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 (2006-05-30)
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 Fern�ndez-Sanguino Pe�a)
+	* 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"