changeset 13796:98e65e6a5c32

[gaim-migrate @ 16208] some translation updates committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Tue, 30 May 2006 19:42:16 +0000
parents 6559e5c913d9
children d0128f0efe96
files po/ChangeLog po/ca@valencia.po po/en_GB.po po/eu.po po/fi.po po/ru.po
diffstat 6 files changed, 4963 insertions(+), 4505 deletions(-) [+]
line wrap: on
line diff
--- a/po/ChangeLog	Tue May 30 18:17:34 2006 +0000
+++ b/po/ChangeLog	Tue May 30 19:42:16 2006 +0000
@@ -47,7 +47,8 @@
 	* Thai translation added (Isriya Paireepairit)
 	* Turkish translation updated (Ahmet Alp BALKAN)
 	* Ukrainian translation updated (Maxim V. Dziumanenko)
-	* Valencian-Catalan translation added (Toni Hermoso, Josep Puigdemont)
+	* Valencian-Catalan translation added (Toni Hermoso Pulido,
+	  Josep Puigdemont)
 
 version 1.5.1:
 	* Catalan win32 installer translation updated (Bernat López)
@@ -588,7 +589,7 @@
 	* Russian translation updated (Alexandre Prokoudine)
 	* Serbian translation updated (Danilo Segan)
 	* Serbian Latin translation updated (Danilo Segan)
-	* Spanish translation updated (Javier Fernndez-Sanguino Pea)
+	* Spanish translation updated (Javier Fern?ndez-Sanguino Pe?a)
 	* Swedish translation updated (Tore Lundqvist (luntor))
 
 version 0.68 (09/01/2003):
--- a/po/ca@valencia.po	Tue May 30 18:17:34 2006 +0000
+++ b/po/ca@valencia.po	Tue May 30 19:42:16 2006 +0000
@@ -76,15 +76,15 @@
 
 #: ../plugins/contact_priority.c:61
 msgid "Buddy is idle"
-msgstr "L'amic és inactiu"
+msgstr "L'amic està inactiu"
 
 #: ../plugins/contact_priority.c:62
 msgid "Buddy is away"
-msgstr "L'amic és absent"
+msgstr "L'amic està absent"
 
 #: ../plugins/contact_priority.c:63
 msgid "Buddy is \"extended\" away"
-msgstr "L'amic és absent «de fa temps»"
+msgstr "L'amic està absent «de fa temps»"
 
 #. Not used yet.
 #: ../plugins/contact_priority.c:66
@@ -895,7 +895,7 @@
 #. *< id
 #: ../plugins/iconaway.c:82
 msgid "Iconify on Away"
-msgstr "Iconifica si s'és absent"
+msgstr "Iconifica si s'està absent"
 
 #. *< name
 #. *< version
@@ -938,7 +938,7 @@
 
 #: ../plugins/idle.c:180
 msgid "None of your accounts are idle."
-msgstr "Cap dels vostres comptes és inactiu."
+msgstr "Cap dels vostres comptes està inactiu."
 
 # FIXME
 #: ../plugins/idle.c:196
@@ -1011,7 +1011,7 @@
 
 #: ../plugins/log_reader.c:1405
 msgid "User is offline."
-msgstr "L'usuari és fora de línia."
+msgstr "L'usuari està fora de línia."
 
 #: ../plugins/log_reader.c:1411
 msgid "Auto-response sent:"
@@ -1312,7 +1312,7 @@
 #: ../plugins/perl/perl.c:585
 #: ../plugins/perl/perl.c:586
 msgid "Provides support for loading perl plugins."
-msgstr "Proporciona suport per a carregar connectors en Perl."
+msgstr "Permet carregar connectors en Perl."
 
 #: ../plugins/psychic.c:19
 msgid "Psychic Mode"
@@ -1342,7 +1342,7 @@
 
 #: ../plugins/psychic.c:87
 msgid "Disable when away"
-msgstr "Inhabilita-ho quan siga absent"
+msgstr "Inhabilita-ho quan estiga absent"
 
 #: ../plugins/psychic.c:91
 msgid "Display notification message in conversations"
@@ -1527,7 +1527,7 @@
 #: ../plugins/ssl/ssl-gnutls.c:254
 #: ../plugins/ssl/ssl-gnutls.c:256
 msgid "Provides SSL support through GNUTLS."
-msgstr "Proporciona suport per a SSL a través de la biblioteca GNUTLS."
+msgstr "Permet l'ús d'SSL a través de la biblioteca GNUTLS."
 
 #. *< type
 #. *< ui_requirement
@@ -1546,7 +1546,7 @@
 #: ../plugins/ssl/ssl-nss.c:415
 #: ../plugins/ssl/ssl-nss.c:417
 msgid "Provides SSL support through Mozilla NSS."
-msgstr "Proporciona suport per a SSL a través de la biblioteca NSS de Mozilla."
+msgstr "Permet l'ús d'SSL a través de la biblioteca NSS de Mozilla."
 
 #. *< type
 #. *< ui_requirement
@@ -1565,12 +1565,12 @@
 #: ../plugins/ssl/ssl.c:97
 #: ../plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
-msgstr "Proporciona una interfície per a les biblioteques de suport d'SSL."
+msgstr "Proporciona una interfície per a les biblioteques per a SSL."
 
 #: ../plugins/statenotify.c:50
 #, c-format
 msgid "%s is no longer away."
-msgstr "%s ja no és absent."
+msgstr "%s ja no està absent."
 
 #: ../plugins/statenotify.c:52
 #, c-format
@@ -1585,7 +1585,7 @@
 #: ../plugins/statenotify.c:64
 #, c-format
 msgid "%s is no longer idle."
-msgstr "%s ja no és inactiu."
+msgstr "%s ja no està inactiu."
 
 #: ../plugins/statenotify.c:73
 #, c-format
@@ -1634,7 +1634,7 @@
 #: ../plugins/tcl/tcl.c:371
 #: ../plugins/tcl/tcl.c:372
 msgid "Provides support for loading Tcl plugins"
-msgstr "Proporciona suport per a carregar els connectors en Tcl"
+msgstr "Permet carregar els connectors en Tcl"
 
 # FIXME (josep)
 #. *< type
@@ -2992,7 +2992,7 @@
 "The following commands are available in this context:\n"
 msgstr ""
 "Feu servir «/help &lt;ordre&gt;» per a obtindre ajuda sobre una ordre.\n"
-"Les següents ordres són disponibles en este context:\n"
+"Hi ha les següents ordres disponibles en este context:\n"
 
 #: ../src/gtkconv.c:482
 msgid "No such command."
@@ -3355,7 +3355,7 @@
 
 #: ../src/gtkconv.c:6521
 msgid "say &lt;message&gt;:  Send a message normally as if you weren't using a command."
-msgstr "say &lt;missatge&gt;: Envia un missatge normalment com si no féssiu servir cap ordre."
+msgstr "say &lt;missatge&gt;: Envia un missatge normalment com si no féreu servir cap ordre."
 
 #: ../src/gtkconv.c:6524
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
@@ -4180,7 +4180,7 @@
 #. show everything
 #: ../src/gtkimhtmltoolbar.c:735
 msgid "Smile!"
-msgstr "Somrigueu!"
+msgstr "Somrieu!"
 
 #: ../src/gtkimhtmltoolbar.c:923
 msgid "Bold"
@@ -4520,7 +4520,7 @@
 
 #: ../src/gtkpounce.c:591
 msgid "Is no longer i_dle"
-msgstr "Ja no siga i_nactiu"
+msgstr "Ja no estiga i_nactiu"
 
 #: ../src/gtkpounce.c:593
 msgid "Starts _typing"
@@ -4578,7 +4578,7 @@
 
 #: ../src/gtkpounce.c:773
 msgid "P_ounce only when my status is not available"
-msgstr "Avisa n_omés quan el meu estat no siga disponible"
+msgstr "Avisa n_omés quan el meu estat no estiga disponible"
 
 #: ../src/gtkpounce.c:778
 msgid "_Recurring"
@@ -5032,7 +5032,7 @@
 
 #: ../src/gtkprefs.c:1788
 msgid "Change status when _idle"
-msgstr "Canvia l'estat quan siga _inactiu"
+msgstr "Canvia l'estat quan estiga _inactiu"
 
 #: ../src/gtkprefs.c:1792
 msgid "_Minutes before changing status:"
@@ -6158,7 +6158,7 @@
 
 #: ../src/protocols/irc/irc.c:78
 msgid "No MOTD available"
-msgstr "La frase del dia no és disponible"
+msgstr "La frase del dia no està disponible"
 
 #: ../src/protocols/irc/irc.c:79
 msgid "There is no MOTD associated with this connection."
@@ -6198,7 +6198,7 @@
 #: ../src/protocols/jabber/jabber.c:550
 #: ../src/protocols/jabber/jabber.c:890
 msgid "SSL support unavailable"
-msgstr "El suport per a SSL no és disponible"
+msgstr "La implementació d'SSL no està disponible"
 
 #: ../src/protocols/irc/irc.c:333
 #: ../src/protocols/simple/simple.c:452
@@ -6319,7 +6319,7 @@
 #: ../src/protocols/irc/msgs.c:136
 #, c-format
 msgid "Cannot ban %s: banlist is full"
-msgstr "No es pot bandejar %s: la llista de bandejats és plena"
+msgstr "No es pot bandejar %s: la llista de bandejats està plena"
 
 #: ../src/protocols/irc/msgs.c:215
 #: ../src/protocols/irc/msgs.c:235
@@ -6664,11 +6664,11 @@
 
 #: ../src/protocols/jabber/auth.c:51
 msgid "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in account properties"
-msgstr "El servidor requereix TLS/SSL per a entrar. Seleccioneu «Utilitza TLS si és disponible» en les propietats del compte"
+msgstr "El servidor requereix TLS/SSL per a entrar. Seleccioneu «Utilitza TLS si està disponible» en les propietats del compte"
 
 #: ../src/protocols/jabber/auth.c:53
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr "El servidor requereix TLS/SSL per a entrar. No s'ha trobat suport per a TLS/SSL."
+msgstr "El servidor requereix TLS/SSL per a entrar. No es pot fer funcionar TLS/SSL."
 
 #: ../src/protocols/jabber/auth.c:114
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -7276,7 +7276,7 @@
 
 #: ../src/protocols/jabber/jabber.c:1438
 msgid "Recipient Unavailable"
-msgstr "El destinatari no és disponible"
+msgstr "El destinatari no està disponible"
 
 #: ../src/protocols/jabber/jabber.c:1442
 msgid "Registration Required"
@@ -7296,7 +7296,7 @@
 
 #: ../src/protocols/jabber/jabber.c:1450
 msgid "Service Unavailable"
-msgstr "El servei no és disponible"
+msgstr "El servei no està disponible"
 
 #: ../src/protocols/jabber/jabber.c:1452
 msgid "Subscription Required"
@@ -7523,7 +7523,7 @@
 
 #: ../src/protocols/jabber/jabber.c:1911
 msgid "Use TLS if available"
-msgstr "Utilitza TLS si és disponible"
+msgstr "Utilitza TLS si està disponible"
 
 #: ../src/protocols/jabber/jabber.c:1916
 msgid "Require TLS"
@@ -7702,7 +7702,7 @@
 #: ../src/protocols/msn/error.c:70
 #: ../src/protocols/zephyr/zephyr.c:705
 msgid "User is offline"
-msgstr "L'usuari és fora de línia"
+msgstr "L'usuari està fora de línia"
 
 #: ../src/protocols/msn/error.c:73
 msgid "Already in the mode"
@@ -7759,7 +7759,7 @@
 
 #: ../src/protocols/msn/error.c:116
 msgid "Service Temporarily Unavailable"
-msgstr "El servei és temporalment fora de servei."
+msgstr "El servei està temporalment fora de servei."
 
 #: ../src/protocols/msn/error.c:119
 msgid "Database server error"
@@ -7789,7 +7789,7 @@
 #: ../src/protocols/msn/error.c:151
 #: ../src/protocols/msn/error.c:206
 msgid "Server unavailable"
-msgstr "El servidor no és disponible"
+msgstr "El servidor no està disponible"
 
 #: ../src/protocols/msn/error.c:141
 msgid "Peer Notification server down"
@@ -8684,7 +8684,7 @@
 
 #: ../src/protocols/novell/nmuser.c:1913
 msgid "The server is unavailable; try again later"
-msgstr "El servidor no és disponible, proveu-ho més tard"
+msgstr "El servidor no està disponible, proveu-ho més tard"
 
 #: ../src/protocols/novell/nmuser.c:1916
 msgid "Cannot add a contact to the same folder twice"
@@ -8915,7 +8915,7 @@
 #: ../src/protocols/novell/novell.c:2070
 #, c-format
 msgid "%s appears to be offline and did not receive the message that you just sent."
-msgstr "És possible que %s no siga en línia, i no haja rebut el missatge que li acabeu d'enviar."
+msgstr "És possible que %s no estiga en línia, i no haja rebut el missatge que li acabeu d'enviar."
 
 #. TODO: Would be nice to prompt if not set!
 #. *  gaim_request_fields(gc, _("Server Address"),...);
@@ -8927,7 +8927,7 @@
 
 #: ../src/protocols/novell/novell.c:2190
 msgid "Error. SSL support is not installed."
-msgstr "Error. El suport per a SLL no està instal·lat."
+msgstr "S'ha produït un error. La funcionalitat per a SSL no està instal·lada."
 
 #: ../src/protocols/novell/novell.c:2499
 msgid "This conference has been closed. No more messages can be sent."
@@ -9030,7 +9030,7 @@
 
 #: ../src/protocols/oscar/oscar.c:163
 msgid "User temporarily unavailable"
-msgstr "Usuari no disponible temporalment"
+msgstr "L'usuari no està disponible temporalment"
 
 #: ../src/protocols/oscar/oscar.c:164
 msgid "No match"
@@ -9217,7 +9217,7 @@
 #. service temporarily unavailable
 #: ../src/protocols/oscar/oscar.c:1317
 msgid "The AOL Instant Messenger service is temporarily unavailable."
-msgstr "El servei de missatges instantanis d'AOL no és disponible temporalment."
+msgstr "El servei de missatges instantanis d'AOL no està disponible temporalment."
 
 #: ../src/protocols/oscar/oscar.c:1322
 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."
@@ -9469,12 +9469,12 @@
 #: ../src/protocols/oscar/oscar.c:2799
 #, c-format
 msgid "User information not available: %s"
-msgstr "La informació de l'usuari no és disponible: %s"
+msgstr "La informació de l'usuari no està disponible: %s"
 
 #: ../src/protocols/oscar/oscar.c:2802
 #, c-format
 msgid "User information for %s unavailable:"
-msgstr "La informació de %s no és disponible:"
+msgstr "La informació de %s no està disponible:"
 
 #: ../src/protocols/oscar/oscar.c:2828
 msgid "Online Since"
@@ -11211,7 +11211,7 @@
 
 #: ../src/protocols/silc/ops.c:1941
 msgid "Failure: Remote does not trust/support your public key"
-msgstr "Fallida: El remot no se'n refia o no suporta la vostra clau pública"
+msgstr "Fallida: El remot no se'n refia o no funciona amb la vostra clau pública"
 
 #: ../src/protocols/silc/ops.c:1944
 msgid "Failure: Remote does not support proposed KE group"
@@ -11882,7 +11882,7 @@
 #: ../src/protocols/toc/toc.c:500
 #, c-format
 msgid "Chat in %s is not available."
-msgstr "El xat a %s no és disponible."
+msgstr "El xat a %s no està disponible."
 
 #: ../src/protocols/toc/toc.c:503
 #, c-format
@@ -11933,7 +11933,7 @@
 
 #: ../src/protocols/toc/toc.c:537
 msgid "Country not supported."
-msgstr "País no suportat."
+msgstr "País no implementat."
 
 #: ../src/protocols/toc/toc.c:540
 #, c-format
@@ -11942,7 +11942,7 @@
 
 #: ../src/protocols/toc/toc.c:546
 msgid "The service is temporarily unavailable."
-msgstr "El servei és temporalment no disponible."
+msgstr "El servei està temporalment no disponible."
 
 #: ../src/protocols/toc/toc.c:549
 msgid "Your warning level is currently too high to log in."
@@ -11988,7 +11988,7 @@
 
 #: ../src/protocols/toc/toc.c:994
 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 "Quan açò succeeix, TOC ignora els missatges que se li envien, i vos pot fer fora si envieu un missatge. Gaim evitarà que res d'això passe. Només éstemporalment. Si vos plau, tingueu paciència."
+msgstr "Quan açò succeeix, TOC ignora els missatges que se li envien, i vos pot fer fora si envieu un missatge. Gaim evitarà que res d'això passe. Només és temporalment. Si vos plau, tingueu paciència."
 
 #: ../src/protocols/toc/toc.c:1549
 msgid "Get Dir Info"
@@ -12411,7 +12411,7 @@
 #: ../src/protocols/yahoo/yahoo_profile.c:1170
 #, c-format
 msgid "User information for %s unavailable"
-msgstr "Dades de l'usuari %s no disponibles"
+msgstr "Les dades de l'usuari %s no estan disponibles"
 
 #: ../src/protocols/yahoo/yahoo_profile.c:1176
 msgid "Sorry, this profile seems to be in a language or format that is not supported at this time."
@@ -12450,7 +12450,7 @@
 #. -15
 #: ../src/protocols/yahoo/yahoochat.c:367
 msgid "Maybe the room is full"
-msgstr "Pot ser que la sala siga plena"
+msgstr "Pot ser que la sala estiga plena"
 
 #. -35
 #: ../src/protocols/yahoo/yahoochat.c:370
@@ -12722,12 +12722,12 @@
 #: ../src/status.c:632
 #, c-format
 msgid "%s is now %s"
-msgstr "%s es ara %s"
+msgstr "%s està ara %s"
 
 #: ../src/status.c:637
 #, c-format
 msgid "%s is no longer %s"
-msgstr "%s ja no és %s"
+msgstr "%s ja no està %s"
 
 #: ../src/status.c:1311
 #, c-format
@@ -12737,7 +12737,7 @@
 #: ../src/status.c:1328
 #, c-format
 msgid "%s became unidle"
-msgstr "%s ja no és inactiu"
+msgstr "%s ja no està inactiu"
 
 #: ../src/status.c:1394
 #, c-format
@@ -12747,7 +12747,7 @@
 #: ../src/status.c:1396
 #, c-format
 msgid "+++ %s became unidle"
-msgstr "+++ %s ja no és inactiu"
+msgstr "+++ %s ja no està inactiu"
 
 #: ../src/util.c:679
 #, c-format
@@ -12855,7 +12855,7 @@
 #~ msgid "Active item"
 #~ msgstr "Element actiu"
 #~ msgid "The item which is currently active"
-#~ msgstr "L'element que és actualment actiu"
+#~ msgstr "L'element que està actualment actiu"
 #~ msgid "Appears as list"
 #~ msgstr "Apareix com una llista"
 #~ msgid "Whether combobox dropdowns should look like lists rather than menus"
@@ -12890,7 +12890,7 @@
 #~ msgid "You have lost your connection to chat room %s."
 #~ msgstr "Heu perdut la connexió a la sala de xat %s."
 #~ msgid "Chat is currently unavailable"
-#~ msgstr "El xat no és actualment disponible"
+#~ msgstr "El xat no està actualment disponible"
 #~ msgid "Unable to login to AIM"
 #~ msgstr "No s'ha pogut connectar a l'AIM"
 #~ msgid "Attempting connection redirect..."
@@ -13126,7 +13126,7 @@
 #~ msgid "Remove Buddy Pounce"
 #~ msgstr "Suprimeix l'avís d'un amic"
 #~ msgid "_Queue new messages when away"
-#~ msgstr "Posa els missatges en una cua _quan siga absent"
+#~ msgstr "Posa els missatges en una cua _quan estiga absent"
 #~ msgid "Could't open file"
 #~ msgstr "No s'ha pogut obrir el fitxer"
 #~ msgid "Change password"
--- a/po/en_GB.po	Tue May 30 18:17:34 2006 +0000
+++ b/po/en_GB.po	Tue May 30 19:42:16 2006 +0000
@@ -1651,7 +1651,7 @@
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
 msgstr ""
-"This plugin allows the user to customize conversation and logging message "
+"This plug-in allows the user to customize conversation and logging message "
 "timestamp formats."
 
 #: ../plugins/win32/transparency/win2ktrans.c:183
@@ -2472,7 +2472,7 @@
 
 #: ../src/gtkblist.c:2453
 msgid "/Tools/Plu_gins"
-msgstr "/Tools/Plu_gins"
+msgstr "/Tools/Plu_g-ins"
 
 #: ../src/gtkblist.c:2454
 msgid "/Tools/Pr_eferences"
--- a/po/eu.po	Tue May 30 18:17:34 2006 +0000
+++ b/po/eu.po	Tue May 30 19:42:16 2006 +0000
@@ -1,6 +1,246 @@
 # translation of eu.po to 
+# translation of eu.po to
+# translation of eu.po to
+# translation of eu.po to
+# translation of eu.po to
+# translation of eu.po to
+# translation of eu.po to
+# translation of gaim-2.0_eu.po to
+# translation of gaim-2.0_eu.po to
+# translation of gaim-2.0_eu.po to
+# translation of gaim-2.0_eu.po to
 # translation of gaim-2.0_eu.po to Basque
 # translation of gaim.po to Basque
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
+# tamax, 2006.
 # Hizkuntza Politikarako Sailburuordetza <hizkpol@ej-gv.es>, 2005.
 # Iñaki Larrañaga Murgoitio <dooteo@zundan.com>, 2006.
 # tamax, 2006.
@@ -10,7 +250,7 @@
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-04-11 16:20+0000\n"
-"PO-Revision-Date: 2006-05-05 04:20+0200\n"
+"PO-Revision-Date: 2006-05-25 23:48+0200\n"
 "Last-Translator: tamax\n"
 "Language-Team:  <en@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -106,9 +346,8 @@
 #. *< priority
 #. *< id
 #: ../plugins/dbus-example.c:152
-#, fuzzy
 msgid "DBus"
-msgstr "Lanpetuta"
+msgstr "DBus"
 
 #. *< name
 #. *< version
@@ -120,7 +359,7 @@
 
 #: ../plugins/docklet/docklet.c:154
 msgid "Right-click for more unread messages...\n"
-msgstr ""
+msgstr "Eskubiko botoiaz klik egin irakurri gabeko mezu gehiagorentzat...\n"
 
 #: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3230
 #, c-format
@@ -173,9 +412,8 @@
 msgstr "Berria..."
 
 #: ../plugins/docklet/docklet.c:468 ../src/gtkstatusbox.c:682
-#, fuzzy
 msgid "Saved..."
-msgstr "Gorde fitxategia..."
+msgstr "Gordeta..."
 
 #: ../plugins/docklet/docklet.c:484
 msgid "Show Buddy List"
@@ -233,9 +471,8 @@
 #: ../plugins/docklet/docklet.c:686 ../plugins/docklet/docklet.c:694
 #: ../plugins/timestamp_format.c:39 ../plugins/timestamp_format.c:48
 #: ../plugins/win32/winprefs/winprefs.c:425 ../src/gtkprefs.c:825
-#, fuzzy
 msgid "Always"
-msgstr "Kanpoan"
+msgstr "Beti"
 
 #: ../plugins/docklet/docklet.c:690
 msgid "C_hat Messages:"
@@ -307,7 +544,7 @@
 #. *< id
 #: ../plugins/extplacement.c:135
 msgid "ExtPlacement"
-msgstr ""
+msgstr "ExtPlacement "
 
 #. *< name
 #. *< version
@@ -380,9 +617,8 @@
 msgstr "Bigarrengo Kurtsore kolorea"
 
 #: ../plugins/gaimrc.c:43
-#, fuzzy
 msgid "Hyperlink Color"
-msgstr "Hiperestekaren kolorea"
+msgstr "Hiperestekaren kolorea "
 
 #: ../plugins/gaimrc.c:56
 msgid "GtkTreeView Expander Size"
@@ -413,8 +649,9 @@
 msgstr "Jakinarazpenak elkarrizketa"
 
 #: ../plugins/gaimrc.c:91
+# , fuzzy
 msgid "GtkTreeView Indent Expanders"
-msgstr ""
+msgstr "GtkTreeView zabaltzailea"
 
 #: ../plugins/gaimrc.c:287
 #, c-format
@@ -422,9 +659,8 @@
 msgstr "Hautatu testu-kolorea honentzako  %s"
 
 #: ../plugins/gaimrc.c:289
-#, fuzzy
 msgid "Select Color"
-msgstr "Hautatu testu-kolorea"
+msgstr "Hautatu kolorea"
 
 #: ../plugins/gaimrc.c:324
 #, c-format
@@ -432,9 +668,8 @@
 msgstr "Hautatu letra-tipoa honentzako %s"
 
 #: ../plugins/gaimrc.c:362
-#, fuzzy
 msgid "Select Interface Font"
-msgstr "Hautatu letra-tipoa"
+msgstr "Hautatu letra-tipoa "
 
 #: ../plugins/gaimrc.c:415
 msgid "General"
@@ -806,9 +1041,8 @@
 msgstr "Kendu kontuaren ez-aktibo-denbora"
 
 #: ../plugins/idle.c:196
-#, fuzzy
 msgid "_Unset"
-msgstr "_Erabili"
+msgstr "_Ezarpena kendu"
 
 #: ../plugins/idle.c:218 ../plugins/idle.c:257
 msgid "Set Idle Time for All Accounts"
@@ -944,15 +1178,17 @@
 #. *< name
 #. *< version
 #: ../plugins/musicmessaging/musicmessaging.c:663
+# , fuzzy
 msgid "Music Messaging Plugin for collaborative composition."
-msgstr ""
+msgstr "Musika mezuen Plugin-a kolaborazio bitarteko osaketarako."
 
 #. *  summary
 #: ../plugins/musicmessaging/musicmessaging.c:665
+# , fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editting a common score in real-time."
-msgstr ""
+msgstr "Musika mezuen plugin-a hainbat erabiltzaile momentu berean musika zati batean amankumeko \"score\"-a editatzen lan egiteko aukera eskeintzen du benetazko denboran."
 
 #. ---------- "Notify For" ----------
 #: ../plugins/notify.c:638
@@ -1067,11 +1303,11 @@
 
 #: ../plugins/psychic.c:22
 msgid "Psychic Mode"
-msgstr ""
+msgstr "Modu psikikoa "
 
 #: ../plugins/psychic.c:23
 msgid "Psychic mode for incoming conversation"
-msgstr ""
+msgstr "Modu psikikoa datorren elkarrizketerako "
 
 #: ../plugins/psychic.c:24
 msgid ""
@@ -1082,8 +1318,9 @@
 "Honek funtzionatzen du AIM,ICQ,Jabber,Sametime eta Yahoo!"
 
 #: ../plugins/psychic.c:60
+# , fuzzy
 msgid "You feel a disturbance in the force..."
-msgstr ""
+msgstr "Ikanbila sentitu duzu indarrean"
 
 #: ../plugins/psychic.c:79
 msgid "Only enable for users on the buddy list"
@@ -1205,7 +1442,7 @@
 
 #: ../plugins/spellchk.c:1918
 msgid "Duplicate Correction"
-msgstr ""
+msgstr "Bikoiztutako zuzenketa"
 
 #: ../plugins/spellchk.c:1919
 msgid "The specified word already exists in the correction list."
@@ -1229,7 +1466,7 @@
 
 #: ../plugins/spellchk.c:2191
 msgid "Case sensitive"
-msgstr ""
+msgstr "Maiuskulak bereizi"
 
 #: ../plugins/spellchk.c:2217
 msgid "Add a new text replacement"
@@ -1245,8 +1482,9 @@
 
 #. Created here so it can be passed to whole_words_button_toggled.
 #: ../plugins/spellchk.c:2262
+# , fuzzy
 msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr ""
+msgstr "Kasuarko topaketa zehatza (ez-gaitu kasu automatikorako)"
 
 #: ../plugins/spellchk.c:2264
 msgid "Only replace _whole words"
@@ -1450,7 +1688,7 @@
 
 #: ../plugins/timestamp_format.c:22
 msgid "Timestamp Format Options"
-msgstr ""
+msgstr "Timestamp-en formatu ezarpenak"
 
 #: ../plugins/timestamp_format.c:27
 msgid "_Force (traditional Gaim) 24-hour time format"
@@ -1465,13 +1703,12 @@
 msgstr "So_lasaldiak"
 
 #: ../plugins/timestamp_format.c:37 ../plugins/timestamp_format.c:46
-#, fuzzy
 msgid "For delayed messages"
-msgstr "Bidali mezua"
+msgstr "Berandu datozen mezuentzat"
 
 #: ../plugins/timestamp_format.c:38 ../plugins/timestamp_format.c:47
 msgid "For delayed messages and in chats"
-msgstr ""
+msgstr "Atzeratutako mezuentzat eta berriketentzat"
 
 #: ../plugins/timestamp_format.c:44
 msgid "_Message Logs:"
@@ -1485,14 +1722,14 @@
 #. *< id
 #: ../plugins/timestamp_format.c:150
 msgid "Message Timestamp Formats"
-msgstr ""
+msgstr "Mezuen Timestamp formatuak"
 
 #. *< name
 #. *< version
 #. *  summary
 #: ../plugins/timestamp_format.c:153
 msgid "Customizes the message timestamp formats."
-msgstr ""
+msgstr "Pertsonalizatu mezuen timestamp formatuak."
 
 #. *  description
 #: ../plugins/timestamp_format.c:155
@@ -1500,6 +1737,8 @@
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
 msgstr ""
+"Plugin honek erabiltzaileak elkarrizketak eta egunkari "
+"mezuen timestamp formatuak pertsonalizatzea ahalbidetzen du."
 
 #: ../plugins/win32/transparency/win2ktrans.c:183
 #: ../plugins/win32/transparency/win2ktrans.c:569
@@ -1602,7 +1841,7 @@
 #. XXX: Did this ever work?
 #: ../plugins/win32/winprefs/winprefs.c:427
 msgid "Only when docked"
-msgstr ""
+msgstr "Bakarrik geldiunean"
 
 #. Conversations
 #: ../plugins/win32/winprefs/winprefs.c:431 ../src/gtkprefs.c:819
@@ -1611,7 +1850,6 @@
 msgstr "Solasaldiak"
 
 #: ../plugins/win32/winprefs/winprefs.c:432
-#, fuzzy
 msgid "_Flash window when messages are received"
 msgstr "_Erakutsi leihoa keinuka mezuak jasotzean"
 
@@ -1627,7 +1865,7 @@
 msgid ""
 "Provides options specific to Windows Gaim, such as buddy list docking and "
 "conversation flashing."
-msgstr ""
+msgstr "Gaim Windows-en ezarpenak zehazteko aukera eskeintzen du, hala nola lagunen-zerrenda gelditzea eta elkarrizketa kinuak."
 
 #: ../src/account.c:773
 msgid "accounts"
@@ -2444,13 +2682,12 @@
 "<b>Egoera:</b> Txundigarria "
 
 #: ../src/gtkblist.c:2662
-#, fuzzy
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
 msgstr ""
 "\n"
-"<b>Egoera</b>: Rockin'"
+"<b>Egoera:</b> Rockin'"
 
 #: ../src/gtkblist.c:2951
 #, c-format
@@ -2647,7 +2884,7 @@
 "%s was disconnected due to an error: %s\n"
 "Gaim will not attempt to reconnect the account until you correct the error "
 "and re-enable the account."
-msgstr ""
+msgstr "%s deskonektatua izan da errorea baten ondorioz: %s\n Gaim ez da saiatuko kontua berriz konektatzen errorea konpondu  eta kontua ahalbidetu arte."
 
 #: ../src/gtkconv.c:373
 msgid "Supported debug options are:  version"
@@ -2690,9 +2927,8 @@
 msgstr "Komando horrek ez du protokolo honekin lanik egiten"
 
 #: ../src/gtkconv.c:744 ../src/gtkconv.c:770
-#, fuzzy
 msgid "That buddy is not on the same protocol as this chat."
-msgstr "Lagun hori ez dago berriketa honek darabilen protokoloarekin"
+msgstr "Lagun hori ez dago berriketa honek darabilen protokoloarekin."
 
 #: ../src/gtkconv.c:764
 msgid "You are not currently signed on with an account that can invite that buddy."
@@ -3061,7 +3297,7 @@
 
 #: ../src/gtkconv.c:7286
 msgid "Detach this tab"
-msgstr ""
+msgstr "Banatu betilea"
 
 #: ../src/gtkconv.c:7292
 msgid "Close this tab"
@@ -3177,11 +3413,11 @@
 
 #: ../src/gtkdialogs.c:111 ../src/gtkdialogs.c:112
 msgid "Bengali"
-msgstr ""
+msgstr "bengalera"
 
 #: ../src/gtkdialogs.c:113
 msgid "Bosnian"
-msgstr "Bosniera"
+msgstr "Bosniarra"
 
 #: ../src/gtkdialogs.c:114 ../src/gtkdialogs.c:168 ../src/gtkdialogs.c:169
 msgid "Catalan"
@@ -3189,7 +3425,7 @@
 
 #: ../src/gtkdialogs.c:115
 msgid "Valencian"
-msgstr "Balentzianoa"
+msgstr "Balentziera"
 
 #: ../src/gtkdialogs.c:116 ../src/gtkdialogs.c:170
 msgid "Czech"
@@ -3205,7 +3441,7 @@
 
 #: ../src/gtkdialogs.c:120 ../src/gtkdialogs.c:121
 msgid "Greek"
-msgstr "Greziar"
+msgstr "Gerkera"
 
 #: ../src/gtkdialogs.c:122
 msgid "Australian English"
@@ -3226,7 +3462,7 @@
 
 #: ../src/gtkdialogs.c:126 ../src/gtkdialogs.c:127
 msgid "Persian"
-msgstr ""
+msgstr "pertsiera"
 
 #: ../src/gtkdialogs.c:128 ../src/gtkdialogs.c:176 ../src/gtkdialogs.c:177
 msgid "Finnish"
@@ -3271,9 +3507,8 @@
 msgstr "Koreera"
 
 #: ../src/gtkdialogs.c:138 ../src/gtkdialogs.c:139
-#, fuzzy
 msgid "Kurdish"
-msgstr "Turkiera"
+msgstr "Turkiera "
 
 #: ../src/gtkdialogs.c:140 ../src/gtkdialogs.c:188 ../src/gtkdialogs.c:189
 msgid "Lithuanian"
@@ -3325,13 +3560,12 @@
 msgstr "Suediera"
 
 #: ../src/gtkdialogs.c:154
-#, fuzzy
 msgid "Tamil"
-msgstr "Terminala"
+msgstr "Tamil"
 
 #: ../src/gtkdialogs.c:155
 msgid "Telugu"
-msgstr ""
+msgstr "Telugu"
 
 #: ../src/gtkdialogs.c:156
 msgid "Turkish"
@@ -3376,6 +3610,8 @@
 "file for the complete list of contributors.  We provide no warranty for this "
 "program.<BR><BR>"
 msgstr ""
+"Gaim berehalako mezuen bezero modularra da  AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
+"eta Gadu-Gadu momentu berean erabiltzeko gaitasuna duena. GTK+ erabiliz idatzi izan da .<BR><BR> Programa hau aldatu eta ber-banatu dezakezu  GPL terminopean (2 bertsioa edo beranduagokoa). GPL -ren kopia COPYING izeneko fitxategi baten dago gaim distribuzioarekin batera. Gaim \"copyright\"-a du bere laguntzaileen eskutik. Ikusi ezazy COPYRIGHT fitxategia laguntzaileen zerrenda osoa ikusteko. Ez dugu programa honen bermea zihurtatzen.<BR><BR>"
 
 #: ../src/gtkdialogs.c:275
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
@@ -3675,9 +3911,8 @@
 msgstr "Itsatsi _testu gisa"
 
 #: ../src/gtkimhtml.c:833
-#, fuzzy
 msgid "_Reset formatting"
-msgstr "_Garbitu estiloa"
+msgstr "_Garbitu estiloa "
 
 #: ../src/gtkimhtml.c:1327
 msgid "Hyperlink color"
@@ -3849,9 +4084,8 @@
 msgstr "Atzeko planoko kolorea"
 
 #: ../src/gtkimhtmltoolbar.c:1030
-#, fuzzy
 msgid "Reset formatting"
-msgstr "Estilo lehenetsia"
+msgstr "Formateoa beregin"
 
 #: ../src/gtkimhtmltoolbar.c:1045
 msgid "Insert link"
@@ -3938,6 +4172,16 @@
 "                      account(s) to use, separated by commas)\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
+"Gaim %s\n"
+"Erabiltzeko era: %s [Aukerak]...\n"
+"\n"
+"  -c, --config=DIR    erabili DIR konfigurazio fitxategientzat\n"
+"  -d, --debug         idatzi \"debugging\"mezuak stdout -en\n"
+"  -h, --help          Erakutsi laguntza eta irten\n"
+"  -n, --nologin       Automatikoki ez konexio hasi\n"
+"  -l, --login[=IZENA]  Automatikoki konexioa hasi (IZENA aukerazko argumentu espesifikazioa\n"
+"                      kontua(k) erabiltzeko, koma batez bereiztu)\n"
+"  -v, --version       Erakutsi egungo bertsioa eta irten\n"
 
 #: ../src/gtkmain.c:493
 #, c-format
@@ -3974,9 +4218,8 @@
 msgstr "Nork"
 
 #: ../src/gtknotify.c:418
-#, fuzzy
 msgid "Subject"
-msgstr "Ezarri"
+msgstr "Gaia"
 
 #: ../src/gtknotify.c:427
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
@@ -4187,8 +4430,9 @@
 msgstr "Aukerak"
 
 #: ../src/gtkpounce.c:773
+# , fuzzy
 msgid "P_ounce only when my status is not available"
-msgstr ""
+msgstr "P_ounce bakarrik nire egoera eskuragarri ez nagoenean"
 
 #: ../src/gtkpounce.c:778
 msgid "_Recurring"
@@ -4196,8 +4440,9 @@
 
 #: ../src/gtkpounce.c:1092
 #, c-format
+# , fuzzy
 msgid "Are you sure you want to delete the pounce on %s for %s?"
-msgstr ""
+msgstr "Zihur al zaude \"pounce\" -an %s %s-entzako ezabatu nahi duzu ?"
 
 #: ../src/gtkpounce.c:1240
 #, fuzzy
@@ -4318,7 +4563,7 @@
 
 #: ../src/gtkprefs.c:849
 msgid "Use smooth-scrolling"
-msgstr ""
+msgstr "Erabili mugimendu leuna norantza bertikalean"
 
 #: ../src/gtkprefs.c:865
 msgid ""
@@ -4534,9 +4779,8 @@
 msgstr "Normala"
 
 #: ../src/gtkprefs.c:1470
-# ,fuzzy
 msgid "Loud"
-msgstr "Altu esan"
+msgstr "Altu esan "
 
 #: ../src/gtkprefs.c:1472
 #, fuzzy
@@ -4626,13 +4870,12 @@
 msgstr "Ezagutarazi _inaktibotasun-denborak"
 
 #: ../src/gtkprefs.c:1750
-#,fuzzy
 msgid "From last sent message"
-msgstr "Hem"
+msgstr "Bidalitako azkeneko mezutik"
 
 #: ../src/gtkprefs.c:1752
 msgid "Based on keyboard or mouse use"
-msgstr ""
+msgstr "Teklatu edo saguaren erabilpenean oinarrituta"
 
 #: ../src/gtkprefs.c:1761
 msgid "_Auto-reply:"
@@ -4665,14 +4908,12 @@
 msgstr "Hasierako egoera"
 
 #: ../src/gtkprefs.c:1808
-#, fuzzy
 msgid "Use status from last _exit at startup"
-msgstr "Erabili azkeneko egoera hasieratzeko"
+msgstr "Erabili azkeneko irteteerako egoera hasieratzeko"
 
 #: ../src/gtkprefs.c:1814
-# , fuzzy
 msgid "Status to a_pply at startup:"
-msgstr "Ezartzeko egoera"
+msgstr "Haserako egoera ezartzeko:"
 
 #: ../src/gtkprefs.c:1865
 msgid "Smiley Themes"
@@ -4859,9 +5100,8 @@
 msgstr "Lanpostua"
 
 #: ../src/gtksavedstatuses.c:448
-#, fuzzy
 msgid "Type"
-msgstr "Mota"
+msgstr "Mota "
 
 #. Available status messages are plain text
 #: ../src/gtksavedstatuses.c:459 ../src/gtksavedstatuses.c:920
@@ -4897,9 +5137,8 @@
 msgstr "_Erabili"
 
 #: ../src/gtksavedstatuses.c:695
-# , fuzzy
 msgid "Title already in use.  You must choose a unique title."
-msgstr "Titulua erabiltzen ari da. Titulu bakarra"
+msgstr "Titulua erabilia dago. Berria aukeratu."
 
 #: ../src/gtksavedstatuses.c:879
 msgid "Different"
@@ -4921,9 +5160,8 @@
 msgstr "_Titulua:"
 
 #: ../src/gtksavedstatuses.c:1092 ../src/gtksavedstatuses.c:1413
-#, fuzzy
 msgid "_Status:"
-msgstr "Egoera:"
+msgstr "_Egoera:"
 
 #. Different status message expander
 #: ../src/gtksavedstatuses.c:1124
@@ -4937,9 +5175,8 @@
 
 #: ../src/gtksavedstatuses.c:1394
 #, c-format
-# , fuzzy
 msgid "Status for %s"
-msgstr "Egoera : %s"
+msgstr "Egoera : %s rako."
 
 #: ../src/gtksound.c:61
 msgid "Buddy logs in"
@@ -5059,9 +5296,8 @@
 msgstr "Gaim -ek ezin du karpeta bidali. Fitxategiak banan-bana bidali beharko dituzu."
 
 #: ../src/gtkutils.c:1438 ../src/gtkutils.c:1447 ../src/gtkutils.c:1452
-#, fuzzy
 msgid "You have dragged an image"
-msgstr "Herrestan eraman duzu irudia"
+msgstr "Herrestan eraman duzu irudia "
 
 #: ../src/gtkutils.c:1439
 msgid ""
@@ -5109,15 +5345,15 @@
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
 #: ../src/gtkutils.c:1509
-# , fuzzy
+
 msgid "Cannot send launcher"
-msgstr "Ezinezkoa "
+msgstr "Ezinezkoa  jaurtitzailea  bidaltzea"
 
 #: ../src/gtkutils.c:1509
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
-msgstr ""
+msgstr "Mahaingain-eko jaurtigailua herrestan eraman duzu. Seguraski beste zeozer bidali nahiko zenuen. "
 
 #: ../src/gtkwhiteboard.c:756 ../src/gtkwhiteboard.c:775
 msgid "Save File"
@@ -5191,12 +5427,12 @@
 #: ../src/plugin.c:424
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
-msgstr ""
+msgstr "Plugin magikoa gaizki elkartua %d (%d beharrezkoa) "
 
 #: ../src/plugin.c:441
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
-msgstr ""
+msgstr "ABI bertsio gaizki elkartua %d.%d.x (%d.%d.x beharrezkoa)"
 
 #: ../src/plugin.c:458
 msgid "Plugin does not implement all required functions"
@@ -5239,9 +5475,8 @@
 msgstr "Datozen BM konexio berriak entzutea ezinezkoa gertatu da\n"
 
 #: ../src/protocols/bonjour/bonjour.c:146
-# , fuzzy
 msgid "Unable to establish connection with the local mDNS server.  Is it running?"
-msgstr "Ezinezkoa izan da konexioa ematea mDNS zerbitzari lokalarekin , martxan al dago ?"
+msgstr "Ezinezkoa izan da konexioa ezatzea mDNS zerbitzari lokalarekin , martxan al dago ?"
 
 #: ../src/protocols/bonjour/bonjour.c:337
 #: ../src/protocols/sametime/sametime.c:3251
@@ -5286,7 +5521,7 @@
 #. Creating the user splits
 #: ../src/protocols/bonjour/bonjour.c:575 ../src/protocols/silc/silc.c:935
 msgid "Hostname"
-msgstr ""
+msgstr "Ostalari-Izena"
 
 #. Creating the options for the protocol
 #. port to connect to
@@ -5355,9 +5590,8 @@
 
 #: ../src/protocols/gg/gg.c:115 ../src/protocols/gg/gg.c:137
 #: ../src/protocols/gg/gg.c:180
-#, fuzzy
 msgid "Token Error"
-msgstr "Lekukoarekin errorea"
+msgstr "Testigu errorea"
 
 #: ../src/protocols/gg/gg.c:116 ../src/protocols/gg/gg.c:138
 #: ../src/protocols/gg/gg.c:181
@@ -5398,7 +5632,6 @@
 msgstr "Gorde lagunen-zerrenda..."
 
 #: ../src/protocols/gg/gg.c:380
-
 msgid "Fill in the registration fields."
 msgstr "Bete harpidetzarako eremuak"
 
@@ -5428,19 +5661,18 @@
 msgstr "Pasahitza (beridatzi)"
 
 #: ../src/protocols/gg/gg.c:483 ../src/protocols/gg/gg.c:757
-#, fuzzy
+# , fuzzy
 msgid "Enter current token"
-msgstr "%s ez dago une honetan konektatuta."
+msgstr "Sartu momentuko lekukoa"
 
 #: ../src/protocols/gg/gg.c:489 ../src/protocols/gg/gg.c:763
-#, fuzzy
+# , fuzzy
 msgid "Current token"
-msgstr "Orain konektatuta"
+msgstr "Momentuko lekukoa"
 
 #: ../src/protocols/gg/gg.c:493 ../src/protocols/gg/gg.c:494
-#, fuzzy
 msgid "Register New Gadu-Gadu Account"
-msgstr "Erregistratu Jabber kontu berria"
+msgstr "Erregistratu Gadu-Gadu kontu berria"
 
 #: ../src/protocols/gg/gg.c:495
 msgid "Please, fill in the following fields"
@@ -5511,9 +5743,8 @@
 msgstr "Bete eremuak"
 
 #: ../src/protocols/gg/gg.c:685
-# , fuzzy
 msgid "Your current password is different from the one that you specified."
-msgstr "Zure egungo pasahitza ezberdina da zuk adierazi dezunaren aldean."
+msgstr "Zure egungo pasahitza ezberdina da zuk adierazi dezunaren aldean. "
 
 #: ../src/protocols/gg/gg.c:699
 msgid "Unable to change password. Error occured.\n"
@@ -5541,9 +5772,8 @@
 
 #: ../src/protocols/gg/gg.c:846
 #, c-format
-# , fuzzy
 msgid "Select a chat for buddy: %s"
-msgstr "Aukeratu berriketak lagun batentzat:%s"
+msgstr "Aukeratu berriketak lagun batentzat:%s "
 
 #: ../src/protocols/gg/gg.c:849 ../src/protocols/gg/gg.c:850
 msgid "Add to chat..."
@@ -5686,7 +5916,7 @@
 #. summary
 #: ../src/protocols/gg/gg.c:2001
 msgid "Polish popular IM"
-msgstr ""
+msgstr "Poloniar IM ospetsua"
 
 #: ../src/protocols/gg/gg.c:2049
 msgid "Gadu-Gadu User"
@@ -5914,9 +6144,8 @@
 
 #: ../src/protocols/irc/msgs.c:328
 #, c-format
-#,fuzzy
 msgid "%s has cleared the topic."
-msgstr "%s(e)k gaia garbitu du: %s"
+msgstr "%s(e)k gaia garbitu du."
 
 #: ../src/protocols/irc/msgs.c:336
 #, c-format
@@ -6487,7 +6716,7 @@
 
 #: ../src/protocols/jabber/buddy.c:1253
 msgid "JID"
-msgstr ""
+msgstr "JID"
 
 #: ../src/protocols/jabber/buddy.c:1257 ../src/protocols/jabber/buddy.c:1401
 #: ../src/protocols/oscar/oscar.c:6176
@@ -6504,9 +6733,8 @@
 msgstr "Zerbitzariaren aginduak:%s"
 
 #: ../src/protocols/jabber/buddy.c:1392
-#,fuzzy
 msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr "Bete ezazu bat edo eremu gehiago edozein Jabber erabiltzaileren topaketarako."
+msgstr "Bete ezazu bat edo eremu gehiago edozein Jabber erabiltzaileren topaketarako. "
 
 #: ../src/protocols/jabber/buddy.c:1411 ../src/protocols/novell/novell.c:1490
 #: ../src/protocols/oscar/oscar.c:6178 ../src/protocols/oscar/oscar.c:6185
@@ -6982,14 +7210,14 @@
 msgstr "Ezin da erabiltzailea %s kide bihurtu \"%s\""
 
 #: ../src/protocols/jabber/jabber.c:1644
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown role: \"%s\""
-msgstr "Komando ezezaguna: %s"
+msgstr "Rol ezezaguna:\" %s\""
 
 #: ../src/protocols/jabber/jabber.c:1651
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to set role \"%s\" for user: %s"
-msgstr "Ezin da mezua bidali: %s"
+msgstr "%s erabiltzaileari ezin zaio %s rola ezarri"
 
 #: ../src/protocols/jabber/jabber.c:1704
 #, c-format
@@ -7024,13 +7252,13 @@
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
-msgstr ""
+msgstr "Afiliatu &It; erabiltzaile&gt;&It;jabea| administratzailea|kidea| paria | ezer ez&gt;: Erabiltzailearen afiliazioa ezarri gelarekiko."
 
 #: ../src/protocols/jabber/jabber.c:1777
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
-msgstr ""
+msgstr "Zeregin &It;erabiltzaile;&It;moderatzailea| partehartzailea | bisitari | ezer ez&gt;: Ezarri erabiltzailearen zeregina gelarekiko."
 
 #: ../src/protocols/jabber/jabber.c:1783
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
@@ -7433,9 +7661,8 @@
 msgstr "MSN Errorea: %s\n"
 
 #: ../src/protocols/msn/msn.c:113
-# ,fuzzy
 msgid "You have just sent a Nudge!"
-msgstr "Bidali berri duzu Nudge-a !"
+msgstr "Harreta eskaera bidali berri duzu  !"
 
 #: ../src/protocols/msn/msn.c:138
 msgid "Your new MSN friendly name is too long."
@@ -7555,7 +7782,6 @@
 msgstr "Baimendu/Ukatu mugikorraren orriak..."
 
 #: ../src/protocols/msn/msn.c:657
-#, fuzzy
 msgid "Open Hotmail Inbox"
 msgstr "Ireki Hotmail posta"
 
@@ -7637,9 +7863,8 @@
 msgstr "Egoera zibila"
 
 #: ../src/protocols/msn/msn.c:1566
-# , fuzzy
 msgid "Interests"
-msgstr "Interesak"
+msgstr "Intereresak"
 
 #: ../src/protocols/msn/msn.c:1567
 msgid "Pets"
@@ -7654,9 +7879,9 @@
 msgstr "Bizilekua"
 
 #: ../src/protocols/msn/msn.c:1570
-# ,fuzzy
+# , fuzzy
 msgid "Fashion"
-msgstr "Era"
+msgstr "Fashion"
 
 #: ../src/protocols/msn/msn.c:1571
 msgid "Humor"
@@ -7754,9 +7979,9 @@
 msgstr "Laneko segapotoa"
 
 #: ../src/protocols/msn/msn.c:1615
-#, fuzzy
+# , fuzzy
 msgid "Work Pager"
-msgstr "Web orria"
+msgstr "Lan orrigilea"
 
 #: ../src/protocols/msn/msn.c:1616
 msgid "Work Fax"
@@ -7771,9 +7996,8 @@
 msgstr "Laneko IM"
 
 #: ../src/protocols/msn/msn.c:1619
-#,fuzzy
 msgid "Start Date"
-msgstr "Hasteko data"
+msgstr "Hasteko data "
 
 #: ../src/protocols/msn/msn.c:1624
 #, c-format
@@ -7857,9 +8081,8 @@
 msgstr "Erakutsi _aurpegiera grafikoak "
 
 #: ../src/protocols/msn/msn.c:2071
-#, fuzzy
 msgid "nudge: nudge a user to get their attention"
-msgstr "buzz: eman abisu kontaktu bati bere harreta lortzeko"
+msgstr "Harreta ematen: harreta eman kontaktu bati atentzioa lortzeko"
 
 #: ../src/protocols/msn/nexus.c:141 ../src/protocols/msn/servconn.c:133
 #: ../src/protocols/yahoo/yahoochat.c:1345
@@ -8068,7 +8291,7 @@
 #: ../src/protocols/msn/switchboard.c:959
 #, c-format
 msgid "%s just sent you a Nudge!"
-msgstr "%s berriki Nugde bidali dizute !"
+msgstr "%s berriki harreta eskaera bidali dizute !"
 
 #: ../src/protocols/msn/userlist.c:96
 #, c-format
@@ -8865,14 +9088,12 @@
 
 #: ../src/protocols/oscar/oscar.c:2581 ../src/protocols/oscar/oscar.c:2590
 #: ../src/protocols/oscar/oscar.c:2604 ../src/protocols/oscar/oscar.c:2614
-#, fuzzy
 msgid "Unable to log into file transfer proxy."
-msgstr "Ezin da %s fitxategian idatzi"
+msgstr "Ezin da egunkarian gorde proxy-aren transferentzia fitxategia. "
 
 #: ../src/protocols/oscar/oscar.c:2668
-#, fuzzy
 msgid "Unable to establish listener socket or no AOL proxy connection present."
-msgstr "Ezin da entzuteko socket-a ezarri."
+msgstr "Ezin da entzuteko socket-a ezarri edo AOL proxy konexioa dago."
 
 #: ../src/protocols/oscar/oscar.c:2906 ../src/protocols/toc/toc.c:543
 msgid "Incorrect nickname or password."
@@ -8984,9 +9205,8 @@
 msgstr "Eskatu baimena"
 
 #: ../src/protocols/oscar/oscar.c:4643
-#, fuzzy
 msgid "_Request Authorization"
-msgstr "Eskatu baimena"
+msgstr "_Baimena eskatu"
 
 #: ../src/protocols/oscar/oscar.c:4681 ../src/protocols/oscar/oscar.c:4687
 #: ../src/protocols/oscar/oscar.c:4791 ../src/protocols/oscar/oscar.c:4815
@@ -8999,7 +9219,7 @@
 msgstr "Baimena ezesteko mezua:"
 
 #: ../src/protocols/oscar/oscar.c:4793
-#, fuzzy, c-format
+#c-format
 msgid ""
 "The user %u wants to add %s to their buddy list for the following reason:\n"
 "%s"
@@ -9059,7 +9279,7 @@
 "%s"
 
 #: ../src/protocols/oscar/oscar.c:4847
-#, fuzzy, c-format
+# c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
 "\n"
@@ -9081,9 +9301,8 @@
 msgstr "Lagun hori zure lagunen zerrendan gehitu nahi duzu?"
 
 #: ../src/protocols/oscar/oscar.c:4878
-#, fuzzy
 msgid "_Decline"
-msgstr "Ukatu"
+msgstr "_Ukatu"
 
 #: ../src/protocols/oscar/oscar.c:4962
 #, c-format
@@ -9186,9 +9405,8 @@
 msgstr "Gaitasunak"
 
 #: ../src/protocols/oscar/oscar.c:5285
-#, fuzzy
 msgid "Available Message"
-msgstr "Mezu erabilgarria:"
+msgstr "Mezua eskuragarri:"
 
 #: ../src/protocols/oscar/oscar.c:5402
 msgid "Your AIM connection may be lost."
@@ -9266,21 +9484,21 @@
 msgstr "Pop-up mezua"
 
 #: ../src/protocols/oscar/oscar.c:6335
-#, fuzzy, c-format
+#, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
-msgstr[0] "Ondoko pantaila-izenak %s erabiltzailearekin asoziatuta daude"
-msgstr[1] "Ondoko pantaila-izenak %s erabiltzailearekin asoziatuta daude"
+msgstr[0] "Ondoko pantaila-izenak %s erabiltzailearekin erlazionatuak daude"
+msgstr[1] "Ondoko pantaila-izenak %s erabiltzailearekin erlazionatuak daude"
 
 #: ../src/protocols/oscar/oscar.c:6366
-#, fuzzy, c-format
+#, c-format
 msgid "No results found for e-mail address %s"
-msgstr "Emaitzarik ez %s helbide elektronikoarentzat"
+msgstr "Emaitzarik ez %s helbide elektronikoarentzat "
 
 #: ../src/protocols/oscar/oscar.c:6387
-#, fuzzy, c-format
+#, c-format
 msgid "You should receive an e-mail asking to confirm %s."
-msgstr "%s berrestea eskatzeko mezu bat jaso beharko zenuke."
+msgstr "%s berrestea eskatzeko posta-mezu bat jaso beharko zenuke. "
 
 #: ../src/protocols/oscar/oscar.c:6389
 msgid "Account Confirmation Requested"
@@ -9300,11 +9518,11 @@
 "eta jatorrizkoa bat ez datozelako."
 
 #: ../src/protocols/oscar/oscar.c:6426
-#, fuzzy, c-format
+#, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "0x%04x errorea: ezin da formateatu pantaila-izena, eskatutako pantaila-izena "
-"luzeegia delako."
+"Balio okerra du."
 
 #: ../src/protocols/oscar/oscar.c:6429
 #, c-format
@@ -9316,31 +9534,31 @@
 "luzeegia delako."
 
 #: ../src/protocols/oscar/oscar.c:6432
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
-"0x%04x errorea: ezin da helbide elektronikoa aldatu, badagoelako lehendik "
+"0x%04x errorea: ezin da helbide elektronikoa aldatu,  lehendik badagoelak"
 "eskaera bat zain pantaila-izen honekin."
 
 #: ../src/protocols/oscar/oscar.c:6435
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "0x%04x errorea: ezin da helbide elektronikoa aldatu, emandako helbideak "
-"pantaila-izen gehiegi dituelako asoziatuta."
+"pantaila-izen gehiegi dituelako erlazionatuak."
 
 #: ../src/protocols/oscar/oscar.c:6438
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 "0x%04x errorea: ezin da helbide elektronikoa aldatu, emandako helbidea ez "
-"delako baliozkoa."
+"delako baliozkoa. "
 
 #: ../src/protocols/oscar/oscar.c:6441
 #, c-format
@@ -9361,14 +9579,14 @@
 msgstr "Kontuari buruzko informazioa"
 
 #: ../src/protocols/oscar/oscar.c:6457
-#, fuzzy, c-format
+#, c-format
 msgid "The e-mail address for %s is %s"
-msgstr "%s erabiltzailearen helbide elektronikoa %s da"
+msgstr "%s erabiltzailearen helbide elektronikoa %s da "
 
 #: ../src/protocols/oscar/oscar.c:6535
 msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
-"Zure IM irudia ez da bidali. 'Zuzenean Konektatuta' egon behar zara IM "
+"Zure BM irudia ez da bidali. 'Zuzeneko Konexioa'  behar duzu BM "
 "irudiak bidaltzeko."
 
 #: ../src/protocols/oscar/oscar.c:6775
@@ -9492,13 +9710,11 @@
 msgstr "Baimena eman da"
 
 #: ../src/protocols/oscar/oscar.c:7471
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
 "%s"
-msgstr ""
-"%s erabiltzaileak bere lagunen zerrendan gehitu nahi zaitu. Arrazoia:\n"
-"%s"
+msgstr "%s erabiltzaileak bere lagunen zerrendan %s gehitu nahi du bere lagunen zerrendan honako arrazoiagatik:\n %s"
 
 #. Granted
 #: ../src/protocols/oscar/oscar.c:7516
@@ -9569,18 +9785,16 @@
 msgstr "Eskatu baimena berriro"
 
 #: ../src/protocols/oscar/oscar.c:8243
-#, fuzzy
 msgid "Require authorization"
-msgstr "Eskatu baimena"
+msgstr "Baimena beharrezkoa"
 
 #: ../src/protocols/oscar/oscar.c:8246
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
-msgstr ""
+msgstr "Web kontuan izan ( hau ahalbidetzen baduzu Zaborra jasotzea gerta daiteke) "
 
 #: ../src/protocols/oscar/oscar.c:8251
-#, fuzzy
 msgid "ICQ Privacy Options"
-msgstr "Proxy aukerak"
+msgstr "ICQ pribatisasun ezarpenak"
 
 #: ../src/protocols/oscar/oscar.c:8268
 msgid "The new formatting is invalid."
@@ -9617,9 +9831,8 @@
 "gainean, eta hautatu \"Eskatu baimena berriro.\""
 
 #: ../src/protocols/oscar/oscar.c:8394
-#, fuzzy
 msgid "Find Buddy by E-Mail"
-msgstr "Bilatu laguna helbide elektronikoaren arabera"
+msgstr "Bilatu laguna helbide elektronikoaren arabera "
 
 #: ../src/protocols/oscar/oscar.c:8395
 msgid "Search for a buddy by e-mail address"
@@ -9643,9 +9856,8 @@
 
 #. ICQ actions
 #: ../src/protocols/oscar/oscar.c:8514
-#, fuzzy
 msgid "Set Privacy Options..."
-msgstr "Ezarri pribatutasuna:"
+msgstr "Ezarri pribatitasun aukerak:"
 
 #. AIM actions
 #: ../src/protocols/oscar/oscar.c:8521
@@ -9669,9 +9881,8 @@
 msgstr "Bistaratu baimenaren zain dauden lagunak"
 
 #: ../src/protocols/oscar/oscar.c:8546
-#, fuzzy
 msgid "Search for Buddy by E-Mail..."
-msgstr "Bilatu laguna helbide elektronikoaren arabera..."
+msgstr "Bilatu laguna helbide elektronikoaren arabera... "
 
 #: ../src/protocols/oscar/oscar.c:8551
 msgid "Search for Buddy by Information"
@@ -9708,202 +9919,183 @@
 "Use AIM/ICQ proxy server\n"
 "(slower, but usually works)"
 msgstr ""
+"Erabili AIM/ICQ proxy zerbitzaria\n"
+"(motelagoa, baina normalean funtzionatzen du)"
 
 #: ../src/protocols/sametime/sametime.c:415
-#, fuzzy
 msgid "Connection closed (writing)"
-msgstr "Konexioa itxi da"
+msgstr "Konexioa itxi da (idazten)"
 
 #: ../src/protocols/sametime/sametime.c:1267
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Group Title:</b> %s<br>"
-msgstr "<b>Erabiltzailea:</b> %s<br>"
+msgstr "<b>Taldearen titulua:</b> %s<br>"
 
 #: ../src/protocols/sametime/sametime.c:1268
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
-msgstr "<b>Erabiltzailea:</b> %s<br>"
+msgstr "<b>Talde ID oharra:</b> %s<br> "
 
 #: ../src/protocols/sametime/sametime.c:1270
-#, fuzzy, c-format
+#, c-format
 msgid "Info for Group %s"
-msgstr "%s(r)en inf."
+msgstr "%s Taldearentzako informazioa"
 
 #: ../src/protocols/sametime/sametime.c:1272
-#, fuzzy
 msgid "Notes Address Book Information"
-msgstr "Laneko datuak"
+msgstr "Helbide agenda-ren informazioa"
 
 #: ../src/protocols/sametime/sametime.c:1304
-#, fuzzy
 msgid "Invite Group to Conference..."
-msgstr "Hasi konferentzia"
+msgstr "Konferentziara  taldea gonbidatu"
 
 #: ../src/protocols/sametime/sametime.c:1314
-#, fuzzy
 msgid "Get Notes Address Book Info"
-msgstr "Gehitu helbide-liburuan"
+msgstr "Gehitu helbide-liburuan oharraren informazioa"
 
 #: ../src/protocols/sametime/sametime.c:1467
-#, fuzzy
 msgid "Sending Handshake"
-msgstr "Cookie bidaltzen"
+msgstr "Bostekoa bidaltzen"
 
 #: ../src/protocols/sametime/sametime.c:1472
-#, fuzzy
+# , fuzzy
 msgid "Waiting for Handshake Acknowledgement"
-msgstr "Transferentziaren zain hasteko"
+msgstr "Bosteko ezagupenaren zain"
 
 #: ../src/protocols/sametime/sametime.c:1477
 msgid "Handshake Acknowledged, Sending Login"
-msgstr ""
+msgstr "Bostekoa ezagutua, Konexio informazioa bidaltzen"
 
 #: ../src/protocols/sametime/sametime.c:1482
+# , fuzzy
 msgid "Waiting for Login Acknowledgement"
-msgstr ""
+msgstr "Konexio ikuskapenaren zain"
 
 #: ../src/protocols/sametime/sametime.c:1487
-#, fuzzy
 msgid "Login Redirected"
-msgstr "Saioa hasteko zerbitzaria"
+msgstr "Konexio berbideratua"
 
 #: ../src/protocols/sametime/sametime.c:1493
-#, fuzzy
 msgid "Forcing Login"
-msgstr "Konektatzea"
+msgstr "Konektatzea behartzen"
 
 #: ../src/protocols/sametime/sametime.c:1497
+# ,fuzzy
 msgid "Login Acknowledged"
-msgstr ""
+msgstr "Konexio ikuskapena"
 
 #: ../src/protocols/sametime/sametime.c:1502
-#, fuzzy
 msgid "Starting Services"
-msgstr "Zerbitzuak linean"
+msgstr "Zerbitzuak hasten"
 
 #: ../src/protocols/sametime/sametime.c:1507
-#, fuzzy
 msgid "Connected"
-msgstr "Konektatu"
+msgstr "Konektatua"
 
 #: ../src/protocols/sametime/sametime.c:1605
 #, c-format
 msgid "A Sametime administrator has issued the following announcement on server %s"
-msgstr ""
+msgstr "Sametime-eko administratzaileak hurrengo oharra argitaratu du zerbitzarian: %s"
 
 #: ../src/protocols/sametime/sametime.c:1610
 msgid "Sametime Administrator Announcement"
-msgstr ""
+msgstr "Sametime-eko administratzailearen oharra"
 
 #: ../src/protocols/sametime/sametime.c:1662
-#, fuzzy
 msgid "Connection reset"
-msgstr "Konexioa itxi da"
+msgstr "Konexioa berabierazten "
 
 #: ../src/protocols/sametime/sametime.c:1669
-#, fuzzy, c-format
+#, c-format
 msgid "Error reading from socket: %s"
-msgstr "Errorea socket-etik irakurtzean."
+msgstr "Errorea socket-etik irakurtzean:%s."
 
 #. this is a regular connect, error out
 #: ../src/protocols/sametime/sametime.c:1698
 #: ../src/protocols/sametime/sametime.c:3696
-#, fuzzy
 msgid "Unable to connect to host"
-msgstr "Ezin da zerbitzariarekin konektatu"
+msgstr "Ezin da ostalariarekin konektatu"
 
 #: ../src/protocols/sametime/sametime.c:1736
 #, c-format
 msgid "Announcement from %s"
-msgstr ""
+msgstr "Oharra  %s -tik"
 
 #: ../src/protocols/sametime/sametime.c:1910
-#, fuzzy
 msgid "Conference Closed"
-msgstr "Konexioa itxi da"
+msgstr "Konferentzia itxi da"
 
 #: ../src/protocols/sametime/sametime.c:2367
-#, fuzzy
 msgid "Unable to send message: "
-msgstr "Ezin da mezua bidali: %s"
+msgstr "Ezin da mezua bidali: %s."
 
 #: ../src/protocols/sametime/sametime.c:2926
-#, fuzzy
 msgid "Place Closed"
-msgstr "Bertan behera utzi da"
+msgstr "Place itxita"
 
 #: ../src/protocols/sametime/sametime.c:3217
 msgid "Microphone"
-msgstr ""
+msgstr "Mikrofonoa"
 
 #: ../src/protocols/sametime/sametime.c:3218
 msgid "Speakers"
-msgstr ""
+msgstr "Bozgorailuak"
 
 #: ../src/protocols/sametime/sametime.c:3219
-#, fuzzy
 msgid "Video Camera"
-msgstr "Bideo-berriketa"
+msgstr "Bideo-kamera"
 
 #: ../src/protocols/sametime/sametime.c:3223
-#, fuzzy
 msgid "File Transfer"
-msgstr "Fitxategi-transferentziak"
+msgstr "Fitxategi-transferentzia"
 
 #: ../src/protocols/sametime/sametime.c:3257
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Supports:</b> %s"
 msgstr ""
 "\n"
-"<b>%s:</b> %s"
+"<b>Bermatua:</b> %s"
 
 #: ../src/protocols/sametime/sametime.c:3262
-#, fuzzy
 msgid ""
 "\n"
 "<b>External User</b>"
 msgstr ""
 "\n"
-"<b>Abisatuta:</b>"
+"<b>Kanpoko erabiltzailea:</b>"
 
 #: ../src/protocols/sametime/sametime.c:3368
-#, fuzzy
 msgid "Create conference with user"
-msgstr "Hautatu konferentzia-zerbitzari bat kontsulta egiteko"
+msgstr "Erabiltzailerarekin konferentzia sortu"
 
 #: ../src/protocols/sametime/sametime.c:3369
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
-msgstr ""
+msgstr "Gehitu ezazu topiko berria konferentziarako, eta mezua idatzi inbitazion moduan bidaltzeko %s"
 
 #: ../src/protocols/sametime/sametime.c:3373
-#, fuzzy
 msgid "New Conference"
-msgstr "Hasi konferentzia"
+msgstr "Konferentzia berria"
 
 #: ../src/protocols/sametime/sametime.c:3375
-#, fuzzy
 msgid "Create"
-msgstr "Berriketa"
+msgstr "Sortu"
 
 #: ../src/protocols/sametime/sametime.c:3439
-#, fuzzy
 msgid "Available Conferences"
-msgstr "Hasi konferentzia"
+msgstr "Konferentzia erabilgarri"
 
 #: ../src/protocols/sametime/sametime.c:3445
-#, fuzzy
 msgid "Create New Conference..."
-msgstr "Hasi konferentzia"
+msgstr "Sortu konferentzia berria..."
 
 #: ../src/protocols/sametime/sametime.c:3452
-#, fuzzy
 msgid "Invite user to a conference"
-msgstr "Hasi konferentzia"
+msgstr "Erabiltzailea konferentziara gonbidatu"
 
 #: ../src/protocols/sametime/sametime.c:3453
 #, c-format
@@ -9911,74 +10103,70 @@
 "Select a conference from the list below to send an invite to user %s. Select "
 "\"Create New Conference\" if you'd like to create a new conference to invite "
 "this user to."
-msgstr ""
+msgstr "Beheko zerrendatik aukeratu konferentzia %s erabiltzaileari gonbitea bidaltzeko. Aukeratu \"Konferentzia berria sortu\" konferentzia berria sortu nahi baduzu aurreko erabiltzailea gonbidatzeko."
 
 #: ../src/protocols/sametime/sametime.c:3458
-#, fuzzy
 msgid "Invite to Conference"
-msgstr "Hasi konferentzia"
+msgstr "Konferentziara gonbidatu"
 
 #: ../src/protocols/sametime/sametime.c:3460
 msgid "Invite"
 msgstr "Gonbidatu"
 
 #: ../src/protocols/sametime/sametime.c:3548
-#, fuzzy
 msgid "Invite to Conference..."
-msgstr "Hasi konferentzia"
+msgstr "Konferentziara gonbidatu..."
 
 #: ../src/protocols/sametime/sametime.c:3553
 msgid "Send TEST Announcement"
-msgstr ""
+msgstr "Bidali FROGA oharra"
 
 #: ../src/protocols/sametime/sametime.c:3600
 msgid "No Sametime Community Server specified"
-msgstr ""
+msgstr "Ez dago Sametime komunitatearen espezifikaziorik zerbitzarian  "
 
 #: ../src/protocols/sametime/sametime.c:3622
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
 "Please enter one below to continue logging in."
-msgstr ""
+msgstr "Ez da inongo stalari edo IP helbide konfiguratu izan %s konturako. Sartu ezazu behean konexioa ezartzen jarraitzeko."
 
 #: ../src/protocols/sametime/sametime.c:3627
-#, fuzzy
 msgid "Meanwhile Connection Setup"
-msgstr "Urruneko konexioak huts egin du"
+msgstr "Konexio ezarpena bitartean"
 
 #: ../src/protocols/sametime/sametime.c:3628
 msgid "No Sametime Community Server Specified"
-msgstr ""
+msgstr "Ez dago Sametime komunitatearen espezifikaziorik zerbitzarian "
 
 #: ../src/protocols/sametime/sametime.c:4085
-#, fuzzy
 msgid "<b>External User</b><br>"
-msgstr "<b>Erabiltzailea:</b> %s<br>"
+msgstr "<b>Kanpoko Erabiltzailea:</b><br>"
 
 #: ../src/protocols/sametime/sametime.c:4088
-#, fuzzy, c-format
+#, c-format
 msgid "<b>User ID:</b> %s<br>"
-msgstr "<b>Erabiltzailea:</b> %s<br>"
+msgstr "<b>ID Erabiltzailea :</b> %s<br>"
 
 #: ../src/protocols/sametime/sametime.c:4094
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Full Name:</b> %s<br>"
-msgstr "<b>Aliasa:</b> %s<br>"
+msgstr "<b>Izen osoa:</b> %s<br>"
 
 #: ../src/protocols/sametime/sametime.c:4100
 msgid "<b>Last Known Client:</b> "
-msgstr ""
+msgstr "<b>Azkenengo bezero ezaguna:</b> "
 
 #: ../src/protocols/sametime/sametime.c:4108
 #, c-format
 msgid "Unknown (0x%04x)<br>"
-msgstr ""
+msgstr "Ezezaguna (0x%04x)<br>"
 
 #: ../src/protocols/sametime/sametime.c:4115
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Supports:</b> %s<br>"
-msgstr "<b>%s:</b> </b>%s<br>"
+msgstr "<b>Bermatua: </b>%s<br>"
 
 #: ../src/protocols/sametime/sametime.c:4121
 #, c-format
@@ -9987,37 +10175,34 @@
 
 #: ../src/protocols/sametime/sametime.c:4264
 #: ../src/protocols/sametime/sametime.c:5427
-#, fuzzy
 msgid "User Name"
-msgstr "Erabiltzaile-izena"
+msgstr "Erabiltzaile-izena "
 
 #: ../src/protocols/sametime/sametime.c:4267
 #: ../src/protocols/sametime/sametime.c:5430
 msgid "Sametime ID"
-msgstr ""
+msgstr "Sametime ID"
 
 #: ../src/protocols/sametime/sametime.c:4291
 msgid "An ambiguous user ID was entered"
-msgstr ""
+msgstr "ID erabiltzaile anbiguoa sartua izan da."
 
 #: ../src/protocols/sametime/sametime.c:4292
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
 "select the correct user from the list below to add them to your buddy list."
 msgstr ""
-"Erabiltzaile bat baino gehiagok izen berdina dute. Hautatu erabiltzaile "
-"zuzena zerrendatik lagunen zerrendan gehitzeko."
+"%s identifikatzailea segurazki beste edozein erabiltzaileri erreferentzia egiten dio."
+" Mesedez  ondorengo zerrendatik zuzeneko erabiltzailea hautatu zure lagun-zerrendara gehitzeko."
 
 #: ../src/protocols/sametime/sametime.c:4297
-#, fuzzy
 msgid "Select User"
-msgstr "Hautatu erabiltzaile zuzena"
+msgstr "Hautatu erabiltzaile "
 
 #: ../src/protocols/sametime/sametime.c:4367
-#, fuzzy
 msgid "Unable to add user: user not found"
-msgstr "Ezin da erabiltzailea gehitu: %s (%s)"
+msgstr "Ezin da erabiltzailea gehitu: erabiltzailea ez aurkitu"
 
 #: ../src/protocols/sametime/sametime.c:4369
 #, c-format
@@ -10025,35 +10210,33 @@
 "The identifier '%s' did not match any users in your Sametime community. This "
 "entry has been removed from your buddy list."
 msgstr ""
+"%s identifikatzailea ez dator bat Sametime-ko komunitateko inongo erabiltzailearekin. Sarrea hau "
+"zure lagunen-zerrendatik ezabatua izan da."
 
 #: ../src/protocols/sametime/sametime.c:4374
-#, fuzzy
 msgid "Unable to add user"
-msgstr "Ezin da %s erabiltzailea kanporatu"
+msgstr "Ezin da erabiltzailea gehitu"
 
 #: ../src/protocols/sametime/sametime.c:4946
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error reading file %s: \n"
 "%s\n"
 msgstr ""
-"Errorea %s irakurtzean: \n"
+"Errorea %s fitxategia irakurtzean: \n"
 "%s\n"
 
 #: ../src/protocols/sametime/sametime.c:5077
-#, fuzzy
 msgid "Remotely Stored Buddy List"
-msgstr "Bidali lagunen zerrenda"
+msgstr "Hurrunezko lagunen zerrenda bilketa"
 
 #: ../src/protocols/sametime/sametime.c:5082
-#, fuzzy
 msgid "Buddy List Storage Mode"
-msgstr "Lagunen zerrenda ordenatzea"
+msgstr "Lagunen zerrenda bilketa modua"
 
 #: ../src/protocols/sametime/sametime.c:5085
-#, fuzzy
 msgid "Local Buddy List Only"
-msgstr "_Lagunen zerrenda atrakagarria"
+msgstr "Bertako lagunen zerrenda bakarrik"
 
 #: ../src/protocols/sametime/sametime.c:5087
 #, fuzzy
@@ -10066,43 +10249,40 @@
 msgstr "Esportatu lagunen zerrenda zerbitzarira"
 
 #: ../src/protocols/sametime/sametime.c:5091
-#, fuzzy
 msgid "Synchronize List with Server"
-msgstr "Zerbitzariarekin sinkronizatzen"
+msgstr "Zerbitzariarekin  zerrenda sinkronizatu"
 
 #: ../src/protocols/sametime/sametime.c:5140
 #, c-format
 msgid "Import Sametime List for Account %s"
-msgstr ""
+msgstr "Sametime-eko zerrenda inportatu kontu honetara %s"
 
 #: ../src/protocols/sametime/sametime.c:5179
 #, c-format
 msgid "Export Sametime List for Account %s"
-msgstr ""
+msgstr "Sametime-eko zerrenda esportatu kontu honetara %s"
 
 #: ../src/protocols/sametime/sametime.c:5232
-#, fuzzy
 msgid "Unable to add group: group exists"
-msgstr "Ezin da %s gehitu zure ukatuen zerrendan (%s)."
+msgstr "Ezin da taldea gehitu:dagoneneko badago."
 
 #: ../src/protocols/sametime/sametime.c:5233
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
-msgstr ""
+msgstr "%s izena duen taldea badago zure lagunen-zerrendan."
 
 #: ../src/protocols/sametime/sametime.c:5236
 #: ../src/protocols/sametime/sametime.c:5365
-#, fuzzy
 msgid "Unable to add group"
-msgstr "Ezin da taldea ezabatu"
+msgstr "Ezin da taldea gehitu"
 
 #: ../src/protocols/sametime/sametime.c:5295
 msgid "Possible Matches"
-msgstr ""
+msgstr "Topaketa posibleak"
 
 #: ../src/protocols/sametime/sametime.c:5311
 msgid "Notes Address Book group results"
-msgstr ""
+msgstr "Helbideen agenda taldeen emaitzak "
 
 #: ../src/protocols/sametime/sametime.c:5312
 #, c-format
@@ -10110,40 +10290,37 @@
 "The identifier '%s' may possibly refer to any of the following Notes Address "
 "Book groups. Please select the correct group from the list below to add it "
 "to your buddy list."
-msgstr ""
+msgstr "%s Identifitikatzailea behar bada helbide-liburuaren oharreko taldeetara erreferentzia egiten ari da. Aukeratu ezazu talde egokia beheko zerrenda honetatik eta gehitu ezazu zure lagunen zerrenda."
 
 #: ../src/protocols/sametime/sametime.c:5317
-#, fuzzy
 msgid "Select Notes Address Book"
-msgstr "Gehitu helbide-liburuan"
+msgstr "Gehitu helbide-liburuan oharretan"
 
 #: ../src/protocols/sametime/sametime.c:5359
-#, fuzzy
 msgid "Unable to add group: group not found"
-msgstr "Ezin da saretik irakurri"
+msgstr "Ezin da taldea gehitu:ez da taldea topatu"
 
 #: ../src/protocols/sametime/sametime.c:5361
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
-msgstr ""
+msgstr "%s identifikatzailea ez du  inongo emaitzik aurkitu helbide agenda taldean, zure Sametime-eko komunitatean."
 
 #: ../src/protocols/sametime/sametime.c:5402
-#, fuzzy
 msgid "Notes Address Book Group"
-msgstr "Gehitu helbide-liburuan"
+msgstr "Helbide agenda taldea"
 
 #: ../src/protocols/sametime/sametime.c:5403
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
-msgstr ""
+msgstr "Sartu ezazu helbide-liburuaren talde oharreko izena beheko gunean taldearen izena gehitzeko eta bere kideak zure lagunen zerrendara."
 
 #: ../src/protocols/sametime/sametime.c:5451
-#, fuzzy, c-format
+#, c-format
 msgid "Search results for '%s'"
-msgstr "Bilaketaren emaitza"
+msgstr "Bilaketaren emaitza '%s'"
 
 #: ../src/protocols/sametime/sametime.c:5452
 #, c-format
@@ -10152,64 +10329,60 @@
 "may add these users to your buddy list or send them messages with the action "
 "buttons below."
 msgstr ""
+"%s Identifitikatzailea behar bada ondorengo erabiltzaileren bati erreferentzia egiten ari da. "
+"Erabiltzaileek zure lagunen-zerrendara gehitu ditzazkezu edo mezu bat bidali beheko ekintza botoiekin."
 
 #: ../src/protocols/sametime/sametime.c:5484
-#, fuzzy
 msgid "No matches"
-msgstr "Ez dago bat datorrenik"
+msgstr "Ez dago bat datorrenik "
 
 #: ../src/protocols/sametime/sametime.c:5485
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
-msgstr ""
+msgstr "%s identifikatzailea ez dator bat inongo  zure Sametime komunitateko erabiltzaileekin."
 
 #: ../src/protocols/sametime/sametime.c:5489
-#, fuzzy
 msgid "No Matches"
-msgstr "Ez dago bat datorrenik"
+msgstr "Ez da ezer ez aurkitu"
 
 #: ../src/protocols/sametime/sametime.c:5526
-#, fuzzy
 msgid "Search for a user"
-msgstr "Bila_tu:"
+msgstr "Erabiltzailea bilatu"
 
 #: ../src/protocols/sametime/sametime.c:5527
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
-msgstr ""
+msgstr "Sartu ezazu izena edo ID partziala beheko gunean Sametime komunitateko erabiltzaileak topatzeko."
 
 #: ../src/protocols/sametime/sametime.c:5530
-#, fuzzy
 msgid "User Search"
-msgstr "Bilatu"
+msgstr "Erabiltzaile bilaketa"
 
 #: ../src/protocols/sametime/sametime.c:5542
 msgid "Import Sametime List..."
-msgstr ""
+msgstr "Inportatu Sametime zerrenda..."
 
 #: ../src/protocols/sametime/sametime.c:5546
 msgid "Export Sametime List..."
-msgstr ""
+msgstr "Esportatu Sametime zerrenda..."
 
 #: ../src/protocols/sametime/sametime.c:5550
-#, fuzzy
 msgid "Add Notes Address Book Group..."
-msgstr "Gehitu helbide-liburuan"
+msgstr "Helbide agenda taldea  gehitu..."
 
 #: ../src/protocols/sametime/sametime.c:5554
-#, fuzzy
 msgid "User Search..."
-msgstr "Direktorio-bilaketa"
+msgstr "Erabiltzaile Bilaketa..."
 
 #: ../src/protocols/sametime/sametime.c:5651
 msgid "Force login (ignore server redirects)"
-msgstr ""
+msgstr "Konexioa ezartzen behartu (entzungor egin zerbitzariaren norantza ber-adierazlei) "
 
 #. pretend to be Sametime Connect
 #: ../src/protocols/sametime/sametime.c:5661
 msgid "Hide client identity"
-msgstr ""
+msgstr "Eskutatu bezeroaren identidadea"
 
 #: ../src/protocols/silc/buddy.c:52 ../src/protocols/silc/buddy.c:420
 #: ../src/protocols/silc/buddy.c:545 ../src/protocols/silc/buddy.c:711
@@ -10355,9 +10528,8 @@
 "inportatzeko"
 
 #: ../src/protocols/silc/buddy.c:1079
-#, fuzzy
 msgid "_Import..."
-msgstr "Inportatu..."
+msgstr "_Inportatu..."
 
 #: ../src/protocols/silc/buddy.c:1175
 msgid "Select correct user"
@@ -10504,7 +10676,7 @@
 
 #: ../src/protocols/silc/buddy.c:1670 ../src/protocols/silc/chat.c:971
 msgid "Draw On Whiteboard"
-msgstr ""
+msgstr "Marraztu Whiteboard -ean"
 
 #: ../src/protocols/silc/chat.c:39
 msgid "_Passphrase:"
@@ -10712,9 +10884,8 @@
 msgstr "Ezin da talde pribatura konektatu"
 
 #: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1156
-#, fuzzy
 msgid "Call Command"
-msgstr "Komandoa"
+msgstr "Deitu Komandoa"
 
 #: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1156
 msgid "Cannot call command"
@@ -10747,9 +10918,8 @@
 msgstr "Gako-hitzarmenak huts egin du"
 
 #: ../src/protocols/silc/ft.c:102
-#, fuzzy
 msgid "File transfer session does not exist"
-msgstr "Ez dago fitxategi-transferentzia saiorik"
+msgstr "Ez dago fitxategi-transferentzia saiorik "
 
 #: ../src/protocols/silc/ft.c:206
 msgid "No file transfer session active"
@@ -10848,9 +11018,8 @@
 
 #: ../src/protocols/silc/ops.c:1183 ../src/protocols/silc/ops.c:1332
 #: ../src/protocols/yahoo/yahoo_profile.c:1046
-#, fuzzy
 msgid "Real Name"
-msgstr "Benetako izena"
+msgstr "Benetako izena "
 
 #: ../src/protocols/silc/ops.c:1211
 msgid "Status Text"
@@ -10865,9 +11034,8 @@
 msgstr "Gako publikoaren 'babble'-marka"
 
 #: ../src/protocols/silc/ops.c:1298
-#, fuzzy
 msgid "_More..."
-msgstr "Gehiago..."
+msgstr "_Gehiago..."
 
 #: ../src/protocols/silc/ops.c:1369 ../src/protocols/silc/silc.c:1007
 msgid "Detach From Server"
@@ -11079,9 +11247,8 @@
 msgstr "Egiaztatu gako publikoa"
 
 #: ../src/protocols/silc/pk.c:119
-#, fuzzy
 msgid "_View..."
-msgstr "Ikusi..."
+msgstr "_Ikusi..."
 
 #: ../src/protocols/silc/pk.c:141
 msgid "Unsupported public key type"
@@ -11104,14 +11271,12 @@
 msgstr "Memoriarik ez"
 
 #: ../src/protocols/silc/silc.c:328
-#, fuzzy
 msgid "Cannot initialize SILC protocol"
-msgstr "Ezin izan da SILC bezeroaren konexioa hasieratu"
+msgstr "Ezin izan da SILC protokoloa hasieratu"
 
 #: ../src/protocols/silc/silc.c:335
-#, fuzzy
 msgid "Cannot find/access ~/.silc directory"
-msgstr "Ezin da direktoririk bidali."
+msgstr "Ezin da ~/silc direktorioa lortu"
 
 #. Progress
 #: ../src/protocols/silc/silc.c:340
@@ -11119,23 +11284,21 @@
 msgstr "SILC zerbitzariarekin konektatzen"
 
 #: ../src/protocols/silc/silc.c:349
-#, fuzzy, c-format
+#, c-format
 msgid "Could not load SILC key pair: %s"
-msgstr "Ezin izan da gako publikoa kargatu"
+msgstr "Ezin da SILC gako-parea : %s kargatu."
 
 #: ../src/protocols/silc/silc.c:369
-#, fuzzy
 msgid "Unable to create connection"
-msgstr "Ezin da konexio berria sortu."
+msgstr "Ezin da konexio sortu."
 
 #: ../src/protocols/silc/silc.c:668
 msgid "Your Current Mood"
 msgstr "Uneko umorea"
 
 #: ../src/protocols/silc/silc.c:684
-#, fuzzy
 msgid "In love"
-msgstr "Maitemindua"
+msgstr "Maitemindua "
 
 #: ../src/protocols/silc/silc.c:695
 msgid ""
@@ -11154,9 +11317,8 @@
 msgstr "MMS"
 
 #: ../src/protocols/silc/silc.c:707
-#, fuzzy
 msgid "Video conferencing"
-msgstr "Bideo-konferentzia"
+msgstr "Bideo-konferentzia "
 
 #: ../src/protocols/silc/silc.c:712
 msgid "Your Current Status"
@@ -11207,9 +11369,8 @@
 
 #: ../src/protocols/silc/silc.c:841 ../src/protocols/silc/silc.c:885
 #: ../src/protocols/silc/silc.c:956 ../src/protocols/silc/silc.c:957
-#, fuzzy
 msgid "Create New SILC Key Pair"
-msgstr "SILC gako bikotea sortzen..."
+msgstr "SILC gako bikotea berria sortzen..."
 
 #: ../src/protocols/silc/silc.c:841
 #, fuzzy
@@ -11222,19 +11383,16 @@
 msgstr "Gako-hitzarmenak huts egin du"
 
 #: ../src/protocols/silc/silc.c:924
-#, fuzzy
 msgid "Key length"
-msgstr "Gako-hitzarmena"
+msgstr "Gakoa luzera"
 
 #: ../src/protocols/silc/silc.c:926
-#, fuzzy
 msgid "Public key file"
-msgstr "Gako publikoaren fitxategia"
+msgstr "Gako publikoaren fitxategia "
 
 #: ../src/protocols/silc/silc.c:928
-#, fuzzy
 msgid "Private key file"
-msgstr "Gako pribatuaren fitxategia"
+msgstr "Gako pribatuaren fitxategia "
 
 #: ../src/protocols/silc/silc.c:951
 #, fuzzy
@@ -11242,9 +11400,8 @@
 msgstr "Pasaesaldia behar da"
 
 #: ../src/protocols/silc/silc.c:958
-#, fuzzy
 msgid "Generate Key Pair"
-msgstr "Gako pribatuaren fitxategia"
+msgstr "Gako bikote berria egin"
 
 #: ../src/protocols/silc/silc.c:1002
 msgid "Online Status"
@@ -11457,11 +11614,11 @@
 
 #: ../src/protocols/silc/silc.c:1876
 msgid "Cipher"
-msgstr ""
+msgstr "Zifra"
 
 #: ../src/protocols/silc/silc.c:1886
 msgid "HMAC"
-msgstr ""
+msgstr "HMAC "
 
 #: ../src/protocols/silc/silc.c:1889
 msgid "Public key authentication"
@@ -11485,17 +11642,15 @@
 
 #: ../src/protocols/silc/silc.c:1904
 msgid "Block messages to whiteboard"
-msgstr ""
+msgstr "Mezuak blokeatu \"whiteboard\" -ean "
 
 #: ../src/protocols/silc/silc.c:1907
-#, fuzzy
 msgid "Automatically open whiteboard"
-msgstr "_Zabaldu automatikoki kontaktuak"
+msgstr "Automatikoki zabaldu whiteboard-a"
 
 #: ../src/protocols/silc/silc.c:1910
-#, fuzzy
 msgid "Digitally sign and verify all messages"
-msgstr "Sinatu digitalki IMko mezu guztiak"
+msgstr "Sinatu digitalki eta mezu guztiak ondo daudela zihurtatu"
 
 #: ../src/protocols/silc/util.c:206 ../src/protocols/silc/util.c:231
 msgid "Creating SILC key pair..."
@@ -11515,9 +11670,9 @@
 msgstr "Erabiltzaile-izena: \t%s\n"
 
 #: ../src/protocols/silc/util.c:318
-#, fuzzy, c-format
+#, c-format
 msgid "E-Mail: \t\t%s\n"
-msgstr "Helb. elek.: \t\t%s\n"
+msgstr "Helbide elektronikoa.: \t\t%s\n"
 
 #: ../src/protocols/silc/util.c:320
 #, c-format
@@ -11589,51 +11744,47 @@
 msgstr "Terminala"
 
 #: ../src/protocols/silc/wb.c:284
-#, c-format
+# c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
-msgstr ""
+msgstr "\"Whiteboard\" -era   %s mezua bidalia izan da. \"Whiteboard\" -a irekitzea nahi al duzu ?"
 
 #: ../src/protocols/silc/wb.c:288
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
 "whiteboard?"
-msgstr ""
+msgstr " bidalitako mezua %s \"Whiteboard\"-ko  %s kanalera.\"Whiteboard\"-a irekitzea nahi al duzu ?"
 
 #: ../src/protocols/silc/wb.c:302
 msgid "Whiteboard"
-msgstr ""
+msgstr "\"Whiteboard\" "
 
 #. TODO: do we really want to disconnect on a failure to write?
 #: ../src/protocols/simple/simple.c:409
-#, fuzzy
 msgid "Could not write"
-msgstr "Ezin izan da bidali"
+msgstr "Ezin izan da idatzi"
 
 #: ../src/protocols/simple/simple.c:424 ../src/protocols/simple/simple.c:1422
 msgid "Could not connect"
 msgstr "Ezin izan da konektatu"
 
 #: ../src/protocols/simple/simple.c:994
-#, fuzzy
 msgid "Wrong Password"
-msgstr "Aldatu pasahitza"
+msgstr "Pasahitza okerra"
 
 #: ../src/protocols/simple/simple.c:1453 ../src/protocols/simple/simple.c:1492
 #: ../src/protocols/simple/simple.c:1504 ../src/protocols/simple/simple.c:1551
-#, fuzzy
 msgid "Could not create listen socket"
-msgstr "Ezin izan da socket-a sortu"
+msgstr "Ezin izan da entzuteko socket-a sortu"
 
 #: ../src/protocols/simple/simple.c:1474
-#, fuzzy
+# ,fuzzy
 msgid "Couldn't resolve host"
-msgstr "Ezin izan da ostalariarekin konektatu"
+msgstr "Ezin izan da ostalaria"
 
 #: ../src/protocols/simple/simple.c:1572
-#, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
-msgstr "IRC goitizenek ezin dute zuriunerik eduki"
+msgstr "SIP goitizenek ezin dute zurigunerik izan edo @ ikurra"
 
 #. *< type
 #. *< ui_requirement
@@ -11644,29 +11795,25 @@
 #. *< name
 #. *< version
 #: ../src/protocols/simple/simple.c:1734
-#, fuzzy
 msgid "SIP/SIMPLE Protocol Plugin"
-msgstr "SILC protokoloaren plugin-a"
+msgstr "SIP/SIMPLE protokoloaren plugin-a"
 
 #. *  summary
 #: ../src/protocols/simple/simple.c:1735
-#, fuzzy
 msgid "The SIP/SIMPLE Protocol Plugin"
-msgstr "SILC protokoloaren plugin-a"
+msgstr "SIP/SIMPLE protokoloaren plugin-a"
 
 #: ../src/protocols/simple/simple.c:1757
 msgid "Publish status (note: everyone may watch you)"
-msgstr ""
+msgstr "Egoera argitaratu (oharra:Jende guztiak ikusi zaitzake)"
 
 #: ../src/protocols/simple/simple.c:1763
-#, fuzzy
 msgid "Use UDP"
-msgstr "Erabiltzailearen IDa"
+msgstr "Erabilli UDP"
 
 #: ../src/protocols/simple/simple.c:1765
-#, fuzzy
 msgid "Use proxy"
-msgstr "Proxy-rik ez"
+msgstr "Erabili proxy-a"
 
 #: ../src/protocols/simple/simple.c:1767
 msgid "Proxy"
@@ -11763,9 +11910,8 @@
 msgstr "Dir zerbitzua ez dago erabilgarri une honetan."
 
 #: ../src/protocols/toc/toc.c:524
-#, fuzzy
 msgid "E-mail lookup restricted."
-msgstr "Helbide elektronikoaren bilaketa murriztu da."
+msgstr "Helbide elektronikoaren bilaketa murriztu da. "
 
 #: ../src/protocols/toc/toc.c:527
 msgid "Keyword ignored."
@@ -11944,14 +12090,13 @@
 #. * this should probably be moved to the core.
 #.
 #: ../src/protocols/yahoo/yahoo.c:907
-#, fuzzy, c-format
+#, c-format
 msgid "The user %s wants to add %s to his or her buddy list%s%s."
-msgstr "%s erabiltzaileak %s gehitu nahi du bere lagunen zerrendan."
+msgstr "%s erabiltzaileak %s gehitu nahi du bere lagunen zerrendan %s%s."
 
 #: ../src/protocols/yahoo/yahoo.c:913
-#, fuzzy
 msgid "Message (optional) :"
-msgstr "Mezu-jakinarazpena"
+msgstr "Mezu (Aukerazkoa):"
 
 #: ../src/protocols/yahoo/yahoo.c:955
 #, c-format
@@ -12048,7 +12193,7 @@
 #: ../src/protocols/yahoo/yahoo.c:2012
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
-msgstr ""
+msgstr "[ Entzungai %s/%s/%s.swf ] %s"
 
 #: ../src/protocols/yahoo/yahoo.c:2151 ../src/protocols/yahoo/yahoo.c:2298
 #: ../src/protocols/yahoo/yahoo.c:2313 ../src/protocols/yahoo/ycht.c:472
@@ -12063,19 +12208,16 @@
 msgstr "Konexio-arazoa"
 
 #: ../src/protocols/yahoo/yahoo.c:2715 ../src/protocols/yahoo/yahoo.c:3302
-#, fuzzy
 msgid "Not at Home"
-msgstr "Ez dago etxean"
+msgstr "Ez dago etxean "
 
 #: ../src/protocols/yahoo/yahoo.c:2717 ../src/protocols/yahoo/yahoo.c:3305
-#, fuzzy
 msgid "Not at Desk"
-msgstr "Ez dago bere mahaian"
+msgstr "Ez dago bere mahaian "
 
 #: ../src/protocols/yahoo/yahoo.c:2719 ../src/protocols/yahoo/yahoo.c:3308
-#, fuzzy
 msgid "Not in Office"
-msgstr "Ez dago bulegoan"
+msgstr "Ez dago bulegoan "
 
 #: ../src/protocols/yahoo/yahoo.c:2723 ../src/protocols/yahoo/yahoo.c:3314
 msgid "On Vacation"
@@ -12090,9 +12232,8 @@
 msgstr "Ez dago zerbitzarien zerrendan"
 
 #: ../src/protocols/yahoo/yahoo.c:2867 ../src/protocols/yahoo/yahoo.c:2926
-#, fuzzy
 msgid "Appear Online"
-msgstr "Agertu Lineaz kanpo"
+msgstr "Agertu Linean"
 
 #: ../src/protocols/yahoo/yahoo.c:2870 ../src/protocols/yahoo/yahoo.c:2947
 #, fuzzy
@@ -12128,7 +12269,7 @@
 
 #: ../src/protocols/yahoo/yahoo.c:3029
 msgid "Start Doodling"
-msgstr ""
+msgstr "Hasi \"Doodling\" "
 
 #: ../src/protocols/yahoo/yahoo.c:3061
 msgid "Active which ID?"
@@ -12143,18 +12284,16 @@
 msgstr "Aktibatu IDa..."
 
 #: ../src/protocols/yahoo/yahoo.c:3084
-#, fuzzy
 msgid "Join User in Chat..."
-msgstr "Elkartu erabiltzailearekin berriketan..."
+msgstr "Join User in Chat..."
 
 #: ../src/protocols/yahoo/yahoo.c:3628
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;gela&gt;:  konektatu Yahoo sareko berriketa-gelara"
 
 #: ../src/protocols/yahoo/yahoo.c:3633
-#, fuzzy
 msgid "list: List rooms on the Yahoo network"
-msgstr "list: zerrendatu sare honetako kanalak"
+msgstr "zerrendatu: ZerrendatuYahoo sareko kanalak"
 
 #: ../src/protocols/yahoo/yahoo.c:3637
 #, fuzzy
@@ -12163,7 +12302,7 @@
 
 #: ../src/protocols/yahoo/yahoo.c:3641
 msgid "doodle: Request user to start a Doodle session"
-msgstr ""
+msgstr "doodle: Request user to start a Doodle session"
 
 #. *< type
 #. *< ui_requirement
@@ -12200,9 +12339,8 @@
 msgstr "Fitxategi-transferentzien ostalaria"
 
 #: ../src/protocols/yahoo/yahoo.c:3768
-#, fuzzy
 msgid "Japan file transfer host"
-msgstr "Japoniako fitxategi-transferentzien ostalaria"
+msgstr "Japoniako fitxategi-transferentzien ostalaria "
 
 #: ../src/protocols/yahoo/yahoo.c:3771
 msgid "File transfer port"
@@ -12210,39 +12348,35 @@
 
 #: ../src/protocols/yahoo/yahoo.c:3774
 msgid "Chat room locale"
-msgstr ""
+msgstr "Berriketarako gela gunea"
 
 #: ../src/protocols/yahoo/yahoo.c:3777
 msgid "Ignore conference and chatroom invitations"
-msgstr ""
+msgstr "Entzungor egin konferentzia eta berriketa-gela gonbidapenei"
 
 #: ../src/protocols/yahoo/yahoo.c:3781
-#, fuzzy
 msgid "Chat room list URL"
-msgstr "Berriketa-gelen zerrendaren URLa"
+msgstr "Berriketa-gelen zerrendaren URLa "
 
 #: ../src/protocols/yahoo/yahoo.c:3784
-#, fuzzy
 msgid "YCHT host"
-msgstr "YCHT ostalaria"
+msgstr "YCHT ostalaria "
 
 #: ../src/protocols/yahoo/yahoo.c:3787
-#, fuzzy
 msgid "YCHT port"
-msgstr "YCHT Ataka"
+msgstr "YCHT Ataka "
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 #: ../src/protocols/yahoo/yahoo_doodle.c:96
 msgid "Sent Doodle request."
-msgstr ""
+msgstr "Bidalia izan da \"Doodle\" eskaera "
 
 #. TODO: what to do here - do we really have to disconnect?
 #: ../src/protocols/yahoo/yahoo_packet.c:265
-#, fuzzy
 msgid "Write Error"
-msgstr "Idazketa-errorea"
+msgstr "Idazketa-errorea "
 
 #: ../src/protocols/yahoo/yahoo_profile.c:707
 #, c-format
@@ -12301,9 +12435,8 @@
 msgstr "Esteka bikaina 3"
 
 #: ../src/protocols/yahoo/yahoo_profile.c:1164
-#, fuzzy
 msgid "Last Update"
-msgstr "Azken eguneratzea"
+msgstr "Azken eguneratzea "
 
 #: ../src/protocols/yahoo/yahoo_profile.c:1170
 #, c-format
@@ -12311,11 +12444,10 @@
 msgstr "%s erabiltzailearen datuak ez daude erabilgarri"
 
 #: ../src/protocols/yahoo/yahoo_profile.c:1176
-#, fuzzy
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
-msgstr "Badirudi profila hau oraingoz onartzen ez den hizkuntza batean dagoela"
+msgstr "Badirudi profila hau oraingoz onartzen ez den hizkuntza edo formatuan batean dagoela dirudi."
 
 #: ../src/protocols/yahoo/yahoo_profile.c:1192
 msgid ""
@@ -12356,15 +12488,13 @@
 
 #. -6
 #: ../src/protocols/yahoo/yahoochat.c:364
-#, fuzzy
 msgid "Unknown room"
-msgstr "Errore ezezaguna"
+msgstr "Gela ezezaguna"
 
 #. -15
 #: ../src/protocols/yahoo/yahoochat.c:367
-#, fuzzy
 msgid "Maybe the room is full"
-msgstr "Gela beteta egongo da?"
+msgstr "Gela beteta egon daiteke"
 
 #. -35
 #: ../src/protocols/yahoo/yahoochat.c:370
@@ -12376,6 +12506,8 @@
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
 msgstr ""
+"Errore ezezaguna. Deskonektatzeko beharrean egongo zara eta 5 minutu itxoin berriketa-gela berriz "
+"konektatu baino lehen"
 
 #: ../src/protocols/yahoo/yahoochat.c:452
 #, c-format
@@ -12425,9 +12557,9 @@
 "Kontu-editorean)"
 
 #: ../src/protocols/zephyr/zephyr.c:701
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send to chat %s,%s,%s"
-msgstr "Ezin da bidali berriketara %s,%s,%s"
+msgstr "Ezin da bidali berriketara %s,%s,%s "
 
 #: ../src/protocols/zephyr/zephyr.c:734 ../src/protocols/zephyr/zephyr.c:1151
 #, c-format
@@ -12481,9 +12613,8 @@
 msgstr "inst &lt;instantzia&gt;: ezarri klase honetan erabiliko den instantzia"
 
 #: ../src/protocols/zephyr/zephyr.c:2647
-#, fuzzy
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "inst &lt;instantzia&gt;: ezarri klase honetan erabiliko den instantzia"
+msgstr "topikoa &lt;instantzia&gt;: ezarri klase honetan erabiliko den instantzia"
 
 #: ../src/protocols/zephyr/zephyr.c:2653
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
@@ -12550,9 +12681,8 @@
 msgstr "Erabili tzc"
 
 #: ../src/protocols/zephyr/zephyr.c:2899
-#, fuzzy
 msgid "tzc command"
-msgstr "Ezin da komandoari deitu"
+msgstr "tzc komandoa"
 
 #: ../src/protocols/zephyr/zephyr.c:2902
 msgid "Export to .anyone"
@@ -12563,19 +12693,16 @@
 msgstr "Esportatu hona: .zephyr.subs"
 
 #: ../src/protocols/zephyr/zephyr.c:2908
-#, fuzzy
 msgid "Import from .anyone"
-msgstr "Esportatu hona: .anyone"
+msgstr "Inportatu hemendik:edozein"
 
 #: ../src/protocols/zephyr/zephyr.c:2911
-#, fuzzy
 msgid "Import from .zephyr.subs"
-msgstr "Esportatu hona: .zephyr.subs"
+msgstr "Inportatu hemendik: .zephyr.subs"
 
 #: ../src/protocols/zephyr/zephyr.c:2914
-#, fuzzy
 msgid "Realm"
-msgstr "Benetako izena"
+msgstr "Realm"
 
 #: ../src/protocols/zephyr/zephyr.c:2917
 msgid "Exposure"
@@ -12597,14 +12724,12 @@
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
 #: ../src/request.h:1354
-#, fuzzy
 msgid "_Accept"
-msgstr "Onartu"
+msgstr "_Onartu"
 
 #: ../src/savedstatuses.c:514
-#, fuzzy
 msgid "saved statuses"
-msgstr "Egoeraren arabera"
+msgstr "Gorde egoerak"
 
 #: ../src/savedstatuses.c:767
 msgid "I'm not here right now"
@@ -12616,11 +12741,11 @@
 msgstr "%s orain %s da.\n"
 
 #: ../src/server.c:681
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
-msgstr "'%s' erabiltzaileak %s gonbidatu du %s berriketa-gelara\n"
+msgstr "'%s' erabiltzaileak %s gonbidatu du %s:\n%s berriketa-gelara"
 
 #: ../src/server.c:686
 #, c-format
@@ -12654,9 +12779,9 @@
 msgstr "%s orain %s da"
 
 #: ../src/status.c:637
-#, fuzzy, c-format
+#, c-format
 msgid "%s is no longer %s"
-msgstr "%s aktibo jarri da berriro."
+msgstr "%s ez dago luzaroago %s"
 
 #: ../src/status.c:1320
 #, c-format
--- a/po/fi.po	Tue May 30 18:17:34 2006 +0000
+++ b/po/fi.po	Tue May 30 19:42:16 2006 +0000
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: Gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-18 20:07+0300\n"
-"PO-Revision-Date: 2006-04-18 20:16+0300\n"
+"POT-Creation-Date: 2006-05-21 18:14+0300\n"
+"PO-Revision-Date: 2006-05-21 18:15+0300\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -158,7 +158,7 @@
 msgstr "Piirteiden tarkistus"
 
 #. add enabled / disabled
-#: ../plugins/crazychat/cc_gaim_plugin.c:345 ../src/gtkaccount.c:2253
+#: ../plugins/crazychat/cc_gaim_plugin.c:345 ../src/gtkaccount.c:2262
 #: ../src/gtkplugin.c:574
 msgid "Enabled"
 msgstr "Käytössä"
@@ -189,7 +189,7 @@
 msgid "Right-click for more unread messages...\n"
 msgstr "Näytä lisää viestejä hiiren oikealla painikkeella...\n"
 
-#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3230
+#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3239
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
@@ -201,10 +201,10 @@
 msgstr "Vaihda tila"
 
 #: ../plugins/docklet/docklet.c:435 ../src/gtkstatusbox.c:673
-#: ../src/protocols/gg/gg.c:996 ../src/protocols/jabber/buddy.c:1101
+#: ../src/protocols/gg/gg.c:996 ../src/protocols/jabber/buddy.c:1103
 #: ../src/protocols/msn/state.c:29 ../src/protocols/msn/state.c:30
 #: ../src/protocols/msn/state.c:37 ../src/protocols/msn/state.c:38
-#: ../src/protocols/novell/novell.c:2845 ../src/protocols/yahoo/yahoo.c:2735
+#: ../src/protocols/novell/novell.c:2843 ../src/protocols/yahoo/yahoo.c:2731
 #: ../src/status.c:155
 msgid "Available"
 msgstr "Tavoitettavissa"
@@ -212,28 +212,28 @@
 #. Away stuff
 #. get_yahoo_status_from_gaim_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
-#: ../plugins/docklet/docklet.c:439 ../src/gtkprefs.c:1759
+#: ../plugins/docklet/docklet.c:439 ../src/gtkprefs.c:1774
 #: ../src/gtkstatusbox.c:674 ../src/protocols/gg/gg.c:999
 #: ../src/protocols/irc/irc.c:520 ../src/protocols/irc/msgs.c:223
-#: ../src/protocols/jabber/buddy.c:1105 ../src/protocols/novell/novell.c:2848
-#: ../src/protocols/oscar/oscar.c:719 ../src/protocols/oscar/oscar.c:4390
-#: ../src/protocols/oscar/oscar.c:5431 ../src/protocols/silc/buddy.c:1469
-#: ../src/protocols/yahoo/yahoo.c:3189 ../src/protocols/yahoo/yahoo.c:3262
+#: ../src/protocols/jabber/buddy.c:1107 ../src/protocols/novell/novell.c:2846
+#: ../src/protocols/oscar/oscar.c:719 ../src/protocols/oscar/oscar.c:4401
+#: ../src/protocols/oscar/oscar.c:5444 ../src/protocols/silc/buddy.c:1469
+#: ../src/protocols/yahoo/yahoo.c:3185 ../src/protocols/yahoo/yahoo.c:3258
 #: ../src/status.c:158
 msgid "Away"
 msgstr "Poissa"
 
 #: ../plugins/docklet/docklet.c:443 ../src/gtkstatusbox.c:675
-#: ../src/protocols/oscar/oscar.c:723 ../src/protocols/yahoo/yahoo.c:2729
+#: ../src/protocols/oscar/oscar.c:723 ../src/protocols/yahoo/yahoo.c:2725
 #: ../src/status.c:157
 msgid "Invisible"
 msgstr "Näkymätön"
 
-#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:2960
+#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:2969
 #: ../src/gtkstatusbox.c:676 ../src/protocols/gg/gg.c:993
-#: ../src/protocols/jabber/buddy.c:1099 ../src/protocols/novell/novell.c:2857
-#: ../src/protocols/oscar/oscar.c:785 ../src/protocols/oscar/oscar.c:5403
-#: ../src/protocols/yahoo/yahoo.c:2733 ../src/status.c:154
+#: ../src/protocols/jabber/buddy.c:1101 ../src/protocols/novell/novell.c:2855
+#: ../src/protocols/oscar/oscar.c:785 ../src/protocols/oscar/oscar.c:5416
+#: ../src/protocols/yahoo/yahoo.c:2729 ../src/status.c:154
 msgid "Offline"
 msgstr "Poissa linjoilta"
 
@@ -249,7 +249,7 @@
 msgid "Show Buddy List"
 msgstr "Näytä tuttavalista"
 
-#: ../plugins/docklet/docklet.c:489 ../src/gtkconv.c:5640
+#: ../plugins/docklet/docklet.c:489 ../src/gtkconv.c:5680
 msgid "Unread Messages"
 msgstr "Lukemattomat viestit"
 
@@ -257,7 +257,7 @@
 msgid "New Message..."
 msgstr "Uusi viesti..."
 
-#: ../plugins/docklet/docklet.c:519 ../src/gtkaccount.c:2469
+#: ../plugins/docklet/docklet.c:519 ../src/gtkaccount.c:2478
 msgid "Accounts"
 msgstr "Käyttäjätilit"
 
@@ -265,7 +265,7 @@
 msgid "Plugins"
 msgstr "Liitännäiset"
 
-#: ../plugins/docklet/docklet.c:521 ../src/gtkprefs.c:1900
+#: ../plugins/docklet/docklet.c:521 ../src/gtkprefs.c:1915
 msgid "Preferences"
 msgstr "Asetukset"
 
@@ -289,8 +289,8 @@
 msgstr "_Pikaviestejä:"
 
 #: ../plugins/docklet/docklet.c:684 ../plugins/docklet/docklet.c:692
-#: ../plugins/win32/winprefs/winprefs.c:424 ../src/gtkprefs.c:823
-#: ../src/gtkprefs.c:1749 ../src/gtkprefs.c:1763
+#: ../plugins/win32/winprefs/winprefs.c:462 ../src/gtkprefs.c:823
+#: ../src/gtkprefs.c:1764 ../src/gtkprefs.c:1778
 msgid "Never"
 msgstr "Ei koskaan"
 
@@ -300,7 +300,7 @@
 
 #: ../plugins/docklet/docklet.c:686 ../plugins/docklet/docklet.c:694
 #: ../plugins/timestamp_format.c:39 ../plugins/timestamp_format.c:48
-#: ../plugins/win32/winprefs/winprefs.c:425 ../src/gtkprefs.c:825
+#: ../plugins/win32/winprefs/winprefs.c:463 ../src/gtkprefs.c:825
 msgid "Always"
 msgstr "Aina"
 
@@ -499,52 +499,52 @@
 msgid "Select Font for %s"
 msgstr "Valitse %s:n kirjasin"
 
-#: ../plugins/gaimrc.c:362
+#: ../plugins/gaimrc.c:364
 msgid "Select Interface Font"
 msgstr "Valitse käyttöliittymän kirjasin"
 
-#: ../plugins/gaimrc.c:415
+#: ../plugins/gaimrc.c:420
 msgid "General"
 msgstr "Yleinen"
 
-#: ../plugins/gaimrc.c:420
+#: ../plugins/gaimrc.c:425
 msgid "GTK+ Interface Font"
 msgstr "GTK+-käyttöliittymän kirjasin"
 
-#: ../plugins/gaimrc.c:440
+#: ../plugins/gaimrc.c:445
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+-tekstioikopolkuteema"
 
-#: ../plugins/gaimrc.c:475
+#: ../plugins/gaimrc.c:480
 msgid "Interface colors"
 msgstr "Käyttöliittymän värit"
 
-#: ../plugins/gaimrc.c:499
+#: ../plugins/gaimrc.c:504
 msgid "Widget Sizes"
 msgstr "Säädinkoot"
 
-#: ../plugins/gaimrc.c:520
+#: ../plugins/gaimrc.c:525
 msgid "Fonts"
 msgstr "Kirjasimet"
 
-#: ../plugins/gaimrc.c:543
+#: ../plugins/gaimrc.c:548
 msgid "Tools"
 msgstr "Työkalut"
 
-#: ../plugins/gaimrc.c:548
+#: ../plugins/gaimrc.c:553
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Kirjoita asetukset tiedostoon %s%sgtkrc-2.0"
 
-#: ../plugins/gaimrc.c:556
+#: ../plugins/gaimrc.c:561
 msgid "Re-read gtkrc files"
 msgstr "Lue uudelleen gtkrc-tiedostot"
 
-#: ../plugins/gaimrc.c:583
+#: ../plugins/gaimrc.c:588
 msgid "Gaim GTK+ Theme Control"
 msgstr "Gaimin GTK+-teemanhallinta"
 
-#: ../plugins/gaimrc.c:585 ../plugins/gaimrc.c:586
+#: ../plugins/gaimrc.c:590 ../plugins/gaimrc.c:591
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Antaa pääsyn usein käytettyihin gtkrc-asetuksiin."
 
@@ -606,9 +606,9 @@
 #. Business
 #: ../plugins/gevolution/add_buddy_dialog.c:131
 #: ../plugins/gevolution/assoc-buddy.c:119 ../src/gtkplugin.c:587
-#: ../src/gtkroomlist.c:604 ../src/protocols/jabber/jabber.c:755
-#: ../src/protocols/msn/msn.c:1532 ../src/protocols/msn/msn.c:1585
-#: ../src/protocols/msn/msn.c:1606
+#: ../src/gtkroomlist.c:604 ../src/protocols/jabber/jabber.c:754
+#: ../src/protocols/msn/msn.c:1527 ../src/protocols/msn/msn.c:1580
+#: ../src/protocols/msn/msn.c:1601
 msgid "Name"
 msgstr "Nimi"
 
@@ -616,33 +616,41 @@
 msgid "Instant Messaging"
 msgstr "Pikaviestintä"
 
+#: ../plugins/gevolution/add_buddy_dialog.c:442 ../src/gtkblist.c:4528
+#: ../src/protocols/silc/buddy.c:736 ../src/protocols/silc/buddy.c:1030
+#: ../src/protocols/silc/buddy.c:1075 ../src/protocols/silc/buddy.c:1174
+#: ../src/protocols/yahoo/yahoo.c:2974
+msgid "Add Buddy"
+msgstr "Lisää tuttava"
+
 #. Add the label.
-#: ../plugins/gevolution/add_buddy_dialog.c:454
+#: ../plugins/gevolution/add_buddy_dialog.c:455
 msgid "Select a person from your address book below, or add a new person."
 msgstr "Valitse henkilö allaolevasta osoitekirjasta, tai lisää uusi henkilö."
 
 #. "Search"
-#: ../plugins/gevolution/add_buddy_dialog.c:467
+#: ../plugins/gevolution/add_buddy_dialog.c:468
 #: ../plugins/gevolution/assoc-buddy.c:353
-#: ../src/protocols/jabber/buddy.c:1457 ../src/protocols/oscar/oscar.c:6011
-#: ../src/protocols/sametime/sametime.c:5531
+#: ../src/protocols/jabber/buddy.c:1460 ../src/protocols/oscar/oscar.c:6024
+#: ../src/protocols/sametime/sametime.c:5524
 msgid "Search"
 msgstr "Etsi"
 
-#: ../plugins/gevolution/add_buddy_dialog.c:548
-#: ../plugins/gevolution/new_person_dialog.c:306 ../src/gtkblist.c:4610
-#: ../src/gtkblist.c:4974
+#: ../plugins/gevolution/add_buddy_dialog.c:549
+#: ../plugins/gevolution/new_person_dialog.c:307 ../src/gtkblist.c:4612
+#: ../src/gtkblist.c:4976
 msgid "Group:"
 msgstr "Ryhmä:"
 
 #. "New Person" button
-#: ../plugins/gevolution/add_buddy_dialog.c:574
+#: ../plugins/gevolution/add_buddy_dialog.c:575
 #: ../plugins/gevolution/assoc-buddy.c:464
+#: ../plugins/gevolution/new_person_dialog.c:251
 msgid "New Person"
 msgstr "Uusi henkilö"
 
 #. "Select Buddy" button
-#: ../plugins/gevolution/add_buddy_dialog.c:591
+#: ../plugins/gevolution/add_buddy_dialog.c:592
 msgid "Select Buddy"
 msgstr "Valitse tuttava"
 
@@ -666,13 +674,13 @@
 msgstr "_Yhdistä tuttava"
 
 #: ../plugins/gevolution/eds-utils.c:73 ../plugins/gevolution/eds-utils.c:86
-#: ../src/protocols/jabber/jabber.c:1122
+#: ../src/protocols/jabber/jabber.c:1120
 msgid "None"
 msgstr "Ei mitään"
 
 #: ../plugins/gevolution/gevo-util.c:64 ../plugins/gevolution/gevolution.c:96
 #: ../src/blist.c:516 ../src/blist.c:1278 ../src/blist.c:1505
-#: ../src/gtkblist.c:4419 ../src/protocols/jabber/roster.c:65
+#: ../src/gtkblist.c:4421 ../src/protocols/jabber/roster.c:65
 msgid "Buddies"
 msgstr "Tuttavat"
 
@@ -707,8 +715,8 @@
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "Valitse kaikki tilit, joihin tuttavat lisätään automaattisesti."
 
-#: ../plugins/gevolution/gevolution.c:450 ../plugins/idle.c:147
-#: ../plugins/idle.c:183 ../src/gtknotify.c:399 ../src/gtkpounce.c:1262
+#: ../plugins/gevolution/gevolution.c:450 ../plugins/idle.c:150
+#: ../plugins/idle.c:186 ../src/gtknotify.c:399 ../src/gtkpounce.c:1244
 msgid "Account"
 msgstr "Tili"
 
@@ -731,43 +739,43 @@
 msgid "Provides integration with Evolution."
 msgstr "Mahdollistaa integroinnin Evolutionin kanssa."
 
-#: ../plugins/gevolution/new_person_dialog.c:266
+#: ../plugins/gevolution/new_person_dialog.c:267
 msgid "Please enter the person's information below."
 msgstr "Syötä henkilön tiedot alle."
 
-#: ../plugins/gevolution/new_person_dialog.c:270
+#: ../plugins/gevolution/new_person_dialog.c:271
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "Syötä tuttavan näyttönimi ja käyttäjätilin tyyppi alle."
 
-#: ../plugins/gevolution/new_person_dialog.c:290
+#: ../plugins/gevolution/new_person_dialog.c:291
 msgid "Account type:"
 msgstr "Käyttäjätilin tyyppi:"
 
-#: ../plugins/gevolution/new_person_dialog.c:294 ../src/gtkaccount.c:784
-#: ../src/gtkblist.c:4572
+#: ../plugins/gevolution/new_person_dialog.c:295 ../src/gtkaccount.c:784
+#: ../src/gtkblist.c:4574
 msgid "Screen name:"
 msgstr "Näyttönimi:"
 
 #. Optional Information section
-#: ../plugins/gevolution/new_person_dialog.c:314
+#: ../plugins/gevolution/new_person_dialog.c:315
 msgid "Optional information:"
 msgstr "Valinnaisia tietoja:"
 
 #. Label
-#: ../plugins/gevolution/new_person_dialog.c:337 ../src/gtkaccount.c:424
+#: ../plugins/gevolution/new_person_dialog.c:338 ../src/gtkaccount.c:424
 #: ../src/gtkaccount.c:446 ../src/protocols/oscar/oscar.c:625
 msgid "Buddy Icon"
 msgstr "Tuttavakuvake"
 
-#: ../plugins/gevolution/new_person_dialog.c:349
+#: ../plugins/gevolution/new_person_dialog.c:350
 msgid "First name:"
 msgstr "Etunimi:"
 
-#: ../plugins/gevolution/new_person_dialog.c:361
+#: ../plugins/gevolution/new_person_dialog.c:362
 msgid "Last name:"
 msgstr "Sukunimi:"
 
-#: ../plugins/gevolution/new_person_dialog.c:381
+#: ../plugins/gevolution/new_person_dialog.c:382
 msgid "E-mail:"
 msgstr "Sähköposti:"
 
@@ -846,48 +854,50 @@
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Pienentää tuttavalista- ja keskusteluikkunan poissaoloajaksi."
 
-#: ../plugins/idle.c:152 ../plugins/idle.c:210
+#: ../plugins/idle.c:155 ../plugins/idle.c:213
 msgid "Minutes"
 msgstr "Minuuttia"
 
-#: ../plugins/idle.c:159 ../plugins/idle.c:192 ../plugins/idle.c:217
-#: ../plugins/idle.c:306
+#. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
+#. If that doesn't translate well into your language, drop the 's before translating.
+#: ../plugins/idle.c:162 ../plugins/idle.c:195 ../plugins/idle.c:220
+#: ../plugins/idle.c:312
 msgid "I'dle Mak'er"
 msgstr "Joutenoloajan säätö"
 
-#: ../plugins/idle.c:160 ../plugins/idle.c:249
+#: ../plugins/idle.c:163 ../plugins/idle.c:252
 msgid "Set Account Idle Time"
 msgstr "Aseta tilin joutenoloaika"
 
-#: ../plugins/idle.c:163 ../plugins/idle.c:221
+#: ../plugins/idle.c:166 ../plugins/idle.c:224
 msgid "_Set"
 msgstr "_Aseta"
 
-#: ../plugins/idle.c:164 ../plugins/idle.c:197 ../plugins/idle.c:222
+#: ../plugins/idle.c:167 ../plugins/idle.c:200 ../plugins/idle.c:225
 msgid "_Cancel"
 msgstr "_Peru"
 
-#: ../plugins/idle.c:177
+#: ../plugins/idle.c:180
 msgid "None of your accounts are idle."
 msgstr "Yksikään käyttäjätileistäsi ei ole jouten."
 
-#: ../plugins/idle.c:193 ../plugins/idle.c:253
+#: ../plugins/idle.c:196 ../plugins/idle.c:256
 msgid "Unset Account Idle Time"
 msgstr "Poista tilin joutenoloajan asetus"
 
-#: ../plugins/idle.c:196
+#: ../plugins/idle.c:199
 msgid "_Unset"
 msgstr "_Poista asetus"
 
-#: ../plugins/idle.c:218 ../plugins/idle.c:257
+#: ../plugins/idle.c:221 ../plugins/idle.c:260
 msgid "Set Idle Time for All Accounts"
 msgstr "Aseta joutenoloaika kaikille käyttäjätileille"
 
-#: ../plugins/idle.c:262
+#: ../plugins/idle.c:265
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Ota pois joutenoloaika kaikilta jouten olevilta tileiltä"
 
-#: ../plugins/idle.c:308 ../plugins/idle.c:309
+#: ../plugins/idle.c:314 ../plugins/idle.c:315
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "Antaa sinun säätää itse kuinka kauan olet ollut jouten"
 
@@ -979,41 +989,56 @@
 msgid "Message could not be sent."
 msgstr "Viestiäsi ei voitu lähetettää."
 
-#: ../plugins/log_reader.c:1835 ../plugins/log_reader.c:1928
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../plugins/log_reader.c:1838 ../plugins/log_reader.c:1943
 msgid "Adium"
 msgstr "Adium"
 
-#: ../plugins/log_reader.c:1844 ../plugins/log_reader.c:1932
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../plugins/log_reader.c:1850 ../plugins/log_reader.c:1947
 msgid "Fire"
 msgstr "Fire"
 
-#: ../plugins/log_reader.c:1853 ../plugins/log_reader.c:1936
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../plugins/log_reader.c:1862 ../plugins/log_reader.c:1951
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
-#: ../plugins/log_reader.c:1862 ../plugins/log_reader.c:1940
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../plugins/log_reader.c:1874 ../plugins/log_reader.c:1955
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: ../plugins/log_reader.c:1871 ../plugins/log_reader.c:1944
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../plugins/log_reader.c:1886 ../plugins/log_reader.c:1959
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../plugins/log_reader.c:1910
+#: ../plugins/log_reader.c:1925
 msgid "General Log Reading Configuration"
 msgstr "Yleiset lokikatselimen asetukset"
 
-#: ../plugins/log_reader.c:1914
+#: ../plugins/log_reader.c:1929
 msgid "Fast size calculations"
 msgstr "Nopeat koon laskemiset"
 
-#: ../plugins/log_reader.c:1918
+#: ../plugins/log_reader.c:1933
 msgid "Use name heuristics"
 msgstr "Käytä nimiheuristiikkaa"
 
 #. Add Log Directory preferences.
-#: ../plugins/log_reader.c:1924
+#: ../plugins/log_reader.c:1939
 msgid "Log Directory"
 msgstr "Lokihakemisto"
 
@@ -1023,19 +1048,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/log_reader.c:1967
+#: ../plugins/log_reader.c:1982
 msgid "Log Reader"
 msgstr "Lokikatselin"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../plugins/log_reader.c:1971
+#: ../plugins/log_reader.c:1986
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Sisällyttää muiden pikaviestinohjelmien lokit lokikatselimeen."
 
 #. * description
-#: ../plugins/log_reader.c:1975
+#: ../plugins/log_reader.c:1990
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, Fire, Messenger Plus!, MSN Messenger, and "
@@ -1239,15 +1264,15 @@
 msgid "Provides support for loading perl plugins."
 msgstr "Tuo mahdollisuuden ladata perl-liitännäisiä."
 
-#: ../plugins/psychic.c:22
+#: ../plugins/psychic.c:19
 msgid "Psychic Mode"
 msgstr "Meediotila"
 
-#: ../plugins/psychic.c:23
+#: ../plugins/psychic.c:20
 msgid "Psychic mode for incoming conversation"
 msgstr "Meediotila sisääntuleville keskusteluille"
 
-#: ../plugins/psychic.c:24
+#: ../plugins/psychic.c:21
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
@@ -1256,19 +1281,25 @@
 "sinulle. Tämä toimii AIM-, ICQ-, Jabber-, Sametime- ja Yahoo!-"
 "yhteiskäytännöillä."
 
-#: ../plugins/psychic.c:60
+#. This is a quote from Star Wars.  You should
+#. probably not translate it literally.  If
+#. you can't find a fitting cultural reference
+#. in your language, consider translating
+#. something like this instead:
+#. "You feel a new message coming."
+#: ../plugins/psychic.c:63
 msgid "You feel a disturbance in the force..."
 msgstr "Tunnet häiriön voimassa..."
 
-#: ../plugins/psychic.c:79
+#: ../plugins/psychic.c:82
 msgid "Only enable for users on the buddy list"
 msgstr "Salli vain tuttavalistassa oleville käyttäjille"
 
-#: ../plugins/psychic.c:84
+#: ../plugins/psychic.c:87
 msgid "Disable when away"
 msgstr "Pois käytöstä poissaollessa"
 
-#: ../plugins/psychic.c:88
+#: ../plugins/psychic.c:91
 msgid "Display notification message in conversations"
 msgstr "Näytä ilmoitusviesti keskusteluissa"
 
@@ -1368,7 +1399,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/simple.c:34
+#: ../plugins/simple.c:37
 msgid "Simple Plugin"
 msgstr "\"Yksinkertainen\"-liitännäinen"
 
@@ -1376,7 +1407,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/simple.c:37 ../plugins/simple.c:39
+#: ../plugins/simple.c:40 ../plugins/simple.c:42
 msgid "Tests to see that most things are working."
 msgstr "Kokeilee että useimmat asiat toimivat."
 
@@ -1608,7 +1639,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/timestamp.c:254
+#: ../plugins/timestamp.c:256
 msgid "Timestamp"
 msgstr "Aikaleima"
 
@@ -1616,7 +1647,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/timestamp.c:257 ../plugins/timestamp.c:259
+#: ../plugins/timestamp.c:259 ../plugins/timestamp.c:261
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "Lisää iChat-tyylisen aikaleiman keskusteluihin N minuutin välein."
 
@@ -1750,57 +1781,57 @@
 "\n"
 "Huomaa: Tämä liitännäinen vaatii Win2000 tai uudemman."
 
-#: ../plugins/win32/winprefs/winprefs.c:397
+#: ../plugins/win32/winprefs/winprefs.c:434
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ Runtime -versio"
 
 #. Autostart
-#: ../plugins/win32/winprefs/winprefs.c:405
+#: ../plugins/win32/winprefs/winprefs.c:442
 msgid "Startup"
 msgstr "Käynnistys"
 
-#: ../plugins/win32/winprefs/winprefs.c:406
+#: ../plugins/win32/winprefs/winprefs.c:443
 msgid "_Start Gaim on Windows startup"
 msgstr "_Käynnistä Gaim Windowsin käynnistyessä."
 
 #. Buddy List
-#: ../plugins/win32/winprefs/winprefs.c:417 ../src/gtkblist.c:3663
+#: ../plugins/win32/winprefs/winprefs.c:455 ../src/gtkblist.c:3665
 msgid "Buddy List"
 msgstr "Tuttavalista"
 
-#: ../plugins/win32/winprefs/winprefs.c:418
+#: ../plugins/win32/winprefs/winprefs.c:456
 msgid "_Dockable Buddy List"
 msgstr "_Telakoi tuttavalista ruudun reunaan"
 
 #. Blist On Top
-#: ../plugins/win32/winprefs/winprefs.c:422
+#: ../plugins/win32/winprefs/winprefs.c:460
 msgid "_Keep Buddy List window on top:"
 msgstr "_Pidä tuttavalistaikkuna päällimmäisenä:"
 
 #. XXX: Did this ever work?
-#: ../plugins/win32/winprefs/winprefs.c:427
+#: ../plugins/win32/winprefs/winprefs.c:465
 msgid "Only when docked"
 msgstr "Vain telakoituna"
 
 #. Conversations
-#: ../plugins/win32/winprefs/winprefs.c:431 ../src/gtkprefs.c:819
-#: ../src/gtkprefs.c:1864
+#: ../plugins/win32/winprefs/winprefs.c:469 ../src/gtkprefs.c:819
+#: ../src/gtkprefs.c:1879
 msgid "Conversations"
 msgstr "Keskustelut"
 
-#: ../plugins/win32/winprefs/winprefs.c:432
+#: ../plugins/win32/winprefs/winprefs.c:470
 msgid "_Flash window when messages are received"
 msgstr "_Vilkuta ikkunaa viestien saapuessa"
 
-#: ../plugins/win32/winprefs/winprefs.c:456
+#: ../plugins/win32/winprefs/winprefs.c:494
 msgid "WinGaim Options"
 msgstr "WinGaim-valinnat"
 
-#: ../plugins/win32/winprefs/winprefs.c:458
+#: ../plugins/win32/winprefs/winprefs.c:496
 msgid "Options specific to Windows Gaim."
 msgstr "Windows-Gaimin erityiset asetukset"
 
-#: ../plugins/win32/winprefs/winprefs.c:459
+#: ../plugins/win32/winprefs/winprefs.c:497
 msgid ""
 "Provides options specific to Windows Gaim, such as buddy list docking and "
 "conversation flashing."
@@ -1812,135 +1843,138 @@
 msgid "accounts"
 msgstr "käyttäjätilit"
 
-#: ../src/account.c:923
+#: ../src/account.c:918
 msgid "Password is required to sign on."
 msgstr "Salasana tarvitaan kirjautumiseen."
 
-#: ../src/account.c:948
+#: ../src/account.c:943
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Anna salasana käyttäjätilille %s (%s)"
 
-#: ../src/account.c:955
+#: ../src/account.c:950
 msgid "Enter Password"
 msgstr "Anna salasana"
 
-#: ../src/account.c:960
+#: ../src/account.c:955
 msgid "Save password"
 msgstr "Tallenna salasana"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../src/account.c:968 ../src/account.c:1139 ../src/gtkblist.c:3546
-#: ../src/gtkdialogs.c:600 ../src/gtkdialogs.c:737 ../src/gtkdialogs.c:801
+#: ../src/account.c:963 ../src/account.c:1134 ../src/gtkblist.c:3549
+#: ../src/gtkdialogs.c:607 ../src/gtkdialogs.c:744 ../src/gtkdialogs.c:808
 #: ../src/gtkrequest.c:269 ../src/protocols/gg/gg.c:497
 #: ../src/protocols/gg/gg.c:655 ../src/protocols/gg/gg.c:791
-#: ../src/protocols/jabber/jabber.c:1319 ../src/protocols/jabber/xdata.c:337
+#: ../src/protocols/jabber/jabber.c:1317 ../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:1409 ../src/protocols/oscar/oscar.c:2166
-#: ../src/protocols/oscar/oscar.c:2259 ../src/protocols/oscar/oscar.c:5681
-#: ../src/protocols/oscar/oscar.c:5861 ../src/protocols/oscar/oscar.c:5886
-#: ../src/protocols/oscar/oscar.c:5942 ../src/protocols/silc/buddy.c:466
-#: ../src/protocols/silc/buddy.c:1182 ../src/protocols/silc/chat.c:423
-#: ../src/protocols/silc/chat.c:461 ../src/protocols/silc/chat.c:724
+#: ../src/protocols/oscar/oscar.c:1408 ../src/protocols/oscar/oscar.c:2167
+#: ../src/protocols/oscar/oscar.c:2260 ../src/protocols/oscar/oscar.c:5694
+#: ../src/protocols/oscar/oscar.c:5874 ../src/protocols/oscar/oscar.c:5899
+#: ../src/protocols/oscar/oscar.c:5955 ../src/protocols/silc/buddy.c:466
+#: ../src/protocols/silc/buddy.c:1182 ../src/protocols/silc/chat.c:424
+#: ../src/protocols/silc/chat.c:462 ../src/protocols/silc/chat.c:725
 #: ../src/protocols/silc/ops.c:1297 ../src/protocols/silc/ops.c:1910
-#: ../src/protocols/silc/silc.c:753 ../src/protocols/yahoo/yahoo.c:3063
-#: ../src/protocols/yahoo/yahoo.c:3072 ../src/request.h:1344
+#: ../src/protocols/silc/silc.c:753 ../src/protocols/yahoo/yahoo.c:3059
+#: ../src/protocols/yahoo/yahoo.c:3068 ../src/request.h:1344
 msgid "OK"
 msgstr "OK"
 
-#: ../src/account.c:969 ../src/account.c:1140 ../src/account.c:1177
-#: ../src/gtkaccount.c:2173 ../src/gtkaccount.c:2640 ../src/gtkblist.c:5015
-#: ../src/gtkdialogs.c:601 ../src/gtkdialogs.c:738 ../src/gtkdialogs.c:802
-#: ../src/gtkdialogs.c:821 ../src/gtkdialogs.c:843 ../src/gtkdialogs.c:863
-#: ../src/gtkdialogs.c:907 ../src/gtkdialogs.c:962 ../src/gtkdialogs.c:999
-#: ../src/gtkdialogs.c:1024 ../src/gtkimhtmltoolbar.c:419
-#: ../src/gtkplugin.c:296 ../src/gtkpounce.c:1095 ../src/gtkprivacy.c:568
+#: ../src/account.c:964 ../src/account.c:1135 ../src/account.c:1172
+#: ../src/gtkaccount.c:2182 ../src/gtkaccount.c:2649 ../src/gtkblist.c:5017
+#: ../src/gtkdialogs.c:608 ../src/gtkdialogs.c:745 ../src/gtkdialogs.c:809
+#: ../src/gtkdialogs.c:828 ../src/gtkdialogs.c:850 ../src/gtkdialogs.c:870
+#: ../src/gtkdialogs.c:914 ../src/gtkdialogs.c:969 ../src/gtkdialogs.c:1006
+#: ../src/gtkdialogs.c:1031 ../src/gtkimhtmltoolbar.c:419
+#: ../src/gtkplugin.c:296 ../src/gtkpounce.c:1077 ../src/gtkprivacy.c:568
 #: ../src/gtkprivacy.c:581 ../src/gtkprivacy.c:606 ../src/gtkprivacy.c:617
 #: ../src/gtkrequest.c:270 ../src/gtksavedstatuses.c:296
 #: ../src/protocols/gg/gg.c:498 ../src/protocols/gg/gg.c:656
 #: ../src/protocols/gg/gg.c:792 ../src/protocols/gg/gg.c:871
-#: ../src/protocols/jabber/buddy.c:573 ../src/protocols/jabber/buddy.c:1458
-#: ../src/protocols/jabber/buddy.c:1492 ../src/protocols/jabber/chat.c:780
-#: ../src/protocols/jabber/jabber.c:824 ../src/protocols/jabber/jabber.c:1320
+#: ../src/protocols/jabber/buddy.c:575 ../src/protocols/jabber/buddy.c:1461
+#: ../src/protocols/jabber/buddy.c:1495 ../src/protocols/jabber/chat.c:778
+#: ../src/protocols/jabber/jabber.c:823 ../src/protocols/jabber/jabber.c:1318
 #: ../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:1410 ../src/protocols/oscar/oscar.c:2167
-#: ../src/protocols/oscar/oscar.c:2208 ../src/protocols/oscar/oscar.c:2260
-#: ../src/protocols/oscar/oscar.c:5682 ../src/protocols/oscar/oscar.c:5734
-#: ../src/protocols/oscar/oscar.c:5862 ../src/protocols/oscar/oscar.c:5887
-#: ../src/protocols/oscar/oscar.c:5943 ../src/protocols/oscar/oscar.c:6012
-#: ../src/protocols/sametime/sametime.c:3375
-#: ../src/protocols/sametime/sametime.c:3460
-#: ../src/protocols/sametime/sametime.c:3630
-#: ../src/protocols/sametime/sametime.c:5319
-#: ../src/protocols/sametime/sametime.c:5408
-#: ../src/protocols/sametime/sametime.c:5532 ../src/protocols/silc/buddy.c:467
+#: ../src/protocols/oscar/oscar.c:1409 ../src/protocols/oscar/oscar.c:2168
+#: ../src/protocols/oscar/oscar.c:2209 ../src/protocols/oscar/oscar.c:2261
+#: ../src/protocols/oscar/oscar.c:5695 ../src/protocols/oscar/oscar.c:5747
+#: ../src/protocols/oscar/oscar.c:5875 ../src/protocols/oscar/oscar.c:5900
+#: ../src/protocols/oscar/oscar.c:5956 ../src/protocols/oscar/oscar.c:6025
+#: ../src/protocols/oscar/peer.c:942 ../src/protocols/sametime/sametime.c:3368
+#: ../src/protocols/sametime/sametime.c:3453
+#: ../src/protocols/sametime/sametime.c:3623
+#: ../src/protocols/sametime/sametime.c:5312
+#: ../src/protocols/sametime/sametime.c:5401
+#: ../src/protocols/sametime/sametime.c:5525 ../src/protocols/silc/buddy.c:467
 #: ../src/protocols/silc/buddy.c:1078 ../src/protocols/silc/buddy.c:1183
-#: ../src/protocols/silc/chat.c:596 ../src/protocols/silc/chat.c:725
+#: ../src/protocols/silc/chat.c:597 ../src/protocols/silc/chat.c:726
 #: ../src/protocols/silc/ops.c:1911 ../src/protocols/silc/silc.c:754
-#: ../src/protocols/silc/silc.c:959 ../src/protocols/yahoo/yahoo.c:3064
-#: ../src/protocols/yahoo/yahoo.c:3073 ../src/request.h:1344
+#: ../src/protocols/silc/silc.c:959 ../src/protocols/yahoo/yahoo.c:3060
+#: ../src/protocols/yahoo/yahoo.c:3069 ../src/request.h:1344
 #: ../src/request.h:1354
 msgid "Cancel"
 msgstr "Peru"
 
-#: ../src/account.c:994 ../src/connection.c:96
+#: ../src/account.c:989 ../src/connection.c:96
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "%s-yhteyskäytäntöliitännäinen puuttuu"
 
-#: ../src/account.c:996 ../src/connection.c:99 ../src/gtkblist.c:3538
-#: ../src/gtkblist.c:3544
+#: ../src/account.c:991 ../src/connection.c:99 ../src/gtkblist.c:3547
 msgid "Connection Error"
 msgstr "Yhteysvirhe"
 
-#: ../src/account.c:1076 ../src/protocols/gg/gg.c:696
-#: ../src/protocols/jabber/jabber.c:1272
+#: ../src/account.c:1071 ../src/protocols/gg/gg.c:696
+#: ../src/protocols/jabber/jabber.c:1270
 msgid "New passwords do not match."
 msgstr "Uudet salasanat eivät täsmää."
 
-#: ../src/account.c:1085
+#: ../src/account.c:1080
 msgid "Fill out all fields completely."
 msgstr "Täytä kaikki kentät kokonaan."
 
-#: ../src/account.c:1108
+#: ../src/account.c:1103
 msgid "Original password"
 msgstr "Vanha salasana"
 
-#: ../src/account.c:1115
+#: ../src/account.c:1110
 msgid "New password"
 msgstr "Uusi salasana"
 
-#: ../src/account.c:1122
+#: ../src/account.c:1117
 msgid "New password (again)"
 msgstr "Uusi salasana (uudelleen)"
 
-#: ../src/account.c:1128
+#: ../src/account.c:1123
 #, c-format
 msgid "Change password for %s"
 msgstr "Vaihda %s:n salasana"
 
-#: ../src/account.c:1136
+#: ../src/account.c:1131
 msgid "Please enter your current password and your new password."
 msgstr "Anna nykyinen sekä uusi salasana."
 
-#: ../src/account.c:1169
+#: ../src/account.c:1164
 #, c-format
 msgid "Change user information for %s"
 msgstr "Vaihda käyttäjätietoja - %s"
 
-#: ../src/account.c:1176 ../src/gtkdebug.c:684 ../src/gtkrequest.c:276
-#: ../src/protocols/jabber/buddy.c:572
+#: ../src/account.c:1167 ../src/protocols/toc/toc.c:1684
+msgid "Set User Info"
+msgstr "Aseta käyttäjätiedot"
+
+#: ../src/account.c:1171 ../src/gtkdebug.c:684 ../src/gtkrequest.c:276
+#: ../src/protocols/jabber/buddy.c:574
 msgid "Save"
 msgstr "Tallenna"
 
-#: ../src/account.c:1679 ../src/gtkft.c:159 ../src/protocols/gg/gg.c:1002
-#: ../src/protocols/jabber/buddy.c:630 ../src/protocols/jabber/buddy.c:1095
-#: ../src/protocols/jabber/buddy.c:1112 ../src/protocols/novell/novell.c:2860
+#: ../src/account.c:1681 ../src/gtkft.c:159 ../src/protocols/gg/gg.c:1002
+#: ../src/protocols/jabber/buddy.c:632 ../src/protocols/jabber/buddy.c:1097
+#: ../src/protocols/jabber/buddy.c:1114 ../src/protocols/novell/novell.c:2858
 msgid "Unknown"
 msgstr "Tuntematon"
 
@@ -2038,7 +2072,7 @@
 msgid "No name"
 msgstr "Ei nimeä"
 
-#: ../src/ft.c:189 ../src/protocols/msn/msn.c:412
+#: ../src/ft.c:189 ../src/protocols/msn/msn.c:410
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -2186,7 +2220,7 @@
 msgid "Password:"
 msgstr "Salasana:"
 
-#: ../src/gtkaccount.c:863 ../src/gtkblist.c:4593 ../src/gtkblist.c:4959
+#: ../src/gtkaccount.c:863 ../src/gtkblist.c:4595 ../src/gtkblist.c:4961
 msgid "Alias:"
 msgstr "Alias:"
 
@@ -2233,189 +2267,195 @@
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../src/gtkaccount.c:1263 ../src/gtkprefs.c:1043
+#: ../src/gtkaccount.c:1263 ../src/gtkprefs.c:1058
 msgid "Use Environmental Settings"
 msgstr "Käytä ympäristöasetuksia"
 
-#: ../src/gtkaccount.c:1297
-msgid "you can see the butterflies mating"
-msgstr "voit nähdä perhosten parittelevan"
-
-#: ../src/gtkaccount.c:1301
+#. This is an easter egg.
+#. It means one of two things, both intended as humourus:
+#. A) your network is really slow and you have nothing better to do than
+#. look at butterflies.
+#. B)You are looking really closely at something that shouldn't matter.
+#: ../src/gtkaccount.c:1302
 msgid "If you look real closely"
 msgstr "Jos katsot todella tarkkaan"
 
-#: ../src/gtkaccount.c:1317
+#. This is an easter egg. See the comment on the previous line in the source.
+#: ../src/gtkaccount.c:1305
+msgid "you can see the butterflies mating"
+msgstr "voit nähdä perhosten parittelevan"
+
+#: ../src/gtkaccount.c:1326
 msgid "Proxy Options"
 msgstr "Välipalvelinvalinnat"
 
-#: ../src/gtkaccount.c:1331 ../src/gtkprefs.c:1037
+#: ../src/gtkaccount.c:1340 ../src/gtkprefs.c:1052
 msgid "Proxy _type:"
 msgstr "Välipalvelimen _tyyppi:"
 
-#: ../src/gtkaccount.c:1340 ../src/gtkprefs.c:1058
+#: ../src/gtkaccount.c:1349 ../src/gtkprefs.c:1073
 msgid "_Host:"
 msgstr "P_alvelin:"
 
-#: ../src/gtkaccount.c:1344 ../src/gtkprefs.c:1076
+#: ../src/gtkaccount.c:1353 ../src/gtkprefs.c:1091
 msgid "_Port:"
 msgstr "_Portti:"
 
-#: ../src/gtkaccount.c:1352
+#: ../src/gtkaccount.c:1361
 msgid "_Username:"
 msgstr "_Käyttäjänimi:"
 
-#: ../src/gtkaccount.c:1358 ../src/gtkprefs.c:1113
+#: ../src/gtkaccount.c:1367 ../src/gtkprefs.c:1128
 msgid "Pa_ssword:"
 msgstr "_Salasana:"
 
-#: ../src/gtkaccount.c:1738
+#: ../src/gtkaccount.c:1747
 msgid "Add Account"
 msgstr "Lisää tili"
 
-#: ../src/gtkaccount.c:1740 ../src/gtkblist.c:3547
+#: ../src/gtkaccount.c:1749 ../src/gtkblist.c:3550
 msgid "Modify Account"
 msgstr "Muokkaa tiliä"
 
-#: ../src/gtkaccount.c:1762
+#: ../src/gtkaccount.c:1771
 msgid "_Basic"
 msgstr "_Perus"
 
-#: ../src/gtkaccount.c:1773
+#: ../src/gtkaccount.c:1782
 msgid "_Advanced"
 msgstr "_Lisäasetukset"
 
 #. Register button
-#: ../src/gtkaccount.c:1788 ../src/protocols/jabber/jabber.c:823
+#: ../src/gtkaccount.c:1797 ../src/protocols/jabber/jabber.c:822
 msgid "Register"
 msgstr "Rekisteröi"
 
-#: ../src/gtkaccount.c:2167 ../src/gtksavedstatuses.c:293
+#: ../src/gtkaccount.c:2176 ../src/gtksavedstatuses.c:293
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Haluatko varmasti poistaa %s:n?"
 
-#: ../src/gtkaccount.c:2172 ../src/gtkpounce.c:1094 ../src/gtkrequest.c:273
+#: ../src/gtkaccount.c:2181 ../src/gtkpounce.c:1076 ../src/gtkrequest.c:273
 #: ../src/gtksavedstatuses.c:295
 msgid "Delete"
 msgstr "Poista"
 
-#: ../src/gtkaccount.c:2230 ../src/gtksavedstatuses.c:890
-#: ../src/protocols/oscar/oscar.c:2822
+#: ../src/gtkaccount.c:2239 ../src/gtksavedstatuses.c:889
+#: ../src/protocols/oscar/oscar.c:2823
 msgid "Screen Name"
 msgstr "Näyttönimi"
 
-#: ../src/gtkaccount.c:2261
+#: ../src/gtkaccount.c:2270
 msgid "Protocol"
 msgstr "Yhteyskäytäntö"
 
-#: ../src/gtkaccount.c:2588
+#: ../src/gtkaccount.c:2597
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s on tehnyt käyttäjästä %s tuttavansa%s%s"
 
-#: ../src/gtkaccount.c:2637
+#: ../src/gtkaccount.c:2646
 msgid "Add buddy to your list?"
 msgstr "Lisää tuttava listalle?"
 
-#: ../src/gtkaccount.c:2639 ../src/gtkblist.c:5014 ../src/gtkconv.c:1625
+#: ../src/gtkaccount.c:2648 ../src/gtkblist.c:5016 ../src/gtkconv.c:1625
 #: ../src/gtkrequest.c:274 ../src/protocols/gg/gg.c:870
-#: ../src/protocols/oscar/oscar.c:2452
-#: ../src/protocols/sametime/sametime.c:5407 ../src/protocols/silc/chat.c:595
+#: ../src/protocols/oscar/oscar.c:2453
+#: ../src/protocols/sametime/sametime.c:5400 ../src/protocols/silc/chat.c:596
 msgid "Add"
 msgstr "Lisää"
 
-#: ../src/gtkblist.c:664
+#: ../src/gtkblist.c:673
 msgid "Join a Chat"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: ../src/gtkblist.c:685
+#: ../src/gtkblist.c:694
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Syötä tiedot ryhmäkeskustelusta, johon haluaisit liittyä.\n"
 
-#: ../src/gtkblist.c:696 ../src/gtkpounce.c:527 ../src/gtkroomlist.c:377
+#: ../src/gtkblist.c:705 ../src/gtkpounce.c:519 ../src/gtkroomlist.c:377
 msgid "_Account:"
 msgstr "_Käyttäjätili:"
 
-#: ../src/gtkblist.c:940
+#: ../src/gtkblist.c:949
 msgid "Get _Info"
 msgstr "Hae _tiedot"
 
-#: ../src/gtkblist.c:943 ../src/gtkstock.c:141
+#: ../src/gtkblist.c:952 ../src/gtkstock.c:141
 msgid "I_M"
 msgstr "_Pikaviesti"
 
-#: ../src/gtkblist.c:949
+#: ../src/gtkblist.c:958
 msgid "_Send File"
 msgstr "_Lähetä tiedosto"
 
-#: ../src/gtkblist.c:956
+#: ../src/gtkblist.c:965
 msgid "Add Buddy _Pounce"
 msgstr "Lisää tuttava_ilmoitin"
 
-#: ../src/gtkblist.c:960 ../src/gtkblist.c:964 ../src/gtkblist.c:1063
-#: ../src/gtkblist.c:1086
+#: ../src/gtkblist.c:969 ../src/gtkblist.c:973 ../src/gtkblist.c:1072
+#: ../src/gtkblist.c:1095
 msgid "View _Log"
 msgstr "Näytä _loki"
 
-#: ../src/gtkblist.c:975
+#: ../src/gtkblist.c:984
 msgid "Alias..."
 msgstr "Alias..."
 
-#: ../src/gtkblist.c:978 ../src/gtkconv.c:1622 ../src/gtkrequest.c:275
+#: ../src/gtkblist.c:987 ../src/gtkconv.c:1622 ../src/gtkrequest.c:275
 msgid "Remove"
 msgstr "Poista"
 
-#: ../src/gtkblist.c:984 ../src/gtkblist.c:1071 ../src/gtkblist.c:1092
+#: ../src/gtkblist.c:993 ../src/gtkblist.c:1080 ../src/gtkblist.c:1101
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../src/gtkblist.c:986 ../src/gtkblist.c:1073 ../src/gtkblist.c:1094
+#: ../src/gtkblist.c:995 ../src/gtkblist.c:1082 ../src/gtkblist.c:1103
 msgid "_Remove"
 msgstr "_Poista"
 
-#: ../src/gtkblist.c:1034
+#: ../src/gtkblist.c:1043
 msgid "Add a _Buddy"
 msgstr "Lisää _tuttava"
 
-#: ../src/gtkblist.c:1036
+#: ../src/gtkblist.c:1045
 msgid "Add a C_hat"
 msgstr "Lisää _ryhmäkeskustelu"
 
-#: ../src/gtkblist.c:1039
+#: ../src/gtkblist.c:1048
 msgid "_Delete Group"
 msgstr "_Poista ryhmä"
 
-#: ../src/gtkblist.c:1041
+#: ../src/gtkblist.c:1050
 msgid "_Rename"
 msgstr "Nimeä _uudelleen"
 
 #. join button
-#: ../src/gtkblist.c:1059 ../src/gtkroomlist.c:285 ../src/gtkroomlist.c:441
+#: ../src/gtkblist.c:1068 ../src/gtkroomlist.c:285 ../src/gtkroomlist.c:441
 #: ../src/gtkstock.c:139
 msgid "_Join"
 msgstr "_Liity"
 
-#: ../src/gtkblist.c:1061
+#: ../src/gtkblist.c:1070
 msgid "Auto-Join"
 msgstr "Kirjaudu sisään automaattisesti"
 
-#: ../src/gtkblist.c:1099 ../src/gtkblist.c:1122
+#: ../src/gtkblist.c:1108 ../src/gtkblist.c:1131
 msgid "_Collapse"
 msgstr "_Pienennä"
 
-#: ../src/gtkblist.c:1127
+#: ../src/gtkblist.c:1136
 msgid "_Expand"
 msgstr "_Laajenna"
 
-#: ../src/gtkblist.c:1373 ../src/gtkblist.c:1385 ../src/gtkblist.c:3808
-#: ../src/gtkblist.c:3818
+#: ../src/gtkblist.c:1382 ../src/gtkblist.c:1394 ../src/gtkblist.c:3810
+#: ../src/gtkblist.c:3820
 msgid "/Tools/Mute Sounds"
 msgstr "/Työkalut/Vaimenna äänet"
 
-#: ../src/gtkblist.c:1845 ../src/gtkconv.c:4209 ../src/gtkpounce.c:426
+#: ../src/gtkblist.c:1854 ../src/gtkconv.c:4245 ../src/gtkpounce.c:418
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
@@ -2423,126 +2463,126 @@
 "tuttavan."
 
 #. Buddies menu
-#: ../src/gtkblist.c:2419
+#: ../src/gtkblist.c:2428
 msgid "/_Buddies"
 msgstr "/_Tuttavat"
 
-#: ../src/gtkblist.c:2420
+#: ../src/gtkblist.c:2429
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Tuttavat/Uusi _pikaviesti..."
 
-#: ../src/gtkblist.c:2421
+#: ../src/gtkblist.c:2430
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Tuttavat/Liity _ryhmäkeskusteluun..."
 
-#: ../src/gtkblist.c:2422
+#: ../src/gtkblist.c:2431
 msgid "/Buddies/Get User _Info..."
 msgstr "/Tuttavat/Hae _käyttäjätiedot..."
 
-#: ../src/gtkblist.c:2423
+#: ../src/gtkblist.c:2432
 msgid "/Buddies/View User _Log..."
 msgstr "/Tuttavat/Näytä käyttäjä_loki..."
 
-#: ../src/gtkblist.c:2425
+#: ../src/gtkblist.c:2434
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Tuttavat/Näytä poissaolevat tuttavat"
 
-#: ../src/gtkblist.c:2426
+#: ../src/gtkblist.c:2435
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Tuttavat/Näytä tyhjät ryhmät"
 
-#: ../src/gtkblist.c:2427
+#: ../src/gtkblist.c:2436
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Tuttavat/Näytä tuttavien tiedot"
 
-#: ../src/gtkblist.c:2428
+#: ../src/gtkblist.c:2437
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Tuttavat/Näytä _joutenoloajat"
 
-#: ../src/gtkblist.c:2429
+#: ../src/gtkblist.c:2438
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Tuttavat/L_ajittele tuttavat"
 
-#: ../src/gtkblist.c:2431
+#: ../src/gtkblist.c:2440
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Tuttavat/_Lisää tuttava..."
 
-#: ../src/gtkblist.c:2432
+#: ../src/gtkblist.c:2441
 msgid "/Buddies/Add C_hat..."
 msgstr "/Tuttavat/Lisää ryhmäkeskustelu..."
 
-#: ../src/gtkblist.c:2433
+#: ../src/gtkblist.c:2442
 msgid "/Buddies/Add _Group..."
 msgstr "/Tuttavat/Lisää _ryhmä..."
 
-#: ../src/gtkblist.c:2435
+#: ../src/gtkblist.c:2444
 msgid "/Buddies/_Quit"
 msgstr "/Tuttavat/_Lopeta"
 
 #. Accounts menu
-#: ../src/gtkblist.c:2438
+#: ../src/gtkblist.c:2447
 msgid "/_Accounts"
 msgstr "/_Käyttäjätilit"
 
-#: ../src/gtkblist.c:2439 ../src/gtkblist.c:5593
+#: ../src/gtkblist.c:2448 ../src/gtkblist.c:5593
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Käyttäjätilit/Lisää\\/Muokkaa"
 
 #. Tools
-#: ../src/gtkblist.c:2442
+#: ../src/gtkblist.c:2451
 msgid "/_Tools"
 msgstr "/_Työkalut"
 
-#: ../src/gtkblist.c:2443
+#: ../src/gtkblist.c:2452
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Työkalut/Tuttava_ilmoittimet"
 
-#: ../src/gtkblist.c:2444
+#: ../src/gtkblist.c:2453
 msgid "/Tools/Plu_gins"
 msgstr "/Työkalut/_Liitännäiset"
 
-#: ../src/gtkblist.c:2445
+#: ../src/gtkblist.c:2454
 msgid "/Tools/Pr_eferences"
 msgstr "/Työkalut/A_setukset"
 
-#: ../src/gtkblist.c:2446
+#: ../src/gtkblist.c:2455
 msgid "/Tools/Pr_ivacy"
 msgstr "/Työkalut/Yks_ityisyys"
 
-#: ../src/gtkblist.c:2448
+#: ../src/gtkblist.c:2457
 msgid "/Tools/_File Transfers"
 msgstr "/Työkalut/_Tiedostonsiirrot..."
 
-#: ../src/gtkblist.c:2449
+#: ../src/gtkblist.c:2458
 msgid "/Tools/R_oom List"
 msgstr "/Työkalut/Huone_lista"
 
-#: ../src/gtkblist.c:2450
+#: ../src/gtkblist.c:2459
 msgid "/Tools/System _Log"
 msgstr "/Työkalut/Järjestelmä_loki"
 
-#: ../src/gtkblist.c:2452
+#: ../src/gtkblist.c:2461
 msgid "/Tools/Mute _Sounds"
 msgstr "/Työkalut/Vaimenna _äänet"
 
 #. Help
-#: ../src/gtkblist.c:2455
+#: ../src/gtkblist.c:2464
 msgid "/_Help"
 msgstr "/_Ohje"
 
-#: ../src/gtkblist.c:2456
+#: ../src/gtkblist.c:2465
 msgid "/Help/Online _Help"
 msgstr "/Ohje/_Ohjeita verkossa"
 
-#: ../src/gtkblist.c:2457
+#: ../src/gtkblist.c:2466
 msgid "/Help/_Debug Window"
 msgstr "/Ohje/_Virheenjäljitysikkuna"
 
-#: ../src/gtkblist.c:2458
+#: ../src/gtkblist.c:2467
 msgid "/Help/_About"
 msgstr "/Ohje/Tietoj_a"
 
-#: ../src/gtkblist.c:2490 ../src/gtkblist.c:2559
+#: ../src/gtkblist.c:2499 ../src/gtkblist.c:2568
 #, c-format
 msgid ""
 "\n"
@@ -2551,7 +2591,7 @@
 "\n"
 "<b>Käyttäjätili:</b> %s"
 
-#: ../src/gtkblist.c:2571
+#: ../src/gtkblist.c:2580
 #, c-format
 msgid ""
 "\n"
@@ -2560,7 +2600,7 @@
 "\n"
 "<b>Tuttavan lempinimi:</b> %s"
 
-#: ../src/gtkblist.c:2583
+#: ../src/gtkblist.c:2592
 #, c-format
 msgid ""
 "\n"
@@ -2569,7 +2609,7 @@
 "\n"
 "<b>Kutsumanimi:</b> %s"
 
-#: ../src/gtkblist.c:2592
+#: ../src/gtkblist.c:2601
 #, c-format
 msgid ""
 "\n"
@@ -2578,7 +2618,7 @@
 "\n"
 "<b>Kirjautuneena sisään:</b> %s"
 
-#: ../src/gtkblist.c:2603
+#: ../src/gtkblist.c:2612
 #, c-format
 msgid ""
 "\n"
@@ -2587,7 +2627,7 @@
 "\n"
 "<b>Jouten:</b> %s"
 
-#: ../src/gtkblist.c:2638
+#: ../src/gtkblist.c:2647
 #, c-format
 msgid ""
 "\n"
@@ -2596,7 +2636,7 @@
 "\n"
 "<b>Viimeksi nähty:</b> %s sitten"
 
-#: ../src/gtkblist.c:2647
+#: ../src/gtkblist.c:2656
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2604,7 +2644,7 @@
 "\n"
 "<b>Tila:</b> Poissa linjoilta"
 
-#: ../src/gtkblist.c:2658
+#: ../src/gtkblist.c:2667
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2612,7 +2652,7 @@
 "\n"
 "<b>Kuvaus:</b> Aavemainen"
 
-#: ../src/gtkblist.c:2660
+#: ../src/gtkblist.c:2669
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
@@ -2620,7 +2660,7 @@
 "\n"
 "<b>Tila</b>: Mahtava"
 
-#: ../src/gtkblist.c:2662
+#: ../src/gtkblist.c:2671
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
@@ -2628,125 +2668,119 @@
 "\n"
 "<b>Tila</b>: Rokkaava"
 
-#: ../src/gtkblist.c:2951
+#: ../src/gtkblist.c:2960
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Jouten %dt %02dm"
 
-#: ../src/gtkblist.c:2953
+#: ../src/gtkblist.c:2962
 #, c-format
 msgid "Idle %dm"
 msgstr "Jouten %dm"
 
 #. Idle stuff
-#: ../src/gtkblist.c:2956 ../src/gtkprefs.c:1745
-#: ../src/protocols/bonjour/bonjour.c:333 ../src/protocols/msn/msn.c:552
-#: ../src/protocols/msn/state.c:32 ../src/protocols/novell/novell.c:2854
-#: ../src/protocols/oscar/oscar.c:2843 ../src/protocols/yahoo/yahoo.c:2731
+#: ../src/gtkblist.c:2965 ../src/gtkprefs.c:1760
+#: ../src/protocols/bonjour/bonjour.c:333 ../src/protocols/msn/msn.c:550
+#: ../src/protocols/msn/state.c:32 ../src/protocols/novell/novell.c:2852
+#: ../src/protocols/oscar/oscar.c:2844 ../src/protocols/yahoo/yahoo.c:2727
 #: ../src/protocols/yahoo/yahoo_profile.c:691
 msgid "Idle"
 msgstr "Jouten"
 
-#: ../src/gtkblist.c:3088
+#: ../src/gtkblist.c:3097
 msgid "/Buddies/New Instant Message..."
 msgstr "/Tuttavat/Uusi pikaviesti..."
 
-#: ../src/gtkblist.c:3089 ../src/gtkblist.c:3122
+#: ../src/gtkblist.c:3098 ../src/gtkblist.c:3131
 msgid "/Buddies/Join a Chat..."
 msgstr "/Tuttavat/Liity ryhmäkeskusteluun..."
 
-#: ../src/gtkblist.c:3090
+#: ../src/gtkblist.c:3099
 msgid "/Buddies/Get User Info..."
 msgstr "/Tuttavat/Hae käyttäjätiedot..."
 
-#: ../src/gtkblist.c:3091
+#: ../src/gtkblist.c:3100
 msgid "/Buddies/Add Buddy..."
 msgstr "/Tuttavat/Lisää tuttava..."
 
-#: ../src/gtkblist.c:3092 ../src/gtkblist.c:3125
+#: ../src/gtkblist.c:3101 ../src/gtkblist.c:3134
 msgid "/Buddies/Add Chat..."
 msgstr "/Tuttavat/Lisää ryhmäkeskustelu..."
 
-#: ../src/gtkblist.c:3093
+#: ../src/gtkblist.c:3102
 msgid "/Buddies/Add Group..."
 msgstr "/Tuttavat/Lisää ryhmä..."
 
-#: ../src/gtkblist.c:3128
+#: ../src/gtkblist.c:3137
 msgid "/Tools/Buddy Pounces"
 msgstr "/Työkalut/Tuttavailmoittimet"
 
-#: ../src/gtkblist.c:3131
+#: ../src/gtkblist.c:3140
 msgid "/Tools/Privacy"
 msgstr "/Työkalut/Yksityisyys"
 
-#: ../src/gtkblist.c:3134
+#: ../src/gtkblist.c:3143
 msgid "/Tools/Room List"
 msgstr "/Työkalut/Huonelista"
 
-#: ../src/gtkblist.c:3328
+#: ../src/gtkblist.c:3337
 msgid "Manually"
 msgstr "Käsin"
 
-#: ../src/gtkblist.c:3330
+#: ../src/gtkblist.c:3339
 msgid "Alphabetically"
 msgstr "Aakkosittain"
 
-#: ../src/gtkblist.c:3331
+#: ../src/gtkblist.c:3340
 msgid "By status"
 msgstr "Tilan mukaan"
 
-#: ../src/gtkblist.c:3332
+#: ../src/gtkblist.c:3341
 msgid "By log size"
 msgstr "Lokin koon mukaan"
 
-#: ../src/gtkblist.c:3532 ../src/gtkconn.c:196
+#: ../src/gtkblist.c:3542 ../src/gtkconn.c:184
 #, c-format
 msgid "%s disconnected"
 msgstr "Yhteys katkennut kohteeseen %s"
 
-#: ../src/gtkblist.c:3548 ../src/protocols/sametime/sametime.c:3629
+#: ../src/gtkblist.c:3551 ../src/protocols/sametime/sametime.c:3622
 msgid "Connect"
 msgstr "Yhdistä"
 
-#: ../src/gtkblist.c:3548
+#: ../src/gtkblist.c:3551
 msgid "Re-enable Account"
 msgstr "Ota tili uudelleen käyttöön"
 
-#: ../src/gtkblist.c:3570
+#: ../src/gtkblist.c:3572
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s kirjautui ulos: %s</span>"
 
-#: ../src/gtkblist.c:3697
+#: ../src/gtkblist.c:3699
 msgid "/Accounts"
 msgstr "/Käyttäjätilit"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../src/gtkblist.c:3802
+#: ../src/gtkblist.c:3804
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Tuttavat/Näytä poissaolevat tuttavat"
 
-#: ../src/gtkblist.c:3805
+#: ../src/gtkblist.c:3807
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Tuttavat/Näytä tyhjät ryhmät"
 
-#: ../src/gtkblist.c:3811
+#: ../src/gtkblist.c:3813
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Tuttavat/Näytä tuttavien tiedot"
 
-#: ../src/gtkblist.c:3814
+#: ../src/gtkblist.c:3816
 msgid "/Buddies/Show Idle Times"
 msgstr "/Tuttavat/Näytä joutenoloajat"
 
-#: ../src/gtkblist.c:4526 ../src/protocols/silc/buddy.c:736
-#: ../src/protocols/silc/buddy.c:1030 ../src/protocols/silc/buddy.c:1075
-#: ../src/protocols/silc/buddy.c:1174 ../src/protocols/yahoo/yahoo.c:2978
-msgid "Add Buddy"
-msgstr "Lisää tuttava"
-
-#: ../src/gtkblist.c:4550
+#: ../src/gtkblist.c:4552
 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. "
@@ -2757,15 +2791,15 @@
 "aina kuin mahdollista.\n"
 
 #. Set up stuff for the account box
-#: ../src/gtkblist.c:4620 ../src/gtkblist.c:4939
+#: ../src/gtkblist.c:4622 ../src/gtkblist.c:4941
 msgid "Account:"
 msgstr "Käyttäjätili:"
 
-#: ../src/gtkblist.c:4872
+#: ../src/gtkblist.c:4874
 msgid "This protocol does not support chat rooms."
 msgstr "Tämä yhteyskäytäntö ei tue keskusteluhuoneita."
 
-#: ../src/gtkblist.c:4888
+#: ../src/gtkblist.c:4890
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -2773,11 +2807,11 @@
 "Et ole kirjautuneena millään yhteyskäytännöllä jolla voisi käyttää "
 "ryhmäkeskustelua."
 
-#: ../src/gtkblist.c:4905
+#: ../src/gtkblist.c:4907
 msgid "Add Chat"
 msgstr "Lisää ryhmäkeskustelu"
 
-#: ../src/gtkblist.c:4929
+#: ../src/gtkblist.c:4931
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2785,12 +2819,12 @@
 "Anna lempinimi, ja tiedot ryhmäkeskustelusta jonka haluat lisätä "
 "tuttavalistalle.\n"
 
-#: ../src/gtkblist.c:5011 ../src/protocols/sametime/sametime.c:5318
-#: ../src/protocols/sametime/sametime.c:5405
+#: ../src/gtkblist.c:5013 ../src/protocols/sametime/sametime.c:5311
+#: ../src/protocols/sametime/sametime.c:5398
 msgid "Add Group"
 msgstr "Lisää ryhmä"
 
-#: ../src/gtkblist.c:5012
+#: ../src/gtkblist.c:5014
 msgid "Please enter the name of the group to be added."
 msgstr "Anna lisättävän ryhmän nimi."
 
@@ -2798,7 +2832,7 @@
 msgid "_Edit Account"
 msgstr "_Muokaa käyttäjätiliä"
 
-#: ../src/gtkblist.c:5666 ../src/gtkblist.c:5672
+#: ../src/gtkblist.c:5666 ../src/gtkblist.c:5672 ../src/gtkconv.c:2753
 msgid "No actions available"
 msgstr "Ei toimintoja saatavilla."
 
@@ -2818,7 +2852,7 @@
 msgid "/Buddies/Sort Buddies"
 msgstr "/Tuttavat/Lajittele tuttavat"
 
-#: ../src/gtkconn.c:197
+#: ../src/gtkconn.c:185
 #, c-format
 msgid ""
 "%s was disconnected due to an error: %s\n"
@@ -2845,90 +2879,90 @@
 "Kirjoita \"/help &lt;komento&gt;\" saadaksesi ohjeen tietystä komennosta.\n"
 "Seuraavat komennot ovat saatavilla tässä kontekstissa:\n"
 
-#: ../src/gtkconv.c:484
+#: ../src/gtkconv.c:482
 msgid "No such command."
 msgstr "Sellaista komentoa ei ole."
 
-#: ../src/gtkconv.c:491
+#: ../src/gtkconv.c:489
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Syntaksivirhe: Syötit väärän määrän argumentteja kyseiselle komennolle."
 
-#: ../src/gtkconv.c:496
+#: ../src/gtkconv.c:494
 msgid "Your command failed for an unknown reason."
 msgstr "Komento epäonnistui tuntemattomasta syystä."
 
-#: ../src/gtkconv.c:503
+#: ../src/gtkconv.c:501
 msgid "That command only works in chats, not IMs."
 msgstr "Komento toimii vain ryhmäkeskusteluissa, ei pikaviesteissä."
 
-#: ../src/gtkconv.c:506
+#: ../src/gtkconv.c:504
 msgid "That command only works in IMs, not chats."
 msgstr "Komento toimii vain pikaviesteissä, ei ryhmäkeskusteluissa."
 
-#: ../src/gtkconv.c:510
+#: ../src/gtkconv.c:508
 msgid "That command doesn't work on this protocol."
 msgstr "Tämä komento ei toimi tälle yhteyskäytännölle."
 
-#: ../src/gtkconv.c:744 ../src/gtkconv.c:770
+#: ../src/gtkconv.c:743 ../src/gtkconv.c:769
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Tuttava ei käytä samaa yhteyskäytäntöä kuin tämä ryhmäkeskustelu."
 
-#: ../src/gtkconv.c:764
+#: ../src/gtkconv.c:763
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "Et ole kirjautuneena millään käyttäjätilillä jolla voisi kutsua tämän "
 "tuttavan."
 
-#: ../src/gtkconv.c:817
+#: ../src/gtkconv.c:816
 msgid "Invite Buddy Into Chat Room"
 msgstr "Kutsu tuttava keskusteluhuoneeseen"
 
 #. Put our happy label in it.
-#: ../src/gtkconv.c:847
+#: ../src/gtkconv.c:846
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "Anna kutsuttavan käyttäjän nimi sekä vapaaehtoinen viesti."
 
-#: ../src/gtkconv.c:868
+#: ../src/gtkconv.c:867
 msgid "_Buddy:"
 msgstr "_Tuttava:"
 
-#: ../src/gtkconv.c:888 ../src/gtksavedstatuses.c:1108
-#: ../src/gtksavedstatuses.c:1444
+#: ../src/gtkconv.c:887 ../src/gtksavedstatuses.c:1107
+#: ../src/gtksavedstatuses.c:1443
 msgid "_Message:"
 msgstr "_Viesti:"
 
-#: ../src/gtkconv.c:945 ../src/gtkconv.c:2392 ../src/gtkdebug.c:217
+#: ../src/gtkconv.c:944 ../src/gtkconv.c:2370 ../src/gtkdebug.c:217
 #: ../src/gtkft.c:490
 msgid "Unable to open file."
 msgstr "Tiedoston avaaminen epäonnistui."
 
-#: ../src/gtkconv.c:951
+#: ../src/gtkconv.c:950
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Keskustelu käyttäjän %s kanssa</h1>\n"
 
-#: ../src/gtkconv.c:975
+#: ../src/gtkconv.c:974
 msgid "Save Conversation"
 msgstr "Tallenna keskustelu"
 
-#: ../src/gtkconv.c:1096 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
+#: ../src/gtkconv.c:1095 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
 msgid "Find"
 msgstr "Etsi"
 
-#: ../src/gtkconv.c:1122 ../src/gtkdebug.c:193
+#: ../src/gtkconv.c:1121 ../src/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "_Haettava termi:"
 
-#: ../src/gtkconv.c:1293
+#: ../src/gtkconv.c:1292
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Kirjaaminen lokiin aloitettu. Tämän keskustelun viestit kirjataan nyt lokiin."
 
-#: ../src/gtkconv.c:1301
+#: ../src/gtkconv.c:1300
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
@@ -2963,246 +2997,258 @@
 msgid "Last said"
 msgstr "Viimeksi sanottu"
 
-#: ../src/gtkconv.c:2400
+#: ../src/gtkconv.c:2378
 msgid "Unable to save icon file to disk."
 msgstr "Kuvaketiedostoa ei voida tallentaa levylle."
 
-#: ../src/gtkconv.c:2424
+#: ../src/gtkconv.c:2402
 msgid "Save Icon"
 msgstr "Tallenna kuvake"
 
-#: ../src/gtkconv.c:2473
+#: ../src/gtkconv.c:2451
 msgid "Animate"
 msgstr "Animoi"
 
-#: ../src/gtkconv.c:2478
+#: ../src/gtkconv.c:2456
 msgid "Hide Icon"
 msgstr "Piilota kuvake"
 
-#: ../src/gtkconv.c:2484
+#: ../src/gtkconv.c:2462
 msgid "Save Icon As..."
 msgstr "Tallenna kuvake nimellä..."
 
 #. Conversation menu
-#: ../src/gtkconv.c:2625
+#: ../src/gtkconv.c:2602
 msgid "/_Conversation"
 msgstr "/_Keskustelu"
 
-#: ../src/gtkconv.c:2627
+#: ../src/gtkconv.c:2604
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Keskustelu/Uusi _pikaviesti..."
 
-#: ../src/gtkconv.c:2632
+#: ../src/gtkconv.c:2609
 msgid "/Conversation/_Find..."
 msgstr "/Keskustelu/_Etsi..."
 
-#: ../src/gtkconv.c:2634
+#: ../src/gtkconv.c:2611
 msgid "/Conversation/View _Log"
-msgstr "/Keskustelu/Näytä _loki..."
-
-#: ../src/gtkconv.c:2635
+msgstr "/Keskustelu/Näytä l_oki..."
+
+#: ../src/gtkconv.c:2612
 msgid "/Conversation/_Save As..."
 msgstr "/Keskustelu/_Tallenna nimellä..."
 
-#: ../src/gtkconv.c:2637
+#: ../src/gtkconv.c:2614
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Keskustelu/T_yhjennä takaisinvieritys"
 
-#: ../src/gtkconv.c:2641
+#: ../src/gtkconv.c:2618
 msgid "/Conversation/Se_nd File..."
 msgstr "/Keskustelu/_Lähetä tiedosto..."
 
-#: ../src/gtkconv.c:2642
+#: ../src/gtkconv.c:2619
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Keskustelu/Lisää tuttava_ilmoitin..."
 
-#: ../src/gtkconv.c:2644
+#: ../src/gtkconv.c:2621
 msgid "/Conversation/_Get Info"
 msgstr "/Keskustelu/_Hae tiedot..."
 
-#: ../src/gtkconv.c:2646
+#: ../src/gtkconv.c:2623
 msgid "/Conversation/In_vite..."
 msgstr "/Keskustelu/Kut_su..."
 
-#: ../src/gtkconv.c:2651
+#: ../src/gtkconv.c:2625
+msgid "/Conversation/M_ore"
+msgstr "/Keskustelu/Lis_ää"
+
+#: ../src/gtkconv.c:2629
 msgid "/Conversation/Al_ias..."
 msgstr "/Keskustelu/_Alias..."
 
-#: ../src/gtkconv.c:2653
+#: ../src/gtkconv.c:2631
 msgid "/Conversation/_Block..."
 msgstr "/Keskustelu/E_stä..."
 
-#: ../src/gtkconv.c:2655
+#: ../src/gtkconv.c:2633
 msgid "/Conversation/_Add..."
 msgstr "/Keskustelu/_Lisää..."
 
-#: ../src/gtkconv.c:2657
+#: ../src/gtkconv.c:2635
 msgid "/Conversation/_Remove..."
 msgstr "/Keskustelu/_Poista..."
 
-#: ../src/gtkconv.c:2662
+#: ../src/gtkconv.c:2640
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Keskustelu/Lisää lin_kki..."
 
-#: ../src/gtkconv.c:2664
+#: ../src/gtkconv.c:2642
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Keskustelu/Liitä _kuva..."
 
-#: ../src/gtkconv.c:2669
+#: ../src/gtkconv.c:2647
 msgid "/Conversation/_Close"
 msgstr "/Keskustelu/_Sulje"
 
 #. Options
-#: ../src/gtkconv.c:2673
+#: ../src/gtkconv.c:2651
 msgid "/_Options"
 msgstr "/_Valinnat"
 
-#: ../src/gtkconv.c:2674
+#: ../src/gtkconv.c:2652
 msgid "/Options/Enable _Logging"
 msgstr "/Valinnat/_Lokiinkirjaus"
 
-#: ../src/gtkconv.c:2675
+#: ../src/gtkconv.c:2653
 msgid "/Options/Enable _Sounds"
 msgstr "/Valinnat/S_oita merkkiäänet"
 
-#: ../src/gtkconv.c:2676
+#: ../src/gtkconv.c:2654
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Valinnat/Näytä tuttava_kuvake"
 
-#: ../src/gtkconv.c:2678
+#: ../src/gtkconv.c:2656
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Valinnat/Näytä muokkaus-_työkalurivit"
 
-#: ../src/gtkconv.c:2679
+#: ../src/gtkconv.c:2657
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Valinnat/Näytä aika_leima"
 
-#: ../src/gtkconv.c:2771
+#: ../src/gtkconv.c:2732
+msgid "/Conversation/More"
+msgstr "/Keskustelu/Lisää"
+
+#: ../src/gtkconv.c:2770 ../src/gtkconv.c:2797
+msgid "/Conversation"
+msgstr "/Keskustelu"
+
+#: ../src/gtkconv.c:2807
 msgid "/Conversation/View Log"
 msgstr "/Keskustelu/Näytä loki..."
 
-#: ../src/gtkconv.c:2777
+#: ../src/gtkconv.c:2813
 msgid "/Conversation/Send File..."
 msgstr "/Keskustelu/Lähetä tiedosto..."
 
-#: ../src/gtkconv.c:2781
+#: ../src/gtkconv.c:2817
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Keskustelu/Lisää tuttavailmoitin..."
 
-#: ../src/gtkconv.c:2787
+#: ../src/gtkconv.c:2823
 msgid "/Conversation/Get Info"
 msgstr "/Keskustelu/Hae tiedot..."
 
-#: ../src/gtkconv.c:2791
+#: ../src/gtkconv.c:2827
 msgid "/Conversation/Invite..."
 msgstr "/Keskustelu/Kutsu..."
 
-#: ../src/gtkconv.c:2797
+#: ../src/gtkconv.c:2833
 msgid "/Conversation/Alias..."
 msgstr "/Keskustelu/Alias..."
 
-#: ../src/gtkconv.c:2801
+#: ../src/gtkconv.c:2837
 msgid "/Conversation/Block..."
 msgstr "/Keskustelu/Estä..."
 
-#: ../src/gtkconv.c:2805
+#: ../src/gtkconv.c:2841
 msgid "/Conversation/Add..."
 msgstr "/Keskustelu/Lisää..."
 
-#: ../src/gtkconv.c:2809
+#: ../src/gtkconv.c:2845
 msgid "/Conversation/Remove..."
 msgstr "/Keskustelu/Poista..."
 
-#: ../src/gtkconv.c:2815
+#: ../src/gtkconv.c:2851
 msgid "/Conversation/Insert Link..."
 msgstr "/Keskustelu/Lisää linkki..."
 
-#: ../src/gtkconv.c:2819
+#: ../src/gtkconv.c:2855
 msgid "/Conversation/Insert Image..."
 msgstr "/Keskustelu/Lisää kuva..."
 
-#: ../src/gtkconv.c:2825
+#: ../src/gtkconv.c:2861
 msgid "/Options/Enable Logging"
 msgstr "/Valinnat/Lokiinkirjaus"
 
-#: ../src/gtkconv.c:2828
+#: ../src/gtkconv.c:2864
 msgid "/Options/Enable Sounds"
 msgstr "/Valinnat/Soita merkkiäänet"
 
-#: ../src/gtkconv.c:2841
+#: ../src/gtkconv.c:2877
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Valinnat/Näytä muokkaustyökalurivit"
 
-#: ../src/gtkconv.c:2844
+#: ../src/gtkconv.c:2880
 msgid "/Options/Show Timestamps"
 msgstr "/Valinnat/Näytä aikaleima"
 
-#: ../src/gtkconv.c:2847
+#: ../src/gtkconv.c:2883
 msgid "/Options/Show Buddy Icon"
 msgstr "/Valinnat/Näytä tuttava_kuvake"
 
-#: ../src/gtkconv.c:2927
+#: ../src/gtkconv.c:2963
 msgid "User is typing..."
 msgstr "Käyttäjä kirjoittaa..."
 
-#: ../src/gtkconv.c:2930
+#: ../src/gtkconv.c:2966
 msgid "User has typed something and stopped"
 msgstr "Käyttäjä kirjoitti jotain ja keskeytti"
 
 #. Build the Send To menu
-#: ../src/gtkconv.c:3113
+#: ../src/gtkconv.c:3149
 msgid "_Send To"
 msgstr "_Lähetä käyttäjälle"
 
-#: ../src/gtkconv.c:3765
+#: ../src/gtkconv.c:3801
 msgid "_Send"
 msgstr "_Lähetä"
 
-#: ../src/gtkconv.c:3820 ../src/protocols/sametime/sametime.c:3571
+#: ../src/gtkconv.c:3856 ../src/protocols/sametime/sametime.c:3564
 msgid "Topic:"
 msgstr "Aihe:"
 
 #. Setup the label telling how many people are in the room.
-#: ../src/gtkconv.c:3872
+#: ../src/gtkconv.c:3908
 msgid "0 people in room"
 msgstr "0 ihmistä huoneessa"
 
-#: ../src/gtkconv.c:3951
+#: ../src/gtkconv.c:3987
 msgid "IM the user"
 msgstr "Lähetä pikaviesti käyttäjälle"
 
-#: ../src/gtkconv.c:3964
+#: ../src/gtkconv.c:4000
 msgid "Ignore the user"
 msgstr "Älä huomioi käyttäjää"
 
-#: ../src/gtkconv.c:3976
+#: ../src/gtkconv.c:4012
 msgid "Get the user's information"
 msgstr "Hae käyttäjätiedot"
 
-#: ../src/gtkconv.c:4958 ../src/gtkconv.c:5067
+#: ../src/gtkconv.c:4998 ../src/gtkconv.c:5107
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d ihminen huoneessa"
 msgstr[1] "%d ihmistä huoneessa"
 
-#: ../src/gtkconv.c:5624 ../src/gtkstatusbox.c:366
+#: ../src/gtkconv.c:5664 ../src/gtkstatusbox.c:366
 msgid "Typing"
 msgstr "Kirjoittaa"
 
-#: ../src/gtkconv.c:5630
+#: ../src/gtkconv.c:5670
 msgid "Stopped Typing"
 msgstr "Lopetti kirjoittamisen"
 
-#: ../src/gtkconv.c:5635
+#: ../src/gtkconv.c:5675
 msgid "Nick Said"
 msgstr "Sanoi"
 
-#: ../src/gtkconv.c:5645
+#: ../src/gtkconv.c:5685
 msgid "New Event"
 msgstr "Uusi tapahtuma"
 
-#: ../src/gtkconv.c:6547
+#: ../src/gtkconv.c:6575
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -3210,73 +3256,73 @@
 "say &lt;viesti&gt;: Lähetä viesti normaalisti, niin kuin et olisi "
 "käyttämässä komentoa."
 
-#: ../src/gtkconv.c:6550
+#: ../src/gtkconv.c:6578
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;toiminta&gt;: Lähetä IRC-tyylinen toiminta tuttavalle tai "
 "keskusteluun."
 
-#: ../src/gtkconv.c:6553
+#: ../src/gtkconv.c:6581
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr ""
 "debug &lt;valinta&gt;: Lähetä eri debug-tietoja senhetkiseen keskusteluun."
 
-#: ../src/gtkconv.c:6556
+#: ../src/gtkconv.c:6584
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Tyhjentää keskustelun"
 
-#: ../src/gtkconv.c:6559
+#: ../src/gtkconv.c:6587
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;komento&gt;: Ohje tietylle komennolle."
 
-#: ../src/gtkconv.c:6718
+#: ../src/gtkconv.c:6746
 msgid "Confirm close"
 msgstr "Vahvista sulkeminen"
 
-#: ../src/gtkconv.c:6750
+#: ../src/gtkconv.c:6778
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr ""
 "Sinulla on lukemattomia viestejä. Haluatko varmasti sulkea tämän ikkunan?"
 
-#: ../src/gtkconv.c:7272
+#: ../src/gtkconv.c:7300
 msgid "Close other tabs"
 msgstr "Sulje muut välilehdet"
 
-#: ../src/gtkconv.c:7278
+#: ../src/gtkconv.c:7306
 msgid "Close all tabs"
 msgstr "Sulje kaikki välilehdet"
 
-#: ../src/gtkconv.c:7286
+#: ../src/gtkconv.c:7314
 msgid "Detach this tab"
 msgstr "Irrota tämä välilehti"
 
-#: ../src/gtkconv.c:7292
+#: ../src/gtkconv.c:7320
 msgid "Close this tab"
 msgstr "Sulje tämä välilehti"
 
-#: ../src/gtkconv.c:7554
+#: ../src/gtkconv.c:7580
 msgid "Close conversation"
 msgstr "Sulje keskustelu"
 
-#: ../src/gtkconv.c:8018
+#: ../src/gtkconv.c:8044
 msgid "Last created window"
 msgstr "Viimeksi luotu ikkuna"
 
-#: ../src/gtkconv.c:8020
+#: ../src/gtkconv.c:8046
 msgid "Separate IM and Chat windows"
 msgstr "Näytä pikaviestit ja ryhmäkeskustelut eri ikkunoissa"
 
-#: ../src/gtkconv.c:8022 ../src/gtkprefs.c:1243
+#: ../src/gtkconv.c:8048 ../src/gtkprefs.c:1258
 msgid "New window"
 msgstr "Uusi ikkuna"
 
-#: ../src/gtkconv.c:8024
+#: ../src/gtkconv.c:8050
 msgid "By group"
 msgstr "Ryhmän mukaan"
 
-#: ../src/gtkconv.c:8026
+#: ../src/gtkconv.c:8052
 msgid "By account"
 msgstr "Tilin mukaan"
 
@@ -3316,7 +3362,7 @@
 msgid "Right click for more options."
 msgstr "Näytä lisää valintoja oikealla hiiren painikkeella."
 
-#: ../src/gtkdialogs.c:61 ../src/gtkdialogs.c:103
+#: ../src/gtkdialogs.c:61 ../src/gtkdialogs.c:104
 msgid "lead developer"
 msgstr "pääkehittäjä"
 
@@ -3348,210 +3394,219 @@
 msgid "libfaim maintainer"
 msgstr "libfaim-ylläpitäjä"
 
-#: ../src/gtkdialogs.c:100
+#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
+#: ../src/gtkdialogs.c:101
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hakkeri ja kuski [laiska pummi]"
 
-#: ../src/gtkdialogs.c:101
+#: ../src/gtkdialogs.c:102
 msgid "Jabber developer"
 msgstr "Jabber-kehittäjä"
 
-#: ../src/gtkdialogs.c:102
+#: ../src/gtkdialogs.c:103
 msgid "original author"
 msgstr "alkuperäinen tekijä"
 
-#: ../src/gtkdialogs.c:109 ../src/gtkdialogs.c:110 ../src/gtkdialogs.c:168
+#: ../src/gtkdialogs.c:110 ../src/gtkdialogs.c:111 ../src/gtkdialogs.c:174
 msgid "Bulgarian"
 msgstr "bulgaria"
 
-#: ../src/gtkdialogs.c:111 ../src/gtkdialogs.c:112
+#: ../src/gtkdialogs.c:112 ../src/gtkdialogs.c:113
 msgid "Bengali"
 msgstr "bengali"
 
-#: ../src/gtkdialogs.c:113
+#: ../src/gtkdialogs.c:114
 msgid "Bosnian"
 msgstr "bosnia"
 
-#: ../src/gtkdialogs.c:114 ../src/gtkdialogs.c:169 ../src/gtkdialogs.c:170
+#: ../src/gtkdialogs.c:115 ../src/gtkdialogs.c:175 ../src/gtkdialogs.c:176
 msgid "Catalan"
 msgstr "katalaani"
 
-#: ../src/gtkdialogs.c:115
-msgid "Valencian"
-msgstr "valencia"
-
-#: ../src/gtkdialogs.c:116 ../src/gtkdialogs.c:171
+#: ../src/gtkdialogs.c:116 ../src/gtkdialogs.c:117
+msgid "Valencian-Catalan"
+msgstr "valencian katalaani"
+
+#: ../src/gtkdialogs.c:118 ../src/gtkdialogs.c:177
 msgid "Czech"
 msgstr "tšekki"
 
-#: ../src/gtkdialogs.c:117
+#: ../src/gtkdialogs.c:119
 msgid "Danish"
 msgstr "tanska"
 
-#: ../src/gtkdialogs.c:118 ../src/gtkdialogs.c:119 ../src/gtkdialogs.c:172
+#: ../src/gtkdialogs.c:120 ../src/gtkdialogs.c:121 ../src/gtkdialogs.c:178
 msgid "German"
 msgstr "saksa"
 
-#: ../src/gtkdialogs.c:120 ../src/gtkdialogs.c:121
+#: ../src/gtkdialogs.c:122 ../src/gtkdialogs.c:123
 msgid "Greek"
 msgstr "kreikka"
 
-#: ../src/gtkdialogs.c:122
+#: ../src/gtkdialogs.c:124
 msgid "Australian English"
 msgstr "australian englanti"
 
-#: ../src/gtkdialogs.c:123
+#: ../src/gtkdialogs.c:125
 msgid "Canadian English"
 msgstr "kanadan englanti"
 
-#: ../src/gtkdialogs.c:124
+#: ../src/gtkdialogs.c:126
 msgid "British English"
 msgstr "brittienglanti"
 
-#: ../src/gtkdialogs.c:125 ../src/gtkdialogs.c:173 ../src/gtkdialogs.c:174
-#: ../src/gtkdialogs.c:175 ../src/gtkdialogs.c:176
+#: ../src/gtkdialogs.c:127 ../src/gtkdialogs.c:179 ../src/gtkdialogs.c:180
+#: ../src/gtkdialogs.c:181 ../src/gtkdialogs.c:182
 msgid "Spanish"
 msgstr "espanja"
 
-#: ../src/gtkdialogs.c:126 ../src/gtkdialogs.c:127
+#: ../src/gtkdialogs.c:128 ../src/gtkdialogs.c:129
+msgid "Euskera(Basque)"
+msgstr "euskara (baski)"
+
+#: ../src/gtkdialogs.c:130 ../src/gtkdialogs.c:131
 msgid "Persian"
 msgstr "persia"
 
-#: ../src/gtkdialogs.c:128 ../src/gtkdialogs.c:177 ../src/gtkdialogs.c:178
+#: ../src/gtkdialogs.c:132 ../src/gtkdialogs.c:183 ../src/gtkdialogs.c:184
 msgid "Finnish"
 msgstr "suomi"
 
-#: ../src/gtkdialogs.c:129 ../src/gtkdialogs.c:179 ../src/gtkdialogs.c:180
-#: ../src/gtkdialogs.c:181 ../src/gtkdialogs.c:182
+#: ../src/gtkdialogs.c:133 ../src/gtkdialogs.c:185 ../src/gtkdialogs.c:186
+#: ../src/gtkdialogs.c:187 ../src/gtkdialogs.c:188
 msgid "French"
 msgstr "ranska"
 
-#: ../src/gtkdialogs.c:130
+#: ../src/gtkdialogs.c:134
 msgid "Galician"
 msgstr "galego"
 
-#: ../src/gtkdialogs.c:131
+#: ../src/gtkdialogs.c:135 ../src/gtkdialogs.c:189
 msgid "Hebrew"
 msgstr "heprea"
 
-#: ../src/gtkdialogs.c:132
+#: ../src/gtkdialogs.c:136
 msgid "Hindi"
 msgstr "hindi"
 
-#: ../src/gtkdialogs.c:133
+#: ../src/gtkdialogs.c:137
 msgid "Hungarian"
 msgstr "unkari"
 
-#: ../src/gtkdialogs.c:134 ../src/gtkdialogs.c:183
+#: ../src/gtkdialogs.c:138 ../src/gtkdialogs.c:190
 msgid "Italian"
 msgstr "italia"
 
-#: ../src/gtkdialogs.c:135 ../src/gtkdialogs.c:184 ../src/gtkdialogs.c:185
-#: ../src/gtkdialogs.c:186
+#: ../src/gtkdialogs.c:139 ../src/gtkdialogs.c:191 ../src/gtkdialogs.c:192
+#: ../src/gtkdialogs.c:193
 msgid "Japanese"
 msgstr "japani"
 
-#: ../src/gtkdialogs.c:136 ../src/gtkdialogs.c:187
+#: ../src/gtkdialogs.c:140 ../src/gtkdialogs.c:194
 msgid "Georgian"
 msgstr "georgia"
 
-#: ../src/gtkdialogs.c:137 ../src/gtkdialogs.c:188
+#: ../src/gtkdialogs.c:141 ../src/gtkdialogs.c:195
 msgid "Korean"
 msgstr "korea"
 
-#: ../src/gtkdialogs.c:138 ../src/gtkdialogs.c:139 ../src/gtkdialogs.c:140
+#: ../src/gtkdialogs.c:142 ../src/gtkdialogs.c:143 ../src/gtkdialogs.c:144
 msgid "Kurdish"
 msgstr "kurdi"
 
-#: ../src/gtkdialogs.c:141 ../src/gtkdialogs.c:189 ../src/gtkdialogs.c:190
+#: ../src/gtkdialogs.c:145 ../src/gtkdialogs.c:196 ../src/gtkdialogs.c:197
 msgid "Lithuanian"
 msgstr "liettua"
 
-#: ../src/gtkdialogs.c:142
+#: ../src/gtkdialogs.c:146
 msgid "Macedonian"
 msgstr "makedonia"
 
-#: ../src/gtkdialogs.c:143
+#: ../src/gtkdialogs.c:147
 msgid "Dutch, Flemish"
 msgstr "hollanti, flaami"
 
-#: ../src/gtkdialogs.c:144
+#: ../src/gtkdialogs.c:148
 msgid "Norwegian"
 msgstr "norja"
 
-#: ../src/gtkdialogs.c:145 ../src/gtkdialogs.c:146 ../src/gtkdialogs.c:191
+#: ../src/gtkdialogs.c:149 ../src/gtkdialogs.c:150 ../src/gtkdialogs.c:198
 msgid "Polish"
 msgstr "puola"
 
-#: ../src/gtkdialogs.c:147
+#: ../src/gtkdialogs.c:151
 msgid "Portuguese"
 msgstr "portugali"
 
-#: ../src/gtkdialogs.c:148
+#: ../src/gtkdialogs.c:152
 msgid "Portuguese-Brazil"
 msgstr "portugali (brasilialainen)"
 
-#: ../src/gtkdialogs.c:149
+#: ../src/gtkdialogs.c:153
 msgid "Romanian"
 msgstr "romania"
 
-#: ../src/gtkdialogs.c:150 ../src/gtkdialogs.c:192 ../src/gtkdialogs.c:193
+#: ../src/gtkdialogs.c:154 ../src/gtkdialogs.c:199 ../src/gtkdialogs.c:200
 msgid "Russian"
 msgstr "venäjä"
 
-#: ../src/gtkdialogs.c:151 ../src/gtkdialogs.c:152
+#: ../src/gtkdialogs.c:155 ../src/gtkdialogs.c:156
 msgid "Serbian"
 msgstr "serbia"
 
-#: ../src/gtkdialogs.c:153
-msgid "Slovenian"
-msgstr "sloveeni"
-
-#: ../src/gtkdialogs.c:154 ../src/gtkdialogs.c:195
-msgid "Swedish"
-msgstr "ruotsi"
-
-#: ../src/gtkdialogs.c:155
-msgid "Tamil"
-msgstr "tamil"
-
-#: ../src/gtkdialogs.c:156
-msgid "Telugu"
-msgstr "telugu"
-
-#: ../src/gtkdialogs.c:157
-msgid "Turkish"
-msgstr "turkki"
-
-#: ../src/gtkdialogs.c:158
-msgid "Vietnamese"
-msgstr "vietnam"
+#: ../src/gtkdialogs.c:157 ../src/gtkdialogs.c:201
+msgid "Slovak"
+msgstr "slovakki"
 
 #: ../src/gtkdialogs.c:158
+msgid "Slovenian"
+msgstr "sloveeni"
+
+#: ../src/gtkdialogs.c:159 ../src/gtkdialogs.c:202
+msgid "Swedish"
+msgstr "ruotsi"
+
+#: ../src/gtkdialogs.c:160
+msgid "Tamil"
+msgstr "tamil"
+
+#: ../src/gtkdialogs.c:161
+msgid "Telugu"
+msgstr "telugu"
+
+#: ../src/gtkdialogs.c:162
+msgid "Thai"
+msgstr "thai"
+
+#: ../src/gtkdialogs.c:163
+msgid "Turkish"
+msgstr "turkki"
+
+#: ../src/gtkdialogs.c:164
+msgid "Vietnamese"
+msgstr "vietnam"
+
+#: ../src/gtkdialogs.c:164
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M Thanh ja Gnomen Vi-työryhmä"
 
-#: ../src/gtkdialogs.c:159 ../src/gtkdialogs.c:196
+#: ../src/gtkdialogs.c:165 ../src/gtkdialogs.c:203
 msgid "Simplified Chinese"
 msgstr "kiina (yksinkertaistettu)"
 
-#: ../src/gtkdialogs.c:160 ../src/gtkdialogs.c:161 ../src/gtkdialogs.c:197
+#: ../src/gtkdialogs.c:166 ../src/gtkdialogs.c:167 ../src/gtkdialogs.c:204
 msgid "Traditional Chinese"
 msgstr "kiina (perinteinen)"
 
-#: ../src/gtkdialogs.c:167
+#: ../src/gtkdialogs.c:173
 msgid "Amharic"
 msgstr "amhara"
 
-#: ../src/gtkdialogs.c:194
-msgid "Slovak"
-msgstr "slovakki"
-
-#: ../src/gtkdialogs.c:238
+#: ../src/gtkdialogs.c:245
 msgid "About Gaim"
 msgstr "Tietoja Gaimista"
 
-#: ../src/gtkdialogs.c:262
+#: ../src/gtkdialogs.c:269
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
@@ -3572,111 +3627,111 @@
 "osallistuneista löytyy 'COPYRIGHT'-tiedostosta. Emme anna ohjelmalle "
 "minkäänlaista takuuta.<BR><BR>"
 
-#: ../src/gtkdialogs.c:276
+#: ../src/gtkdialogs.c:283
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> #wingaim palvelimella irc.freenode.net<BR><BR>"
 
-#: ../src/gtkdialogs.c:279
+#: ../src/gtkdialogs.c:286
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> #gaim palvelimella irc.freenode.net<BR><BR>"
 
-#: ../src/gtkdialogs.c:285
+#: ../src/gtkdialogs.c:292
 msgid "Current Developers"
 msgstr "Nykyiset kehittäjät"
 
-#: ../src/gtkdialogs.c:300
+#: ../src/gtkdialogs.c:307
 msgid "Crazy Patch Writers"
 msgstr "Villit korjauspäivitysten kirjoittajat"
 
-#: ../src/gtkdialogs.c:315
+#: ../src/gtkdialogs.c:322
 msgid "Retired Developers"
 msgstr "Lopettaneet kehittäjät"
 
-#: ../src/gtkdialogs.c:330
+#: ../src/gtkdialogs.c:337
 msgid "Current Translators"
 msgstr "Nykyiset kielenkääntäjät"
 
-#: ../src/gtkdialogs.c:350
+#: ../src/gtkdialogs.c:357
 msgid "Past Translators"
 msgstr "Aikaisemmat kielenkääntäjät"
 
-#: ../src/gtkdialogs.c:368
+#: ../src/gtkdialogs.c:375
 msgid "Debugging Information"
 msgstr "Virheenjäljitystietoja"
 
-#: ../src/gtkdialogs.c:582 ../src/gtkdialogs.c:719 ../src/gtkdialogs.c:782
+#: ../src/gtkdialogs.c:589 ../src/gtkdialogs.c:726 ../src/gtkdialogs.c:789
 msgid "_Name"
 msgstr "_Nimi"
 
-#: ../src/gtkdialogs.c:587 ../src/gtkdialogs.c:724 ../src/gtkdialogs.c:787
+#: ../src/gtkdialogs.c:594 ../src/gtkdialogs.c:731 ../src/gtkdialogs.c:794
 msgid "_Account"
 msgstr "_Käyttäjätili"
 
-#: ../src/gtkdialogs.c:595
+#: ../src/gtkdialogs.c:602
 msgid "New Instant Message"
 msgstr "Uusi pikaviesti"
 
-#: ../src/gtkdialogs.c:597
+#: ../src/gtkdialogs.c:604
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
 "Syötä sen henkilön näyttönimi tai lempinimi, jolle haluat lähettää "
 "pikaviestin."
 
-#: ../src/gtkdialogs.c:732
+#: ../src/gtkdialogs.c:739
 msgid "Get User Info"
 msgstr "Hae käyttäjätiedot"
 
-#: ../src/gtkdialogs.c:734
+#: ../src/gtkdialogs.c:741
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr ""
 "Syötä sen henkilön näyttönimi tai lempinimi, jonka tiedot haluat nähdä."
 
-#: ../src/gtkdialogs.c:796
+#: ../src/gtkdialogs.c:803
 msgid "View User Log"
 msgstr "Näytä käyttäjäloki"
 
-#: ../src/gtkdialogs.c:798
+#: ../src/gtkdialogs.c:805
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr "Syötä sen henkilön näyttönimi jonka lokia haluat katsella."
 
-#: ../src/gtkdialogs.c:817
+#: ../src/gtkdialogs.c:824
 msgid "Alias Contact"
 msgstr "Anna kontaktiryhmälle lempinimi"
 
-#: ../src/gtkdialogs.c:818
+#: ../src/gtkdialogs.c:825
 msgid "Enter an alias for this contact."
 msgstr "Anna lempinimi tälle kontaktiryhmälle."
 
-#: ../src/gtkdialogs.c:820 ../src/gtkdialogs.c:842 ../src/gtkdialogs.c:862
-#: ../src/gtkrequest.c:277 ../src/protocols/silc/chat.c:586
+#: ../src/gtkdialogs.c:827 ../src/gtkdialogs.c:849 ../src/gtkdialogs.c:869
+#: ../src/gtkrequest.c:277 ../src/protocols/silc/chat.c:587
 msgid "Alias"
 msgstr "Alias"
 
-#: ../src/gtkdialogs.c:838
+#: ../src/gtkdialogs.c:845
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Anna %s:n lempinimi."
 
-#: ../src/gtkdialogs.c:840
+#: ../src/gtkdialogs.c:847
 msgid "Alias Buddy"
 msgstr "Anna tuttavalle lempinimi"
 
-#: ../src/gtkdialogs.c:859
+#: ../src/gtkdialogs.c:866
 msgid "Alias Chat"
 msgstr "Anna ryhmäkeskustelulle lempinimi"
 
-#: ../src/gtkdialogs.c:860
+#: ../src/gtkdialogs.c:867
 msgid "Enter an alias for this chat."
 msgstr "Syötä lempinimi tälle ryhmäkeskustelulle."
 
-#: ../src/gtkdialogs.c:897
+#: ../src/gtkdialogs.c:904
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -3691,15 +3746,15 @@
 "Olet poistamassa kontaktin, jossa on %s sekä %d muuta tuttavaa "
 "tuttavalistaltasi.  Haluatko jatkaa?"
 
-#: ../src/gtkdialogs.c:905
+#: ../src/gtkdialogs.c:912
 msgid "Remove Contact"
 msgstr "Poista kontakti"
 
-#: ../src/gtkdialogs.c:906
+#: ../src/gtkdialogs.c:913
 msgid "_Remove Contact"
 msgstr "_Poista kontakti"
 
-#: ../src/gtkdialogs.c:957
+#: ../src/gtkdialogs.c:964
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -3707,29 +3762,29 @@
 msgstr ""
 "Olet poistamassa ryhmää nimeltä \"%s\" tuttavalistaltasi.  Haluatko jatkaa?"
 
-#: ../src/gtkdialogs.c:960
+#: ../src/gtkdialogs.c:967
 msgid "Remove Group"
 msgstr "Poista ryhmä"
 
-#: ../src/gtkdialogs.c:961
+#: ../src/gtkdialogs.c:968
 msgid "_Remove Group"
 msgstr "_Poista ryhmä"
 
-#: ../src/gtkdialogs.c:994
+#: ../src/gtkdialogs.c:1001
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Olet poistamassa \"%s\":n tuttavalistaltasi.  Haluatko jatkaa?"
 
-#: ../src/gtkdialogs.c:997
+#: ../src/gtkdialogs.c:1004
 msgid "Remove Buddy"
 msgstr "Poista tuttava"
 
-#: ../src/gtkdialogs.c:998
+#: ../src/gtkdialogs.c:1005
 msgid "_Remove Buddy"
 msgstr "_Poista tuttava"
 
-#: ../src/gtkdialogs.c:1019
+#: ../src/gtkdialogs.c:1026
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -3738,11 +3793,11 @@
 "Olet poistamassa ryhmäkeskustelun nimeltä \"%s\" tuttavalistaltasi. Haluatko "
 "jatkaa?"
 
-#: ../src/gtkdialogs.c:1022
+#: ../src/gtkdialogs.c:1029
 msgid "Remove Chat"
 msgstr "Poista ryhmäkeskustelu"
 
-#: ../src/gtkdialogs.c:1023
+#: ../src/gtkdialogs.c:1030
 msgid "_Remove Chat"
 msgstr "_Poista ryhmäkeskustelu"
 
@@ -4206,7 +4261,7 @@
 msgid "Open All Messages"
 msgstr "Avaa kaikki viestit"
 
-#: ../src/gtknotify.c:411 ../src/protocols/jabber/jabber.c:1115
+#: ../src/gtknotify.c:411 ../src/protocols/jabber/jabber.c:1113
 msgid "From"
 msgstr "Lähettäjä"
 
@@ -4236,11 +4291,11 @@
 "\n"
 "%s"
 
-#: ../src/gtknotify.c:688 ../src/protocols/sametime/sametime.c:5458
+#: ../src/gtknotify.c:688 ../src/protocols/sametime/sametime.c:5451
 msgid "Search Results"
 msgstr "Hakutulokset"
 
-#: ../src/gtknotify.c:844 ../src/protocols/oscar/oscar.c:2633
+#: ../src/gtknotify.c:844 ../src/protocols/oscar/oscar.c:2634
 #, c-format
 msgid "Info for %s"
 msgstr "%s tiedot"
@@ -4311,185 +4366,185 @@
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Liitännäisen yksityiskohdat</b>"
 
-#: ../src/gtkpounce.c:162
+#: ../src/gtkpounce.c:154
 msgid "Select a file"
 msgstr "Valitse tiedosto"
 
-#: ../src/gtkpounce.c:259
+#: ../src/gtkpounce.c:251
 msgid "Please enter a buddy to pounce."
 msgstr "Syötä ilmoitettava tuttava."
 
-#: ../src/gtkpounce.c:503
+#: ../src/gtkpounce.c:495
 msgid "New Buddy Pounce"
 msgstr "Uusi tuttavailmoitin"
 
-#: ../src/gtkpounce.c:503
+#: ../src/gtkpounce.c:495
 msgid "Edit Buddy Pounce"
 msgstr "Muokkaa tuttavailmoitinta"
 
 #. Create the "Pounce on Whom" frame.
-#: ../src/gtkpounce.c:520
+#: ../src/gtkpounce.c:512
 msgid "Pounce on Whom"
 msgstr "Kenestä ilmoitetaan"
 
-#: ../src/gtkpounce.c:547
+#: ../src/gtkpounce.c:539
 msgid "_Buddy name:"
 msgstr "_Tuttavan nimi:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../src/gtkpounce.c:573
+#: ../src/gtkpounce.c:565
 msgid "Pounce When Buddy..."
 msgstr "Ilmoita kun tuttava..."
 
-#: ../src/gtkpounce.c:581
+#: ../src/gtkpounce.c:573
 msgid "Si_gns on"
 msgstr "_kirjautuu sisään"
 
-#: ../src/gtkpounce.c:583
+#: ../src/gtkpounce.c:575
 msgid "Signs o_ff"
 msgstr "kirjautuu _ulos"
 
-#: ../src/gtkpounce.c:585
+#: ../src/gtkpounce.c:577
 msgid "Goes a_way"
 msgstr "poi_stuu"
 
-#: ../src/gtkpounce.c:587
+#: ../src/gtkpounce.c:579
 msgid "Ret_urns from away"
 msgstr "_palaa"
 
-#: ../src/gtkpounce.c:589
+#: ../src/gtkpounce.c:581
 msgid "Becomes _idle"
 msgstr "on _jouten"
 
-#: ../src/gtkpounce.c:591
+#: ../src/gtkpounce.c:583
 msgid "Is no longer i_dle"
 msgstr "ei enää ole j_outen"
 
-#: ../src/gtkpounce.c:593
+#: ../src/gtkpounce.c:585
 msgid "Starts _typing"
 msgstr "_alkaa kirjoittaa"
 
-#: ../src/gtkpounce.c:595
+#: ../src/gtkpounce.c:587
 msgid "Stops t_yping"
 msgstr "lope_ttaa kirjoittamisen"
 
-#: ../src/gtkpounce.c:597
+#: ../src/gtkpounce.c:589
 msgid "Sends a _message"
 msgstr "lähettää _viestin"
 
 #. Create the "Action" frame.
-#: ../src/gtkpounce.c:629
+#: ../src/gtkpounce.c:621
 msgid "Action"
 msgstr "Toiminto"
 
-#: ../src/gtkpounce.c:637
+#: ../src/gtkpounce.c:629
 msgid "Ope_n an IM window"
 msgstr "Avaa pikav_iesti-ikkuna"
 
-#: ../src/gtkpounce.c:639
+#: ../src/gtkpounce.c:631
 msgid "_Pop up a notification"
 msgstr "_Ponnahdusilmoitus"
 
-#: ../src/gtkpounce.c:641
+#: ../src/gtkpounce.c:633
 msgid "Send a _message"
 msgstr "Lähetä _viesti"
 
-#: ../src/gtkpounce.c:643
+#: ../src/gtkpounce.c:635
 msgid "E_xecute a command"
 msgstr "Suorita _komento"
 
-#: ../src/gtkpounce.c:645
+#: ../src/gtkpounce.c:637
 msgid "P_lay a sound"
 msgstr "S_oita ääni"
 
-#: ../src/gtkpounce.c:650
+#: ../src/gtkpounce.c:642
 msgid "Brows_e..."
 msgstr "_Selaa"
 
-#: ../src/gtkpounce.c:652
+#: ../src/gtkpounce.c:644
 msgid "Br_owse..."
 msgstr "S_elaa"
 
-#: ../src/gtkpounce.c:653
+#: ../src/gtkpounce.c:645
 msgid "Pre_view"
 msgstr "_Esikatselu"
 
 #. Create the "Options" frame.
-#: ../src/gtkpounce.c:765
+#: ../src/gtkpounce.c:757
 msgid "Options"
 msgstr "Valinnat"
 
-#: ../src/gtkpounce.c:773
+#: ../src/gtkpounce.c:765
 msgid "P_ounce only when my status is not available"
 msgstr "I_lmoita vain kun tilani on \"ei tavoitettavissa\""
 
-#: ../src/gtkpounce.c:778
+#: ../src/gtkpounce.c:770
 msgid "_Recurring"
 msgstr "_Toistuva"
 
-#: ../src/gtkpounce.c:1092
+#: ../src/gtkpounce.c:1074
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Haluatko varmasti poistaa ilmoituksen %s käyttäjältä %s?"
 
-#: ../src/gtkpounce.c:1240
+#: ../src/gtkpounce.c:1222
 msgid "Pounce Target"
 msgstr "Ilmoituksen kohde"
 
-#: ../src/gtkpounce.c:1275
+#: ../src/gtkpounce.c:1257
 msgid "Recurring"
 msgstr "Toistuva"
 
-#: ../src/gtkpounce.c:1322
+#: ../src/gtkpounce.c:1304
 msgid "Buddy Pounces"
 msgstr "Tuttavailmoittimet"
 
-#: ../src/gtkpounce.c:1449
+#: ../src/gtkpounce.c:1431
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s alkoi kirjoittaa sinulle (%s)"
 
-#: ../src/gtkpounce.c:1451
+#: ../src/gtkpounce.c:1433
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s on kirjautunut sisään (%s)"
 
-#: ../src/gtkpounce.c:1453
+#: ../src/gtkpounce.c:1435
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s on palannut oltuaan jouten (%s)"
 
-#: ../src/gtkpounce.c:1455
+#: ../src/gtkpounce.c:1437
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s on palannut oltuaan poissa (%s)"
 
-#: ../src/gtkpounce.c:1457
+#: ../src/gtkpounce.c:1439
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s on lopettanut kirjoittamisen sinulle (%s)"
 
-#: ../src/gtkpounce.c:1459
+#: ../src/gtkpounce.c:1441
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s on kirjautunut ulos (%s)"
 
-#: ../src/gtkpounce.c:1461
+#: ../src/gtkpounce.c:1443
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s on jouten (%s)"
 
-#: ../src/gtkpounce.c:1463
+#: ../src/gtkpounce.c:1445
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s on poissa. (%s)"
 
-#: ../src/gtkpounce.c:1465
+#: ../src/gtkpounce.c:1447
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s on lähettämässä sinulle viestiä. (%s)"
 
-#: ../src/gtkpounce.c:1466
+#: ../src/gtkpounce.c:1448
 msgid "Unknown pounce event. Please report this!"
 msgstr "Tuntematon ilmoitinviesti. Raportoi tästä!"
 
@@ -4510,7 +4565,7 @@
 msgstr "Kuvake"
 
 #: ../src/gtkprefs.c:680 ../src/protocols/jabber/buddy.c:267
-#: ../src/protocols/jabber/buddy.c:818 ../src/protocols/jabber/chat.c:769
+#: ../src/protocols/jabber/buddy.c:820 ../src/protocols/jabber/chat.c:767
 msgid "Description"
 msgstr "Kuvaus"
 
@@ -4518,7 +4573,7 @@
 msgid "_Hide new IM conversations"
 msgstr "_Piilota uudet keskustelut"
 
-#: ../src/gtkprefs.c:824 ../src/gtkprefs.c:1764
+#: ../src/gtkprefs.c:824 ../src/gtkprefs.c:1779
 msgid "When away"
 msgstr "Poissaollessa"
 
@@ -4604,7 +4659,7 @@
 msgstr "_Uudet keskustelut:"
 
 #: ../src/gtkprefs.c:973 ../src/protocols/oscar/oscar.c:795
-#: ../src/protocols/oscar/oscar.c:3630
+#: ../src/protocols/oscar/oscar.c:3631
 msgid "IP Address"
 msgstr "IP-osoite"
 
@@ -4612,107 +4667,111 @@
 msgid "ST_UN server:"
 msgstr "ST_UN-palvelin:"
 
-#: ../src/gtkprefs.c:977
+#: ../src/gtkprefs.c:987
+msgid "<span style=\"italic\">Example: stunserver.org</span>"
+msgstr "<span style=\"italic\">Esimerkki: stunserver.org</span>"
+
+#: ../src/gtkprefs.c:991
 msgid "_Autodetect IP address"
 msgstr "_Hae IP-osoite automaattisesti"
 
-#: ../src/gtkprefs.c:986
+#: ../src/gtkprefs.c:1000
 msgid "Public _IP:"
 msgstr "Julkinen _IP:"
 
-#: ../src/gtkprefs.c:1014
+#: ../src/gtkprefs.c:1029
 msgid "Ports"
 msgstr "Portit"
 
-#: ../src/gtkprefs.c:1017
+#: ../src/gtkprefs.c:1032
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Aseta kuunneltava porttialue"
 
-#: ../src/gtkprefs.c:1020
-msgid "_Start port:"
-msgstr "_Ensimmäinen portti:"
-
-#: ../src/gtkprefs.c:1027
-msgid "_End port:"
-msgstr "Viimeinen _portti:"
-
 #: ../src/gtkprefs.c:1035
+msgid "_Start port:"
+msgstr "_Ensimmäinen portti:"
+
+#: ../src/gtkprefs.c:1042
+msgid "_End port:"
+msgstr "Viimeinen _portti:"
+
+#: ../src/gtkprefs.c:1050
 msgid "Proxy Server"
 msgstr "Välipalvelin"
 
-#: ../src/gtkprefs.c:1039
+#: ../src/gtkprefs.c:1054
 msgid "No proxy"
 msgstr "Ei välipalvelinta"
 
-#: ../src/gtkprefs.c:1095
+#: ../src/gtkprefs.c:1110
 msgid "_User:"
 msgstr "_Käyttäjä:"
 
-#: ../src/gtkprefs.c:1157
+#: ../src/gtkprefs.c:1172
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../src/gtkprefs.c:1158
+#: ../src/gtkprefs.c:1173
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../src/gtkprefs.c:1159
+#: ../src/gtkprefs.c:1174
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../src/gtkprefs.c:1160
+#: ../src/gtkprefs.c:1175
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../src/gtkprefs.c:1161
+#: ../src/gtkprefs.c:1176
 msgid "GNOME Default"
 msgstr "Gnomen oletus"
 
-#: ../src/gtkprefs.c:1162
+#: ../src/gtkprefs.c:1177
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../src/gtkprefs.c:1163
+#: ../src/gtkprefs.c:1178
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../src/gtkprefs.c:1164
+#: ../src/gtkprefs.c:1179
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../src/gtkprefs.c:1165
+#: ../src/gtkprefs.c:1180
 msgid "Opera"
 msgstr "Opera"
 
-#: ../src/gtkprefs.c:1174
+#: ../src/gtkprefs.c:1189
 msgid "Manual"
 msgstr "Oma komento"
 
-#: ../src/gtkprefs.c:1227
+#: ../src/gtkprefs.c:1242
 msgid "Browser Selection"
 msgstr "Selaimen valinta"
 
-#: ../src/gtkprefs.c:1231
+#: ../src/gtkprefs.c:1246
 msgid "_Browser:"
 msgstr "_Selain:"
 
-#: ../src/gtkprefs.c:1239
+#: ../src/gtkprefs.c:1254
 msgid "_Open link in:"
 msgstr "_Avaa linkki:"
 
-#: ../src/gtkprefs.c:1241
+#: ../src/gtkprefs.c:1256
 msgid "Browser default"
 msgstr "Selaimen oletus"
 
-#: ../src/gtkprefs.c:1242
+#: ../src/gtkprefs.c:1257
 msgid "Existing window"
 msgstr "Olemassaolevaan ikkunaan"
 
-#: ../src/gtkprefs.c:1244
+#: ../src/gtkprefs.c:1259
 msgid "New tab"
 msgstr "Uuteen välilehteen"
 
-#: ../src/gtkprefs.c:1258
+#: ../src/gtkprefs.c:1273
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -4721,83 +4780,83 @@
 "_Komento:\n"
 "(URL:ksi %s)"
 
-#: ../src/gtkprefs.c:1294 ../src/gtkprefs.c:1875
+#: ../src/gtkprefs.c:1309 ../src/gtkprefs.c:1890
 msgid "Logging"
 msgstr "Kirjataan lokiin"
 
-#: ../src/gtkprefs.c:1297
+#: ../src/gtkprefs.c:1312
 msgid "Log _format:"
 msgstr "Lokin _muoto:"
 
-#: ../src/gtkprefs.c:1302
+#: ../src/gtkprefs.c:1317
 msgid "Log all _instant messages"
 msgstr "Kirjaa kaikki pikaviestit _lokiin"
 
-#: ../src/gtkprefs.c:1304
+#: ../src/gtkprefs.c:1319
 msgid "Log all c_hats"
 msgstr "Kirjaa kaikki ryhmä_keskustelut lokiin"
 
-#: ../src/gtkprefs.c:1306
+#: ../src/gtkprefs.c:1321
 msgid "Log all _status changes to system log"
 msgstr "Kirjaa kaikki _tilamuutokset järjestelmälokiin"
 
-#: ../src/gtkprefs.c:1454
+#: ../src/gtkprefs.c:1469
 msgid "Sound Selection"
 msgstr "Äänivalinta"
 
-#: ../src/gtkprefs.c:1462
+#: ../src/gtkprefs.c:1477
 msgid "Quietest"
 msgstr "Hiljaisin"
 
-#: ../src/gtkprefs.c:1464
+#: ../src/gtkprefs.c:1479
 msgid "Quieter"
 msgstr "Hiljaisempi"
 
-#: ../src/gtkprefs.c:1466
+#: ../src/gtkprefs.c:1481
 msgid "Quiet"
 msgstr "Hiljainen"
 
-#: ../src/gtkprefs.c:1468 ../src/protocols/silc/silc.c:670
+#: ../src/gtkprefs.c:1483 ../src/protocols/silc/silc.c:670
 msgid "Normal"
 msgstr "Normaali"
 
-#: ../src/gtkprefs.c:1470
+#: ../src/gtkprefs.c:1485
 msgid "Loud"
 msgstr "Äänekäs"
 
-#: ../src/gtkprefs.c:1472
+#: ../src/gtkprefs.c:1487
 msgid "Louder"
 msgstr "Äänekkäämpi"
 
-#: ../src/gtkprefs.c:1474
+#: ../src/gtkprefs.c:1489
 msgid "Loudest"
 msgstr "Äänekkäin"
 
-#: ../src/gtkprefs.c:1537
+#: ../src/gtkprefs.c:1552
 msgid "Sound Method"
 msgstr "Äänimenetelmä"
 
-#: ../src/gtkprefs.c:1538
+#: ../src/gtkprefs.c:1553
 msgid "_Method:"
 msgstr "_Menetelmä:"
 
-#: ../src/gtkprefs.c:1540
+#: ../src/gtkprefs.c:1555
 msgid "Console beep"
 msgstr "Konsoliäänimerkki"
 
-#: ../src/gtkprefs.c:1542
+#: ../src/gtkprefs.c:1557
 msgid "Automatic"
 msgstr "Automaattinen"
 
-#: ../src/gtkprefs.c:1547
+#: ../src/gtkprefs.c:1562
 msgid "Command"
 msgstr "Komento"
 
-#: ../src/gtkprefs.c:1548
+#: ../src/gtkprefs.c:1563
 msgid "No sounds"
 msgstr "Ei ääniä"
 
-#: ../src/gtkprefs.c:1556
+#: ../src/gtkprefs.c:1571
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4806,113 +4865,113 @@
 "Äänik_omento:\n"
 "(%s tiedostonimeksi)"
 
-#: ../src/gtkprefs.c:1582
+#: ../src/gtkprefs.c:1597
 msgid "Sound Options"
 msgstr "Äänivalinnat"
 
-#: ../src/gtkprefs.c:1583
+#: ../src/gtkprefs.c:1598
 msgid "Sounds when conversation has _focus"
 msgstr "Äänet kun keskusteluikkuna on _aktiivinen"
 
-#: ../src/gtkprefs.c:1585
+#: ../src/gtkprefs.c:1600
 msgid "_Sounds while away"
 msgstr "Ää_net poissaollessasi"
 
-#: ../src/gtkprefs.c:1592
+#: ../src/gtkprefs.c:1607
 msgid "Volume:"
 msgstr "Äänenvoimakkuus:"
 
-#: ../src/gtkprefs.c:1620
+#: ../src/gtkprefs.c:1635
 msgid "Sound Events"
 msgstr "Äänitapahtumat"
 
-#: ../src/gtkprefs.c:1671
+#: ../src/gtkprefs.c:1686
 msgid "Play"
 msgstr "Soita"
 
-#: ../src/gtkprefs.c:1678
+#: ../src/gtkprefs.c:1693
 msgid "Event"
 msgstr "Tapahtuma"
 
-#: ../src/gtkprefs.c:1697
+#: ../src/gtkprefs.c:1712
 msgid "Test"
 msgstr "Kokeile"
 
-#: ../src/gtkprefs.c:1701
+#: ../src/gtkprefs.c:1716
 msgid "Reset"
 msgstr "Nollaa"
 
-#: ../src/gtkprefs.c:1705
+#: ../src/gtkprefs.c:1720
 msgid "Choose..."
 msgstr "Valitse..."
 
-#: ../src/gtkprefs.c:1747
+#: ../src/gtkprefs.c:1762
 msgid "_Report idle time:"
 msgstr "_Ilmoita joutenoloaika:"
 
-#: ../src/gtkprefs.c:1750
+#: ../src/gtkprefs.c:1765
 msgid "From last sent message"
 msgstr "Viimeisestä lähetetystä viestistä"
 
-#: ../src/gtkprefs.c:1752
+#: ../src/gtkprefs.c:1767
 msgid "Based on keyboard or mouse use"
 msgstr "Perustuen näppäimistön tai hiiren käyttöön"
 
-#: ../src/gtkprefs.c:1761
+#: ../src/gtkprefs.c:1776
 msgid "_Auto-reply:"
 msgstr "_Automaattivastaus:"
 
-#: ../src/gtkprefs.c:1765
+#: ../src/gtkprefs.c:1780
 msgid "When both away and idle"
 msgstr "Poissa ja jouten ollessa"
 
 #. Auto-away stuff
-#: ../src/gtkprefs.c:1771
+#: ../src/gtkprefs.c:1786
 msgid "Auto-away"
 msgstr "Automaattinen poissaoloasetus"
 
-#: ../src/gtkprefs.c:1773
+#: ../src/gtkprefs.c:1788
 msgid "Change status when _idle"
 msgstr "Vaihda tila, kun ollaan _jouten"
 
-#: ../src/gtkprefs.c:1777
+#: ../src/gtkprefs.c:1792
 msgid "_Minutes before changing status:"
 msgstr "_Minuutteja ennen tilan asetusta:"
 
-#: ../src/gtkprefs.c:1785
+#: ../src/gtkprefs.c:1800
 msgid "Change _status to:"
 msgstr "Vaihda tila seuraavaksi:"
 
 #. Signon status stuff
-#: ../src/gtkprefs.c:1806
+#: ../src/gtkprefs.c:1821
 msgid "Status at startup"
 msgstr "Tila käynnistettäessä"
 
-#: ../src/gtkprefs.c:1808
+#: ../src/gtkprefs.c:1823
 msgid "Use status from last _exit at startup"
 msgstr "Käytä viimeksi poistuttaessa ollutta tilaa"
 
-#: ../src/gtkprefs.c:1814
+#: ../src/gtkprefs.c:1829
 msgid "Status to a_pply at startup:"
 msgstr "Tila jota käytetään käynnistettäessä:"
 
-#: ../src/gtkprefs.c:1865
+#: ../src/gtkprefs.c:1880
 msgid "Smiley Themes"
 msgstr "Hymiöteemat"
 
-#: ../src/gtkprefs.c:1866
+#: ../src/gtkprefs.c:1881
 msgid "Sounds"
 msgstr "Äänet"
 
-#: ../src/gtkprefs.c:1867 ../src/protocols/silc/silc.c:1850
+#: ../src/gtkprefs.c:1882 ../src/protocols/silc/silc.c:1850
 msgid "Network"
 msgstr "Verkko"
 
-#: ../src/gtkprefs.c:1872
+#: ../src/gtkprefs.c:1887
 msgid "Browser"
 msgstr "Selain"
 
-#: ../src/gtkprefs.c:1876
+#: ../src/gtkprefs.c:1891
 msgid "Away / Idle"
 msgstr "Poissa/joutenolot"
 
@@ -5005,16 +5064,16 @@
 #. * A wrapper for gaim_request_action() that uses @c Yes and @c No buttons.
 #.
 #: ../src/gtkrequest.c:267 ../src/protocols/msn/dialog.c:114
-#: ../src/protocols/msn/msn.c:559 ../src/protocols/msn/msn.c:568
-#: ../src/protocols/novell/novell.c:1921 ../src/protocols/silc/buddy.c:313
+#: ../src/protocols/msn/msn.c:557 ../src/protocols/msn/msn.c:566
+#: ../src/protocols/novell/novell.c:1919 ../src/protocols/silc/buddy.c:313
 #: ../src/protocols/silc/pk.c:117 ../src/protocols/silc/wb.c:303
 #: ../src/request.h:1335
 msgid "Yes"
 msgstr "Kyllä"
 
 #: ../src/gtkrequest.c:268 ../src/protocols/msn/dialog.c:115
-#: ../src/protocols/msn/msn.c:559 ../src/protocols/msn/msn.c:568
-#: ../src/protocols/novell/novell.c:1922 ../src/protocols/silc/buddy.c:314
+#: ../src/protocols/msn/msn.c:557 ../src/protocols/msn/msn.c:566
+#: ../src/protocols/novell/novell.c:1920 ../src/protocols/silc/buddy.c:314
 #: ../src/protocols/silc/pk.c:118 ../src/protocols/silc/wb.c:304
 #: ../src/request.h:1335
 msgid "No"
@@ -5025,7 +5084,7 @@
 msgstr "Toteuta"
 
 #: ../src/gtkrequest.c:272 ../src/protocols/msn/msn.c:357
-#: ../src/protocols/silc/util.c:336
+#: ../src/protocols/silc/util.c:350
 msgid "Close"
 msgstr "Sulje"
 
@@ -5076,7 +5135,7 @@
 msgstr "_Lisää ryhmäkeskustelu"
 
 #: ../src/gtksavedstatuses.c:433 ../src/protocols/jabber/buddy.c:264
-#: ../src/protocols/jabber/buddy.c:812 ../src/protocols/novell/novell.c:1486
+#: ../src/protocols/jabber/buddy.c:814 ../src/protocols/novell/novell.c:1484
 msgid "Title"
 msgstr "Otsikko"
 
@@ -5084,25 +5143,25 @@
 msgid "Type"
 msgstr "Tyyppi"
 
-#: ../src/gtksavedstatuses.c:459 ../src/gtksavedstatuses.c:920
+#: ../src/gtksavedstatuses.c:459 ../src/gtksavedstatuses.c:919
 #: ../src/protocols/bonjour/bonjour.c:256
 #: ../src/protocols/bonjour/bonjour.c:263 ../src/protocols/gg/gg.c:1591
 #: ../src/protocols/gg/gg.c:1601 ../src/protocols/gg/gg.c:1607
 #: ../src/protocols/gg/gg.c:1616 ../src/protocols/gg/gg.c:1621
-#: ../src/protocols/irc/irc.c:227 ../src/protocols/jabber/jabber.c:1182
-#: ../src/protocols/jabber/jabber.c:1192 ../src/protocols/jabber/jabber.c:1202
-#: ../src/protocols/jabber/jabber.c:1212 ../src/protocols/jabber/jabber.c:1222
-#: ../src/protocols/jabber/jabber.c:1234 ../src/protocols/novell/novell.c:2868
-#: ../src/protocols/novell/novell.c:2974 ../src/protocols/novell/novell.c:2980
-#: ../src/protocols/novell/novell.c:2986 ../src/protocols/oscar/oscar.c:5353
-#: ../src/protocols/oscar/oscar.c:5368 ../src/protocols/oscar/oscar.c:5373
-#: ../src/protocols/oscar/oscar.c:5581 ../src/protocols/oscar/oscar.c:5593
-#: ../src/protocols/sametime/sametime.c:3273
-#: ../src/protocols/sametime/sametime.c:3279
-#: ../src/protocols/sametime/sametime.c:3285
-#: ../src/protocols/sametime/sametime.c:3364
+#: ../src/protocols/irc/irc.c:227 ../src/protocols/jabber/jabber.c:1180
+#: ../src/protocols/jabber/jabber.c:1190 ../src/protocols/jabber/jabber.c:1200
+#: ../src/protocols/jabber/jabber.c:1210 ../src/protocols/jabber/jabber.c:1220
+#: ../src/protocols/jabber/jabber.c:1232 ../src/protocols/novell/novell.c:2866
+#: ../src/protocols/novell/novell.c:2972 ../src/protocols/novell/novell.c:2978
+#: ../src/protocols/novell/novell.c:2984 ../src/protocols/oscar/oscar.c:5366
+#: ../src/protocols/oscar/oscar.c:5381 ../src/protocols/oscar/oscar.c:5386
+#: ../src/protocols/oscar/oscar.c:5594 ../src/protocols/oscar/oscar.c:5606
+#: ../src/protocols/sametime/sametime.c:3266
+#: ../src/protocols/sametime/sametime.c:3272
+#: ../src/protocols/sametime/sametime.c:3278
+#: ../src/protocols/sametime/sametime.c:3357
 #: ../src/protocols/silc/buddy.c:1544 ../src/protocols/simple/simple.c:242
-#: ../src/protocols/yahoo/yahoo.c:3286 ../src/protocols/yahoo/yahoo.c:3292
+#: ../src/protocols/yahoo/yahoo.c:3282 ../src/protocols/yahoo/yahoo.c:3288
 #: ../src/protocols/zephyr/zephyr.c:2281
 msgid "Message"
 msgstr "Viesti"
@@ -5112,7 +5171,7 @@
 msgstr "Tallennetut tilat"
 
 #. Use button
-#: ../src/gtksavedstatuses.c:549 ../src/gtksavedstatuses.c:1180
+#: ../src/gtksavedstatuses.c:549 ../src/gtksavedstatuses.c:1179
 msgid "_Use"
 msgstr "_Käytä"
 
@@ -5124,86 +5183,86 @@
 msgid "Different"
 msgstr "Eriävyys"
 
-#: ../src/gtksavedstatuses.c:909 ../src/gtksavedstatuses.c:1056
+#: ../src/gtksavedstatuses.c:908 ../src/gtksavedstatuses.c:1055
 #: ../src/protocols/gg/gg.c:1024 ../src/protocols/gg/gg.c:1574
-#: ../src/protocols/gg/gg.c:1578 ../src/protocols/jabber/buddy.c:623
-#: ../src/protocols/jabber/buddy.c:630 ../src/protocols/jabber/buddy.c:641
-#: ../src/protocols/jabber/jabber.c:1153 ../src/protocols/msn/msn.c:550
-#: ../src/protocols/novell/novell.c:2867 ../src/protocols/novell/novell.c:2871
+#: ../src/protocols/gg/gg.c:1578 ../src/protocols/jabber/buddy.c:625
+#: ../src/protocols/jabber/buddy.c:632 ../src/protocols/jabber/buddy.c:643
+#: ../src/protocols/jabber/jabber.c:1151 ../src/protocols/msn/msn.c:548
+#: ../src/protocols/novell/novell.c:2865 ../src/protocols/novell/novell.c:2869
 #: ../src/protocols/oscar/oscar.c:775 ../src/protocols/oscar/oscar.c:781
-#: ../src/protocols/oscar/oscar.c:784 ../src/protocols/yahoo/yahoo.c:2882
+#: ../src/protocols/oscar/oscar.c:784 ../src/protocols/yahoo/yahoo.c:2878
 msgid "Status"
 msgstr "Tila"
 
-#: ../src/gtksavedstatuses.c:1073
+#: ../src/gtksavedstatuses.c:1072
 msgid "_Title:"
 msgstr "_Otsikko"
 
-#: ../src/gtksavedstatuses.c:1092 ../src/gtksavedstatuses.c:1413
+#: ../src/gtksavedstatuses.c:1091 ../src/gtksavedstatuses.c:1412
 msgid "_Status:"
 msgstr "_Tila:"
 
 #. Different status message expander
-#: ../src/gtksavedstatuses.c:1124
+#: ../src/gtksavedstatuses.c:1123
 msgid "Use a _different status for some accounts"
 msgstr "Käytä eri tilaa joillekin käyttäjätileille"
 
 #. Save & Use button
-#: ../src/gtksavedstatuses.c:1188
+#: ../src/gtksavedstatuses.c:1187
 msgid "Sa_ve & Use"
 msgstr "Tallenna ja _käytä"
 
-#: ../src/gtksavedstatuses.c:1394
+#: ../src/gtksavedstatuses.c:1393
 #, c-format
 msgid "Status for %s"
 msgstr "%s:n tila"
 
-#: ../src/gtksound.c:61
+#: ../src/gtksound.c:59
 msgid "Buddy logs in"
 msgstr "Tuttava kirjautuu sisään"
 
-#: ../src/gtksound.c:62
+#: ../src/gtksound.c:60
 msgid "Buddy logs out"
 msgstr "Tuttava kirjautuu ulos"
 
+#: ../src/gtksound.c:61
+msgid "Message received"
+msgstr "Viesti vastaanotettu"
+
+#: ../src/gtksound.c:62
+msgid "Message received begins conversation"
+msgstr "Vastaanotettu viesti aloittaa keskustelun"
+
 #: ../src/gtksound.c:63
-msgid "Message received"
-msgstr "Viesti vastaanotettu"
+msgid "Message sent"
+msgstr "Viesti lähetetty"
 
 #: ../src/gtksound.c:64
-msgid "Message received begins conversation"
-msgstr "Vastaanotettu viesti aloittaa keskustelun"
+msgid "Person enters chat"
+msgstr "Joku saapuu ryhmäkeskusteluun"
 
 #: ../src/gtksound.c:65
-msgid "Message sent"
-msgstr "Viesti lähetetty"
+msgid "Person leaves chat"
+msgstr "Joku poistuu ryhmäkeskustelusta"
 
 #: ../src/gtksound.c:66
-msgid "Person enters chat"
-msgstr "Joku saapuu ryhmäkeskusteluun"
-
-#: ../src/gtksound.c:67
-msgid "Person leaves chat"
-msgstr "Joku poistuu ryhmäkeskustelusta"
-
-#: ../src/gtksound.c:68
 msgid "You talk in chat"
 msgstr "Sinä puhut ryhmäkeskustelussa"
 
-#: ../src/gtksound.c:69
+#: ../src/gtksound.c:67
 msgid "Others talk in chat"
 msgstr "Muut puhuvat ryhmäkeskustelussa"
 
-#: ../src/gtksound.c:72
+#: ../src/gtksound.c:70
 msgid "Someone says your screen name in chat"
 msgstr "Joku sanoo kutsumanimesi ryhmäkeskustelussa"
 
-#: ../src/gtksound.c:485
+#: ../src/gtksound.c:396
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "Ei voitu soittaa äänitiedostoa (%s) koska sitä ei ole."
 
-#: ../src/gtksound.c:501
+#: ../src/gtksound.c:412
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
@@ -5211,7 +5270,7 @@
 "Äänen soito ei onnistu. \"Komento\"-metodi on valittu mutta komentoa ei ole "
 "asetettu."
 
-#: ../src/gtksound.c:513
+#: ../src/gtksound.c:424
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -5221,11 +5280,11 @@
 
 #. connect to the server
 #: ../src/gtkstatusbox.c:368 ../src/protocols/irc/irc.c:313
-#: ../src/protocols/jabber/jabber.c:979 ../src/protocols/msn/session.c:351
+#: ../src/protocols/jabber/jabber.c:977 ../src/protocols/msn/session.c:344
 #: ../src/protocols/napster/napster.c:536
-#: ../src/protocols/novell/novell.c:2183 ../src/protocols/oscar/oscar.c:1251
-#: ../src/protocols/sametime/sametime.c:3692
-#: ../src/protocols/simple/simple.c:1606 ../src/protocols/yahoo/yahoo.c:2572
+#: ../src/protocols/novell/novell.c:2181 ../src/protocols/oscar/oscar.c:1250
+#: ../src/protocols/sametime/sametime.c:3685
+#: ../src/protocols/simple/simple.c:1609 ../src/protocols/yahoo/yahoo.c:2570
 #: ../src/protocols/zephyr/zephyr.c:1565
 msgid "Connecting"
 msgstr "Yhdistetään"
@@ -5345,31 +5404,31 @@
 msgid "Select color"
 msgstr "Valitse väri"
 
-#: ../src/log.c:177
+#: ../src/log.c:180
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">Lokilla ei ole read-funktiota</font></b>"
 
-#: ../src/log.c:558
+#: ../src/log.c:561
 msgid "HTML"
 msgstr "HTML"
 
-#: ../src/log.c:569
+#: ../src/log.c:572
 msgid "Plain text"
 msgstr "Teksti"
 
-#: ../src/log.c:580
+#: ../src/log.c:583
 msgid "Old Gaim"
 msgstr "Vanha Gaim"
 
-#: ../src/log.c:675
+#: ../src/log.c:678
 msgid "Logging of this conversation failed."
 msgstr "Tämän keskustelun kirjaaminen lokiin epäonnistui."
 
-#: ../src/log.c:1025
+#: ../src/log.c:1028
 msgid "XML"
 msgstr "XML"
 
-#: ../src/log.c:1099
+#: ../src/log.c:1102
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -5378,7 +5437,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;"
 "AUTOMAATTIVASTAUS&gt;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:1101
+#: ../src/log.c:1104
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -5387,23 +5446,23 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;"
 "AUTOMAATTIVASTAUS&gt;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:1159 ../src/log.c:1291
+#: ../src/log.c:1162 ../src/log.c:1294
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Lokin hakemistopolkua ei löydy!</b></font>"
 
-#: ../src/log.c:1171 ../src/log.c:1305
+#: ../src/log.c:1174 ../src/log.c:1308
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Ei voitu lukea tiedostoa: %s</b></font>"
 
-#: ../src/log.c:1233
+#: ../src/log.c:1236
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTOMAATTIVASTAUS>: %s\n"
 
-#: ../src/plugin.c:281 ../src/protocols/jabber/buddy.c:1382
-#: ../src/protocols/msn/servconn.c:139 ../src/protocols/msn/session.c:328
-#: ../src/protocols/oscar/oscar.c:2700
+#: ../src/plugin.c:281 ../src/protocols/jabber/buddy.c:1385
+#: ../src/protocols/msn/servconn.c:139 ../src/protocols/msn/session.c:321
+#: ../src/protocols/oscar/oscar.c:2701
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
@@ -5463,7 +5522,7 @@
 "Ei voitu luoda yhteyttä paikalliseen mDNS-palvelimeen. Onko se käynnissä?"
 
 #: ../src/protocols/bonjour/bonjour.c:337
-#: ../src/protocols/sametime/sametime.c:3250
+#: ../src/protocols/sametime/sametime.c:3243
 #, c-format
 msgid ""
 "\n"
@@ -5510,23 +5569,25 @@
 #. Creating the options for the protocol
 #. port to connect to
 #: ../src/protocols/bonjour/bonjour.c:579 ../src/protocols/irc/irc.c:900
-#: ../src/protocols/msn/msn.c:2054 ../src/protocols/napster/napster.c:724
-#: ../src/protocols/sametime/sametime.c:5642 ../src/protocols/silc/silc.c:1858
+#: ../src/protocols/msn/msn.c:2049 ../src/protocols/napster/napster.c:724
+#: ../src/protocols/oscar/oscar.c:6470
+#: ../src/protocols/sametime/sametime.c:5635 ../src/protocols/silc/silc.c:1858
+#: ../src/protocols/toc/toc.c:2344
 msgid "Port"
 msgstr "Portti"
 
 #: ../src/protocols/bonjour/bonjour.c:582 ../src/protocols/gg/gg.c:622
-#: ../src/protocols/jabber/jabber.c:770
+#: ../src/protocols/jabber/jabber.c:769
 msgid "First name"
 msgstr "Etunimi"
 
 #: ../src/protocols/bonjour/bonjour.c:585 ../src/protocols/gg/gg.c:617
-#: ../src/protocols/jabber/jabber.c:775
+#: ../src/protocols/jabber/jabber.c:774
 msgid "Last name"
 msgstr "Sukunimi"
 
 #: ../src/protocols/bonjour/bonjour.c:588 ../src/protocols/gg/gg.c:468
-#: ../src/protocols/jabber/jabber.c:760 ../src/protocols/silc/silc.c:699
+#: ../src/protocols/jabber/jabber.c:759 ../src/protocols/silc/silc.c:699
 #: ../src/protocols/silc/silc.c:939
 msgid "E-mail"
 msgstr "Sähköposti"
@@ -5560,11 +5621,11 @@
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Viestiä ei voida lähettää, keskustelua ei voitu aloittaa."
 
-#: ../src/protocols/gg/gg.c:76 ../src/proxy.c:2345
+#: ../src/protocols/gg/gg.c:76 ../src/proxy.c:2346
 msgid "Invalid proxy settings"
 msgstr "Epäkelvot välipalvelinvalinnat"
 
-#: ../src/protocols/gg/gg.c:77 ../src/proxy.c:2345
+#: ../src/protocols/gg/gg.c:77 ../src/proxy.c:2346
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -5634,7 +5695,7 @@
 msgstr "Rekisteröinti onnistui!"
 
 #: ../src/protocols/gg/gg.c:473 ../src/protocols/gg/gg.c:764
-#: ../src/protocols/jabber/jabber.c:749 ../src/protocols/jabber/jabber.c:1307
+#: ../src/protocols/jabber/jabber.c:748 ../src/protocols/jabber/jabber.c:1305
 msgid "Password"
 msgstr "Salasana"
 
@@ -5661,10 +5722,10 @@
 #. General
 #: ../src/protocols/gg/gg.c:627 ../src/protocols/gg/gg.c:1038
 #: ../src/protocols/gg/gg.c:1104 ../src/protocols/gg/gg.c:2175
-#: ../src/protocols/jabber/buddy.c:252 ../src/protocols/jabber/buddy.c:695
-#: ../src/protocols/jabber/buddy.c:1259 ../src/protocols/jabber/buddy.c:1441
-#: ../src/protocols/jabber/jabber.c:765 ../src/protocols/msn/msn.c:1373
-#: ../src/protocols/msn/msn.c:1535 ../src/protocols/silc/buddy.c:1528
+#: ../src/protocols/jabber/buddy.c:252 ../src/protocols/jabber/buddy.c:697
+#: ../src/protocols/jabber/buddy.c:1262 ../src/protocols/jabber/buddy.c:1444
+#: ../src/protocols/jabber/jabber.c:764 ../src/protocols/msn/msn.c:1368
+#: ../src/protocols/msn/msn.c:1530 ../src/protocols/silc/buddy.c:1528
 #: ../src/protocols/silc/ops.c:1036 ../src/protocols/silc/ops.c:1179
 #: ../src/protocols/silc/ops.c:1328
 #: ../src/protocols/yahoo/yahoo_profile.c:1041
@@ -5672,8 +5733,8 @@
 msgstr "Kutsumanimi"
 
 #: ../src/protocols/gg/gg.c:632 ../src/protocols/gg/gg.c:1043
-#: ../src/protocols/gg/gg.c:1107 ../src/protocols/jabber/jabber.c:785
-#: ../src/protocols/oscar/oscar.c:3676 ../src/protocols/oscar/oscar.c:3684
+#: ../src/protocols/gg/gg.c:1107 ../src/protocols/jabber/jabber.c:784
+#: ../src/protocols/oscar/oscar.c:3687 ../src/protocols/oscar/oscar.c:3695
 msgid "City"
 msgstr "Paikkakunta"
 
@@ -5681,8 +5742,8 @@
 msgid "Year of birth"
 msgstr "Syntymävuosi"
 
-#: ../src/protocols/gg/gg.c:640 ../src/protocols/msn/msn.c:1537
-#: ../src/protocols/oscar/oscar.c:3650
+#: ../src/protocols/gg/gg.c:640 ../src/protocols/msn/msn.c:1532
+#: ../src/protocols/oscar/oscar.c:3651
 #: ../src/protocols/yahoo/yahoo_profile.c:1066
 msgid "Gender"
 msgstr "Sukupuoli"
@@ -5691,11 +5752,11 @@
 msgid "Male or female"
 msgstr "Mies vai nainen"
 
-#: ../src/protocols/gg/gg.c:642 ../src/protocols/oscar/oscar.c:3650
+#: ../src/protocols/gg/gg.c:642 ../src/protocols/oscar/oscar.c:3651
 msgid "Male"
 msgstr "Mies"
 
-#: ../src/protocols/gg/gg.c:643 ../src/protocols/oscar/oscar.c:3650
+#: ../src/protocols/gg/gg.c:643 ../src/protocols/oscar/oscar.c:3651
 msgid "Female"
 msgstr "Nainen"
 
@@ -5753,13 +5814,13 @@
 msgstr "Lisää ryhmäkeskusteluun..."
 
 #: ../src/protocols/gg/gg.c:1029 ../src/protocols/gg/gg.c:1098
-#: ../src/protocols/oscar/oscar.c:3622
+#: ../src/protocols/oscar/oscar.c:3623
 msgid "UIN"
 msgstr "UIN"
 
 #: ../src/protocols/gg/gg.c:1033 ../src/protocols/gg/gg.c:1101
-#: ../src/protocols/jabber/buddy.c:1255 ../src/protocols/jabber/buddy.c:1431
-#: ../src/protocols/oscar/oscar.c:3633 ../src/protocols/silc/ops.c:1024
+#: ../src/protocols/jabber/buddy.c:1258 ../src/protocols/jabber/buddy.c:1434
+#: ../src/protocols/oscar/oscar.c:3634 ../src/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "Etunimi"
 
@@ -5768,7 +5829,7 @@
 msgstr "Syntymävuosi"
 
 #: ../src/protocols/gg/gg.c:1092 ../src/protocols/gg/gg.c:1161
-#: ../src/protocols/oscar/oscar.c:3787
+#: ../src/protocols/oscar/oscar.c:3798
 msgid "Unable to display the search results."
 msgstr "Ei voida näyttää hakutuloksia."
 
@@ -5812,7 +5873,7 @@
 msgid "Connection failed."
 msgstr "Yhteys epäonnistui."
 
-#: ../src/protocols/gg/gg.c:1615 ../src/protocols/msn/msn.c:566
+#: ../src/protocols/gg/gg.c:1615 ../src/protocols/msn/msn.c:564
 msgid "Blocked"
 msgstr "Estetty"
 
@@ -5901,13 +5962,13 @@
 msgid "Unknown command: %s"
 msgstr "Tuntematon komento: %s"
 
-#: ../src/protocols/irc/cmds.c:482 ../src/protocols/jabber/chat.c:592
+#: ../src/protocols/irc/cmds.c:482 ../src/protocols/jabber/chat.c:590
 #: ../src/protocols/silc/silc.c:1293
 #, c-format
 msgid "current topic is: %s"
 msgstr "nykyinen aihe on: %s"
 
-#: ../src/protocols/irc/cmds.c:486 ../src/protocols/jabber/chat.c:596
+#: ../src/protocols/irc/cmds.c:486 ../src/protocols/jabber/chat.c:594
 #: ../src/protocols/silc/silc.c:1297
 msgid "No topic is set"
 msgstr "Aihetta ei ole asetettu"
@@ -5961,18 +6022,18 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC-kutsumanimissä ei tule olla välilyöntejä"
 
-#: ../src/protocols/irc/irc.c:321 ../src/protocols/jabber/jabber.c:550
-#: ../src/protocols/jabber/jabber.c:890
+#: ../src/protocols/irc/irc.c:321 ../src/protocols/jabber/jabber.c:549
+#: ../src/protocols/jabber/jabber.c:888
 msgid "SSL support unavailable"
 msgstr "SSL-tuki ei saatavilla"
 
-#: ../src/protocols/irc/irc.c:333 ../src/protocols/simple/simple.c:451
-#: ../src/protocols/simple/simple.c:1519
+#: ../src/protocols/irc/irc.c:333 ../src/protocols/simple/simple.c:452
+#: ../src/protocols/simple/simple.c:1521
 msgid "Couldn't create socket"
 msgstr "Pistokkeen luominen epäonnistui"
 
 #: ../src/protocols/irc/irc.c:404 ../src/protocols/jabber/jabber.c:421
-#: ../src/protocols/oscar/oscar.c:1247
+#: ../src/protocols/oscar/oscar.c:1246
 msgid "Couldn't connect to host"
 msgstr "Yhteyttä isäntään ei voitu muodostaa"
 
@@ -5988,13 +6049,13 @@
 msgid "Read error"
 msgstr "Virhe luettaessa"
 
-#: ../src/protocols/irc/irc.c:765 ../src/protocols/silc/chat.c:1420
+#: ../src/protocols/irc/irc.c:765 ../src/protocols/silc/chat.c:1421
 #: ../src/protocols/yahoo/yahoochat.c:1430
 msgid "Users"
 msgstr "Käyttäjät"
 
-#: ../src/protocols/irc/irc.c:768 ../src/protocols/sametime/sametime.c:3361
-#: ../src/protocols/silc/chat.c:1423 ../src/protocols/silc/ops.c:1380
+#: ../src/protocols/irc/irc.c:768 ../src/protocols/sametime/sametime.c:3354
+#: ../src/protocols/silc/chat.c:1424 ../src/protocols/silc/ops.c:1380
 #: ../src/protocols/yahoo/yahoochat.c:1439
 msgid "Topic"
 msgstr "Aihe"
@@ -6018,10 +6079,11 @@
 
 #. host to connect to
 #: ../src/protocols/irc/irc.c:897 ../src/protocols/irc/msgs.c:235
-#: ../src/protocols/jabber/jabber.c:1905
-#: ../src/protocols/napster/napster.c:719
-#: ../src/protocols/sametime/sametime.c:5637 ../src/protocols/silc/ops.c:1242
-#: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1766
+#: ../src/protocols/jabber/jabber.c:1903 ../src/protocols/msn/msn.c:2044
+#: ../src/protocols/napster/napster.c:719 ../src/protocols/oscar/oscar.c:6467
+#: ../src/protocols/sametime/sametime.c:5630 ../src/protocols/silc/ops.c:1242
+#: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1769
+#: ../src/protocols/toc/toc.c:2340
 msgid "Server"
 msgstr "Palvelin"
 
@@ -6030,7 +6092,7 @@
 msgstr "Merkistöt"
 
 #: ../src/protocols/irc/irc.c:906 ../src/protocols/irc/msgs.c:229
-#: ../src/protocols/jabber/jabber.c:745 ../src/protocols/silc/buddy.c:1531
+#: ../src/protocols/jabber/jabber.c:744 ../src/protocols/silc/buddy.c:1531
 #: ../src/protocols/silc/ops.c:1189 ../src/protocols/silc/ops.c:1191
 #: ../src/protocols/silc/ops.c:1338 ../src/protocols/silc/ops.c:1340
 #: ../src/protocols/silc/silc.c:933
@@ -6074,7 +6136,7 @@
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../src/protocols/irc/msgs.c:215 ../src/protocols/oscar/oscar.c:3623
+#: ../src/protocols/irc/msgs.c:215 ../src/protocols/oscar/oscar.c:3624
 #: ../src/protocols/silc/ops.c:1412
 msgid "Nick"
 msgstr "Kutsumanimi"
@@ -6111,98 +6173,98 @@
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>Kuvaava adjektiivi</b> Kunniakas<br>"
 
-#: ../src/protocols/irc/msgs.c:328
+#: ../src/protocols/irc/msgs.c:329
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s on vaihtanut aiheeksi: %s"
 
-#: ../src/protocols/irc/msgs.c:330
+#: ../src/protocols/irc/msgs.c:331
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s on poistanut aiheen."
 
-#: ../src/protocols/irc/msgs.c:338
+#: ../src/protocols/irc/msgs.c:339
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s:n aihe on: %s"
 
-#: ../src/protocols/irc/msgs.c:356
+#: ../src/protocols/irc/msgs.c:357
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Tuntematon viesti \"%s\""
 
-#: ../src/protocols/irc/msgs.c:357
+#: ../src/protocols/irc/msgs.c:358
 msgid "Unknown message"
 msgstr "Tuntematon viesti"
 
-#: ../src/protocols/irc/msgs.c:357
+#: ../src/protocols/irc/msgs.c:358
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim on lähettänyt viestin jota IRC-palvelin ei ymmärrä."
 
-#: ../src/protocols/irc/msgs.c:380
+#: ../src/protocols/irc/msgs.c:381
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Käyttäjät %s: %s"
 
-#: ../src/protocols/irc/msgs.c:508
+#: ../src/protocols/irc/msgs.c:509
 msgid "Time Response"
 msgstr "Vastaus time-komentoon "
 
-#: ../src/protocols/irc/msgs.c:509
+#: ../src/protocols/irc/msgs.c:510
 msgid "The IRC server's local time is:"
 msgstr "IRC palvelimen paikallinen aika:"
 
-#: ../src/protocols/irc/msgs.c:520
+#: ../src/protocols/irc/msgs.c:521
 msgid "No such channel"
 msgstr "Kanavaa ei ole"
 
 #. does this happen?
-#: ../src/protocols/irc/msgs.c:531
+#: ../src/protocols/irc/msgs.c:532
 msgid "no such channel"
 msgstr "kanavaa ei ole"
 
-#: ../src/protocols/irc/msgs.c:534
+#: ../src/protocols/irc/msgs.c:535
 msgid "User is not logged in"
 msgstr "Käyttäjä ei ole kirjautuneena sisään"
 
-#: ../src/protocols/irc/msgs.c:539
+#: ../src/protocols/irc/msgs.c:540
 msgid "No such nick or channel"
 msgstr "Kutsumanimeä/kanavaa ei ole olemassa"
 
-#: ../src/protocols/irc/msgs.c:559
+#: ../src/protocols/irc/msgs.c:560
 msgid "Could not send"
 msgstr "Ei voitu lähettää"
 
-#: ../src/protocols/irc/msgs.c:615
+#: ../src/protocols/irc/msgs.c:616
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Liittyminen kanavalle %s vaatii kutsun."
 
-#: ../src/protocols/irc/msgs.c:616
+#: ../src/protocols/irc/msgs.c:617
 msgid "Invitation only"
 msgstr "Vain kutsu"
 
-#: ../src/protocols/irc/msgs.c:717
+#: ../src/protocols/irc/msgs.c:718
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "%s on poistanut sinut kanavalta: (%s)"
 
 #. Remove user from channel
-#: ../src/protocols/irc/msgs.c:722 ../src/protocols/silc/ops.c:721
+#: ../src/protocols/irc/msgs.c:723 ../src/protocols/silc/ops.c:721
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "%s potkaisi (%s)"
 
-#: ../src/protocols/irc/msgs.c:745
+#: ../src/protocols/irc/msgs.c:746
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "moodin (%s %s) asetti %s"
 
-#: ../src/protocols/irc/msgs.c:830 ../src/protocols/irc/msgs.c:831
+#: ../src/protocols/irc/msgs.c:831 ../src/protocols/irc/msgs.c:832
 msgid "Invalid nickname"
 msgstr "Virheellinen lempinimi"
 
-#: ../src/protocols/irc/msgs.c:832
+#: ../src/protocols/irc/msgs.c:833
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -6210,7 +6272,7 @@
 "Palvelin hylkäsi valitsemasi kutsumanimen. Siinä on todennäköisesti "
 "kiellettyjä merkkejä."
 
-#: ../src/protocols/irc/msgs.c:836
+#: ../src/protocols/irc/msgs.c:837
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -6218,42 +6280,42 @@
 "Palvelin hylkäsi valitsemasi tilinimen. Siinä on todennäköisesti kiellettyjä "
 "merkkejä."
 
-#: ../src/protocols/irc/msgs.c:875
+#: ../src/protocols/irc/msgs.c:876
 msgid "Cannot change nick"
 msgstr "Ei kyetty muuttamaan kutsumanimeä"
 
-#: ../src/protocols/irc/msgs.c:875
+#: ../src/protocols/irc/msgs.c:876
 msgid "Could not change nick"
 msgstr "Ei kyetty muuttamaan kutsumanimeä"
 
-#: ../src/protocols/irc/msgs.c:896
+#: ../src/protocols/irc/msgs.c:897
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Olet poistunut kanavalta %s%s"
 
-#: ../src/protocols/irc/msgs.c:938
+#: ../src/protocols/irc/msgs.c:939
 msgid "Error: invalid PONG from server"
 msgstr "Virhe: epäkelpo PONG palvelimelta"
 
-#: ../src/protocols/irc/msgs.c:940
+#: ../src/protocols/irc/msgs.c:941
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING vastaus -- Viive: %lu sekuntia"
 
-#: ../src/protocols/irc/msgs.c:1021
+#: ../src/protocols/irc/msgs.c:1022
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Ei voi liittyä %s:"
 
-#: ../src/protocols/irc/msgs.c:1022 ../src/protocols/silc/ops.c:1128
+#: ../src/protocols/irc/msgs.c:1023 ../src/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Ei voida liittyä kanavalle"
 
-#: ../src/protocols/irc/msgs.c:1056
+#: ../src/protocols/irc/msgs.c:1057
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Kutsumanimi tai kanava ei tilapäisesti ole käytössä."
 
-#: ../src/protocols/irc/msgs.c:1068
+#: ../src/protocols/irc/msgs.c:1069
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops %s:ltä"
@@ -6360,7 +6422,7 @@
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [kanava]: Listaa kanavalla olevat käyttäjät."
 
-#: ../src/protocols/irc/parse.c:129 ../src/protocols/jabber/jabber.c:1743
+#: ../src/protocols/irc/parse.c:129 ../src/protocols/jabber/jabber.c:1741
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;uusi nimi&gt;: Muuta nimesi."
 
@@ -6536,83 +6598,83 @@
 msgid "SASL error"
 msgstr "SASL-virhe"
 
-#: ../src/protocols/jabber/buddy.c:249 ../src/protocols/jabber/buddy.c:664
+#: ../src/protocols/jabber/buddy.c:249 ../src/protocols/jabber/buddy.c:666
 #: ../src/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "Koko nimi"
 
-#: ../src/protocols/jabber/buddy.c:250 ../src/protocols/jabber/buddy.c:677
+#: ../src/protocols/jabber/buddy.c:250 ../src/protocols/jabber/buddy.c:679
 #: ../src/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "Sukunimi"
 
-#: ../src/protocols/jabber/buddy.c:251 ../src/protocols/jabber/buddy.c:681
+#: ../src/protocols/jabber/buddy.c:251 ../src/protocols/jabber/buddy.c:683
 msgid "Given Name"
 msgstr "Etunimi"
 
-#: ../src/protocols/jabber/buddy.c:253 ../src/protocols/jabber/jabber.c:805
+#: ../src/protocols/jabber/buddy.c:253 ../src/protocols/jabber/jabber.c:804
 msgid "URL"
 msgstr "URL"
 
-#: ../src/protocols/jabber/buddy.c:254 ../src/protocols/jabber/buddy.c:733
+#: ../src/protocols/jabber/buddy.c:254 ../src/protocols/jabber/buddy.c:735
 msgid "Street Address"
 msgstr "Katuosoite"
 
-#: ../src/protocols/jabber/buddy.c:255 ../src/protocols/jabber/buddy.c:729
+#: ../src/protocols/jabber/buddy.c:255 ../src/protocols/jabber/buddy.c:731
 msgid "Extended Address"
 msgstr "Laajennettu osoite"
 
-#: ../src/protocols/jabber/buddy.c:256 ../src/protocols/jabber/buddy.c:737
+#: ../src/protocols/jabber/buddy.c:256 ../src/protocols/jabber/buddy.c:739
 msgid "Locality"
 msgstr "Alue"
 
-#: ../src/protocols/jabber/buddy.c:257 ../src/protocols/jabber/buddy.c:741
+#: ../src/protocols/jabber/buddy.c:257 ../src/protocols/jabber/buddy.c:743
 msgid "Region"
 msgstr "Seutu"
 
-#: ../src/protocols/jabber/buddy.c:258 ../src/protocols/jabber/buddy.c:745
+#: ../src/protocols/jabber/buddy.c:258 ../src/protocols/jabber/buddy.c:747
 msgid "Postal Code"
 msgstr "Postinumero"
 
-#: ../src/protocols/jabber/buddy.c:259 ../src/protocols/jabber/buddy.c:750
+#: ../src/protocols/jabber/buddy.c:259 ../src/protocols/jabber/buddy.c:752
 #: ../src/protocols/silc/silc.c:943
 msgid "Country"
 msgstr "Maa"
 
-#: ../src/protocols/jabber/buddy.c:260 ../src/protocols/jabber/buddy.c:761
-#: ../src/protocols/jabber/buddy.c:768
+#: ../src/protocols/jabber/buddy.c:260 ../src/protocols/jabber/buddy.c:763
+#: ../src/protocols/jabber/buddy.c:770
 msgid "Telephone"
 msgstr "Puhelin"
 
-#: ../src/protocols/jabber/buddy.c:261 ../src/protocols/jabber/buddy.c:779
-#: ../src/protocols/jabber/buddy.c:787 ../src/protocols/jabber/buddy.c:1261
-#: ../src/protocols/silc/ops.c:1075 ../src/protocols/silc/util.c:512
+#: ../src/protocols/jabber/buddy.c:261 ../src/protocols/jabber/buddy.c:781
+#: ../src/protocols/jabber/buddy.c:789 ../src/protocols/jabber/buddy.c:1264
+#: ../src/protocols/silc/ops.c:1075 ../src/protocols/silc/util.c:526
 #: ../src/protocols/yahoo/yahoo_profile.c:1036
 msgid "E-Mail"
 msgstr "Sähköposti"
 
-#: ../src/protocols/jabber/buddy.c:262 ../src/protocols/jabber/buddy.c:802
+#: ../src/protocols/jabber/buddy.c:262 ../src/protocols/jabber/buddy.c:804
 msgid "Organization Name"
 msgstr "Organisaation nimi"
 
-#: ../src/protocols/jabber/buddy.c:263 ../src/protocols/jabber/buddy.c:806
+#: ../src/protocols/jabber/buddy.c:263 ../src/protocols/jabber/buddy.c:808
 msgid "Organization Unit"
 msgstr "Organisaatioyksikkö"
 
-#: ../src/protocols/jabber/buddy.c:265 ../src/protocols/jabber/buddy.c:815
+#: ../src/protocols/jabber/buddy.c:265 ../src/protocols/jabber/buddy.c:817
 msgid "Role"
 msgstr "Asema"
 
-#: ../src/protocols/jabber/buddy.c:266 ../src/protocols/jabber/buddy.c:698
-#: ../src/protocols/msn/msn.c:1594 ../src/protocols/oscar/oscar.c:3656
+#: ../src/protocols/jabber/buddy.c:266 ../src/protocols/jabber/buddy.c:700
+#: ../src/protocols/msn/msn.c:1589 ../src/protocols/oscar/oscar.c:3667
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
-#: ../src/protocols/jabber/buddy.c:567 ../src/protocols/jabber/buddy.c:568
+#: ../src/protocols/jabber/buddy.c:569 ../src/protocols/jabber/buddy.c:570
 msgid "Edit Jabber vCard"
 msgstr "Muokkaa Jabberin vCardia"
 
-#: ../src/protocols/jabber/buddy.c:569
+#: ../src/protocols/jabber/buddy.c:571
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -6620,91 +6682,91 @@
 "Kaikki allaolevat kentät ovat valinnaisia. Kirjoita vain tiedot, joiden "
 "luovuttamista pidät sopivana."
 
-#: ../src/protocols/jabber/buddy.c:639 ../src/protocols/jabber/jabber.c:1908
+#: ../src/protocols/jabber/buddy.c:641 ../src/protocols/jabber/jabber.c:1906
 msgid "Resource"
 msgstr "Lähde"
 
-#: ../src/protocols/jabber/buddy.c:685 ../src/protocols/silc/ops.c:1028
+#: ../src/protocols/jabber/buddy.c:687 ../src/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "Muut etunimet"
 
-#: ../src/protocols/jabber/buddy.c:718 ../src/protocols/jabber/jabber.c:780
-#: ../src/protocols/oscar/oscar.c:3675 ../src/protocols/oscar/oscar.c:3683
+#: ../src/protocols/jabber/buddy.c:720 ../src/protocols/jabber/jabber.c:779
+#: ../src/protocols/oscar/oscar.c:3686 ../src/protocols/oscar/oscar.c:3694
 #: ../src/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "Osoite"
 
-#: ../src/protocols/jabber/buddy.c:725
+#: ../src/protocols/jabber/buddy.c:727
 msgid "P.O. Box"
 msgstr "Postilokero"
 
-#: ../src/protocols/jabber/buddy.c:839
+#: ../src/protocols/jabber/buddy.c:841
 msgid "Photo"
 msgstr "Valokuva"
 
-#: ../src/protocols/jabber/buddy.c:839
+#: ../src/protocols/jabber/buddy.c:841
 msgid "Logo"
 msgstr "Logo"
 
-#: ../src/protocols/jabber/buddy.c:1042
+#: ../src/protocols/jabber/buddy.c:1044
 msgid "Un-hide From"
 msgstr "\"Tule esiin\""
 
-#: ../src/protocols/jabber/buddy.c:1046
+#: ../src/protocols/jabber/buddy.c:1048
 msgid "Temporarily Hide From"
 msgstr "Piiloudu väliaikaisesti tuttavalta"
 
 #. && NOT ME
-#: ../src/protocols/jabber/buddy.c:1054
+#: ../src/protocols/jabber/buddy.c:1056
 msgid "Cancel Presence Notification"
 msgstr "Peru paikallaoloilmoitus"
 
-#: ../src/protocols/jabber/buddy.c:1061
+#: ../src/protocols/jabber/buddy.c:1063
 msgid "(Re-)Request authorization"
 msgstr "Pyydä valtuutusta uudelleen"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../src/protocols/jabber/buddy.c:1070
+#: ../src/protocols/jabber/buddy.c:1072
 msgid "Unsubscribe"
 msgstr "Poista listalta"
 
-#: ../src/protocols/jabber/buddy.c:1097 ../src/protocols/jabber/chat.c:677
-#: ../src/protocols/jabber/chat.c:688 ../src/protocols/jabber/jabber.c:1165
+#: ../src/protocols/jabber/buddy.c:1099 ../src/protocols/jabber/chat.c:675
+#: ../src/protocols/jabber/chat.c:686 ../src/protocols/jabber/jabber.c:1163
 #: ../src/protocols/silc/ops.c:1449
 msgid "Error"
 msgstr "Virhe"
 
-#: ../src/protocols/jabber/buddy.c:1103 ../src/protocols/jabber/jabber.c:1190
+#: ../src/protocols/jabber/buddy.c:1105 ../src/protocols/jabber/jabber.c:1188
 msgid "Chatty"
 msgstr "Juttelutuulella"
 
-#: ../src/protocols/jabber/buddy.c:1107 ../src/status.c:159
+#: ../src/protocols/jabber/buddy.c:1109 ../src/status.c:159
 msgid "Extended Away"
 msgstr "Pidennetty poissaolo"
 
-#: ../src/protocols/jabber/buddy.c:1109 ../src/protocols/jabber/jabber.c:1220
-#: ../src/protocols/oscar/oscar.c:713 ../src/protocols/oscar/oscar.c:5610
-#: ../src/protocols/sametime/sametime.c:3284
+#: ../src/protocols/jabber/buddy.c:1111 ../src/protocols/jabber/jabber.c:1218
+#: ../src/protocols/oscar/oscar.c:713 ../src/protocols/oscar/oscar.c:5623
+#: ../src/protocols/sametime/sametime.c:3277
 msgid "Do Not Disturb"
 msgstr "Älä häiritse"
 
-#: ../src/protocols/jabber/buddy.c:1253
+#: ../src/protocols/jabber/buddy.c:1256
 msgid "JID"
 msgstr "JID"
 
-#: ../src/protocols/jabber/buddy.c:1257 ../src/protocols/jabber/buddy.c:1436
-#: ../src/protocols/oscar/oscar.c:3634
+#: ../src/protocols/jabber/buddy.c:1260 ../src/protocols/jabber/buddy.c:1439
+#: ../src/protocols/oscar/oscar.c:3635
 msgid "Last Name"
 msgstr "Sukunimi"
 
-#: ../src/protocols/jabber/buddy.c:1289
+#: ../src/protocols/jabber/buddy.c:1292
 msgid "The following are the results of your search"
 msgstr "Seuraavat ovat hakusi tuloksia"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../src/protocols/jabber/buddy.c:1364
+#: ../src/protocols/jabber/buddy.c:1367
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -6712,51 +6774,51 @@
 "Etsi henkilöä syöttämällä hakukriteerit kenttiin. Huom: jokainen kenttä "
 "tukee jokerimerkkejä (%)"
 
-#: ../src/protocols/jabber/buddy.c:1384
+#: ../src/protocols/jabber/buddy.c:1387
 msgid "Directory Query Failed"
 msgstr "Hakemistohaku epäonnistui"
 
-#: ../src/protocols/jabber/buddy.c:1385
+#: ../src/protocols/jabber/buddy.c:1388
 msgid "Could not query the directory server."
 msgstr "Ei voitu hakea hakemistopalvelimelta."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../src/protocols/jabber/buddy.c:1419
+#: ../src/protocols/jabber/buddy.c:1422
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Palvelimen ohjeet: %s"
 
-#: ../src/protocols/jabber/buddy.c:1426
+#: ../src/protocols/jabber/buddy.c:1429
 msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr "Täytä yksi tai useampia kentistä etsiäksesi Jabber-käyttäjiä."
 
-#: ../src/protocols/jabber/buddy.c:1446 ../src/protocols/novell/novell.c:1490
-#: ../src/protocols/oscar/oscar.c:3636 ../src/protocols/oscar/oscar.c:3643
+#: ../src/protocols/jabber/buddy.c:1449 ../src/protocols/novell/novell.c:1488
+#: ../src/protocols/oscar/oscar.c:3637 ../src/protocols/oscar/oscar.c:3644
 msgid "E-Mail Address"
 msgstr "Sähköpostiosoite"
 
-#: ../src/protocols/jabber/buddy.c:1455 ../src/protocols/jabber/buddy.c:1456
+#: ../src/protocols/jabber/buddy.c:1458 ../src/protocols/jabber/buddy.c:1459
 msgid "Search for Jabber users"
 msgstr "Etsi Jabber-käyttäjiä"
 
-#: ../src/protocols/jabber/buddy.c:1470
+#: ../src/protocols/jabber/buddy.c:1473
 msgid "Invalid Directory"
 msgstr "Virheellinen kansio"
 
-#: ../src/protocols/jabber/buddy.c:1487
+#: ../src/protocols/jabber/buddy.c:1490
 msgid "Enter a User Directory"
 msgstr "Syötä käyttäjähakemisto"
 
-#: ../src/protocols/jabber/buddy.c:1488
+#: ../src/protocols/jabber/buddy.c:1491
 msgid "Select a user directory to search"
 msgstr "Valitse käyttäjähakemisto, josta haetaan"
 
-#: ../src/protocols/jabber/buddy.c:1491
+#: ../src/protocols/jabber/buddy.c:1494
 msgid "Search Directory"
 msgstr "Etsi hakemistosta"
 
-#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:5099
+#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:5108
 #: ../src/protocols/yahoo/yahoochat.c:998
 msgid "_Room:"
 msgstr "_Huone:"
@@ -6800,44 +6862,44 @@
 msgid "Configuration error"
 msgstr "Konfigurointivirhe"
 
-#: ../src/protocols/jabber/chat.c:404 ../src/protocols/jabber/chat.c:549
+#: ../src/protocols/jabber/chat.c:404 ../src/protocols/jabber/chat.c:547
 msgid "Unable to configure"
 msgstr "Ei voida konfiguroida"
 
+#: ../src/protocols/jabber/chat.c:419
+msgid "Room Configuration Error"
+msgstr "Huoneen konfigurointivirhe"
+
 #: ../src/protocols/jabber/chat.c:420
-msgid "Room Configuration Error"
-msgstr "Huoneen konfigurointivirhe"
-
-#: ../src/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "Tätä huonetta ei voida konfiguroida"
 
-#: ../src/protocols/jabber/chat.c:471 ../src/protocols/jabber/chat.c:540
+#: ../src/protocols/jabber/chat.c:469 ../src/protocols/jabber/chat.c:538
 msgid "Registration error"
 msgstr "Rekisteröintivirhe"
 
-#: ../src/protocols/jabber/chat.c:628
+#: ../src/protocols/jabber/chat.c:626
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Kutsumanimeä ei voi muuttaa muissa kuin MUC-keskusteluhuoneissa"
 
-#: ../src/protocols/jabber/chat.c:678 ../src/protocols/jabber/chat.c:689
+#: ../src/protocols/jabber/chat.c:676 ../src/protocols/jabber/chat.c:687
 #: ../src/protocols/silc/ops.c:1449
 msgid "Error retrieving room list"
 msgstr "Virhe haettaessa huonelistaa"
 
-#: ../src/protocols/jabber/chat.c:737
+#: ../src/protocols/jabber/chat.c:735
 msgid "Invalid Server"
 msgstr "Palvelin ei kelpaa"
 
-#: ../src/protocols/jabber/chat.c:775
+#: ../src/protocols/jabber/chat.c:773
 msgid "Enter a Conference Server"
 msgstr "Syötä konferenssipalvelin"
 
-#: ../src/protocols/jabber/chat.c:776
+#: ../src/protocols/jabber/chat.c:774
 msgid "Select a conference server to query"
 msgstr "Valitse konferenssipalvelin"
 
-#: ../src/protocols/jabber/chat.c:779
+#: ../src/protocols/jabber/chat.c:777
 msgid "Find Rooms"
 msgstr "Etsi huoneita"
 
@@ -6854,396 +6916,396 @@
 msgid "Read Error"
 msgstr "Epäkelpo käyttäjä"
 
-#: ../src/protocols/jabber/jabber.c:474 ../src/protocols/jabber/jabber.c:900
+#: ../src/protocols/jabber/jabber.c:474 ../src/protocols/jabber/jabber.c:898
 msgid "Unable to create socket"
 msgstr "Pistokkeen luonti epäonnistui"
 
-#: ../src/protocols/jabber/jabber.c:520 ../src/protocols/jabber/jabber.c:857
+#: ../src/protocols/jabber/jabber.c:519 ../src/protocols/jabber/jabber.c:856
 msgid "Invalid Jabber ID"
 msgstr "Epäkelpo Jabber ID"
 
-#: ../src/protocols/jabber/jabber.c:590
+#: ../src/protocols/jabber/jabber.c:589
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s:n rekisteröinti onnistui"
 
-#: ../src/protocols/jabber/jabber.c:592 ../src/protocols/jabber/jabber.c:593
+#: ../src/protocols/jabber/jabber.c:591 ../src/protocols/jabber/jabber.c:592
 msgid "Registration Successful"
 msgstr "Rekisteröinti onnistui"
 
-#: ../src/protocols/jabber/jabber.c:599 ../src/protocols/jabber/jabber.c:1456
+#: ../src/protocols/jabber/jabber.c:598 ../src/protocols/jabber/jabber.c:1454
 msgid "Unknown Error"
 msgstr "Tuntematon virhe"
 
-#: ../src/protocols/jabber/jabber.c:601 ../src/protocols/jabber/jabber.c:602
+#: ../src/protocols/jabber/jabber.c:600 ../src/protocols/jabber/jabber.c:601
 msgid "Registration Failed"
 msgstr "Rekisteröinti epäonnistui"
 
-#: ../src/protocols/jabber/jabber.c:713 ../src/protocols/jabber/jabber.c:714
+#: ../src/protocols/jabber/jabber.c:712 ../src/protocols/jabber/jabber.c:713
 msgid "Already Registered"
 msgstr "Valmiiksi rekisteröity"
 
-#: ../src/protocols/jabber/jabber.c:790 ../src/protocols/oscar/oscar.c:3677
-#: ../src/protocols/oscar/oscar.c:3685
+#: ../src/protocols/jabber/jabber.c:789 ../src/protocols/oscar/oscar.c:3688
+#: ../src/protocols/oscar/oscar.c:3696
 msgid "State"
 msgstr "Lääni"
 
-#: ../src/protocols/jabber/jabber.c:795
+#: ../src/protocols/jabber/jabber.c:794
 msgid "Postal code"
 msgstr "Postinumero"
 
-#: ../src/protocols/jabber/jabber.c:800 ../src/protocols/silc/ops.c:1069
-#: ../src/protocols/silc/silc.c:701 ../src/protocols/silc/util.c:514
+#: ../src/protocols/jabber/jabber.c:799 ../src/protocols/silc/ops.c:1069
+#: ../src/protocols/silc/silc.c:701 ../src/protocols/silc/util.c:528
 msgid "Phone"
 msgstr "Puhelin"
 
-#: ../src/protocols/jabber/jabber.c:810
+#: ../src/protocols/jabber/jabber.c:809
 msgid "Date"
 msgstr "Päiväys"
 
-#: ../src/protocols/jabber/jabber.c:818
+#: ../src/protocols/jabber/jabber.c:817
 msgid "Please fill out the information below to register your new account."
 msgstr "Syötä alla olevat tiedot rekisteröidäksesi uuden tilin."
 
-#: ../src/protocols/jabber/jabber.c:821 ../src/protocols/jabber/jabber.c:822
+#: ../src/protocols/jabber/jabber.c:820 ../src/protocols/jabber/jabber.c:821
 msgid "Register New Jabber Account"
 msgstr "Rekisteröi uusi Jabber-tili"
 
-#: ../src/protocols/jabber/jabber.c:983
+#: ../src/protocols/jabber/jabber.c:981
 msgid "Initializing Stream"
 msgstr "Alustetaan datavirtaa"
 
-#: ../src/protocols/jabber/jabber.c:989 ../src/protocols/msn/session.c:357
+#: ../src/protocols/jabber/jabber.c:987 ../src/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "Todennetaan"
 
-#: ../src/protocols/jabber/jabber.c:998
+#: ../src/protocols/jabber/jabber.c:996
 msgid "Re-initializing Stream"
 msgstr "Uudelleenalustetaan datavirtaa"
 
-#: ../src/protocols/jabber/jabber.c:1069 ../src/protocols/jabber/jabber.c:1434
-#: ../src/protocols/jabber/jabber.c:1475 ../src/protocols/jabber/jabber.c:1509
-#: ../src/protocols/oscar/oscar.c:782 ../src/protocols/oscar/oscar.c:5401
+#: ../src/protocols/jabber/jabber.c:1067 ../src/protocols/jabber/jabber.c:1432
+#: ../src/protocols/jabber/jabber.c:1473 ../src/protocols/jabber/jabber.c:1507
+#: ../src/protocols/oscar/oscar.c:782 ../src/protocols/oscar/oscar.c:5414
 msgid "Not Authorized"
 msgstr "Ei valtuuksia"
 
-#: ../src/protocols/jabber/jabber.c:1111
+#: ../src/protocols/jabber/jabber.c:1109
 msgid "Both"
 msgstr "molemmille"
 
-#: ../src/protocols/jabber/jabber.c:1113
+#: ../src/protocols/jabber/jabber.c:1111
 msgid "From (To pending)"
 msgstr "vain sinulle (odottaa lupaa)"
 
-#: ../src/protocols/jabber/jabber.c:1118
+#: ../src/protocols/jabber/jabber.c:1116
 msgid "To"
 msgstr "vain sinulta"
 
-#: ../src/protocols/jabber/jabber.c:1120
+#: ../src/protocols/jabber/jabber.c:1118
 msgid "None (To pending)"
 msgstr "Ei mitään (odottaa lupaa)"
 
-#: ../src/protocols/jabber/jabber.c:1124
+#: ../src/protocols/jabber/jabber.c:1122
 msgid "Subscription"
 msgstr "Tilailmoitus"
 
-#: ../src/protocols/jabber/jabber.c:1181 ../src/protocols/jabber/jabber.c:1191
-#: ../src/protocols/jabber/jabber.c:1201 ../src/protocols/jabber/jabber.c:1211
-#: ../src/protocols/jabber/jabber.c:1221
+#: ../src/protocols/jabber/jabber.c:1179 ../src/protocols/jabber/jabber.c:1189
+#: ../src/protocols/jabber/jabber.c:1199 ../src/protocols/jabber/jabber.c:1209
+#: ../src/protocols/jabber/jabber.c:1219
 msgid "Priority"
 msgstr "Tärkeys"
 
-#: ../src/protocols/jabber/jabber.c:1250
+#: ../src/protocols/jabber/jabber.c:1248
 msgid "Password Changed"
 msgstr "Salasana muutettu"
 
-#: ../src/protocols/jabber/jabber.c:1251
+#: ../src/protocols/jabber/jabber.c:1249
 msgid "Your password has been changed."
 msgstr "Salasana vaihdettu"
 
-#: ../src/protocols/jabber/jabber.c:1255 ../src/protocols/jabber/jabber.c:1256
+#: ../src/protocols/jabber/jabber.c:1253 ../src/protocols/jabber/jabber.c:1254
 msgid "Error changing password"
 msgstr "Virhe vaihdettaessa salasanaa"
 
-#: ../src/protocols/jabber/jabber.c:1312
+#: ../src/protocols/jabber/jabber.c:1310
 msgid "Password (again)"
 msgstr "Salasana (uudelleen)"
 
-#: ../src/protocols/jabber/jabber.c:1317 ../src/protocols/jabber/jabber.c:1318
+#: ../src/protocols/jabber/jabber.c:1315 ../src/protocols/jabber/jabber.c:1316
 msgid "Change Jabber Password"
 msgstr "Vaihda Jabber-salasana"
 
-#: ../src/protocols/jabber/jabber.c:1318
+#: ../src/protocols/jabber/jabber.c:1316
 msgid "Please enter your new password"
 msgstr "Anna uusi salasanasi"
 
-#: ../src/protocols/jabber/jabber.c:1328 ../src/protocols/oscar/oscar.c:6171
+#: ../src/protocols/jabber/jabber.c:1326 ../src/protocols/oscar/oscar.c:6184
 #: ../src/protocols/silc/silc.c:1023
 msgid "Set User Info..."
 msgstr "Aseta käyttäjätiedot..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../src/protocols/jabber/jabber.c:1333 ../src/protocols/oscar/oscar.c:6182
+#: ../src/protocols/jabber/jabber.c:1331 ../src/protocols/oscar/oscar.c:6195
 #: ../src/protocols/silc/silc.c:1019
 msgid "Change Password..."
 msgstr "Vaihda salasana..."
 
 #. }
-#: ../src/protocols/jabber/jabber.c:1338
+#: ../src/protocols/jabber/jabber.c:1336
 msgid "Search for Users..."
 msgstr "Etsi käyttäjiä..."
 
+#: ../src/protocols/jabber/jabber.c:1412
+msgid "Bad Request"
+msgstr "Virheellinen pyyntö"
+
 #: ../src/protocols/jabber/jabber.c:1414
-msgid "Bad Request"
-msgstr "Virheellinen pyyntö"
-
-#: ../src/protocols/jabber/jabber.c:1416
 msgid "Conflict"
 msgstr "Ristiriita"
 
-#: ../src/protocols/jabber/jabber.c:1418
+#: ../src/protocols/jabber/jabber.c:1416
 msgid "Feature Not Implemented"
 msgstr "Ominaisuutta ei ole implementoitu."
 
+#: ../src/protocols/jabber/jabber.c:1418
+msgid "Forbidden"
+msgstr "Estetty"
+
 #: ../src/protocols/jabber/jabber.c:1420
-msgid "Forbidden"
-msgstr "Estetty"
-
-#: ../src/protocols/jabber/jabber.c:1422
 msgid "Gone"
 msgstr "Poistunut"
 
-#: ../src/protocols/jabber/jabber.c:1424 ../src/protocols/jabber/jabber.c:1499
+#: ../src/protocols/jabber/jabber.c:1422 ../src/protocols/jabber/jabber.c:1497
 msgid "Internal Server Error"
 msgstr "Sisäinen palvelinvirhe"
 
+#: ../src/protocols/jabber/jabber.c:1424
+msgid "Item Not Found"
+msgstr "Kohdetta ei löytynyt"
+
 #: ../src/protocols/jabber/jabber.c:1426
-msgid "Item Not Found"
-msgstr "Kohdetta ei löytynyt"
-
-#: ../src/protocols/jabber/jabber.c:1428
 msgid "Malformed Jabber ID"
 msgstr "Epäkelpo Jabber ID"
 
-#: ../src/protocols/jabber/jabber.c:1430
+#: ../src/protocols/jabber/jabber.c:1428
 msgid "Not Acceptable"
 msgstr "Ei kelvollinen"
 
-#: ../src/protocols/jabber/jabber.c:1432
+#: ../src/protocols/jabber/jabber.c:1430
 msgid "Not Allowed"
 msgstr "Ei sallittu"
 
-#: ../src/protocols/jabber/jabber.c:1436
+#: ../src/protocols/jabber/jabber.c:1434
 msgid "Payment Required"
 msgstr "Vaatii maksun"
 
-#: ../src/protocols/jabber/jabber.c:1438
+#: ../src/protocols/jabber/jabber.c:1436
 msgid "Recipient Unavailable"
 msgstr "Vastaanottaja ei saatavilla."
 
+#: ../src/protocols/jabber/jabber.c:1440
+msgid "Registration Required"
+msgstr "Vaatii rekisteröinnin"
+
 #: ../src/protocols/jabber/jabber.c:1442
-msgid "Registration Required"
-msgstr "Vaatii rekisteröinnin"
-
-#: ../src/protocols/jabber/jabber.c:1444
 msgid "Remote Server Not Found"
 msgstr "Palvelinta ei löytynyt"
 
-#: ../src/protocols/jabber/jabber.c:1446
+#: ../src/protocols/jabber/jabber.c:1444
 msgid "Remote Server Timeout"
 msgstr "Palvelin aikakatkaisi"
 
+#: ../src/protocols/jabber/jabber.c:1446
+msgid "Server Overloaded"
+msgstr "Palvelin ylikuormitettu"
+
 #: ../src/protocols/jabber/jabber.c:1448
-msgid "Server Overloaded"
-msgstr "Palvelin ylikuormitettu"
+msgid "Service Unavailable"
+msgstr "Palvelu ei käytettävissä"
 
 #: ../src/protocols/jabber/jabber.c:1450
-msgid "Service Unavailable"
-msgstr "Palvelu ei käytettävissä"
+msgid "Subscription Required"
+msgstr "Vaatii tilailmoitukset"
 
 #: ../src/protocols/jabber/jabber.c:1452
-msgid "Subscription Required"
-msgstr "Vaatii tilailmoitukset"
-
-#: ../src/protocols/jabber/jabber.c:1454
 msgid "Unexpected Request"
 msgstr "Odottamaton pyyntö"
 
-#: ../src/protocols/jabber/jabber.c:1461
+#: ../src/protocols/jabber/jabber.c:1459
 msgid "Authorization Aborted"
 msgstr "Valtuutus keskeytetty"
 
-#: ../src/protocols/jabber/jabber.c:1463
+#: ../src/protocols/jabber/jabber.c:1461
 msgid "Incorrect encoding in authorization"
 msgstr "Väärä merkistö valtuutusviestissä"
 
-#: ../src/protocols/jabber/jabber.c:1466
+#: ../src/protocols/jabber/jabber.c:1464
 msgid "Invalid authzid"
 msgstr "Epäkelpo authzid"
 
-#: ../src/protocols/jabber/jabber.c:1469
+#: ../src/protocols/jabber/jabber.c:1467
 msgid "Invalid Authorization Mechanism"
 msgstr "Epäkelpo tunnistautumismekanismi"
 
-#: ../src/protocols/jabber/jabber.c:1472
+#: ../src/protocols/jabber/jabber.c:1470
 msgid "Authorization mechanism too weak"
 msgstr "Tunnistautumismekanismi liian heikko"
 
-#: ../src/protocols/jabber/jabber.c:1477
+#: ../src/protocols/jabber/jabber.c:1475
 msgid "Temporary Authentication Failure"
 msgstr "Väliaikainen todennusvirhe"
 
-#: ../src/protocols/jabber/jabber.c:1480
+#: ../src/protocols/jabber/jabber.c:1478
 msgid "Authentication Failure"
 msgstr "Todennus epäonnistui"
 
-#: ../src/protocols/jabber/jabber.c:1484
+#: ../src/protocols/jabber/jabber.c:1482
 msgid "Bad Format"
 msgstr "Väärä muoto"
 
-#: ../src/protocols/jabber/jabber.c:1486
+#: ../src/protocols/jabber/jabber.c:1484
 msgid "Bad Namespace Prefix"
 msgstr "Väärä nimiavaruuden etuliite"
 
-#: ../src/protocols/jabber/jabber.c:1489
+#: ../src/protocols/jabber/jabber.c:1487
 msgid "Resource Conflict"
 msgstr "Lähdekonflikti"
 
-#: ../src/protocols/jabber/jabber.c:1491 ../src/protocols/silc/ops.c:1728
+#: ../src/protocols/jabber/jabber.c:1489 ../src/protocols/silc/ops.c:1728
 msgid "Connection Timeout"
 msgstr "Ei yhteyttä määräajassa"
 
+#: ../src/protocols/jabber/jabber.c:1491
+msgid "Host Gone"
+msgstr "Verkkoisäntä kadonnut"
+
 #: ../src/protocols/jabber/jabber.c:1493
-msgid "Host Gone"
-msgstr "Verkkoisäntä kadonnut"
+msgid "Host Unknown"
+msgstr "Tuntematon isäntä"
 
 #: ../src/protocols/jabber/jabber.c:1495
-msgid "Host Unknown"
-msgstr "Tuntematon isäntä"
-
-#: ../src/protocols/jabber/jabber.c:1497
 msgid "Improper Addressing"
 msgstr "Vääränlainen osoitus"
 
+#: ../src/protocols/jabber/jabber.c:1499
+msgid "Invalid ID"
+msgstr "Epäkelpo ID"
+
 #: ../src/protocols/jabber/jabber.c:1501
-msgid "Invalid ID"
-msgstr "Epäkelpo ID"
-
-#: ../src/protocols/jabber/jabber.c:1503
 msgid "Invalid Namespace"
 msgstr "Väärä nimiavaruus"
 
-#: ../src/protocols/jabber/jabber.c:1505
+#: ../src/protocols/jabber/jabber.c:1503
 msgid "Invalid XML"
 msgstr "Epäkelpo XML"
 
-#: ../src/protocols/jabber/jabber.c:1507
+#: ../src/protocols/jabber/jabber.c:1505
 msgid "Non-matching Hosts"
 msgstr "Verkkoisännät eivät täsmää"
 
-#: ../src/protocols/jabber/jabber.c:1511
+#: ../src/protocols/jabber/jabber.c:1509
 msgid "Policy Violation"
 msgstr "Menettelykäytäntörikkomus"
 
+#: ../src/protocols/jabber/jabber.c:1511
+msgid "Remote Connection Failed"
+msgstr "Etäyhteydessä yhteydessä virhe"
+
 #: ../src/protocols/jabber/jabber.c:1513
-msgid "Remote Connection Failed"
-msgstr "Etäyhteydessä yhteydessä virhe"
-
-#: ../src/protocols/jabber/jabber.c:1515
 msgid "Resource Constraint"
 msgstr "Lähderajoite"
 
-#: ../src/protocols/jabber/jabber.c:1517
+#: ../src/protocols/jabber/jabber.c:1515
 msgid "Restricted XML"
 msgstr "Rajoitettu XML"
 
+#: ../src/protocols/jabber/jabber.c:1517
+msgid "See Other Host"
+msgstr "Etsi toinen isäntä"
+
 #: ../src/protocols/jabber/jabber.c:1519
-msgid "See Other Host"
-msgstr "Etsi toinen isäntä"
+msgid "System Shutdown"
+msgstr "Järjestelmän alasajo"
 
 #: ../src/protocols/jabber/jabber.c:1521
-msgid "System Shutdown"
-msgstr "Järjestelmän alasajo"
+msgid "Undefined Condition"
+msgstr "Määrittelemätön tila"
 
 #: ../src/protocols/jabber/jabber.c:1523
-msgid "Undefined Condition"
-msgstr "Määrittelemätön tila"
+msgid "Unsupported Encoding"
+msgstr "Merkistöä ei tueta"
 
 #: ../src/protocols/jabber/jabber.c:1525
-msgid "Unsupported Encoding"
-msgstr "Merkistöä ei tueta"
+msgid "Unsupported Stanza Type"
+msgstr "Säkeistötyyppiä(stanza type) ei tuettu"
 
 #: ../src/protocols/jabber/jabber.c:1527
-msgid "Unsupported Stanza Type"
-msgstr "Säkeistötyyppiä(stanza type) ei tuettu"
+msgid "Unsupported Version"
+msgstr "Versiota ei tueta"
 
 #: ../src/protocols/jabber/jabber.c:1529
-msgid "Unsupported Version"
-msgstr "Versiota ei tueta"
-
-#: ../src/protocols/jabber/jabber.c:1531
 msgid "XML Not Well Formed"
 msgstr "Huonosti muotoiltua XML:ää"
 
-#: ../src/protocols/jabber/jabber.c:1533
+#: ../src/protocols/jabber/jabber.c:1531
 msgid "Stream Error"
 msgstr "Datavirtavirhe"
 
-#: ../src/protocols/jabber/jabber.c:1600
+#: ../src/protocols/jabber/jabber.c:1598
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Ei voitu kieltää käyttäjää %s."
 
-#: ../src/protocols/jabber/jabber.c:1620
+#: ../src/protocols/jabber/jabber.c:1618
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Tuntematon kytkös: \"%s\""
 
-#: ../src/protocols/jabber/jabber.c:1625
+#: ../src/protocols/jabber/jabber.c:1623
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Ei voitua tehdä käyttäjälle %s kytköstä \"%s\""
 
-#: ../src/protocols/jabber/jabber.c:1644
+#: ../src/protocols/jabber/jabber.c:1642
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Tuntematon rooli: \"%s\""
 
-#: ../src/protocols/jabber/jabber.c:1651
+#: ../src/protocols/jabber/jabber.c:1649
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Ei voitu asettaa roolia \"%s\" käyttäjälle: %s"
 
-#: ../src/protocols/jabber/jabber.c:1704
+#: ../src/protocols/jabber/jabber.c:1702
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Ei voitu potkaista käyttäjää %s ulos."
 
-#: ../src/protocols/jabber/jabber.c:1735
+#: ../src/protocols/jabber/jabber.c:1733
 msgid "config:  Configure a chat room."
 msgstr "config: Configuroi ryhmäkeskusteluhuone."
 
-#: ../src/protocols/jabber/jabber.c:1739
+#: ../src/protocols/jabber/jabber.c:1737
 msgid "configure:  Configure a chat room."
 msgstr "configure: Configuroi ryhmäkeskusteluhuone."
 
-#: ../src/protocols/jabber/jabber.c:1748
+#: ../src/protocols/jabber/jabber.c:1746
 msgid "part [room]:  Leave the room."
 msgstr "part [huone]: Poistu huoneesta."
 
-#: ../src/protocols/jabber/jabber.c:1753
+#: ../src/protocols/jabber/jabber.c:1751
 msgid "register:  Register with a chat room."
 msgstr "register: Rekisteröidy ryhmäkeskusteluhuoneeseen."
 
-#: ../src/protocols/jabber/jabber.c:1759
+#: ../src/protocols/jabber/jabber.c:1757
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [uusi aihe]: Näytä tai vaihda aihe."
 
-#: ../src/protocols/jabber/jabber.c:1765
+#: ../src/protocols/jabber/jabber.c:1763
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;käyttäjä&gt; [huone]: Kiellä käyttäjä huoneesta."
 
-#: ../src/protocols/jabber/jabber.c:1771
+#: ../src/protocols/jabber/jabber.c:1769
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -7251,7 +7313,7 @@
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Aseta "
 "käyttäjän käyttäjäluokka tälle huoneelle."
 
-#: ../src/protocols/jabber/jabber.c:1777
+#: ../src/protocols/jabber/jabber.c:1775
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -7259,20 +7321,20 @@
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Aseta "
 "käyttäjän rooli huoneessa."
 
-#: ../src/protocols/jabber/jabber.c:1783
+#: ../src/protocols/jabber/jabber.c:1781
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;käyttäjä&gt; [viesti]: Kutsu käyttäjä huoneeseen."
 
-#: ../src/protocols/jabber/jabber.c:1789
+#: ../src/protocols/jabber/jabber.c:1787
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr ""
 "join: &lt;huone&gt; [palvelin]: Liity ryhmäkeskusteluun tällä palvelimella."
 
-#: ../src/protocols/jabber/jabber.c:1795
+#: ../src/protocols/jabber/jabber.c:1793
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;käyttäjä&gt; [huone]: Potkaise käyttäjä ulos huoneesta."
 
-#: ../src/protocols/jabber/jabber.c:1800
+#: ../src/protocols/jabber/jabber.c:1798
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
@@ -7288,60 +7350,60 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/jabber/jabber.c:1883 ../src/protocols/jabber/jabber.c:1885
+#: ../src/protocols/jabber/jabber.c:1881 ../src/protocols/jabber/jabber.c:1883
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber-yhteyskäytäntöliitännäinen"
 
-#: ../src/protocols/jabber/jabber.c:1911
+#: ../src/protocols/jabber/jabber.c:1909
 msgid "Use TLS if available"
 msgstr "Käytä TLS:ää jos mahdollista"
 
-#: ../src/protocols/jabber/jabber.c:1916
+#: ../src/protocols/jabber/jabber.c:1914
 msgid "Require TLS"
 msgstr "Vaadi TLS"
 
-#: ../src/protocols/jabber/jabber.c:1919
+#: ../src/protocols/jabber/jabber.c:1917
 msgid "Force old (port 5223) SSL"
 msgstr "Käytä vanhaa (portti 5223) SSL:ää"
 
-#: ../src/protocols/jabber/jabber.c:1924
+#: ../src/protocols/jabber/jabber.c:1922
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Salli salaamaton tunnistautuminen salaamattoman yhteyden yli"
 
-#: ../src/protocols/jabber/jabber.c:1929 ../src/protocols/simple/simple.c:1772
+#: ../src/protocols/jabber/jabber.c:1927 ../src/protocols/simple/simple.c:1775
 msgid "Connect port"
 msgstr "Yhdistä porttiin"
 
 #. Account options
-#: ../src/protocols/jabber/jabber.c:1933 ../src/protocols/silc/silc.c:1854
+#: ../src/protocols/jabber/jabber.c:1931 ../src/protocols/silc/silc.c:1854
 msgid "Connect server"
 msgstr "Yhdistä palvelimeen"
 
-#: ../src/protocols/jabber/message.c:108
+#: ../src/protocols/jabber/message.c:117
 #, c-format
 msgid "Message from %s"
 msgstr "Viesti %s:lta"
 
-#: ../src/protocols/jabber/message.c:172
+#: ../src/protocols/jabber/message.c:181
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s vaihtoi aiheeksi: %s"
 
-#: ../src/protocols/jabber/message.c:174
+#: ../src/protocols/jabber/message.c:183
 #, c-format
 msgid "The topic is: %s"
 msgstr "Aihe on: %s"
 
-#: ../src/protocols/jabber/message.c:224
+#: ../src/protocols/jabber/message.c:233
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Viestin toimitus %s:lle epäonnistui: %s"
 
-#: ../src/protocols/jabber/message.c:227
+#: ../src/protocols/jabber/message.c:236
 msgid "Jabber Message Error"
 msgstr "Jabber viestivirhe"
 
-#: ../src/protocols/jabber/message.c:295
+#: ../src/protocols/jabber/message.c:319
 #, c-format
 msgid " (Code %s)"
 msgstr " (Koodi %s)"
@@ -7359,13 +7421,13 @@
 msgid "The user %s wants to add %s to his or her buddy list."
 msgstr "Käyttäjä %s haluaa lisätä käyttäjän %s tuttavalistalleen."
 
-#: ../src/protocols/jabber/presence.c:323 ../src/protocols/oscar/oscar.c:2380
-#: ../src/protocols/oscar/oscar.c:5030
+#: ../src/protocols/jabber/presence.c:323 ../src/protocols/oscar/oscar.c:2381
+#: ../src/protocols/oscar/oscar.c:5039
 msgid "_Authorize"
 msgstr "_Valtuuta"
 
-#: ../src/protocols/jabber/presence.c:324 ../src/protocols/oscar/oscar.c:2382
-#: ../src/protocols/oscar/oscar.c:5031
+#: ../src/protocols/jabber/presence.c:324 ../src/protocols/oscar/oscar.c:2383
+#: ../src/protocols/oscar/oscar.c:5040
 msgid "_Deny"
 msgstr "_Kiellä"
 
@@ -7622,7 +7684,7 @@
 msgid "Server too busy"
 msgstr "Palvelimella liikaa ruuhkaa "
 
-#: ../src/protocols/msn/error.c:198 ../src/protocols/oscar/oscar.c:1332
+#: ../src/protocols/msn/error.c:198 ../src/protocols/oscar/oscar.c:1331
 #: ../src/protocols/silc/ops.c:1717 ../src/protocols/toc/toc.c:722
 msgid "Authentication failed"
 msgstr "Todennus epäonnistui"
@@ -7717,9 +7779,9 @@
 msgid "Page"
 msgstr "Lähetä"
 
-#: ../src/protocols/msn/msn.c:550 ../src/protocols/msn/msn.c:557
-#: ../src/protocols/msn/msn.c:566 ../src/protocols/sametime/sametime.c:3246
-#: ../src/protocols/yahoo/yahoo.c:2882 ../src/protocols/yahoo/yahoo.c:2888
+#: ../src/protocols/msn/msn.c:548 ../src/protocols/msn/msn.c:555
+#: ../src/protocols/msn/msn.c:564 ../src/protocols/sametime/sametime.c:3239
+#: ../src/protocols/yahoo/yahoo.c:2878 ../src/protocols/yahoo/yahoo.c:2884
 #, c-format
 msgid ""
 "\n"
@@ -7728,69 +7790,69 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: ../src/protocols/msn/msn.c:557
+#: ../src/protocols/msn/msn.c:555
 msgid "Has you"
 msgstr "Olet hänen listallaan"
 
-#: ../src/protocols/msn/msn.c:587 ../src/protocols/msn/state.c:33
-#: ../src/protocols/yahoo/yahoo.c:2711 ../src/protocols/yahoo/yahoo.c:3296
+#: ../src/protocols/msn/msn.c:585 ../src/protocols/msn/state.c:33
+#: ../src/protocols/yahoo/yahoo.c:2707 ../src/protocols/yahoo/yahoo.c:3292
 msgid "Be Right Back"
 msgstr "Tulen pian takaisin"
 
-#: ../src/protocols/msn/msn.c:591 ../src/protocols/msn/state.c:31
-#: ../src/protocols/novell/novell.c:2851 ../src/protocols/novell/novell.c:2985
+#: ../src/protocols/msn/msn.c:589 ../src/protocols/msn/state.c:31
+#: ../src/protocols/novell/novell.c:2849 ../src/protocols/novell/novell.c:2983
 #: ../src/protocols/silc/buddy.c:1473 ../src/protocols/silc/silc.c:53
-#: ../src/protocols/yahoo/yahoo.c:2713 ../src/protocols/yahoo/yahoo.c:3299
+#: ../src/protocols/yahoo/yahoo.c:2709 ../src/protocols/yahoo/yahoo.c:3295
 msgid "Busy"
 msgstr "Varattu"
 
-#: ../src/protocols/msn/msn.c:595 ../src/protocols/yahoo/yahoo.c:2721
-#: ../src/protocols/yahoo/yahoo.c:3311
+#: ../src/protocols/msn/msn.c:593 ../src/protocols/yahoo/yahoo.c:2717
+#: ../src/protocols/yahoo/yahoo.c:3307
 msgid "On the Phone"
 msgstr "Puhelimessa"
 
-#: ../src/protocols/msn/msn.c:599 ../src/protocols/yahoo/yahoo.c:2725
-#: ../src/protocols/yahoo/yahoo.c:3317
+#: ../src/protocols/msn/msn.c:597 ../src/protocols/yahoo/yahoo.c:2721
+#: ../src/protocols/yahoo/yahoo.c:3313
 msgid "Out to Lunch"
 msgstr "Lounaalla"
 
-#: ../src/protocols/msn/msn.c:623
+#: ../src/protocols/msn/msn.c:621
 msgid "Set Friendly Name..."
 msgstr "Aseta tuttavanimi..."
 
-#: ../src/protocols/msn/msn.c:628
+#: ../src/protocols/msn/msn.c:626
 msgid "Set Home Phone Number..."
 msgstr "Aseta kotipuhelinnumero..."
 
-#: ../src/protocols/msn/msn.c:632
+#: ../src/protocols/msn/msn.c:630
 msgid "Set Work Phone Number..."
 msgstr "Aseta työpuhelinnumero..."
 
-#: ../src/protocols/msn/msn.c:636
+#: ../src/protocols/msn/msn.c:634
 msgid "Set Mobile Phone Number..."
 msgstr "Aseta matkapuhelinnumero..."
 
-#: ../src/protocols/msn/msn.c:642
+#: ../src/protocols/msn/msn.c:640
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Aseta päälle/pois mobiililaitteet..."
 
-#: ../src/protocols/msn/msn.c:647
+#: ../src/protocols/msn/msn.c:645
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Salli/estä mobiilihaut..."
 
-#: ../src/protocols/msn/msn.c:657
+#: ../src/protocols/msn/msn.c:655
 msgid "Open Hotmail Inbox"
 msgstr "Avaa Hotmailin saapuneet-kansio"
 
-#: ../src/protocols/msn/msn.c:681
+#: ../src/protocols/msn/msn.c:679
 msgid "Send to Mobile"
 msgstr "Lähetä mobiililaitteeseen"
 
-#: ../src/protocols/msn/msn.c:691 ../src/protocols/novell/novell.c:3441
+#: ../src/protocols/msn/msn.c:689 ../src/protocols/novell/novell.c:3439
 msgid "Initiate _Chat"
 msgstr "Aloita _ryhmäkeskustelu"
 
-#: ../src/protocols/msn/msn.c:729
+#: ../src/protocols/msn/msn.c:727
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -7798,230 +7860,230 @@
 "MSN vaatii SSL-tuen. Asenna tuettu SSL-kirjasto. Lisätietoja osoitteesta "
 "http://gaim.sf.net/faq-ssl.php."
 
-#: ../src/protocols/msn/msn.c:757
+#: ../src/protocols/msn/msn.c:755
 msgid "Failed to connect to server."
 msgstr "Palvelimeen ei saatu yhteyttä."
 
-#: ../src/protocols/msn/msn.c:1366 ../src/protocols/yahoo/yahoo_profile.c:685
+#: ../src/protocols/msn/msn.c:1361 ../src/protocols/yahoo/yahoo_profile.c:685
 #: ../src/protocols/zephyr/zephyr.c:736 ../src/protocols/zephyr/zephyr.c:1153
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Alias:</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: ../src/protocols/msn/msn.c:1373 ../src/protocols/yahoo/yahoo_profile.c:1208
+#: ../src/protocols/msn/msn.c:1368 ../src/protocols/yahoo/yahoo_profile.c:1208
 #: ../src/util.c:1061
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b> "
 
-#: ../src/protocols/msn/msn.c:1463
+#: ../src/protocols/msn/msn.c:1458
 msgid "MSN Profile"
 msgstr "MSN-profiili"
 
-#: ../src/protocols/msn/msn.c:1468 ../src/protocols/msn/msn.c:1794
+#: ../src/protocols/msn/msn.c:1463 ../src/protocols/msn/msn.c:1789
 #: ../src/protocols/yahoo/yahoo_profile.c:795
 msgid "Error retrieving profile"
 msgstr "Virhe haettaessa profiilia"
 
-#: ../src/protocols/msn/msn.c:1536 ../src/protocols/oscar/oscar.c:3662
+#: ../src/protocols/msn/msn.c:1531 ../src/protocols/oscar/oscar.c:3673
 #: ../src/protocols/yahoo/yahoo_profile.c:1056
 msgid "Age"
 msgstr "Ikä"
 
-#: ../src/protocols/msn/msn.c:1538 ../src/protocols/yahoo/yahoo_profile.c:1071
+#: ../src/protocols/msn/msn.c:1533 ../src/protocols/yahoo/yahoo_profile.c:1071
 msgid "Occupation"
 msgstr "Ammatti"
 
-#: ../src/protocols/msn/msn.c:1539 ../src/protocols/novell/novell.c:1480
+#: ../src/protocols/msn/msn.c:1534 ../src/protocols/novell/novell.c:1478
 #: ../src/protocols/yahoo/yahoo_profile.c:1051
 msgid "Location"
 msgstr "Sijainti"
 
-#: ../src/protocols/msn/msn.c:1544 ../src/protocols/msn/msn.c:1723
-#: ../src/protocols/msn/msn.c:1729 ../src/protocols/msn/msn.c:1736
+#: ../src/protocols/msn/msn.c:1539 ../src/protocols/msn/msn.c:1718
+#: ../src/protocols/msn/msn.c:1724 ../src/protocols/msn/msn.c:1731
 msgid "Hobbies and Interests"
 msgstr "Harrastukset"
 
-#: ../src/protocols/msn/msn.c:1550 ../src/protocols/msn/msn.c:1657
-#: ../src/protocols/msn/msn.c:1663 ../src/protocols/msn/msn.c:1670
-#: ../src/protocols/msn/msn.c:1678 ../src/protocols/msn/msn.c:1685
+#: ../src/protocols/msn/msn.c:1545 ../src/protocols/msn/msn.c:1652
+#: ../src/protocols/msn/msn.c:1658 ../src/protocols/msn/msn.c:1665
+#: ../src/protocols/msn/msn.c:1673 ../src/protocols/msn/msn.c:1680
 msgid "A Little About Me"
 msgstr "Oma kuvaus"
 
-#: ../src/protocols/msn/msn.c:1556
+#: ../src/protocols/msn/msn.c:1551
 #, c-format
 msgid "%s<b>General</b><br>%s"
 msgstr "%s<b>Yleinen</b><br>%s"
 
 #. Social
-#: ../src/protocols/msn/msn.c:1565 ../src/protocols/yahoo/yahoo_profile.c:1061
+#: ../src/protocols/msn/msn.c:1560 ../src/protocols/yahoo/yahoo_profile.c:1061
 msgid "Marital Status"
 msgstr "Siviilisääty"
 
-#: ../src/protocols/msn/msn.c:1566
+#: ../src/protocols/msn/msn.c:1561
 msgid "Interests"
 msgstr "Kiinnostukset"
 
-#: ../src/protocols/msn/msn.c:1567
+#: ../src/protocols/msn/msn.c:1562
 msgid "Pets"
 msgstr "Lemmikit"
 
-#: ../src/protocols/msn/msn.c:1568
+#: ../src/protocols/msn/msn.c:1563
 msgid "Hometown"
 msgstr "Kotikunta"
 
-#: ../src/protocols/msn/msn.c:1569
+#: ../src/protocols/msn/msn.c:1564
 msgid "Places Lived"
 msgstr "Asumispaikat"
 
-#: ../src/protocols/msn/msn.c:1570
+#: ../src/protocols/msn/msn.c:1565
 msgid "Fashion"
 msgstr "Tyyli"
 
-#: ../src/protocols/msn/msn.c:1571
+#: ../src/protocols/msn/msn.c:1566
 msgid "Humor"
 msgstr "Huumorintaju"
 
+#: ../src/protocols/msn/msn.c:1567
+msgid "Music"
+msgstr "Musiikki"
+
+#: ../src/protocols/msn/msn.c:1568 ../src/protocols/msn/msn.c:1740
+#: ../src/protocols/msn/msn.c:1746 ../src/protocols/yahoo/yahoo_profile.c:1113
+msgid "Favorite Quote"
+msgstr "Lempisanonta"
+
 #: ../src/protocols/msn/msn.c:1572
-msgid "Music"
-msgstr "Musiikki"
-
-#: ../src/protocols/msn/msn.c:1573 ../src/protocols/msn/msn.c:1745
-#: ../src/protocols/msn/msn.c:1751 ../src/protocols/yahoo/yahoo_profile.c:1113
-msgid "Favorite Quote"
-msgstr "Lempisanonta"
-
-#: ../src/protocols/msn/msn.c:1577
 #, c-format
 msgid "%s<b>Social</b><br>%s"
 msgstr "%s<b>Vapaa-aika</b><br>%s"
 
-#: ../src/protocols/msn/msn.c:1586
+#: ../src/protocols/msn/msn.c:1581
 msgid "Significant Other"
 msgstr "Elämänkumppani"
 
-#: ../src/protocols/msn/msn.c:1587
+#: ../src/protocols/msn/msn.c:1582
 msgid "Home Phone"
 msgstr "Kotipuhelin"
 
-#: ../src/protocols/msn/msn.c:1588
+#: ../src/protocols/msn/msn.c:1583
 msgid "Home Phone 2"
 msgstr "Kotipuhelin 2"
 
-#: ../src/protocols/msn/msn.c:1589 ../src/protocols/oscar/oscar.c:3674
+#: ../src/protocols/msn/msn.c:1584 ../src/protocols/oscar/oscar.c:3685
 msgid "Home Address"
 msgstr "Kotiosoite"
 
-#: ../src/protocols/msn/msn.c:1590
+#: ../src/protocols/msn/msn.c:1585
 msgid "Personal Mobile"
 msgstr "Oma matkapuhelin"
 
-#: ../src/protocols/msn/msn.c:1591
+#: ../src/protocols/msn/msn.c:1586
 msgid "Home Fax"
 msgstr "Kotifaksi"
 
-#: ../src/protocols/msn/msn.c:1592
+#: ../src/protocols/msn/msn.c:1587
 msgid "Personal E-Mail"
 msgstr "Oma sähköposti"
 
-#: ../src/protocols/msn/msn.c:1593
+#: ../src/protocols/msn/msn.c:1588
 msgid "Personal IM"
 msgstr "Oma pikaviestin"
 
-#: ../src/protocols/msn/msn.c:1595
+#: ../src/protocols/msn/msn.c:1590
 msgid "Anniversary"
 msgstr "Vuosipäivä"
 
-#: ../src/protocols/msn/msn.c:1596 ../src/protocols/msn/msn.c:1620
+#: ../src/protocols/msn/msn.c:1591 ../src/protocols/msn/msn.c:1615
 msgid "Notes"
 msgstr "Huomautuksia"
 
-#: ../src/protocols/msn/msn.c:1600
+#: ../src/protocols/msn/msn.c:1595
 #, c-format
 msgid "<br><b>Personal</b><br>%s"
 msgstr "<br><b>Koti</b><br>%s"
 
-#: ../src/protocols/msn/msn.c:1607 ../src/protocols/silc/ops.c:1044
+#: ../src/protocols/msn/msn.c:1602 ../src/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "Tehtävänimike"
 
-#: ../src/protocols/msn/msn.c:1608 ../src/protocols/oscar/oscar.c:3691
+#: ../src/protocols/msn/msn.c:1603 ../src/protocols/oscar/oscar.c:3702
 msgid "Company"
 msgstr "Yritys"
 
-#: ../src/protocols/msn/msn.c:1609 ../src/protocols/novell/novell.c:1482
+#: ../src/protocols/msn/msn.c:1604 ../src/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Osasto"
 
-#: ../src/protocols/msn/msn.c:1610
+#: ../src/protocols/msn/msn.c:1605
 msgid "Profession"
 msgstr "Asmatti"
 
-#: ../src/protocols/msn/msn.c:1611
+#: ../src/protocols/msn/msn.c:1606
 msgid "Work Phone"
 msgstr "Työpuhelin"
 
-#: ../src/protocols/msn/msn.c:1612
+#: ../src/protocols/msn/msn.c:1607
 msgid "Work Phone 2"
 msgstr "Työpuhelin 2"
 
-#: ../src/protocols/msn/msn.c:1613 ../src/protocols/oscar/oscar.c:3682
+#: ../src/protocols/msn/msn.c:1608 ../src/protocols/oscar/oscar.c:3693
 msgid "Work Address"
 msgstr "Työosoite"
 
-#: ../src/protocols/msn/msn.c:1614
+#: ../src/protocols/msn/msn.c:1609
 msgid "Work Mobile"
 msgstr "Työmatkapuhelin"
 
-#: ../src/protocols/msn/msn.c:1615
+#: ../src/protocols/msn/msn.c:1610
 msgid "Work Pager"
 msgstr "Työhakulaite"
 
-#: ../src/protocols/msn/msn.c:1616
+#: ../src/protocols/msn/msn.c:1611
 msgid "Work Fax"
 msgstr "Työfaksi"
 
-#: ../src/protocols/msn/msn.c:1617
+#: ../src/protocols/msn/msn.c:1612
 msgid "Work E-Mail"
 msgstr "Työsähköposti"
 
-#: ../src/protocols/msn/msn.c:1618
+#: ../src/protocols/msn/msn.c:1613
 msgid "Work IM"
 msgstr "Työ pikaviestin"
 
-#: ../src/protocols/msn/msn.c:1619
+#: ../src/protocols/msn/msn.c:1614
 msgid "Start Date"
 msgstr "Aloituspäivä"
 
-#: ../src/protocols/msn/msn.c:1624
+#: ../src/protocols/msn/msn.c:1619
 #, c-format
 msgid "<br><b>Business</b><br>%s"
 msgstr "<br><b>Työ</b><br>%s"
 
-#: ../src/protocols/msn/msn.c:1635
+#: ../src/protocols/msn/msn.c:1630
 #, c-format
 msgid "<hr><b>Contact Info</b>%s%s"
 msgstr "<hr><b>Yhteystiedot</b>%s%s"
 
-#: ../src/protocols/msn/msn.c:1694 ../src/protocols/msn/msn.c:1700
-#: ../src/protocols/msn/msn.c:1707 ../src/protocols/msn/msn.c:1714
+#: ../src/protocols/msn/msn.c:1689 ../src/protocols/msn/msn.c:1695
+#: ../src/protocols/msn/msn.c:1702 ../src/protocols/msn/msn.c:1709
 msgid "Favorite Things"
 msgstr "Lempiasiat"
 
-#: ../src/protocols/msn/msn.c:1759
+#: ../src/protocols/msn/msn.c:1754
 msgid "Last Updated"
 msgstr "Edellinen päivitys"
 
-#: ../src/protocols/msn/msn.c:1771 ../src/protocols/silc/ops.c:1060
+#: ../src/protocols/msn/msn.c:1766 ../src/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "Kotisivu"
 
-#: ../src/protocols/msn/msn.c:1796
+#: ../src/protocols/msn/msn.c:1791
 msgid "The user has not created a public profile."
 msgstr "Käyttäjällä ei ole julkista profiilia."
 
-#: ../src/protocols/msn/msn.c:1797
+#: ../src/protocols/msn/msn.c:1792
 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 "
@@ -8030,7 +8092,7 @@
 "MSN ilmoitti ettei voida löytää käyttäjän profiilia. Tämä tarkoittaa joko "
 "sitä että käyttäjää ei ole tai käyttäjä ei ole luonut julkista profiilia."
 
-#: ../src/protocols/msn/msn.c:1801
+#: ../src/protocols/msn/msn.c:1796
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
@@ -8039,12 +8101,12 @@
 "todennäköisesti ole olemassa."
 
 #. put a link to the actual profile URL
-#: ../src/protocols/msn/msn.c:1806
+#: ../src/protocols/msn/msn.c:1801
 #, c-format
 msgid "<hr><b>%s:</b> "
 msgstr "<hr><b>%s:</b> "
 
-#: ../src/protocols/msn/msn.c:1806 ../src/protocols/yahoo/yahoo_profile.c:1208
+#: ../src/protocols/msn/msn.c:1801 ../src/protocols/yahoo/yahoo_profile.c:1208
 msgid "Profile URL"
 msgstr "Profiilin URL"
 
@@ -8058,23 +8120,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/msn/msn.c:2028 ../src/protocols/msn/msn.c:2030
+#: ../src/protocols/msn/msn.c:2023 ../src/protocols/msn/msn.c:2025
 msgid "MSN Protocol Plugin"
 msgstr "MSN-yhteyskäytäntöliitännäinen"
 
-#: ../src/protocols/msn/msn.c:2049
-msgid "Login server"
-msgstr "Sisäänkirjautumispalvelin"
+#: ../src/protocols/msn/msn.c:2053
+msgid "Use HTTP Method"
+msgstr "Käytä HTTP-menetelmää"
 
 #: ../src/protocols/msn/msn.c:2058
-msgid "Use HTTP Method"
-msgstr "Käytä HTTP-menetelmää"
-
-#: ../src/protocols/msn/msn.c:2063
 msgid "Show custom smileys"
 msgstr "Näytä itse tehdyt / lisätyt hymiöt"
 
-#: ../src/protocols/msn/msn.c:2071
+#: ../src/protocols/msn/msn.c:2066
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: tönäise tuttavaa huomion saamiseksi"
 
@@ -8090,7 +8148,7 @@
 msgstr "%s ei ole kelvollinen ryhmä"
 
 #: ../src/protocols/msn/notification.c:184
-#: ../src/protocols/msn/notification.c:532 ../src/protocols/msn/session.c:336
+#: ../src/protocols/msn/notification.c:532 ../src/protocols/msn/session.c:329
 msgid "Unknown error."
 msgstr "Tuntematon virhe."
 
@@ -8128,15 +8186,15 @@
 msgid "Service Temporarily Unavailable."
 msgstr "Palvelu ei tilapäisesti ole käytettävissä."
 
-#: ../src/protocols/msn/notification.c:821
+#: ../src/protocols/msn/notification.c:820
 msgid "Unable to rename group"
 msgstr "Ryhmän uudelleen nimeäminen epäonnistui"
 
-#: ../src/protocols/msn/notification.c:876
+#: ../src/protocols/msn/notification.c:875
 msgid "Unable to delete group"
 msgstr "Ryhmää ei voitu poistaa"
 
-#: ../src/protocols/msn/notification.c:1309
+#: ../src/protocols/msn/notification.c:1308
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -8182,63 +8240,63 @@
 "Yhteysvirhe palvelimelta %s:\n"
 "%s"
 
-#: ../src/protocols/msn/session.c:306
+#: ../src/protocols/msn/session.c:299
 msgid "Our protocol is not supported by the server."
 msgstr "Palvelin ei tue yhteyskäytäntöä."
 
-#: ../src/protocols/msn/session.c:310
+#: ../src/protocols/msn/session.c:303
 msgid "Error parsing HTTP."
 msgstr "Virhe jäsennettäessä HTTP:tä."
 
 #. MSG_SERVER_GHOST
 #. Looks like someone logged in as us! =-O
-#: ../src/protocols/msn/session.c:314 ../src/protocols/napster/napster.c:456
-#: ../src/protocols/oscar/oscar.c:3415 ../src/protocols/yahoo/yahoo.c:193
+#: ../src/protocols/msn/session.c:307 ../src/protocols/napster/napster.c:456
+#: ../src/protocols/oscar/oscar.c:3416 ../src/protocols/yahoo/yahoo.c:191
 msgid "You have signed on from another location."
 msgstr "Olet kirjautunut sisään toisesta paikasta."
 
-#: ../src/protocols/msn/session.c:317
+#: ../src/protocols/msn/session.c:310
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN-palvelimet ovat väliaikaisesti tavoittamattomissa. Odota ja yritä "
 "uudelleen."
 
-#: ../src/protocols/msn/session.c:322
+#: ../src/protocols/msn/session.c:315
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN-palvelimet ajetaan alas väliaikaisesti."
 
-#: ../src/protocols/msn/session.c:326
+#: ../src/protocols/msn/session.c:319
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Ei voida tunnistautua: %s"
 
-#: ../src/protocols/msn/session.c:331
+#: ../src/protocols/msn/session.c:324
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN-tuttavalistaa ei väliaikaisesti voida hakea. Yritä myöhemmin uudelleen."
 
-#: ../src/protocols/msn/session.c:352 ../src/protocols/msn/session.c:354
+#: ../src/protocols/msn/session.c:345 ../src/protocols/msn/session.c:347
 msgid "Handshaking"
 msgstr "Kättely"
 
-#: ../src/protocols/msn/session.c:353
+#: ../src/protocols/msn/session.c:346
 msgid "Transferring"
 msgstr "Siirtää"
 
-#: ../src/protocols/msn/session.c:355
+#: ../src/protocols/msn/session.c:348
 msgid "Starting authentication"
 msgstr "Aloitetaan tunnistautumista"
 
-#: ../src/protocols/msn/session.c:356
+#: ../src/protocols/msn/session.c:349
 msgid "Getting cookie"
 msgstr "Haetaan evästettä"
 
-#: ../src/protocols/msn/session.c:358
+#: ../src/protocols/msn/session.c:351
 msgid "Sending cookie"
 msgstr "Lähetetään evästettä"
 
-#: ../src/protocols/msn/session.c:359
+#: ../src/protocols/msn/session.c:352
 msgid "Retrieving buddy list"
 msgstr "Noudetaan tuttavalista"
 
@@ -8254,36 +8312,38 @@
 msgid "Out To Lunch"
 msgstr "Lounaalla"
 
-#: ../src/protocols/msn/switchboard.c:406
+#: ../src/protocols/msn/switchboard.c:401
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "Viestiä ei välttämättä lähetetty koska tapahtui aikakatkaisu:"
 
-#: ../src/protocols/msn/switchboard.c:414
+#: ../src/protocols/msn/switchboard.c:409
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "Viestien lähetys ei ole sallittu näkymättömänä:"
 
-#: ../src/protocols/msn/switchboard.c:418
+#: ../src/protocols/msn/switchboard.c:413
 msgid "Message could not be sent because the user is offline:"
 msgstr "Viestiä ei voitu lähettää koska käyttäjä on poissa linjoilta:"
 
-#: ../src/protocols/msn/switchboard.c:422
+#: ../src/protocols/msn/switchboard.c:417
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Viestiä ei voitu lähettää yhteysvirheen vuoksi:"
 
-#: ../src/protocols/msn/switchboard.c:426
+#: ../src/protocols/msn/switchboard.c:421
 msgid "Message could not be sent because we are sending too quickly:"
-msgstr "Viestiä ei voitu lähettää koska lähetetään liian nopeasti:"
-
-#: ../src/protocols/msn/switchboard.c:430
+msgstr "Viestiä ei voitu lähettää koska viestejä lähetetään liian nopeasti:"
+
+#: ../src/protocols/msn/switchboard.c:425
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
-msgstr "Viestiä ei voitu lähettää switchboard-virheen vuoksi:"
-
-#: ../src/protocols/msn/switchboard.c:438
+msgstr ""
+"Viestiä ei voitu lähettää kytkentäpalvelimen kanssa tapahtuneen virheen "
+"vuoksi:"
+
+#: ../src/protocols/msn/switchboard.c:433
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Viestiä ei voitu lähettää tuntemattoman virheen vuoksi:"
 
-#: ../src/protocols/msn/switchboard.c:959
+#: ../src/protocols/msn/switchboard.c:953
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "Käyttäjä %s lähetti sinulle juuri tönäisyn!"
@@ -8293,11 +8353,11 @@
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "Käyttäjä %s (%s) haluaa lisätä käyttäjän %s tuttavalistalleen."
 
-#: ../src/protocols/msn/userlist.c:111 ../src/protocols/yahoo/yahoo.c:915
+#: ../src/protocols/msn/userlist.c:111 ../src/protocols/yahoo/yahoo.c:913
 msgid "Authorize"
 msgstr "Valtuuta"
 
-#: ../src/protocols/msn/userlist.c:112 ../src/protocols/yahoo/yahoo.c:917
+#: ../src/protocols/msn/userlist.c:112 ../src/protocols/yahoo/yahoo.c:915
 msgid "Deny"
 msgstr "Kiellä"
 
@@ -8311,12 +8371,12 @@
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s on poistanut sinut tuttavalistaltaan."
 
-#: ../src/protocols/msn/userlist.c:679
+#: ../src/protocols/msn/userlist.c:667
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Ei voitu lisätä \"%s\"."
 
-#: ../src/protocols/msn/userlist.c:681
+#: ../src/protocols/msn/userlist.c:669
 msgid "The screen name specified is invalid."
 msgstr "Syötetty näyttönimi on virheellinen."
 
@@ -8360,8 +8420,8 @@
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: ../src/protocols/napster/napster.c:507
 #: ../src/protocols/napster/napster.c:543 ../src/protocols/toc/toc.c:172
-#: ../src/protocols/yahoo/yahoo.c:2239 ../src/protocols/yahoo/yahoo.c:2266
-#: ../src/protocols/yahoo/yahoo.c:2349 ../src/protocols/yahoo/yahoo.c:2364
+#: ../src/protocols/yahoo/yahoo.c:2237 ../src/protocols/yahoo/yahoo.c:2264
+#: ../src/protocols/yahoo/yahoo.c:2347 ../src/protocols/yahoo/yahoo.c:2362
 #: ../src/protocols/yahoo/yahoo_filexfer.c:74
 #: ../src/protocols/yahoo/yahoo_filexfer.c:137
 #: ../src/protocols/yahoo/ycht.c:540
@@ -8537,7 +8597,7 @@
 msgid "Unable to send message (%s)."
 msgstr "Viestiä ei voitu lähettää (%s)."
 
-#: ../src/protocols/novell/novell.c:493 ../src/protocols/novell/novell.c:987
+#: ../src/protocols/novell/novell.c:493 ../src/protocols/novell/novell.c:985
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Ei voitu kutsua käyttäjää (%s)."
@@ -8596,33 +8656,33 @@
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Ei voitu poistaa %s yksityisyys-listalta (%s)."
 
-#: ../src/protocols/novell/novell.c:942 ../src/protocols/novell/novell.c:1654
+#: ../src/protocols/novell/novell.c:942 ../src/protocols/novell/novell.c:1652
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Ei voitu muuttaa palvelinpuolen yksityisyys-asetuksia (%s)."
 
-#: ../src/protocols/novell/novell.c:1014
+#: ../src/protocols/novell/novell.c:1012
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Ei voitu luoda konferenssia (%s)."
 
-#: ../src/protocols/novell/novell.c:1123 ../src/protocols/novell/novell.c:1693
+#: ../src/protocols/novell/novell.c:1121 ../src/protocols/novell/novell.c:1691
 msgid "Error communicating with server. Closing connection."
 msgstr "Virhe kommunikoitaessa palvelimelle. Suljetaan yhteys."
 
-#: ../src/protocols/novell/novell.c:1478
+#: ../src/protocols/novell/novell.c:1476
 msgid "Telephone Number"
 msgstr "Puhelinnumero"
 
-#: ../src/protocols/novell/novell.c:1484
+#: ../src/protocols/novell/novell.c:1482
 msgid "Personal Title"
 msgstr "Titteli"
 
-#: ../src/protocols/novell/novell.c:1488
+#: ../src/protocols/novell/novell.c:1486
 msgid "Mailstop"
 msgstr "Mailstop"
 
-#: ../src/protocols/novell/novell.c:1506
+#: ../src/protocols/novell/novell.c:1504
 msgid "User ID"
 msgstr "Käyttäjän ID"
 
@@ -8633,41 +8693,41 @@
 #. tag, value);
 #. }
 #.
-#: ../src/protocols/novell/novell.c:1520
+#: ../src/protocols/novell/novell.c:1518
 msgid "Full name"
 msgstr "Koko nimi"
 
-#: ../src/protocols/novell/novell.c:1644
+#: ../src/protocols/novell/novell.c:1642
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise-konferenssi %d"
 
-#: ../src/protocols/novell/novell.c:1669
+#: ../src/protocols/novell/novell.c:1667
 msgid "Unable to make SSL connection to server."
 msgstr "Palvelimeen ei kyetty muodostamaan SSL-yhteyttä."
 
-#: ../src/protocols/novell/novell.c:1726
+#: ../src/protocols/novell/novell.c:1724
 msgid "Authenticating..."
 msgstr "Todennetaan..."
 
-#: ../src/protocols/novell/novell.c:1738
+#: ../src/protocols/novell/novell.c:1736
 msgid "Unable to connect to server."
 msgstr "Palvelimeen ei kyetty muodostamaan yhteyttä."
 
-#: ../src/protocols/novell/novell.c:1741
+#: ../src/protocols/novell/novell.c:1739
 msgid "Waiting for response..."
 msgstr "Odotetaan vastausta..."
 
-#: ../src/protocols/novell/novell.c:1876
+#: ../src/protocols/novell/novell.c:1874
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s on kutsuttu tähän keskusteluun."
 
-#: ../src/protocols/novell/novell.c:1904
+#: ../src/protocols/novell/novell.c:1902
 msgid "Invitation to Conversation"
 msgstr "Keskustelukutsu"
 
-#: ../src/protocols/novell/novell.c:1905
+#: ../src/protocols/novell/novell.c:1903
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8678,16 +8738,16 @@
 "\n"
 "Lähetetty: %s"
 
-#: ../src/protocols/novell/novell.c:1907
+#: ../src/protocols/novell/novell.c:1905
 msgid "Would you like to join the conversation?"
 msgstr "Haluatko liittyä keskusteluun?"
 
-#: ../src/protocols/novell/novell.c:2014
+#: ../src/protocols/novell/novell.c:2012
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 "Sinut on kirjattu ulos koska olet kirjautunut sisään toiselta työasemalta."
 
-#: ../src/protocols/novell/novell.c:2070
+#: ../src/protocols/novell/novell.c:2068
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -8697,7 +8757,7 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../src/protocols/novell/novell.c:2168
+#: ../src/protocols/novell/novell.c:2166
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -8705,11 +8765,11 @@
 "Ei voitu yhdistää palvelimeen. Ole hyvä, syötä palvelimen osoite jolle "
 "haluat yhdistää."
 
-#: ../src/protocols/novell/novell.c:2190
+#: ../src/protocols/novell/novell.c:2188
 msgid "Error. SSL support is not installed."
 msgstr "Virhe. SSL-tuki ei ole asennettu."
 
-#: ../src/protocols/novell/novell.c:2499
+#: ../src/protocols/novell/novell.c:2497
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Tämä konferenssi on suljettu. Uusia viestejä ei voi lähettää."
 
@@ -8723,18 +8783,58 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/novell/novell.c:3543 ../src/protocols/novell/novell.c:3545
+#: ../src/protocols/novell/novell.c:3541 ../src/protocols/novell/novell.c:3543
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger -yhteyskäytäntöliitännäinen"
 
-#: ../src/protocols/novell/novell.c:3564
+#: ../src/protocols/novell/novell.c:3562
 msgid "Server address"
 msgstr "Palvelimen osoite"
 
-#: ../src/protocols/novell/novell.c:3568
+#: ../src/protocols/novell/novell.c:3566
 msgid "Server port"
 msgstr "Palvelimen portti"
 
+#: ../src/protocols/oscar/flap_connection.c:222
+msgid "Server closed the connection."
+msgstr "Palvelin on katkaissut yhteyden."
+
+#: ../src/protocols/oscar/flap_connection.c:224
+msgid "Lost connection with server for an unknown reason."
+msgstr "Yhteys palvelimeen katkesi tuntemattomasta syystä."
+
+#: ../src/protocols/oscar/flap_connection.c:226
+msgid "Received invalid data on connection with server."
+msgstr "Palvelimeen yhdistettäessä vastaanotettiin virheellisiä tietoja."
+
+#: ../src/protocols/oscar/flap_connection.c:228
+msgid "Could not establish a connection with the server."
+msgstr "Ei voitu muodostaa yhteyttä palvelimeen."
+
+#: ../src/protocols/oscar/odc.c:41
+msgid "The remote user has closed the connection."
+msgstr "Käyttäjä on katkaissut yhteyden."
+
+#: ../src/protocols/oscar/odc.c:45
+msgid "The remote user has declined your request."
+msgstr "Käyttäjä on kieltäytynyt pyynnöstäsi."
+
+#: ../src/protocols/oscar/odc.c:49
+msgid "Lost connection with the remote user for an unknown reason."
+msgstr "Yhteys käyttäjään katkesi tuntemattomasta syystä."
+
+#: ../src/protocols/oscar/odc.c:53
+msgid "Received invalid data on connection with remote user."
+msgstr "Vastaanotettiin virheellisiä tietoja luotaessa yhteyttä käyttäjään."
+
+#: ../src/protocols/oscar/odc.c:57
+msgid "Could not establish a connection with the remote user."
+msgstr "Ei voitu muodostaa yhteyttä käyttäjän kanssa."
+
+#: ../src/protocols/oscar/odc.c:567
+msgid "Direct IM established"
+msgstr "Suora pikaviestiyhteys muodostettu"
+
 #: ../src/protocols/oscar/oscar.c:144
 msgid "Invalid error"
 msgstr "Epäkelpo virhe"
@@ -8860,11 +8960,11 @@
 msgstr "AIM:n suora pikaviesti"
 
 #: ../src/protocols/oscar/oscar.c:634 ../src/protocols/silc/silc.c:697
-#: ../src/protocols/silc/util.c:510
+#: ../src/protocols/silc/util.c:524
 msgid "Chat"
 msgstr "Keskustelu"
 
-#: ../src/protocols/oscar/oscar.c:637 ../src/protocols/oscar/oscar.c:5780
+#: ../src/protocols/oscar/oscar.c:637 ../src/protocols/oscar/oscar.c:5793
 msgid "Get File"
 msgstr "Vastaanota tiedosto"
 
@@ -8936,15 +9036,15 @@
 msgid "Camera"
 msgstr "Kamera"
 
-#: ../src/protocols/oscar/oscar.c:711 ../src/protocols/oscar/oscar.c:5587
+#: ../src/protocols/oscar/oscar.c:711 ../src/protocols/oscar/oscar.c:5600
 msgid "Free For Chat"
 msgstr "Vapaana keskusteluun"
 
-#: ../src/protocols/oscar/oscar.c:715 ../src/protocols/oscar/oscar.c:5615
+#: ../src/protocols/oscar/oscar.c:715 ../src/protocols/oscar/oscar.c:5628
 msgid "Not Available"
 msgstr "Ei tavoittevissa"
 
-#: ../src/protocols/oscar/oscar.c:717 ../src/protocols/oscar/oscar.c:5605
+#: ../src/protocols/oscar/oscar.c:717 ../src/protocols/oscar/oscar.c:5618
 msgid "Occupied"
 msgstr "Varattu"
 
@@ -8956,7 +9056,7 @@
 msgid "Online"
 msgstr "Linjoilla"
 
-#: ../src/protocols/oscar/oscar.c:802 ../src/protocols/oscar/oscar.c:2823
+#: ../src/protocols/oscar/oscar.c:802 ../src/protocols/oscar/oscar.c:2824
 msgid "Warning Level"
 msgstr "Varoitustaso"
 
@@ -8985,7 +9085,7 @@
 msgid "Finalizing connection"
 msgstr "Viimeistellään yhteyttä"
 
-#: ../src/protocols/oscar/oscar.c:1220
+#: ../src/protocols/oscar/oscar.c:1219
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -8996,20 +9096,20 @@
 "virheellinen. Näyttönimien tulee alkaa joko kirjaimella ja sisältää vain "
 "kirjaimia, numeroita ja välilyöntejä tai sisältää vain numeroita."
 
-#: ../src/protocols/oscar/oscar.c:1309 ../src/protocols/toc/toc.c:543
+#: ../src/protocols/oscar/oscar.c:1308 ../src/protocols/toc/toc.c:543
 msgid "Incorrect nickname or password."
 msgstr "Virheellinen kutsumanimi tai salasana."
 
-#: ../src/protocols/oscar/oscar.c:1314
+#: ../src/protocols/oscar/oscar.c:1313
 msgid "Your account is currently suspended."
 msgstr "Käyttäjätilisi palvelu on parhaillaan keskeytetty."
 
 #. service temporarily unavailable
-#: ../src/protocols/oscar/oscar.c:1318
+#: ../src/protocols/oscar/oscar.c:1317
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL-pikaviestipalvelu ei tilapäisesti ole käytössä."
 
-#: ../src/protocols/oscar/oscar.c:1323
+#: ../src/protocols/oscar/oscar.c:1322
 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."
@@ -9018,32 +9118,32 @@
 "ja yritä uudelleen. Jos jatkat yrittämistä, joudut odottamaan vielä "
 "pidempään."
 
-#: ../src/protocols/oscar/oscar.c:1328
+#: ../src/protocols/oscar/oscar.c:1327
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Asiakasohjelmasi versio on liian vanha. Päivitä osoitteessa %s"
 
-#: ../src/protocols/oscar/oscar.c:1364
+#: ../src/protocols/oscar/oscar.c:1363
 msgid "Could Not Connect"
 msgstr "Yhteyttä ei voitu muodostaa"
 
-#: ../src/protocols/oscar/oscar.c:1369
+#: ../src/protocols/oscar/oscar.c:1368
 msgid "Received authorization"
 msgstr "Saatiin lupa"
 
-#: ../src/protocols/oscar/oscar.c:1392
+#: ../src/protocols/oscar/oscar.c:1391
 msgid "The SecurID key entered is invalid."
 msgstr "Syötetty SecurID-avain on virheellinen."
 
-#: ../src/protocols/oscar/oscar.c:1406
+#: ../src/protocols/oscar/oscar.c:1405
 msgid "Enter SecurID"
 msgstr "Syötä SecurID"
 
-#: ../src/protocols/oscar/oscar.c:1407
+#: ../src/protocols/oscar/oscar.c:1406
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Syötä 6 numeroinen luku digitaaliselta näytöltä."
 
-#: ../src/protocols/oscar/oscar.c:1447 ../src/protocols/oscar/oscar.c:1477
+#: ../src/protocols/oscar/oscar.c:1446 ../src/protocols/oscar/oscar.c:1480
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -9052,36 +9152,36 @@
 "Yhteytesi saatetaan katkaista kohta. Saatat haluta käyttää TOC-"
 "yhteyskäytäntöä kunnes tämä on korjattu. Tarkista päivitykset: %s"
 
-#: ../src/protocols/oscar/oscar.c:1450 ../src/protocols/oscar/oscar.c:1480
+#: ../src/protocols/oscar/oscar.c:1449 ../src/protocols/oscar/oscar.c:1483
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim ei saanut kelvollista AIM-sisäänkirjautumistiivistettä."
 
-#: ../src/protocols/oscar/oscar.c:1566
+#: ../src/protocols/oscar/oscar.c:1569
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "Yhteytesi saatetaan katkaista kohta. Tarkista päivitykset: %s."
 
-#: ../src/protocols/oscar/oscar.c:1569
+#: ../src/protocols/oscar/oscar.c:1572
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim ei saanut kelvollista sisäänkirjautumistiivistettä."
 
-#: ../src/protocols/oscar/oscar.c:1595
+#: ../src/protocols/oscar/oscar.c:1598
 msgid "Password sent"
 msgstr "Salasana lähetetty"
 
-#: ../src/protocols/oscar/oscar.c:2155
+#: ../src/protocols/oscar/oscar.c:2156
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Valtuuta minut jotta voin lisätä sinut tuttavalistalleni."
 
-#: ../src/protocols/oscar/oscar.c:2164
+#: ../src/protocols/oscar/oscar.c:2165
 msgid "Authorization Request Message:"
 msgstr "Valtuutuksen pyyntöviesti:"
 
-#: ../src/protocols/oscar/oscar.c:2165
+#: ../src/protocols/oscar/oscar.c:2166
 msgid "Please authorize me!"
 msgstr "Valtuuta minut."
 
-#: ../src/protocols/oscar/oscar.c:2199
+#: ../src/protocols/oscar/oscar.c:2200
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -9090,25 +9190,25 @@
 "Käyttäjä %s vaatii valtuutuksen ennenkuin hänet voi lisätä tuttavalistalle. "
 "Haluatko lähettää valtuutuspyynnön?"
 
-#: ../src/protocols/oscar/oscar.c:2204
+#: ../src/protocols/oscar/oscar.c:2205
 msgid "Request Authorization"
 msgstr "Pyydä valtuutusta"
 
-#: ../src/protocols/oscar/oscar.c:2206
+#: ../src/protocols/oscar/oscar.c:2207
 msgid "_Request Authorization"
 msgstr "_Pyydä valtuutusta"
 
-#: ../src/protocols/oscar/oscar.c:2250 ../src/protocols/oscar/oscar.c:2258
-#: ../src/protocols/oscar/oscar.c:2366 ../src/protocols/oscar/oscar.c:2390
-#: ../src/protocols/oscar/oscar.c:5016 ../src/protocols/oscar/oscar.c:5068
+#: ../src/protocols/oscar/oscar.c:2251 ../src/protocols/oscar/oscar.c:2259
+#: ../src/protocols/oscar/oscar.c:2367 ../src/protocols/oscar/oscar.c:2391
+#: ../src/protocols/oscar/oscar.c:5025 ../src/protocols/oscar/oscar.c:5077
 msgid "No reason given."
 msgstr "Syytä ei annettu."
 
-#: ../src/protocols/oscar/oscar.c:2257
+#: ../src/protocols/oscar/oscar.c:2258
 msgid "Authorization Denied Message:"
 msgstr "Valtuutuspyyntö evätty:"
 
-#: ../src/protocols/oscar/oscar.c:2368
+#: ../src/protocols/oscar/oscar.c:2369
 #, c-format
 msgid ""
 "The user %u wants to add %s to their buddy list for the following reason:\n"
@@ -9117,11 +9217,11 @@
 "Käyttäjä %u haluaa lisätä %s:n tuttavalistalleen seuraavasta syystä:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:2378 ../src/protocols/oscar/oscar.c:5028
+#: ../src/protocols/oscar/oscar.c:2379 ../src/protocols/oscar/oscar.c:5037
 msgid "Authorization Request"
 msgstr "Valtuutuspyyntö"
 
-#: ../src/protocols/oscar/oscar.c:2390
+#: ../src/protocols/oscar/oscar.c:2391
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -9132,17 +9232,17 @@
 "syystä:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:2391
+#: ../src/protocols/oscar/oscar.c:2392
 msgid "ICQ authorization denied."
 msgstr "ICQ-valtuutus evätty."
 
 #. Someone has granted you authorization
-#: ../src/protocols/oscar/oscar.c:2398
+#: ../src/protocols/oscar/oscar.c:2399
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "Käyttäjä %u on hyväksynyt pyyntösi lisätä hänet tuttavalistallesi."
 
-#: ../src/protocols/oscar/oscar.c:2406
+#: ../src/protocols/oscar/oscar.c:2407
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -9155,7 +9255,7 @@
 "Lähettäjä: %s [%s]\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:2414
+#: ../src/protocols/oscar/oscar.c:2415
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -9168,7 +9268,7 @@
 "Lähettäjä: %s [%s]\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:2422
+#: ../src/protocols/oscar/oscar.c:2423
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -9181,34 +9281,34 @@
 "Viesti on:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:2443
+#: ../src/protocols/oscar/oscar.c:2444
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ-käyttäjä %u on lähettänyt sinulle tuttavan: %s (%s)"
 
-#: ../src/protocols/oscar/oscar.c:2449
+#: ../src/protocols/oscar/oscar.c:2450
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Haluatko lisätä hänet tuttavalistallesi?"
 
-#: ../src/protocols/oscar/oscar.c:2453
+#: ../src/protocols/oscar/oscar.c:2454
 msgid "_Decline"
 msgstr "_Kieltäydy"
 
-#: ../src/protocols/oscar/oscar.c:2537
+#: ../src/protocols/oscar/oscar.c:2538
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "Et saanut %hu viestiä %s:lta koska se oli epäkelpo."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska ne olivat epäkelpoja."
 
-#: ../src/protocols/oscar/oscar.c:2546
+#: ../src/protocols/oscar/oscar.c:2547
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "Et saanut %hu viestiä %s:lta koska se oli liian suuri."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska ne olivat liian suuria."
 
-#: ../src/protocols/oscar/oscar.c:2555
+#: ../src/protocols/oscar/oscar.c:2556
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -9217,87 +9317,87 @@
 msgstr[0] "Et saanut %hu viestiä %s:lta koska taajuusraja ylittyi."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska taajuusraja ylittyi."
 
-#: ../src/protocols/oscar/oscar.c:2564
+#: ../src/protocols/oscar/oscar.c:2565
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "Et saanut %hu viestiä %s:lta koska hän on liian hirveä."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska hän on liian hirveä."
 
-#: ../src/protocols/oscar/oscar.c:2573
+#: ../src/protocols/oscar/oscar.c:2574
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "Et saanut %hu viestiä %s:lta koska olet liian hirveä."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska olet liian hirveä."
 
-#: ../src/protocols/oscar/oscar.c:2582
+#: ../src/protocols/oscar/oscar.c:2583
 #, 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] "Et saanut %hu viestiä %s:lta tuntemattomasta syystä."
 msgstr[1] "Et saanut %hu viestiä %s:lta tuntemattomasta syystä."
 
-#: ../src/protocols/oscar/oscar.c:2638
+#: ../src/protocols/oscar/oscar.c:2639
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>Tila:</B> %s<HR>%s"
 
-#: ../src/protocols/oscar/oscar.c:2699
+#: ../src/protocols/oscar/oscar.c:2700
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC antoi virheen: %s\n"
 
 #. Data is assumed to be the destination sn
-#: ../src/protocols/oscar/oscar.c:2735
+#: ../src/protocols/oscar/oscar.c:2736
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Viestiä ei voitu lähettää: %s"
 
-#: ../src/protocols/oscar/oscar.c:2735 ../src/protocols/oscar/oscar.c:2740
-#: ../src/protocols/oscar/oscar.c:2798 ../src/protocols/oscar/oscar.c:2802
+#: ../src/protocols/oscar/oscar.c:2736 ../src/protocols/oscar/oscar.c:2741
+#: ../src/protocols/oscar/oscar.c:2799 ../src/protocols/oscar/oscar.c:2803
 msgid "Unknown reason."
 msgstr "Tuntematon syy."
 
-#: ../src/protocols/oscar/oscar.c:2738
-#: ../src/protocols/sametime/sametime.c:2370
+#: ../src/protocols/oscar/oscar.c:2739
+#: ../src/protocols/sametime/sametime.c:2367
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Viestiä ei voitu lähettää käyttäjälle %s."
 
-#: ../src/protocols/oscar/oscar.c:2798
+#: ../src/protocols/oscar/oscar.c:2799
 #, c-format
 msgid "User information not available: %s"
 msgstr "Käyttäjätiedot eivät ole saatavilla: %s"
 
-#: ../src/protocols/oscar/oscar.c:2801
+#: ../src/protocols/oscar/oscar.c:2802
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s:n käyttäjätiedot eivät ole saatavilla"
 
-#: ../src/protocols/oscar/oscar.c:2827
+#: ../src/protocols/oscar/oscar.c:2828
 msgid "Online Since"
 msgstr "Kirjautunut"
 
-#: ../src/protocols/oscar/oscar.c:2832
+#: ../src/protocols/oscar/oscar.c:2833
 #: ../src/protocols/yahoo/yahoo_profile.c:1159
 msgid "Member Since"
 msgstr "Rekisteröitynyt"
 
-#: ../src/protocols/oscar/oscar.c:2837
+#: ../src/protocols/oscar/oscar.c:2838
 msgid "Capabilities"
 msgstr "Kyvyt"
 
-#: ../src/protocols/oscar/oscar.c:2855
+#: ../src/protocols/oscar/oscar.c:2856
 msgid "Available Message"
 msgstr "Paikallaoloviesti"
 
-#: ../src/protocols/oscar/oscar.c:2944
+#: ../src/protocols/oscar/oscar.c:2945
 msgid "Your AIM connection may be lost."
 msgstr "AIM-yhteytesi saattaa olla katkennut."
 
 #. The conversion failed!
-#: ../src/protocols/oscar/oscar.c:3125
+#: ../src/protocols/oscar/oscar.c:3126
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -9305,11 +9405,11 @@
 "[Ei voitu näyttää viestiä tältä käyttäjältä koska se sisälsi epäkelpoja "
 "merkkejä.]"
 
-#: ../src/protocols/oscar/oscar.c:3344
+#: ../src/protocols/oscar/oscar.c:3345
 msgid "Rate limiting error."
 msgstr "Määrärajoitusvirhe"
 
-#: ../src/protocols/oscar/oscar.c:3345
+#: ../src/protocols/oscar/oscar.c:3346
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -9317,81 +9417,81 @@
 "Viimeistä viestiä ei lähetetty koska olet ylittänyt taajuusrajan. Odota 10 "
 "sekuntia ja yritä uudelleen."
 
-#: ../src/protocols/oscar/oscar.c:3417
+#: ../src/protocols/oscar/oscar.c:3418
 msgid "You have been signed off for an unknown reason."
 msgstr "Yhteytesi on katkaistu tuntemattomasta syystä."
 
-#: ../src/protocols/oscar/oscar.c:3430 ../src/protocols/toc/toc.c:971
+#: ../src/protocols/oscar/oscar.c:3431 ../src/protocols/toc/toc.c:971
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Yhteytesi keskusteluhuoneeseen %s on katkennut."
 
-#: ../src/protocols/oscar/oscar.c:3648 ../src/protocols/silc/util.c:542
+#: ../src/protocols/oscar/oscar.c:3649 ../src/protocols/silc/util.c:556
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
-#: ../src/protocols/oscar/oscar.c:3665
+#: ../src/protocols/oscar/oscar.c:3676
 msgid "Personal Web Page"
 msgstr "Henkilökohtainen kotisivu"
 
-#: ../src/protocols/oscar/oscar.c:3669
+#: ../src/protocols/oscar/oscar.c:3680
 msgid "Additional Information"
 msgstr "Lisätiedot"
 
-#: ../src/protocols/oscar/oscar.c:3678 ../src/protocols/oscar/oscar.c:3686
+#: ../src/protocols/oscar/oscar.c:3689 ../src/protocols/oscar/oscar.c:3697
 msgid "Zip Code"
 msgstr "Postinumero"
 
-#: ../src/protocols/oscar/oscar.c:3690
+#: ../src/protocols/oscar/oscar.c:3701
 msgid "Work Information"
 msgstr "Työtiedot"
 
-#: ../src/protocols/oscar/oscar.c:3692
+#: ../src/protocols/oscar/oscar.c:3703
 msgid "Division"
 msgstr "Osasto"
 
-#: ../src/protocols/oscar/oscar.c:3693
+#: ../src/protocols/oscar/oscar.c:3704
 msgid "Position"
 msgstr "Asema"
 
-#: ../src/protocols/oscar/oscar.c:3695
+#: ../src/protocols/oscar/oscar.c:3706
 msgid "Web Page"
 msgstr "Kotisivu"
 
-#: ../src/protocols/oscar/oscar.c:3753
+#: ../src/protocols/oscar/oscar.c:3764
 msgid "Pop-Up Message"
 msgstr "Ponnahdusviesti"
 
-#: ../src/protocols/oscar/oscar.c:3793
+#: ../src/protocols/oscar/oscar.c:3804
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "Seuraava näyttönimi on assosioitu %s kanssa"
 msgstr[1] "Seuraavat näyttönimet on assosioitu %s kanssa"
 
-#: ../src/protocols/oscar/oscar.c:3798
+#: ../src/protocols/oscar/oscar.c:3809
 msgid "Screen name"
 msgstr "Näyttönimi"
 
-#: ../src/protocols/oscar/oscar.c:3824
+#: ../src/protocols/oscar/oscar.c:3835
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Ei hakutuloksia sähköpostiosoitteelle %s"
 
-#: ../src/protocols/oscar/oscar.c:3845
+#: ../src/protocols/oscar/oscar.c:3856
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Sinun tulisi saada sähköpostiviesti %s:n varmistusta varten."
 
-#: ../src/protocols/oscar/oscar.c:3847
+#: ../src/protocols/oscar/oscar.c:3858
 msgid "Account Confirmation Requested"
 msgstr "Tilin varmistusta pyydetty"
 
-#: ../src/protocols/oscar/oscar.c:3878
+#: ../src/protocols/oscar/oscar.c:3889
 msgid "Error Changing Account Info"
 msgstr "Virhe muutettaessa käyttäjätilin tietoja"
 
-#: ../src/protocols/oscar/oscar.c:3881
+#: ../src/protocols/oscar/oscar.c:3892
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -9400,14 +9500,14 @@
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi eroaa "
 "alkuperäisestä."
 
-#: ../src/protocols/oscar/oscar.c:3884
+#: ../src/protocols/oscar/oscar.c:3895
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi on "
 "virheellinen."
 
-#: ../src/protocols/oscar/oscar.c:3887
+#: ../src/protocols/oscar/oscar.c:3898
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -9416,7 +9516,7 @@
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi on "
 "liian pitkä."
 
-#: ../src/protocols/oscar/oscar.c:3890
+#: ../src/protocols/oscar/oscar.c:3901
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -9425,7 +9525,7 @@
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska tälle näyttönimelle "
 "on jo käsittelemätön muutospyyntö."
 
-#: ../src/protocols/oscar/oscar.c:3893
+#: ../src/protocols/oscar/oscar.c:3904
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -9434,7 +9534,7 @@
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska annettu osoite on "
 "assosioitu liian moneen näyttönimeen."
 
-#: ../src/protocols/oscar/oscar.c:3896
+#: ../src/protocols/oscar/oscar.c:3907
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -9443,12 +9543,12 @@
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska annettu osoite on "
 "virheellinen."
 
-#: ../src/protocols/oscar/oscar.c:3899
+#: ../src/protocols/oscar/oscar.c:3910
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Virhe 0x%04x: Tuntematon virhe."
 
-#: ../src/protocols/oscar/oscar.c:3909
+#: ../src/protocols/oscar/oscar.c:3920
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -9457,27 +9557,27 @@
 "Näyttönimesi on tällä hetkellä muotoiltu seuraavasti:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:3910 ../src/protocols/oscar/oscar.c:3917
+#: ../src/protocols/oscar/oscar.c:3921 ../src/protocols/oscar/oscar.c:3928
 msgid "Account Info"
 msgstr "Tilin tiedot"
 
-#: ../src/protocols/oscar/oscar.c:3915
+#: ../src/protocols/oscar/oscar.c:3926
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s:n sähköpostiosoite on %s"
 
-#: ../src/protocols/oscar/oscar.c:4090
+#: ../src/protocols/oscar/oscar.c:4101
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Pikaviesti kuvaasi ei lähetetty. Sinun tulee käyttää suorayhteyttä "
 "lähettääksesi pikaviestikuvia."
 
-#: ../src/protocols/oscar/oscar.c:4330
+#: ../src/protocols/oscar/oscar.c:4341
 msgid "Unable to set AIM profile."
 msgstr "AIM-profiilia ei saatu asetettua."
 
-#: ../src/protocols/oscar/oscar.c:4331
+#: ../src/protocols/oscar/oscar.c:4342
 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 "
@@ -9487,7 +9587,7 @@
 "suoritettua loppuun. Profiilia ei asetettu. Yritä asettaa se kun "
 "kirjautuminen on suoritettu."
 
-#: ../src/protocols/oscar/oscar.c:4345
+#: ../src/protocols/oscar/oscar.c:4356
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -9500,11 +9600,11 @@
 msgstr[1] ""
 "Maksimi profiilin koko %d tavua ylitetty. Gaim on lyhentänyt sen puolestasi."
 
-#: ../src/protocols/oscar/oscar.c:4350
+#: ../src/protocols/oscar/oscar.c:4361
 msgid "Profile too long."
 msgstr "Profiili on liian pitkä."
 
-#: ../src/protocols/oscar/oscar.c:4397
+#: ../src/protocols/oscar/oscar.c:4408
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -9517,11 +9617,11 @@
 msgstr[1] ""
 "Maksimi profiilin koko %d tavua ylitetty. Gaim on lyhentänyt sen puolestasi."
 
-#: ../src/protocols/oscar/oscar.c:4402
+#: ../src/protocols/oscar/oscar.c:4413
 msgid "Away message too long."
 msgstr "Poissaoloviesti on liian pitkä."
 
-#: ../src/protocols/oscar/oscar.c:4471
+#: ../src/protocols/oscar/oscar.c:4482
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -9532,16 +9632,16 @@
 "tulee alkaa joko kirjaimella ja sisältää vain kirjaimia, numeroita ja \n"
 "välilyöntejä tai sisältää vain numeroita."
 
-#: ../src/protocols/oscar/oscar.c:4473 ../src/protocols/oscar/oscar.c:4874
-#: ../src/protocols/oscar/oscar.c:4888
+#: ../src/protocols/oscar/oscar.c:4484 ../src/protocols/oscar/oscar.c:4883
+#: ../src/protocols/oscar/oscar.c:4897
 msgid "Unable To Add"
 msgstr "Lisääminen epäonnistui"
 
-#: ../src/protocols/oscar/oscar.c:4577
+#: ../src/protocols/oscar/oscar.c:4588
 msgid "Unable To Retrieve Buddy List"
 msgstr "Tuttavalistan nouto ei onnistunut"
 
-#: ../src/protocols/oscar/oscar.c:4578
+#: ../src/protocols/oscar/oscar.c:4589
 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 "
@@ -9550,13 +9650,13 @@
 "Gaim epäonnistui hakiessaan tuttavalistaa AIM-pavelimelta. Tuttavalistasi ei "
 "ole kadonnut, se tulee luultavasti saataville muutamassa tunnissa."
 
-#: ../src/protocols/oscar/oscar.c:4772 ../src/protocols/oscar/oscar.c:4773
-#: ../src/protocols/oscar/oscar.c:4778 ../src/protocols/oscar/oscar.c:4932
-#: ../src/protocols/oscar/oscar.c:4933 ../src/protocols/oscar/oscar.c:4938
+#: ../src/protocols/oscar/oscar.c:4781 ../src/protocols/oscar/oscar.c:4782
+#: ../src/protocols/oscar/oscar.c:4787 ../src/protocols/oscar/oscar.c:4941
+#: ../src/protocols/oscar/oscar.c:4942 ../src/protocols/oscar/oscar.c:4947
 msgid "Orphans"
 msgstr "Orvot"
 
-#: ../src/protocols/oscar/oscar.c:4872
+#: ../src/protocols/oscar/oscar.c:4881
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9565,11 +9665,11 @@
 "Ei voitu lisätä tuttavaa %s koska listallasi on liian monta tuttavaa. Ole "
 "hyvä ja poista joku ja yritä uudelleen."
 
-#: ../src/protocols/oscar/oscar.c:4872 ../src/protocols/oscar/oscar.c:4886
+#: ../src/protocols/oscar/oscar.c:4881 ../src/protocols/oscar/oscar.c:4895
 msgid "(no name)"
 msgstr "(nimetön)"
 
-#: ../src/protocols/oscar/oscar.c:4886
+#: ../src/protocols/oscar/oscar.c:4895
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -9579,7 +9679,7 @@
 "Ei voitu lisätä tuttavaa %s tuntemattomasta syystä. Yleisin syy tälle on se "
 "että listasi maksimituttavamäärä on ylittynyt."
 
-#: ../src/protocols/oscar/oscar.c:4969
+#: ../src/protocols/oscar/oscar.c:4978
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -9588,11 +9688,11 @@
 "Käyttäjälle %s on annettu lupa lisätä sinut heidän tuttavalistalleen. "
 "Haluatko lisätä heidät omalle listallesi?"
 
-#: ../src/protocols/oscar/oscar.c:4975
+#: ../src/protocols/oscar/oscar.c:4984
 msgid "Authorization Given"
 msgstr "Valtuutus annettu"
 
-#: ../src/protocols/oscar/oscar.c:5019
+#: ../src/protocols/oscar/oscar.c:5028
 #, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
@@ -9603,17 +9703,17 @@
 "%s"
 
 #. Granted
-#: ../src/protocols/oscar/oscar.c:5064
+#: ../src/protocols/oscar/oscar.c:5073
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "Käyttäjä %s on hyväksynyt pyyntösi lisätä hänet tuttavalistallesi."
 
-#: ../src/protocols/oscar/oscar.c:5065
+#: ../src/protocols/oscar/oscar.c:5074
 msgid "Authorization Granted"
 msgstr "Valtuutus hyväksytty"
 
 #. Denied
-#: ../src/protocols/oscar/oscar.c:5068
+#: ../src/protocols/oscar/oscar.c:5077
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9624,43 +9724,43 @@
 "syystä:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:5069
+#: ../src/protocols/oscar/oscar.c:5078
 msgid "Authorization Denied"
 msgstr "Valtuutus evätty"
 
-#: ../src/protocols/oscar/oscar.c:5105 ../src/protocols/toc/toc.c:1372
+#: ../src/protocols/oscar/oscar.c:5114 ../src/protocols/toc/toc.c:1372
 msgid "_Exchange:"
 msgstr "_Vaihto:"
 
-#: ../src/protocols/oscar/oscar.c:5145
+#: ../src/protocols/oscar/oscar.c:5154
 msgid "Invalid chat name specified."
 msgstr "Virheellinen ryhmäkeskustelun nimi annettu."
 
-#: ../src/protocols/oscar/oscar.c:5215
+#: ../src/protocols/oscar/oscar.c:5224
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Pikaviestikuvaasi ei lähetetty. Et voi lähettää pikaviestikuvia AIM- "
 "ryhmäkeskustelussa."
 
-#: ../src/protocols/oscar/oscar.c:5373
+#: ../src/protocols/oscar/oscar.c:5386
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(vastaanotetaan)</i>"
 
-#: ../src/protocols/oscar/oscar.c:5678
+#: ../src/protocols/oscar/oscar.c:5691
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Tuttavakommentti käyttäjälle %s"
 
-#: ../src/protocols/oscar/oscar.c:5679
+#: ../src/protocols/oscar/oscar.c:5692
 msgid "Buddy Comment:"
 msgstr "Kommentti"
 
-#: ../src/protocols/oscar/oscar.c:5725
+#: ../src/protocols/oscar/oscar.c:5738
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Olet päättänyt avata suoran pikaviestiyhteyden %s:n kanssa."
 
-#: ../src/protocols/oscar/oscar.c:5729
+#: ../src/protocols/oscar/oscar.c:5742
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -9668,65 +9768,65 @@
 "Koska tämä paljastaa IP-osoitteesi, sitä voidaan pitää turvallisuusriskinä.  "
 "Haluatko jatkaa?"
 
-#: ../src/protocols/oscar/oscar.c:5733
+#: ../src/protocols/oscar/oscar.c:5746 ../src/protocols/oscar/peer.c:941
 msgid "_Connect"
 msgstr "_Yhdistä"
 
-#: ../src/protocols/oscar/oscar.c:5751
+#: ../src/protocols/oscar/oscar.c:5764
 msgid "Edit Buddy Comment"
 msgstr "Muokkaa kommenttia"
 
-#: ../src/protocols/oscar/oscar.c:5759
+#: ../src/protocols/oscar/oscar.c:5772
 msgid "Get Status Msg"
 msgstr "Hae tilaviesti"
 
-#: ../src/protocols/oscar/oscar.c:5772
+#: ../src/protocols/oscar/oscar.c:5785
 msgid "Direct IM"
 msgstr "Suora pikaviesti"
 
-#: ../src/protocols/oscar/oscar.c:5794
+#: ../src/protocols/oscar/oscar.c:5807
 msgid "Re-request Authorization"
 msgstr "Pyydä valtuutus uudelleen"
 
-#: ../src/protocols/oscar/oscar.c:5851
+#: ../src/protocols/oscar/oscar.c:5864
 msgid "Require authorization"
 msgstr "Pyydä valtuutusta"
 
-#: ../src/protocols/oscar/oscar.c:5854
+#: ../src/protocols/oscar/oscar.c:5867
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Web-tietoinen (tämän käyttö altistaa sinut roskaposteille)"
 
-#: ../src/protocols/oscar/oscar.c:5859
+#: ../src/protocols/oscar/oscar.c:5872
 msgid "ICQ Privacy Options"
 msgstr "ICQ-yksityisyysvalinnat"
 
-#: ../src/protocols/oscar/oscar.c:5876
+#: ../src/protocols/oscar/oscar.c:5889
 msgid "The new formatting is invalid."
 msgstr "Uusi muotoilu on virheellinen."
 
-#: ../src/protocols/oscar/oscar.c:5877
+#: ../src/protocols/oscar/oscar.c:5890
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "Näyttönimen muotoilu voi vaikuttaa ainoastaan alkukirjaimeen sekä "
 "välilyönteihin."
 
-#: ../src/protocols/oscar/oscar.c:5884
+#: ../src/protocols/oscar/oscar.c:5897
 msgid "New screen name formatting:"
 msgstr "Uusi näyttönimen muotoilu:"
 
-#: ../src/protocols/oscar/oscar.c:5940
+#: ../src/protocols/oscar/oscar.c:5953
 msgid "Change Address To:"
 msgstr "Vaihda osoite:"
 
-#: ../src/protocols/oscar/oscar.c:5985
+#: ../src/protocols/oscar/oscar.c:5998
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>Et odota valtuutusta</i>"
 
-#: ../src/protocols/oscar/oscar.c:5988
+#: ../src/protocols/oscar/oscar.c:6001
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Odotat valtuutusta seuraavilta tuttavilta"
 
-#: ../src/protocols/oscar/oscar.c:5989
+#: ../src/protocols/oscar/oscar.c:6002
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9734,69 +9834,69 @@
 "Voit pyytää valtuutuksen uudelleen näiltä tuttavilta napsauttamalla oikeaa "
 "nappia heihin ja valitsemalla \"Pyydä valtuutus uudelleen\"."
 
-#: ../src/protocols/oscar/oscar.c:6006
+#: ../src/protocols/oscar/oscar.c:6019
 msgid "Find Buddy by E-Mail"
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
-#: ../src/protocols/oscar/oscar.c:6007
+#: ../src/protocols/oscar/oscar.c:6020
 msgid "Search for a buddy by e-mail address"
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
-#: ../src/protocols/oscar/oscar.c:6008
+#: ../src/protocols/oscar/oscar.c:6021
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Syötä etsimäsi tuttavan sähköpostiosoite."
 
-#: ../src/protocols/oscar/oscar.c:6177
+#: ../src/protocols/oscar/oscar.c:6190
 msgid "Set User Info (URL)..."
 msgstr "Aseta käyttäjätiedot (URL)..."
 
-#: ../src/protocols/oscar/oscar.c:6188
+#: ../src/protocols/oscar/oscar.c:6201
 msgid "Change Password (URL)"
 msgstr "Vaihda salasana (URL)"
 
-#: ../src/protocols/oscar/oscar.c:6192
+#: ../src/protocols/oscar/oscar.c:6205
 msgid "Configure IM Forwarding (URL)"
 msgstr "Aseta pikaviestien edelleenlähetys (URL)"
 
 #. ICQ actions
-#: ../src/protocols/oscar/oscar.c:6202
+#: ../src/protocols/oscar/oscar.c:6215
 msgid "Set Privacy Options..."
 msgstr "Aseta yksityisyysvalinnat..."
 
 #. AIM actions
-#: ../src/protocols/oscar/oscar.c:6209
+#: ../src/protocols/oscar/oscar.c:6222
 msgid "Format Screen Name..."
 msgstr "Muotoile näyttönimi..."
 
-#: ../src/protocols/oscar/oscar.c:6213
+#: ../src/protocols/oscar/oscar.c:6226
 msgid "Confirm Account"
 msgstr "Vahvista tili"
 
-#: ../src/protocols/oscar/oscar.c:6217
+#: ../src/protocols/oscar/oscar.c:6230
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Näytä tällä hetkellä rekisteröity sähköpostiosoite"
 
-#: ../src/protocols/oscar/oscar.c:6221
+#: ../src/protocols/oscar/oscar.c:6234
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Muuta tällä hetkellä rekisteröityä sähköpostiosoitetta..."
 
-#: ../src/protocols/oscar/oscar.c:6228
+#: ../src/protocols/oscar/oscar.c:6241
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Näytä tuttavat jotka odottavat valtuutusta"
 
-#: ../src/protocols/oscar/oscar.c:6234
+#: ../src/protocols/oscar/oscar.c:6247
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Etsi tuttavaa sähköpostiosoitteen perusteella..."
 
-#: ../src/protocols/oscar/oscar.c:6239
+#: ../src/protocols/oscar/oscar.c:6252
 msgid "Search for Buddy by Information"
 msgstr "Etsi tuttavaa tietojen perusteella"
 
-#: ../src/protocols/oscar/oscar.c:6305
+#: ../src/protocols/oscar/oscar.c:6318
 msgid "Use recent buddies group"
 msgstr "Käytä viimeaikaisten tuttavien ryhmää"
 
-#: ../src/protocols/oscar/oscar.c:6308
+#: ../src/protocols/oscar/oscar.c:6321
 msgid "Show how long you have been idle"
 msgstr "Näyttää kuinka kauan olet ollut jouten."
 
@@ -9810,23 +9910,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/oscar/oscar.c:6433 ../src/protocols/oscar/oscar.c:6435
+#: ../src/protocols/oscar/oscar.c:6446 ../src/protocols/oscar/oscar.c:6448
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ-yhteyskäytäntöliitännäinen"
 
-#: ../src/protocols/oscar/oscar.c:6454
-msgid "Auth host"
-msgstr "Kirjautumispalvelin"
-
-#: ../src/protocols/oscar/oscar.c:6457
-msgid "Auth port"
-msgstr "Portti"
-
-#: ../src/protocols/oscar/oscar.c:6460 ../src/protocols/zephyr/zephyr.c:2920
+#: ../src/protocols/oscar/oscar.c:6473 ../src/protocols/zephyr/zephyr.c:2920
 msgid "Encoding"
 msgstr "Merkistö"
 
-#: ../src/protocols/oscar/oscar.c:6465
+#: ../src/protocols/oscar/oscar.c:6477
 msgid ""
 "Always use AIM/ICQ proxy server\n"
 "(slower, but does not reveal your IP address)"
@@ -9834,132 +9926,162 @@
 "Käytä aina AIM/ICQ-välipalvelinta\n"
 "(hitaampi, mutta ei paljasta IP-osoitettasi)"
 
+#: ../src/protocols/oscar/peer.c:613
+#, c-format
+msgid "Asking %s to connect to us at %s:%hu for Direct IM."
+msgstr ""
+"Pyydetään %s yhdistämään meihin at %s:%hu suoraa pikaviestiyhteyttä varten."
+
+#: ../src/protocols/oscar/peer.c:662 ../src/protocols/oscar/peer.c:693
+#, c-format
+msgid "Attempting to connect to %s:%hu."
+msgstr "Yritetään yhdistää kohteeseen %s:%hu."
+
+#: ../src/protocols/oscar/peer.c:753
+msgid "Attempting to connect via proxy server."
+msgstr "Yritetään yhdistämistä välipalvelimen kautta."
+
+#: ../src/protocols/oscar/peer.c:931
+#, c-format
+msgid "%s has just asked to directly connect to %s"
+msgstr "%s on juuri pyytänyt suoraa yhteyttä %s:n"
+
+#: ../src/protocols/oscar/peer.c:935
+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 ""
+"Tämä toiminto vaatiin suoran yhteyden koneiden välillä mutta on tarpeellinen "
+"lähetettäessä kuvia. Koska IP-osoitteesi paljastuu, tätä voi pitää "
+"yksityisyysriskinä."
+
 #: ../src/protocols/sametime/sametime.c:415
 msgid "Connection closed (writing)"
 msgstr "Yhteys suljettu (kirjoitus)"
 
-#: ../src/protocols/sametime/sametime.c:1264
+#: ../src/protocols/sametime/sametime.c:1261
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Ryhmän nimi:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:1265
+#: ../src/protocols/sametime/sametime.c:1262
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>Notesin ryhmä-ID:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:1267
+#: ../src/protocols/sametime/sametime.c:1264
 #, c-format
 msgid "Info for Group %s"
 msgstr "Tietoja ryhmästä %s"
 
-#: ../src/protocols/sametime/sametime.c:1269
+#: ../src/protocols/sametime/sametime.c:1266
 msgid "Notes Address Book Information"
 msgstr "Notesin osoitekirjatiedot"
 
-#: ../src/protocols/sametime/sametime.c:1301
+#: ../src/protocols/sametime/sametime.c:1298
 msgid "Invite Group to Conference..."
 msgstr "Kutsu ryhmä neuvotteluun..."
 
-#: ../src/protocols/sametime/sametime.c:1311
+#: ../src/protocols/sametime/sametime.c:1308
 msgid "Get Notes Address Book Info"
 msgstr "Hae Notesin osoitekirjatiedot"
 
-#: ../src/protocols/sametime/sametime.c:1464
+#: ../src/protocols/sametime/sametime.c:1461
 msgid "Sending Handshake"
 msgstr "Lähetetään kättelyä"
 
-#: ../src/protocols/sametime/sametime.c:1469
+#: ../src/protocols/sametime/sametime.c:1466
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "Odotetaan kättelyn vahvistusta"
 
-#: ../src/protocols/sametime/sametime.c:1474
+#: ../src/protocols/sametime/sametime.c:1471
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Kättely vahvistettu, kirjaudutaan"
 
-#: ../src/protocols/sametime/sametime.c:1479
+#: ../src/protocols/sametime/sametime.c:1476
 msgid "Waiting for Login Acknowledgement"
 msgstr "Odotetaan kirjautumisen vahvistusta"
 
-#: ../src/protocols/sametime/sametime.c:1484
+#: ../src/protocols/sametime/sametime.c:1481
 msgid "Login Redirected"
 msgstr "Sisäänkirjautuminen uudelleenohjattu"
 
-#: ../src/protocols/sametime/sametime.c:1490
+#: ../src/protocols/sametime/sametime.c:1487
 msgid "Forcing Login"
 msgstr "Pakotetaan sisäänkirjautuminen"
 
-#: ../src/protocols/sametime/sametime.c:1494
+#: ../src/protocols/sametime/sametime.c:1491
 msgid "Login Acknowledged"
 msgstr "Kirjautuminen vahvistettu"
 
-#: ../src/protocols/sametime/sametime.c:1499
+#: ../src/protocols/sametime/sametime.c:1496
 msgid "Starting Services"
 msgstr "Käynnistetään palveluja"
 
-#: ../src/protocols/sametime/sametime.c:1504
+#: ../src/protocols/sametime/sametime.c:1501
 msgid "Connected"
 msgstr "Yhdistetty"
 
-#: ../src/protocols/sametime/sametime.c:1602
+#: ../src/protocols/sametime/sametime.c:1599
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr "Sametime-ylläpitäjä on julkaissut seuraavan tiedotteen palvelimella %s"
 
-#: ../src/protocols/sametime/sametime.c:1607
+#: ../src/protocols/sametime/sametime.c:1604
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime-ylläpitäjän tiedote"
 
-#: ../src/protocols/sametime/sametime.c:1659
+#: ../src/protocols/sametime/sametime.c:1656
 msgid "Connection reset"
 msgstr "Yhteys suljettu"
 
-#: ../src/protocols/sametime/sametime.c:1666
+#: ../src/protocols/sametime/sametime.c:1663
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Virhe luettaessa socketista: %s"
 
 #. this is a regular connect, error out
-#: ../src/protocols/sametime/sametime.c:1695
-#: ../src/protocols/sametime/sametime.c:3695
+#: ../src/protocols/sametime/sametime.c:1692
+#: ../src/protocols/sametime/sametime.c:3688
 msgid "Unable to connect to host"
 msgstr "Palvelimeen ei kyetty muodostamaan yhteyttä"
 
-#: ../src/protocols/sametime/sametime.c:1733
+#: ../src/protocols/sametime/sametime.c:1730
 #, c-format
 msgid "Announcement from %s"
 msgstr "Ilmoitus käyttäjältä %s"
 
-#: ../src/protocols/sametime/sametime.c:1907
+#: ../src/protocols/sametime/sametime.c:1904
 msgid "Conference Closed"
 msgstr "Neuvottelu suljettu"
 
-#: ../src/protocols/sametime/sametime.c:2364
+#: ../src/protocols/sametime/sametime.c:2361
 msgid "Unable to send message: "
 msgstr "Viestiä ei voitu lähettää: "
 
-#: ../src/protocols/sametime/sametime.c:2925
+#: ../src/protocols/sametime/sametime.c:2918
 msgid "Place Closed"
 msgstr "Paikka suljettu"
 
-#: ../src/protocols/sametime/sametime.c:3216
+#: ../src/protocols/sametime/sametime.c:3209
 msgid "Microphone"
 msgstr "Mikrofoni"
 
-#: ../src/protocols/sametime/sametime.c:3217
+#: ../src/protocols/sametime/sametime.c:3210
 msgid "Speakers"
 msgstr "Kaiuttimet"
 
-#: ../src/protocols/sametime/sametime.c:3218
+#: ../src/protocols/sametime/sametime.c:3211
 msgid "Video Camera"
 msgstr "Videokamera"
 
-#: ../src/protocols/sametime/sametime.c:3222
+#: ../src/protocols/sametime/sametime.c:3215
 msgid "File Transfer"
 msgstr "Tiedostonsiirto"
 
-#: ../src/protocols/sametime/sametime.c:3256
+#: ../src/protocols/sametime/sametime.c:3249
 #, c-format
 msgid ""
 "\n"
@@ -9968,7 +10090,7 @@
 "\n"
 "<b>Tukee</b>: %s"
 
-#: ../src/protocols/sametime/sametime.c:3261
+#: ../src/protocols/sametime/sametime.c:3254
 msgid ""
 "\n"
 "<b>External User</b>"
@@ -9976,11 +10098,11 @@
 "\n"
 "<b>Ulkoinen käyttäjä</b>"
 
-#: ../src/protocols/sametime/sametime.c:3367
+#: ../src/protocols/sametime/sametime.c:3360
 msgid "Create conference with user"
 msgstr "Aloita neuvottelu käyttäjän kanssa"
 
-#: ../src/protocols/sametime/sametime.c:3368
+#: ../src/protocols/sametime/sametime.c:3361
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -9989,27 +10111,27 @@
 "Kirjoita uuden neuvottelun puheenaihe sekä kutsuviesti joka lähetetään "
 "käyttäjälle %s"
 
-#: ../src/protocols/sametime/sametime.c:3372
+#: ../src/protocols/sametime/sametime.c:3365
 msgid "New Conference"
 msgstr "Aloita neuvottelu"
 
-#: ../src/protocols/sametime/sametime.c:3374
+#: ../src/protocols/sametime/sametime.c:3367
 msgid "Create"
 msgstr "Aloita"
 
-#: ../src/protocols/sametime/sametime.c:3438
+#: ../src/protocols/sametime/sametime.c:3431
 msgid "Available Conferences"
 msgstr "Käynnissä olevat neuvottelut"
 
-#: ../src/protocols/sametime/sametime.c:3444
+#: ../src/protocols/sametime/sametime.c:3437
 msgid "Create New Conference..."
 msgstr "Aloita uusi neuvottelu..."
 
-#: ../src/protocols/sametime/sametime.c:3451
+#: ../src/protocols/sametime/sametime.c:3444
 msgid "Invite user to a conference"
 msgstr "Kutsu käyttäjä neuvotteluun"
 
-#: ../src/protocols/sametime/sametime.c:3452
+#: ../src/protocols/sametime/sametime.c:3445
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -10020,27 +10142,27 @@
 "Valitse \"Aloita uusi neuvottelu\" jos haluat aloittaa uuden neuvottelun ja "
 "kutsua tämän käyttäjän sinne."
 
-#: ../src/protocols/sametime/sametime.c:3457
+#: ../src/protocols/sametime/sametime.c:3450
 msgid "Invite to Conference"
 msgstr "Kutsu neuvotteluun"
 
-#: ../src/protocols/sametime/sametime.c:3459
+#: ../src/protocols/sametime/sametime.c:3452
 msgid "Invite"
 msgstr "Kutsu"
 
-#: ../src/protocols/sametime/sametime.c:3547
+#: ../src/protocols/sametime/sametime.c:3540
 msgid "Invite to Conference..."
 msgstr "Kutsu neuvotteluun..."
 
-#: ../src/protocols/sametime/sametime.c:3552
+#: ../src/protocols/sametime/sametime.c:3545
 msgid "Send TEST Announcement"
 msgstr "Lähetä TEST-ilmoitus"
 
-#: ../src/protocols/sametime/sametime.c:3599
+#: ../src/protocols/sametime/sametime.c:3592
 msgid "No Sametime Community Server specified"
 msgstr "Sametime-yhteisöpalvelinta ei ole määritelty"
 
-#: ../src/protocols/sametime/sametime.c:3621
+#: ../src/protocols/sametime/sametime.c:3614
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -10049,62 +10171,62 @@
 "Isäntää tai IP-osoitetta ei ole astetettu Meanwhile-käyttäjätilille %s. "
 "Lisää sellainen alle ennen kirjautumista sisään."
 
-#: ../src/protocols/sametime/sametime.c:3626
+#: ../src/protocols/sametime/sametime.c:3619
 msgid "Meanwhile Connection Setup"
 msgstr "Meanwhilen yhteysasetukset"
 
-#: ../src/protocols/sametime/sametime.c:3627
+#: ../src/protocols/sametime/sametime.c:3620
 msgid "No Sametime Community Server Specified"
 msgstr "Sametime-yhteisöpalvelinta ei ole määritelty"
 
-#: ../src/protocols/sametime/sametime.c:4084
+#: ../src/protocols/sametime/sametime.c:4077
 msgid "<b>External User</b><br>"
 msgstr "<b>Ulkoinen käyttäjä</b><br>"
 
-#: ../src/protocols/sametime/sametime.c:4087
+#: ../src/protocols/sametime/sametime.c:4080
 #, c-format
 msgid "<b>User ID:</b> %s<br>"
 msgstr "<b>Käyttäjän ID:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4093
+#: ../src/protocols/sametime/sametime.c:4086
 #, c-format
 msgid "<b>Full Name:</b> %s<br>"
 msgstr "<b>Koko nimi:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4099
+#: ../src/protocols/sametime/sametime.c:4092
 msgid "<b>Last Known Client:</b> "
 msgstr "<b>Viimeksi nähty asiakas:</b> "
 
-#: ../src/protocols/sametime/sametime.c:4107
+#: ../src/protocols/sametime/sametime.c:4100
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Tuntematon (0x%04x)<br>"
 
-#: ../src/protocols/sametime/sametime.c:4114
+#: ../src/protocols/sametime/sametime.c:4107
 #, c-format
 msgid "<b>Supports:</b> %s<br>"
 msgstr "<b>Tukee:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4120
+#: ../src/protocols/sametime/sametime.c:4113
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>Tila:</b> %s"
 
-#: ../src/protocols/sametime/sametime.c:4263
-#: ../src/protocols/sametime/sametime.c:5426
+#: ../src/protocols/sametime/sametime.c:4256
+#: ../src/protocols/sametime/sametime.c:5419
 msgid "User Name"
 msgstr "Käyttäjänimi"
 
-#: ../src/protocols/sametime/sametime.c:4266
-#: ../src/protocols/sametime/sametime.c:5429
+#: ../src/protocols/sametime/sametime.c:4259
+#: ../src/protocols/sametime/sametime.c:5422
 msgid "Sametime ID"
 msgstr "Sametime-tunnus"
 
-#: ../src/protocols/sametime/sametime.c:4290
+#: ../src/protocols/sametime/sametime.c:4283
 msgid "An ambiguous user ID was entered"
 msgstr "Epäselvä käyttäjätunnus syötetty"
 
-#: ../src/protocols/sametime/sametime.c:4291
+#: ../src/protocols/sametime/sametime.c:4284
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -10113,15 +10235,15 @@
 "Tunniste '%s' voi viitata keneen tahansa seuraavista käyttäjistä. Valitse "
 "oikea käyttäjä alla olevasta luettelosta lisätäksesi hänet tuttavalistallesi."
 
-#: ../src/protocols/sametime/sametime.c:4296
+#: ../src/protocols/sametime/sametime.c:4289
 msgid "Select User"
 msgstr "Valitse käyttäjä"
 
-#: ../src/protocols/sametime/sametime.c:4366
+#: ../src/protocols/sametime/sametime.c:4359
 msgid "Unable to add user: user not found"
 msgstr "Ei voitu lisätä käyttäjää: käyttäjää ei löydy"
 
-#: ../src/protocols/sametime/sametime.c:4368
+#: ../src/protocols/sametime/sametime.c:4361
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -10130,11 +10252,11 @@
 "Tunnisteella '%s' ei löytynyt osumia Sametime-yhteisöstäsi. Tämä hakusana "
 "onpoistettu tuttavalistaltasi."
 
-#: ../src/protocols/sametime/sametime.c:4373
+#: ../src/protocols/sametime/sametime.c:4366
 msgid "Unable to add user"
 msgstr "Ei voitu lisätä käyttäjää"
 
-#: ../src/protocols/sametime/sametime.c:4945
+#: ../src/protocols/sametime/sametime.c:4938
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10143,64 +10265,64 @@
 "Virhe luettaessa tiedostoa %s:  \n"
 "%s.\n"
 
-#: ../src/protocols/sametime/sametime.c:5076
+#: ../src/protocols/sametime/sametime.c:5069
 msgid "Remotely Stored Buddy List"
 msgstr "Etätallennettu tuttavalista"
 
 # NOTE source: gftt glossary
-#: ../src/protocols/sametime/sametime.c:5081
+#: ../src/protocols/sametime/sametime.c:5074
 msgid "Buddy List Storage Mode"
 msgstr "Tuttavalistan tallennustapa"
 
-#: ../src/protocols/sametime/sametime.c:5084
+#: ../src/protocols/sametime/sametime.c:5077
 msgid "Local Buddy List Only"
 msgstr "Vain paikallinen tuttavalista"
 
-#: ../src/protocols/sametime/sametime.c:5086
+#: ../src/protocols/sametime/sametime.c:5079
 msgid "Merge List from Server"
 msgstr "Yhdistä tuttavalista palvelimelta"
 
-#: ../src/protocols/sametime/sametime.c:5088
+#: ../src/protocols/sametime/sametime.c:5081
 msgid "Merge and Save List to Server"
 msgstr "Yhdistä ja tallenna lista palvelimelle"
 
-#: ../src/protocols/sametime/sametime.c:5090
+#: ../src/protocols/sametime/sametime.c:5083
 msgid "Synchronize List with Server"
 msgstr "Täsmää lista palvelimen kanssa"
 
-#: ../src/protocols/sametime/sametime.c:5139
+#: ../src/protocols/sametime/sametime.c:5132
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Tuo Sametime-lista käyttäjätililtä %s"
 
-#: ../src/protocols/sametime/sametime.c:5178
+#: ../src/protocols/sametime/sametime.c:5171
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Vie Sametime-lista käyttäjätilille %s"
 
-#: ../src/protocols/sametime/sametime.c:5231
+#: ../src/protocols/sametime/sametime.c:5224
 msgid "Unable to add group: group exists"
 msgstr "Ei voitu lisätä ryhmää: ryhmä on jo olemassa"
 
-#: ../src/protocols/sametime/sametime.c:5232
+#: ../src/protocols/sametime/sametime.c:5225
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Ryhmä '%s' on jo tuttavalistallasi."
 
-#: ../src/protocols/sametime/sametime.c:5235
-#: ../src/protocols/sametime/sametime.c:5364
+#: ../src/protocols/sametime/sametime.c:5228
+#: ../src/protocols/sametime/sametime.c:5357
 msgid "Unable to add group"
 msgstr "Ryhmää ei voitu lisätä"
 
-#: ../src/protocols/sametime/sametime.c:5294
+#: ../src/protocols/sametime/sametime.c:5287
 msgid "Possible Matches"
 msgstr "Mahdollisia osumia"
 
-#: ../src/protocols/sametime/sametime.c:5310
+#: ../src/protocols/sametime/sametime.c:5303
 msgid "Notes Address Book group results"
 msgstr "Notesin osoitekirjan ryhmätulokset"
 
-#: ../src/protocols/sametime/sametime.c:5311
+#: ../src/protocols/sametime/sametime.c:5304
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -10211,15 +10333,15 @@
 "ryhmistä. Valitse oikea ryhmä alla olevasta luettelosta lisätäksesi sen "
 "tuttavalistallesi."
 
-#: ../src/protocols/sametime/sametime.c:5316
+#: ../src/protocols/sametime/sametime.c:5309
 msgid "Select Notes Address Book"
 msgstr "Valitse Notesin osoitekirja"
 
-#: ../src/protocols/sametime/sametime.c:5358
+#: ../src/protocols/sametime/sametime.c:5351
 msgid "Unable to add group: group not found"
 msgstr "Ei voitu lisätä ryhmää: ryhmää ei löytynyt"
 
-#: ../src/protocols/sametime/sametime.c:5360
+#: ../src/protocols/sametime/sametime.c:5353
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -10228,11 +10350,11 @@
 "Tunnisteella '%s' ei löytynyt osumia Sametime-yhteisösi Notesin osoitekirjan "
 "ryhmistä."
 
-#: ../src/protocols/sametime/sametime.c:5401
+#: ../src/protocols/sametime/sametime.c:5394
 msgid "Notes Address Book Group"
 msgstr "Notesin osoitekirjan ryhmä"
 
-#: ../src/protocols/sametime/sametime.c:5402
+#: ../src/protocols/sametime/sametime.c:5395
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
@@ -10240,12 +10362,12 @@
 "Kirjoita Notesin osoitekirjan ryhmän nimi allaolevaan kenttään lisätäksesi "
 "ryhmän ja sen jäsenet tuttavalistallesi."
 
-#: ../src/protocols/sametime/sametime.c:5450
+#: ../src/protocols/sametime/sametime.c:5443
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Hakutulokset haulle '%s'"
 
-#: ../src/protocols/sametime/sametime.c:5451
+#: ../src/protocols/sametime/sametime.c:5444
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -10256,24 +10378,24 @@
 "lisätä nämä käyttäjät tuttavalistallesi tai lähettää heille viestejä alla "
 "olevilla painikkeilla."
 
-#: ../src/protocols/sametime/sametime.c:5483
+#: ../src/protocols/sametime/sametime.c:5476
 msgid "No matches"
 msgstr "Ei tuloksia"
 
-#: ../src/protocols/sametime/sametime.c:5484
+#: ../src/protocols/sametime/sametime.c:5477
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr "Tunnisteella '%s' ei löytynyt osumia Sametime-yhteisöstäsi."
 
-#: ../src/protocols/sametime/sametime.c:5488
+#: ../src/protocols/sametime/sametime.c:5481
 msgid "No Matches"
 msgstr "Ei tuloksia"
 
-#: ../src/protocols/sametime/sametime.c:5525
+#: ../src/protocols/sametime/sametime.c:5518
 msgid "Search for a user"
 msgstr "Etsi käyttäjiä"
 
-#: ../src/protocols/sametime/sametime.c:5526
+#: ../src/protocols/sametime/sametime.c:5519
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -10281,32 +10403,32 @@
 "Kirjoita nimi tai osittainen käyttäjätunnus alla olevaan kenttään etsiäksesi "
 "käyttäjiä Sametime-yhteisöstäsi."
 
-#: ../src/protocols/sametime/sametime.c:5529
+#: ../src/protocols/sametime/sametime.c:5522
 msgid "User Search"
 msgstr "Käyttäjähaku"
 
-#: ../src/protocols/sametime/sametime.c:5541
+#: ../src/protocols/sametime/sametime.c:5534
 msgid "Import Sametime List..."
 msgstr "Tuo Sametime-lista..."
 
-#: ../src/protocols/sametime/sametime.c:5545
+#: ../src/protocols/sametime/sametime.c:5538
 msgid "Export Sametime List..."
 msgstr "Vie Sametime-lista..."
 
-#: ../src/protocols/sametime/sametime.c:5549
+#: ../src/protocols/sametime/sametime.c:5542
 msgid "Add Notes Address Book Group..."
 msgstr "Lisää Notesin osoitekirjan ryhmä..."
 
-#: ../src/protocols/sametime/sametime.c:5553
+#: ../src/protocols/sametime/sametime.c:5546
 msgid "User Search..."
 msgstr "Käyttäjähaku..."
 
-#: ../src/protocols/sametime/sametime.c:5650
+#: ../src/protocols/sametime/sametime.c:5643
 msgid "Force login (ignore server redirects)"
 msgstr "Pakota sisäänkirjautuminen (älä välitä palvelinuudelleenohjauksista)"
 
 #. pretend to be Sametime Connect
-#: ../src/protocols/sametime/sametime.c:5660
+#: ../src/protocols/sametime/sametime.c:5653
 msgid "Hide client identity"
 msgstr "Piilota asiakasohjelman tunniste"
 
@@ -10409,7 +10531,7 @@
 msgstr "Näytä julkinen avain"
 
 #: ../src/protocols/silc/buddy.c:635 ../src/protocols/silc/buddy.c:1030
-#: ../src/protocols/silc/chat.c:236
+#: ../src/protocols/silc/chat.c:237
 msgid "Could not load public key"
 msgstr "Ei voitu ladata julkista avainta"
 
@@ -10500,56 +10622,56 @@
 msgstr "Robotti"
 
 #: ../src/protocols/silc/buddy.c:1486 ../src/protocols/silc/silc.c:672
-#: ../src/protocols/silc/util.c:473
+#: ../src/protocols/silc/util.c:487
 msgid "Happy"
 msgstr "Onnellinen"
 
 #: ../src/protocols/silc/buddy.c:1488 ../src/protocols/silc/silc.c:674
-#: ../src/protocols/silc/util.c:475
+#: ../src/protocols/silc/util.c:489
 msgid "Sad"
 msgstr "Surullinen"
 
 #: ../src/protocols/silc/buddy.c:1490 ../src/protocols/silc/silc.c:676
-#: ../src/protocols/silc/util.c:477
+#: ../src/protocols/silc/util.c:491
 msgid "Angry"
 msgstr "Vihainen"
 
 #: ../src/protocols/silc/buddy.c:1492 ../src/protocols/silc/silc.c:678
-#: ../src/protocols/silc/util.c:479
+#: ../src/protocols/silc/util.c:493
 msgid "Jealous"
 msgstr "Mustasukkainen"
 
 #: ../src/protocols/silc/buddy.c:1494 ../src/protocols/silc/silc.c:680
-#: ../src/protocols/silc/util.c:481
+#: ../src/protocols/silc/util.c:495
 msgid "Ashamed"
 msgstr "Häpeää"
 
 #: ../src/protocols/silc/buddy.c:1496 ../src/protocols/silc/silc.c:682
-#: ../src/protocols/silc/util.c:483
+#: ../src/protocols/silc/util.c:497
 msgid "Invincible"
 msgstr "Haavoittumaton"
 
-#: ../src/protocols/silc/buddy.c:1498 ../src/protocols/silc/util.c:485
+#: ../src/protocols/silc/buddy.c:1498 ../src/protocols/silc/util.c:499
 msgid "In Love"
 msgstr "Rakastunut"
 
 #: ../src/protocols/silc/buddy.c:1500 ../src/protocols/silc/silc.c:686
-#: ../src/protocols/silc/util.c:487
+#: ../src/protocols/silc/util.c:501
 msgid "Sleepy"
 msgstr "Unelias"
 
 #: ../src/protocols/silc/buddy.c:1502 ../src/protocols/silc/silc.c:688
-#: ../src/protocols/silc/util.c:489
+#: ../src/protocols/silc/util.c:503
 msgid "Bored"
 msgstr "Tylsistynyt"
 
 #: ../src/protocols/silc/buddy.c:1504 ../src/protocols/silc/silc.c:690
-#: ../src/protocols/silc/util.c:491
+#: ../src/protocols/silc/util.c:505
 msgid "Excited"
 msgstr "Innostunut"
 
 #: ../src/protocols/silc/buddy.c:1506 ../src/protocols/silc/silc.c:692
-#: ../src/protocols/silc/util.c:493
+#: ../src/protocols/silc/util.c:507
 msgid "Anxious"
 msgstr "Levoton"
 
@@ -10602,7 +10724,7 @@
 msgid "Kill User"
 msgstr "Poista käyttäjä"
 
-#: ../src/protocols/silc/buddy.c:1670 ../src/protocols/silc/chat.c:971
+#: ../src/protocols/silc/buddy.c:1670 ../src/protocols/silc/chat.c:972
 msgid "Draw On Whiteboard"
 msgstr "Piirrä kirjoitustaululle"
 
@@ -10615,7 +10737,7 @@
 msgid "Channel %s does not exist in the network"
 msgstr "Kanavaa %s ei ole verkossa"
 
-#: ../src/protocols/silc/chat.c:81 ../src/protocols/silc/chat.c:173
+#: ../src/protocols/silc/chat.c:81 ../src/protocols/silc/chat.c:174
 msgid "Channel Information"
 msgstr "Kanavatiedot"
 
@@ -10643,48 +10765,49 @@
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Kanavan salausalgoritmi:<b> %s"
 
-#: ../src/protocols/silc/chat.c:141
+#. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
+#: ../src/protocols/silc/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>Kanavan HMAC:</b> %s"
 
-#: ../src/protocols/silc/chat.c:146
+#: ../src/protocols/silc/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Kanavan aihe:</b><br>%s"
 
-#: ../src/protocols/silc/chat.c:151
+#: ../src/protocols/silc/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Kanavan tilat:</b> "
 
-#: ../src/protocols/silc/chat.c:164
+#: ../src/protocols/silc/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Perustajan avain Fingerprint</b><br>%s"
 
-#: ../src/protocols/silc/chat.c:165
+#: ../src/protocols/silc/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Perustajan avain Babbleprint:</b><br>%s"
 
-#: ../src/protocols/silc/chat.c:235
+#: ../src/protocols/silc/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Lisää kanavan julkinen avain"
 
 #. Add new public key
-#: ../src/protocols/silc/chat.c:290
+#: ../src/protocols/silc/chat.c:291
 msgid "Open Public Key..."
 msgstr "Avaa julkinen avain..."
 
-#: ../src/protocols/silc/chat.c:399
+#: ../src/protocols/silc/chat.c:400
 msgid "Channel Passphrase"
 msgstr "Kanavan salasana"
 
-#: ../src/protocols/silc/chat.c:406
+#: ../src/protocols/silc/chat.c:407
 msgid "Channel Public Keys List"
 msgstr "Kanavan julkisten avainten lista"
 
-#: ../src/protocols/silc/chat.c:411
+#: ../src/protocols/silc/chat.c:412
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -10698,129 +10821,129 @@
 "pääsemiseksi. Jos käytetään kanavan julkisia avaimia niin silloin pääsevät "
 "vain käyttäjät joiden julkinen avain on listalla."
 
-#: ../src/protocols/silc/chat.c:420 ../src/protocols/silc/chat.c:421
-#: ../src/protocols/silc/chat.c:458 ../src/protocols/silc/chat.c:459
-#: ../src/protocols/silc/chat.c:905
+#: ../src/protocols/silc/chat.c:421 ../src/protocols/silc/chat.c:422
+#: ../src/protocols/silc/chat.c:459 ../src/protocols/silc/chat.c:460
+#: ../src/protocols/silc/chat.c:906
 msgid "Channel Authentication"
 msgstr "Kanavalle tunnistautuminen"
 
-#: ../src/protocols/silc/chat.c:422 ../src/protocols/silc/chat.c:460
+#: ../src/protocols/silc/chat.c:423 ../src/protocols/silc/chat.c:461
 msgid "Add / Remove"
 msgstr "Lisää / poista"
 
-#: ../src/protocols/silc/chat.c:577
+#: ../src/protocols/silc/chat.c:578
 msgid "Group Name"
 msgstr "Ryhmän nimi"
 
-#: ../src/protocols/silc/chat.c:581 ../src/protocols/silc/ops.c:1908
+#: ../src/protocols/silc/chat.c:582 ../src/protocols/silc/ops.c:1908
 #: ../src/protocols/silc/silc.c:948
 msgid "Passphrase"
 msgstr "Salasana"
 
-#: ../src/protocols/silc/chat.c:592
+#: ../src/protocols/silc/chat.c:593
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Syötä kanavan %s yksityinen ryhmänimi ja salasana."
 
-#: ../src/protocols/silc/chat.c:594
+#: ../src/protocols/silc/chat.c:595
 msgid "Add Channel Private Group"
 msgstr "Lisää kanavaan yksityinen ryhmä"
 
-#: ../src/protocols/silc/chat.c:721
+#: ../src/protocols/silc/chat.c:722
 msgid "User Limit"
 msgstr "Käyttäjäraja"
 
-#: ../src/protocols/silc/chat.c:722
+#: ../src/protocols/silc/chat.c:723
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Aseta käyttäjärajoitus kanavalle. Aseta nollaksi poistaaksesi rajoituksen."
 
-#: ../src/protocols/silc/chat.c:877
+#: ../src/protocols/silc/chat.c:878
 msgid "Get Info"
 msgstr "Hae tiedot"
 
-#: ../src/protocols/silc/chat.c:885
+#: ../src/protocols/silc/chat.c:886
 msgid "Invite List"
 msgstr "Kutsulista"
 
-#: ../src/protocols/silc/chat.c:890
+#: ../src/protocols/silc/chat.c:891
 msgid "Ban List"
 msgstr "Kieltolista"
 
-#: ../src/protocols/silc/chat.c:898
+#: ../src/protocols/silc/chat.c:899
 msgid "Add Private Group"
 msgstr "Lisää yksityinen ryhmä"
 
-#: ../src/protocols/silc/chat.c:911
+#: ../src/protocols/silc/chat.c:912
 msgid "Reset Permanent"
 msgstr "Nollaa pysyvä"
 
-#: ../src/protocols/silc/chat.c:916
+#: ../src/protocols/silc/chat.c:917
 msgid "Set Permanent"
 msgstr "Aseta pysyvä"
 
-#: ../src/protocols/silc/chat.c:924
+#: ../src/protocols/silc/chat.c:925
 msgid "Set User Limit"
 msgstr "Aseta käyttäjärajoitus"
 
-#: ../src/protocols/silc/chat.c:930
+#: ../src/protocols/silc/chat.c:931
 msgid "Reset Topic Restriction"
 msgstr "Poista aiherajoitus"
 
-#: ../src/protocols/silc/chat.c:935
+#: ../src/protocols/silc/chat.c:936
 msgid "Set Topic Restriction"
 msgstr "Aseta aiherajoitus"
 
-#: ../src/protocols/silc/chat.c:942
+#: ../src/protocols/silc/chat.c:943
 msgid "Reset Private Channel"
 msgstr "Poista yksityinen kanava"
 
-#: ../src/protocols/silc/chat.c:947
+#: ../src/protocols/silc/chat.c:948
 msgid "Set Private Channel"
 msgstr "Aseta yksityinen kanava"
 
-#: ../src/protocols/silc/chat.c:954
+#: ../src/protocols/silc/chat.c:955
 msgid "Reset Secret Channel"
 msgstr "Poista salainen kanava"
 
-#: ../src/protocols/silc/chat.c:959
+#: ../src/protocols/silc/chat.c:960
 msgid "Set Secret Channel"
 msgstr "Aseta salainen kanava"
 
-#: ../src/protocols/silc/chat.c:1033
+#: ../src/protocols/silc/chat.c:1034
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Olet kanavan perustaja kanavalla <I>%s</I>"
 
-#: ../src/protocols/silc/chat.c:1037
+#: ../src/protocols/silc/chat.c:1038
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Kanavan perustaja kanavalla <I>%s</I> on <I>%s</I>"
 
-#: ../src/protocols/silc/chat.c:1096
+#: ../src/protocols/silc/chat.c:1097
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr ""
 "Sinun tulee liittyä kanavalle %s ennenkuin voit liittyä yksityiseen ryhmään"
 
-#: ../src/protocols/silc/chat.c:1098
+#: ../src/protocols/silc/chat.c:1099
 msgid "Join Private Group"
 msgstr "Liity yksityiseen ryhmään"
 
-#: ../src/protocols/silc/chat.c:1099
+#: ../src/protocols/silc/chat.c:1100
 msgid "Cannot join private group"
 msgstr "Ei voida liittyä yksityiseen ryhmään"
 
-#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1156
+#: ../src/protocols/silc/chat.c:1294 ../src/protocols/silc/silc.c:1156
 msgid "Call Command"
 msgstr "Kutsu komentoa"
 
-#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1156
+#: ../src/protocols/silc/chat.c:1294 ../src/protocols/silc/silc.c:1156
 msgid "Cannot call command"
 msgstr "Komentoa ei voida kutsua"
 
-#: ../src/protocols/silc/chat.c:1294 ../src/protocols/silc/silc.c:1157
+#: ../src/protocols/silc/chat.c:1295 ../src/protocols/silc/silc.c:1157
 msgid "Unknown command"
 msgstr "Tuntematon komento"
 
@@ -11238,11 +11361,11 @@
 "\n"
 "Suosimasi yhteystavat"
 
-#: ../src/protocols/silc/silc.c:703 ../src/protocols/silc/util.c:518
+#: ../src/protocols/silc/silc.c:703 ../src/protocols/silc/util.c:532
 msgid "SMS"
 msgstr "SMS"
 
-#: ../src/protocols/silc/silc.c:705 ../src/protocols/silc/util.c:520
+#: ../src/protocols/silc/silc.c:705 ../src/protocols/silc/util.c:534
 msgid "MMS"
 msgstr "MMS"
 
@@ -11576,54 +11699,54 @@
 msgid "Digitally sign and verify all messages"
 msgstr "Allekirjoita ja tarkista kaikki viestit digitaalisesti"
 
-#: ../src/protocols/silc/util.c:206 ../src/protocols/silc/util.c:231
+#: ../src/protocols/silc/util.c:207 ../src/protocols/silc/util.c:233
 msgid "Creating SILC key pair..."
 msgstr "Luodaan SILC-avainpari"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../src/protocols/silc/util.c:314
+#: ../src/protocols/silc/util.c:328
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Oikea nimi: \t%s\n"
 
-#: ../src/protocols/silc/util.c:316
+#: ../src/protocols/silc/util.c:330
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Käyttäjänimi: \t%s\n"
 
-#: ../src/protocols/silc/util.c:318
+#: ../src/protocols/silc/util.c:332
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "Sähköposti: \t\t%s\n"
 
-#: ../src/protocols/silc/util.c:320
+#: ../src/protocols/silc/util.c:334
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Palvelin: \t%s\n"
 
-#: ../src/protocols/silc/util.c:322
+#: ../src/protocols/silc/util.c:336
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organisaatio: \t%s\n"
 
-#: ../src/protocols/silc/util.c:324
+#: ../src/protocols/silc/util.c:338
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Maa: \t%s\n"
 
-#: ../src/protocols/silc/util.c:325
+#: ../src/protocols/silc/util.c:339
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritmi: \t%s\n"
 
-#: ../src/protocols/silc/util.c:326
+#: ../src/protocols/silc/util.c:340
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Avaimen pituus: \t%d bittiä\n"
 
-#: ../src/protocols/silc/util.c:328
+#: ../src/protocols/silc/util.c:342
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -11634,7 +11757,7 @@
 "%s\n"
 "\n"
 
-#: ../src/protocols/silc/util.c:329
+#: ../src/protocols/silc/util.c:343
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -11643,27 +11766,27 @@
 "Julkisen avaimen babbleprint\n"
 "%s"
 
-#: ../src/protocols/silc/util.c:333 ../src/protocols/silc/util.c:334
+#: ../src/protocols/silc/util.c:347 ../src/protocols/silc/util.c:348
 msgid "Public Key Information"
 msgstr "Julkisen avaimen tiedot"
 
-#: ../src/protocols/silc/util.c:516
+#: ../src/protocols/silc/util.c:530
 msgid "Paging"
 msgstr "Kaukohaku"
 
-#: ../src/protocols/silc/util.c:522
+#: ../src/protocols/silc/util.c:536
 msgid "Video Conferencing"
 msgstr "Videoneuvottelu"
 
-#: ../src/protocols/silc/util.c:540
+#: ../src/protocols/silc/util.c:554
 msgid "Computer"
 msgstr "Tietokone"
 
-#: ../src/protocols/silc/util.c:544
+#: ../src/protocols/silc/util.c:558
 msgid "PDA"
 msgstr "PDA"
 
-#: ../src/protocols/silc/util.c:546
+#: ../src/protocols/silc/util.c:560
 msgid "Terminal"
 msgstr "Pääte"
 
@@ -11687,28 +11810,28 @@
 msgstr "Kirjoitustaulu"
 
 #. TODO: do we really want to disconnect on a failure to write?
-#: ../src/protocols/simple/simple.c:410
+#: ../src/protocols/simple/simple.c:411
 msgid "Could not write"
 msgstr "Ei voitu kirjoittaa"
 
-#: ../src/protocols/simple/simple.c:425 ../src/protocols/simple/simple.c:1423
+#: ../src/protocols/simple/simple.c:426 ../src/protocols/simple/simple.c:1425
 msgid "Could not connect"
 msgstr "Ei voitu yhdistää"
 
-#: ../src/protocols/simple/simple.c:995
+#: ../src/protocols/simple/simple.c:997
 msgid "Wrong Password"
 msgstr "Väärä salasana"
 
-#: ../src/protocols/simple/simple.c:1454 ../src/protocols/simple/simple.c:1493
-#: ../src/protocols/simple/simple.c:1505 ../src/protocols/simple/simple.c:1563
+#: ../src/protocols/simple/simple.c:1456 ../src/protocols/simple/simple.c:1495
+#: ../src/protocols/simple/simple.c:1507 ../src/protocols/simple/simple.c:1565
 msgid "Could not create listen socket"
 msgstr "Kuuntelupistokkeen luominen epäonnistui"
 
-#: ../src/protocols/simple/simple.c:1475
+#: ../src/protocols/simple/simple.c:1477
 msgid "Couldn't resolve host"
 msgstr "Yhteyttä isäntään ei voitu löytää"
 
-#: ../src/protocols/simple/simple.c:1584
+#: ../src/protocols/simple/simple.c:1587
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP-käyttäjänimissä ei tule olla välilyöntejä tai @-merkkejä"
 
@@ -11720,36 +11843,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../src/protocols/simple/simple.c:1746
+#: ../src/protocols/simple/simple.c:1749
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE-yhteyskäytäntöliitännäinen"
 
 #. *  summary
-#: ../src/protocols/simple/simple.c:1747
+#: ../src/protocols/simple/simple.c:1750
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE-yhteyskäytäntöliitännäinen"
 
-#: ../src/protocols/simple/simple.c:1769
+#: ../src/protocols/simple/simple.c:1772
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Julkaise tilasi (huom: kuka tahansa voi seurata tilaasi)"
 
-#: ../src/protocols/simple/simple.c:1775
+#: ../src/protocols/simple/simple.c:1778
 msgid "Use UDP"
 msgstr "Käytä UDP:tä"
 
-#: ../src/protocols/simple/simple.c:1777
+#: ../src/protocols/simple/simple.c:1780
 msgid "Use proxy"
 msgstr "Käytä välipalvelinta"
 
-#: ../src/protocols/simple/simple.c:1779
+#: ../src/protocols/simple/simple.c:1782
 msgid "Proxy"
 msgstr "Välipalvelin"
 
-#: ../src/protocols/simple/simple.c:1781
+#: ../src/protocols/simple/simple.c:1784
 msgid "Auth User"
 msgstr "Todennus/käyttäjä"
 
-#: ../src/protocols/simple/simple.c:1783
+#: ../src/protocols/simple/simple.c:1786
 msgid "Auth Domain"
 msgstr "Todennus/verkkoalue"
 
@@ -11923,10 +12046,6 @@
 msgid "Get Dir Info"
 msgstr "Hae hakemistotiedot"
 
-#: ../src/protocols/toc/toc.c:1684
-msgid "Set User Info"
-msgstr "Aseta käyttäjätiedot"
-
 #: ../src/protocols/toc/toc.c:1689
 msgid "Set Dir Info"
 msgstr "Aseta hakemistotiedot"
@@ -11984,23 +12103,15 @@
 msgid "TOC Protocol Plugin"
 msgstr "TOC-yhteyskäytäntöliitännäinen"
 
-#: ../src/protocols/toc/toc.c:2340
-msgid "TOC host"
-msgstr "TOC-isäntä"
-
-#: ../src/protocols/toc/toc.c:2344
-msgid "TOC port"
-msgstr "TOC-portti"
-
-#: ../src/protocols/yahoo/yahoo.c:712
+#: ../src/protocols/yahoo/yahoo.c:710
 msgid "Your Yahoo! message did not get sent."
 msgstr "Yahoo!-viestiäsi ei lähetetty."
 
-#: ../src/protocols/yahoo/yahoo.c:766 ../src/protocols/yahoo/yahoo.c:3569
+#: ../src/protocols/yahoo/yahoo.c:764 ../src/protocols/yahoo/yahoo.c:3564
 msgid "Buzz!!"
 msgstr "Huomio!"
 
-#: ../src/protocols/yahoo/yahoo.c:811
+#: ../src/protocols/yahoo/yahoo.c:809
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo!-järjestelmäviesti käyttäjälle %s:"
@@ -12008,23 +12119,23 @@
 #. TODO: this is almost exactly the same as what MSN does,
 #. * this should probably be moved to the core.
 #.
-#: ../src/protocols/yahoo/yahoo.c:907
+#: ../src/protocols/yahoo/yahoo.c:905
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list%s%s."
 msgstr "Käyttäjä %s haluaa lisätä käyttäjän %s tuttavalistalleen %s%s."
 
-#: ../src/protocols/yahoo/yahoo.c:913
+#: ../src/protocols/yahoo/yahoo.c:911
 msgid "Message (optional) :"
 msgstr "Viesti (valinnainen) :"
 
-#: ../src/protocols/yahoo/yahoo.c:955
+#: ../src/protocols/yahoo/yahoo.c:953
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "Käyttäjä %s on (taannehtivasti) evännyt pyyntösi lisätä hänet "
 "tuttavalistallesi."
 
-#: ../src/protocols/yahoo/yahoo.c:958
+#: ../src/protocols/yahoo/yahoo.c:956
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -12033,11 +12144,11 @@
 "Käyttäjä %s on (taannehtivasti) evännyt pyyntösi lisätä hänet "
 "tuttavalistallesi seuraavasta syystä: %s."
 
-#: ../src/protocols/yahoo/yahoo.c:961
+#: ../src/protocols/yahoo/yahoo.c:959
 msgid "Add buddy rejected"
 msgstr "Tuttavan lisääminen estetty"
 
-#: ../src/protocols/yahoo/yahoo.c:1704
+#: ../src/protocols/yahoo/yahoo.c:1702
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -12048,11 +12159,11 @@
 "versio ei todennäköisesti pysty kirjautumaan Yahoo-palveluun. Tarkista "
 "päivitykset osoitteesta: %s."
 
-#: ../src/protocols/yahoo/yahoo.c:1707
+#: ../src/protocols/yahoo/yahoo.c:1705
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo!:n todennus epäonnistui"
 
-#: ../src/protocols/yahoo/yahoo.c:1773
+#: ../src/protocols/yahoo/yahoo.c:1771
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -12062,19 +12173,19 @@
 "tuttavalistalla. Painaessasi \"Kyllä\" poistat hänet tuttavalistalta eikä "
 "häneltä saapuneista viesteistä enää välitetä."
 
-#: ../src/protocols/yahoo/yahoo.c:1776
+#: ../src/protocols/yahoo/yahoo.c:1774
 msgid "Ignore buddy?"
 msgstr "Jätä tuttava huomiotta?"
 
-#: ../src/protocols/yahoo/yahoo.c:1810
+#: ../src/protocols/yahoo/yahoo.c:1808
 msgid "Invalid username."
 msgstr "Epäkelpo käyttäjänimi."
 
-#: ../src/protocols/yahoo/yahoo.c:1821
+#: ../src/protocols/yahoo/yahoo.c:1819
 msgid "Normal authentication failed!"
 msgstr "Tavallinen tunnistautumismenetelmä epäonnistui!"
 
-#: ../src/protocols/yahoo/yahoo.c:1822
+#: ../src/protocols/yahoo/yahoo.c:1820
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -12086,137 +12197,137 @@
 "muuttunut. Gaim yrittää nyt kirjautua käyttäen Web Messenger- "
 "tunnistautumista josta seuraa vähentynyt toiminnallisuus ja ominaisuudet."
 
-#: ../src/protocols/yahoo/yahoo.c:1830
+#: ../src/protocols/yahoo/yahoo.c:1828
 msgid "Incorrect password."
 msgstr "Virheellinen salasana."
 
-#: ../src/protocols/yahoo/yahoo.c:1833
+#: ../src/protocols/yahoo/yahoo.c:1831
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Käyttäjätilisi on lukittu, kirjaudu sisään yahoo-websivustolta."
 
-#: ../src/protocols/yahoo/yahoo.c:1836
+#: ../src/protocols/yahoo/yahoo.c:1834
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Tuntematon viesti numero %d. Kirjautumalla Yahoo! verkkosivuille saattaa "
 "korjata tämän."
 
-#: ../src/protocols/yahoo/yahoo.c:1890
+#: ../src/protocols/yahoo/yahoo.c:1888
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Ei voitu lisätä tuttavaa %s ryhmään %s palvelimen listalle, tilillä %s."
 
-#: ../src/protocols/yahoo/yahoo.c:1893
+#: ../src/protocols/yahoo/yahoo.c:1891
 msgid "Could not add buddy to server list"
 msgstr "Ei voitu lisätä tuttavaa palvelimen listalle"
 
-#: ../src/protocols/yahoo/yahoo.c:2012
+#: ../src/protocols/yahoo/yahoo.c:2010
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Ääniäinen %s/%s/%s.swf ] %s"
 
-#: ../src/protocols/yahoo/yahoo.c:2151 ../src/protocols/yahoo/yahoo.c:2298
-#: ../src/protocols/yahoo/yahoo.c:2313 ../src/protocols/yahoo/ycht.c:472
+#: ../src/protocols/yahoo/yahoo.c:2149 ../src/protocols/yahoo/yahoo.c:2296
+#: ../src/protocols/yahoo/yahoo.c:2311 ../src/protocols/yahoo/ycht.c:472
 msgid "Unable to read"
 msgstr "Ei kyetty lukemaan"
 
-#: ../src/protocols/yahoo/yahoo.c:2337 ../src/protocols/yahoo/yahoo.c:2494
-#: ../src/protocols/yahoo/yahoo.c:2596 ../src/protocols/yahoo/yahoo.c:2606
+#: ../src/protocols/yahoo/yahoo.c:2335 ../src/protocols/yahoo/yahoo.c:2492
+#: ../src/protocols/yahoo/yahoo.c:2594 ../src/protocols/yahoo/yahoo.c:2604
 #: ../src/protocols/yahoo/yahoochat.c:1447
 #: ../src/protocols/yahoo/yahoochat.c:1517 ../src/protocols/yahoo/ycht.c:576
 msgid "Connection problem"
 msgstr "Yhteysvirhe"
 
-#: ../src/protocols/yahoo/yahoo.c:2715 ../src/protocols/yahoo/yahoo.c:3302
+#: ../src/protocols/yahoo/yahoo.c:2711 ../src/protocols/yahoo/yahoo.c:3298
 msgid "Not at Home"
 msgstr "Poissa kotoa"
 
-#: ../src/protocols/yahoo/yahoo.c:2717 ../src/protocols/yahoo/yahoo.c:3305
+#: ../src/protocols/yahoo/yahoo.c:2713 ../src/protocols/yahoo/yahoo.c:3301
 msgid "Not at Desk"
 msgstr "Poissa työpöydältä"
 
-#: ../src/protocols/yahoo/yahoo.c:2719 ../src/protocols/yahoo/yahoo.c:3308
+#: ../src/protocols/yahoo/yahoo.c:2715 ../src/protocols/yahoo/yahoo.c:3304
 msgid "Not in Office"
 msgstr "Poissa toimistolta"
 
-#: ../src/protocols/yahoo/yahoo.c:2723 ../src/protocols/yahoo/yahoo.c:3314
+#: ../src/protocols/yahoo/yahoo.c:2719 ../src/protocols/yahoo/yahoo.c:3310
 msgid "On Vacation"
 msgstr "Lomalla"
 
-#: ../src/protocols/yahoo/yahoo.c:2727 ../src/protocols/yahoo/yahoo.c:3320
+#: ../src/protocols/yahoo/yahoo.c:2723 ../src/protocols/yahoo/yahoo.c:3316
 msgid "Stepped Out"
 msgstr "Piipahdan ulkona"
 
-#: ../src/protocols/yahoo/yahoo.c:2820 ../src/protocols/yahoo/yahoo.c:2850
+#: ../src/protocols/yahoo/yahoo.c:2816 ../src/protocols/yahoo/yahoo.c:2846
 msgid "Not on server list"
 msgstr "Ei palvelimen listalla"
 
-#: ../src/protocols/yahoo/yahoo.c:2867 ../src/protocols/yahoo/yahoo.c:2926
+#: ../src/protocols/yahoo/yahoo.c:2863 ../src/protocols/yahoo/yahoo.c:2922
 msgid "Appear Online"
 msgstr "Näytä linjoilla olevalta"
 
-#: ../src/protocols/yahoo/yahoo.c:2870 ../src/protocols/yahoo/yahoo.c:2947
+#: ../src/protocols/yahoo/yahoo.c:2866 ../src/protocols/yahoo/yahoo.c:2943
 msgid "Appear Permanently Offline"
 msgstr "Näytä pysyvästi poissaolevalta"
 
-#: ../src/protocols/yahoo/yahoo.c:2889
+#: ../src/protocols/yahoo/yahoo.c:2885
 msgid "Presence"
 msgstr "Läsnäolo"
 
-#: ../src/protocols/yahoo/yahoo.c:2932
+#: ../src/protocols/yahoo/yahoo.c:2928
 msgid "Appear Offline"
 msgstr "Näytä poissaolevalta"
 
-#: ../src/protocols/yahoo/yahoo.c:2941
+#: ../src/protocols/yahoo/yahoo.c:2937
 msgid "Don't Appear Permanently Offline"
 msgstr "Älä näytä pysyvästi poissaolevalta"
 
-#: ../src/protocols/yahoo/yahoo.c:2989
+#: ../src/protocols/yahoo/yahoo.c:2985
 msgid "Join in Chat"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: ../src/protocols/yahoo/yahoo.c:2995
+#: ../src/protocols/yahoo/yahoo.c:2991
 msgid "Initiate Conference"
 msgstr "Aloita neuvottelu"
 
-#: ../src/protocols/yahoo/yahoo.c:3023
+#: ../src/protocols/yahoo/yahoo.c:3019
 msgid "Presence Settings"
 msgstr "Läsnäoloasetukset"
 
-#: ../src/protocols/yahoo/yahoo.c:3029
+#: ../src/protocols/yahoo/yahoo.c:3025
 msgid "Start Doodling"
 msgstr "Aloita piirtely"
 
-#: ../src/protocols/yahoo/yahoo.c:3061
+#: ../src/protocols/yahoo/yahoo.c:3057
 msgid "Active which ID?"
 msgstr "Minkä tunnuksen (ID) haluat aktivoida?"
 
-#: ../src/protocols/yahoo/yahoo.c:3070
+#: ../src/protocols/yahoo/yahoo.c:3066
 msgid "Join who in chat?"
 msgstr "Kenen seuraan liitytään ryhmäkeskustelussa?"
 
-#: ../src/protocols/yahoo/yahoo.c:3080
+#: ../src/protocols/yahoo/yahoo.c:3076
 msgid "Activate ID..."
 msgstr "Aktivoi tunnus (ID)..."
 
-#: ../src/protocols/yahoo/yahoo.c:3084
+#: ../src/protocols/yahoo/yahoo.c:3080
 msgid "Join User in Chat..."
 msgstr "Liity käyttäjän seuraan ryhmäkeskustelussa..."
 
-#: ../src/protocols/yahoo/yahoo.c:3628
+#: ../src/protocols/yahoo/yahoo.c:3623
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;huone&gt;: Liity keskusteluhuoneeseen Yahoo-verkossa"
 
-#: ../src/protocols/yahoo/yahoo.c:3633
+#: ../src/protocols/yahoo/yahoo.c:3628
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Listaa kanavat Yahoo-verkossa"
 
-#: ../src/protocols/yahoo/yahoo.c:3637
+#: ../src/protocols/yahoo/yahoo.c:3632
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Anna tuttavalle äänimerkki huomion saamiseksi"
 
-#: ../src/protocols/yahoo/yahoo.c:3641
+#: ../src/protocols/yahoo/yahoo.c:3636
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Pyydä käyttäjää aloittamaan piirtelyistunto"
 
@@ -12230,57 +12341,57 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/yahoo/yahoo.c:3734 ../src/protocols/yahoo/yahoo.c:3736
+#: ../src/protocols/yahoo/yahoo.c:3729 ../src/protocols/yahoo/yahoo.c:3731
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo-yhteyskäytäntöliitännäinen"
 
-#: ../src/protocols/yahoo/yahoo.c:3753
+#: ../src/protocols/yahoo/yahoo.c:3748
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../src/protocols/yahoo/yahoo.c:3756
-msgid "Pager host"
-msgstr "Isäntä"
-
-#: ../src/protocols/yahoo/yahoo.c:3759
-msgid "Japan Pager host"
-msgstr "Isäntä (Japani)"
-
-#: ../src/protocols/yahoo/yahoo.c:3762
+#: ../src/protocols/yahoo/yahoo.c:3751
+msgid "Pager server"
+msgstr "Hakulaitepalvelin"
+
+#: ../src/protocols/yahoo/yahoo.c:3754
+msgid "Japan Pager server"
+msgstr "Hakulaitepalvelin (Japani)"
+
+#: ../src/protocols/yahoo/yahoo.c:3757
 msgid "Pager port"
-msgstr "Portti"
-
-#: ../src/protocols/yahoo/yahoo.c:3765
-msgid "File transfer host"
+msgstr "Hakulaiteportti"
+
+#: ../src/protocols/yahoo/yahoo.c:3760
+msgid "File transfer server"
 msgstr "Tiedostonsiirtopalvelin"
 
-#: ../src/protocols/yahoo/yahoo.c:3768
-msgid "Japan file transfer host"
+#: ../src/protocols/yahoo/yahoo.c:3763
+msgid "Japan file transfer server"
 msgstr "Tiedostonsiirtopalvelin (Japani)"
 
-#: ../src/protocols/yahoo/yahoo.c:3771
+#: ../src/protocols/yahoo/yahoo.c:3766
 msgid "File transfer port"
 msgstr "Tiedostonsiirtoportti"
 
-#: ../src/protocols/yahoo/yahoo.c:3774
+#: ../src/protocols/yahoo/yahoo.c:3769
 msgid "Chat room locale"
 msgstr "Keskusteluhuoneen paikallisasetus"
 
-#: ../src/protocols/yahoo/yahoo.c:3777
+#: ../src/protocols/yahoo/yahoo.c:3772
 msgid "Ignore conference and chatroom invitations"
 msgstr "Jätä konferenssi- ja keskusteluhuonekutsut huomiotta"
 
-#: ../src/protocols/yahoo/yahoo.c:3781
+#: ../src/protocols/yahoo/yahoo.c:3776
 msgid "Chat room list URL"
 msgstr "Keskusteluhuoneluettelon URL"
 
-#: ../src/protocols/yahoo/yahoo.c:3784
-msgid "YCHT host"
-msgstr "YCHT-isäntä"
-
-#: ../src/protocols/yahoo/yahoo.c:3787
-msgid "YCHT port"
-msgstr "YCHT-portti"
+#: ../src/protocols/yahoo/yahoo.c:3779
+msgid "Yahoo Chat server"
+msgstr "Yahoo-ryhmäkeskustelupalvelin"
+
+#: ../src/protocols/yahoo/yahoo.c:3782
+msgid "Yahoo Chat port"
+msgstr "Yahoo-ryhmäkeskustelupalvelimen portti"
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
@@ -12637,14 +12748,14 @@
 msgid "Exposure"
 msgstr "Altistus"
 
-#: ../src/proxy.c:1216 ../src/proxy.c:1272 ../src/proxy.c:1320
-#: ../src/proxy.c:1347
+#: ../src/proxy.c:1217 ../src/proxy.c:1273 ../src/proxy.c:1321
+#: ../src/proxy.c:1348
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "Välipalvelimen yhteysvirhe %d"
 
 #. Forbidden
-#: ../src/proxy.c:1336
+#: ../src/proxy.c:1337
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "Pääsy evätty: välipalvelin estää portin %d tunneloinnin."
@@ -12656,14 +12767,17 @@
 msgid "_Accept"
 msgstr "_Hyväksy"
 
-#: ../src/savedstatuses.c:514
+#. *
+#. * The default message to use when the user becomes auto-away.
+#.
+#: ../src/savedstatuses.c:45
+msgid "I'm not here right now"
+msgstr "En ole täällä juuri nyt"
+
+#: ../src/savedstatuses.c:524
 msgid "saved statuses"
 msgstr "tallennetut tilat"
 
-#: ../src/savedstatuses.c:767
-msgid "I'm not here right now"
-msgstr "En ole täällä juuri nyt"
-
 #: ../src/server.c:227
 #, c-format
 msgid "%s is now known as %s.\n"
@@ -12714,22 +12828,22 @@
 msgid "%s is no longer %s"
 msgstr "%s ei ole enää %s"
 
-#: ../src/status.c:1320
+#: ../src/status.c:1311
 #, c-format
 msgid "%s became idle"
 msgstr "%s on jouten"
 
-#: ../src/status.c:1337
+#: ../src/status.c:1328
 #, c-format
 msgid "%s became unidle"
 msgstr "%s on aktiivinen"
 
-#: ../src/status.c:1403
+#: ../src/status.c:1394
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s on jouten"
 
-#: ../src/status.c:1405
+#: ../src/status.c:1396
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s on aktiivinen"
@@ -12807,6 +12921,27 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Virhe avattaessa yhteyttä.\n"
 
+#~ msgid "Auth host"
+#~ msgstr "Kirjautumispalvelin"
+
+#~ msgid "Auth port"
+#~ msgstr "Portti"
+
+#~ msgid "TOC host"
+#~ msgstr "TOC-isäntä"
+
+#~ msgid "TOC port"
+#~ msgstr "TOC-portti"
+
+#~ msgid "Pager host"
+#~ msgstr "Isäntä"
+
+#~ msgid "YCHT host"
+#~ msgstr "YCHT-isäntä"
+
+#~ msgid "YCHT port"
+#~ msgstr "YCHT-portti"
+
 #~ msgid "Unable to initiate a new search"
 #~ msgstr "Ei voida aloittaa uutta hakua"
 
@@ -12826,17 +12961,6 @@
 #~ msgid "Direct IM with %s failed"
 #~ msgstr "Suora pikaviesti %s:n kanssa epäonnistui"
 
-#~ msgid "Direct IM with %s established"
-#~ msgstr "Suora pikaviestiyhteys %s:n kanssa muodostettu"
-
-#~ msgid "Attempting to connect to %s at %s:%hu for Direct IM."
-#~ msgstr "Yritetään yhdistää %s at %s:%hu suoraa pikaviestiä varten."
-
-#~ msgid "Asking %s to connect to us at %s:%hu for Direct IM."
-#~ msgstr ""
-#~ "Pyydetään %s yhdistämään meihin at %s:%hu suoraa pikaviestiyhteyttä "
-#~ "varten."
-
 #~ msgid "Unable to open Direct IM"
 #~ msgstr "Ei voitu avata suoraa pikaviestiyhteyttä"
 
@@ -12849,9 +12973,6 @@
 #~ msgid "Unable to login to AIM"
 #~ msgstr "Ei kyetty kirjautumaan AIM:iin"
 
-#~ msgid "Attempting connection redirect..."
-#~ msgstr "Yritetään yhteyden uudelleenreititystä..."
-
 #~ msgid ""
 #~ "Transfer of file %s timed out.\n"
 #~ " Try enabling proxy servers for file transfers in Accounts -> %s -> Edit "
@@ -12875,18 +12996,6 @@
 #~ msgid "Internal Error"
 #~ msgstr "Sisäinen virhe"
 
-#~ msgid "%s has just asked to directly connect to %s"
-#~ msgstr "%s on juuri pyytänyt suoraa yhteyttä %s:n"
-
-#~ 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 ""
-#~ "Tämä toiminto vaatiin suoran yhteyden koneiden välillä mutta on "
-#~ "tarpeellinen lähetettäessä kuvia. Koska IP-osoitteesi paljastuu, tätä voi "
-#~ "pitää yksityisyysriskinä."
-
 #~ msgid "Screen Name:"
 #~ msgstr "Näyttönimi:"
 
--- a/po/ru.po	Tue May 30 18:17:34 2006 +0000
+++ b/po/ru.po	Tue May 30 19:42:16 2006 +0000
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-18 10:16+0300\n"
-"PO-Revision-Date: 2006-03-18 11:00+0300\n"
+"POT-Creation-Date: 2006-05-12 11:10+0400\n"
+"PO-Revision-Date: 2006-05-12 15:00+0400\n"
 "Last-Translator: Dmitry Beloglazov <dmaa@users.sf.net>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -38,7 +38,7 @@
 #. *< id
 #: ../plugins/ciphertest.c:264
 msgid "Cipher Test"
-msgstr ""
+msgstr "Проверка шифров"
 
 #. *< name
 #. *< version
@@ -46,7 +46,7 @@
 #. *  description
 #: ../plugins/ciphertest.c:267 ../plugins/ciphertest.c:269
 msgid "Tests the ciphers that ship with gaim."
-msgstr ""
+msgstr "Проверяет шифры, поставляемые с Gaim."
 
 #: ../plugins/contact_priority.c:61
 msgid "Buddy is idle"
@@ -57,15 +57,13 @@
 msgstr "Собеседник отошёл"
 
 #: ../plugins/contact_priority.c:63
-#, fuzzy
 msgid "Buddy is \"extended\" away"
-msgstr "Пользователь отошёл:"
+msgstr ""
 
 #. Not used yet.
 #: ../plugins/contact_priority.c:66
-#, fuzzy
 msgid "Buddy is mobile"
-msgstr "Собеседник бездействует"
+msgstr ""
 
 #: ../plugins/contact_priority.c:68
 msgid "Buddy is offline"
@@ -156,7 +154,7 @@
 msgstr ""
 
 #. add enabled / disabled
-#: ../plugins/crazychat/cc_gaim_plugin.c:345 ../src/gtkaccount.c:2251
+#: ../plugins/crazychat/cc_gaim_plugin.c:345 ../src/gtkaccount.c:2262
 #: ../src/gtkplugin.c:574
 msgid "Enabled"
 msgstr "Включено"
@@ -171,7 +169,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/dbus-example.c:135
+#: ../plugins/dbus-example.c:152
 msgid "DBus"
 msgstr "DBus"
 
@@ -179,16 +177,16 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/dbus-example.c:138 ../plugins/dbus-example.c:140
+#: ../plugins/dbus-example.c:155 ../plugins/dbus-example.c:157
 msgid "DBus Plugin Example"
 msgstr "Образец модуля DBus"
 
 #: ../plugins/docklet/docklet.c:154
-#, fuzzy
 msgid "Right-click for more unread messages...\n"
-msgstr "Щёлкните правой кнопкой мыши для"
-
-#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3241
+msgstr ""
+"Щёлкните правой кнопкой мыши для чтения других непрочитанных сообщений...\n"
+
+#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3239
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
@@ -200,35 +198,39 @@
 msgstr "Изменить статус"
 
 #: ../plugins/docklet/docklet.c:435 ../src/gtkstatusbox.c:673
-#: ../src/protocols/jabber/buddy.c:1101 ../src/protocols/msn/state.c:29
-#: ../src/protocols/msn/state.c:30 ../src/protocols/msn/state.c:37
-#: ../src/protocols/msn/state.c:38 ../src/protocols/novell/novell.c:2845
-#: ../src/protocols/yahoo/yahoo.c:2735 ../src/status.c:155
+#: ../src/protocols/gg/gg.c:996 ../src/protocols/jabber/buddy.c:1103
+#: ../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:2843 ../src/protocols/yahoo/yahoo.c:2731
+#: ../src/status.c:155
 msgid "Available"
 msgstr "Доступен"
 
 #. Away stuff
-#: ../plugins/docklet/docklet.c:439 ../src/gtkprefs.c:1759
-#: ../src/gtkstatusbox.c:674 ../src/protocols/irc/irc.c:520
-#: ../src/protocols/irc/msgs.c:219 ../src/protocols/jabber/buddy.c:1105
-#: ../src/protocols/novell/novell.c:2848 ../src/protocols/oscar/oscar.c:793
-#: ../src/protocols/oscar/oscar.c:6836 ../src/protocols/oscar/oscar.c:7879
-#: ../src/protocols/silc/buddy.c:1469 ../src/protocols/yahoo/yahoo.c:3189
+#. get_yahoo_status_from_gaim_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#: ../plugins/docklet/docklet.c:439 ../src/gtkprefs.c:1774
+#: ../src/gtkstatusbox.c:674 ../src/protocols/gg/gg.c:999
+#: ../src/protocols/irc/irc.c:520 ../src/protocols/irc/msgs.c:223
+#: ../src/protocols/jabber/buddy.c:1107 ../src/protocols/novell/novell.c:2846
+#: ../src/protocols/oscar/oscar.c:719 ../src/protocols/oscar/oscar.c:4401
+#: ../src/protocols/oscar/oscar.c:5444 ../src/protocols/silc/buddy.c:1469
+#: ../src/protocols/yahoo/yahoo.c:3185 ../src/protocols/yahoo/yahoo.c:3258
 #: ../src/status.c:158
 msgid "Away"
 msgstr "Отошёл"
 
 #: ../plugins/docklet/docklet.c:443 ../src/gtkstatusbox.c:675
-#: ../src/protocols/oscar/oscar.c:797 ../src/protocols/yahoo/yahoo.c:2729
+#: ../src/protocols/oscar/oscar.c:723 ../src/protocols/yahoo/yahoo.c:2725
 #: ../src/status.c:157
 msgid "Invisible"
 msgstr "Невидимый"
 
-#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:2971
-#: ../src/gtkstatusbox.c:676 ../src/protocols/jabber/buddy.c:1099
-#: ../src/protocols/novell/novell.c:2857 ../src/protocols/oscar/oscar.c:859
-#: ../src/protocols/oscar/oscar.c:7851 ../src/protocols/yahoo/yahoo.c:2733
-#: ../src/status.c:154
+#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:2969
+#: ../src/gtkstatusbox.c:676 ../src/protocols/gg/gg.c:993
+#: ../src/protocols/jabber/buddy.c:1101 ../src/protocols/novell/novell.c:2855
+#: ../src/protocols/oscar/oscar.c:785 ../src/protocols/oscar/oscar.c:5416
+#: ../src/protocols/yahoo/yahoo.c:2729 ../src/status.c:154
 msgid "Offline"
 msgstr "Не в сети"
 
@@ -244,7 +246,7 @@
 msgid "Show Buddy List"
 msgstr "Показывать список собеседников"
 
-#: ../plugins/docklet/docklet.c:489 ../src/gtkconv.c:5642
+#: ../plugins/docklet/docklet.c:489 ../src/gtkconv.c:5610
 msgid "Unread Messages"
 msgstr "Непрочитанные сообщения"
 
@@ -252,7 +254,7 @@
 msgid "New Message..."
 msgstr "Новое сообщение..."
 
-#: ../plugins/docklet/docklet.c:519 ../src/gtkaccount.c:2467
+#: ../plugins/docklet/docklet.c:519 ../src/gtkaccount.c:2478
 msgid "Accounts"
 msgstr "Учётные записи"
 
@@ -260,7 +262,7 @@
 msgid "Plugins"
 msgstr "Модули"
 
-#: ../plugins/docklet/docklet.c:521 ../src/gtkprefs.c:1900
+#: ../plugins/docklet/docklet.c:521 ../src/gtkprefs.c:1915
 msgid "Preferences"
 msgstr "Настройки"
 
@@ -284,8 +286,8 @@
 msgstr "_Мгновенные сообщения:"
 
 #: ../plugins/docklet/docklet.c:684 ../plugins/docklet/docklet.c:692
-#: ../plugins/win32/winprefs/winprefs.c:424 ../src/gtkprefs.c:823
-#: ../src/gtkprefs.c:1749 ../src/gtkprefs.c:1763
+#: ../plugins/win32/winprefs/winprefs.c:462 ../src/gtkprefs.c:823
+#: ../src/gtkprefs.c:1764 ../src/gtkprefs.c:1778
 msgid "Never"
 msgstr "Никогда"
 
@@ -295,7 +297,7 @@
 
 #: ../plugins/docklet/docklet.c:686 ../plugins/docklet/docklet.c:694
 #: ../plugins/timestamp_format.c:39 ../plugins/timestamp_format.c:48
-#: ../plugins/win32/winprefs/winprefs.c:425 ../src/gtkprefs.c:825
+#: ../plugins/win32/winprefs/winprefs.c:463 ../src/gtkprefs.c:825
 msgid "Always"
 msgstr "Всегда"
 
@@ -359,9 +361,9 @@
 msgstr "Количество бесед в окне"
 
 #: ../plugins/extplacement.c:112
-#, fuzzy
 msgid "Separate IM and Chat windows when placing by number"
-msgstr "Отдельные окна бесед и чатов"
+msgstr ""
+"Разделять окна мгновенных сообщений и чатов при расположении по количеству"
 
 #. *< type
 #. *< ui_requirement
@@ -386,7 +388,9 @@
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
-msgstr "Позволяет ограничивать количество бесед в окне"
+msgstr ""
+"Ограничивает количество бесед в окне, с возможностью разделения мгновенных "
+"сообщений и чатов."
 
 #. *< type
 #. *< ui_requirement
@@ -443,7 +447,6 @@
 msgstr "Цвет курсора"
 
 #: ../plugins/gaimrc.c:42
-#, fuzzy
 msgid "Secondary Cursor Color"
 msgstr "Вторичный цвет курсора"
 
@@ -452,27 +455,24 @@
 msgstr "Цвет гиперссылки"
 
 #: ../plugins/gaimrc.c:56
-#, fuzzy
 msgid "GtkTreeView Expander Size"
 msgstr "Размер расширителя GtkTreeView"
 
 #: ../plugins/gaimrc.c:57
 msgid "GtkTreeView Horizontal Separation"
-msgstr ""
+msgstr "Горизонтальное разделение GtkTreeView"
 
 #: ../plugins/gaimrc.c:76
-#, fuzzy
 msgid "Conversation Entry"
-msgstr "Беседы"
+msgstr "Область ввода окна беседы"
 
 #: ../plugins/gaimrc.c:77
 msgid "Conversation History"
 msgstr "История бесед"
 
 #: ../plugins/gaimrc.c:78
-#, fuzzy
 msgid "Log Viewer"
-msgstr "Сервер входа в сеть:"
+msgstr "Система просмотра журналов"
 
 #: ../plugins/gaimrc.c:79
 msgid "Request Dialog"
@@ -483,9 +483,8 @@
 msgstr "Диалог уведомления"
 
 #: ../plugins/gaimrc.c:91
-#, fuzzy
 msgid "GtkTreeView Indent Expanders"
-msgstr "Размер расширителя GtkTreeView"
+msgstr ""
 
 #: ../plugins/gaimrc.c:287
 #, c-format
@@ -501,52 +500,52 @@
 msgid "Select Font for %s"
 msgstr "Выберите шрифт для %s"
 
-#: ../plugins/gaimrc.c:362
+#: ../plugins/gaimrc.c:364
 msgid "Select Interface Font"
 msgstr "Выберите шрифт"
 
-#: ../plugins/gaimrc.c:415
+#: ../plugins/gaimrc.c:420
 msgid "General"
 msgstr "Основные"
 
-#: ../plugins/gaimrc.c:420
+#: ../plugins/gaimrc.c:425
 msgid "GTK+ Interface Font"
 msgstr "Шрифт интерфейса GTK+"
 
-#: ../plugins/gaimrc.c:440
+#: ../plugins/gaimrc.c:445
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#: ../plugins/gaimrc.c:475
+#: ../plugins/gaimrc.c:480
 msgid "Interface colors"
 msgstr "Цвета интерфейса"
 
-#: ../plugins/gaimrc.c:499
+#: ../plugins/gaimrc.c:504
 msgid "Widget Sizes"
 msgstr "Размер виджетов"
 
-#: ../plugins/gaimrc.c:520
+#: ../plugins/gaimrc.c:525
 msgid "Fonts"
 msgstr "Шрифты"
 
-#: ../plugins/gaimrc.c:543
+#: ../plugins/gaimrc.c:548
 msgid "Tools"
 msgstr "Инструменты"
 
-#: ../plugins/gaimrc.c:548
+#: ../plugins/gaimrc.c:553
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Записать настройки в %s%sgtkrc-2.0"
 
-#: ../plugins/gaimrc.c:556
+#: ../plugins/gaimrc.c:561
 msgid "Re-read gtkrc files"
 msgstr "Повторно прочитать файлы gtkrc"
 
-#: ../plugins/gaimrc.c:583
+#: ../plugins/gaimrc.c:588
 msgid "Gaim GTK+ Theme Control"
 msgstr "Управление темой GTK+ для Gaim"
 
-#: ../plugins/gaimrc.c:585 ../plugins/gaimrc.c:586
+#: ../plugins/gaimrc.c:590 ../plugins/gaimrc.c:591
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Предоставляет доступ к часто используемым настройкам gtkrc."
 
@@ -604,10 +603,14 @@
 "Вверх и вправо для перехода к следующей беседе."
 
 #. Extract their Name and put it in
+#. Contact Info
+#. Personal
+#. Business
 #: ../plugins/gevolution/add_buddy_dialog.c:131
 #: ../plugins/gevolution/assoc-buddy.c:119 ../src/gtkplugin.c:587
-#: ../src/gtkroomlist.c:604 ../src/protocols/jabber/jabber.c:755
-#: ../src/protocols/msn/msn.c:1534
+#: ../src/gtkroomlist.c:604 ../src/protocols/jabber/jabber.c:754
+#: ../src/protocols/msn/msn.c:1527 ../src/protocols/msn/msn.c:1580
+#: ../src/protocols/msn/msn.c:1601
 msgid "Name"
 msgstr "Имя"
 
@@ -615,33 +618,41 @@
 msgid "Instant Messaging"
 msgstr "Обмен мгновенными сообщениями"
 
+#: ../plugins/gevolution/add_buddy_dialog.c:442 ../src/gtkblist.c:4528
+#: ../src/protocols/silc/buddy.c:736 ../src/protocols/silc/buddy.c:1030
+#: ../src/protocols/silc/buddy.c:1075 ../src/protocols/silc/buddy.c:1174
+#: ../src/protocols/yahoo/yahoo.c:2974
+msgid "Add Buddy"
+msgstr "Добавить собеседника"
+
 #. Add the label.
-#: ../plugins/gevolution/add_buddy_dialog.c:454
+#: ../plugins/gevolution/add_buddy_dialog.c:455
 msgid "Select a person from your address book below, or add a new person."
 msgstr "Ниже выберите персону из адресной книги или добавьте новую персону."
 
 #. "Search"
-#: ../plugins/gevolution/add_buddy_dialog.c:467
+#: ../plugins/gevolution/add_buddy_dialog.c:468
 #: ../plugins/gevolution/assoc-buddy.c:353
-#: ../src/protocols/jabber/buddy.c:1418 ../src/protocols/oscar/oscar.c:8399
-#: ../src/protocols/sametime/sametime.c:5532
+#: ../src/protocols/jabber/buddy.c:1460 ../src/protocols/oscar/oscar.c:6024
+#: ../src/protocols/sametime/sametime.c:5524
 msgid "Search"
 msgstr "Искать"
 
-#: ../plugins/gevolution/add_buddy_dialog.c:548
-#: ../plugins/gevolution/new_person_dialog.c:306 ../src/gtkblist.c:4615
-#: ../src/gtkblist.c:4979
+#: ../plugins/gevolution/add_buddy_dialog.c:549
+#: ../plugins/gevolution/new_person_dialog.c:307 ../src/gtkblist.c:4612
+#: ../src/gtkblist.c:4976
 msgid "Group:"
 msgstr "Группа:"
 
 #. "New Person" button
-#: ../plugins/gevolution/add_buddy_dialog.c:574
+#: ../plugins/gevolution/add_buddy_dialog.c:575
 #: ../plugins/gevolution/assoc-buddy.c:464
+#: ../plugins/gevolution/new_person_dialog.c:251
 msgid "New Person"
 msgstr "Новая персона"
 
 #. "Select Buddy" button
-#: ../plugins/gevolution/add_buddy_dialog.c:591
+#: ../plugins/gevolution/add_buddy_dialog.c:592
 msgid "Select Buddy"
 msgstr "Выбрать собеседника"
 
@@ -665,13 +676,13 @@
 msgstr "Соотнести собеседника"
 
 #: ../plugins/gevolution/eds-utils.c:73 ../plugins/gevolution/eds-utils.c:86
-#: ../src/protocols/jabber/jabber.c:1122
+#: ../src/protocols/jabber/jabber.c:1120
 msgid "None"
 msgstr "Нет"
 
 #: ../plugins/gevolution/gevo-util.c:64 ../plugins/gevolution/gevolution.c:96
 #: ../src/blist.c:516 ../src/blist.c:1278 ../src/blist.c:1505
-#: ../src/gtkblist.c:4424 ../src/protocols/jabber/roster.c:65
+#: ../src/gtkblist.c:4421 ../src/protocols/jabber/roster.c:65
 msgid "Buddies"
 msgstr "Собеседники"
 
@@ -708,8 +719,8 @@
 "Выберите все учётные записи, собеседники которых должны быть добавлены "
 "автоматически."
 
-#: ../plugins/gevolution/gevolution.c:450 ../plugins/idle.c:147
-#: ../plugins/idle.c:183 ../src/gtknotify.c:397 ../src/gtkpounce.c:1262
+#: ../plugins/gevolution/gevolution.c:450 ../plugins/idle.c:150
+#: ../plugins/idle.c:186 ../src/gtknotify.c:399 ../src/gtkpounce.c:1244
 msgid "Account"
 msgstr "Учётная запись"
 
@@ -732,43 +743,44 @@
 msgid "Provides integration with Evolution."
 msgstr "Предоставляет интеграцию с Evolution."
 
-#: ../plugins/gevolution/new_person_dialog.c:266
+#: ../plugins/gevolution/new_person_dialog.c:267
 msgid "Please enter the person's information below."
 msgstr "Ниже введите информацию о персоне."
 
-#: ../plugins/gevolution/new_person_dialog.c:270
+#: ../plugins/gevolution/new_person_dialog.c:271
 msgid "Please enter the buddy's screen name and account type below."
 msgstr ""
 "Ниже введите идентификатор пользователя собеседника и тип учётной записи."
 
-#: ../plugins/gevolution/new_person_dialog.c:290
+#: ../plugins/gevolution/new_person_dialog.c:291
 msgid "Account type:"
 msgstr "Тип учётной записи:"
 
-#: ../plugins/gevolution/new_person_dialog.c:294 ../src/gtkaccount.c:784
+#: ../plugins/gevolution/new_person_dialog.c:295 ../src/gtkaccount.c:784
+#: ../src/gtkblist.c:4574
 msgid "Screen name:"
 msgstr "Идентификатор пользователя:"
 
 #. Optional Information section
-#: ../plugins/gevolution/new_person_dialog.c:314
+#: ../plugins/gevolution/new_person_dialog.c:315
 msgid "Optional information:"
 msgstr "Необязательная информация:"
 
 #. Label
-#: ../plugins/gevolution/new_person_dialog.c:337 ../src/gtkaccount.c:424
-#: ../src/gtkaccount.c:446 ../src/protocols/oscar/oscar.c:699
+#: ../plugins/gevolution/new_person_dialog.c:338 ../src/gtkaccount.c:424
+#: ../src/gtkaccount.c:446 ../src/protocols/oscar/oscar.c:625
 msgid "Buddy Icon"
 msgstr "Значок собеседника"
 
-#: ../plugins/gevolution/new_person_dialog.c:349
+#: ../plugins/gevolution/new_person_dialog.c:350
 msgid "First name:"
 msgstr "Имя:"
 
-#: ../plugins/gevolution/new_person_dialog.c:361
+#: ../plugins/gevolution/new_person_dialog.c:362
 msgid "Last name:"
 msgstr "Фамилия:"
 
-#: ../plugins/gevolution/new_person_dialog.c:381
+#: ../plugins/gevolution/new_person_dialog.c:382
 msgid "E-mail:"
 msgstr "E-mail:"
 
@@ -829,7 +841,7 @@
 #. *< id
 #: ../plugins/iconaway.c:82
 msgid "Iconify on Away"
-msgstr "Сворачивать при отсутствии"
+msgstr "Сворачивание при отсутствии"
 
 #. *< name
 #. *< version
@@ -839,51 +851,50 @@
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Сворачивает список собеседников и все беседы, когда вы отсутствуете."
 
-#: ../plugins/idle.c:152 ../plugins/idle.c:210
+#: ../plugins/idle.c:155 ../plugins/idle.c:213
 msgid "Minutes"
 msgstr "Минуты"
 
-#: ../plugins/idle.c:159 ../plugins/idle.c:192 ../plugins/idle.c:217
-#: ../plugins/idle.c:306
+#. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
+#. If that doesn't translate well into your language, drop the 's before translating.
+#: ../plugins/idle.c:162 ../plugins/idle.c:195 ../plugins/idle.c:220
+#: ../plugins/idle.c:312
 msgid "I'dle Mak'er"
 msgstr "Мастер бездействия"
 
-#: ../plugins/idle.c:160 ../plugins/idle.c:249
+#: ../plugins/idle.c:163 ../plugins/idle.c:252
 msgid "Set Account Idle Time"
 msgstr "Установить время бездействия учётной записи"
 
-#: ../plugins/idle.c:163 ../plugins/idle.c:221
+#: ../plugins/idle.c:166 ../plugins/idle.c:224
 msgid "_Set"
-msgstr "Установить"
-
-#: ../plugins/idle.c:164 ../plugins/idle.c:197 ../plugins/idle.c:222
+msgstr "_Установить"
+
+#: ../plugins/idle.c:167 ../plugins/idle.c:200 ../plugins/idle.c:225
 msgid "_Cancel"
 msgstr "О_тменить"
 
-#: ../plugins/idle.c:177
+#: ../plugins/idle.c:180
 msgid "None of your accounts are idle."
-msgstr ""
-
-#: ../plugins/idle.c:193 ../plugins/idle.c:253
-#, fuzzy
+msgstr "Ни одна из учётных записей не бездействует."
+
+#: ../plugins/idle.c:196 ../plugins/idle.c:256
 msgid "Unset Account Idle Time"
-msgstr "Установить время бездействия учётной записи"
-
-#: ../plugins/idle.c:196
-#, fuzzy
+msgstr "Сбросить время бездействия учётной записи"
+
+#: ../plugins/idle.c:199
 msgid "_Unset"
-msgstr "_Применить"
-
-#: ../plugins/idle.c:218 ../plugins/idle.c:257
+msgstr "_Сбросить"
+
+#: ../plugins/idle.c:221 ../plugins/idle.c:260
 msgid "Set Idle Time for All Accounts"
 msgstr "Установить время бездействия для всех учётных записей"
 
-#: ../plugins/idle.c:262
+#: ../plugins/idle.c:265
 msgid "Unset Idle Time for All Idled Accounts"
-msgstr ""
-
-#: ../plugins/idle.c:308 ../plugins/idle.c:309
-#, fuzzy
+msgstr "Сбросить время бездействия для всех бездействующих учётных записей"
+
+#: ../plugins/idle.c:314 ../plugins/idle.c:315
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "Позволяет настраивать время бездействия вручную."
 
@@ -941,9 +952,8 @@
 msgstr "Пользователь не в сети."
 
 #: ../plugins/log_reader.c:1411
-#, fuzzy
 msgid "Auto-response sent:"
-msgstr "Автоматическое пересоединение"
+msgstr "Автоматический отклик отправлен:"
 
 #: ../plugins/log_reader.c:1421 ../plugins/log_reader.c:1424
 #: ../plugins/statenotify.c:80
@@ -968,50 +978,64 @@
 msgstr ""
 
 #: ../plugins/log_reader.c:1471
-#, fuzzy
 msgid "Message could not be sent because the maximum length was exceeded."
-msgstr "Сообщение не может быть отправлено, так как пользователь не в сети:"
+msgstr ""
+"Сообщение не может быть отправлено, так как был превышен максимальный размер."
 
 #: ../plugins/log_reader.c:1476
 msgid "Message could not be sent."
 msgstr "Сообщение не может быть отправлено."
 
-#: ../plugins/log_reader.c:1835 ../plugins/log_reader.c:1928
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../plugins/log_reader.c:1838 ../plugins/log_reader.c:1943
 msgid "Adium"
 msgstr "Adium"
 
-#: ../plugins/log_reader.c:1844 ../plugins/log_reader.c:1932
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../plugins/log_reader.c:1850 ../plugins/log_reader.c:1947
 msgid "Fire"
 msgstr "Fire"
 
-#: ../plugins/log_reader.c:1853 ../plugins/log_reader.c:1936
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../plugins/log_reader.c:1862 ../plugins/log_reader.c:1951
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
-#: ../plugins/log_reader.c:1862 ../plugins/log_reader.c:1940
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../plugins/log_reader.c:1874 ../plugins/log_reader.c:1955
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: ../plugins/log_reader.c:1871 ../plugins/log_reader.c:1944
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../plugins/log_reader.c:1886 ../plugins/log_reader.c:1959
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../plugins/log_reader.c:1910
-#, fuzzy
+#: ../plugins/log_reader.c:1925
 msgid "General Log Reading Configuration"
-msgstr "Основные"
-
-#: ../plugins/log_reader.c:1914
+msgstr "Основные настройки системы чтения журналов"
+
+#: ../plugins/log_reader.c:1929
 msgid "Fast size calculations"
 msgstr "Быстрое вычисление размера"
 
-#: ../plugins/log_reader.c:1918
+#: ../plugins/log_reader.c:1933
 msgid "Use name heuristics"
 msgstr ""
 
 #. Add Log Directory preferences.
-#: ../plugins/log_reader.c:1924
+#: ../plugins/log_reader.c:1939
 msgid "Log Directory"
 msgstr "Каталог журналов"
 
@@ -1021,20 +1045,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/log_reader.c:1967
-#, fuzzy
+#: ../plugins/log_reader.c:1982
 msgid "Log Reader"
-msgstr "Сервер входа в сеть:"
+msgstr "Система чтения журналов"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../plugins/log_reader.c:1971
+#: ../plugins/log_reader.c:1986
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr ""
 
 #. * description
-#: ../plugins/log_reader.c:1975
+#: ../plugins/log_reader.c:1990
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, Fire, Messenger Plus!, MSN Messenger, and "
@@ -1079,12 +1102,11 @@
 
 #: ../plugins/musicmessaging/musicmessaging.c:415
 msgid "There was a conflict in running the command:"
-msgstr ""
+msgstr "Произошёл конфликт при выполнении команды:"
 
 #: ../plugins/musicmessaging/musicmessaging.c:523
-#, fuzzy
 msgid "Error Running Editor"
-msgstr "Ошибка выполнения %s"
+msgstr "Ошибка запуска редактора"
 
 #: ../plugins/musicmessaging/musicmessaging.c:524
 msgid "The following error has occured:"
@@ -1136,8 +1158,8 @@
 msgstr "Окна _чатов"
 
 #: ../plugins/notify.c:657
-msgid "\t_Only when someone says your nick"
-msgstr "\t_Только когда кто-то произносит ваше имя"
+msgid "\t_Only when someone says your screen name"
+msgstr "\t_Только тогда, когда кто-то произносит ваше имя"
 
 #: ../plugins/notify.c:667
 msgid "_Focused windows"
@@ -1150,23 +1172,22 @@
 
 #: ../plugins/notify.c:682
 msgid "Prepend _string into window title:"
-msgstr "Добавлять строку в начало заголовка окна:"
+msgstr "Добавлять _строку в начало заголовка окна:"
 
 #. Count method button
 #: ../plugins/notify.c:701
 msgid "Insert c_ount of new messages into window title"
-msgstr "Вставлять количество новых сообщений в заголовок окна"
+msgstr "Вставлять _количество новых сообщений в заголовок окна"
 
 #. Urgent method button
 #: ../plugins/notify.c:710
 msgid "Set window manager \"_URGENT\" hint"
-msgstr "Установить подсказку \"СРОЧНО\" менеджера окон"
+msgstr "Установить подсказку \"С_РОЧНО\" менеджера окон"
 
 #. Raise window method button
 #: ../plugins/notify.c:719
-#, fuzzy
 msgid "R_aise conversation window"
-msgstr "Окна бесед"
+msgstr "_Поднимать окно беседы"
 
 #. ---------- "Notification Removals" ----------
 #: ../plugins/notify.c:727
@@ -1234,33 +1255,39 @@
 msgid "Provides support for loading perl plugins."
 msgstr "Предоставляет поддержку загрузки модулей perl."
 
-#: ../plugins/psychic.c:22
+#: ../plugins/psychic.c:19
 msgid "Psychic Mode"
 msgstr ""
 
-#: ../plugins/psychic.c:23
+#: ../plugins/psychic.c:20
 msgid "Psychic mode for incoming conversation"
 msgstr ""
 
-#: ../plugins/psychic.c:24
+#: ../plugins/psychic.c:21
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
 msgstr ""
 
-#: ../plugins/psychic.c:60
+#. This is a quote from Star Wars.  You should
+#. probably not translate it literally.  If
+#. you can't find a fitting cultural reference
+#. in your language, consider translating
+#. something like this instead:
+#. "You feel a new message coming."
+#: ../plugins/psychic.c:63
 msgid "You feel a disturbance in the force..."
 msgstr ""
 
-#: ../plugins/psychic.c:79
+#: ../plugins/psychic.c:82
 msgid "Only enable for users on the buddy list"
 msgstr "Включить только для пользователей из списка собеседников"
 
-#: ../plugins/psychic.c:84
+#: ../plugins/psychic.c:87
 msgid "Disable when away"
 msgstr "Выключать во время отсутствия"
 
-#: ../plugins/psychic.c:88
+#: ../plugins/psychic.c:91
 msgid "Display notification message in conversations"
 msgstr "Выводить уведомительное сообщение в беседах"
 
@@ -1360,7 +1387,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/simple.c:34
+#: ../plugins/simple.c:37
 msgid "Simple Plugin"
 msgstr "Простой модуль"
 
@@ -1368,7 +1395,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/simple.c:37 ../plugins/simple.c:39
+#: ../plugins/simple.c:40 ../plugins/simple.c:42
 msgid "Tests to see that most things are working."
 msgstr "Проверяет, всё ли работает."
 
@@ -1600,7 +1627,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/timestamp.c:254
+#: ../plugins/timestamp.c:256
 msgid "Timestamp"
 msgstr "Время"
 
@@ -1608,40 +1635,38 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/timestamp.c:257 ../plugins/timestamp.c:259
+#: ../plugins/timestamp.c:259 ../plugins/timestamp.c:261
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "Добавляет в беседы отметки времени в стиле iChat каждые N минут."
 
 #: ../plugins/timestamp_format.c:22
 msgid "Timestamp Format Options"
-msgstr ""
+msgstr "Параметры формата времени"
 
 #: ../plugins/timestamp_format.c:27
 msgid "_Force (traditional Gaim) 24-hour time format"
 msgstr ""
+"_Принудительно использовать (традиционный для Gaim) 24-часовой формат времени"
 
 #: ../plugins/timestamp_format.c:30
 msgid "Show dates in..."
-msgstr ""
+msgstr "Показывать дату..."
 
 #: ../plugins/timestamp_format.c:35
-#, fuzzy
 msgid "Co_nversations:"
-msgstr "Беседы"
+msgstr "_Беседы:"
 
 #: ../plugins/timestamp_format.c:37 ../plugins/timestamp_format.c:46
-#, fuzzy
 msgid "For delayed messages"
-msgstr "Непрочитанные сообщения"
+msgstr "Для задержанных сообщений"
 
 #: ../plugins/timestamp_format.c:38 ../plugins/timestamp_format.c:47
 msgid "For delayed messages and in chats"
-msgstr ""
+msgstr "Для задержанных сообщений и в чатах"
 
 #: ../plugins/timestamp_format.c:44
-#, fuzzy
 msgid "_Message Logs:"
-msgstr "_Сообщение:"
+msgstr "_Журналы сообщений:"
 
 #. *< type
 #. *< ui_requirement
@@ -1651,14 +1676,14 @@
 #. *< id
 #: ../plugins/timestamp_format.c:150
 msgid "Message Timestamp Formats"
-msgstr ""
+msgstr "Форматы времени сообщений"
 
 #. *< name
 #. *< version
 #. *  summary
 #: ../plugins/timestamp_format.c:153
 msgid "Customizes the message timestamp formats."
-msgstr ""
+msgstr "Изменяет форматы времени сообщений."
 
 #. *  description
 #: ../plugins/timestamp_format.c:155
@@ -1666,6 +1691,8 @@
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
 msgstr ""
+"Этот модуль позволяет пользователю изменять форматы времени сообщений для "
+"бесед и журналов."
 
 #: ../plugins/win32/transparency/win2ktrans.c:183
 #: ../plugins/win32/transparency/win2ktrans.c:569
@@ -1680,16 +1707,15 @@
 
 #: ../plugins/win32/transparency/win2ktrans.c:534
 msgid "_IM window transparency"
-msgstr "Прозрачность окна беседы"
+msgstr "_Прозрачность окна беседы"
 
 #: ../plugins/win32/transparency/win2ktrans.c:548
 msgid "_Show slider bar in IM window"
-msgstr "Показывать полосу прокрутки в окнах бесед"
+msgstr "Показывать _полосу прокрутки в окнах бесед"
 
 #: ../plugins/win32/transparency/win2ktrans.c:555
-#, fuzzy
 msgid "Remove IM window transparency on focus"
-msgstr "Прозрачность окна беседы"
+msgstr "Убирать прозрачность окна беседы в фокусе"
 
 #: ../plugins/win32/transparency/win2ktrans.c:558
 #: ../plugins/win32/transparency/win2ktrans.c:606
@@ -1703,12 +1729,11 @@
 
 #: ../plugins/win32/transparency/win2ktrans.c:591
 msgid "_Buddy List window transparency"
-msgstr "Прозрачность окна списка собеседников"
+msgstr "Прозрачность окна _списка собеседников"
 
 #: ../plugins/win32/transparency/win2ktrans.c:604
-#, fuzzy
 msgid "Remove Buddy List window transparency on focus"
-msgstr "Прозрачность окна списка собеседников"
+msgstr "Убирать прозрачность окна списка собеседников в фокусе"
 
 #. *< type
 #. *< ui_requirement
@@ -1740,57 +1765,57 @@
 "\n"
 "* Замечание: Этот модуль требует Win2000 или выше."
 
-#: ../plugins/win32/winprefs/winprefs.c:397
+#: ../plugins/win32/winprefs/winprefs.c:434
 msgid "GTK+ Runtime Version"
-msgstr ""
+msgstr "Версия GTK+"
 
 #. Autostart
-#: ../plugins/win32/winprefs/winprefs.c:405
+#: ../plugins/win32/winprefs/winprefs.c:442
 msgid "Startup"
 msgstr "Загрузка"
 
-#: ../plugins/win32/winprefs/winprefs.c:406
+#: ../plugins/win32/winprefs/winprefs.c:443
 msgid "_Start Gaim on Windows startup"
-msgstr "Запускать Gaim при загрузке Windows"
+msgstr "_Запускать Gaim при загрузке Windows"
 
 #. Buddy List
-#: ../plugins/win32/winprefs/winprefs.c:417 ../src/gtkblist.c:3668
+#: ../plugins/win32/winprefs/winprefs.c:455 ../src/gtkblist.c:3665
 msgid "Buddy List"
 msgstr "Список собеседников"
 
-#: ../plugins/win32/winprefs/winprefs.c:418
+#: ../plugins/win32/winprefs/winprefs.c:456
 msgid "_Dockable Buddy List"
-msgstr "Закреплённый список собеседников"
+msgstr "Закреплённый _список собеседников"
 
 #. Blist On Top
-#: ../plugins/win32/winprefs/winprefs.c:422
+#: ../plugins/win32/winprefs/winprefs.c:460
 msgid "_Keep Buddy List window on top:"
-msgstr "Держать окно списка собеседников наверху:"
+msgstr "Держать окно списка собеседников _наверху:"
 
 #. XXX: Did this ever work?
-#: ../plugins/win32/winprefs/winprefs.c:427
+#: ../plugins/win32/winprefs/winprefs.c:465
 msgid "Only when docked"
-msgstr ""
+msgstr "Только тогда, когда закреплено"
 
 #. Conversations
-#: ../plugins/win32/winprefs/winprefs.c:431 ../src/gtkprefs.c:819
-#: ../src/gtkprefs.c:1864
+#: ../plugins/win32/winprefs/winprefs.c:469 ../src/gtkprefs.c:819
+#: ../src/gtkprefs.c:1879
 msgid "Conversations"
 msgstr "Беседы"
 
-#: ../plugins/win32/winprefs/winprefs.c:432
+#: ../plugins/win32/winprefs/winprefs.c:470
 msgid "_Flash window when messages are received"
 msgstr "_Мерцать окном при принятии сообщений"
 
-#: ../plugins/win32/winprefs/winprefs.c:456
+#: ../plugins/win32/winprefs/winprefs.c:494
 msgid "WinGaim Options"
 msgstr "Параметры WinGaim"
 
-#: ../plugins/win32/winprefs/winprefs.c:458
+#: ../plugins/win32/winprefs/winprefs.c:496
 msgid "Options specific to Windows Gaim."
 msgstr "Специфичные для Windows параметры Gaim."
 
-#: ../plugins/win32/winprefs/winprefs.c:459
+#: ../plugins/win32/winprefs/winprefs.c:497
 msgid ""
 "Provides options specific to Windows Gaim, such as buddy list docking and "
 "conversation flashing."
@@ -1800,132 +1825,138 @@
 msgid "accounts"
 msgstr "учётные записи"
 
-#: ../src/account.c:923
+#: ../src/account.c:918
 msgid "Password is required to sign on."
 msgstr "Для подключения требуется пароль."
 
-#: ../src/account.c:948
+#: ../src/account.c:943
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Введите пароль для %s (%s)"
 
-#: ../src/account.c:955
+#: ../src/account.c:950
 msgid "Enter Password"
 msgstr "Введите пароль"
 
-#: ../src/account.c:960
+#: ../src/account.c:955
 msgid "Save password"
 msgstr "Сохранить пароль"
 
-#: ../src/account.c:968 ../src/account.c:1139 ../src/gtkblist.c:3552
-#: ../src/gtkdialogs.c:588 ../src/gtkdialogs.c:725 ../src/gtkdialogs.c:789
+#. *
+#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
+#.
+#: ../src/account.c:963 ../src/account.c:1134 ../src/gtkblist.c:3549
+#: ../src/gtkdialogs.c:607 ../src/gtkdialogs.c:744 ../src/gtkdialogs.c:808
 #: ../src/gtkrequest.c:269 ../src/protocols/gg/gg.c:497
-#: ../src/protocols/gg/gg.c:638 ../src/protocols/gg/gg.c:774
-#: ../src/protocols/jabber/jabber.c:1319 ../src/protocols/jabber/xdata.c:337
+#: ../src/protocols/gg/gg.c:655 ../src/protocols/gg/gg.c:791
+#: ../src/protocols/jabber/jabber.c:1317 ../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:3064 ../src/protocols/oscar/oscar.c:4607
-#: ../src/protocols/oscar/oscar.c:4688 ../src/protocols/oscar/oscar.c:8130
-#: ../src/protocols/oscar/oscar.c:8253 ../src/protocols/oscar/oscar.c:8278
-#: ../src/protocols/oscar/oscar.c:8330 ../src/protocols/silc/buddy.c:466
-#: ../src/protocols/silc/buddy.c:1182 ../src/protocols/silc/chat.c:423
-#: ../src/protocols/silc/chat.c:461 ../src/protocols/silc/chat.c:724
+#: ../src/protocols/oscar/oscar.c:1408 ../src/protocols/oscar/oscar.c:2167
+#: ../src/protocols/oscar/oscar.c:2260 ../src/protocols/oscar/oscar.c:5694
+#: ../src/protocols/oscar/oscar.c:5874 ../src/protocols/oscar/oscar.c:5899
+#: ../src/protocols/oscar/oscar.c:5955 ../src/protocols/silc/buddy.c:466
+#: ../src/protocols/silc/buddy.c:1182 ../src/protocols/silc/chat.c:424
+#: ../src/protocols/silc/chat.c:462 ../src/protocols/silc/chat.c:725
 #: ../src/protocols/silc/ops.c:1297 ../src/protocols/silc/ops.c:1910
-#: ../src/protocols/silc/silc.c:753 ../src/protocols/yahoo/yahoo.c:3063
-#: ../src/protocols/yahoo/yahoo.c:3072
+#: ../src/protocols/silc/silc.c:753 ../src/protocols/yahoo/yahoo.c:3059
+#: ../src/protocols/yahoo/yahoo.c:3068 ../src/request.h:1344
 msgid "OK"
 msgstr "OK"
 
-#: ../src/account.c:969 ../src/account.c:1140 ../src/account.c:1177
-#: ../src/gtkaccount.c:2171 ../src/gtkaccount.c:2638 ../src/gtkblist.c:5020
-#: ../src/gtkdialogs.c:589 ../src/gtkdialogs.c:726 ../src/gtkdialogs.c:790
-#: ../src/gtkdialogs.c:809 ../src/gtkdialogs.c:831 ../src/gtkdialogs.c:851
-#: ../src/gtkdialogs.c:895 ../src/gtkdialogs.c:950 ../src/gtkdialogs.c:987
-#: ../src/gtkdialogs.c:1012 ../src/gtkimhtmltoolbar.c:419
-#: ../src/gtkplugin.c:296 ../src/gtkpounce.c:1095 ../src/gtkprivacy.c:568
+#: ../src/account.c:964 ../src/account.c:1135 ../src/account.c:1172
+#: ../src/gtkaccount.c:2182 ../src/gtkaccount.c:2649 ../src/gtkblist.c:5017
+#: ../src/gtkdialogs.c:608 ../src/gtkdialogs.c:745 ../src/gtkdialogs.c:809
+#: ../src/gtkdialogs.c:828 ../src/gtkdialogs.c:850 ../src/gtkdialogs.c:870
+#: ../src/gtkdialogs.c:914 ../src/gtkdialogs.c:969 ../src/gtkdialogs.c:1006
+#: ../src/gtkdialogs.c:1031 ../src/gtkimhtmltoolbar.c:419
+#: ../src/gtkplugin.c:296 ../src/gtkpounce.c:1077 ../src/gtkprivacy.c:568
 #: ../src/gtkprivacy.c:581 ../src/gtkprivacy.c:606 ../src/gtkprivacy.c:617
 #: ../src/gtkrequest.c:270 ../src/gtksavedstatuses.c:296
-#: ../src/protocols/gg/gg.c:498 ../src/protocols/gg/gg.c:639
-#: ../src/protocols/gg/gg.c:775 ../src/protocols/gg/gg.c:854
-#: ../src/protocols/jabber/buddy.c:573 ../src/protocols/jabber/buddy.c:1419
-#: ../src/protocols/jabber/buddy.c:1453 ../src/protocols/jabber/chat.c:780
-#: ../src/protocols/jabber/jabber.c:824 ../src/protocols/jabber/jabber.c:1320
+#: ../src/protocols/gg/gg.c:498 ../src/protocols/gg/gg.c:656
+#: ../src/protocols/gg/gg.c:792 ../src/protocols/gg/gg.c:871
+#: ../src/protocols/jabber/buddy.c:575 ../src/protocols/jabber/buddy.c:1461
+#: ../src/protocols/jabber/buddy.c:1495 ../src/protocols/jabber/chat.c:778
+#: ../src/protocols/jabber/jabber.c:823 ../src/protocols/jabber/jabber.c:1318
 #: ../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:1705 ../src/protocols/oscar/oscar.c:3065
-#: ../src/protocols/oscar/oscar.c:4565 ../src/protocols/oscar/oscar.c:4608
-#: ../src/protocols/oscar/oscar.c:4645 ../src/protocols/oscar/oscar.c:4689
-#: ../src/protocols/oscar/oscar.c:8131 ../src/protocols/oscar/oscar.c:8254
-#: ../src/protocols/oscar/oscar.c:8279 ../src/protocols/oscar/oscar.c:8331
-#: ../src/protocols/oscar/oscar.c:8400
-#: ../src/protocols/sametime/sametime.c:3376
-#: ../src/protocols/sametime/sametime.c:3461
-#: ../src/protocols/sametime/sametime.c:3631
-#: ../src/protocols/sametime/sametime.c:5320
-#: ../src/protocols/sametime/sametime.c:5409
-#: ../src/protocols/sametime/sametime.c:5533 ../src/protocols/silc/buddy.c:467
+#: ../src/protocols/oscar/oscar.c:1409 ../src/protocols/oscar/oscar.c:2168
+#: ../src/protocols/oscar/oscar.c:2209 ../src/protocols/oscar/oscar.c:2261
+#: ../src/protocols/oscar/oscar.c:5695 ../src/protocols/oscar/oscar.c:5747
+#: ../src/protocols/oscar/oscar.c:5875 ../src/protocols/oscar/oscar.c:5900
+#: ../src/protocols/oscar/oscar.c:5956 ../src/protocols/oscar/oscar.c:6025
+#: ../src/protocols/oscar/peer.c:942 ../src/protocols/sametime/sametime.c:3368
+#: ../src/protocols/sametime/sametime.c:3453
+#: ../src/protocols/sametime/sametime.c:3623
+#: ../src/protocols/sametime/sametime.c:5312
+#: ../src/protocols/sametime/sametime.c:5401
+#: ../src/protocols/sametime/sametime.c:5525 ../src/protocols/silc/buddy.c:467
 #: ../src/protocols/silc/buddy.c:1078 ../src/protocols/silc/buddy.c:1183
-#: ../src/protocols/silc/chat.c:596 ../src/protocols/silc/chat.c:725
+#: ../src/protocols/silc/chat.c:597 ../src/protocols/silc/chat.c:726
 #: ../src/protocols/silc/ops.c:1911 ../src/protocols/silc/silc.c:754
-#: ../src/protocols/silc/silc.c:959 ../src/protocols/yahoo/yahoo.c:3064
-#: ../src/protocols/yahoo/yahoo.c:3073
+#: ../src/protocols/silc/silc.c:959 ../src/protocols/yahoo/yahoo.c:3060
+#: ../src/protocols/yahoo/yahoo.c:3069 ../src/request.h:1344
+#: ../src/request.h:1354
 msgid "Cancel"
 msgstr "Отменить"
 
-#: ../src/account.c:994 ../src/connection.c:96
+#: ../src/account.c:989 ../src/connection.c:96
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Отсутствует модуль протокола для %s"
 
-#: ../src/account.c:996 ../src/connection.c:99 ../src/gtkblist.c:3544
-#: ../src/gtkblist.c:3550
+#: ../src/account.c:991 ../src/connection.c:99 ../src/gtkblist.c:3547
 msgid "Connection Error"
 msgstr "Ошибка соединения"
 
-#: ../src/account.c:1076 ../src/protocols/gg/gg.c:679
-#: ../src/protocols/jabber/jabber.c:1272
+#: ../src/account.c:1071 ../src/protocols/gg/gg.c:696
+#: ../src/protocols/jabber/jabber.c:1270
 msgid "New passwords do not match."
 msgstr "Новые пароли не совпадают."
 
-#: ../src/account.c:1085
+#: ../src/account.c:1080
 msgid "Fill out all fields completely."
 msgstr "Заполните все поля."
 
-#: ../src/account.c:1108
+#: ../src/account.c:1103
 msgid "Original password"
 msgstr "Исходный пароль"
 
-#: ../src/account.c:1115
+#: ../src/account.c:1110
 msgid "New password"
 msgstr "Новый пароль"
 
-#: ../src/account.c:1122
+#: ../src/account.c:1117
 msgid "New password (again)"
 msgstr "Новый пароль (ещё раз)"
 
-#: ../src/account.c:1128
+#: ../src/account.c:1123
 #, c-format
 msgid "Change password for %s"
 msgstr "Изменить пароль для %s"
 
-#: ../src/account.c:1136
+#: ../src/account.c:1131
 msgid "Please enter your current password and your new password."
 msgstr "Введите ваш текущий и ваш новый пароли."
 
-#: ../src/account.c:1169
+#: ../src/account.c:1164
 #, c-format
 msgid "Change user information for %s"
 msgstr "Изменить пользовательскую информацию для %s"
 
-#: ../src/account.c:1176 ../src/gtkdebug.c:684 ../src/gtkrequest.c:276
-#: ../src/protocols/jabber/buddy.c:572
+#: ../src/account.c:1167 ../src/protocols/toc/toc.c:1684
+msgid "Set User Info"
+msgstr "Установить пользовательскую информацию"
+
+#: ../src/account.c:1171 ../src/gtkdebug.c:684 ../src/gtkrequest.c:276
+#: ../src/protocols/jabber/buddy.c:574
 msgid "Save"
 msgstr "Сохранить"
 
-#: ../src/account.c:1679 ../src/gtkft.c:157
-#: ../src/protocols/jabber/buddy.c:630 ../src/protocols/jabber/buddy.c:1095
-#: ../src/protocols/jabber/buddy.c:1112 ../src/protocols/novell/novell.c:2860
+#: ../src/account.c:1681 ../src/gtkft.c:159 ../src/protocols/gg/gg.c:1002
+#: ../src/protocols/jabber/buddy.c:632 ../src/protocols/jabber/buddy.c:1097
+#: ../src/protocols/jabber/buddy.c:1114 ../src/protocols/novell/novell.c:2858
 msgid "Unknown"
 msgstr "Неизвестно"
 
@@ -1938,7 +1969,7 @@
 msgstr "Чаты"
 
 #: ../src/blist.c:1901
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%d buddy from group %s was not removed because it belongs to an account "
 "which is disabled or offline.  This buddy and the group were not removed.\n"
@@ -1947,13 +1978,13 @@
 "which are currently disabled or offline.  These buddies and the group were "
 "not removed.\n"
 msgstr[0] ""
-"%d собеседник из группы %s не был удалён, так как не был осуществлён вход с "
-"соответствующей ему учётной записью. Этот собеседник и группа не были "
-"удалены.\n"
+"%d собеседник из группы %s не был удалён, так как он принадлежит учётной "
+"записи, которая в настоящий момент выключена или неактивна. Этот собеседник "
+"и группа не были удалены.\n"
 msgstr[1] ""
-"%d собеседников из группы %s не были удалены, так как не был осуществлён "
-"вход с соответствующей им учётной записью. Эти собеседники и группа не были "
-"удалены.\n"
+"%d собеседников из группы %s не были удалены, так как они принадлежат "
+"учётным записям, которые в настоящий момент выключены или неактивны. Эти "
+"собеседники и группа не были удалены.\n"
 
 #: ../src/blist.c:1911
 msgid "Group not removed"
@@ -2024,7 +2055,7 @@
 msgid "No name"
 msgstr "Нет имени"
 
-#: ../src/ft.c:189 ../src/protocols/msn/msn.c:412
+#: ../src/ft.c:189 ../src/protocols/msn/msn.c:410
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -2060,9 +2091,9 @@
 msgstr "Нельзя отправить каталог."
 
 #: ../src/ft.c:249
-#, fuzzy, c-format
+#, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
-msgstr "%s не является обычным файлом.\n"
+msgstr "%s не является обычным файлом. Не будет перезаписан.\n"
 
 #: ../src/ft.c:307
 #, c-format
@@ -2095,55 +2126,55 @@
 msgid "%s is offering to send file %s"
 msgstr "%s предлагает отправку файла %s"
 
-#: ../src/ft.c:442
+#: ../src/ft.c:443
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s не является допустимым именем файла.\n"
 
-#: ../src/ft.c:463
+#: ../src/ft.c:464
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Предложение отправки %s для %s"
 
-#: ../src/ft.c:474
+#: ../src/ft.c:476
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Запуск передачи %s от %s"
 
-#: ../src/ft.c:628
+#: ../src/ft.c:630
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Передача файла %s завершена"
 
-#: ../src/ft.c:631
+#: ../src/ft.c:633
 msgid "File transfer complete"
 msgstr "Передача файлов завершена"
 
-#: ../src/ft.c:1022
+#: ../src/ft.c:1028
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Вы отменили передачу %s"
 
-#: ../src/ft.c:1027
+#: ../src/ft.c:1033
 msgid "File transfer cancelled"
 msgstr "Передача файлов отменена"
 
-#: ../src/ft.c:1084
+#: ../src/ft.c:1091
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s отменил передачу %s"
 
-#: ../src/ft.c:1089
+#: ../src/ft.c:1096
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s отменил передачу файлов"
 
-#: ../src/ft.c:1146
+#: ../src/ft.c:1153
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Не удалось произвести передачу файлов для %s."
 
-#: ../src/ft.c:1148
+#: ../src/ft.c:1155
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Не удалось произвести передачу файлов от %s."
@@ -2164,7 +2195,7 @@
 msgid "Login Options"
 msgstr "Параметры входа"
 
-#: ../src/gtkaccount.c:779 ../src/gtkft.c:640
+#: ../src/gtkaccount.c:779 ../src/gtkft.c:642
 msgid "Protocol:"
 msgstr "Протокол:"
 
@@ -2172,7 +2203,7 @@
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../src/gtkaccount.c:863 ../src/gtkblist.c:4598 ../src/gtkblist.c:4964
+#: ../src/gtkaccount.c:863 ../src/gtkblist.c:4595 ../src/gtkblist.c:4961
 msgid "Alias:"
 msgstr "Псевдоним:"
 
@@ -2219,103 +2250,109 @@
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../src/gtkaccount.c:1263 ../src/gtkprefs.c:1043
+#: ../src/gtkaccount.c:1263 ../src/gtkprefs.c:1058
 msgid "Use Environmental Settings"
 msgstr "Использовать настройки окружения"
 
-#: ../src/gtkaccount.c:1297
+#. This is an easter egg.
+#. It means one of two things, both intended as humourus:
+#. A) your network is really slow and you have nothing better to do than
+#. look at butterflies.
+#. B)You are looking really closely at something that shouldn't matter.
+#: ../src/gtkaccount.c:1302
+msgid "If you look real closely"
+msgstr "Если приглядитесь"
+
+#. This is an easter egg. See the comment on the previous line in the source.
+#: ../src/gtkaccount.c:1305
 msgid "you can see the butterflies mating"
 msgstr "вы можете увидеть спаривающихся бабочек"
 
-#: ../src/gtkaccount.c:1301
-msgid "If you look real closely"
-msgstr "Если приглядитесь"
-
-#: ../src/gtkaccount.c:1317
+#: ../src/gtkaccount.c:1326
 msgid "Proxy Options"
 msgstr "Параметры прокси"
 
-#: ../src/gtkaccount.c:1331 ../src/gtkprefs.c:1037
+#: ../src/gtkaccount.c:1340 ../src/gtkprefs.c:1052
 msgid "Proxy _type:"
-msgstr "Тип прокси:"
-
-#: ../src/gtkaccount.c:1340 ../src/gtkprefs.c:1058
+msgstr "_Тип прокси:"
+
+#: ../src/gtkaccount.c:1349 ../src/gtkprefs.c:1073
 msgid "_Host:"
-msgstr "Узел:"
-
-#: ../src/gtkaccount.c:1344 ../src/gtkprefs.c:1076
+msgstr "_Узел:"
+
+#: ../src/gtkaccount.c:1353 ../src/gtkprefs.c:1091
 msgid "_Port:"
-msgstr "Порт:"
-
-#: ../src/gtkaccount.c:1352
+msgstr "П_орт:"
+
+#: ../src/gtkaccount.c:1361
 msgid "_Username:"
-msgstr "Имя пользователя:"
-
-#: ../src/gtkaccount.c:1358 ../src/gtkprefs.c:1113
+msgstr "_Имя пользователя:"
+
+#: ../src/gtkaccount.c:1367 ../src/gtkprefs.c:1128
 msgid "Pa_ssword:"
-msgstr "Пароль:"
-
-#: ../src/gtkaccount.c:1736
+msgstr "Па_роль:"
+
+#: ../src/gtkaccount.c:1747
 msgid "Add Account"
 msgstr "Добавить учётную запись"
 
-#: ../src/gtkaccount.c:1738 ../src/gtkblist.c:3553
+#: ../src/gtkaccount.c:1749 ../src/gtkblist.c:3550
 msgid "Modify Account"
 msgstr "Изменить учётную запись"
 
-#: ../src/gtkaccount.c:1760
+#: ../src/gtkaccount.c:1771
 msgid "_Basic"
 msgstr "_Основные"
 
-#: ../src/gtkaccount.c:1771
+#: ../src/gtkaccount.c:1782
 msgid "_Advanced"
 msgstr "_Дополнительные"
 
 #. Register button
-#: ../src/gtkaccount.c:1786 ../src/protocols/jabber/jabber.c:823
+#: ../src/gtkaccount.c:1797 ../src/protocols/jabber/jabber.c:822
 msgid "Register"
 msgstr "Зарегистрировать"
 
-#: ../src/gtkaccount.c:2165 ../src/gtksavedstatuses.c:293
+#: ../src/gtkaccount.c:2176 ../src/gtksavedstatuses.c:293
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Вы действительно хотите удалить %s?"
 
-#: ../src/gtkaccount.c:2170 ../src/gtkpounce.c:1094 ../src/gtkrequest.c:273
+#: ../src/gtkaccount.c:2181 ../src/gtkpounce.c:1076 ../src/gtkrequest.c:273
 #: ../src/gtksavedstatuses.c:295
 msgid "Delete"
 msgstr "Удалить"
 
-#: ../src/gtkaccount.c:2228 ../src/gtksavedstatuses.c:890
-#: ../src/protocols/oscar/oscar.c:5252
+#: ../src/gtkaccount.c:2239 ../src/gtksavedstatuses.c:889
+#: ../src/protocols/oscar/oscar.c:2823
 msgid "Screen Name"
 msgstr "Идентификатор пользователя"
 
-#: ../src/gtkaccount.c:2259
+#: ../src/gtkaccount.c:2270
 msgid "Protocol"
 msgstr "Протокол"
 
-#: ../src/gtkaccount.c:2586
+#: ../src/gtkaccount.c:2597
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s добавил %s в свой список собеседников%s%s"
 
-#: ../src/gtkaccount.c:2635
+#: ../src/gtkaccount.c:2646
 msgid "Add buddy to your list?"
 msgstr "Добавить собеседника в список?"
 
-#: ../src/gtkaccount.c:2637 ../src/gtkblist.c:5019 ../src/gtkconv.c:1625
-#: ../src/gtkrequest.c:274 ../src/protocols/gg/gg.c:853
-#: ../src/protocols/oscar/oscar.c:4877
-#: ../src/protocols/sametime/sametime.c:5408 ../src/protocols/silc/chat.c:595
+#: ../src/gtkaccount.c:2648 ../src/gtkblist.c:5016 ../src/gtkconv.c:1623
+#: ../src/gtkrequest.c:274 ../src/protocols/gg/gg.c:870
+#: ../src/protocols/oscar/oscar.c:2453
+#: ../src/protocols/sametime/sametime.c:5400 ../src/protocols/silc/chat.c:596
 msgid "Add"
 msgstr "Добавить"
 
-#: ../src/gtkblist.c:672
+#: ../src/gtkblist.c:673
 msgid "Join a Chat"
 msgstr "Присоединиться к чату"
 
-#: ../src/gtkblist.c:693
+#: ../src/gtkblist.c:694
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -2323,213 +2360,213 @@
 "Введите соответствующую информацию о чате, к которому вы хотели бы "
 "присоединиться.\n"
 
-#: ../src/gtkblist.c:704 ../src/gtkpounce.c:527 ../src/gtkroomlist.c:377
+#: ../src/gtkblist.c:705 ../src/gtkpounce.c:519 ../src/gtkroomlist.c:377
 msgid "_Account:"
 msgstr "У_чётная запись:"
 
-#: ../src/gtkblist.c:948
+#: ../src/gtkblist.c:949
 msgid "Get _Info"
 msgstr "_Информация"
 
-#: ../src/gtkblist.c:951 ../src/gtkstock.c:141
+#: ../src/gtkblist.c:952 ../src/gtkstock.c:141
 msgid "I_M"
 msgstr "Сооб_щение"
 
-#: ../src/gtkblist.c:957
+#: ../src/gtkblist.c:958
 msgid "_Send File"
 msgstr "Отправить _файл"
 
-#: ../src/gtkblist.c:964
+#: ../src/gtkblist.c:965
 msgid "Add Buddy _Pounce"
 msgstr "Добавить п_равило"
 
-#: ../src/gtkblist.c:968 ../src/gtkblist.c:972 ../src/gtkblist.c:1071
-#: ../src/gtkblist.c:1094
+#: ../src/gtkblist.c:969 ../src/gtkblist.c:973 ../src/gtkblist.c:1072
+#: ../src/gtkblist.c:1095
 msgid "View _Log"
 msgstr "Просмотреть _журнал"
 
-#: ../src/gtkblist.c:983
+#: ../src/gtkblist.c:984
 msgid "Alias..."
 msgstr "Псевдоним..."
 
-#: ../src/gtkblist.c:986 ../src/gtkconv.c:1622 ../src/gtkrequest.c:275
+#: ../src/gtkblist.c:987 ../src/gtkconv.c:1620 ../src/gtkrequest.c:275
 msgid "Remove"
 msgstr "Удалить"
 
-#: ../src/gtkblist.c:992 ../src/gtkblist.c:1079 ../src/gtkblist.c:1100
+#: ../src/gtkblist.c:993 ../src/gtkblist.c:1080 ../src/gtkblist.c:1101
 msgid "_Alias..."
 msgstr "_Псевдоним..."
 
-#: ../src/gtkblist.c:994 ../src/gtkblist.c:1081 ../src/gtkblist.c:1102
+#: ../src/gtkblist.c:995 ../src/gtkblist.c:1082 ../src/gtkblist.c:1103
 msgid "_Remove"
 msgstr "_Удалить"
 
-#: ../src/gtkblist.c:1042
+#: ../src/gtkblist.c:1043
 msgid "Add a _Buddy"
 msgstr "Добавить _собеседника"
 
-#: ../src/gtkblist.c:1044
+#: ../src/gtkblist.c:1045
 msgid "Add a C_hat"
 msgstr "Добавить _чат"
 
-#: ../src/gtkblist.c:1047
+#: ../src/gtkblist.c:1048
 msgid "_Delete Group"
 msgstr "_Удалить группу"
 
-#: ../src/gtkblist.c:1049
+#: ../src/gtkblist.c:1050
 msgid "_Rename"
 msgstr "Пере_именовать"
 
 #. join button
-#: ../src/gtkblist.c:1067 ../src/gtkroomlist.c:285 ../src/gtkroomlist.c:441
+#: ../src/gtkblist.c:1068 ../src/gtkroomlist.c:285 ../src/gtkroomlist.c:441
 #: ../src/gtkstock.c:139
 msgid "_Join"
 msgstr "П_рисоединиться"
 
-#: ../src/gtkblist.c:1069
+#: ../src/gtkblist.c:1070
 msgid "Auto-Join"
 msgstr "Присоединяться автоматически"
 
-#: ../src/gtkblist.c:1107 ../src/gtkblist.c:1130
+#: ../src/gtkblist.c:1108 ../src/gtkblist.c:1131
 msgid "_Collapse"
 msgstr "_Свернуть"
 
-#: ../src/gtkblist.c:1135
+#: ../src/gtkblist.c:1136
 msgid "_Expand"
 msgstr "Р_азвернуть"
 
-#: ../src/gtkblist.c:1381 ../src/gtkblist.c:1393 ../src/gtkblist.c:3813
-#: ../src/gtkblist.c:3823
+#: ../src/gtkblist.c:1382 ../src/gtkblist.c:1394 ../src/gtkblist.c:3810
+#: ../src/gtkblist.c:3820
 msgid "/Tools/Mute Sounds"
 msgstr "/Инструменты/Отключить звуки"
 
-#: ../src/gtkblist.c:1856 ../src/gtkconv.c:4209 ../src/gtkpounce.c:426
+#: ../src/gtkblist.c:1854 ../src/gtkconv.c:4175 ../src/gtkpounce.c:418
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
 "Вы не подключены с учётной записью, позволяющей добавить этого собеседника."
 
 #. Buddies menu
-#: ../src/gtkblist.c:2430
+#: ../src/gtkblist.c:2428
 msgid "/_Buddies"
 msgstr "/_Собеседники"
 
-#: ../src/gtkblist.c:2431
+#: ../src/gtkblist.c:2429
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Собеседники/Новое мгновенное сооб_щение..."
 
-#: ../src/gtkblist.c:2432
+#: ../src/gtkblist.c:2430
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Собеседники/Присоединиться к _чату..."
 
-#: ../src/gtkblist.c:2433
+#: ../src/gtkblist.c:2431
 msgid "/Buddies/Get User _Info..."
 msgstr "/Собеседники/Получить пользовательскую _информацию..."
 
-#: ../src/gtkblist.c:2434
+#: ../src/gtkblist.c:2432
 msgid "/Buddies/View User _Log..."
 msgstr "/Собеседники/Просмотреть _журнал пользователя..."
 
-#: ../src/gtkblist.c:2436
+#: ../src/gtkblist.c:2434
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Собеседники/Показывать собеседников _не в сети"
 
-#: ../src/gtkblist.c:2437
+#: ../src/gtkblist.c:2435
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Собеседники/Показывать п_устые группы"
 
-#: ../src/gtkblist.c:2438
+#: ../src/gtkblist.c:2436
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Собеседники/Показывать _подробности о собеседнике"
 
-#: ../src/gtkblist.c:2439
+#: ../src/gtkblist.c:2437
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Собеседники/Показывать _время бездействия"
 
-#: ../src/gtkblist.c:2440
+#: ../src/gtkblist.c:2438
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Собеседники/_Сортировать собеседников"
 
+#: ../src/gtkblist.c:2440
+msgid "/Buddies/_Add Buddy..."
+msgstr "/Собеседники/_Добавить собеседника..."
+
+#: ../src/gtkblist.c:2441
+msgid "/Buddies/Add C_hat..."
+msgstr "/Собеседники/Добавить ч_ат..."
+
 #: ../src/gtkblist.c:2442
-msgid "/Buddies/_Add Buddy..."
-msgstr "/Собеседники/_Добавить собеседника..."
-
-#: ../src/gtkblist.c:2443
-msgid "/Buddies/Add C_hat..."
-msgstr "/Собеседники/Добавить ч_ат..."
+msgid "/Buddies/Add _Group..."
+msgstr "/Собеседники/Добавить _группу..."
 
 #: ../src/gtkblist.c:2444
-msgid "/Buddies/Add _Group..."
-msgstr "/Собеседники/Добавить _группу..."
-
-#: ../src/gtkblist.c:2446
 msgid "/Buddies/_Quit"
 msgstr "/Собеседники/В_ыйти"
 
 #. Accounts menu
-#: ../src/gtkblist.c:2449
+#: ../src/gtkblist.c:2447
 msgid "/_Accounts"
 msgstr "/_Учётные записи"
 
-#: ../src/gtkblist.c:2450 ../src/gtkblist.c:5598
+#: ../src/gtkblist.c:2448 ../src/gtkblist.c:5593
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Учётные записи/Добавить\\/Изменить"
 
 #. Tools
-#: ../src/gtkblist.c:2453
+#: ../src/gtkblist.c:2451
 msgid "/_Tools"
 msgstr "/_Инструменты"
 
-#: ../src/gtkblist.c:2454
+#: ../src/gtkblist.c:2452
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Инструменты/_Слежение за собеседниками"
 
-#: ../src/gtkblist.c:2455
+#: ../src/gtkblist.c:2453
 msgid "/Tools/Plu_gins"
 msgstr "/Инструменты/_Модули"
 
-#: ../src/gtkblist.c:2456
+#: ../src/gtkblist.c:2454
 msgid "/Tools/Pr_eferences"
 msgstr "/Инструменты/_Настройки"
 
+#: ../src/gtkblist.c:2455
+msgid "/Tools/Pr_ivacy"
+msgstr "/Инструменты/К_онфиденциальность"
+
 #: ../src/gtkblist.c:2457
-msgid "/Tools/Pr_ivacy"
-msgstr "/Инструменты/К_онфиденциальность"
-
-#: ../src/gtkblist.c:2459
 msgid "/Tools/_File Transfers"
 msgstr "/Инструменты/Передача _файлов"
 
-#: ../src/gtkblist.c:2460
+#: ../src/gtkblist.c:2458
 msgid "/Tools/R_oom List"
 msgstr "/Инструменты/Список _комнат"
 
+#: ../src/gtkblist.c:2459
+msgid "/Tools/System _Log"
+msgstr "/Инструменты/Системный _журнал"
+
 #: ../src/gtkblist.c:2461
-msgid "/Tools/System _Log"
-msgstr "/Инструменты/Системный _журнал"
-
-#: ../src/gtkblist.c:2463
 msgid "/Tools/Mute _Sounds"
 msgstr "/Инструменты/Отключить _звуки"
 
 #. Help
-#: ../src/gtkblist.c:2466
+#: ../src/gtkblist.c:2464
 msgid "/_Help"
 msgstr "/_Помощь"
 
-#: ../src/gtkblist.c:2467
+#: ../src/gtkblist.c:2465
 msgid "/Help/Online _Help"
 msgstr "/Помощь/Помощь в _сети"
 
-#: ../src/gtkblist.c:2468
+#: ../src/gtkblist.c:2466
 msgid "/Help/_Debug Window"
 msgstr "/Помощь/Окно _отладки"
 
-#: ../src/gtkblist.c:2469
+#: ../src/gtkblist.c:2467
 msgid "/Help/_About"
 msgstr "/Помощь/О _программе"
 
-#: ../src/gtkblist.c:2501 ../src/gtkblist.c:2570
+#: ../src/gtkblist.c:2499 ../src/gtkblist.c:2568
 #, c-format
 msgid ""
 "\n"
@@ -2538,7 +2575,7 @@
 "\n"
 "<b>Учётная запись:</b> %s"
 
-#: ../src/gtkblist.c:2582
+#: ../src/gtkblist.c:2580
 #, c-format
 msgid ""
 "\n"
@@ -2547,7 +2584,7 @@
 "\n"
 "<b>Псевдоним собеседника:</b> %s"
 
-#: ../src/gtkblist.c:2594
+#: ../src/gtkblist.c:2592
 #, c-format
 msgid ""
 "\n"
@@ -2556,7 +2593,7 @@
 "\n"
 "<b>Оригинальный псевдоним:</b> %s"
 
-#: ../src/gtkblist.c:2603
+#: ../src/gtkblist.c:2601
 #, c-format
 msgid ""
 "\n"
@@ -2565,7 +2602,7 @@
 "\n"
 "<b>В сети:</b> %s"
 
-#: ../src/gtkblist.c:2614
+#: ../src/gtkblist.c:2612
 #, c-format
 msgid ""
 "\n"
@@ -2574,7 +2611,7 @@
 "\n"
 "<b>Бездействует:</b> %s"
 
-#: ../src/gtkblist.c:2649
+#: ../src/gtkblist.c:2647
 #, c-format
 msgid ""
 "\n"
@@ -2583,7 +2620,7 @@
 "\n"
 "<b>Последнее появление:</b> %s назад"
 
-#: ../src/gtkblist.c:2658
+#: ../src/gtkblist.c:2656
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2591,143 +2628,137 @@
 "\n"
 "<b>Статус:</b> Не в сети"
 
+#: ../src/gtkblist.c:2667
+msgid ""
+"\n"
+"<b>Description:</b> Spooky"
+msgstr ""
+
 #: ../src/gtkblist.c:2669
 msgid ""
 "\n"
-"<b>Description:</b> Spooky"
+"<b>Status:</b> Awesome"
 msgstr ""
 
 #: ../src/gtkblist.c:2671
 msgid ""
 "\n"
-"<b>Status:</b> Awesome"
-msgstr ""
-
-#: ../src/gtkblist.c:2673
-msgid ""
-"\n"
 "<b>Status:</b> Rockin'"
 msgstr ""
 
-#: ../src/gtkblist.c:2962
+#: ../src/gtkblist.c:2960
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Бездействует %dч %02dм"
 
-#: ../src/gtkblist.c:2964
+#: ../src/gtkblist.c:2962
 #, c-format
 msgid "Idle %dm"
 msgstr "Бездействует %dм"
 
 #. Idle stuff
-#: ../src/gtkblist.c:2967 ../src/gtkprefs.c:1745
-#: ../src/protocols/bonjour/bonjour.c:333 ../src/protocols/msn/msn.c:552
-#: ../src/protocols/msn/state.c:32 ../src/protocols/novell/novell.c:2854
-#: ../src/protocols/oscar/oscar.c:5273 ../src/protocols/yahoo/yahoo.c:2731
+#: ../src/gtkblist.c:2965 ../src/gtkprefs.c:1760
+#: ../src/protocols/bonjour/bonjour.c:333 ../src/protocols/msn/msn.c:550
+#: ../src/protocols/msn/state.c:32 ../src/protocols/novell/novell.c:2852
+#: ../src/protocols/oscar/oscar.c:2844 ../src/protocols/yahoo/yahoo.c:2727
 #: ../src/protocols/yahoo/yahoo_profile.c:691
 msgid "Idle"
 msgstr "Бездействие"
 
-#: ../src/gtkblist.c:3099
+#: ../src/gtkblist.c:3097
 msgid "/Buddies/New Instant Message..."
 msgstr "/Собеседники/Новое мгновенное сообщение..."
 
-#: ../src/gtkblist.c:3100 ../src/gtkblist.c:3133
+#: ../src/gtkblist.c:3098 ../src/gtkblist.c:3131
 msgid "/Buddies/Join a Chat..."
 msgstr "/Собеседники/Присоединиться к чату..."
 
-#: ../src/gtkblist.c:3101
+#: ../src/gtkblist.c:3099
 msgid "/Buddies/Get User Info..."
 msgstr "/Собеседники/Получить пользовательскую информацию..."
 
+#: ../src/gtkblist.c:3100
+msgid "/Buddies/Add Buddy..."
+msgstr "/Собеседники/Добавить собеседника..."
+
+#: ../src/gtkblist.c:3101 ../src/gtkblist.c:3134
+msgid "/Buddies/Add Chat..."
+msgstr "/Собеседники/Добавить чат..."
+
 #: ../src/gtkblist.c:3102
-msgid "/Buddies/Add Buddy..."
-msgstr "/Собеседники/Добавить собеседника..."
-
-#: ../src/gtkblist.c:3103 ../src/gtkblist.c:3136
-msgid "/Buddies/Add Chat..."
-msgstr "/Собеседники/Добавить чат..."
-
-#: ../src/gtkblist.c:3104
 msgid "/Buddies/Add Group..."
 msgstr "/Собеседники/Добавить группу..."
 
-#: ../src/gtkblist.c:3139
+#: ../src/gtkblist.c:3137
 msgid "/Tools/Buddy Pounces"
 msgstr "/Инструменты/Слежение за собеседниками"
 
-#: ../src/gtkblist.c:3142
+#: ../src/gtkblist.c:3140
 msgid "/Tools/Privacy"
 msgstr "/Инструменты/Конфиденциальность"
 
-#: ../src/gtkblist.c:3145
+#: ../src/gtkblist.c:3143
 msgid "/Tools/Room List"
 msgstr "/Инструменты/Список комнат"
 
-#: ../src/gtkblist.c:3339
+#: ../src/gtkblist.c:3337
 msgid "Manually"
 msgstr "Вручную"
 
+#: ../src/gtkblist.c:3339
+msgid "Alphabetically"
+msgstr "По алфавиту"
+
+#: ../src/gtkblist.c:3340
+msgid "By status"
+msgstr "По статусу"
+
 #: ../src/gtkblist.c:3341
-msgid "Alphabetically"
-msgstr "По алфавиту"
-
-#: ../src/gtkblist.c:3342
-msgid "By status"
-msgstr "По статусу"
-
-#: ../src/gtkblist.c:3343
 msgid "By log size"
 msgstr "По размеру журнала"
 
-#: ../src/gtkblist.c:3538 ../src/gtkconn.c:196
+#: ../src/gtkblist.c:3542 ../src/gtkconn.c:184
 #, c-format
 msgid "%s disconnected"
 msgstr "Соединение с %s разорвано"
 
-#: ../src/gtkblist.c:3554 ../src/protocols/sametime/sametime.c:3630
+#: ../src/gtkblist.c:3551 ../src/protocols/sametime/sametime.c:3622
 msgid "Connect"
 msgstr "Установить соединение"
 
-#: ../src/gtkblist.c:3554 ../src/gtkblist.c:5697
-msgid "Enable Account"
-msgstr "Включить учётную запись"
-
-#: ../src/gtkblist.c:3575
+#: ../src/gtkblist.c:3551
+msgid "Re-enable Account"
+msgstr "Повторно включить учётную запись"
+
+#: ../src/gtkblist.c:3572
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">Соединение с %s разорвано: %s</span>"
 
-#: ../src/gtkblist.c:3702
+#: ../src/gtkblist.c:3699
 msgid "/Accounts"
 msgstr "/Учётные записи"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../src/gtkblist.c:3807
+#: ../src/gtkblist.c:3804
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Собеседники/Показывать собеседников не в сети"
 
-#: ../src/gtkblist.c:3810
+#: ../src/gtkblist.c:3807
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Собеседники/Показывать пустые группы"
 
-#: ../src/gtkblist.c:3816
+#: ../src/gtkblist.c:3813
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Собеседники/Показывать подробности о собеседнике"
 
-#: ../src/gtkblist.c:3819
+#: ../src/gtkblist.c:3816
 msgid "/Buddies/Show Idle Times"
 msgstr "/Собеседники/Показывать время бездействия"
 
-#: ../src/gtkblist.c:4531 ../src/protocols/silc/buddy.c:736
-#: ../src/protocols/silc/buddy.c:1030 ../src/protocols/silc/buddy.c:1075
-#: ../src/protocols/silc/buddy.c:1174 ../src/protocols/yahoo/yahoo.c:2978
-msgid "Add Buddy"
-msgstr "Добавить собеседника"
-
-#: ../src/gtkblist.c:4555
+#: ../src/gtkblist.c:4552
 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. "
@@ -2738,30 +2769,26 @@
 "собеседника. Псевдоним будет показываться вместо идентификатора "
 "пользователя, когда это возможно.\n"
 
-#: ../src/gtkblist.c:4577
-msgid "Screen Name:"
-msgstr "Идентификатор пользователя:"
-
 #. Set up stuff for the account box
-#: ../src/gtkblist.c:4625 ../src/gtkblist.c:4944
+#: ../src/gtkblist.c:4622 ../src/gtkblist.c:4941
 msgid "Account:"
 msgstr "Учётная запись:"
 
-#: ../src/gtkblist.c:4877
+#: ../src/gtkblist.c:4874
 msgid "This protocol does not support chat rooms."
 msgstr "Этот протокол не поддерживает чаты."
 
-#: ../src/gtkblist.c:4893
+#: ../src/gtkblist.c:4890
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "Вы не подключены по протоколам, имеющим поддержку чатов."
 
-#: ../src/gtkblist.c:4910
+#: ../src/gtkblist.c:4907
 msgid "Add Chat"
 msgstr "Добавить чат"
 
-#: ../src/gtkblist.c:4934
+#: ../src/gtkblist.c:4931
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2769,36 +2796,40 @@
 "Введите псевдоним и соответствующую информацию о чате, который вы хотели бы "
 "добавить в список собеседников.\n"
 
-#: ../src/gtkblist.c:5016 ../src/protocols/sametime/sametime.c:5319
-#: ../src/protocols/sametime/sametime.c:5406
+#: ../src/gtkblist.c:5013 ../src/protocols/sametime/sametime.c:5311
+#: ../src/protocols/sametime/sametime.c:5398
 msgid "Add Group"
 msgstr "Добавить группу"
 
-#: ../src/gtkblist.c:5017
+#: ../src/gtkblist.c:5014
 msgid "Please enter the name of the group to be added."
 msgstr "Введите имя добавляемой группы."
 
-#: ../src/gtkblist.c:5638
+#: ../src/gtkblist.c:5633
 msgid "_Edit Account"
 msgstr "_Изменить учётную запись"
 
-#: ../src/gtkblist.c:5671 ../src/gtkblist.c:5677
+#: ../src/gtkblist.c:5666 ../src/gtkblist.c:5672
 msgid "No actions available"
 msgstr "Нет доступных действий"
 
-#: ../src/gtkblist.c:5685
+#: ../src/gtkblist.c:5680
 msgid "_Disable"
 msgstr "_Выключить"
 
-#: ../src/gtkblist.c:5750
+#: ../src/gtkblist.c:5692
+msgid "Enable Account"
+msgstr "Включить учётную запись"
+
+#: ../src/gtkblist.c:5745
 msgid "/Tools"
 msgstr "/Инструменты"
 
-#: ../src/gtkblist.c:5836
+#: ../src/gtkblist.c:5831
 msgid "/Buddies/Sort Buddies"
 msgstr "/Собеседники/Сортировать собеседников"
 
-#: ../src/gtkconn.c:197
+#: ../src/gtkconn.c:185
 #, c-format
 msgid ""
 "%s was disconnected due to an error: %s\n"
@@ -2822,48 +2853,48 @@
 "Используйте \"/help &lt;команда&gt;\" для помощи по конкретной команде.\n"
 "Следующие команды доступны в этом контексте:\n"
 
-#: ../src/gtkconv.c:484
+#: ../src/gtkconv.c:482
 msgid "No such command."
 msgstr "Нет такой команды."
 
-#: ../src/gtkconv.c:491
+#: ../src/gtkconv.c:489
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Синтаксическая ошибка:  Вы ввели неверное количество аргументов для этой "
 "команды."
 
-#: ../src/gtkconv.c:496
+#: ../src/gtkconv.c:494
 msgid "Your command failed for an unknown reason."
 msgstr "Ваша команда не была выполнена по неизвестной причине."
 
-#: ../src/gtkconv.c:503
+#: ../src/gtkconv.c:501
 msgid "That command only works in chats, not IMs."
 msgstr "Эта команда работает только в чатах, не в беседах."
 
-#: ../src/gtkconv.c:506
+#: ../src/gtkconv.c:504
 msgid "That command only works in IMs, not chats."
 msgstr "Эта команда работает только в беседах, не в чатах."
 
-#: ../src/gtkconv.c:510
+#: ../src/gtkconv.c:508
 msgid "That command doesn't work on this protocol."
 msgstr "Эта команда не работает с этим протоколом."
 
-#: ../src/gtkconv.c:744 ../src/gtkconv.c:770
+#: ../src/gtkconv.c:742 ../src/gtkconv.c:768
 msgid "That buddy is not on the same protocol as this chat."
 msgstr ""
 
-#: ../src/gtkconv.c:764
+#: ../src/gtkconv.c:762
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "Вы не подключены с учётной записью, позволяющей пригласить этого собеседника."
 
-#: ../src/gtkconv.c:817
+#: ../src/gtkconv.c:815
 msgid "Invite Buddy Into Chat Room"
 msgstr "Пригласить собеседника в чат"
 
 #. Put our happy label in it.
-#: ../src/gtkconv.c:847
+#: ../src/gtkconv.c:845
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2871,320 +2902,328 @@
 "Введите имя пользователя, которого вы хотите пригласить, вместе с "
 "необязательным текстом приглашения."
 
-#: ../src/gtkconv.c:868
+#: ../src/gtkconv.c:866
 msgid "_Buddy:"
 msgstr "_Собеседник:"
 
-#: ../src/gtkconv.c:888 ../src/gtksavedstatuses.c:1108
-#: ../src/gtksavedstatuses.c:1444
+#: ../src/gtkconv.c:886 ../src/gtksavedstatuses.c:1107
+#: ../src/gtksavedstatuses.c:1443
 msgid "_Message:"
 msgstr "Сооб_щение:"
 
-#: ../src/gtkconv.c:945 ../src/gtkconv.c:2392 ../src/gtkdebug.c:217
-#: ../src/gtkft.c:488
+#: ../src/gtkconv.c:943 ../src/gtkconv.c:2359 ../src/gtkdebug.c:217
+#: ../src/gtkft.c:490
 msgid "Unable to open file."
 msgstr "Не удаётся открыть файл."
 
-#: ../src/gtkconv.c:951
+#: ../src/gtkconv.c:949
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Беседа с %s</h1>\n"
 
-#: ../src/gtkconv.c:975
+#: ../src/gtkconv.c:973
 msgid "Save Conversation"
 msgstr "Сохранить беседу"
 
-#: ../src/gtkconv.c:1096 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
+#: ../src/gtkconv.c:1094 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
 msgid "Find"
 msgstr "Найти"
 
-#: ../src/gtkconv.c:1122 ../src/gtkdebug.c:193
+#: ../src/gtkconv.c:1120 ../src/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "_Искать:"
 
-#: ../src/gtkconv.c:1293
+#: ../src/gtkconv.c:1291
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Ведение журнала начато. Последующие сообщения в этой беседе будут записаны."
 
-#: ../src/gtkconv.c:1301
+#: ../src/gtkconv.c:1299
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "Ведение журнала остановлено. Последующие сообщения в этой беседе не будут "
 "записаны."
 
-#: ../src/gtkconv.c:1562
+#: ../src/gtkconv.c:1560
 msgid "IM"
 msgstr "Сообщение"
 
-#: ../src/gtkconv.c:1573 ../src/protocols/oscar/oscar.c:714
+#: ../src/gtkconv.c:1571 ../src/protocols/oscar/oscar.c:640
 msgid "Send File"
 msgstr "Отправить файл"
 
-#: ../src/gtkconv.c:1588
+#: ../src/gtkconv.c:1586
 msgid "Un-Ignore"
 msgstr "Не игнорировать"
 
-#: ../src/gtkconv.c:1591
+#: ../src/gtkconv.c:1589
 msgid "Ignore"
 msgstr "Игнорировать"
 
-#: ../src/gtkconv.c:1601
+#: ../src/gtkconv.c:1599
 msgid "Info"
 msgstr "Информация"
 
-#: ../src/gtkconv.c:1611
+#: ../src/gtkconv.c:1609
 msgid "Get Away Message"
 msgstr "Получить сообщение об отсутствии"
 
-#: ../src/gtkconv.c:1634
+#: ../src/gtkconv.c:1632
 msgid "Last said"
 msgstr "Последнее сказанное"
 
-#: ../src/gtkconv.c:2400
+#: ../src/gtkconv.c:2367
 msgid "Unable to save icon file to disk."
 msgstr "Не удаётся сохранить файл значка на диск."
 
-#: ../src/gtkconv.c:2424
+#: ../src/gtkconv.c:2391
 msgid "Save Icon"
 msgstr "Сохранить значок"
 
-#: ../src/gtkconv.c:2473
+#: ../src/gtkconv.c:2440
 msgid "Animate"
 msgstr "Анимировать"
 
-#: ../src/gtkconv.c:2478
+#: ../src/gtkconv.c:2445
 msgid "Hide Icon"
 msgstr "Скрыть значок"
 
-#: ../src/gtkconv.c:2484
+#: ../src/gtkconv.c:2451
 msgid "Save Icon As..."
 msgstr "Сохранить значок как..."
 
 #. Conversation menu
-#: ../src/gtkconv.c:2625
+#: ../src/gtkconv.c:2591
 msgid "/_Conversation"
 msgstr "/_Беседа"
 
-#: ../src/gtkconv.c:2627
+#: ../src/gtkconv.c:2593
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Беседа/Новое мгновенное сооб_щение..."
 
-#: ../src/gtkconv.c:2632
+#: ../src/gtkconv.c:2598
 msgid "/Conversation/_Find..."
 msgstr "/Беседа/_Найти..."
 
-#: ../src/gtkconv.c:2634
+#: ../src/gtkconv.c:2600
 msgid "/Conversation/View _Log"
 msgstr "/Беседа/Просмотреть _журнал"
 
-#: ../src/gtkconv.c:2635
+#: ../src/gtkconv.c:2601
 msgid "/Conversation/_Save As..."
 msgstr "/Беседа/Со_хранить как..."
 
-#: ../src/gtkconv.c:2637
+#: ../src/gtkconv.c:2603
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Беседа/О_чистить"
 
-#: ../src/gtkconv.c:2641
+#: ../src/gtkconv.c:2607
 msgid "/Conversation/Se_nd File..."
 msgstr "/Беседа/Отправить _файл..."
 
-#: ../src/gtkconv.c:2642
+#: ../src/gtkconv.c:2608
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Беседа/Добавить п_равило..."
 
-#: ../src/gtkconv.c:2644
+#: ../src/gtkconv.c:2610
 msgid "/Conversation/_Get Info"
 msgstr "/Беседа/Получить _информацию"
 
-#: ../src/gtkconv.c:2646
+#: ../src/gtkconv.c:2612
 msgid "/Conversation/In_vite..."
 msgstr "/Беседа/Приг_ласить..."
 
-#: ../src/gtkconv.c:2651
+#: ../src/gtkconv.c:2617
 msgid "/Conversation/Al_ias..."
 msgstr "/Беседа/_Псевдоним..."
 
-#: ../src/gtkconv.c:2653
+#: ../src/gtkconv.c:2619
 msgid "/Conversation/_Block..."
 msgstr "/Беседа/_Блокировать..."
 
-#: ../src/gtkconv.c:2655
+#: ../src/gtkconv.c:2621
 msgid "/Conversation/_Add..."
 msgstr "/Беседа/_Добавить..."
 
-#: ../src/gtkconv.c:2657
+#: ../src/gtkconv.c:2623
 msgid "/Conversation/_Remove..."
 msgstr "/Беседа/_Удалить..."
 
-#: ../src/gtkconv.c:2662
+#: ../src/gtkconv.c:2628
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Беседа/Вставить _ссылку..."
 
-#: ../src/gtkconv.c:2664
+#: ../src/gtkconv.c:2630
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Беседа/Вставить из_ображение..."
 
-#: ../src/gtkconv.c:2669
+#: ../src/gtkconv.c:2635
 msgid "/Conversation/_Close"
 msgstr "/Беседа/_Закрыть"
 
 #. Options
-#: ../src/gtkconv.c:2673
+#: ../src/gtkconv.c:2639
 msgid "/_Options"
 msgstr "/_Параметры"
 
-#: ../src/gtkconv.c:2674
+#: ../src/gtkconv.c:2640
 msgid "/Options/Enable _Logging"
 msgstr "/Параметры/Вести _журнал"
 
-#: ../src/gtkconv.c:2675
+#: ../src/gtkconv.c:2641
 msgid "/Options/Enable _Sounds"
 msgstr "/Параметры/Воспроизводить _звуки"
 
-#: ../src/gtkconv.c:2676
+#: ../src/gtkconv.c:2642
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Параметры/Показывать з_начок собеседника"
 
-#: ../src/gtkconv.c:2678
+#: ../src/gtkconv.c:2644
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Параметры/Показывать _панели форматирования"
 
-#: ../src/gtkconv.c:2679
+#: ../src/gtkconv.c:2645
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Параметры/Показывать _время сообщений"
 
-#: ../src/gtkconv.c:2771
+#: ../src/gtkconv.c:2737
 msgid "/Conversation/View Log"
 msgstr "/Беседа/Просмотреть журнал"
 
-#: ../src/gtkconv.c:2777
+#: ../src/gtkconv.c:2743
 msgid "/Conversation/Send File..."
 msgstr "/Беседа/Отправить файл..."
 
-#: ../src/gtkconv.c:2781
+#: ../src/gtkconv.c:2747
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Беседа/Добавить правило..."
 
-#: ../src/gtkconv.c:2787
+#: ../src/gtkconv.c:2753
 msgid "/Conversation/Get Info"
 msgstr "/Беседа/Получить информацию"
 
-#: ../src/gtkconv.c:2791
+#: ../src/gtkconv.c:2757
 msgid "/Conversation/Invite..."
 msgstr "/Беседа/Пригласить..."
 
-#: ../src/gtkconv.c:2797
+#: ../src/gtkconv.c:2763
 msgid "/Conversation/Alias..."
 msgstr "/Беседа/Псевдоним..."
 
-#: ../src/gtkconv.c:2801
+#: ../src/gtkconv.c:2767
 msgid "/Conversation/Block..."
 msgstr "/Беседа/Блокировать..."
 
-#: ../src/gtkconv.c:2805
+#: ../src/gtkconv.c:2771
 msgid "/Conversation/Add..."
 msgstr "/Беседа/Добавить..."
 
-#: ../src/gtkconv.c:2809
+#: ../src/gtkconv.c:2775
 msgid "/Conversation/Remove..."
 msgstr "/Беседа/Удалить..."
 
-#: ../src/gtkconv.c:2815
+#: ../src/gtkconv.c:2781
 msgid "/Conversation/Insert Link..."
 msgstr "/Беседа/Вставить ссылку..."
 
-#: ../src/gtkconv.c:2819
+#: ../src/gtkconv.c:2785
 msgid "/Conversation/Insert Image..."
 msgstr "/Беседа/Вставить изображение..."
 
-#: ../src/gtkconv.c:2825
+#: ../src/gtkconv.c:2791
 msgid "/Options/Enable Logging"
 msgstr "/Параметры/Вести журнал"
 
-#: ../src/gtkconv.c:2828
+#: ../src/gtkconv.c:2794
 msgid "/Options/Enable Sounds"
 msgstr "/Параметры/Воспроизводить звуки"
 
-#: ../src/gtkconv.c:2841
+#: ../src/gtkconv.c:2807
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Параметры/Показывать панели форматирования"
 
-#: ../src/gtkconv.c:2844
+#: ../src/gtkconv.c:2810
 msgid "/Options/Show Timestamps"
 msgstr "/Параметры/Показывать время сообщений"
 
-#: ../src/gtkconv.c:2847
+#: ../src/gtkconv.c:2813
 msgid "/Options/Show Buddy Icon"
 msgstr "/Параметры/Показывать значок собеседника"
 
-#: ../src/gtkconv.c:2927
+#: ../src/gtkconv.c:2893
 msgid "User is typing..."
 msgstr "Пользователь пишет..."
 
-#: ../src/gtkconv.c:2930
+#: ../src/gtkconv.c:2896
 msgid "User has typed something and stopped"
 msgstr "Пользователь что-то написал и остановился"
 
 #. Build the Send To menu
-#: ../src/gtkconv.c:3113
+#: ../src/gtkconv.c:3079
 msgid "_Send To"
 msgstr "_Адресат"
 
-#: ../src/gtkconv.c:3765
+#: ../src/gtkconv.c:3731
 msgid "_Send"
 msgstr "_Отправить"
 
-#: ../src/gtkconv.c:3820 ../src/protocols/sametime/sametime.c:3572
+#: ../src/gtkconv.c:3786 ../src/protocols/sametime/sametime.c:3564
 msgid "Topic:"
 msgstr "Тема:"
 
 #. Setup the label telling how many people are in the room.
-#: ../src/gtkconv.c:3872
+#: ../src/gtkconv.c:3838
 msgid "0 people in room"
 msgstr "0 пользователей в комнате"
 
-#: ../src/gtkconv.c:3951
+#: ../src/gtkconv.c:3917
 msgid "IM the user"
 msgstr "Отправить пользователю сообщение"
 
-#: ../src/gtkconv.c:3964
+#: ../src/gtkconv.c:3930
 msgid "Ignore the user"
 msgstr "Игнорировать пользователя"
 
-#: ../src/gtkconv.c:3976
+#: ../src/gtkconv.c:3942
 msgid "Get the user's information"
 msgstr "Получить информацию пользователя"
 
-#: ../src/gtkconv.c:4958 ../src/gtkconv.c:5067
+#: ../src/gtkconv.c:4928 ../src/gtkconv.c:5037
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d пользователь в комнате"
 msgstr[1] "%d пользователей в комнате"
 
-#: ../src/gtkconv.c:5624 ../src/gtkstatusbox.c:366
+#: ../src/gtkconv.c:5594 ../src/gtkstatusbox.c:366
 msgid "Typing"
 msgstr "Пишет"
 
-#: ../src/gtkconv.c:5647 ../src/gtkprefs.c:1678
-msgid "Event"
-msgstr "Событие"
-
-#: ../src/gtkconv.c:6549
+#: ../src/gtkconv.c:5600
+msgid "Stopped Typing"
+msgstr "Перестал писать"
+
+#: ../src/gtkconv.c:5605
+msgid "Nick Said"
+msgstr "Произнесено имя"
+
+#: ../src/gtkconv.c:5615
+msgid "New Event"
+msgstr "Новое событие"
+
+#: ../src/gtkconv.c:6505
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr ""
 
-#: ../src/gtkconv.c:6552
+#: ../src/gtkconv.c:6508
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;действие&gt;:  Отправить действие в стиле IRC собеседнику или в чат."
 
-#: ../src/gtkconv.c:6555
+#: ../src/gtkconv.c:6511
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -3192,59 +3231,59 @@
 "debug &lt;параметр&gt;:  Отправить различную отладочную информацию в текущую "
 "беседу."
 
-#: ../src/gtkconv.c:6558
+#: ../src/gtkconv.c:6514
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Очистить окно беседы."
 
-#: ../src/gtkconv.c:6561
+#: ../src/gtkconv.c:6517
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;команда&gt;:  Получить помощь по конкретной команде."
 
-#: ../src/gtkconv.c:6720
+#: ../src/gtkconv.c:6676
 msgid "Confirm close"
 msgstr "Подтвердить закрытие"
 
-#: ../src/gtkconv.c:6752
+#: ../src/gtkconv.c:6708
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Есть непрочитанные сообщения. Вы действительно хотите закрыть окно?"
 
-#: ../src/gtkconv.c:7274
+#: ../src/gtkconv.c:7230
 msgid "Close other tabs"
 msgstr "Закрыть другие вкладки"
 
-#: ../src/gtkconv.c:7280
+#: ../src/gtkconv.c:7236
 msgid "Close all tabs"
 msgstr "Закрыть все вкладки"
 
-#: ../src/gtkconv.c:7288
+#: ../src/gtkconv.c:7244
 msgid "Detach this tab"
 msgstr "Отделить эту вкладку"
 
-#: ../src/gtkconv.c:7294
+#: ../src/gtkconv.c:7250
 msgid "Close this tab"
 msgstr "Закрыть эту вкладку"
 
-#: ../src/gtkconv.c:7556
+#: ../src/gtkconv.c:7510
 msgid "Close conversation"
 msgstr "Закрыть беседу"
 
-#: ../src/gtkconv.c:8020
+#: ../src/gtkconv.c:7974
 msgid "Last created window"
 msgstr "Последнее созданное окно"
 
-#: ../src/gtkconv.c:8022
+#: ../src/gtkconv.c:7976
 msgid "Separate IM and Chat windows"
 msgstr "Отдельные окна бесед и чатов"
 
-#: ../src/gtkconv.c:8024 ../src/gtkprefs.c:1243
+#: ../src/gtkconv.c:7978 ../src/gtkprefs.c:1258
 msgid "New window"
 msgstr "Новое окно"
 
-#: ../src/gtkconv.c:8026
+#: ../src/gtkconv.c:7980
 msgid "By group"
 msgstr "По группе"
 
-#: ../src/gtkconv.c:8028
+#: ../src/gtkconv.c:7982
 msgid "By account"
 msgstr "По учётной записи"
 
@@ -3281,11 +3320,10 @@
 msgstr "Фильтр"
 
 #: ../src/gtkdebug.c:743
-#, fuzzy
 msgid "Right click for more options."
-msgstr "Щёлкните правой кнопкой мыши для"
-
-#: ../src/gtkdialogs.c:61 ../src/gtkdialogs.c:103
+msgstr "Щёлкните правой кнопкой мыши для доступа к другим параметрам."
+
+#: ../src/gtkdialogs.c:61 ../src/gtkdialogs.c:104
 msgid "lead developer"
 msgstr "ведущий разработчик"
 
@@ -3317,206 +3355,220 @@
 msgid "libfaim maintainer"
 msgstr "сопровождающий libfaim"
 
-#: ../src/gtkdialogs.c:100
+#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
+#: ../src/gtkdialogs.c:101
 msgid "hacker and designated driver [lazy bum]"
 msgstr ""
 
-#: ../src/gtkdialogs.c:101
+#: ../src/gtkdialogs.c:102
 msgid "Jabber developer"
 msgstr "Jabber-разработчик"
 
-#: ../src/gtkdialogs.c:102
+#: ../src/gtkdialogs.c:103
 msgid "original author"
 msgstr "оригинальный автор"
 
-#: ../src/gtkdialogs.c:109 ../src/gtkdialogs.c:110 ../src/gtkdialogs.c:164
+#: ../src/gtkdialogs.c:110 ../src/gtkdialogs.c:111 ../src/gtkdialogs.c:174
 msgid "Bulgarian"
 msgstr "Болгарский"
 
-#: ../src/gtkdialogs.c:111 ../src/gtkdialogs.c:112
+#: ../src/gtkdialogs.c:112 ../src/gtkdialogs.c:113
 msgid "Bengali"
 msgstr "Бенгальский"
 
-#: ../src/gtkdialogs.c:113
+#: ../src/gtkdialogs.c:114
 msgid "Bosnian"
 msgstr "Боснийский"
 
-#: ../src/gtkdialogs.c:114 ../src/gtkdialogs.c:165 ../src/gtkdialogs.c:166
+#: ../src/gtkdialogs.c:115 ../src/gtkdialogs.c:175 ../src/gtkdialogs.c:176
 msgid "Catalan"
 msgstr "Каталонский"
 
-#: ../src/gtkdialogs.c:115 ../src/gtkdialogs.c:167
+#: ../src/gtkdialogs.c:116 ../src/gtkdialogs.c:117
+#, fuzzy
+msgid "Valencian-Catalan"
+msgstr "Валенсийский"
+
+#: ../src/gtkdialogs.c:118 ../src/gtkdialogs.c:177
 msgid "Czech"
 msgstr "Чешский"
 
-#: ../src/gtkdialogs.c:116
+#: ../src/gtkdialogs.c:119
 msgid "Danish"
 msgstr "Датский"
 
-#: ../src/gtkdialogs.c:117 ../src/gtkdialogs.c:168
+#: ../src/gtkdialogs.c:120 ../src/gtkdialogs.c:121 ../src/gtkdialogs.c:178
 msgid "German"
 msgstr "Немецкий"
 
-#: ../src/gtkdialogs.c:118 ../src/gtkdialogs.c:119
+#: ../src/gtkdialogs.c:122 ../src/gtkdialogs.c:123
 msgid "Greek"
 msgstr "Греческий"
 
-#: ../src/gtkdialogs.c:120
+#: ../src/gtkdialogs.c:124
 msgid "Australian English"
 msgstr "Австралийский английский"
 
-#: ../src/gtkdialogs.c:121
+#: ../src/gtkdialogs.c:125
 msgid "Canadian English"
 msgstr "Канадский английский"
 
-#: ../src/gtkdialogs.c:122
+#: ../src/gtkdialogs.c:126
 msgid "British English"
 msgstr "Британский английский"
 
-#: ../src/gtkdialogs.c:123 ../src/gtkdialogs.c:169 ../src/gtkdialogs.c:170
-#: ../src/gtkdialogs.c:171 ../src/gtkdialogs.c:172
+#: ../src/gtkdialogs.c:127 ../src/gtkdialogs.c:179 ../src/gtkdialogs.c:180
+#: ../src/gtkdialogs.c:181 ../src/gtkdialogs.c:182
 msgid "Spanish"
 msgstr "Испанский"
 
-#: ../src/gtkdialogs.c:124 ../src/gtkdialogs.c:125
+#: ../src/gtkdialogs.c:128 ../src/gtkdialogs.c:129
+msgid "Euskera(Basque)"
+msgstr ""
+
+#: ../src/gtkdialogs.c:130 ../src/gtkdialogs.c:131
 msgid "Persian"
 msgstr "Персидский"
 
-#: ../src/gtkdialogs.c:126 ../src/gtkdialogs.c:173 ../src/gtkdialogs.c:174
+#: ../src/gtkdialogs.c:132 ../src/gtkdialogs.c:183 ../src/gtkdialogs.c:184
 msgid "Finnish"
 msgstr "Финский"
 
-#: ../src/gtkdialogs.c:127 ../src/gtkdialogs.c:175 ../src/gtkdialogs.c:176
-#: ../src/gtkdialogs.c:177 ../src/gtkdialogs.c:178
+#: ../src/gtkdialogs.c:133 ../src/gtkdialogs.c:185 ../src/gtkdialogs.c:186
+#: ../src/gtkdialogs.c:187 ../src/gtkdialogs.c:188
 msgid "French"
 msgstr "Французский"
 
-#: ../src/gtkdialogs.c:128
+#: ../src/gtkdialogs.c:134
+msgid "Galician"
+msgstr "Галисийский"
+
+#: ../src/gtkdialogs.c:135 ../src/gtkdialogs.c:189
 msgid "Hebrew"
 msgstr "Иврит"
 
-#: ../src/gtkdialogs.c:129
+#: ../src/gtkdialogs.c:136
 msgid "Hindi"
 msgstr "Хинди"
 
-#: ../src/gtkdialogs.c:130
+#: ../src/gtkdialogs.c:137
 msgid "Hungarian"
 msgstr "Венгерский"
 
-#: ../src/gtkdialogs.c:131 ../src/gtkdialogs.c:179
+#: ../src/gtkdialogs.c:138 ../src/gtkdialogs.c:190
 msgid "Italian"
 msgstr "Итальянский"
 
-#: ../src/gtkdialogs.c:132 ../src/gtkdialogs.c:180 ../src/gtkdialogs.c:181
-#: ../src/gtkdialogs.c:182
+#: ../src/gtkdialogs.c:139 ../src/gtkdialogs.c:191 ../src/gtkdialogs.c:192
+#: ../src/gtkdialogs.c:193
 msgid "Japanese"
 msgstr "Японский"
 
-#: ../src/gtkdialogs.c:133 ../src/gtkdialogs.c:183
+#: ../src/gtkdialogs.c:140 ../src/gtkdialogs.c:194
 msgid "Georgian"
 msgstr "Грузинский"
 
-#: ../src/gtkdialogs.c:134 ../src/gtkdialogs.c:184
+#: ../src/gtkdialogs.c:141 ../src/gtkdialogs.c:195
 msgid "Korean"
 msgstr "Корейский"
 
-#: ../src/gtkdialogs.c:135
+#: ../src/gtkdialogs.c:142 ../src/gtkdialogs.c:143 ../src/gtkdialogs.c:144
 msgid "Kurdish"
 msgstr "Курдский"
 
-#: ../src/gtkdialogs.c:136 ../src/gtkdialogs.c:185 ../src/gtkdialogs.c:186
+#: ../src/gtkdialogs.c:145 ../src/gtkdialogs.c:196 ../src/gtkdialogs.c:197
 msgid "Lithuanian"
 msgstr "Литовский"
 
-#: ../src/gtkdialogs.c:137
+#: ../src/gtkdialogs.c:146
 msgid "Macedonian"
 msgstr "Македонский"
 
-#: ../src/gtkdialogs.c:138
+#: ../src/gtkdialogs.c:147
 msgid "Dutch, Flemish"
 msgstr "Нидерландский, фламандский"
 
-#: ../src/gtkdialogs.c:139
+#: ../src/gtkdialogs.c:148
 msgid "Norwegian"
 msgstr "Норвежский"
 
-#: ../src/gtkdialogs.c:140 ../src/gtkdialogs.c:141 ../src/gtkdialogs.c:187
+#: ../src/gtkdialogs.c:149 ../src/gtkdialogs.c:150 ../src/gtkdialogs.c:198
 msgid "Polish"
 msgstr "Польский"
 
-#: ../src/gtkdialogs.c:142
+#: ../src/gtkdialogs.c:151
 msgid "Portuguese"
 msgstr "Португальский"
 
-#: ../src/gtkdialogs.c:143
+#: ../src/gtkdialogs.c:152
 msgid "Portuguese-Brazil"
 msgstr "Португальский-бразильский"
 
-#: ../src/gtkdialogs.c:144
+#: ../src/gtkdialogs.c:153
 msgid "Romanian"
 msgstr "Румынский"
 
-#: ../src/gtkdialogs.c:145 ../src/gtkdialogs.c:188 ../src/gtkdialogs.c:189
+#: ../src/gtkdialogs.c:154 ../src/gtkdialogs.c:199 ../src/gtkdialogs.c:200
 msgid "Russian"
 msgstr "Русский"
 
-#: ../src/gtkdialogs.c:146 ../src/gtkdialogs.c:147
+#: ../src/gtkdialogs.c:155 ../src/gtkdialogs.c:156
 msgid "Serbian"
 msgstr "Сербский"
 
-#: ../src/gtkdialogs.c:148
+#: ../src/gtkdialogs.c:157 ../src/gtkdialogs.c:201
+msgid "Slovak"
+msgstr "Словацкий"
+
+#: ../src/gtkdialogs.c:158
 msgid "Slovenian"
 msgstr "Словенский"
 
-#: ../src/gtkdialogs.c:149 ../src/gtkdialogs.c:191
+#: ../src/gtkdialogs.c:159 ../src/gtkdialogs.c:202
 msgid "Swedish"
 msgstr "Шведский"
 
-#: ../src/gtkdialogs.c:150
+#: ../src/gtkdialogs.c:160
 msgid "Tamil"
 msgstr "Тамильский"
 
-#: ../src/gtkdialogs.c:151
+#: ../src/gtkdialogs.c:161
 msgid "Telugu"
 msgstr "Телугу"
 
-#: ../src/gtkdialogs.c:152
+#: ../src/gtkdialogs.c:162
+msgid "Thai"
+msgstr "Тайский"
+
+#: ../src/gtkdialogs.c:163
 msgid "Turkish"
 msgstr "Турецкий"
 
-#: ../src/gtkdialogs.c:153
-msgid "Valencian"
-msgstr "Валенсийский"
-
-#: ../src/gtkdialogs.c:154
+#: ../src/gtkdialogs.c:164
 msgid "Vietnamese"
 msgstr "Вьетнамский"
 
-#: ../src/gtkdialogs.c:154
+#: ../src/gtkdialogs.c:164
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh и команда Gnome-Vi"
 
-#: ../src/gtkdialogs.c:155 ../src/gtkdialogs.c:192
+#: ../src/gtkdialogs.c:165 ../src/gtkdialogs.c:203
 msgid "Simplified Chinese"
 msgstr "Упрощённый китайский"
 
-#: ../src/gtkdialogs.c:156 ../src/gtkdialogs.c:157 ../src/gtkdialogs.c:193
+#: ../src/gtkdialogs.c:166 ../src/gtkdialogs.c:167 ../src/gtkdialogs.c:204
 msgid "Traditional Chinese"
 msgstr "Традиционный китайский"
 
-#: ../src/gtkdialogs.c:163
+#: ../src/gtkdialogs.c:173
 msgid "Amharic"
 msgstr "Амхарский"
 
-#: ../src/gtkdialogs.c:190
-msgid "Slovak"
-msgstr "Словацкий"
-
-#: ../src/gtkdialogs.c:234
+#: ../src/gtkdialogs.c:245
 msgid "About Gaim"
 msgstr "О Gaim"
 
-#: ../src/gtkdialogs.c:258
+#: ../src/gtkdialogs.c:269
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
@@ -3536,62 +3588,62 @@
 "проекта.  Полный список участников проекта смотрите в файле 'COPYRIGHT'.  Мы "
 "не предоставляем никаких гарантий на эту программу.<BR><BR>"
 
-#: ../src/gtkdialogs.c:272
+#: ../src/gtkdialogs.c:283
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim на irc.freenode.net<BR><BR>"
 
-#: ../src/gtkdialogs.c:275
+#: ../src/gtkdialogs.c:286
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim на irc.freenode.net<BR><BR>"
 
-#: ../src/gtkdialogs.c:281
+#: ../src/gtkdialogs.c:292
 msgid "Current Developers"
 msgstr "Текущие разработчики"
 
-#: ../src/gtkdialogs.c:296
+#: ../src/gtkdialogs.c:307
 msgid "Crazy Patch Writers"
 msgstr "Одержимые писатели заплаток"
 
-#: ../src/gtkdialogs.c:311
+#: ../src/gtkdialogs.c:322
 msgid "Retired Developers"
 msgstr "Разработчики, отошедшие от дел"
 
-#: ../src/gtkdialogs.c:326
+#: ../src/gtkdialogs.c:337
 msgid "Current Translators"
 msgstr "Текущие переводчики"
 
-#: ../src/gtkdialogs.c:346
+#: ../src/gtkdialogs.c:357
 msgid "Past Translators"
 msgstr "Предыдущие переводчики"
 
-#: ../src/gtkdialogs.c:364
+#: ../src/gtkdialogs.c:375
 msgid "Debugging Information"
 msgstr "Отладочная информация"
 
-#: ../src/gtkdialogs.c:570 ../src/gtkdialogs.c:707 ../src/gtkdialogs.c:770
+#: ../src/gtkdialogs.c:589 ../src/gtkdialogs.c:726 ../src/gtkdialogs.c:789
 msgid "_Name"
 msgstr "_Имя"
 
-#: ../src/gtkdialogs.c:575 ../src/gtkdialogs.c:712 ../src/gtkdialogs.c:775
+#: ../src/gtkdialogs.c:594 ../src/gtkdialogs.c:731 ../src/gtkdialogs.c:794
 msgid "_Account"
 msgstr "_Учётная запись"
 
-#: ../src/gtkdialogs.c:583
+#: ../src/gtkdialogs.c:602
 msgid "New Instant Message"
 msgstr "Новое мгновенное сообщение"
 
-#: ../src/gtkdialogs.c:585
+#: ../src/gtkdialogs.c:604
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
 "Введите идентификатор пользователя или псевдоним персоны, которой вы хотели "
 "бы отправить сообщение."
 
-#: ../src/gtkdialogs.c:720
+#: ../src/gtkdialogs.c:739
 msgid "Get User Info"
 msgstr "Получить пользовательскую информацию"
 
-#: ../src/gtkdialogs.c:722
+#: ../src/gtkdialogs.c:741
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -3599,11 +3651,11 @@
 "Введите идентификатор пользователя или псевдоним персоны, информацию о "
 "которой вы хотели бы просмотреть."
 
-#: ../src/gtkdialogs.c:784
+#: ../src/gtkdialogs.c:803
 msgid "View User Log"
 msgstr "Просмотреть журнал пользователя"
 
-#: ../src/gtkdialogs.c:786
+#: ../src/gtkdialogs.c:805
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -3611,37 +3663,37 @@
 "Введите идентификатор пользователя или псевдоним персоны, журнал которой вы "
 "хотели бы просмотреть."
 
-#: ../src/gtkdialogs.c:805
+#: ../src/gtkdialogs.c:824
 msgid "Alias Contact"
 msgstr "Псевдоним контакта"
 
-#: ../src/gtkdialogs.c:806
+#: ../src/gtkdialogs.c:825
 msgid "Enter an alias for this contact."
 msgstr "Введите псевдоним для этого контакта."
 
-#: ../src/gtkdialogs.c:808 ../src/gtkdialogs.c:830 ../src/gtkdialogs.c:850
-#: ../src/gtkrequest.c:277 ../src/protocols/silc/chat.c:586
+#: ../src/gtkdialogs.c:827 ../src/gtkdialogs.c:849 ../src/gtkdialogs.c:869
+#: ../src/gtkrequest.c:277 ../src/protocols/silc/chat.c:587
 msgid "Alias"
 msgstr "Псевдоним"
 
-#: ../src/gtkdialogs.c:826
+#: ../src/gtkdialogs.c:845
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Введите псевдоним для %s."
 
-#: ../src/gtkdialogs.c:828
+#: ../src/gtkdialogs.c:847
 msgid "Alias Buddy"
 msgstr "Псевдоним собеседника"
 
-#: ../src/gtkdialogs.c:847
+#: ../src/gtkdialogs.c:866
 msgid "Alias Chat"
 msgstr "Псевдоним чата"
 
-#: ../src/gtkdialogs.c:848
+#: ../src/gtkdialogs.c:867
 msgid "Enter an alias for this chat."
 msgstr "Введите псевдоним для этого чата."
 
-#: ../src/gtkdialogs.c:885
+#: ../src/gtkdialogs.c:904
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -3656,15 +3708,15 @@
 "Вы удалите контакт, содержащий %s и %d других собеседников из списка "
 "собеседников. Хотите продолжить?"
 
-#: ../src/gtkdialogs.c:893
+#: ../src/gtkdialogs.c:912
 msgid "Remove Contact"
 msgstr "Удалить контакт"
 
-#: ../src/gtkdialogs.c:894
+#: ../src/gtkdialogs.c:913
 msgid "_Remove Contact"
 msgstr "_Удалить контакт"
 
-#: ../src/gtkdialogs.c:945
+#: ../src/gtkdialogs.c:964
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -3673,163 +3725,167 @@
 "Вы удалите группу %s и всех её членов из списка собеседников. Хотите "
 "продолжить?"
 
-#: ../src/gtkdialogs.c:948
+#: ../src/gtkdialogs.c:967
 msgid "Remove Group"
 msgstr "Удалить группу"
 
-#: ../src/gtkdialogs.c:949
+#: ../src/gtkdialogs.c:968
 msgid "_Remove Group"
 msgstr "_Удалить группу"
 
-#: ../src/gtkdialogs.c:982
+#: ../src/gtkdialogs.c:1001
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Вы удалите %s из списка собеседников. Хотите продолжить?"
 
-#: ../src/gtkdialogs.c:985
+#: ../src/gtkdialogs.c:1004
 msgid "Remove Buddy"
 msgstr "Удалить собеседника"
 
-#: ../src/gtkdialogs.c:986
+#: ../src/gtkdialogs.c:1005
 msgid "_Remove Buddy"
 msgstr "_Удалить собеседника"
 
-#: ../src/gtkdialogs.c:1007
+#: ../src/gtkdialogs.c:1026
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "Вы удалите чат %s из списка собеседников. Хотите продолжить?"
 
-#: ../src/gtkdialogs.c:1010
+#: ../src/gtkdialogs.c:1029
 msgid "Remove Chat"
 msgstr "Удалить чат"
 
-#: ../src/gtkdialogs.c:1011
+#: ../src/gtkdialogs.c:1030
 msgid "_Remove Chat"
 msgstr "_Удалить чат"
 
-#: ../src/gtkft.c:139
+#: ../src/gtkft.c:133
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: ../src/gtkft.c:160 ../src/gtkft.c:1063
+#: ../src/gtkft.c:153
+msgid "Not started"
+msgstr "Не начато"
+
+#: ../src/gtkft.c:162 ../src/gtkft.c:1063
 msgid "Finished"
 msgstr "Завершено"
 
-#: ../src/gtkft.c:163 ../src/gtkft.c:1003
+#: ../src/gtkft.c:165 ../src/gtkft.c:1003
 msgid "Canceled"
 msgstr "Отменено"
 
-#: ../src/gtkft.c:166 ../src/gtkft.c:922
+#: ../src/gtkft.c:168 ../src/gtkft.c:922
 msgid "Waiting for transfer to begin"
 msgstr "Ожидание начала передачи"
 
-#: ../src/gtkft.c:219
+#: ../src/gtkft.c:221
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Приём как:</b>"
 
-#: ../src/gtkft.c:221
+#: ../src/gtkft.c:223
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Приём от:</b>"
 
-#: ../src/gtkft.c:225
+#: ../src/gtkft.c:227
 msgid "<b>Sending To:</b>"
 msgstr "<b>Отправка для:</b>"
 
-#: ../src/gtkft.c:227
+#: ../src/gtkft.c:229
 msgid "<b>Sending As:</b>"
 msgstr "<b>Отправка как:</b>"
 
-#: ../src/gtkft.c:443
+#: ../src/gtkft.c:445
 msgid "There is no application configured to open this type of file."
 msgstr "Нет приложения, сопоставленного этому типу файла."
 
-#: ../src/gtkft.c:448
+#: ../src/gtkft.c:450
 msgid "An error occurred while opening the file."
 msgstr "Произошла ошибка при открытии файла."
 
-#: ../src/gtkft.c:485
+#: ../src/gtkft.c:487
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "Ошибка запуска %s: %s"
 
-#: ../src/gtkft.c:494
+#: ../src/gtkft.c:496
 #, c-format
 msgid "Error running %s"
 msgstr "Ошибка выполнения %s"
 
-#: ../src/gtkft.c:495
+#: ../src/gtkft.c:497
 #, c-format
 msgid "Process returned error code %d"
 msgstr "Процесс возвратил код ошибки %d"
 
-#: ../src/gtkft.c:589
+#: ../src/gtkft.c:591
 msgid "Progress"
 msgstr "Прогресс"
 
-#: ../src/gtkft.c:596
+#: ../src/gtkft.c:598
 msgid "Filename"
 msgstr "Имя файла"
 
-#: ../src/gtkft.c:603
+#: ../src/gtkft.c:605
 msgid "Size"
 msgstr "Размер"
 
-#: ../src/gtkft.c:610
+#: ../src/gtkft.c:612
 msgid "Remaining"
 msgstr "Осталось"
 
-#: ../src/gtkft.c:641
-msgid "Filename:"
-msgstr "Имя файла:"
-
-#: ../src/gtkft.c:642
-msgid "Local File:"
-msgstr "Локальный файл:"
-
 #: ../src/gtkft.c:643
-msgid "Status:"
-msgstr "Статус:"
+msgid "Filename:"
+msgstr "Имя файла:"
 
 #: ../src/gtkft.c:644
-msgid "Speed:"
-msgstr "Скорость:"
+msgid "Local File:"
+msgstr "Локальный файл:"
 
 #: ../src/gtkft.c:645
-msgid "Time Elapsed:"
-msgstr "Прошло времени:"
+msgid "Status:"
+msgstr "Статус:"
 
 #: ../src/gtkft.c:646
+msgid "Speed:"
+msgstr "Скорость:"
+
+#: ../src/gtkft.c:647
+msgid "Time Elapsed:"
+msgstr "Прошло времени:"
+
+#: ../src/gtkft.c:648
 msgid "Time Remaining:"
 msgstr "Осталось времени:"
 
-#: ../src/gtkft.c:708
+#: ../src/gtkft.c:710
 msgid "File Transfers"
 msgstr "Передача файлов"
 
-#: ../src/gtkft.c:731
+#: ../src/gtkft.c:733
 msgid "Close this window when all transfers _finish"
 msgstr "_Закрывать это окно по завершении всех передач"
 
-#: ../src/gtkft.c:741
+#: ../src/gtkft.c:743
 msgid "C_lear finished transfers"
 msgstr "О_чищать завершённые передачи"
 
 #. "Download Details" arrow
-#: ../src/gtkft.c:750
+#: ../src/gtkft.c:752
 msgid "File transfer _details"
 msgstr "_Подробности о передаче файлов"
 
 #. Pause button
-#: ../src/gtkft.c:780 ../src/gtkstock.c:146
+#: ../src/gtkft.c:782 ../src/gtkstock.c:146
 msgid "_Pause"
 msgstr "_Пауза"
 
 #. Resume button
-#: ../src/gtkft.c:790
+#: ../src/gtkft.c:792
 msgid "_Resume"
 msgstr "_Возобновить"
 
@@ -3841,54 +3897,53 @@
 msgid "Paste as Plain _Text"
 msgstr "Вставить как простой _текст"
 
-#. XXX: make this new with mnemonic, and HIG-happy after string thaw
-#: ../src/gtkimhtml.c:834 ../src/gtkimhtmltoolbar.c:1030
-msgid "Clear formatting"
-msgstr "Очистить форматирование"
+#: ../src/gtkimhtml.c:833
+msgid "_Reset formatting"
+msgstr "Восстановить _форматирование"
+
+#: ../src/gtkimhtml.c:1327
+msgid "Hyperlink color"
+msgstr "Цвет гиперссылки"
 
 #: ../src/gtkimhtml.c:1328
-msgid "Hyperlink color"
-msgstr "Цвет гиперссылки"
-
-#: ../src/gtkimhtml.c:1329
 msgid "Color to draw hyperlinks."
 msgstr "Цвет для отображения гиперссылок."
 
-#: ../src/gtkimhtml.c:1332
+#: ../src/gtkimhtml.c:1331
 msgid "Hyperlink prelight color"
 msgstr "Цвет подсветки гиперссылки"
 
-#: ../src/gtkimhtml.c:1333
+#: ../src/gtkimhtml.c:1332
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Цвет для отображения гиперссылок при наведении на них курсора мыши."
 
-#: ../src/gtkimhtml.c:1554
+#: ../src/gtkimhtml.c:1553
 msgid "_Copy E-Mail Address"
 msgstr "_Скопировать адрес e-mail"
 
-#: ../src/gtkimhtml.c:1566
+#: ../src/gtkimhtml.c:1565
 msgid "_Open Link in Browser"
 msgstr "_Открыть ссылку в браузере"
 
-#: ../src/gtkimhtml.c:1576
+#: ../src/gtkimhtml.c:1575
 msgid "_Copy Link Location"
 msgstr "_Скопировать ссылку"
 
-#: ../src/gtkimhtml.c:3273
+#: ../src/gtkimhtml.c:3272
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
 "Defaulting to PNG."
 msgstr ""
 
-#: ../src/gtkimhtml.c:3276
+#: ../src/gtkimhtml.c:3275
 msgid ""
 "Unrecognized file type\n"
 "\n"
 "Defaulting to PNG."
 msgstr ""
 
-#: ../src/gtkimhtml.c:3289
+#: ../src/gtkimhtml.c:3288
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -3899,7 +3954,7 @@
 "\n"
 "%s"
 
-#: ../src/gtkimhtml.c:3292
+#: ../src/gtkimhtml.c:3291
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -3910,11 +3965,11 @@
 "\n"
 "%s"
 
-#: ../src/gtkimhtml.c:3372 ../src/gtkimhtml.c:3384
+#: ../src/gtkimhtml.c:3371 ../src/gtkimhtml.c:3383
 msgid "Save Image"
 msgstr "Сохранить изображение"
 
-#: ../src/gtkimhtml.c:3412
+#: ../src/gtkimhtml.c:3411
 msgid "_Save Image..."
 msgstr "_Сохранить изображение..."
 
@@ -4008,6 +4063,10 @@
 msgid "Background color"
 msgstr "Цвет фона"
 
+#: ../src/gtkimhtmltoolbar.c:1030
+msgid "Reset formatting"
+msgstr "Восстановить форматирование"
+
 #: ../src/gtkimhtmltoolbar.c:1045
 msgid "Insert link"
 msgstr "Вставить ссылку"
@@ -4020,65 +4079,65 @@
 msgid "Insert smiley"
 msgstr "Вставить смайлик"
 
-#: ../src/gtklog.c:188
+#: ../src/gtklog.c:207
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Беседа в %s на %s</span>"
 
-#: ../src/gtklog.c:193
+#: ../src/gtklog.c:212
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Беседа с %s на %s</span>"
 
-#: ../src/gtklog.c:242
+#: ../src/gtklog.c:261
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../src/gtklog.c:295
+#: ../src/gtklog.c:308
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
 msgstr ""
 
-#: ../src/gtklog.c:299
+#: ../src/gtklog.c:312
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
 msgstr ""
 
-#: ../src/gtklog.c:302
+#: ../src/gtklog.c:315
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
 
-#: ../src/gtklog.c:306
+#: ../src/gtklog.c:319
 msgid "No logs were found"
 msgstr "Журналы не найдены"
 
-#: ../src/gtklog.c:382
+#: ../src/gtklog.c:398
 msgid "Total log size:"
 msgstr "Общий размер журналов:"
 
-#: ../src/gtklog.c:458
+#: ../src/gtklog.c:464
 #, c-format
 msgid "Conversations in %s"
 msgstr "Беседы в %s"
 
-#: ../src/gtklog.c:466 ../src/gtklog.c:517
+#: ../src/gtklog.c:472 ../src/gtklog.c:523
 #, c-format
 msgid "Conversations with %s"
 msgstr "Беседы с %s"
 
-#: ../src/gtklog.c:542
+#: ../src/gtklog.c:548
 msgid "System Log"
 msgstr "Системный журнал"
 
-#: ../src/gtkmain.c:308
+#: ../src/gtkmain.c:307
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. Наберите `%s -h' для получения дополнительной информации.\n"
 
-#: ../src/gtkmain.c:310
+#: ../src/gtkmain.c:309
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4104,7 +4163,7 @@
 "                      разделённых запятыми)\n"
 "  -v, --version       показать текущую версию и выйти\n"
 
-#: ../src/gtkmain.c:493
+#: ../src/gtkmain.c:492
 #, c-format
 msgid ""
 "Gaim has segfaulted and attempted to dump a core file.\n"
@@ -4126,34 +4185,34 @@
 "%scontactinfo.php\n"
 msgstr ""
 
-#: ../src/gtknotify.c:327
+#: ../src/gtknotify.c:329
 msgid "New Mail"
 msgstr "Новая почта"
 
-#: ../src/gtknotify.c:343
+#: ../src/gtknotify.c:345
 msgid "Open All Messages"
 msgstr "Открыть все сообщения"
 
-#: ../src/gtknotify.c:409 ../src/protocols/jabber/jabber.c:1115
+#: ../src/gtknotify.c:411 ../src/protocols/jabber/jabber.c:1113
 msgid "From"
 msgstr "От"
 
-#: ../src/gtknotify.c:418
+#: ../src/gtknotify.c:420
 msgid "Subject"
 msgstr "Тема"
 
-#: ../src/gtknotify.c:427
+#: ../src/gtknotify.c:429
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Вам пришла почта!</span>"
 
-#: ../src/gtknotify.c:493
+#: ../src/gtknotify.c:495
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s имеет %d новое сообщение."
 msgstr[1] "%s имеет %d новых сообщений."
 
-#: ../src/gtknotify.c:498
+#: ../src/gtknotify.c:500
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -4164,35 +4223,33 @@
 "\n"
 "%s"
 
-#: ../src/gtknotify.c:685 ../src/protocols/sametime/sametime.c:5459
+#: ../src/gtknotify.c:688 ../src/protocols/sametime/sametime.c:5451
 msgid "Search Results"
 msgstr "Результаты поиска"
 
-#: ../src/gtknotify.c:841 ../src/protocols/oscar/oscar.c:5061
+#: ../src/gtknotify.c:844 ../src/protocols/oscar/oscar.c:2634
 #, c-format
 msgid "Info for %s"
 msgstr "Информация для %s"
 
-#: ../src/gtknotify.c:842 ../src/protocols/toc/toc.c:470
+#: ../src/gtknotify.c:845 ../src/protocols/toc/toc.c:470
 msgid "Buddy Information"
 msgstr "Информация о собеседнике"
 
-#. TODO: Change the bold tags to quotes when not in string freeze
-#: ../src/gtknotify.c:882
-#, c-format
-msgid "The browser command <b>%s</b> is invalid."
-msgstr "Команда запуска браузера <b>%s</b> неверна."
-
-#: ../src/gtknotify.c:884 ../src/gtknotify.c:897 ../src/gtknotify.c:911
+#: ../src/gtknotify.c:884
+#, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr "Команда запуска браузера \"%s\" неверна."
+
+#: ../src/gtknotify.c:886 ../src/gtknotify.c:898 ../src/gtknotify.c:911
 #: ../src/gtknotify.c:1034
 msgid "Unable to open URL"
 msgstr "Не удаётся открыть URL"
 
-#. TODO: Change the bold tags to quotes when not in string freeze
-#: ../src/gtknotify.c:895 ../src/gtknotify.c:909
-#, c-format
-msgid "Error launching <b>%s</b>: %s"
-msgstr "Ошибка запуска <b>%s</b>: %s"
+#: ../src/gtknotify.c:896 ../src/gtknotify.c:909
+#, c-format
+msgid "Error launching \"%s\": %s"
+msgstr "Ошибка запуска \"%s\": %s"
 
 #: ../src/gtknotify.c:1035
 msgid ""
@@ -4238,191 +4295,191 @@
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Подробности о модуле</b>"
 
-#: ../src/gtkpounce.c:162
+#: ../src/gtkpounce.c:154
 msgid "Select a file"
 msgstr "Выбрать файл"
 
-#: ../src/gtkpounce.c:259
+#: ../src/gtkpounce.c:251
 msgid "Please enter a buddy to pounce."
 msgstr "Введите собеседника для слежения."
 
-#: ../src/gtkpounce.c:503
+#: ../src/gtkpounce.c:495
 msgid "New Buddy Pounce"
 msgstr "Новое правило"
 
-#: ../src/gtkpounce.c:503
+#: ../src/gtkpounce.c:495
 msgid "Edit Buddy Pounce"
 msgstr "Изменить правило"
 
 #. Create the "Pounce on Whom" frame.
-#: ../src/gtkpounce.c:520
+#: ../src/gtkpounce.c:512
 msgid "Pounce on Whom"
 msgstr "За кем следить"
 
-#: ../src/gtkpounce.c:547
+#: ../src/gtkpounce.c:539
 msgid "_Buddy name:"
 msgstr "_Имя собеседника:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../src/gtkpounce.c:573
+#: ../src/gtkpounce.c:565
 msgid "Pounce When Buddy..."
 msgstr "Выполнять, когда собеседник..."
 
-#: ../src/gtkpounce.c:581
+#: ../src/gtkpounce.c:573
 msgid "Si_gns on"
 msgstr "_Входит"
 
-#: ../src/gtkpounce.c:583
+#: ../src/gtkpounce.c:575
 msgid "Signs o_ff"
 msgstr "В_ыходит"
 
-#: ../src/gtkpounce.c:585
+#: ../src/gtkpounce.c:577
 msgid "Goes a_way"
 msgstr "Отхо_дит"
 
-#: ../src/gtkpounce.c:587
+#: ../src/gtkpounce.c:579
 msgid "Ret_urns from away"
 msgstr "Возв_ращается"
 
-#: ../src/gtkpounce.c:589
+#: ../src/gtkpounce.c:581
 msgid "Becomes _idle"
 msgstr "Начинает _бездействовать"
 
-#: ../src/gtkpounce.c:591
+#: ../src/gtkpounce.c:583
 msgid "Is no longer i_dle"
 msgstr "Перестаёт безде_йствовать"
 
-#: ../src/gtkpounce.c:593
+#: ../src/gtkpounce.c:585
 msgid "Starts _typing"
 msgstr "Начинает пис_ать"
 
-#: ../src/gtkpounce.c:595
+#: ../src/gtkpounce.c:587
 msgid "Stops t_yping"
 msgstr "Перестаёт писат_ь"
 
-#: ../src/gtkpounce.c:597
+#: ../src/gtkpounce.c:589
 msgid "Sends a _message"
 msgstr "Отправляет сооб_щение"
 
 #. Create the "Action" frame.
-#: ../src/gtkpounce.c:629
+#: ../src/gtkpounce.c:621
 msgid "Action"
 msgstr "Действие"
 
-#: ../src/gtkpounce.c:637
+#: ../src/gtkpounce.c:629
 msgid "Ope_n an IM window"
 msgstr "Открыть ок_но беседы"
 
-#: ../src/gtkpounce.c:639
+#: ../src/gtkpounce.c:631
 msgid "_Pop up a notification"
 msgstr "Вывести уведом_ление"
 
-#: ../src/gtkpounce.c:641
+#: ../src/gtkpounce.c:633
 msgid "Send a _message"
 msgstr "Отправить _сообщение"
 
-#: ../src/gtkpounce.c:643
+#: ../src/gtkpounce.c:635
 msgid "E_xecute a command"
 msgstr "Выполнить ко_манду"
 
-#: ../src/gtkpounce.c:645
+#: ../src/gtkpounce.c:637
 msgid "P_lay a sound"
 msgstr "Воспроизвести _звук"
 
-#: ../src/gtkpounce.c:650
+#: ../src/gtkpounce.c:642
 msgid "Brows_e..."
 msgstr "_Открыть..."
 
-#: ../src/gtkpounce.c:652
+#: ../src/gtkpounce.c:644
 msgid "Br_owse..."
 msgstr "От_крыть..."
 
-#: ../src/gtkpounce.c:653
+#: ../src/gtkpounce.c:645
 msgid "Pre_view"
 msgstr "Т_ест"
 
 #. Create the "Options" frame.
-#: ../src/gtkpounce.c:765
+#: ../src/gtkpounce.c:757
 msgid "Options"
 msgstr "Параметры"
 
-#: ../src/gtkpounce.c:773
+#: ../src/gtkpounce.c:765
 msgid "P_ounce only when my status is not available"
 msgstr "Выполн_ять только при статусе, отличном от \"Доступен\""
 
-#: ../src/gtkpounce.c:778
+#: ../src/gtkpounce.c:770
 msgid "_Recurring"
 msgstr "_Повторение"
 
-#: ../src/gtkpounce.c:1092
+#: ../src/gtkpounce.c:1074
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Вы действительно хотите удалить правило %s для %s?"
 
-#: ../src/gtkpounce.c:1240
+#: ../src/gtkpounce.c:1222
 msgid "Pounce Target"
 msgstr "Объект слежения"
 
-#: ../src/gtkpounce.c:1275
+#: ../src/gtkpounce.c:1257
 msgid "Recurring"
 msgstr "Повторение"
 
-#: ../src/gtkpounce.c:1322
+#: ../src/gtkpounce.c:1304
 msgid "Buddy Pounces"
 msgstr "Правила"
 
-#: ../src/gtkpounce.c:1449
+#: ../src/gtkpounce.c:1431
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s начал писать вам (%s)"
 
-#: ../src/gtkpounce.c:1451
+#: ../src/gtkpounce.c:1433
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s вошёл (%s)"
 
-#: ../src/gtkpounce.c:1453
+#: ../src/gtkpounce.c:1435
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s перестал бездействовать (%s)"
 
-#: ../src/gtkpounce.c:1455
+#: ../src/gtkpounce.c:1437
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s вернулся (%s)"
 
-#: ../src/gtkpounce.c:1457
+#: ../src/gtkpounce.c:1439
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s перестал писать вам (%s)"
 
-#: ../src/gtkpounce.c:1459
+#: ../src/gtkpounce.c:1441
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s вышел (%s)"
 
-#: ../src/gtkpounce.c:1461
+#: ../src/gtkpounce.c:1443
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s начал бездействовать (%s)"
 
-#: ../src/gtkpounce.c:1463
+#: ../src/gtkpounce.c:1445
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s отошёл (%s)"
 
-#: ../src/gtkpounce.c:1465
+#: ../src/gtkpounce.c:1447
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s отправил вам сообщение (%s)"
 
-#: ../src/gtkpounce.c:1466
+#: ../src/gtkpounce.c:1448
 msgid "Unknown pounce event. Please report this!"
 msgstr "Неизвестное событие слежения. Сообщите об этом!"
 
 #: ../src/gtkprefs.c:512
 msgid "Smiley theme failed to unpack."
-msgstr ""
+msgstr "Не удалось распаковать тему смайликов."
 
 #: ../src/gtkprefs.c:638
 msgid ""
@@ -4437,7 +4494,7 @@
 msgstr "Значок"
 
 #: ../src/gtkprefs.c:680 ../src/protocols/jabber/buddy.c:267
-#: ../src/protocols/jabber/buddy.c:818 ../src/protocols/jabber/chat.c:769
+#: ../src/protocols/jabber/buddy.c:820 ../src/protocols/jabber/chat.c:767
 msgid "Description"
 msgstr "Описание"
 
@@ -4445,7 +4502,7 @@
 msgid "_Hide new IM conversations"
 msgstr "_Скрывать новые беседы"
 
-#: ../src/gtkprefs.c:824 ../src/gtkprefs.c:1764
+#: ../src/gtkprefs.c:824 ../src/gtkprefs.c:1779
 msgid "When away"
 msgstr "Во время отсутствия"
 
@@ -4530,8 +4587,8 @@
 msgid "N_ew conversations:"
 msgstr "_Новые беседы:"
 
-#: ../src/gtkprefs.c:973 ../src/protocols/oscar/oscar.c:869
-#: ../src/protocols/oscar/oscar.c:6172
+#: ../src/gtkprefs.c:973 ../src/protocols/oscar/oscar.c:795
+#: ../src/protocols/oscar/oscar.c:3631
 msgid "IP Address"
 msgstr "IP-адрес"
 
@@ -4539,107 +4596,111 @@
 msgid "ST_UN server:"
 msgstr "ST_UN-сервер:"
 
-#: ../src/gtkprefs.c:977
+#: ../src/gtkprefs.c:987
+msgid "<span style=\"italic\">Example: stunserver.org</span>"
+msgstr "<span style=\"italic\">Пример: stunserver.org</span>"
+
+#: ../src/gtkprefs.c:991
 msgid "_Autodetect IP address"
 msgstr "Определять IP-адрес _автоматически"
 
-#: ../src/gtkprefs.c:986
+#: ../src/gtkprefs.c:1000
 msgid "Public _IP:"
 msgstr "Публичный _IP:"
 
-#: ../src/gtkprefs.c:1014
+#: ../src/gtkprefs.c:1029
 msgid "Ports"
 msgstr "Порты"
 
-#: ../src/gtkprefs.c:1017
+#: ../src/gtkprefs.c:1032
 msgid "_Manually specify range of ports to listen on"
 msgstr "Указать диапазон прослушиваемых портов _вручную"
 
-#: ../src/gtkprefs.c:1020
-msgid "_Start port:"
-msgstr "_Начальный порт:"
-
-#: ../src/gtkprefs.c:1027
-msgid "_End port:"
-msgstr "_Конечный порт:"
-
 #: ../src/gtkprefs.c:1035
+msgid "_Start port:"
+msgstr "_Начальный порт:"
+
+#: ../src/gtkprefs.c:1042
+msgid "_End port:"
+msgstr "_Конечный порт:"
+
+#: ../src/gtkprefs.c:1050
 msgid "Proxy Server"
 msgstr "Прокси-сервер"
 
-#: ../src/gtkprefs.c:1039
+#: ../src/gtkprefs.c:1054
 msgid "No proxy"
 msgstr "Нет прокси"
 
-#: ../src/gtkprefs.c:1095
+#: ../src/gtkprefs.c:1110
 msgid "_User:"
 msgstr "_Пользователь:"
 
-#: ../src/gtkprefs.c:1157
+#: ../src/gtkprefs.c:1172
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../src/gtkprefs.c:1158
+#: ../src/gtkprefs.c:1173
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../src/gtkprefs.c:1159
+#: ../src/gtkprefs.c:1174
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../src/gtkprefs.c:1160
+#: ../src/gtkprefs.c:1175
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../src/gtkprefs.c:1161
+#: ../src/gtkprefs.c:1176
 msgid "GNOME Default"
 msgstr "Браузер GNOME по умолчанию"
 
-#: ../src/gtkprefs.c:1162
+#: ../src/gtkprefs.c:1177
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../src/gtkprefs.c:1163
+#: ../src/gtkprefs.c:1178
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../src/gtkprefs.c:1164
+#: ../src/gtkprefs.c:1179
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../src/gtkprefs.c:1165
+#: ../src/gtkprefs.c:1180
 msgid "Opera"
 msgstr "Opera"
 
-#: ../src/gtkprefs.c:1174
+#: ../src/gtkprefs.c:1189
 msgid "Manual"
 msgstr "Другой"
 
-#: ../src/gtkprefs.c:1227
+#: ../src/gtkprefs.c:1242
 msgid "Browser Selection"
 msgstr "Выбор браузера"
 
-#: ../src/gtkprefs.c:1231
+#: ../src/gtkprefs.c:1246
 msgid "_Browser:"
 msgstr "_Браузер:"
 
-#: ../src/gtkprefs.c:1239
+#: ../src/gtkprefs.c:1254
 msgid "_Open link in:"
 msgstr "_Открывать ссылку в:"
 
-#: ../src/gtkprefs.c:1241
+#: ../src/gtkprefs.c:1256
 msgid "Browser default"
 msgstr "По умолчанию"
 
-#: ../src/gtkprefs.c:1242
+#: ../src/gtkprefs.c:1257
 msgid "Existing window"
 msgstr "Существующее окно"
 
-#: ../src/gtkprefs.c:1244
+#: ../src/gtkprefs.c:1259
 msgid "New tab"
 msgstr "Новая вкладка"
 
-#: ../src/gtkprefs.c:1258
+#: ../src/gtkprefs.c:1273
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -4648,83 +4709,83 @@
 "_Вручную:\n"
 "(%s для URL)"
 
-#: ../src/gtkprefs.c:1294 ../src/gtkprefs.c:1875
+#: ../src/gtkprefs.c:1309 ../src/gtkprefs.c:1890
 msgid "Logging"
 msgstr "Журналы"
 
-#: ../src/gtkprefs.c:1297
+#: ../src/gtkprefs.c:1312
 msgid "Log _format:"
 msgstr "_Формат журнала:"
 
-#: ../src/gtkprefs.c:1302
+#: ../src/gtkprefs.c:1317
 msgid "Log all _instant messages"
 msgstr "Записывать все _мгновенные сообщения"
 
-#: ../src/gtkprefs.c:1304
+#: ../src/gtkprefs.c:1319
 msgid "Log all c_hats"
 msgstr "Записывать все _чаты"
 
-#: ../src/gtkprefs.c:1306
+#: ../src/gtkprefs.c:1321
 msgid "Log all _status changes to system log"
 msgstr "Записывать все изменения _статуса в системный журнал"
 
-#: ../src/gtkprefs.c:1454
+#: ../src/gtkprefs.c:1469
 msgid "Sound Selection"
 msgstr "Выбор звука"
 
-#: ../src/gtkprefs.c:1462
+#: ../src/gtkprefs.c:1477
 msgid "Quietest"
 msgstr "Очень тихо"
 
-#: ../src/gtkprefs.c:1464
+#: ../src/gtkprefs.c:1479
 msgid "Quieter"
 msgstr "Тихо"
 
-#: ../src/gtkprefs.c:1466
+#: ../src/gtkprefs.c:1481
 msgid "Quiet"
 msgstr "Ниже среднего"
 
-#: ../src/gtkprefs.c:1468 ../src/protocols/silc/silc.c:670
+#: ../src/gtkprefs.c:1483 ../src/protocols/silc/silc.c:670
 msgid "Normal"
 msgstr "Нормально"
 
-#: ../src/gtkprefs.c:1470
+#: ../src/gtkprefs.c:1485
 msgid "Loud"
 msgstr "Выше среднего"
 
-#: ../src/gtkprefs.c:1472
+#: ../src/gtkprefs.c:1487
 msgid "Louder"
 msgstr "Громко"
 
-#: ../src/gtkprefs.c:1474
+#: ../src/gtkprefs.c:1489
 msgid "Loudest"
 msgstr "Очень громко"
 
-#: ../src/gtkprefs.c:1537
+#: ../src/gtkprefs.c:1552
 msgid "Sound Method"
 msgstr "Метод воспроизведения звука"
 
-#: ../src/gtkprefs.c:1538
+#: ../src/gtkprefs.c:1553
 msgid "_Method:"
 msgstr "_Метод:"
 
-#: ../src/gtkprefs.c:1540
+#: ../src/gtkprefs.c:1555
 msgid "Console beep"
 msgstr "Сигнал динамиком"
 
-#: ../src/gtkprefs.c:1542
+#: ../src/gtkprefs.c:1557
 msgid "Automatic"
 msgstr "Автоматически"
 
-#: ../src/gtkprefs.c:1547
+#: ../src/gtkprefs.c:1562
 msgid "Command"
 msgstr "Команда"
 
-#: ../src/gtkprefs.c:1548
+#: ../src/gtkprefs.c:1563
 msgid "No sounds"
 msgstr "Нет звуков"
 
-#: ../src/gtkprefs.c:1556
+#: ../src/gtkprefs.c:1571
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4733,109 +4794,113 @@
 "_Команда воспроизведения звука:\n"
 "(%s для имени файла)"
 
-#: ../src/gtkprefs.c:1582
+#: ../src/gtkprefs.c:1597
 msgid "Sound Options"
 msgstr "Параметры звука"
 
-#: ../src/gtkprefs.c:1583
+#: ../src/gtkprefs.c:1598
 msgid "Sounds when conversation has _focus"
 msgstr "Звуки, когда окно беседы в _фокусе"
 
-#: ../src/gtkprefs.c:1585
+#: ../src/gtkprefs.c:1600
 msgid "_Sounds while away"
 msgstr "_Звуки во время отсутствия"
 
-#: ../src/gtkprefs.c:1592
+#: ../src/gtkprefs.c:1607
 msgid "Volume:"
 msgstr "Громкость:"
 
-#: ../src/gtkprefs.c:1620
+#: ../src/gtkprefs.c:1635
 msgid "Sound Events"
 msgstr "Звуковые события"
 
-#: ../src/gtkprefs.c:1671
+#: ../src/gtkprefs.c:1686
 msgid "Play"
 msgstr "Воспроизводить"
 
-#: ../src/gtkprefs.c:1697
+#: ../src/gtkprefs.c:1693
+msgid "Event"
+msgstr "Событие"
+
+#: ../src/gtkprefs.c:1712
 msgid "Test"
 msgstr "Тест"
 
-#: ../src/gtkprefs.c:1701
+#: ../src/gtkprefs.c:1716
 msgid "Reset"
 msgstr "Сброс"
 
-#: ../src/gtkprefs.c:1705
+#: ../src/gtkprefs.c:1720
 msgid "Choose..."
 msgstr "Выбрать..."
 
-#: ../src/gtkprefs.c:1747
+#: ../src/gtkprefs.c:1762
 msgid "_Report idle time:"
 msgstr "Сообщать _время бездействия:"
 
-#: ../src/gtkprefs.c:1750
+#: ../src/gtkprefs.c:1765
 msgid "From last sent message"
 msgstr "С момента последней отправки сообщения"
 
-#: ../src/gtkprefs.c:1752
+#: ../src/gtkprefs.c:1767
 msgid "Based on keyboard or mouse use"
 msgstr "Основываясь на использовании клавиатуры или мыши"
 
-#: ../src/gtkprefs.c:1761
+#: ../src/gtkprefs.c:1776
 msgid "_Auto-reply:"
 msgstr "_Автоматический ответ:"
 
-#: ../src/gtkprefs.c:1765
+#: ../src/gtkprefs.c:1780
 msgid "When both away and idle"
 msgstr "Во время отсутствия и бездействия"
 
 #. Auto-away stuff
-#: ../src/gtkprefs.c:1771
+#: ../src/gtkprefs.c:1786
 msgid "Auto-away"
 msgstr "Авто-\"Отошёл\""
 
-#: ../src/gtkprefs.c:1773
+#: ../src/gtkprefs.c:1788
 msgid "Change status when _idle"
 msgstr "Менять статус при _бездействии"
 
-#: ../src/gtkprefs.c:1777
+#: ../src/gtkprefs.c:1792
 msgid "_Minutes before changing status:"
 msgstr "_Минут до изменения статуса:"
 
-#: ../src/gtkprefs.c:1785
+#: ../src/gtkprefs.c:1800
 msgid "Change _status to:"
 msgstr "Менять _статус на:"
 
 #. Signon status stuff
-#: ../src/gtkprefs.c:1806
+#: ../src/gtkprefs.c:1821
 msgid "Status at startup"
 msgstr "Статус при запуске"
 
-#: ../src/gtkprefs.c:1808
+#: ../src/gtkprefs.c:1823
 msgid "Use status from last _exit at startup"
 msgstr "Использовать при запуске статус, бывший до в_ыхода"
 
-#: ../src/gtkprefs.c:1814
+#: ../src/gtkprefs.c:1829
 msgid "Status to a_pply at startup:"
 msgstr "_Применить при запуске статус:"
 
-#: ../src/gtkprefs.c:1865
+#: ../src/gtkprefs.c:1880
 msgid "Smiley Themes"
 msgstr "Темы смайликов"
 
-#: ../src/gtkprefs.c:1866
+#: ../src/gtkprefs.c:1881
 msgid "Sounds"
 msgstr "Звуки"
 
-#: ../src/gtkprefs.c:1867 ../src/protocols/silc/silc.c:1851
+#: ../src/gtkprefs.c:1882 ../src/protocols/silc/silc.c:1850
 msgid "Network"
 msgstr "Сеть"
 
-#: ../src/gtkprefs.c:1872
+#: ../src/gtkprefs.c:1887
 msgid "Browser"
 msgstr "Браузер"
 
-#: ../src/gtkprefs.c:1876
+#: ../src/gtkprefs.c:1891
 msgid "Away / Idle"
 msgstr "Отсутствие / Бездействие"
 
@@ -4925,17 +4990,22 @@
 msgid "Are you sure you want to block %s?"
 msgstr "Вы действительно хотите блокировать %s?"
 
+#. *
+#. * A wrapper for gaim_request_action() that uses @c Yes and @c No buttons.
+#.
 #: ../src/gtkrequest.c:267 ../src/protocols/msn/dialog.c:114
-#: ../src/protocols/msn/msn.c:559 ../src/protocols/msn/msn.c:568
-#: ../src/protocols/novell/novell.c:1921 ../src/protocols/silc/buddy.c:313
+#: ../src/protocols/msn/msn.c:557 ../src/protocols/msn/msn.c:566
+#: ../src/protocols/novell/novell.c:1919 ../src/protocols/silc/buddy.c:313
 #: ../src/protocols/silc/pk.c:117 ../src/protocols/silc/wb.c:303
+#: ../src/request.h:1335
 msgid "Yes"
 msgstr "Да"
 
 #: ../src/gtkrequest.c:268 ../src/protocols/msn/dialog.c:115
-#: ../src/protocols/msn/msn.c:559 ../src/protocols/msn/msn.c:568
-#: ../src/protocols/novell/novell.c:1922 ../src/protocols/silc/buddy.c:314
+#: ../src/protocols/msn/msn.c:557 ../src/protocols/msn/msn.c:566
+#: ../src/protocols/novell/novell.c:1920 ../src/protocols/silc/buddy.c:314
 #: ../src/protocols/silc/pk.c:118 ../src/protocols/silc/wb.c:304
+#: ../src/request.h:1335
 msgid "No"
 msgstr "Нет"
 
@@ -4944,7 +5014,7 @@
 msgstr "Применить"
 
 #: ../src/gtkrequest.c:272 ../src/protocols/msn/msn.c:357
-#: ../src/protocols/silc/util.c:336
+#: ../src/protocols/silc/util.c:350
 msgid "Close"
 msgstr "Закрыть"
 
@@ -4956,6 +5026,14 @@
 msgid "Would you like to overwrite it?"
 msgstr "Хотите перезаписать его?"
 
+#: ../src/gtkrequest.c:1469
+msgid "Overwrite"
+msgstr "Перезаписать"
+
+#: ../src/gtkrequest.c:1470
+msgid "Choose New Name"
+msgstr "Выбрать новое имя"
+
 #: ../src/gtkrequest.c:1512 ../src/gtkrequest.c:1553
 msgid "Save File..."
 msgstr "Сохранить файл..."
@@ -4964,6 +5042,10 @@
 msgid "Open File..."
 msgstr "Открыть файл..."
 
+#: ../src/gtkrequest.c:1601 ../src/gtkrequest.c:1615
+msgid "Select Folder..."
+msgstr "Выбрать папку..."
+
 #: ../src/gtkroomlist.c:287
 msgid "_Add"
 msgstr "_Добавить"
@@ -4983,7 +5065,7 @@
 msgstr "_Добавить чат"
 
 #: ../src/gtksavedstatuses.c:433 ../src/protocols/jabber/buddy.c:264
-#: ../src/protocols/jabber/buddy.c:812 ../src/protocols/novell/novell.c:1486
+#: ../src/protocols/jabber/buddy.c:814 ../src/protocols/novell/novell.c:1484
 msgid "Title"
 msgstr "Название"
 
@@ -4991,26 +5073,25 @@
 msgid "Type"
 msgstr "Тип"
 
-#. Available status messages are plain text
-#: ../src/gtksavedstatuses.c:459 ../src/gtksavedstatuses.c:920
+#: ../src/gtksavedstatuses.c:459 ../src/gtksavedstatuses.c:919
 #: ../src/protocols/bonjour/bonjour.c:256
-#: ../src/protocols/bonjour/bonjour.c:263 ../src/protocols/gg/gg.c:1461
-#: ../src/protocols/gg/gg.c:1471 ../src/protocols/gg/gg.c:1477
-#: ../src/protocols/gg/gg.c:1486 ../src/protocols/gg/gg.c:1491
-#: ../src/protocols/irc/irc.c:227 ../src/protocols/jabber/jabber.c:1182
-#: ../src/protocols/jabber/jabber.c:1192 ../src/protocols/jabber/jabber.c:1202
-#: ../src/protocols/jabber/jabber.c:1212 ../src/protocols/jabber/jabber.c:1222
-#: ../src/protocols/jabber/jabber.c:1234 ../src/protocols/novell/novell.c:2868
-#: ../src/protocols/novell/novell.c:2974 ../src/protocols/novell/novell.c:2980
-#: ../src/protocols/novell/novell.c:2986 ../src/protocols/oscar/oscar.c:7801
-#: ../src/protocols/oscar/oscar.c:7816 ../src/protocols/oscar/oscar.c:7821
-#: ../src/protocols/oscar/oscar.c:8030 ../src/protocols/oscar/oscar.c:8042
-#: ../src/protocols/sametime/sametime.c:3274
-#: ../src/protocols/sametime/sametime.c:3280
-#: ../src/protocols/sametime/sametime.c:3286
-#: ../src/protocols/sametime/sametime.c:3365
+#: ../src/protocols/bonjour/bonjour.c:263 ../src/protocols/gg/gg.c:1591
+#: ../src/protocols/gg/gg.c:1601 ../src/protocols/gg/gg.c:1607
+#: ../src/protocols/gg/gg.c:1616 ../src/protocols/gg/gg.c:1621
+#: ../src/protocols/irc/irc.c:227 ../src/protocols/jabber/jabber.c:1180
+#: ../src/protocols/jabber/jabber.c:1190 ../src/protocols/jabber/jabber.c:1200
+#: ../src/protocols/jabber/jabber.c:1210 ../src/protocols/jabber/jabber.c:1220
+#: ../src/protocols/jabber/jabber.c:1232 ../src/protocols/novell/novell.c:2866
+#: ../src/protocols/novell/novell.c:2972 ../src/protocols/novell/novell.c:2978
+#: ../src/protocols/novell/novell.c:2984 ../src/protocols/oscar/oscar.c:5366
+#: ../src/protocols/oscar/oscar.c:5381 ../src/protocols/oscar/oscar.c:5386
+#: ../src/protocols/oscar/oscar.c:5594 ../src/protocols/oscar/oscar.c:5606
+#: ../src/protocols/sametime/sametime.c:3266
+#: ../src/protocols/sametime/sametime.c:3272
+#: ../src/protocols/sametime/sametime.c:3278
+#: ../src/protocols/sametime/sametime.c:3357
 #: ../src/protocols/silc/buddy.c:1544 ../src/protocols/simple/simple.c:242
-#: ../src/protocols/yahoo/yahoo.c:3280 ../src/protocols/yahoo/yahoo.c:3286
+#: ../src/protocols/yahoo/yahoo.c:3282 ../src/protocols/yahoo/yahoo.c:3288
 #: ../src/protocols/zephyr/zephyr.c:2281
 msgid "Message"
 msgstr "Сообщение"
@@ -5020,99 +5101,99 @@
 msgstr "Сохранённые статусы"
 
 #. Use button
-#: ../src/gtksavedstatuses.c:549 ../src/gtksavedstatuses.c:1180
+#: ../src/gtksavedstatuses.c:549 ../src/gtksavedstatuses.c:1179
 msgid "_Use"
 msgstr "_Применить"
 
 #: ../src/gtksavedstatuses.c:695
 msgid "Title already in use.  You must choose a unique title."
-msgstr ""
+msgstr "Название уже используется. Вы должны выбрать уникальное название."
 
 #: ../src/gtksavedstatuses.c:879
 msgid "Different"
 msgstr "Отличающийся"
 
-#: ../src/gtksavedstatuses.c:909 ../src/gtksavedstatuses.c:1056
-#: ../src/protocols/gg/gg.c:1444 ../src/protocols/gg/gg.c:1448
-#: ../src/protocols/jabber/buddy.c:623 ../src/protocols/jabber/buddy.c:630
-#: ../src/protocols/jabber/buddy.c:641 ../src/protocols/jabber/jabber.c:1153
-#: ../src/protocols/msn/msn.c:550 ../src/protocols/novell/novell.c:2867
-#: ../src/protocols/novell/novell.c:2871 ../src/protocols/oscar/oscar.c:849
-#: ../src/protocols/oscar/oscar.c:855 ../src/protocols/oscar/oscar.c:858
-#: ../src/protocols/yahoo/yahoo.c:2882
+#: ../src/gtksavedstatuses.c:908 ../src/gtksavedstatuses.c:1055
+#: ../src/protocols/gg/gg.c:1024 ../src/protocols/gg/gg.c:1574
+#: ../src/protocols/gg/gg.c:1578 ../src/protocols/jabber/buddy.c:625
+#: ../src/protocols/jabber/buddy.c:632 ../src/protocols/jabber/buddy.c:643
+#: ../src/protocols/jabber/jabber.c:1151 ../src/protocols/msn/msn.c:548
+#: ../src/protocols/novell/novell.c:2865 ../src/protocols/novell/novell.c:2869
+#: ../src/protocols/oscar/oscar.c:775 ../src/protocols/oscar/oscar.c:781
+#: ../src/protocols/oscar/oscar.c:784 ../src/protocols/yahoo/yahoo.c:2878
 msgid "Status"
 msgstr "Статус"
 
-#: ../src/gtksavedstatuses.c:1073
+#: ../src/gtksavedstatuses.c:1072
 msgid "_Title:"
 msgstr "_Название:"
 
-#: ../src/gtksavedstatuses.c:1092 ../src/gtksavedstatuses.c:1413
+#: ../src/gtksavedstatuses.c:1091 ../src/gtksavedstatuses.c:1412
 msgid "_Status:"
 msgstr "_Статус:"
 
 #. Different status message expander
-#: ../src/gtksavedstatuses.c:1124
+#: ../src/gtksavedstatuses.c:1123
 msgid "Use a _different status for some accounts"
 msgstr "Использовать _отличающийся статус для некоторых учётных записей"
 
 #. Save & Use button
-#: ../src/gtksavedstatuses.c:1188
+#: ../src/gtksavedstatuses.c:1187
 msgid "Sa_ve & Use"
 msgstr "Сохранить _и применить"
 
-#: ../src/gtksavedstatuses.c:1394
+#: ../src/gtksavedstatuses.c:1393
 #, c-format
 msgid "Status for %s"
 msgstr "Статус для %s"
 
-#: ../src/gtksound.c:61
+#: ../src/gtksound.c:59
 msgid "Buddy logs in"
 msgstr "Собеседник входит в сеть"
 
-#: ../src/gtksound.c:62
+#: ../src/gtksound.c:60
 msgid "Buddy logs out"
 msgstr "Собеседник выходит из сети"
 
+#: ../src/gtksound.c:61
+msgid "Message received"
+msgstr "Принято сообщение"
+
+#: ../src/gtksound.c:62
+msgid "Message received begins conversation"
+msgstr "Принято сообщение, начинающее беседу"
+
 #: ../src/gtksound.c:63
-msgid "Message received"
-msgstr "Принято сообщение"
+msgid "Message sent"
+msgstr "Сообщение отправлено"
 
 #: ../src/gtksound.c:64
-msgid "Message received begins conversation"
-msgstr "Принято сообщение, начинающее беседу"
+msgid "Person enters chat"
+msgstr "Пользователь входит в чат"
 
 #: ../src/gtksound.c:65
-msgid "Message sent"
-msgstr "Сообщение отправлено"
+msgid "Person leaves chat"
+msgstr "Пользователь выходит из чата"
 
 #: ../src/gtksound.c:66
-msgid "Person enters chat"
-msgstr "Пользователь входит в чат"
-
-#: ../src/gtksound.c:67
-msgid "Person leaves chat"
-msgstr "Пользователь выходит из чата"
-
-#: ../src/gtksound.c:68
 msgid "You talk in chat"
 msgstr "Вы говорите в чате"
 
-#: ../src/gtksound.c:69
+#: ../src/gtksound.c:67
 msgid "Others talk in chat"
 msgstr "Другие говорят в чате"
 
-#: ../src/gtksound.c:72
-msgid "Someone says your name in chat"
+#: ../src/gtksound.c:70
+msgid "Someone says your screen name in chat"
 msgstr "Кто-то произносит ваше имя в чате"
 
-#: ../src/gtksound.c:489
+#: ../src/gtksound.c:396
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr ""
 "Не удаётся воспроизвести звук, так как указанный файл (%s) не существует."
 
-#: ../src/gtksound.c:505
+#: ../src/gtksound.c:412
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
@@ -5120,7 +5201,7 @@
 "Не удаётся воспроизвести звук, так как был выбран метод воспроизведения "
 "звука \"Команда\", но команда не была задана."
 
-#: ../src/gtksound.c:517
+#: ../src/gtksound.c:424
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -5131,11 +5212,11 @@
 
 #. connect to the server
 #: ../src/gtkstatusbox.c:368 ../src/protocols/irc/irc.c:313
-#: ../src/protocols/jabber/jabber.c:979 ../src/protocols/msn/session.c:349
+#: ../src/protocols/jabber/jabber.c:977 ../src/protocols/msn/session.c:344
 #: ../src/protocols/napster/napster.c:536
-#: ../src/protocols/novell/novell.c:2183 ../src/protocols/oscar/oscar.c:1938
-#: ../src/protocols/sametime/sametime.c:3693
-#: ../src/protocols/simple/simple.c:1594 ../src/protocols/yahoo/yahoo.c:2572
+#: ../src/protocols/novell/novell.c:2181 ../src/protocols/oscar/oscar.c:1250
+#: ../src/protocols/sametime/sametime.c:3685
+#: ../src/protocols/simple/simple.c:1609 ../src/protocols/yahoo/yahoo.c:2570
 #: ../src/protocols/zephyr/zephyr.c:1565
 msgid "Connecting"
 msgstr "Соединение"
@@ -5176,7 +5257,7 @@
 #: ../src/gtkutils.c:1408
 #, c-format
 msgid "Cannot send folder %s."
-msgstr "Не удаётся отправить папку %s."
+msgstr "Нельзя отправить папку %s."
 
 #: ../src/gtkutils.c:1410
 msgid ""
@@ -5230,9 +5311,8 @@
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
 #: ../src/gtkutils.c:1509
-#, fuzzy
 msgid "Cannot send launcher"
-msgstr "Не удаётся отправить файл"
+msgstr "Нельзя отправить ярлык"
 
 #: ../src/gtkutils.c:1509
 msgid ""
@@ -5240,33 +5320,41 @@
 "launcher points to instead of this launcher itself."
 msgstr ""
 
-#: ../src/log.c:167
+#: ../src/gtkwhiteboard.c:756 ../src/gtkwhiteboard.c:775
+msgid "Save File"
+msgstr "Сохранить файл"
+
+#: ../src/gtkwhiteboard.c:863
+msgid "Select color"
+msgstr "Выбрать цвет"
+
+#: ../src/log.c:180
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
 "<b><font color=\"red\">Служба ведения журнала не имеет функции чтения</"
 "font></b>"
 
-#: ../src/log.c:549
+#: ../src/log.c:561
 msgid "HTML"
 msgstr "HTML"
 
-#: ../src/log.c:560
+#: ../src/log.c:572
 msgid "Plain text"
 msgstr "Простой текст"
 
-#: ../src/log.c:571
+#: ../src/log.c:583
 msgid "Old Gaim"
 msgstr "Старый Gaim"
 
-#: ../src/log.c:666
+#: ../src/log.c:678
 msgid "Logging of this conversation failed."
 msgstr ""
 
-#: ../src/log.c:1009
+#: ../src/log.c:1028
 msgid "XML"
 msgstr "XML"
 
-#: ../src/log.c:1083
+#: ../src/log.c:1102
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -5275,7 +5363,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:1085
+#: ../src/log.c:1104
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -5284,22 +5372,23 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:1142 ../src/log.c:1273
+#: ../src/log.c:1162 ../src/log.c:1294
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Не удаётся найти путь к журналу!</b></font>"
 
-#: ../src/log.c:1154 ../src/log.c:1287
+#: ../src/log.c:1174 ../src/log.c:1308
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Не удалось прочитать файл: %s</b></font>"
 
-#: ../src/log.c:1216
+#: ../src/log.c:1236
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
-#: ../src/plugin.c:281 ../src/protocols/msn/servconn.c:139
-#: ../src/protocols/msn/session.c:326 ../src/protocols/oscar/oscar.c:5128
+#: ../src/plugin.c:281 ../src/protocols/jabber/buddy.c:1385
+#: ../src/protocols/msn/servconn.c:139 ../src/protocols/msn/session.c:321
+#: ../src/protocols/oscar/oscar.c:2701
 msgid "Unknown error"
 msgstr "Неизвестная ошибка"
 
@@ -5340,9 +5429,9 @@
 msgstr "Gaim не удалось загрузить ваш модуль."
 
 #: ../src/plugin.c:657
-#, fuzzy, c-format
+#, c-format
 msgid "The dependent plugin %s failed to unload."
-msgstr "Необходимый модуль %s не удалось загрузить."
+msgstr "Не удалось выгрузить зависимый модуль %s."
 
 #: ../src/plugin.c:662
 msgid "Gaim encountered errors unloading the plugin."
@@ -5350,17 +5439,17 @@
 
 #. Send a message about the connection error
 #: ../src/protocols/bonjour/bonjour.c:111
-#, fuzzy
 msgid "Unable to listen for incoming IM connections\n"
-msgstr "Не удаётся создать новое соединение."
+msgstr "Не удаётся прослушивать входящие соединения\n"
 
 #: ../src/protocols/bonjour/bonjour.c:146
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
+"Не удаётся установить соединение с локальным mDNS-сервером. Он работает?"
 
 #: ../src/protocols/bonjour/bonjour.c:337
-#: ../src/protocols/sametime/sametime.c:3251
+#: ../src/protocols/sametime/sametime.c:3243
 #, c-format
 msgid ""
 "\n"
@@ -5407,28 +5496,33 @@
 #. Creating the options for the protocol
 #. port to connect to
 #: ../src/protocols/bonjour/bonjour.c:579 ../src/protocols/irc/irc.c:900
-#: ../src/protocols/msn/msn.c:2074 ../src/protocols/napster/napster.c:724
-#: ../src/protocols/sametime/sametime.c:5643 ../src/protocols/silc/silc.c:1859
+#: ../src/protocols/msn/msn.c:2049 ../src/protocols/napster/napster.c:724
+#: ../src/protocols/oscar/oscar.c:6470
+#: ../src/protocols/sametime/sametime.c:5635 ../src/protocols/silc/silc.c:1858
+#: ../src/protocols/toc/toc.c:2344
 msgid "Port"
 msgstr "Порт"
 
-#: ../src/protocols/bonjour/bonjour.c:582 ../src/protocols/gg/gg.c:605
-#: ../src/protocols/gg/gg.c:1015
+#: ../src/protocols/bonjour/bonjour.c:582 ../src/protocols/gg/gg.c:622
+#: ../src/protocols/jabber/jabber.c:769
 msgid "First name"
 msgstr "Имя"
 
-#: ../src/protocols/bonjour/bonjour.c:585 ../src/protocols/gg/gg.c:600
+#: ../src/protocols/bonjour/bonjour.c:585 ../src/protocols/gg/gg.c:617
+#: ../src/protocols/jabber/jabber.c:774
 msgid "Last name"
 msgstr "Фамилия"
 
-#: ../src/protocols/bonjour/bonjour.c:588 ../src/protocols/jabber/buddy.c:261
-#: ../src/protocols/jabber/buddy.c:779 ../src/protocols/jabber/buddy.c:787
-#: ../src/protocols/silc/silc.c:699 ../src/protocols/silc/silc.c:939
-#: ../src/protocols/silc/util.c:512
-#: ../src/protocols/yahoo/yahoo_profile.c:1036
-msgid "Email"
+#: ../src/protocols/bonjour/bonjour.c:588 ../src/protocols/gg/gg.c:468
+#: ../src/protocols/jabber/jabber.c:759 ../src/protocols/silc/silc.c:699
+#: ../src/protocols/silc/silc.c:939
+msgid "E-mail"
 msgstr "E-mail"
 
+#: ../src/protocols/bonjour/bonjour.h:35
+msgid "Bonjour"
+msgstr ""
+
 #: ../src/protocols/bonjour/jabber.c:357
 #, c-format
 msgid "%s has closed the conversation."
@@ -5454,11 +5548,11 @@
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Не удаётся отправить сообщение, не удалось начать беседу."
 
-#: ../src/protocols/gg/gg.c:76 ../src/proxy.c:2336
+#: ../src/protocols/gg/gg.c:76 ../src/proxy.c:2346
 msgid "Invalid proxy settings"
 msgstr "Неверные настройки прокси"
 
-#: ../src/protocols/gg/gg.c:77 ../src/proxy.c:2336
+#: ../src/protocols/gg/gg.c:77 ../src/proxy.c:2346
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -5466,15 +5560,13 @@
 
 #: ../src/protocols/gg/gg.c:115 ../src/protocols/gg/gg.c:137
 #: ../src/protocols/gg/gg.c:180
-#, fuzzy
 msgid "Token Error"
-msgstr "Неизвестная ошибка"
+msgstr ""
 
 #: ../src/protocols/gg/gg.c:116 ../src/protocols/gg/gg.c:138
 #: ../src/protocols/gg/gg.c:181
-#, fuzzy
 msgid "Unable to fetch the token.\n"
-msgstr "Не удаётся загрузить список комнат."
+msgstr ""
 
 #: ../src/protocols/gg/gg.c:269 ../src/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
@@ -5528,24 +5620,20 @@
 msgid "Registration completed successfully!"
 msgstr "Регистрация завершена успешно!"
 
-#: ../src/protocols/gg/gg.c:468 ../src/protocols/jabber/jabber.c:760
-msgid "E-Mail"
-msgstr "E-mail"
-
-#: ../src/protocols/gg/gg.c:473 ../src/protocols/gg/gg.c:747
-#: ../src/protocols/jabber/jabber.c:749 ../src/protocols/jabber/jabber.c:1307
+#: ../src/protocols/gg/gg.c:473 ../src/protocols/gg/gg.c:764
+#: ../src/protocols/jabber/jabber.c:748 ../src/protocols/jabber/jabber.c:1305
 msgid "Password"
 msgstr "Пароль"
 
-#: ../src/protocols/gg/gg.c:478 ../src/protocols/gg/gg.c:752
+#: ../src/protocols/gg/gg.c:478 ../src/protocols/gg/gg.c:769
 msgid "Password (retype)"
 msgstr "Пароль (наберите ещё раз)"
 
-#: ../src/protocols/gg/gg.c:483 ../src/protocols/gg/gg.c:757
+#: ../src/protocols/gg/gg.c:483 ../src/protocols/gg/gg.c:774
 msgid "Enter current token"
 msgstr ""
 
-#: ../src/protocols/gg/gg.c:489 ../src/protocols/gg/gg.c:763
+#: ../src/protocols/gg/gg.c:489 ../src/protocols/gg/gg.c:780
 msgid "Current token"
 msgstr ""
 
@@ -5557,216 +5645,217 @@
 msgid "Please, fill in the following fields"
 msgstr ""
 
-#: ../src/protocols/gg/gg.c:590 ../src/protocols/gg/gg.c:1657
-msgid "Unable to initiate a new search"
-msgstr "Не удаётся начать новый поиск"
-
-#: ../src/protocols/gg/gg.c:591 ../src/protocols/gg/gg.c:1658
-msgid "You have a pending search. Please wait for it to finish."
-msgstr ""
-
-#: ../src/protocols/gg/gg.c:610 ../src/protocols/gg/gg.c:1018
-#: ../src/protocols/gg/gg.c:2048 ../src/protocols/jabber/buddy.c:252
-#: ../src/protocols/jabber/buddy.c:695 ../src/protocols/jabber/buddy.c:1402
-#: ../src/protocols/jabber/jabber.c:765 ../src/protocols/msn/msn.c:1373
-#: ../src/protocols/silc/buddy.c:1528 ../src/protocols/silc/ops.c:1036
-#: ../src/protocols/silc/ops.c:1179 ../src/protocols/silc/ops.c:1328
+#. General
+#: ../src/protocols/gg/gg.c:627 ../src/protocols/gg/gg.c:1038
+#: ../src/protocols/gg/gg.c:1104 ../src/protocols/gg/gg.c:2175
+#: ../src/protocols/jabber/buddy.c:252 ../src/protocols/jabber/buddy.c:697
+#: ../src/protocols/jabber/buddy.c:1262 ../src/protocols/jabber/buddy.c:1444
+#: ../src/protocols/jabber/jabber.c:764 ../src/protocols/msn/msn.c:1368
+#: ../src/protocols/msn/msn.c:1530 ../src/protocols/silc/buddy.c:1528
+#: ../src/protocols/silc/ops.c:1036 ../src/protocols/silc/ops.c:1179
+#: ../src/protocols/silc/ops.c:1328
 #: ../src/protocols/yahoo/yahoo_profile.c:1041
 msgid "Nickname"
 msgstr "Псевдоним"
 
-#: ../src/protocols/gg/gg.c:615 ../src/protocols/gg/gg.c:1021
-#: ../src/protocols/jabber/jabber.c:785 ../src/protocols/oscar/oscar.c:6218
-#: ../src/protocols/oscar/oscar.c:6226
+#: ../src/protocols/gg/gg.c:632 ../src/protocols/gg/gg.c:1043
+#: ../src/protocols/gg/gg.c:1107 ../src/protocols/jabber/jabber.c:784
+#: ../src/protocols/oscar/oscar.c:3687 ../src/protocols/oscar/oscar.c:3695
 msgid "City"
 msgstr "Город"
 
-#: ../src/protocols/gg/gg.c:620
+#: ../src/protocols/gg/gg.c:637
 msgid "Year of birth"
 msgstr "Год рождения"
 
-#: ../src/protocols/gg/gg.c:623 ../src/protocols/msn/msn.c:1541
-#: ../src/protocols/oscar/oscar.c:6192
+#: ../src/protocols/gg/gg.c:640 ../src/protocols/msn/msn.c:1532
+#: ../src/protocols/oscar/oscar.c:3651
 #: ../src/protocols/yahoo/yahoo_profile.c:1066
 msgid "Gender"
 msgstr "Пол"
 
-#: ../src/protocols/gg/gg.c:624
+#: ../src/protocols/gg/gg.c:641
 msgid "Male or female"
 msgstr "Мужчина или женщина"
 
-#: ../src/protocols/gg/gg.c:625 ../src/protocols/oscar/oscar.c:6192
+#: ../src/protocols/gg/gg.c:642 ../src/protocols/oscar/oscar.c:3651
 msgid "Male"
 msgstr "Мужчина"
 
-#: ../src/protocols/gg/gg.c:626 ../src/protocols/oscar/oscar.c:6192
+#: ../src/protocols/gg/gg.c:643 ../src/protocols/oscar/oscar.c:3651
 msgid "Female"
 msgstr "Женщина"
 
-#: ../src/protocols/gg/gg.c:630
+#: ../src/protocols/gg/gg.c:647
 msgid "Only online"
 msgstr "Только в сети"
 
-#: ../src/protocols/gg/gg.c:634 ../src/protocols/gg/gg.c:635
+#: ../src/protocols/gg/gg.c:651 ../src/protocols/gg/gg.c:652
 msgid "Find buddies"
 msgstr "Найти собеседников"
 
-#: ../src/protocols/gg/gg.c:636
+#: ../src/protocols/gg/gg.c:653
 msgid "Please, enter your search criteria below"
 msgstr ""
 
-#: ../src/protocols/gg/gg.c:673
+#: ../src/protocols/gg/gg.c:690
 msgid "Fill in the fields."
 msgstr "Заполните поля."
 
-#: ../src/protocols/gg/gg.c:685
+#: ../src/protocols/gg/gg.c:702
 msgid "Your current password is different from the one that you specified."
 msgstr ""
 
-#: ../src/protocols/gg/gg.c:699
+#: ../src/protocols/gg/gg.c:716
 msgid "Unable to change password. Error occured.\n"
 msgstr "Не удаётся изменить пароль. Произошла ошибка.\n"
 
-#: ../src/protocols/gg/gg.c:708
+#: ../src/protocols/gg/gg.c:725
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Изменить пароль для учётной записи Gadu-Gadu"
 
-#: ../src/protocols/gg/gg.c:709
+#: ../src/protocols/gg/gg.c:726
 msgid "Password was changed successfully!"
 msgstr "Пароль был успешно изменён!"
 
-#: ../src/protocols/gg/gg.c:742
+#: ../src/protocols/gg/gg.c:759
 msgid "Current password"
 msgstr "Текущий пароль"
 
-#: ../src/protocols/gg/gg.c:767
+#: ../src/protocols/gg/gg.c:784
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Введите текущий и новый пароли для UIN: "
 
-#: ../src/protocols/gg/gg.c:771 ../src/protocols/gg/gg.c:772
+#: ../src/protocols/gg/gg.c:788 ../src/protocols/gg/gg.c:789
 msgid "Change Gadu-Gadu Password"
 msgstr "Изменить пароль Gadu-Gadu"
 
-#: ../src/protocols/gg/gg.c:846
+#: ../src/protocols/gg/gg.c:863
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr ""
 
-#: ../src/protocols/gg/gg.c:849 ../src/protocols/gg/gg.c:850
+#: ../src/protocols/gg/gg.c:866 ../src/protocols/gg/gg.c:867
 msgid "Add to chat..."
 msgstr "Добавить к чату..."
 
-#: ../src/protocols/gg/gg.c:993
-#, fuzzy
-msgid "No matching users found"
-msgstr "Несочетаемые узлы"
-
-#: ../src/protocols/gg/gg.c:994
-msgid "There are no users matching your search criteria."
-msgstr ""
-
-#: ../src/protocols/gg/gg.c:1006 ../src/protocols/gg/gg.c:1073
-#: ../src/protocols/oscar/oscar.c:6329
-msgid "Unable to display the search results."
-msgstr "Не удаётся отобразить результаты поиска."
-
-#: ../src/protocols/gg/gg.c:1012 ../src/protocols/oscar/oscar.c:6164
+#: ../src/protocols/gg/gg.c:1029 ../src/protocols/gg/gg.c:1098
+#: ../src/protocols/oscar/oscar.c:3623
 msgid "UIN"
 msgstr "UIN"
 
-#: ../src/protocols/gg/gg.c:1024
-msgid "Birth year"
+#: ../src/protocols/gg/gg.c:1033 ../src/protocols/gg/gg.c:1101
+#: ../src/protocols/jabber/buddy.c:1258 ../src/protocols/jabber/buddy.c:1434
+#: ../src/protocols/oscar/oscar.c:3634 ../src/protocols/silc/ops.c:1024
+msgid "First Name"
+msgstr "Имя"
+
+#: ../src/protocols/gg/gg.c:1052 ../src/protocols/gg/gg.c:1110
+msgid "Birth Year"
 msgstr "Год рождения"
 
-#: ../src/protocols/gg/gg.c:1064
+#: ../src/protocols/gg/gg.c:1092 ../src/protocols/gg/gg.c:1161
+#: ../src/protocols/oscar/oscar.c:3798
+msgid "Unable to display the search results."
+msgstr "Не удаётся отобразить результаты поиска."
+
+#: ../src/protocols/gg/gg.c:1152
 msgid "Gadu-Gadu Public Directory"
 msgstr "Публичный каталог Gadu-Gadu"
 
-#: ../src/protocols/gg/gg.c:1065
+#: ../src/protocols/gg/gg.c:1153
 msgid "Search results"
 msgstr "Результаты поиска"
 
-#: ../src/protocols/gg/gg.c:1162 ../src/protocols/gg/gg.c:1309
+#: ../src/protocols/gg/gg.c:1197
+msgid "No matching users found"
+msgstr "Пользователи не найдены"
+
+#: ../src/protocols/gg/gg.c:1198
+msgid "There are no users matching your search criteria."
+msgstr "Нет пользователей, соответствующих критериям поиска."
+
+#: ../src/protocols/gg/gg.c:1292 ../src/protocols/gg/gg.c:1439
 msgid "Unable to read socket"
 msgstr "Не удаётся прочитать сокет"
 
-#: ../src/protocols/gg/gg.c:1245
+#: ../src/protocols/gg/gg.c:1375
 msgid "Buddy list downloaded"
 msgstr "Список собеседников загружен"
 
-#: ../src/protocols/gg/gg.c:1246
+#: ../src/protocols/gg/gg.c:1376
 msgid "Your buddy list was downloaded from the server."
 msgstr "Список собеседников был загружен с сервера."
 
-#: ../src/protocols/gg/gg.c:1253
+#: ../src/protocols/gg/gg.c:1383
 msgid "Buddy list uploaded"
 msgstr "Список собеседников сохранён"
 
-#: ../src/protocols/gg/gg.c:1254
+#: ../src/protocols/gg/gg.c:1384
 msgid "Your buddy list was stored on the server."
 msgstr "Список собеседников был сохранён на сервере."
 
-#: ../src/protocols/gg/gg.c:1355 ../src/protocols/gg/gg.c:1579
+#: ../src/protocols/gg/gg.c:1485 ../src/protocols/gg/gg.c:1709
 msgid "Connection failed."
 msgstr "Не удалось установить соединение."
 
-#: ../src/protocols/gg/gg.c:1485 ../src/protocols/msn/msn.c:566
+#: ../src/protocols/gg/gg.c:1615 ../src/protocols/msn/msn.c:564
 msgid "Blocked"
 msgstr "Заблокирован"
 
-#: ../src/protocols/gg/gg.c:1508
+#: ../src/protocols/gg/gg.c:1638
 msgid "Add to chat"
 msgstr "Добавить к чату"
 
-#: ../src/protocols/gg/gg.c:1517
+#: ../src/protocols/gg/gg.c:1647
 msgid "Unblock"
 msgstr "Разблокировать"
 
-#: ../src/protocols/gg/gg.c:1521
+#: ../src/protocols/gg/gg.c:1651
 msgid "Block"
 msgstr "Блокировать"
 
-#: ../src/protocols/gg/gg.c:1538
+#: ../src/protocols/gg/gg.c:1668
 msgid "Chat _name:"
 msgstr "_Имя чата:"
 
-#: ../src/protocols/gg/gg.c:1769
+#: ../src/protocols/gg/gg.c:1896
 msgid "Chat error"
 msgstr "Ошибка чата"
 
-#: ../src/protocols/gg/gg.c:1770
+#: ../src/protocols/gg/gg.c:1897
 msgid "This chat name is already in use"
 msgstr "Это имя чата уже используется"
 
-#: ../src/protocols/gg/gg.c:1853
+#: ../src/protocols/gg/gg.c:1980
 msgid "Not connected to the server."
 msgstr "Нет соединения с сервером."
 
-#: ../src/protocols/gg/gg.c:1876
+#: ../src/protocols/gg/gg.c:2003
 msgid "Find buddies..."
 msgstr "Найти собеседников..."
 
-#: ../src/protocols/gg/gg.c:1882
+#: ../src/protocols/gg/gg.c:2009
 msgid "Change password..."
 msgstr "Изменить пароль..."
 
-#: ../src/protocols/gg/gg.c:1888
+#: ../src/protocols/gg/gg.c:2015
 msgid "Upload buddylist to Server"
 msgstr "Сохранить список собеседников на сервере"
 
-#: ../src/protocols/gg/gg.c:1892
+#: ../src/protocols/gg/gg.c:2019
 msgid "Download buddylist from Server"
 msgstr "Загрузить список собеседников с сервера"
 
-#: ../src/protocols/gg/gg.c:1896
+#: ../src/protocols/gg/gg.c:2023
 msgid "Delete buddylist from Server"
 msgstr "Удалить список собеседников с сервера"
 
-#: ../src/protocols/gg/gg.c:1900
+#: ../src/protocols/gg/gg.c:2027
 msgid "Save buddylist to file..."
 msgstr "Сохранить список собеседников в файл..."
 
-#: ../src/protocols/gg/gg.c:1904
+#: ../src/protocols/gg/gg.c:2031
 msgid "Load buddylist from file..."
 msgstr "Загрузить список собеседников из файла..."
 
@@ -5781,32 +5870,32 @@
 #. id
 #. name
 #. version
-#: ../src/protocols/gg/gg.c:2000
+#: ../src/protocols/gg/gg.c:2127
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Модуль протокола Gadu-Gadu"
 
 #. summary
-#: ../src/protocols/gg/gg.c:2001
+#: ../src/protocols/gg/gg.c:2128
 msgid "Polish popular IM"
 msgstr ""
 
-#: ../src/protocols/gg/gg.c:2049
+#: ../src/protocols/gg/gg.c:2176
 msgid "Gadu-Gadu User"
 msgstr "Пользователь Gadu-Gadu"
 
-#: ../src/protocols/irc/cmds.c:43 ../src/protocols/silc/silc.c:1586
+#: ../src/protocols/irc/cmds.c:43 ../src/protocols/silc/silc.c:1585
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Неизвестная команда: %s"
 
-#: ../src/protocols/irc/cmds.c:482 ../src/protocols/jabber/chat.c:592
-#: ../src/protocols/silc/silc.c:1294
+#: ../src/protocols/irc/cmds.c:482 ../src/protocols/jabber/chat.c:590
+#: ../src/protocols/silc/silc.c:1293
 #, c-format
 msgid "current topic is: %s"
 msgstr "текущая тема: %s"
 
-#: ../src/protocols/irc/cmds.c:486 ../src/protocols/jabber/chat.c:596
-#: ../src/protocols/silc/silc.c:1298
+#: ../src/protocols/irc/cmds.c:486 ../src/protocols/jabber/chat.c:594
+#: ../src/protocols/silc/silc.c:1297
 msgid "No topic is set"
 msgstr "Тема не установлена"
 
@@ -5819,7 +5908,7 @@
 
 #: ../src/protocols/irc/dcc_send.c:288 ../src/protocols/irc/dcc_send.c:327
 msgid "Gaim could not open a listening port."
-msgstr "Gaim не удалось открыть порт на прослушивание."
+msgstr "Gaim не удалось открыть порт для прослушивания."
 
 #: ../src/protocols/irc/irc.c:78
 msgid "Error displaying MOTD"
@@ -5859,18 +5948,18 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "Псевдонимы IRC не могут содержать пробелы"
 
-#: ../src/protocols/irc/irc.c:321 ../src/protocols/jabber/jabber.c:550
-#: ../src/protocols/jabber/jabber.c:890
+#: ../src/protocols/irc/irc.c:321 ../src/protocols/jabber/jabber.c:549
+#: ../src/protocols/jabber/jabber.c:888
 msgid "SSL support unavailable"
 msgstr "Поддержка SSL недоступна"
 
-#: ../src/protocols/irc/irc.c:333 ../src/protocols/simple/simple.c:450
-#: ../src/protocols/simple/simple.c:1518
+#: ../src/protocols/irc/irc.c:333 ../src/protocols/simple/simple.c:452
+#: ../src/protocols/simple/simple.c:1521
 msgid "Couldn't create socket"
 msgstr "Не удалось создать сокет"
 
 #: ../src/protocols/irc/irc.c:404 ../src/protocols/jabber/jabber.c:421
-#: ../src/protocols/oscar/oscar.c:1867 ../src/protocols/oscar/oscar.c:1934
+#: ../src/protocols/oscar/oscar.c:1246
 msgid "Couldn't connect to host"
 msgstr "Не удалось соединиться с узлом"
 
@@ -5886,13 +5975,13 @@
 msgid "Read error"
 msgstr "Ошибка чтения"
 
-#: ../src/protocols/irc/irc.c:765 ../src/protocols/silc/chat.c:1420
+#: ../src/protocols/irc/irc.c:765 ../src/protocols/silc/chat.c:1421
 #: ../src/protocols/yahoo/yahoochat.c:1430
 msgid "Users"
 msgstr "Пользователи"
 
-#: ../src/protocols/irc/irc.c:768 ../src/protocols/sametime/sametime.c:3362
-#: ../src/protocols/silc/chat.c:1423 ../src/protocols/silc/ops.c:1380
+#: ../src/protocols/irc/irc.c:768 ../src/protocols/sametime/sametime.c:3354
+#: ../src/protocols/silc/chat.c:1424 ../src/protocols/silc/ops.c:1380
 #: ../src/protocols/yahoo/yahoochat.c:1439
 msgid "Topic"
 msgstr "Тема"
@@ -5915,11 +6004,12 @@
 msgstr "Наименее плохой модуль протокола IRC"
 
 #. host to connect to
-#: ../src/protocols/irc/irc.c:897 ../src/protocols/irc/msgs.c:231
-#: ../src/protocols/jabber/jabber.c:1905
-#: ../src/protocols/napster/napster.c:719
-#: ../src/protocols/sametime/sametime.c:5638 ../src/protocols/silc/ops.c:1242
-#: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1754
+#: ../src/protocols/irc/irc.c:897 ../src/protocols/irc/msgs.c:235
+#: ../src/protocols/jabber/jabber.c:1903 ../src/protocols/msn/msn.c:2044
+#: ../src/protocols/napster/napster.c:719 ../src/protocols/oscar/oscar.c:6467
+#: ../src/protocols/sametime/sametime.c:5630 ../src/protocols/silc/ops.c:1242
+#: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1769
+#: ../src/protocols/toc/toc.c:2340
 msgid "Server"
 msgstr "Сервер"
 
@@ -5927,15 +6017,16 @@
 msgid "Encodings"
 msgstr "Кодировки"
 
-#: ../src/protocols/irc/irc.c:906 ../src/protocols/irc/msgs.c:225
-#: ../src/protocols/jabber/jabber.c:745 ../src/protocols/silc/buddy.c:1531
+#: ../src/protocols/irc/irc.c:906 ../src/protocols/irc/msgs.c:229
+#: ../src/protocols/jabber/jabber.c:744 ../src/protocols/silc/buddy.c:1531
 #: ../src/protocols/silc/ops.c:1189 ../src/protocols/silc/ops.c:1191
 #: ../src/protocols/silc/ops.c:1338 ../src/protocols/silc/ops.c:1340
 #: ../src/protocols/silc/silc.c:933
 msgid "Username"
 msgstr "Имя пользователя"
 
-#: ../src/protocols/irc/irc.c:909
+#: ../src/protocols/irc/irc.c:909 ../src/protocols/irc/msgs.c:230
+#: ../src/protocols/silc/silc.c:937
 msgid "Real name"
 msgstr "Настоящее имя"
 
@@ -5947,160 +6038,159 @@
 msgid "Use SSL"
 msgstr "Использовать SSL"
 
-#: ../src/protocols/irc/msgs.c:103
+#: ../src/protocols/irc/msgs.c:107
 msgid "Bad mode"
 msgstr "Неверный режим"
 
-#: ../src/protocols/irc/msgs.c:114
+#: ../src/protocols/irc/msgs.c:118
 #, c-format
 msgid "You are banned from %s."
 msgstr "Вас выгнали из %s."
 
-#: ../src/protocols/irc/msgs.c:115
+#: ../src/protocols/irc/msgs.c:119
 msgid "Banned"
 msgstr "Изгнан"
 
-#: ../src/protocols/irc/msgs.c:132
+#: ../src/protocols/irc/msgs.c:136
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr ""
 
-#: ../src/protocols/irc/msgs.c:211 ../src/protocols/irc/msgs.c:231
-#: ../src/protocols/irc/msgs.c:244
+#: ../src/protocols/irc/msgs.c:215 ../src/protocols/irc/msgs.c:235
+#: ../src/protocols/irc/msgs.c:248
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../src/protocols/irc/msgs.c:211 ../src/protocols/oscar/oscar.c:6165
+#: ../src/protocols/irc/msgs.c:215 ../src/protocols/oscar/oscar.c:3624
 #: ../src/protocols/silc/ops.c:1412
 msgid "Nick"
 msgstr "Псевдоним"
 
-#: ../src/protocols/irc/msgs.c:214
+#: ../src/protocols/irc/msgs.c:218
 msgid " <i>(ircop)</i>"
 msgstr " <i>(оператор IRC)</i>"
 
-#: ../src/protocols/irc/msgs.c:215
+#: ../src/protocols/irc/msgs.c:219
 msgid " <i>(identified)</i>"
 msgstr " <i>(идентифицирован)</i>"
 
-#: ../src/protocols/irc/msgs.c:219 ../src/protocols/irc/msgs.c:225
-#: ../src/protocols/irc/msgs.c:226 ../src/protocols/irc/msgs.c:237
+#: ../src/protocols/irc/msgs.c:223 ../src/protocols/irc/msgs.c:229
+#: ../src/protocols/irc/msgs.c:230 ../src/protocols/irc/msgs.c:241
 #: ../src/protocols/yahoo/yahoo_profile.c:691
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: ../src/protocols/irc/msgs.c:226 ../src/protocols/silc/ops.c:1183
-#: ../src/protocols/silc/ops.c:1332
-#: ../src/protocols/yahoo/yahoo_profile.c:1046
-msgid "Realname"
-msgstr "Настоящее имя"
-
-#: ../src/protocols/irc/msgs.c:237 ../src/protocols/silc/ops.c:1255
+#: ../src/protocols/irc/msgs.c:241 ../src/protocols/silc/ops.c:1255
 msgid "Currently on"
 msgstr "Сейчас на"
 
-#: ../src/protocols/irc/msgs.c:242
+#: ../src/protocols/irc/msgs.c:246
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>Бездействует:</b> %s<br>"
 
-#: ../src/protocols/irc/msgs.c:244
+#: ../src/protocols/irc/msgs.c:248
 msgid "Online since"
 msgstr "В сети с"
 
-#: ../src/protocols/irc/msgs.c:248
+#: ../src/protocols/irc/msgs.c:252
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr ""
 
-#: ../src/protocols/irc/msgs.c:318
+#: ../src/protocols/irc/msgs.c:329
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s сменил тему на: %s"
 
-#: ../src/protocols/irc/msgs.c:325
+#: ../src/protocols/irc/msgs.c:331
+#, c-format
+msgid "%s has cleared the topic."
+msgstr "%s очистил тему."
+
+#: ../src/protocols/irc/msgs.c:339
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Тема для %s: %s"
 
-#: ../src/protocols/irc/msgs.c:343
+#: ../src/protocols/irc/msgs.c:357
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Неизвестное сообщение '%s'"
 
-#: ../src/protocols/irc/msgs.c:344
+#: ../src/protocols/irc/msgs.c:358
 msgid "Unknown message"
 msgstr "Неизвестное сообщение"
 
-#: ../src/protocols/irc/msgs.c:344
+#: ../src/protocols/irc/msgs.c:358
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim отправил сообщение, которое не понял сервер IRC."
 
-#: ../src/protocols/irc/msgs.c:367
+#: ../src/protocols/irc/msgs.c:381
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Пользователи на %s: %s"
 
-#: ../src/protocols/irc/msgs.c:495
+#: ../src/protocols/irc/msgs.c:509
 msgid "Time Response"
 msgstr "Отклик времени"
 
-#: ../src/protocols/irc/msgs.c:496
+#: ../src/protocols/irc/msgs.c:510
 msgid "The IRC server's local time is:"
 msgstr "Локальное время сервера IRC:"
 
-#: ../src/protocols/irc/msgs.c:507
+#: ../src/protocols/irc/msgs.c:521
 msgid "No such channel"
 msgstr "Нет такого канала"
 
 #. does this happen?
-#: ../src/protocols/irc/msgs.c:518
+#: ../src/protocols/irc/msgs.c:532
 msgid "no such channel"
 msgstr "нет такого канала"
 
-#: ../src/protocols/irc/msgs.c:521
+#: ../src/protocols/irc/msgs.c:535
 msgid "User is not logged in"
 msgstr "Пользователь не в сети"
 
-#: ../src/protocols/irc/msgs.c:526
+#: ../src/protocols/irc/msgs.c:540
 msgid "No such nick or channel"
 msgstr "Нет такого псевдонима или канала"
 
-#: ../src/protocols/irc/msgs.c:546
+#: ../src/protocols/irc/msgs.c:560
 msgid "Could not send"
 msgstr "Не удалось отправить"
 
-#: ../src/protocols/irc/msgs.c:602
+#: ../src/protocols/irc/msgs.c:616
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Присоединение к %s требует приглашения."
 
-#: ../src/protocols/irc/msgs.c:603
+#: ../src/protocols/irc/msgs.c:617
 msgid "Invitation only"
 msgstr "Только по приглашению"
 
-#: ../src/protocols/irc/msgs.c:704
+#: ../src/protocols/irc/msgs.c:718
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Вы были удалены оператором %s: (%s)"
 
 #. Remove user from channel
-#: ../src/protocols/irc/msgs.c:709 ../src/protocols/silc/ops.c:721
+#: ../src/protocols/irc/msgs.c:723 ../src/protocols/silc/ops.c:721
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Удалён оператором %s (%s)"
 
-#: ../src/protocols/irc/msgs.c:732
+#: ../src/protocols/irc/msgs.c:746
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "режим (%s %s) установлен %s"
 
-#: ../src/protocols/irc/msgs.c:817 ../src/protocols/irc/msgs.c:818
+#: ../src/protocols/irc/msgs.c:831 ../src/protocols/irc/msgs.c:832
 msgid "Invalid nickname"
 msgstr "Неверный псевдоним"
 
-#: ../src/protocols/irc/msgs.c:819
+#: ../src/protocols/irc/msgs.c:833
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -6108,7 +6198,7 @@
 "Выбранный вами псевдоним был отвергнут сервером. Вероятно, он содержит "
 "недопустимые символы."
 
-#: ../src/protocols/irc/msgs.c:823
+#: ../src/protocols/irc/msgs.c:837
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -6116,43 +6206,42 @@
 "Выбранное вами имя учётной записи было отвергнуто сервером. Вероятно, оно "
 "содержит недопустимые символы."
 
-#: ../src/protocols/irc/msgs.c:864
+#: ../src/protocols/irc/msgs.c:876
 msgid "Cannot change nick"
 msgstr "Не удаётся изменить псевдоним"
 
-#: ../src/protocols/irc/msgs.c:864
+#: ../src/protocols/irc/msgs.c:876
 msgid "Could not change nick"
 msgstr "Не удалось изменить псевдоним"
 
-#: ../src/protocols/irc/msgs.c:885
+#: ../src/protocols/irc/msgs.c:897
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Вы покинули канал%s%s"
 
-#: ../src/protocols/irc/msgs.c:927
+#: ../src/protocols/irc/msgs.c:939
 msgid "Error: invalid PONG from server"
 msgstr "Ошибка: неверный PONG с сервера"
 
-#: ../src/protocols/irc/msgs.c:929
+#: ../src/protocols/irc/msgs.c:941
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Ответ PING -- задержка: %lu секунд"
 
-#: ../src/protocols/irc/msgs.c:1005
+#: ../src/protocols/irc/msgs.c:1022
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Не удаётся присоединиться к %s:"
 
-#: ../src/protocols/irc/msgs.c:1006 ../src/protocols/silc/ops.c:1128
+#: ../src/protocols/irc/msgs.c:1023 ../src/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Не удаётся присоединиться к каналу"
 
-#: ../src/protocols/irc/msgs.c:1040
-#, fuzzy
+#: ../src/protocols/irc/msgs.c:1057
 msgid "Nick or channel is temporarily unavailable."
-msgstr "Служба временно недоступна."
-
-#: ../src/protocols/irc/msgs.c:1052
+msgstr "Псевдоним или канал временно недоступен."
+
+#: ../src/protocols/irc/msgs.c:1069
 #, c-format
 msgid "Wallops from %s"
 msgstr ""
@@ -6255,7 +6344,7 @@
 "names [канал]:  Вывести список пользователей, присутствующих сейчас на "
 "канале."
 
-#: ../src/protocols/irc/parse.c:129 ../src/protocols/jabber/jabber.c:1743
+#: ../src/protocols/irc/parse.c:129 ../src/protocols/jabber/jabber.c:1741
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;новый псевдоним&gt;:  Изменить свой псевдоним."
 
@@ -6365,9 +6454,8 @@
 msgstr "Ответ CTCP PING"
 
 #: ../src/protocols/irc/parse.c:542 ../src/protocols/irc/parse.c:546
-#: ../src/protocols/oscar/oscar.c:1774 ../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/toc/toc.c:190 ../src/protocols/toc/toc.c:688
+#: ../src/protocols/toc/toc.c:704 ../src/protocols/toc/toc.c:780
 msgid "Disconnected."
 msgstr "Соединение разорвано."
 
@@ -6428,200 +6516,224 @@
 msgid "SASL error"
 msgstr "Ошибка SASL"
 
-#: ../src/protocols/jabber/buddy.c:249 ../src/protocols/jabber/buddy.c:664
+#: ../src/protocols/jabber/buddy.c:249 ../src/protocols/jabber/buddy.c:666
 #: ../src/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "Полное имя"
 
-#: ../src/protocols/jabber/buddy.c:250 ../src/protocols/jabber/buddy.c:677
+#: ../src/protocols/jabber/buddy.c:250 ../src/protocols/jabber/buddy.c:679
 #: ../src/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "Фамилия"
 
-#: ../src/protocols/jabber/buddy.c:251 ../src/protocols/jabber/buddy.c:681
+#: ../src/protocols/jabber/buddy.c:251 ../src/protocols/jabber/buddy.c:683
 msgid "Given Name"
 msgstr "Имя"
 
-#: ../src/protocols/jabber/buddy.c:253 ../src/protocols/jabber/jabber.c:805
+#: ../src/protocols/jabber/buddy.c:253 ../src/protocols/jabber/jabber.c:804
 msgid "URL"
 msgstr "URL"
 
-#: ../src/protocols/jabber/buddy.c:254 ../src/protocols/jabber/buddy.c:733
+#: ../src/protocols/jabber/buddy.c:254 ../src/protocols/jabber/buddy.c:735
 msgid "Street Address"
 msgstr "Адрес"
 
-#: ../src/protocols/jabber/buddy.c:255 ../src/protocols/jabber/buddy.c:729
+#: ../src/protocols/jabber/buddy.c:255 ../src/protocols/jabber/buddy.c:731
 msgid "Extended Address"
 msgstr "Дополнительный адрес"
 
-#: ../src/protocols/jabber/buddy.c:256 ../src/protocols/jabber/buddy.c:737
+#: ../src/protocols/jabber/buddy.c:256 ../src/protocols/jabber/buddy.c:739
 msgid "Locality"
 msgstr "Населённый пункт"
 
-#: ../src/protocols/jabber/buddy.c:257 ../src/protocols/jabber/buddy.c:741
+#: ../src/protocols/jabber/buddy.c:257 ../src/protocols/jabber/buddy.c:743
 msgid "Region"
 msgstr "Регион"
 
-#: ../src/protocols/jabber/buddy.c:258 ../src/protocols/jabber/buddy.c:745
-#: ../src/protocols/jabber/jabber.c:795
+#: ../src/protocols/jabber/buddy.c:258 ../src/protocols/jabber/buddy.c:747
 msgid "Postal Code"
 msgstr "Почтовый код"
 
-#: ../src/protocols/jabber/buddy.c:259 ../src/protocols/jabber/buddy.c:750
+#: ../src/protocols/jabber/buddy.c:259 ../src/protocols/jabber/buddy.c:752
 #: ../src/protocols/silc/silc.c:943
 msgid "Country"
 msgstr "Страна"
 
-#: ../src/protocols/jabber/buddy.c:260 ../src/protocols/jabber/buddy.c:761
-#: ../src/protocols/jabber/buddy.c:768
+#: ../src/protocols/jabber/buddy.c:260 ../src/protocols/jabber/buddy.c:763
+#: ../src/protocols/jabber/buddy.c:770
 msgid "Telephone"
 msgstr "Телефон"
 
-#: ../src/protocols/jabber/buddy.c:262 ../src/protocols/jabber/buddy.c:802
+#: ../src/protocols/jabber/buddy.c:261 ../src/protocols/jabber/buddy.c:781
+#: ../src/protocols/jabber/buddy.c:789 ../src/protocols/jabber/buddy.c:1264
+#: ../src/protocols/silc/ops.c:1075 ../src/protocols/silc/util.c:526
+#: ../src/protocols/yahoo/yahoo_profile.c:1036
+msgid "E-Mail"
+msgstr "E-mail"
+
+#: ../src/protocols/jabber/buddy.c:262 ../src/protocols/jabber/buddy.c:804
 msgid "Organization Name"
 msgstr "Название организации"
 
-#: ../src/protocols/jabber/buddy.c:263 ../src/protocols/jabber/buddy.c:806
+#: ../src/protocols/jabber/buddy.c:263 ../src/protocols/jabber/buddy.c:808
 msgid "Organization Unit"
 msgstr "Отдел"
 
-#: ../src/protocols/jabber/buddy.c:265 ../src/protocols/jabber/buddy.c:815
+#: ../src/protocols/jabber/buddy.c:265 ../src/protocols/jabber/buddy.c:817
 msgid "Role"
 msgstr "Должность"
 
-#: ../src/protocols/jabber/buddy.c:266 ../src/protocols/jabber/buddy.c:698
-#: ../src/protocols/oscar/oscar.c:6198
+#: ../src/protocols/jabber/buddy.c:266 ../src/protocols/jabber/buddy.c:700
+#: ../src/protocols/msn/msn.c:1589 ../src/protocols/oscar/oscar.c:3667
 msgid "Birthday"
 msgstr "Дата рождения"
 
-#: ../src/protocols/jabber/buddy.c:567 ../src/protocols/jabber/buddy.c:568
+#: ../src/protocols/jabber/buddy.c:569 ../src/protocols/jabber/buddy.c:570
 msgid "Edit Jabber vCard"
 msgstr "Изменить Jabber vCard"
 
-#: ../src/protocols/jabber/buddy.c:569
+#: ../src/protocols/jabber/buddy.c:571
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr ""
 "Все нижеследующие пункты необязательны. Заполняйте по своему усмотрению."
 
-#: ../src/protocols/jabber/buddy.c:639 ../src/protocols/jabber/jabber.c:1908
+#: ../src/protocols/jabber/buddy.c:641 ../src/protocols/jabber/jabber.c:1906
 msgid "Resource"
 msgstr "Ресурс"
 
-#: ../src/protocols/jabber/buddy.c:685 ../src/protocols/silc/ops.c:1028
+#: ../src/protocols/jabber/buddy.c:687 ../src/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "Отчество"
 
-#: ../src/protocols/jabber/buddy.c:718 ../src/protocols/jabber/jabber.c:780
-#: ../src/protocols/oscar/oscar.c:6217 ../src/protocols/oscar/oscar.c:6225
+#: ../src/protocols/jabber/buddy.c:720 ../src/protocols/jabber/jabber.c:779
+#: ../src/protocols/oscar/oscar.c:3686 ../src/protocols/oscar/oscar.c:3694
 #: ../src/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "Адрес"
 
-#: ../src/protocols/jabber/buddy.c:725
+#: ../src/protocols/jabber/buddy.c:727
 msgid "P.O. Box"
 msgstr "Индекс"
 
-#: ../src/protocols/jabber/buddy.c:839
+#: ../src/protocols/jabber/buddy.c:841
 msgid "Photo"
 msgstr "Фотография"
 
-#: ../src/protocols/jabber/buddy.c:839
+#: ../src/protocols/jabber/buddy.c:841
 msgid "Logo"
 msgstr "Логотип"
 
-#: ../src/protocols/jabber/buddy.c:1042
+#: ../src/protocols/jabber/buddy.c:1044
 msgid "Un-hide From"
 msgstr "Показаться для"
 
-#: ../src/protocols/jabber/buddy.c:1046
+#: ../src/protocols/jabber/buddy.c:1048
 msgid "Temporarily Hide From"
 msgstr "Временно скрыться от"
 
 #. && NOT ME
-#: ../src/protocols/jabber/buddy.c:1054
+#: ../src/protocols/jabber/buddy.c:1056
 msgid "Cancel Presence Notification"
 msgstr "Отменить уведомление о присутствии"
 
-#: ../src/protocols/jabber/buddy.c:1061
+#: ../src/protocols/jabber/buddy.c:1063
 msgid "(Re-)Request authorization"
 msgstr "(Повторно) Запросить авторизацию"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../src/protocols/jabber/buddy.c:1070
+#: ../src/protocols/jabber/buddy.c:1072
 msgid "Unsubscribe"
 msgstr "Отписаться"
 
-#: ../src/protocols/jabber/buddy.c:1097 ../src/protocols/jabber/chat.c:677
-#: ../src/protocols/jabber/chat.c:688 ../src/protocols/jabber/jabber.c:1165
+#: ../src/protocols/jabber/buddy.c:1099 ../src/protocols/jabber/chat.c:675
+#: ../src/protocols/jabber/chat.c:686 ../src/protocols/jabber/jabber.c:1163
 #: ../src/protocols/silc/ops.c:1449
 msgid "Error"
 msgstr "Ошибка"
 
-#: ../src/protocols/jabber/buddy.c:1103 ../src/protocols/jabber/jabber.c:1190
+#: ../src/protocols/jabber/buddy.c:1105 ../src/protocols/jabber/jabber.c:1188
 msgid "Chatty"
 msgstr "Готов пообщаться"
 
-#: ../src/protocols/jabber/buddy.c:1107 ../src/status.c:159
+#: ../src/protocols/jabber/buddy.c:1109 ../src/status.c:159
 msgid "Extended Away"
 msgstr "Расширенный \"Отошёл\""
 
-#: ../src/protocols/jabber/buddy.c:1109 ../src/protocols/jabber/jabber.c:1220
-#: ../src/protocols/oscar/oscar.c:787 ../src/protocols/oscar/oscar.c:8059
-#: ../src/protocols/sametime/sametime.c:3285
+#: ../src/protocols/jabber/buddy.c:1111 ../src/protocols/jabber/jabber.c:1218
+#: ../src/protocols/oscar/oscar.c:713 ../src/protocols/oscar/oscar.c:5623
+#: ../src/protocols/sametime/sametime.c:3277
 msgid "Do Not Disturb"
 msgstr "Не беспокоить"
 
-#: ../src/protocols/jabber/buddy.c:1289
-msgid "The following are the results of your search"
-msgstr ""
-
-#: ../src/protocols/jabber/buddy.c:1388
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr ""
-
-#: ../src/protocols/jabber/buddy.c:1392 ../src/protocols/jabber/jabber.c:770
-#: ../src/protocols/oscar/oscar.c:6175 ../src/protocols/silc/ops.c:1024
-msgid "First Name"
-msgstr "Имя"
-
-#: ../src/protocols/jabber/buddy.c:1397 ../src/protocols/jabber/jabber.c:775
-#: ../src/protocols/oscar/oscar.c:6176
+#: ../src/protocols/jabber/buddy.c:1256
+msgid "JID"
+msgstr "JID"
+
+#: ../src/protocols/jabber/buddy.c:1260 ../src/protocols/jabber/buddy.c:1439
+#: ../src/protocols/oscar/oscar.c:3635
 msgid "Last Name"
 msgstr "Фамилия"
 
-#: ../src/protocols/jabber/buddy.c:1407
+#: ../src/protocols/jabber/buddy.c:1292
+msgid "The following are the results of your search"
+msgstr "Следующее является результатами вашего поиска"
+
+#. current comment from Jabber User Directory users.jabber.org
+#: ../src/protocols/jabber/buddy.c:1367
+msgid ""
+"Find a contact by entering the search criteria in the given fields. Note: "
+"Each field supports wild card searches (%)"
+msgstr ""
+
+#: ../src/protocols/jabber/buddy.c:1387
+msgid "Directory Query Failed"
+msgstr "Не удалось опросить каталог"
+
+#: ../src/protocols/jabber/buddy.c:1388
+msgid "Could not query the directory server."
+msgstr "Не удалось опросить сервер каталога."
+
+#. Try to translate the message (see static message
+#. list in jabber_user_dir_comments[])
+#: ../src/protocols/jabber/buddy.c:1422
+#, c-format
+msgid "Server Instructions: %s"
+msgstr "Инструкции сервера: %s"
+
+#: ../src/protocols/jabber/buddy.c:1429
+msgid "Fill in one or more fields to search for any matching Jabber users."
+msgstr ""
+
+#: ../src/protocols/jabber/buddy.c:1449 ../src/protocols/novell/novell.c:1488
+#: ../src/protocols/oscar/oscar.c:3637 ../src/protocols/oscar/oscar.c:3644
 msgid "E-Mail Address"
 msgstr "Адрес e-mail"
 
-#: ../src/protocols/jabber/buddy.c:1416 ../src/protocols/jabber/buddy.c:1417
+#: ../src/protocols/jabber/buddy.c:1458 ../src/protocols/jabber/buddy.c:1459
 msgid "Search for Jabber users"
 msgstr "Искать пользователей Jabber"
 
-#: ../src/protocols/jabber/buddy.c:1431
-#, fuzzy
+#: ../src/protocols/jabber/buddy.c:1473
 msgid "Invalid Directory"
-msgstr "Недопустимая ошибка"
-
-#: ../src/protocols/jabber/buddy.c:1448
-#, fuzzy
+msgstr "Неверный каталог"
+
+#: ../src/protocols/jabber/buddy.c:1490
 msgid "Enter a User Directory"
-msgstr "Нельзя отправить каталог."
-
-#: ../src/protocols/jabber/buddy.c:1449
-#, fuzzy
+msgstr "Введите каталог пользователей"
+
+#: ../src/protocols/jabber/buddy.c:1491
 msgid "Select a user directory to search"
-msgstr "Выберите сервер конференций для опроса"
-
-#: ../src/protocols/jabber/buddy.c:1452
-#, fuzzy
+msgstr "Выберите каталог пользователей для поиска"
+
+#: ../src/protocols/jabber/buddy.c:1494
 msgid "Search Directory"
-msgstr "Искать:"
-
-#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:7552
+msgstr "Поиск в каталоге"
+
+#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:5108
 #: ../src/protocols/yahoo/yahoochat.c:998
 msgid "_Room:"
 msgstr "_Комната:"
@@ -6665,44 +6777,44 @@
 msgid "Configuration error"
 msgstr "Ошибка настройки"
 
-#: ../src/protocols/jabber/chat.c:404 ../src/protocols/jabber/chat.c:549
+#: ../src/protocols/jabber/chat.c:404 ../src/protocols/jabber/chat.c:547
 msgid "Unable to configure"
 msgstr "Не удаётся настроить"
 
+#: ../src/protocols/jabber/chat.c:419
+msgid "Room Configuration Error"
+msgstr "Ошибка настройки комнаты"
+
 #: ../src/protocols/jabber/chat.c:420
-msgid "Room Configuration Error"
-msgstr "Ошибка настройки комнаты"
-
-#: ../src/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "Эта комната не имеет возможности настройки"
 
-#: ../src/protocols/jabber/chat.c:471 ../src/protocols/jabber/chat.c:540
+#: ../src/protocols/jabber/chat.c:469 ../src/protocols/jabber/chat.c:538
 msgid "Registration error"
 msgstr "Ошибка регистрации"
 
-#: ../src/protocols/jabber/chat.c:628
+#: ../src/protocols/jabber/chat.c:626
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Изменение псевдонима не поддерживается в чатах не-MUC"
 
-#: ../src/protocols/jabber/chat.c:678 ../src/protocols/jabber/chat.c:689
+#: ../src/protocols/jabber/chat.c:676 ../src/protocols/jabber/chat.c:687
 #: ../src/protocols/silc/ops.c:1449
 msgid "Error retrieving room list"
 msgstr "Ошибка загрузки списка комнат"
 
-#: ../src/protocols/jabber/chat.c:737
+#: ../src/protocols/jabber/chat.c:735
 msgid "Invalid Server"
 msgstr "Неверный сервер"
 
-#: ../src/protocols/jabber/chat.c:775
+#: ../src/protocols/jabber/chat.c:773
 msgid "Enter a Conference Server"
 msgstr "Войти на сервер конференций"
 
-#: ../src/protocols/jabber/chat.c:776
+#: ../src/protocols/jabber/chat.c:774
 msgid "Select a conference server to query"
 msgstr "Выберите сервер конференций для опроса"
 
-#: ../src/protocols/jabber/chat.c:779
+#: ../src/protocols/jabber/chat.c:777
 msgid "Find Rooms"
 msgstr "Искать комнаты"
 
@@ -6719,418 +6831,422 @@
 msgid "Read Error"
 msgstr "Ошибка чтения"
 
-#: ../src/protocols/jabber/jabber.c:474 ../src/protocols/jabber/jabber.c:900
+#: ../src/protocols/jabber/jabber.c:474 ../src/protocols/jabber/jabber.c:898
 msgid "Unable to create socket"
 msgstr "Не удаётся создать сокет"
 
-#: ../src/protocols/jabber/jabber.c:520 ../src/protocols/jabber/jabber.c:857
+#: ../src/protocols/jabber/jabber.c:519 ../src/protocols/jabber/jabber.c:856
 msgid "Invalid Jabber ID"
 msgstr "Неверный Jabber ID"
 
-#: ../src/protocols/jabber/jabber.c:590
+#: ../src/protocols/jabber/jabber.c:589
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Регистрация %s@%s завершена успешно"
 
-#: ../src/protocols/jabber/jabber.c:592 ../src/protocols/jabber/jabber.c:593
+#: ../src/protocols/jabber/jabber.c:591 ../src/protocols/jabber/jabber.c:592
 msgid "Registration Successful"
 msgstr "Регистрация завершена успешно"
 
-#: ../src/protocols/jabber/jabber.c:599 ../src/protocols/jabber/jabber.c:1456
+#: ../src/protocols/jabber/jabber.c:598 ../src/protocols/jabber/jabber.c:1454
 msgid "Unknown Error"
 msgstr "Неизвестная ошибка"
 
-#: ../src/protocols/jabber/jabber.c:601 ../src/protocols/jabber/jabber.c:602
+#: ../src/protocols/jabber/jabber.c:600 ../src/protocols/jabber/jabber.c:601
 msgid "Registration Failed"
 msgstr "Регистрация завершилась неудачно"
 
-#: ../src/protocols/jabber/jabber.c:713 ../src/protocols/jabber/jabber.c:714
+#: ../src/protocols/jabber/jabber.c:712 ../src/protocols/jabber/jabber.c:713
 msgid "Already Registered"
 msgstr "Уже зарегистрировано"
 
-#: ../src/protocols/jabber/jabber.c:790 ../src/protocols/oscar/oscar.c:6219
-#: ../src/protocols/oscar/oscar.c:6227
+#: ../src/protocols/jabber/jabber.c:789 ../src/protocols/oscar/oscar.c:3688
+#: ../src/protocols/oscar/oscar.c:3696
 msgid "State"
 msgstr "Область"
 
-#: ../src/protocols/jabber/jabber.c:800 ../src/protocols/silc/ops.c:1069
-#: ../src/protocols/silc/silc.c:701 ../src/protocols/silc/util.c:514
+#: ../src/protocols/jabber/jabber.c:794
+msgid "Postal code"
+msgstr "Почтовый код"
+
+#: ../src/protocols/jabber/jabber.c:799 ../src/protocols/silc/ops.c:1069
+#: ../src/protocols/silc/silc.c:701 ../src/protocols/silc/util.c:528
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/protocols/jabber/jabber.c:810
+#: ../src/protocols/jabber/jabber.c:809
 msgid "Date"
 msgstr "Дата"
 
-#: ../src/protocols/jabber/jabber.c:818
+#: ../src/protocols/jabber/jabber.c:817
 msgid "Please fill out the information below to register your new account."
 msgstr "Заполните нижеследующие поля для регистрации новой учётной записи."
 
-#: ../src/protocols/jabber/jabber.c:821 ../src/protocols/jabber/jabber.c:822
+#: ../src/protocols/jabber/jabber.c:820 ../src/protocols/jabber/jabber.c:821
 msgid "Register New Jabber Account"
 msgstr "Зарегистрировать новую учётную запись Jabber"
 
-#: ../src/protocols/jabber/jabber.c:983
+#: ../src/protocols/jabber/jabber.c:981
 msgid "Initializing Stream"
 msgstr "Инициализация потока"
 
-#: ../src/protocols/jabber/jabber.c:989 ../src/protocols/msn/session.c:355
+#: ../src/protocols/jabber/jabber.c:987 ../src/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "Аутентификация"
 
-#: ../src/protocols/jabber/jabber.c:998
+#: ../src/protocols/jabber/jabber.c:996
 msgid "Re-initializing Stream"
 msgstr "Повторная инициализация потока"
 
-#: ../src/protocols/jabber/jabber.c:1069 ../src/protocols/jabber/jabber.c:1434
-#: ../src/protocols/jabber/jabber.c:1475 ../src/protocols/jabber/jabber.c:1509
-#: ../src/protocols/oscar/oscar.c:856 ../src/protocols/oscar/oscar.c:7849
+#: ../src/protocols/jabber/jabber.c:1067 ../src/protocols/jabber/jabber.c:1432
+#: ../src/protocols/jabber/jabber.c:1473 ../src/protocols/jabber/jabber.c:1507
+#: ../src/protocols/oscar/oscar.c:782 ../src/protocols/oscar/oscar.c:5414
 msgid "Not Authorized"
 msgstr "Не авторизован"
 
-#: ../src/protocols/jabber/jabber.c:1111
+#: ../src/protocols/jabber/jabber.c:1109
 msgid "Both"
 msgstr "Обе"
 
-#: ../src/protocols/jabber/jabber.c:1113
+#: ../src/protocols/jabber/jabber.c:1111
 msgid "From (To pending)"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1118
+#: ../src/protocols/jabber/jabber.c:1116
 msgid "To"
 msgstr "Для"
 
-#: ../src/protocols/jabber/jabber.c:1120
+#: ../src/protocols/jabber/jabber.c:1118
 msgid "None (To pending)"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1124
+#: ../src/protocols/jabber/jabber.c:1122
 msgid "Subscription"
 msgstr "Подписка"
 
-#: ../src/protocols/jabber/jabber.c:1181 ../src/protocols/jabber/jabber.c:1191
-#: ../src/protocols/jabber/jabber.c:1201 ../src/protocols/jabber/jabber.c:1211
-#: ../src/protocols/jabber/jabber.c:1221
+#: ../src/protocols/jabber/jabber.c:1179 ../src/protocols/jabber/jabber.c:1189
+#: ../src/protocols/jabber/jabber.c:1199 ../src/protocols/jabber/jabber.c:1209
+#: ../src/protocols/jabber/jabber.c:1219
 msgid "Priority"
 msgstr "Приоритет"
 
-#: ../src/protocols/jabber/jabber.c:1250
+#: ../src/protocols/jabber/jabber.c:1248
 msgid "Password Changed"
 msgstr "Пароль изменён"
 
-#: ../src/protocols/jabber/jabber.c:1251
+#: ../src/protocols/jabber/jabber.c:1249
 msgid "Your password has been changed."
 msgstr "Пароль был изменён."
 
-#: ../src/protocols/jabber/jabber.c:1255 ../src/protocols/jabber/jabber.c:1256
+#: ../src/protocols/jabber/jabber.c:1253 ../src/protocols/jabber/jabber.c:1254
 msgid "Error changing password"
 msgstr "Ошибка изменения пароля"
 
-#: ../src/protocols/jabber/jabber.c:1312
+#: ../src/protocols/jabber/jabber.c:1310
 msgid "Password (again)"
 msgstr "Пароль (ещё раз)"
 
-#: ../src/protocols/jabber/jabber.c:1317 ../src/protocols/jabber/jabber.c:1318
+#: ../src/protocols/jabber/jabber.c:1315 ../src/protocols/jabber/jabber.c:1316
 msgid "Change Jabber Password"
 msgstr "Изменить пароль Jabber"
 
-#: ../src/protocols/jabber/jabber.c:1318
+#: ../src/protocols/jabber/jabber.c:1316
 msgid "Please enter your new password"
 msgstr "Введите новый пароль"
 
-#: ../src/protocols/jabber/jabber.c:1328 ../src/protocols/oscar/oscar.c:8483
+#: ../src/protocols/jabber/jabber.c:1326 ../src/protocols/oscar/oscar.c:6184
 #: ../src/protocols/silc/silc.c:1023
 msgid "Set User Info..."
 msgstr "Установить пользовательскую информацию..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../src/protocols/jabber/jabber.c:1333 ../src/protocols/oscar/oscar.c:8494
+#: ../src/protocols/jabber/jabber.c:1331 ../src/protocols/oscar/oscar.c:6195
 #: ../src/protocols/silc/silc.c:1019
 msgid "Change Password..."
 msgstr "Изменить пароль..."
 
 #. }
-#: ../src/protocols/jabber/jabber.c:1338
+#: ../src/protocols/jabber/jabber.c:1336
 msgid "Search for Users..."
 msgstr "Искать пользователей..."
 
+#: ../src/protocols/jabber/jabber.c:1412
+msgid "Bad Request"
+msgstr "Неверный запрос"
+
 #: ../src/protocols/jabber/jabber.c:1414
-msgid "Bad Request"
-msgstr "Неверный запрос"
-
-#: ../src/protocols/jabber/jabber.c:1416
 msgid "Conflict"
 msgstr "Конфликт"
 
-#: ../src/protocols/jabber/jabber.c:1418
+#: ../src/protocols/jabber/jabber.c:1416
 msgid "Feature Not Implemented"
 msgstr "Функция не реализована"
 
+#: ../src/protocols/jabber/jabber.c:1418
+msgid "Forbidden"
+msgstr "Запрещено"
+
 #: ../src/protocols/jabber/jabber.c:1420
-msgid "Forbidden"
-msgstr "Запрещено"
-
-#: ../src/protocols/jabber/jabber.c:1422
 msgid "Gone"
 msgstr "Ушёл"
 
-#: ../src/protocols/jabber/jabber.c:1424 ../src/protocols/jabber/jabber.c:1499
+#: ../src/protocols/jabber/jabber.c:1422 ../src/protocols/jabber/jabber.c:1497
 msgid "Internal Server Error"
 msgstr "Внутренняя ошибка сервера"
 
+#: ../src/protocols/jabber/jabber.c:1424
+msgid "Item Not Found"
+msgstr "Элемент не найден"
+
 #: ../src/protocols/jabber/jabber.c:1426
-msgid "Item Not Found"
-msgstr "Элемент не найден"
-
-#: ../src/protocols/jabber/jabber.c:1428
 msgid "Malformed Jabber ID"
 msgstr "Неверный Jabber ID"
 
-#: ../src/protocols/jabber/jabber.c:1430
+#: ../src/protocols/jabber/jabber.c:1428
 msgid "Not Acceptable"
 msgstr "Недопустимо"
 
-#: ../src/protocols/jabber/jabber.c:1432
+#: ../src/protocols/jabber/jabber.c:1430
 msgid "Not Allowed"
 msgstr "Не разрешено"
 
-#: ../src/protocols/jabber/jabber.c:1436
+#: ../src/protocols/jabber/jabber.c:1434
 msgid "Payment Required"
 msgstr "Требуется плата"
 
-#: ../src/protocols/jabber/jabber.c:1438
+#: ../src/protocols/jabber/jabber.c:1436
 msgid "Recipient Unavailable"
 msgstr "Получатель недоступен"
 
+#: ../src/protocols/jabber/jabber.c:1440
+msgid "Registration Required"
+msgstr "Требуется регистрация"
+
 #: ../src/protocols/jabber/jabber.c:1442
-msgid "Registration Required"
-msgstr "Требуется регистрация"
-
-#: ../src/protocols/jabber/jabber.c:1444
 msgid "Remote Server Not Found"
 msgstr "Удалённый сервер не найден"
 
-#: ../src/protocols/jabber/jabber.c:1446
+#: ../src/protocols/jabber/jabber.c:1444
 msgid "Remote Server Timeout"
 msgstr "Истекло время ожидания удалённого сервера"
 
+#: ../src/protocols/jabber/jabber.c:1446
+msgid "Server Overloaded"
+msgstr "Сервер перегружен"
+
 #: ../src/protocols/jabber/jabber.c:1448
-msgid "Server Overloaded"
-msgstr "Сервер перегружен"
+msgid "Service Unavailable"
+msgstr "Служба недоступна"
 
 #: ../src/protocols/jabber/jabber.c:1450
-msgid "Service Unavailable"
-msgstr "Служба недоступна"
+msgid "Subscription Required"
+msgstr "Требуется подписка"
 
 #: ../src/protocols/jabber/jabber.c:1452
-msgid "Subscription Required"
-msgstr "Требуется подписка"
-
-#: ../src/protocols/jabber/jabber.c:1454
 msgid "Unexpected Request"
 msgstr "Непредвиденный запрос"
 
-#: ../src/protocols/jabber/jabber.c:1461
+#: ../src/protocols/jabber/jabber.c:1459
 msgid "Authorization Aborted"
 msgstr "Авторизация прервана"
 
-#: ../src/protocols/jabber/jabber.c:1463
+#: ../src/protocols/jabber/jabber.c:1461
 msgid "Incorrect encoding in authorization"
 msgstr "Некорректная кодировка в авторизации"
 
-#: ../src/protocols/jabber/jabber.c:1466
+#: ../src/protocols/jabber/jabber.c:1464
 msgid "Invalid authzid"
 msgstr "Неверный идентификатор авторизации"
 
-#: ../src/protocols/jabber/jabber.c:1469
+#: ../src/protocols/jabber/jabber.c:1467
 msgid "Invalid Authorization Mechanism"
 msgstr "Неверный механизм авторизации"
 
-#: ../src/protocols/jabber/jabber.c:1472
+#: ../src/protocols/jabber/jabber.c:1470
 msgid "Authorization mechanism too weak"
 msgstr "Механизм авторизации слишком слаб"
 
-#: ../src/protocols/jabber/jabber.c:1477
+#: ../src/protocols/jabber/jabber.c:1475
 msgid "Temporary Authentication Failure"
 msgstr "Временная ошибка аутентификации"
 
-#: ../src/protocols/jabber/jabber.c:1480
+#: ../src/protocols/jabber/jabber.c:1478
 msgid "Authentication Failure"
 msgstr "Ошибка аутентификации"
 
-#: ../src/protocols/jabber/jabber.c:1484
+#: ../src/protocols/jabber/jabber.c:1482
 msgid "Bad Format"
 msgstr "Неверный формат"
 
-#: ../src/protocols/jabber/jabber.c:1486
+#: ../src/protocols/jabber/jabber.c:1484
 msgid "Bad Namespace Prefix"
 msgstr "Неверный префикс пространства имён"
 
-#: ../src/protocols/jabber/jabber.c:1489
+#: ../src/protocols/jabber/jabber.c:1487
 msgid "Resource Conflict"
 msgstr "Конфликт ресурсов"
 
-#: ../src/protocols/jabber/jabber.c:1491 ../src/protocols/silc/ops.c:1728
+#: ../src/protocols/jabber/jabber.c:1489 ../src/protocols/silc/ops.c:1728
 msgid "Connection Timeout"
 msgstr "Истекло время ожидания соединения"
 
+#: ../src/protocols/jabber/jabber.c:1491
+msgid "Host Gone"
+msgstr "Узел ушёл"
+
 #: ../src/protocols/jabber/jabber.c:1493
-msgid "Host Gone"
-msgstr "Узел ушёл"
+msgid "Host Unknown"
+msgstr "Узел неизвестен"
 
 #: ../src/protocols/jabber/jabber.c:1495
-msgid "Host Unknown"
-msgstr "Узел неизвестен"
-
-#: ../src/protocols/jabber/jabber.c:1497
 msgid "Improper Addressing"
 msgstr "Неправильная адресация"
 
+#: ../src/protocols/jabber/jabber.c:1499
+msgid "Invalid ID"
+msgstr "Неверный ID"
+
 #: ../src/protocols/jabber/jabber.c:1501
-msgid "Invalid ID"
-msgstr "Неверный ID"
-
-#: ../src/protocols/jabber/jabber.c:1503
 msgid "Invalid Namespace"
 msgstr "Неверное пространство имён"
 
-#: ../src/protocols/jabber/jabber.c:1505
+#: ../src/protocols/jabber/jabber.c:1503
 msgid "Invalid XML"
 msgstr "Неверный XML"
 
-#: ../src/protocols/jabber/jabber.c:1507
+#: ../src/protocols/jabber/jabber.c:1505
 msgid "Non-matching Hosts"
 msgstr "Несочетаемые узлы"
 
-#: ../src/protocols/jabber/jabber.c:1511
+#: ../src/protocols/jabber/jabber.c:1509
 msgid "Policy Violation"
 msgstr "Нарушение правил"
 
+#: ../src/protocols/jabber/jabber.c:1511
+msgid "Remote Connection Failed"
+msgstr "Не удалось установить удалённое соединение"
+
 #: ../src/protocols/jabber/jabber.c:1513
-msgid "Remote Connection Failed"
-msgstr "Не удалось установить удалённое соединение"
-
-#: ../src/protocols/jabber/jabber.c:1515
 msgid "Resource Constraint"
 msgstr "Недостаток ресурсов"
 
-#: ../src/protocols/jabber/jabber.c:1517
+#: ../src/protocols/jabber/jabber.c:1515
 msgid "Restricted XML"
 msgstr "Ограниченный XML"
 
+#: ../src/protocols/jabber/jabber.c:1517
+msgid "See Other Host"
+msgstr "Обратитесь к другому узлу"
+
 #: ../src/protocols/jabber/jabber.c:1519
-msgid "See Other Host"
-msgstr "Обратитесь к другому узлу"
+msgid "System Shutdown"
+msgstr "Выключение системы"
 
 #: ../src/protocols/jabber/jabber.c:1521
-msgid "System Shutdown"
-msgstr "Выключение системы"
+msgid "Undefined Condition"
+msgstr "Неопределённое состояние"
 
 #: ../src/protocols/jabber/jabber.c:1523
-msgid "Undefined Condition"
-msgstr "Неопределённое состояние"
+msgid "Unsupported Encoding"
+msgstr "Неподдерживаемая кодировка"
 
 #: ../src/protocols/jabber/jabber.c:1525
-msgid "Unsupported Encoding"
-msgstr "Неподдерживаемая кодировка"
+msgid "Unsupported Stanza Type"
+msgstr "Неподдерживаемый тип строфы"
 
 #: ../src/protocols/jabber/jabber.c:1527
-msgid "Unsupported Stanza Type"
-msgstr "Неподдерживаемый тип строфы"
+msgid "Unsupported Version"
+msgstr "Неподдерживаемая версия"
 
 #: ../src/protocols/jabber/jabber.c:1529
-msgid "Unsupported Version"
-msgstr "Неподдерживаемая версия"
-
-#: ../src/protocols/jabber/jabber.c:1531
 msgid "XML Not Well Formed"
 msgstr "XML не сформирован должным образом"
 
-#: ../src/protocols/jabber/jabber.c:1533
+#: ../src/protocols/jabber/jabber.c:1531
 msgid "Stream Error"
 msgstr "Ошибка потока"
 
-#: ../src/protocols/jabber/jabber.c:1600
+#: ../src/protocols/jabber/jabber.c:1598
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Не удаётся выгнать пользователя %s"
 
-#: ../src/protocols/jabber/jabber.c:1620
-#, fuzzy, c-format
+#: ../src/protocols/jabber/jabber.c:1618
+#, c-format
 msgid "Unknown affiliation: \"%s\""
-msgstr "Неизвестная команда: %s"
-
-#: ../src/protocols/jabber/jabber.c:1625
-#, fuzzy, c-format
+msgstr ""
+
+#: ../src/protocols/jabber/jabber.c:1623
+#, c-format
 msgid "Unable to affiliate user %s as \"%s\""
-msgstr "Не удаётся пригласить пользователя (%s)."
-
-#: ../src/protocols/jabber/jabber.c:1644
-#, fuzzy, c-format
+msgstr ""
+
+#: ../src/protocols/jabber/jabber.c:1642
+#, c-format
 msgid "Unknown role: \"%s\""
-msgstr "Неизвестная команда: %s"
-
-#: ../src/protocols/jabber/jabber.c:1651
-#, fuzzy, c-format
+msgstr ""
+
+#: ../src/protocols/jabber/jabber.c:1649
+#, c-format
 msgid "Unable to set role \"%s\" for user: %s"
-msgstr "Не удаётся отправить сообщение: %s"
-
-#: ../src/protocols/jabber/jabber.c:1704
+msgstr ""
+
+#: ../src/protocols/jabber/jabber.c:1702
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Не удаётся удалить пользователя %s"
 
-#: ../src/protocols/jabber/jabber.c:1735
+#: ../src/protocols/jabber/jabber.c:1733
 msgid "config:  Configure a chat room."
 msgstr "config:  Настроить комнату."
 
-#: ../src/protocols/jabber/jabber.c:1739
+#: ../src/protocols/jabber/jabber.c:1737
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Настроить комнату."
 
-#: ../src/protocols/jabber/jabber.c:1748
+#: ../src/protocols/jabber/jabber.c:1746
 msgid "part [room]:  Leave the room."
 msgstr "part [комната]:  Покинуть комнату."
 
-#: ../src/protocols/jabber/jabber.c:1753
+#: ../src/protocols/jabber/jabber.c:1751
 msgid "register:  Register with a chat room."
 msgstr "register:  Зарегистрировать комнату."
 
-#: ../src/protocols/jabber/jabber.c:1759
+#: ../src/protocols/jabber/jabber.c:1757
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [новая тема]:  Просмотреть или изменить тему."
 
-#: ../src/protocols/jabber/jabber.c:1765
+#: ../src/protocols/jabber/jabber.c:1763
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;пользователь&gt; [комната]:  Выгнать пользователя из комнаты."
 
-#: ../src/protocols/jabber/jabber.c:1771
+#: ../src/protocols/jabber/jabber.c:1769
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1777
+#: ../src/protocols/jabber/jabber.c:1775
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1783
+#: ../src/protocols/jabber/jabber.c:1781
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
 "invite &lt;пользователь&gt; [сообщение]:  Пригласить пользователя в комнату."
 
-#: ../src/protocols/jabber/jabber.c:1789
+#: ../src/protocols/jabber/jabber.c:1787
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr ""
 "join: &lt;комната&gt; [сервер]:  Присоединиться к чату на этом сервере."
 
-#: ../src/protocols/jabber/jabber.c:1795
+#: ../src/protocols/jabber/jabber.c:1793
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;пользователь&gt; [комната]:  Удалить пользователя из комнаты."
 
-#: ../src/protocols/jabber/jabber.c:1800
+#: ../src/protocols/jabber/jabber.c:1798
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
@@ -7147,60 +7263,60 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/jabber/jabber.c:1883 ../src/protocols/jabber/jabber.c:1885
+#: ../src/protocols/jabber/jabber.c:1881 ../src/protocols/jabber/jabber.c:1883
 msgid "Jabber Protocol Plugin"
 msgstr "Модуль протокола Jabber"
 
-#: ../src/protocols/jabber/jabber.c:1911
+#: ../src/protocols/jabber/jabber.c:1909
 msgid "Use TLS if available"
 msgstr "Использовать TLS, если доступно"
 
-#: ../src/protocols/jabber/jabber.c:1916
+#: ../src/protocols/jabber/jabber.c:1914
 msgid "Require TLS"
 msgstr "Требовать TLS"
 
-#: ../src/protocols/jabber/jabber.c:1919
+#: ../src/protocols/jabber/jabber.c:1917
 msgid "Force old (port 5223) SSL"
 msgstr "Принудительно использовать старый (порт 5223) SSL"
 
-#: ../src/protocols/jabber/jabber.c:1924
+#: ../src/protocols/jabber/jabber.c:1922
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Разрешить идентификацию простым текстом через нешифрованные потоки"
 
-#: ../src/protocols/jabber/jabber.c:1929 ../src/protocols/simple/simple.c:1760
+#: ../src/protocols/jabber/jabber.c:1927 ../src/protocols/simple/simple.c:1775
 msgid "Connect port"
 msgstr "Соединяться на порт"
 
 #. Account options
-#: ../src/protocols/jabber/jabber.c:1933 ../src/protocols/silc/silc.c:1855
+#: ../src/protocols/jabber/jabber.c:1931 ../src/protocols/silc/silc.c:1854
 msgid "Connect server"
 msgstr "Соединяться с сервером"
 
-#: ../src/protocols/jabber/message.c:108
+#: ../src/protocols/jabber/message.c:117
 #, c-format
 msgid "Message from %s"
 msgstr "Сообщение от %s"
 
-#: ../src/protocols/jabber/message.c:172
+#: ../src/protocols/jabber/message.c:181
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s установил тему: %s"
 
-#: ../src/protocols/jabber/message.c:174
+#: ../src/protocols/jabber/message.c:183
 #, c-format
 msgid "The topic is: %s"
 msgstr "Тема: %s"
 
-#: ../src/protocols/jabber/message.c:224
+#: ../src/protocols/jabber/message.c:233
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Не удалось доставить сообщение для %s: %s"
 
-#: ../src/protocols/jabber/message.c:227
+#: ../src/protocols/jabber/message.c:236
 msgid "Jabber Message Error"
 msgstr "Ошибка сообщения Jabber"
 
-#: ../src/protocols/jabber/message.c:295
+#: ../src/protocols/jabber/message.c:319
 #, c-format
 msgid " (Code %s)"
 msgstr " (Код %s)"
@@ -7218,13 +7334,13 @@
 msgid "The user %s wants to add %s to his or her buddy list."
 msgstr "Пользователь %s хочет добавить %s в свой список собеседников."
 
-#: ../src/protocols/jabber/presence.c:323 ../src/protocols/oscar/oscar.c:4805
-#: ../src/protocols/oscar/oscar.c:7482
+#: ../src/protocols/jabber/presence.c:323 ../src/protocols/oscar/oscar.c:2381
+#: ../src/protocols/oscar/oscar.c:5039
 msgid "_Authorize"
 msgstr "_Авторизовать"
 
-#: ../src/protocols/jabber/presence.c:324 ../src/protocols/oscar/oscar.c:4807
-#: ../src/protocols/oscar/oscar.c:7483
+#: ../src/protocols/jabber/presence.c:324 ../src/protocols/oscar/oscar.c:2383
+#: ../src/protocols/oscar/oscar.c:5040
 msgid "_Deny"
 msgstr "_Отказать"
 
@@ -7388,7 +7504,7 @@
 msgid "Too many hits to a FND"
 msgstr "Слишком много попаданий в FND"
 
-#: ../src/protocols/msn/error.c:112 ../src/protocols/oscar/oscar.c:207
+#: ../src/protocols/msn/error.c:112 ../src/protocols/oscar/oscar.c:148
 msgid "Not logged in"
 msgstr "Не в сети"
 
@@ -7481,7 +7597,7 @@
 msgid "Server too busy"
 msgstr "Сервер слишком занят"
 
-#: ../src/protocols/msn/error.c:198 ../src/protocols/oscar/oscar.c:2929
+#: ../src/protocols/msn/error.c:198 ../src/protocols/oscar/oscar.c:1331
 #: ../src/protocols/silc/ops.c:1717 ../src/protocols/toc/toc.c:722
 msgid "Authentication failed"
 msgstr "Аутентификация завершилась неудачно"
@@ -7574,9 +7690,9 @@
 msgid "Page"
 msgstr "Страница"
 
-#: ../src/protocols/msn/msn.c:550 ../src/protocols/msn/msn.c:557
-#: ../src/protocols/msn/msn.c:566 ../src/protocols/sametime/sametime.c:3247
-#: ../src/protocols/yahoo/yahoo.c:2882 ../src/protocols/yahoo/yahoo.c:2888
+#: ../src/protocols/msn/msn.c:548 ../src/protocols/msn/msn.c:555
+#: ../src/protocols/msn/msn.c:564 ../src/protocols/sametime/sametime.c:3239
+#: ../src/protocols/yahoo/yahoo.c:2878 ../src/protocols/yahoo/yahoo.c:2884
 #, c-format
 msgid ""
 "\n"
@@ -7585,69 +7701,69 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: ../src/protocols/msn/msn.c:557
+#: ../src/protocols/msn/msn.c:555
 msgid "Has you"
 msgstr ""
 
-#: ../src/protocols/msn/msn.c:587 ../src/protocols/msn/state.c:33
-#: ../src/protocols/yahoo/yahoo.c:2711 ../src/protocols/yahoo/yahoo.c:3290
+#: ../src/protocols/msn/msn.c:585 ../src/protocols/msn/state.c:33
+#: ../src/protocols/yahoo/yahoo.c:2707 ../src/protocols/yahoo/yahoo.c:3292
 msgid "Be Right Back"
 msgstr "Скоро вернусь"
 
-#: ../src/protocols/msn/msn.c:591 ../src/protocols/msn/state.c:31
-#: ../src/protocols/novell/novell.c:2851 ../src/protocols/novell/novell.c:2985
+#: ../src/protocols/msn/msn.c:589 ../src/protocols/msn/state.c:31
+#: ../src/protocols/novell/novell.c:2849 ../src/protocols/novell/novell.c:2983
 #: ../src/protocols/silc/buddy.c:1473 ../src/protocols/silc/silc.c:53
-#: ../src/protocols/yahoo/yahoo.c:2713 ../src/protocols/yahoo/yahoo.c:3293
+#: ../src/protocols/yahoo/yahoo.c:2709 ../src/protocols/yahoo/yahoo.c:3295
 msgid "Busy"
 msgstr "Занят"
 
-#: ../src/protocols/msn/msn.c:595 ../src/protocols/yahoo/yahoo.c:2721
-#: ../src/protocols/yahoo/yahoo.c:3305
+#: ../src/protocols/msn/msn.c:593 ../src/protocols/yahoo/yahoo.c:2717
+#: ../src/protocols/yahoo/yahoo.c:3307
 msgid "On the Phone"
 msgstr "Разговариваю по телефону"
 
-#: ../src/protocols/msn/msn.c:599 ../src/protocols/yahoo/yahoo.c:2725
-#: ../src/protocols/yahoo/yahoo.c:3311
+#: ../src/protocols/msn/msn.c:597 ../src/protocols/yahoo/yahoo.c:2721
+#: ../src/protocols/yahoo/yahoo.c:3313
 msgid "Out to Lunch"
 msgstr "Пошёл перекусить"
 
-#: ../src/protocols/msn/msn.c:623
+#: ../src/protocols/msn/msn.c:621
 msgid "Set Friendly Name..."
 msgstr "Ввести дружеское имя..."
 
-#: ../src/protocols/msn/msn.c:628
+#: ../src/protocols/msn/msn.c:626
 msgid "Set Home Phone Number..."
 msgstr "Ввести номер домашнего телефона..."
 
-#: ../src/protocols/msn/msn.c:632
+#: ../src/protocols/msn/msn.c:630
 msgid "Set Work Phone Number..."
 msgstr "Ввести номер рабочего телефона..."
 
-#: ../src/protocols/msn/msn.c:636
+#: ../src/protocols/msn/msn.c:634
 msgid "Set Mobile Phone Number..."
 msgstr "Ввести номер мобильного телефона..."
 
-#: ../src/protocols/msn/msn.c:642
+#: ../src/protocols/msn/msn.c:640
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Разрешить/запретить мобильные устройства..."
 
-#: ../src/protocols/msn/msn.c:647
+#: ../src/protocols/msn/msn.c:645
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Разрешить/запретить мобильные страницы..."
 
-#: ../src/protocols/msn/msn.c:657
+#: ../src/protocols/msn/msn.c:655
 msgid "Open Hotmail Inbox"
 msgstr ""
 
-#: ../src/protocols/msn/msn.c:681
+#: ../src/protocols/msn/msn.c:679
 msgid "Send to Mobile"
 msgstr ""
 
-#: ../src/protocols/msn/msn.c:691 ../src/protocols/novell/novell.c:3441
+#: ../src/protocols/msn/msn.c:689 ../src/protocols/novell/novell.c:3439
 msgid "Initiate _Chat"
 msgstr "Создать _чат"
 
-#: ../src/protocols/msn/msn.c:729
+#: ../src/protocols/msn/msn.c:727
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -7655,99 +7771,249 @@
 "Поддержка SSL необходима для MSN. Установите поддерживаемую библиотеку SSL. "
 "За дополнительной информацией обращайтесь на http://gaim.sf.net/faq-ssl.php."
 
-#: ../src/protocols/msn/msn.c:757
+#: ../src/protocols/msn/msn.c:755
 msgid "Failed to connect to server."
 msgstr "Не удалось соединиться с сервером."
 
-#: ../src/protocols/msn/msn.c:1366 ../src/protocols/yahoo/yahoo_profile.c:685
+#: ../src/protocols/msn/msn.c:1361 ../src/protocols/yahoo/yahoo_profile.c:685
 #: ../src/protocols/zephyr/zephyr.c:736 ../src/protocols/zephyr/zephyr.c:1153
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Псевдоним:</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: ../src/protocols/msn/msn.c:1373 ../src/protocols/msn/msn.c:1825
-#: ../src/protocols/yahoo/yahoo_profile.c:1208 ../src/util.c:1055
+#: ../src/protocols/msn/msn.c:1368 ../src/protocols/yahoo/yahoo_profile.c:1208
+#: ../src/util.c:1061
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b> "
 
-#: ../src/protocols/msn/msn.c:1465
+#: ../src/protocols/msn/msn.c:1458
 msgid "MSN Profile"
 msgstr "Профиль MSN"
 
-#: ../src/protocols/msn/msn.c:1470 ../src/protocols/msn/msn.c:1809
+#: ../src/protocols/msn/msn.c:1463 ../src/protocols/msn/msn.c:1789
 #: ../src/protocols/yahoo/yahoo_profile.c:795
 msgid "Error retrieving profile"
 msgstr "Ошибка загрузки профиля"
 
-#: ../src/protocols/msn/msn.c:1540 ../src/protocols/oscar/oscar.c:6204
+#: ../src/protocols/msn/msn.c:1531 ../src/protocols/oscar/oscar.c:3673
 #: ../src/protocols/yahoo/yahoo_profile.c:1056
 msgid "Age"
 msgstr "Возраст"
 
-#: ../src/protocols/msn/msn.c:1542 ../src/protocols/yahoo/yahoo_profile.c:1071
+#: ../src/protocols/msn/msn.c:1533 ../src/protocols/yahoo/yahoo_profile.c:1071
 msgid "Occupation"
 msgstr "Занятость"
 
-#: ../src/protocols/msn/msn.c:1543 ../src/protocols/novell/novell.c:1480
+#: ../src/protocols/msn/msn.c:1534 ../src/protocols/novell/novell.c:1478
 #: ../src/protocols/yahoo/yahoo_profile.c:1051
 msgid "Location"
 msgstr "Местоположение"
 
-#: ../src/protocols/msn/msn.c:1548 ../src/protocols/msn/msn.c:1738
-#: ../src/protocols/msn/msn.c:1744 ../src/protocols/msn/msn.c:1751
+#: ../src/protocols/msn/msn.c:1539 ../src/protocols/msn/msn.c:1718
+#: ../src/protocols/msn/msn.c:1724 ../src/protocols/msn/msn.c:1731
 msgid "Hobbies and Interests"
 msgstr "Хобби и интересы"
 
-#: ../src/protocols/msn/msn.c:1554 ../src/protocols/msn/msn.c:1672
-#: ../src/protocols/msn/msn.c:1678 ../src/protocols/msn/msn.c:1685
-#: ../src/protocols/msn/msn.c:1693 ../src/protocols/msn/msn.c:1700
+#: ../src/protocols/msn/msn.c:1545 ../src/protocols/msn/msn.c:1652
+#: ../src/protocols/msn/msn.c:1658 ../src/protocols/msn/msn.c:1665
+#: ../src/protocols/msn/msn.c:1673 ../src/protocols/msn/msn.c:1680
 msgid "A Little About Me"
 msgstr "Немного о себе"
 
+#: ../src/protocols/msn/msn.c:1551
+#, c-format
+msgid "%s<b>General</b><br>%s"
+msgstr "%s<b>Основное</b><br>%s"
+
 #. Social
-#: ../src/protocols/msn/msn.c:1572 ../src/protocols/yahoo/yahoo_profile.c:1061
+#: ../src/protocols/msn/msn.c:1560 ../src/protocols/yahoo/yahoo_profile.c:1061
 msgid "Marital Status"
 msgstr "Брачный статус"
 
-#: ../src/protocols/msn/msn.c:1582 ../src/protocols/msn/msn.c:1760
-#: ../src/protocols/msn/msn.c:1766 ../src/protocols/yahoo/yahoo_profile.c:1113
+#: ../src/protocols/msn/msn.c:1561
+msgid "Interests"
+msgstr "Интересы"
+
+#: ../src/protocols/msn/msn.c:1562
+msgid "Pets"
+msgstr "Домашние животные"
+
+#: ../src/protocols/msn/msn.c:1563
+msgid "Hometown"
+msgstr "Родной город"
+
+#: ../src/protocols/msn/msn.c:1564
+msgid "Places Lived"
+msgstr "Места проживания"
+
+#: ../src/protocols/msn/msn.c:1565
+msgid "Fashion"
+msgstr "Мода"
+
+#: ../src/protocols/msn/msn.c:1566
+msgid "Humor"
+msgstr "Юмор"
+
+#: ../src/protocols/msn/msn.c:1567
+msgid "Music"
+msgstr "Музыка"
+
+#: ../src/protocols/msn/msn.c:1568 ../src/protocols/msn/msn.c:1740
+#: ../src/protocols/msn/msn.c:1746 ../src/protocols/yahoo/yahoo_profile.c:1113
 msgid "Favorite Quote"
 msgstr "Любимая цитата"
 
-#: ../src/protocols/msn/msn.c:1709 ../src/protocols/msn/msn.c:1715
-#: ../src/protocols/msn/msn.c:1722 ../src/protocols/msn/msn.c:1729
+#: ../src/protocols/msn/msn.c:1572
+#, c-format
+msgid "%s<b>Social</b><br>%s"
+msgstr "%s<b>Общественное</b><br>%s"
+
+#: ../src/protocols/msn/msn.c:1581
+msgid "Significant Other"
+msgstr ""
+
+#: ../src/protocols/msn/msn.c:1582
+msgid "Home Phone"
+msgstr "Домашний телефон"
+
+#: ../src/protocols/msn/msn.c:1583
+msgid "Home Phone 2"
+msgstr "Домашний телефон 2"
+
+#: ../src/protocols/msn/msn.c:1584 ../src/protocols/oscar/oscar.c:3685
+msgid "Home Address"
+msgstr "Домашний адрес"
+
+#: ../src/protocols/msn/msn.c:1585
+msgid "Personal Mobile"
+msgstr "Персональный мобильный телефон"
+
+#: ../src/protocols/msn/msn.c:1586
+msgid "Home Fax"
+msgstr "Домашний факс"
+
+#: ../src/protocols/msn/msn.c:1587
+msgid "Personal E-Mail"
+msgstr "Персональный e-mail"
+
+#: ../src/protocols/msn/msn.c:1588
+msgid "Personal IM"
+msgstr ""
+
+#: ../src/protocols/msn/msn.c:1590
+msgid "Anniversary"
+msgstr ""
+
+#: ../src/protocols/msn/msn.c:1591 ../src/protocols/msn/msn.c:1615
+msgid "Notes"
+msgstr "Заметки"
+
+#: ../src/protocols/msn/msn.c:1595
+#, c-format
+msgid "<br><b>Personal</b><br>%s"
+msgstr "<br><b>Персональное</b><br>%s"
+
+#: ../src/protocols/msn/msn.c:1602 ../src/protocols/silc/ops.c:1044
+msgid "Job Title"
+msgstr "Название работы"
+
+#: ../src/protocols/msn/msn.c:1603 ../src/protocols/oscar/oscar.c:3702
+msgid "Company"
+msgstr "Компания"
+
+#: ../src/protocols/msn/msn.c:1604 ../src/protocols/novell/novell.c:1480
+msgid "Department"
+msgstr "Отдел"
+
+#: ../src/protocols/msn/msn.c:1605
+msgid "Profession"
+msgstr "Профессия"
+
+#: ../src/protocols/msn/msn.c:1606
+msgid "Work Phone"
+msgstr "Рабочий телефон"
+
+#: ../src/protocols/msn/msn.c:1607
+msgid "Work Phone 2"
+msgstr "Рабочий телефон 2"
+
+#: ../src/protocols/msn/msn.c:1608 ../src/protocols/oscar/oscar.c:3693
+msgid "Work Address"
+msgstr "Рабочий адрес"
+
+#: ../src/protocols/msn/msn.c:1609
+msgid "Work Mobile"
+msgstr "Рабочий мобильный телефон"
+
+#: ../src/protocols/msn/msn.c:1610
+msgid "Work Pager"
+msgstr "Рабочий пейджер"
+
+#: ../src/protocols/msn/msn.c:1611
+msgid "Work Fax"
+msgstr "Рабочий факс"
+
+#: ../src/protocols/msn/msn.c:1612
+msgid "Work E-Mail"
+msgstr "Рабочий e-mail"
+
+#: ../src/protocols/msn/msn.c:1613
+msgid "Work IM"
+msgstr ""
+
+#: ../src/protocols/msn/msn.c:1614
+msgid "Start Date"
+msgstr ""
+
+#: ../src/protocols/msn/msn.c:1619
+#, c-format
+msgid "<br><b>Business</b><br>%s"
+msgstr "<br><b>Деловое</b><br>%s"
+
+#: ../src/protocols/msn/msn.c:1630
+#, c-format
+msgid "<hr><b>Contact Info</b>%s%s"
+msgstr "<hr><b>Контактная информация</b>%s%s"
+
+#: ../src/protocols/msn/msn.c:1689 ../src/protocols/msn/msn.c:1695
+#: ../src/protocols/msn/msn.c:1702 ../src/protocols/msn/msn.c:1709
 msgid "Favorite Things"
 msgstr "Любимые вещи"
 
-#: ../src/protocols/msn/msn.c:1774
+#: ../src/protocols/msn/msn.c:1754
 msgid "Last Updated"
 msgstr "Последнее обновление"
 
-#: ../src/protocols/msn/msn.c:1786 ../src/protocols/silc/ops.c:1060
+#: ../src/protocols/msn/msn.c:1766 ../src/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "Домашняя страница"
 
-#: ../src/protocols/msn/msn.c:1811
+#: ../src/protocols/msn/msn.c:1791
 msgid "The user has not created a public profile."
 msgstr ""
 
-#: ../src/protocols/msn/msn.c:1812
+#: ../src/protocols/msn/msn.c:1792
 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:1816
+#: ../src/protocols/msn/msn.c:1796
 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:1822 ../src/protocols/msn/msn.c:1825
-#: ../src/protocols/yahoo/yahoo_profile.c:1208
+#. put a link to the actual profile URL
+#: ../src/protocols/msn/msn.c:1801
+#, c-format
+msgid "<hr><b>%s:</b> "
+msgstr "<hr><b>%s:</b> "
+
+#: ../src/protocols/msn/msn.c:1801 ../src/protocols/yahoo/yahoo_profile.c:1208
 msgid "Profile URL"
 msgstr "URL профиля"
 
@@ -7761,23 +8027,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/msn/msn.c:2048 ../src/protocols/msn/msn.c:2050
+#: ../src/protocols/msn/msn.c:2023 ../src/protocols/msn/msn.c:2025
 msgid "MSN Protocol Plugin"
 msgstr "Модуль протокола MSN"
 
-#: ../src/protocols/msn/msn.c:2069
-msgid "Login server"
-msgstr "Сервер входа в сеть:"
-
-#: ../src/protocols/msn/msn.c:2078
+#: ../src/protocols/msn/msn.c:2053
 msgid "Use HTTP Method"
 msgstr "Использовать метод HTTP"
 
-#: ../src/protocols/msn/msn.c:2083
+#: ../src/protocols/msn/msn.c:2058
 msgid "Show custom smileys"
 msgstr ""
 
-#: ../src/protocols/msn/msn.c:2091
+#: ../src/protocols/msn/msn.c:2066
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
@@ -7793,7 +8055,7 @@
 msgstr "%s не является допустимой группой."
 
 #: ../src/protocols/msn/notification.c:184
-#: ../src/protocols/msn/notification.c:532 ../src/protocols/msn/session.c:334
+#: ../src/protocols/msn/notification.c:532 ../src/protocols/msn/session.c:329
 msgid "Unknown error."
 msgstr "Неизвестная ошибка."
 
@@ -7831,15 +8093,15 @@
 msgid "Service Temporarily Unavailable."
 msgstr "Служба временно недоступна."
 
-#: ../src/protocols/msn/notification.c:821
+#: ../src/protocols/msn/notification.c:820
 msgid "Unable to rename group"
 msgstr "Не удаётся переименовать группу"
 
-#: ../src/protocols/msn/notification.c:876
+#: ../src/protocols/msn/notification.c:875
 msgid "Unable to delete group"
 msgstr "Не удаётся удалить группу"
 
-#: ../src/protocols/msn/notification.c:1309
+#: ../src/protocols/msn/notification.c:1308
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7875,61 +8137,61 @@
 "Ошибка соединения от сервера %s:\n"
 "%s"
 
-#: ../src/protocols/msn/session.c:304
+#: ../src/protocols/msn/session.c:299
 msgid "Our protocol is not supported by the server."
 msgstr "Наш протокол не поддерживается сервером."
 
-#: ../src/protocols/msn/session.c:308
+#: ../src/protocols/msn/session.c:303
 msgid "Error parsing HTTP."
 msgstr "Ошибка разбора HTTP."
 
 #. MSG_SERVER_GHOST
 #. Looks like someone logged in as us! =-O
-#: ../src/protocols/msn/session.c:312 ../src/protocols/napster/napster.c:456
-#: ../src/protocols/oscar/oscar.c:5881 ../src/protocols/yahoo/yahoo.c:193
+#: ../src/protocols/msn/session.c:307 ../src/protocols/napster/napster.c:456
+#: ../src/protocols/oscar/oscar.c:3416 ../src/protocols/yahoo/yahoo.c:191
 msgid "You have signed on from another location."
 msgstr "Вы подключены из другого места."
 
+#: ../src/protocols/msn/session.c:310
+msgid "The MSN servers are temporarily unavailable. Please wait and try again."
+msgstr "Серверы MSN временно недоступны. Повторите попытку позже."
+
 #: ../src/protocols/msn/session.c:315
-msgid "The MSN servers are temporarily unavailable. Please wait and try again."
-msgstr "Серверы MSN временно недоступны. Повторите попытку позже."
-
-#: ../src/protocols/msn/session.c:320
 msgid "The MSN servers are going down temporarily."
 msgstr "Серверы MSN временно выключаются."
 
-#: ../src/protocols/msn/session.c:324
+#: ../src/protocols/msn/session.c:319
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Не удаётся аутентифицировать: %s"
 
-#: ../src/protocols/msn/session.c:329
+#: ../src/protocols/msn/session.c:324
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "Ваш список собеседников MSN временно недоступен. Повторите попытку позже."
 
-#: ../src/protocols/msn/session.c:350 ../src/protocols/msn/session.c:352
+#: ../src/protocols/msn/session.c:345 ../src/protocols/msn/session.c:347
 msgid "Handshaking"
 msgstr "Согласование"
 
-#: ../src/protocols/msn/session.c:351
+#: ../src/protocols/msn/session.c:346
 msgid "Transferring"
 msgstr "Передача"
 
-#: ../src/protocols/msn/session.c:353
+#: ../src/protocols/msn/session.c:348
 msgid "Starting authentication"
 msgstr "Запуск аутентификации"
 
-#: ../src/protocols/msn/session.c:354
+#: ../src/protocols/msn/session.c:349
 msgid "Getting cookie"
 msgstr "Получение данных"
 
-#: ../src/protocols/msn/session.c:356
+#: ../src/protocols/msn/session.c:351
 msgid "Sending cookie"
 msgstr "Отправка данных"
 
-#: ../src/protocols/msn/session.c:357
+#: ../src/protocols/msn/session.c:352
 msgid "Retrieving buddy list"
 msgstr "Загрузка списка собеседников"
 
@@ -7945,42 +8207,43 @@
 msgid "Out To Lunch"
 msgstr "Пошёл перекусить"
 
-#: ../src/protocols/msn/switchboard.c:406
+#: ../src/protocols/msn/switchboard.c:401
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "Сообщение могло быть не отправлено, так как истекло время ожидания:"
 
-#: ../src/protocols/msn/switchboard.c:414
+#: ../src/protocols/msn/switchboard.c:409
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr ""
 "Сообщение не может быть отправлено, не разрешено при статусе \"Невидимый\":"
 
-#: ../src/protocols/msn/switchboard.c:418
+#: ../src/protocols/msn/switchboard.c:413
 msgid "Message could not be sent because the user is offline:"
 msgstr "Сообщение не может быть отправлено, так как пользователь не в сети:"
 
-#: ../src/protocols/msn/switchboard.c:422
+#: ../src/protocols/msn/switchboard.c:417
 msgid "Message could not be sent because a connection error occurred:"
 msgstr ""
 "Сообщение не может быть отправлено, так как произошла ошибка соединения:"
 
-#: ../src/protocols/msn/switchboard.c:426
-#, fuzzy
+#: ../src/protocols/msn/switchboard.c:421
 msgid "Message could not be sent because we are sending too quickly:"
-msgstr "Сообщение не может быть отправлено, так как пользователь не в сети:"
-
-#: ../src/protocols/msn/switchboard.c:430
+msgstr ""
+"Сообщение не может быть отправлено, так как отправка происходит слишком "
+"быстро:"
+
+#: ../src/protocols/msn/switchboard.c:425
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
 "Сообщение не может быть отправлено, так как произошла ошибка коммутационной "
 "панели:"
 
-#: ../src/protocols/msn/switchboard.c:438
+#: ../src/protocols/msn/switchboard.c:433
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 "Сообщение могло быть не отправлено, так как произошла неизвестная ошибка:"
 
-#: ../src/protocols/msn/switchboard.c:959
+#: ../src/protocols/msn/switchboard.c:953
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr ""
@@ -7990,11 +8253,11 @@
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "Пользователь %s (%s) хочет добавить %s в свой список собеседников."
 
-#: ../src/protocols/msn/userlist.c:111 ../src/protocols/yahoo/yahoo.c:915
+#: ../src/protocols/msn/userlist.c:111 ../src/protocols/yahoo/yahoo.c:913
 msgid "Authorize"
 msgstr "Авторизовать"
 
-#: ../src/protocols/msn/userlist.c:112 ../src/protocols/yahoo/yahoo.c:917
+#: ../src/protocols/msn/userlist.c:112 ../src/protocols/yahoo/yahoo.c:915
 msgid "Deny"
 msgstr "Отказать"
 
@@ -8008,12 +8271,12 @@
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s удалил вас из своего списка собеседников."
 
-#: ../src/protocols/msn/userlist.c:679
+#: ../src/protocols/msn/userlist.c:667
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Не удаётся добавить \"%s\"."
 
-#: ../src/protocols/msn/userlist.c:681
+#: ../src/protocols/msn/userlist.c:669
 msgid "The screen name specified is invalid."
 msgstr "Указанный идентификатор пользователя недопустим."
 
@@ -8057,8 +8320,8 @@
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: ../src/protocols/napster/napster.c:507
 #: ../src/protocols/napster/napster.c:543 ../src/protocols/toc/toc.c:172
-#: ../src/protocols/yahoo/yahoo.c:2239 ../src/protocols/yahoo/yahoo.c:2266
-#: ../src/protocols/yahoo/yahoo.c:2349 ../src/protocols/yahoo/yahoo.c:2364
+#: ../src/protocols/yahoo/yahoo.c:2237 ../src/protocols/yahoo/yahoo.c:2264
+#: ../src/protocols/yahoo/yahoo.c:2347 ../src/protocols/yahoo/yahoo.c:2362
 #: ../src/protocols/yahoo/yahoo_filexfer.c:74
 #: ../src/protocols/yahoo/yahoo_filexfer.c:137
 #: ../src/protocols/yahoo/ycht.c:540
@@ -8236,7 +8499,7 @@
 msgid "Unable to send message (%s)."
 msgstr "Не удаётся отправить сообщение (%s)."
 
-#: ../src/protocols/novell/novell.c:493 ../src/protocols/novell/novell.c:987
+#: ../src/protocols/novell/novell.c:493 ../src/protocols/novell/novell.c:985
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Не удаётся пригласить пользователя (%s)."
@@ -8295,43 +8558,34 @@
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Не удаётся удалить %s из списка конфиденциальности (%s)."
 
-#: ../src/protocols/novell/novell.c:942 ../src/protocols/novell/novell.c:1654
+#: ../src/protocols/novell/novell.c:942 ../src/protocols/novell/novell.c:1652
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr ""
 "Не удаётся изменить установки конфиденциальности на стороне сервера (%s)."
 
-#: ../src/protocols/novell/novell.c:1014
+#: ../src/protocols/novell/novell.c:1012
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Не удаётся создать конференцию (%s)."
 
-#: ../src/protocols/novell/novell.c:1123 ../src/protocols/novell/novell.c:1693
+#: ../src/protocols/novell/novell.c:1121 ../src/protocols/novell/novell.c:1691
 msgid "Error communicating with server. Closing connection."
 msgstr "Ошибка связи с сервером. Закрытие соединения."
 
-#: ../src/protocols/novell/novell.c:1478
+#: ../src/protocols/novell/novell.c:1476
 msgid "Telephone Number"
 msgstr "Номер телефона"
 
 #: ../src/protocols/novell/novell.c:1482
-msgid "Department"
-msgstr "Отдел"
-
-#: ../src/protocols/novell/novell.c:1484
 msgid "Personal Title"
 msgstr "Звание"
 
-#: ../src/protocols/novell/novell.c:1488
+#: ../src/protocols/novell/novell.c:1486
 msgid "Mailstop"
 msgstr ""
 
-#: ../src/protocols/novell/novell.c:1490 ../src/protocols/oscar/oscar.c:6178
-#: ../src/protocols/oscar/oscar.c:6185
-msgid "Email Address"
-msgstr "Адрес e-mail"
-
-#: ../src/protocols/novell/novell.c:1506
+#: ../src/protocols/novell/novell.c:1504
 msgid "User ID"
 msgstr "Пользовательский ID"
 
@@ -8342,41 +8596,41 @@
 #. tag, value);
 #. }
 #.
-#: ../src/protocols/novell/novell.c:1520
+#: ../src/protocols/novell/novell.c:1518
 msgid "Full name"
 msgstr "Полное Имя"
 
-#: ../src/protocols/novell/novell.c:1644
+#: ../src/protocols/novell/novell.c:1642
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Конференция GroupWise %d"
 
-#: ../src/protocols/novell/novell.c:1669
+#: ../src/protocols/novell/novell.c:1667
 msgid "Unable to make SSL connection to server."
 msgstr "Не удаётся установить SSL-соединение с сервером."
 
-#: ../src/protocols/novell/novell.c:1726
+#: ../src/protocols/novell/novell.c:1724
 msgid "Authenticating..."
 msgstr "Аутентификация..."
 
-#: ../src/protocols/novell/novell.c:1738
+#: ../src/protocols/novell/novell.c:1736
 msgid "Unable to connect to server."
 msgstr "Не удаётся соединиться с сервером."
 
-#: ../src/protocols/novell/novell.c:1741
+#: ../src/protocols/novell/novell.c:1739
 msgid "Waiting for response..."
 msgstr "Ожидание отклика..."
 
-#: ../src/protocols/novell/novell.c:1876
+#: ../src/protocols/novell/novell.c:1874
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s был приглашён к этой беседе."
 
-#: ../src/protocols/novell/novell.c:1904
+#: ../src/protocols/novell/novell.c:1902
 msgid "Invitation to Conversation"
 msgstr "Приглашение к беседе"
 
-#: ../src/protocols/novell/novell.c:1905
+#: ../src/protocols/novell/novell.c:1903
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8387,15 +8641,15 @@
 "\n"
 "Отправлено: %s"
 
-#: ../src/protocols/novell/novell.c:1907
+#: ../src/protocols/novell/novell.c:1905
 msgid "Would you like to join the conversation?"
 msgstr "Хотите присоединиться к беседе?"
 
-#: ../src/protocols/novell/novell.c:2014
+#: ../src/protocols/novell/novell.c:2012
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "Вы были отключены, так как вошли с другой машины."
 
-#: ../src/protocols/novell/novell.c:2070
+#: ../src/protocols/novell/novell.c:2068
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -8407,7 +8661,7 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../src/protocols/novell/novell.c:2168
+#: ../src/protocols/novell/novell.c:2166
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -8415,11 +8669,11 @@
 "Не удаётся соединиться с сервером. Введите адрес сервера, с которым вы "
 "хотите соединиться."
 
-#: ../src/protocols/novell/novell.c:2190
+#: ../src/protocols/novell/novell.c:2188
 msgid "Error. SSL support is not installed."
 msgstr "Ошибка. Поддержка SSL не установлена."
 
-#: ../src/protocols/novell/novell.c:2499
+#: ../src/protocols/novell/novell.c:2497
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 "Эта конференция была закрыта. Больше не может быть отправлено ни одного "
@@ -8435,115 +8689,163 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/novell/novell.c:3543 ../src/protocols/novell/novell.c:3545
+#: ../src/protocols/novell/novell.c:3541 ../src/protocols/novell/novell.c:3543
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Модуль протокола Novell GroupWise Messenger"
 
-#: ../src/protocols/novell/novell.c:3564
+#: ../src/protocols/novell/novell.c:3562
 msgid "Server address"
 msgstr "Адрес сервера"
 
-#: ../src/protocols/novell/novell.c:3568
+#: ../src/protocols/novell/novell.c:3566
 msgid "Server port"
 msgstr "Порт сервера"
 
-#: ../src/protocols/oscar/oscar.c:203
+#: ../src/protocols/oscar/flap_connection.c:222
+msgid "Server closed the connection."
+msgstr "Сервер разорвал соединение."
+
+#: ../src/protocols/oscar/flap_connection.c:224
+msgid "Lost connection with server for an unknown reason."
+msgstr "Соединение с сервером потеряно по неизвестной причине."
+
+#: ../src/protocols/oscar/flap_connection.c:226
+msgid "Received invalid data on connection with server."
+msgstr "При соединении с сервером получены недопустимые данные."
+
+#: ../src/protocols/oscar/flap_connection.c:228
+msgid "Could not establish a connection with the server."
+msgstr "Не удалось установить соединение с сервером."
+
+#: ../src/protocols/oscar/odc.c:41
+msgid "The remote user has closed the connection."
+msgstr "Удалённый пользователь разорвал соединение."
+
+#: ../src/protocols/oscar/odc.c:45
+msgid "The remote user has declined your request."
+msgstr "Удалённый пользователь отклонил ваш запрос."
+
+#: ../src/protocols/oscar/odc.c:49
+msgid "Lost connection with the remote user for an unknown reason."
+msgstr "Соединение с удалённым пользователем потеряно по неизвестной причине."
+
+#: ../src/protocols/oscar/odc.c:53
+msgid "Received invalid data on connection with remote user."
+msgstr "При соединении с удалённым пользователем получены недопустимые данные."
+
+#: ../src/protocols/oscar/odc.c:57
+msgid "Could not establish a connection with the remote user."
+msgstr "Не удалось установить соединение с удалённым пользователем."
+
+#: ../src/protocols/oscar/odc.c:567
+msgid "Direct IM established"
+msgstr "Прямое соединение установлено"
+
+#: ../src/protocols/oscar/oscar.c:144
 msgid "Invalid error"
 msgstr "Недопустимая ошибка"
 
-#: ../src/protocols/oscar/oscar.c:204
+#: ../src/protocols/oscar/oscar.c:145
 msgid "Invalid SNAC"
 msgstr "Неверный SNAC"
 
-#: ../src/protocols/oscar/oscar.c:205
+#: ../src/protocols/oscar/oscar.c:146
 msgid "Rate to host"
 msgstr "Оценить узел"
 
-#: ../src/protocols/oscar/oscar.c:206
+#: ../src/protocols/oscar/oscar.c:147
 msgid "Rate to client"
 msgstr "Оценить клиента"
 
-#: ../src/protocols/oscar/oscar.c:208
+#: ../src/protocols/oscar/oscar.c:149
 msgid "Service unavailable"
 msgstr "Служба недоступна"
 
-#: ../src/protocols/oscar/oscar.c:209
+#: ../src/protocols/oscar/oscar.c:150
 msgid "Service not defined"
 msgstr "Служба не определена"
 
-#: ../src/protocols/oscar/oscar.c:210
+#: ../src/protocols/oscar/oscar.c:151
 msgid "Obsolete SNAC"
 msgstr "Устаревший SNAC"
 
-#: ../src/protocols/oscar/oscar.c:211
+#: ../src/protocols/oscar/oscar.c:152
 msgid "Not supported by host"
 msgstr "Не поддерживается узлом"
 
-#: ../src/protocols/oscar/oscar.c:212
+#: ../src/protocols/oscar/oscar.c:153
 msgid "Not supported by client"
 msgstr "Не поддерживается клиентом"
 
-#: ../src/protocols/oscar/oscar.c:213
+#: ../src/protocols/oscar/oscar.c:154
 msgid "Refused by client"
 msgstr "Отвергнуто клиентом"
 
-#: ../src/protocols/oscar/oscar.c:214
+#: ../src/protocols/oscar/oscar.c:155
 msgid "Reply too big"
 msgstr "Ответ слишком велик"
 
-#: ../src/protocols/oscar/oscar.c:215
+#: ../src/protocols/oscar/oscar.c:156
 msgid "Responses lost"
 msgstr "Отклики потеряны"
 
-#: ../src/protocols/oscar/oscar.c:216
+#: ../src/protocols/oscar/oscar.c:157
 msgid "Request denied"
 msgstr "Запрос отвергнут"
 
-#: ../src/protocols/oscar/oscar.c:217
+#: ../src/protocols/oscar/oscar.c:158
 msgid "Busted SNAC payload"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:218
+#: ../src/protocols/oscar/oscar.c:159
 msgid "Insufficient rights"
 msgstr "Недостаточные права"
 
-#: ../src/protocols/oscar/oscar.c:219
+#: ../src/protocols/oscar/oscar.c:160
 msgid "In local permit/deny"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:220
+#: ../src/protocols/oscar/oscar.c:161
 msgid "Too evil (sender)"
 msgstr "Слишком надоедлив (отправитель)"
 
-#: ../src/protocols/oscar/oscar.c:221
+#: ../src/protocols/oscar/oscar.c:162
 msgid "Too evil (receiver)"
 msgstr "Слишком надоедлив (получатель)"
 
-#: ../src/protocols/oscar/oscar.c:222
+#: ../src/protocols/oscar/oscar.c:163
 msgid "User temporarily unavailable"
 msgstr "Пользователь временно недоступен"
 
-#: ../src/protocols/oscar/oscar.c:223
+#: ../src/protocols/oscar/oscar.c:164
 msgid "No match"
 msgstr "Нет совпадения"
 
-#: ../src/protocols/oscar/oscar.c:224
+#: ../src/protocols/oscar/oscar.c:165
 msgid "List overflow"
 msgstr "Переполнение списка"
 
-#: ../src/protocols/oscar/oscar.c:225
+#: ../src/protocols/oscar/oscar.c:166
 msgid "Request ambiguous"
 msgstr "Неясный запрос"
 
-#: ../src/protocols/oscar/oscar.c:226
+#: ../src/protocols/oscar/oscar.c:167
 msgid "Queue full"
 msgstr "Очередь полна"
 
-#: ../src/protocols/oscar/oscar.c:227
+#: ../src/protocols/oscar/oscar.c:168
 msgid "Not while on AOL"
 msgstr "Не в AOL"
 
-#: ../src/protocols/oscar/oscar.c:421 ../src/protocols/oscar/oscar.c:523
+#: ../src/protocols/oscar/oscar.c:346
+msgid ""
+"(There was an error receiving this message.  The buddy you are speaking with "
+"is probably using a different encoding than expected.  If you know what "
+"encoding he is using, you can specify it in the advanced account options for "
+"your AIM/ICQ account.)"
+msgstr ""
+
+#: ../src/protocols/oscar/oscar.c:449
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
@@ -8551,183 +8853,141 @@
 "(Произошла ошибка при приёме этого сообщения. Вероятнее всего, клиент "
 "собеседника содержит ошибки.)"
 
-#: ../src/protocols/oscar/oscar.c:702
+#: ../src/protocols/oscar/oscar.c:628
 msgid "Voice"
 msgstr "Голос"
 
-#: ../src/protocols/oscar/oscar.c:705
+#: ../src/protocols/oscar/oscar.c:631
 msgid "AIM Direct IM"
 msgstr "Прямое соединение AIM"
 
-#: ../src/protocols/oscar/oscar.c:708 ../src/protocols/silc/silc.c:697
-#: ../src/protocols/silc/util.c:510
+#: ../src/protocols/oscar/oscar.c:634 ../src/protocols/silc/silc.c:697
+#: ../src/protocols/silc/util.c:524
 msgid "Chat"
 msgstr "Чат"
 
-#: ../src/protocols/oscar/oscar.c:711 ../src/protocols/oscar/oscar.c:8174
+#: ../src/protocols/oscar/oscar.c:637 ../src/protocols/oscar/oscar.c:5793
 msgid "Get File"
 msgstr "Получить файл"
 
-#: ../src/protocols/oscar/oscar.c:718
+#: ../src/protocols/oscar/oscar.c:644
 msgid "Games"
 msgstr "Игры"
 
-#: ../src/protocols/oscar/oscar.c:721
+#: ../src/protocols/oscar/oscar.c:647
 msgid "Add-Ins"
 msgstr "Дополнения"
 
-#: ../src/protocols/oscar/oscar.c:724
+#: ../src/protocols/oscar/oscar.c:650
 msgid "Send Buddy List"
 msgstr "Отправить список собеседников"
 
-#: ../src/protocols/oscar/oscar.c:727
+#: ../src/protocols/oscar/oscar.c:653
 msgid "ICQ Direct Connect"
 msgstr "Прямое соединение ICQ"
 
-#: ../src/protocols/oscar/oscar.c:730
+#: ../src/protocols/oscar/oscar.c:656
 msgid "AP User"
 msgstr "Пользователь AP"
 
-#: ../src/protocols/oscar/oscar.c:733
+#: ../src/protocols/oscar/oscar.c:659
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../src/protocols/oscar/oscar.c:736
+#: ../src/protocols/oscar/oscar.c:662
 msgid "Nihilist"
 msgstr "Нигилист"
 
-#: ../src/protocols/oscar/oscar.c:739
+#: ../src/protocols/oscar/oscar.c:665
 msgid "ICQ Server Relay"
 msgstr "Релейный сервер ICQ"
 
-#: ../src/protocols/oscar/oscar.c:742
+#: ../src/protocols/oscar/oscar.c:668
 msgid "Old ICQ UTF8"
 msgstr "Старый ICQ UTF8"
 
-#: ../src/protocols/oscar/oscar.c:745
+#: ../src/protocols/oscar/oscar.c:671
 msgid "Trillian Encryption"
 msgstr "Шифрование Trillian"
 
-#: ../src/protocols/oscar/oscar.c:748
+#: ../src/protocols/oscar/oscar.c:674
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../src/protocols/oscar/oscar.c:751
+#: ../src/protocols/oscar/oscar.c:677
 msgid "Hiptop"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:754
+#: ../src/protocols/oscar/oscar.c:680
 msgid "Security Enabled"
 msgstr "Безопасность включена"
 
-#: ../src/protocols/oscar/oscar.c:757
+#: ../src/protocols/oscar/oscar.c:683
 msgid "Video Chat"
 msgstr "Видеочат"
 
-#: ../src/protocols/oscar/oscar.c:761
+#: ../src/protocols/oscar/oscar.c:687
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../src/protocols/oscar/oscar.c:764
+#: ../src/protocols/oscar/oscar.c:690
 msgid "Live Video"
 msgstr "Живое видео"
 
-#: ../src/protocols/oscar/oscar.c:767
+#: ../src/protocols/oscar/oscar.c:693
 msgid "Camera"
 msgstr "Камера"
 
-#: ../src/protocols/oscar/oscar.c:785 ../src/protocols/oscar/oscar.c:8036
+#: ../src/protocols/oscar/oscar.c:711 ../src/protocols/oscar/oscar.c:5600
 msgid "Free For Chat"
 msgstr "Готов пообщаться"
 
-#: ../src/protocols/oscar/oscar.c:789 ../src/protocols/oscar/oscar.c:8064
+#: ../src/protocols/oscar/oscar.c:715 ../src/protocols/oscar/oscar.c:5628
 msgid "Not Available"
 msgstr "Недоступен"
 
-#: ../src/protocols/oscar/oscar.c:791 ../src/protocols/oscar/oscar.c:8054
+#: ../src/protocols/oscar/oscar.c:717 ../src/protocols/oscar/oscar.c:5618
 msgid "Occupied"
 msgstr "Занят"
 
-#: ../src/protocols/oscar/oscar.c:795
+#: ../src/protocols/oscar/oscar.c:721
 msgid "Web Aware"
 msgstr "Статус на веб-страницах"
 
-#: ../src/protocols/oscar/oscar.c:799
+#: ../src/protocols/oscar/oscar.c:725
 msgid "Online"
 msgstr "В сети"
 
-#: ../src/protocols/oscar/oscar.c:876 ../src/protocols/oscar/oscar.c:5253
+#: ../src/protocols/oscar/oscar.c:802 ../src/protocols/oscar/oscar.c:2824
 msgid "Warning Level"
 msgstr "Уровень предупреждения"
 
-#: ../src/protocols/oscar/oscar.c:885
+#: ../src/protocols/oscar/oscar.c:811
 msgid "Buddy Comment"
 msgstr "Комментарий собеседника"
 
-#: ../src/protocols/oscar/oscar.c:1034
-#, c-format
-msgid "Direct IM with %s closed"
-msgstr "Прямое соединение с %s закрыто"
-
-#: ../src/protocols/oscar/oscar.c:1036
-#, c-format
-msgid "Direct IM with %s failed"
-msgstr "Не удалось создать прямое соединение с %s"
-
-#: ../src/protocols/oscar/oscar.c:1044
-msgid "Direct Connect failed"
-msgstr "Не удалось создать прямое соединение"
-
-#: ../src/protocols/oscar/oscar.c:1124 ../src/protocols/oscar/oscar.c:1253
-#, c-format
-msgid "Direct IM with %s established"
-msgstr "Прямое соединение с %s установлено"
-
-#: ../src/protocols/oscar/oscar.c:1205
-#, c-format
-msgid "Attempting to connect to %s at %s:%hu for Direct IM."
-msgstr "Попытка создания прямого соединения с %s в %s:%hu."
-
-#: ../src/protocols/oscar/oscar.c:1608
-#, c-format
-msgid "Asking %s to connect to us at %s:%hu for Direct IM."
-msgstr "Запрос создания прямого соединения %s с нами в %s:%hu."
-
-#: ../src/protocols/oscar/oscar.c:1613 ../src/protocols/oscar/oscar.c:1660
-msgid "Unable to open Direct IM"
-msgstr "Не удаётся открыть прямое соединение"
-
-#: ../src/protocols/oscar/oscar.c:1696
-#, c-format
-msgid "You have selected to open a Direct IM connection with %s."
-msgstr "Вы выбрали открытие прямого соединения с %s."
-
-#: ../src/protocols/oscar/oscar.c:1700
-msgid ""
-"Because this reveals your IP address, it may be considered a privacy risk.  "
-"Do you wish to continue?"
-msgstr ""
-"Так как это обнаружит ваш IP-адрес, это можно считать угрозой "
-"конфиденциальности. Хотите продолжить?"
-
-#: ../src/protocols/oscar/oscar.c:1704 ../src/protocols/oscar/oscar.c:4564
-msgid "_Connect"
-msgstr "_Установить соединение"
-
-#: ../src/protocols/oscar/oscar.c:1782
-#, c-format
-msgid "You have lost your connection to chat room %s."
-msgstr "Вы потеряли соединение с чатом %s."
-
-#: ../src/protocols/oscar/oscar.c:1805
-msgid "Chat is currently unavailable"
-msgstr "Чат сейчас недоступен"
-
-#: ../src/protocols/oscar/oscar.c:1877
+#: ../src/protocols/oscar/oscar.c:966
+msgid "Could not connect to authentication server"
+msgstr "Не удалось установить соединение с сервером аутентификации"
+
+#: ../src/protocols/oscar/oscar.c:968
+msgid "Could not connect to BOS server"
+msgstr "Не удалось установить соединение с BOS-сервером"
+
+#: ../src/protocols/oscar/oscar.c:998
 msgid "Screen name sent"
 msgstr "Идентификатор пользователя отправлен"
 
-#: ../src/protocols/oscar/oscar.c:1893
+#: ../src/protocols/oscar/oscar.c:1003
+msgid "Connection established, cookie sent"
+msgstr "Соединение установлено, данные отправлены"
+
+#. TODO: Don't call this with ssi
+#: ../src/protocols/oscar/oscar.c:1034
+msgid "Finalizing connection"
+msgstr "Завершение установления соединения"
+
+#: ../src/protocols/oscar/oscar.c:1219
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -8735,77 +8995,20 @@
 "letters, numbers and spaces, or contain only numbers."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:1921
-msgid "Unable to login to AIM"
-msgstr "Не удаётся войти в сеть AIM"
-
-#: ../src/protocols/oscar/oscar.c:2024 ../src/protocols/oscar/oscar.c:3016
-msgid "Could Not Connect"
-msgstr "Не удалось установить соединение"
-
-#: ../src/protocols/oscar/oscar.c:2035
-msgid "Connection established, cookie sent"
-msgstr "Соединение установлено, данные отправлены"
-
-#. clientip & verifiedip failed, request a redirect
-#. * that is, we want the sender to connect to us
-#. *
-#. * Above, we checked if we had previously attempted a connection
-#. * redirect to prevent a conflict with the joscar library
-#.
-#. Let the user not to lose hope quite yet
-#: ../src/protocols/oscar/oscar.c:2194
-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 or 2 proxied transfer might work when a stage 3 will not.
-#: ../src/protocols/oscar/oscar.c:2240
-#, c-format
-msgid ""
-"Transfer of file %s timed out.\n"
-" Try enabling proxy servers for file transfers in Accounts->%s->Edit Account-"
-">Advanced."
-msgstr ""
-
-#: ../src/protocols/oscar/oscar.c:2338
-#: ../src/protocols/yahoo/yahoo_filexfer.c:253
-#: ../src/protocols/yahoo/yahoo_filexfer.c:262
-#: ../src/protocols/yahoo/yahoo_filexfer.c:271
-msgid "Unable to establish file descriptor."
-msgstr "Не удаётся установить дескриптор файла."
-
-#: ../src/protocols/oscar/oscar.c:2343
-msgid "Unable to create new connection."
-msgstr "Не удаётся создать новое соединение."
-
-#: ../src/protocols/oscar/oscar.c:2581 ../src/protocols/oscar/oscar.c:2590
-#: ../src/protocols/oscar/oscar.c:2604 ../src/protocols/oscar/oscar.c:2614
-msgid "Unable to log into file transfer proxy."
-msgstr "Не удаётся войти на прокси передачи файлов."
-
-#: ../src/protocols/oscar/oscar.c:2668
-msgid "Unable to establish listener socket or no AOL proxy connection present."
-msgstr ""
-"Не удаётся установить сокет для прослушивания или отсутствует соединение с "
-"прокси AOL."
-
-#: ../src/protocols/oscar/oscar.c:2906 ../src/protocols/toc/toc.c:543
+#: ../src/protocols/oscar/oscar.c:1308 ../src/protocols/toc/toc.c:543
 msgid "Incorrect nickname or password."
 msgstr "Некорректный псевдоним или пароль."
 
-#: ../src/protocols/oscar/oscar.c:2911
+#: ../src/protocols/oscar/oscar.c:1313
 msgid "Your account is currently suspended."
 msgstr "Ваша учётная запись сейчас заблокирована."
 
 #. service temporarily unavailable
-#: ../src/protocols/oscar/oscar.c:2915
+#: ../src/protocols/oscar/oscar.c:1317
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Служба AOL Instant Messenger временно недоступна."
 
-#: ../src/protocols/oscar/oscar.c:2920
+#: ../src/protocols/oscar/oscar.c:1322
 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."
@@ -8813,81 +9016,71 @@
 "Вы соединялись и отсоединялись слишком часто. Подождите 10 минут и "
 "попытайтесь снова. Если вы продолжите попытки, вам придётся ждать ещё дольше."
 
-#: ../src/protocols/oscar/oscar.c:2925
+#: ../src/protocols/oscar/oscar.c:1327
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Версия клиента, которой вы пользуетесь, слишком стара. Обновите до %s"
 
-#: ../src/protocols/oscar/oscar.c:2953
-msgid "Internal Error"
-msgstr "Внутренняя ошибка"
-
-#: ../src/protocols/oscar/oscar.c:3023
+#: ../src/protocols/oscar/oscar.c:1363
+msgid "Could Not Connect"
+msgstr "Не удалось установить соединение"
+
+#: ../src/protocols/oscar/oscar.c:1368
 msgid "Received authorization"
 msgstr "Получена авторизация"
 
-#: ../src/protocols/oscar/oscar.c:3047
+#: ../src/protocols/oscar/oscar.c:1391
 msgid "The SecurID key entered is invalid."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:3061
+#: ../src/protocols/oscar/oscar.c:1405
 msgid "Enter SecurID"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:3062
+#: ../src/protocols/oscar/oscar.c:1406
 msgid "Enter the 6 digit number from the digital display."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:3102 ../src/protocols/oscar/oscar.c:3132
-#: ../src/protocols/oscar/oscar.c:3223
+#: ../src/protocols/oscar/oscar.c:1446 ../src/protocols/oscar/oscar.c:1480
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
 msgstr ""
-"Вы можете быть скоро отсоединены. Возможно, вы захотите использовать TOC, "
-"пока это не будет исправлено. Смотрите обновления на %s."
-
-#: ../src/protocols/oscar/oscar.c:3105 ../src/protocols/oscar/oscar.c:3135
+"Соединение с вами вскоре может быть разорвано. Возможно, вы захотите "
+"использовать TOC, пока это не будет исправлено. Смотрите обновления на %s."
+
+#: ../src/protocols/oscar/oscar.c:1449 ../src/protocols/oscar/oscar.c:1483
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim не удалось получить допустимый хэш входа AIM."
 
-#: ../src/protocols/oscar/oscar.c:3226
+#: ../src/protocols/oscar/oscar.c:1569
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr ""
+"Соединение с вами вскоре может быть разорвано. Смотрите обновления на %s."
+
+#: ../src/protocols/oscar/oscar.c:1572
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim не удалось получить допустимый хэш входа."
 
-#: ../src/protocols/oscar/oscar.c:3247
+#: ../src/protocols/oscar/oscar.c:1598
 msgid "Password sent"
 msgstr "Пароль отправлен"
 
-#: ../src/protocols/oscar/oscar.c:4555
-#, c-format
-msgid "%s has just asked to directly connect to %s"
-msgstr "%s запросил прямое соединение с %s"
-
-#: ../src/protocols/oscar/oscar.c:4558
-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 ""
-"Это требует прямого соединения между двумя компьютерами и является "
-"необходимым для изображений. Так как ваш IP-адрес будет обнаружен, это можно "
-"считать угрозой конфиденциальности."
-
-#: ../src/protocols/oscar/oscar.c:4597
+#: ../src/protocols/oscar/oscar.c:2156
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:4605
+#: ../src/protocols/oscar/oscar.c:2165
 msgid "Authorization Request Message:"
 msgstr "Сообщение запроса авторизации:"
 
-#: ../src/protocols/oscar/oscar.c:4606
+#: ../src/protocols/oscar/oscar.c:2166
 msgid "Please authorize me!"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:4636
+#: ../src/protocols/oscar/oscar.c:2200
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -8896,25 +9089,25 @@
 "Пользователь %s требует авторизацию перед добавлением его в список "
 "собеседников. Хотите отправить запрос авторизации?"
 
-#: ../src/protocols/oscar/oscar.c:4641
+#: ../src/protocols/oscar/oscar.c:2205
 msgid "Request Authorization"
 msgstr "Запросить авторизацию"
 
-#: ../src/protocols/oscar/oscar.c:4643
+#: ../src/protocols/oscar/oscar.c:2207
 msgid "_Request Authorization"
 msgstr "_Запросить авторизацию"
 
-#: ../src/protocols/oscar/oscar.c:4681 ../src/protocols/oscar/oscar.c:4687
-#: ../src/protocols/oscar/oscar.c:4791 ../src/protocols/oscar/oscar.c:4815
-#: ../src/protocols/oscar/oscar.c:7468 ../src/protocols/oscar/oscar.c:7520
+#: ../src/protocols/oscar/oscar.c:2251 ../src/protocols/oscar/oscar.c:2259
+#: ../src/protocols/oscar/oscar.c:2367 ../src/protocols/oscar/oscar.c:2391
+#: ../src/protocols/oscar/oscar.c:5025 ../src/protocols/oscar/oscar.c:5077
 msgid "No reason given."
 msgstr "Причина не указана."
 
-#: ../src/protocols/oscar/oscar.c:4686
+#: ../src/protocols/oscar/oscar.c:2258
 msgid "Authorization Denied Message:"
 msgstr "Сообщение отказа в авторизации:"
 
-#: ../src/protocols/oscar/oscar.c:4793
+#: ../src/protocols/oscar/oscar.c:2369
 #, c-format
 msgid ""
 "The user %u wants to add %s to their buddy list for the following reason:\n"
@@ -8924,11 +9117,11 @@
 "причине:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4803 ../src/protocols/oscar/oscar.c:7480
+#: ../src/protocols/oscar/oscar.c:2379 ../src/protocols/oscar/oscar.c:5037
 msgid "Authorization Request"
 msgstr "Запрос авторизации"
 
-#: ../src/protocols/oscar/oscar.c:4815
+#: ../src/protocols/oscar/oscar.c:2391
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8939,18 +9132,18 @@
 "следующей причине:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4816
+#: ../src/protocols/oscar/oscar.c:2392
 msgid "ICQ authorization denied."
 msgstr "В авторизации ICQ отказано."
 
 #. Someone has granted you authorization
-#: ../src/protocols/oscar/oscar.c:4823
+#: ../src/protocols/oscar/oscar.c:2399
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "Пользователь %u дал своё согласие добавить его в ваш список собеседников."
 
-#: ../src/protocols/oscar/oscar.c:4831
+#: ../src/protocols/oscar/oscar.c:2407
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8963,7 +9156,7 @@
 "От: %s [%s]\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4839
+#: ../src/protocols/oscar/oscar.c:2415
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8976,7 +9169,7 @@
 "От: %s [%s]\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4847
+#: ../src/protocols/oscar/oscar.c:2423
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -8989,27 +9182,27 @@
 "Сообщение:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4868
+#: ../src/protocols/oscar/oscar.c:2444
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "Пользователь ICQ %u отправил вам собеседника: %s (%s)"
 
-#: ../src/protocols/oscar/oscar.c:4874
+#: ../src/protocols/oscar/oscar.c:2450
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Хотите добавить этого собеседника в список собеседников?"
 
-#: ../src/protocols/oscar/oscar.c:4878
+#: ../src/protocols/oscar/oscar.c:2454
 msgid "_Decline"
 msgstr "_Отклонить"
 
-#: ../src/protocols/oscar/oscar.c:4962
+#: ../src/protocols/oscar/oscar.c:2538
 #, 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] "Вы не получили %hu сообщение от %s, так как оно было некорректно."
 msgstr[1] "Вы не получили %hu сообщений от %s, так как они были некорректны."
 
-#: ../src/protocols/oscar/oscar.c:4971
+#: ../src/protocols/oscar/oscar.c:2547
 #, 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."
@@ -9018,7 +9211,7 @@
 msgstr[1] ""
 "Вы не получили %hu сообщений от %s, так как они были слишком велики."
 
-#: ../src/protocols/oscar/oscar.c:4980
+#: ../src/protocols/oscar/oscar.c:2556
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -9029,7 +9222,7 @@
 msgstr[1] ""
 "Вы не получили %hu сообщений от %s, так как был превышен предел оценки."
 
-#: ../src/protocols/oscar/oscar.c:4989
+#: ../src/protocols/oscar/oscar.c:2565
 #, 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."
@@ -9038,7 +9231,7 @@
 msgstr[1] ""
 "Вы не получили %hu сообщений от %s, потому что он слишком надоедлив."
 
-#: ../src/protocols/oscar/oscar.c:4998
+#: ../src/protocols/oscar/oscar.c:2574
 #, 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."
@@ -9047,73 +9240,73 @@
 msgstr[1] ""
 "Вы не получили %hu сообщений от %s, потому что вы слишком надоедливы."
 
-#: ../src/protocols/oscar/oscar.c:5007
+#: ../src/protocols/oscar/oscar.c:2583
 #, 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] "Вы не получили %hu сообщение от %s по неизвестной причине."
 msgstr[1] "Вы не получили %hu сообщений от %s по неизвестной причине."
 
-#: ../src/protocols/oscar/oscar.c:5066
+#: ../src/protocols/oscar/oscar.c:2639
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>Статус:</B> %s<HR>%s"
 
-#: ../src/protocols/oscar/oscar.c:5127
+#: ../src/protocols/oscar/oscar.c:2700
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC вызвал ошибку: %s\n"
 
 #. Data is assumed to be the destination sn
-#: ../src/protocols/oscar/oscar.c:5164
+#: ../src/protocols/oscar/oscar.c:2736
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Не удаётся отправить сообщение: %s"
 
-#: ../src/protocols/oscar/oscar.c:5164 ../src/protocols/oscar/oscar.c:5169
-#: ../src/protocols/oscar/oscar.c:5227 ../src/protocols/oscar/oscar.c:5231
+#: ../src/protocols/oscar/oscar.c:2736 ../src/protocols/oscar/oscar.c:2741
+#: ../src/protocols/oscar/oscar.c:2799 ../src/protocols/oscar/oscar.c:2803
 msgid "Unknown reason."
 msgstr "Причина неизвестна."
 
-#: ../src/protocols/oscar/oscar.c:5167
-#: ../src/protocols/sametime/sametime.c:2373
+#: ../src/protocols/oscar/oscar.c:2739
+#: ../src/protocols/sametime/sametime.c:2367
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Не удаётся отправить сообщение для %s:"
 
-#: ../src/protocols/oscar/oscar.c:5227
+#: ../src/protocols/oscar/oscar.c:2799
 #, c-format
 msgid "User information not available: %s"
 msgstr "Пользовательская информация недоступна: %s"
 
-#: ../src/protocols/oscar/oscar.c:5230
+#: ../src/protocols/oscar/oscar.c:2802
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Пользовательская информация для %s недоступна:"
 
-#: ../src/protocols/oscar/oscar.c:5257
+#: ../src/protocols/oscar/oscar.c:2828
 msgid "Online Since"
 msgstr "В сети с"
 
-#: ../src/protocols/oscar/oscar.c:5262
+#: ../src/protocols/oscar/oscar.c:2833
 #: ../src/protocols/yahoo/yahoo_profile.c:1159
 msgid "Member Since"
 msgstr "Член с"
 
-#: ../src/protocols/oscar/oscar.c:5267
+#: ../src/protocols/oscar/oscar.c:2838
 msgid "Capabilities"
 msgstr "Возможности"
 
-#: ../src/protocols/oscar/oscar.c:5285
+#: ../src/protocols/oscar/oscar.c:2856
 msgid "Available Message"
 msgstr "Статусное сообщение"
 
-#: ../src/protocols/oscar/oscar.c:5402
+#: ../src/protocols/oscar/oscar.c:2945
 msgid "Your AIM connection may be lost."
 msgstr "Ваше соединение AIM может быть потеряно."
 
 #. The conversion failed!
-#: ../src/protocols/oscar/oscar.c:5588
+#: ../src/protocols/oscar/oscar.c:3126
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -9121,11 +9314,11 @@
 "[Не удаётся отобразить сообщение от этого пользователя, так как оно содержит "
 "недопустимые символы.]"
 
-#: ../src/protocols/oscar/oscar.c:5809
+#: ../src/protocols/oscar/oscar.c:3345
 msgid "Rate limiting error."
 msgstr "Ошибка ограничения предела."
 
-#: ../src/protocols/oscar/oscar.c:5810
+#: ../src/protocols/oscar/oscar.c:3346
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -9133,94 +9326,81 @@
 "Последнее предпринятое вами действие не может быть выполнено, так как вы "
 "превысили предел. Подождите 10 секунд и попытайтесь снова."
 
-#: ../src/protocols/oscar/oscar.c:5883
+#: ../src/protocols/oscar/oscar.c:3418
 msgid "You have been signed off for an unknown reason."
 msgstr "Вы были отключены по неизвестной причине."
 
-#: ../src/protocols/oscar/oscar.c:5896 ../src/protocols/toc/toc.c:971
+#: ../src/protocols/oscar/oscar.c:3431 ../src/protocols/toc/toc.c:971
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Вы были отсоединены от чата %s."
 
-#. XXX - Don't call this with ssi
-#: ../src/protocols/oscar/oscar.c:5925
-msgid "Finalizing connection"
-msgstr "Завершение установления соединения"
-
-#: ../src/protocols/oscar/oscar.c:6190 ../src/protocols/silc/util.c:542
+#: ../src/protocols/oscar/oscar.c:3649 ../src/protocols/silc/util.c:556
 msgid "Mobile Phone"
 msgstr "Мобильный телефон"
 
-#: ../src/protocols/oscar/oscar.c:6207
+#: ../src/protocols/oscar/oscar.c:3676
 msgid "Personal Web Page"
 msgstr "Персональная Web-страница"
 
-#: ../src/protocols/oscar/oscar.c:6211
+#: ../src/protocols/oscar/oscar.c:3680
 msgid "Additional Information"
 msgstr "Дополнительная информация"
 
-#: ../src/protocols/oscar/oscar.c:6216
-msgid "Home Address"
-msgstr "Домашний адрес"
-
-#: ../src/protocols/oscar/oscar.c:6220 ../src/protocols/oscar/oscar.c:6228
+#: ../src/protocols/oscar/oscar.c:3689 ../src/protocols/oscar/oscar.c:3697
 msgid "Zip Code"
 msgstr "Индекс"
 
-#: ../src/protocols/oscar/oscar.c:6224
-msgid "Work Address"
-msgstr "Рабочий адрес"
-
-#: ../src/protocols/oscar/oscar.c:6232
+#: ../src/protocols/oscar/oscar.c:3701
 msgid "Work Information"
 msgstr "Информация о работе"
 
-#: ../src/protocols/oscar/oscar.c:6233
-msgid "Company"
-msgstr "Компания"
-
-#: ../src/protocols/oscar/oscar.c:6234
+#: ../src/protocols/oscar/oscar.c:3703
 msgid "Division"
 msgstr "Отдел"
 
-#: ../src/protocols/oscar/oscar.c:6235
+#: ../src/protocols/oscar/oscar.c:3704
 msgid "Position"
 msgstr "Должность"
 
-#: ../src/protocols/oscar/oscar.c:6237
+#: ../src/protocols/oscar/oscar.c:3706
 msgid "Web Page"
 msgstr "Web-страница"
 
-#: ../src/protocols/oscar/oscar.c:6295
+#: ../src/protocols/oscar/oscar.c:3764
 msgid "Pop-Up Message"
 msgstr "Всплывающее сообщение"
 
-#: ../src/protocols/oscar/oscar.c:6335
+#: ../src/protocols/oscar/oscar.c:3804
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "Следующий идентификатор пользователя соотнесён с %s"
-msgstr[1] "Следующие идентификаторы пользователя соотнесены с %s"
-
-#: ../src/protocols/oscar/oscar.c:6366
+msgstr[1] "Следующие идентификаторы пользователей соотнесены с %s"
+
+#: ../src/protocols/oscar/oscar.c:3809
+msgid "Screen name"
+msgstr "Идентификатор пользователя"
+
+#: ../src/protocols/oscar/oscar.c:3835
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Ничего не найдено для адреса e-mail %s"
 
-#: ../src/protocols/oscar/oscar.c:6387
+#: ../src/protocols/oscar/oscar.c:3856
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Вы должны получить e-mail с просьбой подтвердить %s."
 
-#: ../src/protocols/oscar/oscar.c:6389
+#: ../src/protocols/oscar/oscar.c:3858
 msgid "Account Confirmation Requested"
 msgstr "Запрошено подтверждение учётной записи"
 
-#: ../src/protocols/oscar/oscar.c:6420
+#: ../src/protocols/oscar/oscar.c:3889
 msgid "Error Changing Account Info"
 msgstr "Ошибка изменения информации об учётной записи"
 
-#: ../src/protocols/oscar/oscar.c:6423
+#: ../src/protocols/oscar/oscar.c:3892
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -9229,14 +9409,14 @@
 "Ошибка 0x%04x: Не удаётся отформатировать идентификатор пользователя, так "
 "как запрошенный идентификатор пользователя отличается от оригинального."
 
-#: ../src/protocols/oscar/oscar.c:6426
+#: ../src/protocols/oscar/oscar.c:3895
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Ошибка 0x%04x: Не удаётся отформатировать идентификатор пользователя, так "
 "как он недопустим."
 
-#: ../src/protocols/oscar/oscar.c:6429
+#: ../src/protocols/oscar/oscar.c:3898
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -9245,23 +9425,25 @@
 "Ошибка 0x%04x: Не удаётся отформатировать идентификатор пользователя, так "
 "как запрошенный идентификатор пользователя слишком велик."
 
-#: ../src/protocols/oscar/oscar.c:6432
+#: ../src/protocols/oscar/oscar.c:3901
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
-
-#: ../src/protocols/oscar/oscar.c:6435
+"Ошибка 0x%04x: Не удаётся изменить адрес e-mail, так как для этого "
+"идентификатора пользователя уже есть ожидающий запрос."
+
+#: ../src/protocols/oscar/oscar.c:3904
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "Ошибка 0x%04x: Не удаётся изменить адрес e-mail, так как с заданным адресом "
-"соотнесено слишком много идентификаторов пользователя."
-
-#: ../src/protocols/oscar/oscar.c:6438
+"соотнесено слишком много идентификаторов пользователей."
+
+#: ../src/protocols/oscar/oscar.c:3907
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -9270,12 +9452,12 @@
 "Ошибка 0x%04x: Не удаётся изменить адрес e-mail, так как заданный адрес "
 "неверен."
 
-#: ../src/protocols/oscar/oscar.c:6441
+#: ../src/protocols/oscar/oscar.c:3910
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Ошибка 0x%04x: Неизвестная ошибка."
 
-#: ../src/protocols/oscar/oscar.c:6451
+#: ../src/protocols/oscar/oscar.c:3920
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -9284,27 +9466,27 @@
 "Сейчас ваш идентификатор пользователя отформатирован следующим образом:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:6452 ../src/protocols/oscar/oscar.c:6459
+#: ../src/protocols/oscar/oscar.c:3921 ../src/protocols/oscar/oscar.c:3928
 msgid "Account Info"
 msgstr "Информация об учётной записи"
 
-#: ../src/protocols/oscar/oscar.c:6457
+#: ../src/protocols/oscar/oscar.c:3926
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "Адрес e-mail для %s: %s"
 
-#: ../src/protocols/oscar/oscar.c:6535
+#: ../src/protocols/oscar/oscar.c:4101
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Ваше изображение не было отправлено. Вы должны иметь прямое соединение для "
 "отправки изображений."
 
-#: ../src/protocols/oscar/oscar.c:6775
+#: ../src/protocols/oscar/oscar.c:4341
 msgid "Unable to set AIM profile."
 msgstr "Не удаётся установить профиль AIM."
 
-#: ../src/protocols/oscar/oscar.c:6776
+#: ../src/protocols/oscar/oscar.c:4342
 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 "
@@ -9314,7 +9496,7 @@
 "входа. Ваш профиль остаётся неустановленным; попытайтесь установить его ещё "
 "раз, когда будете полностью подключены."
 
-#: ../src/protocols/oscar/oscar.c:6790
+#: ../src/protocols/oscar/oscar.c:4356
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -9327,11 +9509,11 @@
 msgstr[1] ""
 "Максимальный размер профиля в %d байт был превышен. Gaim урезал его для вас."
 
-#: ../src/protocols/oscar/oscar.c:6795
+#: ../src/protocols/oscar/oscar.c:4361
 msgid "Profile too long."
 msgstr "Профиль слишком велик."
 
-#: ../src/protocols/oscar/oscar.c:6843
+#: ../src/protocols/oscar/oscar.c:4408
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -9346,11 +9528,11 @@
 "Максимальный размер сообщения об отсутствии в %d байт был превышен. Gaim "
 "урезал его для вас."
 
-#: ../src/protocols/oscar/oscar.c:6848
+#: ../src/protocols/oscar/oscar.c:4413
 msgid "Away message too long."
 msgstr "Сообщение об отсутствии слишком велико."
 
-#: ../src/protocols/oscar/oscar.c:6917
+#: ../src/protocols/oscar/oscar.c:4482
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -9358,16 +9540,16 @@
 "spaces, or contain only numbers."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:6919 ../src/protocols/oscar/oscar.c:7326
-#: ../src/protocols/oscar/oscar.c:7340
+#: ../src/protocols/oscar/oscar.c:4484 ../src/protocols/oscar/oscar.c:4883
+#: ../src/protocols/oscar/oscar.c:4897
 msgid "Unable To Add"
 msgstr "Не удаётся добавить"
 
-#: ../src/protocols/oscar/oscar.c:7026
+#: ../src/protocols/oscar/oscar.c:4588
 msgid "Unable To Retrieve Buddy List"
 msgstr "Не удаётся загрузить список собеседников"
 
-#: ../src/protocols/oscar/oscar.c:7027
+#: ../src/protocols/oscar/oscar.c:4589
 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 "
@@ -9377,13 +9559,13 @@
 "Список собеседников не потерян и, вероятно, станет доступен в течение "
 "нескольких часов."
 
-#: ../src/protocols/oscar/oscar.c:7224 ../src/protocols/oscar/oscar.c:7225
-#: ../src/protocols/oscar/oscar.c:7230 ../src/protocols/oscar/oscar.c:7384
-#: ../src/protocols/oscar/oscar.c:7385 ../src/protocols/oscar/oscar.c:7390
+#: ../src/protocols/oscar/oscar.c:4781 ../src/protocols/oscar/oscar.c:4782
+#: ../src/protocols/oscar/oscar.c:4787 ../src/protocols/oscar/oscar.c:4941
+#: ../src/protocols/oscar/oscar.c:4942 ../src/protocols/oscar/oscar.c:4947
 msgid "Orphans"
 msgstr "Сироты"
 
-#: ../src/protocols/oscar/oscar.c:7324
+#: ../src/protocols/oscar/oscar.c:4881
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9392,11 +9574,11 @@
 "Не удалось добавить собеседника %s, так как в списке собеседников слишком "
 "много собеседников. Удалите один и попытайтесь снова."
 
-#: ../src/protocols/oscar/oscar.c:7324 ../src/protocols/oscar/oscar.c:7338
+#: ../src/protocols/oscar/oscar.c:4881 ../src/protocols/oscar/oscar.c:4895
 msgid "(no name)"
 msgstr "(нет имени)"
 
-#: ../src/protocols/oscar/oscar.c:7338
+#: ../src/protocols/oscar/oscar.c:4895
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -9407,7 +9589,7 @@
 "причиной этого является то, что вы имеете максимальное количество допустимых "
 "собеседников в списке собеседников."
 
-#: ../src/protocols/oscar/oscar.c:7421
+#: ../src/protocols/oscar/oscar.c:4978
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -9416,11 +9598,11 @@
 "Пользователь %s разрешил добавить его в ваш список собеседников. Хотите "
 "добавить его?"
 
-#: ../src/protocols/oscar/oscar.c:7427
+#: ../src/protocols/oscar/oscar.c:4984
 msgid "Authorization Given"
 msgstr "Авторизация дана"
 
-#: ../src/protocols/oscar/oscar.c:7471
+#: ../src/protocols/oscar/oscar.c:5028
 #, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
@@ -9431,17 +9613,17 @@
 "%s"
 
 #. Granted
-#: ../src/protocols/oscar/oscar.c:7516
+#: ../src/protocols/oscar/oscar.c:5073
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "Пользователь %s разрешил добавить его в ваш список собеседников."
 
-#: ../src/protocols/oscar/oscar.c:7517
+#: ../src/protocols/oscar/oscar.c:5074
 msgid "Authorization Granted"
 msgstr "Авторизация дана"
 
 #. Denied
-#: ../src/protocols/oscar/oscar.c:7520
+#: ../src/protocols/oscar/oscar.c:5077
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9452,92 +9634,109 @@
 "следующей причине:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:7521
+#: ../src/protocols/oscar/oscar.c:5078
 msgid "Authorization Denied"
 msgstr "В авторизации отказано"
 
-#: ../src/protocols/oscar/oscar.c:7558 ../src/protocols/toc/toc.c:1372
+#: ../src/protocols/oscar/oscar.c:5114 ../src/protocols/toc/toc.c:1372
 msgid "_Exchange:"
 msgstr "Обмен:"
 
-#: ../src/protocols/oscar/oscar.c:7594
+#: ../src/protocols/oscar/oscar.c:5154
 msgid "Invalid chat name specified."
 msgstr "Указано неверное имя чата."
 
-#: ../src/protocols/oscar/oscar.c:7664
+#: ../src/protocols/oscar/oscar.c:5224
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Изображение не было отправлено. Вы не можете отправлять изображения в чатах "
 "AIM."
 
-#: ../src/protocols/oscar/oscar.c:7821
+#: ../src/protocols/oscar/oscar.c:5386
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(загрузка)</i>"
 
-#: ../src/protocols/oscar/oscar.c:8127
+#: ../src/protocols/oscar/oscar.c:5691
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Комментарий собеседника для %s"
 
-#: ../src/protocols/oscar/oscar.c:8128
+#: ../src/protocols/oscar/oscar.c:5692
 msgid "Buddy Comment:"
 msgstr "Комментарий собеседника:"
 
-#: ../src/protocols/oscar/oscar.c:8147
+#: ../src/protocols/oscar/oscar.c:5738
+#, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr "Вы выбрали открытие прямого соединения с %s."
+
+#: ../src/protocols/oscar/oscar.c:5742
+msgid ""
+"Because this reveals your IP address, it may be considered a security risk.  "
+"Do you wish to continue?"
+msgstr ""
+"Так как это раскроет ваш IP-адрес, это можно считать угрозой безопасности. "
+"Хотите продолжить?"
+
+#: ../src/protocols/oscar/oscar.c:5746 ../src/protocols/oscar/peer.c:941
+msgid "_Connect"
+msgstr "_Установить соединение"
+
+#: ../src/protocols/oscar/oscar.c:5764
 msgid "Edit Buddy Comment"
 msgstr "Изменить комментарий собеседника"
 
-#: ../src/protocols/oscar/oscar.c:8154
+#: ../src/protocols/oscar/oscar.c:5772
 msgid "Get Status Msg"
 msgstr "Получить сообщение о статусе"
 
-#: ../src/protocols/oscar/oscar.c:8167
+#: ../src/protocols/oscar/oscar.c:5785
 msgid "Direct IM"
 msgstr "Прямое соединение"
 
-#: ../src/protocols/oscar/oscar.c:8186
+#: ../src/protocols/oscar/oscar.c:5807
 msgid "Re-request Authorization"
 msgstr "Повторный запрос авторизации"
 
-#: ../src/protocols/oscar/oscar.c:8243
+#: ../src/protocols/oscar/oscar.c:5864
 msgid "Require authorization"
 msgstr "Требовать авторизацию"
 
-#: ../src/protocols/oscar/oscar.c:8246
+#: ../src/protocols/oscar/oscar.c:5867
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Статус на веб-страницах (вызывает появление СПАМА!)"
 
-#: ../src/protocols/oscar/oscar.c:8251
+#: ../src/protocols/oscar/oscar.c:5872
 msgid "ICQ Privacy Options"
 msgstr "Параметры конфиденциальности ICQ"
 
-#: ../src/protocols/oscar/oscar.c:8268
+#: ../src/protocols/oscar/oscar.c:5889
 msgid "The new formatting is invalid."
 msgstr "Новое форматирование недопустимо."
 
-#: ../src/protocols/oscar/oscar.c:8269
+#: ../src/protocols/oscar/oscar.c:5890
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "Форматирование идентификатора пользователя может влиять только на регистр "
 "букв и пробелы."
 
-#: ../src/protocols/oscar/oscar.c:8276
+#: ../src/protocols/oscar/oscar.c:5897
 msgid "New screen name formatting:"
 msgstr "Новое форматирование идентификатора пользователя:"
 
-#: ../src/protocols/oscar/oscar.c:8328
+#: ../src/protocols/oscar/oscar.c:5953
 msgid "Change Address To:"
 msgstr "Изменить адрес на:"
 
-#: ../src/protocols/oscar/oscar.c:8373
+#: ../src/protocols/oscar/oscar.c:5998
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>вы не ожидаете авторизацию</i>"
 
-#: ../src/protocols/oscar/oscar.c:8376
+#: ../src/protocols/oscar/oscar.c:6001
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Вы ожидаете авторизацию от следующих собеседников"
 
-#: ../src/protocols/oscar/oscar.c:8377
+#: ../src/protocols/oscar/oscar.c:6002
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9545,64 +9744,72 @@
 "Вы можете запросить авторизацию от этих собеседников повторно, щёлкнув на "
 "них правой кнопкой мыши и выбрав \"Повторный запрос авторизации\"."
 
-#: ../src/protocols/oscar/oscar.c:8394
+#: ../src/protocols/oscar/oscar.c:6019
 msgid "Find Buddy by E-Mail"
 msgstr "Найти собеседника по e-mail"
 
-#: ../src/protocols/oscar/oscar.c:8395
+#: ../src/protocols/oscar/oscar.c:6020
 msgid "Search for a buddy by e-mail address"
 msgstr "Искать собеседника по адресу e-mail"
 
-#: ../src/protocols/oscar/oscar.c:8396
+#: ../src/protocols/oscar/oscar.c:6021
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Введите адрес e-mail собеседника, которого вы ищете."
 
-#: ../src/protocols/oscar/oscar.c:8489
+#: ../src/protocols/oscar/oscar.c:6190
 msgid "Set User Info (URL)..."
 msgstr "Установить пользовательскую информацию (URL)..."
 
-#: ../src/protocols/oscar/oscar.c:8500
+#: ../src/protocols/oscar/oscar.c:6201
 msgid "Change Password (URL)"
 msgstr "Изменить пароль (URL)"
 
-#: ../src/protocols/oscar/oscar.c:8504
+#: ../src/protocols/oscar/oscar.c:6205
 msgid "Configure IM Forwarding (URL)"
 msgstr "Настроить перенаправление сообщений (URL)"
 
 #. ICQ actions
-#: ../src/protocols/oscar/oscar.c:8514
+#: ../src/protocols/oscar/oscar.c:6215
 msgid "Set Privacy Options..."
 msgstr "Установить параметры конфиденциальности..."
 
 #. AIM actions
-#: ../src/protocols/oscar/oscar.c:8521
+#: ../src/protocols/oscar/oscar.c:6222
 msgid "Format Screen Name..."
 msgstr "Форматировать идентификатор пользователя..."
 
-#: ../src/protocols/oscar/oscar.c:8525
+#: ../src/protocols/oscar/oscar.c:6226
 msgid "Confirm Account"
 msgstr "Подтвердить учётную запись"
 
-#: ../src/protocols/oscar/oscar.c:8529
-msgid "Display Currently Registered Address"
-msgstr "Показать текущий зарегистрированный адрес"
-
-#: ../src/protocols/oscar/oscar.c:8533
-msgid "Change Currently Registered Address..."
-msgstr "Изменить текущий зарегистрированный адрес..."
-
-#: ../src/protocols/oscar/oscar.c:8540
+#: ../src/protocols/oscar/oscar.c:6230
+msgid "Display Currently Registered E-Mail Address"
+msgstr "Показать текущий зарегистрированный адрес e-mail"
+
+#: ../src/protocols/oscar/oscar.c:6234
+msgid "Change Currently Registered E-Mail Address..."
+msgstr "Изменить текущий зарегистрированный адрес e-mail..."
+
+#: ../src/protocols/oscar/oscar.c:6241
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Показать собеседников без авторизации"
 
-#: ../src/protocols/oscar/oscar.c:8546
-msgid "Search for Buddy by E-Mail..."
-msgstr "Искать собеседника по e-mail..."
-
-#: ../src/protocols/oscar/oscar.c:8551
+#: ../src/protocols/oscar/oscar.c:6247
+msgid "Search for Buddy by E-Mail Address..."
+msgstr "Искать собеседника по адресу e-mail..."
+
+#: ../src/protocols/oscar/oscar.c:6252
 msgid "Search for Buddy by Information"
 msgstr "Искать собеседника по информации"
 
+#: ../src/protocols/oscar/oscar.c:6318
+msgid "Use recent buddies group"
+msgstr ""
+
+#: ../src/protocols/oscar/oscar.c:6321
+msgid "Show how long you have been idle"
+msgstr "Показывать, как долго вы бездействовали"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9613,156 +9820,175 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/oscar/oscar.c:8729 ../src/protocols/oscar/oscar.c:8731
+#: ../src/protocols/oscar/oscar.c:6446 ../src/protocols/oscar/oscar.c:6448
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "Модуль протокола AIM/ICQ"
 
-#: ../src/protocols/oscar/oscar.c:8750
-msgid "Auth host"
-msgstr "Узел идентификации"
-
-#: ../src/protocols/oscar/oscar.c:8753
-msgid "Auth port"
-msgstr "Порт идентификации"
-
-#: ../src/protocols/oscar/oscar.c:8756 ../src/protocols/zephyr/zephyr.c:2920
+#: ../src/protocols/oscar/oscar.c:6473 ../src/protocols/zephyr/zephyr.c:2920
 msgid "Encoding"
 msgstr "Кодировка"
 
-#: ../src/protocols/oscar/oscar.c:8760
-msgid ""
-"Use AIM/ICQ proxy server\n"
-"(slower, but usually works)"
-msgstr ""
-"Использовать прокси-сервер AIM/ICQ\n"
-"(медленнее, но обычно работает)"
+#: ../src/protocols/oscar/oscar.c:6477
+msgid ""
+"Always use AIM/ICQ proxy server\n"
+"(slower, but does not reveal your IP address)"
+msgstr ""
+"Всегда использовать прокси-сервер AIM/ICQ\n"
+"(медленнее, но не раскрывает ваш IP-адрес)"
+
+#: ../src/protocols/oscar/peer.c:613
+#, c-format
+msgid "Asking %s to connect to us at %s:%hu for Direct IM."
+msgstr ""
+
+#: ../src/protocols/oscar/peer.c:662 ../src/protocols/oscar/peer.c:693
+#, fuzzy, c-format
+msgid "Attempting to connect to %s:%hu."
+msgstr "Не удаётся соединиться с сервером."
+
+#: ../src/protocols/oscar/peer.c:753
+#, fuzzy
+msgid "Attempting to connect via proxy server."
+msgstr "Не удалось соединиться с сервером."
+
+#: ../src/protocols/oscar/peer.c:931
+#, fuzzy, c-format
+msgid "%s has just asked to directly connect to %s"
+msgstr "%s установил тему: %s"
+
+#: ../src/protocols/oscar/peer.c:935
+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/sametime/sametime.c:415
 msgid "Connection closed (writing)"
 msgstr "Соединение разорвано (запись)"
 
-#: ../src/protocols/sametime/sametime.c:1267
+#: ../src/protocols/sametime/sametime.c:1261
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Название группы:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:1268
+#: ../src/protocols/sametime/sametime.c:1262
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:1270
+#: ../src/protocols/sametime/sametime.c:1264
 #, c-format
 msgid "Info for Group %s"
 msgstr "Информация для группы %s"
 
-#: ../src/protocols/sametime/sametime.c:1272
+#: ../src/protocols/sametime/sametime.c:1266
 msgid "Notes Address Book Information"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:1304
+#: ../src/protocols/sametime/sametime.c:1298
 msgid "Invite Group to Conference..."
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:1314
+#: ../src/protocols/sametime/sametime.c:1308
 msgid "Get Notes Address Book Info"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:1467
+#: ../src/protocols/sametime/sametime.c:1461
 msgid "Sending Handshake"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:1472
+#: ../src/protocols/sametime/sametime.c:1466
 msgid "Waiting for Handshake Acknowledgement"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:1477
+#: ../src/protocols/sametime/sametime.c:1471
 msgid "Handshake Acknowledged, Sending Login"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:1482
+#: ../src/protocols/sametime/sametime.c:1476
 msgid "Waiting for Login Acknowledgement"
 msgstr ""
 
+#: ../src/protocols/sametime/sametime.c:1481
+msgid "Login Redirected"
+msgstr ""
+
 #: ../src/protocols/sametime/sametime.c:1487
-msgid "Login Redirected"
-msgstr ""
-
-#: ../src/protocols/sametime/sametime.c:1493
 msgid "Forcing Login"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:1497
+#: ../src/protocols/sametime/sametime.c:1491
 msgid "Login Acknowledged"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:1502
+#: ../src/protocols/sametime/sametime.c:1496
 msgid "Starting Services"
 msgstr "Запуск служб"
 
-#: ../src/protocols/sametime/sametime.c:1507
+#: ../src/protocols/sametime/sametime.c:1501
 msgid "Connected"
 msgstr "Соединение установлено"
 
-#: ../src/protocols/sametime/sametime.c:1605
+#: ../src/protocols/sametime/sametime.c:1599
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:1610
+#: ../src/protocols/sametime/sametime.c:1604
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:1662
+#: ../src/protocols/sametime/sametime.c:1656
 msgid "Connection reset"
 msgstr "Сброс соединения"
 
-#: ../src/protocols/sametime/sametime.c:1669
+#: ../src/protocols/sametime/sametime.c:1663
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Ошибка при чтении из сокета: %s"
 
 #. this is a regular connect, error out
-#: ../src/protocols/sametime/sametime.c:1698
-#: ../src/protocols/sametime/sametime.c:3696
+#: ../src/protocols/sametime/sametime.c:1692
+#: ../src/protocols/sametime/sametime.c:3688
 msgid "Unable to connect to host"
 msgstr "Не удаётся соединиться с узлом"
 
-#: ../src/protocols/sametime/sametime.c:1736
+#: ../src/protocols/sametime/sametime.c:1730
 #, c-format
 msgid "Announcement from %s"
 msgstr "Объявление от %s"
 
-#: ../src/protocols/sametime/sametime.c:1910
+#: ../src/protocols/sametime/sametime.c:1904
 msgid "Conference Closed"
 msgstr "Конференция закрыта"
 
-#: ../src/protocols/sametime/sametime.c:2367
+#: ../src/protocols/sametime/sametime.c:2361
 msgid "Unable to send message: "
 msgstr "Не удаётся отправить сообщение: "
 
-#: ../src/protocols/sametime/sametime.c:2926
+#: ../src/protocols/sametime/sametime.c:2918
 msgid "Place Closed"
 msgstr "Место закрыто"
 
-#: ../src/protocols/sametime/sametime.c:3217
+#: ../src/protocols/sametime/sametime.c:3209
 msgid "Microphone"
 msgstr "Микрофон"
 
-#: ../src/protocols/sametime/sametime.c:3218
+#: ../src/protocols/sametime/sametime.c:3210
 msgid "Speakers"
 msgstr "Колонки"
 
-#: ../src/protocols/sametime/sametime.c:3219
+#: ../src/protocols/sametime/sametime.c:3211
 msgid "Video Camera"
 msgstr "Видеокамера"
 
-#: ../src/protocols/sametime/sametime.c:3223
+#: ../src/protocols/sametime/sametime.c:3215
 msgid "File Transfer"
 msgstr "Передача файлов"
 
-#: ../src/protocols/sametime/sametime.c:3257
+#: ../src/protocols/sametime/sametime.c:3249
 #, c-format
 msgid ""
 "\n"
@@ -9771,7 +9997,7 @@
 "\n"
 "<b>Поддерживается:</b> %s"
 
-#: ../src/protocols/sametime/sametime.c:3262
+#: ../src/protocols/sametime/sametime.c:3254
 msgid ""
 "\n"
 "<b>External User</b>"
@@ -9779,38 +10005,38 @@
 "\n"
 "<b>Внешний пользователь</b>"
 
-#: ../src/protocols/sametime/sametime.c:3368
+#: ../src/protocols/sametime/sametime.c:3360
 msgid "Create conference with user"
 msgstr "Создать конференцию с пользователем"
 
-#: ../src/protocols/sametime/sametime.c:3369
+#: ../src/protocols/sametime/sametime.c:3361
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:3373
+#: ../src/protocols/sametime/sametime.c:3365
 msgid "New Conference"
 msgstr "Новая конференция"
 
-#: ../src/protocols/sametime/sametime.c:3375
+#: ../src/protocols/sametime/sametime.c:3367
 msgid "Create"
 msgstr "Создать"
 
-#: ../src/protocols/sametime/sametime.c:3439
+#: ../src/protocols/sametime/sametime.c:3431
 msgid "Available Conferences"
 msgstr "Доступные конференции"
 
-#: ../src/protocols/sametime/sametime.c:3445
+#: ../src/protocols/sametime/sametime.c:3437
 msgid "Create New Conference..."
 msgstr "Создать новую конференцию..."
 
-#: ../src/protocols/sametime/sametime.c:3452
+#: ../src/protocols/sametime/sametime.c:3444
 msgid "Invite user to a conference"
 msgstr "Пригласить пользователя в конференцию"
 
-#: ../src/protocols/sametime/sametime.c:3453
+#: ../src/protocols/sametime/sametime.c:3445
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -9818,117 +10044,118 @@
 "this user to."
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:3458
+#: ../src/protocols/sametime/sametime.c:3450
 msgid "Invite to Conference"
 msgstr "Пригласить в конференцию"
 
-#: ../src/protocols/sametime/sametime.c:3460
+#: ../src/protocols/sametime/sametime.c:3452
 msgid "Invite"
 msgstr "Пригласить"
 
-#: ../src/protocols/sametime/sametime.c:3548
+#: ../src/protocols/sametime/sametime.c:3540
 msgid "Invite to Conference..."
 msgstr "Пригласить в конференцию..."
 
-#: ../src/protocols/sametime/sametime.c:3553
+#: ../src/protocols/sametime/sametime.c:3545
 msgid "Send TEST Announcement"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:3600
+#: ../src/protocols/sametime/sametime.c:3592
 msgid "No Sametime Community Server specified"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:3622
+#: ../src/protocols/sametime/sametime.c:3614
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
 "Please enter one below to continue logging in."
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:3627
+#: ../src/protocols/sametime/sametime.c:3619
 msgid "Meanwhile Connection Setup"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:3628
+#: ../src/protocols/sametime/sametime.c:3620
 msgid "No Sametime Community Server Specified"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:4085
+#: ../src/protocols/sametime/sametime.c:4077
 msgid "<b>External User</b><br>"
 msgstr "<b>Внешний пользователь</b><br>"
 
-#: ../src/protocols/sametime/sametime.c:4088
+#: ../src/protocols/sametime/sametime.c:4080
 #, c-format
 msgid "<b>User ID:</b> %s<br>"
 msgstr "<b>Пользовательский ID:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4094
+#: ../src/protocols/sametime/sametime.c:4086
 #, c-format
 msgid "<b>Full Name:</b> %s<br>"
 msgstr "<b>Полное имя:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4100
+#: ../src/protocols/sametime/sametime.c:4092
 msgid "<b>Last Known Client:</b> "
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:4108
+#: ../src/protocols/sametime/sametime.c:4100
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Неизвестно (0x%04x)<br>"
 
-#: ../src/protocols/sametime/sametime.c:4115
+#: ../src/protocols/sametime/sametime.c:4107
 #, c-format
 msgid "<b>Supports:</b> %s<br>"
 msgstr "<b>Поддерживается:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4121
+#: ../src/protocols/sametime/sametime.c:4113
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>Статус:</b> %s"
 
-#: ../src/protocols/sametime/sametime.c:4264
-#: ../src/protocols/sametime/sametime.c:5427
+#: ../src/protocols/sametime/sametime.c:4256
+#: ../src/protocols/sametime/sametime.c:5419
 msgid "User Name"
 msgstr "Имя пользователя"
 
-#: ../src/protocols/sametime/sametime.c:4267
-#: ../src/protocols/sametime/sametime.c:5430
+#: ../src/protocols/sametime/sametime.c:4259
+#: ../src/protocols/sametime/sametime.c:5422
 msgid "Sametime ID"
 msgstr "Sametime ID"
 
-#: ../src/protocols/sametime/sametime.c:4291
+#: ../src/protocols/sametime/sametime.c:4283
 msgid "An ambiguous user ID was entered"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:4292
-#, fuzzy, c-format
+#: ../src/protocols/sametime/sametime.c:4284
+#, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
 "select the correct user from the list below to add them to your buddy list."
 msgstr ""
-"Было найдено несколько пользователей с одинаковыми именами. Выберите из "
-"списка одного из них для добавления в список собеседников."
-
-#: ../src/protocols/sametime/sametime.c:4297
+"Идентификатор '%s' может ссылаться на любого из следующих пользователей. "
+"Выберите из списка ниже одного из них для добавления его в список "
+"собеседников."
+
+#: ../src/protocols/sametime/sametime.c:4289
 msgid "Select User"
 msgstr "Выберите пользователя"
 
-#: ../src/protocols/sametime/sametime.c:4367
+#: ../src/protocols/sametime/sametime.c:4359
 msgid "Unable to add user: user not found"
 msgstr "Не удаётся добавить пользователя: пользователь не найден"
 
-#: ../src/protocols/sametime/sametime.c:4369
+#: ../src/protocols/sametime/sametime.c:4361
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
 "entry has been removed from your buddy list."
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:4374
+#: ../src/protocols/sametime/sametime.c:4366
 msgid "Unable to add user"
 msgstr "Не удаётся добавить пользователя"
 
-#: ../src/protocols/sametime/sametime.c:4946
+#: ../src/protocols/sametime/sametime.c:4938
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -9937,68 +10164,63 @@
 "Ошибка чтения файла %s: \n"
 "%s\n"
 
-#: ../src/protocols/sametime/sametime.c:5077
-#, fuzzy
+#: ../src/protocols/sametime/sametime.c:5069
 msgid "Remotely Stored Buddy List"
-msgstr "Отправить список собеседников"
-
-#: ../src/protocols/sametime/sametime.c:5082
-#, fuzzy
+msgstr "Сохраняемый удалённо список собеседников"
+
+#: ../src/protocols/sametime/sametime.c:5074
 msgid "Buddy List Storage Mode"
-msgstr "Сортировка списка собеседников"
-
-#: ../src/protocols/sametime/sametime.c:5085
-#, fuzzy
+msgstr "Режим хранения списка собеседников"
+
+#: ../src/protocols/sametime/sametime.c:5077
 msgid "Local Buddy List Only"
-msgstr "Закреплённый список собеседников"
-
-#: ../src/protocols/sametime/sametime.c:5087
-#, fuzzy
+msgstr "Только локальный список собеседников"
+
+#: ../src/protocols/sametime/sametime.c:5079
 msgid "Merge List from Server"
-msgstr "Удалить список собеседников с сервера"
-
-#: ../src/protocols/sametime/sametime.c:5089
-#, fuzzy
+msgstr "Объединить со списком с сервера"
+
+#: ../src/protocols/sametime/sametime.c:5081
 msgid "Merge and Save List to Server"
-msgstr "Экспортировать список собеседников на сервер"
-
-#: ../src/protocols/sametime/sametime.c:5091
+msgstr "Объединить и сохранить список на сервере"
+
+#: ../src/protocols/sametime/sametime.c:5083
 msgid "Synchronize List with Server"
-msgstr ""
-
-#: ../src/protocols/sametime/sametime.c:5140
+msgstr "Синхронизировать со списком с сервера"
+
+#: ../src/protocols/sametime/sametime.c:5132
 #, c-format
 msgid "Import Sametime List for Account %s"
-msgstr ""
-
-#: ../src/protocols/sametime/sametime.c:5179
+msgstr "Импортировать список Sametime для учётной записи %s"
+
+#: ../src/protocols/sametime/sametime.c:5171
 #, c-format
 msgid "Export Sametime List for Account %s"
-msgstr ""
-
-#: ../src/protocols/sametime/sametime.c:5232
+msgstr "Экспортировать список Sametime для учётной записи %s"
+
+#: ../src/protocols/sametime/sametime.c:5224
 msgid "Unable to add group: group exists"
 msgstr "Не удаётся добавить группу: группа существует"
 
-#: ../src/protocols/sametime/sametime.c:5233
+#: ../src/protocols/sametime/sametime.c:5225
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Группа с именем '%s' уже существует в списке собеседников."
 
-#: ../src/protocols/sametime/sametime.c:5236
-#: ../src/protocols/sametime/sametime.c:5365
+#: ../src/protocols/sametime/sametime.c:5228
+#: ../src/protocols/sametime/sametime.c:5357
 msgid "Unable to add group"
 msgstr "Не удаётся добавить группу"
 
-#: ../src/protocols/sametime/sametime.c:5295
+#: ../src/protocols/sametime/sametime.c:5287
 msgid "Possible Matches"
 msgstr "Вероятные совпадения"
 
-#: ../src/protocols/sametime/sametime.c:5311
+#: ../src/protocols/sametime/sametime.c:5303
 msgid "Notes Address Book group results"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:5312
+#: ../src/protocols/sametime/sametime.c:5304
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -10006,95 +10228,96 @@
 "to your buddy list."
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:5317
+#: ../src/protocols/sametime/sametime.c:5309
 msgid "Select Notes Address Book"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:5359
+#: ../src/protocols/sametime/sametime.c:5351
 msgid "Unable to add group: group not found"
 msgstr "Не удаётся добавить группу: группа не найдена"
 
-#: ../src/protocols/sametime/sametime.c:5361
+#: ../src/protocols/sametime/sametime.c:5353
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:5402
+#: ../src/protocols/sametime/sametime.c:5394
 msgid "Notes Address Book Group"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:5403
+#: ../src/protocols/sametime/sametime.c:5395
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:5451
+#: ../src/protocols/sametime/sametime.c:5443
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Результаты поиска для '%s'"
 
-#: ../src/protocols/sametime/sametime.c:5452
-#, fuzzy, c-format
+#: ../src/protocols/sametime/sametime.c:5444
+#, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
 "may add these users to your buddy list or send them messages with the action "
 "buttons below."
 msgstr ""
-"Было найдено несколько пользователей с одинаковыми именами. Выберите из "
-"списка одного из них для добавления в список собеседников."
-
-#: ../src/protocols/sametime/sametime.c:5484
+"Идентификатор '%s' может ссылаться на любого из следующих пользователей. Вы "
+"можете добавить этих пользователей в список собеседников или отправить им "
+"сообщения с помощью кнопок действия ниже."
+
+#: ../src/protocols/sametime/sametime.c:5476
 msgid "No matches"
 msgstr "Нет совпадений"
 
-#: ../src/protocols/sametime/sametime.c:5485
+#: ../src/protocols/sametime/sametime.c:5477
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:5489
+#: ../src/protocols/sametime/sametime.c:5481
 msgid "No Matches"
 msgstr "Нет совпадений"
 
-#: ../src/protocols/sametime/sametime.c:5526
+#: ../src/protocols/sametime/sametime.c:5518
 msgid "Search for a user"
 msgstr "Искать пользователя"
 
-#: ../src/protocols/sametime/sametime.c:5527
+#: ../src/protocols/sametime/sametime.c:5519
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:5530
+#: ../src/protocols/sametime/sametime.c:5522
 msgid "User Search"
 msgstr "Поиск пользователей"
 
+#: ../src/protocols/sametime/sametime.c:5534
+msgid "Import Sametime List..."
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:5538
+msgid "Export Sametime List..."
+msgstr ""
+
 #: ../src/protocols/sametime/sametime.c:5542
-msgid "Import Sametime List..."
+msgid "Add Notes Address Book Group..."
 msgstr ""
 
 #: ../src/protocols/sametime/sametime.c:5546
-msgid "Export Sametime List..."
-msgstr ""
-
-#: ../src/protocols/sametime/sametime.c:5550
-msgid "Add Notes Address Book Group..."
-msgstr ""
-
-#: ../src/protocols/sametime/sametime.c:5554
 msgid "User Search..."
 msgstr "Поиск пользователей..."
 
-#: ../src/protocols/sametime/sametime.c:5651
+#: ../src/protocols/sametime/sametime.c:5643
 msgid "Force login (ignore server redirects)"
 msgstr ""
 
 #. pretend to be Sametime Connect
-#: ../src/protocols/sametime/sametime.c:5661
+#: ../src/protocols/sametime/sametime.c:5653
 msgid "Hide client identity"
 msgstr ""
 
@@ -10197,7 +10420,7 @@
 msgstr "Показать публичный ключ"
 
 #: ../src/protocols/silc/buddy.c:635 ../src/protocols/silc/buddy.c:1030
-#: ../src/protocols/silc/chat.c:236
+#: ../src/protocols/silc/chat.c:237
 msgid "Could not load public key"
 msgstr "Не удалось загрузить публичный ключ"
 
@@ -10289,57 +10512,56 @@
 msgstr "Робот"
 
 #: ../src/protocols/silc/buddy.c:1486 ../src/protocols/silc/silc.c:672
-#: ../src/protocols/silc/util.c:473
+#: ../src/protocols/silc/util.c:487
 msgid "Happy"
 msgstr "Счастливый"
 
 #: ../src/protocols/silc/buddy.c:1488 ../src/protocols/silc/silc.c:674
-#: ../src/protocols/silc/util.c:475
+#: ../src/protocols/silc/util.c:489
 msgid "Sad"
 msgstr "Печальный"
 
 #: ../src/protocols/silc/buddy.c:1490 ../src/protocols/silc/silc.c:676
-#: ../src/protocols/silc/util.c:477
+#: ../src/protocols/silc/util.c:491
 msgid "Angry"
 msgstr "Рассерженный"
 
 #: ../src/protocols/silc/buddy.c:1492 ../src/protocols/silc/silc.c:678
-#: ../src/protocols/silc/util.c:479
+#: ../src/protocols/silc/util.c:493
 msgid "Jealous"
 msgstr "Ревнующий"
 
 #: ../src/protocols/silc/buddy.c:1494 ../src/protocols/silc/silc.c:680
-#: ../src/protocols/silc/util.c:481
+#: ../src/protocols/silc/util.c:495
 msgid "Ashamed"
 msgstr "Стыдящийся"
 
 #: ../src/protocols/silc/buddy.c:1496 ../src/protocols/silc/silc.c:682
-#: ../src/protocols/silc/util.c:483
+#: ../src/protocols/silc/util.c:497
 msgid "Invincible"
 msgstr "Непобедимый"
 
-#: ../src/protocols/silc/buddy.c:1498 ../src/protocols/silc/silc.c:684
-#: ../src/protocols/silc/util.c:485
+#: ../src/protocols/silc/buddy.c:1498 ../src/protocols/silc/util.c:499
 msgid "In Love"
 msgstr "Влюблённый"
 
 #: ../src/protocols/silc/buddy.c:1500 ../src/protocols/silc/silc.c:686
-#: ../src/protocols/silc/util.c:487
+#: ../src/protocols/silc/util.c:501
 msgid "Sleepy"
 msgstr "Сонный"
 
 #: ../src/protocols/silc/buddy.c:1502 ../src/protocols/silc/silc.c:688
-#: ../src/protocols/silc/util.c:489
+#: ../src/protocols/silc/util.c:503
 msgid "Bored"
 msgstr "Скучающий"
 
 #: ../src/protocols/silc/buddy.c:1504 ../src/protocols/silc/silc.c:690
-#: ../src/protocols/silc/util.c:491
+#: ../src/protocols/silc/util.c:505
 msgid "Excited"
 msgstr "Возбуждённый"
 
 #: ../src/protocols/silc/buddy.c:1506 ../src/protocols/silc/silc.c:692
-#: ../src/protocols/silc/util.c:493
+#: ../src/protocols/silc/util.c:507
 msgid "Anxious"
 msgstr "Озабоченный"
 
@@ -10392,7 +10614,7 @@
 msgid "Kill User"
 msgstr "Убить пользователя"
 
-#: ../src/protocols/silc/buddy.c:1670 ../src/protocols/silc/chat.c:971
+#: ../src/protocols/silc/buddy.c:1670 ../src/protocols/silc/chat.c:972
 msgid "Draw On Whiteboard"
 msgstr ""
 
@@ -10405,7 +10627,7 @@
 msgid "Channel %s does not exist in the network"
 msgstr "Канал %s не существует в сети"
 
-#: ../src/protocols/silc/chat.c:81 ../src/protocols/silc/chat.c:173
+#: ../src/protocols/silc/chat.c:81 ../src/protocols/silc/chat.c:174
 msgid "Channel Information"
 msgstr "Информация о канале"
 
@@ -10433,48 +10655,49 @@
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Шифр канала:</b> %s"
 
-#: ../src/protocols/silc/chat.c:141
+#. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
+#: ../src/protocols/silc/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>HMAC канала:</b> %s"
 
-#: ../src/protocols/silc/chat.c:146
+#: ../src/protocols/silc/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Тема канала:</b><br>%s"
 
-#: ../src/protocols/silc/chat.c:151
+#: ../src/protocols/silc/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Режимы канала:</b> "
 
-#: ../src/protocols/silc/chat.c:164
+#: ../src/protocols/silc/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr ""
 
-#: ../src/protocols/silc/chat.c:165
+#: ../src/protocols/silc/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr ""
 
-#: ../src/protocols/silc/chat.c:235
+#: ../src/protocols/silc/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Добавить публичный ключ канала"
 
 #. Add new public key
-#: ../src/protocols/silc/chat.c:290
+#: ../src/protocols/silc/chat.c:291
 msgid "Open Public Key..."
 msgstr "Открыть публичный ключ..."
 
-#: ../src/protocols/silc/chat.c:399
+#: ../src/protocols/silc/chat.c:400
 msgid "Channel Passphrase"
 msgstr "Парольная фраза канала"
 
-#: ../src/protocols/silc/chat.c:406
+#: ../src/protocols/silc/chat.c:407
 msgid "Channel Public Keys List"
 msgstr "Список публичных ключей канала"
 
-#: ../src/protocols/silc/chat.c:411
+#: ../src/protocols/silc/chat.c:412
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -10483,129 +10706,129 @@
 "able to join."
 msgstr ""
 
-#: ../src/protocols/silc/chat.c:420 ../src/protocols/silc/chat.c:421
-#: ../src/protocols/silc/chat.c:458 ../src/protocols/silc/chat.c:459
-#: ../src/protocols/silc/chat.c:905
+#: ../src/protocols/silc/chat.c:421 ../src/protocols/silc/chat.c:422
+#: ../src/protocols/silc/chat.c:459 ../src/protocols/silc/chat.c:460
+#: ../src/protocols/silc/chat.c:906
 msgid "Channel Authentication"
 msgstr "Аутентификация канала"
 
-#: ../src/protocols/silc/chat.c:422 ../src/protocols/silc/chat.c:460
+#: ../src/protocols/silc/chat.c:423 ../src/protocols/silc/chat.c:461
 msgid "Add / Remove"
 msgstr "Добавить / Удалить"
 
-#: ../src/protocols/silc/chat.c:577
+#: ../src/protocols/silc/chat.c:578
 msgid "Group Name"
 msgstr "Имя группы"
 
-#: ../src/protocols/silc/chat.c:581 ../src/protocols/silc/ops.c:1908
+#: ../src/protocols/silc/chat.c:582 ../src/protocols/silc/ops.c:1908
 #: ../src/protocols/silc/silc.c:948
 msgid "Passphrase"
 msgstr "Парольная фраза"
 
-#: ../src/protocols/silc/chat.c:592
+#: ../src/protocols/silc/chat.c:593
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Введите имя личной группы и парольную фразу канала %s."
 
-#: ../src/protocols/silc/chat.c:594
+#: ../src/protocols/silc/chat.c:595
 msgid "Add Channel Private Group"
 msgstr "Добавить личную группу канала"
 
-#: ../src/protocols/silc/chat.c:721
+#: ../src/protocols/silc/chat.c:722
 msgid "User Limit"
 msgstr "Предел количества пользователей"
 
-#: ../src/protocols/silc/chat.c:722
+#: ../src/protocols/silc/chat.c:723
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Установить предел количества пользователей на канале. Установите в ноль для "
 "сброса предела количества пользователей."
 
-#: ../src/protocols/silc/chat.c:877
+#: ../src/protocols/silc/chat.c:878
 msgid "Get Info"
 msgstr "Получить информацию"
 
-#: ../src/protocols/silc/chat.c:885
+#: ../src/protocols/silc/chat.c:886
 msgid "Invite List"
 msgstr "Список приглашённых"
 
-#: ../src/protocols/silc/chat.c:890
+#: ../src/protocols/silc/chat.c:891
 msgid "Ban List"
 msgstr "Список изгнанных"
 
-#: ../src/protocols/silc/chat.c:898
+#: ../src/protocols/silc/chat.c:899
 msgid "Add Private Group"
 msgstr "Добавить личную группу"
 
-#: ../src/protocols/silc/chat.c:911
+#: ../src/protocols/silc/chat.c:912
 msgid "Reset Permanent"
 msgstr "Сбросить перманентно"
 
-#: ../src/protocols/silc/chat.c:916
+#: ../src/protocols/silc/chat.c:917
 msgid "Set Permanent"
 msgstr "Установить перманентно"
 
-#: ../src/protocols/silc/chat.c:924
+#: ../src/protocols/silc/chat.c:925
 msgid "Set User Limit"
 msgstr "Установить предел количества пользователей"
 
-#: ../src/protocols/silc/chat.c:930
+#: ../src/protocols/silc/chat.c:931
 msgid "Reset Topic Restriction"
 msgstr "Сбросить ограничение темы"
 
-#: ../src/protocols/silc/chat.c:935
+#: ../src/protocols/silc/chat.c:936
 msgid "Set Topic Restriction"
 msgstr "Установить ограничение темы"
 
-#: ../src/protocols/silc/chat.c:942
+#: ../src/protocols/silc/chat.c:943
 msgid "Reset Private Channel"
 msgstr "Сбросить личный канал"
 
-#: ../src/protocols/silc/chat.c:947
+#: ../src/protocols/silc/chat.c:948
 msgid "Set Private Channel"
 msgstr "Установить личный канал"
 
-#: ../src/protocols/silc/chat.c:954
+#: ../src/protocols/silc/chat.c:955
 msgid "Reset Secret Channel"
 msgstr "Сбросить секретный канал"
 
-#: ../src/protocols/silc/chat.c:959
+#: ../src/protocols/silc/chat.c:960
 msgid "Set Secret Channel"
 msgstr "Установить секретный канал"
 
-#: ../src/protocols/silc/chat.c:1033
+#: ../src/protocols/silc/chat.c:1034
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Вы являетесь основателем канала на <I>%s</I>"
 
-#: ../src/protocols/silc/chat.c:1037
+#: ../src/protocols/silc/chat.c:1038
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Основателем канала на <I>%s</I> является <I>%s</I>"
 
-#: ../src/protocols/silc/chat.c:1096
+#: ../src/protocols/silc/chat.c:1097
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "Вы сможете войти в личную группу после того, как войдёте на канал %s."
 
-#: ../src/protocols/silc/chat.c:1098
+#: ../src/protocols/silc/chat.c:1099
 msgid "Join Private Group"
 msgstr "Присоединиться к личной группе"
 
-#: ../src/protocols/silc/chat.c:1099
+#: ../src/protocols/silc/chat.c:1100
 msgid "Cannot join private group"
 msgstr "Не удаётся присоединиться к личной группе"
 
-#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1156
+#: ../src/protocols/silc/chat.c:1294 ../src/protocols/silc/silc.c:1156
 msgid "Call Command"
 msgstr "Вызвать команду"
 
-#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1156
+#: ../src/protocols/silc/chat.c:1294 ../src/protocols/silc/silc.c:1156
 msgid "Cannot call command"
 msgstr "Не удаётся вызвать команду"
 
-#: ../src/protocols/silc/chat.c:1294 ../src/protocols/silc/silc.c:1157
+#: ../src/protocols/silc/chat.c:1295 ../src/protocols/silc/silc.c:1157
 msgid "Unknown command"
 msgstr "Неизвестная команда"
 
@@ -10710,10 +10933,6 @@
 msgid "Birth Day"
 msgstr "День рождения"
 
-#: ../src/protocols/silc/ops.c:1044
-msgid "Job Title"
-msgstr "Название работы"
-
 #: ../src/protocols/silc/ops.c:1048
 msgid "Job Role"
 msgstr "Должность"
@@ -10726,10 +10945,6 @@
 msgid "Unit"
 msgstr "Отдел"
 
-#: ../src/protocols/silc/ops.c:1075
-msgid "EMail"
-msgstr "E-mail"
-
 #: ../src/protocols/silc/ops.c:1080
 msgid "Note"
 msgstr "Заметки"
@@ -10738,6 +10953,11 @@
 msgid "Join Chat"
 msgstr "Присоединиться к чату"
 
+#: ../src/protocols/silc/ops.c:1183 ../src/protocols/silc/ops.c:1332
+#: ../src/protocols/yahoo/yahoo_profile.c:1046
+msgid "Real Name"
+msgstr "Настоящее имя"
+
 #: ../src/protocols/silc/ops.c:1211
 msgid "Status Text"
 msgstr "Текст статуса"
@@ -10995,6 +11215,10 @@
 msgid "Your Current Mood"
 msgstr "Ваше текущее настроение"
 
+#: ../src/protocols/silc/silc.c:684
+msgid "In love"
+msgstr "Влюблённый"
+
 #: ../src/protocols/silc/silc.c:695
 msgid ""
 "\n"
@@ -11003,16 +11227,16 @@
 "\n"
 "Предпочитаемые вами способы контакта"
 
-#: ../src/protocols/silc/silc.c:703 ../src/protocols/silc/util.c:518
+#: ../src/protocols/silc/silc.c:703 ../src/protocols/silc/util.c:532
 msgid "SMS"
 msgstr "SMS"
 
-#: ../src/protocols/silc/silc.c:705 ../src/protocols/silc/util.c:520
+#: ../src/protocols/silc/silc.c:705 ../src/protocols/silc/util.c:534
 msgid "MMS"
 msgstr "MMS"
 
-#: ../src/protocols/silc/silc.c:707 ../src/protocols/silc/util.c:522
-msgid "Video Conferencing"
+#: ../src/protocols/silc/silc.c:707
+msgid "Video conferencing"
 msgstr "Видеоконференция"
 
 #: ../src/protocols/silc/silc.c:712
@@ -11051,7 +11275,7 @@
 "хотели бы"
 
 #: ../src/protocols/silc/silc.c:789 ../src/protocols/silc/silc.c:795
-#: ../src/protocols/silc/silc.c:1435
+#: ../src/protocols/silc/silc.c:1434
 msgid "Message of the Day"
 msgstr "Сообщение дня"
 
@@ -11059,7 +11283,7 @@
 msgid "No Message of the Day available"
 msgstr "Нет доступного сообщения дня"
 
-#: ../src/protocols/silc/silc.c:790 ../src/protocols/silc/silc.c:1430
+#: ../src/protocols/silc/silc.c:790 ../src/protocols/silc/silc.c:1429
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Нет сообщения дня, соотнесённого с этим соединением"
 
@@ -11088,13 +11312,9 @@
 msgid "Private key file"
 msgstr "Файл личного ключа"
 
-#: ../src/protocols/silc/silc.c:937
-msgid "Real Name"
-msgstr "Настоящее имя"
-
 #: ../src/protocols/silc/silc.c:951
-msgid "Re-type Passphrase"
-msgstr "Наберите парольную фразу ещё раз"
+msgid "Passphrase (retype)"
+msgstr "Парольная фраза (наберите ещё раз)"
 
 #: ../src/protocols/silc/silc.c:958
 msgid "Generate Key Pair"
@@ -11117,115 +11337,113 @@
 msgid "User <I>%s</I> is not present in the network"
 msgstr "Пользователь <I>%s</I> не присутствует в сети"
 
-#: ../src/protocols/silc/silc.c:1306
+#: ../src/protocols/silc/silc.c:1305
 msgid "Topic too long"
 msgstr "Тема слишком велика"
 
-#: ../src/protocols/silc/silc.c:1387
+#: ../src/protocols/silc/silc.c:1386
 msgid "You must specify a nick"
 msgstr "Вы должны указать псевдоним"
 
-#: ../src/protocols/silc/silc.c:1489
+#: ../src/protocols/silc/silc.c:1488
 #, c-format
 msgid "channel %s not found"
 msgstr "канал %s не найден"
 
-#: ../src/protocols/silc/silc.c:1494
+#: ../src/protocols/silc/silc.c:1493
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "режимы канала для %s: %s"
 
-#: ../src/protocols/silc/silc.c:1496
+#: ../src/protocols/silc/silc.c:1495
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "нет установленных режимов канала на %s"
 
-#: ../src/protocols/silc/silc.c:1509
+#: ../src/protocols/silc/silc.c:1508
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Не удалось установить режимы канала для %s"
 
-#: ../src/protocols/silc/silc.c:1539
+#: ../src/protocols/silc/silc.c:1538
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "Неизвестная команда: %s, (возможно, ошибка Gaim)"
 
-#: ../src/protocols/silc/silc.c:1602
+#: ../src/protocols/silc/silc.c:1601
 msgid "part [channel]:  Leave the chat"
 msgstr "part [канал]:  Покинуть чат"
 
-#: ../src/protocols/silc/silc.c:1606
+#: ../src/protocols/silc/silc.c:1605
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [канал]:  Покинуть чат"
 
-#: ../src/protocols/silc/silc.c:1610
+#: ../src/protocols/silc/silc.c:1609
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;новая тема&gt;]:  Просмотреть или изменить тему"
 
-#: ../src/protocols/silc/silc.c:1615
+#: ../src/protocols/silc/silc.c:1614
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
 "join &lt;канал&gt; [&lt;пароль&gt;]:  Присоединиться к чату в этой сети"
 
-#: ../src/protocols/silc/silc.c:1619
+#: ../src/protocols/silc/silc.c:1618
 msgid "list:  List channels on this network"
 msgstr "list:  Вывести список каналов в этой сети"
 
-#: ../src/protocols/silc/silc.c:1623
+#: ../src/protocols/silc/silc.c:1622
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;псевдоним&gt;:  Просмотреть информацию о пользователе"
 
-#: ../src/protocols/silc/silc.c:1627 ../src/protocols/zephyr/zephyr.c:2622
+#: ../src/protocols/silc/silc.c:1626 ../src/protocols/zephyr/zephyr.c:2622
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;псевдоним&gt; &lt;сообщение&gt;:  Отправить пользователю личное "
 "сообщение"
 
-#: ../src/protocols/silc/silc.c:1631
+#: ../src/protocols/silc/silc.c:1630
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;псевдоним&gt; [&lt;сообщение&gt;]:  Отправить пользователю личное "
 "сообщение"
 
-#: ../src/protocols/silc/silc.c:1635
+#: ../src/protocols/silc/silc.c:1634
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Просмотреть сообщение дня сервера"
 
-#: ../src/protocols/silc/silc.c:1639
+#: ../src/protocols/silc/silc.c:1638
 msgid "detach:  Detach this session"
 msgstr "detach:  Прервать эту сессию"
 
-#: ../src/protocols/silc/silc.c:1643
+#: ../src/protocols/silc/silc.c:1642
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr ""
 "quit [сообщение]:  Разорвать соединение с сервером, сообщение необязательно"
 
-#: ../src/protocols/silc/silc.c:1647
+#: ../src/protocols/silc/silc.c:1646
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;команда&gt;:  Вызвать любую команду клиента silc"
 
-#: ../src/protocols/silc/silc.c:1653
+#: ../src/protocols/silc/silc.c:1652
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr ""
 "kill &lt;псевдоним&gt; [-публичный ключ|&lt;причина&gt;]:  Убить пользователя"
 
-#: ../src/protocols/silc/silc.c:1657
+#: ../src/protocols/silc/silc.c:1656
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;новый псевдоним&gt;:  Изменить свой псевдоним"
 
-#: ../src/protocols/silc/silc.c:1661
+#: ../src/protocols/silc/silc.c:1660
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;псевдоним&gt;:  Просмотреть информацию о пользователе"
 
-#: ../src/protocols/silc/silc.c:1665
-#, fuzzy
+#: ../src/protocols/silc/silc.c:1664
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr ""
-"cmode &lt;канал&gt; [+|-&lt;режимы&gt;] [аргументы]:  Change or display "
-
-#: ../src/protocols/silc/silc.c:1669
+
+#: ../src/protocols/silc/silc.c:1668
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -11233,57 +11451,57 @@
 "cumode &lt;канал&gt; +|-&lt;режимы&gt; &lt;псевдоним&gt;:  Изменить режимы "
 "пользователя на канале"
 
-#: ../src/protocols/silc/silc.c:1673
+#: ../src/protocols/silc/silc.c:1672
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;режимы пользователя&gt;:  Установить свои режимы в сети"
 
-#: ../src/protocols/silc/silc.c:1677
+#: ../src/protocols/silc/silc.c:1676
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr ""
 "oper &lt;псевдоним&gt; [-публичный ключ]:  Получить привилегии оператора "
 "сервера"
 
-#: ../src/protocols/silc/silc.c:1681
+#: ../src/protocols/silc/silc.c:1680
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:1685
+#: ../src/protocols/silc/silc.c:1684
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;канал&gt; &lt;псевдоним&gt; [комментарий]:  Удалить пользователя с "
 "канала"
 
-#: ../src/protocols/silc/silc.c:1689
+#: ../src/protocols/silc/silc.c:1688
 msgid "info [server]:  View server administrative details"
 msgstr "info [сервер]:  Просмотреть административные подробности о сервере"
 
-#: ../src/protocols/silc/silc.c:1693
+#: ../src/protocols/silc/silc.c:1692
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr ""
 "ban [&lt;канал&gt; +|-&lt;псевдоним&gt;]:  Выгнать пользователя с канала"
 
-#: ../src/protocols/silc/silc.c:1697
+#: ../src/protocols/silc/silc.c:1696
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;псевдоним|сервер&gt;:  Загрузить публичный ключ пользователя или "
 "сервера"
 
-#: ../src/protocols/silc/silc.c:1701
+#: ../src/protocols/silc/silc.c:1700
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Просмотреть статистику сервера и сети"
 
-#: ../src/protocols/silc/silc.c:1705
+#: ../src/protocols/silc/silc.c:1704
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Послать PING серверу"
 
-#: ../src/protocols/silc/silc.c:1710
+#: ../src/protocols/silc/silc.c:1709
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr ""
 "users &lt;канал&gt;:  Вывести список пользователей, присутствующих на канале"
 
-#: ../src/protocols/silc/silc.c:1714
+#: ../src/protocols/silc/silc.c:1713
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -11298,112 +11516,111 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../src/protocols/silc/silc.c:1823
+#: ../src/protocols/silc/silc.c:1822
 msgid "SILC Protocol Plugin"
 msgstr "Модуль протокола SILC"
 
 #. *  description
-#: ../src/protocols/silc/silc.c:1825
+#: ../src/protocols/silc/silc.c:1824
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Протокол Secure Internet Live Conferencing (SILC)"
 
-#: ../src/protocols/silc/silc.c:1862
+#: ../src/protocols/silc/silc.c:1861
 msgid "Public Key file"
 msgstr "Файл публичного ключа"
 
-#: ../src/protocols/silc/silc.c:1866
+#: ../src/protocols/silc/silc.c:1865
 msgid "Private Key file"
 msgstr "Файл личного ключа"
 
-#: ../src/protocols/silc/silc.c:1876
+#: ../src/protocols/silc/silc.c:1875
 msgid "Cipher"
-msgstr ""
-
-#: ../src/protocols/silc/silc.c:1886
+msgstr "Шифр"
+
+#: ../src/protocols/silc/silc.c:1885
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../src/protocols/silc/silc.c:1889
+#: ../src/protocols/silc/silc.c:1888
 msgid "Public key authentication"
 msgstr "Аутентификация публичного ключа"
 
-#: ../src/protocols/silc/silc.c:1892
+#: ../src/protocols/silc/silc.c:1891
 msgid "Reject watching by other users"
 msgstr "Запретить просмотр другими пользователями"
 
-#: ../src/protocols/silc/silc.c:1895
+#: ../src/protocols/silc/silc.c:1894
 msgid "Block invites"
 msgstr "Блокировать приглашения"
 
-#: ../src/protocols/silc/silc.c:1898
+#: ../src/protocols/silc/silc.c:1897
 msgid "Block IMs without Key Exchange"
 msgstr "Блокировать сообщения без обмена ключами"
 
-#: ../src/protocols/silc/silc.c:1901
+#: ../src/protocols/silc/silc.c:1900
 msgid "Reject online status attribute requests"
 msgstr "Отвергать запросы атрибута сетевого статуса"
 
-#: ../src/protocols/silc/silc.c:1904
+#: ../src/protocols/silc/silc.c:1903
 msgid "Block messages to whiteboard"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:1907
-#, fuzzy
+#: ../src/protocols/silc/silc.c:1906
 msgid "Automatically open whiteboard"
-msgstr "Раскрывать автоматически"
-
-#: ../src/protocols/silc/silc.c:1910
+msgstr ""
+
+#: ../src/protocols/silc/silc.c:1909
 msgid "Digitally sign and verify all messages"
 msgstr "Делать цифровую подпись и проверку всех сообщений"
 
-#: ../src/protocols/silc/util.c:206 ../src/protocols/silc/util.c:231
+#: ../src/protocols/silc/util.c:207 ../src/protocols/silc/util.c:233
 msgid "Creating SILC key pair..."
 msgstr "Создание пары ключей SILC..."
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../src/protocols/silc/util.c:314
+#: ../src/protocols/silc/util.c:328
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Настоящее имя: \t%s\n"
 
-#: ../src/protocols/silc/util.c:316
+#: ../src/protocols/silc/util.c:330
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Имя пользователя: \t%s\n"
 
-#: ../src/protocols/silc/util.c:318
-#, c-format
-msgid "EMail: \t\t%s\n"
+#: ../src/protocols/silc/util.c:332
+#, c-format
+msgid "E-Mail: \t\t%s\n"
 msgstr "E-mail: \t\t%s\n"
 
-#: ../src/protocols/silc/util.c:320
+#: ../src/protocols/silc/util.c:334
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Имя узла: \t%s\n"
 
-#: ../src/protocols/silc/util.c:322
+#: ../src/protocols/silc/util.c:336
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Организация: \t%s\n"
 
-#: ../src/protocols/silc/util.c:324
+#: ../src/protocols/silc/util.c:338
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Страна: \t%s\n"
 
-#: ../src/protocols/silc/util.c:325
+#: ../src/protocols/silc/util.c:339
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Алгоритм: \t%s\n"
 
-#: ../src/protocols/silc/util.c:326
-#, c-format
-msgid "Key length: \t%d bits\n"
+#: ../src/protocols/silc/util.c:340
+#, c-format
+msgid "Key Length: \t%d bits\n"
 msgstr "Длина ключа: \t%d бит\n"
 
-#: ../src/protocols/silc/util.c:328
+#: ../src/protocols/silc/util.c:342
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -11411,30 +11628,34 @@
 "\n"
 msgstr ""
 
-#: ../src/protocols/silc/util.c:329
+#: ../src/protocols/silc/util.c:343
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
 "%s"
 msgstr ""
 
-#: ../src/protocols/silc/util.c:333 ../src/protocols/silc/util.c:334
+#: ../src/protocols/silc/util.c:347 ../src/protocols/silc/util.c:348
 msgid "Public Key Information"
 msgstr "Информация о публичном ключе"
 
-#: ../src/protocols/silc/util.c:516
+#: ../src/protocols/silc/util.c:530
 msgid "Paging"
 msgstr ""
 
-#: ../src/protocols/silc/util.c:540
+#: ../src/protocols/silc/util.c:536
+msgid "Video Conferencing"
+msgstr "Видеоконференция"
+
+#: ../src/protocols/silc/util.c:554
 msgid "Computer"
 msgstr "Компьютер"
 
-#: ../src/protocols/silc/util.c:544
+#: ../src/protocols/silc/util.c:558
 msgid "PDA"
 msgstr "PDA"
 
-#: ../src/protocols/silc/util.c:546
+#: ../src/protocols/silc/util.c:560
 msgid "Terminal"
 msgstr "Терминал"
 
@@ -11455,33 +11676,30 @@
 msgstr ""
 
 #. TODO: do we really want to disconnect on a failure to write?
-#: ../src/protocols/simple/simple.c:409
+#: ../src/protocols/simple/simple.c:411
 msgid "Could not write"
 msgstr "Не удалось записать"
 
-#: ../src/protocols/simple/simple.c:424 ../src/protocols/simple/simple.c:1422
+#: ../src/protocols/simple/simple.c:426 ../src/protocols/simple/simple.c:1425
 msgid "Could not connect"
 msgstr "Не удалось установить соединение"
 
-#: ../src/protocols/simple/simple.c:994
+#: ../src/protocols/simple/simple.c:997
 msgid "Wrong Password"
 msgstr "Неверный пароль"
 
-#: ../src/protocols/simple/simple.c:1453 ../src/protocols/simple/simple.c:1492
-#: ../src/protocols/simple/simple.c:1504 ../src/protocols/simple/simple.c:1551
-#, fuzzy
+#: ../src/protocols/simple/simple.c:1456 ../src/protocols/simple/simple.c:1495
+#: ../src/protocols/simple/simple.c:1507 ../src/protocols/simple/simple.c:1565
 msgid "Could not create listen socket"
-msgstr "Не удалось создать сокет"
-
-#: ../src/protocols/simple/simple.c:1474
-#, fuzzy
+msgstr "Не удалось создать сокет для прослушивания"
+
+#: ../src/protocols/simple/simple.c:1477
 msgid "Couldn't resolve host"
-msgstr "Не удалось соединиться с узлом"
-
-#: ../src/protocols/simple/simple.c:1572
-#, fuzzy
+msgstr "Не удалось определить адрес узла"
+
+#: ../src/protocols/simple/simple.c:1587
 msgid "SIP usernames may not contain whitespaces or @ symbols"
-msgstr "Псевдонимы IRC не могут содержать пробелы или символы @"
+msgstr "Имена пользователей SIP не могут содержать пробелы или символы @"
 
 #. *< type
 #. *< ui_requirement
@@ -11491,40 +11709,38 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../src/protocols/simple/simple.c:1734
+#: ../src/protocols/simple/simple.c:1749
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Модуль протокола SIP/SIMPLE"
 
 #. *  summary
-#: ../src/protocols/simple/simple.c:1735
+#: ../src/protocols/simple/simple.c:1750
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "Модуль протокола SIP/SIMPLE"
 
-#: ../src/protocols/simple/simple.c:1757
+#: ../src/protocols/simple/simple.c:1772
 msgid "Publish status (note: everyone may watch you)"
 msgstr ""
 
-#: ../src/protocols/simple/simple.c:1763
+#: ../src/protocols/simple/simple.c:1778
 msgid "Use UDP"
 msgstr "Использовать UDP"
 
-#: ../src/protocols/simple/simple.c:1765
+#: ../src/protocols/simple/simple.c:1780
 msgid "Use proxy"
 msgstr "Использовать прокси"
 
-#: ../src/protocols/simple/simple.c:1767
+#: ../src/protocols/simple/simple.c:1782
 msgid "Proxy"
 msgstr "Прокси"
 
-#: ../src/protocols/simple/simple.c:1769
-#, fuzzy
+#: ../src/protocols/simple/simple.c:1784
 msgid "Auth User"
-msgstr "Пользователь AP"
-
-#: ../src/protocols/simple/simple.c:1771
-#, fuzzy
+msgstr ""
+
+#: ../src/protocols/simple/simple.c:1786
 msgid "Auth Domain"
-msgstr "Автоматически"
+msgstr ""
 
 #: ../src/protocols/toc/toc.c:139
 #, c-format
@@ -11567,9 +11783,8 @@
 msgstr "Предупреждение %s не разрешено."
 
 #: ../src/protocols/toc/toc.c:497
-#, fuzzy
 msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "Сообщение было брошено, вы превышаете предел скорости сервера."
+msgstr "Сообщение было отброшено, вы превышаете предел скорости сервера."
 
 #: ../src/protocols/toc/toc.c:500
 #, c-format
@@ -11694,10 +11909,6 @@
 msgid "Get Dir Info"
 msgstr "Получить информацию каталога"
 
-#: ../src/protocols/toc/toc.c:1684
-msgid "Set User Info"
-msgstr "Установить пользовательскую информацию"
-
 #: ../src/protocols/toc/toc.c:1689
 msgid "Set Dir Info"
 msgstr "Установить информацию каталога"
@@ -11719,7 +11930,7 @@
 #: ../src/protocols/toc/toc.c:1892 ../src/protocols/toc/toc.c:1932
 #: ../src/protocols/toc/toc.c:2056 ../src/protocols/toc/toc.c:2144
 msgid "Could not connect for transfer."
-msgstr "Не удалось соединиться для передачи."
+msgstr "Не удалось установить соединение для передачи."
 
 #: ../src/protocols/toc/toc.c:2089
 msgid "Could not write file header.  The file will not be transferred."
@@ -11755,23 +11966,15 @@
 msgid "TOC Protocol Plugin"
 msgstr "Модуль протокола TOC"
 
-#: ../src/protocols/toc/toc.c:2340
-msgid "TOC host"
-msgstr "Узел TOC"
-
-#: ../src/protocols/toc/toc.c:2344
-msgid "TOC port"
-msgstr "Порт TOC"
-
-#: ../src/protocols/yahoo/yahoo.c:712
+#: ../src/protocols/yahoo/yahoo.c:710
 msgid "Your Yahoo! message did not get sent."
 msgstr "Ваше сообщение Yahoo! не отправлено."
 
-#: ../src/protocols/yahoo/yahoo.c:766 ../src/protocols/yahoo/yahoo.c:3563
+#: ../src/protocols/yahoo/yahoo.c:764 ../src/protocols/yahoo/yahoo.c:3564
 msgid "Buzz!!"
 msgstr ""
 
-#: ../src/protocols/yahoo/yahoo.c:811
+#: ../src/protocols/yahoo/yahoo.c:809
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Системное сообщение Yahoo! для %s:"
@@ -11779,21 +11982,21 @@
 #. TODO: this is almost exactly the same as what MSN does,
 #. * this should probably be moved to the core.
 #.
-#: ../src/protocols/yahoo/yahoo.c:907
+#: ../src/protocols/yahoo/yahoo.c:905
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list%s%s."
 msgstr "Пользователь %s хочет добавить %s в свой список собеседников%s%s."
 
-#: ../src/protocols/yahoo/yahoo.c:913
+#: ../src/protocols/yahoo/yahoo.c:911
 msgid "Message (optional) :"
 msgstr "Сообщение (необязательное) :"
 
-#: ../src/protocols/yahoo/yahoo.c:955
+#: ../src/protocols/yahoo/yahoo.c:953
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s (повторно) не разрешил добавить его в ваш список."
 
-#: ../src/protocols/yahoo/yahoo.c:958
+#: ../src/protocols/yahoo/yahoo.c:956
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -11801,11 +12004,11 @@
 msgstr ""
 "%s (повторно) не разрешил добавить его в ваш список по следующей причине: %s."
 
-#: ../src/protocols/yahoo/yahoo.c:961
+#: ../src/protocols/yahoo/yahoo.c:959
 msgid "Add buddy rejected"
 msgstr "В добавлении собеседника отказано"
 
-#: ../src/protocols/yahoo/yahoo.c:1704
+#: ../src/protocols/yahoo/yahoo.c:1702
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -11813,30 +12016,30 @@
 "on to Yahoo.  Check %s for updates."
 msgstr ""
 
-#: ../src/protocols/yahoo/yahoo.c:1707
+#: ../src/protocols/yahoo/yahoo.c:1705
 msgid "Failed Yahoo! Authentication"
 msgstr "Аутентификация Yahoo! завершилась неудачно"
 
-#: ../src/protocols/yahoo/yahoo.c:1773
+#: ../src/protocols/yahoo/yahoo.c:1771
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
 "\"Yes\" will remove and ignore the buddy."
 msgstr ""
 
-#: ../src/protocols/yahoo/yahoo.c:1776
+#: ../src/protocols/yahoo/yahoo.c:1774
 msgid "Ignore buddy?"
 msgstr "Игнорировать собеседника?"
 
-#: ../src/protocols/yahoo/yahoo.c:1810
+#: ../src/protocols/yahoo/yahoo.c:1808
 msgid "Invalid username."
 msgstr "Неверное имя пользователя."
 
-#: ../src/protocols/yahoo/yahoo.c:1821
+#: ../src/protocols/yahoo/yahoo.c:1819
 msgid "Normal authentication failed!"
 msgstr "Обычная аутентификация завершилась неудачно!"
 
-#: ../src/protocols/yahoo/yahoo.c:1822
+#: ../src/protocols/yahoo/yahoo.c:1820
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -11844,137 +12047,137 @@
 "reduced functionality and features."
 msgstr ""
 
-#: ../src/protocols/yahoo/yahoo.c:1830
+#: ../src/protocols/yahoo/yahoo.c:1828
 msgid "Incorrect password."
 msgstr "Неверный пароль."
 
-#: ../src/protocols/yahoo/yahoo.c:1833
+#: ../src/protocols/yahoo/yahoo.c:1831
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Ваша учётная запись заблокирована, войдите с веб-сайта Yahoo!."
 
-#: ../src/protocols/yahoo/yahoo.c:1836
+#: ../src/protocols/yahoo/yahoo.c:1834
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Неизвестная ошибка номер %d. Вход с веб-сайта Yahoo! может исправить это."
 
-#: ../src/protocols/yahoo/yahoo.c:1890
+#: ../src/protocols/yahoo/yahoo.c:1888
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Не удалось добавить собеседника %s в группу %s в список на сервере учётной "
 "записи %s."
 
-#: ../src/protocols/yahoo/yahoo.c:1893
+#: ../src/protocols/yahoo/yahoo.c:1891
 msgid "Could not add buddy to server list"
 msgstr "Не удалось добавить собеседника в список на сервере"
 
-#: ../src/protocols/yahoo/yahoo.c:2012
+#: ../src/protocols/yahoo/yahoo.c:2010
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-#: ../src/protocols/yahoo/yahoo.c:2151 ../src/protocols/yahoo/yahoo.c:2298
-#: ../src/protocols/yahoo/yahoo.c:2313 ../src/protocols/yahoo/ycht.c:472
+#: ../src/protocols/yahoo/yahoo.c:2149 ../src/protocols/yahoo/yahoo.c:2296
+#: ../src/protocols/yahoo/yahoo.c:2311 ../src/protocols/yahoo/ycht.c:472
 msgid "Unable to read"
 msgstr "Не удаётся прочитать"
 
-#: ../src/protocols/yahoo/yahoo.c:2337 ../src/protocols/yahoo/yahoo.c:2494
-#: ../src/protocols/yahoo/yahoo.c:2596 ../src/protocols/yahoo/yahoo.c:2606
+#: ../src/protocols/yahoo/yahoo.c:2335 ../src/protocols/yahoo/yahoo.c:2492
+#: ../src/protocols/yahoo/yahoo.c:2594 ../src/protocols/yahoo/yahoo.c:2604
 #: ../src/protocols/yahoo/yahoochat.c:1447
 #: ../src/protocols/yahoo/yahoochat.c:1517 ../src/protocols/yahoo/ycht.c:576
 msgid "Connection problem"
 msgstr "Проблема с соединением"
 
-#: ../src/protocols/yahoo/yahoo.c:2715 ../src/protocols/yahoo/yahoo.c:3296
+#: ../src/protocols/yahoo/yahoo.c:2711 ../src/protocols/yahoo/yahoo.c:3298
 msgid "Not at Home"
 msgstr "Не дома"
 
-#: ../src/protocols/yahoo/yahoo.c:2717 ../src/protocols/yahoo/yahoo.c:3299
+#: ../src/protocols/yahoo/yahoo.c:2713 ../src/protocols/yahoo/yahoo.c:3301
 msgid "Not at Desk"
 msgstr "Не за столом"
 
-#: ../src/protocols/yahoo/yahoo.c:2719 ../src/protocols/yahoo/yahoo.c:3302
+#: ../src/protocols/yahoo/yahoo.c:2715 ../src/protocols/yahoo/yahoo.c:3304
 msgid "Not in Office"
 msgstr "Не в офисе"
 
-#: ../src/protocols/yahoo/yahoo.c:2723 ../src/protocols/yahoo/yahoo.c:3308
+#: ../src/protocols/yahoo/yahoo.c:2719 ../src/protocols/yahoo/yahoo.c:3310
 msgid "On Vacation"
 msgstr "В отпуске"
 
-#: ../src/protocols/yahoo/yahoo.c:2727 ../src/protocols/yahoo/yahoo.c:3314
+#: ../src/protocols/yahoo/yahoo.c:2723 ../src/protocols/yahoo/yahoo.c:3316
 msgid "Stepped Out"
 msgstr "Вышел"
 
-#: ../src/protocols/yahoo/yahoo.c:2820 ../src/protocols/yahoo/yahoo.c:2850
+#: ../src/protocols/yahoo/yahoo.c:2816 ../src/protocols/yahoo/yahoo.c:2846
 msgid "Not on server list"
 msgstr "Не в списке на сервере"
 
-#: ../src/protocols/yahoo/yahoo.c:2867 ../src/protocols/yahoo/yahoo.c:2926
+#: ../src/protocols/yahoo/yahoo.c:2863 ../src/protocols/yahoo/yahoo.c:2922
 msgid "Appear Online"
 msgstr ""
 
-#: ../src/protocols/yahoo/yahoo.c:2870 ../src/protocols/yahoo/yahoo.c:2947
+#: ../src/protocols/yahoo/yahoo.c:2866 ../src/protocols/yahoo/yahoo.c:2943
 msgid "Appear Permanently Offline"
 msgstr ""
 
-#: ../src/protocols/yahoo/yahoo.c:2889
+#: ../src/protocols/yahoo/yahoo.c:2885
 msgid "Presence"
 msgstr "Присутствие"
 
-#: ../src/protocols/yahoo/yahoo.c:2932
+#: ../src/protocols/yahoo/yahoo.c:2928
 msgid "Appear Offline"
 msgstr "Вероятно не в сети"
 
-#: ../src/protocols/yahoo/yahoo.c:2941
+#: ../src/protocols/yahoo/yahoo.c:2937
 msgid "Don't Appear Permanently Offline"
 msgstr ""
 
-#: ../src/protocols/yahoo/yahoo.c:2989
+#: ../src/protocols/yahoo/yahoo.c:2985
 msgid "Join in Chat"
 msgstr "Присоединиться в чате"
 
-#: ../src/protocols/yahoo/yahoo.c:2995
+#: ../src/protocols/yahoo/yahoo.c:2991
 msgid "Initiate Conference"
 msgstr "Создать конференцию"
 
-#: ../src/protocols/yahoo/yahoo.c:3023
+#: ../src/protocols/yahoo/yahoo.c:3019
 msgid "Presence Settings"
 msgstr "Настройки присутствия"
 
-#: ../src/protocols/yahoo/yahoo.c:3029
+#: ../src/protocols/yahoo/yahoo.c:3025
 msgid "Start Doodling"
 msgstr ""
 
-#: ../src/protocols/yahoo/yahoo.c:3061
+#: ../src/protocols/yahoo/yahoo.c:3057
 msgid "Active which ID?"
 msgstr "Активировать какой ID?"
 
-#: ../src/protocols/yahoo/yahoo.c:3070
+#: ../src/protocols/yahoo/yahoo.c:3066
 msgid "Join who in chat?"
 msgstr "К кому присоединиться в чате?"
 
+#: ../src/protocols/yahoo/yahoo.c:3076
+msgid "Activate ID..."
+msgstr "Активировать ID..."
+
 #: ../src/protocols/yahoo/yahoo.c:3080
-msgid "Activate ID..."
-msgstr "Активировать ID..."
-
-#: ../src/protocols/yahoo/yahoo.c:3084
 msgid "Join User in Chat..."
 msgstr "Присоединиться к пользователю в чате..."
 
-#: ../src/protocols/yahoo/yahoo.c:3622
+#: ../src/protocols/yahoo/yahoo.c:3623
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;комната&gt;:  Присоединиться к чату в сети Yahoo"
 
-#: ../src/protocols/yahoo/yahoo.c:3627
+#: ../src/protocols/yahoo/yahoo.c:3628
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Вывести список комнат в сети Yahoo"
 
-#: ../src/protocols/yahoo/yahoo.c:3631
+#: ../src/protocols/yahoo/yahoo.c:3632
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 
-#: ../src/protocols/yahoo/yahoo.c:3635
+#: ../src/protocols/yahoo/yahoo.c:3636
 msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
@@ -11988,57 +12191,58 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/yahoo/yahoo.c:3728 ../src/protocols/yahoo/yahoo.c:3730
+#: ../src/protocols/yahoo/yahoo.c:3729 ../src/protocols/yahoo/yahoo.c:3731
 msgid "Yahoo Protocol Plugin"
 msgstr "Модуль протокола Yahoo"
 
-#: ../src/protocols/yahoo/yahoo.c:3747
+#: ../src/protocols/yahoo/yahoo.c:3748
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../src/protocols/yahoo/yahoo.c:3750
-msgid "Pager host"
-msgstr "Узел пейджера"
-
-#: ../src/protocols/yahoo/yahoo.c:3753
-msgid "Japan Pager host"
-msgstr "Узел пейджера Japan"
-
-#: ../src/protocols/yahoo/yahoo.c:3756
+#: ../src/protocols/yahoo/yahoo.c:3751
+msgid "Pager server"
+msgstr "Сервер пейджера"
+
+#: ../src/protocols/yahoo/yahoo.c:3754
+msgid "Japan Pager server"
+msgstr "Сервер пейджера Japan"
+
+#: ../src/protocols/yahoo/yahoo.c:3757
 msgid "Pager port"
 msgstr "Порт пейджера"
 
-#: ../src/protocols/yahoo/yahoo.c:3759
-msgid "File transfer host"
-msgstr "Узел передачи файлов"
-
-#: ../src/protocols/yahoo/yahoo.c:3762
-msgid "Japan file transfer host"
-msgstr "Узел передачи файлов Japan"
-
-#: ../src/protocols/yahoo/yahoo.c:3765
+#: ../src/protocols/yahoo/yahoo.c:3760
+msgid "File transfer server"
+msgstr "Сервер передачи файлов"
+
+#: ../src/protocols/yahoo/yahoo.c:3763
+msgid "Japan file transfer server"
+msgstr "Сервер передачи файлов Japan"
+
+#: ../src/protocols/yahoo/yahoo.c:3766
 msgid "File transfer port"
 msgstr "Порт передачи файлов"
 
-#: ../src/protocols/yahoo/yahoo.c:3768
+#: ../src/protocols/yahoo/yahoo.c:3769
 msgid "Chat room locale"
 msgstr "Языковой формат чата"
 
-#: ../src/protocols/yahoo/yahoo.c:3771
+#: ../src/protocols/yahoo/yahoo.c:3772
 msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-#: ../src/protocols/yahoo/yahoo.c:3775
+msgstr "Игнорировать приглашения в конференции и чаты"
+
+#: ../src/protocols/yahoo/yahoo.c:3776
 msgid "Chat room list URL"
 msgstr "URL списка чатов"
 
-#: ../src/protocols/yahoo/yahoo.c:3778
-msgid "YCHT host"
-msgstr "Узел YCHT"
-
-#: ../src/protocols/yahoo/yahoo.c:3781
-msgid "YCHT port"
-msgstr "Порт YCHT"
+#: ../src/protocols/yahoo/yahoo.c:3779
+msgid "Yahoo Chat server"
+msgstr ""
+
+#: ../src/protocols/yahoo/yahoo.c:3782
+#, fuzzy
+msgid "Yahoo Chat port"
+msgstr "Yahoo Japan"
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
@@ -12047,6 +12251,12 @@
 msgid "Sent Doodle request."
 msgstr ""
 
+#: ../src/protocols/yahoo/yahoo_filexfer.c:253
+#: ../src/protocols/yahoo/yahoo_filexfer.c:262
+#: ../src/protocols/yahoo/yahoo_filexfer.c:271
+msgid "Unable to establish file descriptor."
+msgstr "Не удаётся установить дескриптор файла."
+
 #. TODO: what to do here - do we really have to disconnect?
 #: ../src/protocols/yahoo/yahoo_packet.c:265
 msgid "Write Error"
@@ -12336,6 +12546,14 @@
 msgid "Zephyr Protocol Plugin"
 msgstr "Модуль протокола Zephyr"
 
+#: ../src/protocols/zephyr/zephyr.c:2896
+msgid "Use tzc"
+msgstr "Использовать tzc"
+
+#: ../src/protocols/zephyr/zephyr.c:2899
+msgid "tzc command"
+msgstr "Команда tzc"
+
 #: ../src/protocols/zephyr/zephyr.c:2902
 msgid "Export to .anyone"
 msgstr "Экспортировать в .anyone"
@@ -12360,26 +12578,36 @@
 msgid "Exposure"
 msgstr ""
 
-#: ../src/proxy.c:1207 ../src/proxy.c:1263 ../src/proxy.c:1311
-#: ../src/proxy.c:1338
+#: ../src/proxy.c:1217 ../src/proxy.c:1273 ../src/proxy.c:1321
+#: ../src/proxy.c:1348
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "Ошибка соединения с прокси %d"
 
 #. Forbidden
-#: ../src/proxy.c:1327
+#: ../src/proxy.c:1337
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "Доступ запрещён: прокси-сервер запрещает туннелирование порта %d."
 
-#: ../src/savedstatuses.c:514
+#. *
+#. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
+#.
+#: ../src/request.h:1354
+msgid "_Accept"
+msgstr "_Принять"
+
+#. *
+#. * The default message to use when the user becomes auto-away.
+#.
+#: ../src/savedstatuses.c:45
+msgid "I'm not here right now"
+msgstr ""
+
+#: ../src/savedstatuses.c:524
 msgid "saved statuses"
 msgstr "сохранённые статусы"
 
-#: ../src/savedstatuses.c:767
-msgid "I'm not here right now"
-msgstr ""
-
 #: ../src/server.c:227
 #, c-format
 msgid "%s is now known as %s.\n"
@@ -12405,7 +12633,7 @@
 
 #: ../src/status.c:153
 msgid "Unset"
-msgstr ""
+msgstr "Не установлен"
 
 #: ../src/status.c:156
 msgid "Unavailable"
@@ -12415,42 +12643,37 @@
 msgid "Mobile"
 msgstr ""
 
-#: ../src/status.c:623
-#, c-format
-msgid "%s signed on"
-msgstr "%s вошёл"
-
-#: ../src/status.c:629
-#, c-format
-msgid "%s signed off"
-msgstr "%s вышел"
-
-#: ../src/status.c:634
-#, c-format
-msgid "%s came back"
-msgstr "%s вернулся"
-
-#: ../src/status.c:639
-#, c-format
-msgid "%s went away"
-msgstr "%s отошёл"
-
-#: ../src/status.c:1330
+#: ../src/status.c:622
+#, c-format
+msgid "%s changed status from %s to %s"
+msgstr "%s изменил статус с %s на %s"
+
+#: ../src/status.c:632
+#, c-format
+msgid "%s is now %s"
+msgstr "%s теперь %s"
+
+#: ../src/status.c:637
+#, c-format
+msgid "%s is no longer %s"
+msgstr "%s больше не %s"
+
+#: ../src/status.c:1311
 #, c-format
 msgid "%s became idle"
 msgstr "%s начал бездействовать"
 
-#: ../src/status.c:1347
+#: ../src/status.c:1328
 #, c-format
 msgid "%s became unidle"
 msgstr "%s перестал бездействовать"
 
-#: ../src/status.c:1413
+#: ../src/status.c:1394
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s начал бездействовать"
 
-#: ../src/status.c:1415
+#: ../src/status.c:1396
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s перестал бездействовать"
@@ -12460,12 +12683,12 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../src/util.c:2455
+#: ../src/util.c:2453
 #, c-format
 msgid "Error Reading %s"
 msgstr "Ошибка чтения %s"
 
-#: ../src/util.c:2456
+#: ../src/util.c:2454
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -12474,56 +12697,56 @@
 "Произошла ошибка при чтении %s. Файл не был загружен, а старый файл был "
 "переименован в %s~."
 
-#: ../src/util.c:2895
+#: ../src/util.c:2903
 msgid "Calculating..."
 msgstr "Подсчёт..."
 
-#: ../src/util.c:2898
+#: ../src/util.c:2906
 msgid "Unknown."
 msgstr "Неизвестно."
 
-#: ../src/util.c:2924
+#: ../src/util.c:2932
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d секунда"
 msgstr[1] "%d секунд"
 
-#: ../src/util.c:2936
+#: ../src/util.c:2944
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d день"
 msgstr[1] "%d дней"
 
-#: ../src/util.c:2944
+#: ../src/util.c:2952
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d час"
 msgstr[1] "%s, %d часов"
 
-#: ../src/util.c:2950
+#: ../src/util.c:2958
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d час"
 msgstr[1] "%d часов"
 
-#: ../src/util.c:2958
+#: ../src/util.c:2966
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d минута"
 msgstr[1] "%s, %d минут"
 
-#: ../src/util.c:2964
+#: ../src/util.c:2972
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d минута"
 msgstr[1] "%d минут"
 
-#: ../src/util.c:3431
+#: ../src/util.c:3439
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Ошибка открытия соединения.\n"