# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1140136176 0
# Node ID 5e9f17b439cd977492fb5869f548c6652068e6da
# Parent  dc396c7dbcf9cd482db98d3516b39a101233516a
[gaim-migrate @ 15670]
2 updates

committer: Tailor Script <tailor@pidgin.im>

diff -r dc396c7dbcf9 -r 5e9f17b439cd po/es.po
--- a/po/es.po	Thu Feb 16 23:02:56 2006 +0000
+++ b/po/es.po	Fri Feb 17 00:29:36 2006 +0000
@@ -6,7 +6,7 @@
 # Copyright (c) December 2003, Francisco Javier F. Serrador
 #               <franciscojavier.fernandez.serrador@hispalinux.es>, 2003.
 # Copyright (C) June 2002, April 2003, January 2004, March 2004, September 2004,
-# 	      January 2005
+# 	      January 2005, January/February 2006
 # 		Javier Fernández-Sanguino Peña  <jfs@debian.org>
 #
 # Agradecemos la ayuda de revisión realizada por:
@@ -42,13 +42,15 @@
 # - Key Exchange: Intercambio de claves
 # - Key Agreement: Acuerdo de claves
 # - Plain text: «En claro» (refiriéndose a una autenticación que no está cifrada)
+# - Pounce: Aviso
+# - Smiley: Emoticono
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-27 16:12-0400\n"
-"PO-Revision-Date: 2006-01-05 01:04+0100\n"
+"POT-Creation-Date: 2006-02-13 21:43+0100\n"
+"PO-Revision-Date: 2006-02-17 00:37+0100\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team:  Spanish team <es@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -56,21 +58,17 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: plugins/autorecon.c:301
-msgid "Error Message Suppression"
-msgstr "Supresión de mensajes de error"
-
-#: plugins/autorecon.c:305
-msgid "Hide Disconnect Errors"
-msgstr "Ocultar errores de desconexión"
-
-#: plugins/autorecon.c:309
-msgid "Hide Login Errors"
-msgstr "Ocultar errores de conexión"
-
-#: plugins/autorecon.c:313
-msgid "Hide Reconnecting Dialog"
-msgstr "Ocultar dialogo de re-conexión"
+#: ../gaim.desktop.in.h:1
+msgid "Gaim Internet Messenger"
+msgstr "Gaim - cliente de mensajería de Internet"
+
+#: ../gaim.desktop.in.h:2
+msgid "Internet Messenger"
+msgstr "Cliente de mensajería de Internet"
+
+#: ../gaim.desktop.in.h:3
+msgid "Send instant messages over multiple protocols"
+msgstr "Cliente de mensajería instantánea multiprotocolo"
 
 #. *< type
 #. *< ui_requirement
@@ -78,54 +76,143 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:337
-msgid "Auto-Reconnect"
-msgstr "Reconexión automática"
+#: ../plugins/ciphertest.c:264 plugins/ciphertest.c:264
+msgid "Cipher Test"
+msgstr "Prueba de cifrado"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/autorecon.c:340 plugins/autorecon.c:342
-msgid "When you are kicked offline, this reconnects you."
-msgstr "Cuando por alguna razón Ud. se le expulsa, esto lo vuelve a conectar."
-
-#: plugins/contact_priority.c:84
+#: ../plugins/ciphertest.c:267 ../plugins/ciphertest.c:269
+#: plugins/ciphertest.c:267 plugins/ciphertest.c:269
+msgid "Tests the ciphers that ship with gaim."
+msgstr "Prueba los cifrados que se incluyen en gaim."
+
+#: plugins/contact_priority.c:61
+msgid "Buddy is idle"
+msgstr "El amigo está inactivo"
+
+#: plugins/contact_priority.c:62
+msgid "Buddy is away"
+msgstr "El amigo está ausente"
+
+#: plugins/contact_priority.c:63
+msgid "Buddy is \"extended\" away"
+msgstr "El amigo está  \"extended\" ausente"
+
+#. Not used yet.
+#: ../plugins/contact_priority.c:66
+msgid "Buddy is mobile"
+msgstr "El amigo está móvil"
+
+#: plugins/contact_priority.c:64
+msgid "Buddy is offline"
+msgstr "El amigo está desconectado"
+
+#: ../plugins/contact_priority.c:90 plugins/contact_priority.c:86
 msgid "Point values to use when..."
-msgstr "Puntos a utilizar cuando..."
-
-#: plugins/contact_priority.c:93
-msgid "Buddy is offline:"
-msgstr "El amigo está desconectado:"
-
-#: plugins/contact_priority.c:107
-msgid "Buddy is away:"
-msgstr "El amigo está ausente:"
+msgstr ""
+"Valores a utilizar cuando..."
+
+#: plugins/contact_priority.c:114
+msgid ""
+"The buddy with the <i>largest score</i> is the buddy who will have priority "
+"in the contact.\n"
+msgstr ""
+"El amigo con el <i>mayor marcador</i> es el que tendrá prioridad en el "
+"contacto.\n"
 
 #: plugins/contact_priority.c:121
-msgid "Buddy is idle:"
-msgstr "El amigo está inactivo:"
-
-#: plugins/contact_priority.c:135
-msgid "Use last matching buddy"
-msgstr "Usar el último amigo coincidente"
-
-#. Explanation
-#: plugins/contact_priority.c:141
-msgid ""
-"The buddy with the lowest score is the buddy who will have priority in the "
-"contact.\n"
-"The default values (offline = 4, away = 2, and idle = 1) will use what used "
-"to be\n"
-"the built-in order: active, idle, away, away + idle, offline."
-msgstr ""
-"El amigo con la puntuación más baja es el que tendrá prioridad dentro del contacto.\n"
-"Los valores por defecto (desconectado = 4, no disponible = 2 e inactivo = 1)\n"
-"se utilizarán para el orden previamente prefijado de activo, inactivo, no disponible, no disponible e inactivo, desconectado."
-
-#: plugins/contact_priority.c:144
+msgid "Use last buddy when scores are equal"
+msgstr "Usar el último amigo cuando los marcadores sean iguales"
+
+#: ../plugins/contact_priority.c:130 plugins/contact_priority.c:126
 msgid "Point values to use for account..."
-msgstr "Puntos a utilizar para la cuenta..."
+msgstr ""
+"Valores a utilizar para la cuenta..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../plugins/contact_priority.c:182 plugins/contact_priority.c:177
+msgid "Contact Priority"
+msgstr "Prioridad del contacto"
+
+#. *< name
+#. *< version
+#. *< summary
+#: ../plugins/contact_priority.c:185 plugins/contact_priority.c:180
+msgid ""
+"Allows for controlling the values associated with different buddy states."
+msgstr ""
+"Permite controlar los valores asociados a los diferentes estados de los "
+"amigos."
+
+#. *< description
+#: ../plugins/contact_priority.c:187 plugins/contact_priority.c:182
+msgid ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
+msgstr ""
+"Permite cambiar los puntos asignados a los estados inactivo/ausente/no "
+"disponible para los amigos en cálculos de prioridades de contacto."
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../plugins/crazychat/cc_gaim_plugin.c:146
+#: plugins/crazychat/cc_gaim_plugin.c:146
+msgid "Crazychat"
+msgstr "Crazychat"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/crazychat/cc_gaim_plugin.c:149
+msgid "Plugin to establish a Crazychat session."
+msgstr "Complemento para establecer una sesión de «Crazychat»"
+
+#. *  description
+#: plugins/crazychat/cc_gaim_plugin.c:151
+msgid "Uses Gaim to obtain buddy ips to connect for a Crazychat session"
+msgstr "Usar Gaim para obtener direcciones IP de los amigos para conectar a una sesión de «Crazychat»"
+
+#. make the network configuration frame
+#: plugins/crazychat/cc_gaim_plugin.c:295
+msgid "Network Configuration"
+msgstr "Configuración de red"
+
+#: plugins/crazychat/cc_gaim_plugin.c:307
+msgid "TCP port"
+msgstr "Puerto TCP"
+
+#: plugins/crazychat/cc_gaim_plugin.c:317
+msgid "UDP port"
+msgstr "Puerto UDP"
+
+#. make the feature configuration frame
+#: plugins/crazychat/cc_gaim_plugin.c:329
+msgid "Feature Calibration"
+msgstr "Ajuste de la función"
+
+#. add enabled / disabled
+#: ../plugins/crazychat/cc_gaim_plugin.c:345 ../src/gtkaccount.c:2251
+#: ../src/gtkplugin.c:577 plugins/crazychat/cc_gaim_plugin.c:345
+#: src/gtkaccount.c:2236 src/gtkplugin.c:414
+msgid "Enabled"
+msgstr "Habilitado"
+
+#: plugins/crazychat/cc_gaim_plugin.c:350
+msgid "Disabled"
+msgstr "Deshabilitado"
 
 #. *< type
 #. *< ui_requirement
@@ -133,124 +220,248 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/contact_priority.c:195
-msgid "Contact Priority"
-msgstr "Prioridad del contacto"
+#: plugins/dbus-example.c:135
+msgid "DBus"
+msgstr "DBus"
 
 #. *< name
 #. *< version
-#. *< summary
-#: plugins/contact_priority.c:198
-msgid ""
-"Allows for controlling the values associated with different buddy states."
-msgstr ""
-"Permite controlar los valores asociados a los diferentes estados de los "
-"amigos."
-
-#. *< description
-#: plugins/contact_priority.c:200
-msgid ""
-"Allows for changing the point values of idle/away/offline states for buddies "
-"in contact priority computations."
-msgstr ""
-"Permite cambiar los puntos asignados a los estados inactivo/ausente/no "
-"disponible para los amigos en cálculos de prioridades de contacto."
-
+#. *  summary
+#. *  description
+#: plugins/dbus-example.c:138 plugins/dbus-example.c:140
+msgid "DBus Plugin Example"
+msgstr "Ejemplo de complemento DBus"
+
+#: plugins/docklet/docklet.c:153
+msgid "Right-click for more unread messages...\n"
+msgstr "Pulse el botón derecho para ver más mensajes sin leer...\n"
+
+#: plugins/docklet/docklet.c:156 src/gtkblist.c:3244
+#, c-format
+msgid "%d unread message from %s\n"
+msgid_plural "%d unread messages from %s\n"
+msgstr[0] "%d mensaje sin leer de %s\n"
+msgstr[1] "%d mensajes sin leer de %s\n"
+
+#: ../plugins/docklet/docklet.c:432
+msgid "Change Status"
+msgstr "Cambiar estado:"
+
+#. hacks
+#. zephyr has several exposures
+#. NONE (where you are hidden, and zephyrs to you are in practice silently dropped -- yes this is wrong)
+#. OPSTAFF "hidden"
+#. REALM-VISIBLE visible to people in local realm
+#. REALM-ANNOUNCED REALM-VISIBLE+ plus your logins/logouts are announced to <login,username,*>
+#. NET-VISIBLE REALM-ANNOUNCED, plus visible to people in foreign realm
+#. NET-ANNOUNCED NET-VISIBLE, plus logins/logouts are announced	 to <login,username,*>
+#.
+#. Online will set the user to the exposure they have in their options (defaulting to REALM-VISIBLE),
+#. Hidden, will set the user's exposure to OPSTAFF
+#.
+#. Away won't change their exposure but will set an auto away message (for IMs only)
 #.
-#. *  DEFINES, MACROS & DATA TYPES
-#.
-#: plugins/docklet/docklet-win32.c:44
-msgid "Gaim"
-msgstr "Gaim"
-
-#: plugins/docklet/docklet-win32.c:45
-msgid "Gaim - Signed off"
-msgstr "Gaim - Desconectado"
-
-#: plugins/docklet/docklet-win32.c:46
-msgid "Gaim - Away"
-msgstr "Gaim - Ausente"
-
-#: plugins/docklet/docklet.c:383
+#: ../plugins/docklet/docklet.c:435 ../src/gtkstatusbox.c:663
+#: ../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:2733 ../src/status.c:155
+#: src/gtkstatusbox.c:438 src/protocols/bonjour/bonjour.c:251
+#: src/protocols/gg/gg.c:1437 src/protocols/irc/irc.c:171
+#: src/protocols/jabber/buddy.c:1089 src/protocols/jabber/jabber.c:1094
+#: src/protocols/msn/msn.c:581 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/napster/napster.c:584
+#: src/protocols/novell/novell.c:2846 src/protocols/novell/novell.c:2978
+#: src/protocols/oscar/oscar.c:7827 src/protocols/silc/silc.c:49
+#: src/protocols/simple/simple.c:254 src/protocols/yahoo/yahoo.c:2664
+#: src/protocols/zephyr/zephyr.c:2253 src/status.c:154
+msgid "Available"
+msgstr "Disponible"
+
+#. Away stuff
+#: ../plugins/docklet/docklet.c:439 ../src/gtkprefs.c:1759
+#: ../src/gtkstatusbox.c:664 ../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:729
+#: ../src/protocols/oscar/oscar.c:6759 ../src/protocols/oscar/oscar.c:7800
+#: ../src/protocols/silc/buddy.c:1469 ../src/protocols/yahoo/yahoo.c:3187
+#: ../src/status.c:158 src/gtkprefs.c:1661 src/gtkstatusbox.c:439
+#: src/protocols/bonjour/bonjour.c:258 src/protocols/irc/irc.c:175
+#: src/protocols/irc/irc.c:457 src/protocols/irc/msgs.c:221
+#: src/protocols/jabber/buddy.c:1093 src/protocols/jabber/jabber.c:1110
+#: src/protocols/msn/msn.c:585 src/protocols/novell/novell.c:2849
+#: src/protocols/novell/novell.c:2984 src/protocols/oscar/oscar.c:707
+#: src/protocols/oscar/oscar.c:6621 src/protocols/oscar/oscar.c:7677
+#: src/protocols/oscar/oscar.c:7834 src/protocols/sametime/sametime.c:3247
+#: src/protocols/silc/buddy.c:1431 src/protocols/silc/silc.c:53
+#: src/protocols/yahoo/yahoo.c:3113 src/protocols/yahoo/yahoo.c:3212
+#: src/protocols/zephyr/zephyr.c:2260 src/status.c:157
+msgid "Away"
+msgstr "Ausente"
+
+#: ../plugins/docklet/docklet.c:443 ../src/gtkstatusbox.c:665
+#: ../src/protocols/oscar/oscar.c:733 ../src/protocols/yahoo/yahoo.c:2727
+#: ../src/status.c:157 src/gtkstatusbox.c:440 src/protocols/gg/gg.c:1446
+#: src/protocols/oscar/oscar.c:711 src/protocols/oscar/oscar.c:7841
+#: src/protocols/yahoo/yahoo.c:2658 src/protocols/yahoo/yahoo.c:3245
+msgid "Invisible"
+msgstr "Invisible"
+
+#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:3016
+#: ../src/gtkstatusbox.c:666 ../src/protocols/jabber/buddy.c:1099
+#: ../src/protocols/novell/novell.c:2857 ../src/protocols/oscar/oscar.c:795
+#: ../src/protocols/oscar/oscar.c:7772 ../src/protocols/yahoo/yahoo.c:2731
+#: ../src/status.c:154 src/gtkstatusbox.c:441
+#: src/protocols/bonjour/bonjour.c:246 src/protocols/gg/gg.c:1432
+#: src/protocols/irc/irc.c:167 src/protocols/jabber/buddy.c:1087
+#: src/protocols/jabber/jabber.c:1087 src/protocols/msn/msn.c:577
+#: src/protocols/napster/napster.c:579 src/protocols/novell/novell.c:2858
+#: src/protocols/novell/novell.c:2975 src/protocols/oscar/oscar.c:769
+#: src/protocols/oscar/oscar.c:7649 src/protocols/oscar/oscar.c:7822
+#: src/protocols/sametime/sametime.c:3237 src/protocols/silc/silc.c:47
+#: src/protocols/simple/simple.c:250 src/protocols/yahoo/yahoo.c:2662
+#: src/protocols/yahoo/yahoo.c:3202 src/status.c:153
+msgid "Offline"
+msgstr "Desconectado"
+
+#: ../plugins/docklet/docklet.c:467 ../src/gtkstatusbox.c:671
+msgid "New..."
+msgstr "Nuevo..."
+
+#: ../plugins/docklet/docklet.c:468 ../src/gtkstatusbox.c:672
+#: src/gtkstatusbox.c:444
+msgid "Saved..."
+msgstr "Guardado..."
+
+#: ../plugins/docklet/docklet.c:484 plugins/docklet/docklet.c:370
 msgid "Show Buddy List"
 msgstr "Mostrar la lista de amigos"
 
-#: plugins/docklet/docklet.c:390
+#: plugins/docklet/docklet.c:375
+msgid "Unread Messages"
+msgstr "Mensajes sin leer"
+
+#: ../plugins/docklet/docklet.c:510 plugins/docklet/docklet.c:396
 msgid "New Message..."
 msgstr "Mensaje nuevo..."
 
-#: plugins/docklet/docklet.c:394
-msgid "Join A Chat..."
-msgstr "Unirse a un chat..."
-
-#: plugins/docklet/docklet.c:399
+#: ../plugins/docklet/docklet.c:519 ../src/gtkaccount.c:2467
+#: plugins/docklet/docklet.c:405 src/gtkaccount.c:2459
+msgid "Accounts"
+msgstr "Cuentas"
+
+#: ../plugins/docklet/docklet.c:520 ../src/gtkplugin.c:541
+#: plugins/docklet/docklet.c:406 src/gtkplugin.c:383
+msgid "Plugins"
+msgstr "Complementos"
+
+#: ../plugins/docklet/docklet.c:521 ../src/gtkprefs.c:1900
+#: plugins/docklet/docklet.c:407 src/gtkprefs.c:1779
+msgid "Preferences"
+msgstr "Preferencias"
+
+#: ../plugins/docklet/docklet.c:525 plugins/docklet/docklet.c:413
 msgid "Mute Sounds"
 msgstr "Sin sonido"
 
-#: plugins/docklet/docklet.c:406 src/gtkft.c:691
-#: src/protocols/oscar/oscar.c:8357
-msgid "File Transfers"
-msgstr "Transferencia de archivos"
-
-#: plugins/docklet/docklet.c:407 src/gtkaccount.c:2422
-msgid "Accounts"
-msgstr "Cuentas"
-
-#: plugins/docklet/docklet.c:408 src/gtkprefs.c:1763
-msgid "Preferences"
-msgstr "Preferencias"
-
 #. TODO: need a submenu to change status, this needs to "link"
 #. * to the status in the buddy list gtkstatusbox
 #.
-#: plugins/docklet/docklet.c:416
+#: ../plugins/docklet/docklet.c:538 plugins/docklet/docklet.c:426
 msgid "Quit"
 msgstr "Salir"
 
+#: plugins/docklet/docklet.c:567
+msgid "Blink tray icon for unread..."
+msgstr ""
+"Hacer parpadear el icono en el área de notificación del sistema para los "
+"mensajes sin leer..."
+
+#: plugins/docklet/docklet.c:570
+msgid "_Instant Messages:"
+msgstr "Mensajes instantáneos:"
+
+#: ../plugins/docklet/docklet.c:684 ../plugins/docklet/docklet.c:692
+#: ../plugins/win32/winprefs/winprefs.c:411 ../src/gtkprefs.c:823
+#: ../src/gtkprefs.c:1749 ../src/gtkprefs.c:1763 plugins/docklet/docklet.c:572
+#: plugins/docklet/docklet.c:580 plugins/win32/winprefs/winprefs.c:412
+#: src/gtkprefs.c:816 src/gtkprefs.c:1665
+msgid "Never"
+msgstr "Nunca"
+
+#: plugins/docklet/docklet.c:573
+msgid "In hidden conversations"
+msgstr "En conversaciones ocultas"
+
+#: ../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:412 ../src/gtkprefs.c:825
+#: plugins/docklet/docklet.c:574 plugins/docklet/docklet.c:582
+#: plugins/win32/winprefs/winprefs.c:413 src/gtkprefs.c:818
+msgid "Always"
+msgstr "Siempre"
+
+#: plugins/docklet/docklet.c:578
+msgid "C_hat Messages:"
+msgstr "Mensajes del c_hat"
+
+#: plugins/docklet/docklet.c:581
+msgid "When my nick is said"
+msgstr "Cuando mi apodo es mencionado"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:556
+#: ../plugins/docklet/docklet.c:720 plugins/docklet/docklet.c:607
 msgid "System Tray Icon"
 msgstr "Icono del área de notificación del sistema"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:559
+#: ../plugins/docklet/docklet.c:723 plugins/docklet/docklet.c:610
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "Muestra un icono para Gaim en el área de notificación del sistema."
 
 #. *  description
-#: plugins/docklet/docklet.c:561
-msgid ""
-"Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
+#: plugins/docklet/docklet.c:612
+msgid ""
+"Displays a system tray icon (in GNOME, KDE, or Windows for example) to show "
 "the current status of Gaim, allow fast access to commonly used functions, "
-"and to toggle display of the buddy list or login window. Also allows "
-"messages to be queued until the icon is clicked, similar to ICQ."
+"and to toggle display of the buddy list. Also provides options to blink for "
+"unread messages."
 msgstr ""
 "Muestra un icono en el área de notificación del sistema (por ejemplo en "
 "Gnome, KDE o Windows) para mostrar el estado actual de Gaim. Permite un "
-"acceso rápido a las funciones más comunes, indicar si se debe mostrar la "
-"lista de de amigos o la ventana de conexión. También permite encolar los "
-"mensajes hasta que se pulse el icono, similar a cómo se hace en ICQ."
-
-#: plugins/extplacement.c:79
+"acceso rápido a las funciones más comunes, e indicar si se debe mostrar la "
+"lista de de amigos. También ofrece opciones para hacer parpadear los "
+"mensajes sin leer."
+
+#: ../plugins/docklet/eggtrayicon.c:123 plugins/docklet/eggtrayicon.c:122
+msgid "Orientation"
+msgstr "Orientación"
+
+#: ../plugins/docklet/eggtrayicon.c:124 plugins/docklet/eggtrayicon.c:123
+msgid "The orientation of the tray."
+msgstr "La orientación en el área de notificación."
+
+#: ../plugins/extplacement.c:80 plugins/extplacement.c:80
 msgid "By conversation count"
 msgstr "Por número de conversaciones"
 
-#: plugins/extplacement.c:100
+#: ../plugins/extplacement.c:101 plugins/extplacement.c:101
 msgid "Conversation Placement"
 msgstr "Localización de la conversación"
 
-#: plugins/extplacement.c:105
+#: ../plugins/extplacement.c:106 plugins/extplacement.c:106
 msgid "Number of conversations per window"
 msgstr "Número de conversaciones por ventana"
 
-#: plugins/extplacement.c:111
+#: ../plugins/extplacement.c:112 plugins/extplacement.c:112
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "Separar ventanas de MIs y chats cuando se ubican por número"
 
@@ -260,19 +471,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/extplacement.c:132
+#: ../plugins/extplacement.c:135 plugins/extplacement.c:133
 msgid "ExtPlacement"
 msgstr "_UbicaciónExt"
 
 #. *< name
 #. *< version
-#: plugins/extplacement.c:134
+#: ../plugins/extplacement.c:137 plugins/extplacement.c:135
 msgid "Extra conversation placement options."
 msgstr "Opciones adicionales de ubicación de conversaciones."
 
 #. *< summary
 #. *  description
-#: plugins/extplacement.c:136
+#: ../plugins/extplacement.c:139 plugins/extplacement.c:137
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
@@ -286,7 +497,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:245
+#: ../plugins/filectl.c:245 plugins/filectl.c:245
 msgid "Gaim File Control"
 msgstr "Control de archivos de Gaim"
 
@@ -294,7 +505,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/filectl.c:248 plugins/filectl.c:250
+#: ../plugins/filectl.c:248 ../plugins/filectl.c:250 plugins/filectl.c:248
+#: plugins/filectl.c:250
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "Permite controlar Gaim introduciendo órdenes en un archivo."
 
@@ -304,19 +516,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaiminc.c:91
+#: ../plugins/gaiminc.c:91 plugins/gaiminc.c:91
 msgid "Gaim Demonstration Plugin"
 msgstr "Complemento de demostración de Gaim"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaiminc.c:94
+#: ../plugins/gaiminc.c:94 plugins/gaiminc.c:94
 msgid "An example plugin that does stuff - see the description."
 msgstr "Un ejemplo de complemento que hace cosas - consulte la descripción."
 
 #. *  description
-#: plugins/gaiminc.c:96
+#: ../plugins/gaiminc.c:96 plugins/gaiminc.c:96
 msgid ""
 "This is a really cool plugin that does a lot of stuff:\n"
 "- It tells you who wrote the program when you log in\n"
@@ -329,91 +541,139 @@
 "- Envía un mensaje a las personas en su lista inmediatamente cuando se "
 "conectan"
 
-#: plugins/gaimrc.c:40
+#: ../plugins/gaimrc.c:41 plugins/gaimrc.c:41
 msgid "Cursor Color"
-msgstr "Color del cursor"
-
-#: plugins/gaimrc.c:41
+msgstr ""
+"Color del puntero"
+
+#: ../plugins/gaimrc.c:42 plugins/gaimrc.c:42
 msgid "Secondary Cursor Color"
-msgstr "Color secundario del cursor"
-
-#: plugins/gaimrc.c:42
+msgstr ""
+"Color secundario del puntero"
+
+#: ../plugins/gaimrc.c:43 plugins/gaimrc.c:43
 msgid "Hyperlink Color"
 msgstr "Color de hiperenlace"
 
-#: plugins/gaimrc.c:53
+#: ../plugins/gaimrc.c:56 plugins/gaimrc.c:58
 msgid "GtkTreeView Expander Size"
 msgstr "Tamaño del expansor GtkTreeView"
 
-#: plugins/gaimrc.c:72
+#: plugins/gaimrc.c:60
+msgid "GtkTreeView Horizontal Separation"
+msgstr "Separación horizontal GtkTreeView"
+
+#: ../plugins/gaimrc.c:76 plugins/gaimrc.c:79
 msgid "Conversation Entry"
 msgstr "Entrada de conversaciones"
 
-#: plugins/gaimrc.c:73
+#: ../plugins/gaimrc.c:77 plugins/gaimrc.c:80
 msgid "Conversation History"
-msgstr "Histórico de conversaciones"
-
-#: plugins/gaimrc.c:74
+msgstr ""
+"Historial de conversaciones"
+
+#: ../plugins/gaimrc.c:78 plugins/gaimrc.c:81
 msgid "Log Viewer"
-msgstr "Visor de registros"
-
-#: plugins/gaimrc.c:75
+msgstr ""
+"Visor del registro"
+
+#: ../plugins/gaimrc.c:79 plugins/gaimrc.c:82
 msgid "Request Dialog"
-msgstr "Diálogo de solicitud"
-
-#: plugins/gaimrc.c:76
+msgstr ""
+"Diálogo de solicitud"
+
+#: ../plugins/gaimrc.c:80 plugins/gaimrc.c:83
 msgid "Notify Dialog"
-msgstr "Diálogo de notificación"
-
-#: plugins/gaimrc.c:209
+msgstr ""
+"Diálogo de notificación"
+
+#: ../plugins/gaimrc.c:91
+msgid "GtkTreeView Indent Expanders"
+msgstr "Sangrado de los expansores GtkTreeView"
+
+#: ../plugins/gaimrc.c:287 plugins/gaimrc.c:286
 #, c-format
 msgid "Select Color for %s"
 msgstr "Seleccionar el color para %s"
 
-#: plugins/gaimrc.c:211
+#: ../plugins/gaimrc.c:289 plugins/gaimrc.c:288
 msgid "Select Color"
-msgstr "Seleccionar el color"
-
-#: plugins/gaimrc.c:246
+msgstr ""
+"Seleccionar el color"
+
+#: ../plugins/gaimrc.c:324 plugins/gaimrc.c:323
 #, c-format
 msgid "Select Font for %s"
 msgstr "Seleccionar tipografía para %s"
 
-#: plugins/gaimrc.c:284
+#: ../plugins/gaimrc.c:362 plugins/gaimrc.c:361
 msgid "Select Interface Font"
 msgstr "Seleccionar tipografía de la interfaz"
 
-#: plugins/gaimrc.c:343
+#: ../plugins/gaimrc.c:415
+msgid "General"
+msgstr "General"
+
+#: ../plugins/gaimrc.c:420 plugins/gaimrc.c:421
 msgid "GTK+ Interface Font"
 msgstr "Tipografía de la interfaz GTK+"
 
-#: plugins/gaimrc.c:362
+#: ../plugins/gaimrc.c:440
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Tema de atajos de teclado GTK+"
 
-#: plugins/gaimrc.c:460
+#: ../plugins/gaimrc.c:475
+msgid "Interface colors"
+msgstr "Colores de la interfaz"
+
+#: ../plugins/gaimrc.c:499
+msgid "Widget Sizes"
+msgstr "Tamaño de los controles"
+
+#: ../plugins/gaimrc.c:520
+msgid "Fonts"
+msgstr "Tipografía"
+
+#: ../plugins/gaimrc.c:543
+msgid "Tools"
+msgstr "Herramientas"
+
+#: ../plugins/gaimrc.c:548
+#, c-format
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr "Escribir la configuración en %s%sgtkrc-2.0"
+
+#: plugins/gaimrc.c:531
+msgid "Re-read gtkrc files"
+msgstr "Volver a leer archivos de configuración gtkrc"
+
+#: ../plugins/gaimrc.c:583 plugins/gaimrc.c:557
 msgid "Gaim GTK+ Theme Control"
-msgstr "Control del tema de Gaim GTK+"
-
-#: plugins/gaimrc.c:462 plugins/gaimrc.c:463
+msgstr ""
+"Control de tema GTK+ de Gaim"
+
+#: ../plugins/gaimrc.c:585 ../plugins/gaimrc.c:586 plugins/gaimrc.c:559
+#: plugins/gaimrc.c:560
 msgid "Provides access to commonly used gtkrc settings."
-msgstr "Da acceso a las opciones de configuración de gtkrc que se utilizan habitualmente."
+msgstr ""
+"Da acceso a los parámetros de configuración de gtkrc que se utilizan "
+"habitualmente."
 
 #. Configuration frame
-#: plugins/gestures/gestures.c:243
+#: ../plugins/gestures/gestures.c:235 plugins/gestures/gestures.c:243
 msgid "Mouse Gestures Configuration"
 msgstr "Configuración de los gestos con el ratón"
 
-#: plugins/gestures/gestures.c:250
+#: ../plugins/gestures/gestures.c:242 plugins/gestures/gestures.c:250
 msgid "Middle mouse button"
 msgstr "Botón central del ratón"
 
-#: plugins/gestures/gestures.c:255
+#: ../plugins/gestures/gestures.c:247 plugins/gestures/gestures.c:255
 msgid "Right mouse button"
 msgstr "Botón derecho del ratón"
 
 #. "Visual gesture display" checkbox
-#: plugins/gestures/gestures.c:267
+#: ../plugins/gestures/gestures.c:259 plugins/gestures/gestures.c:267
 msgid "_Visual gesture display"
 msgstr "Mostrar gestos _visuales"
 
@@ -423,19 +683,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gestures/gestures.c:296
+#: ../plugins/gestures/gestures.c:289 plugins/gestures/gestures.c:296
 msgid "Mouse Gestures"
 msgstr "Gestos con el ratón"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gestures/gestures.c:299
+#: ../plugins/gestures/gestures.c:292 plugins/gestures/gestures.c:299
 msgid "Provides support for mouse gestures"
-msgstr "Proporciona soporte para gestos con el ratón"
+msgstr ""
+"Proporciona soporte para gestos con el ratón"
 
 #. *  description
-#: plugins/gestures/gestures.c:301
+#: ../plugins/gestures/gestures.c:294 plugins/gestures/gestures.c:301
 msgid ""
 "Allows support for mouse gestures in conversation windows.\n"
 "Drag the middle mouse button to perform certain actions:\n"
@@ -452,17 +713,23 @@
 "Arriba y después a la izquierda para cambiar a la conversación anterior.\n"
 "Arriba y después a la derecha para cambiar a la siguiente conversación."
 
-#: plugins/gevolution/add_buddy_dialog.c:131
-#: plugins/gevolution/assoc-buddy.c:119 src/gtkroomlist.c:572
-#: src/protocols/jabber/jabber.c:638 src/protocols/msn/msn.c:1539
+#: ../plugins/gevolution/add_buddy_dialog.c:131
+#: ../plugins/gevolution/assoc-buddy.c:119 ../src/gtkplugin.c:590
+#: ../src/gtkroomlist.c:604 ../src/protocols/jabber/jabber.c:754
+#: ../src/protocols/msn/msn.c:1524 plugins/gevolution/add_buddy_dialog.c:131
+#: plugins/gevolution/assoc-buddy.c:119 src/gtkplugin.c:424
+#: src/gtkroomlist.c:572 src/protocols/jabber/jabber.c:686
+#: src/protocols/msn/msn.c:1513
 msgid "Name"
 msgstr "Nombre"
 
+#: ../plugins/gevolution/add_buddy_dialog.c:142
 #: plugins/gevolution/add_buddy_dialog.c:142
 msgid "Instant Messaging"
 msgstr "Mensajería Instantáneos"
 
 #. Add the label.
+#: ../plugins/gevolution/add_buddy_dialog.c:454
 #: plugins/gevolution/add_buddy_dialog.c:458
 msgid "Select a person from your address book below, or add a new person."
 msgstr ""
@@ -470,30 +737,40 @@
 "persona."
 
 #. "Search"
+#: ../plugins/gevolution/add_buddy_dialog.c:467
+#: ../plugins/gevolution/assoc-buddy.c:353
+#: ../src/protocols/jabber/buddy.c:1411 ../src/protocols/oscar/oscar.c:8320
+#: ../src/protocols/sametime/sametime.c:5533
 #: plugins/gevolution/add_buddy_dialog.c:471
 #: plugins/gevolution/assoc-buddy.c:353 src/protocols/jabber/buddy.c:1357
-#: src/protocols/oscar/oscar.c:8128
+#: src/protocols/oscar/oscar.c:8198
 msgid "Search"
 msgstr "Buscar"
 
-#: plugins/gevolution/add_buddy_dialog.c:552
-#: plugins/gevolution/new_person_dialog.c:306 src/gtkblist.c:4082
-#: src/gtkblist.c:4459
+#: ../plugins/gevolution/add_buddy_dialog.c:548
+#: ../plugins/gevolution/new_person_dialog.c:306 ../src/gtkblist.c:4555
+#: ../src/gtkblist.c:4919 plugins/gevolution/add_buddy_dialog.c:552
+#: plugins/gevolution/new_person_dialog.c:306 src/gtkblist.c:4453
+#: src/gtkblist.c:4833
 msgid "Group:"
 msgstr "Grupo:"
 
 #. "New Person" button
+#: ../plugins/gevolution/add_buddy_dialog.c:574
+#: ../plugins/gevolution/assoc-buddy.c:464
 #: plugins/gevolution/add_buddy_dialog.c:578
 #: plugins/gevolution/assoc-buddy.c:464
 msgid "New Person"
 msgstr "Nueva persona"
 
 #. "Select Buddy" button
+#: ../plugins/gevolution/add_buddy_dialog.c:591
 #: plugins/gevolution/add_buddy_dialog.c:595
 msgid "Select Buddy"
 msgstr "Seleccionar amigo"
 
 #. Add the label.
+#: ../plugins/gevolution/assoc-buddy.c:340
 #: plugins/gevolution/assoc-buddy.c:340
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
@@ -503,54 +780,74 @@
 "nueva persona."
 
 #. Add the expander
+#: ../plugins/gevolution/assoc-buddy.c:428
 #: plugins/gevolution/assoc-buddy.c:428
 msgid "User _details"
-msgstr "_Detalles del usuario"
+msgstr ""
+"_Detalles del usuario"
 
 #. "Associate Buddy" button
+#: ../plugins/gevolution/assoc-buddy.c:481
 #: plugins/gevolution/assoc-buddy.c:481
 msgid "_Associate Buddy"
 msgstr "_Asociar amigo"
 
+#: ../plugins/gevolution/eds-utils.c:73 ../plugins/gevolution/eds-utils.c:86
+#: ../src/protocols/jabber/jabber.c:1124 plugins/gevolution/eds-utils.c:73
+#: plugins/gevolution/eds-utils.c:86 src/protocols/jabber/jabber.c:1037
+#: src/protocols/yahoo/yahoo.c:2802
+msgid "None"
+msgstr "Ninguno"
+
+#: ../plugins/gevolution/gevo-util.c:64 ../plugins/gevolution/gevolution.c:96
+#: ../src/blist.c:516 ../src/blist.c:1270 ../src/blist.c:1495
+#: ../src/gtkblist.c:4364 ../src/protocols/jabber/roster.c:65
 #: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:96
-#: src/blist.c:518 src/blist.c:1259 src/blist.c:1480 src/gtkblist.c:3897
-#: src/protocols/jabber/roster.c:66
+#: src/blist.c:518 src/blist.c:1275 src/blist.c:1500 src/gtkblist.c:4261
+#: src/protocols/jabber/roster.c:65
 msgid "Buddies"
 msgstr "Amigos"
 
-#: plugins/gevolution/gevolution.c:262 plugins/gevolution/gevolution.c:268
+#: ../plugins/gevolution/gevolution.c:262
+#: ../plugins/gevolution/gevolution.c:268 plugins/gevolution/gevolution.c:262
+#: plugins/gevolution/gevolution.c:268
 msgid "Unable to send e-mail"
-msgstr "No se pudo enviar el correo electrónico."
-
-#: plugins/gevolution/gevolution.c:263
+msgstr ""
+"No se pudo enviar el correo electrónico"
+
+#: ../plugins/gevolution/gevolution.c:263 plugins/gevolution/gevolution.c:263
 msgid "The evolution executable was not found in the PATH."
-msgstr "No se encontró el ejecutable de evolution en el PATH."
-
-#: plugins/gevolution/gevolution.c:269
+msgstr ""
+"No se encontró el ejecutable de Evolution en la ruta."
+
+#: ../plugins/gevolution/gevolution.c:269 plugins/gevolution/gevolution.c:269
 msgid "The specified buddy was not found in the Evolution Contacts."
-msgstr "No se encontró al amigo indicado dentro de la lista de contactos de Evolution"
-
-#: plugins/gevolution/gevolution.c:286
+msgstr "No se encontró al amigo especificado dentro en los contactos de Evolution."
+
+#: ../plugins/gevolution/gevolution.c:286 plugins/gevolution/gevolution.c:286
 msgid "Add to Address Book"
 msgstr "Añadir a la agenda"
 
-#: plugins/gevolution/gevolution.c:290
+#: ../plugins/gevolution/gevolution.c:290 plugins/gevolution/gevolution.c:290
 msgid "Send E-Mail"
 msgstr "Enviar correo electrónico"
 
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:414
+#: ../plugins/gevolution/gevolution.c:417 plugins/gevolution/gevolution.c:417
 msgid "Evolution Integration Configuration"
 msgstr "Configuración de la integración con Evolution"
 
 #. Label
-#: plugins/gevolution/gevolution.c:417
+#: ../plugins/gevolution/gevolution.c:420 plugins/gevolution/gevolution.c:420
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr ""
 "Seleccione todas las cuentas a los que los amigos se añadirán de forma "
 "automática."
 
-#: plugins/gevolution/gevolution.c:447 plugins/idle.c:111 plugins/idle.c:140
+#: ../plugins/gevolution/gevolution.c:450 ../plugins/idle.c:147
+#: ../plugins/idle.c:183 ../src/gtknotify.c:371 ../src/gtkpounce.c:1260
+#: plugins/gevolution/gevolution.c:450 plugins/idle.c:112 plugins/idle.c:147
+#: src/gtkpounce.c:1167
 msgid "Account"
 msgstr "Cuenta"
 
@@ -560,7 +857,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:530
+#: ../plugins/gevolution/gevolution.c:527 plugins/gevolution/gevolution.c:534
 msgid "Evolution Integration"
 msgstr "Integración con Evolution"
 
@@ -568,55 +865,88 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:533 plugins/gevolution/gevolution.c:535
+#: ../plugins/gevolution/gevolution.c:530
+#: ../plugins/gevolution/gevolution.c:532 plugins/gevolution/gevolution.c:537
+#: plugins/gevolution/gevolution.c:539
 msgid "Provides integration with Evolution."
 msgstr "Ofrece integración con Evolution."
 
+#: ../plugins/gevolution/new_person_dialog.c:266
 #: plugins/gevolution/new_person_dialog.c:266
 msgid "Please enter the person's information below."
 msgstr "Introduzca la información de la persona a continuación."
 
+#: ../plugins/gevolution/new_person_dialog.c:270
 #: plugins/gevolution/new_person_dialog.c:270
 msgid "Please enter the buddy's screen name and account type below."
 msgstr ""
 "Introduzca el nombre de usuario de su amigo y el tipo de cuenta más abajo."
 
+#: ../plugins/gevolution/new_person_dialog.c:290
 #: plugins/gevolution/new_person_dialog.c:290
 msgid "Account type:"
 msgstr "Tipo de cuenta:"
 
-#: plugins/gevolution/new_person_dialog.c:294
-msgid "Screenname:"
+#: plugins/gevolution/new_person_dialog.c:294 src/gtkaccount.c:764
+msgid "Screen name:"
 msgstr "Nombre de usuario:"
 
 #. Optional Information section
+#: ../plugins/gevolution/new_person_dialog.c:314
 #: plugins/gevolution/new_person_dialog.c:314
 msgid "Optional information:"
 msgstr "Información opcional:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:337 src/gtkaccount.c:412
-#: src/gtkaccount.c:434 src/protocols/oscar/oscar.c:613
+#: ../plugins/gevolution/new_person_dialog.c:337 ../src/gtkaccount.c:424
+#: ../src/gtkaccount.c:446 ../src/protocols/oscar/oscar.c:635
+#: plugins/gevolution/new_person_dialog.c:337 src/gtkaccount.c:407
+#: src/gtkaccount.c:429 src/protocols/oscar/oscar.c:613
 msgid "Buddy Icon"
 msgstr "Icono de amigo"
 
+#: ../plugins/gevolution/new_person_dialog.c:349
 #: plugins/gevolution/new_person_dialog.c:349
 msgid "First name:"
 msgstr "Nombre:"
 
+#: ../plugins/gevolution/new_person_dialog.c:361
 #: plugins/gevolution/new_person_dialog.c:361
 msgid "Last name:"
 msgstr "Apellidos:"
 
+#: ../plugins/gevolution/new_person_dialog.c:381
 #: plugins/gevolution/new_person_dialog.c:381
 msgid "E-mail:"
 msgstr "Correo electrónico:"
 
-#: plugins/history.c:146
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../plugins/gtk-signals-test.c:160 plugins/gtk-signals-test.c:107
+msgid "GTK Signals Test"
+msgstr "Prueba de señales GTK"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../plugins/gtk-signals-test.c:163 ../plugins/gtk-signals-test.c:165
+#: plugins/gtk-signals-test.c:110 plugins/gtk-signals-test.c:112
+msgid "Test to see that all ui signals are working properly."
+msgstr ""
+"Probar para ver si todas las señales de la interfaz de usuario funcionan "
+"correctamente."
+
+#: ../plugins/history.c:143 plugins/history.c:146
 msgid "History Plugin Requires Logging"
-msgstr "Debe tener habilitado el registro para utilizar el complemento de histórico"
-
-#: plugins/history.c:147
+msgstr ""
+"Debe estar conectad para utilizar el complemento de histórico"
+
+#: ../plugins/history.c:144
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -625,30 +955,26 @@
 msgstr ""
 "Puede activar el registro en Herramientas -> Preferencias -> Registro.\n"
 "\n"
-"La activación del registro en mensajes instantáneos y/o chats activará el histórico para los mismos tipos de conversación."
-
-#: plugins/history.c:186
+"La activación del registro en mensajes instantáneos y/o chats activará el "
+"histórico para los mismos tipos de conversación."
+
+#: ../plugins/history.c:184 plugins/history.c:186
 msgid "History"
 msgstr "Histórico"
 
-#: plugins/history.c:188
+#: ../plugins/history.c:186 plugins/history.c:188
 msgid "Shows recently logged conversations in new conversations."
 msgstr ""
 "Muestra las conversaciones registradas previamente en las nuevas "
 "conversaciones."
 
-#: plugins/history.c:189
+#: ../plugins/history.c:187
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
-"conversation into the current conversation.\n"
-"\n"
-"The history plugin requires logging be enabled. Logging can be enabled from "
-"Tools -> Preferences -> Logging. Enabling logs for instant messages and/or "
-"chats will activate history for the same conversation type(s)."
-msgstr ""
-"Este complemento insertará la última conversación en la conversación actual cuando se establezca una nueva conversación.\n"
-"\n"
-"El complemento de histórico necesita que esté activo el registro. Puede activar el registro de Herramientas -> Preferencias -> Registro. Si activa el registro para mensajes instantáneos y/o chats se activará el histórico para el mismo tipo de conversación."
+"conversation into the current conversation."
+msgstr ""
+"Cuando se abre una nueva conversación este complemento introduce la última "
+"conversación en la conversación actual."
 
 # Nota: ni «iconizar» ni «iconificar» están en el diccionario... jfs
 #. *< type
@@ -657,7 +983,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/iconaway.c:101
+#: ../plugins/iconaway.c:82 plugins/iconaway.c:101
 msgid "Iconify on Away"
 msgstr "Iconizar en ausencia"
 
@@ -665,46 +991,62 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/iconaway.c:104 plugins/iconaway.c:106
+#: ../plugins/iconaway.c:85 ../plugins/iconaway.c:87 plugins/iconaway.c:104
+#: plugins/iconaway.c:106
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr ""
 "Iconiza la lista de amigos y de conversaciones cuando usted está ausente."
 
-#: plugins/idle.c:115
+#: ../plugins/idle.c:152 ../plugins/idle.c:210 plugins/idle.c:116
 msgid "Minutes"
 msgstr "minutos"
 
-#: plugins/idle.c:122 plugins/idle.c:149 plugins/idle.c:215
+#: ../plugins/idle.c:159 ../plugins/idle.c:192 ../plugins/idle.c:217
+#: ../plugins/idle.c:306 plugins/idle.c:123 plugins/idle.c:156
+#: plugins/idle.c:222
 msgid "I'dle Mak'er"
 msgstr "Generador de ausencia"
 
-#: plugins/idle.c:123 plugins/idle.c:181
+#: ../plugins/idle.c:160 ../plugins/idle.c:249 plugins/idle.c:124
+#: plugins/idle.c:188
 msgid "Set Account Idle Time"
 msgstr "Establecer tiempo de inactividad de la cuenta"
 
-#: plugins/idle.c:126
+#: ../plugins/idle.c:163 ../plugins/idle.c:221 plugins/idle.c:127
 msgid "_Set"
 msgstr "_Guardar"
 
-#: plugins/idle.c:127 plugins/idle.c:154
+#: ../plugins/idle.c:164 ../plugins/idle.c:197 ../plugins/idle.c:222
+#: plugins/idle.c:128 plugins/idle.c:161
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: plugins/idle.c:150 plugins/idle.c:185
+#: plugins/idle.c:141
+msgid "None of your accounts are idle."
+msgstr "Ninguna de sus cuentas está inactiva."
+
+#: ../plugins/idle.c:193 ../plugins/idle.c:253 plugins/idle.c:157
+#: plugins/idle.c:192
 msgid "Unset Account Idle Time"
 msgstr "Desactivar tiempo de inactividad de la cuenta"
 
-#: plugins/idle.c:153
+#: ../plugins/idle.c:196 plugins/idle.c:160
 msgid "_Unset"
 msgstr "_Desactivar"
 
-#: plugins/idle.c:190
-msgid "Unset Idle Time For All Idled Accounts"
+#: ../plugins/idle.c:218 ../plugins/idle.c:257
+msgid "Set Idle Time for All Accounts"
+msgstr "Fijar tiempo de inactividad para todas las cuentas"
+
+#: plugins/idle.c:197
+msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Desactivar tiempo de inactividad para todas las cuentas inactivas"
 
-#: plugins/idle.c:217 plugins/idle.c:218
+#: ../plugins/idle.c:308 ../plugins/idle.c:309 plugins/idle.c:224
+#: plugins/idle.c:225
 msgid "Allows you to hand-configure how long you've been idle"
-msgstr "Permite configurar manualmente cuánto tiempo ha estado ausente"
+msgstr ""
+"Permite configurar manualmente cuánto tiempo ha estado ausente"
 
 #. *< type
 #. *< ui_requirement
@@ -712,19 +1054,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ipc-test-client.c:87
+#: ../plugins/ipc-test-client.c:87 plugins/ipc-test-client.c:87
 msgid "IPC Test Client"
 msgstr "Cliente de prueba IPC"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ipc-test-client.c:90
+#: ../plugins/ipc-test-client.c:90 plugins/ipc-test-client.c:90
 msgid "Test plugin IPC support, as a client."
 msgstr "Complemento de prueba con soporte IPC, como cliente."
 
 #. *  description
-#: plugins/ipc-test-client.c:92
+#: ../plugins/ipc-test-client.c:92 plugins/ipc-test-client.c:92
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
@@ -738,106 +1080,286 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ipc-test-server.c:74
+#: ../plugins/ipc-test-server.c:74 plugins/ipc-test-server.c:74
 msgid "IPC Test Server"
 msgstr "Servidor de prueba IPC"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ipc-test-server.c:77
+#: ../plugins/ipc-test-server.c:77 plugins/ipc-test-server.c:77
 msgid "Test plugin IPC support, as a server."
 msgstr "Complemento de soporte IPC de prueba, como servidor."
 
 #. *  description
-#: plugins/ipc-test-server.c:79
+#: ../plugins/ipc-test-server.c:79 plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr ""
 "Complemento de soporte IPC de prueba, como servidor. Éste registra las "
 "órdenes IPC."
 
-#: plugins/mailchk.c:160
+#: plugins/log_reader.c:1403
+msgid "User is offline."
+msgstr "El usuario no está conectado."
+
+#: plugins/log_reader.c:1409
+msgid "Auto-response sent:"
+msgstr "_Enviar respuesta automática:"
+
+#: ../plugins/log_reader.c:1423 ../plugins/log_reader.c:1426
+#: plugins/log_reader.c:1419 plugins/log_reader.c:1422
+#, c-format
+msgid "%s logged out."
+msgstr "%s se ha desconectado."
+
+#: plugins/log_reader.c:1436
+msgid "One or more messages may have been undeliverable."
+msgstr "Uno o más mensajes puede no haber llegado a destino."
+
+#. MSG_SERVER_DISCONNECTING
+#. we have been kicked off =^(
+#: ../plugins/log_reader.c:1450 ../src/protocols/napster/napster.c:363
+#: plugins/log_reader.c:1446 src/protocols/napster/napster.c:363
+msgid "You were disconnected from the server."
+msgstr "Ha sido desconectado del servidor."
+
+#: plugins/log_reader.c:1454
+msgid ""
+"You are currently disconnected. Messages will not be received unless you are "
+"logged in."
+msgstr ""
+"Actualmente está desconectado. No podrá recibir mensajes a menos que se "
+"conecte."
+
+#: plugins/log_reader.c:1469
+msgid "Message could not be sent because the maximum length was exceeded."
+msgstr ""
+"No se pudo enviar el mensaje porque excede la longitud máxima permitida."
+
+#: plugins/log_reader.c:1474
+msgid "Message could not be sent."
+msgstr "No se envió su mensaje."
+
+#. Add general preferences.
+#: plugins/log_reader.c:1908
+msgid "General Log Reading Configuration"
+msgstr "Configuración general de lectura del registro"
+
+#: plugins/log_reader.c:1912
+msgid "Fast size calculations"
+msgstr "Cálculos de tamaño rápido"
+
+#: ../plugins/log_reader.c:1920 plugins/log_reader.c:1916
+msgid "Use name heuristics"
+msgstr "Utilizar heurísticos de nombres"
+
+#. Add Log Directory preferences.
+#: plugins/log_reader.c:1922
+msgid "Log Directory"
+msgstr "Directorio de registro"
+
+#: plugins/log_reader.c:1926
+msgid "Adium"
+msgstr "Adium"
+
+#: plugins/log_reader.c:1930
+msgid "Fire"
+msgstr "Fire"
+
+#: plugins/log_reader.c:1934
+msgid "Messenger Plus!"
+msgstr "Messenger Plus!"
+
+#: plugins/log_reader.c:1938
+msgid "MSN Messenger"
+msgstr "MSN Messenger"
+
+#: plugins/log_reader.c:1942
+msgid "Trillian"
+msgstr "Trillian"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/log_reader.c:1963
+msgid "Log Reader"
+msgstr "Lector de registro"
+
+#. *< name
+#. *< version
+#. * summary
+#: plugins/log_reader.c:1967
+msgid "Includes other IM clients' logs in the log viewer."
+msgstr "Incluir otros registros de clientes de MI en el visor de registro."
+
+#. * description
+#: plugins/log_reader.c:1971
+msgid ""
+"When viewing logs, this plugin will include logs from other IM clients. "
+"Currently, this includes Adium, Fire, Messenger Plus!, MSN Messenger, and "
+"Trillian."
+msgstr ""
+"Cuando los registros sean vistos, este complemento incluirá registros de "
+"otros clientes de IM. Actualmente, esto incluye a Adium, Fire, Messenger "
+"Plus!, MSN Messenger, y Trillian."
+
+#: ../plugins/mailchk.c:160 plugins/mailchk.c:160
 msgid "Mail Checker"
 msgstr "Comprobador de correo"
 
-#: plugins/mailchk.c:162
+#: ../plugins/mailchk.c:162 plugins/mailchk.c:162
 msgid "Checks for new local mail."
 msgstr "Comprueba si hay correo local nuevo."
 
-#: plugins/mailchk.c:163
+#: ../plugins/mailchk.c:163 plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr ""
 "Añade una pequeña caja a la lista de amigos que muestra si tiene nuevo "
 "correo."
 
+#: plugins/mono/loader/mono.c:213
+msgid "Mono Plugin Loader"
+msgstr "Cargador de complementos Mono"
+
+#: plugins/mono/loader/mono.c:215 plugins/mono/loader/mono.c:216
+msgid "Loads .NET plugins with Mono."
+msgstr "Cargar complementos .NET con Mono."
+
+#: ../plugins/musicmessaging/musicmessaging.c:44
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr "Se ha solicitado una sesión de mensajería musical. Por favor, seleccione el icono de MM para aceptarla."
+
+#: ../plugins/musicmessaging/musicmessaging.c:45
+msgid "Music messaging session confirmed."
+msgstr "Se ha confirmado la sesión de mensajería musical."
+
+#: ../plugins/musicmessaging/musicmessaging.c:414
+msgid "Music Messaging"
+msgstr "Mensajería musical"
+
+#: ../plugins/musicmessaging/musicmessaging.c:415
+msgid "There was a conflict in running the command:"
+msgstr "Se ha producido un conflicto al ejecutar la orden:"
+
+#: ../plugins/musicmessaging/musicmessaging.c:523
+msgid "Error Running Editor"
+msgstr "Error al ejecutar el editor"
+
+#: ../plugins/musicmessaging/musicmessaging.c:524
+msgid "The following error has occured:"
+msgstr "Ha ocurrido el siguiente error:"
+
+#. Configuration frame
+#: plugins/musicmessaging/musicmessaging.c:622
+msgid "Music Messaging Configuration"
+msgstr "Configuración de Mensajes de música"
+
+#: ../plugins/musicmessaging/musicmessaging.c:627
+msgid "Score Editor Path"
+msgstr "Ruta del editor de partituras"
+
+#: ../plugins/musicmessaging/musicmessaging.c:628
+#: plugins/musicmessaging/musicmessaging.c:627
+msgid "_Apply"
+msgstr "_Aplicar"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../plugins/musicmessaging/musicmessaging.c:663
+msgid "Music Messaging Plugin for collaborative composition."
+msgstr "Complemento de mensajería musical para composición colaborativa."
+
+#. *  summary
+#: ../plugins/musicmessaging/musicmessaging.c:665
+msgid ""
+"The Music Messaging Plugin allows a number of users to simultaneously work "
+"on a piece of music by editting a common score in real-time."
+msgstr "El complemento de mensajería musical permite trabajar a distintos usuarios de forma simultánea en una pieza de música editando una partitura común en tiempo real."
+
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:638
+#: ../plugins/notify.c:638 plugins/notify.c:639
 msgid "Notify For"
 msgstr "Notificar de"
 
-#: plugins/notify.c:642
+#: ../plugins/notify.c:642 plugins/notify.c:643
 msgid "_IM windows"
 msgstr "Ventanas de M_I"
 
-#: plugins/notify.c:649
+#: ../plugins/notify.c:649 plugins/notify.c:650
 msgid "C_hat windows"
 msgstr "Ventanas de _chat"
 
-#: plugins/notify.c:656
+#: ../plugins/notify.c:657
+msgid "\t_Only when someone says your nick"
+msgstr "\t_Sólo si alguien menciona su apodo"
+
+#: ../plugins/notify.c:667 plugins/notify.c:657
 msgid "_Focused windows"
 msgstr "Ventanas _enfocadas"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:664
+#: ../plugins/notify.c:675 plugins/notify.c:665
 msgid "Notification Methods"
 msgstr "Métodos de notificación"
 
-#: plugins/notify.c:671
+#: ../plugins/notify.c:682 plugins/notify.c:672
 msgid "Prepend _string into window title:"
 msgstr "Prefijar la _cadena en el título de la ventana:"
 
 #. Count method button
-#: plugins/notify.c:690
+#: ../plugins/notify.c:701 plugins/notify.c:691
 msgid "Insert c_ount of new messages into window title"
 msgstr "Insertar el _número de mensajes nuevos en el título de la ventana"
 
 #. Urgent method button
-#: plugins/notify.c:698
+#: ../plugins/notify.c:710 plugins/notify.c:699
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Establecer pista «_URGENTE» del gestor de ventanas"
 
 #. Raise window method button
-#: plugins/notify.c:706
+#: ../plugins/notify.c:719 plugins/notify.c:707
 msgid "R_aise conversation window"
-msgstr "_Subir las ventanas de conversación"
+msgstr ""
+"_Subir la ventana de conversación"
 
 #. ---------- "Notification Removals" ----------
-#: plugins/notify.c:714
+#: ../plugins/notify.c:727 plugins/notify.c:715
 msgid "Notification Removal"
 msgstr "Eliminación de la notificación"
 
 #. Remove on focus button
-#: plugins/notify.c:719
+#: ../plugins/notify.c:732 plugins/notify.c:720
 msgid "Remove when conversation window _gains focus"
 msgstr "Eliminar cuando la ventana de la conversación obtiene el _foco"
 
 #. Remove on click button
-#: plugins/notify.c:726
+#: ../plugins/notify.c:739 plugins/notify.c:727
 msgid "Remove when conversation window _receives click"
 msgstr "Eliminar cuando la ventana de la conversación _recibe una pulsación"
 
 #. Remove on type button
-#: plugins/notify.c:734
+#: ../plugins/notify.c:747 plugins/notify.c:735
 msgid "Remove when _typing in conversation window"
 msgstr "Eliminar cuando se _escriba en la ventana de la conversación"
 
 #. Remove on message send button
-#: plugins/notify.c:742
+#: ../plugins/notify.c:755 plugins/notify.c:743
 msgid "Remove when a _message gets sent"
 msgstr "Eliminar cuando se envíe un _mensaje"
 
 #. Remove on conversation switch button
-#: plugins/notify.c:751
+#: ../plugins/notify.c:764 plugins/notify.c:752
 msgid "Remove on switch to conversation ta_b"
 msgstr "Eliminar al cambiar de _solapa de conversación"
 
@@ -847,7 +1369,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:841
+#: ../plugins/notify.c:853 plugins/notify.c:842
 msgid "Message Notification"
 msgstr "Notificación de mensajes"
 
@@ -855,7 +1377,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/notify.c:844 plugins/notify.c:846
+#: ../plugins/notify.c:856 ../plugins/notify.c:858 plugins/notify.c:845
+#: plugins/notify.c:847
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr ""
 "Permite notificar de diversas formas la presencia de mensajes sin leer."
@@ -866,26 +1389,58 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:587
+#: ../plugins/perl/perl.c:583 plugins/perl/perl.c:587
 msgid "Perl Plugin Loader"
 msgstr "Cargador de complementos Perl"
 
 #. *< name
 #. *< version
 #. *< summary
+#: ../plugins/perl/perl.c:585 ../plugins/perl/perl.c:586
 #: plugins/perl/perl.c:589 plugins/perl/perl.c:590
 msgid "Provides support for loading perl plugins."
-msgstr "Provee soporte para cargar complementos en perl."
-
-#: plugins/raw.c:151
+msgstr ""
+"Provee soporte para cargar complementos en perl."
+
+#: ../plugins/psychic.c:22
+msgid "Psychic Mode"
+msgstr "Modo psíquico"
+
+#: ../plugins/psychic.c:23
+msgid "Psychic mode for incoming conversation"
+msgstr "Modo psíquico para conversaciones entrantes"
+
+#: ../plugins/psychic.c:24
+msgid ""
+"Causes conversation windows to appear as other users begin to message you.  "
+"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+msgstr "Hace que aparezcan las ventanas de conversación cuando un usuario empieza a enviarle un mensaje. Esto funciona con AIM, ICQ, Jabber, Sametime y Yahoo!"
+
+#: ../plugins/psychic.c:60
+msgid "You feel a disturbance in the force..."
+msgstr "Sientes una perturbación en la fuerza..."
+
+#: ../plugins/psychic.c:79
+msgid "Only enable for users on the buddy list"
+msgstr "Permitir sólo a los usuarios en mi lista de amigos"
+
+#: ../plugins/psychic.c:84
+msgid "Disable when away"
+msgstr "Deshabilitar cuando ausente"
+
+#: ../plugins/psychic.c:88
+msgid "Display notification message in conversations"
+msgstr "Muestra el mensaje de notificación en las conversaciones"
+
+#: ../plugins/raw.c:175 plugins/raw.c:175
 msgid "Raw"
 msgstr "En bruto"
 
-#: plugins/raw.c:153
+#: ../plugins/raw.c:177 plugins/raw.c:177
 msgid "Lets you send raw input to text-based protocols."
 msgstr "Le permite enviar datos en bruto a protocolos basados en texto."
 
-#: plugins/raw.c:154
+#: ../plugins/raw.c:178 plugins/raw.c:178
 msgid ""
 "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
@@ -894,13 +1449,13 @@
 "IRC,  TOC). Pulse «Intro» en la caja de entrada para enviarlo. Observe la "
 "ventana de depuración."
 
-#: plugins/relnot.c:63
+#: ../plugins/relnot.c:63 plugins/relnot.c:63
 #, c-format
 msgid "You are using Gaim version %s.  The current version is %s.<hr>"
 msgstr ""
 "Usted está utilizado la versión de Gaim %s. La versión actual es %s.<hr>"
 
-#: plugins/relnot.c:69
+#: ../plugins/relnot.c:69 plugins/relnot.c:69
 #, c-format
 msgid ""
 "<b>ChangeLog:</b>\n"
@@ -909,16 +1464,17 @@
 "<b>Registro de cambios:</b>\n"
 "%s<br><br>"
 
-#: plugins/relnot.c:74
+#: ../plugins/relnot.c:74 plugins/relnot.c:74
 #, c-format
 msgid ""
 "You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
 "\">http://gaim.sourceforge.net</a>."
 msgstr ""
-"Puede obtener la versión %s de:<<br><a href=\"http://gaim.sourceforge.net/"
+"Puede obtener la versión %s de:<br><a href=\"http://gaim.sourceforge.net/"
 "\">http://gaim.sourceforge.net</a>."
 
-#: plugins/relnot.c:78 plugins/relnot.c:79
+#: ../plugins/relnot.c:78 ../plugins/relnot.c:79 plugins/relnot.c:78
+#: plugins/relnot.c:79
 msgid "New Version Available"
 msgstr "Nueva versión disponible"
 
@@ -928,19 +1484,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/relnot.c:137
+#: ../plugins/relnot.c:137 plugins/relnot.c:137
 msgid "Release Notification"
 msgstr "Notificación de versiones"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/relnot.c:140
+#: ../plugins/relnot.c:140 plugins/relnot.c:140
 msgid "Checks periodically for new releases."
 msgstr "Comprueba periódicamente la existencia de nuevas versiones."
 
 #. *  description
-#: plugins/relnot.c:142
+#: ../plugins/relnot.c:142 plugins/relnot.c:142
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
@@ -954,7 +1510,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:730
+#: ../plugins/signals-test.c:674 plugins/signals-test.c:732
 msgid "Signals Test"
 msgstr "Prueba de señales"
 
@@ -962,7 +1518,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:733 plugins/signals-test.c:735
+#: ../plugins/signals-test.c:677 ../plugins/signals-test.c:679
+#: plugins/signals-test.c:735 plugins/signals-test.c:737
 msgid "Test to see that all signals are working properly."
 msgstr "Probar para ver si todas las señales funcionan correctamente."
 
@@ -972,7 +1529,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/simple.c:34
+#: ../plugins/simple.c:34 plugins/simple.c:34
 msgid "Simple Plugin"
 msgstr "Complemento sencillo"
 
@@ -980,55 +1537,76 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/simple.c:37 plugins/simple.c:39
+#: ../plugins/simple.c:37 ../plugins/simple.c:39 plugins/simple.c:37
+#: plugins/simple.c:39
 msgid "Tests to see that most things are working."
 msgstr "Hace pruebas para determinar si la mayor parte de las cosas funcionan."
 
-#: plugins/spellchk.c:1788
+#: ../plugins/spellchk.c:1902
 msgid "Duplicate Correction"
 msgstr "Corrección duplicada"
 
-#: plugins/spellchk.c:1789
+#: ../plugins/spellchk.c:1903
 msgid "The specified word already exists in the correction list."
 msgstr "La palabra específica ya existe en la lista de corrección."
 
-#: plugins/spellchk.c:1948
+#: ../plugins/spellchk.c:2112 plugins/spellchk.c:1981
 msgid "Text Replacements"
 msgstr "Reemplazos de texto"
 
-#: plugins/spellchk.c:1972
+#: ../plugins/spellchk.c:2135 plugins/spellchk.c:2005
 msgid "You type"
 msgstr "Usted escribe"
 
-#: plugins/spellchk.c:1984
+#: ../plugins/spellchk.c:2149 plugins/spellchk.c:2017
 msgid "You send"
 msgstr "Usted envía"
 
-#: plugins/spellchk.c:1996
+#: ../plugins/spellchk.c:2163 plugins/spellchk.c:2029
 msgid "Whole words only"
-msgstr "Sólo palabras enteras"
-
-#: plugins/spellchk.c:2022
+msgstr ""
+"Solamente palabras enteras"
+
+#: ../plugins/spellchk.c:2175
+msgid "Case sensitive"
+msgstr "Distingue mayúsculas de minúsculas"
+
+#: ../plugins/spellchk.c:2201 plugins/spellchk.c:2055
 msgid "Add a new text replacement"
 msgstr "Añadir una regla nueva de reemplazo de texto"
 
-#: plugins/spellchk.c:2032
+#: ../plugins/spellchk.c:2217 plugins/spellchk.c:2065
 msgid "You _type:"
 msgstr "Usted _escribe:"
 
-#: plugins/spellchk.c:2048
+#: ../plugins/spellchk.c:2234 plugins/spellchk.c:2081
 msgid "You _send:"
 msgstr "Usted _envía:"
 
-#: plugins/spellchk.c:2060
+#. Created here so it can be passed to whole_words_button_toggled.
+#: ../plugins/spellchk.c:2246
+msgid "_Exact case match (uncheck for automatic case handling)"
+msgstr "Ajustar al formato _exacto (desmarcar para gestionar mayúsculas y minúsculas automáticamente)"
+
+#: ../plugins/spellchk.c:2248 plugins/spellchk.c:2093
 msgid "Only replace _whole words"
-msgstr "Sól reemplazar palabras _enteras"
-
-#: plugins/spellchk.c:2097
+msgstr ""
+"Reemplazar solamente palabras _enteras"
+
+#: ../plugins/spellchk.c:2273
+msgid "General Text Replacement Options"
+msgstr "Opciones de reemplazos de texto general"
+
+#: ../plugins/spellchk.c:2274
+msgid "Enable replacement of last word on send"
+msgstr "Habilitar la sustitución de la última palabra al enviar"
+
+#: ../plugins/spellchk.c:2299 plugins/spellchk.c:2130
 msgid "Text replacement"
 msgstr "Reemplazo de texto"
 
-#: plugins/spellchk.c:2099 plugins/spellchk.c:2100
+#: ../plugins/spellchk.c:2301 ../plugins/spellchk.c:2302
+#: plugins/spellchk.c:2132 plugins/spellchk.c:2133
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "Reemplaza el texto de los mensajes salientes según las reglas definidas por "
@@ -1040,7 +1618,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-gnutls.c:227
+#: ../plugins/ssl/ssl-gnutls.c:251 plugins/ssl/ssl-gnutls.c:227
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -1048,6 +1626,7 @@
 #. *< version
 #. *  summary
 #. *  description
+#: ../plugins/ssl/ssl-gnutls.c:254 ../plugins/ssl/ssl-gnutls.c:256
 #: plugins/ssl/ssl-gnutls.c:230 plugins/ssl/ssl-gnutls.c:232
 msgid "Provides SSL support through GNUTLS."
 msgstr "Proporciona soporte SSL a través de GNUTLS."
@@ -1058,7 +1637,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-nss.c:319
+#: ../plugins/ssl/ssl-nss.c:412 plugins/ssl/ssl-nss.c:319
 msgid "NSS"
 msgstr "NSS"
 
@@ -1066,6 +1645,7 @@
 #. *< version
 #. *  summary
 #. *  description
+#: ../plugins/ssl/ssl-nss.c:415 ../plugins/ssl/ssl-nss.c:417
 #: plugins/ssl/ssl-nss.c:322 plugins/ssl/ssl-nss.c:324
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Proporciona soporte SSL a través del NSS de Mozilla."
@@ -1076,7 +1656,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl.c:94
+#: ../plugins/ssl/ssl.c:94 plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL"
 
@@ -1084,50 +1664,65 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl.c:97 plugins/ssl/ssl.c:99
+#: ../plugins/ssl/ssl.c:97 ../plugins/ssl/ssl.c:99 plugins/ssl/ssl.c:97
+#: plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr ""
 "Proporciona un recubrimiento a través de las bibliotecas de soporte de SSL."
 
-#: plugins/statenotify.c:42
-#, c-format
-msgid "%s has gone away."
-msgstr "%s se ha marchado."
-
-#: plugins/statenotify.c:49
+#: ../plugins/statenotify.c:49 plugins/statenotify.c:49
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s ya no está ausente."
 
-#: plugins/statenotify.c:56
+#: ../plugins/statenotify.c:51 plugins/statenotify.c:51
+#, c-format
+msgid "%s has gone away."
+msgstr "%s se ha marchado."
+
+#: ../plugins/statenotify.c:61 plugins/statenotify.c:61
 #, c-format
 msgid "%s has become idle."
 msgstr "%s está ahora inactivo."
 
-#: plugins/statenotify.c:63
+#: ../plugins/statenotify.c:63 plugins/statenotify.c:63
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s ya no está inactivo."
 
-#: plugins/statenotify.c:74
+#: ../plugins/statenotify.c:72 plugins/statenotify.c:72
+#, c-format
+msgid "%s has signed on."
+msgstr "%s se ha conectado."
+
+#: ../plugins/statenotify.c:79 plugins/statenotify.c:79
+#, c-format
+msgid "%s has signed off."
+msgstr "%s se ha desconectado."
+
+#: ../plugins/statenotify.c:90 plugins/statenotify.c:90
 msgid "Notify When"
 msgstr "Notificar cuando"
 
-#: plugins/statenotify.c:77
+#: ../plugins/statenotify.c:93 plugins/statenotify.c:93
 msgid "Buddy Goes _Away"
 msgstr "El amigo se _ausenta"
 
-#: plugins/statenotify.c:80
+#: ../plugins/statenotify.c:96 plugins/statenotify.c:96
 msgid "Buddy Goes _Idle"
 msgstr "El amigo está _inactivo"
 
+#: plugins/statenotify.c:99
+msgid "Buddy _Signs On/Off"
+msgstr "Un amigo se conecta/desconecta"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/statenotify.c:120
+#: ../plugins/statenotify.c:141 plugins/statenotify.c:139
 msgid "Buddy State Notification"
 msgstr "Notificación de estado de amigos"
 
@@ -1135,7 +1730,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/statenotify.c:123 plugins/statenotify.c:126
+#: ../plugins/statenotify.c:144 ../plugins/statenotify.c:147
+#: plugins/statenotify.c:142 plugins/statenotify.c:145
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -1143,11 +1739,12 @@
 "Notifica en una ventana de conversación cuando un amigo se ausenta o vuelve "
 "o está inactivo."
 
-#: plugins/tcl/tcl.c:363
+#: ../plugins/tcl/tcl.c:369 plugins/tcl/tcl.c:363
 msgid "Tcl Plugin Loader"
 msgstr "Cargador de complementos Tcl"
 
-#: plugins/tcl/tcl.c:365 plugins/tcl/tcl.c:366
+#: ../plugins/tcl/tcl.c:371 ../plugins/tcl/tcl.c:372 plugins/tcl/tcl.c:365
+#: plugins/tcl/tcl.c:366
 msgid "Provides support for loading Tcl plugins"
 msgstr "Provee soporte para cargar complementos Tcl"
 
@@ -1157,7 +1754,8 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ticker/ticker.c:75 plugins/ticker/ticker.c:326
+#: ../plugins/ticker/ticker.c:77 ../plugins/ticker/ticker.c:355
+#: plugins/ticker/ticker.c:75 plugins/ticker/ticker.c:324
 msgid "Buddy Ticker"
 msgstr "Deslizante de amigos"
 
@@ -1165,19 +1763,20 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ticker/ticker.c:329 plugins/ticker/ticker.c:331
+#: ../plugins/ticker/ticker.c:358 ../plugins/ticker/ticker.c:360
+#: plugins/ticker/ticker.c:327 plugins/ticker/ticker.c:329
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Una versión horizontal deslizante de la lista de amigos."
 
-#: plugins/timestamp.c:202
+#: ../plugins/timestamp.c:188 plugins/timestamp.c:198
 msgid "iChat Timestamp"
 msgstr "Sello temporal al estilo iChat"
 
-#: plugins/timestamp.c:209
+#: ../plugins/timestamp.c:195 plugins/timestamp.c:205
 msgid "Delay"
 msgstr "Retardo"
 
-#: plugins/timestamp.c:216
+#: ../plugins/timestamp.c:202 plugins/timestamp.c:212
 msgid "minutes."
 msgstr "minutos."
 
@@ -1187,7 +1786,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:279
+#: ../plugins/timestamp.c:264 plugins/timestamp.c:275
 msgid "Timestamp"
 msgstr "Marca temporal"
 
@@ -1195,12 +1794,68 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/timestamp.c:282 plugins/timestamp.c:284
+#: ../plugins/timestamp.c:267 ../plugins/timestamp.c:269
+#: plugins/timestamp.c:278 plugins/timestamp.c:280
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr ""
 "Añade una marca de tiempo al estilo iChat en las conversaciones cada N "
 "minutos."
 
+#: ../plugins/timestamp_format.c:22
+msgid "Timestamp Format Options"
+msgstr "Opciones de formato de marca de tiempo"
+
+#: ../plugins/timestamp_format.c:27
+msgid "_Force (traditional Gaim) 24-hour time format"
+msgstr "_Forzar formato de tiempo de 24 horas (tradicional Gaim)"
+
+#: ../plugins/timestamp_format.c:30
+msgid "Show dates in..."
+msgstr "Mostrar las fechas en..."
+
+#: ../plugins/timestamp_format.c:35
+msgid "Co_nversations:"
+msgstr "Co_nversaciones:"
+
+#: ../plugins/timestamp_format.c:37 ../plugins/timestamp_format.c:46
+msgid "For delayed messages"
+msgstr "Para mensajes diferidos"
+
+#: ../plugins/timestamp_format.c:38 ../plugins/timestamp_format.c:47
+msgid "For delayed messages and in chats"
+msgstr "Para mensajes diferidos y para chats"
+
+#: ../plugins/timestamp_format.c:44
+msgid "_Message Logs:"
+msgstr "Registro de _mensajes:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../plugins/timestamp_format.c:150
+msgid "Message Timestamp Formats"
+msgstr "Formatos de marca de tiempo de mensajes"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../plugins/timestamp_format.c:153
+msgid "Customizes the message timestamp formats."
+msgstr "Configura el formato de la marca de tiempo de mensajes."
+
+#. *  description
+#: ../plugins/timestamp_format.c:155
+msgid ""
+"This plugin allows the user to customize conversation and logging message "
+"timestamp formats."
+msgstr "Este complemento permite al usuario configurar los formatos de marca de tiempo para los mensajes en conversaciones y guardados en el registro."
+
+#: ../plugins/win32/transparency/win2ktrans.c:183
+#: ../plugins/win32/transparency/win2ktrans.c:569
+#: ../plugins/win32/transparency/win2ktrans.c:616
 #: plugins/win32/transparency/win2ktrans.c:183
 #: plugins/win32/transparency/win2ktrans.c:569
 #: plugins/win32/transparency/win2ktrans.c:616
@@ -1208,39 +1863,48 @@
 msgstr "Opacidad:"
 
 #. IM Convo trans options
+#: ../plugins/win32/transparency/win2ktrans.c:533
 #: plugins/win32/transparency/win2ktrans.c:533
 msgid "IM Conversation Windows"
 msgstr "Ventanas de conversación de MI"
 
+#: ../plugins/win32/transparency/win2ktrans.c:534
 #: plugins/win32/transparency/win2ktrans.c:534
 msgid "_IM window transparency"
 msgstr "Transparencia de las ventanas de M_I"
 
+#: ../plugins/win32/transparency/win2ktrans.c:548
 #: plugins/win32/transparency/win2ktrans.c:548
 msgid "_Show slider bar in IM window"
 msgstr "_Mostrar barra deslizante en la ventana MI"
 
+#: ../plugins/win32/transparency/win2ktrans.c:555
 #: plugins/win32/transparency/win2ktrans.c:555
 msgid "Remove IM window transparency on focus"
-msgstr "Eliminar la transparencia de las ventanas cuando se enfocan"
-
+msgstr "Eliminar la transparencia de las ventanas MI al enfocar"
+
+#: ../plugins/win32/transparency/win2ktrans.c:558
+#: ../plugins/win32/transparency/win2ktrans.c:606
 #: plugins/win32/transparency/win2ktrans.c:558
 #: plugins/win32/transparency/win2ktrans.c:606
 msgid "Always on top"
 msgstr "Siempre en primer plano"
 
 #. Buddy List trans options
+#: ../plugins/win32/transparency/win2ktrans.c:590
 #: plugins/win32/transparency/win2ktrans.c:590
 msgid "Buddy List Window"
 msgstr "Ventana de la lista de amigos"
 
+#: ../plugins/win32/transparency/win2ktrans.c:591
 #: plugins/win32/transparency/win2ktrans.c:591
 msgid "_Buddy List window transparency"
 msgstr "Transparencia de la ventana de lista de _amigos"
 
+#: ../plugins/win32/transparency/win2ktrans.c:604
 #: plugins/win32/transparency/win2ktrans.c:604
 msgid "Remove Buddy List window transparency on focus"
-msgstr "Eliminar la transparencia de la ventana de lista de amigos cuando se enfoque"
+msgstr "Eliminar la transparencia de la ventana de lista de amigos cuando se enfoca"
 
 #. *< type
 #. *< ui_requirement
@@ -1248,6 +1912,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
+#: ../plugins/win32/transparency/win2ktrans.c:657
 #: plugins/win32/transparency/win2ktrans.c:657
 msgid "Transparency"
 msgstr "Transparencia"
@@ -1255,11 +1920,13 @@
 #. *< name
 #. *< version
 #. *  summary
+#: ../plugins/win32/transparency/win2ktrans.c:660
 #: plugins/win32/transparency/win2ktrans.c:660
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Transparencia variable para la lista de amigos y las conversaciones."
 
 #. *  description
+#: ../plugins/win32/transparency/win2ktrans.c:662
 #: plugins/win32/transparency/win2ktrans.c:662
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
@@ -1271,288 +1938,357 @@
 "\n"
 "* Nota: Este complemento requiere Win2000 o superior."
 
+#: ../plugins/win32/winprefs/winprefs.c:384
 #: plugins/win32/winprefs/winprefs.c:385
 msgid "GTK+ Runtime Version"
 msgstr "Versión en ejecución de GTK+"
 
 #. Autostart
+#: ../plugins/win32/winprefs/winprefs.c:392
 #: plugins/win32/winprefs/winprefs.c:393
 msgid "Startup"
 msgstr "Inicio"
 
+#: ../plugins/win32/winprefs/winprefs.c:393
 #: plugins/win32/winprefs/winprefs.c:394
 msgid "_Start Gaim on Windows startup"
 msgstr "_Iniciar Gaim al iniciar Windows"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:405 src/gtkblist.c:3173
+#: ../plugins/win32/winprefs/winprefs.c:404 ../src/gtkblist.c:3608
+#: plugins/win32/winprefs/winprefs.c:405 src/gtkblist.c:3498
 msgid "Buddy List"
 msgstr "Lista de amigos"
 
 # Usar empotrable? (jfs)
+#: ../plugins/win32/winprefs/winprefs.c:405
 #: plugins/win32/winprefs/winprefs.c:406
 msgid "_Dockable Buddy List"
 msgstr "Lista de amigos a_pilable "
 
 #. Blist On Top
+#: ../plugins/win32/winprefs/winprefs.c:409
 #: plugins/win32/winprefs/winprefs.c:410
 msgid "_Keep Buddy List window on top:"
-msgstr "_Mantener la ventana de amigos por encima del resto"
-
-#: plugins/win32/winprefs/winprefs.c:412 src/gtkprefs.c:1657
-msgid "Never"
-msgstr "Nunca"
-
-#: plugins/win32/winprefs/winprefs.c:413
-msgid "Always"
-msgstr "Siempre"
+msgstr "_Mantener la ventana de lista de amigos por encima del resto"
 
 #. XXX: Did this ever work?
+#: ../plugins/win32/winprefs/winprefs.c:414
 #: plugins/win32/winprefs/winprefs.c:415
 msgid "Only when docked"
-msgstr "Sólo cuando esté apilada"
+msgstr "Solamente cuando se apile"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:419 src/gtkprefs.c:803
-#: src/gtkprefs.c:1727
+#: ../plugins/win32/winprefs/winprefs.c:418 ../src/gtkprefs.c:819
+#: ../src/gtkprefs.c:1864 plugins/win32/winprefs/winprefs.c:419
+#: src/gtkprefs.c:812 src/gtkprefs.c:1743
 msgid "Conversations"
 msgstr "Conversaciones"
 
+#: ../plugins/win32/winprefs/winprefs.c:419
 #: plugins/win32/winprefs/winprefs.c:420
 msgid "_Flash window when messages are received"
 msgstr "_Destello de ventana cuando se reciben mensajes"
 
+#: ../plugins/win32/winprefs/winprefs.c:442
 #: plugins/win32/winprefs/winprefs.c:443
 msgid "WinGaim Options"
 msgstr "Opciones de WinGaim"
 
+#: ../plugins/win32/winprefs/winprefs.c:444
 #: plugins/win32/winprefs/winprefs.c:445
 msgid "Options specific to Windows Gaim."
 msgstr "Opciones específicas de Gaim para Windows."
 
+#: ../plugins/win32/winprefs/winprefs.c:445
 #: plugins/win32/winprefs/winprefs.c:446
 msgid ""
 "Provides options specific to Windows Gaim, such as buddy list docking and "
 "conversation flashing."
 msgstr "Contiene las opciones específicas al Gaim de Windows como el apilado de la lista de amigos o el parpadeo de conversaciones."
 
-#: src/account.c:773
+#: ../src/account.c:773 src/account.c:773
 msgid "accounts"
 msgstr "cuentas"
 
-#: src/account.c:915
+#: ../src/account.c:923 src/account.c:923
 msgid "Password is required to sign on."
 msgstr "Para conectarse se necesita una contraseña."
 
-#: src/account.c:940
+#: ../src/account.c:948 src/account.c:948
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Introduzca la contraseña para %s (%s)"
 
-#: src/account.c:947
+#: ../src/account.c:955 src/account.c:955
 msgid "Enter Password"
 msgstr "Introduzca la contraseña"
 
-#: src/account.c:952
+#: ../src/account.c:960 src/account.c:960
 msgid "Save password"
 msgstr "Guardar la contraseña"
 
+#. #-#-#-#-#  gaim-contributed-2006-01-04.es.po (Gaim)  #-#-#-#-#
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:960 src/account.c:1116 src/gtkdialogs.c:507
-#: src/gtkdialogs.c:648 src/gtkdialogs.c:704 src/gtkrequest.c:261
-#: src/protocols/gg/gg.c:434 src/protocols/gg/gg.c:581
-#: src/protocols/gg/gg.c:1498 src/protocols/jabber/jabber.c:1162
+#: ../src/account.c:968 ../src/account.c:1139 ../src/gtkdialogs.c:571
+#: ../src/gtkdialogs.c:708 ../src/gtkdialogs.c:776 ../src/gtkrequest.c:287
+#: ../src/protocols/gg/gg.c:454 ../src/protocols/gg/gg.c:595
+#: ../src/protocols/gg/gg.c:731 ../src/protocols/jabber/jabber.c:1321
+#: ../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:2999
+#: ../src/protocols/oscar/oscar.c:4542 ../src/protocols/oscar/oscar.c:4623
+#: ../src/protocols/oscar/oscar.c:8051 ../src/protocols/oscar/oscar.c:8174
+#: ../src/protocols/oscar/oscar.c:8199 ../src/protocols/oscar/oscar.c:8251
+#: ../src/protocols/silc/buddy.c:466 ../src/protocols/silc/buddy.c:1182
+#: ../src/protocols/silc/chat.c:423 ../src/protocols/silc/chat.c:461
+#: ../src/protocols/silc/chat.c:724 ../src/protocols/silc/ops.c:1297
+#: ../src/protocols/silc/ops.c:1910 ../src/protocols/silc/silc.c:749
+#: ../src/protocols/yahoo/yahoo.c:3061 ../src/protocols/yahoo/yahoo.c:3070
+#: src/account.c:968 src/account.c:1139 src/gtkdialogs.c:545
+#: src/gtkdialogs.c:682 src/gtkdialogs.c:750 src/gtkrequest.c:287
+#: src/protocols/gg/gg.c:463 src/protocols/gg/gg.c:604
+#: src/protocols/gg/gg.c:740 src/protocols/jabber/jabber.c:1217
 #: 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:2894
-#: src/protocols/oscar/oscar.c:4404 src/protocols/oscar/oscar.c:4485
-#: src/protocols/oscar/oscar.c:7857 src/protocols/oscar/oscar.c:7982
-#: src/protocols/oscar/oscar.c:8007 src/protocols/oscar/oscar.c:8059
-#: src/protocols/sametime/sametime.c:4585 src/protocols/silc/buddy.c:465
-#: src/protocols/silc/buddy.c:1137 src/protocols/silc/chat.c:422
-#: src/protocols/silc/chat.c:460 src/protocols/silc/chat.c:723
-#: src/protocols/silc/ops.c:1083 src/protocols/silc/ops.c:1696
-#: src/protocols/silc/silc.c:716 src/protocols/yahoo/yahoo.c:2965
-#: src/protocols/yahoo/yahoo.c:2974 src/request.h:1331
+#: src/protocols/msn/msn.c:295 src/protocols/oscar/oscar.c:2890
+#: src/protocols/oscar/oscar.c:4392 src/protocols/oscar/oscar.c:4473
+#: src/protocols/oscar/oscar.c:7927 src/protocols/oscar/oscar.c:8052
+#: src/protocols/oscar/oscar.c:8077 src/protocols/oscar/oscar.c:8129
+#: src/protocols/silc/buddy.c:466 src/protocols/silc/buddy.c:1147
+#: src/protocols/silc/chat.c:423 src/protocols/silc/chat.c:461
+#: src/protocols/silc/chat.c:724 src/protocols/silc/ops.c:1297
+#: src/protocols/silc/ops.c:1910 src/protocols/silc/silc.c:739
+#: src/protocols/yahoo/yahoo.c:2987 src/protocols/yahoo/yahoo.c:2996
+#: src/request.h:1340
 msgid "OK"
 msgstr "Aceptar"
 
-#: src/account.c:961 src/account.c:1117 src/account.c:1155
-#: src/gtkaccount.c:2124 src/gtkaccount.c:2575 src/gtkblist.c:4497
-#: src/gtkdialogs.c:508 src/gtkdialogs.c:649 src/gtkdialogs.c:705
-#: src/gtkdialogs.c:724 src/gtkdialogs.c:746 src/gtkdialogs.c:766
-#: src/gtkdialogs.c:810 src/gtkdialogs.c:872 src/gtkdialogs.c:914
-#: src/gtkdialogs.c:956 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:595
-#: src/gtkprivacy.c:608 src/gtkprivacy.c:633 src/gtkprivacy.c:644
-#: src/gtkrequest.c:262 src/gtksavedstatuses.c:221 src/protocols/gg/gg.c:435
-#: src/protocols/gg/gg.c:582 src/protocols/gg/gg.c:656
-#: src/protocols/gg/gg.c:1499 src/protocols/jabber/buddy.c:573
+#: ../src/account.c:969 ../src/account.c:1140 ../src/account.c:1177
+#: ../src/gtkaccount.c:2171 ../src/gtkaccount.c:2638 ../src/gtkblist.c:4960
+#: ../src/gtkdialogs.c:572 ../src/gtkdialogs.c:709 ../src/gtkdialogs.c:777
+#: ../src/gtkdialogs.c:796 ../src/gtkdialogs.c:818 ../src/gtkdialogs.c:838
+#: ../src/gtkdialogs.c:882 ../src/gtkdialogs.c:937 ../src/gtkdialogs.c:974
+#: ../src/gtkdialogs.c:999 ../src/gtkimhtmltoolbar.c:419
+#: ../src/gtkplugin.c:297 ../src/gtkpounce.c:1093 ../src/gtkprivacy.c:568
+#: ../src/gtkprivacy.c:581 ../src/gtkprivacy.c:606 ../src/gtkprivacy.c:617
+#: ../src/gtkrequest.c:288 ../src/gtksavedstatuses.c:296
+#: ../src/protocols/gg/gg.c:455 ../src/protocols/gg/gg.c:596
+#: ../src/protocols/gg/gg.c:732 ../src/protocols/gg/gg.c:812
+#: ../src/protocols/jabber/buddy.c:573 ../src/protocols/jabber/buddy.c:1412
+#: ../src/protocols/jabber/buddy.c:1446 ../src/protocols/jabber/chat.c:780
+#: ../src/protocols/jabber/jabber.c:823 ../src/protocols/jabber/jabber.c:1322
+#: ../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:1641 ../src/protocols/oscar/oscar.c:3000
+#: ../src/protocols/oscar/oscar.c:4500 ../src/protocols/oscar/oscar.c:4543
+#: ../src/protocols/oscar/oscar.c:4580 ../src/protocols/oscar/oscar.c:4624
+#: ../src/protocols/oscar/oscar.c:8052 ../src/protocols/oscar/oscar.c:8175
+#: ../src/protocols/oscar/oscar.c:8200 ../src/protocols/oscar/oscar.c:8252
+#: ../src/protocols/oscar/oscar.c:8321
+#: ../src/protocols/sametime/sametime.c:3376
+#: ../src/protocols/sametime/sametime.c:3461
+#: ../src/protocols/sametime/sametime.c:3631
+#: ../src/protocols/sametime/sametime.c:5321
+#: ../src/protocols/sametime/sametime.c:5410
+#: ../src/protocols/sametime/sametime.c:5534 ../src/protocols/silc/buddy.c:467
+#: ../src/protocols/silc/buddy.c:1078 ../src/protocols/silc/buddy.c:1183
+#: ../src/protocols/silc/chat.c:596 ../src/protocols/silc/chat.c:725
+#: ../src/protocols/silc/ops.c:1911 ../src/protocols/silc/silc.c:750
+#: ../src/protocols/silc/silc.c:955 ../src/protocols/yahoo/yahoo.c:3062
+#: ../src/protocols/yahoo/yahoo.c:3071 src/account.c:969 src/account.c:1140
+#: src/account.c:1178 src/gtkaccount.c:2156 src/gtkaccount.c:2627
+#: src/gtkblist.c:4874 src/gtkdialogs.c:546 src/gtkdialogs.c:683
+#: src/gtkdialogs.c:751 src/gtkdialogs.c:770 src/gtkdialogs.c:792
+#: src/gtkdialogs.c:812 src/gtkdialogs.c:856 src/gtkdialogs.c:918
+#: src/gtkdialogs.c:960 src/gtkdialogs.c:1002 src/gtkimhtmltoolbar.c:419
+#: src/gtkpounce.c:1000 src/gtkprivacy.c:595 src/gtkprivacy.c:608
+#: src/gtkprivacy.c:633 src/gtkprivacy.c:644 src/gtkrequest.c:288
+#: src/gtksavedstatuses.c:298 src/protocols/gg/gg.c:464
+#: src/protocols/gg/gg.c:605 src/protocols/gg/gg.c:741
+#: src/protocols/gg/gg.c:830 src/protocols/jabber/buddy.c:573
 #: src/protocols/jabber/buddy.c:1358 src/protocols/jabber/buddy.c:1392
-#: src/protocols/jabber/chat.c:780 src/protocols/jabber/jabber.c:707
-#: src/protocols/jabber/jabber.c:1163 src/protocols/jabber/xdata.c:338
+#: src/protocols/jabber/chat.c:780 src/protocols/jabber/jabber.c:755
+#: src/protocols/jabber/jabber.c:1218 src/protocols/jabber/xdata.c:338
 #: src/protocols/msn/msn.c:251 src/protocols/msn/msn.c:266
 #: src/protocols/msn/msn.c:281 src/protocols/msn/msn.c:296
-#: src/protocols/msn/msn.c:313 src/protocols/oscar/oscar.c:1596
-#: src/protocols/oscar/oscar.c:2895 src/protocols/oscar/oscar.c:4362
-#: src/protocols/oscar/oscar.c:4405 src/protocols/oscar/oscar.c:4442
-#: src/protocols/oscar/oscar.c:4486 src/protocols/oscar/oscar.c:7858
-#: src/protocols/oscar/oscar.c:7983 src/protocols/oscar/oscar.c:8008
-#: src/protocols/oscar/oscar.c:8060 src/protocols/oscar/oscar.c:8129
-#: src/protocols/sametime/sametime.c:4586 src/protocols/silc/buddy.c:466
-#: src/protocols/silc/buddy.c:1042 src/protocols/silc/buddy.c:1138
-#: src/protocols/silc/chat.c:595 src/protocols/silc/chat.c:724
-#: src/protocols/silc/ops.c:1697 src/protocols/silc/silc.c:717
-#: src/protocols/yahoo/yahoo.c:2966 src/protocols/yahoo/yahoo.c:2975
-#: src/request.h:1331 src/request.h:1341
+#: src/protocols/msn/msn.c:313 src/protocols/oscar/oscar.c:1584
+#: src/protocols/oscar/oscar.c:2891 src/protocols/oscar/oscar.c:4350
+#: src/protocols/oscar/oscar.c:4393 src/protocols/oscar/oscar.c:4430
+#: src/protocols/oscar/oscar.c:4474 src/protocols/oscar/oscar.c:7928
+#: src/protocols/oscar/oscar.c:8053 src/protocols/oscar/oscar.c:8078
+#: src/protocols/oscar/oscar.c:8130 src/protocols/oscar/oscar.c:8199
+#: src/protocols/sametime/sametime.c:3338
+#: src/protocols/sametime/sametime.c:3421
+#: src/protocols/sametime/sametime.c:3548
+#: src/protocols/sametime/sametime.c:4392
+#: src/protocols/sametime/sametime.c:5394
+#: src/protocols/sametime/sametime.c:5480 src/protocols/silc/buddy.c:467
+#: src/protocols/silc/buddy.c:1043 src/protocols/silc/buddy.c:1148
+#: src/protocols/silc/chat.c:596 src/protocols/silc/chat.c:725
+#: src/protocols/silc/ops.c:1911 src/protocols/silc/silc.c:740
+#: src/protocols/silc/silc.c:945 src/protocols/yahoo/yahoo.c:2988
+#: src/protocols/yahoo/yahoo.c:2997 src/request.h:1340 src/request.h:1350
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/account.c:986 src/connection.c:96
+#: ../src/account.c:994 ../src/connection.c:96 src/account.c:994
+#: src/connection.c:96
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Falta el complemento de protocolo para %s"
 
-#: src/account.c:988 src/connection.c:99
+#: ../src/account.c:996 ../src/connection.c:99 ../src/gtkblist.c:3496
+#: src/account.c:996 src/connection.c:99
 msgid "Connection Error"
 msgstr "Error de conexión"
 
-#: src/account.c:1052 src/protocols/gg/gg.c:470
-#: src/protocols/jabber/jabber.c:1115
+#: ../src/account.c:1076 ../src/protocols/gg/gg.c:636
+#: ../src/protocols/jabber/jabber.c:1274 src/account.c:1076
+#: src/protocols/gg/gg.c:645 src/protocols/jabber/jabber.c:1170
 msgid "New passwords do not match."
 msgstr "Las nuevas contraseñas no coinciden."
 
-#: src/account.c:1061
+#: ../src/account.c:1085 src/account.c:1085
 msgid "Fill out all fields completely."
 msgstr "Rellene todos los campos completamente."
 
-#: src/account.c:1085
+#: ../src/account.c:1108 src/account.c:1108
 msgid "Original password"
 msgstr "Contraseña original"
 
-#: src/account.c:1092
+#: ../src/account.c:1115 src/account.c:1115
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: src/account.c:1099
+#: ../src/account.c:1122 src/account.c:1122
 msgid "New password (again)"
 msgstr "Nueva contraseña (otra vez)"
 
-#: src/account.c:1105
+#: ../src/account.c:1128 src/account.c:1128
 #, c-format
 msgid "Change password for %s"
 msgstr "Cambiar la contraseña de %s"
 
-#: src/account.c:1113
+#: ../src/account.c:1136 src/account.c:1136
 msgid "Please enter your current password and your new password."
 msgstr "Introduzca su contraseña actual y la contraseña nueva."
 
-#: src/account.c:1146
+#: ../src/account.c:1169 src/account.c:1169
 #, c-format
 msgid "Change user information for %s"
 msgstr "Cambiar la información del usuario %s"
 
-#: src/account.c:1154 src/gtkdebug.c:684 src/gtkrequest.c:268
-#: src/protocols/jabber/buddy.c:572
+#: ../src/account.c:1176 ../src/gtkdebug.c:684 ../src/gtkrequest.c:294
+#: ../src/protocols/jabber/buddy.c:572 src/account.c:1177 src/gtkdebug.c:684
+#: src/gtkrequest.c:294 src/protocols/jabber/buddy.c:572
 msgid "Save"
 msgstr "Guardar"
 
-#: src/account.c:1641 src/gtkft.c:156 src/protocols/jabber/buddy.c:633
+#: ../src/account.c:1671 ../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:1672 src/gtkft.c:157 src/protocols/jabber/buddy.c:633
 #: src/protocols/jabber/buddy.c:1083 src/protocols/jabber/buddy.c:1100
-#: src/protocols/novell/novell.c:2837
+#: src/protocols/novell/novell.c:2861
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: src/blist.c:545
+#: ../src/blist.c:543 src/blist.c:545
 msgid "buddy list"
 msgstr "lista de amigos"
 
-#: src/blist.c:1162
+#: ../src/blist.c:1173 src/blist.c:1178
 msgid "Chats"
 msgstr "Chats"
 
-#: src/blist.c:1863
-#, c-format
-msgid ""
-"%d buddy from group %s was not removed because its account was not logged "
-"in.  This buddy and the group were not removed.\n"
+#: ../src/blist.c:1886
+#, c-format
+msgid ""
+"%d buddy from group %s was not removed because it belongs to an account "
+"which is disabled or offline.  This buddy and the group were not removed.\n"
 msgid_plural ""
-"%d buddies from group %s were not removed because their accounts were not "
-"logged in.  These buddies and the group were not removed.\n"
-msgstr[0] ""
-"%d amigo del grupo %s no se ha eliminado porque su cuenta no estaba "
-"conectada. Este amigo y sus grupos no han sido eliminados.\n"
-msgstr[1] ""
-"%d amigos del grupo %s no se han eliminado porque no sus cuentas estaban "
-"conectadas. Esos amigos y sus grupos no han sido eliminados.\n"
-
-#: src/blist.c:1872
+"%d buddies from group %s were not removed because they belong to accounts "
+"which are currently disabled or offline.  These buddies and the group were "
+"not removed.\n"
+msgstr[0] "No se ha eliminado %d amigo del grupo %s porque pertenece a una cuenta que está desconectada o deshabilitada. No se han eliminado ni el amigo ni el grupo\n"
+msgstr[1] "No se han eliminado %d amigos del grupo %s porque pertenece a una cuenta que está desconectada o deshabilitada. No se han eliminado los amigos ni el grupo.\n"
+
+#: ../src/blist.c:1896 src/blist.c:1890
 msgid "Group not removed"
 msgstr "Grupo no eliminado"
 
-#: src/connection.c:98
+#: ../src/connection.c:98 src/connection.c:98
 msgid "Registration Error"
 msgstr "Error de registro"
 
-#: src/conversation.c:205
+#: src/connection.c:280
+#, c-format
+msgid "+++ %s signed on"
+msgstr "+++ %s se ha conectado"
+
+#: src/connection.c:322
+#, c-format
+msgid "+++ %s signed off"
+msgstr "+++ %s se ha desconectado"
+
+#: ../src/conversation.c:163 src/conversation.c:196
 msgid "Unable to send message: The message is too large."
 msgstr "No se pudo enviar el mensaje: es demasiado grande."
 
-#: src/conversation.c:208 src/conversation.c:221
+#: ../src/conversation.c:166 ../src/conversation.c:179 src/conversation.c:199
+#: src/conversation.c:212
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "No se pudo enviar el mensaje a %s."
 
-#: src/conversation.c:209
+#: ../src/conversation.c:167 src/conversation.c:200
 msgid "The message is too large."
 msgstr "El mensaje es demasiado largo"
 
-#: src/conversation.c:218
+#: ../src/conversation.c:176 src/conversation.c:209
 msgid "Unable to send message."
 msgstr "No se pudo enviar el mensaje."
 
-#: src/conversation.c:1497
+#: ../src/conversation.c:1517 src/conversation.c:1503
 #, c-format
 msgid "%s entered the room."
 msgstr "%s ha entrado en la sala."
 
-#: src/conversation.c:1499
+#: ../src/conversation.c:1520 src/conversation.c:1505
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] ha entrado en la sala."
 
-#: src/conversation.c:1598
+#: ../src/conversation.c:1627 src/conversation.c:1608
 #, c-format
 msgid "You are now known as %s"
 msgstr "Vd. ahora se llama %s"
 
-#: src/conversation.c:1613
+#: ../src/conversation.c:1647 src/conversation.c:1623
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ahora se llama %s"
 
-#: src/conversation.c:1669
+#: ../src/conversation.c:1720 src/conversation.c:1681
+#, c-format
+msgid "%s left the room."
+msgstr "%s ha salido de la sala."
+
+#: ../src/conversation.c:1723 src/conversation.c:1679
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s ha salido de la sala (%s)."
 
-#: src/conversation.c:1671
-#, c-format
-msgid "%s left the room."
-msgstr "%s ha salido de la sala."
-
-#: src/conversation.c:1748
-#, c-format
-msgid "(+%d more)"
-msgstr "(+%d más)"
-
-#: src/conversation.c:1750
-#, c-format
-msgid " left the room (%s)."
-msgstr " salió de la sala (%s)."
-
-#: src/ft.c:188 src/protocols/msn/msn.c:412
+#: src/desktopitem.c:286 src/desktopitem.c:875
+msgid "No name"
+msgstr "Sin nombre"
+
+#: ../src/ft.c:189 ../src/protocols/msn/msn.c:412 src/ft.c:189
+#: src/protocols/msn/msn.c:412
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1561,7 +2297,7 @@
 "Error al leer %s: \n"
 "%s.\n"
 
-#: src/ft.c:192
+#: ../src/ft.c:193 src/ft.c:193
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -1570,7 +2306,7 @@
 "Error al escribir %s: \n"
 "%s.\n"
 
-#: src/ft.c:196
+#: ../src/ft.c:197 src/ft.c:197
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -1579,35 +2315,35 @@
 "Error al acceder a %s: \n"
 "%s.\n"
 
-#: src/ft.c:229
+#: ../src/ft.c:230 src/ft.c:230
 msgid "Cannot send a file of 0 bytes."
 msgstr "No se puede enviar un archivo de 0 bytes."
 
-#: src/ft.c:239
+#: ../src/ft.c:240 src/ft.c:240
 msgid "Cannot send a directory."
 msgstr "No se puede enviar un directorio."
 
-#: src/ft.c:248
+#: ../src/ft.c:249 src/ft.c:249
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s no es un archivo normal. No se sobreescribirá.\n"
 
-#: src/ft.c:306
+#: ../src/ft.c:307 src/ft.c:307
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s quiere enviarle %s (%s)"
 
-#: src/ft.c:313
+#: ../src/ft.c:314 src/ft.c:314
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s quiere enviarle un fichero"
 
-#: src/ft.c:354
+#: ../src/ft.c:355 src/ft.c:355
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "¿Aceptar solicitud de transferencia de archivo de %s?"
 
-#: src/ft.c:358
+#: ../src/ft.c:359 src/ft.c:359
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1618,65 +2354,65 @@
 "Servidor remoto: %s\n"
 "Puerto remoto: %d"
 
-#: src/ft.c:382
+#: ../src/ft.c:391 src/ft.c:383
 #, c-format
 msgid "%s is offering to send file %s"
-msgstr "%s se ofrece enviar el fichero %s"
-
-#: src/ft.c:422
+msgstr "%s se ofrece a enviarle el archivo %s"
+
+#: ../src/ft.c:442 src/ft.c:427
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s no es un nombre de archivo válido.\n"
 
-#: src/ft.c:443
+#: ../src/ft.c:463 src/ft.c:448
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Se ofrece enviar %s a %s"
 
-#: src/ft.c:454
+#: ../src/ft.c:474 src/ft.c:459
 #, c-format
 msgid "Starting transfer of %s from %s"
-msgstr "Empezando la transferencia de %s de %s"
-
-#: src/ft.c:608
+msgstr "Comienza la transferencia de %s de %s"
+
+#: ../src/ft.c:628 src/ft.c:613
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Se ha completado la transferencia de %s"
 
-#: src/ft.c:611
+#: ../src/ft.c:631 src/ft.c:616
 msgid "File transfer complete"
 msgstr "Transferencia de archivos completa"
 
-#: src/ft.c:995
+#: ../src/ft.c:1022 src/ft.c:1000
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Vd. canceló la transferencia de %s"
 
-#: src/ft.c:1000
+#: ../src/ft.c:1027 src/ft.c:1005
 msgid "File transfer cancelled"
 msgstr "Transferencia de archivos cancelada"
 
-#: src/ft.c:1057
+#: ../src/ft.c:1084 src/ft.c:1062
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s canceló la transferencia de %s"
 
-#: src/ft.c:1062
+#: ../src/ft.c:1089 src/ft.c:1067
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s canceló la transferencia de archivos"
 
-#: src/ft.c:1119
+#: ../src/ft.c:1146 src/ft.c:1124
 #, c-format
 msgid "File transfer to %s failed."
-msgstr "Transferencia de archivo a %s abortada."
-
-#: src/ft.c:1121
+msgstr "Falló la transferencia del archivo a %s."
+
+#: ../src/ft.c:1148 src/ft.c:1126
 #, c-format
 msgid "File transfer from %s failed."
-msgstr "Transferencia de archivo de %s abortada."
-
-#: src/gtkaccount.c:362
+msgstr "Falló la transferencia del archivo de %s."
+
+#: ../src/gtkaccount.c:374 src/gtkaccount.c:357
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1688,390 +2424,402 @@
 "<b>Tamaño de imagen:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:730
+#: ../src/gtkaccount.c:762 src/gtkaccount.c:742
 msgid "Login Options"
 msgstr "Opciones de conexión"
 
-#: src/gtkaccount.c:747 src/gtkft.c:623
+#: ../src/gtkaccount.c:779 ../src/gtkft.c:640 src/gtkaccount.c:759
+#: src/gtkft.c:639
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: src/gtkaccount.c:752 src/gtkblist.c:4051
-msgid "Screen Name:"
-msgstr "Nombre de usuario:"
-
-#: src/gtkaccount.c:825
+#: ../src/gtkaccount.c:858 src/gtkaccount.c:841
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: src/gtkaccount.c:830 src/gtkblist.c:4065 src/gtkblist.c:4444
+#: ../src/gtkaccount.c:863 ../src/gtkblist.c:4538 ../src/gtkblist.c:4904
+#: src/gtkaccount.c:846 src/gtkblist.c:4436 src/gtkblist.c:4818
 msgid "Alias:"
 msgstr "Apodo:"
 
-#: src/gtkaccount.c:834
+#: ../src/gtkaccount.c:867 src/gtkaccount.c:850
 msgid "Remember password"
 msgstr "Recordar contraseña"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:879
+#: ../src/gtkaccount.c:919 src/gtkaccount.c:900
 msgid "User Options"
 msgstr "Opciones de usuario"
 
-#: src/gtkaccount.c:892
+#: ../src/gtkaccount.c:932 src/gtkaccount.c:913
 msgid "New mail notifications"
 msgstr "Notificaciones de correo nuevo"
 
-#: src/gtkaccount.c:901
+#: ../src/gtkaccount.c:941 src/gtkaccount.c:922
 msgid "Buddy icon:"
 msgstr "Icono de amigo:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:990
+#: ../src/gtkaccount.c:1032 src/gtkaccount.c:1013
 #, c-format
 msgid "%s Options"
 msgstr "Opciones de %s"
 
-#. Use Global Proxy Settings
-#: src/gtkaccount.c:1128 src/gtkaccount.c:1175
+#: ../src/gtkaccount.c:1233 src/gtkaccount.c:1214
 msgid "Use Global Proxy Settings"
 msgstr "Usar configuración global del proxy"
 
-#. No Proxy
-#: src/gtkaccount.c:1134 src/gtkaccount.c:1182
+#: ../src/gtkaccount.c:1239 src/gtkaccount.c:1220
 msgid "No Proxy"
 msgstr "Sin proxy"
 
-#. HTTP
-#: src/gtkaccount.c:1140 src/gtkaccount.c:1189
+#: ../src/gtkaccount.c:1245 src/gtkaccount.c:1226
 msgid "HTTP"
 msgstr "HTTP"
 
-#. SOCKS 4
-#: src/gtkaccount.c:1146 src/gtkaccount.c:1196
+#: ../src/gtkaccount.c:1251 src/gtkaccount.c:1232
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#. SOCKS 5
-#: src/gtkaccount.c:1152 src/gtkaccount.c:1203
+#: ../src/gtkaccount.c:1257 src/gtkaccount.c:1238
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#. Use Environmental Settings
-#: src/gtkaccount.c:1158 src/gtkaccount.c:1210 src/gtkprefs.c:1007
+#: ../src/gtkaccount.c:1263 ../src/gtkprefs.c:1043 src/gtkaccount.c:1244
+#: src/gtkprefs.c:1030
 msgid "Use Environmental Settings"
 msgstr "Usar configuración del entorno"
 
-#: src/gtkaccount.c:1249
+#: ../src/gtkaccount.c:1297 src/gtkaccount.c:1278
 msgid "you can see the butterflies mating"
 msgstr "puedes ver a las mariposas apareándose"
 
-#: src/gtkaccount.c:1253
+#: ../src/gtkaccount.c:1301 src/gtkaccount.c:1282
 msgid "If you look real closely"
 msgstr "Si miras de cerca"
 
-#: src/gtkaccount.c:1269
+#: ../src/gtkaccount.c:1317 src/gtkaccount.c:1298
 msgid "Proxy Options"
 msgstr "Opciones del proxy"
 
-#: src/gtkaccount.c:1287 src/gtkprefs.c:1001
+#: ../src/gtkaccount.c:1331 ../src/gtkprefs.c:1037 src/gtkaccount.c:1312
+#: src/gtkprefs.c:1024
 msgid "Proxy _type:"
 msgstr "_Tipo de proxy:"
 
-#: src/gtkaccount.c:1296 src/gtkprefs.c:1022
+#: ../src/gtkaccount.c:1340 ../src/gtkprefs.c:1058 src/gtkaccount.c:1321
+#: src/gtkprefs.c:1045
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: src/gtkaccount.c:1300 src/gtkprefs.c:1040
+#: ../src/gtkaccount.c:1344 ../src/gtkprefs.c:1076 src/gtkaccount.c:1325
+#: src/gtkprefs.c:1063
 msgid "_Port:"
 msgstr "_Puerto:"
 
-#: src/gtkaccount.c:1308
+#: ../src/gtkaccount.c:1352 src/gtkaccount.c:1333
 msgid "_Username:"
 msgstr "Nombre de _usuario:"
 
-#: src/gtkaccount.c:1313 src/gtkprefs.c:1077
+#: ../src/gtkaccount.c:1358 ../src/gtkprefs.c:1113 src/gtkaccount.c:1339
+#: src/gtkprefs.c:1100
 msgid "Pa_ssword:"
 msgstr "_Contraseña:"
 
-#: src/gtkaccount.c:1700
+#: ../src/gtkaccount.c:1736 src/gtkaccount.c:1717
 msgid "Add Account"
 msgstr "Añadir cuenta"
 
-#: src/gtkaccount.c:1702
+#: ../src/gtkaccount.c:1738 src/gtkaccount.c:1719
 msgid "Modify Account"
 msgstr "Modificar cuenta"
 
+#: src/gtkaccount.c:1741
+msgid "_Basic"
+msgstr "_Básica"
+
+#: src/gtkaccount.c:1752
+msgid "_Advanced"
+msgstr "_Avanzadas"
+
 #. Register button
-#: src/gtkaccount.c:1750 src/protocols/jabber/jabber.c:706
+#: ../src/gtkaccount.c:1786 ../src/protocols/jabber/jabber.c:822
+#: src/gtkaccount.c:1767 src/protocols/jabber/jabber.c:754
 msgid "Register"
 msgstr "Registrar"
 
-#: src/gtkaccount.c:2118 src/gtksavedstatuses.c:217
+#: ../src/gtkaccount.c:2165 ../src/gtksavedstatuses.c:293
+#: src/gtkaccount.c:2150 src/gtksavedstatuses.c:295
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "¿Seguro que quiere borrar a %s?"
 
-#: src/gtkaccount.c:2123 src/gtkrequest.c:265 src/gtksavedstatuses.c:220
+#: ../src/gtkaccount.c:2170 ../src/gtkpounce.c:1092 ../src/gtkrequest.c:291
+#: ../src/gtksavedstatuses.c:295 src/gtkaccount.c:2155 src/gtkpounce.c:999
+#: src/gtkrequest.c:291 src/gtksavedstatuses.c:297
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/gtkaccount.c:2187 src/gtksavedstatuses.c:686
-#: src/protocols/oscar/oscar.c:5049
+#: ../src/gtkaccount.c:2228 ../src/gtksavedstatuses.c:890
+#: ../src/protocols/oscar/oscar.c:5187 src/gtkaccount.c:2213
+#: src/gtksavedstatuses.c:873 src/protocols/oscar/oscar.c:5037
 msgid "Screen Name"
 msgstr "Nombre de usuario"
 
-#: src/gtkaccount.c:2210
-msgid "Enabled"
-msgstr "Activado"
-
-#: src/gtkaccount.c:2218
+#: ../src/gtkaccount.c:2259 src/gtkaccount.c:2244
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: src/gtkaccount.c:2550
-#, c-format
-msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
-msgstr "%s%s%s%s ha hecho amigo a %s %s%s%s"
-
-#: src/gtkaccount.c:2564
-msgid ""
-"\n"
-"\n"
-"Do you wish to add him or her to your buddy list?"
-msgstr ""
-"\n"
-"\n"
-"¿Desea añadirlo/a a su lista de amigos?"
-
-#: src/gtkaccount.c:2572
+#: src/gtkaccount.c:2575
+#, c-format
+msgid "%s%s%s%s has made %s his or her buddy%s%s"
+msgstr "%s%s%s%s ha hecho a %s su amigo o amiga%s%s"
+
+#: ../src/gtkaccount.c:2635 src/gtkaccount.c:2624
 msgid "Add buddy to your list?"
 msgstr "¿Desea añadir el amigo a su lista?"
 
-#: src/gtkaccount.c:2574 src/gtkblist.c:4496 src/gtkconv.c:1527
-#: src/gtkrequest.c:266 src/protocols/gg/gg.c:655
-#: src/protocols/oscar/oscar.c:4674 src/protocols/silc/chat.c:594
+#: ../src/gtkaccount.c:2637 ../src/gtkblist.c:4959 ../src/gtkconv.c:1616
+#: ../src/gtkrequest.c:292 ../src/protocols/gg/gg.c:811
+#: ../src/protocols/oscar/oscar.c:4812
+#: ../src/protocols/sametime/sametime.c:5409 ../src/protocols/silc/chat.c:595
+#: src/gtkaccount.c:2626 src/gtkblist.c:4873 src/gtkconv.c:1574
+#: src/gtkrequest.c:292 src/protocols/gg/gg.c:829
+#: src/protocols/oscar/oscar.c:4662 src/protocols/sametime/sametime.c:5479
+#: src/protocols/silc/chat.c:595
 msgid "Add"
 msgstr "Añadir"
 
-#: src/gtkblist.c:595
+#: ../src/gtkblist.c:678 src/gtkblist.c:662
 msgid "Join a Chat"
 msgstr "Unirse a un chat"
 
-#: src/gtkblist.c:616
+#: ../src/gtkblist.c:699 src/gtkblist.c:683
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Introduzca la información apropiada del chat al que desearía unirse.\n"
 
-#: src/gtkblist.c:627 src/gtkpounce.c:415 src/gtkroomlist.c:354
+#: ../src/gtkblist.c:710 ../src/gtkpounce.c:527 ../src/gtkroomlist.c:377
+#: src/gtkblist.c:694 src/gtkpounce.c:500 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "_Cuenta:"
 
-#: src/gtkblist.c:935
+#: ../src/gtkblist.c:954 src/gtkblist.c:1002
 msgid "Get _Info"
 msgstr "Obtener _información"
 
-#: src/gtkblist.c:938
+#: ../src/gtkblist.c:957 ../src/gtkstock.c:141 src/gtkblist.c:1005
 msgid "I_M"
 msgstr "_MI"
 
-#: src/gtkblist.c:944
+#: ../src/gtkblist.c:963 src/gtkblist.c:1011
 msgid "_Send File"
 msgstr "_Enviar archivo"
 
-#: src/gtkblist.c:950
+#: src/gtkblist.c:1019
+msgid "Start _Voice Chat"
+msgstr "Iniciar chat de voz"
+
+#: ../src/gtkblist.c:977 src/gtkblist.c:1025
 msgid "Add Buddy _Pounce"
 msgstr "Añadir _aviso de amigo"
 
-#: src/gtkblist.c:954 src/gtkblist.c:958 src/gtkblist.c:1056
-#: src/gtkblist.c:1079
+#: ../src/gtkblist.c:981 ../src/gtkblist.c:985 ../src/gtkblist.c:1084
+#: ../src/gtkblist.c:1107 src/gtkblist.c:1029 src/gtkblist.c:1033
+#: src/gtkblist.c:1131 src/gtkblist.c:1154
 msgid "View _Log"
 msgstr "Ver _registro"
 
-#: src/gtkblist.c:969
-msgid "_Alias Buddy..."
-msgstr "_Apodo de amigo..."
-
-#: src/gtkblist.c:971
-msgid "_Remove Buddy"
-msgstr "_Eliminar amigo"
-
-#: src/gtkblist.c:973
-msgid "Alias Contact..."
-msgstr "Apodo para contacto..."
-
-#: src/gtkblist.c:976 src/gtkdialogs.c:808 src/gtkdialogs.c:809
-msgid "Remove Contact"
-msgstr "Eliminar contacto"
-
-#: src/gtkblist.c:980 src/gtkblist.c:1064 src/gtkblist.c:1085
+#: src/gtkblist.c:1044
+msgid "Alias..."
+msgstr "_Apodo..."
+
+#: ../src/gtkblist.c:999 ../src/gtkconv.c:1613 ../src/gtkrequest.c:293
+#: src/gtkblist.c:1047 src/gtkconv.c:1571 src/gtkrequest.c:293
+msgid "Remove"
+msgstr "Quitar"
+
+#: ../src/gtkblist.c:1005 ../src/gtkblist.c:1092 ../src/gtkblist.c:1113
+#: src/gtkblist.c:1053 src/gtkblist.c:1139 src/gtkblist.c:1160
 msgid "_Alias..."
 msgstr "_Apodo..."
 
-#: src/gtkblist.c:982 src/gtkblist.c:1066 src/gtkblist.c:1087
+#: ../src/gtkblist.c:1007 ../src/gtkblist.c:1094 ../src/gtkblist.c:1115
+#: src/gtkblist.c:1055 src/gtkblist.c:1141 src/gtkblist.c:1162
 msgid "_Remove"
 msgstr "Elimina_r"
 
-#: src/gtkblist.c:1028
+#: ../src/gtkblist.c:1055 src/gtkblist.c:1102
 msgid "Add a _Buddy"
 msgstr "Añadir un _amigo"
 
-#: src/gtkblist.c:1030
+#: ../src/gtkblist.c:1057 src/gtkblist.c:1104
 msgid "Add a C_hat"
 msgstr "Añadir un _chat"
 
-#: src/gtkblist.c:1032
+#: ../src/gtkblist.c:1060 src/gtkblist.c:1107
 msgid "_Delete Group"
 msgstr "_Eliminar grupo"
 
-#: src/gtkblist.c:1034
+#: ../src/gtkblist.c:1062 src/gtkblist.c:1109
 msgid "_Rename"
 msgstr "_Renombrar"
 
 #. join button
-#: src/gtkblist.c:1052 src/gtkroomlist.c:264 src/gtkroomlist.c:409
-#: src/gtkstock.c:118
+#: ../src/gtkblist.c:1080 ../src/gtkroomlist.c:285 ../src/gtkroomlist.c:441
+#: ../src/gtkstock.c:139 src/gtkblist.c:1127 src/gtkroomlist.c:264
+#: src/gtkroomlist.c:409 src/gtkstock.c:139
 msgid "_Join"
 msgstr "_Unirse"
 
-#: src/gtkblist.c:1054
+#: ../src/gtkblist.c:1082 src/gtkblist.c:1129
 msgid "Auto-Join"
 msgstr "Conectarse automáticamente"
 
-#: src/gtkblist.c:1092 src/gtkblist.c:1115
+#: ../src/gtkblist.c:1120 ../src/gtkblist.c:1143 src/gtkblist.c:1167
+#: src/gtkblist.c:1190
 msgid "_Collapse"
 msgstr "_Contraer"
 
-#: src/gtkblist.c:1120
+#: ../src/gtkblist.c:1148 src/gtkblist.c:1195
 msgid "_Expand"
 msgstr "_Expandir"
 
-#: src/gtkblist.c:1353 src/gtkblist.c:1363 src/gtkblist.c:3326
-#: src/gtkblist.c:3331
+#: ../src/gtkblist.c:1426 ../src/gtkblist.c:1438 ../src/gtkblist.c:3753
+#: ../src/gtkblist.c:3763 src/gtkblist.c:1426 src/gtkblist.c:1436
+#: src/gtkblist.c:3668 src/gtkblist.c:3673
 msgid "/Tools/Mute Sounds"
 msgstr "/Herramientas/Sin sonido"
 
-#: src/gtkblist.c:1822 src/gtkconv.c:3745 src/gtkpounce.c:314
+#: ../src/gtkblist.c:1901 ../src/gtkconv.c:4203 ../src/gtkpounce.c:426
+#: src/gtkblist.c:1895 src/gtkconv.c:3909 src/gtkpounce.c:399
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "No está conectado con ninguna cuenta que pueda añadir a ese amigo."
 
 #. Buddies menu
-#: src/gtkblist.c:2329
+#: ../src/gtkblist.c:2475 src/gtkblist.c:2460
 msgid "/_Buddies"
-msgstr "/_Amigos"
-
-#: src/gtkblist.c:2330
+msgstr "/A_migos"
+
+#: ../src/gtkblist.c:2476 src/gtkblist.c:2461
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Amigos/Mensaje _instantáneo nuevo..."
 
-#: src/gtkblist.c:2331
+#: ../src/gtkblist.c:2477 src/gtkblist.c:2462
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Amigos/Unirse a un _chat..."
 
-#: src/gtkblist.c:2332
+#: ../src/gtkblist.c:2478 src/gtkblist.c:2463
 msgid "/Buddies/Get User _Info..."
 msgstr "/Amigos/Obtener _información del usuario..."
 
-#: src/gtkblist.c:2333
+#: ../src/gtkblist.c:2479 src/gtkblist.c:2464
 msgid "/Buddies/View User _Log..."
 msgstr "/Amigos/Ver _registro del usuario..."
 
-#: src/gtkblist.c:2335
+#: ../src/gtkblist.c:2481 src/gtkblist.c:2466
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Amigos/Mostrar amigos _desconectados"
 
-#: src/gtkblist.c:2336
+#: ../src/gtkblist.c:2482 src/gtkblist.c:2467
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Amigos/Mostrar grupos _vacíos"
 
-#: src/gtkblist.c:2337
+#: ../src/gtkblist.c:2483 src/gtkblist.c:2468
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Amigos/Mostrar _detalles de amigo"
 
-#: src/gtkblist.c:2338 src/gtkblist.c:5158
-msgid "/Buddies/Sort Buddies"
+#: ../src/gtkblist.c:2484
+msgid "/Buddies/Show Idle _Times"
+msgstr "/Amigos/Mostrar _tiempo de ausencia"
+
+#: src/gtkblist.c:2469
+msgid "/Buddies/_Sort Buddies"
 msgstr "/Amigos/Ordenar amigos"
 
-#: src/gtkblist.c:2340
+#: ../src/gtkblist.c:2487 src/gtkblist.c:2471
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Amigos/_Añadir un amigo..."
 
-#: src/gtkblist.c:2341
+#: ../src/gtkblist.c:2488 src/gtkblist.c:2472
 msgid "/Buddies/Add C_hat..."
 msgstr "/Amigos/Añadir un _chat..."
 
-#: src/gtkblist.c:2342
+#: ../src/gtkblist.c:2489 src/gtkblist.c:2473
 msgid "/Buddies/Add _Group..."
 msgstr "/Amigos/Añadir _grupo..."
 
-#: src/gtkblist.c:2344
+#: ../src/gtkblist.c:2491 src/gtkblist.c:2475
 msgid "/Buddies/_Quit"
 msgstr "/Amigos/_Salir"
 
+#. Accounts menu
+#: src/gtkblist.c:2478
+msgid "/_Accounts"
+msgstr "/_Cuentas"
+
+#: src/gtkblist.c:2479 src/gtkblist.c:5453
+msgid "/Accounts/Add\\/Edit"
+msgstr "/Cuentas/Añadir\\/Editar"
+
 #. Tools
-#: src/gtkblist.c:2347
+#: ../src/gtkblist.c:2498 src/gtkblist.c:2482
 msgid "/_Tools"
 msgstr "/_Herramientas"
 
-#: src/gtkblist.c:2348
-msgid "/Tools/Buddy _Pounce"
+#: src/gtkblist.c:2483
+msgid "/Tools/Buddy _Pounces"
 msgstr "/Herramientas/_Aviso de amigo"
 
-#: src/gtkblist.c:2349
-msgid "/Tools/Account Ac_tions"
-msgstr "/Herramientas/Acc_iones"
-
-#: src/gtkblist.c:2351
-msgid "/Tools/A_ccounts"
-msgstr "/Herramientas/_Cuentas"
-
-#: src/gtkblist.c:2352
+#: ../src/gtkblist.c:2500 src/gtkblist.c:2484
+msgid "/Tools/Plu_gins"
+msgstr "/Herramientas/Com_plementos"
+
+#: ../src/gtkblist.c:2501 src/gtkblist.c:2485
 msgid "/Tools/Pr_eferences"
 msgstr "/Herramientas/Pr_eferencias"
 
-#: src/gtkblist.c:2353
-msgid "/Tools/Plu_gins"
-msgstr "/Herramientas/Com_plementos"
-
-#: src/gtkblist.c:2354
+#: ../src/gtkblist.c:2502 src/gtkblist.c:2486
 msgid "/Tools/Pr_ivacy"
 msgstr "/Herramientas/Pri_vacidad"
 
-#: src/gtkblist.c:2355
+#: ../src/gtkblist.c:2504 src/gtkblist.c:2488
 msgid "/Tools/_File Transfers"
 msgstr "/Herramientas/_Transferencias de archivos"
 
-#: src/gtkblist.c:2356
+#: ../src/gtkblist.c:2505 src/gtkblist.c:2489
 msgid "/Tools/R_oom List"
 msgstr "/Herramientas/_Lista de salas"
 
-#: src/gtkblist.c:2358
+#: src/gtkblist.c:2490
+msgid "/Tools/System _Log"
+msgstr "/Herramientas/Registro del sistema"
+
+#: ../src/gtkblist.c:2508 src/gtkblist.c:2492
 msgid "/Tools/Mute _Sounds"
 msgstr "/Herramientas/_Sin sonido"
 
-#: src/gtkblist.c:2359
-msgid "/Tools/View System _Log"
-msgstr "/Herramientas/_Ver registro del sistema"
-
 #. Help
-#: src/gtkblist.c:2362
+#: ../src/gtkblist.c:2511 src/gtkblist.c:2495
 msgid "/_Help"
 msgstr "/_Ayuda"
 
-#: src/gtkblist.c:2363
+#: ../src/gtkblist.c:2512 src/gtkblist.c:2496
 msgid "/Help/Online _Help"
 msgstr "/Ayuda/Ayuda en _línea"
 
-#: src/gtkblist.c:2364
+#: ../src/gtkblist.c:2513 src/gtkblist.c:2497
 msgid "/Help/_Debug Window"
 msgstr "/Ayuda/Ventana de _depuración"
 
-#: src/gtkblist.c:2365
+#: ../src/gtkblist.c:2514 src/gtkblist.c:2498
 msgid "/Help/_About"
 msgstr "/Ayuda/_Acerca de"
 
-#: src/gtkblist.c:2397 src/gtkblist.c:2464
+#: ../src/gtkblist.c:2546 ../src/gtkblist.c:2615 src/gtkblist.c:2530
+#: src/gtkblist.c:2597
 #, c-format
 msgid ""
 "\n"
@@ -2080,49 +2828,48 @@
 "\n"
 "<b>Cuenta:</b> %s"
 
-#: src/gtkblist.c:2473
-#, c-format
-msgid ""
-"\n"
-"<b>Contact Alias:</b> %s"
-msgstr "\n<b>Apodo del contacto:</b> %s"
-
-#: src/gtkblist.c:2481
-#, c-format
-msgid ""
-"\n"
-"<b>Alias:</b> %s"
-msgstr "\n<b>Apodo:</b> %s"
-
-#: src/gtkblist.c:2489
+#: ../src/gtkblist.c:2627
+#, c-format
+msgid ""
+"\n"
+"<b>Buddy Alias:</b> %s"
+msgstr "\n<b>Apodo de amigo:</b> %s"
+
+#: ../src/gtkblist.c:2639 src/gtkblist.c:2622
 #, c-format
 msgid ""
 "\n"
 "<b>Nickname:</b> %s"
-msgstr "\n<b>Apodo:</b> %s"
-
-#: src/gtkblist.c:2498
+msgstr ""
+"\n"
+"<b>Apodo:</b> %s"
+
+#: ../src/gtkblist.c:2648 src/gtkblist.c:2631
 #, c-format
 msgid ""
 "\n"
 "<b>Logged In:</b> %s"
-msgstr "\n<b>Conectado:</b> %s"
-
-#: src/gtkblist.c:2510
+msgstr ""
+"\n"
+"<b>Conectado:</b> %s"
+
+#: ../src/gtkblist.c:2659 src/gtkblist.c:2643
 #, c-format
 msgid ""
 "\n"
 "<b>Idle:</b> %s"
-msgstr "\n<b>Ausente:</b> %s"
-
-#: src/gtkblist.c:2546
+msgstr ""
+"\n"
+"<b>Ausente:</b> %s"
+
+#: ../src/gtkblist.c:2694 src/gtkblist.c:2678
 #, c-format
 msgid ""
 "\n"
 "<b>Last Seen:</b> %s ago"
 msgstr "\n<b>Visto por última vez:</b> hace %s"
 
-#: src/gtkblist.c:2554
+#: ../src/gtkblist.c:2703 src/gtkblist.c:2686
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2130,7 +2877,7 @@
 "\n"
 "<b>Estado:</b> Desconectado"
 
-#: src/gtkblist.c:2577
+#: ../src/gtkblist.c:2714 src/gtkblist.c:2709
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2138,114 +2885,141 @@
 "\n"
 "<b>Descripción:</b> Terrorífica"
 
-#: src/gtkblist.c:2579
+#: ../src/gtkblist.c:2716 src/gtkblist.c:2711
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
-msgstr "\n<b>Estado:</b> Genial"
-
-#: src/gtkblist.c:2581
+msgstr ""
+"\n"
+"<b>Estado:</b> Genial"
+
+#: ../src/gtkblist.c:2718 src/gtkblist.c:2713
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
 msgstr "\n<b>Estado:</b> Rock & roll"
 
-#: src/gtkblist.c:2843
-#, c-format
-msgid "Idle (%dh %02dm) "
-msgstr "Ausente (%dh %02dm) "
-
-#: src/gtkblist.c:2845
-#, c-format
-msgid "Idle (%dm) "
-msgstr "Ausente (%dm)"
-
-#: src/gtkblist.c:2848
-msgid "Idle "
-msgstr "Ausente "
-
-#: src/gtkblist.c:2852
-msgid "Offline "
-msgstr "Desconectado "
-
-#: src/gtkblist.c:2968
+#: src/gtkblist.c:2981
+#, c-format
+msgid "Idle %dh %02dm"
+msgstr "Ausente %dh %02dm"
+
+#: src/gtkblist.c:2983
+#, c-format
+msgid "Idle %dm"
+msgstr "Ausente %dm"
+
+#. #-#-#-#-#  es.po (Gaim)  #-#-#-#-#
+#. Idle stuff
+#: ../src/gtkblist.c:3012 ../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:5208 ../src/protocols/yahoo/yahoo.c:2729
+#: ../src/protocols/yahoo/yahoo_profile.c:691 src/gtkblist.c:2986
+#: src/protocols/bonjour/bonjour.c:323 src/protocols/msn/msn.c:554
+#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2855
+#: src/protocols/oscar/oscar.c:5058 src/protocols/yahoo/yahoo.c:2660
+#: src/protocols/yahoo/yahoo_profile.c:660
+msgid "Idle"
+msgstr "Está inactivo"
+
+#: ../src/gtkblist.c:3144 src/gtkblist.c:3108
 msgid "/Buddies/New Instant Message..."
-msgstr "/Amigos/Mensaje instantáneo nuevo..."
-
-#: src/gtkblist.c:2969 src/gtkblist.c:3003
+msgstr "/Amigos/Nuevo mensaje instantáneo..."
+
+#: ../src/gtkblist.c:3145 ../src/gtkblist.c:3178 src/gtkblist.c:3109
+#: src/gtkblist.c:3142
 msgid "/Buddies/Join a Chat..."
 msgstr "/Amigos/Unirse a un chat..."
 
-#: src/gtkblist.c:2970
+#: ../src/gtkblist.c:3146 src/gtkblist.c:3110
 msgid "/Buddies/Get User Info..."
 msgstr "/Amigos/Obtener información del usuario..."
 
-#: src/gtkblist.c:2971
+#: ../src/gtkblist.c:3147 src/gtkblist.c:3111
 msgid "/Buddies/Add Buddy..."
 msgstr "/Amigos/Añadir un amigo..."
 
-#: src/gtkblist.c:2972
+#: ../src/gtkblist.c:3148 ../src/gtkblist.c:3181 src/gtkblist.c:3112
+#: src/gtkblist.c:3145
 msgid "/Buddies/Add Chat..."
 msgstr "/Amigos/Añadir un chat..."
 
-#: src/gtkblist.c:2973
+#: ../src/gtkblist.c:3149 src/gtkblist.c:3113
 msgid "/Buddies/Add Group..."
 msgstr "/Amigos/Añadir un grupo..."
 
-#: src/gtkblist.c:3006
+#: src/gtkblist.c:3148
+msgid "/Tools/Buddy Pounces"
+msgstr "/Herramientas/Aviso de amigo"
+
+#: ../src/gtkblist.c:3187 src/gtkblist.c:3151
+msgid "/Tools/Privacy"
+msgstr "/Herramientas/Privacidad"
+
+#: ../src/gtkblist.c:3190 src/gtkblist.c:3154
 msgid "/Tools/Room List"
 msgstr "/Herramientas/Lista de salas"
 
-#: src/gtkblist.c:3009
-msgid "/Tools/Privacy"
-msgstr "/Herramientas/Privacidad"
-
-#: src/gtkblist.c:3085
+#: ../src/gtkblist.c:3384 src/gtkblist.c:3339
 msgid "Manually"
 msgstr "Manualmente"
 
-#: src/gtkblist.c:3087
+#: ../src/gtkblist.c:3386 src/gtkblist.c:3341
 msgid "Alphabetically"
 msgstr "Alfabéticamente"
 
-#: src/gtkblist.c:3088
+#: ../src/gtkblist.c:3387 src/gtkblist.c:3342
 msgid "By status"
 msgstr "Por estado"
 
-#: src/gtkblist.c:3089
+#: ../src/gtkblist.c:3388 src/gtkblist.c:3343
 msgid "By log size"
 msgstr "Por tamaño de registro"
 
-#: src/gtkblist.c:3201
-msgid "/Tools/Buddy Pounce"
-msgstr "/Herramientas/Aviso de amigo"
-
-#: src/gtkblist.c:3202
-msgid "/Tools/Account Actions"
-msgstr "/Herramientas/Acciones de cuentas"
+#: ../src/gtkblist.c:3493 ../src/gtkconn.c:191 src/gtkconn.c:226
+#, c-format
+msgid "%s disconnected"
+msgstr "%s se ha desconectado"
+
+#: ../src/gtkblist.c:3515
+#, c-format
+msgid "<span color=\"red\">%s disconnected: %s</span>"
+msgstr "<span color=\"red\">%s se ha desconectado: %s</span>"
+
+#: src/gtkblist.c:3532
+msgid "/Accounts"
+msgstr "/Cuentas"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3322
+#: ../src/gtkblist.c:3747 src/gtkblist.c:3664
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Amigos/Mostrar amigos desconectados"
 
-#: src/gtkblist.c:3324
+#: ../src/gtkblist.c:3750 src/gtkblist.c:3666
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Amigos/Mostrar grupos vacíos"
 
-#: src/gtkblist.c:3328
+#: ../src/gtkblist.c:3756 src/gtkblist.c:3670
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Amigos/Mostrar detalles de amigo"
 
-#: src/gtkblist.c:4005 src/protocols/silc/buddy.c:736
-#: src/protocols/silc/buddy.c:994 src/protocols/silc/buddy.c:1039
-#: src/protocols/silc/buddy.c:1129 src/protocols/yahoo/yahoo.c:2886
+#: ../src/gtkblist.c:3759
+msgid "/Buddies/Show Idle Times"
+msgstr "/Amigos/Mostrar tiempos de ausencia"
+
+#: ../src/gtkblist.c:4471 ../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:2976
+#: src/gtkblist.c:4369 src/protocols/silc/buddy.c:737
+#: src/protocols/silc/buddy.c:995 src/protocols/silc/buddy.c:1040
+#: src/protocols/silc/buddy.c:1139 src/protocols/yahoo/yahoo.c:2908
 msgid "Add Buddy"
 msgstr "Añadir amigo"
 
-#: src/gtkblist.c:4029
+#: ../src/gtkblist.c:4495 src/gtkblist.c:4393
 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. "
@@ -2256,16 +3030,21 @@
 "sobrenombre se mostrará en lugar del nombre de usuario siempre que sea "
 "posible.\n"
 
+#: ../src/gtkblist.c:4517 src/gtkblist.c:4415
+msgid "Screen Name:"
+msgstr "Nombre de usuario:"
+
 #. Set up stuff for the account box
-#: src/gtkblist.c:4092 src/gtkblist.c:4424
+#: ../src/gtkblist.c:4565 ../src/gtkblist.c:4884 src/gtkblist.c:4463
+#: src/gtkblist.c:4798
 msgid "Account:"
 msgstr "Cuenta:"
 
-#: src/gtkblist.c:4357
+#: ../src/gtkblist.c:4817 src/gtkblist.c:4731
 msgid "This protocol does not support chat rooms."
 msgstr "Este protocolo no está soportado en las habitaciones de chats."
 
-#: src/gtkblist.c:4373
+#: ../src/gtkblist.c:4833 src/gtkblist.c:4747
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -2273,11 +3052,11 @@
 "No está conectado con ninguna cuenta que tenga la capacidad de acceder a "
 "chats."
 
-#: src/gtkblist.c:4390
+#: ../src/gtkblist.c:4850 src/gtkblist.c:4764
 msgid "Add Chat"
 msgstr "Añadir chat"
 
-#: src/gtkblist.c:4414
+#: ../src/gtkblist.c:4874 src/gtkblist.c:4788
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2285,48 +3064,139 @@
 "Introduzca el apodo, y la información que crea conveniente del chat que "
 "desearía añadir en la lista de amigos.\n"
 
-#: src/gtkblist.c:4493
+#: ../src/gtkblist.c:4956 ../src/protocols/sametime/sametime.c:5320
+#: ../src/protocols/sametime/sametime.c:5407 src/gtkblist.c:4870
+#: src/protocols/sametime/sametime.c:5393
+#: src/protocols/sametime/sametime.c:5477
 msgid "Add Group"
 msgstr "Añadir grupo"
 
-#: src/gtkblist.c:4494
+#: ../src/gtkblist.c:4957 src/gtkblist.c:4871
 msgid "Please enter the name of the group to be added."
 msgstr "Introduzca el nombre del grupo a añadir."
 
-#: src/gtkblist.c:5025
+#: src/gtkblist.c:5495
+msgid "_Edit Account"
+msgstr "_Editar cuenta"
+
+#: ../src/gtkblist.c:5611 ../src/gtkblist.c:5617 src/gtkblist.c:5528
+#: src/gtkblist.c:5534
 msgid "No actions available"
 msgstr "No hay acciones disponibles"
 
-#: src/gtkblist.c:5094
+#: src/gtkblist.c:5542
+msgid "_Disable"
+msgstr "Deshabilitar"
+
+#: src/gtkblist.c:5554
+msgid "Enable Account"
+msgstr "Habilitar cuenta"
+
+#: ../src/gtkblist.c:5690 src/gtkblist.c:5609
 msgid "/Tools"
 msgstr "/Herramientas"
 
-#: src/gtkconn.c:190
-#, c-format
-msgid "%s disconnected"
-msgstr "%s se ha desconectado"
-
-#: src/gtkconn.c:191
-#, c-format
-msgid ""
-"%s was disconnected due to an error. %s The account has been disabled. "
-"Correct the error and reenable the account to connect."
-msgstr "Se desconectó %s debido a un error. %s La cuenta ha sido deshabilitada. Corrija el error y reactive la cuenta para conectarse."
-
-#: src/gtkconv.c:325
+#: ../src/gtkblist.c:5785 src/gtkblist.c:5704
+msgid "/Buddies/Sort Buddies"
+msgstr "/Amigos/Ordenar amigos"
+
+#: src/gtkcellview.c:198
+msgid "Background color name"
+msgstr "Nombre del color de fondo"
+
+#: ../src/gtkcellview.c:199 src/gtkcellview.c:199
+msgid "Background color as a string"
+msgstr "Cadena del color de fondo"
+
+#: ../src/gtkcellview.c:205 ../src/gtkimhtmltoolbar.c:1014
+#: src/gtkcellview.c:205 src/gtkimhtmltoolbar.c:1007
+msgid "Background color"
+msgstr "Color de fondo"
+
+#: src/gtkcellview.c:206
+msgid "Background color as a GdkColor"
+msgstr "Color de fondo como un GdkColor"
+
+#: src/gtkcellview.c:213
+msgid "Background set"
+msgstr "Establecer color de fondo"
+
+#: ../src/gtkcellview.c:214 src/gtkcellview.c:214
+msgid "Whether this tag affects the background color"
+msgstr "Si esta marca afecta al color de fondo"
+
+#: ../src/gtkcombobox.c:490 src/gtkcombobox.c:490
+msgid "ComboBox model"
+msgstr "Modelo «ComboBox»"
+
+#: ../src/gtkcombobox.c:491 src/gtkcombobox.c:491
+msgid "The model for the combo box"
+msgstr "El modelo para el «combo box»"
+
+#: ../src/gtkcombobox.c:498 src/gtkcombobox.c:498
+msgid "Wrap width"
+msgstr "Envolver ancho"
+
+#: ../src/gtkcombobox.c:499 src/gtkcombobox.c:499
+msgid "Wrap width for layouting the items in a grid"
+msgstr "Ancho a utilizar al envolver para mostrar elementos en una cuadrícula"
+
+#: ../src/gtkcombobox.c:508 src/gtkcombobox.c:508
+msgid "Row span column"
+msgstr "Columnas que incluyen las filas"
+
+#: ../src/gtkcombobox.c:509 src/gtkcombobox.c:509
+msgid "TreeModel column containing the row span values"
+msgstr "Columna «TreeModel» que contiene los valores que expanden las filas"
+
+#: ../src/gtkcombobox.c:518 src/gtkcombobox.c:518
+msgid "Column span column"
+msgstr "Columna que incluye columnas"
+
+#: ../src/gtkcombobox.c:520 src/gtkcombobox.c:520
+msgid "TreeModel column containing the column span values"
+msgstr "Columna «TreeModel» que contiene los valores que incluyen columnas"
+
+#: src/gtkcombobox.c:529
+msgid "Active item"
+msgstr "Elemento activo"
+
+#: src/gtkcombobox.c:530
+msgid "The item which is currently active"
+msgstr "El elemento que está activo actualmente"
+
+#: src/gtkcombobox.c:538
+msgid "Appears as list"
+msgstr "Aparece como lista"
+
+#: ../src/gtkcombobox.c:539 src/gtkcombobox.c:539
+msgid "Whether combobox dropdowns should look like lists rather than menus"
+msgstr "Si las selecciones de combobox debería mostrarse como listas en lugar de como menús"
+
+#: ../src/gtkconn.c:192
+#, c-format
+msgid ""
+"%s was disconnected due to an error: %s\n"
+"Gaim will not attempt to reconnect the account until you correct the error "
+"and reenable the account."
+msgstr ""
+"Se desconectó %s debido a un error: %s \n"
+"Gaim no intentará reconectarse a esta cuenta hasta que corrija el error y reactive la cuenta."
+
+#: ../src/gtkconv.c:364 src/gtkconv.c:349
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr "yo estoy utilizando Gaim v%s."
 
-#: src/gtkconv.c:334
+#: ../src/gtkconv.c:373 src/gtkconv.c:358
 msgid "Supported debug options are:  version"
 msgstr "Las opciones de depuración soportadas son:  version"
 
-#: src/gtkconv.c:371
+#: ../src/gtkconv.c:409 src/gtkconv.c:394
 msgid "No such command (in this context)."
 msgstr "No existe esa orden (en este contexto)."
 
-#: src/gtkconv.c:374
+#: ../src/gtkconv.c:412 src/gtkconv.c:397
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2334,47 +3204,48 @@
 "Utilice \"/help &lt;orden&gt;\" para obtener ayuda de una orden concreta.\n"
 "Las siguientes órdenes están disponibles en este contexto:\n"
 
-#: src/gtkconv.c:446
+#: ../src/gtkconv.c:484 src/gtkconv.c:469
 msgid "No such command."
 msgstr "No existe esa orden."
 
-#: src/gtkconv.c:453
+#: ../src/gtkconv.c:491 src/gtkconv.c:476
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Error sintáctico:  Vd. no escribió suficientes argumentos para esa orden."
 
-#: src/gtkconv.c:458
+#: ../src/gtkconv.c:496 src/gtkconv.c:481
 msgid "Your command failed for an unknown reason."
 msgstr "Su orden ha fallado por motivos desconocidos."
 
-#: src/gtkconv.c:465
+#: ../src/gtkconv.c:503 src/gtkconv.c:488
 msgid "That command only works in chats, not IMs."
 msgstr "Esa orden sólo funciona en chats, no en MIs."
 
-#: src/gtkconv.c:468
+#: ../src/gtkconv.c:506 src/gtkconv.c:491
 msgid "That command only works in IMs, not chats."
 msgstr "Esa orden sólo funciona en MIs, no en chats."
 
-#: src/gtkconv.c:472
+#: ../src/gtkconv.c:510 src/gtkconv.c:495
 msgid "That command doesn't work on this protocol."
 msgstr "Esa orden no funciona en este protocolo."
 
-#: src/gtkconv.c:699 src/gtkconv.c:725
+#: ../src/gtkconv.c:744 ../src/gtkconv.c:770 src/gtkconv.c:729
+#: src/gtkconv.c:755
 msgid "That buddy is not on the same protocol as this chat."
-msgstr "Ese amigo no está en el mismo protocolo que este chat"
-
-#: src/gtkconv.c:719
+msgstr "Ese amigo no utiliza el mismo protocolo que este chat."
+
+#: ../src/gtkconv.c:764 src/gtkconv.c:749
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "No está conectado con ninguna cuenta con la que pueda invitar a ese amigo."
 
-#: src/gtkconv.c:772
+#: ../src/gtkconv.c:817 src/gtkconv.c:802
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invitar a un amigo a la sala de chat"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:802
+#: ../src/gtkconv.c:847 src/gtkconv.c:832
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2382,292 +3253,309 @@
 "Introduzca el nombre de usuario al que desea invitar, junto con un mensaje "
 "de invitación opcional."
 
-#: src/gtkconv.c:823
+#: ../src/gtkconv.c:868 src/gtkconv.c:853
 msgid "_Buddy:"
 msgstr "_Amigo:"
 
-#: src/gtkconv.c:843 src/gtksavedstatuses.c:836
+#: ../src/gtkconv.c:888 ../src/gtksavedstatuses.c:1108
+#: ../src/gtksavedstatuses.c:1444 src/gtkconv.c:873
+#: src/gtksavedstatuses.c:1077 src/gtksavedstatuses.c:1395
 msgid "_Message:"
 msgstr "_Mensaje:"
 
-#: src/gtkconv.c:900 src/gtkconv.c:2228 src/gtkdebug.c:217 src/gtkft.c:470
+#: ../src/gtkconv.c:945 ../src/gtkconv.c:2399 ../src/gtkdebug.c:217
+#: ../src/gtkft.c:488 src/gtkconv.c:930 src/gtkconv.c:2275 src/gtkdebug.c:217
+#: src/gtkft.c:487
 msgid "Unable to open file."
 msgstr "No se pudo leer el archivo."
 
-#: src/gtkconv.c:906
+#: ../src/gtkconv.c:951 src/gtkconv.c:936
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversaciones con %s</h1>\n"
 
-#: src/gtkconv.c:930
+#: ../src/gtkconv.c:975 src/gtkconv.c:960
 msgid "Save Conversation"
 msgstr "Guardar conversación"
 
-#: src/gtkconv.c:1030 src/gtkdebug.c:165 src/gtkdebug.c:678
+#: ../src/gtkconv.c:1093 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
+#: src/gtkconv.c:1077 src/gtkdebug.c:165 src/gtkdebug.c:678
 msgid "Find"
 msgstr "Buscar"
 
-#: src/gtkconv.c:1056 src/gtkdebug.c:193
+#: ../src/gtkconv.c:1119 ../src/gtkdebug.c:193 src/gtkconv.c:1103
+#: src/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "Término a _buscar:"
 
-#: src/gtkconv.c:1227
+#: ../src/gtkconv.c:1290
 msgid "Logging started. Future messages in this conversation will be logged."
-msgstr "Se inició el registro. A partir de ahora se registrarán todos los mensajes de esta conversación."
-
-#: src/gtkconv.c:1235
+msgstr ""
+"Se inició el registro. A partir de ahora se registrarán todos los mensajes "
+"de esta conversación."
+
+#: ../src/gtkconv.c:1298
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
-msgstr "Se ha parado el registro. No se registrarán mensajes de esta conversación de ahora en adelante."
-
-#: src/gtkconv.c:1489
+msgstr ""
+"Se ha parado el registro. No se registrarán mensajes de esta conversación de "
+"ahora en adelante."
+
+#: ../src/gtkconv.c:1578 src/gtkconv.c:1536
 msgid "IM"
 msgstr "MI"
 
-#: src/gtkconv.c:1495 src/protocols/oscar/oscar.c:628
+#: ../src/gtkconv.c:1584 ../src/protocols/oscar/oscar.c:650 src/gtkconv.c:1542
+#: src/protocols/oscar/oscar.c:628
 msgid "Send File"
 msgstr "Enviar archivo"
 
-#: src/gtkconv.c:1502
+#: ../src/gtkconv.c:1591 src/gtkconv.c:1549
 msgid "Un-Ignore"
 msgstr "No ignorar"
 
-#: src/gtkconv.c:1505
+#: ../src/gtkconv.c:1594 src/gtkconv.c:1552
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: src/gtkconv.c:1511
+#: ../src/gtkconv.c:1600 src/gtkconv.c:1558
 msgid "Info"
 msgstr "Info"
 
-#: src/gtkconv.c:1517
+#: ../src/gtkconv.c:1606 src/gtkconv.c:1564
 msgid "Get Away Message"
 msgstr "Mensaje de ausencia"
 
-#: src/gtkconv.c:1524 src/gtkrequest.c:267
-msgid "Remove"
-msgstr "Quitar"
-
-#: src/gtkconv.c:2236
+#: ../src/gtkconv.c:1621
+msgid "Last said"
+msgstr "Dicho la última vez"
+
+#: ../src/gtkconv.c:2407 src/gtkconv.c:2283
 msgid "Unable to save icon file to disk."
 msgstr "No se pudo salvar el archivo de iconos al disco."
 
-#: src/gtkconv.c:2259
+#: ../src/gtkconv.c:2430 src/gtkconv.c:2306
 msgid "Save Icon"
 msgstr "Guardar icono"
 
-#: src/gtkconv.c:2308
+#: ../src/gtkconv.c:2479 src/gtkconv.c:2355
 msgid "Animate"
 msgstr "Animar"
 
-#: src/gtkconv.c:2313
+#: ../src/gtkconv.c:2484 src/gtkconv.c:2360
 msgid "Hide Icon"
 msgstr "Ocultar icono"
 
-#: src/gtkconv.c:2319
+#: ../src/gtkconv.c:2490 src/gtkconv.c:2366
 msgid "Save Icon As..."
 msgstr "Guardar icono como..."
 
 #. Conversation menu
-#: src/gtkconv.c:2367
+#: ../src/gtkconv.c:2631 src/gtkconv.c:2507
 msgid "/_Conversation"
 msgstr "/_Conversación"
 
-#: src/gtkconv.c:2369
+#: ../src/gtkconv.c:2633 src/gtkconv.c:2509
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversación/Mensaje _instantáneo nuevo..."
 
-#: src/gtkconv.c:2374
+#: ../src/gtkconv.c:2638 src/gtkconv.c:2514
 msgid "/Conversation/_Find..."
 msgstr "/Conversación/_Buscar..."
 
-#: src/gtkconv.c:2376
+#: ../src/gtkconv.c:2640 src/gtkconv.c:2516
 msgid "/Conversation/View _Log"
 msgstr "/Conversación/Ver _historial"
 
-#: src/gtkconv.c:2377
+#: ../src/gtkconv.c:2641 src/gtkconv.c:2517
 msgid "/Conversation/_Save As..."
 msgstr "/Conversación/_Guardar como..."
 
-#: src/gtkconv.c:2379
-msgid "/Conversation/Clear"
-msgstr "/Conversación/Limpiar"
-
-#: src/gtkconv.c:2383
+#: ../src/gtkconv.c:2643
+msgid "/Conversation/Clea_r Scrollback"
+msgstr "/Conversación/Limpia_r deslizable"
+
+#: ../src/gtkconv.c:2647 src/gtkconv.c:2523
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversación/_Enviar archivo..."
 
-#: src/gtkconv.c:2384
+#: ../src/gtkconv.c:2648 src/gtkconv.c:2524
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversación/Añadir _aviso de amigo..."
 
-#: src/gtkconv.c:2386
+#: ../src/gtkconv.c:2650 src/gtkconv.c:2526
 msgid "/Conversation/_Get Info"
 msgstr "/Conversación/_Obtener información"
 
-#: src/gtkconv.c:2388
+#: ../src/gtkconv.c:2652 src/gtkconv.c:2528
 msgid "/Conversation/In_vite..."
 msgstr "/Conversación/In_vitar..."
 
-#: src/gtkconv.c:2393
+#: ../src/gtkconv.c:2657 src/gtkconv.c:2533
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversación/A_podo..."
 
-#: src/gtkconv.c:2395
+#: ../src/gtkconv.c:2659 src/gtkconv.c:2535
 msgid "/Conversation/_Block..."
 msgstr "/Conversación/_Bloquear..."
 
-#: src/gtkconv.c:2397
+#: ../src/gtkconv.c:2661 src/gtkconv.c:2537
 msgid "/Conversation/_Add..."
 msgstr "/Conversación/_Añadir..."
 
-#: src/gtkconv.c:2399
+#: ../src/gtkconv.c:2663 src/gtkconv.c:2539
 msgid "/Conversation/_Remove..."
 msgstr "/Conversación/Elimina_r..."
 
-#: src/gtkconv.c:2404
+#: ../src/gtkconv.c:2668 src/gtkconv.c:2544
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversación/Insertar en_lace..."
 
-#: src/gtkconv.c:2406
+#: ../src/gtkconv.c:2670 src/gtkconv.c:2546
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversación/Insertar imag_en..."
 
-#: src/gtkconv.c:2411
+#: ../src/gtkconv.c:2675 src/gtkconv.c:2551
 msgid "/Conversation/_Close"
 msgstr "/Conversación/_Cerrar"
 
 #. Options
-#: src/gtkconv.c:2415
+#: ../src/gtkconv.c:2679 src/gtkconv.c:2555
 msgid "/_Options"
 msgstr "/_Opciones"
 
-#: src/gtkconv.c:2416
+#: ../src/gtkconv.c:2680 src/gtkconv.c:2556
 msgid "/Options/Enable _Logging"
 msgstr "/Opciones/_Habilitar registro"
 
-#: src/gtkconv.c:2417
+#: ../src/gtkconv.c:2681 src/gtkconv.c:2557
 msgid "/Options/Enable _Sounds"
 msgstr "/Opciones/Habilitar _sonidos"
 
-#: src/gtkconv.c:2418
+#: ../src/gtkconv.c:2682 src/gtkconv.c:2558
+msgid "/Options/Show Buddy _Icon"
+msgstr "/Opciones/Mostrar _iconos de los amigos"
+
+#: ../src/gtkconv.c:2684 src/gtkconv.c:2560
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Opciones/Mostrar _barras de formato"
 
-#: src/gtkconv.c:2419
+#: ../src/gtkconv.c:2685 src/gtkconv.c:2561
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Opciones/Mostrar _marcas de tiempo"
 
-#: src/gtkconv.c:2420
-msgid "/Options/Show Buddy _Icon"
-msgstr "/Opciones/Mostrar _iconos de amigos"
-
-#: src/gtkconv.c:2460
+#: ../src/gtkconv.c:2777 src/gtkconv.c:2601
 msgid "/Conversation/View Log"
 msgstr "/Conversación/Ver registro"
 
-#: src/gtkconv.c:2466
+#: ../src/gtkconv.c:2783 src/gtkconv.c:2607
 msgid "/Conversation/Send File..."
 msgstr "/Conversación/Enviar archivo..."
 
-#: src/gtkconv.c:2470
+#: ../src/gtkconv.c:2787 src/gtkconv.c:2611
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversación/Añadir aviso de amigo..."
 
-#: src/gtkconv.c:2476
+#: ../src/gtkconv.c:2793 src/gtkconv.c:2617
 msgid "/Conversation/Get Info"
 msgstr "/Conversación/Obtener información"
 
-#: src/gtkconv.c:2480
+#: ../src/gtkconv.c:2797 src/gtkconv.c:2621
 msgid "/Conversation/Invite..."
 msgstr "/Conversación/Invitar..."
 
-#: src/gtkconv.c:2486
+#: ../src/gtkconv.c:2803 src/gtkconv.c:2627
 msgid "/Conversation/Alias..."
 msgstr "/Conversación/Apodo..."
 
-#: src/gtkconv.c:2490
+#: ../src/gtkconv.c:2807 src/gtkconv.c:2631
 msgid "/Conversation/Block..."
 msgstr "/Conversación/Bloquear..."
 
-#: src/gtkconv.c:2494
+#: ../src/gtkconv.c:2811 src/gtkconv.c:2635
 msgid "/Conversation/Add..."
 msgstr "/Conversación/Añadir..."
 
-#: src/gtkconv.c:2498
+#: ../src/gtkconv.c:2815 src/gtkconv.c:2639
 msgid "/Conversation/Remove..."
 msgstr "/Conversación/Eliminar..."
 
-#: src/gtkconv.c:2504
+#: ../src/gtkconv.c:2821 src/gtkconv.c:2645
 msgid "/Conversation/Insert Link..."
 msgstr "/Opciones/Insertar enlace..."
 
-#: src/gtkconv.c:2508
+#: ../src/gtkconv.c:2825 src/gtkconv.c:2649
 msgid "/Conversation/Insert Image..."
 msgstr "/Opciones/Insertar imagen..."
 
-#: src/gtkconv.c:2514
+#: ../src/gtkconv.c:2831 src/gtkconv.c:2655
 msgid "/Options/Enable Logging"
 msgstr "/Opciones/_Habilitar registro"
 
-#: src/gtkconv.c:2517
+#: ../src/gtkconv.c:2834 src/gtkconv.c:2658
 msgid "/Options/Enable Sounds"
 msgstr "/Opciones/Habilitar _sonidos"
 
-#: src/gtkconv.c:2520
+#: ../src/gtkconv.c:2847 src/gtkconv.c:2661
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Opciones/Mostrar barras de formato"
 
-#: src/gtkconv.c:2523
+#: ../src/gtkconv.c:2850 src/gtkconv.c:2664
 msgid "/Options/Show Timestamps"
 msgstr "/Opciones/Mostrar marcas de tiempo"
 
-#: src/gtkconv.c:2526
+#: ../src/gtkconv.c:2853 src/gtkconv.c:2667
 msgid "/Options/Show Buddy Icon"
-msgstr "/Opciones/Mostrar _iconos de amigos"
-
-#: src/gtkconv.c:2597
+msgstr "/Opciones/Mostrar _iconos de los amigos"
+
+#: ../src/gtkconv.c:2933 src/gtkconv.c:2739
 msgid "User is typing..."
 msgstr "El usuario está escribiendo..."
 
-#: src/gtkconv.c:2602
-msgid "User has typed something and paused"
+#: src/gtkconv.c:2742
+msgid "User has typed something and stopped"
 msgstr "El usuario ha escrito algo y ha parado"
 
-#. Build the Send As menu
-#: src/gtkconv.c:2740
+#. Build the Send To menu
+#: ../src/gtkconv.c:3119 src/gtkconv.c:2890
 msgid "_Send To"
 msgstr "_Enviar a"
 
-#: src/gtkconv.c:3373
+#: ../src/gtkconv.c:3771
+msgid "_Send"
+msgstr "_Enviar"
+
+#: ../src/gtkconv.c:3824 ../src/protocols/sametime/sametime.c:3572
+#: src/gtkconv.c:3537 src/protocols/sametime/sametime.c:3490
 msgid "Topic:"
 msgstr "Tema:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3421
+#: ../src/gtkconv.c:3872 src/gtkconv.c:3585
 msgid "0 people in room"
 msgstr "0 personas en la conversación"
 
-#: src/gtkconv.c:3500
+#: ../src/gtkconv.c:3951 src/gtkconv.c:3664
 msgid "IM the user"
 msgstr "Enviar un MI al usuario"
 
-#: src/gtkconv.c:3513
+#: ../src/gtkconv.c:3964 src/gtkconv.c:3677
 msgid "Ignore the user"
 msgstr "Ignorar al usuario"
 
-#: src/gtkconv.c:3525
+#: ../src/gtkconv.c:3976 src/gtkconv.c:3689
 msgid "Get the user's information"
 msgstr "Obtener la información del usuario"
 
-#: src/gtkconv.c:4360 src/gtkconv.c:4462 src/gtkconv.c:4517
+#: ../src/gtkconv.c:4942 ../src/gtkconv.c:5051 src/gtkconv.c:4575
+#: src/gtkconv.c:4680 src/gtkconv.c:4735
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d persona en la conversación"
 msgstr[1] "%d personas en la conversación"
 
-#: src/gtkconv.c:5582
+#: ../src/gtkconv.c:6521 src/gtkconv.c:5973
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -2675,12 +3563,12 @@
 "say &lt;mensaje;gt;:  Enviar un mensaje como si no se estuviera utilizando "
 "una orden."
 
-#: src/gtkconv.c:5585
+#: ../src/gtkconv.c:6524 src/gtkconv.c:5976
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;acción&gt;: enviar una acción estilo IRC a un amigo o a un chat."
 
-#: src/gtkconv.c:5588
+#: ../src/gtkconv.c:6527 src/gtkconv.c:5979
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -2688,389 +3576,444 @@
 "debug &lt;opción&gt;: Enviar información de depuración sobre la conversación "
 "actual."
 
-#: src/gtkconv.c:5591
+#: ../src/gtkconv.c:6530 src/gtkconv.c:5982
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: limpia el histórico de la ventana de conversación."
 
-#: src/gtkconv.c:5594
+#: ../src/gtkconv.c:6533 src/gtkconv.c:5985
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;orden&gt;:  Recibir ayuda sobre una orden concreta."
 
-#: src/gtkconv.c:5709
+#: ../src/gtkconv.c:6692 src/gtkconv.c:6118
 msgid "Confirm close"
-msgstr "Confirmar el cierre"
-
-#: src/gtkconv.c:5741
+msgstr "Confirmar cierre"
+
+#: ../src/gtkconv.c:6724 src/gtkconv.c:6150
 msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr "Tiene mensajes sin leero. ¿Está seguro de que quiere cerrar la ventana?"
-
-#: src/gtkconv.c:6408
+msgstr "Tiene mensajes sin leer. ¿Está seguro que quiere cerrar la ventana?"
+
+#: ../src/gtkconv.c:7528 src/gtkconv.c:6946
 msgid "Close conversation"
 msgstr "Cerrar conversación"
 
-#: src/gtkconv.c:6872
+#: ../src/gtkconv.c:7992 src/gtkconv.c:7410
 msgid "Last created window"
 msgstr "Última ventana creada"
 
-#: src/gtkconv.c:6874
+#: ../src/gtkconv.c:7994 src/gtkconv.c:7412
 msgid "Separate IM and Chat windows"
 msgstr "Separar ventanas de MIs y chats"
 
-#: src/gtkconv.c:6876 src/gtkprefs.c:1205
+#: ../src/gtkconv.c:7996 ../src/gtkprefs.c:1243 src/gtkconv.c:7414
+#: src/gtkprefs.c:1230
 msgid "New window"
 msgstr "Ventana nueva"
 
-#: src/gtkconv.c:6878
+#: ../src/gtkconv.c:7998 src/gtkconv.c:7416
 msgid "By group"
 msgstr "Por grupo"
 
-#: src/gtkconv.c:6880
+#: ../src/gtkconv.c:8000 src/gtkconv.c:7418
 msgid "By account"
 msgstr "Por cuenta"
 
-#: src/gtkdebug.c:232
+#: ../src/gtkdebug.c:232 src/gtkdebug.c:232
 msgid "Save Debug Log"
 msgstr "Guardar registro de depuración"
 
-#: src/gtkdebug.c:586
+#: ../src/gtkdebug.c:586 src/gtkdebug.c:586
 msgid "Invert"
-msgstr "Insertar"
-
-#: src/gtkdebug.c:589
+msgstr "Invertir"
+
+#: ../src/gtkdebug.c:589 src/gtkdebug.c:589
 msgid "Highlight matches"
 msgstr "Resaltar coincidencias"
 
-#: src/gtkdebug.c:636
+#: ../src/gtkdebug.c:636 src/gtkdebug.c:636
 msgid "Debug Window"
 msgstr "Ventana de depuración"
 
-#: src/gtkdebug.c:689
+#: ../src/gtkdebug.c:689 src/gtkdebug.c:689
 msgid "Clear"
 msgstr "Limpiar"
 
-#: src/gtkdebug.c:698
+#: ../src/gtkdebug.c:698 src/gtkdebug.c:698
 msgid "Pause"
 msgstr "Pausar"
 
-#: src/gtkdebug.c:705 src/gtkdebug.c:706
+#: ../src/gtkdebug.c:705 ../src/gtkdebug.c:706 src/gtkdebug.c:705
+#: src/gtkdebug.c:706
 msgid "Timestamps"
 msgstr "Marcas de tiempo"
 
-#: src/gtkdebug.c:724
+#: ../src/gtkdebug.c:724 src/gtkdebug.c:724
 msgid "Filter"
 msgstr "Filtro"
 
-#: src/gtkdebug.c:743
+#: ../src/gtkdebug.c:743 src/gtkdebug.c:743
 msgid "Right click for more options."
-msgstr "Pulsar el botón derecho para más opciones"
-
-#: src/gtkdialogs.c:59 src/gtkdialogs.c:90
+msgstr "Pulsar el botón derecho para más opciones."
+
+#: ../src/gtkdialogs.c:61 ../src/gtkdialogs.c:100 src/gtkdialogs.c:61
+#: src/gtkdialogs.c:99
 msgid "lead developer"
 msgstr "desarrollador principal"
 
-#: src/gtkdialogs.c:60 src/gtkdialogs.c:63 src/gtkdialogs.c:64
-#: src/gtkdialogs.c:65 src/gtkdialogs.c:66 src/gtkdialogs.c:67
+#: ../src/gtkdialogs.c:62 ../src/gtkdialogs.c:63 ../src/gtkdialogs.c:65
+#: ../src/gtkdialogs.c:67 ../src/gtkdialogs.c:68 ../src/gtkdialogs.c:69
+#: ../src/gtkdialogs.c:70 ../src/gtkdialogs.c:71 ../src/gtkdialogs.c:73
+#: ../src/gtkdialogs.c:74 src/gtkdialogs.c:62 src/gtkdialogs.c:63
+#: src/gtkdialogs.c:65 src/gtkdialogs.c:67 src/gtkdialogs.c:68
 #: src/gtkdialogs.c:69 src/gtkdialogs.c:70 src/gtkdialogs.c:71
+#: src/gtkdialogs.c:73 src/gtkdialogs.c:74
 msgid "developer"
 msgstr "desarrollador"
 
-#: src/gtkdialogs.c:61
-msgid "developer & webmaster"
-msgstr "desarrollador y webmaster"
-
-#: src/gtkdialogs.c:62
+#: ../src/gtkdialogs.c:64 src/gtkdialogs.c:64
 msgid "win32 port"
 msgstr "adaptación a win32"
 
-#: src/gtkdialogs.c:68
+#: ../src/gtkdialogs.c:66 src/gtkdialogs.c:66
+msgid "developer & webmaster"
+msgstr "desarrollador y webmaster"
+
+#: ../src/gtkdialogs.c:72 src/gtkdialogs.c:72
 msgid "support"
 msgstr "soporte"
 
-#: src/gtkdialogs.c:88 src/gtkdialogs.c:91
+#: ../src/gtkdialogs.c:94 ../src/gtkdialogs.c:95 src/gtkdialogs.c:93
+#: src/gtkdialogs.c:94
 msgid "maintainer"
 msgstr "mantenedor"
 
-#: src/gtkdialogs.c:89
+#: ../src/gtkdialogs.c:96 src/gtkdialogs.c:95
 msgid "libfaim maintainer"
-msgstr "desarrollador de libfaim"
-
-#: src/gtkdialogs.c:92
+msgstr "mantenedor de libfaim"
+
+#: ../src/gtkdialogs.c:97 src/gtkdialogs.c:96
+msgid "hacker and designated driver [lazy bum]"
+msgstr "hacker y diseñador de controladores [lazy bum]"
+
+#: ../src/gtkdialogs.c:98 src/gtkdialogs.c:97
 msgid "Jabber developer"
 msgstr "desarrollador de Jabber"
 
-#: src/gtkdialogs.c:93
+#: ../src/gtkdialogs.c:99 src/gtkdialogs.c:98
 msgid "original author"
 msgstr "autor original"
 
-#: src/gtkdialogs.c:94
-msgid "hacker and designated driver [lazy bum]"
-msgstr "hacker y diseñador de controladores [lazy bum]"
-
-#: src/gtkdialogs.c:99 src/gtkdialogs.c:100 src/gtkdialogs.c:144
+#: ../src/gtkdialogs.c:106 ../src/gtkdialogs.c:107 ../src/gtkdialogs.c:158
+#: src/gtkdialogs.c:105 src/gtkdialogs.c:106 src/gtkdialogs.c:154
 msgid "Bulgarian"
 msgstr "Búlgaro"
 
-#: src/gtkdialogs.c:101
+#: ../src/gtkdialogs.c:108 ../src/gtkdialogs.c:109
+msgid "Bengali"
+msgstr "Bengalí"
+
+#: ../src/gtkdialogs.c:110 src/gtkdialogs.c:107
 msgid "Bosnian"
 msgstr "Bosnio"
 
-#: src/gtkdialogs.c:102 src/gtkdialogs.c:145 src/gtkdialogs.c:146
+#: ../src/gtkdialogs.c:111 ../src/gtkdialogs.c:159 ../src/gtkdialogs.c:160
+#: src/gtkdialogs.c:108 src/gtkdialogs.c:155 src/gtkdialogs.c:156
 msgid "Catalan"
 msgstr "Catalán"
 
-#: src/gtkdialogs.c:103 src/gtkdialogs.c:147
+#: ../src/gtkdialogs.c:112 ../src/gtkdialogs.c:161 src/gtkdialogs.c:109
+#: src/gtkdialogs.c:157
 msgid "Czech"
 msgstr "Checo"
 
-#: src/gtkdialogs.c:104
+#: ../src/gtkdialogs.c:113 src/gtkdialogs.c:110
 msgid "Danish"
 msgstr "Danés"
 
-#: src/gtkdialogs.c:105 src/gtkdialogs.c:148
+#: ../src/gtkdialogs.c:114 ../src/gtkdialogs.c:162 src/gtkdialogs.c:111
+#: src/gtkdialogs.c:158
 msgid "German"
 msgstr "Alemán"
 
-#: src/gtkdialogs.c:106
+#: src/gtkdialogs.c:112 src/gtkdialogs.c:113
+msgid "Greek"
+msgstr "Griego"
+
+#: ../src/gtkdialogs.c:117 src/gtkdialogs.c:114
 msgid "Australian English"
 msgstr "Inglés australiano"
 
-#: src/gtkdialogs.c:107
-msgid "British English"
-msgstr "Inglés británico"
-
-#: src/gtkdialogs.c:108
+#: ../src/gtkdialogs.c:118 src/gtkdialogs.c:115
 msgid "Canadian English"
 msgstr "Inglés canadiense"
 
-#: src/gtkdialogs.c:109 src/gtkdialogs.c:149
+#: ../src/gtkdialogs.c:119 src/gtkdialogs.c:116
+msgid "British English"
+msgstr "Inglés británico"
+
+#: ../src/gtkdialogs.c:120 ../src/gtkdialogs.c:163 ../src/gtkdialogs.c:164
+#: ../src/gtkdialogs.c:165 ../src/gtkdialogs.c:166 src/gtkdialogs.c:117
+#: src/gtkdialogs.c:159
 msgid "Spanish"
 msgstr "Español"
 
-#: src/gtkdialogs.c:110 src/gtkdialogs.c:150
+#: ../src/gtkdialogs.c:121 ../src/gtkdialogs.c:167 ../src/gtkdialogs.c:168
+#: src/gtkdialogs.c:118 src/gtkdialogs.c:160
 msgid "Finnish"
 msgstr "Finlandés"
 
-#: src/gtkdialogs.c:111 src/gtkdialogs.c:151
+#: ../src/gtkdialogs.c:122 ../src/gtkdialogs.c:169 ../src/gtkdialogs.c:170
+#: ../src/gtkdialogs.c:171 ../src/gtkdialogs.c:172 src/gtkdialogs.c:119
+#: src/gtkdialogs.c:161
 msgid "French"
 msgstr "Francés"
 
-#: src/gtkdialogs.c:112
+#: ../src/gtkdialogs.c:123 src/gtkdialogs.c:120
 msgid "Hebrew"
 msgstr "Hebreo"
 
-#: src/gtkdialogs.c:113
+#: ../src/gtkdialogs.c:124 src/gtkdialogs.c:121
 msgid "Hindi"
 msgstr "Hindú"
 
-#: src/gtkdialogs.c:114
+#: ../src/gtkdialogs.c:125 src/gtkdialogs.c:122
 msgid "Hungarian"
 msgstr "Húngaro"
 
-#: src/gtkdialogs.c:115 src/gtkdialogs.c:152
+#: ../src/gtkdialogs.c:126 ../src/gtkdialogs.c:173 src/gtkdialogs.c:123
+#: src/gtkdialogs.c:162
 msgid "Italian"
 msgstr "Italiano"
 
-#: src/gtkdialogs.c:116 src/gtkdialogs.c:153
+#: ../src/gtkdialogs.c:127 ../src/gtkdialogs.c:174 ../src/gtkdialogs.c:175
+#: ../src/gtkdialogs.c:176 src/gtkdialogs.c:124 src/gtkdialogs.c:163
 msgid "Japanese"
 msgstr "Japonés"
 
-#: src/gtkdialogs.c:117
-msgid "Lithuanian"
-msgstr "Lituano"
-
-#: src/gtkdialogs.c:118
+#: ../src/gtkdialogs.c:128 ../src/gtkdialogs.c:177 src/gtkdialogs.c:125
 msgid "Georgian"
 msgstr "Georgiano"
 
-#: src/gtkdialogs.c:119 src/gtkdialogs.c:154
+#: ../src/gtkdialogs.c:129 ../src/gtkdialogs.c:178 src/gtkdialogs.c:126
+#: src/gtkdialogs.c:164
 msgid "Korean"
 msgstr "Coreano"
 
-#: src/gtkdialogs.c:120
+#: src/gtkdialogs.c:127
+msgid "Kurdish"
+msgstr "Kurdo"
+
+#: ../src/gtkdialogs.c:131 ../src/gtkdialogs.c:179 src/gtkdialogs.c:128
+msgid "Lithuanian"
+msgstr "Lituano"
+
+#: ../src/gtkdialogs.c:132 src/gtkdialogs.c:129
+msgid "Macedonian"
+msgstr "Macedonio"
+
+#: ../src/gtkdialogs.c:133 src/gtkdialogs.c:130
 msgid "Dutch, Flemish"
 msgstr "Danés, Flamenco"
 
-#: src/gtkdialogs.c:121
-msgid "Macedonian"
-msgstr "Macedonio"
-
-#: src/gtkdialogs.c:122
+#: ../src/gtkdialogs.c:134 src/gtkdialogs.c:131
 msgid "Norwegian"
 msgstr "Noruego"
 
-#: src/gtkdialogs.c:123 src/gtkdialogs.c:124 src/gtkdialogs.c:155
+#: ../src/gtkdialogs.c:135 ../src/gtkdialogs.c:136 ../src/gtkdialogs.c:180
+#: src/gtkdialogs.c:132 src/gtkdialogs.c:133 src/gtkdialogs.c:165
 msgid "Polish"
 msgstr "Polaco"
 
-#: src/gtkdialogs.c:125
+#: ../src/gtkdialogs.c:137 src/gtkdialogs.c:134
 msgid "Portuguese"
 msgstr "Portugués"
 
-#: src/gtkdialogs.c:126
+#: ../src/gtkdialogs.c:138 src/gtkdialogs.c:135
 msgid "Portuguese-Brazil"
 msgstr "Portugués brasileño"
 
-#: src/gtkdialogs.c:127
+#: ../src/gtkdialogs.c:139 src/gtkdialogs.c:136
 msgid "Romanian"
 msgstr "Rumano"
 
-#: src/gtkdialogs.c:128 src/gtkdialogs.c:156 src/gtkdialogs.c:157
+#: ../src/gtkdialogs.c:140 ../src/gtkdialogs.c:181 ../src/gtkdialogs.c:182
+#: src/gtkdialogs.c:137 src/gtkdialogs.c:166 src/gtkdialogs.c:167
 msgid "Russian"
 msgstr "Ruso"
 
-#: src/gtkdialogs.c:129 src/gtkdialogs.c:130
+#: ../src/gtkdialogs.c:141 ../src/gtkdialogs.c:142 src/gtkdialogs.c:138
+#: src/gtkdialogs.c:139
 msgid "Serbian"
-msgstr "Servio"
-
-#: src/gtkdialogs.c:131
+msgstr "Serbio"
+
+#: ../src/gtkdialogs.c:143 src/gtkdialogs.c:140
 msgid "Slovenian"
 msgstr "Esloveno"
 
-#: src/gtkdialogs.c:132 src/gtkdialogs.c:159
+#: ../src/gtkdialogs.c:144 ../src/gtkdialogs.c:184 src/gtkdialogs.c:141
+#: src/gtkdialogs.c:169
 msgid "Swedish"
 msgstr "Sueco"
 
-#: src/gtkdialogs.c:133
+#: ../src/gtkdialogs.c:145 src/gtkdialogs.c:142
+msgid "Tamil"
+msgstr "Tamil"
+
+#: ../src/gtkdialogs.c:146
 msgid "Telugu"
 msgstr "Telugu"
 
-#: src/gtkdialogs.c:134
+#: ../src/gtkdialogs.c:147
+msgid "Turkish"
+msgstr "Turco"
+
+#: ../src/gtkdialogs.c:148 src/gtkdialogs.c:144
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: src/gtkdialogs.c:134
+#: ../src/gtkdialogs.c:148 src/gtkdialogs.c:144
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh y el equipo Gnome-Vi"
 
-#: src/gtkdialogs.c:135 src/gtkdialogs.c:160
+#: ../src/gtkdialogs.c:149 ../src/gtkdialogs.c:185 src/gtkdialogs.c:145
+#: src/gtkdialogs.c:170
 msgid "Simplified Chinese"
 msgstr "Chino simplificado"
 
-#: src/gtkdialogs.c:136 src/gtkdialogs.c:137 src/gtkdialogs.c:161
+#: ../src/gtkdialogs.c:150 ../src/gtkdialogs.c:151 ../src/gtkdialogs.c:186
+#: src/gtkdialogs.c:146 src/gtkdialogs.c:147 src/gtkdialogs.c:171
 msgid "Traditional Chinese"
 msgstr "Chino tradicional"
 
 # Amhario
-#: src/gtkdialogs.c:143
+#: ../src/gtkdialogs.c:157 src/gtkdialogs.c:153
 msgid "Amharic"
 msgstr "Amhárico"
 
-#: src/gtkdialogs.c:158
+#: ../src/gtkdialogs.c:183 src/gtkdialogs.c:168
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: src/gtkdialogs.c:202
+#: ../src/gtkdialogs.c:227 src/gtkdialogs.c:212
 msgid "About Gaim"
 msgstr "Acerca de Gaim"
 
-#: src/gtkdialogs.c:226
+#: ../src/gtkdialogs.c:251
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
-msgstr "Gaim es un cliente modular de mensajería instantánea, capaz de utilizar AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr y Gadu-Gadu al mismo tiempo.  Está escrito usando Gtk+ y está licencia bajo la GPL de GNU.<BR><BR>"
-
-#: src/gtkdialogs.c:235
+"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
+"and Gadu-Gadu all at once.  It is written using GTK+.<BR><BR>You may modify "
+"and redistribute the program under the terms of the GPL (version 2 or "
+"later).  A copy of the GPL is contained in the 'COPYING' file distributed "
+"with Gaim.  Gaim is copyrighted by its contributors.  See the 'COPYRIGHT' "
+"file for the complete list of contributors.  We provide no warranty for this "
+"program.<BR><BR>"
+msgstr "Gaim es un cliente de mensajería modular capaz de utilizar AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, y Gadu-Gadu todos al mismo tiempo. Está escrito utilizando GTK+.<BR><BR>Puede modificar y redistribuir este programa bajo los términos de la GPL (versión 2 o posterior). Se incluye una copia de la licencia GPL en el archivo «COPYING» que se distribuye con Gaim. Las personas que han contribuido a Gaim tienen los derechos de copia. Consulte el archivo «COPYRIGHT» si desea consultar la lista completa de personas que han contribuido. Este programa se distribuye sin ninguna garantía.<BR><BR>"
+
+#: ../src/gtkdialogs.c:265 src/gtkdialogs.c:245
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> canal #wingaim en irc.freenode.net<BR><BR>"
 
-#: src/gtkdialogs.c:238
+#: ../src/gtkdialogs.c:268 src/gtkdialogs.c:248
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> canal #gaim en irc.freenode.net<BR><BR>"
 
-#: src/gtkdialogs.c:244
-msgid "Active Developers"
-msgstr "Desarrolladores en activo"
-
-#: src/gtkdialogs.c:259
+#: src/gtkdialogs.c:254
+msgid "Current Developers"
+msgstr "Desarrolladores actuales"
+
+#: ../src/gtkdialogs.c:289 src/gtkdialogs.c:269
 msgid "Crazy Patch Writers"
 msgstr "Locos escritores de parches"
 
-#: src/gtkdialogs.c:274
+#: ../src/gtkdialogs.c:304 src/gtkdialogs.c:284
 msgid "Retired Developers"
 msgstr "Desarrolladores retirados"
 
-#: src/gtkdialogs.c:289
+#: ../src/gtkdialogs.c:319 src/gtkdialogs.c:299
 msgid "Current Translators"
 msgstr "Traductores actuales"
 
-#: src/gtkdialogs.c:309
+#: ../src/gtkdialogs.c:339 src/gtkdialogs.c:319
 msgid "Past Translators"
 msgstr "Traductores anteriores"
 
-#: src/gtkdialogs.c:327
+#: ../src/gtkdialogs.c:357 src/gtkdialogs.c:337
 msgid "Debugging Information"
 msgstr "Información de depuración"
 
-#: src/gtkdialogs.c:489 src/gtkdialogs.c:630 src/gtkdialogs.c:685
+#: ../src/gtkdialogs.c:553 ../src/gtkdialogs.c:690 ../src/gtkdialogs.c:757
+#: src/gtkdialogs.c:527 src/gtkdialogs.c:664 src/gtkdialogs.c:731
 msgid "_Name"
 msgstr "_Nombre"
 
-#: src/gtkdialogs.c:494 src/gtkdialogs.c:635 src/gtkdialogs.c:690
+#: ../src/gtkdialogs.c:558 ../src/gtkdialogs.c:695 ../src/gtkdialogs.c:762
+#: src/gtkdialogs.c:532 src/gtkdialogs.c:669 src/gtkdialogs.c:736
 msgid "_Account"
 msgstr "_Cuenta"
 
-#: src/gtkdialogs.c:502
+#: ../src/gtkdialogs.c:566 src/gtkdialogs.c:540
 msgid "New Instant Message"
 msgstr "Mensaje instantáneo nuevo"
 
-#: src/gtkdialogs.c:504
+#: ../src/gtkdialogs.c:568 src/gtkdialogs.c:542
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
-msgstr "Introduzca el nombre de usuario o el apodo de la persona con la que quiere comunicarse con MI."
-
-#: src/gtkdialogs.c:643
+msgstr "Introduzca el nombre de usuario o apodo de la persona con la que quiere comunicarse."
+
+#: ../src/gtkdialogs.c:703 src/gtkdialogs.c:677
 msgid "Get User Info"
 msgstr "Obtener datos del usuario"
 
-#: src/gtkdialogs.c:645
+#: ../src/gtkdialogs.c:705 src/gtkdialogs.c:679
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr "Introduzca el nombre de usuario o el apodo de la persona de la cual quiere ver información."
 
-#: src/gtkdialogs.c:699
+#: ../src/gtkdialogs.c:771 src/gtkdialogs.c:745
 msgid "View User Log"
 msgstr "Ver registro de usuario"
 
-#: src/gtkdialogs.c:701
+#: ../src/gtkdialogs.c:773 src/gtkdialogs.c:747
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr "Introduzca el nombre de usuario o el apodo de la persona de la cual quiere ver información de registro."
 
-#: src/gtkdialogs.c:720
+#: ../src/gtkdialogs.c:792 src/gtkdialogs.c:766
 msgid "Alias Contact"
 msgstr "Apodo para contacto"
 
-#: src/gtkdialogs.c:721
+#: ../src/gtkdialogs.c:793 src/gtkdialogs.c:767
 msgid "Enter an alias for this contact."
 msgstr "Introduzca un apodo para este contacto."
 
-#: src/gtkdialogs.c:723 src/gtkdialogs.c:745 src/gtkdialogs.c:765
-#: src/gtkrequest.c:269 src/protocols/silc/chat.c:585
+#: ../src/gtkdialogs.c:795 ../src/gtkdialogs.c:817 ../src/gtkdialogs.c:837
+#: ../src/gtkrequest.c:295 ../src/protocols/silc/chat.c:586
+#: src/gtkdialogs.c:769 src/gtkdialogs.c:791 src/gtkdialogs.c:811
+#: src/gtkrequest.c:295 src/protocols/silc/chat.c:586
 msgid "Alias"
 msgstr "Apodo"
 
-#: src/gtkdialogs.c:741
+#: ../src/gtkdialogs.c:813 src/gtkdialogs.c:787
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Introduzca un alias para %s."
 
-#: src/gtkdialogs.c:743
+#: ../src/gtkdialogs.c:815 src/gtkdialogs.c:789
 msgid "Alias Buddy"
 msgstr "Apodo de amigo"
 
-#: src/gtkdialogs.c:762
+#: ../src/gtkdialogs.c:834 src/gtkdialogs.c:808
 msgid "Alias Chat"
 msgstr "Apodo en el chat"
 
-#: src/gtkdialogs.c:763
+#: ../src/gtkdialogs.c:835 src/gtkdialogs.c:809
 msgid "Enter an alias for this chat."
 msgstr "Introduzca un apodo para este chat."
 
-#: src/gtkdialogs.c:800
+#: ../src/gtkdialogs.c:872 src/gtkdialogs.c:846
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -3079,11 +4022,17 @@
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
 msgstr[0] "Está a punto de borrar el contacto que contiene a %s y a otros %d amigos de su lista de amigos. ¿Desea continuar?"
-msgstr[1] ""
-"Está a punto de borrar el contacto que contiene a %s y a otros %d amigos de "
-"su lista de amigos. ¿Desea continuar?"
-
-#: src/gtkdialogs.c:867
+msgstr[1] "Está a punto de borrar los contactos que contiene a %s y a otros %d amigos de su lista de amigos. ¿Desea continuar?"
+
+#: ../src/gtkdialogs.c:880 src/gtkdialogs.c:854 src/gtkdialogs.c:855
+msgid "Remove Contact"
+msgstr "Eliminar contacto"
+
+#: ../src/gtkdialogs.c:881
+msgid "_Remove Contact"
+msgstr "_Eliminar contacto"
+
+#: ../src/gtkdialogs.c:932 src/gtkdialogs.c:913
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -3092,21 +4041,29 @@
 "Está a punto de borrar el grupo %s junto con todos sus miembros de la lista "
 "de amigos. ¿Desea continuar?"
 
-#: src/gtkdialogs.c:870 src/gtkdialogs.c:871
+#: ../src/gtkdialogs.c:935 src/gtkdialogs.c:916 src/gtkdialogs.c:917
 msgid "Remove Group"
 msgstr "Eliminar grupo"
 
-#: src/gtkdialogs.c:909
+#: ../src/gtkdialogs.c:936
+msgid "_Remove Group"
+msgstr "_Eliminar grupo"
+
+#: ../src/gtkdialogs.c:969 src/gtkdialogs.c:955
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Está a punto eliminar a %s de su lista de amigos. ¿Desea continuar?"
 
-#: src/gtkdialogs.c:912 src/gtkdialogs.c:913
+#: ../src/gtkdialogs.c:972 src/gtkdialogs.c:958 src/gtkdialogs.c:959
 msgid "Remove Buddy"
 msgstr "Eliminar amigo"
 
-#: src/gtkdialogs.c:951
+#: ../src/gtkdialogs.c:973
+msgid "_Remove Buddy"
+msgstr "_Eliminar amigo"
+
+#: ../src/gtkdialogs.c:994 src/gtkdialogs.c:997
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -3114,167 +4071,177 @@
 msgstr ""
 "Está a punto de eliminar el chat %s de su lista de amigos. ¿Desea continuar?"
 
-#: src/gtkdialogs.c:954 src/gtkdialogs.c:955
+#: ../src/gtkdialogs.c:997 src/gtkdialogs.c:1000 src/gtkdialogs.c:1001
 msgid "Remove Chat"
 msgstr "Eliminar chat"
 
-#: src/gtkft.c:138
+#: ../src/gtkdialogs.c:998
+msgid "_Remove Chat"
+msgstr "_Eliminar chat"
+
+#: ../src/gtkft.c:139 src/gtkft.c:139
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KiB/s"
 
-#: src/gtkft.c:159 src/gtkft.c:1035
+#: ../src/gtkft.c:160 ../src/gtkft.c:1063 src/gtkft.c:160 src/gtkft.c:1063
 msgid "Finished"
 msgstr "Terminado"
 
-#: src/gtkft.c:162 src/gtkft.c:986
+#: ../src/gtkft.c:163 ../src/gtkft.c:1003 src/gtkft.c:163 src/gtkft.c:1003
 msgid "Canceled"
 msgstr "Cancelado"
 
-#: src/gtkft.c:165 src/gtkft.c:905
+#: ../src/gtkft.c:166 ../src/gtkft.c:922 src/gtkft.c:166 src/gtkft.c:922
 msgid "Waiting for transfer to begin"
 msgstr "Esperando el comienzo de la transferencia"
 
-#: src/gtkft.c:218
+#: ../src/gtkft.c:219 src/gtkft.c:219
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Recibiendo como:</b>"
 
-#: src/gtkft.c:220
+#: ../src/gtkft.c:221 src/gtkft.c:221
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Recibiendo de:</b>"
 
-#: src/gtkft.c:224
+#: ../src/gtkft.c:225 src/gtkft.c:225
 msgid "<b>Sending To:</b>"
 msgstr "<b>Enviando a:</b>"
 
-#: src/gtkft.c:226
+#: ../src/gtkft.c:227 src/gtkft.c:227
 msgid "<b>Sending As:</b>"
 msgstr "<b>Enviando como:</b>"
 
-#: src/gtkft.c:442
+#: ../src/gtkft.c:443 src/gtkft.c:442
 msgid "There is no application configured to open this type of file."
 msgstr ""
 "No se ha configurado ninguna aplicación para abrir este tipo de archivo."
 
-#: src/gtkft.c:447
+#: ../src/gtkft.c:448 src/gtkft.c:447
 msgid "An error occurred while opening the file."
 msgstr "Se produjo un error al abrir el archivo."
 
-#: src/gtkft.c:467
+#: ../src/gtkft.c:485 src/gtkft.c:484
 #, c-format
 msgid "Error launching %s: %s"
-msgstr "Error al ejecutar %s: %s"
-
-#: src/gtkft.c:476
+msgstr "Error al lanzar %s: %s"
+
+#: ../src/gtkft.c:494 src/gtkft.c:493
 #, c-format
 msgid "Error running %s"
 msgstr "Error al ejecutar %s"
 
-#: src/gtkft.c:477
+#: ../src/gtkft.c:495 src/gtkft.c:494
 #, c-format
 msgid "Process returned error code %d"
 msgstr "El proceso devolvió el código de error %d"
 
-#: src/gtkft.c:572
+#: ../src/gtkft.c:589 src/gtkft.c:588
 msgid "Progress"
 msgstr "Progreso"
 
-#: src/gtkft.c:579
+#: ../src/gtkft.c:596 src/gtkft.c:595
 msgid "Filename"
 msgstr "Nombre de archivo"
 
-#: src/gtkft.c:586
+#: ../src/gtkft.c:603 src/gtkft.c:602
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/gtkft.c:593
+#: ../src/gtkft.c:610 src/gtkft.c:609
 msgid "Remaining"
 msgstr "Restante"
 
-#: src/gtkft.c:624
+#: ../src/gtkft.c:641 src/gtkft.c:640
 msgid "Filename:"
 msgstr "Nombre de archivo:"
 
-#: src/gtkft.c:625
+#: ../src/gtkft.c:642 src/gtkft.c:641
 msgid "Local File:"
-msgstr "Fichero local:"
-
-#: src/gtkft.c:626
+msgstr "Archivo local:"
+
+#: ../src/gtkft.c:643 src/gtkft.c:642
 msgid "Status:"
 msgstr "Estado:"
 
-#: src/gtkft.c:627
+#: ../src/gtkft.c:644 src/gtkft.c:643
 msgid "Speed:"
 msgstr "Velocidad:"
 
-#: src/gtkft.c:628
+#: ../src/gtkft.c:645 src/gtkft.c:644
 msgid "Time Elapsed:"
 msgstr "Tiempo transcurrido:"
 
-#: src/gtkft.c:629
+#: ../src/gtkft.c:646 src/gtkft.c:645
 msgid "Time Remaining:"
 msgstr "Tiempo restante:"
 
-#: src/gtkft.c:715
-msgid "_Keep the dialog open"
-msgstr "Mantener el diálogo _abierto"
-
-#: src/gtkft.c:725
+#: ../src/gtkft.c:708 ../src/protocols/oscar/oscar.c:8546
+#: plugins/docklet/docklet.c:411 src/gtkft.c:707
+#: src/protocols/oscar/oscar.c:8423
+msgid "File Transfers"
+msgstr "Transferencia de archivos"
+
+#: src/gtkft.c:731
+msgid "Close this window when all transfers _finish"
+msgstr "Cerrar esta ventana cuando todas las transferencias terminen"
+
+#: ../src/gtkft.c:741 src/gtkft.c:741
 msgid "C_lear finished transfers"
 msgstr "_Limpiar transferencias terminadas"
 
 #. "Download Details" arrow
-#: src/gtkft.c:734
+#: ../src/gtkft.c:750 src/gtkft.c:750
 msgid "File transfer _details"
-msgstr "_Detalles de la transferencia"
+msgstr "_Detalles de la transferencia de archivos"
 
 #. Pause button
-#: src/gtkft.c:764 src/gtkstock.c:122
+#: ../src/gtkft.c:780 ../src/gtkstock.c:146 src/gtkft.c:780 src/gtkstock.c:143
 msgid "_Pause"
 msgstr "_Pausar"
 
 #. Resume button
-#: src/gtkft.c:774
+#: ../src/gtkft.c:790 src/gtkft.c:790
 msgid "_Resume"
 msgstr "_Continuar"
 
-#: src/gtkft.c:988
+#: ../src/gtkft.c:1005 src/gtkft.c:1005
 msgid "Failed"
 msgstr "Falló"
 
-#: src/gtkimhtml.c:816
-msgid "Pa_ste As Text"
-msgstr "Pe_gar como texto"
-
-#: src/gtkimhtml.c:1313
+#: ../src/gtkimhtml.c:818
+msgid "Paste as Plain _Text"
+msgstr "Pe_gar como texto en claro"
+
+#: ../src/gtkimhtml.c:1316 src/gtkimhtml.c:1313
 msgid "Hyperlink color"
 msgstr "Color de hiperenlace"
 
-#: src/gtkimhtml.c:1314
+#: ../src/gtkimhtml.c:1317 src/gtkimhtml.c:1314
 msgid "Color to draw hyperlinks."
 msgstr "Color para dibujar hiperenlaces."
 
-#: src/gtkimhtml.c:1317
+#: ../src/gtkimhtml.c:1320 src/gtkimhtml.c:1317
 msgid "Hyperlink prelight color"
 msgstr "Color de hiperenlace pre-iluminado"
 
-#: src/gtkimhtml.c:1318
+#: ../src/gtkimhtml.c:1321 src/gtkimhtml.c:1318
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Color para dibujar hiperenlaces cuando el ratón esté encima."
 
-#: src/gtkimhtml.c:1537
+#: ../src/gtkimhtml.c:1542 src/gtkimhtml.c:1537
 msgid "_Copy E-Mail Address"
 msgstr "_Copiar dirección de correo electrónico"
 
-#: src/gtkimhtml.c:1549
+#: ../src/gtkimhtml.c:1554 src/gtkimhtml.c:1549
 msgid "_Open Link in Browser"
 msgstr "_Abrir enlace en navegador"
 
-#: src/gtkimhtml.c:1559
+#: ../src/gtkimhtml.c:1564 src/gtkimhtml.c:1559
 msgid "_Copy Link Location"
 msgstr "_Copiar destino del enlace"
 
-#: src/gtkimhtml.c:3234
+#: ../src/gtkimhtml.c:3261
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -3284,7 +4251,7 @@
 "\n"
 "Tomando PNG por omisión."
 
-#: src/gtkimhtml.c:3237
+#: ../src/gtkimhtml.c:3264
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -3294,18 +4261,18 @@
 "\n"
 "Tomando PNG por omisión."
 
-#: src/gtkimhtml.c:3250
+#: ../src/gtkimhtml.c:3277 src/gtkimhtml.c:3259
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
 "\n"
 "%s"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Se producjo un error al guardar la imagen</span>\n"
+"<span size='larger' weight='bold'>Se produjo un error al guardar la imagen</span>\n"
 "\n"
 "%s"
 
-#: src/gtkimhtml.c:3253
+#: ../src/gtkimhtml.c:3280
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -3316,35 +4283,36 @@
 "\n"
 "%s"
 
-#: src/gtkimhtml.c:3333 src/gtkimhtml.c:3345
+#: ../src/gtkimhtml.c:3360 ../src/gtkimhtml.c:3372 src/gtkimhtml.c:3342
+#: src/gtkimhtml.c:3354
 msgid "Save Image"
 msgstr "Guardar imagen"
 
-#: src/gtkimhtml.c:3373
+#: ../src/gtkimhtml.c:3400 src/gtkimhtml.c:3382
 msgid "_Save Image..."
 msgstr "_Guardar imagen..."
 
-#: src/gtkimhtmltoolbar.c:147
+#: ../src/gtkimhtmltoolbar.c:147 src/gtkimhtmltoolbar.c:147
 msgid "Select Font"
 msgstr "Seleccionar tipografía"
 
-#: src/gtkimhtmltoolbar.c:226
+#: ../src/gtkimhtmltoolbar.c:226 src/gtkimhtmltoolbar.c:226
 msgid "Select Text Color"
 msgstr "Seleccionar el color del texto"
 
-#: src/gtkimhtmltoolbar.c:305
+#: ../src/gtkimhtmltoolbar.c:305 src/gtkimhtmltoolbar.c:305
 msgid "Select Background Color"
 msgstr "Seleccionar el color de fondo"
 
-#: src/gtkimhtmltoolbar.c:394
+#: ../src/gtkimhtmltoolbar.c:394 src/gtkimhtmltoolbar.c:394
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:402
+#: ../src/gtkimhtmltoolbar.c:402 src/gtkimhtmltoolbar.c:402
 msgid "_Description"
 msgstr "_Descripción"
 
-#: src/gtkimhtmltoolbar.c:405
+#: ../src/gtkimhtmltoolbar.c:405 src/gtkimhtmltoolbar.c:405
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -3352,140 +4320,143 @@
 "Introduzca el URL y la descripción del enlace que quiere insertar. La "
 "descripción es opcional."
 
-#: src/gtkimhtmltoolbar.c:409
+#: ../src/gtkimhtmltoolbar.c:409 src/gtkimhtmltoolbar.c:409
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Introduzca el URL del enlace que quiere insertar."
 
-#: src/gtkimhtmltoolbar.c:414
+#: ../src/gtkimhtmltoolbar.c:414 src/gtkimhtmltoolbar.c:414
 msgid "Insert Link"
 msgstr "Insertar enlace"
 
-#: src/gtkimhtmltoolbar.c:418
+#: ../src/gtkimhtmltoolbar.c:418 src/gtkimhtmltoolbar.c:418
 msgid "_Insert"
 msgstr "_Insertar"
 
-#: src/gtkimhtmltoolbar.c:487
+#: ../src/gtkimhtmltoolbar.c:487 src/gtkimhtmltoolbar.c:487
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "No se pudo almacenar la imagen: %s\n"
 
+#: ../src/gtkimhtmltoolbar.c:513 ../src/gtkimhtmltoolbar.c:523
 #: src/gtkimhtmltoolbar.c:513 src/gtkimhtmltoolbar.c:523
 msgid "Insert Image"
 msgstr "Insertar imagen"
 
-#: src/gtkimhtmltoolbar.c:721
+#: ../src/gtkimhtmltoolbar.c:721 src/gtkimhtmltoolbar.c:721
 msgid "This theme has no available smileys."
-msgstr "Este tema no tiene caritas disponibles."
+msgstr "Este tema no tiene emoticonos disponibles."
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:735
+#: ../src/gtkimhtmltoolbar.c:735 src/gtkimhtmltoolbar.c:735
 msgid "Smile!"
 msgstr "¡Sonría!"
 
-#: src/gtkimhtmltoolbar.c:916
+#: ../src/gtkimhtmltoolbar.c:923 src/gtkimhtmltoolbar.c:916
 msgid "Bold"
 msgstr "Negrita"
 
-#: src/gtkimhtmltoolbar.c:927
+#: ../src/gtkimhtmltoolbar.c:934 src/gtkimhtmltoolbar.c:927
 msgid "Italic"
 msgstr "Cursiva"
 
-#: src/gtkimhtmltoolbar.c:938
+#: ../src/gtkimhtmltoolbar.c:945 src/gtkimhtmltoolbar.c:938
 msgid "Underline"
 msgstr "Subrayado"
 
-#: src/gtkimhtmltoolbar.c:954
+#: ../src/gtkimhtmltoolbar.c:961 src/gtkimhtmltoolbar.c:954
 msgid "Larger font size"
 msgstr "Tamaño de tipografía mayor"
 
-#: src/gtkimhtmltoolbar.c:966
+#: ../src/gtkimhtmltoolbar.c:973 src/gtkimhtmltoolbar.c:966
 msgid "Smaller font size"
 msgstr "Tamaño de tipografía menor"
 
-#: src/gtkimhtmltoolbar.c:983
+#: ../src/gtkimhtmltoolbar.c:990 src/gtkimhtmltoolbar.c:983
 msgid "Font Face"
 msgstr "Estilo de tipografía"
 
-#: src/gtkimhtmltoolbar.c:995
+#: ../src/gtkimhtmltoolbar.c:1002 src/gtkimhtmltoolbar.c:995
 msgid "Foreground font color"
 msgstr "Color del texto"
 
-#: src/gtkimhtmltoolbar.c:1007
-msgid "Background color"
-msgstr "Color de fondo"
-
-#: src/gtkimhtmltoolbar.c:1023
+#: ../src/gtkimhtmltoolbar.c:1030 src/gtkimhtmltoolbar.c:1023
 msgid "Clear formatting"
 msgstr "Limpiar formato"
 
-#: src/gtkimhtmltoolbar.c:1038
+#: ../src/gtkimhtmltoolbar.c:1045 src/gtkimhtmltoolbar.c:1038
 msgid "Insert link"
 msgstr "Insertar enlace"
 
-#: src/gtkimhtmltoolbar.c:1048
+#: ../src/gtkimhtmltoolbar.c:1055 src/gtkimhtmltoolbar.c:1048
 msgid "Insert image"
 msgstr "Insertar imagen"
 
 # No estoy muy seguro de usar emoticono, quizás «smiley» sería más apropiado
-#: src/gtkimhtmltoolbar.c:1059
+#: ../src/gtkimhtmltoolbar.c:1066 src/gtkimhtmltoolbar.c:1059
 msgid "Insert smiley"
 msgstr "Insertar emoticono"
 
-#: src/gtklog.c:200
-#, c-format
-msgid "Conversation in %s on %s"
-msgstr "Conversaciones con %s en %s"
-
-#: src/gtklog.c:202
-#, c-format
-msgid "Conversation with %s on %s"
-msgstr "Conversaciones con %s en %s"
-
-#: src/gtklog.c:309
+#: ../src/gtklog.c:202
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
+msgstr "<span weight='bold' size='larger'>Conversación en %s de %s</span>"
+
+#: ../src/gtklog.c:207
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
+msgstr "<span weight='bold' size='larger'>Conversación con %s de %s</span>"
+
+#: ../src/gtklog.c:258
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: ../src/gtklog.c:311 src/gtklog.c:324
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
 msgstr "Sólo se registrarán los eventos del sistema cuando esté habilitada la opción «Registrar todos los cambios de estado en el registro del sistema»."
 
-#: src/gtklog.c:313
+#: ../src/gtklog.c:315 src/gtklog.c:328
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
 msgstr "Sólo se registrarán los mensajes instantáneos si está habilitada la preferencia «Registrar todos los mensajes instantáneos»."
 
-#: src/gtklog.c:316
-msgid ""
-"Chats will only be logged if the \"Log all chats preference\" is enabled."
-msgstr "Sólo se registrarán las charlas si está habilitada la preferencia «Registrar todas las charlas»."
-
-#: src/gtklog.c:320
+#: src/gtklog.c:331
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr ""
+"Los chats sólo serán registrados si la opción \"Registrar todos los chats\" "
+"está habilitada en las preferencias."
+
+#: ../src/gtklog.c:322 src/gtklog.c:335
 msgid "No logs were found"
 msgstr "No se encontraron registros"
 
-#: src/gtklog.c:396
+#: ../src/gtklog.c:398 src/gtklog.c:411
 msgid "Total log size:"
 msgstr "Tamaño total del registro:"
 
-#: src/gtklog.c:472
+#: ../src/gtklog.c:474 src/gtklog.c:487
 #, c-format
 msgid "Conversations in %s"
 msgstr "Conversaciones en %s"
 
-#: src/gtklog.c:480 src/gtklog.c:531
+#: ../src/gtklog.c:482 ../src/gtklog.c:533 src/gtklog.c:495 src/gtklog.c:546
 #, c-format
 msgid "Conversations with %s"
 msgstr "Conversaciones con %s"
 
-#: src/gtklog.c:556
+#: ../src/gtklog.c:558 src/gtklog.c:571
 msgid "System Log"
 msgstr "Registro del Sistema"
 
-#: src/gtkmain.c:326
+#: ../src/gtkmain.c:312 src/gtkmain.c:326
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. Intente `%s -h' para más información.\n"
 
-#: src/gtkmain.c:328
+#: ../src/gtkmain.c:314
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -3502,52 +4473,122 @@
 "Gaim %s\n"
 "Modo de uso: %s [OPCIÓN]...\n"
 "\n"
-"  -c, --config=DIR     utilizar el directorio DIR para los ficheros de configuración\n"
-"  -d, --debug          imprimir mensajes de depuración en la salida estándar\n"
+"  -c, --config=DIR     utilizar el directorio DIR para los ficheros de "
+"configuración\n"
+"  -d, --debug          imprimir mensajes de depuración en la salida "
+"estándar\n"
 "  -h, --help           mostrar este mensaje y salir\n"
 "  -n, --nologin        no conectarse de forma automática\n"
-"  -l, --login[=NOMBRe] conectarse de forma automática (el argumento opción NOMBRE\n"
+"  -l, --login[=NOMBRE] conectarse de forma automática (el argumento opción "
+"NOMBRE\n"
 "                       indica la(s) cuenta(s) a usar, separadas por comas)\n"
 "  -v, --version        mostrar la versión actual y salir\n"
 
-#. TODO: Should save the previous status as a transient status?
-#. Save the newly selected status to prefs.xml and status.xml
-#: src/gtkmain.c:676 src/gtkmain.c:678 src/gtkmain.c:681
-#: src/gtkstatusbox.c:663 src/gtkstatusbox.c:665 src/gtkstatusbox.c:668
-#: src/status.c:1696
-msgid "Default"
-msgstr "Valores por omisión"
-
+#: ../src/gtkmain.c:497
+#, c-format
+msgid ""
+"Gaim has segfaulted and attempted to dump a core file.\n"
+"This is a bug in the software and has happened through\n"
+"no fault of your own.\n"
+"\n"
+"If you can reproduce the crash, please notify the gaim\n"
+"developers by reporting a bug at\n"
+"%sbug.php\n"
+"\n"
+"Please make sure to specify what you were doing at the time\n"
+"and post the backtrace from the core file.  If you do not know\n"
+"how to get the backtrace, please read the instructions at\n"
+"%sgdb.php\n"
+"\n"
+"If you need further assistance, please IM either SeanEgn or \n"
+"LSchiere (via AIM).  Contact information for Sean and Luke \n"
+"on other protocols is at\n"
+"%scontactinfo.php\n"
+msgstr ""
+"Gaim ha tenido un fallo y ha intentado generar un fichero «core»\n"
+"Esto es una errata en el programa y no se ha producido por\n"
+"algo que haya hecho.\n"
+"\n"
+"Si puede reproducir este fallo, por favor, notifíquelo a los \n"
+"desarrolladores de gaim enviando un informe de errata a\n"
+"%sbug.php\n"
+"\n"
+"Asegúrese de que especifica lo que estaba haciendo en el momento\n"
+"de publicar su traza del fichero «core». Si no sabe como\n"
+"obtener una traza consulte las instrucciones disponibles en\n"
+"%sgdb.php\n"
+"\n"
+"Si necesita ayuda puede enviar un MI a SeanEgn o LSchiere (a\n"
+"través de AIM). Puede encontrar la información de cómo \n"
+"contactar con Sean o Luke a través de otros protocolos en\n"
+"%scontactinfo.php\n"
+
+#: src/gtkmedia.c:52
+msgid "Call ended."
+msgstr "Llamada terminada."
+
+#: src/gtkmedia.c:69
+#, c-format
+msgid "Calling %s"
+msgstr "Llamando %s"
+
+#: src/gtkmedia.c:73 src/gtkmedia.c:108
+msgid "End Call"
+msgstr "Terminar llamada"
+
+#: src/gtkmedia.c:81
+#, c-format
+msgid "Receiving call from %s"
+msgstr "Recibiendo llamada de %s"
+
+#: src/gtkmedia.c:89
+msgid "Reject Call"
+msgstr "Rechazar llamada"
+
+#: src/gtkmedia.c:95
+msgid "Accept call"
+msgstr "Aceptar llamada"
+
+#: src/gtkmedia.c:102
+#, c-format
+msgid "Connected to %s"
+msgstr "Conectado a %s"
+
+#: src/gtkmedia.c:113
+msgid "_Mute"
+msgstr "Silenciar"
+
+#: ../src/gtknotify.c:305
+msgid "New Mail"
+msgstr "Nuevo correo"
+
+#: ../src/gtknotify.c:321
+msgid "Open All Messages"
+msgstr "Abrir todos los mensajes"
+
+#: ../src/gtknotify.c:382 ../src/protocols/jabber/jabber.c:1117
+#: src/protocols/jabber/jabber.c:1030
+msgid "From"
+msgstr "De"
+
+#: ../src/gtknotify.c:390
+msgid "Subject"
+msgstr "Asunto"
+
+#: ../src/gtknotify.c:399
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">¡Tiene correo!</span>"
+
+#. #-#-#-#-#  gaim-contributed-2006-01-04.es.po (Gaim)  #-#-#-#-#
 #. Descriptive label
-#: src/gtknotify.c:275
+#: ../src/gtknotify.c:451 src/gtknotify.c:269
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s tiene %d mensaje nuevo."
 msgstr[1] "%s tiene %d nuevos mensajes."
 
-#: src/gtknotify.c:289
-#, c-format
-msgid "<span weight=\"bold\">From:</span> %s\n"
-msgstr "<span weight=\"bold\">De:</span> %s\n"
-
-#: src/gtknotify.c:298
-#, c-format
-msgid "<span weight=\"bold\">Subject:</span> %s\n"
-msgstr "<span weight=\"bold\">Asunto:</span> %s\n"
-
-#: src/gtknotify.c:303
-#, c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
-"\n"
-"%s%s%s%s"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">¡Tiene correo!</span>\n"
-"\n"
-"%s%s%s%s"
-
-#: src/gtknotify.c:319
+#: ../src/gtknotify.c:456 src/gtknotify.c:313
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3558,197 +4599,277 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:504
+#: ../src/gtknotify.c:643 ../src/protocols/sametime/sametime.c:5460
+#: src/gtknotify.c:500
 msgid "Search Results"
 msgstr "Resultados de la búsqueda"
 
-#: src/gtknotify.c:643 src/protocols/oscar/oscar.c:4858
+#: ../src/gtknotify.c:799 ../src/protocols/oscar/oscar.c:4996
+#: src/gtknotify.c:638 src/protocols/oscar/oscar.c:4846
 #, c-format
 msgid "Info for %s"
 msgstr "Información sobre %s:"
 
-#: src/gtknotify.c:644 src/protocols/toc/toc.c:470
+#: ../src/gtknotify.c:800 ../src/protocols/toc/toc.c:470 src/gtknotify.c:639
+#: src/protocols/toc/toc.c:470
 msgid "Buddy Information"
 msgstr "Información de amigos"
 
-#: src/gtknotify.c:687
+#: ../src/gtknotify.c:840 src/gtknotify.c:681
 #, c-format
 msgid "The browser command <b>%s</b> is invalid."
 msgstr "La orden de navegador <b>%s</b> no es válida."
 
-#: src/gtknotify.c:689 src/gtknotify.c:701 src/gtknotify.c:714
-#: src/gtknotify.c:838
+#: ../src/gtknotify.c:842 ../src/gtknotify.c:854 ../src/gtknotify.c:867
+#: ../src/gtknotify.c:992 src/gtknotify.c:683 src/gtknotify.c:695
+#: src/gtknotify.c:708 src/gtknotify.c:833
 msgid "Unable to open URL"
 msgstr "No se pudo abrir la URL"
 
-#: src/gtknotify.c:699 src/gtknotify.c:712
+#: ../src/gtknotify.c:852 ../src/gtknotify.c:865 src/gtknotify.c:693
+#: src/gtknotify.c:706
 #, c-format
 msgid "Error launching <b>%s</b>: %s"
 msgstr "Error al ejecutar <b>%s</b>: %s"
 
-#: src/gtknotify.c:839
+#: ../src/gtknotify.c:993 src/gtknotify.c:834
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 "Se ha definido un navegador «Manual», pero no se ha definido ningún comando "
 "para ejecutarlo."
 
-#: src/gtkpounce.c:130
+#: ../src/gtkplugin.c:275
+msgid "The following plugins will be unloaded."
+msgstr "Se van a desactivar los siguientes complementos."
+
+#: ../src/gtkplugin.c:294
+msgid "Multiple plugins will be unloaded."
+msgstr "Se desactivarán múltiples complementos."
+
+#: ../src/gtkplugin.c:296
+msgid "Unload Plugins"
+msgstr "Desactivar complementos"
+
+#: ../src/gtkplugin.c:410
+#, c-format
+msgid ""
+"%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
+"<span weight=\"bold\">Website:</span>\t\t%s\n"
+"<span weight=\"bold\">Filename:</span>\t\t%s"
+msgstr ""
+"%s%s<span weight=\"bold\">Escrito por:</span>\t%s\n"
+"<span weight=\"bold\">Sitio Web:</span>\t\t%s\n"
+"<span weight=\"bold\">Nombre del archivo:</span>\t\t%s"
+
+#: ../src/gtkplugin.c:420
+#, c-format
+msgid ""
+"%s\n"
+"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
+"Check the plugin website for an update.</span>"
+msgstr ""
+"%s\n"
+"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\\n\n"
+"Compruebe el sitio web del complemento para obtener una actualización.</span>"
+
+#: src/gtkplugin.c:388
+msgid "Configure Pl_ugin"
+msgstr "Configurar complemento"
+
+#: src/gtkplugin.c:437
+msgid "<b>Plugin Details</b>"
+msgstr "<b>Detalles del complemento</b>"
+
+#: ../src/gtkpounce.c:162 src/gtkpounce.c:157
 msgid "Select a file"
 msgstr "Seleccione un archivo"
 
-#: src/gtkpounce.c:161
+#: ../src/gtkpounce.c:259 src/gtkpounce.c:254
 msgid "Please enter a buddy to pounce."
 msgstr "Indique el amigo del que avisar."
 
-#. "New Buddy Pounce"
-#: src/gtkpounce.c:391 src/gtkpounce.c:898
+#: ../src/gtkpounce.c:503 src/gtkpounce.c:476
 msgid "New Buddy Pounce"
 msgstr "Nuevo aviso de amigo"
 
-#: src/gtkpounce.c:391
+#: ../src/gtkpounce.c:503 src/gtkpounce.c:476
 msgid "Edit Buddy Pounce"
 msgstr "Editar aviso de amigo"
 
-#. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:408
-msgid "Pounce Who"
-msgstr "Avisar a quién"
-
-#: src/gtkpounce.c:435
+#. Create the "Pounce on Whom" frame.
+#: ../src/gtkpounce.c:520
+msgid "Pounce on Whom"
+msgstr "A quién avisar"
+
+#: ../src/gtkpounce.c:547 src/gtkpounce.c:520
 msgid "_Buddy name:"
 msgstr "Nombre del _amigo:"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:459
-msgid "Pounce When"
-msgstr "Cuándo avisar"
-
-#: src/gtkpounce.c:467
-msgid "Si_gn on"
+#: src/gtkpounce.c:544
+msgid "Pounce When Buddy..."
+msgstr "Avisar cuando un amigo..."
+
+#: src/gtkpounce.c:552
+msgid "Si_gns on"
 msgstr "_Conectarse"
 
-#: src/gtkpounce.c:469
-msgid "Sign _off"
+#: src/gtkpounce.c:554
+msgid "Signs o_ff"
 msgstr "_Desconectarse"
 
-#: src/gtkpounce.c:471
-msgid "A_way"
-msgstr "_Ausente"
-
-#: src/gtkpounce.c:473
-msgid "_Return from away"
+#: src/gtkpounce.c:556
+msgid "Goes a_way"
+msgstr "El amigo se _ausenta"
+
+#: src/gtkpounce.c:558
+msgid "Ret_urns from away"
 msgstr "_Dejar de estar ausente"
 
-#: src/gtkpounce.c:475
-msgid "_Idle"
-msgstr "_Inactivo"
-
-#: src/gtkpounce.c:477
-msgid "Retur_n from idle"
-msgstr "Dejar de estar i_nactivo"
-
-#: src/gtkpounce.c:479
-msgid "Buddy starts _typing"
+#: src/gtkpounce.c:560
+msgid "Becomes _idle"
+msgstr "Ahora está inactivo"
+
+#: src/gtkpounce.c:562
+msgid "Is no longer i_dle"
+msgstr "Ya no está inactivo."
+
+#: src/gtkpounce.c:564
+msgid "Starts _typing"
 msgstr "El amigo empieza a _escribir"
 
-#: src/gtkpounce.c:481
-msgid "Buddy stops t_yping"
+#: src/gtkpounce.c:566
+msgid "Stops t_yping"
 msgstr "El amigo deja de escribi_r"
 
-#. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:510
-msgid "Pounce Action"
-msgstr "Acción del aviso"
-
-#: src/gtkpounce.c:518
-msgid "Op_en an IM window"
+#: ../src/gtkpounce.c:595
+msgid "Sends a _message"
+msgstr "Envía un _mensaje"
+
+#. Create the "Action" frame.
+#: ../src/gtkpounce.c:627
+msgid "Action"
+msgstr "Acción"
+
+#: src/gtkpounce.c:603
+msgid "Ope_n an IM window"
 msgstr "_Abrir una ventana de MI"
 
-#: src/gtkpounce.c:520
-msgid "_Popup notification"
+#: src/gtkpounce.c:605
+msgid "_Pop up a notification"
 msgstr "_Notificación con una ventana emergente"
 
-#: src/gtkpounce.c:522
+#: ../src/gtkpounce.c:639 src/gtkpounce.c:607
 msgid "Send a _message"
 msgstr "Enviar un _mensaje"
 
-#: src/gtkpounce.c:524
+#: ../src/gtkpounce.c:641 src/gtkpounce.c:609
 msgid "E_xecute a command"
 msgstr "E_jecutar una orden"
 
-#: src/gtkpounce.c:526
+#: ../src/gtkpounce.c:643 src/gtkpounce.c:611
 msgid "P_lay a sound"
 msgstr "Re_producir un sonido"
 
 # Examinar puede ser también válido, comprobar, jfs.
-#: src/gtkpounce.c:530
-msgid "B_rowse..."
+#: src/gtkpounce.c:615
+msgid "Brows_e..."
 msgstr "_Navegar..."
 
 # Examinar puede ser también válido, comprobar, jfs.
-#: src/gtkpounce.c:532
-msgid "Bro_wse..."
+#: src/gtkpounce.c:617
+msgid "Br_owse..."
 msgstr "_Navegar..."
 
-#: src/gtkpounce.c:533
+#: ../src/gtkpounce.c:651 src/gtkpounce.c:618
 msgid "Pre_view"
 msgstr "Pre_visualizar"
 
-#: src/gtkpounce.c:616
-msgid "Sav_e this pounce after activation"
-msgstr "_Guardar este aviso tras la activación"
-
-#. "Remove Buddy Pounce"
-#: src/gtkpounce.c:906
-msgid "Remove Buddy Pounce"
-msgstr "Quitar aviso de amigo"
-
-#: src/gtkpounce.c:964
+#. Create the "Options" frame.
+#: ../src/gtkpounce.c:763
+msgid "Options"
+msgstr "Opciones"
+
+#: ../src/gtkpounce.c:771
+msgid "P_ounce only when my status is not available"
+msgstr "Sólo _avisar cuando mi estado no está disponible"
+
+#: ../src/gtkpounce.c:776 src/gtkpounce.c:701
+msgid "_Recurring"
+msgstr "_Recurrente"
+
+#: src/gtkpounce.c:997
+#, c-format
+msgid "Are you sure you want to delete the pounce on %s for %s?"
+msgstr "¿Está seguro que desea borrar el aviso en %s para %s?"
+
+#: ../src/gtkpounce.c:1238 src/gtkpounce.c:1145
+msgid "Pounce Target"
+msgstr "Objetivo a avisar"
+
+#: ../src/gtkpounce.c:1273 src/gtkpounce.c:1180
+msgid "Recurring"
+msgstr "Recurrente"
+
+#: src/gtkpounce.c:1227
+msgid "Buddy Pounces"
+msgstr "Avisos de amigos"
+
+#: ../src/gtkpounce.c:1447 src/gtkpounce.c:1345
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s ha comenzado a escribirle algo (%s)"
 
-#: src/gtkpounce.c:966
+#: ../src/gtkpounce.c:1449 src/gtkpounce.c:1347
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s se ha conectado (%s)"
 
-#: src/gtkpounce.c:968
+#: ../src/gtkpounce.c:1451 src/gtkpounce.c:1349
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s volvió de su inactividad (%s)"
 
-#: src/gtkpounce.c:970
+#: ../src/gtkpounce.c:1453 src/gtkpounce.c:1351
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s ha dejado de estar ausente (%s)"
 
-#: src/gtkpounce.c:972
+#: ../src/gtkpounce.c:1455 src/gtkpounce.c:1353
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s ha dejado de escribirle (%s)"
 
-#: src/gtkpounce.c:974
+#: ../src/gtkpounce.c:1457 src/gtkpounce.c:1355
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s se ha desconectado (%s)"
 
-#: src/gtkpounce.c:976
+#: ../src/gtkpounce.c:1459 src/gtkpounce.c:1357
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s está inactivo (%s)"
 
-#: src/gtkpounce.c:978
+#: ../src/gtkpounce.c:1461 src/gtkpounce.c:1359
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s se ha marchado. (%s)"
 
-#: src/gtkpounce.c:979
+#: ../src/gtkpounce.c:1463
+#, c-format
+msgid "%s has sent you a message. (%s)"
+msgstr "%s le ha enviado un mensaje. (%s)"
+
+#: ../src/gtkpounce.c:1464 src/gtkpounce.c:1360
 msgid "Unknown pounce event. Please report this!"
 msgstr "Evento de aviso desconocido. ¡Por favor, informe de esto! "
 
-#: src/gtkprefs.c:623
+#: src/gtkprefs.c:511
+msgid "Smiley theme failed to unpack."
+msgstr "Falló el desempaque de tema de emoticonos"
+
+#: ../src/gtkprefs.c:638 src/gtkprefs.c:630
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -3756,40 +4877,55 @@
 "Seleccione de la lista inferior el tema de emoticonos que desee. Puede "
 "instalar temas nuevos arrastrándolos y soltándolos sobre esta lista de temas."
 
-#: src/gtkprefs.c:658
+#: ../src/gtkprefs.c:673 src/gtkprefs.c:665
 msgid "Icon"
 msgstr "Icono"
 
-#: src/gtkprefs.c:665 src/protocols/jabber/buddy.c:267
+#: ../src/gtkprefs.c:680 ../src/protocols/jabber/buddy.c:267
+#: ../src/protocols/jabber/buddy.c:818 ../src/protocols/jabber/chat.c:769
+#: src/gtkprefs.c:672 src/protocols/jabber/buddy.c:267
 #: src/protocols/jabber/buddy.c:811 src/protocols/jabber/chat.c:769
 msgid "Description"
 msgstr "Descripción"
 
-#: src/gtkprefs.c:805
+#: src/gtkprefs.c:814
+msgid "_Hide new IM conversations"
+msgstr "Ocultar nuevas conversaciones de mensajes instantáneos"
+
+#: ../src/gtkprefs.c:824 ../src/gtkprefs.c:1764 src/gtkprefs.c:817
+#: src/gtkprefs.c:1666
+msgid "When away"
+msgstr "Cuando está ausente"
+
+#: ../src/gtkprefs.c:828 src/gtkprefs.c:821
 msgid "Send unknown \"_slash\" commands as messages"
 msgstr "Enviar órdenes «_slash» desconocidas como mensajes"
 
-#: src/gtkprefs.c:807
+#: ../src/gtkprefs.c:830 src/gtkprefs.c:823
 msgid "Show _formatting on incoming messages"
-msgstr "Ignorar el _formato de los mensajes entrantes"
-
-#: src/gtkprefs.c:809
+msgstr "Mostrar el _formato de los mensajes entrantes"
+
+#: ../src/gtkprefs.c:833 src/gtkprefs.c:826
 msgid "Show buddy _icons"
 msgstr "Mostrar _iconos de los amigos"
 
-#: src/gtkprefs.c:811
+#: ../src/gtkprefs.c:835 src/gtkprefs.c:828
 msgid "Enable buddy ic_on animation"
 msgstr "Habilitar animaciones en los i_conos de amigos"
 
-#: src/gtkprefs.c:813
+#: ../src/gtkprefs.c:842 src/gtkprefs.c:835
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Notificar a los amigos cuando les esté escribiendo"
 
-#: src/gtkprefs.c:816
-msgid "_Highlight misspelled words"
+#: src/gtkprefs.c:838
+msgid "Highlight _misspelled words"
 msgstr "_Resaltar las faltas de ortografía"
 
-#: src/gtkprefs.c:834
+#: ../src/gtkprefs.c:849
+msgid "Use smooth-scrolling"
+msgstr "Utilizar paginado suave"
+
+#: ../src/gtkprefs.c:865 src/gtkprefs.c:856
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -3798,160 +4934,161 @@
 "soportan formatos. :)"
 
 #. All the tab options!
-#: src/gtkprefs.c:856
+#: ../src/gtkprefs.c:887 src/gtkprefs.c:878
 msgid "Tab Options"
 msgstr "Opciones de las solapas"
 
-#: src/gtkprefs.c:858
+#: ../src/gtkprefs.c:889 src/gtkprefs.c:880
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Mostrar MIs y chats en ventanas con solapas."
 
-#: src/gtkprefs.c:872
+#: ../src/gtkprefs.c:903 src/gtkprefs.c:894
 msgid "Show close b_utton on tabs"
 msgstr "Mostrar botones de _cierre en las solapas"
 
-#: src/gtkprefs.c:878
+#: ../src/gtkprefs.c:909 src/gtkprefs.c:900
 msgid "_Placement:"
-msgstr "_Ubicación:"
-
-#: src/gtkprefs.c:880
+msgstr "_Colocación:"
+
+#: ../src/gtkprefs.c:911 src/gtkprefs.c:902
 msgid "Top"
 msgstr "Arriba"
 
-#: src/gtkprefs.c:881
+#: ../src/gtkprefs.c:912 src/gtkprefs.c:903
 msgid "Bottom"
 msgstr "Abajo"
 
-#: src/gtkprefs.c:882
+#: ../src/gtkprefs.c:913 src/gtkprefs.c:904
 msgid "Left"
 msgstr "Izquierda"
 
-#: src/gtkprefs.c:883
+#: ../src/gtkprefs.c:914 src/gtkprefs.c:905
 msgid "Right"
 msgstr "Derecha"
 
-#: src/gtkprefs.c:885
+#: ../src/gtkprefs.c:916 src/gtkprefs.c:907
 msgid "Left Vertical"
 msgstr "Vertical a la izquierda"
 
-#: src/gtkprefs.c:886
+#: ../src/gtkprefs.c:917 src/gtkprefs.c:908
 msgid "Right Vertical"
 msgstr "Vertical a la derecha"
 
-#: src/gtkprefs.c:891
+#: ../src/gtkprefs.c:922 src/gtkprefs.c:913
 msgid "N_ew conversations:"
-msgstr "_Nueva conversación"
-
-#: src/gtkprefs.c:942 src/protocols/oscar/oscar.c:779
-#: src/protocols/oscar/oscar.c:5959
+msgstr "_Nuevas conversaciones:"
+
+#: ../src/gtkprefs.c:973 ../src/protocols/oscar/oscar.c:805
+#: ../src/protocols/oscar/oscar.c:6107 src/gtkprefs.c:964
+#: src/protocols/oscar/oscar.c:779 src/protocols/oscar/oscar.c:6001
 msgid "IP Address"
 msgstr "Dirección IP"
 
-#: src/gtkprefs.c:944
-msgid "STUN Server:"
-msgstr "Servidor STUN:"
-
-#: src/gtkprefs.c:946
-msgid "_Autodetect IP Address"
-msgstr "_Autodetectar la dirección IP"
-
-#: src/gtkprefs.c:955
+#: src/gtkprefs.c:966
+msgid "ST_UN server:"
+msgstr "Servidor ST_UN:"
+
+#: src/gtkprefs.c:968
+msgid "_Autodetect IP address"
+msgstr "_Auto detectar la dirección IP"
+
+#: ../src/gtkprefs.c:986 src/gtkprefs.c:977
 msgid "Public _IP:"
 msgstr "_IP pública:"
 
-#: src/gtkprefs.c:979
+#: ../src/gtkprefs.c:1014 src/gtkprefs.c:1001
 msgid "Ports"
 msgstr "Puertos"
 
-#: src/gtkprefs.c:982
+#: ../src/gtkprefs.c:1017 src/gtkprefs.c:1004
 msgid "_Manually specify range of ports to listen on"
 msgstr "Especificar _manualmente el rango de puertos en el que se escuchará"
 
-#: src/gtkprefs.c:985
-msgid "_Start Port:"
+#: src/gtkprefs.c:1007
+msgid "_Start port:"
 msgstr "Puerto _inicial:"
 
-#: src/gtkprefs.c:992
-msgid "_End Port:"
+#: src/gtkprefs.c:1014
+msgid "_End port:"
 msgstr "Puerto _final:"
 
-#: src/gtkprefs.c:999
+#: ../src/gtkprefs.c:1035 src/gtkprefs.c:1022
 msgid "Proxy Server"
 msgstr "Servidor proxy"
 
-#: src/gtkprefs.c:1003
+#: ../src/gtkprefs.c:1039 src/gtkprefs.c:1026
 msgid "No proxy"
 msgstr "Sin proxy"
 
-#: src/gtkprefs.c:1059
+#: ../src/gtkprefs.c:1095 src/gtkprefs.c:1082
 msgid "_User:"
 msgstr "_Usuario:"
 
-#: src/gtkprefs.c:1119
+#: ../src/gtkprefs.c:1157 src/gtkprefs.c:1144
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: src/gtkprefs.c:1120
+#: ../src/gtkprefs.c:1158 src/gtkprefs.c:1145
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1121
+#: ../src/gtkprefs.c:1159 src/gtkprefs.c:1146
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1122
+#: ../src/gtkprefs.c:1160 src/gtkprefs.c:1147
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1123
+#: ../src/gtkprefs.c:1161 src/gtkprefs.c:1148
 msgid "GNOME Default"
 msgstr "Valores por omisión de Gnome"
 
-#: src/gtkprefs.c:1124
+#: ../src/gtkprefs.c:1162 src/gtkprefs.c:1149
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1125
+#: ../src/gtkprefs.c:1163 src/gtkprefs.c:1150
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1126
+#: ../src/gtkprefs.c:1164 src/gtkprefs.c:1151
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1127
+#: ../src/gtkprefs.c:1165 src/gtkprefs.c:1152
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1136
+#: ../src/gtkprefs.c:1174 src/gtkprefs.c:1161
 msgid "Manual"
 msgstr "Manual"
 
-#: src/gtkprefs.c:1189
+#: ../src/gtkprefs.c:1227 src/gtkprefs.c:1214
 msgid "Browser Selection"
 msgstr "Selección de navegador"
 
-#: src/gtkprefs.c:1193
+#: ../src/gtkprefs.c:1231 src/gtkprefs.c:1218
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: src/gtkprefs.c:1201
+#: ../src/gtkprefs.c:1239 src/gtkprefs.c:1226
 msgid "_Open link in:"
 msgstr "_Abrir enlace en:"
 
-#: src/gtkprefs.c:1203
+#: ../src/gtkprefs.c:1241 src/gtkprefs.c:1228
 msgid "Browser default"
 msgstr "Navegador por omisión"
 
-#: src/gtkprefs.c:1204
+#: ../src/gtkprefs.c:1242 src/gtkprefs.c:1229
 msgid "Existing window"
 msgstr "Ventana existente"
 
-#: src/gtkprefs.c:1206
+#: ../src/gtkprefs.c:1244 src/gtkprefs.c:1231
 msgid "New tab"
 msgstr "Nueva pestaña"
 
-#: src/gtkprefs.c:1220
+#: ../src/gtkprefs.c:1258 src/gtkprefs.c:1245
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3960,55 +5097,85 @@
 "_Manual:\n"
 "(%s para URL)"
 
-#: src/gtkprefs.c:1256 src/gtkprefs.c:1738
+#: ../src/gtkprefs.c:1294 ../src/gtkprefs.c:1875 src/gtkprefs.c:1281
+#: src/gtkprefs.c:1754
 msgid "Logging"
 msgstr "Registro"
 
-#: src/gtkprefs.c:1259
-msgid "Log _Format:"
+#: src/gtkprefs.c:1284
+msgid "Log _format:"
 msgstr "Formato de _registro:"
 
-#: src/gtkprefs.c:1264
+#: ../src/gtkprefs.c:1302 src/gtkprefs.c:1289
 msgid "Log all _instant messages"
-msgstr "Registrar _todos los mensajes instantáneos"
-
-#: src/gtkprefs.c:1266
+msgstr "Registrar todos los mensajes _instantáneos"
+
+#: ../src/gtkprefs.c:1304 src/gtkprefs.c:1291
 msgid "Log all c_hats"
 msgstr "Registrar todas las _charlas"
 
-#: src/gtkprefs.c:1268
+#: ../src/gtkprefs.c:1306 src/gtkprefs.c:1293
 msgid "Log all _status changes to system log"
 msgstr "Registrar todos los cambios de _estado en el registro del sistema"
 
-#: src/gtkprefs.c:1400
+#: ../src/gtkprefs.c:1454 src/gtkprefs.c:1425
 msgid "Sound Selection"
 msgstr "Selección de sonido"
 
-#: src/gtkprefs.c:1454
+#: ../src/gtkprefs.c:1462
+msgid "Quietest"
+msgstr "El más silencioso"
+
+#: ../src/gtkprefs.c:1464
+msgid "Quieter"
+msgstr "Más silencioso"
+
+#: ../src/gtkprefs.c:1466
+msgid "Quiet"
+msgstr "Silencio"
+
+#: ../src/gtkprefs.c:1468 ../src/protocols/silc/silc.c:666
+#: src/protocols/silc/silc.c:656
+msgid "Normal"
+msgstr "Normal"
+
+#: ../src/gtkprefs.c:1470
+msgid "Loud"
+msgstr "Ruidoso"
+
+#: ../src/gtkprefs.c:1472
+msgid "Louder"
+msgstr "Más ruidoso"
+
+#: ../src/gtkprefs.c:1474
+msgid "Loudest"
+msgstr "El más ruidoso"
+
+#: ../src/gtkprefs.c:1537 src/gtkprefs.c:1479
 msgid "Sound Method"
 msgstr "Método para reproducir sonidos"
 
-#: src/gtkprefs.c:1455
+#: ../src/gtkprefs.c:1538 src/gtkprefs.c:1480
 msgid "_Method:"
 msgstr "_Método:"
 
-#: src/gtkprefs.c:1457
+#: ../src/gtkprefs.c:1540 src/gtkprefs.c:1482
 msgid "Console beep"
 msgstr "Timbre de la consola"
 
-#: src/gtkprefs.c:1459
+#: ../src/gtkprefs.c:1542 src/gtkprefs.c:1484
 msgid "Automatic"
 msgstr "Automático"
 
-#: src/gtkprefs.c:1464
+#: ../src/gtkprefs.c:1547 src/gtkprefs.c:1489
 msgid "Command"
 msgstr "Comando"
 
-#: src/gtkprefs.c:1465
+#: ../src/gtkprefs.c:1548 src/gtkprefs.c:1490
 msgid "No sounds"
 msgstr "Sin sonido"
 
-#: src/gtkprefs.c:1473
+#: ../src/gtkprefs.c:1556 src/gtkprefs.c:1498
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4017,364 +5184,438 @@
 "_Comando para sonido:\n"
 "(%s para nombre de archivo)"
 
-#: src/gtkprefs.c:1499
+#: ../src/gtkprefs.c:1582 src/gtkprefs.c:1524
 msgid "Sound Options"
 msgstr "Opciones de sonido"
 
-#: src/gtkprefs.c:1500
+#: ../src/gtkprefs.c:1583 src/gtkprefs.c:1525
 msgid "Sounds when conversation has _focus"
 msgstr "Suena cuando la conversación obtiene el _foco"
 
-#: src/gtkprefs.c:1502
+#: ../src/gtkprefs.c:1585 src/gtkprefs.c:1527
 msgid "_Sounds while away"
 msgstr "_Sonidos mientras vd. está ausente"
 
-#: src/gtkprefs.c:1512
+#: ../src/gtkprefs.c:1592
+msgid "Volume:"
+msgstr "Volumen:"
+
+#: ../src/gtkprefs.c:1620 src/gtkprefs.c:1537
 msgid "Sound Events"
 msgstr "Eventos de sonido"
 
-#: src/gtkprefs.c:1563
+#: ../src/gtkprefs.c:1671 src/gtkprefs.c:1588
 msgid "Play"
 msgstr "Reproducir"
 
-#: src/gtkprefs.c:1570
+#: ../src/gtkprefs.c:1678 src/gtkprefs.c:1595
 msgid "Event"
 msgstr "Acontecimiento"
 
-#: src/gtkprefs.c:1589
+#: ../src/gtkprefs.c:1697 src/gtkprefs.c:1614
 msgid "Test"
 msgstr "Probar"
 
-#: src/gtkprefs.c:1593
+#: ../src/gtkprefs.c:1701 src/gtkprefs.c:1618
 msgid "Reset"
 msgstr "Restablecer"
 
-#: src/gtkprefs.c:1597
+#: ../src/gtkprefs.c:1705 src/gtkprefs.c:1622
 msgid "Choose..."
 msgstr "Seleccionar..."
 
-#: src/gtkprefs.c:1651 src/gtkstatusbox.c:295
-#: src/protocols/bonjour/bonjour.c:240 src/protocols/irc/irc.c:176
-#: src/protocols/irc/msgs.c:221 src/protocols/jabber/buddy.c:1093
-#: src/protocols/jabber/jabber.c:1055 src/protocols/msn/msn.c:577
-#: src/protocols/novell/novell.c:2825 src/protocols/novell/novell.c:2959
-#: src/protocols/novell/novell.c:3041 src/protocols/oscar/oscar.c:707
-#: src/protocols/oscar/oscar.c:6516 src/protocols/oscar/oscar.c:6585
-#: src/protocols/oscar/oscar.c:7610 src/protocols/oscar/oscar.c:7764
-#: src/protocols/sametime/sametime.c:2764 src/protocols/silc/buddy.c:1417
-#: src/protocols/silc/silc.c:52 src/protocols/yahoo/yahoo.c:3225
-#: src/protocols/zephyr/zephyr.c:2259 src/status.c:158
-msgid "Away"
-msgstr "Ausente"
-
-#: src/gtkprefs.c:1652
-msgid "_Queue new messages when away"
-msgstr "En_colar mensajes nuevos durante las ausencias"
-
-#: src/gtkprefs.c:1655
+#: ../src/gtkprefs.c:1747
+msgid "_Report idle time:"
+msgstr "Mostrar el _tiempo de inactividad"
+
+#: ../src/gtkprefs.c:1750
+msgid "From last sent message"
+msgstr "Del último mensaje enviado"
+
+#: ../src/gtkprefs.c:1752
+msgid "Based on keyboard or mouse use"
+msgstr "Basado en teclado o en uso de ratón"
+
+#: ../src/gtkprefs.c:1761 src/gtkprefs.c:1663
 msgid "_Auto-reply:"
 msgstr "Respuesta _automática:"
 
-#: src/gtkprefs.c:1658
-msgid "When away"
-msgstr "Cuando está ausente"
-
-#: src/gtkprefs.c:1659
+#: ../src/gtkprefs.c:1765 src/gtkprefs.c:1667
 msgid "When both away and idle"
 msgstr "Cuando está ausente e inactivo"
 
-#: src/gtkprefs.c:1662
-msgid "_Report idle time"
-msgstr "Mostrar el _tiempo de inactividad"
-
-#: src/gtkprefs.c:1665
+#. #-#-#-#-#  es.po (Gaim)  #-#-#-#-#
+#. Auto-away stuff
+#: ../src/gtkprefs.c:1771 src/gtkprefs.c:1673
 msgid "Auto-away"
 msgstr "Auto-ausencia"
 
-#: src/gtkprefs.c:1666
+#: ../src/gtkprefs.c:1773 src/gtkprefs.c:1674
 msgid "Change status when _idle"
 msgstr "Cambiar el estado cuando esté _inactivo"
 
-#: src/gtkprefs.c:1670
+#: ../src/gtkprefs.c:1777 src/gtkprefs.c:1678
 msgid "_Minutes before changing status:"
 msgstr "_Minutos antes de cambiar el estado:"
 
-#: src/gtkprefs.c:1678
+#: ../src/gtkprefs.c:1785 src/gtkprefs.c:1686
 msgid "Change _status to:"
 msgstr "Cambiar _estado a:"
 
-#: src/gtkprefs.c:1728
+#. Signon status stuff
+#: ../src/gtkprefs.c:1806
+msgid "Status at startup"
+msgstr "Estado al arrancar"
+
+#: ../src/gtkprefs.c:1808
+msgid "Use status from last _exit at startup"
+msgstr "Utilizar el estado de mi última _salida al empezar"
+
+#: ../src/gtkprefs.c:1814
+msgid "Status to a_pply at startup:"
+msgstr "Estado a _aplicar al empezar:"
+
+#: ../src/gtkprefs.c:1865 src/gtkprefs.c:1744
 msgid "Smiley Themes"
 msgstr "Temas de emoticonos"
 
-#: src/gtkprefs.c:1729
+#: ../src/gtkprefs.c:1866 src/gtkprefs.c:1745
 msgid "Sounds"
 msgstr "Sonidos"
 
-#: src/gtkprefs.c:1730 src/protocols/silc/silc.c:1589
+#: ../src/gtkprefs.c:1867 ../src/protocols/silc/silc.c:1848
+#: src/gtkprefs.c:1746 src/protocols/silc/silc.c:1828
 msgid "Network"
 msgstr "Red"
 
-#: src/gtkprefs.c:1735
+#: ../src/gtkprefs.c:1872 src/gtkprefs.c:1751
 msgid "Browser"
 msgstr "Navegador"
 
-#: src/gtkprefs.c:1739
+#: ../src/gtkprefs.c:1876 src/gtkprefs.c:1755
 msgid "Away / Idle"
 msgstr "Ausencia / Inactividad"
 
-#: src/gtkprivacy.c:79
+#: ../src/gtkprivacy.c:79 src/gtkprivacy.c:79
 msgid "Allow all users to contact me"
 msgstr "Permitir que todos los usuarios me contacten"
 
-#: src/gtkprivacy.c:80
+#: ../src/gtkprivacy.c:80 src/gtkprivacy.c:80
 msgid "Allow only the users on my buddy list"
 msgstr "Permitir sólo a los usuarios en mi lista de amigos"
 
-#: src/gtkprivacy.c:81
+#: ../src/gtkprivacy.c:81 src/gtkprivacy.c:81
 msgid "Allow only the users below"
 msgstr "Permitir sólo a los siguientes usuarios"
 
-#: src/gtkprivacy.c:82
+#: ../src/gtkprivacy.c:82 src/gtkprivacy.c:82
 msgid "Block all users"
 msgstr "Bloquear todos los usuarios"
 
-#: src/gtkprivacy.c:83
+#: ../src/gtkprivacy.c:83 src/gtkprivacy.c:83
 msgid "Block only the users below"
 msgstr "Bloquear sólo los siguientes usuarios"
 
-#: src/gtkprivacy.c:398
+#: ../src/gtkprivacy.c:372 src/gtkprivacy.c:398
 msgid "Privacy"
 msgstr "Privacidad"
 
-#: src/gtkprivacy.c:411
+#: ../src/gtkprivacy.c:385 src/gtkprivacy.c:411
 msgid "Changes to privacy settings take effect immediately."
 msgstr ""
 "Los cambios a la configuración de privacidad tienen efecto inmediatamente."
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:423
+#: ../src/gtkprivacy.c:397 src/gtkprivacy.c:423
 msgid "Set privacy for:"
 msgstr "Establecer privacidad para:"
 
-#: src/gtkprivacy.c:589 src/gtkprivacy.c:605
+#: ../src/gtkprivacy.c:562 ../src/gtkprivacy.c:578 src/gtkprivacy.c:589
+#: src/gtkprivacy.c:605
 msgid "Permit User"
 msgstr "Permitir al usuario"
 
-#: src/gtkprivacy.c:590
+#: ../src/gtkprivacy.c:563 src/gtkprivacy.c:590
 msgid "Type a user you permit to contact you."
 msgstr "Escriba un usuario al que le permita contactar con vd."
 
-#: src/gtkprivacy.c:591
+#: ../src/gtkprivacy.c:564 src/gtkprivacy.c:591
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr ""
 "Introduzca el nombre de usuario al que quiere permitir que contacte con vd."
 
-#: src/gtkprivacy.c:594 src/gtkprivacy.c:607
-msgid "Permit"
-msgstr "Permitir"
-
-#: src/gtkprivacy.c:599
+#: ../src/gtkprivacy.c:567 ../src/gtkprivacy.c:580
+msgid "_Permit"
+msgstr "_Permitir"
+
+#: ../src/gtkprivacy.c:572 src/gtkprivacy.c:599
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "¿Permitir a %s contactar con vd.?"
 
-#: src/gtkprivacy.c:601
+#: ../src/gtkprivacy.c:574 src/gtkprivacy.c:601
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "¿Está seguro que quiere permitir que %s le contacte?"
 
-#: src/gtkprivacy.c:628 src/gtkprivacy.c:641
+#: ../src/gtkprivacy.c:601 ../src/gtkprivacy.c:614 src/gtkprivacy.c:628
+#: src/gtkprivacy.c:641
 msgid "Block User"
 msgstr "Bloquear al usuario"
 
-#: src/gtkprivacy.c:629
+#: ../src/gtkprivacy.c:602 src/gtkprivacy.c:629
 msgid "Type a user to block."
 msgstr "Escriba un usuario a bloquear."
 
-#: src/gtkprivacy.c:630
+#: ../src/gtkprivacy.c:603 src/gtkprivacy.c:630
 msgid "Please enter the name of the user you wish to block."
 msgstr "Introduzca el nombre del grupo a bloquear."
 
-#: src/gtkprivacy.c:632 src/gtkprivacy.c:643 src/protocols/gg/gg.c:1135
-msgid "Block"
-msgstr "Bloquear"
-
-#: src/gtkprivacy.c:637
+#: ../src/gtkprivacy.c:605 ../src/gtkprivacy.c:616
+msgid "_Block"
+msgstr "_Bloquear"
+
+#: ../src/gtkprivacy.c:610 src/gtkprivacy.c:637
 #, c-format
 msgid "Block %s?"
 msgstr "¿Bloquear a %s?"
 
-#: src/gtkprivacy.c:639
+#: ../src/gtkprivacy.c:612 src/gtkprivacy.c:639
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "¿Está seguro de que quiere bloquear a %s?"
 
+#. #-#-#-#-#  gaim-contributed-2006-01-04.es.po (Gaim)  #-#-#-#-#
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:259 src/protocols/msn/dialog.c:113
-#: src/protocols/msn/msn.c:553 src/protocols/msn/msn.c:556
-#: src/protocols/novell/novell.c:1902 src/protocols/silc/buddy.c:312
-#: src/protocols/silc/pk.c:117 src/request.h:1322
+#: ../src/gtkrequest.c:285 ../src/protocols/msn/dialog.c:114
+#: ../src/protocols/msn/msn.c:559 ../src/protocols/msn/msn.c:568
+#: ../src/protocols/novell/novell.c:1921 ../src/protocols/silc/buddy.c:313
+#: ../src/protocols/silc/pk.c:117 ../src/protocols/silc/wb.c:303
+#: src/gtkrequest.c:285 src/protocols/msn/dialog.c:114
+#: src/protocols/msn/msn.c:561 src/protocols/msn/msn.c:564
+#: src/protocols/novell/novell.c:1921 src/protocols/silc/buddy.c:313
+#: src/protocols/silc/pk.c:117 src/protocols/silc/wb.c:303 src/request.h:1331
 msgid "Yes"
 msgstr "Sí"
 
-#: src/gtkrequest.c:260 src/protocols/msn/dialog.c:114
-#: src/protocols/msn/msn.c:553 src/protocols/msn/msn.c:556
-#: src/protocols/novell/novell.c:1903 src/protocols/silc/buddy.c:313
-#: src/protocols/silc/pk.c:118 src/request.h:1322
+#: ../src/gtkrequest.c:286 ../src/protocols/msn/dialog.c:115
+#: ../src/protocols/msn/msn.c:559 ../src/protocols/msn/msn.c:568
+#: ../src/protocols/novell/novell.c:1922 ../src/protocols/silc/buddy.c:314
+#: ../src/protocols/silc/pk.c:118 ../src/protocols/silc/wb.c:304
+#: src/gtkrequest.c:286 src/protocols/msn/dialog.c:115
+#: src/protocols/msn/msn.c:561 src/protocols/msn/msn.c:564
+#: src/protocols/novell/novell.c:1922 src/protocols/silc/buddy.c:314
+#: src/protocols/silc/pk.c:118 src/protocols/silc/wb.c:304 src/request.h:1331
 msgid "No"
 msgstr "No"
 
-#: src/gtkrequest.c:263
+#: ../src/gtkrequest.c:289 src/gtkrequest.c:289
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/gtkrequest.c:264 src/protocols/msn/msn.c:357
-#: src/protocols/silc/util.c:335
+#: ../src/gtkrequest.c:290 ../src/protocols/msn/msn.c:357
+#: ../src/protocols/silc/util.c:336 src/gtkrequest.c:290
+#: src/protocols/msn/msn.c:357 src/protocols/silc/util.c:336
 msgid "Close"
 msgstr "Cerrar"
 
-#: src/gtkrequest.c:1796
+#: ../src/gtkrequest.c:1839 src/gtkrequest.c:1832
 msgid "That file already exists"
 msgstr "Ese archivo ya existe"
 
-#: src/gtkrequest.c:1797
+#: ../src/gtkrequest.c:1840 src/gtkrequest.c:1833
 msgid "Would you like to overwrite it?"
 msgstr "¿Quiere sobreescribirlo?"
 
-#: src/gtkrequest.c:1839 src/gtkrequest.c:1880
+#: ../src/gtkrequest.c:1884 ../src/gtkrequest.c:1925 src/gtkrequest.c:1877
+#: src/gtkrequest.c:1918
 msgid "Save File..."
 msgstr "Enviar archivo.."
 
-#: src/gtkrequest.c:1840 src/gtkrequest.c:1881
+#: ../src/gtkrequest.c:1885 ../src/gtkrequest.c:1926 src/gtkrequest.c:1878
+#: src/gtkrequest.c:1919
 msgid "Open File..."
 msgstr "Abrir archivo..."
 
-#: src/gtkroomlist.c:331
+#: ../src/gtkroomlist.c:287
+msgid "_Add"
+msgstr "_Añadir"
+
+#: ../src/gtkroomlist.c:354 src/gtkroomlist.c:331
 msgid "Room List"
 msgstr "Lista de salas"
 
 #. list button
-#: src/gtkroomlist.c:402
+#: ../src/gtkroomlist.c:424 src/gtkroomlist.c:402
 msgid "_Get List"
 msgstr "Obtener la lista"
 
-#: src/gtksavedstatuses.c:362 src/protocols/jabber/buddy.c:264
-#: src/protocols/jabber/buddy.c:805 src/protocols/novell/novell.c:1460
+#. add button
+#: ../src/gtkroomlist.c:432
+msgid "_Add Chat"
+msgstr "_Añadir chat"
+
+#: ../src/gtksavedstatuses.c:433 ../src/protocols/jabber/buddy.c:264
+#: ../src/protocols/jabber/buddy.c:812 ../src/protocols/novell/novell.c:1486
+#: src/gtksavedstatuses.c:436 src/protocols/jabber/buddy.c:264
+#: src/protocols/jabber/buddy.c:805 src/protocols/novell/novell.c:1486
 msgid "Title"
 msgstr "Título"
 
-#: src/gtksavedstatuses.c:377
+#: ../src/gtksavedstatuses.c:448 src/gtksavedstatuses.c:451
 msgid "Type"
 msgstr "Tipo"
 
-#: src/gtksavedstatuses.c:388 src/protocols/bonjour/bonjour.c:234
-#: src/protocols/bonjour/bonjour.c:241 src/protocols/gg/gg.c:1083
-#: src/protocols/gg/gg.c:1088 src/protocols/gg/gg.c:1097
-#: src/protocols/gg/gg.c:1107 src/protocols/gg/gg.c:1112
-#: src/protocols/irc/irc.c:177 src/protocols/jabber/jabber.c:1032
-#: src/protocols/jabber/jabber.c:1040 src/protocols/jabber/jabber.c:1048
-#: src/protocols/jabber/jabber.c:1056 src/protocols/jabber/jabber.c:1064
-#: src/protocols/jabber/jabber.c:1072 src/protocols/novell/novell.c:2845
-#: src/protocols/oscar/oscar.c:7758 src/protocols/oscar/oscar.c:7765
-#: src/protocols/sametime/sametime.c:2759
-#: src/protocols/sametime/sametime.c:2765
-#: src/protocols/sametime/sametime.c:2771 src/protocols/simple/simple.c:255
-#: src/protocols/yahoo/yahoo.c:3220 src/protocols/yahoo/yahoo.c:3226
-#: src/protocols/zephyr/zephyr.c:2260
+#. #-#-#-#-#  es.po (Gaim)  #-#-#-#-#
+#. Available status messages are plain text
+#: ../src/gtksavedstatuses.c:459 ../src/gtksavedstatuses.c:920
+#: ../src/protocols/bonjour/bonjour.c:256
+#: ../src/protocols/bonjour/bonjour.c:263 ../src/protocols/gg/gg.c:1421
+#: ../src/protocols/gg/gg.c:1431 ../src/protocols/gg/gg.c:1437
+#: ../src/protocols/gg/gg.c:1446 ../src/protocols/gg/gg.c:1451
+#: ../src/protocols/irc/irc.c:227 ../src/protocols/jabber/jabber.c:1184
+#: ../src/protocols/jabber/jabber.c:1194 ../src/protocols/jabber/jabber.c:1204
+#: ../src/protocols/jabber/jabber.c:1214 ../src/protocols/jabber/jabber.c:1224
+#: ../src/protocols/jabber/jabber.c:1236 ../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:7723
+#: ../src/protocols/oscar/oscar.c:7737 ../src/protocols/oscar/oscar.c:7742
+#: ../src/protocols/oscar/oscar.c:7951 ../src/protocols/oscar/oscar.c:7963
+#: ../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/silc/buddy.c:1544 ../src/protocols/simple/simple.c:242
+#: ../src/protocols/yahoo/yahoo.c:3278 ../src/protocols/yahoo/yahoo.c:3284
+#: ../src/protocols/zephyr/zephyr.c:2261 src/gtksavedstatuses.c:462
+#: src/gtksavedstatuses.c:903 src/protocols/bonjour/bonjour.c:252
+#: src/protocols/bonjour/bonjour.c:259 src/protocols/gg/gg.c:1432
+#: src/protocols/gg/gg.c:1437 src/protocols/gg/gg.c:1446
+#: src/protocols/gg/gg.c:1451 src/protocols/gg/gg.c:1456
+#: src/protocols/irc/irc.c:176 src/protocols/jabber/jabber.c:1087
+#: src/protocols/jabber/jabber.c:1095 src/protocols/jabber/jabber.c:1103
+#: src/protocols/jabber/jabber.c:1111 src/protocols/jabber/jabber.c:1119
+#: src/protocols/jabber/jabber.c:1127 src/protocols/novell/novell.c:2869
+#: src/protocols/novell/novell.c:2980 src/protocols/novell/novell.c:2986
+#: src/protocols/novell/novell.c:2992 src/protocols/oscar/oscar.c:7828
+#: src/protocols/oscar/oscar.c:7835 src/protocols/sametime/sametime.c:3242
+#: src/protocols/sametime/sametime.c:3248
+#: src/protocols/sametime/sametime.c:3254
+#: src/protocols/sametime/sametime.c:3327 src/protocols/simple/simple.c:256
+#: src/protocols/yahoo/yahoo.c:3207 src/protocols/yahoo/yahoo.c:3213
+#: src/protocols/zephyr/zephyr.c:2261
 msgid "Message"
 msgstr "Mensaje"
 
-#: src/gtksavedstatuses.c:451
+#: ../src/gtksavedstatuses.c:526 src/gtksavedstatuses.c:525
 msgid "Saved Statuses"
 msgstr "Estados guardados"
 
 #. Use button
-#. TODO: It might be better if the button said "Use" or "Activate"
-#: src/gtksavedstatuses.c:477
+#: ../src/gtksavedstatuses.c:549 ../src/gtksavedstatuses.c:1180
+#: src/gtksavedstatuses.c:550 src/gtksavedstatuses.c:1150
 msgid "_Use"
 msgstr "_Usar"
 
-#: src/gtksavedstatuses.c:584
+#: ../src/gtksavedstatuses.c:695 src/gtksavedstatuses.c:660
 msgid "Title already in use.  You must choose a unique title."
-msgstr "Ya se está utlizando ese título. Debe elejir un título único."
-
-#: src/gtksavedstatuses.c:675
-msgid "Custom status"
-msgstr "Estado personalizado"
-
-#: src/gtksavedstatuses.c:778 src/protocols/gg/gg.c:1064
-#: src/protocols/gg/gg.c:1069 src/protocols/jabber/buddy.c:626
+msgstr "Ya se está utilizando ese título. Debe elegir un título único."
+
+#: src/gtksavedstatuses.c:862
+msgid "Different"
+msgstr "Diferente"
+
+#: ../src/gtksavedstatuses.c:909 ../src/gtksavedstatuses.c:1056
+#: ../src/protocols/gg/gg.c:1403 ../src/protocols/gg/gg.c:1408
+#: ../src/protocols/jabber/buddy.c:623 ../src/protocols/jabber/buddy.c:630
+#: ../src/protocols/jabber/buddy.c:641 ../src/protocols/jabber/jabber.c:1155
+#: ../src/protocols/msn/msn.c:550 ../src/protocols/novell/novell.c:2867
+#: ../src/protocols/novell/novell.c:2871 ../src/protocols/oscar/oscar.c:785
+#: ../src/protocols/oscar/oscar.c:791 ../src/protocols/oscar/oscar.c:794
+#: ../src/protocols/yahoo/yahoo.c:2880 src/gtksavedstatuses.c:892
+#: src/gtksavedstatuses.c:1019 src/protocols/gg/gg.c:1413
+#: src/protocols/gg/gg.c:1418 src/protocols/jabber/buddy.c:626
 #: src/protocols/jabber/buddy.c:633 src/protocols/jabber/buddy.c:644
-#: src/protocols/jabber/jabber.c:1005 src/protocols/msn/msn.c:544
-#: src/protocols/novell/novell.c:2844 src/protocols/novell/novell.c:2848
+#: src/protocols/jabber/jabber.c:1060 src/protocols/msn/msn.c:552
+#: src/protocols/novell/novell.c:2868 src/protocols/novell/novell.c:2872
 #: src/protocols/oscar/oscar.c:762 src/protocols/oscar/oscar.c:767
-#: src/protocols/oscar/oscar.c:769 src/protocols/yahoo/yahoo.c:2787
+#: src/protocols/oscar/oscar.c:769 src/protocols/yahoo/yahoo.c:2809
 msgid "Status"
 msgstr "Estado"
 
-#: src/gtksavedstatuses.c:797
+#: ../src/gtksavedstatuses.c:1073 src/gtksavedstatuses.c:1038
 msgid "_Title:"
-msgstr "_Título"
-
-#: src/gtksavedstatuses.c:817
+msgstr "_Título:"
+
+#: ../src/gtksavedstatuses.c:1092 ../src/gtksavedstatuses.c:1413
+#: src/gtksavedstatuses.c:1058 src/gtksavedstatuses.c:1360
 msgid "_Status:"
-msgstr "_Estado:"
-
-#. Custom status message expander
-#: src/gtksavedstatuses.c:852
+msgstr "E_stado:"
+
+#. Different status message expander
+#: ../src/gtksavedstatuses.c:1124 src/gtksavedstatuses.c:1093
 msgid "Use a _different status for some accounts"
 msgstr "Usar un estado _diferente para algunas cuentas"
 
-#: src/gtksound.c:61
+#. Save & Use button
+#: ../src/gtksavedstatuses.c:1188 src/gtksavedstatuses.c:1159
+msgid "Sa_ve & Use"
+msgstr "Gua_rdar y usar"
+
+#: src/gtksavedstatuses.c:1339
+#, c-format
+msgid "Status for %s"
+msgstr "Estado de %s"
+
+#: ../src/gtksound.c:61 src/gtksound.c:61
 msgid "Buddy logs in"
 msgstr "Se conecta un amigo"
 
-#: src/gtksound.c:62
+#: ../src/gtksound.c:62 src/gtksound.c:62
 msgid "Buddy logs out"
 msgstr "Se desconecta un amigo"
 
-#: src/gtksound.c:63
+#: ../src/gtksound.c:63 src/gtksound.c:63
 msgid "Message received"
 msgstr "Se recibe un mensaje"
 
-#: src/gtksound.c:64
+#: ../src/gtksound.c:64 src/gtksound.c:64
 msgid "Message received begins conversation"
 msgstr "Se recibe un mensaje que comienza una conversación"
 
-#: src/gtksound.c:65
+#: ../src/gtksound.c:65 src/gtksound.c:65
 msgid "Message sent"
 msgstr "Se envía un mensaje"
 
-#: src/gtksound.c:66
+#: ../src/gtksound.c:66 src/gtksound.c:66
 msgid "Person enters chat"
 msgstr "Alguien entra al chat"
 
-#: src/gtksound.c:67
+#: ../src/gtksound.c:67 src/gtksound.c:67
 msgid "Person leaves chat"
 msgstr "Alguien deja el chat"
 
-#: src/gtksound.c:68
+#: ../src/gtksound.c:68 src/gtksound.c:68
 msgid "You talk in chat"
 msgstr "Usted habla en el chat"
 
-#: src/gtksound.c:69
+#: ../src/gtksound.c:69 src/gtksound.c:69
 msgid "Others talk in chat"
 msgstr "Otros hablan en el chat"
 
-#: src/gtksound.c:72
+#: ../src/gtksound.c:72 src/gtksound.c:72
 msgid "Someone says your name in chat"
 msgstr "Alguien menciona su nombre en el chat"
 
-#: src/gtksound.c:414
+#: ../src/gtksound.c:488 src/gtksound.c:414
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr ""
 "No fue posible reproducir el sonido porque el archivo elegido (%s) no existe."
 
-#: src/gtksound.c:430
+#: ../src/gtksound.c:504 src/gtksound.c:430
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
@@ -4382,7 +5623,7 @@
 "No fue posible reproducir el sonido porque se ha escogido el método de "
 "«Orden», pero no se ha especificado la orden."
 
-#: src/gtksound.c:442
+#: ../src/gtksound.c:516 src/gtksound.c:442
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -4391,136 +5632,109 @@
 "No fue posible reproducir el sonido porque el comando de sonido establecido "
 "no se ha podido lanzar: %s"
 
-#: src/gtkstatusbox.c:197
+#: ../src/gtkstatusbox.c:362 src/gtkstatusbox.c:287
 msgid "Typing"
 msgstr "Tecleando"
 
 #. connect to the server
-#: src/gtkstatusbox.c:200 src/protocols/irc/irc.c:258
-#: src/protocols/jabber/jabber.c:838 src/protocols/msn/session.c:362
-#: src/protocols/napster/napster.c:525 src/protocols/novell/novell.c:2164
-#: src/protocols/oscar/oscar.c:1816 src/protocols/simple/simple.c:1276
-#: src/protocols/yahoo/yahoo.c:2455 src/protocols/zephyr/zephyr.c:1546
+#: ../src/gtkstatusbox.c:364 ../src/protocols/irc/irc.c:313
+#: ../src/protocols/jabber/jabber.c:982 ../src/protocols/msn/session.c:349
+#: ../src/protocols/napster/napster.c:536
+#: ../src/protocols/novell/novell.c:2183 ../src/protocols/oscar/oscar.c:1874
+#: ../src/protocols/sametime/sametime.c:3693
+#: ../src/protocols/simple/simple.c:1503 ../src/protocols/yahoo/yahoo.c:2571
+#: ../src/protocols/zephyr/zephyr.c:1547 src/gtkstatusbox.c:290
+#: src/protocols/irc/irc.c:257 src/protocols/jabber/jabber.c:893
+#: src/protocols/msn/session.c:349 src/protocols/napster/napster.c:531
+#: src/protocols/novell/novell.c:2183 src/protocols/oscar/oscar.c:1804
+#: src/protocols/sametime/sametime.c:3610 src/protocols/simple/simple.c:1294
+#: src/protocols/yahoo/yahoo.c:2510 src/protocols/zephyr/zephyr.c:1547
 msgid "Connecting"
 msgstr "Conectando"
 
-#. hacks
-#: src/gtkstatusbox.c:294 src/protocols/bonjour/bonjour.c:233
-#: src/protocols/irc/irc.c:172 src/protocols/jabber/jabber.c:1039
-#: src/protocols/msn/msn.c:573 src/protocols/msn/state.c:29
-#: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
-#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2822
-#: src/protocols/novell/novell.c:2956 src/protocols/novell/novell.c:3039
-#: src/protocols/oscar/oscar.c:808 src/protocols/oscar/oscar.c:7757
-#: src/protocols/simple/simple.c:253 src/protocols/silc/silc.c:48
-#: src/protocols/yahoo/yahoo.c:3214 src/status.c:155
-msgid "Available"
-msgstr "Disponible"
-
-#.
-#. * Without this selecting Invisible as own status doesn't
-#. * work. It's not used and not needed to show status of buddies.
-#.
-#: src/gtkstatusbox.c:296 src/protocols/gg/gg.c:1096
-#: src/protocols/oscar/oscar.c:711 src/protocols/oscar/oscar.c:7771
-#: src/protocols/yahoo/yahoo.c:2633 src/protocols/yahoo/yahoo.c:3257
-msgid "Invisible"
-msgstr "Invisible"
-
-#: src/gtkstatusbox.c:297 src/protocols/bonjour/bonjour.c:228
-#: src/protocols/gg/gg.c:1082 src/protocols/irc/irc.c:168
-#: src/protocols/jabber/buddy.c:1087 src/protocols/jabber/jabber.c:1032
-#: src/protocols/msn/msn.c:569 src/protocols/napster/napster.c:573
-#: src/protocols/novell/novell.c:2834 src/protocols/novell/novell.c:2953
-#: src/protocols/oscar/oscar.c:769 src/protocols/oscar/oscar.c:7591
-#: src/protocols/oscar/oscar.c:7752 src/protocols/sametime/sametime.c:2754
-#: src/protocols/simple/simple.c:249 src/protocols/silc/silc.c:46
-#: src/protocols/yahoo/yahoo.c:2637 src/protocols/yahoo/yahoo.c:3211
-#: src/status.c:154
-msgid "Offline"
-msgstr "Desconectado"
-
-#: src/gtkstatusbox.c:299
-msgid "Custom..."
-msgstr "Personalizado..."
-
-#: src/gtkstatusbox.c:300
-msgid "Saved..."
-msgstr "Guardado..."
-
-#: src/gtkstock.c:117
+#: ../src/gtkstock.c:138 src/gtkstock.c:138
 msgid "_Alias"
 msgstr "_Apodo:"
 
-#: src/gtkstock.c:119
+#: ../src/gtkstock.c:140
+msgid "Close _tabs"
+msgstr "Cerrar _pestañas"
+
+#: ../src/gtkstock.c:142
+msgid "_Get Info"
+msgstr "Obtener _información"
+
+#: ../src/gtkstock.c:143 src/gtkstock.c:140
 msgid "_Invite"
 msgstr "_Invitar"
 
-#: src/gtkstock.c:120
+#: ../src/gtkstock.c:144 src/gtkstock.c:141
 msgid "_Modify"
 msgstr "_Modificar"
 
-#: src/gtkstock.c:121
+#: ../src/gtkstock.c:145 src/gtkstock.c:142
 msgid "_Open Mail"
 msgstr "_Abrir correo"
 
-#: src/gtkstock.c:123
-msgid "_Warn"
-msgstr "_Avisar"
-
-#: src/gtkutils.c:1393 src/gtkutils.c:1418
+#: ../src/gtkutils.c:1303 ../src/gtkutils.c:1328 src/gtkutils.c:1309
+#: src/gtkutils.c:1334
 #, c-format
 msgid "The following error has occurred loading %s: %s"
-msgstr "Ha ocurrido un error desconocido al cargar %s: %s"
-
-#: src/gtkutils.c:1395 src/gtkutils.c:1420
+msgstr "Se ha producido el siguiente error al cargar %s: %s"
+
+#: ../src/gtkutils.c:1305 ../src/gtkutils.c:1330 src/gtkutils.c:1311
+#: src/gtkutils.c:1336
 msgid "Failed to load image"
 msgstr "No se pudo cargar la imagen"
 
-#: src/gtkutils.c:1495
+#: ../src/gtkutils.c:1405 src/gtkutils.c:1411
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "No se puede enviar la carpeta %s."
 
-#: src/gtkutils.c:1497
+#: ../src/gtkutils.c:1407 src/gtkutils.c:1413
 msgid ""
 "Gaim cannot transfer a folder. You will need to send the files within "
 "individually"
 msgstr "Gaim no puede transferir una carpeta. Necesita enviar los archivos que contiene individualmente."
 
-#: src/gtkutils.c:1525 src/gtkutils.c:1534 src/gtkutils.c:1539
+#: ../src/gtkutils.c:1435 ../src/gtkutils.c:1444 ../src/gtkutils.c:1449
+#: src/gtkutils.c:1441 src/gtkutils.c:1450 src/gtkutils.c:1455
 msgid "You have dragged an image"
 msgstr "Ha arrastrado una imagen"
 
-#: src/gtkutils.c:1526
+#: ../src/gtkutils.c:1436 src/gtkutils.c:1442
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
-msgstr "Puede enviar esta imagen como un archivo, introducirla en el mensaje, o usarla como icono de amigo para este usuario."
-
-#: src/gtkutils.c:1530 src/gtkutils.c:1545
+msgstr "Puede enviar esta imagen como una transferencia de archivo, introducirla en el mensaje, o usarla como icono de amigo para este usuario."
+
+#: ../src/gtkutils.c:1440 ../src/gtkutils.c:1455 src/gtkutils.c:1446
+#: src/gtkutils.c:1461
 msgid "Set as buddy icon"
 msgstr "Establecer como icono de amigo"
 
-#: src/gtkutils.c:1531 src/gtkutils.c:1546
+#: ../src/gtkutils.c:1441 ../src/gtkutils.c:1456 src/gtkutils.c:1447
+#: src/gtkutils.c:1462
 msgid "Send image file"
 msgstr "Enviar archivo de imagen"
 
-#: src/gtkutils.c:1532 src/gtkutils.c:1546
+#: ../src/gtkutils.c:1442 ../src/gtkutils.c:1456 src/gtkutils.c:1448
+#: src/gtkutils.c:1462
 msgid "Insert in message"
-msgstr "Insertar en mensaje"
-
-#: src/gtkutils.c:1535
+msgstr "Insertar en el mensaje"
+
+#: ../src/gtkutils.c:1445 src/gtkutils.c:1451
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "¿Desea establecerla como el icono de amigo para este usuario?"
 
-#: src/gtkutils.c:1540
+#: ../src/gtkutils.c:1450 src/gtkutils.c:1456
 msgid ""
 "You can send this image as a file transfer or embed it into this message, or "
 "use it as the buddy icon for this user."
-msgstr "Puede enviar esta imagen como un archivo, o introducirla en este mensaje, o usarla como icono de amigo para este usuario."
-
-#: src/gtkutils.c:1542
+msgstr "Puede enviar esta imagen como una transferencia de archivo, o introducirla en este mensaje, o usarla como icono de amigo para este usuario."
+
+#: ../src/gtkutils.c:1452 src/gtkutils.c:1458
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -4531,30 +5745,51 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: src/gtkutils.c:1596
+#: ../src/gtkutils.c:1506 src/gtkutils.c:1512
 msgid "Cannot send launcher"
 msgstr "No se puede enviar un lanzador"
 
-#: src/gtkutils.c:1596
+#: ../src/gtkutils.c:1506
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
-msgstr "Vd. arrastró un lanzador de escritorio. Lo más probable es que quiera enviar a lo que apunta el lanzador más que el lanzador en sí."
-
-#: src/log.c:129
+msgstr ""
+"Vd. arrastró un lanzador de escritorio. Lo más probable es que quiera enviar "
+"a lo que apunta el lanzador más que el lanzador en sí."
+
+#. Write a local message to this conversation showing that a request for a
+#. * Doodle session has been made
+#.
+#: src/gtkwhiteboard.c:344 src/protocols/yahoo/yahoo_doodle.c:96
+msgid "Sent Doodle request."
+msgstr "Enviar petición Doodle."
+
+#: ../src/log.c:165 src/log.c:129
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
 "<b><font color=\"red\">El registro no tiene función de lectura</font></b>"
 
-#: src/log.c:577
+#: ../src/log.c:547 src/log.c:497
+msgid "HTML"
+msgstr "HTML"
+
+#: ../src/log.c:558 src/log.c:508
+msgid "Plain text"
+msgstr "En claro"
+
+#: src/log.c:519
+msgid "Old Gaim"
+msgstr "Antiguo Gaim"
+
+#: ../src/log.c:668 src/log.c:577
 msgid "Logging of this conversation failed."
 msgstr "No se pudo registrar esta conversación."
 
-#: src/log.c:839
+#: ../src/log.c:969 src/log.c:839
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:904
+#: ../src/log.c:1037 src/log.c:904
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4563,7 +5798,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;RESPUESTA "
 "AUTOMÁTICA&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:906
+#: ../src/log.c:1039 src/log.c:906
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4572,22 +5807,43 @@
 "<font color=\"#A82F2f\"><font size=\"2\">(%s)</font> <b>%s &lt;RESPUESTA "
 "AUTOMÁTICA&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:957 src/log.c:1074
+#: ../src/log.c:1096 ../src/log.c:1218 src/log.c:957 src/log.c:1074
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
 "<font color=\"red\"><b>¡No se pudo encontrar la ruta del registro!</b></font>"
 
-#: src/log.c:967 src/log.c:1086
+#: ../src/log.c:1108 ../src/log.c:1230 src/log.c:967 src/log.c:1086
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>No se pudo leer el archivo: %s</b></font>"
 
-#: src/log.c:1019
+#: ../src/log.c:1161 src/log.c:1019
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RESPUESTA AUTOMÁTICA>: %s\n"
 
-#: src/plugin.c:331
+#: ../src/plugin.c:281 ../src/protocols/msn/servconn.c:139
+#: ../src/protocols/msn/session.c:326 ../src/protocols/oscar/oscar.c:5063
+#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:326
+#: src/protocols/oscar/oscar.c:4913
+msgid "Unknown error"
+msgstr "Error desconocido"
+
+#: ../src/plugin.c:424
+#, c-format
+msgid "Plugin magic mismatch %d (need %d)"
+msgstr "No hubo coincidencia en el número mágico del complemento %d (necesitaba %d)"
+
+#: ../src/plugin.c:441
+#, c-format
+msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
+msgstr "No hubo coincidencia en el número de versión ABI %d.%d.x (necesitaba %d.%d.x)"
+
+#: ../src/plugin.c:457
+msgid "Plugin does not implement all required functions"
+msgstr "El complemento no implementa todas las funciones necesarias"
+
+#: ../src/plugin.c:514 src/plugin.c:362
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -4596,35 +5852,57 @@
 "No se encontró el complemento necesario %s. Por favor, instale este "
 "complemento e inténtelo de nuevo."
 
-#: src/plugin.c:336 src/plugin.c:364
-msgid "Gaim was unable to load your plugin."
-msgstr "Gaim no pudo cargar su complemento."
-
-#: src/plugin.c:360
+#: ../src/plugin.c:519
+msgid "Gaim encountered errors loading the plugin."
+msgstr "Gaim encontró un error mientras cargaba este complemento."
+
+#: ../src/plugin.c:542 src/plugin.c:391
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "No se pudo cargar el complemento necesario %s."
 
-#: src/protocols/bonjour/bonjour.c:298 src/protocols/msn/msn.c:546
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2831
-#: src/protocols/oscar/oscar.c:5064 src/protocols/yahoo/yahoo.c:2635
-#: src/protocols/yahoo/yahoo_profile.c:660
-msgid "Idle"
-msgstr "Está inactivo"
-
-#: src/protocols/bonjour/bonjour.c:303
+#: ../src/plugin.c:546 src/plugin.c:367 src/plugin.c:395
+msgid "Gaim was unable to load your plugin."
+msgstr "Gaim no pudo cargar su complemento."
+
+#: ../src/plugin.c:648
+#, c-format
+msgid "The dependent plugin %s failed to unload."
+msgstr "No se pudo cargar el complemento dependiente %s."
+
+#: ../src/plugin.c:653
+msgid "Gaim encountered errors unloading the plugin."
+msgstr "Gaim encontró errores mientras descargaba el complemento."
+
+#. Send a message about the connection error
+#: src/protocols/bonjour/bonjour.c:107
+msgid "Unable to listen for incoming IM connections\n"
+msgstr "No se pudieron escuchar las conexiones MI entrantes\n"
+
+#: ../src/protocols/bonjour/bonjour.c:146 src/protocols/bonjour/bonjour.c:142
+msgid ""
+"Unable to establish connection with the local mDNS server.  Is it running?"
+msgstr "No se pudo establecer una conexión con el servidor mDNS local. ¿Está arrancado?"
+
+#: ../src/protocols/bonjour/bonjour.c:337
+#: ../src/protocols/sametime/sametime.c:3251
+#: src/protocols/bonjour/bonjour.c:328
 #, c-format
 msgid ""
 "\n"
 "<b>Status:</b> %s"
-msgstr "\n<b>Estado:</b> %s"
-
-#: src/protocols/bonjour/bonjour.c:305
+msgstr ""
+"\n"
+"<b>Estado:</b> %s"
+
+#: ../src/protocols/bonjour/bonjour.c:339 src/protocols/bonjour/bonjour.c:330
 #, c-format
 msgid ""
 "\n"
 "<b>Message:</b> %s"
-msgstr "\n<b>Mensaje:</b> %s"
+msgstr ""
+"\n"
+"<b>Mensaje:</b> %s"
 
 #. *< type
 #. *< ui_requirement
@@ -4636,306 +5914,413 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/bonjour/bonjour.c:388 src/protocols/bonjour/bonjour.c:390
+#: ../src/protocols/bonjour/bonjour.c:434
+#: ../src/protocols/bonjour/bonjour.c:436 src/protocols/bonjour/bonjour.c:424
+#: src/protocols/bonjour/bonjour.c:426
 msgid "Bonjour Protocol Plugin"
 msgstr "Complemento de protocolo Bonjour"
 
+#: ../src/protocols/bonjour/bonjour.c:472
+#: ../src/protocols/bonjour/bonjour.c:480
+#: ../src/protocols/bonjour/bonjour.c:538 src/protocols/bonjour/bonjour.c:458
+#: src/protocols/bonjour/bonjour.c:515
+msgid "Gaim User"
+msgstr "Usuario de Gaim"
+
 #. Creating the user splits
-#: src/protocols/bonjour/bonjour.c:417
-msgid "Host name"
-msgstr "Nombre de equipo"
+#: src/protocols/bonjour/bonjour.c:553 src/protocols/silc/silc.c:921
+msgid "Hostname"
+msgstr "Servidor"
 
 #. Creating the options for the protocol
-#: src/protocols/bonjour/bonjour.c:421 src/protocols/irc/irc.c:822
-#: src/protocols/msn/msn.c:1968 src/protocols/napster/napster.c:712
-#: src/protocols/silc/silc.c:1597
+#. port to connect to
+#: ../src/protocols/bonjour/bonjour.c:580 ../src/protocols/irc/irc.c:901
+#: ../src/protocols/msn/msn.c:1957 ../src/protocols/napster/napster.c:725
+#: ../src/protocols/sametime/sametime.c:5644 ../src/protocols/silc/silc.c:1856
+#: src/protocols/bonjour/bonjour.c:557 src/protocols/irc/irc.c:820
+#: src/protocols/msn/msn.c:1943 src/protocols/napster/napster.c:719
+#: src/protocols/sametime/sametime.c:5586 src/protocols/silc/silc.c:1836
 msgid "Port"
 msgstr "Puerto"
 
-#: src/protocols/bonjour/bonjour.c:424 src/protocols/gg/gg.c:405
+#: ../src/protocols/bonjour/bonjour.c:583 ../src/protocols/gg/gg.c:562
+#: ../src/protocols/gg/gg.c:971 src/protocols/bonjour/bonjour.c:560
+#: src/protocols/gg/gg.c:571 src/protocols/gg/gg.c:986
 msgid "First name"
 msgstr "Nombre:"
 
-#: src/protocols/bonjour/bonjour.c:427 src/protocols/gg/gg.c:401
+#: ../src/protocols/bonjour/bonjour.c:586 ../src/protocols/gg/gg.c:557
+#: src/protocols/bonjour/bonjour.c:563 src/protocols/gg/gg.c:566
 msgid "Last name"
 msgstr "Apellidos:"
 
-#: src/protocols/bonjour/bonjour.c:430 src/protocols/jabber/buddy.c:261
+#: ../src/protocols/bonjour/bonjour.c:589 ../src/protocols/jabber/buddy.c:261
+#: ../src/protocols/jabber/buddy.c:779 ../src/protocols/jabber/buddy.c:787
+#: ../src/protocols/silc/silc.c:695 ../src/protocols/silc/silc.c:935
+#: ../src/protocols/silc/util.c:512
+#: ../src/protocols/yahoo/yahoo_profile.c:1030
+#: src/protocols/bonjour/bonjour.c:566 src/protocols/jabber/buddy.c:261
 #: src/protocols/jabber/buddy.c:772 src/protocols/jabber/buddy.c:780
-#: src/protocols/silc/silc.c:661 src/protocols/silc/util.c:511
-#: src/protocols/yahoo/yahoo_profile.c:995
+#: src/protocols/silc/silc.c:685 src/protocols/silc/silc.c:925
+#: src/protocols/silc/util.c:512 src/protocols/yahoo/yahoo_profile.c:999
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: src/protocols/bonjour/bonjour.h:35
-msgid "Bonjour"
-msgstr "Bonjour"
-
-#: src/protocols/gg/gg.c:136 src/protocols/gg/gg.c:155
+#: ../src/protocols/bonjour/jabber.c:357
+#, c-format
+msgid "%s has closed the conversation."
+msgstr "%s ha cerrado la conversación."
+
+#: ../src/protocols/bonjour/jabber.c:439
+msgid "Cannot open socket"
+msgstr "No se pudo abrir el socket"
+
+#: ../src/protocols/bonjour/jabber.c:447
+msgid "Error setting socket options"
+msgstr "Error al establecer las opciones del socket"
+
+#: ../src/protocols/bonjour/jabber.c:458
+msgid "Cannot bind socket to port"
+msgstr "No se pudo vincular el socket a un puerto"
+
+#: ../src/protocols/bonjour/jabber.c:465
+msgid "Cannot listen on socket"
+msgstr "No se pudo escuchar en el socket"
+
+#: ../src/protocols/bonjour/jabber.c:559
+msgid "Unable to send the message, the conversation couldn't be started."
+msgstr "No se pudo enviar el mensaje, no se pudo iniciar la conversación."
+
+#: ../src/protocols/gg/gg.c:80 ../src/protocols/gg/gg.c:102
+#: ../src/protocols/gg/gg.c:137
+msgid "Token Error"
+msgstr "Error de token"
+
+#: ../src/protocols/gg/gg.c:81 ../src/protocols/gg/gg.c:103
+#: ../src/protocols/gg/gg.c:138
+msgid "Unable to fetch the token.\n"
+msgstr "No se pudo obtener el token.\n"
+
+#: ../src/protocols/gg/gg.c:226 ../src/protocols/gg/gg.c:245
+#: src/protocols/gg/gg.c:235 src/protocols/gg/gg.c:254
 msgid "Save Buddylist..."
 msgstr "Guardar la lista de amigos..."
 
-#: src/protocols/gg/gg.c:137
+#: ../src/protocols/gg/gg.c:227 src/protocols/gg/gg.c:236
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "No se escribió nada en el fichero ya que su lista de amigos esta vacía."
 
-#: src/protocols/gg/gg.c:143 src/protocols/gg/gg.c:145
-#: src/protocols/gg/gg.c:176
+#: ../src/protocols/gg/gg.c:233 ../src/protocols/gg/gg.c:235
+#: src/protocols/gg/gg.c:242 src/protocols/gg/gg.c:244
 msgid "Couldn't open file"
 msgstr "No se pudo abrir el archivo"
 
-#: src/protocols/gg/gg.c:156
+#: ../src/protocols/gg/gg.c:246 src/protocols/gg/gg.c:255
 msgid "Buddylist saved successfully!"
-msgstr "¡Lista de amigos guardada con éxito!"
-
-#: src/protocols/gg/gg.c:178
-msgid "Could't open file"
-msgstr "No se pudo abrir el archivo"
-
-#: src/protocols/gg/gg.c:199
+msgstr "¡Se guardó con éxito la lista de amigos!"
+
+#: src/protocols/gg/gg.c:273 src/protocols/gg/gg.c:274
+msgid "Couldn't load buddylist"
+msgstr "No se pudo cargar la lista de amigos"
+
+#: ../src/protocols/gg/gg.c:281 src/protocols/gg/gg.c:290
 msgid "Load Buddylist..."
 msgstr "Cargar lista de amigos..."
 
-#: src/protocols/gg/gg.c:200
+#: ../src/protocols/gg/gg.c:282 src/protocols/gg/gg.c:291
 msgid "Buddylist loaded successfully!"
-msgstr "¡Lista de amigos cargada con éxito!"
-
-#: src/protocols/gg/gg.c:211
+msgstr "¡Éxito en la carga de la lista de amigos!"
+
+#: ../src/protocols/gg/gg.c:293 src/protocols/gg/gg.c:302
 msgid "Save buddylist..."
 msgstr "Guardar lista de amigos..."
 
-#: src/protocols/gg/gg.c:254
+#: ../src/protocols/gg/gg.c:337 src/protocols/gg/gg.c:346
 msgid "Fill in the registration fields."
-msgstr "Rellene los campos de registro"
-
-#: src/protocols/gg/gg.c:259
+msgstr "Rellene los campos de registro."
+
+#: ../src/protocols/gg/gg.c:342 src/protocols/gg/gg.c:351
 msgid "Passwords do not match."
 msgstr "Las contraseñas no coinciden."
 
-#: src/protocols/gg/gg.c:266
+#: ../src/protocols/gg/gg.c:351 src/protocols/gg/gg.c:360
 msgid "Unable to register new account. Error occurred.\n"
-msgstr "No se pudo registrar una nueva cuenta. Se produjo un error.\n"
-
-#: src/protocols/gg/gg.c:279
+msgstr "No se pudo registrar la cuenta nueva. Se produjo un error.\n"
+
+#: ../src/protocols/gg/gg.c:364 src/protocols/gg/gg.c:373
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Se ha registrado una nueva cuenta Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:280
+#: ../src/protocols/gg/gg.c:365 src/protocols/gg/gg.c:374
 msgid "Registration completed successfully!"
 msgstr "¡Se completó el registro con éxito!"
 
-#: src/protocols/gg/gg.c:409 src/protocols/gg/gg.c:1665
+#: ../src/protocols/gg/gg.c:425 src/protocols/gg/gg.c:434
+msgid "e-Mail"
+msgstr "Correo electrónico"
+
+#: ../src/protocols/gg/gg.c:430 ../src/protocols/gg/gg.c:704
+#: ../src/protocols/jabber/jabber.c:748 ../src/protocols/jabber/jabber.c:1309
+#: src/protocols/gg/gg.c:439 src/protocols/gg/gg.c:713
+#: src/protocols/jabber/jabber.c:680 src/protocols/jabber/jabber.c:1205
+msgid "Password"
+msgstr "Contraseña"
+
+#: ../src/protocols/gg/gg.c:435 ../src/protocols/gg/gg.c:709
+#: src/protocols/gg/gg.c:444 src/protocols/gg/gg.c:718
+msgid "Password (retype)"
+msgstr "Contraseña (escribir de nuevo)"
+
+#: ../src/protocols/gg/gg.c:440 ../src/protocols/gg/gg.c:714
+msgid "Enter current token"
+msgstr "Introduzca el token actual"
+
+#: ../src/protocols/gg/gg.c:446 ../src/protocols/gg/gg.c:720
+msgid "Current token"
+msgstr "Token actual"
+
+#: ../src/protocols/gg/gg.c:450 ../src/protocols/gg/gg.c:451
+#: src/protocols/gg/gg.c:459 src/protocols/gg/gg.c:460
+msgid "Register New Gadu-Gadu Account"
+msgstr "Registrando cuenta nueva de Gadu-Gadu"
+
+#: ../src/protocols/gg/gg.c:452 src/protocols/gg/gg.c:461
+msgid "Please, fill in the following fields"
+msgstr "Por favor, rellene los siguientes campos"
+
+#: src/protocols/gg/gg.c:556 src/protocols/gg/gg.c:1605
+msgid "Unable to initiate a new search"
+msgstr "No se pudo iniciar una nueva búsqueda"
+
+#: src/protocols/gg/gg.c:557 src/protocols/gg/gg.c:1606
+msgid "You have a pending search. Please wait for it to finish."
+msgstr "Tiene una búsqueda pendiente. Por favor espere a que termine."
+
+#: ../src/protocols/gg/gg.c:567 ../src/protocols/gg/gg.c:974
+#: ../src/protocols/gg/gg.c:1997 ../src/protocols/jabber/buddy.c:252
+#: ../src/protocols/jabber/buddy.c:695 ../src/protocols/jabber/buddy.c:1395
+#: ../src/protocols/jabber/jabber.c:764 ../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
+#: ../src/protocols/yahoo/yahoo_profile.c:1035 src/protocols/gg/gg.c:576
+#: src/protocols/gg/gg.c:989 src/protocols/gg/gg.c:1985
 #: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:698
-#: src/protocols/jabber/buddy.c:1341 src/protocols/jabber/jabber.c:648
-#: src/protocols/msn/msn.c:1394 src/protocols/silc/buddy.c:1480
-#: src/protocols/silc/ops.c:822 src/protocols/silc/ops.c:965
-#: src/protocols/silc/ops.c:1114 src/protocols/yahoo/yahoo_profile.c:1000
+#: src/protocols/jabber/buddy.c:1341 src/protocols/jabber/jabber.c:696
+#: src/protocols/msn/msn.c:1368 src/protocols/silc/buddy.c:1494
+#: src/protocols/silc/ops.c:1036 src/protocols/silc/ops.c:1179
+#: src/protocols/silc/ops.c:1328 src/protocols/yahoo/yahoo_profile.c:1004
 msgid "Nickname"
 msgstr "Apodo"
 
-#: src/protocols/gg/gg.c:413 src/protocols/jabber/jabber.c:668
-#: src/protocols/oscar/oscar.c:6006 src/protocols/oscar/oscar.c:6014
+#: ../src/protocols/gg/gg.c:572 ../src/protocols/gg/gg.c:977
+#: ../src/protocols/jabber/jabber.c:784 ../src/protocols/oscar/oscar.c:6153
+#: ../src/protocols/oscar/oscar.c:6161 src/protocols/gg/gg.c:581
+#: src/protocols/gg/gg.c:992 src/protocols/jabber/jabber.c:716
+#: src/protocols/oscar/oscar.c:6048 src/protocols/oscar/oscar.c:6056
 msgid "City"
 msgstr "Ciudad"
 
-#: src/protocols/gg/gg.c:417
+#: ../src/protocols/gg/gg.c:577 src/protocols/gg/gg.c:586
 msgid "Year of birth"
 msgstr "Año de nacimiento"
 
-#: src/protocols/gg/gg.c:426
+#: ../src/protocols/gg/gg.c:580 ../src/protocols/msn/msn.c:1538
+#: ../src/protocols/oscar/oscar.c:6127
+#: ../src/protocols/yahoo/yahoo_profile.c:1060 src/protocols/gg/gg.c:589
+#: src/protocols/msn/msn.c:1527 src/protocols/oscar/oscar.c:6021
+#: src/protocols/yahoo/yahoo_profile.c:1029
+msgid "Gender"
+msgstr "Sexo"
+
+#: src/protocols/gg/gg.c:590
+msgid "Male or female"
+msgstr "Hombre o mujer"
+
+#: ../src/protocols/gg/gg.c:582 ../src/protocols/oscar/oscar.c:6127
+#: src/protocols/gg/gg.c:591 src/protocols/oscar/oscar.c:6021
+msgid "Male"
+msgstr "Hombre"
+
+#: ../src/protocols/gg/gg.c:583 ../src/protocols/oscar/oscar.c:6127
+#: src/protocols/gg/gg.c:592 src/protocols/oscar/oscar.c:6021
+msgid "Female"
+msgstr "Mujer"
+
+#: ../src/protocols/gg/gg.c:587 src/protocols/gg/gg.c:596
 msgid "Only online"
-msgstr "Sólo en línea"
-
-#: src/protocols/gg/gg.c:430 src/protocols/gg/gg.c:431
-#: src/protocols/gg/gg.c:1510
+msgstr "Solamente conectado"
+
+#: ../src/protocols/gg/gg.c:591 ../src/protocols/gg/gg.c:592
+#: src/protocols/gg/gg.c:600 src/protocols/gg/gg.c:601
 msgid "Find buddies"
 msgstr "Encontrar amigos"
 
-#: src/protocols/gg/gg.c:432
+#: ../src/protocols/gg/gg.c:593 src/protocols/gg/gg.c:602
 msgid "Please, enter your search criteria below"
 msgstr "Por favor, introduzca a continuación su criterio de búsqueda"
 
-#: src/protocols/gg/gg.c:465
+#: ../src/protocols/gg/gg.c:630 src/protocols/gg/gg.c:639
 msgid "Fill in the fields."
 msgstr "Rellene los campos."
 
-#: src/protocols/gg/gg.c:476
+#: ../src/protocols/gg/gg.c:642 src/protocols/gg/gg.c:651
 msgid "Your current password is different from the one that you specified."
-msgstr "Su contraseña actual difiere de la que ha especificado."
-
-#: src/protocols/gg/gg.c:491
+msgstr "Su contraseña actual es diferente de la que ha especificado."
+
+#: ../src/protocols/gg/gg.c:656 src/protocols/gg/gg.c:665
 msgid "Unable to change password. Error occured.\n"
 msgstr "No se pudo cambiar la contraseña. Se produjo un error.\n"
 
-#: src/protocols/gg/gg.c:500
+#: ../src/protocols/gg/gg.c:665 src/protocols/gg/gg.c:674
 msgid "Change password for the Gadu-Gadu account"
-msgstr "Se ha cambiado la contraseña para la cuenta Gadu-Gadu"
-
-#: src/protocols/gg/gg.c:501
+msgstr "Cambiar la contraseña de la cuenta Gadu-Gadu"
+
+#: ../src/protocols/gg/gg.c:666 src/protocols/gg/gg.c:675
 msgid "Password was changed successfully!"
-msgstr "Se cambió con éxito la contraseña"
-
-#: src/protocols/gg/gg.c:535
-msgid "Token Error"
-msgstr "Error de token"
-
-#: src/protocols/gg/gg.c:536
-msgid "Unable to fetch the token.\n"
-msgstr "No se pudo obtener el token.\n"
-
-#: src/protocols/gg/gg.c:551
+msgstr "¡Se cambió con éxito la contraseña!"
+
+#: ../src/protocols/gg/gg.c:699 src/protocols/gg/gg.c:708
 msgid "Current password"
 msgstr "Contraseña actual"
 
-#: src/protocols/gg/gg.c:555 src/protocols/gg/gg.c:1476
-#: src/protocols/jabber/jabber.c:632 src/protocols/jabber/jabber.c:1150
-msgid "Password"
-msgstr "Contraseña"
-
-#: src/protocols/gg/gg.c:559 src/protocols/gg/gg.c:1480
-msgid "Password (retype)"
-msgstr "Contraseña (de nuevo)"
-
-#: src/protocols/gg/gg.c:563 src/protocols/gg/gg.c:1484
-msgid "Enter current token"
-msgstr "Introduzca el token actual"
-
-#. original size: 60x24
-#: src/protocols/gg/gg.c:568 src/protocols/gg/gg.c:1489
-msgid "Current token"
-msgstr "Token actual"
-
-#: src/protocols/gg/gg.c:574
+#: ../src/protocols/gg/gg.c:724 src/protocols/gg/gg.c:733
 msgid "Please, enter your current password and your new password for UIN: "
-msgstr "Introduzca su contraseña actual y su contraseña nueva para UIN: "
-
-#: src/protocols/gg/gg.c:578 src/protocols/gg/gg.c:579
+msgstr "Introduzca su contraseña actual y la contraseña nueva para UIN: "
+
+#: ../src/protocols/gg/gg.c:728 ../src/protocols/gg/gg.c:729
+#: src/protocols/gg/gg.c:737 src/protocols/gg/gg.c:738
 msgid "Change Gadu-Gadu Password"
-msgstr "Cambio de la contraseña Gadu-Gadu"
-
-#: src/protocols/gg/gg.c:649
+msgstr "Cambiar la contraseña Gadu-Gadu"
+
+#. #-#-#-#-#  es.po (Gaim)  #-#-#-#-#
+#. TODO: s/screenname/alias/
+#: ../src/protocols/gg/gg.c:804 src/protocols/gg/gg.c:822
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Seleccione un chat para el amigo: %s"
 
-#: src/protocols/gg/gg.c:651 src/protocols/gg/gg.c:652
+#: ../src/protocols/gg/gg.c:807 ../src/protocols/gg/gg.c:808
+#: src/protocols/gg/gg.c:825 src/protocols/gg/gg.c:826
 msgid "Add to chat..."
-msgstr "Añadir a un chat..."
-
-#: src/protocols/gg/gg.c:812
-msgid "Unable to read socket"
-msgstr "No se pudo leer del conector"
-
-#: src/protocols/gg/gg.c:959
+msgstr "Añadir al chat"
+
+#: src/protocols/gg/gg.c:965
+msgid "No matching users found"
+msgstr "No se encontraron usuarios que coincidan"
+
+#: src/protocols/gg/gg.c:966
+msgid "There are no users matching your search criteria."
+msgstr "No hay usuarios que coincidan con sus criterios de búsqueda."
+
+#: src/protocols/gg/gg.c:977 src/protocols/gg/gg.c:1044
+#: src/protocols/oscar/oscar.c:6158
+msgid "Unable to display the search results."
+msgstr "No se pueden mostrar los resultados de la búsqueda."
+
+#: ../src/protocols/gg/gg.c:968 ../src/protocols/oscar/oscar.c:6099
+#: src/protocols/gg/gg.c:983 src/protocols/oscar/oscar.c:5993
+msgid "UIN"
+msgstr "UIN"
+
+#: src/protocols/gg/gg.c:995
+msgid "Birth year"
+msgstr "Año de nacimiento"
+
+#: ../src/protocols/gg/gg.c:1020 src/protocols/gg/gg.c:1035
 msgid "Gadu-Gadu Public Directory"
 msgstr "Directorio público Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:960
+#: ../src/protocols/gg/gg.c:1021 src/protocols/gg/gg.c:1036
 msgid "Search results"
 msgstr "Resultados de la búsqueda"
 
-#. zephyr has several exposures
-#. NONE (where you are hidden, and zephyrs to you are in practice silently dropped -- yes this is wrong)
-#. OPSTAFF "hidden"
-#. REALM-VISIBLE visible to people in local realm
-#. REALM-ANNOUNCED REALM-VISIBLE+ plus your logins/logouts are announced to <login,username,*>
-#. NET-VISIBLE REALM-ANNOUNCED, plus visible to people in foreign realm
-#. NET-ANNOUNCED NET-VISIBLE, plus logins/logouts are announced	 to <login,username,*>
-#.
-#. Online will set the user to the exposure they have in their options (defaulting to REALM-VISIBLE),
-#. Hidden, will set the user's exposure to OPSTAFF
-#.
-#. Away won't change their exposure but will set an auto away message (for IMs only)
-#.
-#: src/protocols/gg/gg.c:1087 src/protocols/jabber/buddy.c:1089
-#: src/protocols/napster/napster.c:578 src/protocols/oscar/oscar.c:713
-#: src/protocols/yahoo/yahoo.c:2639 src/protocols/zephyr/zephyr.c:2252
-msgid "Online"
-msgstr "Conectado"
-
-#. type = gaim_status_type_new_with_attrs(GAIM_STATUS_UNAVAILABLE, "not-available", "Not Available",
-#. TRUE, TRUE, FALSE, "message", _("Message"),
-#. gaim_value_new(GAIM_TYPE_STRING), NULL);
-#. types = g_list_append(types, type);
-#: src/protocols/gg/gg.c:1106 src/protocols/msn/msn.c:585
-#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2828
-#: src/protocols/novell/novell.c:2962 src/protocols/novell/novell.c:3044
-#: src/protocols/silc/buddy.c:1421 src/protocols/silc/silc.c:54
-#: src/protocols/yahoo/yahoo.c:2617 src/protocols/yahoo/yahoo.c:3233
-msgid "Busy"
-msgstr "Ocupado"
-
-#: src/protocols/gg/gg.c:1111 src/protocols/msn/msn.c:554
+#: ../src/protocols/gg/gg.c:1118 ../src/protocols/gg/gg.c:1265
+#: src/protocols/gg/gg.c:1132 src/protocols/gg/gg.c:1279
+msgid "Unable to read socket"
+msgstr "No se pudo leer el socket"
+
+#: src/protocols/gg/gg.c:1215
+msgid "Buddy list downloaded"
+msgstr "Lista de amigos descargada"
+
+#: src/protocols/gg/gg.c:1216
+msgid "Your buddy list was downloaded from the server."
+msgstr "Su lista de amigos fue descargada del servidor."
+
+#: src/protocols/gg/gg.c:1223
+msgid "Buddy list uploaded"
+msgstr "Lista de amigos exportada"
+
+#: src/protocols/gg/gg.c:1224
+msgid "Your buddy list was stored on the server."
+msgstr "Su lista de amigos fue almacenada en el servidor."
+
+#: ../src/protocols/gg/gg.c:1311 ../src/protocols/gg/gg.c:1532
+#: src/protocols/gg/gg.c:1313 src/protocols/gg/gg.c:1531
+msgid "Connection failed."
+msgstr "Falló la conexión."
+
+#: ../src/protocols/gg/gg.c:1445 ../src/protocols/msn/msn.c:566
+#: src/protocols/gg/gg.c:1456 src/protocols/msn/msn.c:562
 msgid "Blocked"
 msgstr "Bloqueado"
 
-#: src/protocols/gg/gg.c:1129
+#: ../src/protocols/gg/gg.c:1468 src/protocols/gg/gg.c:1473
 msgid "Add to chat"
 msgstr "Añadir al chat"
 
-#: src/protocols/gg/gg.c:1133
+#: ../src/protocols/gg/gg.c:1477 src/protocols/gg/gg.c:1478
 msgid "Unblock"
 msgstr "Desbloquear"
 
-#: src/protocols/gg/gg.c:1149
+#: ../src/protocols/gg/gg.c:1481 src/gtkprivacy.c:632 src/gtkprivacy.c:643
+#: src/protocols/gg/gg.c:1481
+msgid "Block"
+msgstr "Bloquear"
+
+#: ../src/protocols/gg/gg.c:1498 src/protocols/gg/gg.c:1497
 msgid "Chat _name:"
 msgstr "_Nombre de chat:"
 
-#: src/protocols/gg/gg.c:1183
-msgid "Connection failed."
-msgstr "Falló la conexión."
-
-#: src/protocols/gg/gg.c:1357
+#: ../src/protocols/gg/gg.c:1724 src/protocols/gg/gg.c:1716
 msgid "Chat error"
 msgstr "Error de chat"
 
-#: src/protocols/gg/gg.c:1358
+#: ../src/protocols/gg/gg.c:1725 src/protocols/gg/gg.c:1717
 msgid "This chat name is already in use"
 msgstr "Ya existe un chat con ese nombre"
 
-#: src/protocols/gg/gg.c:1435
+#: ../src/protocols/gg/gg.c:1808 src/protocols/gg/gg.c:1799
 msgid "Not connected to the server."
 msgstr "No está conectado al servidor."
 
-#: src/protocols/gg/gg.c:1456
-msgid "Token Error: Unable to fetch the token.\n"
-msgstr "Error en el token: no se pudo obtener un token.\n"
-
-#: src/protocols/gg/gg.c:1472
-msgid "e-Mail"
-msgstr "Correo electrónico"
-
-#: src/protocols/gg/gg.c:1495 src/protocols/gg/gg.c:1496
-msgid "Register New Gadu-Gadu Account"
-msgstr "Registrando cuenta nueva de Gadu-Gadu"
-
-#: src/protocols/gg/gg.c:1497
-msgid "Please, fill in the following fields"
-msgstr "Por favor, rellene los siguientes campos"
-
-#: src/protocols/gg/gg.c:1515
-msgid "Change password"
-msgstr "Cambiar contraseña"
-
-#: src/protocols/gg/gg.c:1520
+#: src/protocols/gg/gg.c:1822
+msgid "Find buddies..."
+msgstr "Encontrar amigos... "
+
+#: src/protocols/gg/gg.c:1828
+msgid "Change password..."
+msgstr "Cambiar su contraseña..."
+
+#: ../src/protocols/gg/gg.c:1843 src/protocols/gg/gg.c:1834
 msgid "Upload buddylist to Server"
 msgstr "Subir la lista de amigos al servidor"
 
-#: src/protocols/gg/gg.c:1523
+#: ../src/protocols/gg/gg.c:1847 src/protocols/gg/gg.c:1838
 msgid "Download buddylist from Server"
 msgstr "Descargar la lista de amigos del servidor"
 
-#: src/protocols/gg/gg.c:1526
+#: ../src/protocols/gg/gg.c:1851 src/protocols/gg/gg.c:1842
 msgid "Delete buddylist from Server"
 msgstr "Borrar la lista de amigos del servidor"
 
-#: src/protocols/gg/gg.c:1529
-msgid "Save buddylist to file"
-msgstr "Guardar la lista de amigos en un fichero"
-
-#: src/protocols/gg/gg.c:1532
-msgid "Load buddylist from file"
-msgstr "Cargar la lista de amigos de un fichero"
+#: src/protocols/gg/gg.c:1846
+msgid "Save buddylist to file..."
+msgstr "Guardar lista de amigos a archivo..."
+
+#: src/protocols/gg/gg.c:1850
+msgid "Load buddylist from file..."
+msgstr "Cargar la lista de amigos desde archivo..."
 
 #. magic
 #. major_version
@@ -4948,117 +6333,137 @@
 #. id
 #. name
 #. version
-#: src/protocols/gg/gg.c:1617
+#: ../src/protocols/gg/gg.c:1949 src/protocols/gg/gg.c:1937
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Complemento de protocolo Gadu-Gadu"
 
 #. summary
-#: src/protocols/gg/gg.c:1618
+#: ../src/protocols/gg/gg.c:1950 src/protocols/gg/gg.c:1938
 msgid "Polish popular IM"
-msgstr "MI popular polaca"
-
-#: src/protocols/gg/gg.c:1665
+msgstr "Mensajería instantánea polaca muy popular"
+
+#: ../src/protocols/gg/gg.c:1998 src/protocols/gg/gg.c:1986
 msgid "Gadu-Gadu User"
 msgstr "Usuario de Gadu-Gadu"
 
-#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1313
+#: ../src/protocols/irc/cmds.c:43 ../src/protocols/silc/silc.c:1582
+#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1572
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Orden desconocida: %s"
 
-#: src/protocols/irc/cmds.c:468 src/protocols/jabber/chat.c:592
-#: src/protocols/silc/silc.c:1021
+#: ../src/protocols/irc/cmds.c:482 ../src/protocols/jabber/chat.c:592
+#: ../src/protocols/silc/silc.c:1290 src/protocols/irc/cmds.c:485
+#: src/protocols/jabber/chat.c:592 src/protocols/silc/silc.c:1280
 #, c-format
 msgid "current topic is: %s"
 msgstr "el tema actual es: %s"
 
-#: src/protocols/irc/cmds.c:472 src/protocols/jabber/chat.c:596
-#: src/protocols/silc/silc.c:1025
+#: ../src/protocols/irc/cmds.c:486 ../src/protocols/jabber/chat.c:596
+#: ../src/protocols/silc/silc.c:1294 src/protocols/irc/cmds.c:489
+#: src/protocols/jabber/chat.c:596 src/protocols/silc/silc.c:1284
 msgid "No topic is set"
 msgstr "No hay tema establecido"
 
-#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:173
-#: src/protocols/yahoo/yahoo_filexfer.c:182
-#: src/protocols/yahoo/yahoo_filexfer.c:191
+#: ../src/protocols/irc/dcc_send.c:287 ../src/protocols/irc/dcc_send.c:326
+#: ../src/protocols/yahoo/yahoo_filexfer.c:252
+#: ../src/protocols/yahoo/yahoo_filexfer.c:261
+#: ../src/protocols/yahoo/yahoo_filexfer.c:270
 msgid "File Transfer Failed"
 msgstr "Falló la transferencia de archivos"
 
+#: ../src/protocols/irc/dcc_send.c:288 ../src/protocols/irc/dcc_send.c:327
 #: src/protocols/irc/dcc_send.c:273
 msgid "Gaim could not open a listening port."
 msgstr "Gaim no pudo abrir un puerto de escucha."
 
-#: src/protocols/irc/irc.c:79
+#: ../src/protocols/irc/irc.c:78 src/protocols/irc/irc.c:78
 msgid "Error displaying MOTD"
 msgstr "Error al mostrar el MOTD"
 
-#: src/protocols/irc/irc.c:79
+#: ../src/protocols/irc/irc.c:78 src/protocols/irc/irc.c:78
 msgid "No MOTD available"
 msgstr "No hay MOTD disponible"
 
-#: src/protocols/irc/irc.c:80
+#: ../src/protocols/irc/irc.c:79 src/protocols/irc/irc.c:79
 msgid "There is no MOTD associated with this connection."
 msgstr "No hay MOTD asociado con esta conexión."
 
-#: src/protocols/irc/irc.c:83
+#: ../src/protocols/irc/irc.c:82 src/protocols/irc/irc.c:82
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD para %s"
 
-#: src/protocols/irc/irc.c:103 src/protocols/irc/irc.c:522
-#: src/protocols/irc/irc.c:544
+#: ../src/protocols/irc/irc.c:119 ../src/protocols/irc/irc.c:149
+#: ../src/protocols/irc/irc.c:604 ../src/protocols/irc/irc.c:629
+#: src/protocols/irc/irc.c:102 src/protocols/irc/irc.c:529
+#: src/protocols/irc/irc.c:551
 msgid "Server has disconnected"
 msgstr "El servidor se ha desconectado"
 
-#: src/protocols/irc/irc.c:188
+#: ../src/protocols/irc/irc.c:242 src/protocols/irc/irc.c:187
 msgid "View MOTD"
 msgstr "Ver MOTD"
 
-#: src/protocols/irc/irc.c:200 src/protocols/silc/chat.c:32
+#: ../src/protocols/irc/irc.c:254 ../src/protocols/silc/chat.c:33
+#: src/protocols/irc/irc.c:199 src/protocols/silc/chat.c:33
 msgid "_Channel:"
 msgstr "_Canal:"
 
-#: src/protocols/irc/irc.c:206 src/protocols/jabber/chat.c:59
+#: ../src/protocols/irc/irc.c:260 ../src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:205 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "Contra_seña:"
 
-#: src/protocols/irc/irc.c:238
+#: ../src/protocols/irc/irc.c:292 src/protocols/irc/irc.c:237
 msgid "IRC nicks may not contain whitespace"
 msgstr "Los apodos de IRC no pueden tener espacios en blanco"
 
-#: src/protocols/irc/irc.c:266 src/protocols/jabber/jabber.c:433
-#: src/protocols/jabber/jabber.c:770
+#: ../src/protocols/irc/irc.c:321 ../src/protocols/jabber/jabber.c:549
+#: ../src/protocols/jabber/jabber.c:889 src/protocols/irc/irc.c:265
+#: src/protocols/jabber/jabber.c:481 src/protocols/jabber/jabber.c:818
 msgid "SSL support unavailable"
 msgstr "Soporte SSL no disponible"
 
-#: src/protocols/irc/irc.c:277 src/protocols/simple/simple.c:383
-#: src/protocols/simple/simple.c:1219
+#: ../src/protocols/irc/irc.c:333 ../src/protocols/simple/simple.c:456
+#: ../src/protocols/simple/simple.c:1427 src/protocols/irc/irc.c:276
+#: src/protocols/simple/simple.c:392 src/protocols/simple/simple.c:1237
 msgid "Couldn't create socket"
-msgstr "No se pudo crear el conector"
-
-#: src/protocols/irc/irc.c:348 src/protocols/jabber/jabber.c:306
-#: src/protocols/oscar/oscar.c:1744 src/protocols/oscar/oscar.c:1812
+msgstr "No se pudo crear el socket"
+
+#: ../src/protocols/irc/irc.c:404 ../src/protocols/jabber/jabber.c:420
+#: ../src/protocols/oscar/oscar.c:1803 ../src/protocols/oscar/oscar.c:1870
+#: src/protocols/irc/irc.c:347 src/protocols/jabber/jabber.c:354
+#: src/protocols/oscar/oscar.c:1732 src/protocols/oscar/oscar.c:1800
 msgid "Couldn't connect to host"
 msgstr "No se pudo conectar al servidor"
 
-#: src/protocols/irc/irc.c:373 src/protocols/jabber/jabber.c:333
+#: ../src/protocols/irc/irc.c:429 ../src/protocols/jabber/jabber.c:447
+#: src/protocols/irc/irc.c:372 src/protocols/jabber/jabber.c:381
 msgid "Connection Failed"
 msgstr "Falló la conexión"
 
-#: src/protocols/irc/irc.c:376 src/protocols/jabber/jabber.c:336
+#: ../src/protocols/irc/irc.c:432 ../src/protocols/jabber/jabber.c:450
+#: src/protocols/irc/irc.c:375 src/protocols/jabber/jabber.c:384
 msgid "SSL Handshake Failed"
-msgstr "Falló en el saludo inicial de SSL"
-
-#: src/protocols/irc/irc.c:519 src/protocols/irc/irc.c:541
+msgstr "Se produjo un fallo en la negociación SSL"
+
+#: ../src/protocols/irc/irc.c:601 ../src/protocols/irc/irc.c:626
+#: src/protocols/irc/irc.c:526 src/protocols/irc/irc.c:548
 msgid "Read error"
 msgstr "Error de lectura"
 
-#: src/protocols/irc/irc.c:690 src/protocols/silc/chat.c:1388
-#: src/protocols/yahoo/yahoochat.c:1376
+#: ../src/protocols/irc/irc.c:765 ../src/protocols/silc/chat.c:1420
+#: ../src/protocols/yahoo/yahoochat.c:1430 src/protocols/irc/irc.c:687
+#: src/protocols/silc/chat.c:1419 src/protocols/yahoo/yahoochat.c:1378
 msgid "Users"
 msgstr "Usuarios"
 
-#: src/protocols/irc/irc.c:693 src/protocols/silc/chat.c:1391
-#: src/protocols/silc/ops.c:1166 src/protocols/yahoo/yahoochat.c:1385
+#: ../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/yahoo/yahoochat.c:1439 src/protocols/irc/irc.c:690
+#: src/protocols/sametime/sametime.c:3324 src/protocols/silc/chat.c:1422
+#: src/protocols/silc/ops.c:1380 src/protocols/yahoo/yahoochat.c:1387
 msgid "Topic"
 msgstr "Tema"
 
@@ -5070,34 +6475,45 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:799
+#: ../src/protocols/irc/irc.c:878 src/protocols/irc/irc.c:797
 msgid "IRC Protocol Plugin"
 msgstr "Complemento de protocolo IRC"
 
 #. *  summary
-#: src/protocols/irc/irc.c:800
+#: ../src/protocols/irc/irc.c:879 src/protocols/irc/irc.c:798
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Complemento de protocolo IRC menos malo"
 
-#: src/protocols/irc/irc.c:819 src/protocols/irc/msgs.c:233
-#: src/protocols/jabber/jabber.c:1708 src/protocols/napster/napster.c:707
-#: src/protocols/simple/simple.c:1428 src/protocols/silc/ops.c:1028
-#: src/protocols/silc/ops.c:1130
+#. host to connect to
+#: ../src/protocols/irc/irc.c:898 ../src/protocols/irc/msgs.c:231
+#: ../src/protocols/jabber/jabber.c:1908
+#: ../src/protocols/napster/napster.c:720
+#: ../src/protocols/sametime/sametime.c:5639 ../src/protocols/silc/ops.c:1242
+#: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1663
+#: src/protocols/irc/irc.c:817 src/protocols/irc/msgs.c:233
+#: src/protocols/jabber/jabber.c:1766 src/protocols/napster/napster.c:714
+#: src/protocols/sametime/sametime.c:5581 src/protocols/silc/ops.c:1242
+#: src/protocols/silc/ops.c:1344 src/protocols/simple/simple.c:1448
 msgid "Server"
 msgstr "Servidor"
 
-#: src/protocols/irc/irc.c:825
+#: ../src/protocols/irc/irc.c:904 src/protocols/irc/irc.c:823
 msgid "Encodings"
 msgstr "Codificaciones"
 
-#: src/protocols/irc/irc.c:828 src/protocols/irc/msgs.c:227
-#: src/protocols/jabber/jabber.c:628 src/protocols/silc/buddy.c:1483
-#: src/protocols/silc/ops.c:975 src/protocols/silc/ops.c:977
-#: src/protocols/silc/ops.c:1124 src/protocols/silc/ops.c:1126
+#: ../src/protocols/irc/irc.c:907 ../src/protocols/irc/msgs.c:225
+#: ../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:929 src/protocols/irc/irc.c:826
+#: src/protocols/irc/msgs.c:227 src/protocols/jabber/jabber.c:676
+#: src/protocols/silc/buddy.c:1497 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:919
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: src/protocols/irc/irc.c:831
+#: ../src/protocols/irc/irc.c:910 src/protocols/irc/irc.c:829
 msgid "Real name"
 msgstr "Nombre real"
 
@@ -5105,211 +6521,231 @@
 #. option = gaim_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: src/protocols/irc/irc.c:839
+#: ../src/protocols/irc/irc.c:918 src/protocols/irc/irc.c:837
 msgid "Use SSL"
 msgstr "Usar SSL"
 
-#: src/protocols/irc/msgs.c:105
+#: ../src/protocols/irc/msgs.c:103 src/protocols/irc/msgs.c:105
 msgid "Bad mode"
 msgstr "Modo erróneo"
 
 # Banned puede ser expulsar o censurar, prefiero expulsar. jfs.
-#: src/protocols/irc/msgs.c:116
+#: ../src/protocols/irc/msgs.c:114 src/protocols/irc/msgs.c:116
 #, c-format
 msgid "You are banned from %s."
 msgstr "Ha sido expulsado de %s."
 
-#: src/protocols/irc/msgs.c:117
+#: ../src/protocols/irc/msgs.c:115 src/protocols/irc/msgs.c:117
 msgid "Banned"
 msgstr "Expulsado"
 
-#: src/protocols/irc/msgs.c:134
+#: ../src/protocols/irc/msgs.c:132 src/protocols/irc/msgs.c:134
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "No se puede expulsar a %s: la lista de expulsados está llena"
 
-#: src/protocols/irc/msgs.c:213 src/protocols/irc/msgs.c:233
-#: src/protocols/irc/msgs.c:246
+#: ../src/protocols/irc/msgs.c:211 ../src/protocols/irc/msgs.c:231
+#: ../src/protocols/irc/msgs.c:244 src/protocols/irc/msgs.c:213
+#: src/protocols/irc/msgs.c:233 src/protocols/irc/msgs.c:246
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: src/protocols/irc/msgs.c:213 src/protocols/oscar/oscar.c:5952
-#: src/protocols/silc/ops.c:1198
+#: ../src/protocols/irc/msgs.c:211 ../src/protocols/oscar/oscar.c:6100
+#: ../src/protocols/silc/ops.c:1412 src/protocols/irc/msgs.c:213
+#: src/protocols/oscar/oscar.c:5994 src/protocols/silc/ops.c:1412
 msgid "Nick"
 msgstr "Apodo"
 
-#: src/protocols/irc/msgs.c:216
+#: ../src/protocols/irc/msgs.c:214 src/protocols/irc/msgs.c:216
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: src/protocols/irc/msgs.c:217
+#: ../src/protocols/irc/msgs.c:215 src/protocols/irc/msgs.c:217
 msgid " <i>(identified)</i>"
 msgstr " <i>(identificado)</i>"
 
-#: src/protocols/irc/msgs.c:221 src/protocols/irc/msgs.c:227
-#: src/protocols/irc/msgs.c:228 src/protocols/irc/msgs.c:239
-#: src/protocols/yahoo/yahoo_profile.c:660
+#: ../src/protocols/irc/msgs.c:219 ../src/protocols/irc/msgs.c:225
+#: ../src/protocols/irc/msgs.c:226 ../src/protocols/irc/msgs.c:237
+#: ../src/protocols/yahoo/yahoo_profile.c:691 src/protocols/irc/msgs.c:221
+#: src/protocols/irc/msgs.c:227 src/protocols/irc/msgs.c:228
+#: src/protocols/irc/msgs.c:239 src/protocols/yahoo/yahoo_profile.c:660
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:228 src/protocols/silc/ops.c:969
-#: src/protocols/silc/ops.c:1118 src/protocols/yahoo/yahoo_profile.c:1005
+#: ../src/protocols/irc/msgs.c:226 ../src/protocols/silc/ops.c:1183
+#: ../src/protocols/silc/ops.c:1332
+#: ../src/protocols/yahoo/yahoo_profile.c:1040 src/protocols/irc/msgs.c:228
+#: src/protocols/silc/ops.c:1183 src/protocols/silc/ops.c:1332
+#: src/protocols/yahoo/yahoo_profile.c:1009
 msgid "Realname"
 msgstr "Nombre real"
 
-#: src/protocols/irc/msgs.c:239 src/protocols/silc/ops.c:1041
+#: ../src/protocols/irc/msgs.c:237 ../src/protocols/silc/ops.c:1255
+#: src/protocols/irc/msgs.c:239 src/protocols/silc/ops.c:1255
 msgid "Currently on"
 msgstr "Actualmente en"
 
-#: src/protocols/irc/msgs.c:244
+#: ../src/protocols/irc/msgs.c:242 src/protocols/irc/msgs.c:244
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>Inactivo desde:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:246
+#: ../src/protocols/irc/msgs.c:244 src/protocols/irc/msgs.c:246
 msgid "Online since"
 msgstr "Conectado desde"
 
-#: src/protocols/irc/msgs.c:249
+#: ../src/protocols/irc/msgs.c:248 src/protocols/irc/msgs.c:249
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>Adjetivo que lo define:</b> Glorioso</b>"
 
-#: src/protocols/irc/msgs.c:317
+#: ../src/protocols/irc/msgs.c:316 src/protocols/irc/msgs.c:317
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s ha cambiado el tema a: %s"
 
-#: src/protocols/irc/msgs.c:322
+#: ../src/protocols/irc/msgs.c:321 src/protocols/irc/msgs.c:322
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "El tema de %s es: %s"
 
-#: src/protocols/irc/msgs.c:339
+#: ../src/protocols/irc/msgs.c:338 src/protocols/irc/msgs.c:339
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Mensaje desconocido '%s'"
 
-#: src/protocols/irc/msgs.c:340
+#: ../src/protocols/irc/msgs.c:339 src/protocols/irc/msgs.c:340
 msgid "Unknown message"
 msgstr "Mensaje desconocido"
 
-#: src/protocols/irc/msgs.c:340
+#: ../src/protocols/irc/msgs.c:339 src/protocols/irc/msgs.c:340
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim ha enviado un mensaje que el servidor IRC no pudo entender."
 
-#: src/protocols/irc/msgs.c:363
+#: ../src/protocols/irc/msgs.c:362 src/protocols/irc/msgs.c:363
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Usuarios en %s: %s"
 
-#: src/protocols/irc/msgs.c:482
+#: ../src/protocols/irc/msgs.c:490 src/protocols/irc/msgs.c:491
 msgid "Time Response"
 msgstr "Respuesta de hora"
 
-#: src/protocols/irc/msgs.c:483
+#: ../src/protocols/irc/msgs.c:491 src/protocols/irc/msgs.c:492
 msgid "The IRC server's local time is:"
 msgstr "La hora local del servidor de IRC es:"
 
-#: src/protocols/irc/msgs.c:494
+#: ../src/protocols/irc/msgs.c:502 src/protocols/irc/msgs.c:503
 msgid "No such channel"
 msgstr "No existe ese canal"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:505
+#: ../src/protocols/irc/msgs.c:513 src/protocols/irc/msgs.c:514
 msgid "no such channel"
 msgstr "no existe el canal"
 
-#: src/protocols/irc/msgs.c:508
+#: ../src/protocols/irc/msgs.c:516 src/protocols/irc/msgs.c:517
 msgid "User is not logged in"
 msgstr "El usuario no está conectado"
 
-#: src/protocols/irc/msgs.c:513
+#: ../src/protocols/irc/msgs.c:521 src/protocols/irc/msgs.c:522
 msgid "No such nick or channel"
 msgstr "No existe el apodo o canal"
 
-#: src/protocols/irc/msgs.c:533
+#: ../src/protocols/irc/msgs.c:541 src/protocols/irc/msgs.c:542
 msgid "Could not send"
 msgstr "No se pudo enviar"
 
-#: src/protocols/irc/msgs.c:589
+#: ../src/protocols/irc/msgs.c:597 src/protocols/irc/msgs.c:598
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Para unirse a %s es necesaria una invitación."
 
-#: src/protocols/irc/msgs.c:590
+#: ../src/protocols/irc/msgs.c:598 src/protocols/irc/msgs.c:599
 msgid "Invitation only"
 msgstr "Sólo con invitación"
 
-#: src/protocols/irc/msgs.c:692
+#: ../src/protocols/irc/msgs.c:699 src/protocols/irc/msgs.c:701
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Ha sido expulsado por %s: (%s)"
 
-#: src/protocols/irc/msgs.c:697
+#. #-#-#-#-#  es.po (Gaim)  #-#-#-#-#
+#. Remove user from channel
+#: ../src/protocols/irc/msgs.c:704 ../src/protocols/silc/ops.c:721
+#: src/protocols/irc/msgs.c:706
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Expulsado por %s (%s)"
 
-#: src/protocols/irc/msgs.c:721
+#: ../src/protocols/irc/msgs.c:727 src/protocols/irc/msgs.c:730
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "modo (%s %s) por %s"
 
-#: src/protocols/irc/msgs.c:805
+#: ../src/protocols/irc/msgs.c:812 ../src/protocols/irc/msgs.c:813
+msgid "Invalid nickname"
+msgstr "Apodo inválido"
+
+#: ../src/protocols/irc/msgs.c:814
+msgid ""
+"Your selected nickname was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr "El servidor rechazó el nombre que escogió para su cuenta. Es posible que incluya caracteres inválidos."
+
+#: ../src/protocols/irc/msgs.c:818 src/protocols/irc/msgs.c:814
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
-msgstr ""
-"El servidor rechazó el nombre que escogió para su cuenta. Es posible que "
-"incluya caractéres inválidos."
-
-#: src/protocols/irc/msgs.c:844
+msgstr "El servidor rechazó el nombre que escogió para su cuenta. Es posible que incluya caracteres inválidos."
+
+#: ../src/protocols/irc/msgs.c:858 src/protocols/irc/msgs.c:853
 msgid "Cannot change nick"
 msgstr "No se puede cambiar el alias"
 
-#: src/protocols/irc/msgs.c:844
+#: ../src/protocols/irc/msgs.c:858 src/protocols/irc/msgs.c:853
 msgid "Could not change nick"
 msgstr "No se pudo cambiar el alias"
 
-#: src/protocols/irc/msgs.c:865
+#: ../src/protocols/irc/msgs.c:879 src/protocols/irc/msgs.c:874
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Ha abandonado el canal %s%s"
 
-#: src/protocols/irc/msgs.c:907
+#: ../src/protocols/irc/msgs.c:921 src/protocols/irc/msgs.c:916
 msgid "Error: invalid PONG from server"
 msgstr "Error: PONG inválido del servidor"
 
-#: src/protocols/irc/msgs.c:909
+#: ../src/protocols/irc/msgs.c:923 src/protocols/irc/msgs.c:918
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Respuesta PING -- Retraso: %lu segundos"
 
-#: src/protocols/irc/msgs.c:984
+#: ../src/protocols/irc/msgs.c:998 src/protocols/irc/msgs.c:993
 #, c-format
 msgid "Cannot join %s:"
 msgstr "No se puede unir a %s:"
 
-#: src/protocols/irc/msgs.c:985 src/protocols/silc/ops.c:914
+#: ../src/protocols/irc/msgs.c:999 ../src/protocols/silc/ops.c:1128
+#: src/protocols/irc/msgs.c:994 src/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "No se puede unir al canal"
 
-#: src/protocols/irc/msgs.c:1019
+#: ../src/protocols/irc/msgs.c:1033 src/protocols/irc/msgs.c:1028
 msgid "Nick or channel is temporarily unavailable."
-msgstr "El apodo o canal están temporalmente no disponible."
-
-#: src/protocols/irc/msgs.c:1031
+msgstr "El apodo o el canal están temporalmente no disponibles."
+
+#: ../src/protocols/irc/msgs.c:1045 src/protocols/irc/msgs.c:1040
 #, c-format
 msgid "Wallops from %s"
 msgstr "Mensajes globales de %s"
 
-#: src/protocols/irc/parse.c:114
+#: ../src/protocols/irc/parse.c:114 src/protocols/irc/parse.c:114
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;acción a realizar&gt;: Realiza una acción."
 
-#: src/protocols/irc/parse.c:115
+#: ../src/protocols/irc/parse.c:115 src/protocols/irc/parse.c:115
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -5318,6 +6754,10 @@
 "mensaje al dejar de estar ausente."
 
 #: src/protocols/irc/parse.c:116
+msgid "chanserv: Send a command to chanserv"
+msgstr "chanserv: Enviar un comando al servidor"
+
+#: ../src/protocols/irc/parse.c:117 src/protocols/irc/parse.c:117
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -5325,7 +6765,7 @@
 "deop &lt;apodo1&gt; [apodo2] ....: Quitarle a alguien el estado de operador "
 "de canal. Sólo un operador de canal puede hacerlo."
 
-#: src/protocols/irc/parse.c:117
+#: ../src/protocols/irc/parse.c:118 src/protocols/irc/parse.c:118
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -5335,7 +6775,7 @@
 "hablar en el canal si éste está moderado (+m). Sólo lo puede hacer un "
 "operador de canal."
 
-#: src/protocols/irc/parse.c:118
+#: ../src/protocols/irc/parse.c:119 src/protocols/irc/parse.c:119
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -5343,7 +6783,7 @@
 "invite %lt;apodo&gt; [sala]:  Invitar a alguien a unirse al canal "
 "especificado o al canal actual."
 
-#: src/protocols/irc/parse.c:119
+#: ../src/protocols/irc/parse.c:120 src/protocols/irc/parse.c:120
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5351,7 +6791,7 @@
 "j &lt;sala1&gt;[,sala2][,...] [clave1[,clave2][,...]]:  Entrar en un o más "
 "canales utilizando, opcionalmente, una clave de canal si fuera necesario."
 
-#: src/protocols/irc/parse.c:120
+#: ../src/protocols/irc/parse.c:121 src/protocols/irc/parse.c:121
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5359,7 +6799,7 @@
 "join &lt;sala1&gt;[,sala2][,...] [clave1[,clave2][,...]]:  Entrar en un o "
 "más canales utilizando, opcionalmente, una clave de canal si fuera necesario."
 
-#: src/protocols/irc/parse.c:121
+#: ../src/protocols/irc/parse.c:122 src/protocols/irc/parse.c:122
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -5367,7 +6807,7 @@
 "kick &lt;apodo&gt; [mensaje]:  Echar a alguien del canal. Sólo lo pueden "
 "hacer los operadores de canal."
 
-#: src/protocols/irc/parse.c:122
+#: ../src/protocols/irc/parse.c:123 src/protocols/irc/parse.c:123
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -5375,11 +6815,15 @@
 "list:  Mostrar una lista de las salas de chat disponibles en la red. "
 "<i>Aviso: algunos servidores puede que le desconecten si hace ésto.</i>"
 
-#: src/protocols/irc/parse.c:123
+#: ../src/protocols/irc/parse.c:124 src/protocols/irc/parse.c:124
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;acción a realizar&gt;:  Realizar una acción."
 
-#: src/protocols/irc/parse.c:124
+#: src/protocols/irc/parse.c:125
+msgid "memoserv: Send a command to memoserv"
+msgstr "memoserv: Enviar un comando al servidor"
+
+#: ../src/protocols/irc/parse.c:126 src/protocols/irc/parse.c:126
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
@@ -5387,7 +6831,7 @@
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;apodo|canal&gt;:  Fija o elimina un modo "
 "de canal o de usuario."
 
-#: src/protocols/irc/parse.c:125
+#: ../src/protocols/irc/parse.c:127 src/protocols/irc/parse.c:127
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -5395,16 +6839,21 @@
 "msg &lt;apodo&gt; &lt;mensaje&gt;:  Enviar un mensaje privado a un usuario "
 "(lo opuesto a un canal)."
 
-#: src/protocols/irc/parse.c:126
+#: ../src/protocols/irc/parse.c:128 src/protocols/irc/parse.c:128
 msgid "names [channel]:  List the users currently in a channel."
 msgstr ""
 "names [canal]:  Obtener la lista de los usuarios que están en el canal."
 
-#: src/protocols/irc/parse.c:127 src/protocols/jabber/jabber.c:1555
+#: ../src/protocols/irc/parse.c:129 ../src/protocols/jabber/jabber.c:1745
+#: src/protocols/irc/parse.c:129 src/protocols/jabber/jabber.c:1610
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nuevo apodo&gt;:  Cambia su apodo."
 
-#: src/protocols/irc/parse.c:128
+#: src/protocols/irc/parse.c:130
+msgid "nickserv: Send a command to nickserv"
+msgstr "nickserv: Enviar un comando al servidor."
+
+#: ../src/protocols/irc/parse.c:131 src/protocols/irc/parse.c:131
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -5412,7 +6861,7 @@
 "op &lt;apodo1&gt; [apodo2] ...:  Dar estado de operador de canal a otra "
 "persona. Sólo lo puede hacer un operador de canal."
 
-#: src/protocols/irc/parse.c:129
+#: ../src/protocols/irc/parse.c:132 src/protocols/irc/parse.c:132
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -5420,7 +6869,11 @@
 "operwall &lt;mensaje&gt;:  Si no sabe lo que es probablemente no puede "
 "utilizarlo."
 
-#: src/protocols/irc/parse.c:130
+#: src/protocols/irc/parse.c:133
+msgid "operserv: Send a command to operserv"
+msgstr "openserv: Enviar un comando al servidor"
+
+#: ../src/protocols/irc/parse.c:134 src/protocols/irc/parse.c:134
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -5428,7 +6881,7 @@
 "part [sala] [mensaje]:  Abandonar el canal actual, o un canal específico, "
 "con el mensaje opcional."
 
-#: src/protocols/irc/parse.c:131
+#: ../src/protocols/irc/parse.c:135 src/protocols/irc/parse.c:135
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -5436,7 +6889,7 @@
 "ping [apodo]:  Pregunta cuanta latencia tiene un usuario (o el servidor si "
 "no se especifica un usuario)."
 
-#: src/protocols/irc/parse.c:132
+#: ../src/protocols/irc/parse.c:136 src/protocols/irc/parse.c:136
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -5444,17 +6897,17 @@
 "query &lt;apodo&gt; &lt;mensaje&gt;:  Envía un mensaje privado a un usuario "
 "(lo opuesto a un canal)."
 
-#: src/protocols/irc/parse.c:133
+#: ../src/protocols/irc/parse.c:137 src/protocols/irc/parse.c:137
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr ""
 "quit [mensaje]:  Desconecta del servidor actual indicando un mensaje "
 "(opcional)."
 
-#: src/protocols/irc/parse.c:134
+#: ../src/protocols/irc/parse.c:138 src/protocols/irc/parse.c:138
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Enviar un comando en crudo al servidor."
 
-#: src/protocols/irc/parse.c:135
+#: ../src/protocols/irc/parse.c:139 src/protocols/irc/parse.c:139
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -5462,20 +6915,20 @@
 "remove &lt;apodo&gt; [mensaje]:  Eliminar a alguien de una sala. Sólo puede "
 "hacerlo un operador de canal."
 
-#: src/protocols/irc/parse.c:136
+#: ../src/protocols/irc/parse.c:140 src/protocols/irc/parse.c:140
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Muestra la hora local en el servidor IRC."
 
-#: src/protocols/irc/parse.c:137
+#: ../src/protocols/irc/parse.c:141 src/protocols/irc/parse.c:141
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [nuevo tema]:  Muestra o cambia el tema del canal."
 
-#: src/protocols/irc/parse.c:138
+#: ../src/protocols/irc/parse.c:142 src/protocols/irc/parse.c:142
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr ""
 "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Establece o elimina un modo de usuario."
 
-#: src/protocols/irc/parse.c:139
+#: ../src/protocols/irc/parse.c:143 src/protocols/irc/parse.c:143
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -5483,38 +6936,41 @@
 "voice &lt;apodo1&gt; [apodo2] ...:  Dar la posibilidad de hablar en el canal "
 "a alguien. Sólo lo puede hacer un operador de canal."
 
-#: src/protocols/irc/parse.c:140
+#: ../src/protocols/irc/parse.c:144 src/protocols/irc/parse.c:144
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 msgstr ""
 "wallops &lt;mensaje&gt;:  Si no sabe lo que es probablemente no pueda usarlo."
 
-#: src/protocols/irc/parse.c:141
+#: ../src/protocols/irc/parse.c:145 src/protocols/irc/parse.c:145
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [servidor] &lt;apodo&gt;:  Obtiene información de un usuario."
 
-#: src/protocols/irc/parse.c:422
+#: ../src/protocols/irc/parse.c:439 src/protocols/irc/parse.c:439
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Tiempo de respuesta de %s: %lu segundos"
 
-#: src/protocols/irc/parse.c:423
+#: ../src/protocols/irc/parse.c:440 src/protocols/irc/parse.c:440
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:423
+#: ../src/protocols/irc/parse.c:440 src/protocols/irc/parse.c:440
 msgid "CTCP PING reply"
 msgstr "Respuesta a PING CTCP"
 
-#: src/protocols/irc/parse.c:526 src/protocols/irc/parse.c:530
-#: src/protocols/oscar/oscar.c:1653 src/protocols/toc/toc.c:190
-#: src/protocols/toc/toc.c:688 src/protocols/toc/toc.c:704
-#: src/protocols/toc/toc.c:780
+#: ../src/protocols/irc/parse.c:542 ../src/protocols/irc/parse.c:546
+#: ../src/protocols/oscar/oscar.c:1710 ../src/protocols/toc/toc.c:190
+#: ../src/protocols/toc/toc.c:688 ../src/protocols/toc/toc.c:704
+#: ../src/protocols/toc/toc.c:780 src/protocols/irc/parse.c:543
+#: src/protocols/irc/parse.c:547 src/protocols/oscar/oscar.c:1641
+#: 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 "Desconectado."
 
-#: src/protocols/jabber/auth.c:51
+#: ../src/protocols/jabber/auth.c:51 src/protocols/jabber/auth.c:51
 msgid ""
 "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
 "account properties"
@@ -5522,27 +6978,31 @@
 "El servidor necesita utilizar TLS/SSL para conectarle. Seleccione la opción "
 "«Usar TLS si está disponible» en las propiedades de la cuenta"
 
-#: src/protocols/jabber/auth.c:53
+#: ../src/protocols/jabber/auth.c:53 src/protocols/jabber/auth.c:53
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr ""
 "El servidor requiere SSL para conectarse. No se dispone de soporte TLS/SSL."
 
-#: src/protocols/jabber/auth.c:114
+#: ../src/protocols/jabber/auth.c:114 src/protocols/jabber/auth.c:114
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "El servidor solicita autenticación en claro sobre un canal no cifrado"
 
-#: src/protocols/jabber/auth.c:133 src/protocols/jabber/auth.c:207
-#: src/protocols/jabber/auth.c:375 src/protocols/jabber/auth.c:473
-#: src/protocols/jabber/auth.c:485 src/protocols/jabber/jabber.c:110
-msgid "Invalid response from server."
-msgstr "Respuesta inválida del servidor."
-
-#: src/protocols/jabber/auth.c:163 src/protocols/jabber/auth.c:164
-#: src/protocols/jabber/auth.c:244 src/protocols/jabber/auth.c:245
+#: ../src/protocols/jabber/auth.c:234 src/protocols/jabber/auth.c:232
+msgid "Server couldn't authenticate you without a password"
+msgstr "El servidor no pudo autenticarle sin una contraseña"
+
+#: ../src/protocols/jabber/auth.c:237 ../src/protocols/jabber/auth.c:238
+#: ../src/protocols/jabber/auth.c:398 ../src/protocols/jabber/auth.c:399
+#: ../src/protocols/jabber/auth.c:480 ../src/protocols/jabber/auth.c:481
+#: src/protocols/jabber/auth.c:235 src/protocols/jabber/auth.c:236
+#: src/protocols/jabber/auth.c:381 src/protocols/jabber/auth.c:382
+#: src/protocols/jabber/auth.c:463 src/protocols/jabber/auth.c:464
 msgid "Plaintext Authentication"
 msgstr "Autenticación en claro"
 
-#: src/protocols/jabber/auth.c:165 src/protocols/jabber/auth.c:246
+#: ../src/protocols/jabber/auth.c:239 ../src/protocols/jabber/auth.c:400
+#: ../src/protocols/jabber/auth.c:482 src/protocols/jabber/auth.c:237
+#: src/protocols/jabber/auth.c:383 src/protocols/jabber/auth.c:465
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -5550,84 +7010,118 @@
 "El servidor solicita autenticación en claro sobre un canal no cifrado. "
 "¿Permitir ésto y continuar con el proceso de autenticación?"
 
-#: src/protocols/jabber/auth.c:173 src/protocols/jabber/auth.c:254
+#: ../src/protocols/jabber/auth.c:245 ../src/protocols/jabber/auth.c:408
+#: ../src/protocols/jabber/auth.c:490 src/protocols/jabber/auth.c:243
+#: src/protocols/jabber/auth.c:391 src/protocols/jabber/auth.c:473
 msgid "Server does not use any supported authentication method"
 msgstr "El servidor no usa un método de autenticación conocido"
 
-#: src/protocols/jabber/auth.c:396
+#. This should never happen!
+#: ../src/protocols/jabber/auth.c:321 ../src/protocols/jabber/auth.c:443
+#: ../src/protocols/jabber/auth.c:611 ../src/protocols/jabber/auth.c:744
+#: ../src/protocols/jabber/auth.c:756 ../src/protocols/jabber/auth.c:775
+#: ../src/protocols/jabber/jabber.c:110 src/protocols/jabber/auth.c:309
+#: src/protocols/jabber/auth.c:426 src/protocols/jabber/auth.c:594
+#: src/protocols/jabber/auth.c:726 src/protocols/jabber/auth.c:738
+#: src/protocols/jabber/auth.c:757 src/protocols/jabber/jabber.c:110
+msgid "Invalid response from server."
+msgstr "Respuesta inválida del servidor."
+
+#: ../src/protocols/jabber/auth.c:632 src/protocols/jabber/auth.c:615
 msgid "Invalid challenge from server"
 msgstr "Desafío inválido del servidor"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:667
-#: src/protocols/silc/ops.c:806
+#: src/protocols/jabber/auth.c:701
+msgid "SASL error"
+msgstr "Error de SASL"
+
+#: ../src/protocols/jabber/buddy.c:249 ../src/protocols/jabber/buddy.c:664
+#: ../src/protocols/silc/ops.c:1020 src/protocols/jabber/buddy.c:249
+#: src/protocols/jabber/buddy.c:667 src/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "Nombre completo"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:680
-#: src/protocols/silc/ops.c:818
+#: ../src/protocols/jabber/buddy.c:250 ../src/protocols/jabber/buddy.c:677
+#: ../src/protocols/silc/ops.c:1032 src/protocols/jabber/buddy.c:250
+#: src/protocols/jabber/buddy.c:680 src/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "Apellidos"
 
+#: ../src/protocols/jabber/buddy.c:251 ../src/protocols/jabber/buddy.c:681
 #: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:684
 msgid "Given Name"
 msgstr "Nombre propio"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/jabber.c:688
+#: ../src/protocols/jabber/buddy.c:253 ../src/protocols/jabber/jabber.c:804
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/jabber.c:736
 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:726
 msgid "Street Address"
 msgstr "Calle"
 
+#: ../src/protocols/jabber/buddy.c:255 ../src/protocols/jabber/buddy.c:729
 #: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:722
 msgid "Extended Address"
 msgstr "Dirección extendida"
 
+#: ../src/protocols/jabber/buddy.c:256 ../src/protocols/jabber/buddy.c:737
 #: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:730
 msgid "Locality"
 msgstr "Localidad"
 
+#: ../src/protocols/jabber/buddy.c:257 ../src/protocols/jabber/buddy.c:741
 #: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:734
 msgid "Region"
 msgstr "Región"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:738
-#: src/protocols/jabber/jabber.c:678
+#: ../src/protocols/jabber/buddy.c:258 ../src/protocols/jabber/buddy.c:745
+#: ../src/protocols/jabber/jabber.c:794 src/protocols/jabber/buddy.c:258
+#: src/protocols/jabber/buddy.c:738 src/protocols/jabber/jabber.c:726
 msgid "Postal Code"
 msgstr "Código postal"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:743
+#: ../src/protocols/jabber/buddy.c:259 ../src/protocols/jabber/buddy.c:750
+#: ../src/protocols/silc/silc.c:939 src/protocols/jabber/buddy.c:259
+#: src/protocols/jabber/buddy.c:743 src/protocols/silc/silc.c:929
 msgid "Country"
 msgstr "País"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:754
-#: src/protocols/jabber/buddy.c:761
+#: ../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:754 src/protocols/jabber/buddy.c:761
 msgid "Telephone"
 msgstr "Teléfono"
 
+#: ../src/protocols/jabber/buddy.c:262 ../src/protocols/jabber/buddy.c:802
 #: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:795
 msgid "Organization Name"
 msgstr "Nombre de la organización"
 
+#: ../src/protocols/jabber/buddy.c:263 ../src/protocols/jabber/buddy.c:806
 #: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:799
 msgid "Organization Unit"
 msgstr "Grupo de trabajo"
 
+#: ../src/protocols/jabber/buddy.c:265 ../src/protocols/jabber/buddy.c:815
 #: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:808
 msgid "Role"
 msgstr "Rol"
 
-#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:701
-#: src/protocols/oscar/oscar.c:5987
+#: ../src/protocols/jabber/buddy.c:266 ../src/protocols/jabber/buddy.c:698
+#: ../src/protocols/oscar/oscar.c:6133 src/protocols/jabber/buddy.c:266
+#: src/protocols/jabber/buddy.c:701 src/protocols/oscar/oscar.c:6029
 msgid "Birthday"
 msgstr "Cumpleaños"
 
+#: ../src/protocols/jabber/buddy.c:567 ../src/protocols/jabber/buddy.c:568
 #: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568
 msgid "Edit Jabber vCard"
 msgstr "Editar vCard de Jabber"
 
-#: src/protocols/jabber/buddy.c:569
+#: ../src/protocols/jabber/buddy.c:569 src/protocols/jabber/buddy.c:569
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -5635,627 +7129,682 @@
 "Todos los campos siguientes son opcionales. Introduzca sólo la información "
 "con la que se sienta cómodo."
 
-#: src/protocols/jabber/buddy.c:616
-msgid "Jabber ID"
-msgstr "ID Jabber"
-
-#: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1711
+#: ../src/protocols/jabber/buddy.c:639 ../src/protocols/jabber/jabber.c:1911
+#: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1769
 msgid "Resource"
 msgstr "Recurso"
 
-#: src/protocols/jabber/buddy.c:688 src/protocols/silc/ops.c:814
+#: ../src/protocols/jabber/buddy.c:685 ../src/protocols/silc/ops.c:1028
+#: src/protocols/jabber/buddy.c:688 src/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "Nombre medio"
 
-#: src/protocols/jabber/buddy.c:706 src/protocols/jabber/jabber.c:663
-#: src/protocols/oscar/oscar.c:6005 src/protocols/oscar/oscar.c:6013
-#: src/protocols/silc/ops.c:850
+#: ../src/protocols/jabber/buddy.c:718 ../src/protocols/jabber/jabber.c:779
+#: ../src/protocols/oscar/oscar.c:6152 ../src/protocols/oscar/oscar.c:6160
+#: ../src/protocols/silc/ops.c:1064 src/protocols/jabber/buddy.c:706
+#: src/protocols/jabber/jabber.c:711 src/protocols/oscar/oscar.c:6047
+#: src/protocols/oscar/oscar.c:6055 src/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "Dirección"
 
-#: src/protocols/jabber/buddy.c:718
+#: ../src/protocols/jabber/buddy.c:725 src/protocols/jabber/buddy.c:718
 msgid "P.O. Box"
 msgstr "Código postal"
 
-#: src/protocols/jabber/buddy.c:832
+#: ../src/protocols/jabber/buddy.c:839 src/protocols/jabber/buddy.c:832
 msgid "Photo"
 msgstr "Foto"
 
-#: src/protocols/jabber/buddy.c:832
+#: ../src/protocols/jabber/buddy.c:839 src/protocols/jabber/buddy.c:832
 msgid "Logo"
 msgstr "Logotipo"
 
-#: src/protocols/jabber/buddy.c:1035
+#: ../src/protocols/jabber/buddy.c:1042 src/protocols/jabber/buddy.c:1035
 msgid "Un-hide From"
 msgstr "No ocultarse de"
 
-#: src/protocols/jabber/buddy.c:1038
+#: ../src/protocols/jabber/buddy.c:1046 src/protocols/jabber/buddy.c:1038
 msgid "Temporarily Hide From"
 msgstr "Ocultarse temporalmente de"
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:1045
+#: ../src/protocols/jabber/buddy.c:1054 src/protocols/jabber/buddy.c:1045
 msgid "Cancel Presence Notification"
 msgstr "Cancelar notificación de presencia"
 
-#: src/protocols/jabber/buddy.c:1051
+#: ../src/protocols/jabber/buddy.c:1061 src/protocols/jabber/buddy.c:1051
 msgid "(Re-)Request authorization"
 msgstr "Volver a pedir autorización"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: src/protocols/jabber/buddy.c:1059
+#: ../src/protocols/jabber/buddy.c:1070 src/protocols/jabber/buddy.c:1059
 msgid "Unsubscribe"
 msgstr "De-suscribir"
 
-#: src/protocols/jabber/buddy.c:1085 src/protocols/jabber/chat.c:677
-#: src/protocols/jabber/chat.c:688 src/protocols/jabber/jabber.c:1018
-#: src/protocols/silc/ops.c:1235
+#: ../src/protocols/jabber/buddy.c:1097 ../src/protocols/jabber/chat.c:677
+#: ../src/protocols/jabber/chat.c:688 ../src/protocols/jabber/jabber.c:1167
+#: ../src/protocols/silc/ops.c:1449 src/protocols/jabber/buddy.c:1085
+#: src/protocols/jabber/chat.c:677 src/protocols/jabber/chat.c:688
+#: src/protocols/jabber/jabber.c:1073 src/protocols/silc/ops.c:1449
 msgid "Error"
 msgstr "Error"
 
-#: src/protocols/jabber/buddy.c:1091 src/protocols/jabber/jabber.c:1047
+#: ../src/protocols/jabber/buddy.c:1103 ../src/protocols/jabber/jabber.c:1192
+#: src/protocols/jabber/buddy.c:1091 src/protocols/jabber/jabber.c:1102
 msgid "Chatty"
 msgstr "Hablador"
 
-#: src/protocols/jabber/buddy.c:1095 src/protocols/jabber/jabber.c:1063
-#: src/status.c:159
+#: ../src/protocols/jabber/buddy.c:1107 ../src/status.c:159
+#: src/protocols/jabber/buddy.c:1095 src/protocols/jabber/jabber.c:1118
+#: src/status.c:158
 msgid "Extended Away"
 msgstr "Ausencia extendida"
 
-#: src/protocols/jabber/buddy.c:1097 src/protocols/jabber/jabber.c:1071
-#: src/protocols/oscar/oscar.c:701 src/protocols/oscar/oscar.c:7791
-#: src/protocols/sametime/sametime.c:2770
+#: ../src/protocols/jabber/buddy.c:1109 ../src/protocols/jabber/jabber.c:1222
+#: ../src/protocols/oscar/oscar.c:723 ../src/protocols/oscar/oscar.c:7980
+#: ../src/protocols/sametime/sametime.c:3285 src/protocols/jabber/buddy.c:1097
+#: src/protocols/jabber/jabber.c:1126 src/protocols/oscar/oscar.c:701
+#: src/protocols/oscar/oscar.c:7861 src/protocols/sametime/sametime.c:3253
 msgid "Do Not Disturb"
 msgstr "No molestar"
 
-#: src/protocols/jabber/buddy.c:1235
+#: ../src/protocols/jabber/buddy.c:1289 src/protocols/jabber/buddy.c:1235
 msgid "The following are the results of your search"
 msgstr "Éstos son los resultados de su búsqueda"
 
-#: src/protocols/jabber/buddy.c:1327
+#: ../src/protocols/jabber/buddy.c:1381
 msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr "Rellene uno o más de los campos mostrados a continuación para buscar a un usuario Jabber que los tengan."
-
-#: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:653
-#: src/protocols/oscar/oscar.c:5962 src/protocols/silc/ops.c:810
+msgstr ""
+"Rellene uno o más de los campos mostrados a continuación para buscar a un "
+"usuario Jabber que los tengan."
+
+#: ../src/protocols/jabber/buddy.c:1385 ../src/protocols/jabber/jabber.c:769
+#: ../src/protocols/oscar/oscar.c:6110 ../src/protocols/silc/ops.c:1024
+#: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:701
+#: src/protocols/oscar/oscar.c:6004 src/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "Nombre"
 
-#: src/protocols/jabber/buddy.c:1336 src/protocols/jabber/jabber.c:658
-#: src/protocols/oscar/oscar.c:5963
+#: ../src/protocols/jabber/buddy.c:1390 ../src/protocols/jabber/jabber.c:774
+#: ../src/protocols/oscar/oscar.c:6111 src/protocols/jabber/buddy.c:1336
+#: src/protocols/jabber/jabber.c:706 src/protocols/oscar/oscar.c:6005
 msgid "Last Name"
 msgstr "Apellidos"
 
-#: src/protocols/jabber/buddy.c:1346
+#: ../src/protocols/jabber/buddy.c:1400 src/protocols/jabber/buddy.c:1346
 msgid "E-Mail Address"
 msgstr "Dirección de correo electrónico"
 
+#: ../src/protocols/jabber/buddy.c:1409 ../src/protocols/jabber/buddy.c:1410
 #: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356
 msgid "Search for Jabber users"
-msgstr "Buscar un usuario Jabber"
-
-#: src/protocols/jabber/buddy.c:1370
+msgstr "Buscar usuarios Jabber"
+
+#: ../src/protocols/jabber/buddy.c:1424 src/protocols/jabber/buddy.c:1370
 msgid "Invalid Directory"
 msgstr "Directorio inválido"
 
-#: src/protocols/jabber/buddy.c:1387
+#: ../src/protocols/jabber/buddy.c:1441
 msgid "Enter a User Directory"
 msgstr "Introduzca un directorio de usuario"
 
-#: src/protocols/jabber/buddy.c:1388
+#: ../src/protocols/jabber/buddy.c:1442 src/protocols/jabber/buddy.c:1388
 msgid "Select a user directory to search"
 msgstr "Selecciona un directorio de usuario donde buscar"
 
-#: src/protocols/jabber/buddy.c:1391
+#: ../src/protocols/jabber/buddy.c:1445 src/protocols/jabber/buddy.c:1391
 msgid "Search Directory"
 msgstr "Buscar en el directorio"
 
-#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:7318
-#: src/protocols/yahoo/yahoochat.c:979
+#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:7475
+#: ../src/protocols/yahoo/yahoochat.c:998 src/protocols/jabber/chat.c:41
+#: src/protocols/oscar/oscar.c:7350 src/protocols/yahoo/yahoochat.c:979
 msgid "_Room:"
 msgstr "_Sala:"
 
-#: src/protocols/jabber/chat.c:47
+#: ../src/protocols/jabber/chat.c:47 src/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "S_ervidor:"
 
-#: src/protocols/jabber/chat.c:53
+#: ../src/protocols/jabber/chat.c:53 src/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "_Manipulador:"
 
-#: src/protocols/jabber/chat.c:223
+#: ../src/protocols/jabber/chat.c:223 src/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s no es un nombre de sala válido"
 
-#: src/protocols/jabber/chat.c:224
+#: ../src/protocols/jabber/chat.c:224 src/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "Nombre de sala inválido"
 
-#: src/protocols/jabber/chat.c:229
+#: ../src/protocols/jabber/chat.c:229 src/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s no es un nombre de servidor válido"
 
+#: ../src/protocols/jabber/chat.c:230 ../src/protocols/jabber/chat.c:231
 #: src/protocols/jabber/chat.c:230 src/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "Nombre de servidor no válido"
 
-#: src/protocols/jabber/chat.c:235
+#: ../src/protocols/jabber/chat.c:235 src/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s no es un indicador de sala válido"
 
+#: ../src/protocols/jabber/chat.c:236 ../src/protocols/jabber/chat.c:237
 #: src/protocols/jabber/chat.c:236 src/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "Indicador de sala inválido"
 
-#: src/protocols/jabber/chat.c:395
+#: ../src/protocols/jabber/chat.c:395 src/protocols/jabber/chat.c:395
 msgid "Configuration error"
 msgstr "Error de configuración"
 
+#: ../src/protocols/jabber/chat.c:404 ../src/protocols/jabber/chat.c:549
 #: src/protocols/jabber/chat.c:404 src/protocols/jabber/chat.c:549
 msgid "Unable to configure"
 msgstr "No se pudo configurar"
 
-#: src/protocols/jabber/chat.c:420
+#: ../src/protocols/jabber/chat.c:420 src/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "Error de configuración de sala"
 
-#: src/protocols/jabber/chat.c:421
+#: ../src/protocols/jabber/chat.c:421 src/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "Esta sala no es capaz de ser configurada"
 
+#: ../src/protocols/jabber/chat.c:471 ../src/protocols/jabber/chat.c:540
 #: src/protocols/jabber/chat.c:471 src/protocols/jabber/chat.c:540
 msgid "Registration error"
 msgstr "Error de registro"
 
-#: src/protocols/jabber/chat.c:628
+#: ../src/protocols/jabber/chat.c:628 src/protocols/jabber/chat.c:628
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "El cambio de apodo no está soportado en salas de chat no-MUC"
 
-#: src/protocols/jabber/chat.c:678 src/protocols/jabber/chat.c:689
-#: src/protocols/silc/ops.c:1235
+#: ../src/protocols/jabber/chat.c:678 ../src/protocols/jabber/chat.c:689
+#: ../src/protocols/silc/ops.c:1449 src/protocols/jabber/chat.c:678
+#: src/protocols/jabber/chat.c:689 src/protocols/silc/ops.c:1449
 msgid "Error retrieving room list"
 msgstr "Error al obtener la lista de salas"
 
-#: src/protocols/jabber/chat.c:737
+#: ../src/protocols/jabber/chat.c:737 src/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "Nombre de servidor no válido"
 
-#: src/protocols/jabber/chat.c:775
+#: ../src/protocols/jabber/chat.c:775 src/protocols/jabber/chat.c:775
 msgid "Enter a Conference Server"
 msgstr "Introducir un servidor de conferencias"
 
-#: src/protocols/jabber/chat.c:776
+#: ../src/protocols/jabber/chat.c:776 src/protocols/jabber/chat.c:776
 msgid "Select a conference server to query"
 msgstr "Selecciona un servidor de conferencias al que consultar"
 
-#: src/protocols/jabber/chat.c:779
+#: ../src/protocols/jabber/chat.c:779 src/protocols/jabber/chat.c:779
 msgid "Find Rooms"
 msgstr "Buscar salas"
 
-#: src/protocols/jabber/jabber.c:79
+#: ../src/protocols/jabber/jabber.c:79 src/protocols/jabber/jabber.c:79
 msgid "Error initializing session"
 msgstr "Error al inicializar la sesión"
 
-#: src/protocols/jabber/jabber.c:215
+#: ../src/protocols/jabber/jabber.c:226 ../src/protocols/jabber/jabber.c:275
+#: ../src/protocols/jabber/jabber.c:303 src/protocols/jabber/jabber.c:236
+#: src/protocols/jabber/jabber.c:251
 msgid "Write error"
 msgstr "Error de escritura"
 
-#: src/protocols/jabber/jabber.c:253 src/protocols/jabber/jabber.c:273
+#: ../src/protocols/jabber/jabber.c:353 ../src/protocols/jabber/jabber.c:387
+#: src/protocols/jabber/jabber.c:289 src/protocols/jabber/jabber.c:321
 msgid "Read Error"
 msgstr "Error de lectura"
 
-#: src/protocols/jabber/jabber.c:359 src/protocols/jabber/jabber.c:780
+#: ../src/protocols/jabber/jabber.c:473 ../src/protocols/jabber/jabber.c:899
+#: src/protocols/jabber/jabber.c:407 src/protocols/jabber/jabber.c:828
 msgid "Unable to create socket"
-msgstr "No se pudo crear el conector"
-
-#: src/protocols/jabber/jabber.c:403 src/protocols/jabber/jabber.c:740
+msgstr "No se pudo crear el socket"
+
+#: ../src/protocols/jabber/jabber.c:519 ../src/protocols/jabber/jabber.c:856
+#: src/protocols/jabber/jabber.c:451 src/protocols/jabber/jabber.c:788
 msgid "Invalid Jabber ID"
 msgstr "ID de Jabber no válido"
 
-#: src/protocols/jabber/jabber.c:473
+#: ../src/protocols/jabber/jabber.c:589 src/protocols/jabber/jabber.c:521
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registro de %s@%s efectuado con éxito"
 
-#: src/protocols/jabber/jabber.c:475 src/protocols/jabber/jabber.c:476
+#: ../src/protocols/jabber/jabber.c:591 ../src/protocols/jabber/jabber.c:592
+#: src/protocols/jabber/jabber.c:523 src/protocols/jabber/jabber.c:524
 msgid "Registration Successful"
 msgstr "Éxito en el registro"
 
-#: src/protocols/jabber/jabber.c:482 src/protocols/jabber/jabber.c:1299
+#: ../src/protocols/jabber/jabber.c:598 ../src/protocols/jabber/jabber.c:1458
+#: src/protocols/jabber/jabber.c:530 src/protocols/jabber/jabber.c:1354
 msgid "Unknown Error"
 msgstr "Error desconocido"
 
-#: src/protocols/jabber/jabber.c:484 src/protocols/jabber/jabber.c:485
+#: ../src/protocols/jabber/jabber.c:600 ../src/protocols/jabber/jabber.c:601
+#: src/protocols/jabber/jabber.c:532 src/protocols/jabber/jabber.c:533
 msgid "Registration Failed"
 msgstr "Falló el registro"
 
-#: src/protocols/jabber/jabber.c:596 src/protocols/jabber/jabber.c:597
+#: ../src/protocols/jabber/jabber.c:712 ../src/protocols/jabber/jabber.c:713
+#: src/protocols/jabber/jabber.c:644 src/protocols/jabber/jabber.c:645
 msgid "Already Registered"
 msgstr "Ya está registrado"
 
-#: src/protocols/jabber/jabber.c:643
+#: ../src/protocols/jabber/jabber.c:759 src/protocols/jabber/jabber.c:691
 msgid "E-Mail"
 msgstr "Correo electrónico"
 
-#: src/protocols/jabber/jabber.c:673 src/protocols/oscar/oscar.c:6007
-#: src/protocols/oscar/oscar.c:6015
+#: ../src/protocols/jabber/jabber.c:789 ../src/protocols/oscar/oscar.c:6154
+#: ../src/protocols/oscar/oscar.c:6162 src/protocols/jabber/jabber.c:721
+#: src/protocols/oscar/oscar.c:6049 src/protocols/oscar/oscar.c:6057
 msgid "State"
 msgstr "Estado"
 
-#: src/protocols/jabber/jabber.c:683 src/protocols/silc/ops.c:855
-#: src/protocols/silc/silc.c:663 src/protocols/silc/util.c:513
+#: ../src/protocols/jabber/jabber.c:799 ../src/protocols/silc/ops.c:1069
+#: ../src/protocols/silc/silc.c:697 ../src/protocols/silc/util.c:514
+#: src/protocols/jabber/jabber.c:731 src/protocols/silc/ops.c:1069
+#: src/protocols/silc/silc.c:687 src/protocols/silc/util.c:514
 msgid "Phone"
 msgstr "Teléfono"
 
-#: src/protocols/jabber/jabber.c:693
+#: ../src/protocols/jabber/jabber.c:809 src/protocols/jabber/jabber.c:741
 msgid "Date"
 msgstr "Fecha"
 
-#: src/protocols/jabber/jabber.c:701
+#: ../src/protocols/jabber/jabber.c:817 src/protocols/jabber/jabber.c:749
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 "Por favor, rellene la información abajo indicada para registrar su nueva "
 "cuenta."
 
-#: src/protocols/jabber/jabber.c:704 src/protocols/jabber/jabber.c:705
+#: ../src/protocols/jabber/jabber.c:820 ../src/protocols/jabber/jabber.c:821
+#: src/protocols/jabber/jabber.c:752 src/protocols/jabber/jabber.c:753
 msgid "Register New Jabber Account"
 msgstr "Registrando cuenta nueva de Jabber"
 
-#: src/protocols/jabber/jabber.c:842
+#: ../src/protocols/jabber/jabber.c:986 src/protocols/jabber/jabber.c:897
 msgid "Initializing Stream"
 msgstr "Inicializando flujo"
 
-#: src/protocols/jabber/jabber.c:848 src/protocols/msn/session.c:368
+#: ../src/protocols/jabber/jabber.c:992 ../src/protocols/msn/session.c:355
+#: src/protocols/jabber/jabber.c:903 src/protocols/msn/session.c:355
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: src/protocols/jabber/jabber.c:857
+#: ../src/protocols/jabber/jabber.c:1001 src/protocols/jabber/jabber.c:912
 msgid "Re-initializing Stream"
 msgstr "Reinicializando flujo"
 
-#: src/protocols/jabber/jabber.c:928 src/protocols/jabber/jabber.c:1277
-#: src/protocols/jabber/jabber.c:1318 src/protocols/jabber/jabber.c:1351
-#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:7589
+#: ../src/protocols/jabber/jabber.c:1071 ../src/protocols/jabber/jabber.c:1436
+#: ../src/protocols/jabber/jabber.c:1477 ../src/protocols/jabber/jabber.c:1511
+#: ../src/protocols/oscar/oscar.c:792 ../src/protocols/oscar/oscar.c:7770
+#: src/protocols/jabber/jabber.c:983 src/protocols/jabber/jabber.c:1332
+#: src/protocols/jabber/jabber.c:1373 src/protocols/jabber/jabber.c:1406
+#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:7647
 msgid "Not Authorized"
 msgstr "No autorizado"
 
-#: src/protocols/jabber/jabber.c:971
+#: ../src/protocols/jabber/jabber.c:1113 src/protocols/jabber/jabber.c:1026
 msgid "Both"
 msgstr "Ambos"
 
-#: src/protocols/jabber/jabber.c:973
+#: ../src/protocols/jabber/jabber.c:1115 src/protocols/jabber/jabber.c:1028
 msgid "From (To pending)"
 msgstr "Desde (Destino pendiente)"
 
-#: src/protocols/jabber/jabber.c:975
-msgid "From"
-msgstr "De"
-
-#: src/protocols/jabber/jabber.c:978
+#: ../src/protocols/jabber/jabber.c:1120 src/protocols/jabber/jabber.c:1033
 msgid "To"
 msgstr "A"
 
-#: src/protocols/jabber/jabber.c:980
+#: ../src/protocols/jabber/jabber.c:1122 src/protocols/jabber/jabber.c:1035
 msgid "None (To pending)"
 msgstr "Nadie (Destino pendiente)"
 
-#: src/protocols/jabber/jabber.c:982 src/protocols/yahoo/yahoo.c:2780
-msgid "None"
-msgstr "Ninguno"
-
-#: src/protocols/jabber/jabber.c:984
+#: ../src/protocols/jabber/jabber.c:1126 src/protocols/jabber/jabber.c:1039
 msgid "Subscription"
 msgstr "Subscripción"
 
-#: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/jabber.c:1047
-#: src/protocols/jabber/jabber.c:1055 src/protocols/jabber/jabber.c:1063
-#: src/protocols/jabber/jabber.c:1071
+#: ../src/protocols/jabber/jabber.c:1183 ../src/protocols/jabber/jabber.c:1193
+#: ../src/protocols/jabber/jabber.c:1203 ../src/protocols/jabber/jabber.c:1213
+#: ../src/protocols/jabber/jabber.c:1223 src/protocols/jabber/jabber.c:1094
+#: src/protocols/jabber/jabber.c:1102 src/protocols/jabber/jabber.c:1110
+#: src/protocols/jabber/jabber.c:1118 src/protocols/jabber/jabber.c:1126
 msgid "Priority"
 msgstr "Prioridad"
 
-#: src/protocols/jabber/jabber.c:1093
+#: ../src/protocols/jabber/jabber.c:1252 src/protocols/jabber/jabber.c:1148
 msgid "Password Changed"
 msgstr "Contraseña modificada"
 
-#: src/protocols/jabber/jabber.c:1094
+#: ../src/protocols/jabber/jabber.c:1253 src/protocols/jabber/jabber.c:1149
 msgid "Your password has been changed."
 msgstr "Su contraseña ha sido modificada."
 
-#: src/protocols/jabber/jabber.c:1098 src/protocols/jabber/jabber.c:1099
+#: ../src/protocols/jabber/jabber.c:1257 ../src/protocols/jabber/jabber.c:1258
+#: src/protocols/jabber/jabber.c:1153 src/protocols/jabber/jabber.c:1154
 msgid "Error changing password"
 msgstr "Error al cambiar la contraseña"
 
-#: src/protocols/jabber/jabber.c:1155
+#: ../src/protocols/jabber/jabber.c:1314 src/protocols/jabber/jabber.c:1210
 msgid "Password (again)"
 msgstr "Contraseña (de nuevo)"
 
-#: src/protocols/jabber/jabber.c:1160 src/protocols/jabber/jabber.c:1161
+#: ../src/protocols/jabber/jabber.c:1319 ../src/protocols/jabber/jabber.c:1320
+#: src/protocols/jabber/jabber.c:1215 src/protocols/jabber/jabber.c:1216
 msgid "Change Jabber Password"
 msgstr "Cambiar contraseña de Jabber"
 
-#: src/protocols/jabber/jabber.c:1161
+#: ../src/protocols/jabber/jabber.c:1320 src/protocols/jabber/jabber.c:1216
 msgid "Please enter your new password"
 msgstr "Por favor, indique su nueva contraseña"
 
-#: src/protocols/jabber/jabber.c:1171 src/protocols/toc/toc.c:1684
-msgid "Set User Info"
-msgstr "Establecer su información de usuario"
+#: ../src/protocols/jabber/jabber.c:1330 ../src/protocols/oscar/oscar.c:8404
+#: ../src/protocols/silc/silc.c:1019 src/protocols/jabber/jabber.c:1226
+#: src/protocols/oscar/oscar.c:8282 src/protocols/silc/silc.c:1009
+msgid "Set User Info..."
+msgstr "Establecer su información de usuario..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/jabber/jabber.c:1176 src/protocols/toc/toc.c:1694
-msgid "Change Password"
-msgstr "Cambiar contraseña"
+#: ../src/protocols/jabber/jabber.c:1335 ../src/protocols/oscar/oscar.c:8415
+#: ../src/protocols/silc/silc.c:1015 src/protocols/jabber/jabber.c:1231
+#: src/protocols/oscar/oscar.c:8293 src/protocols/silc/silc.c:1005
+msgid "Change Password..."
+msgstr "Cambiar su contraseña..."
 
 #. }
-#: src/protocols/jabber/jabber.c:1181
-msgid "Search for users"
-msgstr "Buscar usuarios"
-
-#: src/protocols/jabber/jabber.c:1257
+#: src/protocols/jabber/jabber.c:1236
+msgid "Search for Users..."
+msgstr "Buscar usuarios..."
+
+#: ../src/protocols/jabber/jabber.c:1416 src/protocols/jabber/jabber.c:1312
 msgid "Bad Request"
 msgstr "Solicitud errónea"
 
-#: src/protocols/jabber/jabber.c:1259
+#: ../src/protocols/jabber/jabber.c:1418 src/protocols/jabber/jabber.c:1314
 msgid "Conflict"
 msgstr "Conflicto"
 
-#: src/protocols/jabber/jabber.c:1261
+#: ../src/protocols/jabber/jabber.c:1420 src/protocols/jabber/jabber.c:1316
 msgid "Feature Not Implemented"
 msgstr "Funcionalidad no implementada"
 
-#: src/protocols/jabber/jabber.c:1263
+#: ../src/protocols/jabber/jabber.c:1422 src/protocols/jabber/jabber.c:1318
 msgid "Forbidden"
 msgstr "Prohibido"
 
-#: src/protocols/jabber/jabber.c:1265
+#: ../src/protocols/jabber/jabber.c:1424 src/protocols/jabber/jabber.c:1320
 msgid "Gone"
 msgstr "Se fue"
 
-#: src/protocols/jabber/jabber.c:1267 src/protocols/jabber/jabber.c:1341
+#: ../src/protocols/jabber/jabber.c:1426 ../src/protocols/jabber/jabber.c:1501
+#: src/protocols/jabber/jabber.c:1322 src/protocols/jabber/jabber.c:1396
 msgid "Internal Server Error"
 msgstr "Error interno del servidor"
 
-#: src/protocols/jabber/jabber.c:1269
+#: ../src/protocols/jabber/jabber.c:1428 src/protocols/jabber/jabber.c:1324
 msgid "Item Not Found"
 msgstr "Elemento no encontrado"
 
-#: src/protocols/jabber/jabber.c:1271
+#: ../src/protocols/jabber/jabber.c:1430 src/protocols/jabber/jabber.c:1326
 msgid "Malformed Jabber ID"
 msgstr "ID de Jabber no válido"
 
-#: src/protocols/jabber/jabber.c:1273
+#: ../src/protocols/jabber/jabber.c:1432 src/protocols/jabber/jabber.c:1328
 msgid "Not Acceptable"
 msgstr "No aceptable"
 
-#: src/protocols/jabber/jabber.c:1275
+#: ../src/protocols/jabber/jabber.c:1434 src/protocols/jabber/jabber.c:1330
 msgid "Not Allowed"
 msgstr "No permitido"
 
-#: src/protocols/jabber/jabber.c:1279
+#: ../src/protocols/jabber/jabber.c:1438 src/protocols/jabber/jabber.c:1334
 msgid "Payment Required"
 msgstr "Pago necesario"
 
-#: src/protocols/jabber/jabber.c:1281
+#: ../src/protocols/jabber/jabber.c:1440 src/protocols/jabber/jabber.c:1336
 msgid "Recipient Unavailable"
 msgstr "Destinatario no disponible"
 
-#: src/protocols/jabber/jabber.c:1285
+#: ../src/protocols/jabber/jabber.c:1444 src/protocols/jabber/jabber.c:1340
 msgid "Registration Required"
 msgstr "Registro necesario"
 
-#: src/protocols/jabber/jabber.c:1287
+#: ../src/protocols/jabber/jabber.c:1446 src/protocols/jabber/jabber.c:1342
 msgid "Remote Server Not Found"
 msgstr "No se encontró el servidor remoto"
 
-#: src/protocols/jabber/jabber.c:1289
+#: ../src/protocols/jabber/jabber.c:1448 src/protocols/jabber/jabber.c:1344
 msgid "Remote Server Timeout"
 msgstr "Expiró el tiempo del servidor remoto"
 
-#: src/protocols/jabber/jabber.c:1291
+#: ../src/protocols/jabber/jabber.c:1450 src/protocols/jabber/jabber.c:1346
 msgid "Server Overloaded"
 msgstr "Servidor sobrecargado"
 
-#: src/protocols/jabber/jabber.c:1293
+#: ../src/protocols/jabber/jabber.c:1452 src/protocols/jabber/jabber.c:1348
 msgid "Service Unavailable"
 msgstr "Servicio no disponible"
 
-#: src/protocols/jabber/jabber.c:1295
+#: ../src/protocols/jabber/jabber.c:1454 src/protocols/jabber/jabber.c:1350
 msgid "Subscription Required"
 msgstr "Subscripción necesaria"
 
-#: src/protocols/jabber/jabber.c:1297
+#: ../src/protocols/jabber/jabber.c:1456 src/protocols/jabber/jabber.c:1352
 msgid "Unexpected Request"
 msgstr "Solicitud no esperada"
 
-#: src/protocols/jabber/jabber.c:1304
+#: ../src/protocols/jabber/jabber.c:1463 src/protocols/jabber/jabber.c:1359
 msgid "Authorization Aborted"
 msgstr "Autorización interrumpida"
 
-#: src/protocols/jabber/jabber.c:1306
+#: ../src/protocols/jabber/jabber.c:1465 src/protocols/jabber/jabber.c:1361
 msgid "Incorrect encoding in authorization"
 msgstr "Codificación incorrecta en la autorización"
 
-#: src/protocols/jabber/jabber.c:1309
+#: ../src/protocols/jabber/jabber.c:1468 src/protocols/jabber/jabber.c:1364
 msgid "Invalid authzid"
 msgstr "Authzid inválido"
 
-#: src/protocols/jabber/jabber.c:1312
+#: ../src/protocols/jabber/jabber.c:1471 src/protocols/jabber/jabber.c:1367
 msgid "Invalid Authorization Mechanism"
 msgstr "Mecanismo de autorización inválido"
 
-#: src/protocols/jabber/jabber.c:1315
+#: ../src/protocols/jabber/jabber.c:1474 src/protocols/jabber/jabber.c:1370
 msgid "Authorization mechanism too weak"
 msgstr "Mecanismo de autorización demasiado débil"
 
-#: src/protocols/jabber/jabber.c:1320
+#: ../src/protocols/jabber/jabber.c:1479 src/protocols/jabber/jabber.c:1375
 msgid "Temporary Authentication Failure"
 msgstr "Falló temporal de la autenticación"
 
-#: src/protocols/jabber/jabber.c:1322
+#: ../src/protocols/jabber/jabber.c:1482 src/protocols/jabber/jabber.c:1377
 msgid "Authentication Failure"
 msgstr "Falló de autenticación"
 
-#: src/protocols/jabber/jabber.c:1326
+#: ../src/protocols/jabber/jabber.c:1486 src/protocols/jabber/jabber.c:1381
 msgid "Bad Format"
 msgstr "Formato erróneo"
 
-#: src/protocols/jabber/jabber.c:1328
+#: ../src/protocols/jabber/jabber.c:1488 src/protocols/jabber/jabber.c:1383
 msgid "Bad Namespace Prefix"
 msgstr "Prefijo del espacio de nombres erróneo"
 
-#: src/protocols/jabber/jabber.c:1331
+#: ../src/protocols/jabber/jabber.c:1491 src/protocols/jabber/jabber.c:1386
 msgid "Resource Conflict"
 msgstr "Conflicto de recursos"
 
-#: src/protocols/jabber/jabber.c:1333 src/protocols/silc/ops.c:1514
+#: ../src/protocols/jabber/jabber.c:1493 ../src/protocols/silc/ops.c:1728
+#: src/protocols/jabber/jabber.c:1388 src/protocols/silc/ops.c:1728
 msgid "Connection Timeout"
 msgstr "Expiró la conexión"
 
-#: src/protocols/jabber/jabber.c:1335
+#: ../src/protocols/jabber/jabber.c:1495 src/protocols/jabber/jabber.c:1390
 msgid "Host Gone"
 msgstr "Servidor desaparecido"
 
-#: src/protocols/jabber/jabber.c:1337
+#: ../src/protocols/jabber/jabber.c:1497 src/protocols/jabber/jabber.c:1392
 msgid "Host Unknown"
 msgstr "Servidor desconocido"
 
-#: src/protocols/jabber/jabber.c:1339
+#: ../src/protocols/jabber/jabber.c:1499 src/protocols/jabber/jabber.c:1394
 msgid "Improper Addressing"
 msgstr "Direccionamiento incorrecto"
 
-#: src/protocols/jabber/jabber.c:1343
+#: ../src/protocols/jabber/jabber.c:1503 src/protocols/jabber/jabber.c:1398
 msgid "Invalid ID"
 msgstr "ID no válido"
 
-#: src/protocols/jabber/jabber.c:1345
+#: ../src/protocols/jabber/jabber.c:1505 src/protocols/jabber/jabber.c:1400
 msgid "Invalid Namespace"
 msgstr "Espacio de nombres no válido"
 
-#: src/protocols/jabber/jabber.c:1347
+#: ../src/protocols/jabber/jabber.c:1507 src/protocols/jabber/jabber.c:1402
 msgid "Invalid XML"
 msgstr "XML inválido"
 
-#: src/protocols/jabber/jabber.c:1349
+#: ../src/protocols/jabber/jabber.c:1509 src/protocols/jabber/jabber.c:1404
 msgid "Non-matching Hosts"
 msgstr "No existen servidores coincidentes"
 
-#: src/protocols/jabber/jabber.c:1353
+#: ../src/protocols/jabber/jabber.c:1513 src/protocols/jabber/jabber.c:1408
 msgid "Policy Violation"
 msgstr "Violación de la política"
 
-#: src/protocols/jabber/jabber.c:1355
+#: ../src/protocols/jabber/jabber.c:1515 src/protocols/jabber/jabber.c:1410
 msgid "Remote Connection Failed"
 msgstr "Falló la conexión remota"
 
-#: src/protocols/jabber/jabber.c:1357
+#: ../src/protocols/jabber/jabber.c:1517 src/protocols/jabber/jabber.c:1412
 msgid "Resource Constraint"
 msgstr "Restricción de recursos"
 
-#: src/protocols/jabber/jabber.c:1359
+#: ../src/protocols/jabber/jabber.c:1519 src/protocols/jabber/jabber.c:1414
 msgid "Restricted XML"
 msgstr "XML restringido"
 
-#: src/protocols/jabber/jabber.c:1361
+#: ../src/protocols/jabber/jabber.c:1521 src/protocols/jabber/jabber.c:1416
 msgid "See Other Host"
 msgstr "Ver otros servidores"
 
-#: src/protocols/jabber/jabber.c:1363
+#: ../src/protocols/jabber/jabber.c:1523 src/protocols/jabber/jabber.c:1418
 msgid "System Shutdown"
 msgstr "Parada del sistema"
 
-#: src/protocols/jabber/jabber.c:1365
+#: ../src/protocols/jabber/jabber.c:1525 src/protocols/jabber/jabber.c:1420
 msgid "Undefined Condition"
 msgstr "Condición no definida"
 
-#: src/protocols/jabber/jabber.c:1367
+#: ../src/protocols/jabber/jabber.c:1527 src/protocols/jabber/jabber.c:1422
 msgid "Unsupported Encoding"
 msgstr "Codificación no soportada"
 
-#: src/protocols/jabber/jabber.c:1369
+#: ../src/protocols/jabber/jabber.c:1529 src/protocols/jabber/jabber.c:1424
 msgid "Unsupported Stanza Type"
 msgstr "Tipo de «stanza» no soportado"
 
-#: src/protocols/jabber/jabber.c:1371
+#: ../src/protocols/jabber/jabber.c:1531 src/protocols/jabber/jabber.c:1426
 msgid "Unsupported Version"
 msgstr "Versión no soportada"
 
-#: src/protocols/jabber/jabber.c:1373
+#: ../src/protocols/jabber/jabber.c:1533 src/protocols/jabber/jabber.c:1428
 msgid "XML Not Well Formed"
 msgstr "XML malformado"
 
-#: src/protocols/jabber/jabber.c:1375
+#: ../src/protocols/jabber/jabber.c:1535 src/protocols/jabber/jabber.c:1430
 msgid "Stream Error"
 msgstr "Error de flujo"
 
-#: src/protocols/jabber/jabber.c:1442
+#: ../src/protocols/jabber/jabber.c:1602 src/protocols/jabber/jabber.c:1497
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "No puede echar al usuario %s"
 
-#: src/protocols/jabber/jabber.c:1464
+#: ../src/protocols/jabber/jabber.c:1622 src/protocols/jabber/jabber.c:1519
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Afiliación desconocida: \"%s\""
 
-#: src/protocols/jabber/jabber.c:1469
+#: ../src/protocols/jabber/jabber.c:1627 src/protocols/jabber/jabber.c:1524
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "No se pudo afiliar al usuario %s como \"%s\""
 
-#: src/protocols/jabber/jabber.c:1521
+#: ../src/protocols/jabber/jabber.c:1646
+#, c-format
+msgid "Unknown role: \"%s\""
+msgstr "Rol desconocido: \"%s\""
+
+#: ../src/protocols/jabber/jabber.c:1653
+#, c-format
+msgid "Unable to set role \"%s\" for user: %s"
+msgstr "No se pudo establecer el rol \"%s\" para el usuario: %s"
+
+#: ../src/protocols/jabber/jabber.c:1706 src/protocols/jabber/jabber.c:1576
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "No puede expulsar al usuario %s"
 
-#: src/protocols/jabber/jabber.c:1547
+#: ../src/protocols/jabber/jabber.c:1737 src/protocols/jabber/jabber.c:1602
 msgid "config:  Configure a chat room."
 msgstr "config:  Configurar una sala de chat."
 
-#: src/protocols/jabber/jabber.c:1551
+#: ../src/protocols/jabber/jabber.c:1741 src/protocols/jabber/jabber.c:1606
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configurar una sala de chat"
 
-#: src/protocols/jabber/jabber.c:1560
+#: ../src/protocols/jabber/jabber.c:1750 src/protocols/jabber/jabber.c:1615
 msgid "part [room]:  Leave the room."
 msgstr "part [habitación]:  Abandonar la habitación."
 
-#: src/protocols/jabber/jabber.c:1565
+#: ../src/protocols/jabber/jabber.c:1755 src/protocols/jabber/jabber.c:1620
 msgid "register:  Register with a chat room."
 msgstr "register:  Registrarse en una sala de chat."
 
-#: src/protocols/jabber/jabber.c:1571
+#: ../src/protocols/jabber/jabber.c:1761 src/protocols/jabber/jabber.c:1626
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nuevo tema]:  Mostrar o cambiar el tema."
 
-#: src/protocols/jabber/jabber.c:1577
+#: ../src/protocols/jabber/jabber.c:1767 src/protocols/jabber/jabber.c:1632
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;usuario&gt; [sala]:  Echar a un usuario de la sala."
 
-#: src/protocols/jabber/jabber.c:1583
+#: ../src/protocols/jabber/jabber.c:1773
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
-msgstr "affiliate &lt;usuario&gt; &lt;owner|admin|member|outcast|none&gt;: definir la afiliación de un usuario a la sala."
-
-#: src/protocols/jabber/jabber.c:1589
+msgstr ""
+"affiliate &lt;usuario&gt; &lt;owner|admin|member|outcast|none&gt;: definir "
+"la afiliación de un usuario a la sala."
+
+#: ../src/protocols/jabber/jabber.c:1779
+msgid ""
+"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
+"role in the room."
+msgstr "rol &lt;usuario&gt; &lt;moderator|participant|visitor|none&gt;: Definir el rol de un usuario en la sala."
+
+#: ../src/protocols/jabber/jabber.c:1785 src/protocols/jabber/jabber.c:1644
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;usuario&gt; [mensaje]:  Invitar a un usuario a la sala."
 
-#: src/protocols/jabber/jabber.c:1595
+#: ../src/protocols/jabber/jabber.c:1791 src/protocols/jabber/jabber.c:1650
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr ""
 "join: &lt;sala&gt; [servidor]:  Unirse a una sala en el servidor indicado."
 
-#: src/protocols/jabber/jabber.c:1601
+#: ../src/protocols/jabber/jabber.c:1797 src/protocols/jabber/jabber.c:1656
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;usuario&gt; [sala]:  Echar a un usuario de la sala."
 
-#: src/protocols/jabber/jabber.c:1606
+#: ../src/protocols/jabber/jabber.c:1802 src/protocols/jabber/jabber.c:1661
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
@@ -6271,94 +7820,98 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1686 src/protocols/jabber/jabber.c:1688
+#: ../src/protocols/jabber/jabber.c:1886 ../src/protocols/jabber/jabber.c:1888
+#: src/protocols/jabber/jabber.c:1744 src/protocols/jabber/jabber.c:1746
 msgid "Jabber Protocol Plugin"
 msgstr "Complemento de protocolo Jabber"
 
-#: src/protocols/jabber/jabber.c:1714
+#: ../src/protocols/jabber/jabber.c:1914 src/protocols/jabber/jabber.c:1772
 msgid "Use TLS if available"
 msgstr "Usar TLS si está disponible"
 
-#: src/protocols/jabber/jabber.c:1719
+#: ../src/protocols/jabber/jabber.c:1919 src/protocols/jabber/jabber.c:1777
 msgid "Require TLS"
 msgstr "Requiere TLS"
 
-#: src/protocols/jabber/jabber.c:1722
+#: ../src/protocols/jabber/jabber.c:1922 src/protocols/jabber/jabber.c:1780
 msgid "Force old (port 5223) SSL"
-msgstr "Forzar SSL antiguo (puerto 5223)"
-
-#: src/protocols/jabber/jabber.c:1727
+msgstr "Forzar SSL antiguo (puerto 5323)"
+
+#: ../src/protocols/jabber/jabber.c:1927 src/protocols/jabber/jabber.c:1785
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permitir autenticación en claro sobre canales no cifrados"
 
-#: src/protocols/jabber/jabber.c:1732
+#: ../src/protocols/jabber/jabber.c:1932 ../src/protocols/simple/simple.c:1669
+#: src/protocols/jabber/jabber.c:1790
 msgid "Connect port"
 msgstr "Puerto de conexión"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1736 src/protocols/silc/silc.c:1593
+#: ../src/protocols/jabber/jabber.c:1936 ../src/protocols/silc/silc.c:1852
+#: src/protocols/jabber/jabber.c:1794 src/protocols/silc/silc.c:1832
 msgid "Connect server"
 msgstr "Conectar con el servidor"
 
-#: src/protocols/jabber/message.c:114
+#: ../src/protocols/jabber/message.c:114 src/protocols/jabber/message.c:114
 #, c-format
 msgid "Message from %s"
 msgstr "Mensaje de %s"
 
-#: src/protocols/jabber/message.c:178
+#: ../src/protocols/jabber/message.c:178 src/protocols/jabber/message.c:178
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s ha cambiado el tema a: %s"
 
-#: src/protocols/jabber/message.c:180
+#: ../src/protocols/jabber/message.c:180 src/protocols/jabber/message.c:180
 #, c-format
 msgid "The topic is: %s"
 msgstr "El tema es: %s"
 
-#: src/protocols/jabber/message.c:230
+#: ../src/protocols/jabber/message.c:230 src/protocols/jabber/message.c:230
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Falló el envío de mensaje a %s: %s"
 
-#: src/protocols/jabber/message.c:233
+#: ../src/protocols/jabber/message.c:233 src/protocols/jabber/message.c:233
 msgid "Jabber Message Error"
 msgstr "Mensaje de error de Jabber"
 
-#: src/protocols/jabber/message.c:297
+#: ../src/protocols/jabber/message.c:297 src/protocols/jabber/message.c:297
 #, c-format
 msgid " (Code %s)"
 msgstr " (Código %s)"
 
-#: src/protocols/jabber/parser.c:131
+#: ../src/protocols/jabber/parser.c:131 src/protocols/jabber/parser.c:131
 msgid "XML Parse error"
 msgstr "Error de tratamiento XML"
 
-#: src/protocols/jabber/presence.c:284
+#: ../src/protocols/jabber/presence.c:305 src/protocols/jabber/presence.c:305
 msgid "Unknown Error in presence"
 msgstr "Error desconocido en presencia"
 
-#: src/protocols/jabber/presence.c:289 src/protocols/msn/userlist.c:93
+#: ../src/protocols/jabber/presence.c:310 ../src/protocols/msn/userlist.c:104
+#: src/protocols/jabber/presence.c:310 src/protocols/msn/userlist.c:104
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list."
 msgstr "El usuario %s quiere añadir a %s a su lista de amigos."
 
-#: src/protocols/jabber/presence.c:297 src/protocols/msn/userlist.c:100
-#: src/protocols/oscar/oscar.c:4602 src/protocols/oscar/oscar.c:7248
-#: src/protocols/yahoo/yahoo.c:895
-msgid "Authorize"
-msgstr "Autorizar"
-
-#: src/protocols/jabber/presence.c:298 src/protocols/msn/userlist.c:101
-#: src/protocols/oscar/oscar.c:4604 src/protocols/oscar/oscar.c:7249
-#: src/protocols/yahoo/yahoo.c:897
-msgid "Deny"
-msgstr "Denegar"
-
-#: src/protocols/jabber/presence.c:345 src/protocols/jabber/presence.c:346
+#: ../src/protocols/jabber/presence.c:319 ../src/protocols/oscar/oscar.c:4740
+#: ../src/protocols/oscar/oscar.c:7405
+msgid "_Authorize"
+msgstr "_Autorizar"
+
+#: ../src/protocols/jabber/presence.c:320 ../src/protocols/oscar/oscar.c:4742
+#: ../src/protocols/oscar/oscar.c:7406
+msgid "_Deny"
+msgstr "_Denegar"
+
+#: ../src/protocols/jabber/presence.c:376
+#: ../src/protocols/jabber/presence.c:377 src/protocols/jabber/presence.c:376
+#: src/protocols/jabber/presence.c:377
 msgid "Create New Room"
 msgstr "Crear una sala nueva"
 
-#: src/protocols/jabber/presence.c:347
+#: ../src/protocols/jabber/presence.c:378 src/protocols/jabber/presence.c:378
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6366,41 +7919,42 @@
 "Va a crear una sala nueva. ¿Desea configurarla o aceptar los valores por "
 "omisión?"
 
-#: src/protocols/jabber/presence.c:349
-msgid "Configure Room"
-msgstr "Configurar sala"
-
-#: src/protocols/jabber/presence.c:351
-msgid "Accept Defaults"
-msgstr "Aceptar valores por omisión"
-
-#: src/protocols/jabber/presence.c:388
+#: ../src/protocols/jabber/presence.c:380
+msgid "_Configure Room"
+msgstr "_Configurar sala"
+
+#: ../src/protocols/jabber/presence.c:382
+msgid "_Accept Defaults"
+msgstr "_Aceptar valores por omisión"
+
+#: ../src/protocols/jabber/presence.c:419 src/protocols/jabber/presence.c:419
 #, c-format
 msgid "Error in chat %s"
 msgstr "Error en el chat %s"
 
-#: src/protocols/jabber/presence.c:391
+#: ../src/protocols/jabber/presence.c:422 src/protocols/jabber/presence.c:422
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Error al unirse al chat %s"
 
-#: src/protocols/jabber/si.c:591
+#: ../src/protocols/jabber/si.c:726 src/protocols/jabber/si.c:591
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "No se pudo enviar el archivo a %s, el usuario no soporta transferencias de "
 "archivos"
 
+#: ../src/protocols/jabber/si.c:727 ../src/protocols/jabber/si.c:728
 #: src/protocols/jabber/si.c:592 src/protocols/jabber/si.c:593
 msgid "File Send Failed"
 msgstr "Fallo en el envío del archivo"
 
-#: src/protocols/msn/dialog.c:91
+#: ../src/protocols/msn/dialog.c:92 src/protocols/msn/dialog.c:92
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Problema de sincronización de la lista de amigos en %s (%s)"
 
-#: src/protocols/msn/dialog.c:97
+#: ../src/protocols/msn/dialog.c:98 src/protocols/msn/dialog.c:98
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
@@ -6409,7 +7963,7 @@
 "%s está en la lista local dentro del grupo «%s» pero no está en la lista del "
 "servidor. ¿Desea añadir a este amigo?"
 
-#: src/protocols/msn/dialog.c:105
+#: ../src/protocols/msn/dialog.c:106 src/protocols/msn/dialog.c:106
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
@@ -6418,267 +7972,272 @@
 "%s está en la lista local pero no está en la lista del servidor. ¿Desea "
 "añadir a este amigo?"
 
-#: src/protocols/msn/error.c:35
+#: ../src/protocols/msn/error.c:35 src/protocols/msn/error.c:35
 msgid "Unable to parse message"
 msgstr "No se pudo interpretar el mensaje"
 
-#: src/protocols/msn/error.c:38
+#: ../src/protocols/msn/error.c:38 src/protocols/msn/error.c:38
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "Error de sintaxis (probablemente un error de Gaim)"
 
-#: src/protocols/msn/error.c:42
+#: ../src/protocols/msn/error.c:42 src/protocols/msn/error.c:42
 msgid "Invalid email address"
 msgstr "Dirección de correo electrónico inválida"
 
-#: src/protocols/msn/error.c:45
+#: ../src/protocols/msn/error.c:45 src/protocols/msn/error.c:45
 msgid "User does not exist"
 msgstr "El usuario no existe"
 
-#: src/protocols/msn/error.c:49
+#: ../src/protocols/msn/error.c:49 src/protocols/msn/error.c:49
 msgid "Fully Qualified Domain Name missing"
 msgstr "Falta un nombre de dominio totalmente cualificado"
 
-#: src/protocols/msn/error.c:52
+#: ../src/protocols/msn/error.c:52 src/protocols/msn/error.c:52
 msgid "Already Logged In"
 msgstr "Ya está conectado"
 
-#: src/protocols/msn/error.c:55
+#: ../src/protocols/msn/error.c:55 src/protocols/msn/error.c:55
 msgid "Invalid Username"
 msgstr "Nombre de usuario no válido"
 
-#: src/protocols/msn/error.c:58
+#: ../src/protocols/msn/error.c:58 src/protocols/msn/error.c:58
 msgid "Invalid Friendly Name"
 msgstr "Nombre de amigo no válido"
 
-#: src/protocols/msn/error.c:61
+#: ../src/protocols/msn/error.c:61 src/protocols/msn/error.c:61
 msgid "List Full"
 msgstr "Lista llena"
 
-#: src/protocols/msn/error.c:64
+#: ../src/protocols/msn/error.c:64 src/protocols/msn/error.c:64
 msgid "Already there"
 msgstr "Ya está en lista"
 
-#: src/protocols/msn/error.c:67
+#: ../src/protocols/msn/error.c:67 src/protocols/msn/error.c:67
 msgid "Not on list"
 msgstr "No está en la lista"
 
+#: ../src/protocols/msn/error.c:70 ../src/protocols/zephyr/zephyr.c:690
 #: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:690
 msgid "User is offline"
 msgstr "El usuario no está conectado"
 
-#: src/protocols/msn/error.c:73
+#: ../src/protocols/msn/error.c:73 src/protocols/msn/error.c:73
 msgid "Already in the mode"
 msgstr "Ya está en ese modo"
 
-#: src/protocols/msn/error.c:76
+#: ../src/protocols/msn/error.c:76 src/protocols/msn/error.c:76
 msgid "Already in opposite list"
 msgstr "Ya está en la lista contraria"
 
-#: src/protocols/msn/error.c:79
+#: ../src/protocols/msn/error.c:79 src/protocols/msn/error.c:79
 msgid "Too many groups"
 msgstr "Demasiados grupos"
 
-#: src/protocols/msn/error.c:82
+#: ../src/protocols/msn/error.c:82 src/protocols/msn/error.c:82
 msgid "Invalid group"
 msgstr "Grupo inválido"
 
-#: src/protocols/msn/error.c:85
+#: ../src/protocols/msn/error.c:85 src/protocols/msn/error.c:85
 msgid "User not in group"
 msgstr "El usuario no está en el grupo"
 
-#: src/protocols/msn/error.c:88
+#: ../src/protocols/msn/error.c:88 src/protocols/msn/error.c:88
 msgid "Group name too long"
 msgstr "Nombre de grupo demasiado largo"
 
-#: src/protocols/msn/error.c:91
+#: ../src/protocols/msn/error.c:91 src/protocols/msn/error.c:91
 msgid "Cannot remove group zero"
 msgstr "No se puede eliminar el grupo cero"
 
 #: src/protocols/msn/error.c:95
-msgid "Tried to add a contact to a group that doesn't exist"
+msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Intentó añadir un contacto a un grupo que no existe"
 
-#: src/protocols/msn/error.c:99
+#: ../src/protocols/msn/error.c:99 src/protocols/msn/error.c:99
 msgid "Switchboard failed"
 msgstr "Falló el servidor Switchboard"
 
-#: src/protocols/msn/error.c:102
+#: ../src/protocols/msn/error.c:102 src/protocols/msn/error.c:102
 msgid "Notify Transfer failed"
 msgstr "Falló la notificación de la transferencia"
 
-#: src/protocols/msn/error.c:106
+#: ../src/protocols/msn/error.c:106 src/protocols/msn/error.c:106
 msgid "Required fields missing"
 msgstr "Faltan campos obligatorios"
 
-#: src/protocols/msn/error.c:109
+#: ../src/protocols/msn/error.c:109 src/protocols/msn/error.c:109
 msgid "Too many hits to a FND"
 msgstr "Demasiados resultados de un FND"
 
-#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:206
+#: ../src/protocols/msn/error.c:112 ../src/protocols/oscar/oscar.c:207
+#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:205
 msgid "Not logged in"
 msgstr "No ha iniciado sesión"
 
-#: src/protocols/msn/error.c:116
+#: ../src/protocols/msn/error.c:116 src/protocols/msn/error.c:116
 msgid "Service Temporarily Unavailable"
 msgstr "Servicio no disponible temporalmente"
 
-#: src/protocols/msn/error.c:119
+#: ../src/protocols/msn/error.c:119 src/protocols/msn/error.c:119
 msgid "Database server error"
 msgstr "Error del servidor de base de datos"
 
-#: src/protocols/msn/error.c:122
+#: ../src/protocols/msn/error.c:122 src/protocols/msn/error.c:122
 msgid "Command disabled"
 msgstr "Orden deshabilitada"
 
-#: src/protocols/msn/error.c:125
+#: ../src/protocols/msn/error.c:125 src/protocols/msn/error.c:125
 msgid "File operation error"
 msgstr "Error de operación de archivos"
 
-#: src/protocols/msn/error.c:128
+#: ../src/protocols/msn/error.c:128 src/protocols/msn/error.c:128
 msgid "Memory allocation error"
 msgstr "Error al asignar memoria"
 
-#: src/protocols/msn/error.c:131
+#: ../src/protocols/msn/error.c:131 src/protocols/msn/error.c:131
 msgid "Wrong CHL value sent to server"
 msgstr "Valor CHL erróneo enviado al servidor"
 
-#: src/protocols/msn/error.c:135
+#: ../src/protocols/msn/error.c:135 src/protocols/msn/error.c:135
 msgid "Server busy"
 msgstr "Servidor ocupado"
 
-#: src/protocols/msn/error.c:138 src/protocols/msn/error.c:151
-#: src/protocols/msn/error.c:206
+#: ../src/protocols/msn/error.c:138 ../src/protocols/msn/error.c:151
+#: ../src/protocols/msn/error.c:206 src/protocols/msn/error.c:138
+#: src/protocols/msn/error.c:151 src/protocols/msn/error.c:206
 msgid "Server unavailable"
 msgstr "Servidor no disponible"
 
 # «Peer» no tiene una traducción fácil, he elegido 'pares' (de par, o igual)
 # Acepto otras alternativas (pero no dejarlo igual) jfs.
-#: src/protocols/msn/error.c:141
+#: ../src/protocols/msn/error.c:141 src/protocols/msn/error.c:141
 msgid "Peer Notification server down"
 msgstr "Servidor de notificación de pares caído"
 
-#: src/protocols/msn/error.c:144
+#: ../src/protocols/msn/error.c:144 src/protocols/msn/error.c:144
 msgid "Database connect error"
 msgstr "Error de conexión con la base de datos"
 
-#: src/protocols/msn/error.c:148
+#: ../src/protocols/msn/error.c:148 src/protocols/msn/error.c:148
 msgid "Server is going down (abandon ship)"
 msgstr "El servidor está apagándose (Sálvese quien pueda)"
 
-#: src/protocols/msn/error.c:155
+#: ../src/protocols/msn/error.c:155 src/protocols/msn/error.c:155
 msgid "Error creating connection"
 msgstr "Error al crear la conexión"
 
-#: src/protocols/msn/error.c:159
+#: ../src/protocols/msn/error.c:159 src/protocols/msn/error.c:159
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "Los parámetros CVR no se conocen o no están permitidos"
 
-#: src/protocols/msn/error.c:162
+#: ../src/protocols/msn/error.c:162 src/protocols/msn/error.c:162
 msgid "Unable to write"
 msgstr "No se pudo escribir"
 
 # En verdad traduje el error como figura en
 # "http://www.hypothetic.org/docs/msn/basics.php" -NL.
-#: src/protocols/msn/error.c:165
+#: ../src/protocols/msn/error.c:165 src/protocols/msn/error.c:165
 msgid "Session overload"
 msgstr "Sobrecarga de sesión"
 
-#: src/protocols/msn/error.c:168
+#: ../src/protocols/msn/error.c:168 src/protocols/msn/error.c:168
 msgid "User is too active"
 msgstr "El usuario está demasiado activo"
 
-#: src/protocols/msn/error.c:171
+#: ../src/protocols/msn/error.c:171 src/protocols/msn/error.c:171
 msgid "Too many sessions"
 msgstr "Demasiadas sesiones"
 
-#: src/protocols/msn/error.c:174
+#: ../src/protocols/msn/error.c:174 src/protocols/msn/error.c:174
 msgid "Passport not verified"
 msgstr "Pasaporte no verificado"
 
-#: src/protocols/msn/error.c:177
+#: ../src/protocols/msn/error.c:177 src/protocols/msn/error.c:177
 msgid "Bad friend file"
 msgstr "Fichero de amigos incorrecto"
 
-#: src/protocols/msn/error.c:180
+#: ../src/protocols/msn/error.c:180 src/protocols/msn/error.c:180
 msgid "Not expected"
 msgstr "No se esperaba"
 
-#: src/protocols/msn/error.c:185
+#: ../src/protocols/msn/error.c:185 src/protocols/msn/error.c:185
 msgid "Friendly name changes too rapidly"
 msgstr "Los nombres de amigos cambian demasiado rápido"
 
-#: src/protocols/msn/error.c:194
+#: ../src/protocols/msn/error.c:194 src/protocols/msn/error.c:194
 msgid "Server too busy"
 msgstr "Servidor muy ocupado"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2756
-#: src/protocols/silc/ops.c:1503 src/protocols/toc/toc.c:722
+#: ../src/protocols/msn/error.c:198 ../src/protocols/oscar/oscar.c:2864
+#: ../src/protocols/silc/ops.c:1717 ../src/protocols/toc/toc.c:722
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2751
+#: src/protocols/silc/ops.c:1717 src/protocols/toc/toc.c:722
 msgid "Authentication failed"
 msgstr "Falló la autenticación"
 
-#: src/protocols/msn/error.c:201
+#: ../src/protocols/msn/error.c:201 src/protocols/msn/error.c:201
 msgid "Not allowed when offline"
 msgstr "No puede mandar mensajes fuera de línea"
 
-#: src/protocols/msn/error.c:209
+#: ../src/protocols/msn/error.c:209 src/protocols/msn/error.c:209
 msgid "Not accepting new users"
 msgstr "No se aceptan usuarios nuevos"
 
-#: src/protocols/msn/error.c:213
+#: ../src/protocols/msn/error.c:213 src/protocols/msn/error.c:213
 msgid "Kids Passport without parental consent"
 msgstr "Pasaporte de menores sin consentimiento paterno"
 
-#: src/protocols/msn/error.c:217
+#: ../src/protocols/msn/error.c:217 src/protocols/msn/error.c:217
 msgid "Passport account not yet verified"
 msgstr "Cuenta Passport no verificada aún"
 
-#: src/protocols/msn/error.c:220
+#: ../src/protocols/msn/error.c:220 src/protocols/msn/error.c:220
 msgid "Bad ticket"
 msgstr "Ticket erróneo"
 
-#: src/protocols/msn/error.c:224
+#: ../src/protocols/msn/error.c:224 src/protocols/msn/error.c:224
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Código de error desconocido %d"
 
-#: src/protocols/msn/error.c:236
+#: ../src/protocols/msn/error.c:236 src/protocols/msn/error.c:236
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "Error MSN: %s\n"
 
-#: src/protocols/msn/msn.c:113
+#: ../src/protocols/msn/msn.c:113 src/protocols/msn/msn.c:113
 msgid "You have just sent a Nudge!"
 msgstr "¡Le acaban de enviar un codazo!"
 
-#: src/protocols/msn/msn.c:138
+#: ../src/protocols/msn/msn.c:138 src/protocols/msn/msn.c:138
 msgid "Your new MSN friendly name is too long."
 msgstr "El nuevo nombre de amigo MSN es demasiado largo."
 
-#: src/protocols/msn/msn.c:246
+#: ../src/protocols/msn/msn.c:246 src/protocols/msn/msn.c:246
 msgid "Set your friendly name."
 msgstr "Establecer su nombre de amigo."
 
-#: src/protocols/msn/msn.c:247
+#: ../src/protocols/msn/msn.c:247 src/protocols/msn/msn.c:247
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Éste es el nombre bajo el que otros amigos MSN le verán."
 
-#: src/protocols/msn/msn.c:263
+#: ../src/protocols/msn/msn.c:263 src/protocols/msn/msn.c:263
 msgid "Set your home phone number."
 msgstr "Establezca el número de teléfono de su domicilio."
 
-#: src/protocols/msn/msn.c:278
+#: ../src/protocols/msn/msn.c:278 src/protocols/msn/msn.c:278
 msgid "Set your work phone number."
 msgstr "Establezca el número de teléfono de su trabajo."
 
-#: src/protocols/msn/msn.c:293
+#: ../src/protocols/msn/msn.c:293 src/protocols/msn/msn.c:293
 msgid "Set your mobile phone number."
 msgstr "Establezca su número de teléfono móvil."
 
-#: src/protocols/msn/msn.c:306
+#: ../src/protocols/msn/msn.c:306 src/protocols/msn/msn.c:306
 msgid "Allow MSN Mobile pages?"
 msgstr "¿Permitir los envíos de MSN Mobile?"
 
-#: src/protocols/msn/msn.c:307
+#: ../src/protocols/msn/msn.c:307 src/protocols/msn/msn.c:307
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -6686,29 +8245,32 @@
 "¿Quiere permitir o rechazar el envío de mensajes a través de MSN Mobile a su "
 "teléfono móvil (u otro dispositivo móvil) de la gente en su lista de amigos?"
 
-#: src/protocols/msn/msn.c:311
+#: ../src/protocols/msn/msn.c:311 src/protocols/msn/msn.c:311
 msgid "Allow"
 msgstr "Permitir"
 
-#: src/protocols/msn/msn.c:312
+#: ../src/protocols/msn/msn.c:312 src/protocols/msn/msn.c:312
 msgid "Disallow"
 msgstr "Rechazar"
 
-#: src/protocols/msn/msn.c:328
+#: ../src/protocols/msn/msn.c:328
 msgid "This Hotmail account may not be active."
 msgstr "Puede que esta cuenta de Hotmail no esté activa."
 
-#: src/protocols/msn/msn.c:354
+#: ../src/protocols/msn/msn.c:354 src/protocols/msn/msn.c:354
 msgid "Send a mobile message."
 msgstr "Enviar un mensaje a un móvil."
 
-#: src/protocols/msn/msn.c:356
+#: ../src/protocols/msn/msn.c:356 src/protocols/msn/msn.c:356
 msgid "Page"
 msgstr "Buscapersonas"
 
-#: src/protocols/msn/msn.c:544 src/protocols/msn/msn.c:551
-#: src/protocols/msn/msn.c:554 src/protocols/yahoo/yahoo.c:2787
-#: src/protocols/yahoo/yahoo.c:2793
+#: ../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:2880 ../src/protocols/yahoo/yahoo.c:2886
+#: src/protocols/msn/msn.c:552 src/protocols/msn/msn.c:559
+#: src/protocols/msn/msn.c:562 src/protocols/yahoo/yahoo.c:2809
+#: src/protocols/yahoo/yahoo.c:2815
 #, c-format
 msgid ""
 "\n"
@@ -6717,67 +8279,77 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: src/protocols/msn/msn.c:551
+#: ../src/protocols/msn/msn.c:557 src/protocols/msn/msn.c:559
 msgid "Has you"
 msgstr "Le tiene"
 
-#: src/protocols/msn/msn.c:581 src/protocols/msn/state.c:33
-#: src/protocols/yahoo/yahoo.c:2615 src/protocols/yahoo/yahoo.c:3230
+#: ../src/protocols/msn/msn.c:587 ../src/protocols/msn/state.c:33
+#: ../src/protocols/yahoo/yahoo.c:2709 ../src/protocols/yahoo/yahoo.c:3288
+#: src/protocols/msn/msn.c:589 src/protocols/msn/state.c:33
+#: src/protocols/yahoo/yahoo.c:2640 src/protocols/yahoo/yahoo.c:3217
 msgid "Be Right Back"
 msgstr "Vuelvo enseguida"
 
-#: src/protocols/msn/msn.c:589 src/protocols/msn/state.c:35
-#: src/protocols/yahoo/yahoo.c:2625 src/protocols/yahoo/yahoo.c:3245
-msgid "On The Phone"
+#: ../src/protocols/msn/msn.c:591 ../src/protocols/msn/state.c:31
+#: ../src/protocols/novell/novell.c:2851 ../src/protocols/novell/novell.c:2985
+#: ../src/protocols/silc/buddy.c:1473 ../src/protocols/silc/silc.c:53
+#: ../src/protocols/yahoo/yahoo.c:2711 ../src/protocols/yahoo/yahoo.c:3291
+#: src/protocols/gg/gg.c:1451 src/protocols/msn/msn.c:593
+#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2852
+#: src/protocols/novell/novell.c:2990 src/protocols/silc/buddy.c:1435
+#: src/protocols/silc/silc.c:55 src/protocols/yahoo/yahoo.c:2642
+#: src/protocols/yahoo/yahoo.c:3220
+msgid "Busy"
+msgstr "Ocupado"
+
+#: src/protocols/msn/msn.c:597 src/protocols/yahoo/yahoo.c:2650
+#: src/protocols/yahoo/yahoo.c:3232
+msgid "On the Phone"
 msgstr "Al teléfono"
 
-#: src/protocols/msn/msn.c:593 src/protocols/msn/state.c:36
-#: src/protocols/yahoo/yahoo.c:2629 src/protocols/yahoo/yahoo.c:3251
-msgid "Out To Lunch"
+#: src/protocols/msn/msn.c:601 src/protocols/yahoo/yahoo.c:2654
+#: src/protocols/yahoo/yahoo.c:3238
+msgid "Out to Lunch"
 msgstr "Salí a comer"
 
-#: src/protocols/msn/msn.c:597 src/protocols/zephyr/zephyr.c:2255
-#: src/status.c:157
-msgid "Hidden"
-msgstr "Oculto"
-
-#: src/protocols/msn/msn.c:613
-msgid "Set Friendly Name"
-msgstr "Establecer su nombre"
-
-#: src/protocols/msn/msn.c:618
-msgid "Set Home Phone Number"
-msgstr "Establecer el número de teléfono de su domicilio"
-
-#: src/protocols/msn/msn.c:622
-msgid "Set Work Phone Number"
-msgstr "Establecer el número de teléfono de su trabajo"
+#: src/protocols/msn/msn.c:621
+msgid "Set Friendly Name..."
+msgstr "Establecer su nombre de amigo..."
 
 #: src/protocols/msn/msn.c:626
-msgid "Set Mobile Phone Number"
-msgstr "Establecer su número de teléfono móvil"
-
-#: src/protocols/msn/msn.c:632
-msgid "Enable/Disable Mobile Devices"
-msgstr "Permitir/Rechazar dispositivos móviles"
-
-#: src/protocols/msn/msn.c:637
-msgid "Allow/Disallow Mobile Pages"
-msgstr "Permitir/Rechazar mensajes a móviles"
-
-#: src/protocols/msn/msn.c:647
+msgid "Set Home Phone Number..."
+msgstr "Establecer el número de teléfono de su domicilio..."
+
+#: src/protocols/msn/msn.c:630
+msgid "Set Work Phone Number..."
+msgstr "Establecer el número de teléfono de su trabajo..."
+
+#: src/protocols/msn/msn.c:634
+msgid "Set Mobile Phone Number..."
+msgstr "Establecer su número de teléfono móvil..."
+
+#: src/protocols/msn/msn.c:640
+msgid "Enable/Disable Mobile Devices..."
+msgstr "Permitir/Rechazar dispositivos móviles..."
+
+#: src/protocols/msn/msn.c:645
+msgid "Allow/Disallow Mobile Pages..."
+msgstr "Permitir/Rechazar páginas Mobile"
+
+#: ../src/protocols/msn/msn.c:657 src/protocols/msn/msn.c:655
 msgid "Open Hotmail Inbox"
-msgstr "Abrir Bandeja de Entrada de Hotmail"
-
-#: src/protocols/msn/msn.c:671
+msgstr "Abrir bandeja de entrada de Hotmail"
+
+#: ../src/protocols/msn/msn.c:681 src/protocols/msn/msn.c:679
 msgid "Send to Mobile"
 msgstr "Enviar a un móvil"
 
-#: src/protocols/msn/msn.c:680 src/protocols/novell/novell.c:3442
+#: ../src/protocols/msn/msn.c:691 ../src/protocols/novell/novell.c:3441
+#: src/protocols/msn/msn.c:688 src/protocols/novell/novell.c:3444
 msgid "Initiate _Chat"
 msgstr "Iniciar _chat"
 
-#: src/protocols/msn/msn.c:717
+#: ../src/protocols/msn/msn.c:729 src/protocols/msn/msn.c:725
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6785,89 +8357,100 @@
 "El soporte SSL es necesario para MSN. Por favor, instale una biblioteca SSL "
 "soportada. Para más información, consulte http://gaim.sf.net/faq-ssl.php."
 
-#: src/protocols/msn/msn.c:745
+#: ../src/protocols/msn/msn.c:757 src/protocols/msn/msn.c:753
 msgid "Failed to connect to server."
 msgstr "No se pudo conectar al servidor."
 
-#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo_profile.c:654
-#: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1135
+#: ../src/protocols/msn/msn.c:1366 ../src/protocols/yahoo/yahoo_profile.c:685
+#: ../src/protocols/zephyr/zephyr.c:721 ../src/protocols/zephyr/zephyr.c:1136
+#: src/protocols/msn/msn.c:1361 src/protocols/yahoo/yahoo_profile.c:654
+#: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1136
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<B>Apodo:</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1394 src/protocols/msn/msn.c:1740
-#: src/protocols/yahoo/yahoo_profile.c:1167 src/util.c:801
+#: ../src/protocols/msn/msn.c:1373 ../src/protocols/msn/msn.c:1725
+#: ../src/protocols/yahoo/yahoo_profile.c:1202 ../src/util.c:1035
+#: src/protocols/msn/msn.c:1368 src/protocols/msn/msn.c:1714
+#: src/protocols/yahoo/yahoo_profile.c:1171 src/util.c:800
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b>"
 
-#: src/protocols/msn/msn.c:1471
+#: ../src/protocols/msn/msn.c:1456 src/protocols/msn/msn.c:1445
 msgid "MSN Profile"
 msgstr "Perfil MSN"
 
-#: src/protocols/msn/msn.c:1476 src/protocols/msn/msn.c:1727
-#: src/protocols/yahoo/yahoo_profile.c:760
+#: ../src/protocols/msn/msn.c:1461 ../src/protocols/msn/msn.c:1712
+#: ../src/protocols/yahoo/yahoo_profile.c:795 src/protocols/msn/msn.c:1450
+#: src/protocols/msn/msn.c:1701 src/protocols/yahoo/yahoo_profile.c:764
 msgid "Error retrieving profile"
 msgstr "Error al obtener el perfil"
 
-#: src/protocols/msn/msn.c:1546 src/protocols/oscar/oscar.c:5992
-#: src/protocols/yahoo/yahoo_profile.c:1015
+#: ../src/protocols/msn/msn.c:1531 ../src/protocols/oscar/oscar.c:6139
+#: ../src/protocols/yahoo/yahoo_profile.c:1050 src/protocols/msn/msn.c:1520
+#: src/protocols/oscar/oscar.c:6034 src/protocols/yahoo/yahoo_profile.c:1019
 msgid "Age"
 msgstr "Edad"
 
-#: src/protocols/msn/msn.c:1553 src/protocols/oscar/oscar.c:5979
-#: src/protocols/yahoo/yahoo_profile.c:1025
-msgid "Gender"
-msgstr "Sexo"
-
-#: src/protocols/msn/msn.c:1562 src/protocols/yahoo/yahoo_profile.c:1020
+#: ../src/protocols/msn/msn.c:1547 ../src/protocols/yahoo/yahoo_profile.c:1055
+#: src/protocols/msn/msn.c:1536 src/protocols/yahoo/yahoo_profile.c:1024
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: src/protocols/msn/msn.c:1569 src/protocols/novell/novell.c:1454
-#: src/protocols/yahoo/yahoo_profile.c:1010
+#: ../src/protocols/msn/msn.c:1554 ../src/protocols/novell/novell.c:1480
+#: ../src/protocols/yahoo/yahoo_profile.c:1045 src/protocols/msn/msn.c:1543
+#: src/protocols/novell/novell.c:1480 src/protocols/yahoo/yahoo_profile.c:1014
 msgid "Location"
 msgstr "Ubicación"
 
-#: src/protocols/msn/msn.c:1577 src/protocols/yahoo/yahoo_profile.c:1030
+#: ../src/protocols/msn/msn.c:1562 ../src/protocols/yahoo/yahoo_profile.c:1065
+#: src/protocols/msn/msn.c:1551 src/protocols/yahoo/yahoo_profile.c:1034
 msgid "Occupation"
 msgstr "Ocupación"
 
-#: src/protocols/msn/msn.c:1594 src/protocols/msn/msn.c:1600
-#: src/protocols/msn/msn.c:1607 src/protocols/msn/msn.c:1615
-#: src/protocols/msn/msn.c:1622
+#: ../src/protocols/msn/msn.c:1579 ../src/protocols/msn/msn.c:1585
+#: ../src/protocols/msn/msn.c:1592 ../src/protocols/msn/msn.c:1600
+#: ../src/protocols/msn/msn.c:1607 src/protocols/msn/msn.c:1568
+#: src/protocols/msn/msn.c:1574 src/protocols/msn/msn.c:1581
+#: src/protocols/msn/msn.c:1589 src/protocols/msn/msn.c:1596
 msgid "A Little About Me"
 msgstr "Un poco sobre mí"
 
-#: src/protocols/msn/msn.c:1631 src/protocols/msn/msn.c:1637
-#: src/protocols/msn/msn.c:1644 src/protocols/msn/msn.c:1651
+#: ../src/protocols/msn/msn.c:1616 ../src/protocols/msn/msn.c:1622
+#: ../src/protocols/msn/msn.c:1629 ../src/protocols/msn/msn.c:1636
+#: src/protocols/msn/msn.c:1605 src/protocols/msn/msn.c:1611
+#: src/protocols/msn/msn.c:1618 src/protocols/msn/msn.c:1625
 msgid "Favorite Things"
 msgstr "Cosas preferidas"
 
-#: src/protocols/msn/msn.c:1660 src/protocols/msn/msn.c:1666
-#: src/protocols/msn/msn.c:1673
+#: ../src/protocols/msn/msn.c:1645 ../src/protocols/msn/msn.c:1651
+#: ../src/protocols/msn/msn.c:1658 src/protocols/msn/msn.c:1634
+#: src/protocols/msn/msn.c:1640 src/protocols/msn/msn.c:1647
 msgid "Hobbies and Interests"
 msgstr "Aficiones e intereses"
 
-#: src/protocols/msn/msn.c:1682 src/protocols/msn/msn.c:1688
-#: src/protocols/yahoo/yahoo_profile.c:1072
+#: ../src/protocols/msn/msn.c:1667 ../src/protocols/msn/msn.c:1673
+#: ../src/protocols/yahoo/yahoo_profile.c:1107 src/protocols/msn/msn.c:1656
+#: src/protocols/msn/msn.c:1662 src/protocols/yahoo/yahoo_profile.c:1076
 msgid "Favorite Quote"
 msgstr "Cita preferida"
 
-#: src/protocols/msn/msn.c:1696
+#: ../src/protocols/msn/msn.c:1681 src/protocols/msn/msn.c:1670
 msgid "Last Updated"
 msgstr "Actualizado por última vez"
 
-#: src/protocols/msn/msn.c:1707 src/protocols/silc/ops.c:846
+#: ../src/protocols/msn/msn.c:1692 ../src/protocols/silc/ops.c:1060
+#: src/protocols/msn/msn.c:1681 src/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "Página personal"
 
-#: src/protocols/msn/msn.c:1729
+#: ../src/protocols/msn/msn.c:1714 src/protocols/msn/msn.c:1703
 msgid "The user has not created a public profile."
 msgstr "El usuario no ha creado un perfil público."
 
-#: src/protocols/msn/msn.c:1730
+#: ../src/protocols/msn/msn.c:1715 src/protocols/msn/msn.c:1704
 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 "
@@ -6877,7 +8460,7 @@
 "que o bien el usuario no existe o que el usuario existe pero no ha creado un "
 "perfil público."
 
-#: src/protocols/msn/msn.c:1734
+#: ../src/protocols/msn/msn.c:1719 src/protocols/msn/msn.c:1708
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
@@ -6885,7 +8468,8 @@
 "Gaim no pudo encontrar información en el perfil de usuario. Es probable que "
 "el usuario no exista."
 
-#: src/protocols/msn/msn.c:1740 src/protocols/yahoo/yahoo_profile.c:1167
+#: ../src/protocols/msn/msn.c:1725 ../src/protocols/yahoo/yahoo_profile.c:1202
+#: src/protocols/msn/msn.c:1714 src/protocols/yahoo/yahoo_profile.c:1171
 msgid "Profile URL"
 msgstr "URL del perfil"
 
@@ -6899,76 +8483,99 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1942 src/protocols/msn/msn.c:1944
+#: ../src/protocols/msn/msn.c:1931 ../src/protocols/msn/msn.c:1933
+#: src/protocols/msn/msn.c:1917 src/protocols/msn/msn.c:1919
 msgid "MSN Protocol Plugin"
 msgstr "Complemento de protocolo MSN"
 
-#: src/protocols/msn/msn.c:1963
+#: ../src/protocols/msn/msn.c:1952 src/protocols/msn/msn.c:1938
 msgid "Login server"
 msgstr "Servidor de conexión"
 
-#: src/protocols/msn/msn.c:1972
+#: ../src/protocols/msn/msn.c:1961 src/protocols/msn/msn.c:1947
 msgid "Use HTTP Method"
 msgstr "Usar método HTTP"
 
-#: src/protocols/msn/msn.c:1980
-msgid "nudge: nudge a contact to get their attention"
-msgstr "nudge: Dar un codazo a un contacto para llamar su atención"
-
-#: src/protocols/msn/nexus.c:103 src/protocols/msn/servconn.c:127
-#: src/protocols/yahoo/yahoochat.c:1326
+#: ../src/protocols/msn/msn.c:1966
+msgid "Show custom smileys"
+msgstr "Mostrar emoticonos a medida"
+
+#: src/protocols/msn/msn.c:1955
+msgid "nudge: nudge a user to get their attention"
+msgstr "nudge: Avisar a un contacto para llamar su atención"
+
+#: ../src/protocols/msn/nexus.c:141 ../src/protocols/msn/servconn.c:133
+#: ../src/protocols/yahoo/yahoochat.c:1345
+#: ../src/protocols/yahoo/yahoochat.c:1372 src/protocols/msn/nexus.c:103
+#: src/protocols/msn/servconn.c:127 src/protocols/yahoo/yahoochat.c:1326
 msgid "Unable to connect"
 msgstr "No se pudo conectar"
 
+#: ../src/protocols/msn/notification.c:178
 #: src/protocols/msn/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s no es un nombre de grupo válido."
 
-#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:528
-#: src/protocols/msn/session.c:347
+#: ../src/protocols/msn/notification.c:184
+#: ../src/protocols/msn/notification.c:532 ../src/protocols/msn/session.c:334
+#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:532
+#: src/protocols/msn/session.c:334
 msgid "Unknown error."
 msgstr "Error desconocido."
 
+#: ../src/protocols/msn/notification.c:187
 #: src/protocols/msn/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s en %s (%s)"
 
+#: ../src/protocols/msn/notification.c:498
 #: src/protocols/msn/notification.c:498
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "No se pudo añadir al usuario a %s (%s)"
 
+#: ../src/protocols/msn/notification.c:502
 #: src/protocols/msn/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "No puede expulsar al usuario en %s (%s)"
 
+#: ../src/protocols/msn/notification.c:506
 #: src/protocols/msn/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "No se pudo invitar al usuario a %s (%s)."
 
+#: ../src/protocols/msn/notification.c:514
 #: src/protocols/msn/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "No se pudo añadir a %s porque su lista de amigos está llena."
 
+#: ../src/protocols/msn/notification.c:523
 #: src/protocols/msn/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s no es un nombre de cuenta «passport» váida."
 
-#: src/protocols/msn/notification.c:815
+#: src/protocols/msn/notification.c:528
+msgid "Service Temporarily Unavailable."
+msgstr "Servicio no disponible temporalmente."
+
+#: ../src/protocols/msn/notification.c:821
+#: src/protocols/msn/notification.c:821
 msgid "Unable to rename group"
 msgstr "No se pudo cambiar el nombre del grupo"
 
-#: src/protocols/msn/notification.c:870
+#: ../src/protocols/msn/notification.c:876
+#: src/protocols/msn/notification.c:876
 msgid "Unable to delete group"
 msgstr "No se pudo borrar el grupo"
 
-#: src/protocols/msn/notification.c:1303
+#: ../src/protocols/msn/notification.c:1309
+#: src/protocols/msn/notification.c:1309
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6999,204 +8606,229 @@
 "Después de que se hayan realizado las tareas de mantenimiento debería poder "
 "conectarse con éxito de nuevo."
 
-#: src/protocols/msn/servconn.c:129
+#: ../src/protocols/msn/servconn.c:135 src/protocols/msn/servconn.c:129
 msgid "Writing error"
 msgstr "Error de escritura"
 
-#: src/protocols/msn/servconn.c:131
+#: ../src/protocols/msn/servconn.c:137 src/protocols/msn/servconn.c:131
 msgid "Reading error"
 msgstr "Error de lectura"
 
-#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:339
-#: src/protocols/oscar/oscar.c:4925
-msgid "Unknown error"
-msgstr "Error desconocido"
-
-#: src/protocols/msn/servconn.c:136
-#, c-format
-msgid ""
-"Connection error from %s server (%s):\n"
+#: src/protocols/msn/servconn.c:138
+#, c-format
+msgid ""
+"Connection error from %s server:\n"
 "%s"
 msgstr ""
-"Error de conexión del servidor %s (%s):\n"
+"Error de conexión del servidor %s:\n"
 "%s"
 
-#: src/protocols/msn/session.c:317
+#: ../src/protocols/msn/session.c:304 src/protocols/msn/session.c:304
 msgid "Our protocol is not supported by the server."
 msgstr "El servidor no soporta nuestro protocolo."
 
-#: src/protocols/msn/session.c:321
+#: ../src/protocols/msn/session.c:308 src/protocols/msn/session.c:308
 msgid "Error parsing HTTP."
 msgstr "Error en el análisis HTTP."
 
 #. MSG_SERVER_GHOST
 #. Looks like someone logged in as us! =-O
-#: src/protocols/msn/session.c:325 src/protocols/napster/napster.c:450
-#: src/protocols/oscar/oscar.c:5629 src/protocols/yahoo/yahoo.c:194
+#: ../src/protocols/msn/session.c:312 ../src/protocols/napster/napster.c:456
+#: ../src/protocols/oscar/oscar.c:5816 ../src/protocols/yahoo/yahoo.c:193
+#: src/protocols/msn/session.c:312 src/protocols/napster/napster.c:456
+#: src/protocols/oscar/oscar.c:5667 src/protocols/yahoo/yahoo.c:193
 msgid "You have signed on from another location."
 msgstr "Ha conectado desde otra ubicación."
 
-#: src/protocols/msn/session.c:328
+#: ../src/protocols/msn/session.c:315 src/protocols/msn/session.c:315
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Su lista de amigos MSN está indisponible temporalmente. Por favor, espere y "
 "vuelva a intentarlo más tarde."
 
-#: src/protocols/msn/session.c:333
+#: ../src/protocols/msn/session.c:320 src/protocols/msn/session.c:320
 msgid "The MSN servers are going down temporarily."
 msgstr "Los servidores de MSN van a sufrir un apagado temporal."
 
-#: src/protocols/msn/session.c:337
+#: ../src/protocols/msn/session.c:324 src/protocols/msn/session.c:324
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "No se pudo autenticar: %s"
 
-#: src/protocols/msn/session.c:342
+#: ../src/protocols/msn/session.c:329 src/protocols/msn/session.c:329
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "Su lista de amigos MSN está indisponible temporalmente. Por favor, espere y "
 "vuelva a intentarlo más tarde."
 
-#: src/protocols/msn/session.c:363 src/protocols/msn/session.c:365
+#: ../src/protocols/msn/session.c:350 ../src/protocols/msn/session.c:352
+#: src/protocols/msn/session.c:350 src/protocols/msn/session.c:352
 msgid "Handshaking"
 msgstr "Negociación"
 
-#: src/protocols/msn/session.c:364
+#: ../src/protocols/msn/session.c:351 src/protocols/msn/session.c:351
 msgid "Transferring"
 msgstr "Transfiriendo"
 
-#: src/protocols/msn/session.c:366
+#: ../src/protocols/msn/session.c:353 src/protocols/msn/session.c:353
 msgid "Starting authentication"
 msgstr "Empezando la autenticación"
 
-#: src/protocols/msn/session.c:367
+#: ../src/protocols/msn/session.c:354 src/protocols/msn/session.c:354
 msgid "Getting cookie"
 msgstr "Obteniendo una cookie"
 
-#: src/protocols/msn/session.c:369
+#: ../src/protocols/msn/session.c:356 src/protocols/msn/session.c:356
 msgid "Sending cookie"
 msgstr "Enviando cookie"
 
-#: src/protocols/msn/session.c:370
+#: ../src/protocols/msn/session.c:357 src/protocols/msn/session.c:357
 msgid "Retrieving buddy list"
 msgstr "Recuperando lista de amigos"
 
-#: src/protocols/msn/state.c:34
+#: ../src/protocols/msn/state.c:34 src/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "Ausente"
 
-#: src/protocols/msn/switchboard.c:403
+#: ../src/protocols/msn/state.c:35 src/protocols/msn/state.c:35
+msgid "On The Phone"
+msgstr "Al teléfono"
+
+#: ../src/protocols/msn/state.c:36 src/protocols/msn/state.c:36
+msgid "Out To Lunch"
+msgstr "Salí a comer"
+
+#: ../src/protocols/msn/switchboard.c:408 src/protocols/msn/switchboard.c:405
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "Posiblemente no se pudo enviar el mensaje porque expiró la conexión:"
 
-#: src/protocols/msn/switchboard.c:411
+#: ../src/protocols/msn/switchboard.c:416 src/protocols/msn/switchboard.c:413
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr ""
 "No se pudo enviar el mensaje, no está permitido mientras sea invisible:"
 
-#: src/protocols/msn/switchboard.c:415
+#: ../src/protocols/msn/switchboard.c:420 src/protocols/msn/switchboard.c:417
 msgid "Message could not be sent because the user is offline:"
 msgstr "No se pudo enviar el mensaje porque el usuario no está conectado:"
 
-#: src/protocols/msn/switchboard.c:419
+#: ../src/protocols/msn/switchboard.c:424 src/protocols/msn/switchboard.c:421
 msgid "Message could not be sent because a connection error occurred:"
 msgstr ""
 "No se pudo enviar el mensaje porque se produjo un error en la conexión:"
 
-#: src/protocols/msn/switchboard.c:423
+#: ../src/protocols/msn/switchboard.c:428
+msgid "Message could not be sent because we are sending too quickly:"
+msgstr "No se pudo enviar el mensaje porque estamos enviando demasiado rápido:"
+
+#: ../src/protocols/msn/switchboard.c:432 src/protocols/msn/switchboard.c:425
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
 "No se pudo enviar el mensaje porque se produjo un error con el «switchboard»:"
 
-#: src/protocols/msn/switchboard.c:431
+#: ../src/protocols/msn/switchboard.c:440 src/protocols/msn/switchboard.c:433
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "No se pudo enviar el mensaje porque se produjo un error desconocido:"
 
-#: src/protocols/msn/switchboard.c:952
+#: ../src/protocols/msn/switchboard.c:961 src/protocols/msn/switchboard.c:954
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "¡%s le acaba de dar un codazo!"
 
-#: src/protocols/msn/userlist.c:85
+#: ../src/protocols/msn/userlist.c:96 src/protocols/msn/userlist.c:96
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "El usuario %s (%s) quiere añadir a %s a su lista de amigos."
 
-#: src/protocols/msn/userlist.c:275
-#, c-format
-msgid "%s has added you to his or her contact list."
-msgstr "El usuario %s le ha añadido a su lista de amigos."
-
-#: src/protocols/msn/userlist.c:339
-#, c-format
-msgid "%s has removed you from his or her contact list."
-msgstr "%s le ha eliminado de su lista de contactos."
-
-#: src/protocols/msn/userlist.c:659
+#: ../src/protocols/msn/userlist.c:111 ../src/protocols/yahoo/yahoo.c:914
+#: src/protocols/jabber/presence.c:319 src/protocols/msn/userlist.c:111
+#: src/protocols/oscar/oscar.c:4590 src/protocols/oscar/oscar.c:7280
+#: src/protocols/yahoo/yahoo.c:907
+msgid "Authorize"
+msgstr "Autorizar"
+
+#: ../src/protocols/msn/userlist.c:112 ../src/protocols/yahoo/yahoo.c:916
+#: src/protocols/jabber/presence.c:320 src/protocols/msn/userlist.c:112
+#: src/protocols/oscar/oscar.c:4592 src/protocols/oscar/oscar.c:7281
+#: src/protocols/yahoo/yahoo.c:909
+msgid "Deny"
+msgstr "Denegar"
+
+#: src/protocols/msn/userlist.c:286
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "El usuario %s lo ha añadido a su lista de amigos."
+
+#: src/protocols/msn/userlist.c:350
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "El usuario %s lo ha quitado de su lista de amigos."
+
+#: ../src/protocols/msn/userlist.c:678 src/protocols/msn/userlist.c:670
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "No se pudo añadir a \"%s\"."
 
-#: src/protocols/msn/userlist.c:661
+#: ../src/protocols/msn/userlist.c:680 src/protocols/msn/userlist.c:672
 msgid "The screen name specified is invalid."
 msgstr "El nombre de usuario especificado no es válido."
 
-#: src/protocols/napster/napster.c:260
+#: ../src/protocols/napster/napster.c:266 src/protocols/napster/napster.c:266
 msgid "Unable to read header from server"
 msgstr "No se pudo leer las cabeceras del servidor"
 
-#: src/protocols/napster/napster.c:274
+#: ../src/protocols/napster/napster.c:280 src/protocols/napster/napster.c:280
 #, c-format
 msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
 msgstr ""
 "No se pudieron leer los mensajes del servidor %s. La orden es %hd, la "
 "longitud es %hd."
 
-#: src/protocols/napster/napster.c:290
+#: ../src/protocols/napster/napster.c:296 src/protocols/napster/napster.c:296
 msgid "Unknown server error."
 msgstr "Error desconocido del servidor."
 
-#: src/protocols/napster/napster.c:339
+#: ../src/protocols/napster/napster.c:345 src/protocols/napster/napster.c:345
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr "usuarios: %s, archivos: %s, tamaño: %s GiB"
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:350
+#: ../src/protocols/napster/napster.c:356 src/protocols/napster/napster.c:356
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "Incapaz de añadir «%s» a su lista de amigos Napster"
 
-#. MSG_SERVER_DISCONNECTING
-#. we have been kicked off =^(
-#: src/protocols/napster/napster.c:357
-msgid "You were disconnected from the server."
-msgstr "Ha sido desconectado del servidor."
-
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:414
+#: ../src/protocols/napster/napster.c:420 src/protocols/napster/napster.c:420
 #, c-format
 msgid "%s requested your information"
 msgstr "%s solicitó su información de usuario"
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:454
+#: ../src/protocols/napster/napster.c:460 src/protocols/napster/napster.c:460
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s solicitó un PING"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/napster/napster.c:501 src/protocols/napster/napster.c:532
-#: src/protocols/toc/toc.c:172 src/protocols/yahoo/yahoo.c:2212
-#: src/protocols/yahoo/yahoo.c:2239 src/protocols/yahoo/yahoo.c:2302
-#: src/protocols/yahoo/yahoo_filexfer.c:69
+#: ../src/protocols/napster/napster.c:507
+#: ../src/protocols/napster/napster.c:543 ../src/protocols/toc/toc.c:172
+#: ../src/protocols/yahoo/yahoo.c:2238 ../src/protocols/yahoo/yahoo.c:2265
+#: ../src/protocols/yahoo/yahoo.c:2348 ../src/protocols/yahoo/yahoo.c:2363
+#: ../src/protocols/yahoo/yahoo_filexfer.c:74
+#: ../src/protocols/yahoo/yahoo_filexfer.c:137
+#: ../src/protocols/yahoo/ycht.c:540 src/protocols/napster/napster.c:507
+#: src/protocols/napster/napster.c:538 src/protocols/toc/toc.c:172
+#: src/protocols/yahoo/yahoo.c:2224 src/protocols/yahoo/yahoo.c:2251
+#: src/protocols/yahoo/yahoo.c:2314 src/protocols/yahoo/yahoo_filexfer.c:69
 #: src/protocols/yahoo/yahoo_filexfer.c:111 src/protocols/yahoo/ycht.c:481
 msgid "Unable to connect."
 msgstr "No se pudo conectar."
 
-#: src/protocols/napster/napster.c:590 src/protocols/toc/toc.c:1367
+#: ../src/protocols/napster/napster.c:599 ../src/protocols/toc/toc.c:1367
+#: src/protocols/napster/napster.c:596 src/protocols/toc/toc.c:1367
 msgid "_Group:"
 msgstr "_Grupo:"
 
@@ -7210,91 +8842,93 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:687 src/protocols/napster/napster.c:689
+#: ../src/protocols/napster/napster.c:700
+#: ../src/protocols/napster/napster.c:702 src/protocols/napster/napster.c:694
+#: src/protocols/napster/napster.c:696
 msgid "NAPSTER Protocol Plugin"
 msgstr "Complemento de protocolo NAPSTER"
 
-#: src/protocols/novell/nmuser.c:1868
+#: ../src/protocols/novell/nmuser.c:1868 src/protocols/novell/nmuser.c:1868
 msgid "Required parameters not passed in"
 msgstr "No se han recibido los parámetros requeridos"
 
-#: src/protocols/novell/nmuser.c:1871
+#: ../src/protocols/novell/nmuser.c:1871 src/protocols/novell/nmuser.c:1871
 msgid "Unable to write to network"
 msgstr "No se pudo escribir en la red"
 
-#: src/protocols/novell/nmuser.c:1874
+#: ../src/protocols/novell/nmuser.c:1874 src/protocols/novell/nmuser.c:1874
 msgid "Unable to read from network"
 msgstr "No se pudo leer de la red"
 
-#: src/protocols/novell/nmuser.c:1877
+#: ../src/protocols/novell/nmuser.c:1877 src/protocols/novell/nmuser.c:1877
 msgid "Error communicating with server"
 msgstr "Error comunicándose con el servidor"
 
-#: src/protocols/novell/nmuser.c:1881
+#: ../src/protocols/novell/nmuser.c:1881 src/protocols/novell/nmuser.c:1881
 msgid "Conference not found"
 msgstr "Conferencia no encontrada"
 
-#: src/protocols/novell/nmuser.c:1884
+#: ../src/protocols/novell/nmuser.c:1884 src/protocols/novell/nmuser.c:1884
 msgid "Conference does not exist"
 msgstr "La conferencia no existe"
 
-#: src/protocols/novell/nmuser.c:1888
+#: ../src/protocols/novell/nmuser.c:1888 src/protocols/novell/nmuser.c:1888
 msgid "A folder with that name already exists"
 msgstr "Ya existe una carpeta con ese nombre"
 
-#: src/protocols/novell/nmuser.c:1891
+#: ../src/protocols/novell/nmuser.c:1891 src/protocols/novell/nmuser.c:1891
 msgid "Not supported"
 msgstr "No soportado"
 
-#: src/protocols/novell/nmuser.c:1895
+#: ../src/protocols/novell/nmuser.c:1895 src/protocols/novell/nmuser.c:1895
 msgid "Password has expired"
 msgstr "La contraseña ha expirado"
 
-#: src/protocols/novell/nmuser.c:1898
+#: ../src/protocols/novell/nmuser.c:1898 src/protocols/novell/nmuser.c:1898
 msgid "Invalid password"
 msgstr "Contraseña inválida"
 
-#: src/protocols/novell/nmuser.c:1901
+#: ../src/protocols/novell/nmuser.c:1901 src/protocols/novell/nmuser.c:1901
 msgid "User not found"
 msgstr "Usuario no encontrado"
 
-#: src/protocols/novell/nmuser.c:1904
+#: ../src/protocols/novell/nmuser.c:1904 src/protocols/novell/nmuser.c:1904
 msgid "Account has been disabled"
 msgstr "La cuenta ha sido deshabilitada"
 
-#: src/protocols/novell/nmuser.c:1907
+#: ../src/protocols/novell/nmuser.c:1907 src/protocols/novell/nmuser.c:1907
 msgid "The server could not access the directory"
 msgstr "El servidor no pudo acceder al directorio"
 
-#: src/protocols/novell/nmuser.c:1910
+#: ../src/protocols/novell/nmuser.c:1910 src/protocols/novell/nmuser.c:1910
 msgid "Your system administrator has disabled this operation"
 msgstr "Esta opción ha sido deshabilitada por su administrado"
 
-#: src/protocols/novell/nmuser.c:1913
+#: ../src/protocols/novell/nmuser.c:1913 src/protocols/novell/nmuser.c:1913
 msgid "The server is unavailable; try again later"
 msgstr "El servidor no está disponible, inténtelo de nuevo más tarde"
 
-#: src/protocols/novell/nmuser.c:1916
+#: ../src/protocols/novell/nmuser.c:1916 src/protocols/novell/nmuser.c:1916
 msgid "Cannot add a contact to the same folder twice"
 msgstr "No se puede añadir un contacto a la misma carpeta dos veces"
 
-#: src/protocols/novell/nmuser.c:1919
+#: ../src/protocols/novell/nmuser.c:1919 src/protocols/novell/nmuser.c:1919
 msgid "Cannot add yourself"
 msgstr "No se puede añadir uno mismo"
 
-#: src/protocols/novell/nmuser.c:1922
+#: ../src/protocols/novell/nmuser.c:1922 src/protocols/novell/nmuser.c:1922
 msgid "Master archive is misconfigured"
 msgstr "El archivo maestro no está bien configurado"
 
-#: src/protocols/novell/nmuser.c:1926
+#: ../src/protocols/novell/nmuser.c:1926 src/protocols/novell/nmuser.c:1926
 msgid "Invalid username or password"
 msgstr "Nombre o contraseña de usuario no válido"
 
-#: src/protocols/novell/nmuser.c:1929
+#: ../src/protocols/novell/nmuser.c:1929 src/protocols/novell/nmuser.c:1929
 msgid "Could not recognize the host of the username you entered"
 msgstr "No se reconoció el servidor del usuario que introdujo"
 
-#: src/protocols/novell/nmuser.c:1932
+#: ../src/protocols/novell/nmuser.c:1932 src/protocols/novell/nmuser.c:1932
 msgid ""
 "Your account has been disabled because too many invalid passwords were "
 "entered"
@@ -7302,31 +8936,31 @@
 "Su cuenta ha sido deshabilitada porque se introdujo demasiadas veces una "
 "contraseña inválida"
 
-#: src/protocols/novell/nmuser.c:1935
+#: ../src/protocols/novell/nmuser.c:1935 src/protocols/novell/nmuser.c:1935
 msgid "You cannot add the same person twice to a conversation"
 msgstr "No puede añadir la misma persona dos veces a una conversación"
 
-#: src/protocols/novell/nmuser.c:1939
+#: ../src/protocols/novell/nmuser.c:1939 src/protocols/novell/nmuser.c:1939
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "Alcanzó el límite del número de contactos permitidos"
 
-#: src/protocols/novell/nmuser.c:1942
+#: ../src/protocols/novell/nmuser.c:1942 src/protocols/novell/nmuser.c:1942
 msgid "You have entered an invalid username"
 msgstr "El nombre de usuario que ha introducido no es válido"
 
-#: src/protocols/novell/nmuser.c:1945
+#: ../src/protocols/novell/nmuser.c:1945 src/protocols/novell/nmuser.c:1945
 msgid "An error occurred while updating the directory"
 msgstr "Se produjo un error al actualizar el directorio"
 
-#: src/protocols/novell/nmuser.c:1948
+#: ../src/protocols/novell/nmuser.c:1948 src/protocols/novell/nmuser.c:1948
 msgid "Incompatible protocol version"
 msgstr "Versión de protocolo incompatible"
 
-#: src/protocols/novell/nmuser.c:1951
+#: ../src/protocols/novell/nmuser.c:1951 src/protocols/novell/nmuser.c:1951
 msgid "The user has blocked you"
 msgstr "El usuario le ha bloqueado"
 
-#: src/protocols/novell/nmuser.c:1954
+#: ../src/protocols/novell/nmuser.c:1954 src/protocols/novell/nmuser.c:1954
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
@@ -7334,55 +8968,54 @@
 "Esta versión de evaluación no permite la conexión simultánea de más de diez "
 "usuarios"
 
-#: src/protocols/novell/nmuser.c:1957
+#: ../src/protocols/novell/nmuser.c:1957 src/protocols/novell/nmuser.c:1957
 msgid "The user is either offline or you are blocked"
 msgstr "El usuario no está conectado o vd. está siendo bloqueado"
 
-#: src/protocols/novell/nmuser.c:1960
+#: ../src/protocols/novell/nmuser.c:1960 src/protocols/novell/nmuser.c:1960
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Error desconocido: 0x%X"
 
-#: src/protocols/novell/novell.c:117
+#: ../src/protocols/novell/novell.c:124 src/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr "Fallo en la conexión (%s)."
 
-#: src/protocols/novell/novell.c:232
+#: ../src/protocols/novell/novell.c:247 src/protocols/novell/novell.c:247
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
-msgstr ""
-"No se pudo enviar el mensaje. No se pudiero obtener los detalles del usuario "
-"(%s)"
-
-#: src/protocols/novell/novell.c:381
+msgstr "No se pudo enviar el mensaje. No se pudieron obtener los detalles del usuario (%s)"
+
+#: ../src/protocols/novell/novell.c:396 src/protocols/novell/novell.c:396
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "Incapaz de añadir «%s» a su lista de amigos (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: src/protocols/novell/novell.c:407
+#: ../src/protocols/novell/novell.c:422 src/protocols/novell/novell.c:422
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "No se pudo enviar el mensaje (%s)."
 
-#: src/protocols/novell/novell.c:478 src/protocols/novell/novell.c:972
+#: ../src/protocols/novell/novell.c:493 ../src/protocols/novell/novell.c:987
+#: src/protocols/novell/novell.c:493 src/protocols/novell/novell.c:987
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "No se pudo invitar al usuario (%s)."
 
-#: src/protocols/novell/novell.c:517
+#: ../src/protocols/novell/novell.c:532 src/protocols/novell/novell.c:532
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
 "No se pudo enviar un mensaje a %s. No se pudo crear la conferencia (%s)."
 
-#: src/protocols/novell/novell.c:522
+#: ../src/protocols/novell/novell.c:537 src/protocols/novell/novell.c:537
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "No se pudo enviar el mensaje. No se pudo crear la conferencia (%s)"
 
-#: src/protocols/novell/novell.c:569
+#: ../src/protocols/novell/novell.c:584 src/protocols/novell/novell.c:584
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -7391,7 +9024,7 @@
 "No se pudo mover al usuario %s a la carpeta %s en la lista del servidor. Se "
 "produjo un error al crear la carpeta (%s)."
 
-#: src/protocols/novell/novell.c:617
+#: ../src/protocols/novell/novell.c:632 src/protocols/novell/novell.c:632
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -7400,67 +9033,71 @@
 "No se pudo añadir en su lista de amigos a %s. Se produjo un error al crear "
 "la carpeta en la lista del servidor (%s)."
 
-#: src/protocols/novell/novell.c:690
+#: ../src/protocols/novell/novell.c:705 src/protocols/novell/novell.c:705
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "No se pudieron obtener los detalles del usuario %s (%s)."
 
-#: src/protocols/novell/novell.c:736 src/protocols/novell/novell.c:882
+#: ../src/protocols/novell/novell.c:751 ../src/protocols/novell/novell.c:897
+#: src/protocols/novell/novell.c:751 src/protocols/novell/novell.c:897
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "No se pudo añadir al usuario a su lista de privacidad (%s)"
 
-#: src/protocols/novell/novell.c:783
+#: ../src/protocols/novell/novell.c:798 src/protocols/novell/novell.c:798
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "No se pudo añadir «%s» a su lista de rechazados (%s)."
 
-#: src/protocols/novell/novell.c:836
+#: ../src/protocols/novell/novell.c:851 src/protocols/novell/novell.c:851
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "No se pudo añadir «%s» a su lista de permitidos (%s)."
 
-#: src/protocols/novell/novell.c:904
+#: ../src/protocols/novell/novell.c:919 src/protocols/novell/novell.c:919
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "No se pudo eliminar «%s» de su lista de privacidad (%s)."
 
-#: src/protocols/novell/novell.c:927 src/protocols/novell/novell.c:1628
+#: ../src/protocols/novell/novell.c:942 ../src/protocols/novell/novell.c:1654
+#: src/protocols/novell/novell.c:942 src/protocols/novell/novell.c:1654
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "No se pudieron cambiar las opciones de privacidad del servidor (%s)."
 
-#: src/protocols/novell/novell.c:999
+#: ../src/protocols/novell/novell.c:1014 src/protocols/novell/novell.c:1014
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "No se pudo crear la conferencia (%s)."
 
-#: src/protocols/novell/novell.c:1110 src/protocols/novell/novell.c:1667
+#: ../src/protocols/novell/novell.c:1123 ../src/protocols/novell/novell.c:1693
+#: src/protocols/novell/novell.c:1123 src/protocols/novell/novell.c:1693
 msgid "Error communicating with server. Closing connection."
 msgstr "Error comunicándose con el servidor. Se cerrará la conexión."
 
-#: src/protocols/novell/novell.c:1452
+#: ../src/protocols/novell/novell.c:1478 src/protocols/novell/novell.c:1478
 msgid "Telephone Number"
 msgstr "Número de teléfono"
 
-#: src/protocols/novell/novell.c:1456
+#: ../src/protocols/novell/novell.c:1482 src/protocols/novell/novell.c:1482
 msgid "Department"
 msgstr "Departamento"
 
-#: src/protocols/novell/novell.c:1458
+#: ../src/protocols/novell/novell.c:1484 src/protocols/novell/novell.c:1484
 msgid "Personal Title"
 msgstr "Título"
 
-#: src/protocols/novell/novell.c:1462
+#: ../src/protocols/novell/novell.c:1488 src/protocols/novell/novell.c:1488
 msgid "Mailstop"
 msgstr "Buzón de correo"
 
-#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5965
-#: src/protocols/oscar/oscar.c:5972
+#: ../src/protocols/novell/novell.c:1490 ../src/protocols/oscar/oscar.c:6113
+#: ../src/protocols/oscar/oscar.c:6120 src/protocols/novell/novell.c:1490
+#: src/protocols/oscar/oscar.c:6007 src/protocols/oscar/oscar.c:6014
 msgid "Email Address"
 msgstr "Correo electrónico"
 
-#: src/protocols/novell/novell.c:1480
+#: ../src/protocols/novell/novell.c:1506 src/protocols/novell/novell.c:1506
 msgid "User ID"
 msgstr "ID de usuario"
 
@@ -7471,46 +9108,41 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1494
+#: ../src/protocols/novell/novell.c:1520 src/protocols/novell/novell.c:1520
 msgid "Full name"
 msgstr "Nombre completo"
 
-#: src/protocols/novell/novell.c:1618
+#: ../src/protocols/novell/novell.c:1644 src/protocols/novell/novell.c:1644
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Conferencia GroupWise %d"
 
-#: src/protocols/novell/novell.c:1643
+#: ../src/protocols/novell/novell.c:1669 src/protocols/novell/novell.c:1669
 msgid "Unable to make SSL connection to server."
 msgstr "No se pudo establecer una conexión SSL con el servidor."
 
-#: src/protocols/novell/novell.c:1673
-#, c-format
-msgid "Error processing event or response (%s)."
-msgstr "Se produjo un error al procesar un evento o una respuesta (%s)."
-
-#: src/protocols/novell/novell.c:1707
+#: ../src/protocols/novell/novell.c:1726 src/protocols/novell/novell.c:1726
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-#: src/protocols/novell/novell.c:1719
+#: ../src/protocols/novell/novell.c:1738 src/protocols/novell/novell.c:1738
 msgid "Unable to connect to server."
 msgstr "No se pudo conectar al servidor."
 
-#: src/protocols/novell/novell.c:1722
+#: ../src/protocols/novell/novell.c:1741 src/protocols/novell/novell.c:1741
 msgid "Waiting for response..."
 msgstr "Esperando respuesta..."
 
-#: src/protocols/novell/novell.c:1857
+#: ../src/protocols/novell/novell.c:1876 src/protocols/novell/novell.c:1876
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "Se ha invitado a %s a esta conversación."
 
-#: src/protocols/novell/novell.c:1885
+#: ../src/protocols/novell/novell.c:1904 src/protocols/novell/novell.c:1904
 msgid "Invitation to Conversation"
 msgstr "Invitación a una conversación"
 
-#: src/protocols/novell/novell.c:1886
+#: ../src/protocols/novell/novell.c:1905 src/protocols/novell/novell.c:1905
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7521,16 +9153,16 @@
 "\n"
 "Enviada: %s"
 
-#: src/protocols/novell/novell.c:1888
+#: ../src/protocols/novell/novell.c:1907 src/protocols/novell/novell.c:1907
 msgid "Would you like to join the conversation?"
 msgstr "¿Desea unirse a la conversación?"
 
-#: src/protocols/novell/novell.c:1995
+#: ../src/protocols/novell/novell.c:2014 src/protocols/novell/novell.c:2014
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 "Ha sido desconectado porque se ha conectado desde otra estación de trabajo."
 
-#: src/protocols/novell/novell.c:2051
+#: ../src/protocols/novell/novell.c:2070 src/protocols/novell/novell.c:2070
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7542,7 +9174,7 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2149
+#: ../src/protocols/novell/novell.c:2168 src/protocols/novell/novell.c:2168
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -7550,19 +9182,14 @@
 "No se pudo contactar con el servidor. Por favor, indique la dirección del "
 "servidor con el que desea conectarse."
 
-#: src/protocols/novell/novell.c:2171
+#: ../src/protocols/novell/novell.c:2190 src/protocols/novell/novell.c:2190
 msgid "Error. SSL support is not installed."
 msgstr "Error. El soporte de SSL no está instalado."
 
-#: src/protocols/novell/novell.c:2475
+#: ../src/protocols/novell/novell.c:2499 src/protocols/novell/novell.c:2499
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Se ha cerrado esta conferencia. No se pueden enviar más mensajes."
 
-#: src/protocols/novell/novell.c:2965 src/protocols/novell/novell.c:3047
-#: src/protocols/yahoo/yahoo.c:2839
-msgid "Appear Offline"
-msgstr "Parecer desconectado"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7573,114 +9200,116 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3540 src/protocols/novell/novell.c:3542
+#: ../src/protocols/novell/novell.c:3544 ../src/protocols/novell/novell.c:3546
+#: src/protocols/novell/novell.c:3543 src/protocols/novell/novell.c:3545
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Complemento de protocolo de Mensajería de Grupos de Novell"
 
-#: src/protocols/novell/novell.c:3561
+#: ../src/protocols/novell/novell.c:3565 src/protocols/novell/novell.c:3564
 msgid "Server address"
 msgstr "Dirección del servidor"
 
-#: src/protocols/novell/novell.c:3565
+#: ../src/protocols/novell/novell.c:3569 src/protocols/novell/novell.c:3568
 msgid "Server port"
 msgstr "Puerto del servidor"
 
-#: src/protocols/oscar/oscar.c:202
+#: ../src/protocols/oscar/oscar.c:203 src/protocols/oscar/oscar.c:201
 msgid "Invalid error"
 msgstr "Error inválido"
 
-#: src/protocols/oscar/oscar.c:203
+#: ../src/protocols/oscar/oscar.c:204 src/protocols/oscar/oscar.c:202
 msgid "Invalid SNAC"
 msgstr "SNAC inválido"
 
-#: src/protocols/oscar/oscar.c:204
+#: ../src/protocols/oscar/oscar.c:205 src/protocols/oscar/oscar.c:203
 msgid "Rate to host"
 msgstr "Tasa de mensajes al servidor"
 
-#: src/protocols/oscar/oscar.c:205
+#: ../src/protocols/oscar/oscar.c:206 src/protocols/oscar/oscar.c:204
 msgid "Rate to client"
 msgstr "Tasa de mensajes al cliente"
 
-#: src/protocols/oscar/oscar.c:207
+#: ../src/protocols/oscar/oscar.c:208 src/protocols/oscar/oscar.c:206
 msgid "Service unavailable"
 msgstr "Servicio no disponible"
 
-#: src/protocols/oscar/oscar.c:208
+#: ../src/protocols/oscar/oscar.c:209 src/protocols/oscar/oscar.c:207
 msgid "Service not defined"
 msgstr "Servicio no definido"
 
-#: src/protocols/oscar/oscar.c:209
+#: ../src/protocols/oscar/oscar.c:210 src/protocols/oscar/oscar.c:208
 msgid "Obsolete SNAC"
 msgstr "SNAC obsoleto"
 
-#: src/protocols/oscar/oscar.c:210
+#: ../src/protocols/oscar/oscar.c:211 src/protocols/oscar/oscar.c:209
 msgid "Not supported by host"
 msgstr "No soportado por el servidor"
 
-#: src/protocols/oscar/oscar.c:211
+#: ../src/protocols/oscar/oscar.c:212 src/protocols/oscar/oscar.c:210
 msgid "Not supported by client"
 msgstr "No soportado por el cliente"
 
-#: src/protocols/oscar/oscar.c:212
+#: ../src/protocols/oscar/oscar.c:213 src/protocols/oscar/oscar.c:211
 msgid "Refused by client"
 msgstr "Rechazado por el cliente"
 
-#: src/protocols/oscar/oscar.c:213
+#: ../src/protocols/oscar/oscar.c:214 src/protocols/oscar/oscar.c:212
 msgid "Reply too big"
 msgstr "Respuesta demasiado grande"
 
-#: src/protocols/oscar/oscar.c:214
+#: ../src/protocols/oscar/oscar.c:215 src/protocols/oscar/oscar.c:213
 msgid "Responses lost"
 msgstr "Respuestas perdidas"
 
-#: src/protocols/oscar/oscar.c:215
+#: ../src/protocols/oscar/oscar.c:216 src/protocols/oscar/oscar.c:214
 msgid "Request denied"
 msgstr "Solicitud denegada"
 
-#: src/protocols/oscar/oscar.c:216
+#: ../src/protocols/oscar/oscar.c:217 src/protocols/oscar/oscar.c:215
 msgid "Busted SNAC payload"
 msgstr "Carga de SNAC destrozada"
 
-#: src/protocols/oscar/oscar.c:217
+#: ../src/protocols/oscar/oscar.c:218 src/protocols/oscar/oscar.c:216
 msgid "Insufficient rights"
 msgstr "Derechos insuficientes"
 
-#: src/protocols/oscar/oscar.c:218
+#: ../src/protocols/oscar/oscar.c:219 src/protocols/oscar/oscar.c:217
 msgid "In local permit/deny"
 msgstr "En la lista local de autorizar/negar"
 
-#: src/protocols/oscar/oscar.c:219
+#: ../src/protocols/oscar/oscar.c:220 src/protocols/oscar/oscar.c:218
 msgid "Too evil (sender)"
 msgstr "Demasiado malvado (remitente)"
 
-#: src/protocols/oscar/oscar.c:220
+#: ../src/protocols/oscar/oscar.c:221 src/protocols/oscar/oscar.c:219
 msgid "Too evil (receiver)"
 msgstr "Demasiado malvado (destinatario)"
 
-#: src/protocols/oscar/oscar.c:221
+#: ../src/protocols/oscar/oscar.c:222 src/protocols/oscar/oscar.c:220
 msgid "User temporarily unavailable"
 msgstr "Usuario temporalmente no disponible"
 
-#: src/protocols/oscar/oscar.c:222
+#: ../src/protocols/oscar/oscar.c:223 src/protocols/oscar/oscar.c:221
 msgid "No match"
 msgstr "No hubo coincidencia"
 
-#: src/protocols/oscar/oscar.c:223
+#: ../src/protocols/oscar/oscar.c:224 src/protocols/oscar/oscar.c:222
 msgid "List overflow"
 msgstr "Desbordamiento de la lista"
 
-#: src/protocols/oscar/oscar.c:224
+#: ../src/protocols/oscar/oscar.c:225 src/protocols/oscar/oscar.c:223
 msgid "Request ambiguous"
 msgstr "Solicitud ambigua"
 
-#: src/protocols/oscar/oscar.c:225
+#: ../src/protocols/oscar/oscar.c:226 src/protocols/oscar/oscar.c:224
 msgid "Queue full"
 msgstr "Cola llena"
 
-#: src/protocols/oscar/oscar.c:226
+#: ../src/protocols/oscar/oscar.c:227 src/protocols/oscar/oscar.c:225
 msgid "Not while on AOL"
 msgstr "No mientras esté en AOL"
 
+#: ../src/protocols/oscar/oscar.c:421 ../src/protocols/oscar/oscar.c:523
 #: src/protocols/oscar/oscar.c:417 src/protocols/oscar/oscar.c:502
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking to "
@@ -7689,159 +9318,167 @@
 "(Se produjo un error al recibir este mensaje. Es posible que el amigo con el "
 "que está hablando tenga un cliente defectuoso.)"
 
-#: src/protocols/oscar/oscar.c:616
+#: ../src/protocols/oscar/oscar.c:638 src/protocols/oscar/oscar.c:616
 msgid "Voice"
 msgstr "Voz"
 
-#: src/protocols/oscar/oscar.c:619
+#: ../src/protocols/oscar/oscar.c:641 src/protocols/oscar/oscar.c:619
 msgid "AIM Direct IM"
 msgstr "MI Directo AIM"
 
-#: src/protocols/oscar/oscar.c:622 src/protocols/silc/silc.c:659
-#: src/protocols/silc/util.c:509
+#: ../src/protocols/oscar/oscar.c:644 ../src/protocols/silc/silc.c:693
+#: ../src/protocols/silc/util.c:510 src/protocols/oscar/oscar.c:622
+#: src/protocols/silc/silc.c:683 src/protocols/silc/util.c:510
 msgid "Chat"
 msgstr "Charlar"
 
-#: src/protocols/oscar/oscar.c:625 src/protocols/oscar/oscar.c:7898
+#: ../src/protocols/oscar/oscar.c:647 ../src/protocols/oscar/oscar.c:8095
+#: src/protocols/oscar/oscar.c:625 src/protocols/oscar/oscar.c:7968
 msgid "Get File"
 msgstr "Recibir archivo"
 
-#: src/protocols/oscar/oscar.c:632
+#: ../src/protocols/oscar/oscar.c:654 src/protocols/oscar/oscar.c:632
 msgid "Games"
 msgstr "Juegos"
 
-#: src/protocols/oscar/oscar.c:635
+#: ../src/protocols/oscar/oscar.c:657 src/protocols/oscar/oscar.c:635
 msgid "Add-Ins"
 msgstr "Extensiones"
 
-#: src/protocols/oscar/oscar.c:638
+#: ../src/protocols/oscar/oscar.c:660 src/protocols/oscar/oscar.c:638
 msgid "Send Buddy List"
 msgstr "Enviar lista de amigos"
 
-#: src/protocols/oscar/oscar.c:641
+#: ../src/protocols/oscar/oscar.c:663 src/protocols/oscar/oscar.c:641
 msgid "ICQ Direct Connect"
 msgstr "Conexión directa ICQ"
 
-#: src/protocols/oscar/oscar.c:644
+#: ../src/protocols/oscar/oscar.c:666 src/protocols/oscar/oscar.c:644
 msgid "AP User"
 msgstr "Usuario de AP"
 
-#: src/protocols/oscar/oscar.c:647
+#: ../src/protocols/oscar/oscar.c:669 src/protocols/oscar/oscar.c:647
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:650
+#: ../src/protocols/oscar/oscar.c:672 src/protocols/oscar/oscar.c:650
 msgid "Nihilist"
 msgstr "Nihilista"
 
-#: src/protocols/oscar/oscar.c:653
+#: ../src/protocols/oscar/oscar.c:675 src/protocols/oscar/oscar.c:653
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: src/protocols/oscar/oscar.c:656
+#: ../src/protocols/oscar/oscar.c:678 src/protocols/oscar/oscar.c:656
 msgid "Old ICQ UTF8"
 msgstr "Antiguo ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:659
+#: ../src/protocols/oscar/oscar.c:681 src/protocols/oscar/oscar.c:659
 msgid "Trillian Encryption"
 msgstr "Cifrado Trillian"
 
-#: src/protocols/oscar/oscar.c:662
+#: ../src/protocols/oscar/oscar.c:684 src/protocols/oscar/oscar.c:662
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:665
+#: ../src/protocols/oscar/oscar.c:687 src/protocols/oscar/oscar.c:665
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:668
+#: ../src/protocols/oscar/oscar.c:690 src/protocols/oscar/oscar.c:668
 msgid "Security Enabled"
 msgstr "Seguridad activada"
 
-#: src/protocols/oscar/oscar.c:671
+#: ../src/protocols/oscar/oscar.c:693 src/protocols/oscar/oscar.c:671
 msgid "Video Chat"
 msgstr "Video chat"
 
-#: src/protocols/oscar/oscar.c:675
+#: ../src/protocols/oscar/oscar.c:697 src/protocols/oscar/oscar.c:675
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:678
+#: ../src/protocols/oscar/oscar.c:700 src/protocols/oscar/oscar.c:678
 msgid "Live Video"
 msgstr "Vídeo en tiempo real"
 
-#: src/protocols/oscar/oscar.c:681
+#: ../src/protocols/oscar/oscar.c:703 src/protocols/oscar/oscar.c:681
 msgid "Camera"
 msgstr "Cámara"
 
-#: src/protocols/oscar/oscar.c:699 src/protocols/oscar/oscar.c:7781
+#: ../src/protocols/oscar/oscar.c:721 ../src/protocols/oscar/oscar.c:7957
+#: src/protocols/oscar/oscar.c:699 src/protocols/oscar/oscar.c:7851
 msgid "Free For Chat"
 msgstr "Disponible para conversar"
 
-#: src/protocols/oscar/oscar.c:703 src/protocols/oscar/oscar.c:7796
+#: ../src/protocols/oscar/oscar.c:725 ../src/protocols/oscar/oscar.c:7985
+#: src/protocols/oscar/oscar.c:703 src/protocols/oscar/oscar.c:7866
 msgid "Not Available"
 msgstr "No disponible"
 
-#: src/protocols/oscar/oscar.c:705 src/protocols/oscar/oscar.c:7786
+#: ../src/protocols/oscar/oscar.c:727 ../src/protocols/oscar/oscar.c:7975
+#: src/protocols/oscar/oscar.c:705 src/protocols/oscar/oscar.c:7856
 msgid "Occupied"
 msgstr "Ocupado"
 
-#: src/protocols/oscar/oscar.c:709
+#: ../src/protocols/oscar/oscar.c:731 src/protocols/oscar/oscar.c:709
 msgid "Web Aware"
 msgstr "Capacidad web"
 
-#: src/protocols/oscar/oscar.c:786 src/protocols/oscar/oscar.c:5050
+#: ../src/protocols/oscar/oscar.c:735 src/protocols/oscar/oscar.c:713
+msgid "Online"
+msgstr "Conectado"
+
+#: ../src/protocols/oscar/oscar.c:812 ../src/protocols/oscar/oscar.c:5188
+#: src/protocols/oscar/oscar.c:786 src/protocols/oscar/oscar.c:5038
 msgid "Warning Level"
 msgstr "Niveles de aviso"
 
-#: src/protocols/oscar/oscar.c:792
-msgid "Capabilities"
-msgstr "Capacidades"
-
-#: src/protocols/oscar/oscar.c:801
+#: ../src/protocols/oscar/oscar.c:821 src/protocols/oscar/oscar.c:795
 msgid "Buddy Comment"
 msgstr "Comentario de amigo"
 
-#: src/protocols/oscar/oscar.c:958
+#: ../src/protocols/oscar/oscar.c:970 src/protocols/oscar/oscar.c:946
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Se cerró el MI con %s"
 
-#: src/protocols/oscar/oscar.c:960
+#: ../src/protocols/oscar/oscar.c:972 src/protocols/oscar/oscar.c:948
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Fallo un MI directo con %s"
 
-#: src/protocols/oscar/oscar.c:968
+#: ../src/protocols/oscar/oscar.c:980 src/protocols/oscar/oscar.c:956
 msgid "Direct Connect failed"
 msgstr "Falló la conexión directa"
 
-#: src/protocols/oscar/oscar.c:1045 src/protocols/oscar/oscar.c:1176
+#: ../src/protocols/oscar/oscar.c:1060 ../src/protocols/oscar/oscar.c:1189
+#: src/protocols/oscar/oscar.c:1033 src/protocols/oscar/oscar.c:1164
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Se estableció un MI directo con %s"
 
-#: src/protocols/oscar/oscar.c:1126
+#: ../src/protocols/oscar/oscar.c:1141 src/protocols/oscar/oscar.c:1114
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 msgstr "Intentando conectarse a %s en %s:%hu para IM directo."
 
-#: src/protocols/oscar/oscar.c:1547
+#: ../src/protocols/oscar/oscar.c:1544 src/protocols/oscar/oscar.c:1535
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr ""
 "Solicitando a %s que se conecte con nosotros en %s:%hu para MI directo."
 
-#: src/protocols/oscar/oscar.c:1552
+#: ../src/protocols/oscar/oscar.c:1549 ../src/protocols/oscar/oscar.c:1596
+#: src/protocols/oscar/oscar.c:1540
 msgid "Unable to open Direct IM"
 msgstr "No se pudo conectar a MI"
 
-#: src/protocols/oscar/oscar.c:1587
+#: ../src/protocols/oscar/oscar.c:1632 src/protocols/oscar/oscar.c:1575
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Usted pidió abrir una conexión MI directa con %s."
 
-#: src/protocols/oscar/oscar.c:1591
+#: ../src/protocols/oscar/oscar.c:1636 src/protocols/oscar/oscar.c:1579
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -7849,24 +9486,24 @@
 "Como ésto revela su dirección IP, puede ser considerado como un riesgo a su "
 "privacidad.  ¿Quiere continuar?"
 
-#: src/protocols/oscar/oscar.c:1595 src/protocols/oscar/oscar.c:4361
-msgid "Connect"
-msgstr "Conectar"
-
-#: src/protocols/oscar/oscar.c:1661
+#: ../src/protocols/oscar/oscar.c:1640 ../src/protocols/oscar/oscar.c:4499
+msgid "_Connect"
+msgstr "_Conectar"
+
+#: ../src/protocols/oscar/oscar.c:1718 src/protocols/oscar/oscar.c:1649
 #, c-format
 msgid "You have lost your connection to chat room %s."
 msgstr "Ha perdido su conexión a la sala de chat %s."
 
-#: src/protocols/oscar/oscar.c:1684
+#: ../src/protocols/oscar/oscar.c:1741 src/protocols/oscar/oscar.c:1672
 msgid "Chat is currently unavailable"
 msgstr "El chat no está disponible"
 
-#: src/protocols/oscar/oscar.c:1754
+#: ../src/protocols/oscar/oscar.c:1813 src/protocols/oscar/oscar.c:1742
 msgid "Screen name sent"
 msgstr "Se ha enviado el nombre de usuario"
 
-#: src/protocols/oscar/oscar.c:1770
+#: ../src/protocols/oscar/oscar.c:1829 src/protocols/oscar/oscar.c:1758
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7877,73 +9514,88 @@
 "no es válido. Los nombres de usuario deben empezar con letras y sólo pueden "
 "contener letras, números y espacios, o contener sólo números."
 
-#: src/protocols/oscar/oscar.c:1799
+#: ../src/protocols/oscar/oscar.c:1857 src/protocols/oscar/oscar.c:1787
 msgid "Unable to login to AIM"
 msgstr "No se pudo conectar con AIM"
 
-#: src/protocols/oscar/oscar.c:1903 src/protocols/oscar/oscar.c:2846
+#: ../src/protocols/oscar/oscar.c:1960 ../src/protocols/oscar/oscar.c:2951
+#: src/protocols/oscar/oscar.c:1891 src/protocols/oscar/oscar.c:2842
 msgid "Could Not Connect"
 msgstr "No se pudo conectar"
 
-#: src/protocols/oscar/oscar.c:1911
+#: ../src/protocols/oscar/oscar.c:1971 src/protocols/oscar/oscar.c:1899
 msgid "Connection established, cookie sent"
 msgstr "Conexión establecida, cookie enviada"
 
+#. #-#-#-#-#  es.po (Gaim)  #-#-#-#-#
+#. 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
+#. #-#-#-#-#  gaim-contributed-2006-01-04.es.po (Gaim)  #-#-#-#-#
 #. clientip & verifiedip failed, request a redirect
 #. * that is, we want the sender to connect to us
 #. Let the user not to lose hope quite yet
-#: src/protocols/oscar/oscar.c:2063
+#: ../src/protocols/oscar/oscar.c:2130 src/protocols/oscar/oscar.c:2051
 msgid "Attempting connection redirect..."
 msgstr "Intentando redirigir la conexión..."
 
 #. proxyip timed out
 #. * Yes, it's a bit odd to ask the user to enable proxied file transfers
 #. * when it's a proxied transfer that timed out. It is possible that a
-#. * stage 1/2 proxied transfer might work when a stage 3 will not.
-#: src/protocols/oscar/oscar.c:2108
+#. * stage 1 or 2 proxied transfer might work when a stage 3 will not.
+#: ../src/protocols/oscar/oscar.c:2176
 #, c-format
 msgid ""
 "Transfer of file %s timed out.\n"
-" Try enabling proxy servers for file transfers in Tools->Preferences->AIM/"
-"ICQ."
+" Try enabling proxy servers for file transfers in Accounts->%s->Edit Account-"
+">Advanced."
 msgstr ""
 "Expiró la transferencia del fichero %s.\n"
-" Intente habilitar servidor proxy para las transferencias de ficheros en Herramientas->Preferencias->AIM/ICQ."
-
-#: src/protocols/oscar/oscar.c:2206 src/protocols/yahoo/yahoo_filexfer.c:174
+" Intente habilitar servidor proxy para las transferencias de ficheros en Cuentas->%s->Editar cuenta->Avanzadas."
+
+#: ../src/protocols/oscar/oscar.c:2274
+#: ../src/protocols/yahoo/yahoo_filexfer.c:253
+#: ../src/protocols/yahoo/yahoo_filexfer.c:262
+#: ../src/protocols/yahoo/yahoo_filexfer.c:271
+#: src/protocols/oscar/oscar.c:2194 src/protocols/yahoo/yahoo_filexfer.c:174
 #: src/protocols/yahoo/yahoo_filexfer.c:183
 #: src/protocols/yahoo/yahoo_filexfer.c:192
 msgid "Unable to establish file descriptor."
 msgstr "No se pudo establecer el descriptor de archivo."
 
-#: src/protocols/oscar/oscar.c:2211
+#: ../src/protocols/oscar/oscar.c:2279 src/protocols/oscar/oscar.c:2199
 msgid "Unable to create new connection."
 msgstr "No se pudo crear una nueva conexión."
 
-#: src/protocols/oscar/oscar.c:2445 src/protocols/oscar/oscar.c:2454
-#: src/protocols/oscar/oscar.c:2468 src/protocols/oscar/oscar.c:2478
+#: ../src/protocols/oscar/oscar.c:2516 ../src/protocols/oscar/oscar.c:2525
+#: ../src/protocols/oscar/oscar.c:2539 ../src/protocols/oscar/oscar.c:2549
 msgid "Unable to log into file transfer proxy."
 msgstr "No se pudo conectar en el proxy de transferencia de archivos."
 
-#: src/protocols/oscar/oscar.c:2532
+#: ../src/protocols/oscar/oscar.c:2603 src/protocols/oscar/oscar.c:2520
 msgid "Unable to establish listener socket or no AOL proxy connection present."
-msgstr "No se pudo crear el socket de escuch o no hay un proxy de conexión AOL."
-
-#: src/protocols/oscar/oscar.c:2733 src/protocols/toc/toc.c:543
+msgstr "No se pudo crear el socket de escucha o no hay conexión al proxy AOL."
+
+#: ../src/protocols/oscar/oscar.c:2841 ../src/protocols/toc/toc.c:543
+#: src/protocols/oscar/oscar.c:2728 src/protocols/toc/toc.c:543
 msgid "Incorrect nickname or password."
 msgstr "Nombre de cuenta o contraseña incorrecta."
 
-#: src/protocols/oscar/oscar.c:2738
+#: ../src/protocols/oscar/oscar.c:2846 src/protocols/oscar/oscar.c:2733
 msgid "Your account is currently suspended."
 msgstr "Su cuenta está deshabilitada actualmente."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2742
+#: ../src/protocols/oscar/oscar.c:2850 src/protocols/oscar/oscar.c:2737
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 "El servicio de Mensajería Instantáneo AOL está temporalmente no disponible."
 
-#: src/protocols/oscar/oscar.c:2747
+#: ../src/protocols/oscar/oscar.c:2855 src/protocols/oscar/oscar.c:2742
 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."
@@ -7952,35 +9604,36 @@
 "inténtelo de nuevo. Si sigue intentándolo, necesitará esperar incluso más "
 "tiempo."
 
-#: src/protocols/oscar/oscar.c:2752
+#: ../src/protocols/oscar/oscar.c:2860 src/protocols/oscar/oscar.c:2747
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "La versión del cliente que usa es demasiado antigua. Por favor, actualícela "
 "en %s"
 
-#: src/protocols/oscar/oscar.c:2783
+#: ../src/protocols/oscar/oscar.c:2888 src/protocols/oscar/oscar.c:2778
 msgid "Internal Error"
 msgstr "Error interno"
 
-#: src/protocols/oscar/oscar.c:2853
+#: ../src/protocols/oscar/oscar.c:2958 src/protocols/oscar/oscar.c:2849
 msgid "Received authorization"
 msgstr "Se recibió la autorización"
 
-#: src/protocols/oscar/oscar.c:2877
+#: ../src/protocols/oscar/oscar.c:2982 src/protocols/oscar/oscar.c:2873
 msgid "The SecurID key entered is invalid."
 msgstr "La clave SecurID que se ha introducido no es válida."
 
-#: src/protocols/oscar/oscar.c:2891
+#: ../src/protocols/oscar/oscar.c:2996 src/protocols/oscar/oscar.c:2887
 msgid "Enter SecurID"
 msgstr "Introduzca SecurID"
 
-#: src/protocols/oscar/oscar.c:2892
+#: ../src/protocols/oscar/oscar.c:2997 src/protocols/oscar/oscar.c:2888
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Introduzca el dígito de seis números que aparece en la pantalla."
 
-#: src/protocols/oscar/oscar.c:2932 src/protocols/oscar/oscar.c:2962
-#: src/protocols/oscar/oscar.c:3051
+#: ../src/protocols/oscar/oscar.c:3037 ../src/protocols/oscar/oscar.c:3067
+#: ../src/protocols/oscar/oscar.c:3158 src/protocols/oscar/oscar.c:2928
+#: src/protocols/oscar/oscar.c:2958 src/protocols/oscar/oscar.c:3047
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7989,24 +9642,25 @@
 "Quizá sea desconectado en breve.  Puede querer usar TOC hasta que esto se "
 "resuelva.  Compruebe %s para novedades."
 
-#: src/protocols/oscar/oscar.c:2935 src/protocols/oscar/oscar.c:2965
+#: ../src/protocols/oscar/oscar.c:3040 ../src/protocols/oscar/oscar.c:3070
+#: src/protocols/oscar/oscar.c:2931 src/protocols/oscar/oscar.c:2961
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim no pudo obtener un «hash» de conexión a AIM válido."
 
-#: src/protocols/oscar/oscar.c:3054
+#: ../src/protocols/oscar/oscar.c:3161 src/protocols/oscar/oscar.c:3050
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim no pudo un «hash» de conexión válido."
 
-#: src/protocols/oscar/oscar.c:3085
+#: ../src/protocols/oscar/oscar.c:3182 src/protocols/oscar/oscar.c:3071
 msgid "Password sent"
 msgstr "Contraseña enviada"
 
-#: src/protocols/oscar/oscar.c:4352
+#: ../src/protocols/oscar/oscar.c:4490 src/protocols/oscar/oscar.c:4340
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s pide conectarse directamente a %s"
 
-#: src/protocols/oscar/oscar.c:4355
+#: ../src/protocols/oscar/oscar.c:4493 src/protocols/oscar/oscar.c:4343
 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 "
@@ -8016,19 +9670,19 @@
 "para Imágenes de MI.  Como su dirección IP será revelada, puede considerarse "
 "esto como un riesgo a su privacidad."
 
-#: src/protocols/oscar/oscar.c:4394
+#: ../src/protocols/oscar/oscar.c:4532 src/protocols/oscar/oscar.c:4382
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Por favor, autoríceme para que pueda añadirle a mi lista de amigos."
 
-#: src/protocols/oscar/oscar.c:4402
+#: ../src/protocols/oscar/oscar.c:4540 src/protocols/oscar/oscar.c:4390
 msgid "Authorization Request Message:"
 msgstr "Mensaje de solicitud de autorización:"
 
-#: src/protocols/oscar/oscar.c:4403
+#: ../src/protocols/oscar/oscar.c:4541 src/protocols/oscar/oscar.c:4391
 msgid "Please authorize me!"
 msgstr "¡Por favor, autoríceme!"
 
-#: src/protocols/oscar/oscar.c:4433
+#: ../src/protocols/oscar/oscar.c:4571 src/protocols/oscar/oscar.c:4421
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -8037,34 +9691,44 @@
 "El usuario %s requiere autorización antes permitir que lo incorporen a una "
 "lista de amigos.  ¿Desea enviar una solicitud de autorización?"
 
-#: src/protocols/oscar/oscar.c:4438 src/protocols/oscar/oscar.c:4440
+#: ../src/protocols/oscar/oscar.c:4576 src/protocols/oscar/oscar.c:4426
+#: src/protocols/oscar/oscar.c:4428
 msgid "Request Authorization"
 msgstr "Pedir autorización"
 
-#: src/protocols/oscar/oscar.c:4478 src/protocols/oscar/oscar.c:4484
-#: src/protocols/oscar/oscar.c:4588 src/protocols/oscar/oscar.c:4612
-#: src/protocols/oscar/oscar.c:7234 src/protocols/oscar/oscar.c:7286
+#: ../src/protocols/oscar/oscar.c:4578
+msgid "_Request Authorization"
+msgstr "_Pedir autorización"
+
+#: ../src/protocols/oscar/oscar.c:4616 ../src/protocols/oscar/oscar.c:4622
+#: ../src/protocols/oscar/oscar.c:4726 ../src/protocols/oscar/oscar.c:4750
+#: ../src/protocols/oscar/oscar.c:7391 ../src/protocols/oscar/oscar.c:7443
+#: src/protocols/oscar/oscar.c:4466 src/protocols/oscar/oscar.c:4472
+#: src/protocols/oscar/oscar.c:4576 src/protocols/oscar/oscar.c:4600
+#: src/protocols/oscar/oscar.c:7266 src/protocols/oscar/oscar.c:7318
 msgid "No reason given."
 msgstr "No se indicó una razón."
 
-#: src/protocols/oscar/oscar.c:4483
+#: ../src/protocols/oscar/oscar.c:4621 src/protocols/oscar/oscar.c:4471
 msgid "Authorization Denied Message:"
 msgstr "Mensaje de autorización denegada:"
 
-#: src/protocols/oscar/oscar.c:4590
+#: ../src/protocols/oscar/oscar.c:4728
 #, c-format
 msgid ""
 "The user %u wants to add %s to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"El usuario %u quiere añadir a %s a su lista de amigos por el siguiente motivo:\n"
+"El usuario %u quiere añadir a %s a su lista de amigos por el siguiente "
+"motivo:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4600 src/protocols/oscar/oscar.c:7246
+#: ../src/protocols/oscar/oscar.c:4738 ../src/protocols/oscar/oscar.c:7403
+#: src/protocols/oscar/oscar.c:4588 src/protocols/oscar/oscar.c:7278
 msgid "Authorization Request"
 msgstr "Solicitud de autorización"
 
-#: src/protocols/oscar/oscar.c:4612
+#: ../src/protocols/oscar/oscar.c:4750 src/protocols/oscar/oscar.c:4600
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8075,18 +9739,18 @@
 "la siguiente razón:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4613
+#: ../src/protocols/oscar/oscar.c:4751 src/protocols/oscar/oscar.c:4601
 msgid "ICQ authorization denied."
 msgstr "Autorización ICQ denegada."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:4620
+#: ../src/protocols/oscar/oscar.c:4758 src/protocols/oscar/oscar.c:4608
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "El usuario %u ha autorizado su petición de añadirlo a su lista de amigos."
 
-#: src/protocols/oscar/oscar.c:4628
+#: ../src/protocols/oscar/oscar.c:4766 src/protocols/oscar/oscar.c:4616
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8099,7 +9763,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4636
+#: ../src/protocols/oscar/oscar.c:4774 src/protocols/oscar/oscar.c:4624
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8112,7 +9776,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4644
+#: ../src/protocols/oscar/oscar.c:4782 src/protocols/oscar/oscar.c:4632
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -8125,34 +9789,34 @@
 "Mensaje:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4665
+#: ../src/protocols/oscar/oscar.c:4803 src/protocols/oscar/oscar.c:4653
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "El usuario ICQ %u le ha enviado un amigo: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:4671
+#: ../src/protocols/oscar/oscar.c:4809 src/protocols/oscar/oscar.c:4659
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "¿Desea añadir este amigo a su lista de amigos?"
 
-#: src/protocols/oscar/oscar.c:4675
-msgid "Decline"
-msgstr "No añadirlo"
-
-#: src/protocols/oscar/oscar.c:4759
+#: ../src/protocols/oscar/oscar.c:4813
+msgid "_Decline"
+msgstr "_Rehusar"
+
+#: ../src/protocols/oscar/oscar.c:4897 src/protocols/oscar/oscar.c:4747
 #, 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] "Usted perdió %hu mensaje de %s porque no era válido."
 msgstr[1] "Se perdieron %hu mensajes de %s porque porque no eran válidos."
 
-#: src/protocols/oscar/oscar.c:4768
+#: ../src/protocols/oscar/oscar.c:4906 src/protocols/oscar/oscar.c:4756
 #, 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] "Se perdió %hu mensaje de %s porque era demasiado largo."
 msgstr[1] "Se perdieron %hu mensajes de %s porque eran demasiado largos."
 
-#: src/protocols/oscar/oscar.c:4777
+#: ../src/protocols/oscar/oscar.c:4915 src/protocols/oscar/oscar.c:4765
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8162,77 +9826,92 @@
 msgstr[1] ""
 "Se perdieron %hu mensajes de %s porque fueron mandados demasiado rápido."
 
-#: src/protocols/oscar/oscar.c:4786
+#: ../src/protocols/oscar/oscar.c:4924 src/protocols/oscar/oscar.c:4774
 #, 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] "Se perdió %hu mensaje de %s porque el/ella es muy malvado/a."
 msgstr[1] "Se perdieron %hu mensajes de %s porque el/ella es muy malvado/a."
 
-#: src/protocols/oscar/oscar.c:4795
+#: ../src/protocols/oscar/oscar.c:4933 src/protocols/oscar/oscar.c:4783
 #, 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] "Se perdió %hu mensaje de %s porque usted es muy malvado/a."
 msgstr[1] "Se perdieron %hu mensajes de %s porque usted es muy malvado/a."
 
-#: src/protocols/oscar/oscar.c:4804
+#: ../src/protocols/oscar/oscar.c:4942 src/protocols/oscar/oscar.c:4792
 #, 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] "Se perdió %hu mensaje de %s por motivos desconocidos."
 msgstr[1] "Se perdieron %hu mensajes de %s por motivos desconocidos."
 
-#: src/protocols/oscar/oscar.c:4863
+#: ../src/protocols/oscar/oscar.c:5001 src/protocols/oscar/oscar.c:4851
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>Estado:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:4924
+#: ../src/protocols/oscar/oscar.c:5062 src/protocols/oscar/oscar.c:4912
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC envió el error: %s\n"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:4961
+#: ../src/protocols/oscar/oscar.c:5099 src/protocols/oscar/oscar.c:4949
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "No se pudo enviar el mensaje: %s"
 
-#: src/protocols/oscar/oscar.c:4961 src/protocols/oscar/oscar.c:4966
-#: src/protocols/oscar/oscar.c:5024 src/protocols/oscar/oscar.c:5028
+#: ../src/protocols/oscar/oscar.c:5099 ../src/protocols/oscar/oscar.c:5104
+#: ../src/protocols/oscar/oscar.c:5162 ../src/protocols/oscar/oscar.c:5166
+#: src/protocols/oscar/oscar.c:4949 src/protocols/oscar/oscar.c:4954
+#: src/protocols/oscar/oscar.c:5012 src/protocols/oscar/oscar.c:5016
 msgid "Unknown reason."
 msgstr "Razón desconocida."
 
-#: src/protocols/oscar/oscar.c:4964
+#: ../src/protocols/oscar/oscar.c:5102
+#: ../src/protocols/sametime/sametime.c:2373 src/protocols/oscar/oscar.c:4952
+#: src/protocols/sametime/sametime.c:2303
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "No se pudo enviar el mensaje a %s:"
 
-#: src/protocols/oscar/oscar.c:5024
+#: ../src/protocols/oscar/oscar.c:5162 src/protocols/oscar/oscar.c:5012
 #, c-format
 msgid "User information not available: %s"
 msgstr "Información de usuario de no disponible: %s"
 
-#: src/protocols/oscar/oscar.c:5027
+#: ../src/protocols/oscar/oscar.c:5165 src/protocols/oscar/oscar.c:5015
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Información de usuario de %s no disponible:"
 
-#: src/protocols/oscar/oscar.c:5054
+#: ../src/protocols/oscar/oscar.c:5192 src/protocols/oscar/oscar.c:5042
 msgid "Online Since"
 msgstr "Conectado desde"
 
-#: src/protocols/oscar/oscar.c:5059 src/protocols/yahoo/yahoo_profile.c:1118
+#: ../src/protocols/oscar/oscar.c:5197
+#: ../src/protocols/yahoo/yahoo_profile.c:1153
+#: src/protocols/oscar/oscar.c:5047 src/protocols/yahoo/yahoo_profile.c:1122
 msgid "Member Since"
 msgstr "Miembro desde"
 
-#: src/protocols/oscar/oscar.c:5142
+#: ../src/protocols/oscar/oscar.c:5202 src/protocols/oscar/oscar.c:5052
+msgid "Capabilities"
+msgstr "Capacidades"
+
+#. Available status messages are plain text
+#: src/protocols/oscar/oscar.c:7598
+msgid "Available Message"
+msgstr "Mensajes disponibles"
+
+#: ../src/protocols/oscar/oscar.c:5337 src/protocols/oscar/oscar.c:5180
 msgid "Your AIM connection may be lost."
 msgstr "Su conexión AIM puede haberse perdido."
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:5328
+#: ../src/protocols/oscar/oscar.c:5523 src/protocols/oscar/oscar.c:5366
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -8240,11 +9919,11 @@
 "[No se pudo mostrar un mensaje de este usuario porque contenía caracteres "
 "inválidos.]"
 
-#: src/protocols/oscar/oscar.c:5554
+#: ../src/protocols/oscar/oscar.c:5744 src/protocols/oscar/oscar.c:5592
 msgid "Rate limiting error."
 msgstr "Error del limitador de tasa de mensajes."
 
-#: src/protocols/oscar/oscar.c:5555
+#: ../src/protocols/oscar/oscar.c:5745 src/protocols/oscar/oscar.c:5593
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8253,105 +9932,97 @@
 "límite en la tasa de envío de mensajes. Por favor, espere 10 segundos y "
 "vuelva a intentarlo."
 
-#: src/protocols/oscar/oscar.c:5631
+#: ../src/protocols/oscar/oscar.c:5818 src/protocols/oscar/oscar.c:5669
 msgid "You have been signed off for an unknown reason."
 msgstr "Ha sido desconectado por motivos desconocidos."
 
-#: src/protocols/oscar/oscar.c:5644 src/protocols/toc/toc.c:971
+#: ../src/protocols/oscar/oscar.c:5831 ../src/protocols/toc/toc.c:971
+#: src/protocols/oscar/oscar.c:5682 src/protocols/toc/toc.c:971
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Ha sido desconectado de la sala de chat %s."
 
 #. XXX - Don't call this with ssi
-#: src/protocols/oscar/oscar.c:5669
+#: ../src/protocols/oscar/oscar.c:5860 src/protocols/oscar/oscar.c:5707
 msgid "Finalizing connection"
 msgstr "Terminando la conexión"
 
-#: src/protocols/oscar/oscar.c:5951
-msgid "UIN"
-msgstr "UIN"
-
-#: src/protocols/oscar/oscar.c:5977 src/protocols/silc/util.c:541
+#: ../src/protocols/oscar/oscar.c:6125 ../src/protocols/silc/util.c:542
+#: src/protocols/oscar/oscar.c:6019 src/protocols/silc/util.c:542
 msgid "Mobile Phone"
 msgstr "Teléfono móvil"
 
-#: src/protocols/oscar/oscar.c:5979
-msgid "Female"
-msgstr "Mujer"
-
-#: src/protocols/oscar/oscar.c:5979
-msgid "Male"
-msgstr "Hombre"
-
-#: src/protocols/oscar/oscar.c:5995
+#: ../src/protocols/oscar/oscar.c:6142 src/protocols/oscar/oscar.c:6037
 msgid "Personal Web Page"
 msgstr "Página web personal"
 
-#: src/protocols/oscar/oscar.c:5999
+#: ../src/protocols/oscar/oscar.c:6146 src/protocols/oscar/oscar.c:6041
 msgid "Additional Information"
 msgstr "Información adicional"
 
-#: src/protocols/oscar/oscar.c:6004
+#: ../src/protocols/oscar/oscar.c:6151 src/protocols/oscar/oscar.c:6046
 msgid "Home Address"
 msgstr "Domicilio"
 
-#: src/protocols/oscar/oscar.c:6008 src/protocols/oscar/oscar.c:6016
+#: ../src/protocols/oscar/oscar.c:6155 ../src/protocols/oscar/oscar.c:6163
+#: src/protocols/oscar/oscar.c:6050 src/protocols/oscar/oscar.c:6058
 msgid "Zip Code"
 msgstr "Código postal"
 
-#: src/protocols/oscar/oscar.c:6012
+#: ../src/protocols/oscar/oscar.c:6159 src/protocols/oscar/oscar.c:6054
 msgid "Work Address"
 msgstr "Dirección de trabajo"
 
-#: src/protocols/oscar/oscar.c:6020
+#: ../src/protocols/oscar/oscar.c:6167 src/protocols/oscar/oscar.c:6062
 msgid "Work Information"
 msgstr "Información de trabajo"
 
-#: src/protocols/oscar/oscar.c:6021
+#: ../src/protocols/oscar/oscar.c:6168 src/protocols/oscar/oscar.c:6063
 msgid "Company"
 msgstr "Compañía"
 
-#: src/protocols/oscar/oscar.c:6022
+#: ../src/protocols/oscar/oscar.c:6169 src/protocols/oscar/oscar.c:6064
 msgid "Division"
 msgstr "Sección"
 
-#: src/protocols/oscar/oscar.c:6023
+#: ../src/protocols/oscar/oscar.c:6170 src/protocols/oscar/oscar.c:6065
 msgid "Position"
 msgstr "Cargo"
 
-#: src/protocols/oscar/oscar.c:6025
+#: ../src/protocols/oscar/oscar.c:6172 src/protocols/oscar/oscar.c:6067
 msgid "Web Page"
 msgstr "Página web"
 
-#: src/protocols/oscar/oscar.c:6082
+#: ../src/protocols/oscar/oscar.c:6230 src/protocols/oscar/oscar.c:6124
 msgid "Pop-Up Message"
 msgstr "Mensaje emergente"
 
-#. TODO: Need to use ngettext() here
-#: src/protocols/oscar/oscar.c:6111
-#, c-format
-msgid "The following screen names are associated with %s"
-msgstr "Los siguientes nombres de usuarios están asociados a %s"
-
-#: src/protocols/oscar/oscar.c:6140
+#: src/protocols/oscar/oscar.c:6164
+#, c-format
+msgid "The following screen name is associated with %s"
+msgid_plural "The following screen names are associated with %s"
+msgstr[0] "El siguiente nombre de usuario está asociado a %s"
+msgstr[1] "Los siguientes nombres de usuarios están asociados a %s"
+
+#: ../src/protocols/oscar/oscar.c:6301 src/protocols/oscar/oscar.c:6195
 #, c-format
 msgid "No results found for email address %s"
 msgstr "No se encontraron resultados para la dirección de correo %s"
 
-#: src/protocols/oscar/oscar.c:6161
+#: ../src/protocols/oscar/oscar.c:6322 src/protocols/oscar/oscar.c:6216
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "Debería recibir un mensaje solicitando confirmación de %s."
 
-#: src/protocols/oscar/oscar.c:6163
+#: ../src/protocols/oscar/oscar.c:6324 src/protocols/oscar/oscar.c:6218
 msgid "Account Confirmation Requested"
 msgstr "Confirmación de cuenta solicitada"
 
-#: src/protocols/oscar/oscar.c:6194
+#: ../src/protocols/oscar/oscar.c:6355 src/protocols/oscar/oscar.c:6249
 msgid "Error Changing Account Info"
 msgstr "Error cambiando la información de la cuenta"
 
-#: src/protocols/oscar/oscar.c:6197
+#: ../src/protocols/oscar/oscar.c:6358 src/protocols/oscar/oscar.c:6252
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8360,12 +10031,14 @@
 "Error 0x%04x: No se puede dar formato al nombre de usuario porque el nombre "
 "de usuario solicitado difiere del original."
 
-#: src/protocols/oscar/oscar.c:6200
+#: ../src/protocols/oscar/oscar.c:6361
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
-msgstr "Error 0x%04x: No se puede dar formato al nombre de usuario porque es inválido."
-
-#: src/protocols/oscar/oscar.c:6203
+msgstr ""
+"Error 0x%04x: No se puede dar formato al nombre de usuario porque es "
+"inválido."
+
+#: ../src/protocols/oscar/oscar.c:6364 src/protocols/oscar/oscar.c:6258
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8374,7 +10047,7 @@
 "Error 0x%04x: No se puede dar formato al nombre de usuario porque el nombre "
 "de usuario solicitado es demasiado largo."
 
-#: src/protocols/oscar/oscar.c:6206
+#: ../src/protocols/oscar/oscar.c:6367 src/protocols/oscar/oscar.c:6261
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -8383,7 +10056,7 @@
 "Error 0x%04x: No se puede cambiar la dirección de correo electrónico porque "
 "ya existe una solicitud pendiente para este nombre de usuario."
 
-#: src/protocols/oscar/oscar.c:6209
+#: ../src/protocols/oscar/oscar.c:6370 src/protocols/oscar/oscar.c:6264
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -8392,7 +10065,7 @@
 "Error 0x%04x: No se puede cambiar la dirección de correo electrónico porque "
 "la dirección dada ya tiene demasiados nombres de usuarios asociados."
 
-#: src/protocols/oscar/oscar.c:6212
+#: ../src/protocols/oscar/oscar.c:6373 src/protocols/oscar/oscar.c:6267
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -8401,12 +10074,12 @@
 "Error 0x%04x: No se puede cambiar la dirección de correo electrónico porque "
 "la dirección dada es inválida."
 
-#: src/protocols/oscar/oscar.c:6215
+#: ../src/protocols/oscar/oscar.c:6376 src/protocols/oscar/oscar.c:6270
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: Error desconocido."
 
-#: src/protocols/oscar/oscar.c:6225
+#: ../src/protocols/oscar/oscar.c:6386 src/protocols/oscar/oscar.c:6280
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8415,27 +10088,28 @@
 "El formato de su nombre de usuario es actualmente el siguiente:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6226 src/protocols/oscar/oscar.c:6233
+#: ../src/protocols/oscar/oscar.c:6387 ../src/protocols/oscar/oscar.c:6394
+#: src/protocols/oscar/oscar.c:6281 src/protocols/oscar/oscar.c:6288
 msgid "Account Info"
 msgstr "Información de la cuenta"
 
-#: src/protocols/oscar/oscar.c:6231
+#: ../src/protocols/oscar/oscar.c:6392 src/protocols/oscar/oscar.c:6286
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "La dirección de correo electrónico de %s es %s"
 
-#: src/protocols/oscar/oscar.c:6298
+#: ../src/protocols/oscar/oscar.c:6464 src/protocols/oscar/oscar.c:6353
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "No se ha enviado su imagen MI. Debe estar directamente conectado para enviar "
 "imágenes IM."
 
-#: src/protocols/oscar/oscar.c:6480
+#: ../src/protocols/oscar/oscar.c:6704 src/protocols/oscar/oscar.c:6572
 msgid "Unable to set AIM profile."
 msgstr "No se pudo establecer el perfil AIM."
 
-#: src/protocols/oscar/oscar.c:6481
+#: ../src/protocols/oscar/oscar.c:6705 src/protocols/oscar/oscar.c:6573
 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 "
@@ -8445,7 +10119,7 @@
 "conexión se haya completado.  Su perfil quedará sin cambiar, inténtelo "
 "nuevamente cuando ya esté conectado completamente."
 
-#: src/protocols/oscar/oscar.c:6495
+#: ../src/protocols/oscar/oscar.c:6719 src/protocols/oscar/oscar.c:6587
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8460,11 +10134,11 @@
 "Se ha excedido el tamaño máximo de perfil de %d bytes.  Gaim lo aplicó "
 "truncado."
 
-#: src/protocols/oscar/oscar.c:6500
+#: ../src/protocols/oscar/oscar.c:6724 src/protocols/oscar/oscar.c:6592
 msgid "Profile too long."
 msgstr "Perfil demasiado largo."
 
-#: src/protocols/oscar/oscar.c:6523 src/protocols/oscar/oscar.c:6596
+#: ../src/protocols/oscar/oscar.c:6766 src/protocols/oscar/oscar.c:6628
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8479,25 +10153,11 @@
 "Se excedió el límite de %d bytes de longitud en el mensaje de ausencia.  "
 "Gaim lo ha truncado.."
 
-#: src/protocols/oscar/oscar.c:6528 src/protocols/oscar/oscar.c:6601
+#: ../src/protocols/oscar/oscar.c:6771 src/protocols/oscar/oscar.c:6633
 msgid "Away message too long."
 msgstr "Mensaje de ausencia demasiado largo"
 
-#: src/protocols/oscar/oscar.c:6560
-msgid "Unable to set AIM away message."
-msgstr "No se pudo establecer el mensaje de ausencia AIM."
-
-#: src/protocols/oscar/oscar.c:6561
-msgid ""
-"You have probably requested to set your away message before the login "
-"procedure completed.  You remain in a \"present\" state; try setting it "
-"again when you are fully connected."
-msgstr ""
-"Usted probablemente solicitó establecer su mensaje de ausencia antes de que "
-"finalice el proceso de conexión.  Usted quedará en un estado «presente», "
-"intente volver a aplicarlo cuando esté conectado por completo."
-
-#: src/protocols/oscar/oscar.c:6691
+#: ../src/protocols/oscar/oscar.c:6840 src/protocols/oscar/oscar.c:6724
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8508,16 +10168,18 @@
 "nombres de usuario deben empezar con letras y sólo pueden contener letras, "
 "números y espacios, o contener sólo números."
 
-#: src/protocols/oscar/oscar.c:6693 src/protocols/oscar/oscar.c:7092
-#: src/protocols/oscar/oscar.c:7106 src/protocols/simple/simple.c:203
+#: ../src/protocols/oscar/oscar.c:6842 ../src/protocols/oscar/oscar.c:7249
+#: ../src/protocols/oscar/oscar.c:7263 src/protocols/oscar/oscar.c:6726
+#: src/protocols/oscar/oscar.c:7124 src/protocols/oscar/oscar.c:7138
+#: src/protocols/simple/simple.c:203
 msgid "Unable To Add"
 msgstr "No se pudo añadir"
 
-#: src/protocols/oscar/oscar.c:6798
+#: ../src/protocols/oscar/oscar.c:6949 src/protocols/oscar/oscar.c:6831
 msgid "Unable To Retrieve Buddy List"
 msgstr "No se ha podido obtener la lista de amigos"
 
-#: src/protocols/oscar/oscar.c:6799
+#: ../src/protocols/oscar/oscar.c:6950 src/protocols/oscar/oscar.c:6832
 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 "
@@ -8527,13 +10189,16 @@
 "de AIM. La lista no se ha borrado, y seguramente volverá a estar disponible "
 "en unas horas."
 
-#: src/protocols/oscar/oscar.c:6983 src/protocols/oscar/oscar.c:6984
-#: src/protocols/oscar/oscar.c:6989 src/protocols/oscar/oscar.c:7150
-#: src/protocols/oscar/oscar.c:7151 src/protocols/oscar/oscar.c:7156
+#: ../src/protocols/oscar/oscar.c:7147 ../src/protocols/oscar/oscar.c:7148
+#: ../src/protocols/oscar/oscar.c:7153 ../src/protocols/oscar/oscar.c:7307
+#: ../src/protocols/oscar/oscar.c:7308 ../src/protocols/oscar/oscar.c:7313
+#: src/protocols/oscar/oscar.c:7022 src/protocols/oscar/oscar.c:7023
+#: src/protocols/oscar/oscar.c:7028 src/protocols/oscar/oscar.c:7182
+#: src/protocols/oscar/oscar.c:7183 src/protocols/oscar/oscar.c:7188
 msgid "Orphans"
 msgstr "Huérfanos"
 
-#: src/protocols/oscar/oscar.c:7090
+#: ../src/protocols/oscar/oscar.c:7247 src/protocols/oscar/oscar.c:7122
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8542,11 +10207,12 @@
 "No se ha podido añadir al amigo %s porque hay demasiados contactos en la "
 "lista de amigos. Por favor, elimine uno y vuelva a probar."
 
-#: src/protocols/oscar/oscar.c:7090 src/protocols/oscar/oscar.c:7104
+#: ../src/protocols/oscar/oscar.c:7247 ../src/protocols/oscar/oscar.c:7261
+#: src/protocols/oscar/oscar.c:7122 src/protocols/oscar/oscar.c:7136
 msgid "(no name)"
 msgstr "(sin nombre)"
 
-#: src/protocols/oscar/oscar.c:7104
+#: ../src/protocols/oscar/oscar.c:7261 src/protocols/oscar/oscar.c:7136
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8557,7 +10223,7 @@
 "habitual es que ha llegado al máximo número de amigos permitidos en su lista "
 "de amigos."
 
-#: src/protocols/oscar/oscar.c:7187
+#: ../src/protocols/oscar/oscar.c:7344 src/protocols/oscar/oscar.c:7219
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8566,32 +10232,33 @@
 "El usuario %s le ha dado a usted permiso para añadirle a su lista de "
 "amigos.  ¿Desea hacerlo?"
 
-#: src/protocols/oscar/oscar.c:7193
+#: ../src/protocols/oscar/oscar.c:7350 src/protocols/oscar/oscar.c:7225
 msgid "Authorization Given"
 msgstr "Autorización otorgada"
 
-#: src/protocols/oscar/oscar.c:7237
+#: ../src/protocols/oscar/oscar.c:7394 src/protocols/oscar/oscar.c:7269
 #, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"El usuario %s quiere añadir a %s a su lista de amigos por el siguiente motivo:\n"
+"El usuario %s quiere añadir a %s a su lista de amigos por el siguiente "
+"motivo:\n"
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:7282
+#: ../src/protocols/oscar/oscar.c:7439 src/protocols/oscar/oscar.c:7314
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "El usuario %s ha autorizado su solicitud de añadirlo a su lista de amigos."
 
-#: src/protocols/oscar/oscar.c:7283
+#: ../src/protocols/oscar/oscar.c:7440 src/protocols/oscar/oscar.c:7315
 msgid "Authorization Granted"
 msgstr "Autorización aceptada"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:7286
+#: ../src/protocols/oscar/oscar.c:7443 src/protocols/oscar/oscar.c:7318
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8602,95 +10269,92 @@
 "la siguiente razón:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:7287
+#: ../src/protocols/oscar/oscar.c:7444 src/protocols/oscar/oscar.c:7319
 msgid "Authorization Denied"
 msgstr "Autorización denegada"
 
-#: src/protocols/oscar/oscar.c:7324 src/protocols/toc/toc.c:1372
+#: ../src/protocols/oscar/oscar.c:7481 ../src/protocols/toc/toc.c:1372
+#: src/protocols/oscar/oscar.c:7356 src/protocols/toc/toc.c:1372
 msgid "_Exchange:"
 msgstr "_Intercambio:"
 
-#: src/protocols/oscar/oscar.c:7360
+#: ../src/protocols/oscar/oscar.c:7517 src/protocols/oscar/oscar.c:7392
 msgid "Invalid chat name specified."
 msgstr "Se especificó un nombre de chat no válido."
 
-#: src/protocols/oscar/oscar.c:7430
+#: ../src/protocols/oscar/oscar.c:7587 src/protocols/oscar/oscar.c:7462
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "No se ha enviado su imagen MI. No se pueden enviar imágenes IM en chats AIM."
 
-#: src/protocols/oscar/oscar.c:7565
-msgid "Away Message"
-msgstr "Mensaje de ausencia"
-
-#: src/protocols/oscar/oscar.c:7854
+#: ../src/protocols/oscar/oscar.c:7742
+msgid "<i>(retrieving)</i>"
+msgstr " <i>(obteniendo)</i>"
+
+#: ../src/protocols/oscar/oscar.c:8048 src/protocols/oscar/oscar.c:7924
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Comentario de amigo para %s"
 
-#: src/protocols/oscar/oscar.c:7855
+#: ../src/protocols/oscar/oscar.c:8049 src/protocols/oscar/oscar.c:7925
 msgid "Buddy Comment:"
 msgstr "Comentario de amigo:"
 
-#: src/protocols/oscar/oscar.c:7874
+#: ../src/protocols/oscar/oscar.c:8068 src/protocols/oscar/oscar.c:7944
 msgid "Edit Buddy Comment"
 msgstr "Editar comentario de amigo"
 
-#: src/protocols/oscar/oscar.c:7880
+#: ../src/protocols/oscar/oscar.c:8075 src/protocols/oscar/oscar.c:7950
 msgid "Get Status Msg"
 msgstr "Obtener msj de estado"
 
-#: src/protocols/oscar/oscar.c:7892
+#: ../src/protocols/oscar/oscar.c:8088 src/protocols/oscar/oscar.c:7962
 msgid "Direct IM"
 msgstr "MI directo"
 
-#: src/protocols/oscar/oscar.c:7909
+#: ../src/protocols/oscar/oscar.c:8107 src/protocols/oscar/oscar.c:7979
 msgid "Re-request Authorization"
 msgstr "Solicitar autorización otra vez"
 
-#: src/protocols/oscar/oscar.c:7969
+#: ../src/protocols/oscar/oscar.c:8164 src/protocols/oscar/oscar.c:8039
 msgid "Require authorization"
-msgstr "Requiere autorización"
-
-#: src/protocols/oscar/oscar.c:7972
-msgid "Hide IP address"
-msgstr "Esconder dirección IP"
-
-#: src/protocols/oscar/oscar.c:7975
-msgid "Web aware"
-msgstr "Puede utilizar web"
-
-#: src/protocols/oscar/oscar.c:7980
+msgstr "Solicitar autorización"
+
+#: ../src/protocols/oscar/oscar.c:8167
+msgid "Web aware (enabling this will cause you to receive SPAM!)"
+msgstr "Capacidad web (¡si activa esto hará que recibe SPAM!)"
+
+#: ../src/protocols/oscar/oscar.c:8172 src/protocols/oscar/oscar.c:8050
 msgid "ICQ Privacy Options"
 msgstr "Opciones de privacidad de ICQ"
 
-#: src/protocols/oscar/oscar.c:7997
+#: ../src/protocols/oscar/oscar.c:8189 src/protocols/oscar/oscar.c:8067
 msgid "The new formatting is invalid."
 msgstr "El nuevo formato es inválido."
 
-#: src/protocols/oscar/oscar.c:7998
+#: ../src/protocols/oscar/oscar.c:8190 src/protocols/oscar/oscar.c:8068
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "El formato del nombre de usuario sólo puede cambiar en la capitalización y "
 "espacios en blanco."
 
-#: src/protocols/oscar/oscar.c:8005
+#: ../src/protocols/oscar/oscar.c:8197 src/protocols/oscar/oscar.c:8075
 msgid "New screen name formatting:"
 msgstr "Nuevo formato del nombre de usuario:"
 
-#: src/protocols/oscar/oscar.c:8057
+#: ../src/protocols/oscar/oscar.c:8249 src/protocols/oscar/oscar.c:8127
 msgid "Change Address To:"
 msgstr "Cambiar dirección a:"
 
-#: src/protocols/oscar/oscar.c:8102
+#: ../src/protocols/oscar/oscar.c:8294 src/protocols/oscar/oscar.c:8172
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>usted no está esperando autorización</i>"
 
-#: src/protocols/oscar/oscar.c:8105
+#: ../src/protocols/oscar/oscar.c:8297 src/protocols/oscar/oscar.c:8175
 msgid "You are awaiting authorization from the following buddies"
 msgstr "En espera de la autorización de los siguientes amigos"
 
-#: src/protocols/oscar/oscar.c:8106
+#: ../src/protocols/oscar/oscar.c:8298 src/protocols/oscar/oscar.c:8176
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8698,84 +10362,76 @@
 "Puede volver a pedir autorización a estos amigos apretando el botón derecho "
 "del ratón sobre ellos y escogiendo «Solicitar autorización otra vez.»"
 
-#: src/protocols/oscar/oscar.c:8123
+#: ../src/protocols/oscar/oscar.c:8315 src/protocols/oscar/oscar.c:8193
 msgid "Find Buddy by E-mail"
 msgstr "Buscar un amigo en base a su correo electrónico"
 
-#: src/protocols/oscar/oscar.c:8124
+#: ../src/protocols/oscar/oscar.c:8316 src/protocols/oscar/oscar.c:8194
 msgid "Search for a buddy by e-mail address"
 msgstr "Buscar amigo por la dirección correo electrónico"
 
-#: src/protocols/oscar/oscar.c:8125
+#: ../src/protocols/oscar/oscar.c:8317 src/protocols/oscar/oscar.c:8195
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr ""
 "Escriba la dirección de correo electrónico del amigo que está buscando."
 
-#: src/protocols/oscar/oscar.c:8212 src/protocols/silc/silc.c:817
-msgid "Set User Info..."
-msgstr "Establecer su información de usuario..."
-
-#: src/protocols/oscar/oscar.c:8218
+#: ../src/protocols/oscar/oscar.c:8410 src/protocols/oscar/oscar.c:8288
 msgid "Set User Info (URL)..."
 msgstr "Establecer su información de usuario (URL)..."
 
-#: src/protocols/oscar/oscar.c:8223 src/protocols/silc/silc.c:813
-msgid "Change Password..."
-msgstr "Cambiar su contraseña..."
-
-#: src/protocols/oscar/oscar.c:8229
+#: ../src/protocols/oscar/oscar.c:8421 src/protocols/oscar/oscar.c:8299
 msgid "Change Password (URL)"
 msgstr "Cambiar su contraseña (URL)"
 
-#: src/protocols/oscar/oscar.c:8233
+#: ../src/protocols/oscar/oscar.c:8425 src/protocols/oscar/oscar.c:8303
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configurar reenvío de MI (URL)"
 
 #. ICQ actions
-#: src/protocols/oscar/oscar.c:8243
-msgid "Show privacy options..."
-msgstr "Mostrar las opciones de privacidad..."
+#: ../src/protocols/oscar/oscar.c:8435
+msgid "Set Privacy Options..."
+msgstr "Configurar las opciones de privacidad..."
 
 #. AIM actions
-#: src/protocols/oscar/oscar.c:8250
+#: ../src/protocols/oscar/oscar.c:8442 src/protocols/oscar/oscar.c:8320
 msgid "Format Screen Name..."
 msgstr "Formato del nombre de usuario..."
 
-#: src/protocols/oscar/oscar.c:8254
+#: ../src/protocols/oscar/oscar.c:8446 src/protocols/oscar/oscar.c:8324
 msgid "Confirm Account"
 msgstr "Confirmar cuenta"
 
-#: src/protocols/oscar/oscar.c:8258
+#: ../src/protocols/oscar/oscar.c:8450 src/protocols/oscar/oscar.c:8328
 msgid "Display Currently Registered Address"
 msgstr "Mostrar dirección registrada actualmente"
 
-#: src/protocols/oscar/oscar.c:8262
+#: ../src/protocols/oscar/oscar.c:8454 src/protocols/oscar/oscar.c:8332
 msgid "Change Currently Registered Address..."
 msgstr "Cambiar la dirección registrada..."
 
-#: src/protocols/oscar/oscar.c:8269
+#: ../src/protocols/oscar/oscar.c:8461 src/protocols/oscar/oscar.c:8339
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Mostrar amigos pendientes de autorización"
 
-#: src/protocols/oscar/oscar.c:8275
+#: ../src/protocols/oscar/oscar.c:8467 src/protocols/oscar/oscar.c:8345
 msgid "Search for Buddy by Email..."
 msgstr "Buscar amigo por correo electrónico..."
 
-#: src/protocols/oscar/oscar.c:8280
+#: ../src/protocols/oscar/oscar.c:8472 src/protocols/oscar/oscar.c:8350
 msgid "Search for Buddy by Information"
 msgstr "Buscar un amigo a través de su información"
 
-#: src/protocols/oscar/oscar.c:8350
+#: ../src/protocols/oscar/oscar.c:8539 src/protocols/oscar/oscar.c:8416
 msgid "Use recent buddies group"
 msgstr "Usar grupo de amigos reciente"
 
-#: src/protocols/oscar/oscar.c:8353
+#: ../src/protocols/oscar/oscar.c:8542 src/protocols/oscar/oscar.c:8419
 msgid "Show how long you have been idle"
 msgstr "Mostrar cuánto tiempo se ha estado ausente"
 
-#: src/protocols/oscar/oscar.c:8362
-msgid "Use AIM/ICQ proxy server (Slower/More Secure/Usually Works)"
-msgstr "Utilizar un servidor proxy de AIM/ICQ (Lento/más seguro/funcional generalmente)"
+#: ../src/protocols/oscar/oscar.c:8551
+msgid "Use AIM/ICQ proxy server (slower, but usually works)"
+msgstr "Utilizar un servidor proxy de AIM/ICQ (Lento pero funciona generalmente)"
 
 #. *< type
 #. *< ui_requirement
@@ -8787,166 +10443,576 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:8476 src/protocols/oscar/oscar.c:8478
+#: ../src/protocols/oscar/oscar.c:8684 ../src/protocols/oscar/oscar.c:8686
+#: src/protocols/oscar/oscar.c:8545 src/protocols/oscar/oscar.c:8547
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "Complemento de protocolo AIM/ICQ"
 
-#: src/protocols/oscar/oscar.c:8497
+#: ../src/protocols/oscar/oscar.c:8705 src/protocols/oscar/oscar.c:8566
 msgid "Auth host"
 msgstr "Servidor de autenticación"
 
-#: src/protocols/oscar/oscar.c:8500
+#: ../src/protocols/oscar/oscar.c:8708 src/protocols/oscar/oscar.c:8569
 msgid "Auth port"
 msgstr "Puerto de autenticación"
 
-#: src/protocols/oscar/oscar.c:8503 src/protocols/zephyr/zephyr.c:2892
+#: ../src/protocols/oscar/oscar.c:8711 ../src/protocols/zephyr/zephyr.c:2901
+#: src/protocols/oscar/oscar.c:8572 src/protocols/zephyr/zephyr.c:2894
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/protocols/sametime/sametime.c:1134
+#: ../src/protocols/oscar/oscar.c:8715
+msgid ""
+"Use AIM/ICQ proxy server\n"
+"(slower, but usually works)"
+msgstr "Utilizar un servidor proxy de AIM/ICQ (más lento pero funciona generalmente)"
+
+#: src/protocols/sametime/sametime.c:363
+msgid "Connection closed (writing)"
+msgstr "Conexión cerrada (escribiendo)"
+
+#: src/protocols/sametime/sametime.c:1208
+#, c-format
+msgid "<b>Group Title:</b> %s<br>"
+msgstr "<b>Título de grupo:</b> %s<br>"
+
+#: ../src/protocols/sametime/sametime.c:1268
+#: src/protocols/sametime/sametime.c:1209
+#, c-format
+msgid "<b>Notes Group ID:</b> %s<br>"
+msgstr "<b>Identificador de grupo «Notes»:</b> %s<br>"
+
+#: src/protocols/sametime/sametime.c:1211
+#, c-format
+msgid "Info for Group %s"
+msgstr "Información sobre el grupo %s"
+
+#: ../src/protocols/sametime/sametime.c:1272
+#: src/protocols/sametime/sametime.c:1213
+msgid "Notes Address Book Information"
+msgstr "Información de la libreta de direcciones «Notes»"
+
+#: src/protocols/sametime/sametime.c:1245
+msgid "Invite Group to Conference..."
+msgstr "Invitar grupo a la conferencia..."
+
+#: ../src/protocols/sametime/sametime.c:1314
+#: src/protocols/sametime/sametime.c:1254
+msgid "Get Notes Address Book Info"
+msgstr "Obtener la información de la libreta de direcciones «Notes»"
+
+#: ../src/protocols/sametime/sametime.c:1467
+#: src/protocols/sametime/sametime.c:1406
 msgid "Sending Handshake"
-msgstr "Enviando saludo inicial"
-
-#: src/protocols/sametime/sametime.c:1139
+msgstr "Enviando negociación"
+
+#: ../src/protocols/sametime/sametime.c:1472
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "Esperando a la aceptación del saludo inicial"
 
-#: src/protocols/sametime/sametime.c:1144
+#: ../src/protocols/sametime/sametime.c:1477
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Se aceptó el saludo inicial. Enviando la identificación"
 
-#: src/protocols/sametime/sametime.c:1149
+#: ../src/protocols/sametime/sametime.c:1482
 msgid "Waiting for Login Acknowledgement"
 msgstr "Esperando a la aceptación de la identificación"
 
-#: src/protocols/sametime/sametime.c:1154
+#: ../src/protocols/sametime/sametime.c:1487
+#: src/protocols/sametime/sametime.c:1426
 msgid "Login Redirected"
 msgstr "Identificación redirigida"
 
-#: src/protocols/sametime/sametime.c:1159
+#: ../src/protocols/sametime/sametime.c:1493
+#: src/protocols/sametime/sametime.c:1432
 msgid "Forcing Login"
 msgstr "Forzando la identificación"
 
-#: src/protocols/sametime/sametime.c:1163
+#: ../src/protocols/sametime/sametime.c:1497
 msgid "Login Acknowledged"
 msgstr "Identificación aceptada"
 
-#: src/protocols/sametime/sametime.c:1168
-msgid "Connected to Sametime Community Server"
-msgstr "Conectando con el servidor Sametime Community"
-
-#. * @todo Admin alerts should probably be in a conversation window
-#. rather than a gaim_notify_message. Or in some sort of updating
-#. dialog, or something.
-#: src/protocols/sametime/sametime.c:1263
-msgid "Admin Alert"
-msgstr "Alerta de administración"
-
-#: src/protocols/sametime/sametime.c:2758
-msgid "Active"
-msgstr "Activo"
-
-#: src/protocols/simple/simple.c:202
-#, c-format
-msgid ""
-"Could not add the buddy %s because every simple user has to start with "
-"'sip:'."
-msgstr "No se pudo añadir al amigo %s porque cada usuario simple tiene que empezar con 'sip:'."
-
-#: src/protocols/simple/simple.c:1209
-msgid "Could not create listen socket"
-msgstr "No se pudo crear el conector de escucha"
-
-#: src/protocols/simple/simple.c:1263
-msgid "SIP usernames may not contain whitespaces or @ symbols"
-msgstr "Los nombres de usuario sIP no pueden tener espacios en blanco ni símbolos @"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#: src/protocols/simple/simple.c:1408
-msgid "SIP/SIMPLE Protocol Plugin"
-msgstr "Complemento de protocolo SIP/SIMPLE"
-
-#. *  summary
-#: src/protocols/simple/simple.c:1409
-msgid "The SIP/SIMPLE Protocol Plugin"
-msgstr "El complemento de protocolo SIP/SIMPLE"
-
-#. *  description
-#: src/protocols/simple/simple.c:1410
-msgid "Thomas Butter <butter@uni-mannheim.de>"
-msgstr "Thomas Butter <butter@uni-mannheim.de>"
-
-#: src/protocols/simple/simple.c:1431
-msgid "Publish Status (note: everyone may watch you)"
-msgstr "Estado de publicación (aviso: cualquiera puede verle)"
-
-#: src/protocols/simple/simple.c:1434
-msgid "Use UDP"
-msgstr "Utilizar UDP"
-
-#: src/protocols/simple/simple.c:1436
-msgid "Use Proxy"
-msgstr "Utilizar proxy"
-
-#: src/protocols/simple/simple.c:1438
-msgid "Proxy"
-msgstr "Proxy"
-
-#: src/protocols/silc/buddy.c:51 src/protocols/silc/buddy.c:419
-#: src/protocols/silc/buddy.c:544 src/protocols/silc/buddy.c:711
-#: src/protocols/silc/ft.c:338
+#: ../src/protocols/sametime/sametime.c:1502
+msgid "Starting Services"
+msgstr "Arrancando servicios"
+
+#: ../src/protocols/sametime/sametime.c:1507
+msgid "Connected"
+msgstr "Conectado"
+
+#: ../src/protocols/sametime/sametime.c:1605
+#, c-format
+msgid ""
+"A Sametime administrator has issued the following announcement on server %s"
+msgstr "Un administrador de «Sametime» ha enviado el siguiente anuncio en el servidor %s"
+
+#: ../src/protocols/sametime/sametime.c:1610
+msgid "Sametime Administrator Announcement"
+msgstr "Anuncio del administrador «Sametime»"
+
+#: src/protocols/sametime/sametime.c:1592
+msgid "Connection reset"
+msgstr "Conexión rehusada"
+
+#: src/protocols/sametime/sametime.c:1599
+#, c-format
+msgid "Error reading from socket: %s"
+msgstr "Error al leer del socket: %s"
+
+#. this is a regular connect, error out
+#: src/protocols/sametime/sametime.c:1628
+#: src/protocols/sametime/sametime.c:3613
+msgid "Unable to connect to host"
+msgstr "No se pudo conectar al servidor"
+
+#: src/protocols/sametime/sametime.c:1665
+#, c-format
+msgid "Announcement from %s"
+msgstr "Aviso de %s"
+
+#: src/protocols/sametime/sametime.c:1836
+msgid "Conference Closed"
+msgstr "Conferencia cerrada"
+
+#: src/protocols/sametime/sametime.c:2297
+msgid "Unable to send message: "
+msgstr "No se pudo enviar el mensaje:"
+
+#: src/protocols/sametime/sametime.c:2893
+msgid "Place Closed"
+msgstr "Lugar cerrado"
+
+#: src/protocols/sametime/sametime.c:3180
+msgid "Microphone"
+msgstr "Micrófono"
+
+#: src/protocols/sametime/sametime.c:3181
+msgid "Speakers"
+msgstr "Altavoces"
+
+#: src/protocols/sametime/sametime.c:3182
+msgid "Video Camera"
+msgstr "Vídeo cámara"
+
+#: src/protocols/sametime/sametime.c:3186
+msgid "File Transfer"
+msgstr "Transferencia de archivo"
+
+#: ../src/protocols/sametime/sametime.c:3257
+#, c-format
+msgid ""
+"\n"
+"<b>Supports:</b> %s"
+msgstr "\n<b>Soporta:</b> %s"
+
+#: src/protocols/sametime/sametime.c:3223
+msgid ""
+"\n"
+"<b>External User</b>"
+msgstr ""
+"\n"
+"<b>Usuario externo</b>"
+
+#: src/protocols/sametime/sametime.c:3330
+msgid "Create conference with user"
+msgstr "Crear conferencia con el usuario"
+
+#: src/protocols/sametime/sametime.c:3331
+#, c-format
+msgid ""
+"Please enter a topic for the new conference, and an invitation message to be "
+"sent to %s"
+msgstr ""
+"Por favor ingrese tema para la nueva conferencia, y un mensaje de invitación "
+"que se enviará a %s"
+
+#: src/protocols/sametime/sametime.c:3335
+msgid "New Conference"
+msgstr "Nueva conferencia"
+
+#: src/protocols/sametime/sametime.c:3337
+msgid "Create"
+msgstr "Crear"
+
+#: src/protocols/sametime/sametime.c:3399
+msgid "Available Conferences"
+msgstr "Conferencias disponibles"
+
+#: src/protocols/sametime/sametime.c:3405
+msgid "Create New Conference..."
+msgstr "Crear nueva conferencia..."
+
+#: src/protocols/sametime/sametime.c:3412
+msgid "Invite user to a conference"
+msgstr "Invitar a un usuario a una conferencia"
+
+#: src/protocols/sametime/sametime.c:3413
+#, c-format
+msgid ""
+"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 ""
+"Seleccionar una conferencia de la lista mostrada para invitar al usuario %s. "
+"Seleccione \"Crear nueva conferencia\" si quiere crear una nueva conferencia "
+"para invitar a este usuario también."
+
+#: src/protocols/sametime/sametime.c:3418
+msgid "Invite to Conference"
+msgstr "Invitar a conferencia"
+
+#: ../src/protocols/sametime/sametime.c:3460
+#: src/protocols/sametime/sametime.c:3420
+msgid "Invite"
+msgstr "Invitar"
+
+#: src/protocols/sametime/sametime.c:3472
+msgid "Invite to Conference..."
+msgstr "Invitar a conferencia..."
+
+#: ../src/protocols/sametime/sametime.c:3553
+msgid "Send TEST Announcement"
+msgstr "Enviar anuncio de prueba"
+
+#: ../src/protocols/sametime/sametime.c:3600
+#: src/protocols/sametime/sametime.c:3518
+msgid "No Sametime Community Server specified"
+msgstr "No se ha especificado el servidor de comunidad «Sametime»"
+
+#: ../src/protocols/sametime/sametime.c:3622
+#: src/protocols/sametime/sametime.c:3539
+#, 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 "No se ha configurado ninguna dirección IP o nombre de equipo para la cuenta «Meanwhile» %s. Introduzca uno más abajo para continuar el registro."
+
+#: ../src/protocols/sametime/sametime.c:3627
+#: src/protocols/sametime/sametime.c:3544
+msgid "Meanwhile Connection Setup"
+msgstr "Configuración de la conexión «Meanwhile»"
+
+#: ../src/protocols/sametime/sametime.c:3628
+#: src/protocols/sametime/sametime.c:3545
+msgid "No Sametime Community Server Specified"
+msgstr "No se ha especificado un servidor de comunidad «Sametime»"
+
+#: ../src/protocols/sametime/sametime.c:3630 src/protocols/oscar/oscar.c:1583
+#: src/protocols/oscar/oscar.c:4349 src/protocols/sametime/sametime.c:3547
+msgid "Connect"
+msgstr "Conectar"
+
+#: src/protocols/sametime/sametime.c:4061
+msgid "<b>External User</b><br>"
+msgstr "<b>Usuario externo</b><br>"
+
+#: src/protocols/sametime/sametime.c:4064
+#, c-format
+msgid "<b>User ID:</b> %s<br>"
+msgstr "<b>ID de usuario:</b> %s<br>"
+
+#: src/protocols/sametime/sametime.c:4070
+#, c-format
+msgid "<b>Full Name:</b> %s<br>"
+msgstr "Nombre completo:</b> %s<br>"
+
+#: src/protocols/sametime/sametime.c:4076
+msgid "<b>Last Known Client:</b> "
+msgstr "<b>Último cliente conocido:</b> "
+
+#: src/protocols/sametime/sametime.c:4084
+#, c-format
+msgid "Unknown (0x%04x)<br>"
+msgstr "(0x%04x) desconocido<br>"
+
+#: src/protocols/sametime/sametime.c:4091
+#, c-format
+msgid "<b>Supports:</b> %s<br>"
+msgstr "<b>Soportados:</b> %s<br>"
+
+#: src/protocols/sametime/sametime.c:4097
+#, c-format
+msgid "<b>Status:</b> %s"
+msgstr "<b>Estado:</b> %s"
+
+#: ../src/protocols/sametime/sametime.c:4264
+#: ../src/protocols/sametime/sametime.c:5428
+msgid "User Name"
+msgstr "Nombre de usuario"
+
+#: ../src/protocols/sametime/sametime.c:4267
+#: ../src/protocols/sametime/sametime.c:5431
+msgid "Sametime ID"
+msgstr "ID Sametime"
+
+#: ../src/protocols/sametime/sametime.c:4291
+#: src/protocols/sametime/sametime.c:4383
+msgid "An ambiguous user ID was entered"
+msgstr "Se ha introducido un identificador de usuario ambiguo"
+
+#: src/protocols/sametime/sametime.c:4384
+#, 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 ""
+"El identificador '%s' puede referirse a cualquiera de los siguientes "
+"usuarios. Por favor seleccione el usuario de la lista mostrada para añadirlo "
+"a su lista de amigos."
+
+#: ../src/protocols/sametime/sametime.c:4297
+msgid "Select User"
+msgstr "Seleccionar usuario"
+
+#: src/protocols/sametime/sametime.c:4452
+msgid "Unable to add user: user not found"
+msgstr "No se pudo añadir al usuario: el usuario no se ha encontrado"
+
+#: ../src/protocols/sametime/sametime.c:4369
+#: src/protocols/sametime/sametime.c:4454
+#, 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 "El identificador «%s» no coincide con ningún usuario en la comunidad «Sametime». Se ha eliminado esta entrada de la lista de amigos."
+
+#: src/protocols/sametime/sametime.c:4459
+msgid "Unable to add user"
+msgstr "No puede añadir al usuario"
+
+#: src/protocols/sametime/sametime.c:5029
+#, c-format
+msgid ""
+"Error reading file %s: \n"
+"%s\n"
+msgstr ""
+"Error al leer el archivo %s: \n"
+"%s\n"
+
+#: src/protocols/sametime/sametime.c:5155
+msgid "Remotely Stored Buddy List"
+msgstr "Lista de amigos remotamente almacenada"
+
+#: src/protocols/sametime/sametime.c:5160
+msgid "Buddy List Storage Mode"
+msgstr "Modo de almacenamiento de la lista de amigos"
+
+# Usar empotrable? (jfs)
+#: src/protocols/sametime/sametime.c:5163
+msgid "Local Buddy List Only"
+msgstr "Solamente lista de amigos local"
+
+#: src/protocols/sametime/sametime.c:5165
+msgid "Merge List from Server"
+msgstr "Fusionar lista desde el servidor"
+
+#: src/protocols/sametime/sametime.c:5167
+msgid "Merge and Save List to Server"
+msgstr "Fusionar y guardar lista en el servidor"
+
+#: src/protocols/sametime/sametime.c:5169
+msgid "Synchronize List with Server"
+msgstr "Sincronizar la lista con el servidor"
+
+#: ../src/protocols/sametime/sametime.c:5141
+#: src/protocols/sametime/sametime.c:5218
+#, c-format
+msgid "Import Sametime List for Account %s"
+msgstr "Importar la lista «Sametime» para la cuenta %s"
+
+#: ../src/protocols/sametime/sametime.c:5180
+#: src/protocols/sametime/sametime.c:5257
+#, c-format
+msgid "Export Sametime List for Account %s"
+msgstr "Exportar la lista «Sametime» para la cuenta %s"
+
+#: src/protocols/sametime/sametime.c:5308
+msgid "Unable to add group: group exists"
+msgstr "No se pudo añadir el grupo: el grupo ya existe"
+
+#: src/protocols/sametime/sametime.c:5309
+#, c-format
+msgid "A group named '%s' already exists in your buddy list."
+msgstr "Un grupo llamado '%s' ya existe en su lista de amigos."
+
+#: src/protocols/sametime/sametime.c:5312
+#: src/protocols/sametime/sametime.c:5437
+msgid "Unable to add group"
+msgstr "No se pudo añadir el grupo"
+
+#: ../src/protocols/sametime/sametime.c:5296
+#: src/protocols/sametime/sametime.c:4342
+#: src/protocols/sametime/sametime.c:5369
+msgid "Possible Matches"
+msgstr "Posibles coincidencias"
+
+#: ../src/protocols/sametime/sametime.c:5312
+#: src/protocols/sametime/sametime.c:5385
+msgid "Notes Address Book group results"
+msgstr "Resultados de las notas de los grupos de la libreta de direcciones «Notes»"
+
+#: ../src/protocols/sametime/sametime.c:5313
+#: src/protocols/sametime/sametime.c:5386
+#, c-format
+msgid ""
+"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 "Es posible que el identificador «%s» se refiera a cualquiera de los grupos de la libreta de direcciones «Notes». Escoja el grupo más apropiado de la lista que se muestra abajo para añadirlo a su lista de amigos."
+
+#: ../src/protocols/sametime/sametime.c:5318
+#: src/protocols/sametime/sametime.c:5391
+msgid "Select Notes Address Book"
+msgstr "Seleccionar libro de direcciones «Notes»"
+
+#: ../src/protocols/sametime/sametime.c:5360
+#: src/protocols/sametime/sametime.c:5431
+msgid "Unable to add group: group not found"
+msgstr "No se pudo añadir el grupo: no se ha encontrado el grupo"
+
+#: ../src/protocols/sametime/sametime.c:5362
+#: src/protocols/sametime/sametime.c:5433
+#, c-format
+msgid ""
+"The identifier '%s' did not match any Notes Address Book groups in your "
+"Sametime community."
+msgstr "El identificador «%s» no coincide con ninguno de los grupos de la libreta de direcciones «Notes» en su comunidad «Sametime»."
+
+#: ../src/protocols/sametime/sametime.c:5403
+#: src/protocols/sametime/sametime.c:5473
+msgid "Notes Address Book Group"
+msgstr "Libreta de direcciones de grupos «Notes»"
+
+#: ../src/protocols/sametime/sametime.c:5404
+#: src/protocols/sametime/sametime.c:5474
+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 "Introduzca el nombre de un grupo de la libreta de direcciones «Notes» en el campo a continuación para añadir al grupo y a sus miembros en su lista de amigos."
+
+#: ../src/protocols/sametime/sametime.c:5452
+#, c-format
+msgid "Search results for '%s'"
+msgstr "Resultados de la búsqueda '%s'"
+
+#: ../src/protocols/sametime/sametime.c:5453
+#, 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 "El identificador «%s» puede referirse a cualquiera de los usuarios mostrados a continuación. Puede añadir estos usuarios a su lista de amigos o enviarles mensajes con los botones de acciones mostrados abajo."
+
+#: ../src/protocols/sametime/sametime.c:5485
+msgid "No matches"
+msgstr "No hubo coincidencias"
+
+#: ../src/protocols/sametime/sametime.c:5486
+#, c-format
+msgid "The identifier '%s' did not match and users in your Sametime community."
+msgstr "El identificador «%s» no coincide con ninguno de los usuarios en su comunidad «Sametime»."
+
+#: ../src/protocols/sametime/sametime.c:5490
+msgid "No Matches"
+msgstr "No hubo coincidencias"
+
+#: ../src/protocols/sametime/sametime.c:5527
+msgid "Search for a user"
+msgstr "Buscar un usuario"
+
+#: ../src/protocols/sametime/sametime.c:5528
+msgid ""
+"Enter a name or partial ID in the field below to search for matching users "
+"in your Sametime community."
+msgstr "Introduzca el nombre o identificador parcial en el campo mostrado a continuación para buscar usuarios coincidentes en su comunidad «Sametime»."
+
+#: ../src/protocols/sametime/sametime.c:5531
+msgid "User Search"
+msgstr "Búsqueda de usuarios"
+
+#: ../src/protocols/sametime/sametime.c:5543
+#: src/protocols/sametime/sametime.c:5489
+msgid "Import Sametime List..."
+msgstr "Importar la lista «Sametime»..."
+
+#: ../src/protocols/sametime/sametime.c:5547
+#: src/protocols/sametime/sametime.c:5493
+msgid "Export Sametime List..."
+msgstr "Exportar la lista «Sametime»..."
+
+#: ../src/protocols/sametime/sametime.c:5551
+#: src/protocols/sametime/sametime.c:5497
+msgid "Add Notes Address Book Group..."
+msgstr "Añadir a la libreta de direcciones de grupos «Notes»..."
+
+#: ../src/protocols/sametime/sametime.c:5555
+msgid "User Search..."
+msgstr "Búsqueda de los usuarios..."
+
+#: src/protocols/sametime/sametime.c:5600
+msgid "Force login (ignore server redirects)"
+msgstr "Forzar conexión (ignorar redirecciones del servidor)"
+
+#. pretend to be Sametime Connect
+#: src/protocols/sametime/sametime.c:5610
+msgid "Hide client identity"
+msgstr "Ocultar identidad de cliente"
+
+#: ../src/protocols/silc/buddy.c:52 ../src/protocols/silc/buddy.c:420
+#: ../src/protocols/silc/buddy.c:545 ../src/protocols/silc/buddy.c:711
+#: ../src/protocols/silc/ft.c:338 src/protocols/silc/buddy.c:52
+#: src/protocols/silc/buddy.c:420 src/protocols/silc/buddy.c:545
+#: src/protocols/silc/buddy.c:712 src/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "El usuario %s no está disponible en la red"
 
-#: src/protocols/silc/buddy.c:52 src/protocols/silc/buddy.c:114
-#: src/protocols/silc/buddy.c:119 src/protocols/silc/buddy.c:123
-#: src/protocols/silc/buddy.c:128 src/protocols/silc/buddy.c:133
-#: src/protocols/silc/buddy.c:138 src/protocols/silc/buddy.c:256
+#: ../src/protocols/silc/buddy.c:53 ../src/protocols/silc/buddy.c:115
+#: ../src/protocols/silc/buddy.c:120 ../src/protocols/silc/buddy.c:124
+#: ../src/protocols/silc/buddy.c:129 ../src/protocols/silc/buddy.c:134
+#: ../src/protocols/silc/buddy.c:139 ../src/protocols/silc/buddy.c:257
+#: src/protocols/silc/buddy.c:53 src/protocols/silc/buddy.c:115
+#: src/protocols/silc/buddy.c:120 src/protocols/silc/buddy.c:124
+#: src/protocols/silc/buddy.c:129 src/protocols/silc/buddy.c:134
+#: src/protocols/silc/buddy.c:139 src/protocols/silc/buddy.c:257
 msgid "Key Agreement"
 msgstr "Acuerdo de claves"
 
-#: src/protocols/silc/buddy.c:53
+#: ../src/protocols/silc/buddy.c:54 src/protocols/silc/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "No se pudo establecer el acuerdo de claves"
 
-#: src/protocols/silc/buddy.c:115
+#: ../src/protocols/silc/buddy.c:116 src/protocols/silc/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "Se produjo un error durante el acuerdo de claves"
 
-#: src/protocols/silc/buddy.c:119
+#: ../src/protocols/silc/buddy.c:120 src/protocols/silc/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "Falló el acuerdo de claves"
 
-#: src/protocols/silc/buddy.c:124
+#: ../src/protocols/silc/buddy.c:125 src/protocols/silc/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "Expiró el tiempo durante el acuerdo de claves"
 
-#: src/protocols/silc/buddy.c:129
+#: ../src/protocols/silc/buddy.c:130 src/protocols/silc/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "Se interrumpió el acuerdo de claves"
 
-#: src/protocols/silc/buddy.c:134
+#: ../src/protocols/silc/buddy.c:135 src/protocols/silc/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "Ya se ha iniciado el acuerdo de claves"
 
-#: src/protocols/silc/buddy.c:139
+#: ../src/protocols/silc/buddy.c:140 src/protocols/silc/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "No puede comenzar el acuerdo de claves consigo mismo"
 
-#: src/protocols/silc/buddy.c:257 src/protocols/silc/buddy.c:387
-#: src/protocols/silc/buddy.c:512
+#: ../src/protocols/silc/buddy.c:258 ../src/protocols/silc/buddy.c:388
+#: ../src/protocols/silc/buddy.c:513 src/protocols/silc/buddy.c:258
+#: src/protocols/silc/buddy.c:388 src/protocols/silc/buddy.c:513
 msgid "The remote user is not present in the network any more"
 msgstr "El usuario remoto ya no está activo dentro de la red"
 
-#: src/protocols/silc/buddy.c:293
+#: ../src/protocols/silc/buddy.c:294 src/protocols/silc/buddy.c:294
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
@@ -8955,7 +11021,7 @@
 "Se ha recibido una solicitud de acuerdo de claves de %s. ¿Desea realizar el "
 "intercambio de claves?"
 
-#: src/protocols/silc/buddy.c:297
+#: ../src/protocols/silc/buddy.c:298 src/protocols/silc/buddy.c:298
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -8966,59 +11032,69 @@
 "Servidor remoto: %s\n"
 "Puerto remoto: %d"
 
-#: src/protocols/silc/buddy.c:310
+#: ../src/protocols/silc/buddy.c:311 src/protocols/silc/buddy.c:311
 msgid "Key Agreement Request"
 msgstr "Solicitud de acuerdo de claves"
 
-#: src/protocols/silc/buddy.c:386 src/protocols/silc/buddy.c:421
-#: src/protocols/silc/buddy.c:463
+#: ../src/protocols/silc/buddy.c:387 ../src/protocols/silc/buddy.c:422
+#: ../src/protocols/silc/buddy.c:464 src/protocols/silc/buddy.c:387
+#: src/protocols/silc/buddy.c:422 src/protocols/silc/buddy.c:464
 msgid "IM With Password"
 msgstr "MI con contraseña"
 
-#: src/protocols/silc/buddy.c:422
+#: ../src/protocols/silc/buddy.c:423 src/protocols/silc/buddy.c:423
 msgid "Cannot set IM key"
 msgstr "No se pudo establecer la clave MI"
 
-#: src/protocols/silc/buddy.c:464
+#: ../src/protocols/silc/buddy.c:465 src/protocols/silc/buddy.c:465
 msgid "Set IM Password"
 msgstr "Establecer contraseña MI"
 
-#: src/protocols/silc/buddy.c:511 src/protocols/silc/buddy.c:546
-#: src/protocols/silc/ops.c:1278 src/protocols/silc/ops.c:1289
+#: ../src/protocols/silc/buddy.c:512 ../src/protocols/silc/buddy.c:547
+#: ../src/protocols/silc/ops.c:1492 ../src/protocols/silc/ops.c:1503
+#: src/protocols/silc/buddy.c:512 src/protocols/silc/buddy.c:547
+#: src/protocols/silc/ops.c:1492 src/protocols/silc/ops.c:1503
 msgid "Get Public Key"
 msgstr "Obtener clave pública"
 
-#: src/protocols/silc/buddy.c:547 src/protocols/silc/ops.c:1279
-#: src/protocols/silc/ops.c:1290
+#: ../src/protocols/silc/buddy.c:548 ../src/protocols/silc/ops.c:1493
+#: ../src/protocols/silc/ops.c:1504 src/protocols/silc/buddy.c:548
+#: src/protocols/silc/ops.c:1493 src/protocols/silc/ops.c:1504
 msgid "Cannot fetch the public key"
 msgstr "No se pudo obtener la clave pública"
 
-#: src/protocols/silc/buddy.c:634 src/protocols/silc/buddy.c:1583
+#: ../src/protocols/silc/buddy.c:634 ../src/protocols/silc/buddy.c:1647
+#: src/protocols/silc/buddy.c:635 src/protocols/silc/buddy.c:1610
 msgid "Show Public Key"
 msgstr "Mostrar clave pública"
 
-#: src/protocols/silc/buddy.c:635 src/protocols/silc/buddy.c:994
-#: src/protocols/silc/chat.c:235
+#: ../src/protocols/silc/buddy.c:635 ../src/protocols/silc/buddy.c:1030
+#: ../src/protocols/silc/chat.c:236 src/protocols/silc/buddy.c:636
+#: src/protocols/silc/buddy.c:995 src/protocols/silc/chat.c:236
 msgid "Could not load public key"
 msgstr "No se pudo cargar la clave pública"
 
-#: src/protocols/silc/buddy.c:712 src/protocols/silc/ops.c:873
-#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1080
-#: src/protocols/silc/ops.c:1081 src/protocols/silc/ops.c:1099
+#: ../src/protocols/silc/buddy.c:712 ../src/protocols/silc/ops.c:1087
+#: ../src/protocols/silc/ops.c:1159 ../src/protocols/silc/ops.c:1294
+#: ../src/protocols/silc/ops.c:1295 ../src/protocols/silc/ops.c:1313
+#: src/protocols/silc/buddy.c:713 src/protocols/silc/ops.c:1087
+#: src/protocols/silc/ops.c:1159 src/protocols/silc/ops.c:1294
+#: src/protocols/silc/ops.c:1295 src/protocols/silc/ops.c:1313
 msgid "User Information"
 msgstr "Información de usuario"
 
-#: src/protocols/silc/buddy.c:713 src/protocols/silc/ops.c:946
-#: src/protocols/silc/ops.c:1100
+#: ../src/protocols/silc/buddy.c:713 ../src/protocols/silc/ops.c:1160
+#: ../src/protocols/silc/ops.c:1314 src/protocols/silc/buddy.c:714
+#: src/protocols/silc/ops.c:1160 src/protocols/silc/ops.c:1314
 msgid "Cannot get user information"
 msgstr "No se pudo obtener la información del usuario %s"
 
-#: src/protocols/silc/buddy.c:734
+#: ../src/protocols/silc/buddy.c:734 src/protocols/silc/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "No se confía en el amigo %s"
 
-#: src/protocols/silc/buddy.c:737
+#: ../src/protocols/silc/buddy.c:737 src/protocols/silc/buddy.c:738
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
@@ -9027,16 +11103,16 @@
 "pública. Puede utilizar la orden \"Obtener clave pública\" para importarla."
 
 #. Open file selector to select the public key.
-#: src/protocols/silc/buddy.c:1028
+#: ../src/protocols/silc/buddy.c:1064 src/protocols/silc/buddy.c:1029
 msgid "Open..."
 msgstr "Abrir..."
 
-#: src/protocols/silc/buddy.c:1037
+#: ../src/protocols/silc/buddy.c:1073 src/protocols/silc/buddy.c:1038
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "No se encuentra al amigo %s en la red"
 
-#: src/protocols/silc/buddy.c:1040
+#: ../src/protocols/silc/buddy.c:1076 src/protocols/silc/buddy.c:1041
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -9044,23 +11120,21 @@
 "Para añadir al amigo debe importar su clave pública. Pulse «Importar» para "
 "importar una clave pública."
 
-#: src/protocols/silc/buddy.c:1043
-msgid "Import..."
-msgstr "Importar..."
-
-#: src/protocols/silc/buddy.c:1130
+#: ../src/protocols/silc/buddy.c:1079
+msgid "_Import..."
+msgstr "_Importar..."
+
+#: ../src/protocols/silc/buddy.c:1175 src/protocols/silc/buddy.c:1140
 msgid "Select correct user"
 msgstr "Seleccione el usuario correcto"
 
-#: src/protocols/silc/buddy.c:1132
+#: ../src/protocols/silc/buddy.c:1177 src/protocols/silc/buddy.c:1142
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
-msgstr ""
-"Se ha encontrado más de un usuario con la misma clave pública. Seleccione el "
-"usuario que desea añadirr a su lista de amigos de la lista mostrada."
-
-#: src/protocols/silc/buddy.c:1134
+msgstr "Se ha encontrado más de un usuario con la misma clave pública. Seleccione el usuario que desea añadir a su lista de amigos de la lista mostrada."
+
+#: ../src/protocols/silc/buddy.c:1179 src/protocols/silc/buddy.c:1144
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -9068,213 +11142,238 @@
 "Se ha encontrado más de un usuario con el mismo nombre. Seleccione el "
 "usuario que desea añadir a su lista de amigos de la listas mostrada."
 
-#: src/protocols/silc/buddy.c:1415
+#: ../src/protocols/silc/buddy.c:1467 src/protocols/silc/buddy.c:1429
 msgid "Detached"
 msgstr "Desligado"
 
-#: src/protocols/silc/buddy.c:1419 src/protocols/silc/silc.c:56
+#: ../src/protocols/silc/buddy.c:1471 ../src/protocols/silc/silc.c:55
+#: src/protocols/silc/buddy.c:1433 src/protocols/silc/silc.c:57
 msgid "Indisposed"
 msgstr "Indispuesto"
 
-#: src/protocols/silc/buddy.c:1423 src/protocols/silc/silc.c:58
+#: ../src/protocols/silc/buddy.c:1475 ../src/protocols/silc/silc.c:57
+#: src/protocols/silc/buddy.c:1437 src/protocols/silc/silc.c:59
 msgid "Wake Me Up"
 msgstr "Despiértame"
 
-#: src/protocols/silc/buddy.c:1425 src/protocols/silc/silc.c:50
+#: ../src/protocols/silc/buddy.c:1477 ../src/protocols/silc/silc.c:49
+#: src/protocols/silc/buddy.c:1439 src/protocols/silc/silc.c:51
 msgid "Hyper Active"
 msgstr "Hiper-activo"
 
-#: src/protocols/silc/buddy.c:1427
+#: ../src/protocols/silc/buddy.c:1479 src/protocols/silc/buddy.c:1441
 msgid "Robot"
 msgstr "Robot"
 
-#: src/protocols/silc/buddy.c:1434 src/protocols/silc/silc.c:634
-#: src/protocols/silc/util.c:472
+#: ../src/protocols/silc/buddy.c:1486 ../src/protocols/silc/silc.c:668
+#: ../src/protocols/silc/util.c:473 src/protocols/silc/buddy.c:1448
+#: src/protocols/silc/silc.c:658 src/protocols/silc/util.c:473
 msgid "Happy"
 msgstr "Feliz"
 
-#: src/protocols/silc/buddy.c:1436 src/protocols/silc/silc.c:636
-#: src/protocols/silc/util.c:474
+#: ../src/protocols/silc/buddy.c:1488 ../src/protocols/silc/silc.c:670
+#: ../src/protocols/silc/util.c:475 src/protocols/silc/buddy.c:1450
+#: src/protocols/silc/silc.c:660 src/protocols/silc/util.c:475
 msgid "Sad"
 msgstr "Triste"
 
-#: src/protocols/silc/buddy.c:1438 src/protocols/silc/silc.c:638
-#: src/protocols/silc/util.c:476
+#: ../src/protocols/silc/buddy.c:1490 ../src/protocols/silc/silc.c:672
+#: ../src/protocols/silc/util.c:477 src/protocols/silc/buddy.c:1452
+#: src/protocols/silc/silc.c:662 src/protocols/silc/util.c:477
 msgid "Angry"
 msgstr "Furioso"
 
-#: src/protocols/silc/buddy.c:1440 src/protocols/silc/silc.c:640
-#: src/protocols/silc/util.c:478
+#: ../src/protocols/silc/buddy.c:1492 ../src/protocols/silc/silc.c:674
+#: ../src/protocols/silc/util.c:479 src/protocols/silc/buddy.c:1454
+#: src/protocols/silc/silc.c:664 src/protocols/silc/util.c:479
 msgid "Jealous"
 msgstr "Celoso"
 
-#: src/protocols/silc/buddy.c:1442 src/protocols/silc/silc.c:642
-#: src/protocols/silc/util.c:480
+#: ../src/protocols/silc/buddy.c:1494 ../src/protocols/silc/silc.c:676
+#: ../src/protocols/silc/util.c:481 src/protocols/silc/buddy.c:1456
+#: src/protocols/silc/silc.c:666 src/protocols/silc/util.c:481
 msgid "Ashamed"
 msgstr "Avergonzado"
 
-#: src/protocols/silc/buddy.c:1444 src/protocols/silc/silc.c:644
-#: src/protocols/silc/util.c:482
+#: ../src/protocols/silc/buddy.c:1496 ../src/protocols/silc/silc.c:678
+#: ../src/protocols/silc/util.c:483 src/protocols/silc/buddy.c:1458
+#: src/protocols/silc/silc.c:668 src/protocols/silc/util.c:483
 msgid "Invincible"
 msgstr "Invencible"
 
-#: src/protocols/silc/buddy.c:1446 src/protocols/silc/silc.c:646
-#: src/protocols/silc/util.c:484
+#: ../src/protocols/silc/buddy.c:1498 ../src/protocols/silc/silc.c:680
+#: ../src/protocols/silc/util.c:485 src/protocols/silc/buddy.c:1460
+#: src/protocols/silc/silc.c:670 src/protocols/silc/util.c:485
 msgid "In Love"
 msgstr "Enamorado"
 
-#: src/protocols/silc/buddy.c:1448 src/protocols/silc/silc.c:648
-#: src/protocols/silc/util.c:486
+#: ../src/protocols/silc/buddy.c:1500 ../src/protocols/silc/silc.c:682
+#: ../src/protocols/silc/util.c:487 src/protocols/silc/buddy.c:1462
+#: src/protocols/silc/silc.c:672 src/protocols/silc/util.c:487
 msgid "Sleepy"
 msgstr "Dormido"
 
-#: src/protocols/silc/buddy.c:1450 src/protocols/silc/silc.c:650
-#: src/protocols/silc/util.c:488
+#: ../src/protocols/silc/buddy.c:1502 ../src/protocols/silc/silc.c:684
+#: ../src/protocols/silc/util.c:489 src/protocols/silc/buddy.c:1464
+#: src/protocols/silc/silc.c:674 src/protocols/silc/util.c:489
 msgid "Bored"
 msgstr "Aburrido"
 
-#: src/protocols/silc/buddy.c:1452 src/protocols/silc/silc.c:652
-#: src/protocols/silc/util.c:490
+#: ../src/protocols/silc/buddy.c:1504 ../src/protocols/silc/silc.c:686
+#: ../src/protocols/silc/util.c:491 src/protocols/silc/buddy.c:1466
+#: src/protocols/silc/silc.c:676 src/protocols/silc/util.c:491
 msgid "Excited"
 msgstr "Excitado"
 
-#: src/protocols/silc/buddy.c:1454 src/protocols/silc/silc.c:654
-#: src/protocols/silc/util.c:492
+#: ../src/protocols/silc/buddy.c:1506 ../src/protocols/silc/silc.c:688
+#: ../src/protocols/silc/util.c:493 src/protocols/silc/buddy.c:1468
+#: src/protocols/silc/silc.c:678 src/protocols/silc/util.c:493
 msgid "Anxious"
 msgstr "Ansioso"
 
-#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:982
+#: ../src/protocols/silc/buddy.c:1534 ../src/protocols/silc/ops.c:1196
+#: src/protocols/silc/buddy.c:1500 src/protocols/silc/ops.c:1196
 msgid "User Modes"
 msgstr "Modos de usuario"
 
-#: src/protocols/silc/buddy.c:1495 src/protocols/silc/ops.c:991
+#: ../src/protocols/silc/buddy.c:1550 ../src/protocols/silc/ops.c:1205
+#: src/protocols/silc/buddy.c:1509 src/protocols/silc/ops.c:1205
 msgid "Mood"
 msgstr "Ánimo"
 
-#: src/protocols/silc/buddy.c:1499 src/protocols/silc/ops.c:997
-msgid "Status Text"
-msgstr "Texto de estado"
-
-#: src/protocols/silc/buddy.c:1504 src/protocols/silc/ops.c:1003
+#: ../src/protocols/silc/buddy.c:1555 ../src/protocols/silc/ops.c:1217
+#: src/protocols/silc/buddy.c:1518 src/protocols/silc/ops.c:1217
 msgid "Preferred Contact"
 msgstr "Contacto preferido"
 
-#: src/protocols/silc/buddy.c:1509 src/protocols/silc/ops.c:1008
+#: ../src/protocols/silc/buddy.c:1560 ../src/protocols/silc/ops.c:1222
+#: src/protocols/silc/buddy.c:1523 src/protocols/silc/ops.c:1222
 msgid "Preferred Language"
 msgstr "Idioma preferido"
 
-#: src/protocols/silc/buddy.c:1514 src/protocols/silc/ops.c:1013
+#: ../src/protocols/silc/buddy.c:1565 ../src/protocols/silc/ops.c:1227
+#: src/protocols/silc/buddy.c:1528 src/protocols/silc/ops.c:1227
 msgid "Device"
 msgstr "Dispositivo"
 
-#: src/protocols/silc/buddy.c:1519 src/protocols/silc/ops.c:1018
-#: src/protocols/silc/silc.c:702 src/protocols/silc/silc.c:704
+#: ../src/protocols/silc/buddy.c:1570 ../src/protocols/silc/ops.c:1232
+#: ../src/protocols/silc/silc.c:736 ../src/protocols/silc/silc.c:738
+#: src/protocols/silc/buddy.c:1533 src/protocols/silc/ops.c:1232
+#: src/protocols/silc/silc.c:726 src/protocols/silc/silc.c:728
 msgid "Timezone"
 msgstr "Zona horaria"
 
-#: src/protocols/silc/buddy.c:1524 src/protocols/silc/ops.c:1023
+#: ../src/protocols/silc/buddy.c:1575 ../src/protocols/silc/ops.c:1237
+#: src/protocols/silc/buddy.c:1538 src/protocols/silc/ops.c:1237
 msgid "Geolocation"
 msgstr "Localización"
 
-#: src/protocols/silc/buddy.c:1567
+#: ../src/protocols/silc/buddy.c:1629 src/protocols/silc/buddy.c:1594
 msgid "Reset IM Key"
 msgstr "Borrar la clave MI"
 
-#: src/protocols/silc/buddy.c:1572
+#: ../src/protocols/silc/buddy.c:1635 src/protocols/silc/buddy.c:1599
 msgid "IM with Key Exchange"
 msgstr "MI con intercambio de claves"
 
-#: src/protocols/silc/buddy.c:1576
+#: ../src/protocols/silc/buddy.c:1640 src/protocols/silc/buddy.c:1603
 msgid "IM with Password"
 msgstr "MI con contraseña"
 
-#: src/protocols/silc/buddy.c:1588
+#: ../src/protocols/silc/buddy.c:1653 src/protocols/silc/buddy.c:1615
 msgid "Get Public Key..."
 msgstr "Obtener clave pública..."
 
-#: src/protocols/silc/buddy.c:1595 src/protocols/silc/ops.c:1409
+#: ../src/protocols/silc/buddy.c:1660 ../src/protocols/silc/ops.c:1623
+#: src/protocols/silc/buddy.c:1622 src/protocols/silc/ops.c:1623
 msgid "Kill User"
 msgstr "Matar usuario"
 
-#: src/protocols/silc/chat.c:38
+#: ../src/protocols/silc/buddy.c:1670 ../src/protocols/silc/chat.c:971
+#: src/protocols/silc/buddy.c:1631 src/protocols/silc/chat.c:971
+msgid "Draw On Whiteboard"
+msgstr "Escribir en la pizarra"
+
+#: ../src/protocols/silc/chat.c:39 src/protocols/silc/chat.c:39
 msgid "_Passphrase:"
 msgstr "Contra_seña:"
 
-#: src/protocols/silc/chat.c:79
+#: ../src/protocols/silc/chat.c:80 src/protocols/silc/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "No existe el canal %s en la red"
 
-#: src/protocols/silc/chat.c:80 src/protocols/silc/chat.c:172
+#: ../src/protocols/silc/chat.c:81 ../src/protocols/silc/chat.c:173
+#: src/protocols/silc/chat.c:81 src/protocols/silc/chat.c:173
 msgid "Channel Information"
 msgstr "Información de canal"
 
-#: src/protocols/silc/chat.c:81
+#: ../src/protocols/silc/chat.c:82 src/protocols/silc/chat.c:82
 msgid "Cannot get channel information"
 msgstr "No se pudo cambiar la información del canal"
 
-#: src/protocols/silc/chat.c:118
+#: ../src/protocols/silc/chat.c:119 src/protocols/silc/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Nombre del canal:</b> %s"
 
-#: src/protocols/silc/chat.c:121
+#: ../src/protocols/silc/chat.c:122 src/protocols/silc/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Número de usuarios:</b> %d"
 
-#: src/protocols/silc/chat.c:128
+#: ../src/protocols/silc/chat.c:129 src/protocols/silc/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Fundador del canal</b>: %s"
 
-#: src/protocols/silc/chat.c:137
+#: ../src/protocols/silc/chat.c:138 src/protocols/silc/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Cifrado del canal:</b> %s"
 
-#: src/protocols/silc/chat.c:140
+#: ../src/protocols/silc/chat.c:141 src/protocols/silc/chat.c:141
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>HMAC de canal:</b> %s"
 
-#: src/protocols/silc/chat.c:145
+#: ../src/protocols/silc/chat.c:146 src/protocols/silc/chat.c:146
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Tema del canal:</b><br>%s"
 
-#: src/protocols/silc/chat.c:150
+#: ../src/protocols/silc/chat.c:151 src/protocols/silc/chat.c:151
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Modos del canal:</b> "
 
-#: src/protocols/silc/chat.c:163
+#: ../src/protocols/silc/chat.c:164 src/protocols/silc/chat.c:164
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Huella dactilar del fundador:</b><br>%s"
 
-#: src/protocols/silc/chat.c:164
+#: ../src/protocols/silc/chat.c:165 src/protocols/silc/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Huella Babble del fundador:</b><br>%s"
 
-#: src/protocols/silc/chat.c:234
+#: ../src/protocols/silc/chat.c:235 src/protocols/silc/chat.c:235
 msgid "Add Channel Public Key"
 msgstr "Añadir clave pública del canal"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:289
+#: ../src/protocols/silc/chat.c:290 src/protocols/silc/chat.c:290
 msgid "Open Public Key..."
 msgstr "Abrir clave pública..."
 
-#: src/protocols/silc/chat.c:398
+#: ../src/protocols/silc/chat.c:399 src/protocols/silc/chat.c:399
 msgid "Channel Passphrase"
 msgstr "Contraseña del canal"
 
-#: src/protocols/silc/chat.c:405
+#: ../src/protocols/silc/chat.c:406 src/protocols/silc/chat.c:406
 msgid "Channel Public Keys List"
 msgstr "Lista de claves públicas del canal"
 
-#: src/protocols/silc/chat.c:410
+#: ../src/protocols/silc/chat.c:411 src/protocols/silc/chat.c:411
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9288,130 +11387,146 @@
 "conectarse los usuarios que estén en la lista de claves públicas si se "
 "utilizan claves públicas para el acceso."
 
-#: src/protocols/silc/chat.c:419 src/protocols/silc/chat.c:420
-#: src/protocols/silc/chat.c:457 src/protocols/silc/chat.c:458
-#: src/protocols/silc/chat.c:891
+#: ../src/protocols/silc/chat.c: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: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
 msgid "Channel Authentication"
 msgstr "Autenticación de canal"
 
-#: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
+#: ../src/protocols/silc/chat.c:422 ../src/protocols/silc/chat.c:460
+#: src/protocols/silc/chat.c:422 src/protocols/silc/chat.c:460
 msgid "Add / Remove"
 msgstr "Añadir / Quitar"
 
-#: src/protocols/silc/chat.c:576
+#: ../src/protocols/silc/chat.c:577 src/protocols/silc/chat.c:577
 msgid "Group Name"
 msgstr "Nombre de grupo"
 
-#: src/protocols/silc/chat.c:580 src/protocols/silc/ops.c:1694
+#: ../src/protocols/silc/chat.c:581 ../src/protocols/silc/ops.c:1908
+#: ../src/protocols/silc/silc.c:944 src/protocols/silc/chat.c:581
+#: src/protocols/silc/ops.c:1908 src/protocols/silc/silc.c:934
 msgid "Passphrase"
 msgstr "Contraseña"
 
-#: src/protocols/silc/chat.c:591
+#: ../src/protocols/silc/chat.c:592 src/protocols/silc/chat.c:592
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr ""
 "Por favor, indique el nombre del grupo de canales privados %s y una "
 "contraseña."
 
-#: src/protocols/silc/chat.c:593
+#: ../src/protocols/silc/chat.c:594 src/protocols/silc/chat.c:594
 msgid "Add Channel Private Group"
 msgstr "Añadir grupo de canales privados"
 
-#: src/protocols/silc/chat.c:720
+#: ../src/protocols/silc/chat.c:721 src/protocols/silc/chat.c:721
 msgid "User Limit"
 msgstr "Límite de usuarios"
 
-#: src/protocols/silc/chat.c:721
+#: ../src/protocols/silc/chat.c:722 src/protocols/silc/chat.c:722
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Fijar un limite de usuarios en el canal. Poner a cero para quitar el límite "
 "de usuarios."
 
-#: src/protocols/silc/chat.c:863
+#: ../src/protocols/silc/chat.c:877 src/protocols/silc/chat.c:877
 msgid "Get Info"
 msgstr "Info"
 
-#: src/protocols/silc/chat.c:871
+#: ../src/protocols/silc/chat.c:885 src/protocols/silc/chat.c:885
 msgid "Invite List"
 msgstr "Lista de invitados"
 
-#: src/protocols/silc/chat.c:876
+#: ../src/protocols/silc/chat.c:890 src/protocols/silc/chat.c:890
 msgid "Ban List"
 msgstr "Lista de expulsados"
 
-#: src/protocols/silc/chat.c:884
+#: ../src/protocols/silc/chat.c:898 src/protocols/silc/chat.c:898
 msgid "Add Private Group"
 msgstr "Añadir grupo privado"
 
-#: src/protocols/silc/chat.c:897
+#: ../src/protocols/silc/chat.c:911 src/protocols/silc/chat.c:911
 msgid "Reset Permanent"
 msgstr "Borrado permanente"
 
-#: src/protocols/silc/chat.c:902
+#: ../src/protocols/silc/chat.c:916 src/protocols/silc/chat.c:916
 msgid "Set Permanent"
 msgstr "Fijar permanente"
 
-#: src/protocols/silc/chat.c:910
+#: ../src/protocols/silc/chat.c:924 src/protocols/silc/chat.c:924
 msgid "Set User Limit"
 msgstr "Establecer límite de usuarios"
 
-#: src/protocols/silc/chat.c:916
+#: ../src/protocols/silc/chat.c:930 src/protocols/silc/chat.c:930
 msgid "Reset Topic Restriction"
 msgstr "Quitar restricciones de temas"
 
-#: src/protocols/silc/chat.c:921
+#: ../src/protocols/silc/chat.c:935 src/protocols/silc/chat.c:935
 msgid "Set Topic Restriction"
 msgstr "Establecer restricciones de tema"
 
-#: src/protocols/silc/chat.c:928
+#: ../src/protocols/silc/chat.c:942 src/protocols/silc/chat.c:942
 msgid "Reset Private Channel"
 msgstr "Limpiar canal privado"
 
-#: src/protocols/silc/chat.c:933
+#: ../src/protocols/silc/chat.c:947 src/protocols/silc/chat.c:947
 msgid "Set Private Channel"
 msgstr "Establecer canal privado"
 
-#: src/protocols/silc/chat.c:940
+#: ../src/protocols/silc/chat.c:954 src/protocols/silc/chat.c:954
 msgid "Reset Secret Channel"
 msgstr "Limpiar canal secreto"
 
-#: src/protocols/silc/chat.c:945
+#: ../src/protocols/silc/chat.c:959 src/protocols/silc/chat.c:959
 msgid "Set Secret Channel"
 msgstr "Establecer canal secreto"
 
 # Banned puede ser expulsar o censurar, prefiero expulsar. jfs.
-#: src/protocols/silc/chat.c:1008
+#: ../src/protocols/silc/chat.c:1033 src/protocols/silc/chat.c:1032
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Vd. es fundador del canal en <I>%s</I>."
 
-#: src/protocols/silc/chat.c:1012
+#: ../src/protocols/silc/chat.c:1037 src/protocols/silc/chat.c:1036
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "El fundador del canal en <I>%s</I> es <I>%s</I>"
 
-#: src/protocols/silc/chat.c:1071
+#: ../src/protocols/silc/chat.c:1096 src/protocols/silc/chat.c:1095
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "Tiene que unirse al canal %s antes de poder unirse al grupo privado"
 
-#: src/protocols/silc/chat.c:1073
+#: ../src/protocols/silc/chat.c:1098 src/protocols/silc/chat.c:1097
 msgid "Join Private Group"
 msgstr "Unirse a un grupo privado"
 
-#: src/protocols/silc/chat.c:1074
+#: ../src/protocols/silc/chat.c:1099 src/protocols/silc/chat.c:1098
 msgid "Cannot join private group"
 msgstr "No se pudo unir a un grupo privado"
 
-#: src/protocols/silc/chat.c:1267 src/protocols/silc/silc.c:917
+#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1152
+msgid "Call Command"
+msgstr "Orden de llamada"
+
+#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1152
+#: src/protocols/silc/chat.c:1292 src/protocols/silc/silc.c:1142
 msgid "Cannot call command"
 msgstr "No se pudo llamar la orden"
 
-#: src/protocols/silc/chat.c:1268 src/protocols/silc/silc.c:918
+#: ../src/protocols/silc/chat.c:1294 ../src/protocols/silc/silc.c:1153
+#: src/protocols/silc/chat.c:1293 src/protocols/silc/silc.c:1143
 msgid "Unknown command"
 msgstr "Orden desconocida"
 
+#: ../src/protocols/silc/ft.c:89 ../src/protocols/silc/ft.c:92
+#: ../src/protocols/silc/ft.c:96 ../src/protocols/silc/ft.c:100
+#: ../src/protocols/silc/ft.c:104 ../src/protocols/silc/ft.c:205
+#: ../src/protocols/silc/ft.c:210 ../src/protocols/silc/ft.c:215
+#: ../src/protocols/silc/ft.c:221 ../src/protocols/silc/ft.c:340
 #: src/protocols/silc/ft.c:89 src/protocols/silc/ft.c:92
 #: src/protocols/silc/ft.c:96 src/protocols/silc/ft.c:100
 #: src/protocols/silc/ft.c:104 src/protocols/silc/ft.c:205
@@ -9420,191 +11535,207 @@
 msgid "Secure File Transfer"
 msgstr "Transferencia segura de archivos"
 
-#: src/protocols/silc/ft.c:90 src/protocols/silc/ft.c:93
-#: src/protocols/silc/ft.c:97 src/protocols/silc/ft.c:101
-#: src/protocols/silc/ft.c:105
+#: ../src/protocols/silc/ft.c:90 ../src/protocols/silc/ft.c:93
+#: ../src/protocols/silc/ft.c:97 ../src/protocols/silc/ft.c:101
+#: ../src/protocols/silc/ft.c:105 src/protocols/silc/ft.c:90
+#: src/protocols/silc/ft.c:93 src/protocols/silc/ft.c:97
+#: src/protocols/silc/ft.c:101 src/protocols/silc/ft.c:105
 msgid "Error during file transfer"
 msgstr "Se produjo un error durante la transferencia de archivos"
 
-#: src/protocols/silc/ft.c:94
+#: ../src/protocols/silc/ft.c:94 src/protocols/silc/ft.c:94
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: src/protocols/silc/ft.c:98
+#: ../src/protocols/silc/ft.c:98 src/protocols/silc/ft.c:98
 msgid "Key agreement failed"
 msgstr "Falló el acuerdo de claves"
 
-#: src/protocols/silc/ft.c:102
+#: ../src/protocols/silc/ft.c:102 src/protocols/silc/ft.c:102
 msgid "File transfer session does not exist"
-msgstr "No existe la sesión de transferencia de archivos"
-
-#: src/protocols/silc/ft.c:206
+msgstr "La sesión de transferencia de archivos no existe"
+
+#: ../src/protocols/silc/ft.c:206 src/protocols/silc/ft.c:206
 msgid "No file transfer session active"
 msgstr "No hay ninguna sesión de transferencia de archivos activa"
 
-#: src/protocols/silc/ft.c:211
+#: ../src/protocols/silc/ft.c:211 src/protocols/silc/ft.c:211
 msgid "File transfer already started"
 msgstr "Ya se ha iniciado la transferencia de archivos"
 
-#: src/protocols/silc/ft.c:216
+#: ../src/protocols/silc/ft.c:216 src/protocols/silc/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr ""
 "No se pudo realizar el acuerdo de claves para realizar la transferencia de "
 "archivos."
 
-#: src/protocols/silc/ft.c:222
+#: ../src/protocols/silc/ft.c:222 src/protocols/silc/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "No se pudo comenzar la transferencia de archivos."
 
-#: src/protocols/silc/ft.c:341
+#: ../src/protocols/silc/ft.c:341 src/protocols/silc/ft.c:341
 msgid "Cannot send file"
 msgstr "No se puede enviar el archivo."
 
-#: src/protocols/silc/ops.c:341 src/protocols/silc/ops.c:350
-#: src/protocols/silc/ops.c:359
+#: ../src/protocols/silc/ops.c:555 ../src/protocols/silc/ops.c:564
+#: ../src/protocols/silc/ops.c:573 src/protocols/silc/ops.c:555
+#: src/protocols/silc/ops.c:564 src/protocols/silc/ops.c:573
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s ha cambiado el tema a de <I>%s</I> a: %s"
 
-#: src/protocols/silc/ops.c:425
+#: ../src/protocols/silc/ops.c:639 src/protocols/silc/ops.c:639
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> fijo los modos del canal <I>%s</I> a: %s"
 
-#: src/protocols/silc/ops.c:429
+#: ../src/protocols/silc/ops.c:643 src/protocols/silc/ops.c:643
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> quitó todos los modos del canal <I>%s</I>"
 
-#: src/protocols/silc/ops.c:462
+#: ../src/protocols/silc/ops.c:676 src/protocols/silc/ops.c:676
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> fijo los modos del usuario <I>%s</I> a: %s"
 
-#: src/protocols/silc/ops.c:470
+#: ../src/protocols/silc/ops.c:684 src/protocols/silc/ops.c:684
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> quitó todos los modos del usuario <I>%s<I>"
 
-#: src/protocols/silc/ops.c:499
+#: ../src/protocols/silc/ops.c:713 src/protocols/silc/ops.c:713
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Ha sido expulsado de <I>%s</I> por %s (%s)"
 
-#: src/protocols/silc/ops.c:529 src/protocols/silc/ops.c:534
-#: src/protocols/silc/ops.c:539
+#: ../src/protocols/silc/ops.c:743 ../src/protocols/silc/ops.c:748
+#: ../src/protocols/silc/ops.c:753 src/protocols/silc/ops.c:743
+#: src/protocols/silc/ops.c:748 src/protocols/silc/ops.c:753
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Ha sido expulsado por %s (%s)"
 
-#: src/protocols/silc/ops.c:560 src/protocols/silc/ops.c:565
-#: src/protocols/silc/ops.c:570
+#: ../src/protocols/silc/ops.c:774 ../src/protocols/silc/ops.c:779
+#: ../src/protocols/silc/ops.c:784 src/protocols/silc/ops.c:774
+#: src/protocols/silc/ops.c:779 src/protocols/silc/ops.c:784
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Expulsado por %s (%s)"
 
-#: src/protocols/silc/ops.c:616
+#: ../src/protocols/silc/ops.c:830 src/protocols/silc/ops.c:830
 msgid "Server signoff"
 msgstr "Desconectado por el servidor"
 
-#: src/protocols/silc/ops.c:803
+#: ../src/protocols/silc/ops.c:1017 src/protocols/silc/ops.c:1017
 msgid "Personal Information"
 msgstr "Información personal"
 
-#: src/protocols/silc/ops.c:826
+#: ../src/protocols/silc/ops.c:1040 src/protocols/silc/ops.c:1040
 msgid "Birth Day"
 msgstr "Cumpleaños"
 
-# Prefiero esto a "Título laboral" que puede ser ambigüo, jfs
-#: src/protocols/silc/ops.c:830
+# Prefiero esto a "Título laboral" que puede ser ambiguo, jfs
+#: ../src/protocols/silc/ops.c:1044 src/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "Trabajo"
 
-#: src/protocols/silc/ops.c:834
+#: ../src/protocols/silc/ops.c:1048 src/protocols/silc/ops.c:1048
 msgid "Job Role"
 msgstr "Rol laboral"
 
-#: src/protocols/silc/ops.c:838
+#: ../src/protocols/silc/ops.c:1052 ../src/protocols/silc/silc.c:937
+#: src/protocols/silc/ops.c:1052 src/protocols/silc/silc.c:927
 msgid "Organization"
 msgstr "Organización"
 
-#: src/protocols/silc/ops.c:842
+#: ../src/protocols/silc/ops.c:1056 src/protocols/silc/ops.c:1056
 msgid "Unit"
 msgstr "Unidad"
 
-#: src/protocols/silc/ops.c:861
+#: ../src/protocols/silc/ops.c:1075 src/protocols/silc/ops.c:1075
 msgid "EMail"
 msgstr "Correo electrónico"
 
-#: src/protocols/silc/ops.c:866
+#: ../src/protocols/silc/ops.c:1080 src/protocols/silc/ops.c:1080
 msgid "Note"
 msgstr "Nota"
 
-#: src/protocols/silc/ops.c:914
+#: ../src/protocols/silc/ops.c:1128 src/protocols/silc/ops.c:1128
 msgid "Join Chat"
 msgstr "Unirse a un chat"
 
-#: src/protocols/silc/ops.c:1070 src/protocols/silc/ops.c:1140
+#: ../src/protocols/silc/ops.c:1211 src/protocols/silc/buddy.c:1513
+#: src/protocols/silc/ops.c:1211
+msgid "Status Text"
+msgstr "Texto de estado"
+
+#: ../src/protocols/silc/ops.c:1284 ../src/protocols/silc/ops.c:1354
+#: src/protocols/silc/ops.c:1284 src/protocols/silc/ops.c:1354
 msgid "Public Key Fingerprint"
 msgstr "Huella digital de la clave pública"
 
-#: src/protocols/silc/ops.c:1071 src/protocols/silc/ops.c:1141
+#: ../src/protocols/silc/ops.c:1285 ../src/protocols/silc/ops.c:1355
+#: src/protocols/silc/ops.c:1285 src/protocols/silc/ops.c:1355
 msgid "Public Key Babbleprint"
 msgstr "Huella babble de la clave pública"
 
-#: src/protocols/silc/ops.c:1084
-msgid "More..."
-msgstr "Más..."
-
-#: src/protocols/silc/ops.c:1155 src/protocols/silc/silc.c:805
+#: ../src/protocols/silc/ops.c:1298
+msgid "_More..."
+msgstr "_Más..."
+
+#: ../src/protocols/silc/ops.c:1369 ../src/protocols/silc/silc.c:1003
+#: src/protocols/silc/ops.c:1369 src/protocols/silc/silc.c:993
 msgid "Detach From Server"
 msgstr "Desligar del servidor"
 
-#: src/protocols/silc/ops.c:1155
+#: ../src/protocols/silc/ops.c:1369 src/protocols/silc/ops.c:1369
 msgid "Cannot detach"
 msgstr "No se puede desligar"
 
-#: src/protocols/silc/ops.c:1166
+#: ../src/protocols/silc/ops.c:1380 src/protocols/silc/ops.c:1380
 msgid "Cannot set topic"
 msgstr "No se puede cambiar el tema"
 
-#: src/protocols/silc/ops.c:1198
+#: ../src/protocols/silc/ops.c:1412 src/protocols/silc/ops.c:1412
 msgid "Failed to change nickname"
 msgstr "No se pudo cambiar el alias"
 
-#: src/protocols/silc/ops.c:1246
+#: ../src/protocols/silc/ops.c:1460 src/protocols/silc/ops.c:1460
 msgid "Roomlist"
 msgstr "Lista de salas"
 
-#: src/protocols/silc/ops.c:1246
+#: ../src/protocols/silc/ops.c:1460 src/protocols/silc/ops.c:1460
 msgid "Cannot get room list"
 msgstr "No se pudo obtener la lista de salas"
 
-#: src/protocols/silc/ops.c:1291
+#: ../src/protocols/silc/ops.c:1505 src/protocols/silc/ops.c:1505
 msgid "No public key was received"
 msgstr "No se ha recibido una clave pública"
 
-#: src/protocols/silc/ops.c:1304 src/protocols/silc/ops.c:1317
+#: ../src/protocols/silc/ops.c:1518 ../src/protocols/silc/ops.c:1531
+#: src/protocols/silc/ops.c:1518 src/protocols/silc/ops.c:1531
 msgid "Server Information"
 msgstr "Información del servidor"
 
-#: src/protocols/silc/ops.c:1305
+#: ../src/protocols/silc/ops.c:1519 src/protocols/silc/ops.c:1519
 msgid "Cannot get server information"
 msgstr "No se pudo obtener la información del servidor"
 
-#: src/protocols/silc/ops.c:1334 src/protocols/silc/ops.c:1343
+#: ../src/protocols/silc/ops.c:1548 ../src/protocols/silc/ops.c:1557
+#: src/protocols/silc/ops.c:1548 src/protocols/silc/ops.c:1557
 msgid "Server Statistics"
 msgstr "Estadísticas del servidor"
 
-#: src/protocols/silc/ops.c:1335
+#: ../src/protocols/silc/ops.c:1549 src/protocols/silc/ops.c:1549
 msgid "Cannot get server statistics"
 msgstr "No se pudieron obtener las estadísticas del servidor"
 
-#: src/protocols/silc/ops.c:1344
+#: ../src/protocols/silc/ops.c:1558 src/protocols/silc/ops.c:1558
 msgid "No server statistics available"
 msgstr "No se disponen de estadísticas del servidor"
 
-#: src/protocols/silc/ops.c:1366
+#: ../src/protocols/silc/ops.c:1580 src/protocols/silc/ops.c:1580
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9639,106 +11770,108 @@
 "Operadores de servidor en total: %d\n"
 "Operadores de encaminadores en total: %d\n"
 
-#: src/protocols/silc/ops.c:1389
+#: ../src/protocols/silc/ops.c:1603 src/protocols/silc/ops.c:1603
 msgid "Network Statistics"
 msgstr "Estadísticas de red"
 
-#: src/protocols/silc/ops.c:1397 src/protocols/silc/ops.c:1402
+#: ../src/protocols/silc/ops.c:1611 ../src/protocols/silc/ops.c:1616
+#: src/protocols/silc/ops.c:1611 src/protocols/silc/ops.c:1616
 msgid "Ping"
 msgstr "Ping"
 
-#: src/protocols/silc/ops.c:1397
+#: ../src/protocols/silc/ops.c:1611 src/protocols/silc/ops.c:1611
 msgid "Ping failed"
 msgstr "Falló el ping"
 
-#: src/protocols/silc/ops.c:1402
+#: ../src/protocols/silc/ops.c:1616 src/protocols/silc/ops.c:1616
 msgid "Ping reply received from server"
 msgstr "Se recibió una respuesta al ping del servidor"
 
-#: src/protocols/silc/ops.c:1410
+#: ../src/protocols/silc/ops.c:1624 src/protocols/silc/ops.c:1624
 msgid "Could not kill user"
 msgstr "No se pudo expulsar al usuario"
 
-#: src/protocols/silc/ops.c:1494
+#: ../src/protocols/silc/ops.c:1708 src/protocols/silc/ops.c:1708
 msgid "Error during connecting to SILC Server"
 msgstr "Se produjo un error durante la conexión al servidor SILC"
 
-#: src/protocols/silc/ops.c:1499
+#: ../src/protocols/silc/ops.c:1713 src/protocols/silc/ops.c:1713
 msgid "Key Exchange failed"
 msgstr "Falló el intercambio de claves"
 
-#: src/protocols/silc/ops.c:1508
+#: ../src/protocols/silc/ops.c:1722 src/protocols/silc/ops.c:1722
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "Se produjo un fallo al retomar la sesión desligada. Pulse «Reconectar» para "
 "crear una nueva conexión."
 
-#: src/protocols/silc/ops.c:1543
+#: ../src/protocols/silc/ops.c:1757 src/protocols/silc/ops.c:1757
 msgid "Disconnected by server"
 msgstr "Desconectado por el servidor"
 
-#: src/protocols/silc/ops.c:1605 src/protocols/silc/ops.c:1652
-#: src/protocols/silc/silc.c:194
+#: ../src/protocols/silc/ops.c:1819 ../src/protocols/silc/ops.c:1866
+#: ../src/protocols/silc/silc.c:195 src/protocols/silc/ops.c:1819
+#: src/protocols/silc/ops.c:1866 src/protocols/silc/silc.c:195
 msgid "Resuming session"
 msgstr "Reanudando la sesión"
 
-#: src/protocols/silc/ops.c:1607
+#: ../src/protocols/silc/ops.c:1821 src/protocols/silc/ops.c:1821
 msgid "Authenticating connection"
 msgstr "Autenticando la conexión"
 
-#: src/protocols/silc/ops.c:1654
+#: ../src/protocols/silc/ops.c:1868 src/protocols/silc/ops.c:1868
 msgid "Verifying server public key"
 msgstr "Comprobando la clave pública del servidor"
 
-#: src/protocols/silc/ops.c:1695
+#: ../src/protocols/silc/ops.c:1909 src/protocols/silc/ops.c:1909
 msgid "Passphrase required"
 msgstr "Se necesita una contraseña"
 
-#: src/protocols/silc/ops.c:1724
+#: ../src/protocols/silc/ops.c:1938 src/protocols/silc/ops.c:1938
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
 "Fallo: Existe una diferencia en las versiones, por favor, actualice su "
 "cliente"
 
-#: src/protocols/silc/ops.c:1727
+#: ../src/protocols/silc/ops.c:1941 src/protocols/silc/ops.c:1941
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Fallo: El servidor remoto no soporta/confía en su clave pública"
 
-#: src/protocols/silc/ops.c:1730
+#: ../src/protocols/silc/ops.c:1944 src/protocols/silc/ops.c:1944
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Fallo: El servidor remoto no soporta el grupo de IC propuesto"
 
-#: src/protocols/silc/ops.c:1733
+#: ../src/protocols/silc/ops.c:1947 src/protocols/silc/ops.c:1947
 msgid "Failure: Remote does not support proposed cipher"
 msgstr ""
 "Fallo: El servidor remoto no soporta los sistemas de cifrado propuestos"
 
-#: src/protocols/silc/ops.c:1736
+#: ../src/protocols/silc/ops.c:1950 src/protocols/silc/ops.c:1950
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Fallo: El servidor remoto no soporta los PKCS propuestos"
 
-#: src/protocols/silc/ops.c:1739
+#: ../src/protocols/silc/ops.c:1953 src/protocols/silc/ops.c:1953
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Fallo: El servidor remoto no soporta la función de hash propuesta"
 
-#: src/protocols/silc/ops.c:1742
+#: ../src/protocols/silc/ops.c:1956 src/protocols/silc/ops.c:1956
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Fallo: El servidor remoto no soporta el HMAC propuesto"
 
-#: src/protocols/silc/ops.c:1744
+#: ../src/protocols/silc/ops.c:1958 src/protocols/silc/ops.c:1958
 msgid "Failure: Incorrect signature"
 msgstr "Fallo: Firma incorrecta"
 
-#: src/protocols/silc/ops.c:1746
+#: ../src/protocols/silc/ops.c:1960 src/protocols/silc/ops.c:1960
 msgid "Failure: Invalid cookie"
 msgstr "Fallo: Cookie inválida"
 
-#: src/protocols/silc/ops.c:1757
+#: ../src/protocols/silc/ops.c:1971 src/protocols/silc/ops.c:1971
 msgid "Failure: Authentication failed"
 msgstr "Fallo: Falló la autenticación"
 
-#: src/protocols/silc/pk.c:103
+#: ../src/protocols/silc/pk.c:103 src/protocols/silc/pk.c:103
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
@@ -9747,12 +11880,12 @@
 "Se recibió la clave pública de %s. Su copia local no coincide con esta "
 "clave. ¿Desea aceptar la clave pública de todas formas?"
 
-#: src/protocols/silc/pk.c:108
+#: ../src/protocols/silc/pk.c:108 src/protocols/silc/pk.c:108
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "Se recibió la clave pública de %s. ¿Desea aceptar esta clave pública?"
 
-#: src/protocols/silc/pk.c:112
+#: ../src/protocols/silc/pk.c:112 src/protocols/silc/pk.c:112
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -9765,48 +11898,62 @@
 "%s\n"
 "%s\n"
 
+#: ../src/protocols/silc/pk.c:115 ../src/protocols/silc/pk.c:140
 #: src/protocols/silc/pk.c:115 src/protocols/silc/pk.c:140
 msgid "Verify Public Key"
 msgstr "Verificar la clave pública"
 
-#: src/protocols/silc/pk.c:119
-msgid "View..."
-msgstr "Ver..."
-
-#: src/protocols/silc/pk.c:141
+#: ../src/protocols/silc/pk.c:119
+msgid "_View..."
+msgstr "_Ver..."
+
+#: ../src/protocols/silc/pk.c:141 src/protocols/silc/pk.c:141
 msgid "Unsupported public key type"
 msgstr "Tipo de clave pública no soportada"
 
-#: src/protocols/silc/silc.c:154
+#: ../src/protocols/silc/silc.c:155 src/protocols/silc/silc.c:155
 msgid "Connection failed"
 msgstr "Falló la conexión"
 
-#: src/protocols/silc/silc.c:186
+#: ../src/protocols/silc/silc.c:187 src/protocols/silc/silc.c:187
 msgid "Cannot initialize SILC Client connection"
 msgstr "No se pudo inicializar al conexión del cliente SILC"
 
-#: src/protocols/silc/silc.c:197
+#: ../src/protocols/silc/silc.c:198 src/protocols/silc/silc.c:198
 msgid "Performing key exchange"
 msgstr "Realizando intercambio de claves"
 
-#: src/protocols/silc/silc.c:270
+#: ../src/protocols/silc/silc.c:283 src/protocols/silc/silc.c:273
 msgid "Out of memory"
 msgstr "Sin memoria"
 
+#: ../src/protocols/silc/silc.c:324
+msgid "Cannot initialize SILC protocol"
+msgstr "No se pudo inicializar el protocolo SILC"
+
+#: ../src/protocols/silc/silc.c:331
+msgid "Cannot find/access ~/.silc directory"
+msgstr "No se puede encontrar o acceder al directorio ~/.silc"
+
 #. Progress
-#: src/protocols/silc/silc.c:309
+#: ../src/protocols/silc/silc.c:336 src/protocols/silc/silc.c:326
 msgid "Connecting to SILC Server"
 msgstr "Conectando con el servidor SILC"
 
-#: src/protocols/silc/silc.c:630
+#: ../src/protocols/silc/silc.c:345
+#, c-format
+msgid "Could not load SILC key pair: %s"
+msgstr "No se pudo cargar la clave pública SILC: %s"
+
+#: ../src/protocols/silc/silc.c:365
+msgid "Unable to create connection"
+msgstr "No se pudo crear la conexión"
+
+#: ../src/protocols/silc/silc.c:664 src/protocols/silc/silc.c:654
 msgid "Your Current Mood"
 msgstr "Su estado de ánimo actual"
 
-#: src/protocols/silc/silc.c:632
-msgid "Normal"
-msgstr "Normal"
-
-#: src/protocols/silc/silc.c:657
+#: ../src/protocols/silc/silc.c:691 src/protocols/silc/silc.c:681
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9814,43 +11961,47 @@
 "\n"
 "Sus métodos de contacto preferidos"
 
-#: src/protocols/silc/silc.c:665 src/protocols/silc/util.c:517
+#: ../src/protocols/silc/silc.c:699 ../src/protocols/silc/util.c:518
+#: src/protocols/silc/silc.c:689 src/protocols/silc/util.c:518
 msgid "SMS"
 msgstr "SMS"
 
-#: src/protocols/silc/silc.c:667 src/protocols/silc/util.c:519
+#: ../src/protocols/silc/silc.c:701 ../src/protocols/silc/util.c:520
+#: src/protocols/silc/silc.c:691 src/protocols/silc/util.c:520
 msgid "MMS"
 msgstr "MMS"
 
-#: src/protocols/silc/silc.c:669 src/protocols/silc/util.c:521
+#: ../src/protocols/silc/silc.c:703 ../src/protocols/silc/util.c:522
+#: src/protocols/silc/silc.c:693 src/protocols/silc/util.c:522
 msgid "Video Conferencing"
 msgstr "Video conferencia"
 
-#: src/protocols/silc/silc.c:674
+#: ../src/protocols/silc/silc.c:708 src/protocols/silc/silc.c:698
 msgid "Your Current Status"
 msgstr "Su estado actual"
 
-#: src/protocols/silc/silc.c:681
+#: ../src/protocols/silc/silc.c:715 src/protocols/silc/silc.c:705
 msgid "Online Services"
 msgstr "Servicios en línea"
 
-#: src/protocols/silc/silc.c:684
+#: ../src/protocols/silc/silc.c:718 src/protocols/silc/silc.c:708
 msgid "Let others see what services you are using"
 msgstr "Permitir que otros consulten qué servicios está utilizando"
 
-#: src/protocols/silc/silc.c:690
+#: ../src/protocols/silc/silc.c:724 src/protocols/silc/silc.c:714
 msgid "Let others see what computer you are using"
 msgstr "Permitir que otros consulten qué ordenador está utilizando"
 
-#: src/protocols/silc/silc.c:697
+#: ../src/protocols/silc/silc.c:731 src/protocols/silc/silc.c:721
 msgid "Your VCard File"
 msgstr "Su archivo VCard"
 
-#: src/protocols/silc/silc.c:710 src/protocols/silc/silc.c:711
+#: ../src/protocols/silc/silc.c:743 ../src/protocols/silc/silc.c:744
+#: src/protocols/silc/silc.c:733 src/protocols/silc/silc.c:734
 msgid "User Online Status Attributes"
 msgstr "Atributos del estado del usuario en línea"
 
-#: src/protocols/silc/silc.c:712
+#: ../src/protocols/silc/silc.c:745 src/protocols/silc/silc.c:735
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -9860,131 +12011,175 @@
 "línea así como su información personal. Por favor, rellene la información "
 "que desea que otros usuarios vean de vd."
 
-#: src/protocols/silc/silc.c:752 src/protocols/silc/silc.c:758
-#: src/protocols/silc/silc.c:1162
+#: ../src/protocols/silc/silc.c:785 ../src/protocols/silc/silc.c:791
+#: ../src/protocols/silc/silc.c:1431 src/protocols/silc/silc.c:775
+#: src/protocols/silc/silc.c:781 src/protocols/silc/silc.c:1421
 msgid "Message of the Day"
 msgstr "Mensaje del día"
 
-#: src/protocols/silc/silc.c:752
+#: ../src/protocols/silc/silc.c:785 src/protocols/silc/silc.c:775
 msgid "No Message of the Day available"
 msgstr "No hay disponible un mensaje del día"
 
-#: src/protocols/silc/silc.c:753 src/protocols/silc/silc.c:1157
+#: ../src/protocols/silc/silc.c:786 ../src/protocols/silc/silc.c:1426
+#: src/protocols/silc/silc.c:776 src/protocols/silc/silc.c:1416
 msgid "There is no Message of the Day associated with this connection"
 msgstr "No hay un mensaje del día asociado con esta conexión"
 
-#: src/protocols/silc/silc.c:800
+#: src/protocols/silc/silc.c:827 src/protocols/silc/silc.c:871
+#: src/protocols/silc/silc.c:942 src/protocols/silc/silc.c:943
+msgid "Create New SILC Key Pair"
+msgstr "Crear nuevo par de claves SILC"
+
+#: src/protocols/silc/silc.c:827
+msgid "Passphrases do not match"
+msgstr "Las contraseñas no coinciden."
+
+#: src/protocols/silc/silc.c:871
+msgid "Key Pair Generation failed"
+msgstr "Falló la generación de claves"
+
+#: src/protocols/silc/silc.c:910
+msgid "Key Length"
+msgstr "Longitud de clave"
+
+#: src/protocols/silc/silc.c:912
+msgid "Public Key File"
+msgstr "Archivo de clave pública"
+
+#: src/protocols/silc/silc.c:914
+msgid "Private Key File"
+msgstr "Archivo de clave privada"
+
+#: src/protocols/silc/silc.c:923
+msgid "Real Name"
+msgstr "Nombre real"
+
+#: src/protocols/silc/silc.c:937
+msgid "Re-type Passphrase"
+msgstr "Escriba nuevamente la contraseña"
+
+#: src/protocols/silc/silc.c:944
+msgid "Generate Key Pair"
+msgstr "Generar par de claves"
+
+#: ../src/protocols/silc/silc.c:998 src/protocols/silc/silc.c:988
 msgid "Online Status"
 msgstr "Estado en línea"
 
-#: src/protocols/silc/silc.c:809
+#: ../src/protocols/silc/silc.c:1007 src/protocols/silc/silc.c:997
 msgid "View Message of the Day"
 msgstr "Mostrar mensaje del día"
 
-#: src/protocols/silc/silc.c:882
+#: src/protocols/silc/silc.c:1001
+msgid "Create SILC Key Pair..."
+msgstr "Crear par de claves SILC..."
+
+#: ../src/protocols/silc/silc.c:1110 src/protocols/silc/silc.c:1100
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "El usuario <I>%s</I> no está en la red"
 
-#: src/protocols/silc/silc.c:1033
+#: ../src/protocols/silc/silc.c:1302 src/protocols/silc/silc.c:1292
 msgid "Topic too long"
 msgstr "Tema demasiado largo"
 
-#: src/protocols/silc/silc.c:1114
+#: ../src/protocols/silc/silc.c:1383 src/protocols/silc/silc.c:1373
 msgid "You must specify a nick"
 msgstr "Debe especificar un apodo"
 
-#: src/protocols/silc/silc.c:1216
+#: ../src/protocols/silc/silc.c:1485 src/protocols/silc/silc.c:1475
 #, c-format
 msgid "channel %s not found"
 msgstr "no se ha encontrado el canal %s"
 
-#: src/protocols/silc/silc.c:1221
+#: ../src/protocols/silc/silc.c:1490 src/protocols/silc/silc.c:1480
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "los modos del canal de %s son: %s"
 
 # Banned puede ser expulsar o censurar, prefiero expulsar. jfs.
-#: src/protocols/silc/silc.c:1223
+#: ../src/protocols/silc/silc.c:1492 src/protocols/silc/silc.c:1482
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "no se han definido modos de canal para %s"
 
-#: src/protocols/silc/silc.c:1236
+#: ../src/protocols/silc/silc.c:1505 src/protocols/silc/silc.c:1495
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "No se pudieron fijar los modos de canal para %s"
 
-#: src/protocols/silc/silc.c:1266
+#: ../src/protocols/silc/silc.c:1535 src/protocols/silc/silc.c:1525
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "Orden desconocida: %s, (puede ser un error de Gaim)"
 
-#: src/protocols/silc/silc.c:1329
+#: ../src/protocols/silc/silc.c:1598 src/protocols/silc/silc.c:1588
 msgid "part [channel]:  Leave the chat"
 msgstr "part [canal]:  Abandonar un chat"
 
-#: src/protocols/silc/silc.c:1333
+#: ../src/protocols/silc/silc.c:1602 src/protocols/silc/silc.c:1592
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [canal]:  Abandonar un chat"
 
-#: src/protocols/silc/silc.c:1337
+#: ../src/protocols/silc/silc.c:1606 src/protocols/silc/silc.c:1596
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;nuevo tema&gt;]:  Ver o cambiar el tema"
 
-#: src/protocols/silc/silc.c:1342
+#: ../src/protocols/silc/silc.c:1611 src/protocols/silc/silc.c:1601
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;canal&gt; [&lt;contraseña&gt;:  Unirse a un chat en esta red"
 
-#: src/protocols/silc/silc.c:1346
+#: ../src/protocols/silc/silc.c:1615 src/protocols/silc/silc.c:1605
 msgid "list:  List channels on this network"
 msgstr "list:  Mostrar los canales en esta red"
 
-#: src/protocols/silc/silc.c:1350
+#: ../src/protocols/silc/silc.c:1619 src/protocols/silc/silc.c:1609
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;apodo&gt;:  Mostrar información del apodo"
 
-#: src/protocols/silc/silc.c:1354 src/protocols/zephyr/zephyr.c:2597
+#: ../src/protocols/silc/silc.c:1623 ../src/protocols/zephyr/zephyr.c:2602
+#: src/protocols/silc/silc.c:1613 src/protocols/zephyr/zephyr.c:2598
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;apodo&gt; &lt;mensaje&gt;:  Enviar un mensaje privado a un usuario"
 
-#: src/protocols/silc/silc.c:1358
+#: ../src/protocols/silc/silc.c:1627 src/protocols/silc/silc.c:1617
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;apodo&gt; [&lt;mensaje&gt;]:  Enviar un mensaje privado al usuario"
 
-#: src/protocols/silc/silc.c:1362
+#: ../src/protocols/silc/silc.c:1631 src/protocols/silc/silc.c:1621
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Mostrar el mensaje del día del servidor"
 
-#: src/protocols/silc/silc.c:1366
+#: ../src/protocols/silc/silc.c:1635 src/protocols/silc/silc.c:1625
 msgid "detach:  Detach this session"
 msgstr "detach:  Desligar esta sesión"
 
-#: src/protocols/silc/silc.c:1370
+#: ../src/protocols/silc/silc.c:1639 src/protocols/silc/silc.c:1629
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr ""
 "quit [mensaje]:  Desconecta del servidor actual opcionalmente indicando un "
 "mensaje"
 
-#: src/protocols/silc/silc.c:1374
+#: ../src/protocols/silc/silc.c:1643 src/protocols/silc/silc.c:1633
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;orden&gt;:  Ejecutar una orden cualquiera del cliente SILC"
 
-#: src/protocols/silc/silc.c:1380
+#: ../src/protocols/silc/silc.c:1649 src/protocols/silc/silc.c:1639
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;nick&gt; [-pubkey|%lt;razón%gt;]:  Matar un alias"
 
-#: src/protocols/silc/silc.c:1384
+#: ../src/protocols/silc/silc.c:1653 src/protocols/silc/silc.c:1643
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;nuevo apodo&gt;:  Cambia su apodo"
 
-#: src/protocols/silc/silc.c:1388
+#: ../src/protocols/silc/silc.c:1657 src/protocols/silc/silc.c:1647
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;apodo&gt;:  Mostrar información del apodo"
 
-#: src/protocols/silc/silc.c:1392
+#: ../src/protocols/silc/silc.c:1661 src/protocols/silc/silc.c:1651
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -9992,7 +12187,7 @@
 "cmode &lt;canal&gt; [+|&lt;modos-&gt;] [argumentos]:  Cambia o muestra los "
 "modos del canal"
 
-#: src/protocols/silc/silc.c:1396
+#: ../src/protocols/silc/silc.c:1665 src/protocols/silc/silc.c:1655
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -10000,15 +12195,15 @@
 "cumode &lt;canal&gt; +|-&lt;modos&gt &lt;apodo&gt;:  Cambia los modos del "
 "usuario o del canal"
 
-#: src/protocols/silc/silc.c:1400
+#: ../src/protocols/silc/silc.c:1669 src/protocols/silc/silc.c:1659
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;modos_usuario&gt;:  Establecer sus modos en la red"
 
-#: src/protocols/silc/silc.c:1404
+#: ../src/protocols/silc/silc.c:1673 src/protocols/silc/silc.c:1663
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;nick&gt; [-pubkey]:  Establece privilegios de operador"
 
-#: src/protocols/silc/silc.c:1408
+#: ../src/protocols/silc/silc.c:1677 src/protocols/silc/silc.c:1667
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -10016,39 +12211,39 @@
 "invite &lt;canal&gt; [-|+]&lt;apodo&gt;:   invita a un apodo o añade/elimina "
 "el apodo de la lista de invitados para el canal"
 
-#: src/protocols/silc/silc.c:1412
+#: ../src/protocols/silc/silc.c:1681 src/protocols/silc/silc.c:1671
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;canal&gt; &lt;apodo&gt; [comentario]:  Echar a un cliente del canal"
 
-#: src/protocols/silc/silc.c:1416
+#: ../src/protocols/silc/silc.c:1685 src/protocols/silc/silc.c:1675
 msgid "info [server]:  View server administrative details"
 msgstr "info [servidor]:  Consulta detalles administrativos del servidor"
 
-#: src/protocols/silc/silc.c:1420
+#: ../src/protocols/silc/silc.c:1689 src/protocols/silc/silc.c:1679
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;canal&gt; +|-&lt;apodo&gt;]:  Expulsar a un cliente del canal"
 
-#: src/protocols/silc/silc.c:1424
+#: ../src/protocols/silc/silc.c:1693 src/protocols/silc/silc.c:1683
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;apodo|servidor&gt;:  Obtiene la clave pública del servidor o del "
 "cliente"
 
-#: src/protocols/silc/silc.c:1428
+#: ../src/protocols/silc/silc.c:1697 src/protocols/silc/silc.c:1687
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Muestra las estadísticas del servidor y de la red"
 
-#: src/protocols/silc/silc.c:1432
+#: ../src/protocols/silc/silc.c:1701 src/protocols/silc/silc.c:1691
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Enviar un PING al servidor al que está conectado"
 
-#: src/protocols/silc/silc.c:1437
+#: ../src/protocols/silc/silc.c:1706 src/protocols/silc/silc.c:1696
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr ""
 "users &lt;canal&gt;:  Obtiene la lista de los usuarios que están en el canal"
 
-#: src/protocols/silc/silc.c:1441
+#: ../src/protocols/silc/silc.c:1710 src/protocols/silc/silc.c:1700
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -10056,30 +12251,6 @@
 "names [-count|-ops|-halfops|-voices|-normal] &lt;canal(s)&gt;:  Muestra los "
 "usuarios del canal o canales"
 
-#: src/protocols/silc/silc.c:1453
-msgid "Instant Messages"
-msgstr "Mensajes instantáneos"
-
-#: src/protocols/silc/silc.c:1458
-msgid "Digitally sign all IM messages"
-msgstr "Firmar digitalmente todos los mensajes instantáneos"
-
-#: src/protocols/silc/silc.c:1463
-msgid "Verify all IM message signatures"
-msgstr "Verificar todas las firmas de los mensajes MI"
-
-#: src/protocols/silc/silc.c:1466
-msgid "Channel Messages"
-msgstr "Mensajes del canal"
-
-#: src/protocols/silc/silc.c:1471
-msgid "Digitally sign all channel messages"
-msgstr "Firmar digitalmente todos los mensajes del canal"
-
-#: src/protocols/silc/silc.c:1476
-msgid "Verify all channel message signatures"
-msgstr "Verificar todas las firmas de los mensajes de los canales"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -10089,91 +12260,112 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1564
+#: ../src/protocols/silc/silc.c:1820 src/protocols/silc/silc.c:1800
 msgid "SILC Protocol Plugin"
 msgstr "Complemento de protocolo SILC"
 
 #. *  description
-#: src/protocols/silc/silc.c:1566
+#: ../src/protocols/silc/silc.c:1822 src/protocols/silc/silc.c:1802
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Protocolo de Conferencia segura en vivo en Internet (SILC)"
 
-#: src/protocols/silc/silc.c:1600
+#: ../src/protocols/silc/silc.c:1859 src/protocols/silc/silc.c:1839
 msgid "Public Key file"
 msgstr "Fichero de clave pública"
 
-#: src/protocols/silc/silc.c:1604
+#: ../src/protocols/silc/silc.c:1863 src/protocols/silc/silc.c:1843
 msgid "Private Key file"
 msgstr "Fichero de clave privada"
 
-#: src/protocols/silc/silc.c:1607
+#: ../src/protocols/silc/silc.c:1873 src/protocols/silc/silc.c:1853
+msgid "Cipher"
+msgstr "Cifrado"
+
+#: ../src/protocols/silc/silc.c:1883 src/protocols/silc/silc.c:1863
+msgid "HMAC"
+msgstr "HMAC"
+
+#: ../src/protocols/silc/silc.c:1886 src/protocols/silc/silc.c:1866
 msgid "Public key authentication"
 msgstr "Autenticación de clave pública"
 
-#: src/protocols/silc/silc.c:1611
+#: ../src/protocols/silc/silc.c:1889 src/protocols/silc/silc.c:1869
 msgid "Reject watching by other users"
 msgstr "Impedir que otros usuarios miren"
 
-#: src/protocols/silc/silc.c:1614
+#: ../src/protocols/silc/silc.c:1892 src/protocols/silc/silc.c:1872
 msgid "Block invites"
 msgstr "Bloquear invitaciones"
 
-#: src/protocols/silc/silc.c:1617
+#: ../src/protocols/silc/silc.c:1895 src/protocols/silc/silc.c:1875
 msgid "Block IMs without Key Exchange"
 msgstr "Bloquear MIs que no hagan un intercambio de claves"
 
-#: src/protocols/silc/silc.c:1620
+#: ../src/protocols/silc/silc.c:1898 src/protocols/silc/silc.c:1878
 msgid "Reject online status attribute requests"
 msgstr "Rechazar solicitudes de los atributos del estado en línea"
 
-#: src/protocols/silc/util.c:205 src/protocols/silc/util.c:230
+#: ../src/protocols/silc/silc.c:1901 src/protocols/silc/silc.c:1881
+msgid "Block messages to whiteboard"
+msgstr "Bloquear mensajes a la pizarra"
+
+#: ../src/protocols/silc/silc.c:1904 src/protocols/silc/silc.c:1884
+msgid "Automatically open whiteboard"
+msgstr "Abrir la pizarra automáticamente"
+
+#: src/protocols/silc/silc.c:1887
+msgid "Digitally sign and verify all messages"
+msgstr "Firmar digitalmente todos los mensajes instantáneos"
+
+#: ../src/protocols/silc/util.c:206 ../src/protocols/silc/util.c:231
+#: src/protocols/silc/util.c:206 src/protocols/silc/util.c:231
 msgid "Creating SILC key pair..."
 msgstr "Creando el par de claves 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:313
+#: ../src/protocols/silc/util.c:314 src/protocols/silc/util.c:314
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Nombre real: \t%s\n"
 
-#: src/protocols/silc/util.c:315
+#: ../src/protocols/silc/util.c:316 src/protocols/silc/util.c:316
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Nombre de usuario: \t%s\n"
 
-#: src/protocols/silc/util.c:317
+#: ../src/protocols/silc/util.c:318 src/protocols/silc/util.c:318
 #, c-format
 msgid "EMail: \t\t%s\n"
 msgstr "Correo electrónico: \t\t%s\n"
 
-#: src/protocols/silc/util.c:319
+#: ../src/protocols/silc/util.c:320 src/protocols/silc/util.c:320
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Nombre de servidor: \t%s\n"
 
-#: src/protocols/silc/util.c:321
+#: ../src/protocols/silc/util.c:322 src/protocols/silc/util.c:322
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organización: \t%s\n"
 
-#: src/protocols/silc/util.c:323
+#: ../src/protocols/silc/util.c:324 src/protocols/silc/util.c:324
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "País: \t%s\n"
 
-#: src/protocols/silc/util.c:324
+#: ../src/protocols/silc/util.c:325 src/protocols/silc/util.c:325
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritmo:      %s\n"
 
-#: src/protocols/silc/util.c:325
+#: ../src/protocols/silc/util.c:326 src/protocols/silc/util.c:326
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Longitud de clave: \t%d bits\n"
 
-#: src/protocols/silc/util.c:327
+#: ../src/protocols/silc/util.c:328 src/protocols/silc/util.c:328
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -10184,7 +12376,7 @@
 "%s\n"
 "\n"
 
-#: src/protocols/silc/util.c:328
+#: ../src/protocols/silc/util.c:329 src/protocols/silc/util.c:329
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -10193,142 +12385,227 @@
 "Huella babble de la clave pública:\n"
 "%s"
 
-#: src/protocols/silc/util.c:332 src/protocols/silc/util.c:333
+#: ../src/protocols/silc/util.c:333 ../src/protocols/silc/util.c:334
+#: src/protocols/silc/util.c:333 src/protocols/silc/util.c:334
 msgid "Public Key Information"
 msgstr "Información de clave pública"
 
-#: src/protocols/silc/util.c:515
+#: ../src/protocols/silc/util.c:516 src/protocols/silc/util.c:516
 msgid "Paging"
 msgstr "Enviar"
 
-#: src/protocols/silc/util.c:539
+#: ../src/protocols/silc/util.c:540 src/protocols/silc/util.c:540
 msgid "Computer"
 msgstr "Ordenador"
 
-#: src/protocols/silc/util.c:543
+#: ../src/protocols/silc/util.c:544 src/protocols/silc/util.c:544
 msgid "PDA"
 msgstr "PDA"
 
-#: src/protocols/silc/util.c:545
+#: ../src/protocols/silc/util.c:546 src/protocols/silc/util.c:546
 msgid "Terminal"
 msgstr "Terminal"
 
-#: src/protocols/toc/toc.c:139
+#: ../src/protocols/silc/wb.c:284 src/protocols/silc/wb.c:284
+#, c-format
+msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
+msgstr "%s envió un mensaje a la pizarra. ¿Quiere abrir la pizarra?"
+
+#: ../src/protocols/silc/wb.c:288 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 "%s envió un mensaje a la pizarra del canal %s. ¿Quiere abrir la pizarra?"
+
+#: ../src/protocols/silc/wb.c:302 src/protocols/silc/wb.c:302
+msgid "Whiteboard"
+msgstr "Pizarra"
+
+#. TODO: do we really want to disconnect on a failure to write?
+#: ../src/protocols/simple/simple.c:415
+msgid "Could not write"
+msgstr "No se pudo escribir"
+
+#: ../src/protocols/simple/simple.c:430 ../src/protocols/simple/simple.c:1331
+msgid "Could not connect"
+msgstr "No se pudo conectar"
+
+#: ../src/protocols/simple/simple.c:924
+msgid "Wrong Password"
+msgstr "Contraseña errónea"
+
+#: ../src/protocols/simple/simple.c:1362 ../src/protocols/simple/simple.c:1401
+#: ../src/protocols/simple/simple.c:1413 ../src/protocols/simple/simple.c:1460
+#: src/protocols/simple/simple.c:1227
+msgid "Could not create listen socket"
+msgstr "No se pudo crear el socket de escucha"
+
+#: ../src/protocols/simple/simple.c:1383
+msgid "Couldn't resolve host"
+msgstr "No se pudo resolver el nombre"
+
+#: ../src/protocols/simple/simple.c:1481 src/protocols/simple/simple.c:1281
+msgid "SIP usernames may not contain whitespaces or @ symbols"
+msgstr "Los nombres de usuario SIP no pueden tener espacios en blanco ni el símbolo @"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../src/protocols/simple/simple.c:1643 src/protocols/simple/simple.c:1428
+msgid "SIP/SIMPLE Protocol Plugin"
+msgstr "Complemento de protocolo SIP/SIMPLE"
+
+#. *  summary
+#: ../src/protocols/simple/simple.c:1644 src/protocols/simple/simple.c:1429
+msgid "The SIP/SIMPLE Protocol Plugin"
+msgstr "El complemento de protocolo SIP/SIMPLE"
+
+#: src/protocols/simple/simple.c:1451
+msgid "Publish status (note: everyone may watch you)"
+msgstr "Estatus público (nota: todos podrán verlo)"
+
+#: ../src/protocols/simple/simple.c:1672 src/protocols/simple/simple.c:1454
+msgid "Use UDP"
+msgstr "Utilizar UDP"
+
+#: src/protocols/simple/simple.c:1456
+msgid "Use proxy"
+msgstr "Usar proxy"
+
+#: ../src/protocols/simple/simple.c:1676 src/protocols/simple/simple.c:1458
+msgid "Proxy"
+msgstr "Proxy"
+
+#: ../src/protocols/simple/simple.c:1678
+msgid "Auth User"
+msgstr "Usuario de autenticación"
+
+#: ../src/protocols/simple/simple.c:1680
+msgid "Auth Domain"
+msgstr "Dominio de autenticación"
+
+#: ../src/protocols/toc/toc.c:139 src/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr "Buscando %s"
 
-#: src/protocols/toc/toc.c:148
+#: ../src/protocols/toc/toc.c:148 src/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Falló la conexión a %s"
 
-#: src/protocols/toc/toc.c:200
+#: ../src/protocols/toc/toc.c:200 src/protocols/toc/toc.c:200
 #, c-format
 msgid "Signon: %s"
 msgstr "Conectado: %s"
 
-#: src/protocols/toc/toc.c:482
+#: ../src/protocols/toc/toc.c:482 src/protocols/toc/toc.c:482
 #, c-format
 msgid "Unable to write file %s."
 msgstr "No se pudo escribir el archivo %s."
 
-#: src/protocols/toc/toc.c:485
+#: ../src/protocols/toc/toc.c:485 src/protocols/toc/toc.c:485
 #, c-format
 msgid "Unable to read file %s."
 msgstr "No se pudo leer el archivo %s."
 
-#: src/protocols/toc/toc.c:488
+#: ../src/protocols/toc/toc.c:488 src/protocols/toc/toc.c:488
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Mensaje demasiado largo, los últimos %s bytes fueron borrados."
 
-#: src/protocols/toc/toc.c:491
+#: ../src/protocols/toc/toc.c:491 src/protocols/toc/toc.c:491
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s no está conectado ahora."
 
-#: src/protocols/toc/toc.c:494
+#: ../src/protocols/toc/toc.c:494 src/protocols/toc/toc.c:494
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "No se permiten advertencias de %s."
 
-#: src/protocols/toc/toc.c:497
+#: ../src/protocols/toc/toc.c:497 src/protocols/toc/toc.c:497
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr ""
 "El mensaje ha sido descartado, usted esta excediendo el límite de velocidad "
 "del servidor."
 
-#: src/protocols/toc/toc.c:500
+#: ../src/protocols/toc/toc.c:500 src/protocols/toc/toc.c:500
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "No está disponible el chat en %s."
 
-#: src/protocols/toc/toc.c:503
+#: ../src/protocols/toc/toc.c:503 src/protocols/toc/toc.c:503
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Esta enviando mensajes demasiado rápido a %s."
 
-#: src/protocols/toc/toc.c:506
+#: ../src/protocols/toc/toc.c:506 src/protocols/toc/toc.c:506
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Usted perdió un MI de %s porque era demasiado largo."
 
-#: src/protocols/toc/toc.c:509
+#: ../src/protocols/toc/toc.c:509 src/protocols/toc/toc.c:509
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "Usted perdió un MI de %s porque fue mandado demasiado rápido."
 
-#: src/protocols/toc/toc.c:512
+#: ../src/protocols/toc/toc.c:512 src/protocols/toc/toc.c:512
 msgid "Failure."
 msgstr "Fallo."
 
-#: src/protocols/toc/toc.c:515
+#: ../src/protocols/toc/toc.c:515 src/protocols/toc/toc.c:515
 msgid "Too many matches."
 msgstr "Demasiados resultados."
 
-#: src/protocols/toc/toc.c:518
+#: ../src/protocols/toc/toc.c:518 src/protocols/toc/toc.c:518
 msgid "Need more qualifiers."
 msgstr "Necesito más calificadores."
 
-#: src/protocols/toc/toc.c:521
+#: ../src/protocols/toc/toc.c:521 src/protocols/toc/toc.c:521
 msgid "Dir service temporarily unavailable."
 msgstr "Servicio de directorio temporalmente no disponible."
 
-#: src/protocols/toc/toc.c:524
+#: ../src/protocols/toc/toc.c:524 src/protocols/toc/toc.c:524
 msgid "Email lookup restricted."
 msgstr "Búsqueda de direcciones de correo electrónico restringida."
 
-#: src/protocols/toc/toc.c:527
+#: ../src/protocols/toc/toc.c:527 src/protocols/toc/toc.c:527
 msgid "Keyword ignored."
 msgstr "Palabra clave ignorada."
 
-#: src/protocols/toc/toc.c:530
+#: ../src/protocols/toc/toc.c:530 src/protocols/toc/toc.c:530
 msgid "No keywords."
 msgstr "Sin palabras clave."
 
-#: src/protocols/toc/toc.c:533
+#: ../src/protocols/toc/toc.c:533 src/protocols/toc/toc.c:533
 msgid "User has no directory information."
 msgstr "El usuario no tiene información en el directorio."
 
-#: src/protocols/toc/toc.c:537
+#: ../src/protocols/toc/toc.c:537 src/protocols/toc/toc.c:537
 msgid "Country not supported."
 msgstr "País no soportado."
 
-#: src/protocols/toc/toc.c:540
+#: ../src/protocols/toc/toc.c:540 src/protocols/toc/toc.c:540
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Fallo desconocido: %s."
 
-#: src/protocols/toc/toc.c:546
+#: ../src/protocols/toc/toc.c:546 src/protocols/toc/toc.c:546
 msgid "The service is temporarily unavailable."
 msgstr "Servicio temporalmente no disponible."
 
-#: src/protocols/toc/toc.c:549
+#: ../src/protocols/toc/toc.c:549 src/protocols/toc/toc.c:549
 msgid "Your warning level is currently too high to log in."
 msgstr "Su nivel de advertencias es demasiado alto para conectarse."
 
-#: src/protocols/toc/toc.c:552
+#: ../src/protocols/toc/toc.c:552 src/protocols/toc/toc.c:552
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
@@ -10337,41 +12614,41 @@
 "inténtelo de nuevo. Si sigue intentándolo, necesitará esperar incluso más "
 "tiempo."
 
-#: src/protocols/toc/toc.c:554
+#: ../src/protocols/toc/toc.c:554 src/protocols/toc/toc.c:554
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Ha ocurrido un error desconocido al conectarse: %s."
 
-#: src/protocols/toc/toc.c:557
+#: ../src/protocols/toc/toc.c:557 src/protocols/toc/toc.c:557
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Un error desconocido, %d, ha ocurrido. Info: %s"
 
-#: src/protocols/toc/toc.c:584
+#: ../src/protocols/toc/toc.c:584 src/protocols/toc/toc.c:584
 msgid "Invalid Groupname"
 msgstr "Nombre de grupo inválido"
 
-#: src/protocols/toc/toc.c:668
+#: ../src/protocols/toc/toc.c:668 src/protocols/toc/toc.c:668
 msgid "Connection Closed"
 msgstr "Conexión cerrada"
 
-#: src/protocols/toc/toc.c:708
+#: ../src/protocols/toc/toc.c:708 src/protocols/toc/toc.c:708
 msgid "Waiting for reply..."
 msgstr "Esperando respuesta..."
 
-#: src/protocols/toc/toc.c:786
+#: ../src/protocols/toc/toc.c:786 src/protocols/toc/toc.c:786
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC ha terminado su pausa. Ya puede volver a mandar mensajes."
 
-#: src/protocols/toc/toc.c:989
+#: ../src/protocols/toc/toc.c:989 src/protocols/toc/toc.c:989
 msgid "Password Change Successful"
 msgstr "La contraseña se ha cambiado con éxito"
 
-#: src/protocols/toc/toc.c:993
+#: ../src/protocols/toc/toc.c:993 src/protocols/toc/toc.c:993
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC envió una orden de PAUSA."
 
-#: src/protocols/toc/toc.c:994
+#: ../src/protocols/toc/toc.c:994 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 "
@@ -10381,47 +12658,57 @@
 "expulsarle si envía mensajes. Gaim evitará que le llegue cualquier cosa. "
 "Esto es sólo temporal, por favor, sea paciente."
 
-#: src/protocols/toc/toc.c:1549
+#: ../src/protocols/toc/toc.c:1549 src/protocols/toc/toc.c:1549
 msgid "Get Dir Info"
 msgstr "Obtener información del directorio"
 
-#: src/protocols/toc/toc.c:1689
+#: ../src/protocols/toc/toc.c:1684 src/protocols/toc/toc.c:1684
+msgid "Set User Info"
+msgstr "Establecer su información de usuario"
+
+#: ../src/protocols/toc/toc.c:1689 src/protocols/toc/toc.c:1689
 msgid "Set Dir Info"
 msgstr "Guardar información del directorio"
 
-#: src/protocols/toc/toc.c:1811
+#: ../src/protocols/toc/toc.c:1694 src/protocols/toc/toc.c:1694
+msgid "Change Password"
+msgstr "Cambiar contraseña"
+
+#: ../src/protocols/toc/toc.c:1811 src/protocols/toc/toc.c:1811
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "¡No se pudo abrir %s para escritura!"
 
-#: src/protocols/toc/toc.c:1847
+#: ../src/protocols/toc/toc.c:1847 src/protocols/toc/toc.c:1847
 msgid "File transfer failed; other side probably canceled."
 msgstr ""
 "Se produjo un fallo en la transferencia del archivo; posiblemente fue "
 "cancelado por el otro extremo."
 
+#: ../src/protocols/toc/toc.c:1892 ../src/protocols/toc/toc.c:1932
+#: ../src/protocols/toc/toc.c:2056 ../src/protocols/toc/toc.c:2144
 #: src/protocols/toc/toc.c: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 "No se pudo conectar para realizar la transferencia."
 
-#: src/protocols/toc/toc.c:2089
+#: ../src/protocols/toc/toc.c:2089 src/protocols/toc/toc.c:2089
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
 "No se pudo escribir la cabecera de archivo.  El archivo no será transferido."
 
-#: src/protocols/toc/toc.c:2189
+#: ../src/protocols/toc/toc.c:2189 src/protocols/toc/toc.c:2189
 msgid "Gaim - Save As..."
 msgstr "Gaim - Guardar como..."
 
-#: src/protocols/toc/toc.c:2223
+#: ../src/protocols/toc/toc.c:2223 src/protocols/toc/toc.c:2223
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s solicita %s para aceptar %d archivo: %s (%.2f %s)%s%s"
 msgstr[1] "%s solicita %s para aceptar %d archivos: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2230
+#: ../src/protocols/toc/toc.c:2230 src/protocols/toc/toc.c:2230
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s le solicita que le mande un archivo"
@@ -10436,27 +12723,29 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2316 src/protocols/toc/toc.c:2318
+#: ../src/protocols/toc/toc.c:2320 ../src/protocols/toc/toc.c:2322
+#: src/protocols/toc/toc.c:2317 src/protocols/toc/toc.c:2319
 msgid "TOC Protocol Plugin"
 msgstr "Complemento de protocolo TOC"
 
-#: src/protocols/toc/toc.c:2337
+#: ../src/protocols/toc/toc.c:2341 src/protocols/toc/toc.c:2338
 msgid "TOC host"
 msgstr "Servidor TOC"
 
-#: src/protocols/toc/toc.c:2341
+#: ../src/protocols/toc/toc.c:2345 src/protocols/toc/toc.c:2342
 msgid "TOC port"
 msgstr "Puerto TOC"
 
-#: src/protocols/yahoo/yahoo.c:706
+#: ../src/protocols/yahoo/yahoo.c:712 src/protocols/yahoo/yahoo.c:712
 msgid "Your Yahoo! message did not get sent."
 msgstr "Su mensaje Yahoo! no se envió."
 
-#: src/protocols/yahoo/yahoo.c:752 src/protocols/yahoo/yahoo.c:3499
+#: ../src/protocols/yahoo/yahoo.c:765 ../src/protocols/yahoo/yahoo.c:3561
+#: src/protocols/yahoo/yahoo.c:758 src/protocols/yahoo/yahoo.c:3487
 msgid "Buzz!!"
 msgstr "¡¡Buzz!!"
 
-#: src/protocols/yahoo/yahoo.c:797
+#: ../src/protocols/yahoo/yahoo.c:810 src/protocols/yahoo/yahoo.c:803
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Mensaje del sistema Yahoo! para %s:"
@@ -10464,23 +12753,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:887
+#: ../src/protocols/yahoo/yahoo.c:906 src/protocols/yahoo/yahoo.c:899
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list%s%s."
 msgstr "El usuario %s quiere añadir a %s a su lista de amigos%s%s."
 
-#: src/protocols/yahoo/yahoo.c:893
+#: ../src/protocols/yahoo/yahoo.c:912 src/protocols/yahoo/yahoo.c:905
 msgid "Message (optional) :"
 msgstr "Mensaje (opcional) :"
 
-#: src/protocols/yahoo/yahoo.c:935
+#: ../src/protocols/yahoo/yahoo.c:954 src/protocols/yahoo/yahoo.c:947
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "El usuario %s ha rechazado su solicitud de añadirlo a su lista de amigos (de "
 "forma retroactiva)."
 
-#: src/protocols/yahoo/yahoo.c:938
+#: ../src/protocols/yahoo/yahoo.c:957 src/protocols/yahoo/yahoo.c:950
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10489,11 +12778,11 @@
 "El usuario %s ha negado (de forma retroactiva) su solicitud de añadirlo a su "
 "lista de amigos por la siguiente razón: %s."
 
-#: src/protocols/yahoo/yahoo.c:941
+#: ../src/protocols/yahoo/yahoo.c:960 src/protocols/yahoo/yahoo.c:953
 msgid "Add buddy rejected"
 msgstr "Se rechazó la adición del amigo"
 
-#: src/protocols/yahoo/yahoo.c:1684
+#: ../src/protocols/yahoo/yahoo.c:1703 src/protocols/yahoo/yahoo.c:1696
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10504,11 +12793,11 @@
 "desconocido. Esta versión de Gaim posiblemente no sea capaz de conectarse a "
 "Yahoo. Compruebe %s para obtener una actualización."
 
-#: src/protocols/yahoo/yahoo.c:1687
+#: ../src/protocols/yahoo/yahoo.c:1706 src/protocols/yahoo/yahoo.c:1699
 msgid "Failed Yahoo! Authentication"
 msgstr "Falló la autenticación en Yahoo!"
 
-#: src/protocols/yahoo/yahoo.c:1760
+#: ../src/protocols/yahoo/yahoo.c:1772 src/protocols/yahoo/yahoo.c:1772
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10517,19 +12806,19 @@
 "Ha intentado ignorar a %s, pero el usuario está en su lista de amigos. Si "
 "selecciona «Sí» se le eliminará y se ignorará a este amigo."
 
-#: src/protocols/yahoo/yahoo.c:1763
+#: ../src/protocols/yahoo/yahoo.c:1775 src/protocols/yahoo/yahoo.c:1775
 msgid "Ignore buddy?"
 msgstr "¿Ignorar amigo?"
 
-#: src/protocols/yahoo/yahoo.c:1797
+#: ../src/protocols/yahoo/yahoo.c:1809 src/protocols/yahoo/yahoo.c:1809
 msgid "Invalid username."
 msgstr "Nombre de usuario no válido."
 
-#: src/protocols/yahoo/yahoo.c:1808
+#: ../src/protocols/yahoo/yahoo.c:1820 src/protocols/yahoo/yahoo.c:1820
 msgid "Normal authentication failed!"
 msgstr "¡Falló la autenticación habitual!"
 
-#: src/protocols/yahoo/yahoo.c:1809
+#: ../src/protocols/yahoo/yahoo.c:1821 src/protocols/yahoo/yahoo.c:1821
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -10542,128 +12831,153 @@
 "Mensajería web que podrá dar lugar a un acceso a menos funcionalidades y "
 "funciones."
 
-#: src/protocols/yahoo/yahoo.c:1817
+#: ../src/protocols/yahoo/yahoo.c:1829 src/protocols/yahoo/yahoo.c:1829
 msgid "Incorrect password."
 msgstr "Contraseña incorrecta."
 
-#: src/protocols/yahoo/yahoo.c:1820
+#: ../src/protocols/yahoo/yahoo.c:1832 src/protocols/yahoo/yahoo.c:1832
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr ""
 "Su cuenta está bloqueada. Por favor, conéctese al servidor de web de Yahoo!"
 
-#: src/protocols/yahoo/yahoo.c:1823
+#: ../src/protocols/yahoo/yahoo.c:1835 src/protocols/yahoo/yahoo.c:1835
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Error desconocido número %d. Si se conecta al servidor de web de Yahoo! es "
 "posible que ésto se arregle."
 
-#: src/protocols/yahoo/yahoo.c:1877
+#: ../src/protocols/yahoo/yahoo.c:1889 src/protocols/yahoo/yahoo.c:1889
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "No se pudo añadir al amigo %s al grupo %s de la lista en el servidor para la "
 "cuenta %s."
 
-#: src/protocols/yahoo/yahoo.c:1880
+#: ../src/protocols/yahoo/yahoo.c:1892 src/protocols/yahoo/yahoo.c:1892
 msgid "Could not add buddy to server list"
 msgstr "No se pudo añadir el amigo a la lista del servidor"
 
-#: src/protocols/yahoo/yahoo.c:2124 src/protocols/yahoo/yahoo.c:2270
+#: ../src/protocols/yahoo/yahoo.c:2011
+#, c-format
+msgid "[ Audible %s/%s/%s.swf ] %s"
+msgstr "[ Audible %s/%s/%s.swf ] %s"
+
+#: ../src/protocols/yahoo/yahoo.c:2150 ../src/protocols/yahoo/yahoo.c:2297
+#: ../src/protocols/yahoo/yahoo.c:2312 ../src/protocols/yahoo/ycht.c:472
+#: src/protocols/yahoo/yahoo.c:2136 src/protocols/yahoo/yahoo.c:2282
 #: src/protocols/yahoo/ycht.c:413
 msgid "Unable to read"
 msgstr "No se pudo leer"
 
-#: src/protocols/yahoo/yahoo.c:2292 src/protocols/yahoo/yahoo.c:2420
-#: src/protocols/yahoo/yahoo.c:2506 src/protocols/yahoo/yahoo.c:2516
-#: src/protocols/yahoo/yahoochat.c:1393 src/protocols/yahoo/yahoochat.c:1460
+#: ../src/protocols/yahoo/yahoo.c:2336 ../src/protocols/yahoo/yahoo.c:2493
+#: ../src/protocols/yahoo/yahoo.c:2595 ../src/protocols/yahoo/yahoo.c:2605
+#: ../src/protocols/yahoo/yahoochat.c:1447
+#: ../src/protocols/yahoo/yahoochat.c:1517 ../src/protocols/yahoo/ycht.c:576
+#: src/protocols/yahoo/yahoo.c:2304 src/protocols/yahoo/yahoo.c:2432
+#: src/protocols/yahoo/yahoo.c:2531 src/protocols/yahoo/yahoo.c:2541
+#: src/protocols/yahoo/yahoochat.c:1395 src/protocols/yahoo/yahoochat.c:1465
 #: src/protocols/yahoo/ycht.c:517
 msgid "Connection problem"
 msgstr "Error de conexión"
 
-#: src/protocols/yahoo/yahoo.c:2619 src/protocols/yahoo/yahoo.c:3236
-msgid "Not At Home"
+#: src/protocols/yahoo/yahoo.c:2644 src/protocols/yahoo/yahoo.c:3223
+msgid "Not at Home"
 msgstr "Fuera de casa"
 
-#: src/protocols/yahoo/yahoo.c:2621 src/protocols/yahoo/yahoo.c:3239
-msgid "Not At Desk"
+#: src/protocols/yahoo/yahoo.c:2646 src/protocols/yahoo/yahoo.c:3226
+msgid "Not at Desk"
 msgstr "Lejos del escritorio"
 
-#: src/protocols/yahoo/yahoo.c:2623 src/protocols/yahoo/yahoo.c:3242
-msgid "Not In Office"
+#: src/protocols/yahoo/yahoo.c:2648 src/protocols/yahoo/yahoo.c:3229
+msgid "Not in Office"
 msgstr "Fuera de la oficina"
 
-#: src/protocols/yahoo/yahoo.c:2627 src/protocols/yahoo/yahoo.c:3248
+#: ../src/protocols/yahoo/yahoo.c:2721 ../src/protocols/yahoo/yahoo.c:3306
+#: src/protocols/yahoo/yahoo.c:2652 src/protocols/yahoo/yahoo.c:3235
 msgid "On Vacation"
 msgstr "De vacaciones"
 
-#: src/protocols/yahoo/yahoo.c:2631 src/protocols/yahoo/yahoo.c:3254
+#: ../src/protocols/yahoo/yahoo.c:2725 ../src/protocols/yahoo/yahoo.c:3312
+#: src/protocols/yahoo/yahoo.c:2656 src/protocols/yahoo/yahoo.c:3241
 msgid "Stepped Out"
 msgstr "Ha abandonado"
 
-#: src/protocols/yahoo/yahoo.c:2723 src/protocols/yahoo/yahoo.c:2750
+#: ../src/protocols/yahoo/yahoo.c:2818 ../src/protocols/yahoo/yahoo.c:2848
+#: src/protocols/yahoo/yahoo.c:2749 src/protocols/yahoo/yahoo.c:2778
 msgid "Not on server list"
 msgstr "No está en la lista del servidor"
 
-#: src/protocols/yahoo/yahoo.c:2773 src/protocols/yahoo/yahoo.c:2833
+#: ../src/protocols/yahoo/yahoo.c:2865 ../src/protocols/yahoo/yahoo.c:2924
+#: src/protocols/yahoo/yahoo.c:2795 src/protocols/yahoo/yahoo.c:2855
 msgid "Appear Online"
 msgstr "Parecer conectado"
 
-#: src/protocols/yahoo/yahoo.c:2776 src/protocols/yahoo/yahoo.c:2855
+#: ../src/protocols/yahoo/yahoo.c:2868 ../src/protocols/yahoo/yahoo.c:2945
+#: src/protocols/yahoo/yahoo.c:2798 src/protocols/yahoo/yahoo.c:2877
 msgid "Appear Permanently Offline"
-msgstr "Parecer permanentemente desconectado"
-
-#: src/protocols/yahoo/yahoo.c:2794
-msgid "Stealth"
-msgstr "Sigilo"
-
-#: src/protocols/yahoo/yahoo.c:2849
+msgstr "Parecer siempre desconectado"
+
+#: src/protocols/yahoo/yahoo.c:2816
+msgid "Presence"
+msgstr "Presencia"
+
+#: ../src/protocols/yahoo/yahoo.c:2930 src/protocols/novell/novell.c:2996
+#: src/protocols/yahoo/yahoo.c:2861
+msgid "Appear Offline"
+msgstr "Parecer desconectado"
+
+#: ../src/protocols/yahoo/yahoo.c:2939 src/protocols/yahoo/yahoo.c:2871
 msgid "Don't Appear Permanently Offline"
-msgstr "No aparecer permanentemente desconectado"
-
-#: src/protocols/yahoo/yahoo.c:2896
+msgstr "No parecer siempre desconectado"
+
+#: ../src/protocols/yahoo/yahoo.c:2987 src/protocols/yahoo/yahoo.c:2918
 msgid "Join in Chat"
 msgstr "Unirse a un chat"
 
-#: src/protocols/yahoo/yahoo.c:2901
+#: ../src/protocols/yahoo/yahoo.c:2993 src/protocols/yahoo/yahoo.c:2923
 msgid "Initiate Conference"
 msgstr "Iniciar conferencia"
 
-#: src/protocols/yahoo/yahoo.c:2926
-msgid "Stealth Settings"
-msgstr "Configuración de sigilo"
-
-#: src/protocols/yahoo/yahoo.c:2932
+#: src/protocols/yahoo/yahoo.c:2948
+msgid "Presence Settings"
+msgstr "Usar configuración del entorno"
+
+#: ../src/protocols/yahoo/yahoo.c:3027
 msgid "Start Doodling"
 msgstr "Comenzar una sesión de Doodle"
 
-#: src/protocols/yahoo/yahoo.c:2963
+#: ../src/protocols/yahoo/yahoo.c:3059 src/protocols/yahoo/yahoo.c:2985
 msgid "Active which ID?"
 msgstr "¿Qué ID quiere activar?"
 
-#: src/protocols/yahoo/yahoo.c:2972
+#: ../src/protocols/yahoo/yahoo.c:3068 src/protocols/yahoo/yahoo.c:2994
 msgid "Join who in chat?"
 msgstr "¿Juntarse con quién en un chat?"
 
-#: src/protocols/yahoo/yahoo.c:2982
+#: ../src/protocols/yahoo/yahoo.c:3078 src/protocols/yahoo/yahoo.c:3004
 msgid "Activate ID..."
 msgstr "Activar ID..."
 
-#: src/protocols/yahoo/yahoo.c:2986
-msgid "Join user in chat..."
+#: src/protocols/yahoo/yahoo.c:3008
+msgid "Join User in Chat..."
 msgstr "Juntarse con un usuario en un chat..."
 
-#: src/protocols/yahoo/yahoo.c:3541
+#: ../src/protocols/yahoo/yahoo.c:3620 src/protocols/yahoo/yahoo.c:3529
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;sala&gt;:  Unirse a una sala en la red de Yahoo."
 
-#: src/protocols/yahoo/yahoo.c:3545
-msgid "buzz: Buzz a contact to get their attention"
+#: ../src/protocols/yahoo/yahoo.c:3625
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  Mostrar los canales de la red Yahoo"
+
+#: src/protocols/yahoo/yahoo.c:3533
+msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Avisar a un contacto para llamar su atención"
 
-#: src/protocols/yahoo/yahoo.c:3550
+#: ../src/protocols/yahoo/yahoo.c:3633 src/protocols/yahoo/yahoo.c:3538
 msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Solicitar el comienzo de una sesión Doodle a un usuario"
+msgstr "doodle: Solicitar al usuario el comienzo de una sesión Doodle"
 
 #. *< type
 #. *< ui_requirement
@@ -10675,68 +12989,82 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3639 src/protocols/yahoo/yahoo.c:3641
+#: ../src/protocols/yahoo/yahoo.c:3727 ../src/protocols/yahoo/yahoo.c:3729
+#: src/protocols/yahoo/yahoo.c:3630 src/protocols/yahoo/yahoo.c:3632
 msgid "Yahoo Protocol Plugin"
 msgstr "Complemento de protocolo Yahoo"
 
-#: src/protocols/yahoo/yahoo.c:3658
+#: ../src/protocols/yahoo/yahoo.c:3746 src/protocols/yahoo/yahoo.c:3649
 msgid "Yahoo Japan"
 msgstr "Yahoo Japón"
 
-#: src/protocols/yahoo/yahoo.c:3661
+#: ../src/protocols/yahoo/yahoo.c:3749 src/protocols/yahoo/yahoo.c:3652
 msgid "Pager host"
 msgstr "Servidor de buscapersonas"
 
-#: src/protocols/yahoo/yahoo.c:3664
+#: ../src/protocols/yahoo/yahoo.c:3752 src/protocols/yahoo/yahoo.c:3655
 msgid "Japan Pager host"
 msgstr "Servidor de buscapersonas japonés"
 
-#: src/protocols/yahoo/yahoo.c:3667
+#: ../src/protocols/yahoo/yahoo.c:3755 src/protocols/yahoo/yahoo.c:3658
 msgid "Pager port"
 msgstr "Puerto del buscapersonas"
 
-#: src/protocols/yahoo/yahoo.c:3670
+#: ../src/protocols/yahoo/yahoo.c:3758 src/protocols/yahoo/yahoo.c:3661
 msgid "File transfer host"
 msgstr "Servidor de transferencia de archivos"
 
+#: src/protocols/yahoo/yahoo.c:3664
+msgid "Japan file transfer host"
+msgstr "Servidor de transferencia de archivos japonés"
+
+#: ../src/protocols/yahoo/yahoo.c:3764 src/protocols/yahoo/yahoo.c:3667
+msgid "File transfer port"
+msgstr "Puerto de transferencia de archivos"
+
+#: ../src/protocols/yahoo/yahoo.c:3767 src/protocols/yahoo/yahoo.c:3670
+msgid "Chat room locale"
+msgstr "Localización de la sala de chat"
+
+#: ../src/protocols/yahoo/yahoo.c:3770
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ignorar las invitaciones a salas de conferencias o chat"
+
 #: src/protocols/yahoo/yahoo.c:3673
-msgid "Japan File transfer host"
-msgstr "Servidor de transferencia de archivos japonés"
+msgid "Chat room list URL"
+msgstr "Url de lista de salas de chat"
 
 #: src/protocols/yahoo/yahoo.c:3676
-msgid "File transfer port"
-msgstr "Puerto de transferencia de archivos"
+msgid "YCHT host"
+msgstr "Servidor YCHT"
 
 #: src/protocols/yahoo/yahoo.c:3679
-msgid "Chat Room Locale"
-msgstr "Localización de la sala de chat"
-
-#: src/protocols/yahoo/yahoo.c:3682
-msgid "Chat Room List Url"
-msgstr "Url de lista de salas de chat"
-
-#: src/protocols/yahoo/yahoo.c:3685
-msgid "YCHT Host"
-msgstr "Servidor YCHT"
-
-#: src/protocols/yahoo/yahoo.c:3688
-msgid "YCHT Port"
+msgid "YCHT port"
 msgstr "Puerto YCHT"
 
-#: src/protocols/yahoo/yahoo_profile.c:672
+#. TODO: what to do here - do we really have to disconnect?
+#: ../src/protocols/yahoo/yahoo_packet.c:265
+msgid "Write Error"
+msgstr "Error de escritura"
+
+#: ../src/protocols/yahoo/yahoo_profile.c:707
+#: src/protocols/yahoo/yahoo_profile.c:676
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
 msgstr "<b>Dirección IP:</b> %s<br>"
 
-#: src/protocols/yahoo/yahoo_profile.c:748
+#: ../src/protocols/yahoo/yahoo_profile.c:783
+#: src/protocols/yahoo/yahoo_profile.c:752
 msgid "Yahoo! Japan Profile"
 msgstr "Perfil de Yahoo! Japón"
 
-#: src/protocols/yahoo/yahoo_profile.c:749
+#: ../src/protocols/yahoo/yahoo_profile.c:784
+#: src/protocols/yahoo/yahoo_profile.c:753
 msgid "Yahoo! Profile"
 msgstr "Perfil Yahoo!"
 
-#: src/protocols/yahoo/yahoo_profile.c:793
+#: ../src/protocols/yahoo/yahoo_profile.c:828
+#: src/protocols/yahoo/yahoo_profile.c:797
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
@@ -10744,60 +13072,75 @@
 "Lo siento, los perfiles con contenido sólo para adultos no están soportados "
 "aún."
 
-#: src/protocols/yahoo/yahoo_profile.c:795
+#: ../src/protocols/yahoo/yahoo_profile.c:830
+#: src/protocols/yahoo/yahoo_profile.c:799
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
 msgstr ""
 "Si desea ver este perfil, deberá visitar este enlace con su navegador web"
 
-#: src/protocols/yahoo/yahoo_profile.c:971
+#: ../src/protocols/yahoo/yahoo_profile.c:1006
+#: src/protocols/yahoo/yahoo_profile.c:975
 msgid "Yahoo! ID"
 msgstr "ID Yahoo!"
 
-#: src/protocols/yahoo/yahoo_profile.c:1043
+#: ../src/protocols/yahoo/yahoo_profile.c:1078
+#: ../src/protocols/yahoo/yahoo_profile.c:1082
+#: ../src/protocols/yahoo/yahoo_profile.c:1086
 #: src/protocols/yahoo/yahoo_profile.c:1047
 #: src/protocols/yahoo/yahoo_profile.c:1051
+#: src/protocols/yahoo/yahoo_profile.c:1055
 msgid "Hobbies"
 msgstr "Aficiones"
 
-#: src/protocols/yahoo/yahoo_profile.c:1061
+#: ../src/protocols/yahoo/yahoo_profile.c:1096
+#: ../src/protocols/yahoo/yahoo_profile.c:1100
 #: src/protocols/yahoo/yahoo_profile.c:1065
+#: src/protocols/yahoo/yahoo_profile.c:1069
 msgid "Latest News"
 msgstr "Últimas noticias"
 
-#: src/protocols/yahoo/yahoo_profile.c:1086
+#: ../src/protocols/yahoo/yahoo_profile.c:1121
+#: src/protocols/yahoo/yahoo_profile.c:1090
 msgid "Home Page"
 msgstr "Página personal"
 
-#: src/protocols/yahoo/yahoo_profile.c:1101
+#: ../src/protocols/yahoo/yahoo_profile.c:1136
+#: src/protocols/yahoo/yahoo_profile.c:1105
 msgid "Cool Link 1"
 msgstr "Enlace interesante 1"
 
-#: src/protocols/yahoo/yahoo_profile.c:1106
+#: ../src/protocols/yahoo/yahoo_profile.c:1141
+#: src/protocols/yahoo/yahoo_profile.c:1110
 msgid "Cool Link 2"
 msgstr "Enlace interesante 2"
 
-#: src/protocols/yahoo/yahoo_profile.c:1110
+#: ../src/protocols/yahoo/yahoo_profile.c:1145
+#: src/protocols/yahoo/yahoo_profile.c:1114
 msgid "Cool Link 3"
 msgstr "Enlace interesante 3"
 
-#: src/protocols/yahoo/yahoo_profile.c:1123
+#: ../src/protocols/yahoo/yahoo_profile.c:1158
+#: src/protocols/yahoo/yahoo_profile.c:1127
 msgid "Last Update"
 msgstr "Última actualización"
 
-#: src/protocols/yahoo/yahoo_profile.c:1129
+#: ../src/protocols/yahoo/yahoo_profile.c:1164
+#: src/protocols/yahoo/yahoo_profile.c:1133
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Información de usuario de %s no disponible"
 
-#: src/protocols/yahoo/yahoo_profile.c:1135
-msgid ""
-"Sorry, this profile seems to be in a language that is not supported at this "
-"time."
-msgstr "Lo siento, este perfil parece estar en un idioma aún no soportado."
-
-#: src/protocols/yahoo/yahoo_profile.c:1151
+#: src/protocols/yahoo/yahoo_profile.c:1139
+msgid ""
+"Sorry, this profile seems to be in a language or format that is not "
+"supported at this time."
+msgstr ""
+"Lo siento, este perfil parece estar en un idioma o formato aún no soportado."
+
+#: ../src/protocols/yahoo/yahoo_profile.c:1186
+#: src/protocols/yahoo/yahoo_profile.c:1155
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -10805,7 +13148,8 @@
 "No se pudo obtener el perfil del usuario. Esto es habitualmente un problema "
 "temporal en el lado del servidor. Por favor, pruebe de nuevo más tarde."
 
-#: src/protocols/yahoo/yahoo_profile.c:1154
+#: ../src/protocols/yahoo/yahoo_profile.c:1189
+#: src/protocols/yahoo/yahoo_profile.c:1158
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
@@ -10816,66 +13160,91 @@
 "de usuario. Si está seguro de que el usuario existe inténtelo de nuevo más "
 "tarde."
 
-#: src/protocols/yahoo/yahoo_profile.c:1162
+#: ../src/protocols/yahoo/yahoo_profile.c:1197
+#: src/protocols/yahoo/yahoo_profile.c:1166
 msgid "The user's profile is empty."
 msgstr "El perfil del usuario está vacío."
 
-#: src/protocols/yahoo/yahoochat.c:202
+#: ../src/protocols/yahoo/yahoochat.c:203 src/protocols/yahoo/yahoochat.c:202
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s ha declinado su invitación de conferencia en la sala «%s» por «%s»."
 
-#: src/protocols/yahoo/yahoochat.c:204
+#: ../src/protocols/yahoo/yahoochat.c:205 src/protocols/yahoo/yahoochat.c:204
 msgid "Invitation Rejected"
 msgstr "Invitación rechazada"
 
-#: src/protocols/yahoo/yahoochat.c:358
+#: ../src/protocols/yahoo/yahoochat.c:361 src/protocols/yahoo/yahoochat.c:358
 msgid "Failed to join chat"
 msgstr "No se pudo unir al chat"
 
-#: src/protocols/yahoo/yahoochat.c:358
-msgid "Maybe the room is full?"
-msgstr "¿Quizás la sala está llena?"
+#. -6
+#: ../src/protocols/yahoo/yahoochat.c:364
+msgid "Unknown room"
+msgstr "Sala desconocida"
+
+#. -15
+#: ../src/protocols/yahoo/yahoochat.c:367
+msgid "Maybe the room is full"
+msgstr "Quizás la sala está llena"
+
+#. -35
+#: ../src/protocols/yahoo/yahoochat.c:370
+msgid "Not available"
+msgstr "No disponible"
+
+#: ../src/protocols/yahoo/yahoochat.c:374
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+msgstr "Error desconocido. Puede que tenga que desconectarse y esperar cinco minutos antes de poder volver a unirse a la sala del chat."
 
 # Banned puede ser expulsar o censurar, prefiero expulsar. jfs.
-#: src/protocols/yahoo/yahoochat.c:435
+#: ../src/protocols/yahoo/yahoochat.c:452 src/protocols/yahoo/yahoochat.c:435
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Ahora está chateando en %s."
 
-#: src/protocols/yahoo/yahoochat.c:608
+#: ../src/protocols/yahoo/yahoochat.c:626 src/protocols/yahoo/yahoochat.c:608
 msgid "Failed to join buddy in chat"
 msgstr "No se pudo unir al amigo al chat"
 
-#: src/protocols/yahoo/yahoochat.c:609
+#: ../src/protocols/yahoo/yahoochat.c:627 src/protocols/yahoo/yahoochat.c:609
 msgid "Maybe they're not in a chat?"
 msgstr "¿Quizás no están en un chat?"
 
+#: ../src/protocols/yahoo/yahoochat.c:1345
+#: ../src/protocols/yahoo/yahoochat.c:1372
 #: src/protocols/yahoo/yahoochat.c:1326
 msgid "Fetching the room list failed."
 msgstr "No se pudo obtener la lista de salas."
 
-#: src/protocols/yahoo/yahoochat.c:1379
+#: ../src/protocols/yahoo/yahoochat.c:1433
+#: src/protocols/yahoo/yahoochat.c:1381
 msgid "Voices"
 msgstr "Voces"
 
-#: src/protocols/yahoo/yahoochat.c:1382
+#: ../src/protocols/yahoo/yahoochat.c:1436
+#: src/protocols/yahoo/yahoochat.c:1384
 msgid "Webcams"
 msgstr "Cámaras web"
 
-#: src/protocols/yahoo/yahoochat.c:1393 src/protocols/yahoo/yahoochat.c:1460
+#: ../src/protocols/yahoo/yahoochat.c:1447
+#: ../src/protocols/yahoo/yahoochat.c:1517
+#: src/protocols/yahoo/yahoochat.c:1395 src/protocols/yahoo/yahoochat.c:1465
 msgid "Unable to fetch room list."
 msgstr "No se pudo obtener la lista de salas."
 
-#: src/protocols/yahoo/yahoochat.c:1453
+#: ../src/protocols/yahoo/yahoochat.c:1510
+#: src/protocols/yahoo/yahoochat.c:1458
 msgid "User Rooms"
 msgstr "Salas de usuarios"
 
-#: src/protocols/yahoo/ycht.c:400
+#: ../src/protocols/yahoo/ycht.c:456 src/protocols/yahoo/ycht.c:400
 msgid "Connection problem with the YCHT server."
 msgstr "Se produjo un problema al conectarse con el servidor YCHT."
 
-#: src/protocols/zephyr/zephyr.c:331
+#: ../src/protocols/zephyr/zephyr.c:331 src/protocols/zephyr/zephyr.c:331
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10883,79 +13252,83 @@
 "(Hubo un error convirtiendo este mensaje.\\t Verifique la opción "
 "«Codificación» en el Editor de cuentas)"
 
-#: src/protocols/zephyr/zephyr.c:686
+#: ../src/protocols/zephyr/zephyr.c:686
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "No se pudo enviar al chat %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1133
+#: ../src/protocols/zephyr/zephyr.c:719 ../src/protocols/zephyr/zephyr.c:1134
+#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1134
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Usuario:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:723 src/protocols/zephyr/zephyr.c:1138
+#: ../src/protocols/zephyr/zephyr.c:723 ../src/protocols/zephyr/zephyr.c:1139
+#: src/protocols/zephyr/zephyr.c:723 src/protocols/zephyr/zephyr.c:1139
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Oculto o no conectado"
 
-#: src/protocols/zephyr/zephyr.c:728 src/protocols/zephyr/zephyr.c:1140
+#: ../src/protocols/zephyr/zephyr.c:728 ../src/protocols/zephyr/zephyr.c:1141
+#: src/protocols/zephyr/zephyr.c:728 src/protocols/zephyr/zephyr.c:1141
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>En %s desde %s"
 
-#: src/protocols/zephyr/zephyr.c:1471 src/protocols/zephyr/zephyr.c:1472
+#: ../src/protocols/zephyr/zephyr.c:1472 ../src/protocols/zephyr/zephyr.c:1473
+#: src/protocols/zephyr/zephyr.c:1472 src/protocols/zephyr/zephyr.c:1473
 msgid "Anyone"
 msgstr "Cualquiera"
 
-#: src/protocols/zephyr/zephyr.c:2273
+#: ../src/protocols/zephyr/zephyr.c:2278 src/protocols/zephyr/zephyr.c:2274
 msgid "_Class:"
 msgstr "_Clase:"
 
-#: src/protocols/zephyr/zephyr.c:2279
+#: ../src/protocols/zephyr/zephyr.c:2284 src/protocols/zephyr/zephyr.c:2280
 msgid "_Instance:"
 msgstr "_Instancia:"
 
-#: src/protocols/zephyr/zephyr.c:2285
+#: ../src/protocols/zephyr/zephyr.c:2290 src/protocols/zephyr/zephyr.c:2286
 msgid "_Recipient:"
 msgstr "_Destinatario:"
 
-#: src/protocols/zephyr/zephyr.c:2296
+#: ../src/protocols/zephyr/zephyr.c:2301 src/protocols/zephyr/zephyr.c:2297
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Falló el intento de suscripción a %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:2602
+#: ../src/protocols/zephyr/zephyr.c:2607 src/protocols/zephyr/zephyr.c:2603
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;apodo&gt;: Localiza un usuario"
 
-#: src/protocols/zephyr/zephyr.c:2607
+#: ../src/protocols/zephyr/zephyr.c:2612 src/protocols/zephyr/zephyr.c:2608
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;apodo&gt;: Localiza un usuario"
 
-#: src/protocols/zephyr/zephyr.c:2612
+#: ../src/protocols/zephyr/zephyr.c:2617 src/protocols/zephyr/zephyr.c:2613
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "instance &lt;instancia&gt;: Fijar la instancia a utilizar en esta clase"
 
-#: src/protocols/zephyr/zephyr.c:2617
+#: ../src/protocols/zephyr/zephyr.c:2622 src/protocols/zephyr/zephyr.c:2618
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;instancia&gt;: Fijar la instancia a utilizar en esta clase"
 
-#: src/protocols/zephyr/zephyr.c:2622
+#: ../src/protocols/zephyr/zephyr.c:2627 src/protocols/zephyr/zephyr.c:2623
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;instancia&gt;: Fijar la instancia a utilizar en esta clase"
 
-#: src/protocols/zephyr/zephyr.c:2628
+#: ../src/protocols/zephyr/zephyr.c:2633 src/protocols/zephyr/zephyr.c:2629
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 "sub &lt;clase&gt; &lt;instancia&gt; &lt;receptor&gt;: Unirse a un nuevo chat"
 
-#: src/protocols/zephyr/zephyr.c:2633
+#: ../src/protocols/zephyr/zephyr.c:2638 src/protocols/zephyr/zephyr.c:2634
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;instancia&gt;: Enviar un mensaje a &lt;mensaje,<i>instancia</i>,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2639
+#: ../src/protocols/zephyr/zephyr.c:2644 src/protocols/zephyr/zephyr.c:2640
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -10963,7 +13336,7 @@
 "zci &lt;clase&gt; &lt;instancia&gt;: Enviar un mensaje a &lt;<i>clase</i>,"
 "<i>instancia</i>,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2645
+#: ../src/protocols/zephyr/zephyr.c:2650 src/protocols/zephyr/zephyr.c:2646
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -10971,7 +13344,7 @@
 "zcir &lt;clase&gt; &lt;instancia&gt; &lt;receptor&gt;: Enviar un mensaje a "
 "&lt;<i>clase</i>,<i>instancia</i>,<i>receptor</i>&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2651
+#: ../src/protocols/zephyr/zephyr.c:2656 src/protocols/zephyr/zephyr.c:2652
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -10979,15 +13352,15 @@
 "zir &lt;instancia&gt; &lt;receptor&gt;: Enviar un mensaje a &lt;MENSAJE,"
 "<i>instancia</i>,<i>receptor</i>&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2656
+#: ../src/protocols/zephyr/zephyr.c:2661 src/protocols/zephyr/zephyr.c:2657
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;clase&gt;: Enviar un mensaje a &lt;<i>clase</i>,PERSONAL,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2762
+#: ../src/protocols/zephyr/zephyr.c:2767 src/protocols/zephyr/zephyr.c:2763
 msgid "Resubscribe"
 msgstr "Re-suscribir"
 
-#: src/protocols/zephyr/zephyr.c:2765
+#: ../src/protocols/zephyr/zephyr.c:2770 src/protocols/zephyr/zephyr.c:2766
 msgid "Retrieve subscriptions from server"
 msgstr "Obtener las suscripciones del servidor"
 
@@ -11001,51 +13374,53 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:2847 src/protocols/zephyr/zephyr.c:2849
+#: ../src/protocols/zephyr/zephyr.c:2856 ../src/protocols/zephyr/zephyr.c:2858
+#: src/protocols/zephyr/zephyr.c:2849 src/protocols/zephyr/zephyr.c:2851
 msgid "Zephyr Protocol Plugin"
 msgstr "Complemento de protocolo Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:2874
+#: ../src/protocols/zephyr/zephyr.c:2883 src/protocols/zephyr/zephyr.c:2876
 msgid "Export to .anyone"
 msgstr "Exportar a .anyone"
 
-#: src/protocols/zephyr/zephyr.c:2877
+#: ../src/protocols/zephyr/zephyr.c:2886 src/protocols/zephyr/zephyr.c:2879
 msgid "Export to .zephyr.subs"
 msgstr "Exportar a .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:2880
+#: ../src/protocols/zephyr/zephyr.c:2889 src/protocols/zephyr/zephyr.c:2882
 msgid "Import from .anyone"
 msgstr "Importar de .anyone"
 
-#: src/protocols/zephyr/zephyr.c:2883
+#: ../src/protocols/zephyr/zephyr.c:2892 src/protocols/zephyr/zephyr.c:2885
 msgid "Import from .zephyr.subs"
 msgstr "Importar de .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:2886
+#: ../src/protocols/zephyr/zephyr.c:2895 src/protocols/zephyr/zephyr.c:2888
 msgid "Realm"
 msgstr "Dominio"
 
-#: src/protocols/zephyr/zephyr.c:2889
+#: ../src/protocols/zephyr/zephyr.c:2898 src/protocols/zephyr/zephyr.c:2891
 msgid "Exposure"
 msgstr "Exposición"
 
-#. XXX: why in the hell are we calling gaim_connection_error() here?
+#: ../src/proxy.c:1212 ../src/proxy.c:1265 ../src/proxy.c:1311
+#: ../src/proxy.c:1332 src/proxy.c:1118 src/proxy.c:1148 src/proxy.c:1170
+#: src/proxy.c:1182
+#, c-format
+msgid "Proxy connection error %d"
+msgstr "Error de conexión en el proxy %d"
+
 #. Forbidden
-#: src/proxy.c:1036
+#: ../src/proxy.c:1324 src/proxy.c:1178
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "Acceso denegado: el servidor proxy no permite túneles en el puerto %d."
 
-#: src/proxy.c:1040
-#, c-format
-msgid "Proxy connection error %d"
-msgstr "Error de conexión en el proxy %d"
-
-#: src/proxy.c:1874
+#: ../src/proxy.c:2318 src/proxy.c:2019
 msgid "Invalid proxy settings"
 msgstr "Configuración inválida de proxy"
 
-#: src/proxy.c:1874
+#: ../src/proxy.c:2318 src/proxy.c:2019
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -11053,30 +13428,20 @@
 "El nombre de servidor o el puerto especificados no son válidos para su tipo "
 "de proxy."
 
-#. *
-#. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
-#.
-#: src/request.h:1341
-msgid "Accept"
-msgstr "Aceptar"
-
-#: src/server.c:243
+#: src/savedstatuses.c:502
+msgid "saved statuses"
+msgstr "Estadísticas guardadas"
+
+#: src/savedstatuses.c:710
+msgid "I'm not here right now"
+msgstr "No estoy aquí ahora"
+
+#: ../src/server.c:225 src/server.c:224
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s ahora se llama %s.\n"
 
-#: src/server.c:625
-#, c-format
-msgid "(%d message)"
-msgid_plural "(%d messages)"
-msgstr[0] "(%d mensaje)"
-msgstr[1] "(%d mensajes)"
-
-#: src/server.c:639
-msgid "(1 message)"
-msgstr "(1 mensaje)"
-
-#: src/server.c:859
+#: ../src/server.c:675 src/server.c:691
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11085,104 +13450,651 @@
 "%s ha invitado a %s a la sala de chat %s:\n"
 "%s"
 
-#: src/server.c:864
+#: ../src/server.c:680 src/server.c:696
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s ha invitado a %s a la sala de chat %s\n"
 
-#: src/server.c:868
+#: ../src/server.c:684 src/server.c:700
 msgid "Accept chat invitation?"
 msgstr "¿Aceptar la invitación de chat?"
 
-#: src/status.c:153
+#: ../src/status.c:153
 msgid "Unset"
 msgstr "Desactivado"
 
-#: src/status.c:156
+#: ../src/status.c:156 src/status.c:155
 msgid "Unavailable"
 msgstr "No disponible"
 
-#: src/status.c:621
+# El latinoamérica se prefiere 'Celular', creo, jfs
+#: ../src/status.c:160
+msgid "Mobile"
+msgstr "Móvil"
+
+#: ../src/status.c:623
+#, c-format
+msgid "%s signed on"
+msgstr "%s se ha conectado"
+
+#: ../src/status.c:627 src/status.c:620
 #, c-format
 msgid "%s came back"
 msgstr "%s ha vuelto"
 
-#: src/status.c:626
+#: ../src/status.c:634
+#, c-format
+msgid "%s signed off"
+msgstr "%s se ha desconectado"
+
+#: ../src/status.c:638 src/status.c:625
 #, c-format
 msgid "%s went away"
 msgstr "%s se ha marchado"
 
-#: src/status.c:1308
+#: ../src/status.c:1284 src/status.c:1271
 #, c-format
 msgid "%s became idle"
 msgstr "%s ahora está inactivo"
 
-#: src/status.c:1323
+#: ../src/status.c:1297 src/status.c:1284
 #, c-format
 msgid "%s became unidle"
 msgstr "%s ahora está activo"
 
-#: src/status.c:1697
-msgid "Default auto-away"
-msgstr "Auto-ausencia por omisión"
-
-#: src/util.c:2121
+#: src/status.c:1357
+#, c-format
+msgid "+++ %s became idle"
+msgstr "+++ %s ahora está inactivo"
+
+#: src/status.c:1359
+#, c-format
+msgid "+++ %s became unidle"
+msgstr "+++ %s ahora está activo"
+
+#: ../src/util.c:649
+#, c-format
+msgid "%x %X"
+msgstr "%x %X"
+
+#: ../src/util.c:2439 src/util.c:2120
 #, c-format
 msgid "Error Reading %s"
 msgstr "Error al leer %s"
 
-#: src/util.c:2122
+#: ../src/util.c:2440 src/util.c:2121
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
 "the old file has been renamed to %s~."
-msgstr "Se ha encontrado un error al leer su %s. No se ha cargado y el archivo antiguo se ha renombrado a %s~."
-
-#: src/util.c:2567
+msgstr "Se ha encontrado un error al leer su %s. No se ha cargado, y el archivo antiguo se ha renombrado a %s~."
+
+#: ../src/util.c:2933 src/util.c:2616
 msgid "Calculating..."
 msgstr "Calculando..."
 
-#: src/util.c:2570
+#: ../src/util.c:2936 src/util.c:2619
 msgid "Unknown."
 msgstr "Desconocido."
 
-#: src/util.c:2600
+#: ../src/util.c:2962
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d segundo"
+msgstr[1] "%d segundos"
+
+#: ../src/util.c:2974
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d día"
+msgstr[1] "%d días"
+
+#: ../src/util.c:2982
+#, c-format
+msgid "%s, %d hour"
+msgid_plural "%s, %d hours"
+msgstr[0] "%s, %d hora"
+msgstr[1] "%s, %d horas"
+
+#: ../src/util.c:2988
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d hora"
+msgstr[1] "%d horas"
+
+#: ../src/util.c:2996
+#, c-format
+msgid "%s, %d minute"
+msgid_plural "%s, %d minutes"
+msgstr[0] "%s, %d minuto"
+msgstr[1] "%s, %d minutos"
+
+#: ../src/util.c:3002
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minuto"
+msgstr[1] "%d minutos"
+
+#: ../src/util.c:3477 src/util.c:3117
+msgid "g003: Error opening connection.\n"
+msgstr "g003: Error abriendo la conexión.\n"
+
+#: plugins/docklet/docklet.c:400
+msgid "Join A Chat..."
+msgstr "Unirse a un chat..."
+
+#: src/conversation.c:1758
+#, c-format
+msgid "(+%d more)"
+msgstr "(+%d más)"
+
+#: src/conversation.c:1760
+#, c-format
+msgid " left the room (%s)."
+msgstr " salió de la sala (%s)."
+
+#: src/gtkblist.c:2606
+#, c-format
+msgid ""
+"\n"
+"<b>Contact Alias:</b> %s"
+msgstr ""
+"\n"
+"<b>Apodo del contacto:</b> %s"
+
+#: src/gtkblist.c:2990
+msgid "Offline "
+msgstr "Desconectado "
+
+#: src/gtklog.c:212
+#, c-format
+msgid "Conversation in %s on %s"
+msgstr "Conversaciones en %s sobre %s"
+
+#: src/gtklog.c:214
+#, c-format
+msgid "Conversation with %s on %s"
+msgstr "Conversaciones con %s sobre %s"
+
+#: src/gtkmain.c:687 src/gtkmain.c:689
+msgid "Default"
+msgstr "Valores por omisión"
+
+#: src/gtknotify.c:283
+#, c-format
+msgid "<span weight=\"bold\">From:</span> %s\n"
+msgstr "<span weight=\"bold\">De:</span> %s\n"
+
+#: src/gtknotify.c:292
+#, c-format
+msgid "<span weight=\"bold\">Subject:</span> %s\n"
+msgstr "<span weight=\"bold\">Asunto:</span> %s\n"
+
+#: src/gtknotify.c:297
+#, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
+"\n"
+"%s%s%s%s"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">¡Tiene correo!</span>\n"
+"\n"
+"%s%s%s%s"
+
+#. #-#-#-#-#  gaim-contributed-2006-01-04.es.po (Gaim)  #-#-#-#-#
+#. Create the "Pounce Action" frame.
+#: src/gtkpounce.c:595
+msgid "Pounce Action"
+msgstr "Acción del aviso"
+
+#: src/gtkstatusbox.c:443
+msgid "Custom..."
+msgstr "Personalizado..."
+
+#: src/gtkstock.c:144
+msgid "_Warn"
+msgstr "_Avisar"
+
+#: src/protocols/bonjour/bonjour.h:35
+msgid "Bonjour"
+msgstr "Bonjour"
+
+#: src/protocols/jabber/buddy.c:616
+msgid "Jabber ID"
+msgstr "ID Jabber"
+
+#: src/protocols/msn/msn.c:605 src/protocols/zephyr/zephyr.c:2256
+#: src/status.c:156
+msgid "Hidden"
+msgstr "Oculto"
+
+#: src/protocols/oscar/oscar.c:7612 src/protocols/oscar/oscar.c:7617
+msgid "Away Message"
+msgstr "Mensaje de ausencia"
+
+#: src/protocols/oscar/oscar.c:8042
+msgid "Hide IP address"
+msgstr "Ocultar dirección IP"
+
+#: src/protocols/oscar/oscar.c:8045
+msgid "Web aware"
+msgstr "Capacidad web"
+
+#: plugins/gaimrc.c:59
+msgid "GtkTreeView Expander Indentation"
+msgstr "Muesca del expansor GtkTreeView"
+
+#: plugins/gaimrc.c:523
+#, c-format
+msgid "Write a gtkrc file with these settings to %s"
+msgstr "Escribir un archivo de configuración gtkrc con esas opciones a %s"
+
+#: src/blist.c:1881
+#, c-format
+msgid ""
+"%d buddy from group %s was not removed because its account was not logged "
+"in.  This buddy and the group were not removed.\n"
+msgid_plural ""
+"%d buddies from group %s were not removed because their accounts were not "
+"logged in.  These buddies and the group were not removed.\n"
+msgstr[0] ""
+"%d amigo del grupo %s no se ha eliminado porque su cuenta no estaba "
+"conectada. Este amigo y sus grupos no han sido eliminados.\n"
+msgstr[1] ""
+"%d amigos del grupo %s no se han eliminado porque no sus cuentas estaban "
+"conectadas. Esos amigos y sus grupos no han sido eliminados.\n"
+
+#: src/gtkblist.c:2614
+#, c-format
+msgid ""
+"\n"
+"<b>Alias:</b> %s"
+msgstr ""
+"\n"
+"<b>Apodo:</b> %s"
+
+#: src/gtkconn.c:227
+#, c-format
+msgid ""
+"%s was disconnected due to an error. %s The account has been disabled. "
+"Correct the error and reenable the account to connect."
+msgstr ""
+"%s fue desconectado debido a un error. %s La cuenta ha sido deshabilitada. "
+"Corrija el error y rehabilite la cuenta para conectarse."
+
+#: src/gtkconv.c:2519
+msgid "/Conversation/Clea_r"
+msgstr "/Conversación/Limpiar"
+
+#: src/gtkdialogs.c:236
+msgid ""
+"Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
+"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
+"and Gadu-Gadu all at once.  It is written using GTK+ and is licensed under "
+"the GNU GPL.<BR><BR>"
+msgstr ""
+"Gaim es un cliente modular de mensajería instantánea, capaz de utilizar AIM, "
+"MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, "
+"Napster, Zephyr y Gadu-Gadu al mismo tiempo.  Está escrito usando Gtk+ y se "
+"licencia con la GPL.<BR><BR>"
+
+#: src/gtkimhtml.c:816
+msgid "Pa_ste as Plain Text"
+msgstr "Pe_gar como texto sin formato"
+
+#: src/gtkplugin.c:268
+#, c-format
+msgid ""
+"%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
+"<span weight=\"bold\">Web site:</span>\t\t%s\n"
+"<span weight=\"bold\">File name:</span>\t%s"
+msgstr ""
+"%s%s<span weight=\"bold\">Escrito por:</span>\t%s\n"
+"<span weight=\"bold\">Sitio web:</span>\t\t%s\n"
+"<span weight=\"bold\">Nombre del archivo:</span>\t%s"
+
+#. Create the "Pounce Who" frame.
+#: src/gtkpounce.c:493
+msgid "Pounce Who"
+msgstr "Avisar a quién"
+
+#: src/gtkprefs.c:1670
+msgid "_Report idle time"
+msgstr "Mostrar el _tiempo de inactividad"
+
+#: src/gtkprivacy.c:594 src/gtkprivacy.c:607
+msgid "Permit"
+msgstr "Permitir"
+
+#: src/protocols/jabber/presence.c:380
+msgid "Configure Room"
+msgstr "Configurar sala"
+
+#: src/protocols/jabber/presence.c:382
+msgid "Accept Defaults"
+msgstr "Aceptar valores por omisión"
+
+#. proxyip timed out
+#. * Yes, it's a bit odd to ask the user to enable proxied file transfers
+#. * when it's a proxied transfer that timed out. It is possible that a
+#. * stage 1/2 proxied transfer might work when a stage 3 will not.
+#: src/protocols/oscar/oscar.c:2096
+#, c-format
+msgid ""
+"Transfer of file %s timed out.\n"
+" Try enabling proxy servers for file transfers in Tools->Preferences->AIM/"
+"ICQ."
+msgstr ""
+"Expiró la transferencia del archivo %s.\n"
+" Intente habilitar servidores proxy para las transferencias de ficheros en Herramientas->Preferencias->AIM/ICQ."
+
+#: src/protocols/oscar/oscar.c:4663
+msgid "Decline"
+msgstr "No añadirlo"
+
+#: src/protocols/oscar/oscar.c:7617
+msgid "(pending)"
+msgstr "(Pendiente)"
+
+#. ICQ actions
+#: src/protocols/oscar/oscar.c:8313
+msgid "Show Privacy Options..."
+msgstr "Mostrar opciones de privacidad..."
+
+#: src/protocols/oscar/oscar.c:8428
+msgid "Use AIM/ICQ proxy server (Slower/More Secure/Usually Works)"
+msgstr "Utilizar un servidor proxy de AIM/ICQ (Más lento, más seguro, y habitualmente funciona)"
+
+#: src/protocols/sametime/sametime.c:1441
+msgid "Connected to Sametime Community Server"
+msgstr "Conectado al mismo servidor de comunidad «Sametime»"
+
+#: src/protocols/sametime/sametime.c:3207
+#, c-format
+msgid ""
+"\n"
+"<b>Status</b>: %s"
+msgstr ""
+"\n"
+"<b>Estado</b>: %s"
+
+#: src/protocols/sametime/sametime.c:3212
+#, c-format
+msgid ""
+"\n"
+"<b>Message</b>: %s"
+msgstr ""
+"\n"
+"<b>Mensaje</b>: %s"
+
+#: src/protocols/sametime/sametime.c:3218
+#, c-format
+msgid ""
+"\n"
+"<b>Supports</b>: %s"
+msgstr ""
+"\n"
+"<b>Soportados</b>: %s"
+
+#: src/protocols/sametime/sametime.c:3241
+msgid "Active"
+msgstr "Activo"
+
+#: src/protocols/sametime/sametime.c:4389
+msgid "Select User to Add"
+msgstr "Seleccionar el usuario a añadir"
+
+#: src/protocols/sametime/sametime.c:4391
+msgid "Add User"
+msgstr "Añadir usuario"
+
+#. notesbuddy hack encoding
+#: src/protocols/sametime/sametime.c:5591
+msgid "NotesBuddy encoding"
+msgstr "Encodificación «NotesBuddy»"
+
+#: src/protocols/silc/buddy.c:1044
+msgid "Import..."
+msgstr "Importar..."
+
+#: src/protocols/silc/ops.c:1298
+msgid "More..."
+msgstr "Más..."
+
+#: src/protocols/silc/pk.c:119
+msgid "View..."
+msgstr "Ver..."
+
+#: src/protocols/yahoo/yahoochat.c:358
+msgid "Maybe the room is full?"
+msgstr "¿Quizás la sala está llena?"
+
+#. *
+#. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
+#.
+#: src/request.h:1350
+msgid "Accept"
+msgstr "Aceptar"
+
+#: src/savedstatuses.c:688
+msgid "Hello!"
+msgstr "¡Hola!"
+
+#: src/util.c:2649
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "segundo"
 msgstr[1] "segundos"
 
-#: src/util.c:2614
+#: src/util.c:2663
 msgid "day"
 msgid_plural "days"
 msgstr[0] "día"
 msgstr[1] "días"
 
-#: src/util.c:2622
+#: src/util.c:2671
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "horas"
 
-#: src/util.c:2630
+#: src/util.c:2679
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
-#: src/util.c:3053
-msgid "g003: Error opening connection.\n"
-msgstr "g003: Error abriendo la conexión.\n"
-
-#~ msgid "Buddy List Sorting"
-#~ msgstr "Orden de la lista de amigos"
+#~ msgid "Error Message Suppression"
+#~ msgstr "Supresión de mensajes de error"
+
+#~ msgid "Hide Disconnect Errors"
+#~ msgstr "Ocultar errores de desconexión"
+
+#~ msgid "Hide Login Errors"
+#~ msgstr "Ocultar errores de conexión"
+
+#~ msgid "Hide Reconnecting Dialog"
+#~ msgstr "Ocultar dialogo de re-conexión"
+
+#~ msgid "Auto-Reconnect"
+#~ msgstr "Reconexión automática"
+
+#~ msgid "When you are kicked offline, this reconnects you."
+#~ msgstr ""
+#~ "Cuando por alguna razón Ud. se le expulsa, esto lo vuelve a conectar."
+
+#~ msgid "Use last matching buddy"
+#~ msgstr "Usar el último amigo coincidente"
+
+#~ msgid ""
+#~ "The buddy with the lowest score is the buddy who will have priority in "
+#~ "the contact.\n"
+#~ "The default values (offline = 4, away = 2, and idle = 1) will use what "
+#~ "used to be\n"
+#~ "the built-in order: active, idle, away, away + idle, offline."
+#~ msgstr ""
+#~ "El amigo con la puntuación más baja es el que tendrá prioridad dentro del "
+#~ "contacto.\n"
+#~ "Los valores por defecto (desconectado = 4, no disponible = 2 e inactivo = "
+#~ "1)\n"
+#~ "se utilizarán para el orden previamente prefijado de activo, inactivo, no "
+#~ "disponible, no disponible e inactivo, desconectado."
+
+#~ msgid "Gaim - Signed off"
+#~ msgstr "Gaim - Desconectado"
+
+#~ msgid "Gaim - Away"
+#~ msgstr "Gaim - Ausente"
+
+#~ msgid ""
+#~ "When a new conversation is opened this plugin will insert the last "
+#~ "conversation into the current conversation.\n"
+#~ "\n"
+#~ "The history plugin requires logging be enabled. Logging can be enabled "
+#~ "from Tools -> Preferences -> Logging. Enabling logs for instant messages "
+#~ "and/or chats will activate history for the same conversation type(s)."
+#~ msgstr ""
+#~ "Este complemento insertará la última conversación en la conversación "
+#~ "actual cuando se establezca una nueva conversación.\n"
+#~ "\n"
+#~ "El complemento de histórico necesita que esté activo el registro. Puede "
+#~ "activar el registro de Herramientas -> Preferencias -> Registro. Si "
+#~ "activa el registro para mensajes instantáneos y/o chats se activará el "
+#~ "histórico para el mismo tipo de conversación."
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Do you wish to add him or her to your buddy list?"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "¿Desea añadirlo/a a su lista de amigos?"
+
+#~ msgid "_Alias Buddy..."
+#~ msgstr "_Apodo de amigo..."
+
+#~ msgid "Alias Contact..."
+#~ msgstr "Apodo para contacto..."
+
+#~ msgid "/Tools/Account Ac_tions"
+#~ msgstr "/Herramientas/Acc_iones"
+
+#~ msgid "/Tools/A_ccounts"
+#~ msgstr "/Herramientas/_Cuentas"
+
+#~ msgid "Idle "
+#~ msgstr "Ausente "
+
+#~ msgid "/Tools/Account Actions"
+#~ msgstr "/Herramientas/Acciones de cuentas"
+
+#~ msgid ""
+#~ "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
+#~ "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu "
+#~ "all at once.  It is written using GTK+ and is licensed under the GNU GPL."
+#~ "<BR><BR>"
+#~ msgstr ""
+#~ "Gaim es un cliente modular de mensajería instantánea, capaz de utilizar "
+#~ "AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, "
+#~ "Zephyr y Gadu-Gadu al mismo tiempo.  Está escrito usando Gtk+ y está "
+#~ "licencia bajo la GPL de GNU.<BR><BR>"
+
+#~ msgid "Active Developers"
+#~ msgstr "Desarrolladores en activo"
+
+#~ msgid "_Keep the dialog open"
+#~ msgstr "Mantener el diálogo _abierto"
+
+#~ msgid "A_way"
+#~ msgstr "_Ausente"
+
+#~ msgid "_Idle"
+#~ msgstr "_Inactivo"
+
+#~ msgid "Retur_n from idle"
+#~ msgstr "Dejar de estar i_nactivo"
+
+# Examinar puede ser también válido, comprobar, jfs.
+#~ msgid "Bro_wse..."
+#~ msgstr "_Navegar..."
+
+#~ msgid "Sav_e this pounce after activation"
+#~ msgstr "_Guardar este aviso tras la activación"
+
+#~ msgid "Remove Buddy Pounce"
+#~ msgstr "Quitar aviso de amigo"
+
+#~ msgid "_Queue new messages when away"
+#~ msgstr "En_colar mensajes nuevos durante las ausencias"
+
+#~ msgid "Could't open file"
+#~ msgstr "No se pudo abrir el archivo"
+
+#~ msgid "Token Error: Unable to fetch the token.\n"
+#~ msgstr "Error en el token: no se pudo obtener un token.\n"
+
+#~ msgid "Change password"
+#~ msgstr "Cambiar contraseña"
+
+#~ msgid "Error processing event or response (%s)."
+#~ msgstr "Se produjo un error al procesar un evento o una respuesta (%s)."
+
+#~ msgid "Unable to set AIM away message."
+#~ msgstr "No se pudo establecer el mensaje de ausencia AIM."
+
+#~ msgid ""
+#~ "You have probably requested to set your away message before the login "
+#~ "procedure completed.  You remain in a \"present\" state; try setting it "
+#~ "again when you are fully connected."
+#~ msgstr ""
+#~ "Usted probablemente solicitó establecer su mensaje de ausencia antes de "
+#~ "que finalice el proceso de conexión.  Usted quedará en un estado "
+#~ "«presente», intente volver a aplicarlo cuando esté conectado por completo."
+
+#~ msgid "Admin Alert"
+#~ msgstr "Alerta de administración"
+
+#~ msgid ""
+#~ "Could not add the buddy %s because every simple user has to start with "
+#~ "'sip:'."
+#~ msgstr ""
+#~ "No se pudo añadir al amigo %s porque cada usuario simple tiene que "
+#~ "empezar con 'sip:'."
+
+#~ msgid "Thomas Butter <butter@uni-mannheim.de>"
+#~ msgstr "Thomas Butter <butter@uni-mannheim.de>"
+
+#~ msgid "Verify all IM message signatures"
+#~ msgstr "Verificar todas las firmas de los mensajes MI"
+
+#~ msgid "Digitally sign all channel messages"
+#~ msgstr "Firmar digitalmente todos los mensajes del canal"
+
+#~ msgid "Verify all channel message signatures"
+#~ msgstr "Verificar todas las firmas de los mensajes de los canales"
+
+#~ msgid "Stealth"
+#~ msgstr "Sigilo"
+
+#~ msgid "(%d message)"
+#~ msgid_plural "(%d messages)"
+#~ msgstr[0] "(%d mensaje)"
+#~ msgstr[1] "(%d mensajes)"
+
+#~ msgid "(1 message)"
+#~ msgstr "(1 mensaje)"
+
+#~ msgid "Default auto-away"
+#~ msgstr "Auto-ausencia por omisión"
 
 #~ msgid "_Sorting:"
 #~ msgstr "Orden:"
 
-#~ msgid "Buddy Display"
-#~ msgstr "Mostrar amigos"
-
 #~ msgid "Show more buddy details"
 #~ msgstr "Mostrar detalles del amigo"
 
@@ -11213,29 +14125,17 @@
 #~ msgid "Auto-login"
 #~ msgstr "Conectarse automáticamente"
 
-#~ msgid "New..."
-#~ msgstr "Nuevo..."
-
 #~ msgid "Back"
 #~ msgstr "Disponible"
 
 #~ msgid "Signoff"
 #~ msgstr "Desconectar"
 
-#~ msgid "Tray Icon Configuration"
-#~ msgstr "Configuración del icono del área de notificación del sistema"
-
 #~ msgid "_Hide new messages until tray icon is clicked"
 #~ msgstr ""
 #~ "_Ocultar mensajes nuevos hasta que se pulsa en el icono del área de "
 #~ "notificación del sistema"
 
-#~ msgid "Orientation"
-#~ msgstr "Orientación"
-
-#~ msgid "The orientation of the tray."
-#~ msgstr "La orientación en el área de notificación."
-
 #~ msgid "Not connected to AIM"
 #~ msgstr "No está conectado a AIM"
 
@@ -11255,9 +14155,6 @@
 #~ "No se pudo asignar %s a un socket\n"
 #~ "%s"
 
-#~ msgid "Unable to open socket"
-#~ msgstr "No se pudo abrir el socket"
-
 #~ msgid "Remote Control"
 #~ msgstr "Control remoto"
 
@@ -11271,24 +14168,6 @@
 #~ "Permite que Gaim sea controlado de forma remota a través de aplicaciones "
 #~ "de terceros o de la herramienta de control remoto de Gaim."
 
-#~ msgid "GTK Signals Test"
-#~ msgstr "Prueba de señales GTK"
-
-#~ msgid "Test to see that all ui signals are working properly."
-#~ msgstr ""
-#~ "Probar para ver si todas las señales de la interfaz de usuario funcionan "
-#~ "correctamente."
-
-#~ msgid ""
-#~ "When a new conversation is opened this plugin will insert the last "
-#~ "conversation into the current conversation."
-#~ msgstr ""
-#~ "Cuando se abre una nueva conversación este complemento introduce la "
-#~ "última conversación en la conversación actual."
-
-#~ msgid "_Apply"
-#~ msgstr "_Aplicar"
-
 #~ msgid "Docked _Buddy List is always on top"
 #~ msgstr "La lista de _amigos apilada está siempre encima del resto"
 
@@ -11322,18 +14201,12 @@
 #~ msgid "You cannot create an empty away message"
 #~ msgstr "No se puede crear un mensaje de ausencia vacío"
 
-#~ msgid "New away message"
-#~ msgstr "Nuevo mensaje de ausencia"
-
 #~ msgid "Away title: "
 #~ msgstr "Título del mensaje de ausencia: "
 
 #~ msgid "_Save"
 #~ msgstr "_Guardar"
 
-#~ msgid "Sa_ve & Use"
-#~ msgstr "Gua_rdar y usar"
-
 #~ msgid "Buddy List Error"
 #~ msgstr "Error en la lista de amigos"
 
@@ -11477,13 +14350,6 @@
 #~ "\n"
 #~ "<b>Cuenta:</b>"
 
-#~ msgid ""
-#~ "\n"
-#~ "<b>Warned:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Avisado:</b>"
-
 #~ msgid "Warned (%d%%) "
 #~ msgstr "Avisado (%d%%) "
 
@@ -11523,23 +14389,9 @@
 #~ msgid "_Reconnect"
 #~ msgstr "_Reconectar"
 
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
-#~ "\n"
-#~ "%s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">%s se ha desconectado.</span>\n"
-#~ "\n"
-#~ "%s\n"
-#~ "%s"
-
 #~ msgid "Reason Unknown."
 #~ msgstr "Razón desconocida."
 
-#~ msgid "Reconnect _All"
-#~ msgstr "Reconectar todas"
-
 #~ msgid "Time"
 #~ msgstr "Tiempo"
 
@@ -11576,12 +14428,6 @@
 #~ msgid "Remove the user from your buddy list"
 #~ msgstr "Eliminar al usuario de la lista de amigos"
 
-#~ msgid "Send"
-#~ msgstr "Enviar"
-
-#~ msgid "Invite"
-#~ msgstr "Invitar"
-
 #~ msgid "Invite a user"
 #~ msgstr "Invitar al usuario"
 
@@ -11618,9 +14464,6 @@
 #~ msgid "Albanian"
 #~ msgstr "Albanés"
 
-#~ msgid "Turkish"
-#~ msgstr "Turco"
-
 #~ msgid "Ukrainian"
 #~ msgstr "Ucraniano"
 
@@ -11665,9 +14508,6 @@
 #~ msgid "Show _timestamp on messages"
 #~ msgstr "Mostrar la _hora en los mensajes"
 
-#~ msgid "Ignore c_olors"
-#~ msgstr "Ignorar c_olores"
-
 #~ msgid "Ignore font _faces"
 #~ msgstr "Ignorar _aspectos de la tipografía"
 
@@ -11680,15 +14520,9 @@
 #~ msgid "_Send default formatting with outgoing messages"
 #~ msgstr "_Enviar formato por omisión en los mensajes salientes"
 
-#~ msgid "Send Message"
-#~ msgstr "Envío de mensajes"
-
 #~ msgid "Enter _sends message"
 #~ msgstr "«Enter» _envía el mensaje"
 
-#~ msgid "C_ontrol-Enter sends message"
-#~ msgstr "«C_ontrol-Enter» envía el mensaje"
-
 #~ msgid "Window Closing"
 #~ msgstr "Cierre de Ventanas"
 
@@ -11722,9 +14556,6 @@
 #~ msgid "Show _warning levels"
 #~ msgstr "Mostrar niveles de _aviso"
 
-#~ msgid "_Automatically expand contacts"
-#~ msgstr "Expandir contactos _automáticamente"
-
 #~ msgid "Enable \"_slash\" commands"
 #~ msgstr "Activar órdenes \"_barra\""
 
@@ -11749,9 +14580,6 @@
 #~ msgid "New conversation _placement:"
 #~ msgstr "U_bicación de las nuevas conversaciones:"
 
-#~ msgid "Message Logs"
-#~ msgstr "Registro de mensajes"
-
 #~ msgid "System Logs"
 #~ msgstr "Registros del sistema"
 
@@ -11785,19 +14613,6 @@
 #~ msgid ""
 #~ "<span size=\"larger\">%s %s</span>\n"
 #~ "\n"
-#~ "<span weight=\"bold\">Written by:</span>\t%s\n"
-#~ "<span weight=\"bold\">Web site:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">File name:</span>\t%s"
-#~ msgstr ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Escrito por:</span>\t%s\n"
-#~ "<span weight=\"bold\">Sitio Web:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">Nombre del archivo:</span>\t%s"
-
-#~ msgid ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
 #~ "<span weight=\"bold\">Written by:</span>  %s\n"
 #~ "<span weight=\"bold\">URL:</span>  %s\n"
 #~ "<span weight=\"bold\">File name:</span>  %s"
@@ -11808,9 +14623,6 @@
 #~ "<span weight=\"bold\">URL:</span>  %s\n"
 #~ "<span weight=\"bold\">Nombre del archivo:</span>  %s"
 
-#~ msgid "Load"
-#~ msgstr "Cargar"
-
 #~ msgid "Summary"
 #~ msgstr "Resumen"
 
@@ -11832,15 +14644,6 @@
 #~ msgid "Away Messages"
 #~ msgstr "Mensajes de ausencia"
 
-#~ msgid "Plugins"
-#~ msgstr "Complementos"
-
-#~ msgid "HTML"
-#~ msgstr "HTML"
-
-#~ msgid "Plain text"
-#~ msgstr "En claro"
-
 #~ msgid "Please create an account."
 #~ msgstr "Por favor, cree una cuenta."
 
@@ -11927,9 +14730,6 @@
 #~ msgid "Unable to resolve hostname."
 #~ msgstr "No se pudo resolver el nombre del servidor."
 
-#~ msgid "Error while reading from socket."
-#~ msgstr "Error al leer del socket."
-
 #~ msgid "Error while writing to socket."
 #~ msgstr "Error al escribir al socket."
 
@@ -11939,12 +14739,6 @@
 #~ msgid "Unknown Error Code."
 #~ msgstr "Código de error desconocido."
 
-#~ msgid "Status: %s"
-#~ msgstr "Estado: %s"
-
-#~ msgid "Could not connect"
-#~ msgstr "No se pudo conectar"
-
 #~ msgid "Reading data"
 #~ msgstr "Leyendo datos"
 
@@ -11981,15 +14775,9 @@
 #~ msgid "Gadu-Gadu Search Engine"
 #~ msgstr "Motor de búsquedas de Gadu-Gadu"
 
-#~ msgid "Birth Year"
-#~ msgstr "Año de nacimiento"
-
 #~ msgid "Sex"
 #~ msgstr "Sexo"
 
-#~ msgid "There is no Buddy List stored on the Gadu-Gadu server."
-#~ msgstr "No hay una lista de amigos almacenada en el servidor Gadu-Gadu."
-
 #~ msgid "Couldn't Import Buddy List from Server"
 #~ msgstr "No se pudo importar la lista de amigos del servidor"
 
@@ -12028,9 +14816,6 @@
 #~ "Gaim no pudo conectarse con el servidor de listas de amigos Gadu-Gadu.  "
 #~ "Por favor inténtelo más tarde."
 
-#~ msgid "Couldn't export buddy list"
-#~ msgstr "No se pudo exportar la lista de amigos"
-
 #~ msgid ""
 #~ "Gaim was unable to connect to the buddy list server.  Please try again "
 #~ "later."
@@ -12058,9 +14843,6 @@
 #~ "Gaim no pudo cambiar su contraseña porque no pudo conectarse con el "
 #~ "servidor Gadu-Gadu. Por favor, inténtelo más tarde."
 
-#~ msgid "Directory Search"
-#~ msgstr "Búsqueda en el directorio"
-
 #~ msgid "Unable to access user profile."
 #~ msgstr "No se pudo acceder al perfil del usuario."
 
@@ -12072,9 +14854,6 @@
 #~ "intentar conectarse al servidor de directorio. Por favor, inténtelo de "
 #~ "nuevo más tarde."
 
-#~ msgid "Gaim encountered an error communicating with the ICQ server."
-#~ msgstr "Gaim encontró un error mientras se comunicaba con el servidor ICQ."
-
 #~ msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 #~ msgstr "El usuario %s (%s%s%s%s%s) quiere que los autorice."
 
@@ -12087,9 +14866,6 @@
 #~ msgid "Nick:"
 #~ msgstr "Apodo:"
 
-#~ msgid "Gaim User"
-#~ msgstr "Usuario de Gaim"
-
 #~ msgid "File Transfer Aborted"
 #~ msgstr "Transferencia de archivo abortada"
 
@@ -12099,9 +14875,6 @@
 #~ msgid "Invalid nickname '%s'"
 #~ msgstr "Apodo '%s' inválido"
 
-#~ msgid "Invalid nickname"
-#~ msgstr "Apodo inválido"
-
 #~ msgid "Jabber Profile"
 #~ msgstr "Perfil Jabber"
 
@@ -12159,12 +14932,6 @@
 #~ "Error 0x%04x: No se puede dar formato al nombre de usuario porque el "
 #~ "nombre de usuario solicitado termina con un espacio."
 
-#~ msgid "Visible"
-#~ msgstr "Visible"
-
-#~ msgid "Available Message:"
-#~ msgstr "Mensajes disponibles:"
-
 #~ msgid "I'm doing work and hoping for a distraction--IM me!"
 #~ msgstr "Estoy trabajando y deseando ser distraído -- ¡envíame un MI!"
 
@@ -12229,15 +14996,6 @@
 #~ msgid "%s logged in."
 #~ msgstr "%s se ha conectado."
 
-#~ msgid "%s signed on"
-#~ msgstr "%s se ha conectado"
-
-#~ msgid "%s logged out."
-#~ msgstr "%s se ha desconectado."
-
-#~ msgid "%s signed off"
-#~ msgstr "%s se ha desconectado"
-
 #~ msgid ""
 #~ "%s has just been warned by %s.\n"
 #~ "Your new warning level is %d%%"
@@ -12267,9 +15025,6 @@
 #~ "Gaim no ha podido deducir el tipo de imagen a partir de la extensión del "
 #~ "archivo. Tomando PNG por omisión."
 
-#~ msgid "Default SILC Key Pair"
-#~ msgstr "Par de claves SILC por omisión"
-
 #~ msgid "SILC Public Key"
 #~ msgstr "Clave pública SILC"
 
@@ -12282,12 +15037,6 @@
 #~ msgid "Miscellaneous error"
 #~ msgstr "Error misceláneo"
 
-#~ msgid "Initiate Chat"
-#~ msgstr "Iniciar conversación"
-
-#~ msgid "Unable to connect to server"
-#~ msgstr "No se pudo conectar al servidor"
-
 #~ msgid "Unknown error when attempting to authorize with MSN login server."
 #~ msgstr ""
 #~ "Error desconocido cuando se intentaba obtener autorización del servidor "
@@ -12308,9 +15057,6 @@
 #~ msgid "Received HTTP error. Please report this."
 #~ msgstr "Se recibió un error HTTP. Por favor, informe de ésto."
 
-#~ msgid "Syncing with server"
-#~ msgstr "Sincronización con el servidor"
-
 #~ msgid "Message could not be sent for an unkwnown reason"
 #~ msgstr "No se ha podido enviar el mensaje por motivos desconocidos."
 
@@ -12371,9 +15117,6 @@
 #~ "\n"
 #~ "<b>Ausente:</b>"
 
-#~ msgid "_Accounts"
-#~ msgstr "_Cuentas"
-
 #~ msgid "_Preferences"
 #~ msgstr "_Preferencias"
 
@@ -12414,9 +15157,6 @@
 #~ msgid "Userid"
 #~ msgstr "ID de usuario"
 
-#~ msgid "Your message did not get sent."
-#~ msgstr "No se envió su mensaje."
-
 #~ msgid "Your message to %s did not get sent:"
 #~ msgstr "Su mensaje a %s no fue enviado:"
 
@@ -12429,9 +15169,6 @@
 #~ msgid "help:  List available commands."
 #~ msgstr "help:  Muestra las órdenes disponibles"
 
-#~ msgid "_Send auto-response"
-#~ msgstr "_Enviar respuesta automática"
-
 #~ msgid "_Only send auto-response when idle"
 #~ msgstr "Sólo enviar la respuesta automática cuando esté _inactivo"
 
@@ -12451,9 +15188,6 @@
 #~ msgid "MSN ID"
 #~ msgstr "ID MSN"
 
-#~ msgid "Modes"
-#~ msgstr "Modos"
-
 #~ msgid "User Count:\t\t%d\n"
 #~ msgstr "Cuenta de usuarios:\t\t%d\n"
 
@@ -12577,9 +15311,6 @@
 #~ "Error al leer del servidor %s. La última orden fue:\n"
 #~ "%s"
 
-#~ msgid "An MSN message may not have been received."
-#~ msgstr "Un mensaje MSN puede no haber llegado a destino."
-
 #~ msgid "Full Name:\t\t%s\n"
 #~ msgstr "Nombre completo:\t\t%s\n"
 
@@ -12628,9 +15359,6 @@
 #~ msgid "_Bold"
 #~ msgstr "_Negrita"
 
-#~ msgid "_Italic"
-#~ msgstr "Curs_iva"
-
 #~ msgid "_Underline"
 #~ msgstr "S_ubrayado"
 
@@ -12655,9 +15383,6 @@
 #~ msgid "Bac_kground color"
 #~ msgstr "Color del _fondo"
 
-#~ msgid "Show graphical _smileys"
-#~ msgstr "Mostrar _emoticonos gráficos"
-
 #~ msgid "Show _URLs as links"
 #~ msgstr "Mostrar _URLs como enlaces"
 
@@ -12718,9 +15443,6 @@
 #~ msgid "Send auto-response in _active conversations"
 #~ msgstr "Enviar la respuesta automática en conversaciones a_ctivas"
 
-#~ msgid "Fonts"
-#~ msgstr "Tipografía"
-
 #~ msgid ""
 #~ "You are not currently signed on with any protocols that have the ability "
 #~ "to list rooms."
@@ -12776,9 +15498,6 @@
 #~ msgid "_Screenname:"
 #~ msgstr "_Nombre de usuario:"
 
-#~ msgid "_Get Info"
-#~ msgstr "Obtener _información"
-
 #~ msgid "_IM"
 #~ msgstr "M_I"
 
@@ -12858,9 +15577,6 @@
 #~ msgid "Join"
 #~ msgstr "Unirse"
 
-#~ msgid "New Message"
-#~ msgstr "Mensaje nuevo"
-
 #~ msgid "Alias chat"
 #~ msgstr "Apodo de chat"
 
@@ -13034,9 +15750,6 @@
 #~ msgid "Disable Animation"
 #~ msgstr "Deshabilitar Animación"
 
-#~ msgid "Enable Animation"
-#~ msgstr "Habilitar Animación"
-
 #~ msgid "Secure IM"
 #~ msgstr "MI segura"
 
@@ -13101,9 +15814,6 @@
 #~ msgid "Password successfully changed."
 #~ msgstr "La contraseña se cambió correctamente."
 
-#~ msgid "Connected"
-#~ msgstr "Conectado"
-
 #~ msgid "Requesting Authentication Method"
 #~ msgstr "Solicitando método de autenticación"
 
@@ -13324,7 +16034,7 @@
 #~ "'LSchiere' Schierer (soporte)<BR><BR>"
 
 #~ msgid "<FONT SIZE=\"3\">Crazy Patch Writers:</FONT><BR>"
-#~ msgstr "<FONT SIZE=\"3\">Alocados escritores de parches:</FONT><BR>"
+#~ msgstr "<FONT SIZE=\"3\">Locos escritores de parches:</FONT><BR>"
 
 #~ msgid "<FONT SIZE=\"3\">Retired Developers:</FONT><BR>"
 #~ msgstr "<FONT SIZE=\"3\">Desarrolladores retirados:</FONT><BR>"
@@ -13501,9 +16211,6 @@
 #~ "No se puede conectar con esta cuenta; no se dispone del protocolo que "
 #~ "usa, o el protocolo no dispone de la función de conexión."
 
-#~ msgid "Account Editor"
-#~ msgstr "Editor de cuentas"
-
 #~ msgid "%s was unable to sign on"
 #~ msgstr "%s no pudo conectarse"
 
@@ -13552,9 +16259,6 @@
 #~ msgid "%s has mail from %s: %s"
 #~ msgstr "%s tiene correo de %s: %s"
 
-#~ msgid "No Subject"
-#~ msgstr "Sin tema"
-
 #~ msgid "%s has new mail."
 #~ msgstr "%s tiene nuevo correo."
 
@@ -13593,15 +16297,3 @@
 
 #~ msgid "C_ancel"
 #~ msgstr "C_ancelar"
-
-#: gaim.desktop.in:11
-msgid "Gaim Internet Messenger"
-msgstr "Gaim - cliente de mensajería de Internet"
-
-#: gaim.desktop.in:13
-msgid "Internet Messenger"
-msgstr "Cliente de mensajería de Internet"
-
-#: gaim.desktop.in:15
-msgid "Send instant messages over multiple protocols"
-msgstr "Cliente de mensajería instantánea multiprotocolo"
diff -r dc396c7dbcf9 -r 5e9f17b439cd po/sl.po
--- a/po/sl.po	Thu Feb 16 23:02:56 2006 +0000
+++ b/po/sl.po	Fri Feb 17 00:29:36 2006 +0000
@@ -9,7 +9,7 @@
 "Project-Id-Version: Gaim 2.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-09-08 00:02-0400\n"
-"PO-Revision-Date: 2006-01-29 13:05+0100\n"
+"PO-Revision-Date: 2006-02-15 19:08+0100\n"
 "Last-Translator: Martin Srebotnjak <miles@filmsi.net>\n"
 "Language-Team: Martin Srebotnjak, LUGOS <sl@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,13 +20,25 @@
 "X-Poedit-Country: SLOVENIA\n"
 "X-Poedit-SourceCharset: iso-8859-1\n"
 
+#: ../gaim.desktop.in.h:1
+msgid "Gaim Internet Messenger"
+msgstr "Spletni sel Gaim"
+
+#: ../gaim.desktop.in.h:2
+msgid "Internet Messenger"
+msgstr "Spletni sel"
+
+#: ../gaim.desktop.in.h:3
+msgid "Send instant messages over multiple protocols"
+msgstr "Pošlji neposredna sporočila prek več protokolov"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ciphertest.c:264
+#: ../plugins/ciphertest.c:264
 msgid "Cipher Test"
 msgstr "Preizkusi šifre"
 
@@ -34,45 +46,45 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ciphertest.c:267
-#: plugins/ciphertest.c:269
+#: ../plugins/ciphertest.c:267
+#: ../plugins/ciphertest.c:269
 msgid "Tests the ciphers that ship with gaim."
 msgstr "Preizkusi šifre, ki jih prejmete z Gaimom."
 
-#: plugins/contact_priority.c:61
+#: ../plugins/contact_priority.c:61
 msgid "Buddy is idle"
 msgstr "Prijatelj je nedejaven"
 
-#: plugins/contact_priority.c:62
+#: ../plugins/contact_priority.c:62
 msgid "Buddy is away"
 msgstr "Prijatelj je odsoten"
 
-#: plugins/contact_priority.c:63
+#: ../plugins/contact_priority.c:63
 msgid "Buddy is \"extended\" away"
 msgstr "Prijatelj je \"podaljšano\" odsoten"
 
 #. Not used yet.
-#: plugins/contact_priority.c:66
+#: ../plugins/contact_priority.c:66
 msgid "Buddy is mobile"
 msgstr "Prijatelj je mobilen"
 
-#: plugins/contact_priority.c:68
+#: ../plugins/contact_priority.c:68
 msgid "Buddy is offline"
 msgstr "Prijatelj ni na zvezi"
 
-#: plugins/contact_priority.c:90
+#: ../plugins/contact_priority.c:90
 msgid "Point values to use when..."
 msgstr "Vrednosti točk, ko ..."
 
-#: plugins/contact_priority.c:118
+#: ../plugins/contact_priority.c:118
 msgid "The buddy with the <i>largest score</i> is the buddy who will have priority in the contact.\n"
 msgstr "Prijatelj z <i>največjim rezultatom</i> je tisti, ki bo imel prioriteto pri stiku.\n"
 
-#: plugins/contact_priority.c:125
+#: ../plugins/contact_priority.c:125
 msgid "Use last buddy when scores are equal"
 msgstr "Uporabi zadnjega prijatelja, ko so rezultati poravnani"
 
-#: plugins/contact_priority.c:130
+#: ../plugins/contact_priority.c:130
 msgid "Point values to use for account..."
 msgstr "Vrednosti točk za račun ..."
 
@@ -82,19 +94,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/contact_priority.c:182
+#: ../plugins/contact_priority.c:182
 msgid "Contact Priority"
 msgstr "Prednost stika"
 
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/contact_priority.c:185
+#: ../plugins/contact_priority.c:185
 msgid "Allows for controlling the values associated with different buddy states."
 msgstr "Omogoča nastavljanje vrednosti, povezanih z različnimi stanji prijateljev."
 
 #. *< description
-#: plugins/contact_priority.c:187
+#: ../plugins/contact_priority.c:187
 msgid "Allows for changing the point values of idle/away/offline states for buddies in contact priority computations."
 msgstr "Omogoča nastavljanje vrednosti točk pri računanju prednosti stikov za stanja prijateljev nedejaven/odsoten/ni na zvezi."
 
@@ -105,48 +117,48 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/crazychat/cc_gaim_plugin.c:146
+#: ../plugins/crazychat/cc_gaim_plugin.c:146
 msgid "Crazychat"
 msgstr "Crazychat"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/crazychat/cc_gaim_plugin.c:149
+#: ../plugins/crazychat/cc_gaim_plugin.c:149
 msgid "Plugin to establish a Crazychat session."
 msgstr "Vstavek za vzpostavitev seje Crazychat."
 
 #. *  description
-#: plugins/crazychat/cc_gaim_plugin.c:151
+#: ../plugins/crazychat/cc_gaim_plugin.c:151
 msgid "Uses Gaim to obtain buddy ips to connect for a Crazychat session"
 msgstr "Z Gaimom pridobi prijateljev ips za povezavo v sejo Crazychat"
 
 #. make the network configuration frame
-#: plugins/crazychat/cc_gaim_plugin.c:295
+#: ../plugins/crazychat/cc_gaim_plugin.c:295
 msgid "Network Configuration"
 msgstr "Nastavitve omrežja"
 
-#: plugins/crazychat/cc_gaim_plugin.c:307
+#: ../plugins/crazychat/cc_gaim_plugin.c:307
 msgid "TCP port"
 msgstr "Vrata TCP"
 
-#: plugins/crazychat/cc_gaim_plugin.c:317
+#: ../plugins/crazychat/cc_gaim_plugin.c:317
 msgid "UDP port"
 msgstr "Vrata UDP"
 
 #. make the feature configuration frame
-#: plugins/crazychat/cc_gaim_plugin.c:329
+#: ../plugins/crazychat/cc_gaim_plugin.c:329
 msgid "Feature Calibration"
 msgstr "Kalibracija možnosti"
 
 #. add enabled / disabled
-#: plugins/crazychat/cc_gaim_plugin.c:345
-#: src/gtkaccount.c:2240
-#: src/gtkplugin.c:577
+#: ../plugins/crazychat/cc_gaim_plugin.c:345
+#: ../src/gtkaccount.c:2251
+#: ../src/gtkplugin.c:577
 msgid "Enabled"
 msgstr "Omogočen"
 
-#: plugins/crazychat/cc_gaim_plugin.c:350
+#: ../plugins/crazychat/cc_gaim_plugin.c:350
 msgid "Disabled"
 msgstr "Onemogočen"
 
@@ -156,7 +168,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/dbus-example.c:135
+#: ../plugins/dbus-example.c:135
 msgid "DBus"
 msgstr "DBus"
 
@@ -164,17 +176,17 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/dbus-example.c:138
-#: plugins/dbus-example.c:140
+#: ../plugins/dbus-example.c:138
+#: ../plugins/dbus-example.c:140
 msgid "DBus Plugin Example"
 msgstr "Primer vstavka DBus"
 
-#: plugins/docklet/docklet.c:154
+#: ../plugins/docklet/docklet.c:154
 msgid "Right-click for more unread messages...\n"
 msgstr "Za več neprebranih sporočil kliknite na desni miškin gumb ...\n"
 
-#: plugins/docklet/docklet.c:157
-#: src/gtkblist.c:3276
+#: ../plugins/docklet/docklet.c:157
+#: ../src/gtkblist.c:3286
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
@@ -183,139 +195,143 @@
 msgstr[2] "%d neprebrani sporočili od %s\n"
 msgstr[3] "%d neprebrana sporočila od %s\n"
 
-#: plugins/docklet/docklet.c:401
+#: ../plugins/docklet/docklet.c:432
 msgid "Change Status"
 msgstr "Spremeni stanje"
 
-#: plugins/docklet/docklet.c:404
-#: src/gtkstatusbox.c:575
-#: 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:2682
-#: src/status.c:155
+#: ../plugins/docklet/docklet.c:435
+#: ../src/gtkstatusbox.c:663
+#: ../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:2733
+#: ../src/status.c:155
 msgid "Available"
 msgstr "Na voljo"
 
 #. Away stuff
-#: plugins/docklet/docklet.c:408
-#: src/gtkprefs.c:1748
-#: src/gtkstatusbox.c:576
-#: src/protocols/irc/irc.c:456
-#: src/protocols/irc/msgs.c:219
-#: src/protocols/jabber/buddy.c:1105
-#: src/protocols/novell/novell.c:2848
-#: src/protocols/oscar/oscar.c:726
-#: src/protocols/oscar/oscar.c:6780
-#: src/protocols/oscar/oscar.c:7824
-#: src/protocols/silc/buddy.c:1469
-#: src/protocols/yahoo/yahoo.c:3134
-#: src/status.c:158
+#: ../plugins/docklet/docklet.c:439
+#: ../src/gtkprefs.c:1759
+#: ../src/gtkstatusbox.c:664
+#: ../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:729
+#: ../src/protocols/oscar/oscar.c:6759
+#: ../src/protocols/oscar/oscar.c:7800
+#: ../src/protocols/silc/buddy.c:1469
+#: ../src/protocols/yahoo/yahoo.c:3187
+#: ../src/status.c:158
 msgid "Away"
 msgstr "Odsoten"
 
-#: plugins/docklet/docklet.c:412
-#: src/gtkstatusbox.c:577
-#: src/protocols/oscar/oscar.c:730
-#: src/protocols/yahoo/yahoo.c:2676
-#: src/status.c:157
+#: ../plugins/docklet/docklet.c:443
+#: ../src/gtkstatusbox.c:665
+#: ../src/protocols/oscar/oscar.c:733
+#: ../src/protocols/yahoo/yahoo.c:2727
+#: ../src/status.c:157
 msgid "Invisible"
 msgstr "Neviden"
 
-#: plugins/docklet/docklet.c:416
-#: src/gtkblist.c:3015
-#: src/gtkstatusbox.c:578
-#: src/protocols/jabber/buddy.c:1099
-#: src/protocols/novell/novell.c:2857
-#: src/protocols/oscar/oscar.c:792
-#: src/protocols/oscar/oscar.c:7796
-#: src/protocols/yahoo/yahoo.c:2680
-#: src/status.c:154
+#: ../plugins/docklet/docklet.c:447
+#: ../src/gtkblist.c:3016
+#: ../src/gtkstatusbox.c:666
+#: ../src/protocols/jabber/buddy.c:1099
+#: ../src/protocols/novell/novell.c:2857
+#: ../src/protocols/oscar/oscar.c:795
+#: ../src/protocols/oscar/oscar.c:7772
+#: ../src/protocols/yahoo/yahoo.c:2731
+#: ../src/status.c:154
 msgid "Offline"
 msgstr "Brez povezave"
 
-#: plugins/docklet/docklet.c:436
-msgid "New Status..."
-msgstr "Novo stanje ..."
-
-#: plugins/docklet/docklet.c:437
-msgid "Saved Status..."
-msgstr "Shranjeno stanje ..."
-
-#: plugins/docklet/docklet.c:453
+#: ../plugins/docklet/docklet.c:467
+#: ../src/gtkstatusbox.c:671
+msgid "New..."
+msgstr "Novo ..."
+
+#: ../plugins/docklet/docklet.c:468
+#: ../src/gtkstatusbox.c:672
+msgid "Saved..."
+msgstr "Datoteka shranjena ..."
+
+#: ../plugins/docklet/docklet.c:484
 msgid "Show Buddy List"
 msgstr "Pokaži seznam prijateljev"
 
-#: plugins/docklet/docklet.c:458
+#: ../plugins/docklet/docklet.c:489
 msgid "Unread Messages"
 msgstr "Neprebrana sporočila"
 
-#: plugins/docklet/docklet.c:479
+#: ../plugins/docklet/docklet.c:510
 msgid "New Message..."
 msgstr "Novo sporočilo ..."
 
-#: plugins/docklet/docklet.c:488
-#: src/gtkaccount.c:2465
+#: ../plugins/docklet/docklet.c:519
+#: ../src/gtkaccount.c:2467
 msgid "Accounts"
 msgstr "Računi"
 
-#: plugins/docklet/docklet.c:489
-#: src/gtkplugin.c:541
+#: ../plugins/docklet/docklet.c:520
+#: ../src/gtkplugin.c:541
 msgid "Plugins"
 msgstr "Vstavki"
 
-#: plugins/docklet/docklet.c:490
-#: src/gtkprefs.c:1889
+#: ../plugins/docklet/docklet.c:521
+#: ../src/gtkprefs.c:1900
 msgid "Preferences"
 msgstr "Nastavitve"
 
-#: plugins/docklet/docklet.c:494
+#: ../plugins/docklet/docklet.c:525
 msgid "Mute Sounds"
 msgstr "Utišaj zvoke"
 
 #. TODO: need a submenu to change status, this needs to "link"
 #. * to the status in the buddy list gtkstatusbox
 #.
-#: plugins/docklet/docklet.c:507
+#: ../plugins/docklet/docklet.c:538
 msgid "Quit"
 msgstr "Končaj"
 
-#: plugins/docklet/docklet.c:648
+#: ../plugins/docklet/docklet.c:679
 msgid "Blink tray icon for unread..."
 msgstr "Utripaj ikono na pladnju za neprebrano ..."
 
-#: plugins/docklet/docklet.c:651
+#: ../plugins/docklet/docklet.c:682
 msgid "_Instant Messages:"
 msgstr "_Neposredna sporočila:"
 
-#: plugins/docklet/docklet.c:653
-#: plugins/docklet/docklet.c:661
-#: plugins/win32/winprefs/winprefs.c:411
-#: src/gtkprefs.c:816
-#: src/gtkprefs.c:1738
-#: src/gtkprefs.c:1752
+#: ../plugins/docklet/docklet.c:684
+#: ../plugins/docklet/docklet.c:692
+#: ../plugins/win32/winprefs/winprefs.c:411
+#: ../src/gtkprefs.c:823
+#: ../src/gtkprefs.c:1749
+#: ../src/gtkprefs.c:1763
 msgid "Never"
 msgstr "nikoli"
 
-#: plugins/docklet/docklet.c:654
+#: ../plugins/docklet/docklet.c:685
 msgid "In hidden conversations"
 msgstr "V skritih pogovorih"
 
-#: plugins/docklet/docklet.c:655
-#: plugins/docklet/docklet.c:663
-#: plugins/win32/winprefs/winprefs.c:412
-#: src/gtkprefs.c:818
+#: ../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:412
+#: ../src/gtkprefs.c:825
 msgid "Always"
 msgstr "vedno"
 
-#: plugins/docklet/docklet.c:659
+#: ../plugins/docklet/docklet.c:690
 msgid "C_hat Messages:"
 msgstr "_Sporočila klepeta:"
 
-#: plugins/docklet/docklet.c:662
+#: ../plugins/docklet/docklet.c:693
 msgid "When my nick is said"
 msgstr "Ko je vzdevek v sporočilu"
 
@@ -325,43 +341,43 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:689
+#: ../plugins/docklet/docklet.c:720
 msgid "System Tray Icon"
 msgstr "Ikona na pladnju"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:692
+#: ../plugins/docklet/docklet.c:723
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "Prikaže ikono za Gaim v sistemskem pladnju."
 
 #. *  description
-#: plugins/docklet/docklet.c:694
+#: ../plugins/docklet/docklet.c:725
 msgid "Displays a system tray icon (in GNOME, KDE, or Windows for example) to show the current status of Gaim, allow fast access to commonly used functions, and to toggle display of the buddy list. Also provides options to blink for unread messages."
 msgstr "Prikaže ikono v sistemskem pladnju (na primer v GNOME, KDE ali Windows) in s tem prikazuje trenutno stanje pogovorov ter omogoča lažji dostop do pogosto uporabljanih funkcij. S to ikono lahko tudi skrije oz. prikaže seznam stikov ali prijavni zaslon. Omogoča tudi možnosti utripanja ob neprebranih sporočilih."
 
-#: plugins/docklet/eggtrayicon.c:123
+#: ../plugins/docklet/eggtrayicon.c:123
 msgid "Orientation"
 msgstr "Postavitev"
 
-#: plugins/docklet/eggtrayicon.c:124
+#: ../plugins/docklet/eggtrayicon.c:124
 msgid "The orientation of the tray."
 msgstr "Postavitev pladnja."
 
-#: plugins/extplacement.c:80
+#: ../plugins/extplacement.c:80
 msgid "By conversation count"
 msgstr "Po številu pomenkov"
 
-#: plugins/extplacement.c:101
+#: ../plugins/extplacement.c:101
 msgid "Conversation Placement"
 msgstr "Postavitev pomenkov"
 
-#: plugins/extplacement.c:106
+#: ../plugins/extplacement.c:106
 msgid "Number of conversations per window"
 msgstr "Število pomenkov v oknu"
 
-#: plugins/extplacement.c:112
+#: ../plugins/extplacement.c:112
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "Pri postavitvi po številu loči okna za klepet in zasebni pomenek"
 
@@ -371,19 +387,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/extplacement.c:135
+#: ../plugins/extplacement.c:135
 msgid "ExtPlacement"
 msgstr "Postavitev"
 
 #. *< name
 #. *< version
-#: plugins/extplacement.c:137
+#: ../plugins/extplacement.c:137
 msgid "Extra conversation placement options."
 msgstr "Dodatne možnosti postavitve pomenka."
 
 #. *< summary
 #. *  description
-#: plugins/extplacement.c:139
+#: ../plugins/extplacement.c:139
 msgid "Restrict the number of conversations per windows, optionally separating IMs and Chats"
 msgstr "Omeji število pomenkov po oknih z možnostjo ločitve oken za klepet in zasebni pomenek"
 
@@ -393,7 +409,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:245
+#: ../plugins/filectl.c:245
 msgid "Gaim File Control"
 msgstr "Nadzor datotek Gaim"
 
@@ -401,8 +417,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/filectl.c:248
-#: plugins/filectl.c:250
+#: ../plugins/filectl.c:248
+#: ../plugins/filectl.c:250
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "Omogoča nadzor nad Gaimom z vnašanjem ukazov v datoteko."
 
@@ -419,19 +435,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaiminc.c:91
+#: ../plugins/gaiminc.c:91
 msgid "Gaim Demonstration Plugin"
 msgstr "Gaim predstavitveni vstavek"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaiminc.c:94
+#: ../plugins/gaiminc.c:94
 msgid "An example plugin that does stuff - see the description."
 msgstr "Vzorčni vstavek, ki počne razne stvari - oglejte si opis."
 
 #. *  description
-#: plugins/gaiminc.c:96
+#: ../plugins/gaiminc.c:96
 msgid ""
 "This is a really cool plugin that does a lot of stuff:\n"
 "- It tells you who wrote the program when you log in\n"
@@ -443,113 +459,129 @@
 "- prikaže vsa prispela sporočila črkovana nazaj;\n"
 "- pošlje sporočilo prijateljem na vašem seznamu, takoj ko se prijavijo;"
 
-#: plugins/gaimrc.c:41
+#: ../plugins/gaimrc.c:41
 msgid "Cursor Color"
 msgstr "Barva kazalke"
 
-#: plugins/gaimrc.c:42
+#: ../plugins/gaimrc.c:42
 msgid "Secondary Cursor Color"
 msgstr "Drugotna barva kazalke"
 
-#: plugins/gaimrc.c:43
+#: ../plugins/gaimrc.c:43
 msgid "Hyperlink Color"
 msgstr "Barva povezave"
 
-#: plugins/gaimrc.c:56
+#: ../plugins/gaimrc.c:56
 msgid "GtkTreeView Expander Size"
 msgstr "Velikost razširnika GtkTreeView"
 
-#: plugins/gaimrc.c:57
+#: ../plugins/gaimrc.c:57
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Vodoravno ločilo GtkTreeView"
 
-#: plugins/gaimrc.c:76
+#: ../plugins/gaimrc.c:76
 msgid "Conversation Entry"
 msgstr "Vnos pogovora"
 
-#: plugins/gaimrc.c:77
+#: ../plugins/gaimrc.c:77
 msgid "Conversation History"
 msgstr "Zgodovina pogovora"
 
-#: plugins/gaimrc.c:78
+#: ../plugins/gaimrc.c:78
 msgid "Log Viewer"
 msgstr "Ogledovalnik dnevnika"
 
-#: plugins/gaimrc.c:79
+#: ../plugins/gaimrc.c:79
 msgid "Request Dialog"
 msgstr "Pogovorno okno zahteve"
 
-#: plugins/gaimrc.c:80
+#: ../plugins/gaimrc.c:80
 msgid "Notify Dialog"
 msgstr "Pogovorno okno obvestila"
 
-#: plugins/gaimrc.c:91
+#: ../plugins/gaimrc.c:91
 msgid "GtkTreeView Indent Expanders"
 msgstr "Razširniki zamika GtkTreeView"
 
-#: plugins/gaimrc.c:287
+#: ../plugins/gaimrc.c:287
 #, c-format
 msgid "Select Color for %s"
 msgstr "Nastavite barvo za %s"
 
-#: plugins/gaimrc.c:289
+#: ../plugins/gaimrc.c:289
 msgid "Select Color"
 msgstr "Nastavite barvo"
 
-#: plugins/gaimrc.c:324
+#: ../plugins/gaimrc.c:324
 #, c-format
 msgid "Select Font for %s"
 msgstr "Nastavite pisavo za %s"
 
-#: plugins/gaimrc.c:362
+#: ../plugins/gaimrc.c:362
 msgid "Select Interface Font"
 msgstr "Nastavite pisavo vmesnika"
 
-#: plugins/gaimrc.c:420
+#: ../plugins/gaimrc.c:415
+msgid "General"
+msgstr "Splošno"
+
+#: ../plugins/gaimrc.c:420
 msgid "GTK+ Interface Font"
 msgstr "Pisava vmesnika GTK+"
 
-#: plugins/gaimrc.c:440
+#: ../plugins/gaimrc.c:440
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Tema bližnjic besedila GTK+"
 
-#: plugins/gaimrc.c:543
+#: ../plugins/gaimrc.c:475
+msgid "Interface colors"
+msgstr "Barve vmesnika"
+
+#: ../plugins/gaimrc.c:499
+msgid "Widget Sizes"
+msgstr "Velikosti gradnikov"
+
+#: ../plugins/gaimrc.c:520
+msgid "Fonts"
+msgstr "Pisave"
+
+#: ../plugins/gaimrc.c:543
 msgid "Tools"
 msgstr "Orodja"
 
-#: plugins/gaimrc.c:548
+#: ../plugins/gaimrc.c:548
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Zapiši nastavitve v %s%sgtkrc-2.0"
 
-#: plugins/gaimrc.c:556
+#: ../plugins/gaimrc.c:556
 msgid "Re-read gtkrc files"
 msgstr "Ponovno preberi datoteke gtkrc"
 
-#: plugins/gaimrc.c:583
+#: ../plugins/gaimrc.c:583
 msgid "Gaim GTK+ Theme Control"
 msgstr "Nadzor teme Gaim GTK+"
 
-#: plugins/gaimrc.c:585
-#: plugins/gaimrc.c:586
+#: ../plugins/gaimrc.c:585
+#: ../plugins/gaimrc.c:586
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Omogoča dostop do pogosto uporabljenih nastavitev gtkrc."
 
 #. Configuration frame
-#: plugins/gestures/gestures.c:235
+#: ../plugins/gestures/gestures.c:235
 msgid "Mouse Gestures Configuration"
 msgstr "Nastavitve gest miške"
 
-#: plugins/gestures/gestures.c:242
+#: ../plugins/gestures/gestures.c:242
 msgid "Middle mouse button"
 msgstr "Srednja miškina tipka"
 
-#: plugins/gestures/gestures.c:247
+#: ../plugins/gestures/gestures.c:247
 msgid "Right mouse button"
 msgstr "Desna miškina tipka"
 
 #. "Visual gesture display" checkbox
-#: plugins/gestures/gestures.c:259
+#: ../plugins/gestures/gestures.c:259
 msgid "_Visual gesture display"
 msgstr "_Viden prikaz gest"
 
@@ -559,19 +591,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gestures/gestures.c:289
+#: ../plugins/gestures/gestures.c:289
 msgid "Mouse Gestures"
 msgstr "Miškine geste"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gestures/gestures.c:292
+#: ../plugins/gestures/gestures.c:292
 msgid "Provides support for mouse gestures"
 msgstr "Omogoča podporo za geste miške"
 
 #. *  description
-#: plugins/gestures/gestures.c:294
+#: ../plugins/gestures/gestures.c:294
 msgid ""
 "Allows support for mouse gestures in conversation windows.\n"
 "Drag the middle mouse button to perform certain actions:\n"
@@ -587,118 +619,118 @@
 "Povlecite navzgor in zatem levo, da se vrnete k prejšnjemu pogovoru.\n"
 "Povlecite navzgor in zatem desno, da se premaknete k naslednjemu pogovoru."
 
-#: plugins/gevolution/add_buddy_dialog.c:131
-#: plugins/gevolution/assoc-buddy.c:119
-#: src/gtkplugin.c:590
-#: src/gtkroomlist.c:604
-#: src/protocols/jabber/jabber.c:686
-#: src/protocols/msn/msn.c:1515
+#: ../plugins/gevolution/add_buddy_dialog.c:131
+#: ../plugins/gevolution/assoc-buddy.c:119
+#: ../src/gtkplugin.c:590
+#: ../src/gtkroomlist.c:604
+#: ../src/protocols/jabber/jabber.c:755
+#: ../src/protocols/msn/msn.c:1524
 msgid "Name"
 msgstr "Ime"
 
-#: plugins/gevolution/add_buddy_dialog.c:142
+#: ../plugins/gevolution/add_buddy_dialog.c:142
 msgid "Instant Messaging"
 msgstr "Neposredno sporočanje"
 
 #. Add the label.
-#: plugins/gevolution/add_buddy_dialog.c:458
+#: ../plugins/gevolution/add_buddy_dialog.c:454
 msgid "Select a person from your address book below, or add a new person."
 msgstr "Izberite osebo iz vašega imenika spodaj ali dodajte novo."
 
 #. "Search"
-#: plugins/gevolution/add_buddy_dialog.c:471
-#: plugins/gevolution/assoc-buddy.c:353
-#: src/protocols/jabber/buddy.c:1411
-#: src/protocols/oscar/oscar.c:8344
-#: src/protocols/sametime/sametime.c:5409
+#: ../plugins/gevolution/add_buddy_dialog.c:467
+#: ../plugins/gevolution/assoc-buddy.c:353
+#: ../src/protocols/jabber/buddy.c:1411
+#: ../src/protocols/oscar/oscar.c:8320
+#: ../src/protocols/sametime/sametime.c:5533
 msgid "Search"
 msgstr "Išči"
 
-#: plugins/gevolution/add_buddy_dialog.c:552
-#: plugins/gevolution/new_person_dialog.c:306
-#: src/gtkblist.c:4556
-#: src/gtkblist.c:4920
+#: ../plugins/gevolution/add_buddy_dialog.c:548
+#: ../plugins/gevolution/new_person_dialog.c:306
+#: ../src/gtkblist.c:4555
+#: ../src/gtkblist.c:4919
 msgid "Group:"
 msgstr "Skupina:"
 
 #. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:578
-#: plugins/gevolution/assoc-buddy.c:464
+#: ../plugins/gevolution/add_buddy_dialog.c:574
+#: ../plugins/gevolution/assoc-buddy.c:464
 msgid "New Person"
 msgstr "Nova oseba"
 
 #. "Select Buddy" button
-#: plugins/gevolution/add_buddy_dialog.c:595
+#: ../plugins/gevolution/add_buddy_dialog.c:591
 msgid "Select Buddy"
 msgstr "Izberi prijatelja"
 
 #. Add the label.
-#: plugins/gevolution/assoc-buddy.c:340
+#: ../plugins/gevolution/assoc-buddy.c:340
 msgid "Select a person from your address book to add this buddy to, or create a new person."
 msgstr "Izberite osebo iz vašega imenika, ki ji želite dodati tega prijatelja, ali ustvarite novo osebo."
 
 #. Add the expander
-#: plugins/gevolution/assoc-buddy.c:428
+#: ../plugins/gevolution/assoc-buddy.c:428
 msgid "User _details"
 msgstr "Podrobnosti _o uporabniku"
 
 #. "Associate Buddy" button
-#: plugins/gevolution/assoc-buddy.c:481
+#: ../plugins/gevolution/assoc-buddy.c:481
 msgid "_Associate Buddy"
 msgstr "Pridruži prijatelj_a"
 
-#: plugins/gevolution/eds-utils.c:73
-#: plugins/gevolution/eds-utils.c:86
-#: src/protocols/jabber/jabber.c:1035
+#: ../plugins/gevolution/eds-utils.c:73
+#: ../plugins/gevolution/eds-utils.c:86
+#: ../src/protocols/jabber/jabber.c:1125
 msgid "None"
 msgstr "brez"
 
-#: plugins/gevolution/gevo-util.c:64
-#: plugins/gevolution/gevolution.c:96
-#: src/blist.c:516
-#: src/blist.c:1269
-#: src/blist.c:1494
-#: src/gtkblist.c:4365
-#: src/protocols/jabber/roster.c:65
+#: ../plugins/gevolution/gevo-util.c:64
+#: ../plugins/gevolution/gevolution.c:96
+#: ../src/blist.c:516
+#: ../src/blist.c:1270
+#: ../src/blist.c:1495
+#: ../src/gtkblist.c:4364
+#: ../src/protocols/jabber/roster.c:65
 msgid "Buddies"
 msgstr "Prijatelji"
 
-#: plugins/gevolution/gevolution.c:262
-#: plugins/gevolution/gevolution.c:268
+#: ../plugins/gevolution/gevolution.c:262
+#: ../plugins/gevolution/gevolution.c:268
 msgid "Unable to send e-mail"
 msgstr "E-sporočila ni mogoče poslati."
 
-#: plugins/gevolution/gevolution.c:263
+#: ../plugins/gevolution/gevolution.c:263
 msgid "The evolution executable was not found in the PATH."
 msgstr "Izvršilne datoteke Evolution ni v POTI."
 
-#: plugins/gevolution/gevolution.c:269
+#: ../plugins/gevolution/gevolution.c:269
 msgid "The specified buddy was not found in the Evolution Contacts."
 msgstr "Navedenega prijatelja ni med stiki v Evolution."
 
-#: plugins/gevolution/gevolution.c:286
+#: ../plugins/gevolution/gevolution.c:286
 msgid "Add to Address Book"
 msgstr "Dodaj v imenik"
 
-#: plugins/gevolution/gevolution.c:290
+#: ../plugins/gevolution/gevolution.c:290
 msgid "Send E-Mail"
 msgstr "Pošlji e-sporočilo"
 
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:417
+#: ../plugins/gevolution/gevolution.c:417
 msgid "Evolution Integration Configuration"
 msgstr "Nastavitve integracije z Evolutionom"
 
 #. Label
-#: plugins/gevolution/gevolution.c:420
+#: ../plugins/gevolution/gevolution.c:420
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "Izberite vse račune, katerim naj se samodejno dodajo prijatelji."
 
-#: plugins/gevolution/gevolution.c:450
-#: plugins/idle.c:147
-#: plugins/idle.c:183
-#: src/gtknotify.c:371
-#: src/gtkpounce.c:1260
+#: ../plugins/gevolution/gevolution.c:450
+#: ../plugins/idle.c:147
+#: ../plugins/idle.c:183
+#: ../src/gtknotify.c:371
+#: ../src/gtkpounce.c:1260
 msgid "Account"
 msgstr "Račun"
 
@@ -708,7 +740,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:534
+#: ../plugins/gevolution/gevolution.c:527
 msgid "Evolution Integration"
 msgstr "Integracija z Evolutionom"
 
@@ -716,50 +748,50 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:537
-#: plugins/gevolution/gevolution.c:539
+#: ../plugins/gevolution/gevolution.c:530
+#: ../plugins/gevolution/gevolution.c:532
 msgid "Provides integration with Evolution."
 msgstr "Omogoča integracijo z Evolutionom."
 
-#: plugins/gevolution/new_person_dialog.c:266
+#: ../plugins/gevolution/new_person_dialog.c:266
 msgid "Please enter the person's information below."
 msgstr "Spodaj vnesite podatke o osebi."
 
-#: plugins/gevolution/new_person_dialog.c:270
+#: ../plugins/gevolution/new_person_dialog.c:270
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "Spodaj vnesite prijateljev vzdevek in vrsto računa."
 
-#: plugins/gevolution/new_person_dialog.c:290
+#: ../plugins/gevolution/new_person_dialog.c:290
 msgid "Account type:"
 msgstr "Vrsta računa:"
 
-#: plugins/gevolution/new_person_dialog.c:294
-#: src/gtkaccount.c:767
+#: ../plugins/gevolution/new_person_dialog.c:294
+#: ../src/gtkaccount.c:784
 msgid "Screen name:"
 msgstr "Zaslonsko ime:"
 
 #. Optional Information section
-#: plugins/gevolution/new_person_dialog.c:314
+#: ../plugins/gevolution/new_person_dialog.c:314
 msgid "Optional information:"
 msgstr "Dodatne informacije:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:337
-#: src/gtkaccount.c:407
-#: src/gtkaccount.c:429
-#: src/protocols/oscar/oscar.c:632
+#: ../plugins/gevolution/new_person_dialog.c:337
+#: ../src/gtkaccount.c:424
+#: ../src/gtkaccount.c:446
+#: ../src/protocols/oscar/oscar.c:635
 msgid "Buddy Icon"
 msgstr "Ikona prijatelja"
 
-#: plugins/gevolution/new_person_dialog.c:349
+#: ../plugins/gevolution/new_person_dialog.c:349
 msgid "First name:"
 msgstr "Ime:"
 
-#: plugins/gevolution/new_person_dialog.c:361
+#: ../plugins/gevolution/new_person_dialog.c:361
 msgid "Last name:"
 msgstr "Priimek:"
 
-#: plugins/gevolution/new_person_dialog.c:381
+#: ../plugins/gevolution/new_person_dialog.c:381
 msgid "E-mail:"
 msgstr "E-pošta:"
 
@@ -769,7 +801,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gtk-signals-test.c:158
+#: ../plugins/gtk-signals-test.c:160
 msgid "GTK Signals Test"
 msgstr "Preskus signalov GTK"
 
@@ -777,16 +809,16 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gtk-signals-test.c:161
-#: plugins/gtk-signals-test.c:163
+#: ../plugins/gtk-signals-test.c:163
+#: ../plugins/gtk-signals-test.c:165
 msgid "Test to see that all ui signals are working properly."
 msgstr "Preveri pravilnost delovanja vseh signalov uporabniškega vmesnika."
 
-#: plugins/history.c:146
+#: ../plugins/history.c:143
 msgid "History Plugin Requires Logging"
 msgstr "Vstavek za zgodovino zahteva beleženje v dnevnik"
 
-#: plugins/history.c:147
+#: ../plugins/history.c:144
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -796,15 +828,15 @@
 "\n"
 "Omogočanje beleženja v dnevnik za neposredna sporočila in/ali klepete aktivira zgodovino za istovrstne pogovore."
 
-#: plugins/history.c:187
+#: ../plugins/history.c:184
 msgid "History"
 msgstr "Zgodovina"
 
-#: plugins/history.c:189
+#: ../plugins/history.c:186
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Prikaže nedavno zabeležene pogovore v novih pogovorih."
 
-#: plugins/history.c:190
+#: ../plugins/history.c:187
 msgid "When a new conversation is opened this plugin will insert the last conversation into the current conversation."
 msgstr "Ko je odprt nov pogovor, ta vstavek vstavi zadnji pogovor v trenuten pogovor."
 
@@ -814,7 +846,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/iconaway.c:82
+#: ../plugins/iconaway.c:82
 msgid "Iconify on Away"
 msgstr "Pomanjšaj, ko sem odsoten"
 
@@ -822,63 +854,63 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/iconaway.c:85
-#: plugins/iconaway.c:87
+#: ../plugins/iconaway.c:85
+#: ../plugins/iconaway.c:87
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Pomanjša seznam prijateljev in pogovorna okna, ko ste odsotni."
 
-#: plugins/idle.c:152
-#: plugins/idle.c:210
+#: ../plugins/idle.c:152
+#: ../plugins/idle.c:210
 msgid "Minutes"
 msgstr "minut"
 
-#: plugins/idle.c:159
-#: plugins/idle.c:192
-#: plugins/idle.c:217
-#: plugins/idle.c:306
+#: ../plugins/idle.c:159
+#: ../plugins/idle.c:192
+#: ../plugins/idle.c:217
+#: ../plugins/idle.c:306
 msgid "I'dle Mak'er"
 msgstr "NedejavniK"
 
-#: plugins/idle.c:160
-#: plugins/idle.c:249
+#: ../plugins/idle.c:160
+#: ../plugins/idle.c:249
 msgid "Set Account Idle Time"
 msgstr "Nastavi čas nedejavnosti"
 
-#: plugins/idle.c:163
-#: plugins/idle.c:221
+#: ../plugins/idle.c:163
+#: ../plugins/idle.c:221
 msgid "_Set"
 msgstr "_Nastavi"
 
-#: plugins/idle.c:164
-#: plugins/idle.c:197
-#: plugins/idle.c:222
+#: ../plugins/idle.c:164
+#: ../plugins/idle.c:197
+#: ../plugins/idle.c:222
 msgid "_Cancel"
 msgstr "_Prekliči"
 
-#: plugins/idle.c:177
+#: ../plugins/idle.c:177
 msgid "None of your accounts are idle."
 msgstr "Noben od vaših računov ni nedejaven."
 
-#: plugins/idle.c:193
-#: plugins/idle.c:253
+#: ../plugins/idle.c:193
+#: ../plugins/idle.c:253
 msgid "Unset Account Idle Time"
 msgstr "Odnastavi čas nedejavnosti"
 
-#: plugins/idle.c:196
+#: ../plugins/idle.c:196
 msgid "_Unset"
 msgstr "_Odnastavi"
 
-#: plugins/idle.c:218
-#: plugins/idle.c:257
+#: ../plugins/idle.c:218
+#: ../plugins/idle.c:257
 msgid "Set Idle Time for All Accounts"
 msgstr "Nastavi čas nedejavnosti za vse račune"
 
-#: plugins/idle.c:262
+#: ../plugins/idle.c:262
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Odnastavi čas nedejavnosti za vse nedejavne račune"
 
-#: plugins/idle.c:308
-#: plugins/idle.c:309
+#: ../plugins/idle.c:308
+#: ../plugins/idle.c:309
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "Omogoča ročno nastavitev časa vaše odsotnosti"
 
@@ -895,7 +927,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ipc-test-client.c:87
+#: ../plugins/ipc-test-client.c:87
 msgid "IPC Test Client"
 msgstr "Preskusni odjemalec IPC"
 
@@ -905,12 +937,12 @@
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ipc-test-client.c:90
+#: ../plugins/ipc-test-client.c:90
 msgid "Test plugin IPC support, as a client."
 msgstr "Preskusite vstavek s podporo IPC, kot odjemalec."
 
 #. *  description
-#: plugins/ipc-test-client.c:92
+#: ../plugins/ipc-test-client.c:92
 msgid "Test plugin IPC support, as a client. This locates the server plugin and calls the commands registered."
 msgstr "Preskusite vstavek s podporo IPC, kot odjemalec. Poišče strežniški vstavek in kliče registrirane ukaze."
 
@@ -927,7 +959,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ipc-test-server.c:74
+#: ../plugins/ipc-test-server.c:74
 msgid "IPC Test Server"
 msgstr "Preskusni strežnik IPC"
 
@@ -937,87 +969,87 @@
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ipc-test-server.c:77
+#: ../plugins/ipc-test-server.c:77
 msgid "Test plugin IPC support, as a server."
 msgstr "Preskusite vstavek s podporo IPC, kot strežnik."
 
 #. *  description
-#: plugins/ipc-test-server.c:79
+#: ../plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "Preskusite vstavek s podporo IPC, kot strežnik. Ukazi IPC bodo registrirani."
 
-#: plugins/log_reader.c:1403
+#: ../plugins/log_reader.c:1407
 msgid "User is offline."
 msgstr "Uporabnik ni na zvezi."
 
-#: plugins/log_reader.c:1409
+#: ../plugins/log_reader.c:1413
 msgid "Auto-response sent:"
 msgstr "Samodejni odgovor poslan:"
 
-#: plugins/log_reader.c:1419
-#: plugins/log_reader.c:1422
+#: ../plugins/log_reader.c:1423
+#: ../plugins/log_reader.c:1426
 #, c-format
 msgid "%s logged out."
 msgstr "Uporabnik %s se je odjavil."
 
-#: plugins/log_reader.c:1436
+#: ../plugins/log_reader.c:1440
 msgid "One or more messages may have been undeliverable."
 msgstr "Eno ali več sporočil ni mogoče dostaviti."
 
 #. MSG_SERVER_DISCONNECTING
 #. we have been kicked off =^(
-#: plugins/log_reader.c:1446
-#: src/protocols/napster/napster.c:363
+#: ../plugins/log_reader.c:1450
+#: ../src/protocols/napster/napster.c:363
 msgid "You were disconnected from the server."
 msgstr "Povezava s strežnikom je bila prekinjena."
 
-#: plugins/log_reader.c:1454
+#: ../plugins/log_reader.c:1458
 msgid "You are currently disconnected. Messages will not be received unless you are logged in."
 msgstr "Trenutno niste povezani. Sporočil ne boste mogli prejemati, dokler se ne povežete."
 
-#: plugins/log_reader.c:1469
+#: ../plugins/log_reader.c:1473
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "Sporočila ni mogoče poslati, saj je presežena največja dolžina."
 
-#: plugins/log_reader.c:1474
+#: ../plugins/log_reader.c:1478
 msgid "Message could not be sent."
 msgstr "Sporočila ni mogoče poslati."
 
 #. Add general preferences.
-#: plugins/log_reader.c:1908
+#: ../plugins/log_reader.c:1912
 msgid "General Log Reading Configuration"
 msgstr "Splošne nastavitve ogledovanja dnevnika"
 
-#: plugins/log_reader.c:1912
+#: ../plugins/log_reader.c:1916
 msgid "Fast size calculations"
 msgstr "Hitri izračuni velikosti"
 
-#: plugins/log_reader.c:1916
+#: ../plugins/log_reader.c:1920
 msgid "Use name heuristics"
 msgstr "Uporabi hevristiko imena"
 
 #. Add Log Directory preferences.
-#: plugins/log_reader.c:1922
+#: ../plugins/log_reader.c:1926
 msgid "Log Directory"
 msgstr "Imenik dnevnika"
 
-#: plugins/log_reader.c:1926
+#: ../plugins/log_reader.c:1930
 msgid "Adium"
 msgstr "Adium"
 
-#: plugins/log_reader.c:1930
+#: ../plugins/log_reader.c:1934
 msgid "Fire"
 msgstr "Fire"
 
-#: plugins/log_reader.c:1934
+#: ../plugins/log_reader.c:1938
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
-#: plugins/log_reader.c:1938
+#: ../plugins/log_reader.c:1942
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: plugins/log_reader.c:1942
+#: ../plugins/log_reader.c:1946
 msgid "Trillian"
 msgstr "Trillian"
 
@@ -1027,121 +1059,170 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/log_reader.c:1965
+#: ../plugins/log_reader.c:1969
 msgid "Log Reader"
 msgstr "Ogledovalnik dnevnika"
 
 #. *< name
 #. *< version
 #. * summary
-#: plugins/log_reader.c:1969
+#: ../plugins/log_reader.c:1973
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Vključi dnevnike drugih odjemalcev neposrednih sporočil v ogledovalnik dnevnika."
 
 #. * description
-#: plugins/log_reader.c:1973
+#: ../plugins/log_reader.c:1977
 msgid "When viewing logs, this plugin will include logs from other IM clients. Currently, this includes Adium, Fire, Messenger Plus!, MSN Messenger, and Trillian."
 msgstr "Pri ogledovanju dnevnikov bo ta vstavek vključil dnevnike drugih odjemalcev neposrednih sporočil. To trenutno obsega Adium, Fire, Messenger Plus!, MSN Messenger in Trillian."
 
-#: plugins/mailchk.c:160
+#: ../plugins/mailchk.c:160
 msgid "Mail Checker"
 msgstr "Preverjevalnik pošte"
 
-#: plugins/mailchk.c:162
+#: ../plugins/mailchk.c:162
 msgid "Checks for new local mail."
 msgstr "Preveri morebitno novoprispelo pošto."
 
-#: plugins/mailchk.c:163
+#: ../plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr "Doda majhno škatlo na seznam prijateljev, ki prikazuje, ali imate novo pošto."
 
-#: plugins/mono/loader/mono.c:213
+#: ../plugins/mono/loader/mono.c:213
 msgid "Mono Plugin Loader"
 msgstr "Nalaganje vstavkov Mono"
 
-#: plugins/mono/loader/mono.c:215
-#: plugins/mono/loader/mono.c:216
+#: ../plugins/mono/loader/mono.c:215
+#: ../plugins/mono/loader/mono.c:216
 msgid "Loads .NET plugins with Mono."
 msgstr "Naloži vstavke .NET skupaj z Mono."
 
+#: ../plugins/musicmessaging/musicmessaging.c:44
+msgid "A music messaging session has been requested. Please click the MM icon to accept."
+msgstr "Zahtevana je seja glasbenega sporočanja. Prosimo, kliknite ikono MM za sprejem."
+
+#: ../plugins/musicmessaging/musicmessaging.c:45
+msgid "Music messaging session confirmed."
+msgstr "Seja glasbenega sporočanja potrjena."
+
+#: ../plugins/musicmessaging/musicmessaging.c:414
+msgid "Music Messaging"
+msgstr "Glasbeno sporočanje"
+
+#: ../plugins/musicmessaging/musicmessaging.c:415
+msgid "There was a conflict in running the command:"
+msgstr "Pri zaganjanju ukaza je prišlo do napake:"
+
+#: ../plugins/musicmessaging/musicmessaging.c:523
+msgid "Error Running Editor"
+msgstr "Napaka pri uporabi urejevalnika"
+
+#: ../plugins/musicmessaging/musicmessaging.c:524
+msgid "The following error has occured:"
+msgstr "Pprišlo do naslednje napake:"
+
 #. Configuration frame
-#: plugins/musicmessaging/musicmessaging.c:622
+#: ../plugins/musicmessaging/musicmessaging.c:623
 msgid "Music Messaging Configuration"
 msgstr "Nastavitve glasbe sporočanja"
 
-#: plugins/musicmessaging/musicmessaging.c:627
+#: ../plugins/musicmessaging/musicmessaging.c:627
+msgid "Score Editor Path"
+msgstr "Pot urejevalnika partiture"
+
+#: ../plugins/musicmessaging/musicmessaging.c:628
 msgid "_Apply"
 msgstr "Upor_abi"
 
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../plugins/musicmessaging/musicmessaging.c:663
+msgid "Music Messaging Plugin for collaborative composition."
+msgstr "Vtičnik za glasbeno sporočanje - za skupinsko skladanje."
+
+#. *  summary
+#: ../plugins/musicmessaging/musicmessaging.c:665
+msgid "The Music Messaging Plugin allows a number of users to simultaneously work on a piece of music by editting a common score in real-time."
+msgstr "Vtičnik za glasbeno sporočanje omogoča več uporabnikom hkratno sodelovanju pri glasbenem ustvarjanju kompozicije v resničnem času."
+
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:632
+#: ../plugins/notify.c:638
 msgid "Notify For"
 msgstr "Obveščaj o"
 
-#: plugins/notify.c:636
+#: ../plugins/notify.c:642
 msgid "_IM windows"
 msgstr "Okna za _neposredne pogovore"
 
-#: plugins/notify.c:643
+#: ../plugins/notify.c:649
 msgid "C_hat windows"
 msgstr "_Pogovorna okna"
 
-#: plugins/notify.c:650
+#: ../plugins/notify.c:657
+msgid "\t_Only when someone says your nick"
+msgstr "\t_Le ko nekdo omeni vaše ime v sobi"
+
+#: ../plugins/notify.c:667
 msgid "_Focused windows"
 msgstr "Okna, ki imajo _fokus"
 
 #  ---------- "Notification Methods" ----------
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:658
+#: ../plugins/notify.c:675
 msgid "Notification Methods"
 msgstr "Načini obveščanja"
 
-#: plugins/notify.c:665
+#: ../plugins/notify.c:682
 msgid "Prepend _string into window title:"
 msgstr "Dodaj _obvestilo v naslov okna:"
 
 #. Count method button
-#: plugins/notify.c:684
+#: ../plugins/notify.c:701
 msgid "Insert c_ount of new messages into window title"
 msgstr "Prikaži _število novih sporočil v naslovu okna"
 
 #. Urgent method button
-#: plugins/notify.c:693
+#: ../plugins/notify.c:710
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "V upravljalniku oken nastavi namig \"N_UJNO\""
 
 #. Raise window method button
-#: plugins/notify.c:702
+#: ../plugins/notify.c:719
 msgid "R_aise conversation window"
 msgstr "Povzdigni pogovorna okn_a"
 
 #. ---------- "Notification Removals" ----------
-#: plugins/notify.c:710
+#: ../plugins/notify.c:727
 msgid "Notification Removal"
 msgstr "Odstranjevanje obvestil"
 
 #. Remove on focus button
-#: plugins/notify.c:715
+#: ../plugins/notify.c:732
 msgid "Remove when conversation window _gains focus"
 msgstr "Odstrani, ko pogovorno okno _dobi fokus"
 
 #. Remove on click button
-#: plugins/notify.c:722
+#: ../plugins/notify.c:739
 msgid "Remove when conversation window _receives click"
 msgstr "Odstrani, ko _kliknem na pogovorno okno"
 
 #. Remove on type button
-#: plugins/notify.c:730
+#: ../plugins/notify.c:747
 msgid "Remove when _typing in conversation window"
 msgstr "Odstrani, ko _tipkam v pogovornem oknu"
 
 #. Remove on message send button
-#: plugins/notify.c:738
+#: ../plugins/notify.c:755
 msgid "Remove when a _message gets sent"
 msgstr "Odstrani, ko je _sporočilo poslano"
 
 #. Remove on conversation switch button
-#: plugins/notify.c:747
+#: ../plugins/notify.c:764
 msgid "Remove on switch to conversation ta_b"
 msgstr "Odstrani ob zamenjavi _zavihka pomenka"
 
@@ -1151,7 +1232,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:836
+#: ../plugins/notify.c:853
 msgid "Message Notification"
 msgstr "Obvestila o sporočilih"
 
@@ -1159,8 +1240,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/notify.c:839
-#: plugins/notify.c:841
+#: ../plugins/notify.c:856
+#: ../plugins/notify.c:858
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Ponuja mnoge načine opozarjanja na nova sporočila."
 
@@ -1170,36 +1251,64 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:583
+#: ../plugins/perl/perl.c:583
 msgid "Perl Plugin Loader"
 msgstr "Nalagalnik vstavkov Perl"
 
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/perl/perl.c:585
-#: plugins/perl/perl.c:586
+#: ../plugins/perl/perl.c:585
+#: ../plugins/perl/perl.c:586
 msgid "Provides support for loading perl plugins."
 msgstr "Doda podporo nalaganja vstavkov v programskem jeziku perl."
 
-#: plugins/raw.c:175
+#: ../plugins/psychic.c:22
+msgid "Psychic Mode"
+msgstr "Telepatski način"
+
+#: ../plugins/psychic.c:23
+msgid "Psychic mode for incoming conversation"
+msgstr "Telepatski način za dohodne pogovore"
+
+#: ../plugins/psychic.c:24
+msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+msgstr "Povzroči pojavitev pogovornih oken, ko vam začnejo drugi uporabniki sporočati. To deluje za AIM, ICQ, Jabber, Sametime in Yahoo!"
+
+#: ../plugins/psychic.c:60
+msgid "You feel a disturbance in the force..."
+msgstr "Občutite motnjo v Moči (saj veste, Vojna zvezd) ..."
+
+#: ../plugins/psychic.c:79
+msgid "Only enable for users on the buddy list"
+msgstr "Dovoli le uporabnikom s seznama prijateljev"
+
+#: ../plugins/psychic.c:84
+msgid "Disable when away"
+msgstr "Onemogoči ob odsotnosti"
+
+#: ../plugins/psychic.c:88
+msgid "Display notification message in conversations"
+msgstr "Prikaži obvestilno sporočilo v pogovorih"
+
+#: ../plugins/raw.c:175
 msgid "Raw"
 msgstr "Direktno"
 
-#: plugins/raw.c:177
+#: ../plugins/raw.c:177
 msgid "Lets you send raw input to text-based protocols."
 msgstr "Omogoča neposreden vnos v protokole."
 
-#: plugins/raw.c:178
+#: ../plugins/raw.c:178
 msgid "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit 'Enter' in the entry box to send. Watch the debug window."
 msgstr "Omogoča pošiljanje golih ukazov za protokole, ki temeljijo na besedilu (Jabber, MSN, IRC, TOC). Pritisnite 'Enter' za pošiljanje in opazujte kodno okno."
 
-#: plugins/relnot.c:63
+#: ../plugins/relnot.c:63
 #, c-format
 msgid "You are using Gaim version %s.  The current version is %s.<hr>"
 msgstr "Uporabljate Gaim različice %s.  Trenutna različica je %s.<hr>"
 
-#: plugins/relnot.c:69
+#: ../plugins/relnot.c:69
 #, c-format
 msgid ""
 "<b>ChangeLog:</b>\n"
@@ -1208,13 +1317,13 @@
 "<b>Dnevnik sprememb:</b>\n"
 "%s<br><br>"
 
-#: plugins/relnot.c:74
+#: ../plugins/relnot.c:74
 #, c-format
 msgid "You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/\">http://gaim.sourceforge.net</a>."
 msgstr "Različico %s lahko najdete na:<br><a href=\"http://gaim.sourceforge.net/\">http://gaim.sourceforge.net</a>."
 
-#: plugins/relnot.c:78
-#: plugins/relnot.c:79
+#: ../plugins/relnot.c:78
+#: ../plugins/relnot.c:79
 msgid "New Version Available"
 msgstr "Na voljo je nova različica."
 
@@ -1224,19 +1333,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/relnot.c:137
+#: ../plugins/relnot.c:137
 msgid "Release Notification"
 msgstr "Obvestilo o izdaji"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/relnot.c:140
+#: ../plugins/relnot.c:140
 msgid "Checks periodically for new releases."
 msgstr "Preverjaj, ali je na voljo nova različica."
 
 #. *  description
-#: plugins/relnot.c:142
+#: ../plugins/relnot.c:142
 msgid "Checks periodically for new releases and notifies the user with the ChangeLog."
 msgstr "Preverja, ali je na voljo nova različica in uporabika seznanja z dnevnikom sprememb."
 
@@ -1246,7 +1355,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:671
+#: ../plugins/signals-test.c:684
 msgid "Signals Test"
 msgstr "Preskus signalov"
 
@@ -1254,8 +1363,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:674
-#: plugins/signals-test.c:676
+#: ../plugins/signals-test.c:687
+#: ../plugins/signals-test.c:689
 msgid "Test to see that all signals are working properly."
 msgstr "Preveri vse ukaze, da se prepriča o delujoči povezavi."
 
@@ -1265,7 +1374,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/simple.c:34
+#: ../plugins/simple.c:34
 msgid "Simple Plugin"
 msgstr "Enostavni vstavek"
 
@@ -1273,74 +1382,74 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/simple.c:37
-#: plugins/simple.c:39
+#: ../plugins/simple.c:37
+#: ../plugins/simple.c:39
 msgid "Tests to see that most things are working."
 msgstr "Preveri večino stvari, če delujejo."
 
-#: plugins/spellchk.c:1902
+#: ../plugins/spellchk.c:1917
 msgid "Duplicate Correction"
 msgstr "Popravek dvojnikov"
 
-#: plugins/spellchk.c:1903
+#: ../plugins/spellchk.c:1918
 msgid "The specified word already exists in the correction list."
 msgstr "Navedena beseda že obstaja v seznamu popravkov."
 
-#: plugins/spellchk.c:2112
+#: ../plugins/spellchk.c:2127
 msgid "Text Replacements"
 msgstr "Zamenjave besedila"
 
-#: plugins/spellchk.c:2135
+#: ../plugins/spellchk.c:2150
 msgid "You type"
 msgstr "Vi napišete"
 
-#: plugins/spellchk.c:2149
+#: ../plugins/spellchk.c:2164
 msgid "You send"
 msgstr "Jaz pošljem"
 
-#: plugins/spellchk.c:2163
+#: ../plugins/spellchk.c:2178
 msgid "Whole words only"
 msgstr "Samo cele besede"
 
-#: plugins/spellchk.c:2175
+#: ../plugins/spellchk.c:2190
 msgid "Case sensitive"
 msgstr "Razlikuj velike in male črke"
 
-#: plugins/spellchk.c:2201
+#: ../plugins/spellchk.c:2216
 msgid "Add a new text replacement"
 msgstr "Dodaj novo zamenjavo"
 
-#: plugins/spellchk.c:2217
+#: ../plugins/spellchk.c:2232
 msgid "You _type:"
 msgstr "Vi _napišete:"
 
-#: plugins/spellchk.c:2234
+#: ../plugins/spellchk.c:2249
 msgid "You _send:"
 msgstr "Jaz _pošljem:"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: plugins/spellchk.c:2246
+#: ../plugins/spellchk.c:2261
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr "_Natanko ujemanje velikih in malih črk (ne označi za samodejno ravnanje)"
 
-#: plugins/spellchk.c:2248
+#: ../plugins/spellchk.c:2263
 msgid "Only replace _whole words"
 msgstr "Zamenjaj le _cele besede"
 
-#: plugins/spellchk.c:2273
+#: ../plugins/spellchk.c:2288
 msgid "General Text Replacement Options"
 msgstr "Splošne možnosti zamenjave besedila"
 
-#: plugins/spellchk.c:2274
+#: ../plugins/spellchk.c:2289
 msgid "Enable replacement of last word on send"
 msgstr "Omogoči zamenjavo zadnje besede pri pošiljanju"
 
-#: plugins/spellchk.c:2299
+#: ../plugins/spellchk.c:2314
 msgid "Text replacement"
 msgstr "Zamenjava besedila"
 
-#: plugins/spellchk.c:2301
-#: plugins/spellchk.c:2302
+#: ../plugins/spellchk.c:2316
+#: ../plugins/spellchk.c:2317
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Zamenja besedilo v odhodnih sporočilih po uporabniško določenih pravilih."
 
@@ -1350,7 +1459,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-gnutls.c:227
+#: ../plugins/ssl/ssl-gnutls.c:251
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -1358,8 +1467,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl-gnutls.c:230
-#: plugins/ssl/ssl-gnutls.c:232
+#: ../plugins/ssl/ssl-gnutls.c:254
+#: ../plugins/ssl/ssl-gnutls.c:256
 msgid "Provides SSL support through GNUTLS."
 msgstr "Omogoča podporo SSL preko GNUTLS."
 
@@ -1369,7 +1478,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-nss.c:319
+#: ../plugins/ssl/ssl-nss.c:412
 msgid "NSS"
 msgstr "NSS"
 
@@ -1377,8 +1486,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl-nss.c:322
-#: plugins/ssl/ssl-nss.c:324
+#: ../plugins/ssl/ssl-nss.c:415
+#: ../plugins/ssl/ssl-nss.c:417
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Omogoča podporo SSL preko Mozilla NSS."
 
@@ -1388,7 +1497,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl.c:94
+#: ../plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL"
 
@@ -1396,54 +1505,54 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl.c:97
-#: plugins/ssl/ssl.c:99
+#: ../plugins/ssl/ssl.c:97
+#: ../plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Omogoča ovojnico za knjižnice s podporo SSL."
 
-#: plugins/statenotify.c:49
+#: ../plugins/statenotify.c:49
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s se je vrnil."
 
-#: plugins/statenotify.c:51
+#: ../plugins/statenotify.c:51
 #, c-format
 msgid "%s has gone away."
 msgstr "%s je zdaj odsoten."
 
-#: plugins/statenotify.c:61
+#: ../plugins/statenotify.c:61
 #, c-format
 msgid "%s has become idle."
 msgstr "%s je nedejaven."
 
-#: plugins/statenotify.c:63
+#: ../plugins/statenotify.c:63
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s ni več nedejaven."
 
-#: plugins/statenotify.c:72
+#: ../plugins/statenotify.c:72
 #, c-format
 msgid "%s has signed on."
 msgstr "%s se je prijavil(a)."
 
-#: plugins/statenotify.c:79
+#: ../plugins/statenotify.c:79
 #, c-format
 msgid "%s has signed off."
 msgstr "%s se je odjavil(a)."
 
-#: plugins/statenotify.c:90
+#: ../plugins/statenotify.c:90
 msgid "Notify When"
 msgstr "Obvesti, ko"
 
-#: plugins/statenotify.c:93
+#: ../plugins/statenotify.c:93
 msgid "Buddy Goes _Away"
 msgstr "postaja prijatelj _odsoten"
 
-#: plugins/statenotify.c:96
+#: ../plugins/statenotify.c:96
 msgid "Buddy Goes _Idle"
 msgstr "postaja prijatelj _nedejaven"
 
-#: plugins/statenotify.c:99
+#: ../plugins/statenotify.c:99
 msgid "Buddy _Signs On/Off"
 msgstr "Prijatelj _se prijavi/odjavi"
 
@@ -1453,7 +1562,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/statenotify.c:141
+#: ../plugins/statenotify.c:141
 msgid "Buddy State Notification"
 msgstr "Obvestila o stanjih prijateljev"
 
@@ -1461,17 +1570,17 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/statenotify.c:144
-#: plugins/statenotify.c:147
+#: ../plugins/statenotify.c:144
+#: ../plugins/statenotify.c:147
 msgid "Notifies in a conversation window when a buddy goes or returns from away or idle."
 msgstr "V pogovornem oknu obvešča o spremembah stanja vaših prijateljev."
 
-#: plugins/tcl/tcl.c:368
+#: ../plugins/tcl/tcl.c:369
 msgid "Tcl Plugin Loader"
 msgstr "Nalaganje vstavkov Tcl"
 
-#: plugins/tcl/tcl.c:370
-#: plugins/tcl/tcl.c:371
+#: ../plugins/tcl/tcl.c:371
+#: ../plugins/tcl/tcl.c:372
 msgid "Provides support for loading Tcl plugins"
 msgstr "Omogoča podporo nalaganja vstavkov Tcl"
 
@@ -1481,8 +1590,8 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ticker/ticker.c:75
-#: plugins/ticker/ticker.c:324
+#: ../plugins/ticker/ticker.c:77
+#: ../plugins/ticker/ticker.c:355
 msgid "Buddy Ticker"
 msgstr "Nabodalo prijateljev"
 
@@ -1490,20 +1599,20 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ticker/ticker.c:327
-#: plugins/ticker/ticker.c:329
+#: ../plugins/ticker/ticker.c:358
+#: ../plugins/ticker/ticker.c:360
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Vodoravna inačica seznama prijateljev."
 
-#: plugins/timestamp.c:188
+#: ../plugins/timestamp.c:188
 msgid "iChat Timestamp"
 msgstr "Časovni žig iChat"
 
-#: plugins/timestamp.c:195
+#: ../plugins/timestamp.c:195
 msgid "Delay"
 msgstr "Zakasnitev"
 
-#: plugins/timestamp.c:202
+#: ../plugins/timestamp.c:202
 msgid "minutes."
 msgstr "minut."
 
@@ -1513,7 +1622,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:264
+#: ../plugins/timestamp.c:264
 msgid "Timestamp"
 msgstr "Čas nastanka"
 
@@ -1521,49 +1630,101 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/timestamp.c:267
-#: plugins/timestamp.c:269
+#: ../plugins/timestamp.c:267
+#: ../plugins/timestamp.c:269
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "Doda čase nastanka vsakih N minut v slogu iChata."
 
-#: plugins/win32/transparency/win2ktrans.c:183
-#: plugins/win32/transparency/win2ktrans.c:569
-#: plugins/win32/transparency/win2ktrans.c:616
+#: ../plugins/timestamp_format.c:22
+msgid "Timestamp Format Options"
+msgstr "Možnosti zapisa časovnega žiga"
+
+#: ../plugins/timestamp_format.c:27
+msgid "_Force (traditional Gaim) 24-hour time format"
+msgstr "_Prisili (tradicionalni Gaim) 24-urni časovni zapis"
+
+#: ../plugins/timestamp_format.c:30
+msgid "Show dates in..."
+msgstr "Pokaži datume v ..."
+
+#: ../plugins/timestamp_format.c:35
+msgid "Co_nversations:"
+msgstr "Po_govori:"
+
+#: ../plugins/timestamp_format.c:37
+#: ../plugins/timestamp_format.c:46
+msgid "For delayed messages"
+msgstr "Za zakasnjena sporočila"
+
+#: ../plugins/timestamp_format.c:38
+#: ../plugins/timestamp_format.c:47
+msgid "For delayed messages and in chats"
+msgstr "Za zakasnjena sporočila in v pogovorih"
+
+#: ../plugins/timestamp_format.c:44
+msgid "_Message Logs:"
+msgstr "Dnevniki _sporočil:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../plugins/timestamp_format.c:150
+msgid "Message Timestamp Formats"
+msgstr "Zapisi časovnega žiga sporočil"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../plugins/timestamp_format.c:153
+msgid "Customizes the message timestamp formats."
+msgstr "Prilagodi oblike časovnega žiga sporočil po meri."
+
+#. *  description
+#: ../plugins/timestamp_format.c:155
+msgid "This plugin allows the user to customize conversation and logging message timestamp formats."
+msgstr "Ta vtičnik omogoča uporabniku prilagajati zapis časovnega žiga pogovorov in dnevniških sporočil."
+
+#: ../plugins/win32/transparency/win2ktrans.c:183
+#: ../plugins/win32/transparency/win2ktrans.c:569
+#: ../plugins/win32/transparency/win2ktrans.c:616
 msgid "Opacity:"
 msgstr "Neprosojnost:"
 
 #. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:533
+#: ../plugins/win32/transparency/win2ktrans.c:533
 msgid "IM Conversation Windows"
 msgstr "Pogovorna okna"
 
-#: plugins/win32/transparency/win2ktrans.c:534
+#: ../plugins/win32/transparency/win2ktrans.c:534
 msgid "_IM window transparency"
 msgstr "Pro_sojnost pogovornega okna"
 
-#: plugins/win32/transparency/win2ktrans.c:548
+#: ../plugins/win32/transparency/win2ktrans.c:548
 msgid "_Show slider bar in IM window"
 msgstr "_Prikaži drsno vrstico v pogovornem oknu"
 
-#: plugins/win32/transparency/win2ktrans.c:555
+#: ../plugins/win32/transparency/win2ktrans.c:555
 msgid "Remove IM window transparency on focus"
 msgstr "Odstrani prosojnost pogovornega okna v ospredju"
 
-#: plugins/win32/transparency/win2ktrans.c:558
-#: plugins/win32/transparency/win2ktrans.c:606
+#: ../plugins/win32/transparency/win2ktrans.c:558
+#: ../plugins/win32/transparency/win2ktrans.c:606
 msgid "Always on top"
 msgstr "Vedno na vrhu"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:590
+#: ../plugins/win32/transparency/win2ktrans.c:590
 msgid "Buddy List Window"
 msgstr "Seznam prijateljev"
 
-#: plugins/win32/transparency/win2ktrans.c:591
+#: ../plugins/win32/transparency/win2ktrans.c:591
 msgid "_Buddy List window transparency"
 msgstr "_Prosojnost seznama prijateljev"
 
-#: plugins/win32/transparency/win2ktrans.c:604
+#: ../plugins/win32/transparency/win2ktrans.c:604
 msgid "Remove Buddy List window transparency on focus"
 msgstr "Odstrani prosojnost seznama prijateljev v ospredju"
 
@@ -1573,19 +1734,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:657
+#: ../plugins/win32/transparency/win2ktrans.c:657
 msgid "Transparency"
 msgstr "Prosojnost"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/win32/transparency/win2ktrans.c:660
+#: ../plugins/win32/transparency/win2ktrans.c:660
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Poljubna prosojnost seznama prijateljev in pomenkov."
 
 #. *  description
-#: plugins/win32/transparency/win2ktrans.c:662
+#: ../plugins/win32/transparency/win2ktrans.c:662
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and the buddy list.\n"
 "\n"
@@ -1595,268 +1756,262 @@
 "\n"
 "* Pozor: Ta vstavek zahteva Win2000 ali novejše."
 
-#: plugins/win32/winprefs/winprefs.c:384
+#: ../plugins/win32/winprefs/winprefs.c:384
 msgid "GTK+ Runtime Version"
 msgstr "Nastavitve GTK+"
 
 #. Autostart
-#: plugins/win32/winprefs/winprefs.c:392
+#: ../plugins/win32/winprefs/winprefs.c:392
 msgid "Startup"
 msgstr "Zagon"
 
-#: plugins/win32/winprefs/winprefs.c:393
+#: ../plugins/win32/winprefs/winprefs.c:393
 msgid "_Start Gaim on Windows startup"
 msgstr "Za_ženi Gaim ob zagonu Windows"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:404
-#: src/gtkblist.c:3614
+#: ../plugins/win32/winprefs/winprefs.c:404
+#: ../src/gtkblist.c:3608
 msgid "Buddy List"
 msgstr "Seznam prijateljev"
 
-#: plugins/win32/winprefs/winprefs.c:405
+#: ../plugins/win32/winprefs/winprefs.c:405
 msgid "_Dockable Buddy List"
 msgstr "Le_pljiv seznam prijateljev"
 
 #. Blist On Top
-#: plugins/win32/winprefs/winprefs.c:409
+#: ../plugins/win32/winprefs/winprefs.c:409
 msgid "_Keep Buddy List window on top:"
 msgstr "_Ohrani seznam prijateljev nad vrhu:"
 
 #. XXX: Did this ever work?
-#: plugins/win32/winprefs/winprefs.c:414
+#: ../plugins/win32/winprefs/winprefs.c:414
 msgid "Only when docked"
 msgstr "samo, ko je lepljiv"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:418
-#: src/gtkprefs.c:812
-#: src/gtkprefs.c:1853
+#: ../plugins/win32/winprefs/winprefs.c:418
+#: ../src/gtkprefs.c:819
+#: ../src/gtkprefs.c:1864
 msgid "Conversations"
 msgstr "Pogovori"
 
-#: plugins/win32/winprefs/winprefs.c:419
+#: ../plugins/win32/winprefs/winprefs.c:419
 msgid "_Flash window when messages are received"
 msgstr "Utrip_aj z oknom, ko prispe novo sporočilo"
 
-#: plugins/win32/winprefs/winprefs.c:442
+#: ../plugins/win32/winprefs/winprefs.c:442
 msgid "WinGaim Options"
 msgstr "Možnosti Gaim za Windows"
 
-#: plugins/win32/winprefs/winprefs.c:444
+#: ../plugins/win32/winprefs/winprefs.c:444
 msgid "Options specific to Windows Gaim."
 msgstr "Nastavitve, specifične za okolje Windows."
 
-#: plugins/win32/winprefs/winprefs.c:445
+#: ../plugins/win32/winprefs/winprefs.c:445
 msgid "Provides options specific to Windows Gaim, such as buddy list docking and conversation flashing."
 msgstr "Ponuja posebne nastavitve okenskega Gaima, kot je "
 
-#: src/account.c:773
+#: ../src/account.c:773
 msgid "accounts"
 msgstr "Računi"
 
-#: src/account.c:923
+#: ../src/account.c:923
 msgid "Password is required to sign on."
 msgstr "Za prijavo je potrebno geslo."
 
-#: src/account.c:948
+#: ../src/account.c:948
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Vpišite geslo za %s (%s)"
 
-#: src/account.c:955
+#: ../src/account.c:955
 msgid "Enter Password"
 msgstr "Vnesi geslo"
 
-#: src/account.c:960
+#: ../src/account.c:960
 msgid "Save password"
 msgstr "Shrani geslo"
 
-#. *
-#. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
-#.
-#: src/account.c:968
-#: src/account.c:1139
-#: src/gtkdialogs.c:570
-#: src/gtkdialogs.c:707
-#: src/gtkdialogs.c:775
-#: src/gtkrequest.c:287
-#: src/protocols/gg/gg.c:454
-#: src/protocols/gg/gg.c:595
-#: src/protocols/gg/gg.c:731
-#: src/protocols/jabber/jabber.c:1232
-#: 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:2976
-#: src/protocols/oscar/oscar.c:4509
-#: src/protocols/oscar/oscar.c:4590
-#: src/protocols/oscar/oscar.c:8075
-#: src/protocols/oscar/oscar.c:8198
-#: src/protocols/oscar/oscar.c:8223
-#: src/protocols/oscar/oscar.c:8275
-#: src/protocols/silc/buddy.c:466
-#: src/protocols/silc/buddy.c:1182
-#: src/protocols/silc/chat.c:423
-#: src/protocols/silc/chat.c:461
-#: src/protocols/silc/chat.c:724
-#: src/protocols/silc/ops.c:1297
-#: src/protocols/silc/ops.c:1910
-#: src/protocols/silc/silc.c:749
-#: src/protocols/yahoo/yahoo.c:3008
-#: src/protocols/yahoo/yahoo.c:3017
-#: src/request.h:1340
+#: ../src/account.c:968
+#: ../src/account.c:1139
+#: ../src/gtkdialogs.c:571
+#: ../src/gtkdialogs.c:708
+#: ../src/gtkdialogs.c:776
+#: ../src/gtkrequest.c:287
+#: ../src/protocols/gg/gg.c:454
+#: ../src/protocols/gg/gg.c:595
+#: ../src/protocols/gg/gg.c:731
+#: ../src/protocols/jabber/jabber.c:1322
+#: ../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:2999
+#: ../src/protocols/oscar/oscar.c:4542
+#: ../src/protocols/oscar/oscar.c:4623
+#: ../src/protocols/oscar/oscar.c:8051
+#: ../src/protocols/oscar/oscar.c:8174
+#: ../src/protocols/oscar/oscar.c:8199
+#: ../src/protocols/oscar/oscar.c:8251
+#: ../src/protocols/silc/buddy.c:466
+#: ../src/protocols/silc/buddy.c:1182
+#: ../src/protocols/silc/chat.c:423
+#: ../src/protocols/silc/chat.c:461
+#: ../src/protocols/silc/chat.c:724
+#: ../src/protocols/silc/ops.c:1297
+#: ../src/protocols/silc/ops.c:1910
+#: ../src/protocols/silc/silc.c:749
+#: ../src/protocols/yahoo/yahoo.c:3061
+#: ../src/protocols/yahoo/yahoo.c:3070
 msgid "OK"
 msgstr "V redu"
 
-#: src/account.c:969
-#: src/account.c:1140
-#: src/account.c:1177
-#: src/gtkaccount.c:2160
-#: src/gtkaccount.c:2636
-#: src/gtkblist.c:4961
-#: src/gtkdialogs.c:571
-#: src/gtkdialogs.c:708
-#: src/gtkdialogs.c:776
-#: src/gtkdialogs.c:795
-#: src/gtkdialogs.c:817
-#: src/gtkdialogs.c:837
-#: src/gtkdialogs.c:881
-#: src/gtkdialogs.c:936
-#: src/gtkdialogs.c:973
-#: src/gtkdialogs.c:998
-#: src/gtkimhtmltoolbar.c:419
-#: src/gtkplugin.c:297
-#: src/gtkpounce.c:1093
-#: src/gtkprivacy.c:567
-#: src/gtkprivacy.c:580
-#: src/gtkprivacy.c:605
-#: src/gtkprivacy.c:616
-#: src/gtkrequest.c:288
-#: src/gtksavedstatuses.c:298
-#: src/protocols/gg/gg.c:455
-#: src/protocols/gg/gg.c:596
-#: src/protocols/gg/gg.c:732
-#: src/protocols/gg/gg.c:812
-#: src/protocols/jabber/buddy.c:573
-#: src/protocols/jabber/buddy.c:1412
-#: src/protocols/jabber/buddy.c:1446
-#: src/protocols/jabber/chat.c:780
-#: src/protocols/jabber/jabber.c:755
-#: src/protocols/jabber/jabber.c:1233
-#: 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:1640
-#: src/protocols/oscar/oscar.c:2977
-#: src/protocols/oscar/oscar.c:4467
-#: src/protocols/oscar/oscar.c:4510
-#: src/protocols/oscar/oscar.c:4547
-#: src/protocols/oscar/oscar.c:4591
-#: src/protocols/oscar/oscar.c:8076
-#: src/protocols/oscar/oscar.c:8199
-#: src/protocols/oscar/oscar.c:8224
-#: src/protocols/oscar/oscar.c:8276
-#: src/protocols/oscar/oscar.c:8345
-#: src/protocols/sametime/sametime.c:3320
-#: src/protocols/sametime/sametime.c:3403
-#: src/protocols/sametime/sametime.c:3530
-#: src/protocols/sametime/sametime.c:5207
-#: src/protocols/sametime/sametime.c:5293
-#: src/protocols/sametime/sametime.c:5410
-#: src/protocols/silc/buddy.c:467
-#: src/protocols/silc/buddy.c:1078
-#: src/protocols/silc/buddy.c:1183
-#: src/protocols/silc/chat.c:596
-#: src/protocols/silc/chat.c:725
-#: src/protocols/silc/ops.c:1911
-#: src/protocols/silc/silc.c:750
-#: src/protocols/silc/silc.c:955
-#: src/protocols/yahoo/yahoo.c:3009
-#: src/protocols/yahoo/yahoo.c:3018
-#: src/request.h:1340
-#: src/request.h:1350
+#: ../src/account.c:969
+#: ../src/account.c:1140
+#: ../src/account.c:1177
+#: ../src/gtkaccount.c:2171
+#: ../src/gtkaccount.c:2638
+#: ../src/gtkblist.c:4960
+#: ../src/gtkdialogs.c:572
+#: ../src/gtkdialogs.c:709
+#: ../src/gtkdialogs.c:777
+#: ../src/gtkdialogs.c:796
+#: ../src/gtkdialogs.c:818
+#: ../src/gtkdialogs.c:838
+#: ../src/gtkdialogs.c:882
+#: ../src/gtkdialogs.c:937
+#: ../src/gtkdialogs.c:974
+#: ../src/gtkdialogs.c:999
+#: ../src/gtkimhtmltoolbar.c:419
+#: ../src/gtkplugin.c:297
+#: ../src/gtkpounce.c:1093
+#: ../src/gtkprivacy.c:568
+#: ../src/gtkprivacy.c:581
+#: ../src/gtkprivacy.c:606
+#: ../src/gtkprivacy.c:617
+#: ../src/gtkrequest.c:288
+#: ../src/gtksavedstatuses.c:296
+#: ../src/protocols/gg/gg.c:455
+#: ../src/protocols/gg/gg.c:596
+#: ../src/protocols/gg/gg.c:732
+#: ../src/protocols/gg/gg.c:812
+#: ../src/protocols/jabber/buddy.c:573
+#: ../src/protocols/jabber/buddy.c:1412
+#: ../src/protocols/jabber/buddy.c:1446
+#: ../src/protocols/jabber/chat.c:780
+#: ../src/protocols/jabber/jabber.c:824
+#: ../src/protocols/jabber/jabber.c:1323
+#: ../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:1641
+#: ../src/protocols/oscar/oscar.c:3000
+#: ../src/protocols/oscar/oscar.c:4500
+#: ../src/protocols/oscar/oscar.c:4543
+#: ../src/protocols/oscar/oscar.c:4580
+#: ../src/protocols/oscar/oscar.c:4624
+#: ../src/protocols/oscar/oscar.c:8052
+#: ../src/protocols/oscar/oscar.c:8175
+#: ../src/protocols/oscar/oscar.c:8200
+#: ../src/protocols/oscar/oscar.c:8252
+#: ../src/protocols/oscar/oscar.c:8321
+#: ../src/protocols/sametime/sametime.c:3376
+#: ../src/protocols/sametime/sametime.c:3461
+#: ../src/protocols/sametime/sametime.c:3631
+#: ../src/protocols/sametime/sametime.c:5321
+#: ../src/protocols/sametime/sametime.c:5410
+#: ../src/protocols/sametime/sametime.c:5534
+#: ../src/protocols/silc/buddy.c:467
+#: ../src/protocols/silc/buddy.c:1078
+#: ../src/protocols/silc/buddy.c:1183
+#: ../src/protocols/silc/chat.c:596
+#: ../src/protocols/silc/chat.c:725
+#: ../src/protocols/silc/ops.c:1911
+#: ../src/protocols/silc/silc.c:750
+#: ../src/protocols/silc/silc.c:955
+#: ../src/protocols/yahoo/yahoo.c:3062
+#: ../src/protocols/yahoo/yahoo.c:3071
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: src/account.c:994
-#: src/connection.c:96
+#: ../src/account.c:994
+#: ../src/connection.c:96
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Manjka vstavek za protokol %s"
 
-#: src/account.c:996
-#: src/connection.c:99
-#: src/gtkblist.c:3483
+#: ../src/account.c:996
+#: ../src/connection.c:99
+#: ../src/gtkblist.c:3496
 msgid "Connection Error"
 msgstr "Napaka na povezavi"
 
-#: src/account.c:1076
-#: src/protocols/gg/gg.c:636
-#: src/protocols/jabber/jabber.c:1185
+#: ../src/account.c:1076
+#: ../src/protocols/gg/gg.c:636
+#: ../src/protocols/jabber/jabber.c:1275
 msgid "New passwords do not match."
 msgstr "Novi gesli se ne ujemata."
 
-#: src/account.c:1085
+#: ../src/account.c:1085
 msgid "Fill out all fields completely."
 msgstr "Izpolnite vsa polja."
 
-#: src/account.c:1108
+#: ../src/account.c:1108
 msgid "Original password"
 msgstr "Obstoječe geslo"
 
-#: src/account.c:1115
+#: ../src/account.c:1115
 msgid "New password"
 msgstr "Novo geslo"
 
-#: src/account.c:1122
+#: ../src/account.c:1122
 msgid "New password (again)"
 msgstr "Novo geslo (ponovno)"
 
-#: src/account.c:1128
+#: ../src/account.c:1128
 #, c-format
 msgid "Change password for %s"
 msgstr "Spremeni geslo za %s"
 
-#: src/account.c:1136
+#: ../src/account.c:1136
 msgid "Please enter your current password and your new password."
 msgstr "Vnesite svoje obstoječe in novo geslo."
 
-#: src/account.c:1169
+#: ../src/account.c:1169
 #, c-format
 msgid "Change user information for %s"
 msgstr "Spremeni podatke za uporabika %s"
 
-#: src/account.c:1176
-#: src/gtkdebug.c:687
-#: src/gtkrequest.c:294
-#: src/protocols/jabber/buddy.c:572
+#: ../src/account.c:1176
+#: ../src/gtkdebug.c:684
+#: ../src/gtkrequest.c:294
+#: ../src/protocols/jabber/buddy.c:572
 msgid "Save"
 msgstr "Shrani"
 
-#: src/account.c:1671
-#: 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:1679
+#: ../src/gtkft.c:157
+#: ../src/protocols/jabber/buddy.c:630
+#: ../src/protocols/jabber/buddy.c:1095
+#: ../src/protocols/jabber/buddy.c:1112
+#: ../src/protocols/novell/novell.c:2860
 msgid "Unknown"
 msgstr "Neznan"
 
-#: src/blist.c:543
+#: ../src/blist.c:543
 msgid "buddy list"
 msgstr "Seznam prijateljev"
 
-#: src/blist.c:1172
+#: ../src/blist.c:1173
 msgid "Chats"
 msgstr "Pomenki"
 
-#: src/blist.c:1885
+#: ../src/blist.c:1886
 #, c-format
 msgid "%d buddy from group %s was not removed because it belongs to an account which is disabled or offline.  This buddy and the group were not removed.\n"
 msgid_plural "%d buddies from group %s were not removed because they belong to accounts which are currently disabled or offline.  These buddies and the group were not removed.\n"
@@ -1865,79 +2020,79 @@
 msgstr[2] "%d prijatelja iz skupine %s nista bila odstranjena, ker pripadata računoma, ki sta trenutno onemogočena ali nista prijavljena.  Niti prijatelja niti skupina niso bili odstranjeni.\n"
 msgstr[3] "%d prijatelji iz skupine %s niso bili odstranjeni, ker pripadajo računom, ki so trenutno onemogočeni ali niso prijavljeni.  Niti prijatelji niti skupine niso bili odstranjeni.\n"
 
-#: src/blist.c:1895
+#: ../src/blist.c:1896
 msgid "Group not removed"
 msgstr "Skupina ni bila odstranjena"
 
-#: src/connection.c:98
+#: ../src/connection.c:98
 msgid "Registration Error"
 msgstr "Napaka pri prijavi"
 
-#: src/connection.c:280
+#: ../src/connection.c:280
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s se je prijavil(a)"
 
-#: src/connection.c:322
+#: ../src/connection.c:322
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s se je odjavil(a)"
 
-#: src/conversation.c:182
+#: ../src/conversation.c:163
 msgid "Unable to send message: The message is too large."
 msgstr "Sporočila ni mogoče poslati, ker je preveliko."
 
-#: src/conversation.c:185
-#: src/conversation.c:198
+#: ../src/conversation.c:166
+#: ../src/conversation.c:179
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Sporočila k %s ni mogoče poslati."
 
-#: src/conversation.c:186
+#: ../src/conversation.c:167
 msgid "The message is too large."
 msgstr "Sporočilo je preveliko."
 
-#: src/conversation.c:195
+#: ../src/conversation.c:176
 msgid "Unable to send message."
 msgstr "Sporočila ni mogoče poslati."
 
-#: src/conversation.c:1510
+#: ../src/conversation.c:1517
 #, c-format
 msgid "%s entered the room."
 msgstr "%s se nam pridružuje."
 
-#: src/conversation.c:1513
+#: ../src/conversation.c:1520
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] se nam pridružuje."
 
-#: src/conversation.c:1620
+#: ../src/conversation.c:1627
 #, c-format
 msgid "You are now known as %s"
 msgstr "Zdaj ste znani kot %s"
 
-#: src/conversation.c:1640
+#: ../src/conversation.c:1647
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s je zdaj poznan kot %s"
 
-#: src/conversation.c:1713
+#: ../src/conversation.c:1720
 #, c-format
 msgid "%s left the room."
 msgstr "%s nas je zapustil."
 
-#: src/conversation.c:1716
+#: ../src/conversation.c:1723
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s nas je zapustil (%s)."
 
-#: src/desktopitem.c:286
-#: src/desktopitem.c:875
+#: ../src/desktopitem.c:286
+#: ../src/desktopitem.c:875
 msgid "No name"
 msgstr "Brez imena"
 
-#: src/ft.c:189
-#: src/protocols/msn/msn.c:412
+#: ../src/ft.c:189
+#: ../src/protocols/msn/msn.c:412
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1946,7 +2101,7 @@
 "Napaka pri branju %s: \n"
 "%s.\n"
 
-#: src/ft.c:193
+#: ../src/ft.c:193
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -1955,7 +2110,7 @@
 "Napaka pri pisanju na strežnik %s: \n"
 "%s.\n"
 
-#: src/ft.c:197
+#: ../src/ft.c:197
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -1964,35 +2119,35 @@
 "Napaka pri dostopu do %s: \n"
 "%s.\n"
 
-#: src/ft.c:230
+#: ../src/ft.c:230
 msgid "Cannot send a file of 0 bytes."
 msgstr "Datoteke z 0 bajti ni mogoče poslati."
 
-#: src/ft.c:240
+#: ../src/ft.c:240
 msgid "Cannot send a directory."
 msgstr "Imenika ni mogoče poslati."
 
-#: src/ft.c:249
+#: ../src/ft.c:249
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s ni veljavna datoteka. Plašni program je ne želi prepisati.\n"
 
-#: src/ft.c:307
+#: ../src/ft.c:307
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s vam želi poslati %s (%s)"
 
-#: src/ft.c:314
+#: ../src/ft.c:314
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s vam želi poslati datoteko"
 
-#: src/ft.c:355
+#: ../src/ft.c:355
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Sprejmete zahtevo po prenosu datoteke od %s?"
 
-#: src/ft.c:359
+#: ../src/ft.c:359
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -2003,65 +2158,65 @@
 "Oddaljen gostitelj: %s\n"
 "Oddaljena vrata: %d"
 
-#: src/ft.c:383
+#: ../src/ft.c:391
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s ponuja pošiljanje datoteke %s"
 
-#: src/ft.c:427
+#: ../src/ft.c:442
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s ni veljavna datoteka.\n"
 
-#: src/ft.c:448
+#: ../src/ft.c:463
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Ponujeno pošiljanje sporočila %s k %s"
 
-#: src/ft.c:459
+#: ../src/ft.c:474
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Začetek prenosa %s od %s"
 
-#: src/ft.c:613
+#: ../src/ft.c:628
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Prenos datoteke %s je dokončan."
 
-#: src/ft.c:616
+#: ../src/ft.c:631
 msgid "File transfer complete"
 msgstr "Prenos datoteke je dokončan."
 
-#: src/ft.c:1005
+#: ../src/ft.c:1022
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Prekinili ste prenos %s"
 
-#: src/ft.c:1010
+#: ../src/ft.c:1027
 msgid "File transfer cancelled"
 msgstr "Prenos datoteke je preklican"
 
-#: src/ft.c:1067
+#: ../src/ft.c:1084
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s je prekinil prenos %s"
 
-#: src/ft.c:1072
+#: ../src/ft.c:1089
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s je prekinil prenos datoteke"
 
-#: src/ft.c:1129
+#: ../src/ft.c:1146
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Prenos datoteke do %s ni uspel."
 
-#: src/ft.c:1131
+#: ../src/ft.c:1148
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Prenos datoteke od %s ni uspel."
 
-#: src/gtkaccount.c:357
+#: ../src/gtkaccount.c:374
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -2073,411 +2228,411 @@
 "<b>Velikost slike:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:745
+#: ../src/gtkaccount.c:762
 msgid "Login Options"
 msgstr "Možnosti prijave"
 
-#: src/gtkaccount.c:762
-#: src/gtkft.c:640
+#: ../src/gtkaccount.c:779
+#: ../src/gtkft.c:640
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: src/gtkaccount.c:841
+#: ../src/gtkaccount.c:858
 msgid "Password:"
 msgstr "Geslo:"
 
-#: src/gtkaccount.c:846
-#: src/gtkblist.c:4539
-#: src/gtkblist.c:4905
+#: ../src/gtkaccount.c:863
+#: ../src/gtkblist.c:4538
+#: ../src/gtkblist.c:4904
 msgid "Alias:"
 msgstr "Psevdonim:"
 
-#: src/gtkaccount.c:850
+#: ../src/gtkaccount.c:867
 msgid "Remember password"
 msgstr "Zapomni si geslo"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:902
+#: ../src/gtkaccount.c:919
 msgid "User Options"
 msgstr "Možnosti uporabnika"
 
-#: src/gtkaccount.c:915
+#: ../src/gtkaccount.c:932
 msgid "New mail notifications"
 msgstr "Obveščanje o prispeli pošti"
 
-#: src/gtkaccount.c:924
+#: ../src/gtkaccount.c:941
 msgid "Buddy icon:"
 msgstr "Ikona prijatelja:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:1015
+#: ../src/gtkaccount.c:1032
 #, c-format
 msgid "%s Options"
 msgstr "%s Možnosti"
 
-#: src/gtkaccount.c:1216
+#: ../src/gtkaccount.c:1233
 msgid "Use Global Proxy Settings"
 msgstr "uporabljaj splošno nastavitev strežnikov proxy"
 
-#: src/gtkaccount.c:1222
+#: ../src/gtkaccount.c:1239
 msgid "No Proxy"
 msgstr "brez strežnika proxy"
 
-#: src/gtkaccount.c:1228
+#: ../src/gtkaccount.c:1245
 msgid "HTTP"
 msgstr "HTTP"
 
-#: src/gtkaccount.c:1234
+#: ../src/gtkaccount.c:1251
 msgid "SOCKS 4"
 msgstr "SOCKS4"
 
-#: src/gtkaccount.c:1240
+#: ../src/gtkaccount.c:1257
 msgid "SOCKS 5"
 msgstr "SOCKS5"
 
-#: src/gtkaccount.c:1246
-#: src/gtkprefs.c:1032
+#: ../src/gtkaccount.c:1263
+#: ../src/gtkprefs.c:1043
 msgid "Use Environmental Settings"
 msgstr "uporabi nastavitve okolja"
 
-#: src/gtkaccount.c:1280
+#: ../src/gtkaccount.c:1297
 msgid "you can see the butterflies mating"
 msgstr "lahko opazite metulje, ki se parijo"
 
-#: src/gtkaccount.c:1284
+#: ../src/gtkaccount.c:1301
 msgid "If you look real closely"
 msgstr "Če pogledate zelo pozorno,"
 
-#: src/gtkaccount.c:1300
+#: ../src/gtkaccount.c:1317
 msgid "Proxy Options"
 msgstr "Možnosti strežnika proxy"
 
-#: src/gtkaccount.c:1314
-#: src/gtkprefs.c:1026
+#: ../src/gtkaccount.c:1331
+#: ../src/gtkprefs.c:1037
 msgid "Proxy _type:"
 msgstr "Vrsta s_trežnika proxy:"
 
-#: src/gtkaccount.c:1323
-#: src/gtkprefs.c:1047
+#: ../src/gtkaccount.c:1340
+#: ../src/gtkprefs.c:1058
 msgid "_Host:"
 msgstr "_Strežnik:"
 
-#: src/gtkaccount.c:1327
-#: src/gtkprefs.c:1065
+#: ../src/gtkaccount.c:1344
+#: ../src/gtkprefs.c:1076
 msgid "_Port:"
 msgstr "_Vrata:"
 
-#: src/gtkaccount.c:1335
+#: ../src/gtkaccount.c:1352
 msgid "_Username:"
 msgstr "_Uporabniško ime:"
 
-#: src/gtkaccount.c:1341
-#: src/gtkprefs.c:1102
+#: ../src/gtkaccount.c:1358
+#: ../src/gtkprefs.c:1113
 msgid "Pa_ssword:"
 msgstr "Ge_slo:"
 
-#: src/gtkaccount.c:1719
+#: ../src/gtkaccount.c:1736
 msgid "Add Account"
 msgstr "Dodaj račun"
 
-#: src/gtkaccount.c:1721
+#: ../src/gtkaccount.c:1738
 msgid "Modify Account"
 msgstr "Spremeni račun"
 
-#: src/gtkaccount.c:1743
+#: ../src/gtkaccount.c:1760
 msgid "_Basic"
 msgstr "_Osnovno"
 
-#: src/gtkaccount.c:1754
+#: ../src/gtkaccount.c:1771
 msgid "_Advanced"
 msgstr "N_apredno"
 
 #. Register button
-#: src/gtkaccount.c:1769
-#: src/protocols/jabber/jabber.c:754
+#: ../src/gtkaccount.c:1786
+#: ../src/protocols/jabber/jabber.c:823
 msgid "Register"
 msgstr "Registriraj se"
 
-#: src/gtkaccount.c:2154
-#: src/gtksavedstatuses.c:295
+#: ../src/gtkaccount.c:2165
+#: ../src/gtksavedstatuses.c:293
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Ste prepričani, da želite izbrisati %s?"
 
-#: src/gtkaccount.c:2159
-#: src/gtkpounce.c:1092
-#: src/gtkrequest.c:291
-#: src/gtksavedstatuses.c:297
+#: ../src/gtkaccount.c:2170
+#: ../src/gtkpounce.c:1092
+#: ../src/gtkrequest.c:291
+#: ../src/gtksavedstatuses.c:295
 msgid "Delete"
 msgstr "Zbriši"
 
-#: src/gtkaccount.c:2217
-#: src/gtksavedstatuses.c:877
-#: src/protocols/oscar/oscar.c:5154
+#: ../src/gtkaccount.c:2228
+#: ../src/gtksavedstatuses.c:890
+#: ../src/protocols/oscar/oscar.c:5187
 msgid "Screen Name"
 msgstr "Ime"
 
-#: src/gtkaccount.c:2248
+#: ../src/gtkaccount.c:2259
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/gtkaccount.c:2584
+#: ../src/gtkaccount.c:2586
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s je nastavil %s za svojega prijatelja%s%s"
 
-#: src/gtkaccount.c:2633
+#: ../src/gtkaccount.c:2635
 msgid "Add buddy to your list?"
 msgstr "Želite dodati prijatelja na seznam?"
 
-#: src/gtkaccount.c:2635
-#: src/gtkblist.c:4960
-#: src/gtkconv.c:1615
-#: src/gtkrequest.c:292
-#: src/protocols/gg/gg.c:811
-#: src/protocols/oscar/oscar.c:4779
-#: src/protocols/sametime/sametime.c:5292
-#: src/protocols/silc/chat.c:595
+#: ../src/gtkaccount.c:2637
+#: ../src/gtkblist.c:4959
+#: ../src/gtkconv.c:1616
+#: ../src/gtkrequest.c:292
+#: ../src/protocols/gg/gg.c:811
+#: ../src/protocols/oscar/oscar.c:4812
+#: ../src/protocols/sametime/sametime.c:5409
+#: ../src/protocols/silc/chat.c:595
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/gtkblist.c:678
+#: ../src/gtkblist.c:678
 msgid "Join a Chat"
 msgstr "Pridruži se pomenku"
 
-#: src/gtkblist.c:699
+#: ../src/gtkblist.c:699
 msgid "Please enter the appropriate information about the chat you would like to join.\n"
 msgstr "Vnesite ustrezne informacije o pomenku, ki se mu želite pridružiti.\n"
 
-#: src/gtkblist.c:710
-#: src/gtkpounce.c:528
-#: src/gtkroomlist.c:377
+#: ../src/gtkblist.c:710
+#: ../src/gtkpounce.c:527
+#: ../src/gtkroomlist.c:377
 msgid "_Account:"
 msgstr "_Račun:"
 
-#: src/gtkblist.c:954
+#: ../src/gtkblist.c:954
 msgid "Get _Info"
 msgstr "_Informacije"
 
-#: src/gtkblist.c:957
-#: src/gtkstock.c:142
+#: ../src/gtkblist.c:957
+#: ../src/gtkstock.c:141
 msgid "I_M"
 msgstr "_Sporoči"
 
-#: src/gtkblist.c:963
+#: ../src/gtkblist.c:963
 msgid "_Send File"
 msgstr "_Pošlji datoteko"
 
-#: src/gtkblist.c:971
+#: ../src/gtkblist.c:971
 msgid "Start _Voice Chat"
 msgstr "Začni glaso_vni klepet"
 
-#: src/gtkblist.c:977
+#: ../src/gtkblist.c:977
 msgid "Add Buddy _Pounce"
 msgstr "Dodaj _opozorilo prijatelja"
 
-#: src/gtkblist.c:981
-#: src/gtkblist.c:985
-#: src/gtkblist.c:1084
-#: src/gtkblist.c:1107
+#: ../src/gtkblist.c:981
+#: ../src/gtkblist.c:985
+#: ../src/gtkblist.c:1084
+#: ../src/gtkblist.c:1107
 msgid "View _Log"
 msgstr "Poglej _dnevnik"
 
-#: src/gtkblist.c:996
+#: ../src/gtkblist.c:996
 msgid "Alias..."
 msgstr "Psevdonim ..."
 
-#: src/gtkblist.c:999
-#: src/gtkconv.c:1612
-#: src/gtkrequest.c:293
+#: ../src/gtkblist.c:999
+#: ../src/gtkconv.c:1613
+#: ../src/gtkrequest.c:293
 msgid "Remove"
 msgstr "Odstrani"
 
-#: src/gtkblist.c:1005
-#: src/gtkblist.c:1092
-#: src/gtkblist.c:1113
+#: ../src/gtkblist.c:1005
+#: ../src/gtkblist.c:1092
+#: ../src/gtkblist.c:1113
 msgid "_Alias..."
 msgstr "_Psevdonim ..."
 
-#: src/gtkblist.c:1007
-#: src/gtkblist.c:1094
-#: src/gtkblist.c:1115
+#: ../src/gtkblist.c:1007
+#: ../src/gtkblist.c:1094
+#: ../src/gtkblist.c:1115
 msgid "_Remove"
 msgstr "Odst_rani"
 
-#: src/gtkblist.c:1055
+#: ../src/gtkblist.c:1055
 msgid "Add a _Buddy"
 msgstr "Dodaj _prijatelja"
 
-#: src/gtkblist.c:1057
+#: ../src/gtkblist.c:1057
 msgid "Add a C_hat"
 msgstr "Dodaj po_menek"
 
-#: src/gtkblist.c:1060
+#: ../src/gtkblist.c:1060
 msgid "_Delete Group"
 msgstr "_Zbriši skupino"
 
-#: src/gtkblist.c:1062
+#: ../src/gtkblist.c:1062
 msgid "_Rename"
 msgstr "P_reimenuj"
 
 #. join button
-#: src/gtkblist.c:1080
-#: src/gtkroomlist.c:285
-#: src/gtkroomlist.c:441
-#: src/gtkstock.c:140
+#: ../src/gtkblist.c:1080
+#: ../src/gtkroomlist.c:285
+#: ../src/gtkroomlist.c:441
+#: ../src/gtkstock.c:139
 msgid "_Join"
 msgstr "_Pridruži se"
 
-#: src/gtkblist.c:1082
+#: ../src/gtkblist.c:1082
 msgid "Auto-Join"
 msgstr "Samodejno-pridruži"
 
-#: src/gtkblist.c:1120
-#: src/gtkblist.c:1143
+#: ../src/gtkblist.c:1120
+#: ../src/gtkblist.c:1143
 msgid "_Collapse"
 msgstr "_Strni"
 
-#: src/gtkblist.c:1148
+#: ../src/gtkblist.c:1148
 msgid "_Expand"
 msgstr "_Razširi"
 
-#: src/gtkblist.c:1426
-#: src/gtkblist.c:1438
-#: src/gtkblist.c:3759
-#: src/gtkblist.c:3769
+#: ../src/gtkblist.c:1426
+#: ../src/gtkblist.c:1438
+#: ../src/gtkblist.c:3753
+#: ../src/gtkblist.c:3763
 msgid "/Tools/Mute Sounds"
 msgstr "/Orodja/Utišaj zvoke"
 
-#: src/gtkblist.c:1901
-#: src/gtkconv.c:4212
-#: src/gtkpounce.c:427
+#: ../src/gtkblist.c:1901
+#: ../src/gtkconv.c:4215
+#: ../src/gtkpounce.c:426
 msgid "You are not currently signed on with an account that can add that buddy."
 msgstr "Trenutno niste prijavljeni z nobenim računom, ki lahko doda tega prijatelja."
 
 #. Buddies menu
-#: src/gtkblist.c:2475
+#: ../src/gtkblist.c:2475
 msgid "/_Buddies"
 msgstr "/_Prijatelji"
 
-#: src/gtkblist.c:2476
+#: ../src/gtkblist.c:2476
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Prijatelji/Novo _neposredno sporočilo ..."
 
-#: src/gtkblist.c:2477
+#: ../src/gtkblist.c:2477
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Prijatelji/Pridruži se _pomenku ..."
 
-#: src/gtkblist.c:2478
+#: ../src/gtkblist.c:2478
 msgid "/Buddies/Get User _Info..."
 msgstr "/Prijatelji/Informacije o _uporabniku ..."
 
-#: src/gtkblist.c:2479
+#: ../src/gtkblist.c:2479
 msgid "/Buddies/View User _Log..."
 msgstr "/Prijatelji/Pog_lej uporabnikov dnevnik ..."
 
-#: src/gtkblist.c:2481
+#: ../src/gtkblist.c:2481
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Prijatelji/Prikaži prijatelje, ki niso na z_vezi"
 
-#: src/gtkblist.c:2482
+#: ../src/gtkblist.c:2482
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Prijatelji/Prikaži pra_zne skupine"
 
-#: src/gtkblist.c:2483
+#: ../src/gtkblist.c:2483
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Prijatelji/Pokaži p_odrobnosti prijateljev"
 
-#: src/gtkblist.c:2484
+#: ../src/gtkblist.c:2484
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Prijatelji/Pokaži čase _nedejavnosti"
 
-#: src/gtkblist.c:2485
+#: ../src/gtkblist.c:2485
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Prijatelji/Razvr_sti prijatelje"
 
-#: src/gtkblist.c:2487
+#: ../src/gtkblist.c:2487
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Prijatelji/Dodaj p_rijatelja ..."
 
-#: src/gtkblist.c:2488
+#: ../src/gtkblist.c:2488
 msgid "/Buddies/Add C_hat..."
 msgstr "/Prijatelji/Dodaj p_omenek ..."
 
-#: src/gtkblist.c:2489
+#: ../src/gtkblist.c:2489
 msgid "/Buddies/Add _Group..."
 msgstr "/Prijatelji/Dodaj s_kupino ..."
 
-#: src/gtkblist.c:2491
+#: ../src/gtkblist.c:2491
 msgid "/Buddies/_Quit"
 msgstr "/Prijatelji/Iz_hod"
 
 #. Accounts menu
-#: src/gtkblist.c:2494
+#: ../src/gtkblist.c:2494
 msgid "/_Accounts"
 msgstr "/_Računi"
 
-#: src/gtkblist.c:2495
-#: src/gtkblist.c:5537
+#: ../src/gtkblist.c:2495
+#: ../src/gtkblist.c:5538
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Računi/Dodaj\\/Uredi"
 
 #. Tools
-#: src/gtkblist.c:2498
+#: ../src/gtkblist.c:2498
 msgid "/_Tools"
 msgstr "/_Orodja"
 
-#: src/gtkblist.c:2499
+#: ../src/gtkblist.c:2499
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Orodja/Opozorila pri_jateljev"
 
-#: src/gtkblist.c:2500
+#: ../src/gtkblist.c:2500
 msgid "/Tools/Plu_gins"
 msgstr "/Orodja/Vstav_ki"
 
-#: src/gtkblist.c:2501
+#: ../src/gtkblist.c:2501
 msgid "/Tools/Pr_eferences"
 msgstr "/Orodja/_Nastavitve"
 
-#: src/gtkblist.c:2502
+#: ../src/gtkblist.c:2502
 msgid "/Tools/Pr_ivacy"
 msgstr "/Orodja/_Zasebnost"
 
-#: src/gtkblist.c:2504
+#: ../src/gtkblist.c:2504
 msgid "/Tools/_File Transfers"
 msgstr "/Orodja/_Prenosi datotek"
 
-#: src/gtkblist.c:2505
+#: ../src/gtkblist.c:2505
 msgid "/Tools/R_oom List"
 msgstr "/Orodja/_Seznam sob"
 
-#: src/gtkblist.c:2506
+#: ../src/gtkblist.c:2506
 msgid "/Tools/System _Log"
 msgstr "/Orodja/Sistemski _dnevnik"
 
-#: src/gtkblist.c:2508
+#: ../src/gtkblist.c:2508
 msgid "/Tools/Mute _Sounds"
 msgstr "/Orodja/_Utišaj zvoke"
 
 #. Help
-#: src/gtkblist.c:2511
+#: ../src/gtkblist.c:2511
 msgid "/_Help"
 msgstr "/_Pomoč"
 
-#: src/gtkblist.c:2512
+#: ../src/gtkblist.c:2512
 msgid "/Help/Online _Help"
 msgstr "/Pomoč/Pomoč _na spletu"
 
-#: src/gtkblist.c:2513
+#: ../src/gtkblist.c:2513
 msgid "/Help/_Debug Window"
 msgstr "/Pomoč/Raz_hroščevalno okno"
 
-#: src/gtkblist.c:2514
+#: ../src/gtkblist.c:2514
 msgid "/Help/_About"
 msgstr "/Pomoč/_O programu"
 
-#: src/gtkblist.c:2546
-#: src/gtkblist.c:2615
+#: ../src/gtkblist.c:2546
+#: ../src/gtkblist.c:2615
 #, c-format
 msgid ""
 "\n"
@@ -2486,7 +2641,7 @@
 "\n"
 "<b>Račun:</b> %s"
 
-#: src/gtkblist.c:2626
+#: ../src/gtkblist.c:2627
 #, c-format
 msgid ""
 "\n"
@@ -2495,7 +2650,7 @@
 "\n"
 "<b>Psevdonim:</b> %s"
 
-#: src/gtkblist.c:2638
+#: ../src/gtkblist.c:2639
 #, c-format
 msgid ""
 "\n"
@@ -2504,7 +2659,7 @@
 "\n"
 "<b>Vzdevek:</b> %s"
 
-#: src/gtkblist.c:2647
+#: ../src/gtkblist.c:2648
 #, c-format
 msgid ""
 "\n"
@@ -2513,7 +2668,7 @@
 "\n"
 "<b>Prijavljen(i):</b> %s"
 
-#: src/gtkblist.c:2658
+#: ../src/gtkblist.c:2659
 #, c-format
 msgid ""
 "\n"
@@ -2522,7 +2677,7 @@
 "\n"
 "<b>Nedejaven:</b> %s"
 
-#: src/gtkblist.c:2693
+#: ../src/gtkblist.c:2694
 #, c-format
 msgid ""
 "\n"
@@ -2531,7 +2686,7 @@
 "\n"
 "<b>Zadnjič viden:</b> pred %s"
 
-#: src/gtkblist.c:2702
+#: ../src/gtkblist.c:2703
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2539,7 +2694,7 @@
 "\n"
 "<b>Stanje:</b> Ni na zvezi"
 
-#: src/gtkblist.c:2713
+#: ../src/gtkblist.c:2714
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2547,7 +2702,7 @@
 "\n"
 "<b>Opis:</b> Strašljivo"
 
-#: src/gtkblist.c:2715
+#: ../src/gtkblist.c:2716
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
@@ -2555,7 +2710,7 @@
 "\n"
 "<b>Stanje</b>: Neverjetno!"
 
-#: src/gtkblist.c:2717
+#: ../src/gtkblist.c:2718
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
@@ -2563,287 +2718,287 @@
 "\n"
 "<b>Stanje</b>: Kulsko"
 
-#: src/gtkblist.c:3006
+#: ../src/gtkblist.c:3007
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Nedejaven %dh %02dm"
 
-#: src/gtkblist.c:3008
+#: ../src/gtkblist.c:3009
 #, c-format
 msgid "Idle %dm"
 msgstr "Nedejaven %dm"
 
 #. Idle stuff
-#: src/gtkblist.c:3011
-#: src/gtkprefs.c:1734
-#: src/protocols/bonjour/bonjour.c:324
-#: src/protocols/msn/msn.c:552
-#: src/protocols/msn/state.c:32
-#: src/protocols/novell/novell.c:2854
-#: src/protocols/oscar/oscar.c:5175
-#: src/protocols/yahoo/yahoo.c:2678
-#: src/protocols/yahoo/yahoo_profile.c:682
+#: ../src/gtkblist.c:3012
+#: ../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:5208
+#: ../src/protocols/yahoo/yahoo.c:2729
+#: ../src/protocols/yahoo/yahoo_profile.c:691
 msgid "Idle"
 msgstr "Nedejaven"
 
-#: src/gtkblist.c:3134
+#: ../src/gtkblist.c:3144
 msgid "/Buddies/New Instant Message..."
 msgstr "/Prijatelji/Novo neposredno sporočilo ..."
 
-#: src/gtkblist.c:3135
-#: src/gtkblist.c:3168
+#: ../src/gtkblist.c:3145
+#: ../src/gtkblist.c:3178
 msgid "/Buddies/Join a Chat..."
 msgstr "/Prijatelji/Pridruži se pomenku ..."
 
-#: src/gtkblist.c:3136
+#: ../src/gtkblist.c:3146
 msgid "/Buddies/Get User Info..."
 msgstr "/Prijatelji/Informacije o uporabniku ..."
 
-#: src/gtkblist.c:3137
+#: ../src/gtkblist.c:3147
 msgid "/Buddies/Add Buddy..."
 msgstr "/Prijatelji/Dodaj prijatelja ..."
 
-#: src/gtkblist.c:3138
-#: src/gtkblist.c:3171
+#: ../src/gtkblist.c:3148
+#: ../src/gtkblist.c:3181
 msgid "/Buddies/Add Chat..."
 msgstr "/Prijatelji/Dodaj pomenek ..."
 
-#: src/gtkblist.c:3139
+#: ../src/gtkblist.c:3149
 msgid "/Buddies/Add Group..."
 msgstr "/Prijatelji/Dodaj skupino ..."
 
-#: src/gtkblist.c:3174
+#: ../src/gtkblist.c:3184
 msgid "/Tools/Buddy Pounces"
 msgstr "/Orodja/Opozorila prijateljev"
 
-#: src/gtkblist.c:3177
+#: ../src/gtkblist.c:3187
 msgid "/Tools/Privacy"
 msgstr "/Orodja/Zasebnost"
 
-#: src/gtkblist.c:3180
+#: ../src/gtkblist.c:3190
 msgid "/Tools/Room List"
 msgstr "/Orodja/Seznam sob"
 
-#: src/gtkblist.c:3374
+#: ../src/gtkblist.c:3384
 msgid "Manually"
 msgstr "ročno"
 
-#: src/gtkblist.c:3376
+#: ../src/gtkblist.c:3386
 msgid "Alphabetically"
 msgstr "abecedno"
 
-#: src/gtkblist.c:3377
+#: ../src/gtkblist.c:3387
 msgid "By status"
 msgstr "po stanju"
 
-#: src/gtkblist.c:3378
+#: ../src/gtkblist.c:3388
 msgid "By log size"
 msgstr "po obsegu dnevnika"
 
-#: src/gtkblist.c:3480
-#: src/gtkconn.c:197
+#: ../src/gtkblist.c:3493
+#: ../src/gtkconn.c:191
 #, c-format
 msgid "%s disconnected"
 msgstr "%s se je odjavil"
 
-#: src/gtkblist.c:3501
+#: ../src/gtkblist.c:3515
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s ni več povezan: %s</span>"
 
-#: src/gtkblist.c:3648
+#: ../src/gtkblist.c:3642
 msgid "/Accounts"
 msgstr "/Računi"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3753
+#: ../src/gtkblist.c:3747
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Prijatelji/Pokaži prijatelje, ki niso na zvezi"
 
-#: src/gtkblist.c:3756
+#: ../src/gtkblist.c:3750
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Prijatelji/Pokaži prazne skupine"
 
-#: src/gtkblist.c:3762
+#: ../src/gtkblist.c:3756
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Prijatelji/Pokaži podrobnosti prijatelja"
 
-#: src/gtkblist.c:3765
+#: ../src/gtkblist.c:3759
 msgid "/Buddies/Show Idle Times"
 msgstr "/Prijatelji/Pokaži čase nedejavnosti"
 
-#: src/gtkblist.c:4472
-#: 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:2923
+#: ../src/gtkblist.c:4471
+#: ../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:2976
 msgid "Add Buddy"
 msgstr "Dodaj prijatelja"
 
-#: src/gtkblist.c:4496
+#: ../src/gtkblist.c:4495
 msgid "Please enter the screen name of the person you would like to add to your buddy list. You may optionally enter an alias, or nickname,  for the buddy. The alias will be displayed in place of the screen name whenever possible.\n"
 msgstr "Prosim vnesite ime osebe, ki jo želite dodati vašemu seznamu prijateljev. Vnesete lahko tudi psevdonim ali vzdevek. Kjer bo izvedljivo, bo namesto vzdevka prikazan psevdonim.\n"
 
-#: src/gtkblist.c:4518
+#: ../src/gtkblist.c:4517
 msgid "Screen Name:"
 msgstr "Ime:"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4566
-#: src/gtkblist.c:4885
+#: ../src/gtkblist.c:4565
+#: ../src/gtkblist.c:4884
 msgid "Account:"
 msgstr "Račun:"
 
-#: src/gtkblist.c:4818
+#: ../src/gtkblist.c:4817
 msgid "This protocol does not support chat rooms."
 msgstr "Ta protokol ne podpira klepetalnic."
 
-#: src/gtkblist.c:4834
+#: ../src/gtkblist.c:4833
 msgid "You are not currently signed on with any protocols that have the ability to chat."
 msgstr "Trenutno niste prijavljeni na nobenem izmed protokolov, ki podpirajo pomenke."
 
-#: src/gtkblist.c:4851
+#: ../src/gtkblist.c:4850
 msgid "Add Chat"
 msgstr "Dodaj pomenek"
 
-#: src/gtkblist.c:4875
+#: ../src/gtkblist.c:4874
 msgid "Please enter an alias, and the appropriate information about the chat you would like to add to your buddy list.\n"
 msgstr "Prosim vnesite psevdonim in ostale informacije za pomenek, ki ga želite dodati na seznam prijateljev.\n"
 
-#: src/gtkblist.c:4957
-#: src/protocols/sametime/sametime.c:5206
-#: src/protocols/sametime/sametime.c:5290
+#: ../src/gtkblist.c:4956
+#: ../src/protocols/sametime/sametime.c:5320
+#: ../src/protocols/sametime/sametime.c:5407
 msgid "Add Group"
 msgstr "Dodaj skupino"
 
-#: src/gtkblist.c:4958
+#: ../src/gtkblist.c:4957
 msgid "Please enter the name of the group to be added."
 msgstr "Prosimo vnesite ime skupine, ki jo želite dodati."
 
-#: src/gtkblist.c:5579
+#: ../src/gtkblist.c:5578
 msgid "_Edit Account"
 msgstr "_Uredi račun"
 
-#: src/gtkblist.c:5612
-#: src/gtkblist.c:5618
+#: ../src/gtkblist.c:5611
+#: ../src/gtkblist.c:5617
 msgid "No actions available"
 msgstr "Na voljo ni nobenega ukaza"
 
-#: src/gtkblist.c:5626
+#: ../src/gtkblist.c:5625
 msgid "_Disable"
 msgstr "_Onemogoči"
 
-#: src/gtkblist.c:5638
+#: ../src/gtkblist.c:5637
 msgid "Enable Account"
 msgstr "Omogoči račun"
 
-#: src/gtkblist.c:5693
+#: ../src/gtkblist.c:5690
 msgid "/Tools"
 msgstr "/Orodja"
 
-#: src/gtkblist.c:5788
+#: ../src/gtkblist.c:5785
 msgid "/Buddies/Sort Buddies"
 msgstr "/Prijatelji/Razvrsti prijatelje"
 
-#: src/gtkcellview.c:198
+#: ../src/gtkcellview.c:198
 msgid "Background color name"
 msgstr "Ime barve ozadja"
 
-#: src/gtkcellview.c:199
+#: ../src/gtkcellview.c:199
 msgid "Background color as a string"
 msgstr "Barva ozadja kot niz"
 
-#: src/gtkcellview.c:205
-#: src/gtkimhtmltoolbar.c:1014
+#: ../src/gtkcellview.c:205
+#: ../src/gtkimhtmltoolbar.c:1014
 msgid "Background color"
 msgstr "Barva ozadja"
 
-#: src/gtkcellview.c:206
+#: ../src/gtkcellview.c:206
 msgid "Background color as a GdkColor"
 msgstr "Barva ozadja kot GdkColor"
 
-#: src/gtkcellview.c:213
+#: ../src/gtkcellview.c:213
 msgid "Background set"
 msgstr "Ozadje nastavljeno"
 
-#: src/gtkcellview.c:214
+#: ../src/gtkcellview.c:214
 msgid "Whether this tag affects the background color"
 msgstr "Ali ta zaznamek vpliva na barvo ozadja"
 
-#: src/gtkcombobox.c:490
+#: ../src/gtkcombobox.c:490
 msgid "ComboBox model"
 msgstr "Model kombiniranega polja"
 
-#: src/gtkcombobox.c:491
+#: ../src/gtkcombobox.c:491
 msgid "The model for the combo box"
 msgstr "Model kombiniranega polja"
 
-#: src/gtkcombobox.c:498
+#: ../src/gtkcombobox.c:498
 msgid "Wrap width"
 msgstr "Širina preloma"
 
-#: src/gtkcombobox.c:499
+#: ../src/gtkcombobox.c:499
 msgid "Wrap width for layouting the items in a grid"
 msgstr "Širina preloma za prikaz elementov v mreži"
 
-#: src/gtkcombobox.c:508
+#: ../src/gtkcombobox.c:508
 msgid "Row span column"
 msgstr "Stolpec razširi vrstica"
 
-#: src/gtkcombobox.c:509
+#: ../src/gtkcombobox.c:509
 msgid "TreeModel column containing the row span values"
 msgstr "Stolpec TreeModel vsebuje vrednosti razširjenosti vrstice"
 
-#: src/gtkcombobox.c:518
+#: ../src/gtkcombobox.c:518
 msgid "Column span column"
 msgstr "Stolpec razširi stolpec"
 
-#: src/gtkcombobox.c:520
+#: ../src/gtkcombobox.c:520
 msgid "TreeModel column containing the column span values"
 msgstr "Vrstica TreeModel vsebuje vrednosti razširjenosti stolpca"
 
-#: src/gtkcombobox.c:529
+#: ../src/gtkcombobox.c:529
 msgid "Active item"
 msgstr "Aktivni element"
 
-#: src/gtkcombobox.c:530
+#: ../src/gtkcombobox.c:530
 msgid "The item which is currently active"
 msgstr "Element, ki je trenutno aktiven"
 
-#: src/gtkcombobox.c:538
+#: ../src/gtkcombobox.c:538
 msgid "Appears as list"
 msgstr "V obliki seznama"
 
-#: src/gtkcombobox.c:539
+#: ../src/gtkcombobox.c:539
 msgid "Whether combobox dropdowns should look like lists rather than menus"
 msgstr "Če naj bodo roletni meniji kombiniranega polja seznami namesto menijev"
 
-#: src/gtkconn.c:198
+#: ../src/gtkconn.c:192
 #, c-format
 msgid ""
 "%s was disconnected due to an error: %s\n"
-"The account has been disabled. Correct the error and reenable the account to connect."
+"Gaim will not attempt to reconnect the account until you correct the error and reenable the account."
 msgstr ""
 "%s je bil odjavljen zaradi napake: %s\n"
-"Račun je bil onemogočen. Odpravite napako in ponovno omogočite povezavanje računa."
-
-#: src/gtkconv.c:364
+"Gaim se ne bo poskušal ponovno prijaviti, dokler ne odpravite napake in ponovno omogočite povezovanje računa."
+
+#: ../src/gtkconv.c:364
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr "uporabljam Gaim v%s."
 
-#: src/gtkconv.c:373
+#: ../src/gtkconv.c:373
 msgid "Supported debug options are:  version"
 msgstr "Podprte možnosti razhroščevanja:  različica"
 
-#: src/gtkconv.c:409
+#: ../src/gtkconv.c:409
 msgid "No such command (in this context)."
 msgstr "Tak ukaz ne obstaja (v tem sklopu)."
 
-#: src/gtkconv.c:412
+#: ../src/gtkconv.c:412
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2851,341 +3006,341 @@
 "Uporabite \"&lt;ukaz&gt; /help\" za pomoč o določenem ukazu.\n"
 "V tem sklopu so na voljo naslednji ukazi:\n"
 
-#: src/gtkconv.c:484
+#: ../src/gtkconv.c:484
 msgid "No such command."
 msgstr "Ta ukaz ne obstaja."
 
-#: src/gtkconv.c:491
+#: ../src/gtkconv.c:491
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "Skladenjska napaka: vtipkali ste napačno število argumentov za ta ukaz."
 
-#: src/gtkconv.c:496
+#: ../src/gtkconv.c:496
 msgid "Your command failed for an unknown reason."
 msgstr "Vaš ukaz iz neznanega razloga ni uspel."
 
-#: src/gtkconv.c:503
+#: ../src/gtkconv.c:503
 msgid "That command only works in chats, not IMs."
 msgstr "Ta ukaz deluje samo v klepetih in ne v neposrednih sporočilih."
 
-#: src/gtkconv.c:506
+#: ../src/gtkconv.c:506
 msgid "That command only works in IMs, not chats."
 msgstr "Ta ukaz deluje samo v neposrednih sporočilih in ne v klepetih."
 
-#: src/gtkconv.c:510
+#: ../src/gtkconv.c:510
 msgid "That command doesn't work on this protocol."
 msgstr "Ta ukaz ne deluje na tem protokolu."
 
-#: src/gtkconv.c:744
-#: src/gtkconv.c:770
+#: ../src/gtkconv.c:744
+#: ../src/gtkconv.c:770
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Tisti prijatelj ne uporablja enakega protokola kot ta pogovor."
 
-#: src/gtkconv.c:764
+#: ../src/gtkconv.c:764
 msgid "You are not currently signed on with an account that can invite that buddy."
 msgstr "Trenutno niste prijavljeni z nobenim računom, ki lahko doda tega prijatelja."
 
-#: src/gtkconv.c:817
+#: ../src/gtkconv.c:817
 msgid "Invite Buddy Into Chat Room"
 msgstr "Povabi prijatelja v pogovorno sobo"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:847
+#: ../src/gtkconv.c:847
 msgid "Please enter the name of the user you wish to invite, along with an optional invite message."
 msgstr "Prosim vnesite ime uporabnika, ki ga želite povabiti, dodate pa lahko še povabilo."
 
-#: src/gtkconv.c:868
+#: ../src/gtkconv.c:868
 msgid "_Buddy:"
 msgstr "_Prijatelj:"
 
-#: src/gtkconv.c:888
-#: src/gtksavedstatuses.c:1081
-#: src/gtksavedstatuses.c:1404
+#: ../src/gtkconv.c:888
+#: ../src/gtksavedstatuses.c:1108
+#: ../src/gtksavedstatuses.c:1444
 msgid "_Message:"
 msgstr "_Sporočilo:"
 
-#: src/gtkconv.c:945
-#: src/gtkconv.c:2406
-#: src/gtkdebug.c:219
-#: src/gtkft.c:488
+#: ../src/gtkconv.c:945
+#: ../src/gtkconv.c:2399
+#: ../src/gtkdebug.c:217
+#: ../src/gtkft.c:488
 msgid "Unable to open file."
 msgstr "Datoteke ni bilo mogoče odprti."
 
-#: src/gtkconv.c:951
+#: ../src/gtkconv.c:951
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Pogovor z %s</h1>\n"
 
-#: src/gtkconv.c:975
+#: ../src/gtkconv.c:975
 msgid "Save Conversation"
 msgstr "Shrani pogovor"
 
-#: src/gtkconv.c:1092
-#: src/gtkdebug.c:165
-#: src/gtkdebug.c:681
+#: ../src/gtkconv.c:1093
+#: ../src/gtkdebug.c:165
+#: ../src/gtkdebug.c:678
 msgid "Find"
 msgstr "Najdi"
 
-#: src/gtkconv.c:1118
-#: src/gtkdebug.c:193
+#: ../src/gtkconv.c:1119
+#: ../src/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "_Išči:"
 
-#: src/gtkconv.c:1289
+#: ../src/gtkconv.c:1290
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "Začelo se je beleženje v dnevnik. Vsa nadaljna sporočila pogovora bodo zabeležena."
 
-#: src/gtkconv.c:1297
+#: ../src/gtkconv.c:1298
 msgid "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "Beleženje v dnevnik ustavljeno. Nadaljna sporočila pogovora ne bodo zabeležena."
 
-#: src/gtkconv.c:1577
+#: ../src/gtkconv.c:1578
 msgid "IM"
 msgstr "Sporoči"
 
-#: src/gtkconv.c:1583
-#: src/protocols/oscar/oscar.c:647
+#: ../src/gtkconv.c:1584
+#: ../src/protocols/oscar/oscar.c:650
 msgid "Send File"
 msgstr "Pošlji datoteko"
 
-#: src/gtkconv.c:1590
+#: ../src/gtkconv.c:1591
 msgid "Un-Ignore"
 msgstr "Ne prezri"
 
-#: src/gtkconv.c:1593
+#: ../src/gtkconv.c:1594
 msgid "Ignore"
 msgstr "Prezri"
 
-#: src/gtkconv.c:1599
+#: ../src/gtkconv.c:1600
 msgid "Info"
 msgstr "Informacije"
 
-#: src/gtkconv.c:1605
+#: ../src/gtkconv.c:1606
 msgid "Get Away Message"
 msgstr "Sporočilo o odsotnosti"
 
-#: src/gtkconv.c:1620
+#: ../src/gtkconv.c:1621
 msgid "Last said"
 msgstr "Nazadnje rečeno"
 
-#: src/gtkconv.c:2414
+#: ../src/gtkconv.c:2407
 msgid "Unable to save icon file to disk."
 msgstr "Datoteke z ikonami ni bilo mogoče shraniti."
 
-#: src/gtkconv.c:2437
+#: ../src/gtkconv.c:2430
 msgid "Save Icon"
 msgstr "Shrani ikono"
 
-#: src/gtkconv.c:2486
+#: ../src/gtkconv.c:2479
 msgid "Animate"
 msgstr "Animiraj"
 
-#: src/gtkconv.c:2491
+#: ../src/gtkconv.c:2484
 msgid "Hide Icon"
 msgstr "Skrij ikono"
 
-#: src/gtkconv.c:2497
+#: ../src/gtkconv.c:2490
 msgid "Save Icon As..."
 msgstr "Shrani ikono kot ..."
 
 #. Conversation menu
-#: src/gtkconv.c:2638
+#: ../src/gtkconv.c:2631
 msgid "/_Conversation"
 msgstr "/_Pogovor"
 
-#: src/gtkconv.c:2640
+#: ../src/gtkconv.c:2633
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Pogovor/Novo neposredno sporočilo ..."
 
-#: src/gtkconv.c:2645
+#: ../src/gtkconv.c:2638
 msgid "/Conversation/_Find..."
 msgstr "/Pogovor/_Najdi ..."
 
-#: src/gtkconv.c:2647
+#: ../src/gtkconv.c:2640
 msgid "/Conversation/View _Log"
 msgstr "/Pogovor/Pog_lej dnevnik ..."
 
-#: src/gtkconv.c:2648
+#: ../src/gtkconv.c:2641
 msgid "/Conversation/_Save As..."
 msgstr "/Pogovor/_Shrani kot ..."
 
-#: src/gtkconv.c:2650
+#: ../src/gtkconv.c:2643
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Pogovor/Po_čisti pogovor"
 
-#: src/gtkconv.c:2654
+#: ../src/gtkconv.c:2647
 msgid "/Conversation/Se_nd File..."
 msgstr "/Pogovor/_Pošlji datoteko ..."
 
-#: src/gtkconv.c:2655
+#: ../src/gtkconv.c:2648
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Pogovor/Dodaj _opozorilo prijatelja ..."
 
-#: src/gtkconv.c:2657
+#: ../src/gtkconv.c:2650
 msgid "/Conversation/_Get Info"
 msgstr "/Pogovor/_Informacije"
 
-#: src/gtkconv.c:2659
+#: ../src/gtkconv.c:2652
 msgid "/Conversation/In_vite..."
 msgstr "/Pogovor/Po_vabi ..."
 
-#: src/gtkconv.c:2664
+#: ../src/gtkconv.c:2657
 msgid "/Conversation/Al_ias..."
 msgstr "/Pogovor/Psevdon_im ..."
 
-#: src/gtkconv.c:2666
+#: ../src/gtkconv.c:2659
 msgid "/Conversation/_Block..."
 msgstr "/Pogovor/_Zavrni ..."
 
-#: src/gtkconv.c:2668
+#: ../src/gtkconv.c:2661
 msgid "/Conversation/_Add..."
 msgstr "/Pogovor/Dod_aj ..."
 
-#: src/gtkconv.c:2670
+#: ../src/gtkconv.c:2663
 msgid "/Conversation/_Remove..."
 msgstr "/Pogovor/Odst_rani ..."
 
-#: src/gtkconv.c:2675
+#: ../src/gtkconv.c:2668
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Pogovor/Vstavi _povezavo ..."
 
-#: src/gtkconv.c:2677
+#: ../src/gtkconv.c:2670
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Pogovor/Vstavi _sliko ..."
 
-#: src/gtkconv.c:2682
+#: ../src/gtkconv.c:2675
 msgid "/Conversation/_Close"
 msgstr "/Pogovor/_Zapri"
 
 #. Options
-#: src/gtkconv.c:2686
+#: ../src/gtkconv.c:2679
 msgid "/_Options"
 msgstr "/M_ožnosti"
 
-#: src/gtkconv.c:2687
+#: ../src/gtkconv.c:2680
 msgid "/Options/Enable _Logging"
 msgstr "/Možnosti/Vk_ljuči dnevnik"
 
-#: src/gtkconv.c:2688
+#: ../src/gtkconv.c:2681
 msgid "/Options/Enable _Sounds"
 msgstr "/Možnosti/Vključi _zvoke"
 
-#: src/gtkconv.c:2689
+#: ../src/gtkconv.c:2682
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Možnosti/Prikaži ikono prijatelja"
 
-#: src/gtkconv.c:2691
+#: ../src/gtkconv.c:2684
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Možnosti/Prikaži orodno vrstico za _oblikovanje"
 
-#: src/gtkconv.c:2692
+#: ../src/gtkconv.c:2685
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Možnosti/Pr_ikaži časovne žige"
 
-#: src/gtkconv.c:2784
+#: ../src/gtkconv.c:2777
 msgid "/Conversation/View Log"
 msgstr "/Pogovor/Prikaži dnevnik ..."
 
-#: src/gtkconv.c:2790
+#: ../src/gtkconv.c:2783
 msgid "/Conversation/Send File..."
 msgstr "/Pogovor/Pošlji datoteko ..."
 
-#: src/gtkconv.c:2794
+#: ../src/gtkconv.c:2787
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Pogovor/Dodaj opozorilo prijatelja ..."
 
-#: src/gtkconv.c:2800
+#: ../src/gtkconv.c:2793
 msgid "/Conversation/Get Info"
 msgstr "/Pogovor/Informacije"
 
-#: src/gtkconv.c:2804
+#: ../src/gtkconv.c:2797
 msgid "/Conversation/Invite..."
 msgstr "/Pogovor/Povabi ..."
 
-#: src/gtkconv.c:2810
+#: ../src/gtkconv.c:2803
 msgid "/Conversation/Alias..."
 msgstr "/Pogovor/Psevdonim ..."
 
-#: src/gtkconv.c:2814
+#: ../src/gtkconv.c:2807
 msgid "/Conversation/Block..."
 msgstr "/Pogovor/Zavrni ..."
 
-#: src/gtkconv.c:2818
+#: ../src/gtkconv.c:2811
 msgid "/Conversation/Add..."
 msgstr "/Pogovor/Dodaj ..."
 
-#: src/gtkconv.c:2822
+#: ../src/gtkconv.c:2815
 msgid "/Conversation/Remove..."
 msgstr "/Pogovor/Odstrani ..."
 
-#: src/gtkconv.c:2828
+#: ../src/gtkconv.c:2821
 msgid "/Conversation/Insert Link..."
 msgstr "/Pogovor/Vstavi povezavo ..."
 
-#: src/gtkconv.c:2832
+#: ../src/gtkconv.c:2825
 msgid "/Conversation/Insert Image..."
 msgstr "/Pogovor/Vstavi sliko ..."
 
-#: src/gtkconv.c:2838
+#: ../src/gtkconv.c:2831
 msgid "/Options/Enable Logging"
 msgstr "/Možnosti/Vključi dnevnik"
 
-#: src/gtkconv.c:2841
+#: ../src/gtkconv.c:2834
 msgid "/Options/Enable Sounds"
 msgstr "/Možnosti/Vključi zvoke"
 
-#: src/gtkconv.c:2854
+#: ../src/gtkconv.c:2847
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Možnosti/Prikaži orodno vrstico za oblikovanje"
 
-#: src/gtkconv.c:2857
+#: ../src/gtkconv.c:2850
 msgid "/Options/Show Timestamps"
 msgstr "/Možnosti/Prikaži časovne žige"
 
-#: src/gtkconv.c:2860
+#: ../src/gtkconv.c:2853
 msgid "/Options/Show Buddy Icon"
 msgstr "/Možnosti/Prikaži ikono prijatelja"
 
-#: src/gtkconv.c:2939
+#: ../src/gtkconv.c:2933
 msgid "User is typing..."
 msgstr "Uporabnik tipka ..."
 
-#: src/gtkconv.c:2942
+#: ../src/gtkconv.c:2936
 msgid "User has typed something and stopped"
 msgstr "Uporabnik je napisal nekaj in se ustavil."
 
 #. Build the Send To menu
-#: src/gtkconv.c:3128
+#: ../src/gtkconv.c:3119
 msgid "_Send To"
 msgstr "_Pošlji k"
 
-#: src/gtkconv.c:3780
+#: ../src/gtkconv.c:3771
 msgid "_Send"
 msgstr "_Pošlji"
 
-#: src/gtkconv.c:3833
-#: src/protocols/sametime/sametime.c:3472
+#: ../src/gtkconv.c:3826
+#: ../src/protocols/sametime/sametime.c:3572
 msgid "Topic:"
 msgstr "Tema:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3881
+#: ../src/gtkconv.c:3878
 msgid "0 people in room"
 msgstr "0 ljudi v sobi"
 
-#: src/gtkconv.c:3960
+#: ../src/gtkconv.c:3957
 msgid "IM the user"
 msgstr "Pošlji sporočilo uporabniku"
 
-#: src/gtkconv.c:3973
+#: ../src/gtkconv.c:3970
 msgid "Ignore the user"
 msgstr "Prezri uporabnika"
 
-#: src/gtkconv.c:3985
+#: ../src/gtkconv.c:3982
 msgid "Get the user's information"
 msgstr "Poizvedi o uporabniku"
 
-#: src/gtkconv.c:4954
-#: src/gtkconv.c:5063
+#: ../src/gtkconv.c:4954
+#: ../src/gtkconv.c:5063
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -3194,459 +3349,463 @@
 msgstr[2] "%d osebi v sobi"
 msgstr[3] "%d osebe v sobi"
 
-#: src/gtkconv.c:6522
+#: ../src/gtkconv.c:6533
 msgid "say &lt;message&gt;:  Send a message normally as if you weren't using a command."
 msgstr "say &lt;sporočilo&gt;:  Pošlji sporočilo kot ponavadi, kot če ne bi uporabljal ukaza."
 
-#: src/gtkconv.c:6525
+#: ../src/gtkconv.c:6536
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;dejanje&gt;:  Pošlji prijatelju ali klepetu dejanje v slogu IRC-a."
 
-#: src/gtkconv.c:6528
+#: ../src/gtkconv.c:6539
 msgid "debug &lt;option&gt;:  Send various debug information to the current conversation."
 msgstr "razrošči &lt;možnost&gt;:  Trenutnim pomenkom pošlji različne informacije o razhroščevanju."
 
-#: src/gtkconv.c:6531
+#: ../src/gtkconv.c:6542
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Počisti izpisane replike pomenka."
 
-#: src/gtkconv.c:6534
+#: ../src/gtkconv.c:6545
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "pomoč &lt;ukaz&gt;:  Pomoč o določenem ukazu."
 
-#: src/gtkconv.c:6693
+#: ../src/gtkconv.c:6704
 msgid "Confirm close"
 msgstr "Potrdi zaprtje"
 
-#: src/gtkconv.c:6725
+#: ../src/gtkconv.c:6736
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Imate neprebrana sporočila. Ste prepričani, da želite zapreti okno?"
 
-#: src/gtkconv.c:7527
+#: ../src/gtkconv.c:7540
 msgid "Close conversation"
 msgstr "Zapri pogovor"
 
-#: src/gtkconv.c:7991
+#: ../src/gtkconv.c:8004
 msgid "Last created window"
 msgstr "zadnje odprto okno"
 
-#: src/gtkconv.c:7993
+#: ../src/gtkconv.c:8006
 msgid "Separate IM and Chat windows"
 msgstr "loči okna za klepet in zasebni pomenek"
 
-#: src/gtkconv.c:7995
-#: src/gtkprefs.c:1232
+#: ../src/gtkconv.c:8008
+#: ../src/gtkprefs.c:1243
 msgid "New window"
 msgstr "novo okno"
 
-#: src/gtkconv.c:7997
+#: ../src/gtkconv.c:8010
 msgid "By group"
 msgstr "po skupinah"
 
-#: src/gtkconv.c:7999
+#: ../src/gtkconv.c:8012
 msgid "By account"
 msgstr "po vrsti računa"
 
-#: src/gtkdebug.c:235
+#: ../src/gtkdebug.c:232
 msgid "Save Debug Log"
 msgstr "Shrani dnevnik razhroščevanja"
 
-#: src/gtkdebug.c:589
+#: ../src/gtkdebug.c:586
 msgid "Invert"
 msgstr "Preobrni"
 
-#: src/gtkdebug.c:592
+#: ../src/gtkdebug.c:589
 msgid "Highlight matches"
 msgstr "Obarvaj zadetke"
 
-#: src/gtkdebug.c:639
+#: ../src/gtkdebug.c:636
 msgid "Debug Window"
 msgstr "Razhroščevalno okno"
 
-#: src/gtkdebug.c:692
+#: ../src/gtkdebug.c:689
 msgid "Clear"
 msgstr "Počisti"
 
-#: src/gtkdebug.c:701
+#: ../src/gtkdebug.c:698
 msgid "Pause"
 msgstr "Premor"
 
-#: src/gtkdebug.c:708
-#: src/gtkdebug.c:709
+#: ../src/gtkdebug.c:705
+#: ../src/gtkdebug.c:706
 msgid "Timestamps"
 msgstr "Prikaži čas"
 
-#: src/gtkdebug.c:727
+#: ../src/gtkdebug.c:724
 msgid "Filter"
 msgstr "Filter"
 
-#: src/gtkdebug.c:746
+#: ../src/gtkdebug.c:743
 msgid "Right click for more options."
 msgstr "Za več možnosti kliknite na desni miškin gumb."
 
-#: src/gtkdialogs.c:61
-#: src/gtkdialogs.c:100
+#: ../src/gtkdialogs.c:61
+#: ../src/gtkdialogs.c:100
 msgid "lead developer"
 msgstr "glavni razvijalec"
 
-#: src/gtkdialogs.c:62
-#: src/gtkdialogs.c:63
-#: src/gtkdialogs.c:65
-#: src/gtkdialogs.c:67
-#: src/gtkdialogs.c:68
-#: src/gtkdialogs.c:69
-#: src/gtkdialogs.c:70
-#: src/gtkdialogs.c:71
-#: src/gtkdialogs.c:73
-#: src/gtkdialogs.c:74
+#: ../src/gtkdialogs.c:62
+#: ../src/gtkdialogs.c:63
+#: ../src/gtkdialogs.c:65
+#: ../src/gtkdialogs.c:67
+#: ../src/gtkdialogs.c:68
+#: ../src/gtkdialogs.c:69
+#: ../src/gtkdialogs.c:70
+#: ../src/gtkdialogs.c:71
+#: ../src/gtkdialogs.c:73
+#: ../src/gtkdialogs.c:74
 msgid "developer"
 msgstr "razvijalec"
 
-#: src/gtkdialogs.c:64
+#: ../src/gtkdialogs.c:64
 msgid "win32 port"
 msgstr "različica win32"
 
-#: src/gtkdialogs.c:66
+#: ../src/gtkdialogs.c:66
 msgid "developer & webmaster"
 msgstr "razvijalec in oskrbnik spletne strani"
 
-#: src/gtkdialogs.c:72
+#: ../src/gtkdialogs.c:72
 msgid "support"
 msgstr "podpora"
 
-#: src/gtkdialogs.c:94
-#: src/gtkdialogs.c:95
+#: ../src/gtkdialogs.c:94
+#: ../src/gtkdialogs.c:95
 msgid "maintainer"
 msgstr "vzdrževalec"
 
-#: src/gtkdialogs.c:96
+#: ../src/gtkdialogs.c:96
 msgid "libfaim maintainer"
 msgstr "vzdrževalec libfaim"
 
-#: src/gtkdialogs.c:97
+#: ../src/gtkdialogs.c:97
 msgid "hacker and designated driver [lazy bum]"
 msgstr "heker in uradni vodja [lenoba]"
 
-#: src/gtkdialogs.c:98
+#: ../src/gtkdialogs.c:98
 msgid "Jabber developer"
 msgstr "razvijalec podpore protokola Jabber"
 
-#: src/gtkdialogs.c:99
+#: ../src/gtkdialogs.c:99
 msgid "original author"
 msgstr "prvotni avtor"
 
-#: src/gtkdialogs.c:106
-#: src/gtkdialogs.c:107
-#: src/gtkdialogs.c:157
+#: ../src/gtkdialogs.c:106
+#: ../src/gtkdialogs.c:107
+#: ../src/gtkdialogs.c:158
 msgid "Bulgarian"
 msgstr "bolgarsko"
 
-#: src/gtkdialogs.c:108
-#: src/gtkdialogs.c:109
+#: ../src/gtkdialogs.c:108
+#: ../src/gtkdialogs.c:109
 msgid "Bengali"
 msgstr "bengalsko"
 
-#: src/gtkdialogs.c:110
+#: ../src/gtkdialogs.c:110
 msgid "Bosnian"
 msgstr "bosansko"
 
-#: src/gtkdialogs.c:111
-#: src/gtkdialogs.c:158
-#: src/gtkdialogs.c:159
+#: ../src/gtkdialogs.c:111
+#: ../src/gtkdialogs.c:159
+#: ../src/gtkdialogs.c:160
 msgid "Catalan"
 msgstr "katalonsko"
 
-#: src/gtkdialogs.c:112
-#: src/gtkdialogs.c:160
+#: ../src/gtkdialogs.c:112
+#: ../src/gtkdialogs.c:161
 msgid "Czech"
 msgstr "češko"
 
-#: src/gtkdialogs.c:113
+#: ../src/gtkdialogs.c:113
 msgid "Danish"
 msgstr "dansko"
 
-#: src/gtkdialogs.c:114
-#: src/gtkdialogs.c:161
+#: ../src/gtkdialogs.c:114
+#: ../src/gtkdialogs.c:162
 msgid "German"
 msgstr "nemško"
 
-#: src/gtkdialogs.c:115
-#: src/gtkdialogs.c:116
+#: ../src/gtkdialogs.c:115
+#: ../src/gtkdialogs.c:116
 msgid "Greek"
 msgstr "grško"
 
-#: src/gtkdialogs.c:117
+#: ../src/gtkdialogs.c:117
 msgid "Australian English"
 msgstr "avstralsko-angleško"
 
-#: src/gtkdialogs.c:118
+#: ../src/gtkdialogs.c:118
 msgid "Canadian English"
 msgstr "kanadsko-angleško"
 
-#: src/gtkdialogs.c:119
+#: ../src/gtkdialogs.c:119
 msgid "British English"
 msgstr "britansko-angleško"
 
-#: src/gtkdialogs.c:120
-#: src/gtkdialogs.c:162
-#: src/gtkdialogs.c:163
-#: src/gtkdialogs.c:164
-#: src/gtkdialogs.c:165
+#: ../src/gtkdialogs.c:120
+#: ../src/gtkdialogs.c:163
+#: ../src/gtkdialogs.c:164
+#: ../src/gtkdialogs.c:165
+#: ../src/gtkdialogs.c:166
 msgid "Spanish"
 msgstr "špansko"
 
-#: src/gtkdialogs.c:121
-#: src/gtkdialogs.c:166
-#: src/gtkdialogs.c:167
+#: ../src/gtkdialogs.c:121
+#: ../src/gtkdialogs.c:167
+#: ../src/gtkdialogs.c:168
 msgid "Finnish"
 msgstr "finsko"
 
-#: src/gtkdialogs.c:122
-#: src/gtkdialogs.c:168
-#: src/gtkdialogs.c:169
-#: src/gtkdialogs.c:170
-#: src/gtkdialogs.c:171
+#: ../src/gtkdialogs.c:122
+#: ../src/gtkdialogs.c:169
+#: ../src/gtkdialogs.c:170
+#: ../src/gtkdialogs.c:171
+#: ../src/gtkdialogs.c:172
 msgid "French"
 msgstr "francosko"
 
-#: src/gtkdialogs.c:123
+#: ../src/gtkdialogs.c:123
 msgid "Hebrew"
 msgstr "hebrejsko"
 
-#: src/gtkdialogs.c:124
+#: ../src/gtkdialogs.c:124
 msgid "Hindi"
 msgstr "hindujsko"
 
-#: src/gtkdialogs.c:125
+#: ../src/gtkdialogs.c:125
 msgid "Hungarian"
 msgstr "madžarsko"
 
-#: src/gtkdialogs.c:126
-#: src/gtkdialogs.c:172
+#: ../src/gtkdialogs.c:126
+#: ../src/gtkdialogs.c:173
 msgid "Italian"
 msgstr "italijansko"
 
-#: src/gtkdialogs.c:127
-#: src/gtkdialogs.c:173
-#: src/gtkdialogs.c:174
-#: src/gtkdialogs.c:175
+#: ../src/gtkdialogs.c:127
+#: ../src/gtkdialogs.c:174
+#: ../src/gtkdialogs.c:175
+#: ../src/gtkdialogs.c:176
 msgid "Japanese"
 msgstr "japonsko"
 
-#: src/gtkdialogs.c:128
-#: src/gtkdialogs.c:176
+#: ../src/gtkdialogs.c:128
+#: ../src/gtkdialogs.c:177
 msgid "Georgian"
 msgstr "gruzijsko"
 
-#: src/gtkdialogs.c:129
-#: src/gtkdialogs.c:177
+#: ../src/gtkdialogs.c:129
+#: ../src/gtkdialogs.c:178
 msgid "Korean"
 msgstr "korejsko"
 
-#: src/gtkdialogs.c:130
+#: ../src/gtkdialogs.c:130
 msgid "Kurdish"
 msgstr "kurdsko"
 
-#: src/gtkdialogs.c:131
-#: src/gtkdialogs.c:178
+#: ../src/gtkdialogs.c:131
+#: ../src/gtkdialogs.c:179
 msgid "Lithuanian"
 msgstr "litvansko"
 
-#: src/gtkdialogs.c:132
+#: ../src/gtkdialogs.c:132
 msgid "Macedonian"
 msgstr "makedonsko"
 
-#: src/gtkdialogs.c:133
+#: ../src/gtkdialogs.c:133
 msgid "Dutch, Flemish"
 msgstr "nizozemsko, flamsko"
 
-#: src/gtkdialogs.c:134
+#: ../src/gtkdialogs.c:134
 msgid "Norwegian"
 msgstr "norveško"
 
-#: src/gtkdialogs.c:135
-#: src/gtkdialogs.c:136
-#: src/gtkdialogs.c:179
+#: ../src/gtkdialogs.c:135
+#: ../src/gtkdialogs.c:136
+#: ../src/gtkdialogs.c:180
 msgid "Polish"
 msgstr "poljsko"
 
-#: src/gtkdialogs.c:137
+#: ../src/gtkdialogs.c:137
 msgid "Portuguese"
 msgstr "portugalsko"
 
-#: src/gtkdialogs.c:138
+#: ../src/gtkdialogs.c:138
 msgid "Portuguese-Brazil"
 msgstr "portugalsko (Brazilija)"
 
-#: src/gtkdialogs.c:139
+#: ../src/gtkdialogs.c:139
 msgid "Romanian"
 msgstr "romunsko"
 
-#: src/gtkdialogs.c:140
-#: src/gtkdialogs.c:180
-#: src/gtkdialogs.c:181
+#: ../src/gtkdialogs.c:140
+#: ../src/gtkdialogs.c:181
+#: ../src/gtkdialogs.c:182
 msgid "Russian"
 msgstr "rusko"
 
-#: src/gtkdialogs.c:141
-#: src/gtkdialogs.c:142
+#: ../src/gtkdialogs.c:141
+#: ../src/gtkdialogs.c:142
 msgid "Serbian"
 msgstr "srbsko"
 
-#: src/gtkdialogs.c:143
+#: ../src/gtkdialogs.c:143
 msgid "Slovenian"
 msgstr "slovensko"
 
-#: src/gtkdialogs.c:144
-#: src/gtkdialogs.c:183
+#: ../src/gtkdialogs.c:144
+#: ../src/gtkdialogs.c:184
 msgid "Swedish"
 msgstr "švedsko"
 
-#: src/gtkdialogs.c:145
+#: ../src/gtkdialogs.c:145
 msgid "Tamil"
 msgstr "tamilsko"
 
-#: src/gtkdialogs.c:146
+#: ../src/gtkdialogs.c:146
 msgid "Telugu"
 msgstr "teluško"
 
-#: src/gtkdialogs.c:147
+#: ../src/gtkdialogs.c:147
+msgid "Turkish"
+msgstr "turško"
+
+#: ../src/gtkdialogs.c:148
 msgid "Vietnamese"
 msgstr "vietnamsko"
 
-#: src/gtkdialogs.c:147
+#: ../src/gtkdialogs.c:148
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh in ekipa Gnome-Vi"
 
-#: src/gtkdialogs.c:148
-#: src/gtkdialogs.c:184
+#: ../src/gtkdialogs.c:149
+#: ../src/gtkdialogs.c:185
 msgid "Simplified Chinese"
 msgstr "poenostavljeno kitajsko"
 
-#: src/gtkdialogs.c:149
-#: src/gtkdialogs.c:150
-#: src/gtkdialogs.c:185
+#: ../src/gtkdialogs.c:150
+#: ../src/gtkdialogs.c:151
+#: ../src/gtkdialogs.c:186
 msgid "Traditional Chinese"
 msgstr "tradicionalno kitajsko"
 
-#: src/gtkdialogs.c:156
+#: ../src/gtkdialogs.c:157
 msgid "Amharic"
 msgstr "amharsko"
 
-#: src/gtkdialogs.c:182
+#: ../src/gtkdialogs.c:183
 msgid "Slovak"
 msgstr "slovaško"
 
-#: src/gtkdialogs.c:226
+#: ../src/gtkdialogs.c:227
 msgid "About Gaim"
 msgstr "O programu Gaim"
 
-#: src/gtkdialogs.c:250
-msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, and Gadu-Gadu all at once.  It is written using GTK+.  You may modify and redistribute the program under the terms of the GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' file distributed with Gaim.  Gaim is copyrighted by its contributors.  See the 'COPYRIGHT' file for the complete list of contributors.  We provide no warranty for this program.<BR><BR>"
-msgstr "Gaim je modularen odjemalec za neposredna sporočila, ki lahko hkrati uporablja protokole AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr in Gadu-Gadu. Napisan je s pomočjo Gtk+. Program lahko spreminjate in razširjate pod pogoji licence GPL (različice 2 ali novejše).  Kopija GPL je v datoteki 'COPYING', ki je distribuirana s programom Gaim.  Gaim je zaščitena znamka svojih avtorjev.  Oglejte si datoteko 'COPYRIGHT' za popoln seznam sodelavcev.  Za program ni na voljo nikakršna garancija.<BR><BR>"
-
-#: src/gtkdialogs.c:264
+#: ../src/gtkdialogs.c:251
+msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, and Gadu-Gadu all at once.  It is written using GTK+.<BR><BR>You may modify and redistribute the program under the terms of the GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' file distributed with Gaim.  Gaim is copyrighted by its contributors.  See the 'COPYRIGHT' file for the complete list of contributors.  We provide no warranty for this program.<BR><BR>"
+msgstr "Gaim je modularen odjemalec za neposredna sporočila, ki lahko hkrati uporablja protokole AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr in Gadu-Gadu. Napisan je s pomočjo Gtk+.<BR><BR>Program lahko spreminjate in razširjate pod pogoji licence GPL (različice 2 ali novejše).  Kopija GPL je v datoteki 'COPYING', ki je distribuirana s programom Gaim.  Gaim je zaščitena znamka svojih avtorjev.  Oglejte si datoteko 'COPYRIGHT' za popoln seznam sodelavcev.  Za program ni na voljo nikakršna garancija.<BR><BR>"
+
+#: ../src/gtkdialogs.c:265
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim na irc.freenode.net<BR><BR>"
 
-#: src/gtkdialogs.c:267
+#: ../src/gtkdialogs.c:268
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim na irc.freenode.net<BR><BR>"
 
-#: src/gtkdialogs.c:273
+#: ../src/gtkdialogs.c:274
 msgid "Current Developers"
 msgstr "Trenutni razvijalci"
 
-#: src/gtkdialogs.c:288
+#: ../src/gtkdialogs.c:289
 msgid "Crazy Patch Writers"
 msgstr "Nori razvijalci obližev"
 
-#: src/gtkdialogs.c:303
+#: ../src/gtkdialogs.c:304
 msgid "Retired Developers"
 msgstr "Upokojeni razvijalci"
 
-#: src/gtkdialogs.c:318
+#: ../src/gtkdialogs.c:319
 msgid "Current Translators"
 msgstr "Trenutni prevajalci"
 
-#: src/gtkdialogs.c:338
+#: ../src/gtkdialogs.c:339
 msgid "Past Translators"
 msgstr "Nekdanji prevajalci"
 
-#: src/gtkdialogs.c:356
+#: ../src/gtkdialogs.c:357
 msgid "Debugging Information"
 msgstr "Informacije za razhroščevanje"
 
-#: src/gtkdialogs.c:552
-#: src/gtkdialogs.c:689
-#: src/gtkdialogs.c:756
+#: ../src/gtkdialogs.c:553
+#: ../src/gtkdialogs.c:690
+#: ../src/gtkdialogs.c:757
 msgid "_Name"
 msgstr "_Ime"
 
-#: src/gtkdialogs.c:557
-#: src/gtkdialogs.c:694
-#: src/gtkdialogs.c:761
+#: ../src/gtkdialogs.c:558
+#: ../src/gtkdialogs.c:695
+#: ../src/gtkdialogs.c:762
 msgid "_Account"
 msgstr "_Račun"
 
-#: src/gtkdialogs.c:565
+#: ../src/gtkdialogs.c:566
 msgid "New Instant Message"
 msgstr "Novo neposredno sporočilo"
 
-#: src/gtkdialogs.c:567
+#: ../src/gtkdialogs.c:568
 msgid "Please enter the screen name or alias of the person you would like to IM."
 msgstr "Vnesite vzdevek osebe, ki ji želite poslati neposredno sporočilo."
 
-#: src/gtkdialogs.c:702
+#: ../src/gtkdialogs.c:703
 msgid "Get User Info"
 msgstr "Informacije o uporabniku"
 
-#: src/gtkdialogs.c:704
+#: ../src/gtkdialogs.c:705
 msgid "Please enter the screen name or alias of the person whose info you would like to view."
 msgstr "Vnesite vzdevek osebe, o kateri si želite ogledati podatke."
 
-#: src/gtkdialogs.c:770
+#: ../src/gtkdialogs.c:771
 msgid "View User Log"
 msgstr "Prikaži uporabniški dnevnik"
 
-#: src/gtkdialogs.c:772
+#: ../src/gtkdialogs.c:773
 msgid "Please enter the screen name or alias of the person whose log you would like to view."
 msgstr "Vnesite vzdevek osebe, o kateri želite pridobiti dnevnik."
 
-#: src/gtkdialogs.c:791
+#: ../src/gtkdialogs.c:792
 msgid "Alias Contact"
 msgstr "Psevdonim stika"
 
-#: src/gtkdialogs.c:792
+#: ../src/gtkdialogs.c:793
 msgid "Enter an alias for this contact."
 msgstr "Vnesite psevdonim za ta pomenek."
 
-#: src/gtkdialogs.c:794
-#: src/gtkdialogs.c:816
-#: src/gtkdialogs.c:836
-#: src/gtkrequest.c:295
-#: src/protocols/silc/chat.c:586
+#: ../src/gtkdialogs.c:795
+#: ../src/gtkdialogs.c:817
+#: ../src/gtkdialogs.c:837
+#: ../src/gtkrequest.c:295
+#: ../src/protocols/silc/chat.c:586
 msgid "Alias"
 msgstr "Psevdonim"
 
-#: src/gtkdialogs.c:812
+#: ../src/gtkdialogs.c:813
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Vnesite psevdonim za %s."
 
-#: src/gtkdialogs.c:814
+#: ../src/gtkdialogs.c:815
 msgid "Alias Buddy"
 msgstr "Psevdonim prijatelja"
 
-#: src/gtkdialogs.c:833
+#: ../src/gtkdialogs.c:834
 msgid "Alias Chat"
 msgstr "Psevdonim pomenka"
 
-#: src/gtkdialogs.c:834
+#: ../src/gtkdialogs.c:835
 msgid "Enter an alias for this chat."
 msgstr "Vnesite psevdonim za ta pomenek."
 
-#: src/gtkdialogs.c:871
+#: ../src/gtkdialogs.c:872
 #, c-format
 msgid "You are about to remove the contact containing %s and %d other buddy from your buddy list.  Do you want to continue?"
 msgid_plural "You are about to remove the contact containing %s and %d other buddies from your buddy list.  Do you want to continue?"
@@ -3655,218 +3814,218 @@
 msgstr[2] "S seznama prijateljev boste odstranili stik, ki vsebuje %s in %d druga prijatelja. Ali želite nadaljevati?"
 msgstr[3] "S seznama prijateljev boste odstranili stik, ki vsebuje %s in %d druge prijatelje. Ali želite nadaljevati?"
 
-#: src/gtkdialogs.c:879
+#: ../src/gtkdialogs.c:880
 msgid "Remove Contact"
 msgstr "Odstrani stik"
 
-#: src/gtkdialogs.c:880
+#: ../src/gtkdialogs.c:881
 msgid "_Remove Contact"
 msgstr "_Odstrani stik"
 
-#: src/gtkdialogs.c:931
+#: ../src/gtkdialogs.c:932
 #, c-format
 msgid "You are about to remove the group %s and all its members from your buddy list.  Do you want to continue?"
 msgstr "S seznama prijateljev boste odstranili skupino %s. Ali želite nadaljevati?"
 
-#: src/gtkdialogs.c:934
+#: ../src/gtkdialogs.c:935
 msgid "Remove Group"
 msgstr "Odstrani skupino"
 
-#: src/gtkdialogs.c:935
+#: ../src/gtkdialogs.c:936
 msgid "_Remove Group"
 msgstr "_Odstrani skupino"
 
-#: src/gtkdialogs.c:968
+#: ../src/gtkdialogs.c:969
 #, c-format
 msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Odstranili boste %s s seznama prijateljev. Ali želite nadaljevati?"
 
-#: src/gtkdialogs.c:971
+#: ../src/gtkdialogs.c:972
 msgid "Remove Buddy"
 msgstr "Odstrani prijatelja"
 
-#: src/gtkdialogs.c:972
+#: ../src/gtkdialogs.c:973
 msgid "_Remove Buddy"
 msgstr "_Odstrani prijatelja"
 
-#: src/gtkdialogs.c:993
+#: ../src/gtkdialogs.c:994
 #, c-format
 msgid "You are about to remove the chat %s from your buddy list.  Do you want to continue?"
 msgstr "S seznama prijateljev boste odstranili pomenek %s. Ali želite nadaljevati?"
 
-#: src/gtkdialogs.c:996
+#: ../src/gtkdialogs.c:997
 msgid "Remove Chat"
 msgstr "Odstrani pomenek"
 
-#: src/gtkdialogs.c:997
+#: ../src/gtkdialogs.c:998
 msgid "_Remove Chat"
 msgstr "_Odstrani pomenek"
 
-#: src/gtkft.c:139
+#: ../src/gtkft.c:139
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:160
-#: src/gtkft.c:1063
+#: ../src/gtkft.c:160
+#: ../src/gtkft.c:1063
 msgid "Finished"
 msgstr "Končano"
 
-#: src/gtkft.c:163
-#: src/gtkft.c:1003
+#: ../src/gtkft.c:163
+#: ../src/gtkft.c:1003
 msgid "Canceled"
 msgstr "Preklicano"
 
-#: src/gtkft.c:166
-#: src/gtkft.c:922
+#: ../src/gtkft.c:166
+#: ../src/gtkft.c:922
 msgid "Waiting for transfer to begin"
 msgstr "Čakanje na začetek prenosa"
 
-#: src/gtkft.c:219
+#: ../src/gtkft.c:219
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Sprejemam kot:</b>"
 
-#: src/gtkft.c:221
+#: ../src/gtkft.c:221
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Sprejemam od:</b>"
 
-#: src/gtkft.c:225
+#: ../src/gtkft.c:225
 msgid "<b>Sending To:</b>"
 msgstr "<b>Pošiljam k:</b>"
 
-#: src/gtkft.c:227
+#: ../src/gtkft.c:227
 msgid "<b>Sending As:</b>"
 msgstr "<b>Pošiljam kot:</b>"
 
-#: src/gtkft.c:443
+#: ../src/gtkft.c:443
 msgid "There is no application configured to open this type of file."
 msgstr "Za odpiranje datotek te vrste ni nastavljen noben program."
 
-#: src/gtkft.c:448
+#: ../src/gtkft.c:448
 msgid "An error occurred while opening the file."
 msgstr "Med odpiranjem datoteke je prišlo do napake."
 
-#: src/gtkft.c:485
+#: ../src/gtkft.c:485
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "Napaka pri zagonu %s: %s"
 
-#: src/gtkft.c:494
+#: ../src/gtkft.c:494
 #, c-format
 msgid "Error running %s"
 msgstr "Napaka pri uporabi %s"
 
-#: src/gtkft.c:495
+#: ../src/gtkft.c:495
 #, c-format
 msgid "Process returned error code %d"
 msgstr "Proces je vrnil kodo napake %d"
 
-#: src/gtkft.c:589
+#: ../src/gtkft.c:589
 msgid "Progress"
 msgstr "Potek"
 
-#: src/gtkft.c:596
+#: ../src/gtkft.c:596
 msgid "Filename"
 msgstr "Datoteka"
 
-#: src/gtkft.c:603
+#: ../src/gtkft.c:603
 msgid "Size"
 msgstr "Velikost"
 
-#: src/gtkft.c:610
+#: ../src/gtkft.c:610
 msgid "Remaining"
 msgstr "Preostanek"
 
-#: src/gtkft.c:641
+#: ../src/gtkft.c:641
 msgid "Filename:"
 msgstr "Datoteka:"
 
-#: src/gtkft.c:642
+#: ../src/gtkft.c:642
 msgid "Local File:"
 msgstr "Lokalna datoteka:"
 
-#: src/gtkft.c:643
+#: ../src/gtkft.c:643
 msgid "Status:"
 msgstr "Stanje:"
 
-#: src/gtkft.c:644
+#: ../src/gtkft.c:644
 msgid "Speed:"
 msgstr "Hitrost:"
 
-#: src/gtkft.c:645
+#: ../src/gtkft.c:645
 msgid "Time Elapsed:"
 msgstr "Porabljen čas:"
 
-#: src/gtkft.c:646
+#: ../src/gtkft.c:646
 msgid "Time Remaining:"
 msgstr "Preostali čas:"
 
-#: src/gtkft.c:708
-#: src/protocols/oscar/oscar.c:8570
+#: ../src/gtkft.c:708
+#: ../src/protocols/oscar/oscar.c:8546
 msgid "File Transfers"
 msgstr "Prenosi datotek"
 
-#: src/gtkft.c:731
+#: ../src/gtkft.c:731
 msgid "Close this window when all transfers _finish"
 msgstr "Zapri to okno po zaključku _vseh prenosov"
 
-#: src/gtkft.c:741
+#: ../src/gtkft.c:741
 msgid "C_lear finished transfers"
 msgstr "_Počisti dokončane prenose"
 
 #. "Download Details" arrow
-#: src/gtkft.c:750
+#: ../src/gtkft.c:750
 msgid "File transfer _details"
 msgstr "Po_drobnosti o prenosu"
 
 #. Pause button
-#: src/gtkft.c:780
-#: src/gtkstock.c:147
+#: ../src/gtkft.c:780
+#: ../src/gtkstock.c:146
 msgid "_Pause"
 msgstr "_Premor"
 
 #. Resume button
-#: src/gtkft.c:790
+#: ../src/gtkft.c:790
 msgid "_Resume"
 msgstr "_Nadaljuj"
 
-#: src/gtkft.c:1005
+#: ../src/gtkft.c:1005
 msgid "Failed"
 msgstr "Neuspeh"
 
-#: src/gtkimhtml.c:818
+#: ../src/gtkimhtml.c:818
 msgid "Paste as Plain _Text"
 msgstr "Prilepi kot navadno be_sedilo"
 
-#: src/gtkimhtml.c:1316
+#: ../src/gtkimhtml.c:1316
 msgid "Hyperlink color"
 msgstr "Barva povezave"
 
-#: src/gtkimhtml.c:1317
+#: ../src/gtkimhtml.c:1317
 msgid "Color to draw hyperlinks."
 msgstr "Barva za risanje povezav."
 
-#: src/gtkimhtml.c:1320
+#: ../src/gtkimhtml.c:1320
 msgid "Hyperlink prelight color"
 msgstr "Barva presvetljene povezave"
 
-#: src/gtkimhtml.c:1321
+#: ../src/gtkimhtml.c:1321
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Barva za risanje povezav, ko je nad njimi miška."
 
-#: src/gtkimhtml.c:1542
+#: ../src/gtkimhtml.c:1542
 msgid "_Copy E-Mail Address"
 msgstr "_Kopiraj naslov e-pošte"
 
-#: src/gtkimhtml.c:1554
+#: ../src/gtkimhtml.c:1554
 msgid "_Open Link in Browser"
 msgstr "_Odpri povezavo v brskalniku"
 
-#: src/gtkimhtml.c:1564
+#: ../src/gtkimhtml.c:1564
 msgid "_Copy Link Location"
 msgstr "_Kopiraj lokacijo povezave"
 
-#: src/gtkimhtml.c:3263
+#: ../src/gtkimhtml.c:3261
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -3876,7 +4035,7 @@
 "\n"
 "Uporabljena bo privzeta vrednost PNG."
 
-#: src/gtkimhtml.c:3266
+#: ../src/gtkimhtml.c:3264
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -3886,7 +4045,7 @@
 "\n"
 "Uporabljena bo privzeta vrednost PNG."
 
-#: src/gtkimhtml.c:3279
+#: ../src/gtkimhtml.c:3277
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -3897,7 +4056,7 @@
 "\n"
 "%s"
 
-#: src/gtkimhtml.c:3282
+#: ../src/gtkimhtml.c:3280
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -3908,165 +4067,169 @@
 "\n"
 "%s"
 
-#: src/gtkimhtml.c:3362
-#: src/gtkimhtml.c:3374
+#: ../src/gtkimhtml.c:3360
+#: ../src/gtkimhtml.c:3372
 msgid "Save Image"
 msgstr "Shrani sliko"
 
-#: src/gtkimhtml.c:3402
+#: ../src/gtkimhtml.c:3400
 msgid "_Save Image..."
 msgstr "_Shrani sliko ..."
 
-#: src/gtkimhtmltoolbar.c:147
+#: ../src/gtkimhtmltoolbar.c:147
 msgid "Select Font"
 msgstr "Nastavi pisavo"
 
-#: src/gtkimhtmltoolbar.c:226
+#: ../src/gtkimhtmltoolbar.c:226
 msgid "Select Text Color"
 msgstr "Nastavi barvo besedila"
 
-#: src/gtkimhtmltoolbar.c:305
+#: ../src/gtkimhtmltoolbar.c:305
 msgid "Select Background Color"
 msgstr "Nastavi barvo ozadja"
 
-#: src/gtkimhtmltoolbar.c:394
+#: ../src/gtkimhtmltoolbar.c:394
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:402
+#: ../src/gtkimhtmltoolbar.c:402
 msgid "_Description"
 msgstr "_Opis"
 
-#: src/gtkimhtmltoolbar.c:405
+#: ../src/gtkimhtmltoolbar.c:405
 msgid "Please enter the URL and description of the link that you want to insert. The description is optional."
 msgstr "Vnesite URL in opis povezave, ki jo želite vstaviti. Opis ni obvezen."
 
-#: src/gtkimhtmltoolbar.c:409
+#: ../src/gtkimhtmltoolbar.c:409
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Vnesite URL povezave, ki jo želite vstaviti."
 
-#: src/gtkimhtmltoolbar.c:414
+#: ../src/gtkimhtmltoolbar.c:414
 msgid "Insert Link"
 msgstr "Vstavi povezavo"
 
-#: src/gtkimhtmltoolbar.c:418
+#: ../src/gtkimhtmltoolbar.c:418
 msgid "_Insert"
 msgstr "_Vstavi"
 
-#: src/gtkimhtmltoolbar.c:487
+#: ../src/gtkimhtmltoolbar.c:487
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Slike: %s ni mogoče shraniti.\n"
 
-#: src/gtkimhtmltoolbar.c:513
-#: src/gtkimhtmltoolbar.c:523
+#: ../src/gtkimhtmltoolbar.c:513
+#: ../src/gtkimhtmltoolbar.c:523
 msgid "Insert Image"
 msgstr "Vstavi sliko"
 
-#: src/gtkimhtmltoolbar.c:721
+#: ../src/gtkimhtmltoolbar.c:721
 msgid "This theme has no available smileys."
 msgstr "Ta tema nima smeškov."
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:735
+#: ../src/gtkimhtmltoolbar.c:735
 msgid "Smile!"
 msgstr "Nasmeh!"
 
-#: src/gtkimhtmltoolbar.c:923
+#: ../src/gtkimhtmltoolbar.c:923
 msgid "Bold"
 msgstr "Krepko"
 
-#: src/gtkimhtmltoolbar.c:934
+#: ../src/gtkimhtmltoolbar.c:934
 msgid "Italic"
 msgstr "Ležeče"
 
-#: src/gtkimhtmltoolbar.c:945
+#: ../src/gtkimhtmltoolbar.c:945
 msgid "Underline"
 msgstr "Podčrtano"
 
-#: src/gtkimhtmltoolbar.c:961
+#: ../src/gtkimhtmltoolbar.c:961
 msgid "Larger font size"
 msgstr "Povečaj pisavo"
 
-#: src/gtkimhtmltoolbar.c:973
+#: ../src/gtkimhtmltoolbar.c:973
 msgid "Smaller font size"
 msgstr "Manjša pisava"
 
-#: src/gtkimhtmltoolbar.c:990
+#: ../src/gtkimhtmltoolbar.c:990
 msgid "Font Face"
 msgstr "Tip pisave"
 
-#: src/gtkimhtmltoolbar.c:1002
+#: ../src/gtkimhtmltoolbar.c:1002
 msgid "Foreground font color"
 msgstr "Barva pisave"
 
-#: src/gtkimhtmltoolbar.c:1030
+#: ../src/gtkimhtmltoolbar.c:1030
 msgid "Clear formatting"
 msgstr "Počisti oblikovanje"
 
-#: src/gtkimhtmltoolbar.c:1045
+#: ../src/gtkimhtmltoolbar.c:1045
 msgid "Insert link"
 msgstr "Vstavi povezavo"
 
-#: src/gtkimhtmltoolbar.c:1055
+#: ../src/gtkimhtmltoolbar.c:1055
 msgid "Insert image"
 msgstr "Vstavi sliko"
 
-#: src/gtkimhtmltoolbar.c:1066
+#: ../src/gtkimhtmltoolbar.c:1066
 msgid "Insert smiley"
 msgstr "Vstavi smeškota"
 
-#: src/gtklog.c:214
-#, c-format
-msgid "Conversation in %s on %s"
-msgstr "Pomenki v %s o %s"
-
-#: src/gtklog.c:216
-#, c-format
-msgid "Conversation with %s on %s"
-msgstr "Pomenki z %s o %s"
-
-#: src/gtklog.c:329
+#: ../src/gtklog.c:202
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Pogovor s/z %s o %s</span>"
+
+#: ../src/gtklog.c:207
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Pogovor s/z %s glede %s</span>"
+
+#: ../src/gtklog.c:258
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: ../src/gtklog.c:311
 msgid "System events will only be logged if the \"Log all status changes to system log\" preference is enabled."
 msgstr "Sistemski dogodki bodo shranjeni, le če bo nastavljena možnost \"Omogoči sistemski dnevnik\"."
 
-#: src/gtklog.c:333
+#: ../src/gtklog.c:315
 msgid "Instant messages will only be logged if the \"Log all instant messages\" preference is enabled."
 msgstr "Neposredna sporočila se bodo shranila, le če bo okljukana možnost \"Shranjuj vsa neposredna sporočila\"."
 
-#: src/gtklog.c:336
+#: ../src/gtklog.c:318
 msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr "Pomenki bodo shranjeni v dnevnik, ko je okljukana možnost \"Shranjuj vse pomenke\"."
 
-#: src/gtklog.c:340
+#: ../src/gtklog.c:322
 msgid "No logs were found"
 msgstr "Ni najdenih dnevnikov."
 
-#: src/gtklog.c:416
+#: ../src/gtklog.c:398
 msgid "Total log size:"
 msgstr "Skupna velikost dnevnika:"
 
-#: src/gtklog.c:492
+#: ../src/gtklog.c:474
 #, c-format
 msgid "Conversations in %s"
 msgstr "Pomenki v %s"
 
-#: src/gtklog.c:500
-#: src/gtklog.c:551
+#: ../src/gtklog.c:482
+#: ../src/gtklog.c:533
 #, c-format
 msgid "Conversations with %s"
 msgstr "Pomenki z %s"
 
-#: src/gtklog.c:576
+#: ../src/gtklog.c:558
 msgid "System Log"
 msgstr "Sistemski dnevnik"
 
-#: src/gtkmain.c:319
+#: ../src/gtkmain.c:312
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. Poskusi '%s -h' za več informacij.\n"
 
-#: src/gtkmain.c:321
+#: ../src/gtkmain.c:314
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4091,110 +4254,100 @@
 "                     določa račun(e) za prijavo, ločene z vejico)\n"
 "  -v, --version       izpiši trenutno različico in končaj program\n"
 
-#: src/gtkmain.c:498
+#: ../src/gtkmain.c:497
+#, c-format
 msgid ""
 "Gaim has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
 "no fault of your own.\n"
 "\n"
-"It is possible that this bug is already fixed in CVS.\n"
 "If you can reproduce the crash, please notify the gaim\n"
 "developers by reporting a bug at\n"
-msgstr ""
-"Gaim se je sesul in poskusil izvreči datoteko core.\n"
-"To je povzročil hrošč v programski opremi in zgodilo\n"
-"se je brez vaše krivde.\n"
-"\n"
-"Možno je, da je ta hrošč v CVS že odpravljen.\n"
-"Če lahko ponovite sesutje, prosimo, obvestite\n"
-"razvijalce gaima s poročilom o hrošču na naslovu\n"
-
-#: src/gtkmain.c:504
-msgid ""
-"bug.php\n"
+"%sbug.php\n"
 "\n"
 "Please make sure to specify what you were doing at the time\n"
 "and post the backtrace from the core file.  If you do not know\n"
 "how to get the backtrace, please read the instructions at\n"
+"%sgdb.php\n"
+"\n"
+"If you need further assistance, please IM either SeanEgn or \n"
+"LSchiere (via AIM).  Contact information for Sean and Luke \n"
+"on other protocols is at\n"
+"%scontactinfo.php\n"
 msgstr ""
-"bug.php\n"
+"Program Gaim se je sesul in pri tem shranil pomnilniški izmet.\n"
+"Gre za hrošča v programski opremi in za to niste krivi vi.\n"
 "\n"
-"Preverite, da ste navedli, kaj ste počeli takrat\n"
-"in da ste oddali obratno sled (\"backtrace\") iz datoteke core.\n"
-"Če ne znate pridobiti obratne sledi, si preberite navodila na naslovu\n"
-
-#: src/gtkmain.c:508
-msgid ""
-"gdb.php.  If you need further\n"
-"assistance, please IM either SeanEgn or LSchiere (via AIM).\n"
-"Contact information for Sean and Luke on other protocols is at\n"
-msgstr ""
-"gdb.php.  Če potrebujete dodatno\n"
-"podporo, pošljite neposredno sporočilo na naslov SeanEgn ali LSchiere (prek AIM).\n"
-"Informacije o stikih za Seana in Luka prek drugih protokolov so na naslovu\n"
-
-#: src/gtkmain.c:511
-msgid "contactinfo.php.\n"
-msgstr "contactinfo.php.\n"
-
-#: src/gtkmedia.c:52
+"Če lahko ponovite korake, ki privedejo do sesutja, prosimo,\n"
+"obvestite razvijalce gaima s poročilom o hrošču na naslovu\n"
+"%sbug.php\n"
+"\n"
+"Ne pozabite navesti, kaj ste takrat počeli,\n"
+"objavite tudi izsledek iz datoteke pomnilniškega izmeta (core).\n"
+"Če ne veste, kako pridobiti izsledek, si preberite navodila na naslovu\n"
+"%sgdb.php.  Če potrebujete dodatno pomoč,\n"
+"to neposredno sporočite SeanEgn ali LSchiere (prek AIM).\n"
+"Podatki za stik z Seanom in Lukom prek drugih protokolov so na\n"
+"%scontactinfo.php.\n"
+
+#: ../src/gtkmedia.c:52
 msgid "Call ended."
 msgstr "Klic končan."
 
-#: src/gtkmedia.c:69
+#: ../src/gtkmedia.c:69
 #, c-format
 msgid "Calling %s"
 msgstr "Klicanje %s"
 
-#: src/gtkmedia.c:73
-#: src/gtkmedia.c:108
+#: ../src/gtkmedia.c:73
+#: ../src/gtkmedia.c:108
 msgid "End Call"
 msgstr "Končaj klic"
 
-#: src/gtkmedia.c:81
+#: ../src/gtkmedia.c:81
 #, c-format
 msgid "Receiving call from %s"
 msgstr "Sprejemanje klica od %s"
 
-#: src/gtkmedia.c:89
+#: ../src/gtkmedia.c:89
 msgid "Reject Call"
 msgstr "Zavrni klic"
 
-#: src/gtkmedia.c:95
+#: ../src/gtkmedia.c:95
 msgid "Accept call"
 msgstr "Sprejmi klic"
 
-#: src/gtkmedia.c:102
+#: ../src/gtkmedia.c:102
 #, c-format
 msgid "Connected to %s"
 msgstr "Povezani s/z %s"
 
-#: src/gtkmedia.c:113
+#: ../src/gtkmedia.c:113
 msgid "_Mute"
 msgstr "Ne_mo"
 
-#: src/gtknotify.c:305
+#: ../src/gtknotify.c:305
 msgid "New Mail"
 msgstr "Nova e-pošta"
 
-#: src/gtknotify.c:321
+#: ../src/gtknotify.c:321
 msgid "Open All Messages"
 msgstr "Odpri vsa sporočila"
 
-#: src/gtknotify.c:382
-#: src/protocols/jabber/jabber.c:1028
+#: ../src/gtknotify.c:382
+#: ../src/protocols/jabber/jabber.c:1118
 msgid "From"
 msgstr "Od"
 
-#: src/gtknotify.c:390
+#: ../src/gtknotify.c:390
 msgid "Subject"
 msgstr "Zadeva"
 
-#: src/gtknotify.c:399
+#: ../src/gtknotify.c:399
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Dobili ste pošto!</span>"
 
-#: src/gtknotify.c:455
+#: ../src/gtknotify.c:451
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -4203,7 +4356,7 @@
 msgstr[2] "%s ima %d novi sporočili."
 msgstr[3] "%s ima %d nova sporočila."
 
-#: src/gtknotify.c:460
+#: ../src/gtknotify.c:456
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -4214,57 +4367,57 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:645
-#: src/protocols/sametime/sametime.c:5340
+#: ../src/gtknotify.c:643
+#: ../src/protocols/sametime/sametime.c:5460
 msgid "Search Results"
 msgstr "Rezultati iskanja"
 
-#: src/gtknotify.c:801
-#: src/protocols/oscar/oscar.c:4963
+#: ../src/gtknotify.c:799
+#: ../src/protocols/oscar/oscar.c:4996
 #, c-format
 msgid "Info for %s"
 msgstr "Podatki za %s"
 
-#: src/gtknotify.c:802
-#: src/protocols/toc/toc.c:470
+#: ../src/gtknotify.c:800
+#: ../src/protocols/toc/toc.c:470
 msgid "Buddy Information"
 msgstr "Informacije o prijatelju"
 
-#: src/gtknotify.c:842
+#: ../src/gtknotify.c:840
 #, c-format
 msgid "The browser command <b>%s</b> is invalid."
 msgstr "Ukaz brskalnika <b>%s</b> ni veljaven."
 
-#: src/gtknotify.c:844
-#: src/gtknotify.c:856
-#: src/gtknotify.c:869
-#: src/gtknotify.c:994
+#: ../src/gtknotify.c:842
+#: ../src/gtknotify.c:854
+#: ../src/gtknotify.c:867
+#: ../src/gtknotify.c:992
 msgid "Unable to open URL"
 msgstr "Ni bilo mogoče odprti URL"
 
-#: src/gtknotify.c:854
-#: src/gtknotify.c:867
+#: ../src/gtknotify.c:852
+#: ../src/gtknotify.c:865
 #, c-format
 msgid "Error launching <b>%s</b>: %s"
 msgstr "Napaka pri zaganjanju <b>%s</b>: %s"
 
-#: src/gtknotify.c:995
+#: ../src/gtknotify.c:993
 msgid "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Vašega brskalnika ni bilo mogoče zagnati, ker ste v nastavitvah izbrali poljuben brskalnik, a niste nastavili ukaza."
 
-#: src/gtkplugin.c:275
+#: ../src/gtkplugin.c:275
 msgid "The following plugins will be unloaded."
 msgstr "Odloženi bodo naslednji vstavki."
 
-#: src/gtkplugin.c:294
+#: ../src/gtkplugin.c:294
 msgid "Multiple plugins will be unloaded."
 msgstr "Odloženih bo več vstavkov."
 
-#: src/gtkplugin.c:296
+#: ../src/gtkplugin.c:296
 msgid "Unload Plugins"
 msgstr "Odloži vstavke"
 
-#: src/gtkplugin.c:410
+#: ../src/gtkplugin.c:410
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -4275,7 +4428,7 @@
 "<span weight=\"bold\">Spletna stran:</span>\t\t%s\n"
 "<span weight=\"bold\">Ime datoteke:</span>\t\t%s"
 
-#: src/gtkplugin.c:420
+#: ../src/gtkplugin.c:420
 #, c-format
 msgid ""
 "%s\n"
@@ -4286,412 +4439,412 @@
 "<span foreground=\"#ff0000\" weight=\"bold\">Napaka: %s\n"
 "Preverite spletno stran vstavka za posodobitev.</span>"
 
-#: src/gtkplugin.c:546
+#: ../src/gtkplugin.c:546
 msgid "Configure Pl_ugin"
 msgstr "_Nastavi vstavek"
 
-#: src/gtkplugin.c:604
+#: ../src/gtkplugin.c:604
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Podrobnosti o vstavku</b>"
 
-#: src/gtkpounce.c:162
+#: ../src/gtkpounce.c:162
 msgid "Select a file"
 msgstr "Izberi datoteko"
 
-#: src/gtkpounce.c:260
+#: ../src/gtkpounce.c:259
 msgid "Please enter a buddy to pounce."
 msgstr "Vnesite opozorilo prijatelja."
 
-#: src/gtkpounce.c:504
+#: ../src/gtkpounce.c:503
 msgid "New Buddy Pounce"
 msgstr "Novo opozorilo prijatelja"
 
-#: src/gtkpounce.c:504
+#: ../src/gtkpounce.c:503
 msgid "Edit Buddy Pounce"
 msgstr "Uredi opozorilo prijatelja"
 
 #. Create the "Pounce on Whom" frame.
-#: src/gtkpounce.c:521
+#: ../src/gtkpounce.c:520
 msgid "Pounce on Whom"
 msgstr "Opozori koga"
 
-#: src/gtkpounce.c:548
+#: ../src/gtkpounce.c:547
 msgid "_Buddy name:"
 msgstr "_Ime prijatelja:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: src/gtkpounce.c:572
+#: ../src/gtkpounce.c:571
 msgid "Pounce When Buddy..."
 msgstr "Opozori, ko se prijatelj ..."
 
-#: src/gtkpounce.c:580
+#: ../src/gtkpounce.c:579
 msgid "Si_gns on"
 msgstr "_prijavi"
 
-#: src/gtkpounce.c:582
+#: ../src/gtkpounce.c:581
 msgid "Signs o_ff"
 msgstr "_odjavi"
 
-#: src/gtkpounce.c:584
+#: ../src/gtkpounce.c:583
 msgid "Goes a_way"
 msgstr "postane od_soten"
 
-#: src/gtkpounce.c:586
+#: ../src/gtkpounce.c:585
 msgid "Ret_urns from away"
 msgstr "_vrne"
 
-#: src/gtkpounce.c:588
+#: ../src/gtkpounce.c:587
 msgid "Becomes _idle"
 msgstr "postane _nedejaven"
 
-#: src/gtkpounce.c:590
+#: ../src/gtkpounce.c:589
 msgid "Is no longer i_dle"
 msgstr "ni ve_č nedejaven."
 
-#: src/gtkpounce.c:592
+#: ../src/gtkpounce.c:591
 msgid "Starts _typing"
 msgstr "začne _tipkati"
 
-#: src/gtkpounce.c:594
+#: ../src/gtkpounce.c:593
 msgid "Stops t_yping"
 msgstr "_preneha tipkati"
 
-#: src/gtkpounce.c:596
+#: ../src/gtkpounce.c:595
 msgid "Sends a _message"
 msgstr "Pošlje spo_ročilo"
 
 #. Create the "Action" frame.
-#: src/gtkpounce.c:628
+#: ../src/gtkpounce.c:627
 msgid "Action"
 msgstr "Dejanje"
 
-#: src/gtkpounce.c:636
+#: ../src/gtkpounce.c:635
 msgid "Ope_n an IM window"
 msgstr "Odpri no_vo sporočilno okno"
 
-#: src/gtkpounce.c:638
+#: ../src/gtkpounce.c:637
 msgid "_Pop up a notification"
 msgstr "_Prikaži obvestilo"
 
-#: src/gtkpounce.c:640
+#: ../src/gtkpounce.c:639
 msgid "Send a _message"
 msgstr "Pošlji spo_ročilo"
 
-#: src/gtkpounce.c:642
+#: ../src/gtkpounce.c:641
 msgid "E_xecute a command"
 msgstr "Izvr_ši ukaz"
 
-#: src/gtkpounce.c:644
+#: ../src/gtkpounce.c:643
 msgid "P_lay a sound"
 msgstr "Pre_dvajaj zvok"
 
-#: src/gtkpounce.c:649
+#: ../src/gtkpounce.c:648
 msgid "Brows_e..."
 msgstr "Pre_rskaj ..."
 
-#: src/gtkpounce.c:651
+#: ../src/gtkpounce.c:650
 msgid "Br_owse..."
 msgstr "Preb_rskaj ..."
 
-#: src/gtkpounce.c:652
+#: ../src/gtkpounce.c:651
 msgid "Pre_view"
 msgstr "Pred_ogled"
 
 #. Create the "Options" frame.
-#: src/gtkpounce.c:764
+#: ../src/gtkpounce.c:763
 msgid "Options"
 msgstr "Možnosti"
 
-#: src/gtkpounce.c:772
+#: ../src/gtkpounce.c:771
 msgid "P_ounce only when my status is not available"
 msgstr "_Opozori le tedaj, ko moje stanje ni na voljo"
 
-#: src/gtkpounce.c:777
+#: ../src/gtkpounce.c:776
 msgid "_Recurring"
 msgstr "Ponavl_jajoč"
 
-#: src/gtkpounce.c:1090
+#: ../src/gtkpounce.c:1090
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Ste prepričani, da želite izbrisati obvestilo o %s za %s?"
 
-#: src/gtkpounce.c:1238
+#: ../src/gtkpounce.c:1238
 msgid "Pounce Target"
 msgstr "Tarča opozorila"
 
-#: src/gtkpounce.c:1273
+#: ../src/gtkpounce.c:1273
 msgid "Recurring"
 msgstr "Ponavljajoč"
 
-#: src/gtkpounce.c:1320
+#: ../src/gtkpounce.c:1320
 msgid "Buddy Pounces"
 msgstr "Opozorila prijatelja"
 
-#: src/gtkpounce.c:1449
+#: ../src/gtkpounce.c:1447
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s vam (%s) je začel pisati"
 
-#: src/gtkpounce.c:1451
+#: ../src/gtkpounce.c:1449
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s se je prijavil na (%s)"
 
-#: src/gtkpounce.c:1453
+#: ../src/gtkpounce.c:1451
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s je spet dejaven (%s)"
 
-#: src/gtkpounce.c:1455
+#: ../src/gtkpounce.c:1453
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s se je vrnil (%s)"
 
-#: src/gtkpounce.c:1457
+#: ../src/gtkpounce.c:1455
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s vam (%s) je prenehal pisati"
 
-#: src/gtkpounce.c:1459
+#: ../src/gtkpounce.c:1457
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s se je odjavil (%s)"
 
-#: src/gtkpounce.c:1461
+#: ../src/gtkpounce.c:1459
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s je postal nedejaven (%s)"
 
-#: src/gtkpounce.c:1463
+#: ../src/gtkpounce.c:1461
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s je postal odsoten. (%s)"
 
-#: src/gtkpounce.c:1465
+#: ../src/gtkpounce.c:1463
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "Uporabnik %s vam je poslal sporočilo. (%s)"
 
-#: src/gtkpounce.c:1466
+#: ../src/gtkpounce.c:1464
 msgid "Unknown pounce event. Please report this!"
 msgstr "Neznan dogodek opozorila. Poročajte o tem!"
 
-#: src/gtkprefs.c:512
+#: ../src/gtkprefs.c:512
 msgid "Smiley theme failed to unpack."
 msgstr "Teme nasmeškov ni mogoče razpakirati."
 
-#: src/gtkprefs.c:631
+#: ../src/gtkprefs.c:638
 msgid "Select a smiley theme that you would like to use from the list below. New themes can be installed by dragging and dropping them onto the theme list."
 msgstr "S spodnjega seznama izberite vrsto smeškov, ki jih želite uporabljati. Nove teme lahko namestite, če jih povlečete in spustite na seznam."
 
-#: src/gtkprefs.c:666
+#: ../src/gtkprefs.c:673
 msgid "Icon"
 msgstr "Ikona"
 
-#: src/gtkprefs.c:673
-#: src/protocols/jabber/buddy.c:267
-#: src/protocols/jabber/buddy.c:818
-#: src/protocols/jabber/chat.c:769
+#: ../src/gtkprefs.c:680
+#: ../src/protocols/jabber/buddy.c:267
+#: ../src/protocols/jabber/buddy.c:818
+#: ../src/protocols/jabber/chat.c:769
 msgid "Description"
 msgstr "Opis"
 
-#: src/gtkprefs.c:814
+#: ../src/gtkprefs.c:821
 msgid "_Hide new IM conversations"
 msgstr "Skrij nove po_govore IM"
 
-#: src/gtkprefs.c:817
-#: src/gtkprefs.c:1753
+#: ../src/gtkprefs.c:824
+#: ../src/gtkprefs.c:1764
 msgid "When away"
 msgstr "ob odsotnosti"
 
-#: src/gtkprefs.c:821
+#: ../src/gtkprefs.c:828
 msgid "Send unknown \"_slash\" commands as messages"
 msgstr "Pošlji neznane ukaze \"_slash\" kot sporočila"
 
-#: src/gtkprefs.c:823
+#: ../src/gtkprefs.c:830
 msgid "Show _formatting on incoming messages"
 msgstr "Prikaži _oblikovanje v dohodnih sporočilih"
 
-#: src/gtkprefs.c:826
+#: ../src/gtkprefs.c:833
 msgid "Show buddy _icons"
 msgstr "Prikaži _ikone"
 
-#: src/gtkprefs.c:828
+#: ../src/gtkprefs.c:835
 msgid "Enable buddy ic_on animation"
 msgstr "_Omogoči animacijo ikon prijateljev"
 
-#: src/gtkprefs.c:835
+#: ../src/gtkprefs.c:842
 msgid "_Notify buddies that you are typing to them"
 msgstr "O_bvesti prijatelje, da jim pišem"
 
-#: src/gtkprefs.c:838
+#: ../src/gtkprefs.c:845
 msgid "Highlight _misspelled words"
 msgstr "_Obarvaj nepravilno črkovane besede"
 
-#: src/gtkprefs.c:842
+#: ../src/gtkprefs.c:849
 msgid "Use smooth-scrolling"
 msgstr "Uporabi animirano drsenje"
 
-#: src/gtkprefs.c:858
+#: ../src/gtkprefs.c:865
 msgid "This is how your outgoing message text will appear when you use protocols that support formatting. :)"
 msgstr "Tako bo izgledalo besedilo vašega odhodnega sporočila, če uporabljate protokole, ki podpirajo oblikovanje. :)"
 
 #. All the tab options!
-#: src/gtkprefs.c:880
+#: ../src/gtkprefs.c:887
 msgid "Tab Options"
 msgstr "Možnosti zavihkov"
 
-#: src/gtkprefs.c:882
+#: ../src/gtkprefs.c:889
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Prikaži pogovore v _oknih z zavihki"
 
-#: src/gtkprefs.c:896
+#: ../src/gtkprefs.c:903
 msgid "Show close b_utton on tabs"
 msgstr "Pokaži _gumb 'Zapri' na zavihkih"
 
-#: src/gtkprefs.c:902
+#: ../src/gtkprefs.c:909
 msgid "_Placement:"
 msgstr "_Postavitev"
 
-#: src/gtkprefs.c:904
+#: ../src/gtkprefs.c:911
 msgid "Top"
 msgstr "zgoraj"
 
-#: src/gtkprefs.c:905
+#: ../src/gtkprefs.c:912
 msgid "Bottom"
 msgstr "spodaj"
 
-#: src/gtkprefs.c:906
+#: ../src/gtkprefs.c:913
 msgid "Left"
 msgstr "na levi"
 
-#: src/gtkprefs.c:907
+#: ../src/gtkprefs.c:914
 msgid "Right"
 msgstr "na desni"
 
-#: src/gtkprefs.c:909
+#: ../src/gtkprefs.c:916
 msgid "Left Vertical"
 msgstr "levo navpično"
 
-#: src/gtkprefs.c:910
+#: ../src/gtkprefs.c:917
 msgid "Right Vertical"
 msgstr "desno navpično"
 
-#: src/gtkprefs.c:915
+#: ../src/gtkprefs.c:922
 msgid "N_ew conversations:"
 msgstr "N_ovi pogovori:"
 
-#: src/gtkprefs.c:966
-#: src/protocols/oscar/oscar.c:802
-#: src/protocols/oscar/oscar.c:6129
+#: ../src/gtkprefs.c:973
+#: ../src/protocols/oscar/oscar.c:805
+#: ../src/protocols/oscar/oscar.c:6107
 msgid "IP Address"
 msgstr "Naslov IP"
 
-#: src/gtkprefs.c:968
+#: ../src/gtkprefs.c:975
 msgid "ST_UN server:"
 msgstr "Strežnik ST_UN:"
 
-#: src/gtkprefs.c:970
+#: ../src/gtkprefs.c:977
 msgid "_Autodetect IP address"
 msgstr "_Samozaznaj naslov IP"
 
-#: src/gtkprefs.c:979
+#: ../src/gtkprefs.c:986
 msgid "Public _IP:"
 msgstr "Javen _IP:"
 
-#: src/gtkprefs.c:1003
+#: ../src/gtkprefs.c:1014
 msgid "Ports"
 msgstr "Vrata"
 
-#: src/gtkprefs.c:1006
+#: ../src/gtkprefs.c:1017
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Ročno določi obseg vrat za poslušanje"
 
-#: src/gtkprefs.c:1009
+#: ../src/gtkprefs.c:1020
 msgid "_Start port:"
 msgstr "_Začetna vrata:"
 
-#: src/gtkprefs.c:1016
+#: ../src/gtkprefs.c:1027
 msgid "_End port:"
 msgstr "_Končna vrata:"
 
-#: src/gtkprefs.c:1024
+#: ../src/gtkprefs.c:1035
 msgid "Proxy Server"
 msgstr "Strežnik proxy"
 
-#: src/gtkprefs.c:1028
+#: ../src/gtkprefs.c:1039
 msgid "No proxy"
 msgstr "Brez strežnika proxy"
 
-#: src/gtkprefs.c:1084
+#: ../src/gtkprefs.c:1095
 msgid "_User:"
 msgstr "_Uporabnik:"
 
-#: src/gtkprefs.c:1146
+#: ../src/gtkprefs.c:1157
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: src/gtkprefs.c:1147
+#: ../src/gtkprefs.c:1158
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1148
+#: ../src/gtkprefs.c:1159
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1149
+#: ../src/gtkprefs.c:1160
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1150
+#: ../src/gtkprefs.c:1161
 msgid "GNOME Default"
 msgstr "Privzeto za GNOME"
 
-#: src/gtkprefs.c:1151
+#: ../src/gtkprefs.c:1162
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1152
+#: ../src/gtkprefs.c:1163
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1153
+#: ../src/gtkprefs.c:1164
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1154
+#: ../src/gtkprefs.c:1165
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1163
+#: ../src/gtkprefs.c:1174
 msgid "Manual"
 msgstr "Ročni"
 
-#: src/gtkprefs.c:1216
+#: ../src/gtkprefs.c:1227
 msgid "Browser Selection"
 msgstr "Izbira brskalnika"
 
-#: src/gtkprefs.c:1220
+#: ../src/gtkprefs.c:1231
 msgid "_Browser:"
 msgstr "_Brskalnik:"
 
-#: src/gtkprefs.c:1228
+#: ../src/gtkprefs.c:1239
 msgid "_Open link in:"
 msgstr "_Odpri povezavo v:"
 
-#: src/gtkprefs.c:1230
+#: ../src/gtkprefs.c:1241
 msgid "Browser default"
 msgstr "Privzeto za brskalnik"
 
-#: src/gtkprefs.c:1231
+#: ../src/gtkprefs.c:1242
 msgid "Existing window"
 msgstr "Obstoječe okno"
 
-#: src/gtkprefs.c:1233
+#: ../src/gtkprefs.c:1244
 msgid "New tab"
 msgstr "Nov zavihek"
 
-#: src/gtkprefs.c:1247
+#: ../src/gtkprefs.c:1258
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -4700,85 +4853,85 @@
 "_Ročno:\n"
 "(%s namesto URL)"
 
-#: src/gtkprefs.c:1283
-#: src/gtkprefs.c:1864
+#: ../src/gtkprefs.c:1294
+#: ../src/gtkprefs.c:1875
 msgid "Logging"
 msgstr "Beleženje v dnevnik"
 
-#: src/gtkprefs.c:1286
+#: ../src/gtkprefs.c:1297
 msgid "Log _format:"
 msgstr "Oblika _dnevnika:"
 
-#: src/gtkprefs.c:1291
+#: ../src/gtkprefs.c:1302
 msgid "Log all _instant messages"
 msgstr "Shranjuj vsa _neposredna sporočila"
 
-#: src/gtkprefs.c:1293
+#: ../src/gtkprefs.c:1304
 msgid "Log all c_hats"
 msgstr "Shranjuj vse po_menke"
 
-#: src/gtkprefs.c:1295
+#: ../src/gtkprefs.c:1306
 msgid "Log all _status changes to system log"
 msgstr "Beleži vse spremembe _stanja v sistemski dnevnik"
 
-#: src/gtkprefs.c:1443
+#: ../src/gtkprefs.c:1454
 msgid "Sound Selection"
 msgstr "Izbira zvoka"
 
-#: src/gtkprefs.c:1451
+#: ../src/gtkprefs.c:1462
 msgid "Quietest"
 msgstr "najtišje"
 
-#: src/gtkprefs.c:1453
+#: ../src/gtkprefs.c:1464
 msgid "Quieter"
 msgstr "tišje"
 
-#: src/gtkprefs.c:1455
+#: ../src/gtkprefs.c:1466
 msgid "Quiet"
 msgstr "tiho"
 
-#: src/gtkprefs.c:1457
-#: src/protocols/silc/silc.c:666
+#: ../src/gtkprefs.c:1468
+#: ../src/protocols/silc/silc.c:666
 msgid "Normal"
 msgstr "Navadno"
 
-#: src/gtkprefs.c:1459
+#: ../src/gtkprefs.c:1470
 msgid "Loud"
 msgstr "glasno"
 
-#: src/gtkprefs.c:1461
+#: ../src/gtkprefs.c:1472
 msgid "Louder"
 msgstr "glasneje"
 
-#: src/gtkprefs.c:1463
+#: ../src/gtkprefs.c:1474
 msgid "Loudest"
 msgstr "najglasneje"
 
-#: src/gtkprefs.c:1526
+#: ../src/gtkprefs.c:1537
 msgid "Sound Method"
 msgstr "Način zvoka"
 
-#: src/gtkprefs.c:1527
+#: ../src/gtkprefs.c:1538
 msgid "_Method:"
 msgstr "_Način:"
 
-#: src/gtkprefs.c:1529
+#: ../src/gtkprefs.c:1540
 msgid "Console beep"
 msgstr "Pisk"
 
-#: src/gtkprefs.c:1531
+#: ../src/gtkprefs.c:1542
 msgid "Automatic"
 msgstr "Samodejno"
 
-#: src/gtkprefs.c:1536
+#: ../src/gtkprefs.c:1547
 msgid "Command"
 msgstr "Ukaz"
 
-#: src/gtkprefs.c:1537
+#: ../src/gtkprefs.c:1548
 msgid "No sounds"
 msgstr "Nemo"
 
-#: src/gtkprefs.c:1545
+#: ../src/gtkprefs.c:1556
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4787,551 +4940,534 @@
 "Ukaz za _zvok:\n"
 "(%s namesto datoteke)"
 
-#: src/gtkprefs.c:1571
+#: ../src/gtkprefs.c:1582
 msgid "Sound Options"
 msgstr "Nastavitve zvoka"
 
-#: src/gtkprefs.c:1572
+#: ../src/gtkprefs.c:1583
 msgid "Sounds when conversation has _focus"
 msgstr "Zvok, ko pogovorno okno dobi _fokus"
 
-#: src/gtkprefs.c:1574
+#: ../src/gtkprefs.c:1585
 msgid "_Sounds while away"
 msgstr "_Zvoki, kadar sem odsoten"
 
-#: src/gtkprefs.c:1581
+#: ../src/gtkprefs.c:1592
 msgid "Volume:"
 msgstr "Glasnost:"
 
-#: src/gtkprefs.c:1609
+#: ../src/gtkprefs.c:1620
 msgid "Sound Events"
 msgstr "Zvočni Dogodki"
 
-#: src/gtkprefs.c:1660
+#: ../src/gtkprefs.c:1671
 msgid "Play"
 msgstr "Predvajaj"
 
-#: src/gtkprefs.c:1667
+#: ../src/gtkprefs.c:1678
 msgid "Event"
 msgstr "Dogodek"
 
-#: src/gtkprefs.c:1686
+#: ../src/gtkprefs.c:1697
 msgid "Test"
 msgstr "Preskus"
 
-#: src/gtkprefs.c:1690
+#: ../src/gtkprefs.c:1701
 msgid "Reset"
 msgstr "Ponastavi"
 
-#: src/gtkprefs.c:1694
+#: ../src/gtkprefs.c:1705
 msgid "Choose..."
 msgstr "Izberi ..."
 
-#: src/gtkprefs.c:1736
+#: ../src/gtkprefs.c:1747
 msgid "_Report idle time:"
 msgstr "_Poročaj o času odsotnosti:"
 
-#: src/gtkprefs.c:1739
+#: ../src/gtkprefs.c:1750
 msgid "From last sent message"
 msgstr "Od nazadnje poslanega sporočila"
 
-#: src/gtkprefs.c:1741
+#: ../src/gtkprefs.c:1752
 msgid "Based on keyboard or mouse use"
 msgstr "Temelji na uporabi tipkovnice ali miške"
 
-#: src/gtkprefs.c:1750
+#: ../src/gtkprefs.c:1761
 msgid "_Auto-reply:"
 msgstr "_Samodejni odziv"
 
-#: src/gtkprefs.c:1754
+#: ../src/gtkprefs.c:1765
 msgid "When both away and idle"
 msgstr "ob odsotnosti in nedejavnosti"
 
 #. Auto-away stuff
-#: src/gtkprefs.c:1760
+#: ../src/gtkprefs.c:1771
 msgid "Auto-away"
 msgstr "Samodejna odsotnost"
 
-#: src/gtkprefs.c:1762
+#: ../src/gtkprefs.c:1773
 msgid "Change status when _idle"
 msgstr "Spremeni stanje ob _nedejavnosti"
 
-#: src/gtkprefs.c:1766
+#: ../src/gtkprefs.c:1777
 msgid "_Minutes before changing status:"
 msgstr "Število _minut pred spremembo stanja:"
 
-#: src/gtkprefs.c:1774
+#: ../src/gtkprefs.c:1785
 msgid "Change _status to:"
 msgstr "Spremeni _stanje v:"
 
 #. Signon status stuff
-#: src/gtkprefs.c:1795
+#: ../src/gtkprefs.c:1806
 msgid "Status at startup"
 msgstr "Stanje ob zagonu"
 
-#: src/gtkprefs.c:1797
+#: ../src/gtkprefs.c:1808
 msgid "Use status from last _exit at startup"
 msgstr "Ob zagonu uporabi stanje ob zadnjem _izhodu"
 
-#: src/gtkprefs.c:1803
+#: ../src/gtkprefs.c:1814
 msgid "Status to a_pply at startup:"
 msgstr "Stanje ob _zagonu:"
 
-#: src/gtkprefs.c:1854
+#: ../src/gtkprefs.c:1865
 msgid "Smiley Themes"
 msgstr "Teme za smeške"
 
-#: src/gtkprefs.c:1855
+#: ../src/gtkprefs.c:1866
 msgid "Sounds"
 msgstr "Zvoki"
 
-#: src/gtkprefs.c:1856
-#: src/protocols/silc/silc.c:1848
+#: ../src/gtkprefs.c:1867
+#: ../src/protocols/silc/silc.c:1848
 msgid "Network"
 msgstr "Omrežje"
 
-#: src/gtkprefs.c:1861
+#: ../src/gtkprefs.c:1872
 msgid "Browser"
 msgstr "Brskalnik"
 
-#: src/gtkprefs.c:1865
+#: ../src/gtkprefs.c:1876
 msgid "Away / Idle"
 msgstr "Odsotnost / Nedejavnost"
 
-#: src/gtkprivacy.c:79
+#: ../src/gtkprivacy.c:79
 msgid "Allow all users to contact me"
 msgstr "Dovoli vsem uporabnikom, da stopijo v stik z mano"
 
-#: src/gtkprivacy.c:80
+#: ../src/gtkprivacy.c:80
 msgid "Allow only the users on my buddy list"
 msgstr "Dovoli le uporabnikom na mojem seznamu prijateljev"
 
-#: src/gtkprivacy.c:81
+#: ../src/gtkprivacy.c:81
 msgid "Allow only the users below"
 msgstr "Dovoli samo spodnjim uporabnikom"
 
-#: src/gtkprivacy.c:82
+#: ../src/gtkprivacy.c:82
 msgid "Block all users"
 msgstr "Zavrni vse uporabnike"
 
-#: src/gtkprivacy.c:83
+#: ../src/gtkprivacy.c:83
 msgid "Block only the users below"
 msgstr "Zavrni samo uporabnike spodaj"
 
-#: src/gtkprivacy.c:371
+#: ../src/gtkprivacy.c:372
 msgid "Privacy"
 msgstr "Zasebnost"
 
-#: src/gtkprivacy.c:384
+#: ../src/gtkprivacy.c:385
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Spremembe nastavitev o zasebnosti stopijo v veljavo takoj."
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:396
+#: ../src/gtkprivacy.c:397
 msgid "Set privacy for:"
 msgstr "Nastavi zasebnost za:"
 
-#: src/gtkprivacy.c:561
-#: src/gtkprivacy.c:577
+#: ../src/gtkprivacy.c:562
+#: ../src/gtkprivacy.c:578
 msgid "Permit User"
 msgstr "Dovoli uporabniku"
 
-#: src/gtkprivacy.c:562
+#: ../src/gtkprivacy.c:563
 msgid "Type a user you permit to contact you."
 msgstr "Vpišite uporabnika, ki mu želiš dovoliti, da stopi v stik z vami."
 
-#: src/gtkprivacy.c:563
+#: ../src/gtkprivacy.c:564
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "Prosim vnesite ime uporabnika, ki mu želite omogočiti, da stopi v stik z vami"
 
-#: src/gtkprivacy.c:566
-#: src/gtkprivacy.c:579
+#: ../src/gtkprivacy.c:567
+#: ../src/gtkprivacy.c:580
 msgid "_Permit"
 msgstr "_Dovoli"
 
-#: src/gtkprivacy.c:571
+#: ../src/gtkprivacy.c:572
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Dovoli %s, da stopi v stik z vami?"
 
-#: src/gtkprivacy.c:573
+#: ../src/gtkprivacy.c:574
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Ste prepričani, da želite dovoliti %s, da stopi v stik z vami?"
 
-#: src/gtkprivacy.c:600
-#: src/gtkprivacy.c:613
+#: ../src/gtkprivacy.c:601
+#: ../src/gtkprivacy.c:614
 msgid "Block User"
 msgstr "Zavrni uporabnika"
 
-#: src/gtkprivacy.c:601
+#: ../src/gtkprivacy.c:602
 msgid "Type a user to block."
 msgstr "Vpišite uporabnika, ki ga želite zavrniti."
 
-#: src/gtkprivacy.c:602
+#: ../src/gtkprivacy.c:603
 msgid "Please enter the name of the user you wish to block."
 msgstr "Vnesite ime uporabnika, ki ga želite zavrniti."
 
-#: src/gtkprivacy.c:604
-#: src/gtkprivacy.c:615
+#: ../src/gtkprivacy.c:605
+#: ../src/gtkprivacy.c:616
 msgid "_Block"
 msgstr "_Blokiraj"
 
-#: src/gtkprivacy.c:609
+#: ../src/gtkprivacy.c:610
 #, c-format
 msgid "Block %s?"
 msgstr "Zavrnem %s?"
 
-#: src/gtkprivacy.c:611
+#: ../src/gtkprivacy.c:612
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Ste prepričani, da želite zavrniti %s?"
 
-#. *
-#. * A wrapper for gaim_request_action() that uses Yes and No buttons.
-#.
-#: src/gtkrequest.c:285
-#: src/protocols/msn/dialog.c:114
-#: src/protocols/msn/msn.c:559
-#: src/protocols/msn/msn.c:568
-#: src/protocols/novell/novell.c:1921
-#: src/protocols/silc/buddy.c:313
-#: src/protocols/silc/pk.c:117
-#: src/protocols/silc/wb.c:303
-#: src/request.h:1331
+#: ../src/gtkrequest.c:285
+#: ../src/protocols/msn/dialog.c:114
+#: ../src/protocols/msn/msn.c:559
+#: ../src/protocols/msn/msn.c:568
+#: ../src/protocols/novell/novell.c:1921
+#: ../src/protocols/silc/buddy.c:313
+#: ../src/protocols/silc/pk.c:117
+#: ../src/protocols/silc/wb.c:303
 msgid "Yes"
 msgstr "Da"
 
-#: src/gtkrequest.c:286
-#: src/protocols/msn/dialog.c:115
-#: src/protocols/msn/msn.c:559
-#: src/protocols/msn/msn.c:568
-#: src/protocols/novell/novell.c:1922
-#: src/protocols/silc/buddy.c:314
-#: src/protocols/silc/pk.c:118
-#: src/protocols/silc/wb.c:304
-#: src/request.h:1331
+#: ../src/gtkrequest.c:286
+#: ../src/protocols/msn/dialog.c:115
+#: ../src/protocols/msn/msn.c:559
+#: ../src/protocols/msn/msn.c:568
+#: ../src/protocols/novell/novell.c:1922
+#: ../src/protocols/silc/buddy.c:314
+#: ../src/protocols/silc/pk.c:118
+#: ../src/protocols/silc/wb.c:304
 msgid "No"
 msgstr "Ne"
 
-#: src/gtkrequest.c:289
+#: ../src/gtkrequest.c:289
 msgid "Apply"
 msgstr "Uporabi"
 
-#: src/gtkrequest.c:290
-#: src/protocols/msn/msn.c:357
-#: src/protocols/silc/util.c:336
+#: ../src/gtkrequest.c:290
+#: ../src/protocols/msn/msn.c:357
+#: ../src/protocols/silc/util.c:336
 msgid "Close"
 msgstr "Zapri"
 
-#: src/gtkrequest.c:1839
+#: ../src/gtkrequest.c:1851
 msgid "That file already exists"
 msgstr "Datoteka že obstaja"
 
-#: src/gtkrequest.c:1840
+#: ../src/gtkrequest.c:1852
 msgid "Would you like to overwrite it?"
 msgstr "Ali jo želite prepisati?"
 
-#: src/gtkrequest.c:1884
-#: src/gtkrequest.c:1925
+#: ../src/gtkrequest.c:1896
+#: ../src/gtkrequest.c:1937
 msgid "Save File..."
 msgstr "Shrani datoteko ..."
 
-#: src/gtkrequest.c:1885
-#: src/gtkrequest.c:1926
+#: ../src/gtkrequest.c:1897
+#: ../src/gtkrequest.c:1938
 msgid "Open File..."
 msgstr "Odpri datoteko ..."
 
-#: src/gtkroomlist.c:287
+#: ../src/gtkroomlist.c:287
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: src/gtkroomlist.c:354
+#: ../src/gtkroomlist.c:354
 msgid "Room List"
 msgstr "Seznam sob"
 
 #. list button
-#: src/gtkroomlist.c:424
+#: ../src/gtkroomlist.c:424
 msgid "_Get List"
 msgstr "_Dobi seznam"
 
 #. add button
-#: src/gtkroomlist.c:432
+#: ../src/gtkroomlist.c:432
 msgid "_Add Chat"
 msgstr "_Dodaj pomenek"
 
-#: src/gtksavedstatuses.c:436
-#: src/protocols/jabber/buddy.c:264
-#: src/protocols/jabber/buddy.c:812
-#: src/protocols/novell/novell.c:1486
+#: ../src/gtksavedstatuses.c:433
+#: ../src/protocols/jabber/buddy.c:264
+#: ../src/protocols/jabber/buddy.c:812
+#: ../src/protocols/novell/novell.c:1486
 msgid "Title"
 msgstr "Naziv"
 
-#: src/gtksavedstatuses.c:451
+#: ../src/gtksavedstatuses.c:448
 msgid "Type"
 msgstr "Vrsta"
 
 #. Available status messages are plain text
-#: src/gtksavedstatuses.c:462
-#: src/gtksavedstatuses.c:907
-#: src/protocols/bonjour/bonjour.c:247
-#: src/protocols/bonjour/bonjour.c:254
-#: src/protocols/gg/gg.c:1421
-#: src/protocols/gg/gg.c:1431
-#: src/protocols/gg/gg.c:1437
-#: src/protocols/gg/gg.c:1446
-#: src/protocols/gg/gg.c:1451
-#: src/protocols/irc/irc.c:171
-#: src/protocols/jabber/jabber.c:1095
-#: src/protocols/jabber/jabber.c:1105
-#: src/protocols/jabber/jabber.c:1115
-#: src/protocols/jabber/jabber.c:1125
-#: src/protocols/jabber/jabber.c:1135
-#: src/protocols/jabber/jabber.c:1147
-#: 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:7747
-#: src/protocols/oscar/oscar.c:7761
-#: src/protocols/oscar/oscar.c:7766
-#: src/protocols/oscar/oscar.c:7975
-#: src/protocols/oscar/oscar.c:7987
-#: src/protocols/sametime/sametime.c:3220
-#: src/protocols/sametime/sametime.c:3226
-#: src/protocols/sametime/sametime.c:3232
-#: src/protocols/sametime/sametime.c:3309
-#: src/protocols/silc/buddy.c:1544
-#: src/protocols/simple/simple.c:252
-#: src/protocols/yahoo/yahoo.c:3225
-#: src/protocols/yahoo/yahoo.c:3231
-#: src/protocols/zephyr/zephyr.c:2261
+#: ../src/gtksavedstatuses.c:459
+#: ../src/gtksavedstatuses.c:920
+#: ../src/protocols/bonjour/bonjour.c:256
+#: ../src/protocols/bonjour/bonjour.c:263
+#: ../src/protocols/gg/gg.c:1421
+#: ../src/protocols/gg/gg.c:1431
+#: ../src/protocols/gg/gg.c:1437
+#: ../src/protocols/gg/gg.c:1446
+#: ../src/protocols/gg/gg.c:1451
+#: ../src/protocols/irc/irc.c:227
+#: ../src/protocols/jabber/jabber.c:1185
+#: ../src/protocols/jabber/jabber.c:1195
+#: ../src/protocols/jabber/jabber.c:1205
+#: ../src/protocols/jabber/jabber.c:1215
+#: ../src/protocols/jabber/jabber.c:1225
+#: ../src/protocols/jabber/jabber.c:1237
+#: ../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:7723
+#: ../src/protocols/oscar/oscar.c:7737
+#: ../src/protocols/oscar/oscar.c:7742
+#: ../src/protocols/oscar/oscar.c:7951
+#: ../src/protocols/oscar/oscar.c:7963
+#: ../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/silc/buddy.c:1544
+#: ../src/protocols/simple/simple.c:242
+#: ../src/protocols/yahoo/yahoo.c:3278
+#: ../src/protocols/yahoo/yahoo.c:3284
+#: ../src/protocols/zephyr/zephyr.c:2261
 msgid "Message"
 msgstr "Sporočilo"
 
-#: src/gtksavedstatuses.c:525
+#: ../src/gtksavedstatuses.c:526
 msgid "Saved Statuses"
 msgstr "Shranjena stanja"
 
 #. Use button
-#: src/gtksavedstatuses.c:550
-#: src/gtksavedstatuses.c:1154
+#: ../src/gtksavedstatuses.c:549
+#: ../src/gtksavedstatuses.c:1180
 msgid "_Use"
 msgstr "_Uporabi"
 
-#: src/gtksavedstatuses.c:662
+#: ../src/gtksavedstatuses.c:695
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Naziv je že v uporabi. Prosimo, izberite drug naziv."
 
-#: src/gtksavedstatuses.c:866
+#: ../src/gtksavedstatuses.c:879
 msgid "Different"
 msgstr "Razno"
 
-#: src/gtksavedstatuses.c:896
-#: src/gtksavedstatuses.c:1023
-#: src/protocols/gg/gg.c:1403
-#: src/protocols/gg/gg.c:1408
-#: src/protocols/jabber/buddy.c:623
-#: src/protocols/jabber/buddy.c:630
-#: src/protocols/jabber/buddy.c:641
-#: src/protocols/jabber/jabber.c:1066
-#: src/protocols/msn/msn.c:550
-#: src/protocols/novell/novell.c:2867
-#: src/protocols/novell/novell.c:2871
-#: src/protocols/oscar/oscar.c:782
-#: src/protocols/oscar/oscar.c:788
-#: src/protocols/oscar/oscar.c:791
-#: src/protocols/yahoo/yahoo.c:2827
+#: ../src/gtksavedstatuses.c:909
+#: ../src/gtksavedstatuses.c:1056
+#: ../src/protocols/gg/gg.c:1403
+#: ../src/protocols/gg/gg.c:1408
+#: ../src/protocols/jabber/buddy.c:623
+#: ../src/protocols/jabber/buddy.c:630
+#: ../src/protocols/jabber/buddy.c:641
+#: ../src/protocols/jabber/jabber.c:1156
+#: ../src/protocols/msn/msn.c:550
+#: ../src/protocols/novell/novell.c:2867
+#: ../src/protocols/novell/novell.c:2871
+#: ../src/protocols/oscar/oscar.c:785
+#: ../src/protocols/oscar/oscar.c:791
+#: ../src/protocols/oscar/oscar.c:794
+#: ../src/protocols/yahoo/yahoo.c:2880
 msgid "Status"
 msgstr "Stanje"
 
-#: src/gtksavedstatuses.c:1042
+#: ../src/gtksavedstatuses.c:1073
 msgid "_Title:"
 msgstr "_Naziv:"
 
-#: src/gtksavedstatuses.c:1062
-#: src/gtksavedstatuses.c:1369
+#: ../src/gtksavedstatuses.c:1092
+#: ../src/gtksavedstatuses.c:1413
 msgid "_Status:"
 msgstr "_Stanje:"
 
 #. Different status message expander
-#: src/gtksavedstatuses.c:1097
+#: ../src/gtksavedstatuses.c:1124
 msgid "Use a _different status for some accounts"
 msgstr "Za nekatere račune uporabi _različno stanje"
 
 #. Save & Use button
-#: src/gtksavedstatuses.c:1163
+#: ../src/gtksavedstatuses.c:1188
 msgid "Sa_ve & Use"
 msgstr "Shra_ni in uporabi"
 
-#: src/gtksavedstatuses.c:1348
+#: ../src/gtksavedstatuses.c:1394
 #, c-format
 msgid "Status for %s"
 msgstr "Stanje za %s"
 
-#: src/gtksound.c:61
+#: ../src/gtksound.c:61
 msgid "Buddy logs in"
 msgstr "Prijatelj se prijavi"
 
-#: src/gtksound.c:62
+#: ../src/gtksound.c:62
 msgid "Buddy logs out"
 msgstr "Prijatelj se odjavi"
 
-#: src/gtksound.c:63
+#: ../src/gtksound.c:63
 msgid "Message received"
 msgstr "Sporočilo prejeto"
 
-#: src/gtksound.c:64
+#: ../src/gtksound.c:64
 msgid "Message received begins conversation"
 msgstr "Prejeto sporočilo začne pogovor"
 
-#: src/gtksound.c:65
+#: ../src/gtksound.c:65
 msgid "Message sent"
 msgstr "Sporočilo poslano"
 
-#: src/gtksound.c:66
+#: ../src/gtksound.c:66
 msgid "Person enters chat"
 msgstr "Oseba se pridruži pogovorni sobi"
 
-#: src/gtksound.c:67
+#: ../src/gtksound.c:67
 msgid "Person leaves chat"
 msgstr "Oseba zapusti pogovorno sobo"
 
-#: src/gtksound.c:68
+#: ../src/gtksound.c:68
 msgid "You talk in chat"
 msgstr "Vi govorite v sobi"
 
-#: src/gtksound.c:69
+#: ../src/gtksound.c:69
 msgid "Others talk in chat"
 msgstr "Drugi govorijo v sobi"
 
-#: src/gtksound.c:72
+#: ../src/gtksound.c:72
 msgid "Someone says your name in chat"
 msgstr "Nekdo omeni vaše ime v sobi"
 
-#: src/gtksound.c:488
+#: ../src/gtksound.c:488
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "Zvoka ni mogoče predvajati, ker izbrana datoteka (%s) ne obstaja."
 
-#: src/gtksound.c:504
+#: ../src/gtksound.c:504
 msgid "Unable to play sound because the 'Command' sound method has been chosen, but no command has been set."
 msgstr "Ni bilo mogoče predvajati zvoka, ker ste izbrali ukaz za predvajanje zvoka, niste pa nastavili ukaza."
 
-#: src/gtksound.c:516
+#: ../src/gtksound.c:516
 #, c-format
 msgid "Unable to play sound because the configured sound command could not be launched: %s"
 msgstr "Zvoka ni bilo mogoče predvajati, ker izbranega ukaza za zvok ni bilo mogoče pognati: %s"
 
-#: src/gtkstatusbox.c:336
+#: ../src/gtkstatusbox.c:362
 msgid "Typing"
 msgstr "Tipka"
 
 #. connect to the server
-#: src/gtkstatusbox.c:339
-#: src/protocols/irc/irc.c:256
-#: src/protocols/jabber/jabber.c:893
-#: src/protocols/msn/session.c:349
-#: src/protocols/napster/napster.c:531
-#: src/protocols/novell/novell.c:2183
-#: src/protocols/oscar/oscar.c:1860
-#: src/protocols/sametime/sametime.c:3592
-#: src/protocols/simple/simple.c:1344
-#: src/protocols/yahoo/yahoo.c:2524
-#: src/protocols/zephyr/zephyr.c:1547
+#: ../src/gtkstatusbox.c:364
+#: ../src/protocols/irc/irc.c:313
+#: ../src/protocols/jabber/jabber.c:983
+#: ../src/protocols/msn/session.c:349
+#: ../src/protocols/napster/napster.c:536
+#: ../src/protocols/novell/novell.c:2183
+#: ../src/protocols/oscar/oscar.c:1874
+#: ../src/protocols/sametime/sametime.c:3693
+#: ../src/protocols/simple/simple.c:1503
+#: ../src/protocols/yahoo/yahoo.c:2571
+#: ../src/protocols/zephyr/zephyr.c:1547
 msgid "Connecting"
 msgstr "Povezovanje"
 
-#: src/gtkstatusbox.c:583
-msgid "New..."
-msgstr "Novo ..."
-
-#: src/gtkstatusbox.c:584
-msgid "Saved..."
-msgstr "Datoteka shranjena ..."
-
-#: src/gtkstock.c:139
+#: ../src/gtkstock.c:138
 msgid "_Alias"
 msgstr "_Psevdonim"
 
-#: src/gtkstock.c:141
+#: ../src/gtkstock.c:140
 msgid "Close _tabs"
 msgstr "Zapri _zavihke"
 
-#: src/gtkstock.c:143
+#: ../src/gtkstock.c:142
 msgid "_Get Info"
 msgstr "_Informacije"
 
-#: src/gtkstock.c:144
+#: ../src/gtkstock.c:143
 msgid "_Invite"
 msgstr "Povab_i"
 
-#: src/gtkstock.c:145
+#: ../src/gtkstock.c:144
 msgid "_Modify"
 msgstr "_Spremeni"
 
-#: src/gtkstock.c:146
+#: ../src/gtkstock.c:145
 msgid "_Open Mail"
 msgstr "_Odpri pošto"
 
-#: src/gtkstock.c:148
-msgid "_Warn"
-msgstr "_Opozori"
-
-#: src/gtkutils.c:1311
-#: src/gtkutils.c:1336
+#: ../src/gtkutils.c:1306
+#: ../src/gtkutils.c:1331
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Pri odpiranju %s je prišlo do neznane napake: %s"
 
-#: src/gtkutils.c:1313
-#: src/gtkutils.c:1338
+#: ../src/gtkutils.c:1308
+#: ../src/gtkutils.c:1333
 msgid "Failed to load image"
 msgstr "Slike ni mogoče odpreti"
 
-#: src/gtkutils.c:1413
+#: ../src/gtkutils.c:1408
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Ni mogoče poslati imenika %s."
 
-#: src/gtkutils.c:1415
+#: ../src/gtkutils.c:1410
 msgid "Gaim cannot transfer a folder. You will need to send the files within individually"
 msgstr "Gaim ne more prenesti imenika. Datoteke boste morali poslati posamično."
 
-#: src/gtkutils.c:1443
-#: src/gtkutils.c:1452
-#: src/gtkutils.c:1457
+#: ../src/gtkutils.c:1438
+#: ../src/gtkutils.c:1447
+#: ../src/gtkutils.c:1452
 msgid "You have dragged an image"
 msgstr "Povlekli ste sliko"
 
-#: src/gtkutils.c:1444
+#: ../src/gtkutils.c:1439
 msgid "You can send this image as a file transfer, embed it into this message, or use it as the buddy icon for this user."
 msgstr "To sliko lahko pošljete kot datoteko, jo vključite v to sporočilo ali uporabite kot ikono za tega uporabnika."
 
-#: src/gtkutils.c:1448
-#: src/gtkutils.c:1463
+#: ../src/gtkutils.c:1443
+#: ../src/gtkutils.c:1458
 msgid "Set as buddy icon"
 msgstr "Nastavi kot ikono prijatelja"
 
-#: src/gtkutils.c:1449
-#: src/gtkutils.c:1464
+#: ../src/gtkutils.c:1444
+#: ../src/gtkutils.c:1459
 msgid "Send image file"
 msgstr "Pošlji slikovno datoteko"
 
-#: src/gtkutils.c:1450
-#: src/gtkutils.c:1464
+#: ../src/gtkutils.c:1445
+#: ../src/gtkutils.c:1459
 msgid "Insert in message"
 msgstr "Vstavi v sporočilo"
 
-#: src/gtkutils.c:1453
+#: ../src/gtkutils.c:1448
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Jo želite nastaviti za ikono prijatelja?"
 
-#: src/gtkutils.c:1458
+#: ../src/gtkutils.c:1453
 msgid "You can send this image as a file transfer or embed it into this message, or use it as the buddy icon for this user."
 msgstr "To sliko lahko pošljete kot datoteko, jo vključite v to sporočilo ali jo uporabite kot ikono za tega uporabnika."
 
-#: src/gtkutils.c:1460
+#: ../src/gtkutils.c:1455
 msgid "You can insert this image into this message, or use it as the buddy icon for this user"
 msgstr "To sliko lahko vstavite v to sporočilo ali pa jo uporabite kot ikono prijatelja za tega prijatelja"
 
@@ -5340,131 +5476,131 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: src/gtkutils.c:1514
+#: ../src/gtkutils.c:1509
 msgid "Cannot send launcher"
 msgstr "Ni mogoče poslati zaganjalnika"
 
-#: src/gtkutils.c:1514
+#: ../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 "Povlekli ste namizni zaganjalnik. Najverjetneje ste želeli namesto samega zaganjalnika poslati tisto, na kar ta zaganjalnik kaže."
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
-#: src/gtkwhiteboard.c:344
-#: src/protocols/yahoo/yahoo_doodle.c:96
+#: ../src/gtkwhiteboard.c:344
+#: ../src/protocols/yahoo/yahoo_doodle.c:96
 msgid "Sent Doodle request."
 msgstr "Pošlji zahtevo Doodle."
 
-#: src/log.c:129
+#: ../src/log.c:165
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">Beleženje nima možnosti branja</font></b>"
 
-#: src/log.c:511
+#: ../src/log.c:547
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:522
+#: ../src/log.c:558
 msgid "Plain text"
 msgstr "Navadno besedilo"
 
-#: src/log.c:533
+#: ../src/log.c:569
 msgid "Old Gaim"
 msgstr "Stari Gaim"
 
-#: src/log.c:628
+#: ../src/log.c:668
 msgid "Logging of this conversation failed."
 msgstr "Beleženje tega pogovora v dnevnik ni uspelo."
 
-#: src/log.c:896
+#: ../src/log.c:969
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:960
+#: ../src/log.c:1037
 #, c-format
 msgid "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
 msgstr "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;SAMODEJNI ODGOVOR&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:962
+#: ../src/log.c:1039
 #, c-format
 msgid "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
 msgstr "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;SAMODEJNI ODGOVOR&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:1013
-#: src/log.c:1132
+#: ../src/log.c:1096
+#: ../src/log.c:1218
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Ni mogoče najti poti do dnevnika!</b></font>"
 
-#: src/log.c:1025
-#: src/log.c:1144
+#: ../src/log.c:1108
+#: ../src/log.c:1230
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Ni mogoče brati datoteke: %s</b></font>"
 
-#: src/log.c:1077
+#: ../src/log.c:1161
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
-#: src/plugin.c:278
-#: src/protocols/msn/servconn.c:133
-#: src/protocols/msn/session.c:326
-#: src/protocols/oscar/oscar.c:5030
+#: ../src/plugin.c:281
+#: ../src/protocols/msn/servconn.c:139
+#: ../src/protocols/msn/session.c:326
+#: ../src/protocols/oscar/oscar.c:5063
 msgid "Unknown error"
 msgstr "Neznana napaka"
 
-#: src/plugin.c:421
+#: ../src/plugin.c:424
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr "Neustrezna %d vstavka (potrebuje %d)"
 
-#: src/plugin.c:438
+#: ../src/plugin.c:441
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "Neustrezna različica ABI %d.%d.x (potrebna je %d.%d.x)"
 
-#: src/plugin.c:454
+#: ../src/plugin.c:457
 msgid "Plugin does not implement all required functions"
 msgstr "Vstavek ne vsebuje implementacije vseh potrebnih funkcij"
 
-#: src/plugin.c:509
+#: ../src/plugin.c:514
 #, c-format
 msgid "The required plugin %s was not found. Please install this plugin and try again."
 msgstr "Zahtevani dodatek %s ni bil najden. Prosim namestite dodatek in poskusite ponovno."
 
-#: src/plugin.c:514
+#: ../src/plugin.c:519
 msgid "Gaim encountered errors loading the plugin."
 msgstr "Ob nalaganju vstavka je prišlo do napak."
 
-#: src/plugin.c:537
+#: ../src/plugin.c:542
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Zahtevanega dodatka %s se ni dalo naložiti."
 
-#: src/plugin.c:541
+#: ../src/plugin.c:546
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim ni mogel naložiti vašega dodatka."
 
-#: src/plugin.c:643
+#: ../src/plugin.c:648
 #, c-format
 msgid "The dependent plugin %s failed to unload."
 msgstr "Odvisnega vstavka %s ni bilo mogoče odložiti."
 
-#: src/plugin.c:648
+#: ../src/plugin.c:653
 msgid "Gaim encountered errors unloading the plugin."
 msgstr "Pri odlaganju vstavka je prišlo do napake."
 
 #. Send a message about the connection error
-#: src/protocols/bonjour/bonjour.c:107
+#: ../src/protocols/bonjour/bonjour.c:111
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Dohodnim povezavam IM ni mogoče prisluhniti\n"
 
-#: src/protocols/bonjour/bonjour.c:142
+#: ../src/protocols/bonjour/bonjour.c:146
 msgid "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "Povezave s krajevnim strežnikom mDNS ni mogoče vzpostaviti. Ali je strežnik sploh zagnan?"
 
-#: src/protocols/bonjour/bonjour.c:328
-#: src/protocols/sametime/sametime.c:3197
+#: ../src/protocols/bonjour/bonjour.c:337
+#: ../src/protocols/sametime/sametime.c:3251
 #, c-format
 msgid ""
 "\n"
@@ -5473,7 +5609,7 @@
 "\n"
 "<b>Stanje</b>: %s"
 
-#: src/protocols/bonjour/bonjour.c:330
+#: ../src/protocols/bonjour/bonjour.c:339
 #, c-format
 msgid ""
 "\n"
@@ -5492,392 +5628,414 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/bonjour/bonjour.c:425
-#: src/protocols/bonjour/bonjour.c:427
+#: ../src/protocols/bonjour/bonjour.c:434
+#: ../src/protocols/bonjour/bonjour.c:436
 msgid "Bonjour Protocol Plugin"
 msgstr "Dodatek za protokol Bonjour"
 
-#: src/protocols/bonjour/bonjour.c:459
-#: src/protocols/bonjour/bonjour.c:516
+#: ../src/protocols/bonjour/bonjour.c:472
+#: ../src/protocols/bonjour/bonjour.c:480
+#: ../src/protocols/bonjour/bonjour.c:538
 msgid "Gaim User"
 msgstr "Uporabnik Gaim"
 
 #. Creating the user splits
-#: src/protocols/bonjour/bonjour.c:554
-#: src/protocols/silc/silc.c:931
+#: ../src/protocols/bonjour/bonjour.c:576
+#: ../src/protocols/silc/silc.c:931
 msgid "Hostname"
 msgstr "Ime gostitelja"
 
 #. Creating the options for the protocol
 #. port to connect to
-#: src/protocols/bonjour/bonjour.c:558
-#: src/protocols/irc/irc.c:829
-#: src/protocols/msn/msn.c:1948
-#: src/protocols/napster/napster.c:720
-#: src/protocols/sametime/sametime.c:5520
-#: src/protocols/silc/silc.c:1856
+#: ../src/protocols/bonjour/bonjour.c:580
+#: ../src/protocols/irc/irc.c:901
+#: ../src/protocols/msn/msn.c:1957
+#: ../src/protocols/napster/napster.c:725
+#: ../src/protocols/sametime/sametime.c:5644
+#: ../src/protocols/silc/silc.c:1856
 msgid "Port"
 msgstr "Vrata"
 
-#: src/protocols/bonjour/bonjour.c:561
-#: src/protocols/gg/gg.c:562
-#: src/protocols/gg/gg.c:971
+#: ../src/protocols/bonjour/bonjour.c:583
+#: ../src/protocols/gg/gg.c:562
+#: ../src/protocols/gg/gg.c:971
 msgid "First name"
 msgstr "Ime"
 
-#: src/protocols/bonjour/bonjour.c:564
-#: src/protocols/gg/gg.c:557
+#: ../src/protocols/bonjour/bonjour.c:586
+#: ../src/protocols/gg/gg.c:557
 msgid "Last name"
 msgstr "Priimek"
 
-#: src/protocols/bonjour/bonjour.c:567
-#: src/protocols/jabber/buddy.c:261
-#: src/protocols/jabber/buddy.c:779
-#: src/protocols/jabber/buddy.c:787
-#: src/protocols/silc/silc.c:695
-#: src/protocols/silc/silc.c:935
-#: src/protocols/silc/util.c:512
-#: src/protocols/yahoo/yahoo_profile.c:1021
+#: ../src/protocols/bonjour/bonjour.c:589
+#: ../src/protocols/jabber/buddy.c:261
+#: ../src/protocols/jabber/buddy.c:779
+#: ../src/protocols/jabber/buddy.c:787
+#: ../src/protocols/silc/silc.c:695
+#: ../src/protocols/silc/silc.c:935
+#: ../src/protocols/silc/util.c:512
+#: ../src/protocols/yahoo/yahoo_profile.c:1030
 msgid "Email"
 msgstr "Elektronska pošta"
 
-#: src/protocols/bonjour/bonjour.h:35
-msgid "Bonjour"
-msgstr "Bonjour"
-
-#: src/protocols/gg/gg.c:80
-#: src/protocols/gg/gg.c:102
-#: src/protocols/gg/gg.c:137
+#: ../src/protocols/bonjour/jabber.c:357
+#, c-format
+msgid "%s has closed the conversation."
+msgstr "%s je zaprl pomenek."
+
+#: ../src/protocols/bonjour/jabber.c:439
+msgid "Cannot open socket"
+msgstr "Vtičnice ni mogoče odpreti"
+
+#: ../src/protocols/bonjour/jabber.c:447
+msgid "Error setting socket options"
+msgstr "Napaka pri nastavljanju možnosti vtičnice"
+
+#: ../src/protocols/bonjour/jabber.c:458
+msgid "Cannot bind socket to port"
+msgstr "Povezava vtičnice z vrati ni uspela"
+
+#: ../src/protocols/bonjour/jabber.c:465
+msgid "Cannot listen on socket"
+msgstr "Poslušanje vtičnice ni mogoče"
+
+#: ../src/protocols/bonjour/jabber.c:559
+msgid "Unable to send the message, the conversation couldn't be started."
+msgstr "Sporočila ni mogoče poslati, pogovora ni mogoče začeti."
+
+#: ../src/protocols/gg/gg.c:80
+#: ../src/protocols/gg/gg.c:102
+#: ../src/protocols/gg/gg.c:137
 msgid "Token Error"
 msgstr "Napaka žetona"
 
-#: src/protocols/gg/gg.c:81
-#: src/protocols/gg/gg.c:103
-#: src/protocols/gg/gg.c:138
+#: ../src/protocols/gg/gg.c:81
+#: ../src/protocols/gg/gg.c:103
+#: ../src/protocols/gg/gg.c:138
 msgid "Unable to fetch the token.\n"
 msgstr "Ni mogoče prenesti žetona.\n"
 
-#: src/protocols/gg/gg.c:226
-#: src/protocols/gg/gg.c:245
+#: ../src/protocols/gg/gg.c:226
+#: ../src/protocols/gg/gg.c:245
 msgid "Save Buddylist..."
 msgstr "Shrani seznam prijateljev ..."
 
-#: src/protocols/gg/gg.c:227
+#: ../src/protocols/gg/gg.c:227
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "Seznam prijateljev je prazen, v datoteko ni bilo nič zapisanega."
 
-#: src/protocols/gg/gg.c:233
-#: src/protocols/gg/gg.c:235
+#: ../src/protocols/gg/gg.c:233
+#: ../src/protocols/gg/gg.c:235
 msgid "Couldn't open file"
 msgstr "Ni mogoče odpreti datoteke"
 
-#: src/protocols/gg/gg.c:246
+#: ../src/protocols/gg/gg.c:246
 msgid "Buddylist saved successfully!"
 msgstr "Seznam prijateljev je bil uspešno shranjen!"
 
-#: src/protocols/gg/gg.c:264
-#: src/protocols/gg/gg.c:265
+#: ../src/protocols/gg/gg.c:264
+#: ../src/protocols/gg/gg.c:265
 msgid "Couldn't load buddylist"
 msgstr "Seznama prijateljev ni mogoče naložiti"
 
-#: src/protocols/gg/gg.c:281
+#: ../src/protocols/gg/gg.c:281
 msgid "Load Buddylist..."
 msgstr "Nalaganje seznama prijateljev ..."
 
-#: src/protocols/gg/gg.c:282
+#: ../src/protocols/gg/gg.c:282
 msgid "Buddylist loaded successfully!"
 msgstr "Seznam prijateljev je bil uspešno naložen"
 
-#: src/protocols/gg/gg.c:293
+#: ../src/protocols/gg/gg.c:293
 msgid "Save buddylist..."
 msgstr "Shrani seznam prijateljev ..."
 
-#: src/protocols/gg/gg.c:337
+#: ../src/protocols/gg/gg.c:337
 msgid "Fill in the registration fields."
 msgstr "Izpolnite polja za registracijo."
 
-#: src/protocols/gg/gg.c:342
+#: ../src/protocols/gg/gg.c:342
 msgid "Passwords do not match."
 msgstr "Gesli se ne ujemata."
 
-#: src/protocols/gg/gg.c:351
+#: ../src/protocols/gg/gg.c:351
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "Novega računa ni bilo mogoče registrirati. Prišlo je do napake.\n"
 
-#: src/protocols/gg/gg.c:364
+#: ../src/protocols/gg/gg.c:364
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Nov račun Gadu-Gadu je registriran"
 
-#: src/protocols/gg/gg.c:365
+#: ../src/protocols/gg/gg.c:365
 msgid "Registration completed successfully!"
 msgstr "Registracija je uspela!"
 
-#: src/protocols/gg/gg.c:425
+#: ../src/protocols/gg/gg.c:425
 msgid "e-Mail"
 msgstr "E-pošta"
 
-#: src/protocols/gg/gg.c:430
-#: src/protocols/gg/gg.c:704
-#: src/protocols/jabber/jabber.c:680
-#: src/protocols/jabber/jabber.c:1220
+#: ../src/protocols/gg/gg.c:430
+#: ../src/protocols/gg/gg.c:704
+#: ../src/protocols/jabber/jabber.c:749
+#: ../src/protocols/jabber/jabber.c:1310
 msgid "Password"
 msgstr "Geslo"
 
-#: src/protocols/gg/gg.c:435
-#: src/protocols/gg/gg.c:709
+#: ../src/protocols/gg/gg.c:435
+#: ../src/protocols/gg/gg.c:709
 msgid "Password (retype)"
 msgstr "Geslo (ponovno vtipkajte)"
 
-#: src/protocols/gg/gg.c:440
-#: src/protocols/gg/gg.c:714
+#: ../src/protocols/gg/gg.c:440
+#: ../src/protocols/gg/gg.c:714
 msgid "Enter current token"
 msgstr "Vnesite trenutni žeton"
 
-#: src/protocols/gg/gg.c:446
-#: src/protocols/gg/gg.c:720
+#: ../src/protocols/gg/gg.c:446
+#: ../src/protocols/gg/gg.c:720
 msgid "Current token"
 msgstr "Trenutni žeton"
 
-#: src/protocols/gg/gg.c:450
-#: src/protocols/gg/gg.c:451
+#: ../src/protocols/gg/gg.c:450
+#: ../src/protocols/gg/gg.c:451
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registrirajte nov račun za Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:452
+#: ../src/protocols/gg/gg.c:452
 msgid "Please, fill in the following fields"
 msgstr "Prosimo, izpolnite naslednja polja"
 
-#: src/protocols/gg/gg.c:547
-#: src/protocols/gg/gg.c:1610
+#: ../src/protocols/gg/gg.c:547
+#: ../src/protocols/gg/gg.c:1610
 msgid "Unable to initiate a new search"
 msgstr "Novega iskanja ni mogoče začeti"
 
-#: src/protocols/gg/gg.c:548
-#: src/protocols/gg/gg.c:1611
+#: ../src/protocols/gg/gg.c:548
+#: ../src/protocols/gg/gg.c:1611
 msgid "You have a pending search. Please wait for it to finish."
 msgstr "Imate iskanje na čakanju. Prosimo, da počakate na njegovo izvršitev."
 
-#: src/protocols/gg/gg.c:567
-#: src/protocols/gg/gg.c:974
-#: src/protocols/gg/gg.c:1997
-#: src/protocols/jabber/buddy.c:252
-#: src/protocols/jabber/buddy.c:695
-#: src/protocols/jabber/buddy.c:1395
-#: src/protocols/jabber/jabber.c:696
-#: 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
-#: src/protocols/yahoo/yahoo_profile.c:1026
+#: ../src/protocols/gg/gg.c:567
+#: ../src/protocols/gg/gg.c:974
+#: ../src/protocols/gg/gg.c:1997
+#: ../src/protocols/jabber/buddy.c:252
+#: ../src/protocols/jabber/buddy.c:695
+#: ../src/protocols/jabber/buddy.c:1395
+#: ../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
+#: ../src/protocols/yahoo/yahoo_profile.c:1035
 msgid "Nickname"
 msgstr "Vzdevek"
 
-#: src/protocols/gg/gg.c:572
-#: src/protocols/gg/gg.c:977
-#: src/protocols/jabber/jabber.c:716
-#: src/protocols/oscar/oscar.c:6176
-#: src/protocols/oscar/oscar.c:6184
+#: ../src/protocols/gg/gg.c:572
+#: ../src/protocols/gg/gg.c:977
+#: ../src/protocols/jabber/jabber.c:785
+#: ../src/protocols/oscar/oscar.c:6153
+#: ../src/protocols/oscar/oscar.c:6161
 msgid "City"
 msgstr "Kraj"
 
-#: src/protocols/gg/gg.c:577
+#: ../src/protocols/gg/gg.c:577
 msgid "Year of birth"
 msgstr "Leto rojstva"
 
-#: src/protocols/gg/gg.c:580
-#: src/protocols/msn/msn.c:1529
-#: src/protocols/oscar/oscar.c:6149
-#: src/protocols/yahoo/yahoo_profile.c:1051
+#: ../src/protocols/gg/gg.c:580
+#: ../src/protocols/msn/msn.c:1538
+#: ../src/protocols/oscar/oscar.c:6127
+#: ../src/protocols/yahoo/yahoo_profile.c:1060
 msgid "Gender"
 msgstr "Spol"
 
-#: src/protocols/gg/gg.c:581
+#: ../src/protocols/gg/gg.c:581
 msgid "Male or female"
 msgstr "Moški ali ženska"
 
-#: src/protocols/gg/gg.c:582
-#: src/protocols/oscar/oscar.c:6149
+#: ../src/protocols/gg/gg.c:582
+#: ../src/protocols/oscar/oscar.c:6127
 msgid "Male"
 msgstr "Moški"
 
-#: src/protocols/gg/gg.c:583
-#: src/protocols/oscar/oscar.c:6149
+#: ../src/protocols/gg/gg.c:583
+#: ../src/protocols/oscar/oscar.c:6127
 msgid "Female"
 msgstr "Ženska"
 
-#: src/protocols/gg/gg.c:587
+#: ../src/protocols/gg/gg.c:587
 msgid "Only online"
 msgstr "Le prisoten"
 
-#: src/protocols/gg/gg.c:591
-#: src/protocols/gg/gg.c:592
+#: ../src/protocols/gg/gg.c:591
+#: ../src/protocols/gg/gg.c:592
 msgid "Find buddies"
 msgstr "Poišči prijatelje"
 
-#: src/protocols/gg/gg.c:593
+#: ../src/protocols/gg/gg.c:593
 msgid "Please, enter your search criteria below"
 msgstr "Spodaj vnesite svoje iskalne pogoje"
 
-#: src/protocols/gg/gg.c:630
+#: ../src/protocols/gg/gg.c:630
 msgid "Fill in the fields."
 msgstr "Izpolnite polja."
 
-#: src/protocols/gg/gg.c:642
+#: ../src/protocols/gg/gg.c:642
 msgid "Your current password is different from the one that you specified."
 msgstr "Vaše veljavno geslo se razlikuje od navedenega."
 
-#: src/protocols/gg/gg.c:656
+#: ../src/protocols/gg/gg.c:656
 msgid "Unable to change password. Error occured.\n"
 msgstr "Gesla ni bilo mogoče spremeniti. Prišlo je do napake.\n"
 
-#: src/protocols/gg/gg.c:665
+#: ../src/protocols/gg/gg.c:665
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Spremeni geslo za račun Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:666
+#: ../src/protocols/gg/gg.c:666
 msgid "Password was changed successfully!"
 msgstr "Geslo je bilo uspešno spremenjeno!"
 
-#: src/protocols/gg/gg.c:699
+#: ../src/protocols/gg/gg.c:699
 msgid "Current password"
 msgstr "Trenutno geslo"
 
-#: src/protocols/gg/gg.c:724
+#: ../src/protocols/gg/gg.c:724
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Vnesite svoje obstoječe in novo geslo za UIN:"
 
-#: src/protocols/gg/gg.c:728
-#: src/protocols/gg/gg.c:729
+#: ../src/protocols/gg/gg.c:728
+#: ../src/protocols/gg/gg.c:729
 msgid "Change Gadu-Gadu Password"
 msgstr "Spremeni geslo Gadu-Gadu"
 
 #. TODO: s/screenname/alias/
-#: src/protocols/gg/gg.c:804
+#: ../src/protocols/gg/gg.c:804
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Izberite klepet za prijatelja: %s"
 
-#: src/protocols/gg/gg.c:807
-#: src/protocols/gg/gg.c:808
+#: ../src/protocols/gg/gg.c:807
+#: ../src/protocols/gg/gg.c:808
 msgid "Add to chat..."
 msgstr "Dodaj k pomenku ..."
 
-#: src/protocols/gg/gg.c:950
+#: ../src/protocols/gg/gg.c:950
 msgid "No matching users found"
 msgstr "Ni najdenih uporabnikov"
 
-#: src/protocols/gg/gg.c:951
+#: ../src/protocols/gg/gg.c:951
 msgid "There are no users matching your search criteria."
 msgstr "Noben uporabnik ne ustreza iskalnim pogojem."
 
-#: src/protocols/gg/gg.c:962
-#: src/protocols/gg/gg.c:1029
-#: src/protocols/oscar/oscar.c:6287
+#: ../src/protocols/gg/gg.c:962
+#: ../src/protocols/gg/gg.c:1029
+#: ../src/protocols/oscar/oscar.c:6264
 msgid "Unable to display the search results."
 msgstr "Rezultatov iskanja ni mogoče izpisati."
 
-#: src/protocols/gg/gg.c:968
-#: src/protocols/oscar/oscar.c:6121
+#: ../src/protocols/gg/gg.c:968
+#: ../src/protocols/oscar/oscar.c:6099
 msgid "UIN"
 msgstr "UIN"
 
-#: src/protocols/gg/gg.c:980
+#: ../src/protocols/gg/gg.c:980
 msgid "Birth year"
 msgstr "Leto rojstva"
 
-#: src/protocols/gg/gg.c:1020
+#: ../src/protocols/gg/gg.c:1020
 msgid "Gadu-Gadu Public Directory"
 msgstr "Javni imenik Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1021
+#: ../src/protocols/gg/gg.c:1021
 msgid "Search results"
 msgstr "Rezultati iskanja"
 
-#: src/protocols/gg/gg.c:1118
-#: src/protocols/gg/gg.c:1265
+#: ../src/protocols/gg/gg.c:1118
+#: ../src/protocols/gg/gg.c:1265
 msgid "Unable to read socket"
 msgstr "Ne morem brati vtičnice"
 
-#: src/protocols/gg/gg.c:1201
+#: ../src/protocols/gg/gg.c:1201
 msgid "Buddy list downloaded"
 msgstr "Seznam prijateljev prenesen"
 
-#: src/protocols/gg/gg.c:1202
+#: ../src/protocols/gg/gg.c:1202
 msgid "Your buddy list was downloaded from the server."
 msgstr "Vaš seznam prijateljev je bil prenesen s strežnika."
 
-#: src/protocols/gg/gg.c:1209
+#: ../src/protocols/gg/gg.c:1209
 msgid "Buddy list uploaded"
 msgstr "Seznam prijateljev prenesen"
 
-#: src/protocols/gg/gg.c:1210
+#: ../src/protocols/gg/gg.c:1210
 msgid "Your buddy list was stored on the server."
 msgstr "Seznam prijateljev je bil shranjen na strežniku."
 
-#: src/protocols/gg/gg.c:1311
-#: src/protocols/gg/gg.c:1532
+#: ../src/protocols/gg/gg.c:1311
+#: ../src/protocols/gg/gg.c:1532
 msgid "Connection failed."
 msgstr "Povezava ni uspela."
 
-#: src/protocols/gg/gg.c:1445
-#: src/protocols/msn/msn.c:566
+#: ../src/protocols/gg/gg.c:1445
+#: ../src/protocols/msn/msn.c:566
 msgid "Blocked"
 msgstr "Zavrnjeno"
 
-#: src/protocols/gg/gg.c:1468
+#: ../src/protocols/gg/gg.c:1468
 msgid "Add to chat"
 msgstr "Dodaj k pomenku"
 
-#: src/protocols/gg/gg.c:1477
+#: ../src/protocols/gg/gg.c:1477
 msgid "Unblock"
 msgstr "Prekliči zavrnitev"
 
-#: src/protocols/gg/gg.c:1481
+#: ../src/protocols/gg/gg.c:1481
 msgid "Block"
 msgstr "Zavrni"
 
-#: src/protocols/gg/gg.c:1498
+#: ../src/protocols/gg/gg.c:1498
 msgid "Chat _name:"
 msgstr "_Ime za klepet:"
 
-#: src/protocols/gg/gg.c:1724
+#: ../src/protocols/gg/gg.c:1724
 msgid "Chat error"
 msgstr "Napaka pri pomenku"
 
-#: src/protocols/gg/gg.c:1725
+#: ../src/protocols/gg/gg.c:1725
 msgid "This chat name is already in use"
 msgstr "Ime za pomenek že obstaja"
 
-#: src/protocols/gg/gg.c:1808
+#: ../src/protocols/gg/gg.c:1808
 msgid "Not connected to the server."
 msgstr "S strežnikom niste povezani."
 
-#: src/protocols/gg/gg.c:1831
+#: ../src/protocols/gg/gg.c:1831
 msgid "Find buddies..."
 msgstr "Poišči prijatelje ..."
 
-#: src/protocols/gg/gg.c:1837
+#: ../src/protocols/gg/gg.c:1837
 msgid "Change password..."
 msgstr "Spremeni geslo ..."
 
-#: src/protocols/gg/gg.c:1843
+#: ../src/protocols/gg/gg.c:1843
 msgid "Upload buddylist to Server"
 msgstr "Izvozi seznam prijateljev na strežnik"
 
-#: src/protocols/gg/gg.c:1847
+#: ../src/protocols/gg/gg.c:1847
 msgid "Download buddylist from Server"
 msgstr "Uvozi seznam prijateljev s strežnika"
 
-#: src/protocols/gg/gg.c:1851
+#: ../src/protocols/gg/gg.c:1851
 msgid "Delete buddylist from Server"
 msgstr "Izbriši seznam prijateljev na strežniku"
 
-#: src/protocols/gg/gg.c:1855
+#: ../src/protocols/gg/gg.c:1855
 msgid "Save buddylist to file..."
 msgstr "Shrani seznam prijateljev v datoteko ..."
 
-#: src/protocols/gg/gg.c:1859
+#: ../src/protocols/gg/gg.c:1859
 msgid "Load buddylist from file..."
 msgstr "Uvozi seznam prijateljev iz datoteke ..."
 
@@ -5892,137 +6050,138 @@
 #. id
 #. name
 #. version
-#: src/protocols/gg/gg.c:1949
+#: ../src/protocols/gg/gg.c:1949
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Dodatek za protokol Gadu-Gadu"
 
 #. summary
-#: src/protocols/gg/gg.c:1950
+#: ../src/protocols/gg/gg.c:1950
 msgid "Polish popular IM"
 msgstr "Olepšaj priljubljen program za neposredno sporočanje"
 
-#: src/protocols/gg/gg.c:1998
+#: ../src/protocols/gg/gg.c:1998
 msgid "Gadu-Gadu User"
 msgstr "Uporabnik Gadu-Gadu"
 
-#: src/protocols/irc/cmds.c:43
-#: src/protocols/silc/silc.c:1582
+#: ../src/protocols/irc/cmds.c:43
+#: ../src/protocols/silc/silc.c:1582
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Neznan ukaz: %s"
 
-#: src/protocols/irc/cmds.c:482
-#: src/protocols/jabber/chat.c:592
-#: src/protocols/silc/silc.c:1290
+#: ../src/protocols/irc/cmds.c:482
+#: ../src/protocols/jabber/chat.c:592
+#: ../src/protocols/silc/silc.c:1290
 #, c-format
 msgid "current topic is: %s"
 msgstr "trenutna tema je: %s"
 
-#: src/protocols/irc/cmds.c:486
-#: src/protocols/jabber/chat.c:596
-#: src/protocols/silc/silc.c:1294
+#: ../src/protocols/irc/cmds.c:486
+#: ../src/protocols/jabber/chat.c:596
+#: ../src/protocols/silc/silc.c:1294
 msgid "No topic is set"
 msgstr "Ni teme"
 
-#: src/protocols/irc/dcc_send.c:278
-#: src/protocols/irc/dcc_send.c:317
-#: src/protocols/yahoo/yahoo_filexfer.c:173
-#: src/protocols/yahoo/yahoo_filexfer.c:182
-#: src/protocols/yahoo/yahoo_filexfer.c:191
+#: ../src/protocols/irc/dcc_send.c:287
+#: ../src/protocols/irc/dcc_send.c:326
+#: ../src/protocols/yahoo/yahoo_filexfer.c:252
+#: ../src/protocols/yahoo/yahoo_filexfer.c:261
+#: ../src/protocols/yahoo/yahoo_filexfer.c:270
 msgid "File Transfer Failed"
 msgstr "Prenos datoteke ni uspel"
 
-#: src/protocols/irc/dcc_send.c:279
-#: src/protocols/irc/dcc_send.c:318
+#: ../src/protocols/irc/dcc_send.c:288
+#: ../src/protocols/irc/dcc_send.c:327
 msgid "Gaim could not open a listening port."
 msgstr "Gaim ni mogel odprti vrat za poslušanje."
 
-#: src/protocols/irc/irc.c:78
+#: ../src/protocols/irc/irc.c:78
 msgid "Error displaying MOTD"
 msgstr "Napaka pri prikazovanju MOTD"
 
-#: src/protocols/irc/irc.c:78
+#: ../src/protocols/irc/irc.c:78
 msgid "No MOTD available"
 msgstr "MOTD ni na voljo"
 
-#: src/protocols/irc/irc.c:79
+#: ../src/protocols/irc/irc.c:79
 msgid "There is no MOTD associated with this connection."
 msgstr "Noben MOTD ni povezan s to povezavo."
 
-#: src/protocols/irc/irc.c:82
+#: ../src/protocols/irc/irc.c:82
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD za %s"
 
-#: src/protocols/irc/irc.c:102
-#: src/protocols/irc/irc.c:535
-#: src/protocols/irc/irc.c:557
+#: ../src/protocols/irc/irc.c:119
+#: ../src/protocols/irc/irc.c:149
+#: ../src/protocols/irc/irc.c:604
+#: ../src/protocols/irc/irc.c:629
 msgid "Server has disconnected"
 msgstr "Strežnik ni več povezan"
 
-#: src/protocols/irc/irc.c:186
+#: ../src/protocols/irc/irc.c:242
 msgid "View MOTD"
 msgstr "Ogled MOTD"
 
-#: src/protocols/irc/irc.c:198
-#: src/protocols/silc/chat.c:33
+#: ../src/protocols/irc/irc.c:254
+#: ../src/protocols/silc/chat.c:33
 msgid "_Channel:"
 msgstr "_Kanal:"
 
-#: src/protocols/irc/irc.c:204
-#: src/protocols/jabber/chat.c:59
+#: ../src/protocols/irc/irc.c:260
+#: ../src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "_Geslo:"
 
-#: src/protocols/irc/irc.c:236
+#: ../src/protocols/irc/irc.c:292
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC vzdevki ne smejo vsebovati presledka"
 
-#: src/protocols/irc/irc.c:264
-#: src/protocols/jabber/jabber.c:481
-#: src/protocols/jabber/jabber.c:818
+#: ../src/protocols/irc/irc.c:321
+#: ../src/protocols/jabber/jabber.c:550
+#: ../src/protocols/jabber/jabber.c:890
 msgid "SSL support unavailable"
 msgstr "Podpora SSL ni na voljo"
 
-#: src/protocols/irc/irc.c:275
-#: src/protocols/simple/simple.c:403
-#: src/protocols/simple/simple.c:1272
+#: ../src/protocols/irc/irc.c:333
+#: ../src/protocols/simple/simple.c:456
+#: ../src/protocols/simple/simple.c:1427
 msgid "Couldn't create socket"
 msgstr "Vtičnice ni bilo mogoče ustvariti"
 
-#: src/protocols/irc/irc.c:346
-#: src/protocols/jabber/jabber.c:354
-#: src/protocols/oscar/oscar.c:1788
-#: src/protocols/oscar/oscar.c:1856
+#: ../src/protocols/irc/irc.c:404
+#: ../src/protocols/jabber/jabber.c:421
+#: ../src/protocols/oscar/oscar.c:1803
+#: ../src/protocols/oscar/oscar.c:1870
 msgid "Couldn't connect to host"
-msgstr "Nisem se mogel povezati do gostitelja"
-
-#: src/protocols/irc/irc.c:371
-#: src/protocols/jabber/jabber.c:381
+msgstr "Povezava do gostitelja ni uspela"
+
+#: ../src/protocols/irc/irc.c:429
+#: ../src/protocols/jabber/jabber.c:448
 msgid "Connection Failed"
 msgstr "Povezava ni uspela"
 
-#: src/protocols/irc/irc.c:374
-#: src/protocols/jabber/jabber.c:384
+#: ../src/protocols/irc/irc.c:432
+#: ../src/protocols/jabber/jabber.c:451
 msgid "SSL Handshake Failed"
 msgstr "Rokovanje SSL ni uspelo"
 
-#: src/protocols/irc/irc.c:532
-#: src/protocols/irc/irc.c:554
+#: ../src/protocols/irc/irc.c:601
+#: ../src/protocols/irc/irc.c:626
 msgid "Read error"
 msgstr "Napaka pri branju"
 
-#: src/protocols/irc/irc.c:693
-#: src/protocols/silc/chat.c:1420
-#: src/protocols/yahoo/yahoochat.c:1397
+#: ../src/protocols/irc/irc.c:765
+#: ../src/protocols/silc/chat.c:1420
+#: ../src/protocols/yahoo/yahoochat.c:1430
 msgid "Users"
 msgstr "Uporabniki"
 
-#: src/protocols/irc/irc.c:696
-#: src/protocols/sametime/sametime.c:3306
-#: src/protocols/silc/chat.c:1423
-#: src/protocols/silc/ops.c:1380
-#: src/protocols/yahoo/yahoochat.c:1406
+#: ../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/yahoo/yahoochat.c:1439
 msgid "Topic"
 msgstr "Tema"
 
@@ -6034,44 +6193,44 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:806
+#: ../src/protocols/irc/irc.c:878
 msgid "IRC Protocol Plugin"
 msgstr "Vstavek za protokol IRC"
 
 #. *  summary
-#: src/protocols/irc/irc.c:807
+#: ../src/protocols/irc/irc.c:879
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Vstavek za protokol IRC, ki je manj beden"
 
 #. host to connect to
-#: src/protocols/irc/irc.c:826
-#: src/protocols/irc/msgs.c:231
-#: src/protocols/jabber/jabber.c:1788
-#: src/protocols/napster/napster.c:715
-#: src/protocols/sametime/sametime.c:5515
-#: src/protocols/silc/ops.c:1242
-#: src/protocols/silc/ops.c:1344
-#: src/protocols/simple/simple.c:1497
+#: ../src/protocols/irc/irc.c:898
+#: ../src/protocols/irc/msgs.c:231
+#: ../src/protocols/jabber/jabber.c:1909
+#: ../src/protocols/napster/napster.c:720
+#: ../src/protocols/sametime/sametime.c:5639
+#: ../src/protocols/silc/ops.c:1242
+#: ../src/protocols/silc/ops.c:1344
+#: ../src/protocols/simple/simple.c:1663
 msgid "Server"
 msgstr "Strežnik"
 
-#: src/protocols/irc/irc.c:832
+#: ../src/protocols/irc/irc.c:904
 msgid "Encodings"
 msgstr "Kodiranje znakov"
 
-#: src/protocols/irc/irc.c:835
-#: src/protocols/irc/msgs.c:225
-#: src/protocols/jabber/jabber.c:676
-#: 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:929
+#: ../src/protocols/irc/irc.c:907
+#: ../src/protocols/irc/msgs.c:225
+#: ../src/protocols/jabber/jabber.c:745
+#: ../src/protocols/silc/buddy.c:1531
+#: ../src/protocols/silc/ops.c:1189
+#: ../src/protocols/silc/ops.c:1191
+#: ../src/protocols/silc/ops.c:1338
+#: ../src/protocols/silc/ops.c:1340
+#: ../src/protocols/silc/silc.c:929
 msgid "Username"
 msgstr "Uporabniško ime"
 
-#: src/protocols/irc/irc.c:838
+#: ../src/protocols/irc/irc.c:910
 msgid "Real name"
 msgstr "Resnično ime"
 
@@ -6079,1167 +6238,1183 @@
 #. option = gaim_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: src/protocols/irc/irc.c:846
+#: ../src/protocols/irc/irc.c:918
 msgid "Use SSL"
 msgstr "Uporabi SSL"
 
-#: src/protocols/irc/msgs.c:103
+#: ../src/protocols/irc/msgs.c:103
 msgid "Bad mode"
 msgstr "Neveljaven način"
 
-#: src/protocols/irc/msgs.c:114
+#: ../src/protocols/irc/msgs.c:114
 #, c-format
 msgid "You are banned from %s."
 msgstr "Na kanalu %s ste prepovedani."
 
-#: src/protocols/irc/msgs.c:115
+#: ../src/protocols/irc/msgs.c:115
 msgid "Banned"
 msgstr "Prepovedani"
 
-#: src/protocols/irc/msgs.c:132
+#: ../src/protocols/irc/msgs.c:132
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "Prepovedati %s ni možno: seznam prepovedanih je poln"
 
-#: src/protocols/irc/msgs.c:211
-#: src/protocols/irc/msgs.c:231
-#: src/protocols/irc/msgs.c:244
+#: ../src/protocols/irc/msgs.c:211
+#: ../src/protocols/irc/msgs.c:231
+#: ../src/protocols/irc/msgs.c:244
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: src/protocols/irc/msgs.c:211
-#: src/protocols/oscar/oscar.c:6122
-#: src/protocols/silc/ops.c:1412
+#: ../src/protocols/irc/msgs.c:211
+#: ../src/protocols/oscar/oscar.c:6100
+#: ../src/protocols/silc/ops.c:1412
 msgid "Nick"
 msgstr "Vzdevek"
 
-#: src/protocols/irc/msgs.c:214
+#: ../src/protocols/irc/msgs.c:214
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: src/protocols/irc/msgs.c:215
+#: ../src/protocols/irc/msgs.c:215
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</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/yahoo/yahoo_profile.c:682
+#: ../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/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:1031
+#: ../src/protocols/irc/msgs.c:226
+#: ../src/protocols/silc/ops.c:1183
+#: ../src/protocols/silc/ops.c:1332
+#: ../src/protocols/yahoo/yahoo_profile.c:1040
 msgid "Realname"
 msgstr "Pravo ime"
 
-#: src/protocols/irc/msgs.c:237
-#: src/protocols/silc/ops.c:1255
+#: ../src/protocols/irc/msgs.c:237
+#: ../src/protocols/silc/ops.c:1255
 msgid "Currently on"
 msgstr "Trenutno na"
 
-#: src/protocols/irc/msgs.c:242
+#: ../src/protocols/irc/msgs.c:242
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>Nedejaven že:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:244
+#: ../src/protocols/irc/msgs.c:244
 msgid "Online since"
 msgstr "Prijavljen od"
 
-#: src/protocols/irc/msgs.c:247
+#: ../src/protocols/irc/msgs.c:248
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>Ukrasni pridevek:</b> Supersploh<br>"
 
-#: src/protocols/irc/msgs.c:315
+#: ../src/protocols/irc/msgs.c:316
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s je spremenil temo kanala na: %s"
 
-#: src/protocols/irc/msgs.c:320
+#: ../src/protocols/irc/msgs.c:321
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Tema za kanal %s je: %s"
 
-#: src/protocols/irc/msgs.c:337
+#: ../src/protocols/irc/msgs.c:338
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Neznano sporočilo '%s'"
 
-#: src/protocols/irc/msgs.c:338
+#: ../src/protocols/irc/msgs.c:339
 msgid "Unknown message"
 msgstr "Neznano sporočilo"
 
-#: src/protocols/irc/msgs.c:338
+#: ../src/protocols/irc/msgs.c:339
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim je poslal sporočilo, ki ga IRC strežnik ni prepoznal."
 
-#: src/protocols/irc/msgs.c:361
+#: ../src/protocols/irc/msgs.c:362
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Uporabniki na %s: %s"
 
-#: src/protocols/irc/msgs.c:489
+#: ../src/protocols/irc/msgs.c:490
 msgid "Time Response"
 msgstr "Časovni odziv"
 
-#: src/protocols/irc/msgs.c:490
+#: ../src/protocols/irc/msgs.c:491
 msgid "The IRC server's local time is:"
 msgstr "Krajevni čas strežnika IRC je:"
 
-#: src/protocols/irc/msgs.c:501
+#: ../src/protocols/irc/msgs.c:502
 msgid "No such channel"
 msgstr "Ta kanal ne obstaja"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:512
+#: ../src/protocols/irc/msgs.c:513
 msgid "no such channel"
 msgstr "ta kanal ne obstaja"
 
-#: src/protocols/irc/msgs.c:515
+#: ../src/protocols/irc/msgs.c:516
 msgid "User is not logged in"
 msgstr "Uporabnik ni prijavljen"
 
-#: src/protocols/irc/msgs.c:520
+#: ../src/protocols/irc/msgs.c:521
 msgid "No such nick or channel"
 msgstr "Tak kanal ali vzdevek ne obstaja"
 
-#: src/protocols/irc/msgs.c:540
+#: ../src/protocols/irc/msgs.c:541
 msgid "Could not send"
 msgstr "Ni bilo mogoče poslati"
 
-#: src/protocols/irc/msgs.c:596
+#: ../src/protocols/irc/msgs.c:597
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Pridruževanje kanalu %s zahteva povabilo."
 
-#: src/protocols/irc/msgs.c:597
+#: ../src/protocols/irc/msgs.c:598
 msgid "Invitation only"
 msgstr "Samo na povabilo"
 
-#: src/protocols/irc/msgs.c:698
+#: ../src/protocols/irc/msgs.c:699
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Brcnil vas je %s: (%s)"
 
 #. Remove user from channel
-#: src/protocols/irc/msgs.c:703
-#: src/protocols/silc/ops.c:721
+#: ../src/protocols/irc/msgs.c:704
+#: ../src/protocols/silc/ops.c:721
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Brcnil vas je %s (%s)"
 
-#: src/protocols/irc/msgs.c:726
+#: ../src/protocols/irc/msgs.c:727
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "način (%s %s) nastavil %s"
 
-#: src/protocols/irc/msgs.c:811
-#: src/protocols/irc/msgs.c:812
+#: ../src/protocols/irc/msgs.c:812
+#: ../src/protocols/irc/msgs.c:813
 msgid "Invalid nickname"
 msgstr "Neveljaven vzdevek"
 
-#: src/protocols/irc/msgs.c:813
+#: ../src/protocols/irc/msgs.c:814
 msgid "Your selected nickname was rejected by the server.  It probably contains invalid characters."
 msgstr "Vaš izbrani vzdevek je strežnik zavrnil. Najverjetneje vsebuje neveljavne znake."
 
-#: src/protocols/irc/msgs.c:817
+#: ../src/protocols/irc/msgs.c:818
 msgid "Your selected account name was rejected by the server.  It probably contains invalid characters."
 msgstr "Vaše izbrano ime računa je strežnik zavrnil. Najverjetneje vsebuje neveljavne znake."
 
-#: src/protocols/irc/msgs.c:857
+#: ../src/protocols/irc/msgs.c:858
 msgid "Cannot change nick"
 msgstr "Vzdevka ne morem spremeniti"
 
-#: src/protocols/irc/msgs.c:857
+#: ../src/protocols/irc/msgs.c:858
 msgid "Could not change nick"
 msgstr "Vzdevka ni bilo mogoče spremeniti"
 
-#: src/protocols/irc/msgs.c:878
+#: ../src/protocols/irc/msgs.c:879
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Zapustili ste kanal%s%s"
 
-#: src/protocols/irc/msgs.c:920
+#: ../src/protocols/irc/msgs.c:921
 msgid "Error: invalid PONG from server"
 msgstr "Napaka: Neveljaven PONG odgovor strežnika"
 
-#: src/protocols/irc/msgs.c:922
+#: ../src/protocols/irc/msgs.c:923
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING odgovor - Zakasnitev: %lu sekund"
 
-#: src/protocols/irc/msgs.c:997
+#: ../src/protocols/irc/msgs.c:998
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Ne morem se pridružiti %s:"
 
-#: src/protocols/irc/msgs.c:998
-#: src/protocols/silc/ops.c:1128
+#: ../src/protocols/irc/msgs.c:999
+#: ../src/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Ne morem se pridružiti kanalu"
 
-#: src/protocols/irc/msgs.c:1032
+#: ../src/protocols/irc/msgs.c:1033
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Nadimek ali kanal je trenutno nedostopen."
 
-#: src/protocols/irc/msgs.c:1044
+#: ../src/protocols/irc/msgs.c:1045
 #, c-format
 msgid "Wallops from %s"
 msgstr "Močni udarci od %s"
 
-#: src/protocols/irc/parse.c:114
+#: ../src/protocols/irc/parse.c:114
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "dejanje &lt;dejanje za izvedbo&gt;:  Izvedi dejanje."
 
-#: src/protocols/irc/parse.c:115
+#: ../src/protocols/irc/parse.c:115
 msgid "away [message]:  Set an away message, or use no message to return from being away."
 msgstr "odsoten [sporočilo]:  Nastavite sporočilo za odsotnost ali ne uporabite sporočila za vrnitev iz odsotnosti."
 
-#: src/protocols/irc/parse.c:116
+#: ../src/protocols/irc/parse.c:116
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv:  pošlji ukaz chanservu"
 
-#: src/protocols/irc/parse.c:117
+#: ../src/protocols/irc/parse.c:117
 msgid "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from someone. You must be a channel operator to do this."
 msgstr "deop &lt;vzdevek1&gt; [vzdevek2] ...:  Odstrani status operaterja kanala nekomu. Za to dejanje morate biti operater kanala."
 
-#: src/protocols/irc/parse.c:118
+#: ../src/protocols/irc/parse.c:118
 msgid "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from someone, preventing them from speaking if the channel is moderated (+m). You must be a channel operator to do this."
 msgstr "devoice &lt;nick1&gt; [nick2] ...:  Odstrani glasovni status kanala nekomu, kar mu bo preprečilo oglašanje, ko je kanal moderiran (+m). Za to dejanje morate biti operater kanala."
 
-#: src/protocols/irc/parse.c:119
+#: ../src/protocols/irc/parse.c:119
 msgid "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified channel, or the current channel."
 msgstr "invite &lt;vzdevek&gt; [soba]: Povabite nekoga, da se vam pridruži v navedenem ali trenutnem kanalu."
 
-#: src/protocols/irc/parse.c:120
+#: ../src/protocols/irc/parse.c:120
 msgid "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
 msgstr "j &lt;soba1&gt;[,soba2][,...] [ključ1[,ključ2][,...]]:  Vnesite enega ali več kanalov, za ketere lahko po želji navedete tudi ključe."
 
-#: src/protocols/irc/parse.c:121
+#: ../src/protocols/irc/parse.c:121
 msgid "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
 msgstr "join &lt;soba1&gt;[,soba2][,...] [ključ1[,ključ2][,...]]:  Vnesite enega ali več kanalov, za ketere lahko po želji navedete tudi ključe."
 
-#: src/protocols/irc/parse.c:122
+#: ../src/protocols/irc/parse.c:122
 msgid "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a channel operator to do this."
 msgstr "kick &lt;vzdevek&gt; [sporočilo]:  Odstranite nekoga iz kanala. Za to dejanje morate biti operater kanala."
 
-#: src/protocols/irc/parse.c:123
+#: ../src/protocols/irc/parse.c:123
 msgid "list:  Display a list of chat rooms on the network. <i>Warning, some servers may disconnect you upon doing this.</i>"
 msgstr "list:  Prikaži seznam pogovornih sob v omrežju. <i>Opozorilo: nekateri strežniki vas lahko med tem odklopijo.</i>"
 
-#: src/protocols/irc/parse.c:124
+#: ../src/protocols/irc/parse.c:124
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;dejanje za izvedbo&gt;:  Izvedi dejanje."
 
-#: src/protocols/irc/parse.c:125
+#: ../src/protocols/irc/parse.c:125
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv:  Pošlji ukaz memoservu"
 
-#: src/protocols/irc/parse.c:126
+#: ../src/protocols/irc/parse.c:126
 msgid "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel or user mode."
 msgstr "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;vzdevek|kanal&gt;:  Nastavi ali razveljavi način uporabnika ali kanala."
 
-#: src/protocols/irc/parse.c:127
+#: ../src/protocols/irc/parse.c:127
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
 msgstr "msg &lt;vzdevek&gt; &lt;sporočilo&gt;:  Pošlji zasebno sporočilo uporabniku (za razliko od kanala)."
 
-#: src/protocols/irc/parse.c:128
+#: ../src/protocols/irc/parse.c:128
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [kanal]:  Seznam uporabnikov, ki so trenutno na kanalu."
 
-#: src/protocols/irc/parse.c:129
-#: src/protocols/jabber/jabber.c:1631
+#: ../src/protocols/irc/parse.c:129
+#: ../src/protocols/jabber/jabber.c:1746
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nov vzdevek&gt;:  Spremenite vaš vzdevek."
 
-#: src/protocols/irc/parse.c:130
+#: ../src/protocols/irc/parse.c:130
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv:  pošlji ukaz nickservu"
 
-#: src/protocols/irc/parse.c:131
+#: ../src/protocols/irc/parse.c:131
 msgid "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You must be a channel operator to do this."
 msgstr "op &lt;vzdevek1&gt; [vzdevek2] ...:  Podelite status operaterja kanala nekomu. Za to dejanje morate biti operater kanala."
 
-#: src/protocols/irc/parse.c:132
+#: ../src/protocols/irc/parse.c:132
 msgid "operwall &lt;message&gt;:  If you don't know what this is, you probably can't use it."
 msgstr "operwall &lt;sporočilo&gt;:  Če ne veste, kaj je to, tega verjetno ne morete uporabiti."
 
-#: src/protocols/irc/parse.c:133
+#: ../src/protocols/irc/parse.c:133
 msgid "operserv: Send a command to operserv"
 msgstr "operserv:  pošlji ukaz operservu"
 
-#: src/protocols/irc/parse.c:134
+#: ../src/protocols/irc/parse.c:134
 msgid "part [room] [message]:  Leave the current channel, or a specified channel, with an optional message."
 msgstr "part [soba] [sporočilo]:  Zapusti trenutni ali določen kanal z možnostjo sporočila."
 
-#: src/protocols/irc/parse.c:135
+#: ../src/protocols/irc/parse.c:135
 msgid "ping [nick]:  Asks how much lag a user (or the server if no user specified) has."
 msgstr "ping [vzdevek]:  Vpraša koliko zaostanka ima uporabnik (ali strežnik, če uporabnik ni naveden)."
 
-#: src/protocols/irc/parse.c:136
+#: ../src/protocols/irc/parse.c:136
 msgid "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
 msgstr "query &lt;vzdevek&gt; &lt;sporočilo&gt;:  Pošlji zasebno sporočilo uporabniku (za razliko od kanala)."
 
-#: src/protocols/irc/parse.c:137
+#: ../src/protocols/irc/parse.c:137
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [sporočilo]:  Prekinitev povezave s strežnikom z možnostjo sporočila."
 
-#: src/protocols/irc/parse.c:138
+#: ../src/protocols/irc/parse.c:138
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Pošlji surov ukaz strežniku."
 
-#: src/protocols/irc/parse.c:139
+#: ../src/protocols/irc/parse.c:139
 msgid "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a channel operator to do this."
 msgstr "remove &lt;vzdevek&gt; [sporočilo]:  Odstrani nekoga iz sobe. Za to dejanje morate biti operater kanala."
 
-#: src/protocols/irc/parse.c:140
+#: ../src/protocols/irc/parse.c:140
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Prikaže trenutni krajevni čas na strežniku IRC."
 
-#: src/protocols/irc/parse.c:141
+#: ../src/protocols/irc/parse.c:141
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [nova tema]:  Oglejte si ali zamenjajte temo kanala."
 
-#: src/protocols/irc/parse.c:142
+#: ../src/protocols/irc/parse.c:142
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Nastavi ali odvzemi način uporabnika."
 
-#: src/protocols/irc/parse.c:143
+#: ../src/protocols/irc/parse.c:143
 msgid "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You must be a channel operator to do this."
 msgstr "voice &lt;vzdevek1&gt; [vzdevek2] ...:  Podelite status operaterja kanala nekomu. Za to dejanje morate biti operater kanala."
 
-#: src/protocols/irc/parse.c:144
+#: ../src/protocols/irc/parse.c:144
 msgid "wallops &lt;message&gt;:  If you don't know what this is, you probably can't use it."
 msgstr "wallops &lt;sporočilo&gt;:  Če ne veste, kaj je to, tega verjetno ne morete uporabiti."
 
-#: src/protocols/irc/parse.c:145
+#: ../src/protocols/irc/parse.c:145
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [strežnik] &lt;vzdevek&gt;:  Dobi več informacij o uporabniku."
 
-#: src/protocols/irc/parse.c:439
+#: ../src/protocols/irc/parse.c:439
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Čas odgovora od %s: %lu sekund"
 
-#: src/protocols/irc/parse.c:440
+#: ../src/protocols/irc/parse.c:440
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:440
+#: ../src/protocols/irc/parse.c:440
 msgid "CTCP PING reply"
 msgstr "CTCP PING ogdovor"
 
-#: src/protocols/irc/parse.c:542
-#: src/protocols/irc/parse.c:546
-#: src/protocols/oscar/oscar.c:1697
-#: src/protocols/toc/toc.c:190
-#: src/protocols/toc/toc.c:688
-#: src/protocols/toc/toc.c:704
-#: src/protocols/toc/toc.c:780
+#: ../src/protocols/irc/parse.c:542
+#: ../src/protocols/irc/parse.c:546
+#: ../src/protocols/oscar/oscar.c:1710
+#: ../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 "Povezava prekinjena."
 
-#: src/protocols/jabber/auth.c:51
+#: ../src/protocols/jabber/auth.c:51
 msgid "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in account properties"
 msgstr "Za prijavo potrebuje strežnik TLS/SSL. Izberite \"Uporabi TLS, če je na voljo\" v lastnostih računa."
 
-#: src/protocols/jabber/auth.c:53
+#: ../src/protocols/jabber/auth.c:53
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "Strežnik zahteva TLS/SSL za prijavo. Podpore za TLS/SSL ni mogoče najti."
 
-#: src/protocols/jabber/auth.c:114
+#: ../src/protocols/jabber/auth.c:114
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Strežnik zahteva overovitev z navadnim besedilom preko nešifriranega toka"
 
-#: src/protocols/jabber/auth.c:232
+#: ../src/protocols/jabber/auth.c:234
 msgid "Server couldn't authenticate you without a password"
 msgstr "Strežnik ne more preveriti vaše identitete brez gesla."
 
-#: src/protocols/jabber/auth.c:235
-#: src/protocols/jabber/auth.c:236
-#: src/protocols/jabber/auth.c:396
-#: src/protocols/jabber/auth.c:397
-#: src/protocols/jabber/auth.c:478
-#: src/protocols/jabber/auth.c:479
+#: ../src/protocols/jabber/auth.c:237
+#: ../src/protocols/jabber/auth.c:238
+#: ../src/protocols/jabber/auth.c:398
+#: ../src/protocols/jabber/auth.c:399
+#: ../src/protocols/jabber/auth.c:480
+#: ../src/protocols/jabber/auth.c:481
 msgid "Plaintext Authentication"
 msgstr "Overovitev z navadnim besedilom"
 
-#: src/protocols/jabber/auth.c:237
-#: src/protocols/jabber/auth.c:398
-#: src/protocols/jabber/auth.c:480
+#: ../src/protocols/jabber/auth.c:239
+#: ../src/protocols/jabber/auth.c:400
+#: ../src/protocols/jabber/auth.c:482
 msgid "This server requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
 msgstr "Strežnik zahteva overovitev z navadnim besedilom preko nešifrirane povezave. Se strinjate s tem in želite nadaljevati z overovitvijo?"
 
-#: src/protocols/jabber/auth.c:243
-#: src/protocols/jabber/auth.c:406
-#: src/protocols/jabber/auth.c:488
+#: ../src/protocols/jabber/auth.c:245
+#: ../src/protocols/jabber/auth.c:408
+#: ../src/protocols/jabber/auth.c:490
 msgid "Server does not use any supported authentication method"
 msgstr "Strežnik ne uporablja nobene podprte metode overovitve"
 
 #. This should never happen!
-#: src/protocols/jabber/auth.c:319
-#: src/protocols/jabber/auth.c:441
-#: src/protocols/jabber/auth.c:609
-#: src/protocols/jabber/auth.c:742
-#: src/protocols/jabber/auth.c:754
-#: src/protocols/jabber/auth.c:773
-#: src/protocols/jabber/jabber.c:110
+#: ../src/protocols/jabber/auth.c:321
+#: ../src/protocols/jabber/auth.c:443
+#: ../src/protocols/jabber/auth.c:611
+#: ../src/protocols/jabber/auth.c:744
+#: ../src/protocols/jabber/auth.c:756
+#: ../src/protocols/jabber/auth.c:775
+#: ../src/protocols/jabber/jabber.c:110
 msgid "Invalid response from server."
 msgstr "Neveljaven odgovor strežnika."
 
-#: src/protocols/jabber/auth.c:630
+#: ../src/protocols/jabber/auth.c:632
 msgid "Invalid challenge from server"
 msgstr "Neveljaven poziv strežnika"
 
-#: src/protocols/jabber/auth.c:717
+#: ../src/protocols/jabber/auth.c:719
 msgid "SASL error"
 msgstr "Napaka SASL"
 
-#: src/protocols/jabber/buddy.c:249
-#: src/protocols/jabber/buddy.c:664
-#: src/protocols/silc/ops.c:1020
+#: ../src/protocols/jabber/buddy.c:249
+#: ../src/protocols/jabber/buddy.c:664
+#: ../src/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "Polno ime"
 
-#: src/protocols/jabber/buddy.c:250
-#: src/protocols/jabber/buddy.c:677
-#: src/protocols/silc/ops.c:1032
+#: ../src/protocols/jabber/buddy.c:250
+#: ../src/protocols/jabber/buddy.c:677
+#: ../src/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "Družinsko ime"
 
-#: src/protocols/jabber/buddy.c:251
-#: src/protocols/jabber/buddy.c:681
+#: ../src/protocols/jabber/buddy.c:251
+#: ../src/protocols/jabber/buddy.c:681
 msgid "Given Name"
 msgstr "Ime"
 
-#: src/protocols/jabber/buddy.c:253
-#: src/protocols/jabber/jabber.c:736
+#: ../src/protocols/jabber/buddy.c:253
+#: ../src/protocols/jabber/jabber.c:805
 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:733
 msgid "Street Address"
 msgstr "Naslov"
 
-#: src/protocols/jabber/buddy.c:255
-#: src/protocols/jabber/buddy.c:729
+#: ../src/protocols/jabber/buddy.c:255
+#: ../src/protocols/jabber/buddy.c:729
 msgid "Extended Address"
 msgstr "Naslov (dodatno)"
 
-#: src/protocols/jabber/buddy.c:256
-#: src/protocols/jabber/buddy.c:737
+#: ../src/protocols/jabber/buddy.c:256
+#: ../src/protocols/jabber/buddy.c:737
 msgid "Locality"
 msgstr "Okraj"
 
-#: src/protocols/jabber/buddy.c:257
-#: src/protocols/jabber/buddy.c:741
+#: ../src/protocols/jabber/buddy.c:257
+#: ../src/protocols/jabber/buddy.c:741
 msgid "Region"
 msgstr "Regija"
 
-#: src/protocols/jabber/buddy.c:258
-#: src/protocols/jabber/buddy.c:745
-#: src/protocols/jabber/jabber.c:726
+#: ../src/protocols/jabber/buddy.c:258
+#: ../src/protocols/jabber/buddy.c:745
+#: ../src/protocols/jabber/jabber.c:795
 msgid "Postal Code"
 msgstr "Poštna številka"
 
-#: src/protocols/jabber/buddy.c:259
-#: src/protocols/jabber/buddy.c:750
-#: src/protocols/silc/silc.c:939
+#: ../src/protocols/jabber/buddy.c:259
+#: ../src/protocols/jabber/buddy.c:750
+#: ../src/protocols/silc/silc.c:939
 msgid "Country"
 msgstr "Država"
 
-#: 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:761
+#: ../src/protocols/jabber/buddy.c:768
 msgid "Telephone"
 msgstr "Telefon"
 
-#: src/protocols/jabber/buddy.c:262
-#: src/protocols/jabber/buddy.c:802
+#: ../src/protocols/jabber/buddy.c:262
+#: ../src/protocols/jabber/buddy.c:802
 msgid "Organization Name"
 msgstr "Ime organizacije"
 
-#: src/protocols/jabber/buddy.c:263
-#: src/protocols/jabber/buddy.c:806
+#: ../src/protocols/jabber/buddy.c:263
+#: ../src/protocols/jabber/buddy.c:806
 msgid "Organization Unit"
 msgstr "Enota organizacije"
 
-#: src/protocols/jabber/buddy.c:265
-#: src/protocols/jabber/buddy.c:815
+#: ../src/protocols/jabber/buddy.c:265
+#: ../src/protocols/jabber/buddy.c:815
 msgid "Role"
 msgstr "Funkcija"
 
-#: src/protocols/jabber/buddy.c:266
-#: src/protocols/jabber/buddy.c:698
-#: src/protocols/oscar/oscar.c:6157
+#: ../src/protocols/jabber/buddy.c:266
+#: ../src/protocols/jabber/buddy.c:698
+#: ../src/protocols/oscar/oscar.c:6133
 msgid "Birthday"
 msgstr "Rojstni dan"
 
-#: src/protocols/jabber/buddy.c:567
-#: src/protocols/jabber/buddy.c:568
+#: ../src/protocols/jabber/buddy.c:567
+#: ../src/protocols/jabber/buddy.c:568
 msgid "Edit Jabber vCard"
 msgstr "Urejanje Jabber vVizitke"
 
-#: src/protocols/jabber/buddy.c:569
+#: ../src/protocols/jabber/buddy.c:569
 msgid "All items below are optional. Enter only the information with which you feel comfortable."
 msgstr "Vsa spodnja polja so izbirna. Vnesite samo informacije, ki jih želite."
 
-#: src/protocols/jabber/buddy.c:639
-#: src/protocols/jabber/jabber.c:1791
+#: ../src/protocols/jabber/buddy.c:639
+#: ../src/protocols/jabber/jabber.c:1912
 msgid "Resource"
 msgstr "Vir"
 
-#: src/protocols/jabber/buddy.c:685
-#: src/protocols/silc/ops.c:1028
+#: ../src/protocols/jabber/buddy.c:685
+#: ../src/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "Drugo ime"
 
-#: src/protocols/jabber/buddy.c:718
-#: src/protocols/jabber/jabber.c:711
-#: src/protocols/oscar/oscar.c:6175
-#: src/protocols/oscar/oscar.c:6183
-#: src/protocols/silc/ops.c:1064
+#: ../src/protocols/jabber/buddy.c:718
+#: ../src/protocols/jabber/jabber.c:780
+#: ../src/protocols/oscar/oscar.c:6152
+#: ../src/protocols/oscar/oscar.c:6160
+#: ../src/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "Naslov"
 
-#: src/protocols/jabber/buddy.c:725
+#: ../src/protocols/jabber/buddy.c:725
 msgid "P.O. Box"
 msgstr "Poštni nabiralnik"
 
-#: src/protocols/jabber/buddy.c:839
+#: ../src/protocols/jabber/buddy.c:839
 msgid "Photo"
 msgstr "Fotografija"
 
-#: src/protocols/jabber/buddy.c:839
+#: ../src/protocols/jabber/buddy.c:839
 msgid "Logo"
 msgstr "Logotip"
 
-#: src/protocols/jabber/buddy.c:1042
+#: ../src/protocols/jabber/buddy.c:1042
 msgid "Un-hide From"
 msgstr "Ne skrij pred"
 
-#: src/protocols/jabber/buddy.c:1046
+#: ../src/protocols/jabber/buddy.c:1046
 msgid "Temporarily Hide From"
 msgstr "Začasno skrij pred"
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:1054
+#: ../src/protocols/jabber/buddy.c:1054
 msgid "Cancel Presence Notification"
 msgstr "Prekliči obvestilo o prisotnosti"
 
-#: src/protocols/jabber/buddy.c:1061
+#: ../src/protocols/jabber/buddy.c:1061
 msgid "(Re-)Request authorization"
 msgstr "Ponovno zahtevaj pooblastitev"
 
 #. 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:1070
 msgid "Unsubscribe"
 msgstr "Odjavi"
 
-#: src/protocols/jabber/buddy.c:1097
-#: src/protocols/jabber/chat.c:677
-#: src/protocols/jabber/chat.c:688
-#: src/protocols/jabber/jabber.c:1078
-#: src/protocols/silc/ops.c:1449
+#: ../src/protocols/jabber/buddy.c:1097
+#: ../src/protocols/jabber/chat.c:677
+#: ../src/protocols/jabber/chat.c:688
+#: ../src/protocols/jabber/jabber.c:1168
+#: ../src/protocols/silc/ops.c:1449
 msgid "Error"
 msgstr "Napaka"
 
-#: src/protocols/jabber/buddy.c:1103
-#: src/protocols/jabber/jabber.c:1103
+#: ../src/protocols/jabber/buddy.c:1103
+#: ../src/protocols/jabber/jabber.c:1193
 msgid "Chatty"
 msgstr "Pomenek"
 
-#: src/protocols/jabber/buddy.c:1107
-#: src/status.c:159
+#: ../src/protocols/jabber/buddy.c:1107
+#: ../src/status.c:159
 msgid "Extended Away"
 msgstr "Odsotnost - Napredno"
 
-#: src/protocols/jabber/buddy.c:1109
-#: src/protocols/jabber/jabber.c:1133
-#: src/protocols/oscar/oscar.c:720
-#: src/protocols/oscar/oscar.c:8004
-#: src/protocols/sametime/sametime.c:3231
+#: ../src/protocols/jabber/buddy.c:1109
+#: ../src/protocols/jabber/jabber.c:1223
+#: ../src/protocols/oscar/oscar.c:723
+#: ../src/protocols/oscar/oscar.c:7980
+#: ../src/protocols/sametime/sametime.c:3285
 msgid "Do Not Disturb"
 msgstr "Ne moti"
 
-#: src/protocols/jabber/buddy.c:1289
+#: ../src/protocols/jabber/buddy.c:1289
 msgid "The following are the results of your search"
 msgstr "To so rezultati vašega iskanja"
 
-#: src/protocols/jabber/buddy.c:1381
+#: ../src/protocols/jabber/buddy.c:1381
 msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr "Izpolnite eno ali več polj za iskanje uporabnikov Jabberja."
 
-#: src/protocols/jabber/buddy.c:1385
-#: src/protocols/jabber/jabber.c:701
-#: src/protocols/oscar/oscar.c:6132
-#: src/protocols/silc/ops.c:1024
+#: ../src/protocols/jabber/buddy.c:1385
+#: ../src/protocols/jabber/jabber.c:770
+#: ../src/protocols/oscar/oscar.c:6110
+#: ../src/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "Ime"
 
-#: src/protocols/jabber/buddy.c:1390
-#: src/protocols/jabber/jabber.c:706
-#: src/protocols/oscar/oscar.c:6133
+#: ../src/protocols/jabber/buddy.c:1390
+#: ../src/protocols/jabber/jabber.c:775
+#: ../src/protocols/oscar/oscar.c:6111
 msgid "Last Name"
 msgstr "Priimek"
 
-#: src/protocols/jabber/buddy.c:1400
+#: ../src/protocols/jabber/buddy.c:1400
 msgid "E-Mail Address"
 msgstr "E-poštni Naslov"
 
-#: src/protocols/jabber/buddy.c:1409
-#: src/protocols/jabber/buddy.c:1410
+#: ../src/protocols/jabber/buddy.c:1409
+#: ../src/protocols/jabber/buddy.c:1410
 msgid "Search for Jabber users"
 msgstr "Išči uporabnike Jabberja"
 
-#: src/protocols/jabber/buddy.c:1424
+#: ../src/protocols/jabber/buddy.c:1424
 msgid "Invalid Directory"
 msgstr "Neveljaven imenik"
 
-#: src/protocols/jabber/buddy.c:1441
+#: ../src/protocols/jabber/buddy.c:1441
 msgid "Enter a User Directory"
 msgstr "Vnesi uporabniški imenik"
 
-#: src/protocols/jabber/buddy.c:1442
+#: ../src/protocols/jabber/buddy.c:1442
 msgid "Select a user directory to search"
 msgstr "Izberite imenik za iskanje"
 
-#: src/protocols/jabber/buddy.c:1445
+#: ../src/protocols/jabber/buddy.c:1445
 msgid "Search Directory"
 msgstr "Imenik iskanja"
 
-#: src/protocols/jabber/chat.c:41
-#: src/protocols/oscar/oscar.c:7499
-#: src/protocols/yahoo/yahoochat.c:998
+#: ../src/protocols/jabber/chat.c:41
+#: ../src/protocols/oscar/oscar.c:7475
+#: ../src/protocols/yahoo/yahoochat.c:998
 msgid "_Room:"
 msgstr "_Soba:"
 
-#: src/protocols/jabber/chat.c:47
+#: ../src/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "_Strežnik:"
 
-#: src/protocols/jabber/chat.c:53
+#: ../src/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "_Ročica:"
 
-#: src/protocols/jabber/chat.c:223
+#: ../src/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s ni veljavno ime sobe"
 
-#: src/protocols/jabber/chat.c:224
+#: ../src/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "Neveljavno ime sobe"
 
-#: src/protocols/jabber/chat.c:229
+#: ../src/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s ni veljavno ime strežnika"
 
-#: src/protocols/jabber/chat.c:230
-#: src/protocols/jabber/chat.c:231
+#: ../src/protocols/jabber/chat.c:230
+#: ../src/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "Neveljavno ime strežnika"
 
-#: src/protocols/jabber/chat.c:235
+#: ../src/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s ni veljavna ročica sobe"
 
-#: src/protocols/jabber/chat.c:236
-#: src/protocols/jabber/chat.c:237
+#: ../src/protocols/jabber/chat.c:236
+#: ../src/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "Neveljavna ročica sobe"
 
-#: src/protocols/jabber/chat.c:395
+#: ../src/protocols/jabber/chat.c:395
 msgid "Configuration error"
 msgstr "Napaka pri nastavitvi"
 
-#: src/protocols/jabber/chat.c:404
-#: src/protocols/jabber/chat.c:549
+#: ../src/protocols/jabber/chat.c:404
+#: ../src/protocols/jabber/chat.c:549
 msgid "Unable to configure"
 msgstr "Ni mogoče nastaviti"
 
-#: src/protocols/jabber/chat.c:420
+#: ../src/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "Napaka pri nastavitvi sobe"
 
-#: src/protocols/jabber/chat.c:421
+#: ../src/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "Te sobe se ne da nastavljati"
 
-#: src/protocols/jabber/chat.c:471
-#: src/protocols/jabber/chat.c:540
+#: ../src/protocols/jabber/chat.c:471
+#: ../src/protocols/jabber/chat.c:540
 msgid "Registration error"
 msgstr "Napaka pri registraciji"
 
-#: src/protocols/jabber/chat.c:628
+#: ../src/protocols/jabber/chat.c:628
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Spreminjanje vzdevka v pogovornih sobah ne-MUC ni podprto"
 
-#: src/protocols/jabber/chat.c:678
-#: src/protocols/jabber/chat.c:689
-#: src/protocols/silc/ops.c:1449
+#: ../src/protocols/jabber/chat.c:678
+#: ../src/protocols/jabber/chat.c:689
+#: ../src/protocols/silc/ops.c:1449
 msgid "Error retrieving room list"
 msgstr "Napaka pri pridobivanju sezama sob"
 
-#: src/protocols/jabber/chat.c:737
+#: ../src/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "Neveljaven strežnik"
 
-#: src/protocols/jabber/chat.c:775
+#: ../src/protocols/jabber/chat.c:775
 msgid "Enter a Conference Server"
 msgstr "Vnesite konferenčni strežnik"
 
-#: src/protocols/jabber/chat.c:776
+#: ../src/protocols/jabber/chat.c:776
 msgid "Select a conference server to query"
 msgstr "Izberite konferenčni strežnik za pogovor"
 
-#: src/protocols/jabber/chat.c:779
+#: ../src/protocols/jabber/chat.c:779
 msgid "Find Rooms"
 msgstr "Najdi sobe"
 
-#: src/protocols/jabber/jabber.c:79
+#: ../src/protocols/jabber/jabber.c:79
 msgid "Error initializing session"
 msgstr "Napaka pri inicializaciji seje"
 
-#: src/protocols/jabber/jabber.c:236
-#: src/protocols/jabber/jabber.c:251
+#: ../src/protocols/jabber/jabber.c:226
+#: ../src/protocols/jabber/jabber.c:275
+#: ../src/protocols/jabber/jabber.c:303
 msgid "Write error"
 msgstr "Napaka pri pisanju"
 
-#: src/protocols/jabber/jabber.c:289
-#: src/protocols/jabber/jabber.c:321
+#: ../src/protocols/jabber/jabber.c:355
+#: ../src/protocols/jabber/jabber.c:388
 msgid "Read Error"
 msgstr "Napaka pri branju"
 
-#: src/protocols/jabber/jabber.c:407
-#: src/protocols/jabber/jabber.c:828
+#: ../src/protocols/jabber/jabber.c:474
+#: ../src/protocols/jabber/jabber.c:900
 msgid "Unable to create socket"
 msgstr "Ni mogoče ustvariti vtičnice"
 
-#: src/protocols/jabber/jabber.c:451
-#: src/protocols/jabber/jabber.c:788
+#: ../src/protocols/jabber/jabber.c:520
+#: ../src/protocols/jabber/jabber.c:857
 msgid "Invalid Jabber ID"
 msgstr "Neveljaven Jabber ID"
 
-#: src/protocols/jabber/jabber.c:521
+#: ../src/protocols/jabber/jabber.c:590
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registracija %s@%s uspela!"
 
-#: src/protocols/jabber/jabber.c:523
-#: src/protocols/jabber/jabber.c:524
+#: ../src/protocols/jabber/jabber.c:592
+#: ../src/protocols/jabber/jabber.c:593
 msgid "Registration Successful"
 msgstr "Registracija uspela!"
 
-#: src/protocols/jabber/jabber.c:530
-#: src/protocols/jabber/jabber.c:1369
+#: ../src/protocols/jabber/jabber.c:599
+#: ../src/protocols/jabber/jabber.c:1459
 msgid "Unknown Error"
 msgstr "Neznana napaka"
 
-#: src/protocols/jabber/jabber.c:532
-#: src/protocols/jabber/jabber.c:533
+#: ../src/protocols/jabber/jabber.c:601
+#: ../src/protocols/jabber/jabber.c:602
 msgid "Registration Failed"
 msgstr "Napaka pri registraciji"
 
-#: src/protocols/jabber/jabber.c:644
-#: src/protocols/jabber/jabber.c:645
+#: ../src/protocols/jabber/jabber.c:713
+#: ../src/protocols/jabber/jabber.c:714
 msgid "Already Registered"
 msgstr "Že registriran"
 
-#: src/protocols/jabber/jabber.c:691
+#: ../src/protocols/jabber/jabber.c:760
 msgid "E-Mail"
 msgstr "E-pošta"
 
-#: src/protocols/jabber/jabber.c:721
-#: src/protocols/oscar/oscar.c:6177
-#: src/protocols/oscar/oscar.c:6185
+#: ../src/protocols/jabber/jabber.c:790
+#: ../src/protocols/oscar/oscar.c:6154
+#: ../src/protocols/oscar/oscar.c:6162
 msgid "State"
 msgstr "Zvezna država"
 
-#: src/protocols/jabber/jabber.c:731
-#: src/protocols/silc/ops.c:1069
-#: src/protocols/silc/silc.c:697
-#: src/protocols/silc/util.c:514
+#: ../src/protocols/jabber/jabber.c:800
+#: ../src/protocols/silc/ops.c:1069
+#: ../src/protocols/silc/silc.c:697
+#: ../src/protocols/silc/util.c:514
 msgid "Phone"
 msgstr "Telefon"
 
-#: src/protocols/jabber/jabber.c:741
+#: ../src/protocols/jabber/jabber.c:810
 msgid "Date"
 msgstr "Datum"
 
-#: src/protocols/jabber/jabber.c:749
+#: ../src/protocols/jabber/jabber.c:818
 msgid "Please fill out the information below to register your new account."
 msgstr "Za registracijo novega računa morate izpolniti spodnja polja."
 
-#: src/protocols/jabber/jabber.c:752
-#: src/protocols/jabber/jabber.c:753
+#: ../src/protocols/jabber/jabber.c:821
+#: ../src/protocols/jabber/jabber.c:822
 msgid "Register New Jabber Account"
 msgstr "Registrirajte nov račun za Jabber"
 
-#: src/protocols/jabber/jabber.c:897
+#: ../src/protocols/jabber/jabber.c:987
 msgid "Initializing Stream"
 msgstr "Inicializacija toka"
 
-#: src/protocols/jabber/jabber.c:903
-#: src/protocols/msn/session.c:355
+#: ../src/protocols/jabber/jabber.c:993
+#: ../src/protocols/msn/session.c:355
 msgid "Authenticating"
 msgstr "Overovljanje"
 
-#: src/protocols/jabber/jabber.c:912
+#: ../src/protocols/jabber/jabber.c:1002
 msgid "Re-initializing Stream"
 msgstr "Ponovna inicializacija toka"
 
-#: src/protocols/jabber/jabber.c:982
-#: src/protocols/jabber/jabber.c:1347
-#: src/protocols/jabber/jabber.c:1388
-#: src/protocols/jabber/jabber.c:1422
-#: src/protocols/oscar/oscar.c:789
-#: src/protocols/oscar/oscar.c:7794
+#: ../src/protocols/jabber/jabber.c:1072
+#: ../src/protocols/jabber/jabber.c:1437
+#: ../src/protocols/jabber/jabber.c:1478
+#: ../src/protocols/jabber/jabber.c:1512
+#: ../src/protocols/oscar/oscar.c:792
+#: ../src/protocols/oscar/oscar.c:7770
 msgid "Not Authorized"
 msgstr "Nepooblaščeno"
 
-#: src/protocols/jabber/jabber.c:1024
+#: ../src/protocols/jabber/jabber.c:1114
 msgid "Both"
 msgstr "Oboje"
 
-#: src/protocols/jabber/jabber.c:1026
+#: ../src/protocols/jabber/jabber.c:1116
 msgid "From (To pending)"
 msgstr "Od (Za čakajoče)"
 
-#: src/protocols/jabber/jabber.c:1031
+#: ../src/protocols/jabber/jabber.c:1121
 msgid "To"
 msgstr "Za"
 
-#: src/protocols/jabber/jabber.c:1033
+#: ../src/protocols/jabber/jabber.c:1123
 msgid "None (To pending)"
 msgstr "Brez (Za čakajoče)"
 
-#: src/protocols/jabber/jabber.c:1037
+#: ../src/protocols/jabber/jabber.c:1127
 msgid "Subscription"
 msgstr "Naročilo"
 
-#: src/protocols/jabber/jabber.c:1094
-#: src/protocols/jabber/jabber.c:1104
-#: src/protocols/jabber/jabber.c:1114
-#: src/protocols/jabber/jabber.c:1124
-#: src/protocols/jabber/jabber.c:1134
+#: ../src/protocols/jabber/jabber.c:1184
+#: ../src/protocols/jabber/jabber.c:1194
+#: ../src/protocols/jabber/jabber.c:1204
+#: ../src/protocols/jabber/jabber.c:1214
+#: ../src/protocols/jabber/jabber.c:1224
 msgid "Priority"
 msgstr "Prednost stika"
 
-#: src/protocols/jabber/jabber.c:1163
+#: ../src/protocols/jabber/jabber.c:1253
 msgid "Password Changed"
 msgstr "Geslo spremenjeno"
 
-#: src/protocols/jabber/jabber.c:1164
+#: ../src/protocols/jabber/jabber.c:1254
 msgid "Your password has been changed."
 msgstr "Vaše geslo je bilo spremenjeno."
 
-#: src/protocols/jabber/jabber.c:1168
-#: src/protocols/jabber/jabber.c:1169
+#: ../src/protocols/jabber/jabber.c:1258
+#: ../src/protocols/jabber/jabber.c:1259
 msgid "Error changing password"
 msgstr "Napaka pri spreminjanju gesla"
 
-#: src/protocols/jabber/jabber.c:1225
+#: ../src/protocols/jabber/jabber.c:1315
 msgid "Password (again)"
 msgstr "Novo geslo (ponovno)"
 
-#: src/protocols/jabber/jabber.c:1230
-#: src/protocols/jabber/jabber.c:1231
+#: ../src/protocols/jabber/jabber.c:1320
+#: ../src/protocols/jabber/jabber.c:1321
 msgid "Change Jabber Password"
 msgstr "Spremeni geslo za Jabber"
 
-#: src/protocols/jabber/jabber.c:1231
+#: ../src/protocols/jabber/jabber.c:1321
 msgid "Please enter your new password"
 msgstr "Vnesite svoje novo geslo"
 
-#: src/protocols/jabber/jabber.c:1241
-#: src/protocols/oscar/oscar.c:8428
-#: src/protocols/silc/silc.c:1019
+#: ../src/protocols/jabber/jabber.c:1331
+#: ../src/protocols/oscar/oscar.c:8404
+#: ../src/protocols/silc/silc.c:1019
 msgid "Set User Info..."
 msgstr "Nastavi informacije o uporabniku ..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/jabber/jabber.c:1246
-#: src/protocols/oscar/oscar.c:8439
-#: src/protocols/silc/silc.c:1015
+#: ../src/protocols/jabber/jabber.c:1336
+#: ../src/protocols/oscar/oscar.c:8415
+#: ../src/protocols/silc/silc.c:1015
 msgid "Change Password..."
 msgstr "Spremeni geslo ..."
 
 #. }
-#: src/protocols/jabber/jabber.c:1251
+#: ../src/protocols/jabber/jabber.c:1341
 msgid "Search for Users..."
 msgstr "Najdi uporabnike ..."
 
-#: src/protocols/jabber/jabber.c:1327
+#: ../src/protocols/jabber/jabber.c:1417
 msgid "Bad Request"
 msgstr "Napačna zahteva"
 
-#: src/protocols/jabber/jabber.c:1329
+#: ../src/protocols/jabber/jabber.c:1419
 msgid "Conflict"
 msgstr "Spor"
 
-#: src/protocols/jabber/jabber.c:1331
+#: ../src/protocols/jabber/jabber.c:1421
 msgid "Feature Not Implemented"
 msgstr "Možnost ni uvedena"
 
-#: src/protocols/jabber/jabber.c:1333
+#: ../src/protocols/jabber/jabber.c:1423
 msgid "Forbidden"
 msgstr "Prepovedano"
 
-#: src/protocols/jabber/jabber.c:1335
+#: ../src/protocols/jabber/jabber.c:1425
 msgid "Gone"
 msgstr "Ni na voljo"
 
-#: src/protocols/jabber/jabber.c:1337
-#: src/protocols/jabber/jabber.c:1412
+#: ../src/protocols/jabber/jabber.c:1427
+#: ../src/protocols/jabber/jabber.c:1502
 msgid "Internal Server Error"
 msgstr "Notranja napaka strežnika"
 
-#: src/protocols/jabber/jabber.c:1339
+#: ../src/protocols/jabber/jabber.c:1429
 msgid "Item Not Found"
 msgstr "Predmeta ni mogoče najti"
 
-#: src/protocols/jabber/jabber.c:1341
+#: ../src/protocols/jabber/jabber.c:1431
 msgid "Malformed Jabber ID"
 msgstr "Nepravilen Jabber ID"
 
-#: src/protocols/jabber/jabber.c:1343
+#: ../src/protocols/jabber/jabber.c:1433
 msgid "Not Acceptable"
 msgstr "Ni mogoče sprejeti"
 
-#: src/protocols/jabber/jabber.c:1345
+#: ../src/protocols/jabber/jabber.c:1435
 msgid "Not Allowed"
 msgstr "Ni dovoljeno"
 
-#: src/protocols/jabber/jabber.c:1349
+#: ../src/protocols/jabber/jabber.c:1439
 msgid "Payment Required"
 msgstr "Zahtevano plačilo"
 
-#: src/protocols/jabber/jabber.c:1351
+#: ../src/protocols/jabber/jabber.c:1441
 msgid "Recipient Unavailable"
 msgstr "Dobitnik ni na voljo"
 
-#: src/protocols/jabber/jabber.c:1355
+#: ../src/protocols/jabber/jabber.c:1445
 msgid "Registration Required"
 msgstr "Zahtevana registracija"
 
-#: src/protocols/jabber/jabber.c:1357
+#: ../src/protocols/jabber/jabber.c:1447
 msgid "Remote Server Not Found"
 msgstr "Oddaljenega strežnika ni mogoče najti"
 
-#: src/protocols/jabber/jabber.c:1359
+#: ../src/protocols/jabber/jabber.c:1449
 msgid "Remote Server Timeout"
 msgstr "Časovna omejitev oddaljenega strežnika je potekla"
 
-#: src/protocols/jabber/jabber.c:1361
+#: ../src/protocols/jabber/jabber.c:1451
 msgid "Server Overloaded"
 msgstr "Strežnik je preobremenjen"
 
-#: src/protocols/jabber/jabber.c:1363
+#: ../src/protocols/jabber/jabber.c:1453
 msgid "Service Unavailable"
 msgstr "Storitev ni dostopna"
 
-#: src/protocols/jabber/jabber.c:1365
+#: ../src/protocols/jabber/jabber.c:1455
 msgid "Subscription Required"
 msgstr "Zahtevano naročilo"
 
-#: src/protocols/jabber/jabber.c:1367
+#: ../src/protocols/jabber/jabber.c:1457
 msgid "Unexpected Request"
 msgstr "Nepričakovana zahteva"
 
-#: src/protocols/jabber/jabber.c:1374
+#: ../src/protocols/jabber/jabber.c:1464
 msgid "Authorization Aborted"
 msgstr "Pooblastitev prekinjena"
 
-#: src/protocols/jabber/jabber.c:1376
+#: ../src/protocols/jabber/jabber.c:1466
 msgid "Incorrect encoding in authorization"
 msgstr "Napačno kodiranje pri pooblastitvi"
 
-#: src/protocols/jabber/jabber.c:1379
+#: ../src/protocols/jabber/jabber.c:1469
 msgid "Invalid authzid"
 msgstr "Neveljaven ID pooblastila"
 
-#: src/protocols/jabber/jabber.c:1382
+#: ../src/protocols/jabber/jabber.c:1472
 msgid "Invalid Authorization Mechanism"
 msgstr "Neveljaven mehanizem pooblastil"
 
-#: src/protocols/jabber/jabber.c:1385
+#: ../src/protocols/jabber/jabber.c:1475
 msgid "Authorization mechanism too weak"
 msgstr "Prešibek mehanizem pooblastil"
 
-#: src/protocols/jabber/jabber.c:1390
+#: ../src/protocols/jabber/jabber.c:1480
 msgid "Temporary Authentication Failure"
 msgstr "Napaka začasne overovitve"
 
-#: src/protocols/jabber/jabber.c:1393
+#: ../src/protocols/jabber/jabber.c:1483
 msgid "Authentication Failure"
 msgstr "Napaka pri overovitvi"
 
-#: src/protocols/jabber/jabber.c:1397
+#: ../src/protocols/jabber/jabber.c:1487
 msgid "Bad Format"
 msgstr "Napačna oblika"
 
-#: src/protocols/jabber/jabber.c:1399
+#: ../src/protocols/jabber/jabber.c:1489
 msgid "Bad Namespace Prefix"
 msgstr "Napačna predpona imenskega prostora"
 
-#: src/protocols/jabber/jabber.c:1402
+#: ../src/protocols/jabber/jabber.c:1492
 msgid "Resource Conflict"
 msgstr "Spor vira"
 
-#: src/protocols/jabber/jabber.c:1404
-#: src/protocols/silc/ops.c:1728
+#: ../src/protocols/jabber/jabber.c:1494
+#: ../src/protocols/silc/ops.c:1728
 msgid "Connection Timeout"
 msgstr "Časovna omejitev povezave potekla"
 
-#: src/protocols/jabber/jabber.c:1406
+#: ../src/protocols/jabber/jabber.c:1496
 msgid "Host Gone"
 msgstr "Gostitelj ni na voljo"
 
-#: src/protocols/jabber/jabber.c:1408
+#: ../src/protocols/jabber/jabber.c:1498
 msgid "Host Unknown"
 msgstr "Neznan gostitelj"
 
-#: src/protocols/jabber/jabber.c:1410
+#: ../src/protocols/jabber/jabber.c:1500
 msgid "Improper Addressing"
 msgstr "Neustrezno naslavljanje"
 
-#: src/protocols/jabber/jabber.c:1414
+#: ../src/protocols/jabber/jabber.c:1504
 msgid "Invalid ID"
 msgstr "Neveljaven ID"
 
-#: src/protocols/jabber/jabber.c:1416
+#: ../src/protocols/jabber/jabber.c:1506
 msgid "Invalid Namespace"
 msgstr "Neveljaven imenski prostor"
 
-#: src/protocols/jabber/jabber.c:1418
+#: ../src/protocols/jabber/jabber.c:1508
 msgid "Invalid XML"
 msgstr "Neveljaven XML"
 
-#: src/protocols/jabber/jabber.c:1420
+#: ../src/protocols/jabber/jabber.c:1510
 msgid "Non-matching Hosts"
 msgstr "Neujemajoči gostitelji"
 
-#: src/protocols/jabber/jabber.c:1424
+#: ../src/protocols/jabber/jabber.c:1514
 msgid "Policy Violation"
 msgstr "Zloraba politike"
 
-#: src/protocols/jabber/jabber.c:1426
+#: ../src/protocols/jabber/jabber.c:1516
 msgid "Remote Connection Failed"
 msgstr "Oddaljena povezava ni uspela"
 
-#: src/protocols/jabber/jabber.c:1428
+#: ../src/protocols/jabber/jabber.c:1518
 msgid "Resource Constraint"
 msgstr "Zadrega vira"
 
-#: src/protocols/jabber/jabber.c:1430
+#: ../src/protocols/jabber/jabber.c:1520
 msgid "Restricted XML"
 msgstr "Omejen XML"
 
-#: src/protocols/jabber/jabber.c:1432
+#: ../src/protocols/jabber/jabber.c:1522
 msgid "See Other Host"
 msgstr "Glej druge gostitelje"
 
-#: src/protocols/jabber/jabber.c:1434
+#: ../src/protocols/jabber/jabber.c:1524
 msgid "System Shutdown"
 msgstr "Izklop sistema"
 
-#: src/protocols/jabber/jabber.c:1436
+#: ../src/protocols/jabber/jabber.c:1526
 msgid "Undefined Condition"
 msgstr "Nedoločen pogoj"
 
-#: src/protocols/jabber/jabber.c:1438
+#: ../src/protocols/jabber/jabber.c:1528
 msgid "Unsupported Encoding"
 msgstr "Nepodprto kodiranje"
 
-#: src/protocols/jabber/jabber.c:1440
+#: ../src/protocols/jabber/jabber.c:1530
 msgid "Unsupported Stanza Type"
 msgstr "Nepodprt tip vrstice"
 
-#: src/protocols/jabber/jabber.c:1442
+#: ../src/protocols/jabber/jabber.c:1532
 msgid "Unsupported Version"
 msgstr "Nepodprta različica"
 
-#: src/protocols/jabber/jabber.c:1444
+#: ../src/protocols/jabber/jabber.c:1534
 msgid "XML Not Well Formed"
 msgstr "Slabo oblikovan XML"
 
-#: src/protocols/jabber/jabber.c:1446
+#: ../src/protocols/jabber/jabber.c:1536
 msgid "Stream Error"
 msgstr "Napaka toka"
 
-#: src/protocols/jabber/jabber.c:1513
+#: ../src/protocols/jabber/jabber.c:1603
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Ni mogoče prepovedati uporabnika %s"
 
-#: src/protocols/jabber/jabber.c:1535
+#: ../src/protocols/jabber/jabber.c:1623
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Neznana včlanitev: \"%s\""
 
-#: src/protocols/jabber/jabber.c:1540
+#: ../src/protocols/jabber/jabber.c:1628
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Uporabnika %s ni mogoče včlaniti kot \"%s\""
 
-#: src/protocols/jabber/jabber.c:1592
+#: ../src/protocols/jabber/jabber.c:1647
+#, c-format
+msgid "Unknown role: \"%s\""
+msgstr "Neznana vloga: \"%s\""
+
+#  Data is assumed to be the destination sn
+#: ../src/protocols/jabber/jabber.c:1654
+#, c-format
+msgid "Unable to set role \"%s\" for user: %s"
+msgstr "Ni moč določiti vloge \"%s\" za uporabnika: %s"
+
+#: ../src/protocols/jabber/jabber.c:1707
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Ni mogoče brcniti uporabnika %s"
 
-#: src/protocols/jabber/jabber.c:1623
+#: ../src/protocols/jabber/jabber.c:1738
 msgid "config:  Configure a chat room."
 msgstr "config:  Nastavi pogovorno sobo."
 
-#: src/protocols/jabber/jabber.c:1627
+#: ../src/protocols/jabber/jabber.c:1742
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Nastavi pogovorno sobo."
 
-#: src/protocols/jabber/jabber.c:1636
+#: ../src/protocols/jabber/jabber.c:1751
 msgid "part [room]:  Leave the room."
 msgstr "part [soba]:  Zapusti sobo."
 
-#: src/protocols/jabber/jabber.c:1641
+#: ../src/protocols/jabber/jabber.c:1756
 msgid "register:  Register with a chat room."
 msgstr "register:  Registriraj se v pogovorno sobo."
 
-#: src/protocols/jabber/jabber.c:1647
+#: ../src/protocols/jabber/jabber.c:1762
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nova tema]:  Oglej si ali spremeni temo."
 
-#: src/protocols/jabber/jabber.c:1653
+#: ../src/protocols/jabber/jabber.c:1768
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;uporabnik&gt; [soba]:  Prepovej uporabnika v sobi."
 
-#: src/protocols/jabber/jabber.c:1659
+#: ../src/protocols/jabber/jabber.c:1774
 msgid "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's affiliation with the room."
 msgstr "affiliate &lt;uporabnik&gt; &lt;lastnik|skrbnik|član|izločenec|nihče&gt;: Nastavitev uporabnikovega statusa v sobi."
 
-#: src/protocols/jabber/jabber.c:1665
+#: ../src/protocols/jabber/jabber.c:1780
+msgid "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's role in the room."
+msgstr "role &lt;uporabnik&gt; &lt;moderator|participant|visitor|none&gt;: Nastavitev uporabnikove vloge v sobi."
+
+#: ../src/protocols/jabber/jabber.c:1786
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;uporabnik&gt; [soba]:  Povabite uporabnika v sobo."
 
-#: src/protocols/jabber/jabber.c:1671
+#: ../src/protocols/jabber/jabber.c:1792
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;soba&gt; [strežnik]:  Pridruži se pomenku na tem strežniku."
 
-#: src/protocols/jabber/jabber.c:1677
+#: ../src/protocols/jabber/jabber.c:1798
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;uporabnik&gt; [soba]:  Brcni uporabnika iz sobe."
 
-#: src/protocols/jabber/jabber.c:1682
+#: ../src/protocols/jabber/jabber.c:1803
 msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;uporabnik&gt; &lt;sporočilo&gt;:  Pošljite zasebno sporočilo drugemu uporabniku."
 
@@ -7253,436 +7428,436 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1766
-#: src/protocols/jabber/jabber.c:1768
+#: ../src/protocols/jabber/jabber.c:1887
+#: ../src/protocols/jabber/jabber.c:1889
 msgid "Jabber Protocol Plugin"
 msgstr "Dodatek za protokol Jabber"
 
-#: src/protocols/jabber/jabber.c:1794
+#: ../src/protocols/jabber/jabber.c:1915
 msgid "Use TLS if available"
 msgstr "Uporabite TLS, če je na voljo"
 
-#: src/protocols/jabber/jabber.c:1799
+#: ../src/protocols/jabber/jabber.c:1920
 msgid "Require TLS"
 msgstr "Zahtevaj TLS"
 
-#: src/protocols/jabber/jabber.c:1802
+#: ../src/protocols/jabber/jabber.c:1923
 msgid "Force old (port 5223) SSL"
 msgstr "Vsili star SSL (vrata 5223)"
 
-#: src/protocols/jabber/jabber.c:1807
+#: ../src/protocols/jabber/jabber.c:1928
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Dovoli overovitev z navadnim besedilom preko nešifriranih toka"
 
-#: src/protocols/jabber/jabber.c:1812
-#: src/protocols/simple/simple.c:1503
+#: ../src/protocols/jabber/jabber.c:1933
+#: ../src/protocols/simple/simple.c:1669
 msgid "Connect port"
 msgstr "Poveži vrata"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1816
-#: src/protocols/silc/silc.c:1852
+#: ../src/protocols/jabber/jabber.c:1937
+#: ../src/protocols/silc/silc.c:1852
 msgid "Connect server"
 msgstr "Poveži se na strežnik"
 
-#: src/protocols/jabber/message.c:114
+#: ../src/protocols/jabber/message.c:114
 #, c-format
 msgid "Message from %s"
 msgstr "Sporočilo od %s"
 
-#: src/protocols/jabber/message.c:178
+#: ../src/protocols/jabber/message.c:178
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s je spremenil temo na: %s"
 
-#: src/protocols/jabber/message.c:180
+#: ../src/protocols/jabber/message.c:180
 #, c-format
 msgid "The topic is: %s"
 msgstr "Tema je: %s"
 
-#: src/protocols/jabber/message.c:230
+#: ../src/protocols/jabber/message.c:230
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Dostava sporočila za uporabnika %s ni uspela: %s"
 
-#: src/protocols/jabber/message.c:233
+#: ../src/protocols/jabber/message.c:233
 msgid "Jabber Message Error"
 msgstr "Napaka sporočila Jabber"
 
-#: src/protocols/jabber/message.c:297
+#: ../src/protocols/jabber/message.c:297
 #, c-format
 msgid " (Code %s)"
 msgstr " (Koda %s)"
 
-#: src/protocols/jabber/parser.c:131
+#: ../src/protocols/jabber/parser.c:131
 msgid "XML Parse error"
 msgstr "Napaka pri razčlenjevanu XML"
 
-#: src/protocols/jabber/presence.c:305
+#: ../src/protocols/jabber/presence.c:305
 msgid "Unknown Error in presence"
 msgstr "Prišlo je do neznane napake"
 
-#: src/protocols/jabber/presence.c:310
-#: src/protocols/msn/userlist.c:104
+#: ../src/protocols/jabber/presence.c:310
+#: ../src/protocols/msn/userlist.c:104
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list."
 msgstr "Uporabnik %s želi dodati %s na svoj seznam prijateljev."
 
-#: src/protocols/jabber/presence.c:319
-#: src/protocols/oscar/oscar.c:4707
-#: src/protocols/oscar/oscar.c:7429
+#: ../src/protocols/jabber/presence.c:319
+#: ../src/protocols/oscar/oscar.c:4740
+#: ../src/protocols/oscar/oscar.c:7405
 msgid "_Authorize"
 msgstr "_Pooblasti"
 
-#: src/protocols/jabber/presence.c:320
-#: src/protocols/oscar/oscar.c:4709
-#: src/protocols/oscar/oscar.c:7430
+#: ../src/protocols/jabber/presence.c:320
+#: ../src/protocols/oscar/oscar.c:4742
+#: ../src/protocols/oscar/oscar.c:7406
 msgid "_Deny"
 msgstr "_Zavrni"
 
-#: src/protocols/jabber/presence.c:376
-#: src/protocols/jabber/presence.c:377
+#: ../src/protocols/jabber/presence.c:376
+#: ../src/protocols/jabber/presence.c:377
 msgid "Create New Room"
 msgstr "Ustvari novo sobo"
 
-#: src/protocols/jabber/presence.c:378
+#: ../src/protocols/jabber/presence.c:378
 msgid "You are creating a new room.  Would you like to configure it, or accept the default settings?"
 msgstr "Ustvarili boste novo sobo. Jo želite najprej nastaviti ali boste sprejeli privzete nastavitve?"
 
-#: src/protocols/jabber/presence.c:380
+#: ../src/protocols/jabber/presence.c:380
 msgid "_Configure Room"
 msgstr "_Nastavi sobo"
 
-#: src/protocols/jabber/presence.c:382
+#: ../src/protocols/jabber/presence.c:382
 msgid "_Accept Defaults"
 msgstr "_Sprejmi privzeto"
 
-#: src/protocols/jabber/presence.c:419
+#: ../src/protocols/jabber/presence.c:419
 #, c-format
 msgid "Error in chat %s"
 msgstr "Napaka v pomenku %s"
 
-#: src/protocols/jabber/presence.c:422
+#: ../src/protocols/jabber/presence.c:422
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Napaka pri pridruževanju pomenku %s"
 
-#: src/protocols/jabber/si.c:619
+#: ../src/protocols/jabber/si.c:726
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "Ni mogoče poslati datoteke %s, ker uporabnik ne podpira prenosov datotek"
 
-#: src/protocols/jabber/si.c:620
-#: src/protocols/jabber/si.c:621
+#: ../src/protocols/jabber/si.c:727
+#: ../src/protocols/jabber/si.c:728
 msgid "File Send Failed"
 msgstr "Pošiljanje datoteke ni uspelo"
 
-#: src/protocols/msn/dialog.c:92
+#: ../src/protocols/msn/dialog.c:92
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Težava ujemanja (sinhronizacije) seznama prijateljev pri %s (%s)"
 
-#: src/protocols/msn/dialog.c:98
+#: ../src/protocols/msn/dialog.c:98
 #, c-format
 msgid "%s on the local list is inside the group \"%s\" but not on the server list. Do you want this buddy to be added?"
 msgstr "%s z lokalnega seznama je v skupini \"%s\", ne pa tudi na seznamu strežnika. Želite dodati tega prijatelja v skupino?"
 
-#: src/protocols/msn/dialog.c:106
+#: ../src/protocols/msn/dialog.c:106
 #, c-format
 msgid "%s is on the local list but not on the server list. Do you want this buddy to be added?"
 msgstr "%s je na lokalnem seznamu, ne pa tudi na seznamu strežnika. Želite dodati tega prijatelja?"
 
-#: src/protocols/msn/error.c:35
+#: ../src/protocols/msn/error.c:35
 msgid "Unable to parse message"
 msgstr "Ni mogoče razčleniti sporočila"
 
-#: src/protocols/msn/error.c:38
+#: ../src/protocols/msn/error.c:38
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "Skladenjska napaka (verjetno hrošč v Gaimu)"
 
-#: src/protocols/msn/error.c:42
+#: ../src/protocols/msn/error.c:42
 msgid "Invalid email address"
 msgstr "Neveljaven naslov e-pošte"
 
-#: src/protocols/msn/error.c:45
+#: ../src/protocols/msn/error.c:45
 msgid "User does not exist"
 msgstr "Uporabnik ne obstaja"
 
-#: src/protocols/msn/error.c:49
+#: ../src/protocols/msn/error.c:49
 msgid "Fully Qualified Domain Name missing"
 msgstr "Manjka veljavno ime domene"
 
-#: src/protocols/msn/error.c:52
+#: ../src/protocols/msn/error.c:52
 msgid "Already Logged In"
 msgstr "Že prijavljen"
 
-#: src/protocols/msn/error.c:55
+#: ../src/protocols/msn/error.c:55
 msgid "Invalid Username"
 msgstr "Neveljavno uporabniško ime"
 
-#: src/protocols/msn/error.c:58
+#: ../src/protocols/msn/error.c:58
 msgid "Invalid Friendly Name"
 msgstr "Neveljavno poimenovanje"
 
-#: src/protocols/msn/error.c:61
+#: ../src/protocols/msn/error.c:61
 msgid "List Full"
 msgstr "Seznam poln"
 
-#: src/protocols/msn/error.c:64
+#: ../src/protocols/msn/error.c:64
 msgid "Already there"
 msgstr "Že tam"
 
-#: src/protocols/msn/error.c:67
+#: ../src/protocols/msn/error.c:67
 msgid "Not on list"
 msgstr "Ni na seznamu"
 
-#: src/protocols/msn/error.c:70
-#: src/protocols/zephyr/zephyr.c:690
+#: ../src/protocols/msn/error.c:70
+#: ../src/protocols/zephyr/zephyr.c:690
 msgid "User is offline"
 msgstr "Uporabnik ni na zvezi"
 
-#: src/protocols/msn/error.c:73
+#: ../src/protocols/msn/error.c:73
 msgid "Already in the mode"
 msgstr "Že v stanju"
 
-#: src/protocols/msn/error.c:76
+#: ../src/protocols/msn/error.c:76
 msgid "Already in opposite list"
 msgstr "Že na sogovornikovem seznamu"
 
-#: src/protocols/msn/error.c:79
+#: ../src/protocols/msn/error.c:79
 msgid "Too many groups"
 msgstr "Preveč skupin"
 
-#: src/protocols/msn/error.c:82
+#: ../src/protocols/msn/error.c:82
 msgid "Invalid group"
 msgstr "Neveljavna skupina"
 
-#: src/protocols/msn/error.c:85
+#: ../src/protocols/msn/error.c:85
 msgid "User not in group"
 msgstr "Uporabnik ni v skupini"
 
-#: src/protocols/msn/error.c:88
+#: ../src/protocols/msn/error.c:88
 msgid "Group name too long"
 msgstr "Predolgo ime skupine"
 
-#: src/protocols/msn/error.c:91
+#: ../src/protocols/msn/error.c:91
 msgid "Cannot remove group zero"
 msgstr "Ni mogoče odstraniti skupine nič"
 
-#: src/protocols/msn/error.c:95
+#: ../src/protocols/msn/error.c:95
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Uporabnika ste želeli dodati v skupino, ki ne obstaja"
 
-#: src/protocols/msn/error.c:99
+#: ../src/protocols/msn/error.c:99
 msgid "Switchboard failed"
 msgstr "Stikalna plošča ni uspela"
 
-#: src/protocols/msn/error.c:102
+#: ../src/protocols/msn/error.c:102
 msgid "Notify Transfer failed"
 msgstr "Sporočilo o prenosu ni uspelo"
 
-#: src/protocols/msn/error.c:106
+#: ../src/protocols/msn/error.c:106
 msgid "Required fields missing"
 msgstr "Obvezna polja niso bila izpolnjena"
 
-#: src/protocols/msn/error.c:109
+#: ../src/protocols/msn/error.c:109
 msgid "Too many hits to a FND"
 msgstr "Preveč zadetkov za FND"
 
-#: src/protocols/msn/error.c:112
-#: src/protocols/oscar/oscar.c:205
+#: ../src/protocols/msn/error.c:112
+#: ../src/protocols/oscar/oscar.c:207
 msgid "Not logged in"
 msgstr "Neprijavljen"
 
-#: src/protocols/msn/error.c:116
+#: ../src/protocols/msn/error.c:116
 msgid "Service Temporarily Unavailable"
 msgstr "Storitev je trenutno nedosegljiva"
 
-#: src/protocols/msn/error.c:119
+#: ../src/protocols/msn/error.c:119
 msgid "Database server error"
 msgstr "Napaka v podatkovni bazi strežnika"
 
-#: src/protocols/msn/error.c:122
+#: ../src/protocols/msn/error.c:122
 msgid "Command disabled"
 msgstr "Ukaz onemogočen"
 
-#: src/protocols/msn/error.c:125
+#: ../src/protocols/msn/error.c:125
 msgid "File operation error"
 msgstr "Napaka pri operaciji z datoteko"
 
-#: src/protocols/msn/error.c:128
+#: ../src/protocols/msn/error.c:128
 msgid "Memory allocation error"
 msgstr "Napaka ob rezervaciji pomnilnika"
 
-#: src/protocols/msn/error.c:131
+#: ../src/protocols/msn/error.c:131
 msgid "Wrong CHL value sent to server"
 msgstr "Strežniku je bila poslana napačna vrednost CHL"
 
-#: src/protocols/msn/error.c:135
+#: ../src/protocols/msn/error.c:135
 msgid "Server busy"
 msgstr "Strežnik je zaposlen"
 
-#: src/protocols/msn/error.c:138
-#: src/protocols/msn/error.c:151
-#: src/protocols/msn/error.c:206
+#: ../src/protocols/msn/error.c:138
+#: ../src/protocols/msn/error.c:151
+#: ../src/protocols/msn/error.c:206
 msgid "Server unavailable"
 msgstr "Strežnik je nedostopen"
 
-#: src/protocols/msn/error.c:141
+#: ../src/protocols/msn/error.c:141
 msgid "Peer Notification server down"
 msgstr "Strežnik za obveščanje prijateljev je nedelujoč"
 
-#: src/protocols/msn/error.c:144
+#: ../src/protocols/msn/error.c:144
 msgid "Database connect error"
 msgstr "Napaka pri povezavi v podatkovno bazo"
 
-#: src/protocols/msn/error.c:148
+#: ../src/protocols/msn/error.c:148
 msgid "Server is going down (abandon ship)"
 msgstr "Strežnik se zaustavlja (skočite iz ladje!)"
 
-#: src/protocols/msn/error.c:155
+#: ../src/protocols/msn/error.c:155
 msgid "Error creating connection"
 msgstr "Napaka pri ustvarjanju povezave"
 
-#: src/protocols/msn/error.c:159
+#: ../src/protocols/msn/error.c:159
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR parameter je bodisi neznan ali nedovoljen"
 
-#: src/protocols/msn/error.c:162
+#: ../src/protocols/msn/error.c:162
 msgid "Unable to write"
 msgstr "Ni bilo mogoče pisati"
 
-#: src/protocols/msn/error.c:165
+#: ../src/protocols/msn/error.c:165
 msgid "Session overload"
 msgstr "Preobremenitev seje"
 
-#: src/protocols/msn/error.c:168
+#: ../src/protocols/msn/error.c:168
 msgid "User is too active"
 msgstr "Uporabnik je preveč aktiven"
 
-#: src/protocols/msn/error.c:171
+#: ../src/protocols/msn/error.c:171
 msgid "Too many sessions"
 msgstr "Preveč sej"
 
-#: src/protocols/msn/error.c:174
+#: ../src/protocols/msn/error.c:174
 msgid "Passport not verified"
 msgstr "Potni list ni preverjen"
 
-#: src/protocols/msn/error.c:177
+#: ../src/protocols/msn/error.c:177
 msgid "Bad friend file"
 msgstr "Neveljavna datoteka s prijatelji"
 
-#: src/protocols/msn/error.c:180
+#: ../src/protocols/msn/error.c:180
 msgid "Not expected"
 msgstr "Nepričakovano"
 
-#: src/protocols/msn/error.c:185
+#: ../src/protocols/msn/error.c:185
 msgid "Friendly name changes too rapidly"
 msgstr "Prijateljsko ime se spreminja preveč pogosto"
 
-#: src/protocols/msn/error.c:194
+#: ../src/protocols/msn/error.c:194
 msgid "Server too busy"
 msgstr "Strežnik preveč zaposlen"
 
-#: src/protocols/msn/error.c:198
-#: src/protocols/oscar/oscar.c:2837
-#: src/protocols/silc/ops.c:1717
-#: src/protocols/toc/toc.c:722
+#: ../src/protocols/msn/error.c:198
+#: ../src/protocols/oscar/oscar.c:2864
+#: ../src/protocols/silc/ops.c:1717
+#: ../src/protocols/toc/toc.c:722
 msgid "Authentication failed"
 msgstr "Overovitev ni uspela"
 
-#: src/protocols/msn/error.c:201
+#: ../src/protocols/msn/error.c:201
 msgid "Not allowed when offline"
 msgstr "Ni dovoljeno brez povezave"
 
-#: src/protocols/msn/error.c:209
+#: ../src/protocols/msn/error.c:209
 msgid "Not accepting new users"
 msgstr "Brez sprejemanja novih uporabnikov"
 
-#: src/protocols/msn/error.c:213
+#: ../src/protocols/msn/error.c:213
 msgid "Kids Passport without parental consent"
 msgstr "Otroški potni list brez privolitve staršev"
 
-#: src/protocols/msn/error.c:217
+#: ../src/protocols/msn/error.c:217
 msgid "Passport account not yet verified"
 msgstr "Račun še ni bil potrjen"
 
-#: src/protocols/msn/error.c:220
+#: ../src/protocols/msn/error.c:220
 msgid "Bad ticket"
 msgstr "Napačna vstopnica"
 
-#: src/protocols/msn/error.c:224
+#: ../src/protocols/msn/error.c:224
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Neznana koda napake %d"
 
-#: src/protocols/msn/error.c:236
+#: ../src/protocols/msn/error.c:236
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN napaka: %s\n"
 
-#: src/protocols/msn/msn.c:113
+#: ../src/protocols/msn/msn.c:113
 msgid "You have just sent a Nudge!"
 msgstr "Ravnokar ste poslali mežik!"
 
-#: src/protocols/msn/msn.c:138
+#: ../src/protocols/msn/msn.c:138
 msgid "Your new MSN friendly name is too long."
 msgstr "Vaše novo MSN poimenovanje je predolgo."
 
-#: src/protocols/msn/msn.c:246
+#: ../src/protocols/msn/msn.c:246
 msgid "Set your friendly name."
 msgstr "Nastavite vaše poimenovanje."
 
-#: src/protocols/msn/msn.c:247
+#: ../src/protocols/msn/msn.c:247
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "To je ime, pod katerim vas bodo videli vaši MSN prijatelji."
 
-#: src/protocols/msn/msn.c:263
+#: ../src/protocols/msn/msn.c:263
 msgid "Set your home phone number."
 msgstr "Nastavite številko vašega domačega telefona."
 
-#: src/protocols/msn/msn.c:278
+#: ../src/protocols/msn/msn.c:278
 msgid "Set your work phone number."
 msgstr "Nastavite številko vašega službenega telefona."
 
-#: src/protocols/msn/msn.c:293
+#: ../src/protocols/msn/msn.c:293
 msgid "Set your mobile phone number."
 msgstr "Nastavite številko vašega mobilnega telefona."
 
-#: src/protocols/msn/msn.c:306
+#: ../src/protocols/msn/msn.c:306
 msgid "Allow MSN Mobile pages?"
 msgstr "Dovoli MSN strani za mobilnike?"
 
-#: src/protocols/msn/msn.c:307
+#: ../src/protocols/msn/msn.c:307
 msgid "Do you want to allow or disallow people on your buddy list to send you MSN Mobile pages to your cell phone or other mobile device?"
 msgstr "Ali želite dovoliti oz. prepovedati prijateljem na vašem seznamu, da vam pošiljajo MSN strani za mobilnike na vaš mobilni telefon?"
 
-#: src/protocols/msn/msn.c:311
+#: ../src/protocols/msn/msn.c:311
 msgid "Allow"
 msgstr "Dovoli"
 
-#: src/protocols/msn/msn.c:312
+#: ../src/protocols/msn/msn.c:312
 msgid "Disallow"
 msgstr "Prepovej"
 
-#: src/protocols/msn/msn.c:328
+#: ../src/protocols/msn/msn.c:328
 msgid "This Hotmail account may not be active."
 msgstr "Ta račun Hotmail morda ni aktiven."
 
-#: src/protocols/msn/msn.c:354
+#: ../src/protocols/msn/msn.c:354
 msgid "Send a mobile message."
 msgstr "Pošlji sporočilo na mobilnik."
 
-#: src/protocols/msn/msn.c:356
+#: ../src/protocols/msn/msn.c:356
 msgid "Page"
 msgstr "Stran/Poziv"
 
-#: src/protocols/msn/msn.c:550
-#: src/protocols/msn/msn.c:557
-#: src/protocols/msn/msn.c:566
-#: src/protocols/sametime/sametime.c:3193
-#: src/protocols/yahoo/yahoo.c:2827
-#: src/protocols/yahoo/yahoo.c:2833
+#: ../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:2880
+#: ../src/protocols/yahoo/yahoo.c:2886
 #, c-format
 msgid ""
 "\n"
@@ -7691,184 +7866,184 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: src/protocols/msn/msn.c:557
+#: ../src/protocols/msn/msn.c:557
 msgid "Has you"
 msgstr "Vas ima med prijatelji"
 
-#: src/protocols/msn/msn.c:587
-#: src/protocols/msn/state.c:33
-#: src/protocols/yahoo/yahoo.c:2658
-#: src/protocols/yahoo/yahoo.c:3235
+#: ../src/protocols/msn/msn.c:587
+#: ../src/protocols/msn/state.c:33
+#: ../src/protocols/yahoo/yahoo.c:2709
+#: ../src/protocols/yahoo/yahoo.c:3288
 msgid "Be Right Back"
 msgstr "Pridem precej nazaj"
 
-#: src/protocols/msn/msn.c:591
-#: src/protocols/msn/state.c:31
-#: src/protocols/novell/novell.c:2851
-#: src/protocols/novell/novell.c:2985
-#: src/protocols/silc/buddy.c:1473
-#: src/protocols/silc/silc.c:53
-#: src/protocols/yahoo/yahoo.c:2660
-#: src/protocols/yahoo/yahoo.c:3238
+#: ../src/protocols/msn/msn.c:591
+#: ../src/protocols/msn/state.c:31
+#: ../src/protocols/novell/novell.c:2851
+#: ../src/protocols/novell/novell.c:2985
+#: ../src/protocols/silc/buddy.c:1473
+#: ../src/protocols/silc/silc.c:53
+#: ../src/protocols/yahoo/yahoo.c:2711
+#: ../src/protocols/yahoo/yahoo.c:3291
 msgid "Busy"
 msgstr "Zaposlen"
 
-#: src/protocols/msn/msn.c:595
-#: src/protocols/yahoo/yahoo.c:2668
-#: src/protocols/yahoo/yahoo.c:3250
+#: ../src/protocols/msn/msn.c:595
+#: ../src/protocols/yahoo/yahoo.c:2719
+#: ../src/protocols/yahoo/yahoo.c:3303
 msgid "On the Phone"
 msgstr "Na telefonu"
 
-#: src/protocols/msn/msn.c:599
-#: src/protocols/yahoo/yahoo.c:2672
-#: src/protocols/yahoo/yahoo.c:3256
+#: ../src/protocols/msn/msn.c:599
+#: ../src/protocols/yahoo/yahoo.c:2723
+#: ../src/protocols/yahoo/yahoo.c:3309
 msgid "Out to Lunch"
 msgstr "Na kosilu"
 
-#: src/protocols/msn/msn.c:623
+#: ../src/protocols/msn/msn.c:623
 msgid "Set Friendly Name..."
 msgstr "Nastavi poimenovanje ..."
 
-#: src/protocols/msn/msn.c:628
+#: ../src/protocols/msn/msn.c:628
 msgid "Set Home Phone Number..."
 msgstr "Nastavi št. domačega telefona ..."
 
-#: src/protocols/msn/msn.c:632
+#: ../src/protocols/msn/msn.c:632
 msgid "Set Work Phone Number..."
 msgstr "Nastavi št. službenega telefona ..."
 
-#: src/protocols/msn/msn.c:636
+#: ../src/protocols/msn/msn.c:636
 msgid "Set Mobile Phone Number..."
 msgstr "Nastavi št. mobilnega telefona ..."
 
-#: src/protocols/msn/msn.c:642
+#: ../src/protocols/msn/msn.c:642
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Omogoči/onemogoči mobilne naprave ..."
 
-#: src/protocols/msn/msn.c:647
+#: ../src/protocols/msn/msn.c:647
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Dovoli/prepovej mobilne strani ..."
 
-#: src/protocols/msn/msn.c:657
+#: ../src/protocols/msn/msn.c:657
 msgid "Open Hotmail Inbox"
 msgstr "Odpri prispelo pošto Hotmail"
 
-#: src/protocols/msn/msn.c:681
+#: ../src/protocols/msn/msn.c:681
 msgid "Send to Mobile"
 msgstr "Pošlji na mobilca"
 
-#: src/protocols/msn/msn.c:691
-#: src/protocols/novell/novell.c:3441
+#: ../src/protocols/msn/msn.c:691
+#: ../src/protocols/novell/novell.c:3441
 msgid "Initiate _Chat"
 msgstr "Začni _pogovor"
 
-#: src/protocols/msn/msn.c:729
+#: ../src/protocols/msn/msn.c:729
 msgid "SSL support is needed for MSN. Please install a supported SSL library. See http://gaim.sf.net/faq-ssl.php for more information."
 msgstr "Za MSN potrebujete podporo SSL, zato morate namestiti podprto knjižnico SSL. Več informacij na http://gaim.sf.net/faq-ssl.php."
 
-#: src/protocols/msn/msn.c:757
+#: ../src/protocols/msn/msn.c:757
 msgid "Failed to connect to server."
 msgstr "Povezava na strežnik neuspešna."
 
-#: src/protocols/msn/msn.c:1366
-#: src/protocols/yahoo/yahoo_profile.c:676
-#: src/protocols/zephyr/zephyr.c:721
-#: src/protocols/zephyr/zephyr.c:1136
+#: ../src/protocols/msn/msn.c:1366
+#: ../src/protocols/yahoo/yahoo_profile.c:685
+#: ../src/protocols/zephyr/zephyr.c:721
+#: ../src/protocols/zephyr/zephyr.c:1136
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Psevdonim:</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1373
-#: src/protocols/msn/msn.c:1716
-#: src/protocols/yahoo/yahoo_profile.c:1193
-#: src/util.c:790
+#: ../src/protocols/msn/msn.c:1373
+#: ../src/protocols/msn/msn.c:1725
+#: ../src/protocols/yahoo/yahoo_profile.c:1202
+#: ../src/util.c:1035
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b> "
 
-#: src/protocols/msn/msn.c:1447
+#: ../src/protocols/msn/msn.c:1456
 msgid "MSN Profile"
 msgstr "Profil MSN"
 
-#: src/protocols/msn/msn.c:1452
-#: src/protocols/msn/msn.c:1703
-#: src/protocols/yahoo/yahoo_profile.c:786
+#: ../src/protocols/msn/msn.c:1461
+#: ../src/protocols/msn/msn.c:1712
+#: ../src/protocols/yahoo/yahoo_profile.c:795
 msgid "Error retrieving profile"
 msgstr "Napaka pri pridobivanju profila"
 
-#: src/protocols/msn/msn.c:1522
-#: src/protocols/oscar/oscar.c:6162
-#: src/protocols/yahoo/yahoo_profile.c:1041
+#: ../src/protocols/msn/msn.c:1531
+#: ../src/protocols/oscar/oscar.c:6139
+#: ../src/protocols/yahoo/yahoo_profile.c:1050
 msgid "Age"
 msgstr "Starost"
 
-#: src/protocols/msn/msn.c:1538
-#: src/protocols/yahoo/yahoo_profile.c:1046
+#: ../src/protocols/msn/msn.c:1547
+#: ../src/protocols/yahoo/yahoo_profile.c:1055
 msgid "Marital Status"
 msgstr "Zakonski stan"
 
-#: src/protocols/msn/msn.c:1545
-#: src/protocols/novell/novell.c:1480
-#: src/protocols/yahoo/yahoo_profile.c:1036
+#: ../src/protocols/msn/msn.c:1554
+#: ../src/protocols/novell/novell.c:1480
+#: ../src/protocols/yahoo/yahoo_profile.c:1045
 msgid "Location"
 msgstr "Lokacija"
 
-#: src/protocols/msn/msn.c:1553
-#: src/protocols/yahoo/yahoo_profile.c:1056
+#: ../src/protocols/msn/msn.c:1562
+#: ../src/protocols/yahoo/yahoo_profile.c:1065
 msgid "Occupation"
 msgstr "Zaposlitev"
 
-#: src/protocols/msn/msn.c:1570
-#: src/protocols/msn/msn.c:1576
-#: src/protocols/msn/msn.c:1583
-#: src/protocols/msn/msn.c:1591
-#: src/protocols/msn/msn.c:1598
+#: ../src/protocols/msn/msn.c:1579
+#: ../src/protocols/msn/msn.c:1585
+#: ../src/protocols/msn/msn.c:1592
+#: ../src/protocols/msn/msn.c:1600
+#: ../src/protocols/msn/msn.c:1607
 msgid "A Little About Me"
 msgstr "Nekaj o meni"
 
-#: src/protocols/msn/msn.c:1607
-#: src/protocols/msn/msn.c:1613
-#: src/protocols/msn/msn.c:1620
-#: src/protocols/msn/msn.c:1627
+#: ../src/protocols/msn/msn.c:1616
+#: ../src/protocols/msn/msn.c:1622
+#: ../src/protocols/msn/msn.c:1629
+#: ../src/protocols/msn/msn.c:1636
 msgid "Favorite Things"
 msgstr "Priljubljene stvari"
 
-#: src/protocols/msn/msn.c:1636
-#: src/protocols/msn/msn.c:1642
-#: src/protocols/msn/msn.c:1649
+#: ../src/protocols/msn/msn.c:1645
+#: ../src/protocols/msn/msn.c:1651
+#: ../src/protocols/msn/msn.c:1658
 msgid "Hobbies and Interests"
 msgstr "Hobiji in interesi"
 
-#: src/protocols/msn/msn.c:1658
-#: src/protocols/msn/msn.c:1664
-#: src/protocols/yahoo/yahoo_profile.c:1098
+#: ../src/protocols/msn/msn.c:1667
+#: ../src/protocols/msn/msn.c:1673
+#: ../src/protocols/yahoo/yahoo_profile.c:1107
 msgid "Favorite Quote"
 msgstr "Najljubši citat"
 
-#: src/protocols/msn/msn.c:1672
+#: ../src/protocols/msn/msn.c:1681
 msgid "Last Updated"
 msgstr "Nazadnje osveženo"
 
-#: src/protocols/msn/msn.c:1683
-#: src/protocols/silc/ops.c:1060
+#: ../src/protocols/msn/msn.c:1692
+#: ../src/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "Domača stran"
 
-#: src/protocols/msn/msn.c:1705
+#: ../src/protocols/msn/msn.c:1714
 msgid "The user has not created a public profile."
 msgstr "Uporabnik ni ustvaril javnega profila."
 
-#: src/protocols/msn/msn.c:1706
+#: ../src/protocols/msn/msn.c:1715
 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 "MSN ne more najti uporabnikovega profila. To lahko pomeni, da uporabnik ne obstaja, ali pa še ni ustvaril javnega profila."
 
-#: src/protocols/msn/msn.c:1710
+#: ../src/protocols/msn/msn.c:1719
 msgid "Gaim could not find any information in the user's profile. The user most likely does not exist."
 msgstr "Gaim v uporabnikovem profilu ne more najti informacij. Uporabnik verjetno ne obstaja."
 
-#: src/protocols/msn/msn.c:1716
-#: src/protocols/yahoo/yahoo_profile.c:1193
+#: ../src/protocols/msn/msn.c:1725
+#: ../src/protocols/yahoo/yahoo_profile.c:1202
 msgid "Profile URL"
 msgstr "URL profila"
 
@@ -7882,87 +8057,88 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1922
-#: src/protocols/msn/msn.c:1924
+#: ../src/protocols/msn/msn.c:1931
+#: ../src/protocols/msn/msn.c:1933
 msgid "MSN Protocol Plugin"
 msgstr "Vstavek za protokol MSN"
 
-#: src/protocols/msn/msn.c:1943
+#: ../src/protocols/msn/msn.c:1952
 msgid "Login server"
 msgstr "Prijavni strežnik"
 
-#: src/protocols/msn/msn.c:1952
+#: ../src/protocols/msn/msn.c:1961
 msgid "Use HTTP Method"
 msgstr "Uporabi metodo HTTP"
 
-#: src/protocols/msn/msn.c:1957
+#: ../src/protocols/msn/msn.c:1966
 msgid "Show custom smileys"
 msgstr "Pokaži smeške po meri ..."
 
-#: src/protocols/msn/msn.c:1965
+#: ../src/protocols/msn/msn.c:1974
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Dregnite prijatelja, da vas bo opazil"
 
-#: src/protocols/msn/nexus.c:103
-#: src/protocols/msn/servconn.c:127
-#: src/protocols/yahoo/yahoochat.c:1345
+#: ../src/protocols/msn/nexus.c:141
+#: ../src/protocols/msn/servconn.c:133
+#: ../src/protocols/yahoo/yahoochat.c:1345
+#: ../src/protocols/yahoo/yahoochat.c:1372
 msgid "Unable to connect"
 msgstr "Ni se mogoče povezati"
 
-#: src/protocols/msn/notification.c:178
+#: ../src/protocols/msn/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s ni veljavna skupina."
 
-#: src/protocols/msn/notification.c:184
-#: src/protocols/msn/notification.c:532
-#: src/protocols/msn/session.c:334
+#: ../src/protocols/msn/notification.c:184
+#: ../src/protocols/msn/notification.c:532
+#: ../src/protocols/msn/session.c:334
 msgid "Unknown error."
 msgstr "Neznana napaka."
 
-#: src/protocols/msn/notification.c:187
+#: ../src/protocols/msn/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s na %s (%s)"
 
-#: src/protocols/msn/notification.c:498
+#: ../src/protocols/msn/notification.c:498
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Uporabnika ni mogoče dodati na %s (%s)."
 
-#: src/protocols/msn/notification.c:502
+#: ../src/protocols/msn/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "Ni mogoče blokirati uporabnika %s (%s)"
 
-#: src/protocols/msn/notification.c:506
+#: ../src/protocols/msn/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Uporabniku ni mogoče dovoliti na %s (%s)."
 
-#: src/protocols/msn/notification.c:514
+#: ../src/protocols/msn/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "%s ni mogoče dodati, saj je vaš seznam prijateljev poln."
 
-#: src/protocols/msn/notification.c:523
+#: ../src/protocols/msn/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s ni veljaven račun potnega lista."
 
-#: src/protocols/msn/notification.c:528
+#: ../src/protocols/msn/notification.c:528
 msgid "Service Temporarily Unavailable."
 msgstr "Storitev je trenutno nedosegljiva."
 
-#: src/protocols/msn/notification.c:821
+#: ../src/protocols/msn/notification.c:821
 msgid "Unable to rename group"
 msgstr "Skupine ni mogoče preimenovati"
 
-#: src/protocols/msn/notification.c:876
+#: ../src/protocols/msn/notification.c:876
 msgid "Unable to delete group"
 msgstr "Skupine ni mogoče izbrisati"
 
-#: src/protocols/msn/notification.c:1309
+#: ../src/protocols/msn/notification.c:1309
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
@@ -7989,15 +8165,15 @@
 "\n"
 "Po zaključenih vzdrževalnih delih se boste lahko uspešno prijavili."
 
-#: src/protocols/msn/servconn.c:129
+#: ../src/protocols/msn/servconn.c:135
 msgid "Writing error"
 msgstr "Napaka pri pisanju"
 
-#: src/protocols/msn/servconn.c:131
+#: ../src/protocols/msn/servconn.c:137
 msgid "Reading error"
 msgstr "Napaka pri branju"
 
-#: src/protocols/msn/servconn.c:138
+#: ../src/protocols/msn/servconn.c:144
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -8006,192 +8182,197 @@
 "Napaka povezave s strežnika %s:\n"
 "%s"
 
-#: src/protocols/msn/session.c:304
+#: ../src/protocols/msn/session.c:304
 msgid "Our protocol is not supported by the server."
 msgstr "Strežnik ne podpira tega protokola."
 
-#: src/protocols/msn/session.c:308
+#: ../src/protocols/msn/session.c:308
 msgid "Error parsing HTTP."
 msgstr "Napaka pri parsanju 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:5791
-#: src/protocols/yahoo/yahoo.c:193
+#: ../src/protocols/msn/session.c:312
+#: ../src/protocols/napster/napster.c:456
+#: ../src/protocols/oscar/oscar.c:5816
+#: ../src/protocols/yahoo/yahoo.c:193
 msgid "You have signed on from another location."
 msgstr "Prijavili ste se z druge lokacije."
 
-#: src/protocols/msn/session.c:315
+#: ../src/protocols/msn/session.c:315
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "Strežniki MSN so trenutno nedostopni. Prosimo počakajte in poskusite znova."
 
-#: src/protocols/msn/session.c:320
+#: ../src/protocols/msn/session.c:320
 msgid "The MSN servers are going down temporarily."
 msgstr "Strežniki MSN se bodo začasno zaustavili."
 
 #  Data is assumed to be the destination sn
-#: src/protocols/msn/session.c:324
+#: ../src/protocols/msn/session.c:324
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Ni možno overoviti: %s"
 
-#: src/protocols/msn/session.c:329
+#: ../src/protocols/msn/session.c:329
 msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "Vaš seznam prijateljev MSN je trenutno nedostopen. Prosimo počakajte in poskusite znova."
 
-#: src/protocols/msn/session.c:350
-#: src/protocols/msn/session.c:352
+#: ../src/protocols/msn/session.c:350
+#: ../src/protocols/msn/session.c:352
 msgid "Handshaking"
 msgstr "Rokovanje"
 
-#: src/protocols/msn/session.c:351
+#: ../src/protocols/msn/session.c:351
 msgid "Transferring"
 msgstr "Prenos je v teku"
 
-#: src/protocols/msn/session.c:353
+#: ../src/protocols/msn/session.c:353
 msgid "Starting authentication"
 msgstr "Pričetek overovitve"
 
-#: src/protocols/msn/session.c:354
+#: ../src/protocols/msn/session.c:354
 msgid "Getting cookie"
 msgstr "Pridobivanje piškotka"
 
-#: src/protocols/msn/session.c:356
+#: ../src/protocols/msn/session.c:356
 msgid "Sending cookie"
 msgstr "Pošljanje piškotka"
 
-#: src/protocols/msn/session.c:357
+#: ../src/protocols/msn/session.c:357
 msgid "Retrieving buddy list"
 msgstr "Prejemanje seznama prijateljev"
 
-#: src/protocols/msn/state.c:34
+#: ../src/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "Stran od računalnika"
 
-#: src/protocols/msn/state.c:35
+#: ../src/protocols/msn/state.c:35
 msgid "On The Phone"
 msgstr "Na telefonu"
 
-#: src/protocols/msn/state.c:36
+#: ../src/protocols/msn/state.c:36
 msgid "Out To Lunch"
 msgstr "Na kosilu"
 
-#: src/protocols/msn/switchboard.c:405
+#: ../src/protocols/msn/switchboard.c:408
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "Sporočila morda ni bilo poslano, ker je prišlo do časovne prekoračitve:"
 
-#: src/protocols/msn/switchboard.c:413
+#: ../src/protocols/msn/switchboard.c:416
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "Sporočila ni mogoče poslati, saj ni dovoljeno v nevidnem stanju:"
 
-#: src/protocols/msn/switchboard.c:417
+#: ../src/protocols/msn/switchboard.c:420
 msgid "Message could not be sent because the user is offline:"
 msgstr "Sporočila ni mogoče poslati, saj uporabnik ni na zvezi:"
 
-#: src/protocols/msn/switchboard.c:421
+#: ../src/protocols/msn/switchboard.c:424
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Sporočilo ni bilo poslano, ker je prišlo do napake v povezavi:"
 
-#: src/protocols/msn/switchboard.c:425
+#: ../src/protocols/msn/switchboard.c:428
+msgid "Message could not be sent because we are sending too quickly:"
+msgstr "Sporočila ni mogoče poslati, saj je poslano prehitro:"
+
+#: ../src/protocols/msn/switchboard.c:432
 msgid "Message could not be sent because an error with the switchboard occurred:"
 msgstr "Sporočila ni bilo poslano, ker je prišlo do napake v stikalni plošči:"
 
-#: src/protocols/msn/switchboard.c:433
+#: ../src/protocols/msn/switchboard.c:440
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Sporočila morda ni bilo poslano, ker je prišlo do neznane napake:"
 
-#: src/protocols/msn/switchboard.c:954
+#: ../src/protocols/msn/switchboard.c:961
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s vam je ravnokar poslal mežik!"
 
-#: src/protocols/msn/userlist.c:96
+#: ../src/protocols/msn/userlist.c:96
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "Uporabnik %s (%s) želi dodati %s na svoj seznam prijateljev."
 
-#: src/protocols/msn/userlist.c:111
-#: src/protocols/yahoo/yahoo.c:914
+#: ../src/protocols/msn/userlist.c:111
+#: ../src/protocols/yahoo/yahoo.c:914
 msgid "Authorize"
 msgstr "Pooblasti"
 
-#: src/protocols/msn/userlist.c:112
-#: src/protocols/yahoo/yahoo.c:916
+#: ../src/protocols/msn/userlist.c:112
+#: ../src/protocols/yahoo/yahoo.c:916
 msgid "Deny"
 msgstr "Zavrni"
 
-#: src/protocols/msn/userlist.c:286
+#: ../src/protocols/msn/userlist.c:286
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s vas je dodal(a) na svoj seznam prijateljev."
 
-#: src/protocols/msn/userlist.c:350
+#: ../src/protocols/msn/userlist.c:350
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s vas je odstranil(a) s svojega seznama prijateljev."
 
-#: src/protocols/msn/userlist.c:670
+#: ../src/protocols/msn/userlist.c:678
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "\"%s\" ni bilo mogoče dodati."
 
-#: src/protocols/msn/userlist.c:672
+#: ../src/protocols/msn/userlist.c:680
 msgid "The screen name specified is invalid."
 msgstr "Navedeno zaslonsko ime ni veljavno."
 
-#: src/protocols/napster/napster.c:266
+#: ../src/protocols/napster/napster.c:266
 msgid "Unable to read header from server"
 msgstr "Ni bilo mogoče prebrati glave sporočila, ki ga je poslal strežnik"
 
-#: src/protocols/napster/napster.c:280
+#: ../src/protocols/napster/napster.c:280
 #, c-format
 msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
 msgstr "Ni mogoče prebrati sporočila s strežnika: %s.  Ukaz je %hd, dolžina pa %hd."
 
-#: src/protocols/napster/napster.c:296
+#: ../src/protocols/napster/napster.c:296
 msgid "Unknown server error."
 msgstr "Neznana napaka strežnika."
 
-#: src/protocols/napster/napster.c:345
+#: ../src/protocols/napster/napster.c:345
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr "uporabniki: %s, datoteke: %s, velikost: %sGB"
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:356
+#: ../src/protocols/napster/napster.c:356
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "Ni bilo dodati \"%s\" na vaš seznam Napster vroče"
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:420
+#: ../src/protocols/napster/napster.c:420
 #, c-format
 msgid "%s requested your information"
 msgstr "%s je zahteval tvoje informacije"
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:460
+#: ../src/protocols/napster/napster.c:460
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s je zahteval PING"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/napster/napster.c:507
-#: src/protocols/napster/napster.c:538
-#: src/protocols/toc/toc.c:172
-#: src/protocols/yahoo/yahoo.c:2238
-#: src/protocols/yahoo/yahoo.c:2265
-#: src/protocols/yahoo/yahoo.c:2328
-#: src/protocols/yahoo/yahoo_filexfer.c:69
-#: src/protocols/yahoo/yahoo_filexfer.c:111
-#: src/protocols/yahoo/ycht.c:481
+#: ../src/protocols/napster/napster.c:507
+#: ../src/protocols/napster/napster.c:543
+#: ../src/protocols/toc/toc.c:172
+#: ../src/protocols/yahoo/yahoo.c:2238
+#: ../src/protocols/yahoo/yahoo.c:2265
+#: ../src/protocols/yahoo/yahoo.c:2348
+#: ../src/protocols/yahoo/yahoo.c:2363
+#: ../src/protocols/yahoo/yahoo_filexfer.c:74
+#: ../src/protocols/yahoo/yahoo_filexfer.c:137
+#: ../src/protocols/yahoo/ycht.c:540
 msgid "Unable to connect."
 msgstr "Ni se bilo mogoče povezati."
 
-#: src/protocols/napster/napster.c:594
-#: src/protocols/toc/toc.c:1367
+#: ../src/protocols/napster/napster.c:599
+#: ../src/protocols/toc/toc.c:1367
 msgid "_Group:"
 msgstr "_Skupina:"
 
@@ -8205,244 +8386,244 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:695
-#: src/protocols/napster/napster.c:697
+#: ../src/protocols/napster/napster.c:700
+#: ../src/protocols/napster/napster.c:702
 msgid "NAPSTER Protocol Plugin"
 msgstr "Dodatek za protokol NAPSTER"
 
-#: src/protocols/novell/nmuser.c:1868
+#: ../src/protocols/novell/nmuser.c:1868
 msgid "Required parameters not passed in"
 msgstr "Zahtevani parametri niso podani"
 
-#: src/protocols/novell/nmuser.c:1871
+#: ../src/protocols/novell/nmuser.c:1871
 msgid "Unable to write to network"
 msgstr "Pisanje v omrežje ni možno"
 
-#: src/protocols/novell/nmuser.c:1874
+#: ../src/protocols/novell/nmuser.c:1874
 msgid "Unable to read from network"
 msgstr "Branje iz omrežja ni možno"
 
-#: src/protocols/novell/nmuser.c:1877
+#: ../src/protocols/novell/nmuser.c:1877
 msgid "Error communicating with server"
 msgstr "Napaka pri komunikaciji s strežnikom"
 
-#: src/protocols/novell/nmuser.c:1881
+#: ../src/protocols/novell/nmuser.c:1881
 msgid "Conference not found"
 msgstr "Konference ni mogoče najti"
 
-#: src/protocols/novell/nmuser.c:1884
+#: ../src/protocols/novell/nmuser.c:1884
 msgid "Conference does not exist"
 msgstr "Konferenca ne obstaja"
 
-#: src/protocols/novell/nmuser.c:1888
+#: ../src/protocols/novell/nmuser.c:1888
 msgid "A folder with that name already exists"
 msgstr "Mapa s tem imenom že obstaja"
 
-#: src/protocols/novell/nmuser.c:1891
+#: ../src/protocols/novell/nmuser.c:1891
 msgid "Not supported"
 msgstr "Ni podprto"
 
-#: src/protocols/novell/nmuser.c:1895
+#: ../src/protocols/novell/nmuser.c:1895
 msgid "Password has expired"
 msgstr "Geslo je poteklo"
 
-#: src/protocols/novell/nmuser.c:1898
+#: ../src/protocols/novell/nmuser.c:1898
 msgid "Invalid password"
 msgstr "Napačno geslo"
 
-#: src/protocols/novell/nmuser.c:1901
+#: ../src/protocols/novell/nmuser.c:1901
 msgid "User not found"
 msgstr "Uporabnika ni mogoče najti"
 
-#: src/protocols/novell/nmuser.c:1904
+#: ../src/protocols/novell/nmuser.c:1904
 msgid "Account has been disabled"
 msgstr "Račun je bil onemogočen"
 
-#: src/protocols/novell/nmuser.c:1907
+#: ../src/protocols/novell/nmuser.c:1907
 msgid "The server could not access the directory"
 msgstr "Strežnik ni mogel dostopiti do mape"
 
-#: src/protocols/novell/nmuser.c:1910
+#: ../src/protocols/novell/nmuser.c:1910
 msgid "Your system administrator has disabled this operation"
 msgstr "Vaš sistemski skrbnik je to možnost onemogočil"
 
-#: src/protocols/novell/nmuser.c:1913
+#: ../src/protocols/novell/nmuser.c:1913
 msgid "The server is unavailable; try again later"
 msgstr "Strežnik ni na voljo; poskusite pozneje"
 
-#: src/protocols/novell/nmuser.c:1916
+#: ../src/protocols/novell/nmuser.c:1916
 msgid "Cannot add a contact to the same folder twice"
 msgstr "Stika ni mogoče dodati v isto mapo dvakrat"
 
-#: src/protocols/novell/nmuser.c:1919
+#: ../src/protocols/novell/nmuser.c:1919
 msgid "Cannot add yourself"
 msgstr "Vas ni mogoče dodati"
 
-#: src/protocols/novell/nmuser.c:1922
+#: ../src/protocols/novell/nmuser.c:1922
 msgid "Master archive is misconfigured"
 msgstr "Glavni arhiv je narobe nastavljen"
 
-#: src/protocols/novell/nmuser.c:1926
+#: ../src/protocols/novell/nmuser.c:1926
 msgid "Invalid username or password"
 msgstr "Neveljavno uporabniško ime ali geslo"
 
-#: src/protocols/novell/nmuser.c:1929
+#: ../src/protocols/novell/nmuser.c:1929
 msgid "Could not recognize the host of the username you entered"
 msgstr "Ni mogoče prepoznati gostitelja uporabniškega imena, ki ste ga vnesli"
 
-#: src/protocols/novell/nmuser.c:1932
+#: ../src/protocols/novell/nmuser.c:1932
 msgid "Your account has been disabled because too many invalid passwords were entered"
 msgstr "Vaš račun je bil onemogočen, ker ste vnesli preveč napačnih gesel"
 
-#: src/protocols/novell/nmuser.c:1935
+#: ../src/protocols/novell/nmuser.c:1935
 msgid "You cannot add the same person twice to a conversation"
 msgstr "Iste osebe ne morete dvakrat dodati pomenku"
 
-#: src/protocols/novell/nmuser.c:1939
+#: ../src/protocols/novell/nmuser.c:1939
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "Dosegli ste mejo števila dovoljenih stikovstikov"
 
-#: src/protocols/novell/nmuser.c:1942
+#: ../src/protocols/novell/nmuser.c:1942
 msgid "You have entered an invalid username"
 msgstr "Vnesli ste napačno uporabniško ime"
 
-#: src/protocols/novell/nmuser.c:1945
+#: ../src/protocols/novell/nmuser.c:1945
 msgid "An error occurred while updating the directory"
 msgstr "Med posodabljanjem mape je prišlo do napake"
 
-#: src/protocols/novell/nmuser.c:1948
+#: ../src/protocols/novell/nmuser.c:1948
 msgid "Incompatible protocol version"
 msgstr "Nezdružljiva različica protokola"
 
-#: src/protocols/novell/nmuser.c:1951
+#: ../src/protocols/novell/nmuser.c:1951
 msgid "The user has blocked you"
 msgstr "Uporabnik vas je zavrnil"
 
-#: src/protocols/novell/nmuser.c:1954
+#: ../src/protocols/novell/nmuser.c:1954
 msgid "This evaluation version does not allow more than ten users to log in at one time"
 msgstr "Ta preskusna različica ne dovoljuje prijave več kot desetim uporabnikom hkrati"
 
-#: src/protocols/novell/nmuser.c:1957
+#: ../src/protocols/novell/nmuser.c:1957
 msgid "The user is either offline or you are blocked"
 msgstr "Uporabnike ni na zvezi ali pa ste zavrnjeni"
 
-#: src/protocols/novell/nmuser.c:1960
+#: ../src/protocols/novell/nmuser.c:1960
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Neznana napaka: 0x%X"
 
-#: src/protocols/novell/novell.c:124
+#: ../src/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr "Prijava spodletela (%s)."
 
-#: src/protocols/novell/novell.c:247
+#: ../src/protocols/novell/novell.c:247
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr "Sporočila ni mogoče poslati. Ni mogoče dobiti podrobnosti za uporabnika (%s)."
 
-#: src/protocols/novell/novell.c:396
+#: ../src/protocols/novell/novell.c:396
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "Ni bilo moč dodati %s na vaš seznam prijateljev (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: src/protocols/novell/novell.c:422
+#: ../src/protocols/novell/novell.c:422
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Sporočila (%s) ni mogoče poslati."
 
-#: src/protocols/novell/novell.c:493
-#: src/protocols/novell/novell.c:987
+#: ../src/protocols/novell/novell.c:493
+#: ../src/protocols/novell/novell.c:987
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Ni bilo moč povabiti uporabnika (%s)."
 
-#: src/protocols/novell/novell.c:532
+#: ../src/protocols/novell/novell.c:532
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr "Sporočila ni mogoče poslati %s. Ni mogoče ustvariti konference (%s)."
 
-#: src/protocols/novell/novell.c:537
+#: ../src/protocols/novell/novell.c:537
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "Sporočila ni bilo moč poslati. Ni mogoče ustvariti konference (%s)."
 
-#: src/protocols/novell/novell.c:584
+#: ../src/protocols/novell/novell.c:584
 #, c-format
 msgid "Unable to move user %s to folder %s in the server side list. Error while creating folder (%s)."
 msgstr "Uporabnika %s ni mogoče premakniti v mapo %s na seznamu nedejavnih na strežniku. Napaka pri usvarjanju mape (%s)."
 
-#: src/protocols/novell/novell.c:632
+#: ../src/protocols/novell/novell.c:632
 #, c-format
 msgid "Unable to add %s to your buddy list. Error creating folder in server side list (%s)."
 msgstr "Ni bilo moč dodati %s na vaš seznam prijateljev. Napaka pri ustvarjanju mape na strežniku (%s)."
 
-#: src/protocols/novell/novell.c:705
+#: ../src/protocols/novell/novell.c:705
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Podrobnosti za uporabnika %s (%s) ni moč dobiti."
 
-#: src/protocols/novell/novell.c:751
-#: src/protocols/novell/novell.c:897
+#: ../src/protocols/novell/novell.c:751
+#: ../src/protocols/novell/novell.c:897
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Uporabnika ni moč dodati na seznam zasebnosti (%s)."
 
-#: src/protocols/novell/novell.c:798
+#: ../src/protocols/novell/novell.c:798
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "%s ni moč dodati na seznam zavrnjenih (%s)."
 
-#: src/protocols/novell/novell.c:851
+#: ../src/protocols/novell/novell.c:851
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "%s ni moč dodati na seznam dovoljenih (%s)."
 
-#: src/protocols/novell/novell.c:919
+#: ../src/protocols/novell/novell.c:919
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "%s ni moč odstraniti s seznama zasebnosti (%s)."
 
-#: src/protocols/novell/novell.c:942
-#: src/protocols/novell/novell.c:1654
+#: ../src/protocols/novell/novell.c:942
+#: ../src/protocols/novell/novell.c:1654
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Ni mogoče spremeniti strežniških nastavitve zasebnosti (%s)."
 
-#: src/protocols/novell/novell.c:1014
+#: ../src/protocols/novell/novell.c:1014
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Ni mogoče ustvariti konference (%s)."
 
-#: src/protocols/novell/novell.c:1123
-#: src/protocols/novell/novell.c:1693
+#: ../src/protocols/novell/novell.c:1123
+#: ../src/protocols/novell/novell.c:1693
 msgid "Error communicating with server. Closing connection."
 msgstr "Napaka pri komunikaciji s strežnikom. Zapiranje povezave."
 
-#: src/protocols/novell/novell.c:1478
+#: ../src/protocols/novell/novell.c:1478
 msgid "Telephone Number"
 msgstr "Telefonska številka"
 
-#: src/protocols/novell/novell.c:1482
+#: ../src/protocols/novell/novell.c:1482
 msgid "Department"
 msgstr "Oddelek"
 
-#: src/protocols/novell/novell.c:1484
+#: ../src/protocols/novell/novell.c:1484
 msgid "Personal Title"
 msgstr "Osebni naziv"
 
-#: src/protocols/novell/novell.c:1488
+#: ../src/protocols/novell/novell.c:1488
 msgid "Mailstop"
 msgstr "StojPošta"
 
-#: src/protocols/novell/novell.c:1490
-#: src/protocols/oscar/oscar.c:6135
-#: src/protocols/oscar/oscar.c:6142
+#: ../src/protocols/novell/novell.c:1490
+#: ../src/protocols/oscar/oscar.c:6113
+#: ../src/protocols/oscar/oscar.c:6120
 msgid "Email Address"
 msgstr "Elektronski naslov"
 
-#: src/protocols/novell/novell.c:1506
+#: ../src/protocols/novell/novell.c:1506
 msgid "User ID"
 msgstr "Uporabniška št."
 
@@ -8453,41 +8634,41 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1520
+#: ../src/protocols/novell/novell.c:1520
 msgid "Full name"
 msgstr "Polno ime"
 
-#: src/protocols/novell/novell.c:1644
+#: ../src/protocols/novell/novell.c:1644
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Konferenca GroupWise %d"
 
-#: src/protocols/novell/novell.c:1669
+#: ../src/protocols/novell/novell.c:1669
 msgid "Unable to make SSL connection to server."
 msgstr "Ni se bilo mogoče povezati na strežnik preko SSL."
 
-#: src/protocols/novell/novell.c:1726
+#: ../src/protocols/novell/novell.c:1726
 msgid "Authenticating..."
 msgstr "Overovljanje ..."
 
-#: src/protocols/novell/novell.c:1738
+#: ../src/protocols/novell/novell.c:1738
 msgid "Unable to connect to server."
 msgstr "Ni se bilo mogoče povezati na strežnik."
 
-#: src/protocols/novell/novell.c:1741
+#: ../src/protocols/novell/novell.c:1741
 msgid "Waiting for response..."
 msgstr "Čakanje odgovora ..."
 
-#: src/protocols/novell/novell.c:1876
+#: ../src/protocols/novell/novell.c:1876
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s je bil povabljen na ta pomenek."
 
-#: src/protocols/novell/novell.c:1904
+#: ../src/protocols/novell/novell.c:1904
 msgid "Invitation to Conversation"
 msgstr "Povabilo na pomenek"
 
-#: src/protocols/novell/novell.c:1905
+#: ../src/protocols/novell/novell.c:1905
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8498,15 +8679,15 @@
 "\n"
 "Poslano: %s"
 
-#: src/protocols/novell/novell.c:1907
+#: ../src/protocols/novell/novell.c:1907
 msgid "Would you like to join the conversation?"
 msgstr "Se želite pridružiti pomenku?"
 
-#: src/protocols/novell/novell.c:2014
+#: ../src/protocols/novell/novell.c:2014
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "Ker ste se prijavili na drugi delovni postaji, ste bili odjavljeni."
 
-#: src/protocols/novell/novell.c:2070
+#: ../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 ni na zvezi in ni sprejel sporočila, ki ste ga pravkar poslali."
@@ -8515,15 +8696,15 @@
 #. *  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:2168
 msgid "Unable to connect to server. Please enter the address of the server you wish to connect to."
 msgstr "Ni se mogoče povezati na strežnik. Vnesite naslov strežnika, na katerega se želite povezati."
 
-#: src/protocols/novell/novell.c:2190
+#: ../src/protocols/novell/novell.c:2190
 msgid "Error. SSL support is not installed."
 msgstr "Napaka. Podpora SSL ni nameščena."
 
-#: src/protocols/novell/novell.c:2499
+#: ../src/protocols/novell/novell.c:2499
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Ta konferenca je bila zaprta. Spročil se ne da pošiljati več.več."
 
@@ -8537,472 +8718,476 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3544
-#: src/protocols/novell/novell.c:3546
+#: ../src/protocols/novell/novell.c:3544
+#: ../src/protocols/novell/novell.c:3546
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Vstavek za protokol Novell GroupWise Messenger"
 
-#: src/protocols/novell/novell.c:3565
+#: ../src/protocols/novell/novell.c:3565
 msgid "Server address"
 msgstr "Naslov strežnika"
 
-#: src/protocols/novell/novell.c:3569
+#: ../src/protocols/novell/novell.c:3569
 msgid "Server port"
 msgstr "Vrata strežnika"
 
-#: src/protocols/oscar/oscar.c:201
+#: ../src/protocols/oscar/oscar.c:203
 msgid "Invalid error"
 msgstr "Neveljavna napaka"
 
-#: src/protocols/oscar/oscar.c:202
+#: ../src/protocols/oscar/oscar.c:204
 msgid "Invalid SNAC"
 msgstr "Neveljaven SNAC"
 
-#: src/protocols/oscar/oscar.c:203
+#: ../src/protocols/oscar/oscar.c:205
 msgid "Rate to host"
 msgstr "Prenos do gostitelja"
 
-#: src/protocols/oscar/oscar.c:204
+#: ../src/protocols/oscar/oscar.c:206
 msgid "Rate to client"
 msgstr "Prenos do odjemalca"
 
-#: src/protocols/oscar/oscar.c:206
+#: ../src/protocols/oscar/oscar.c:208
 msgid "Service unavailable"
 msgstr "Storitev ni dostopna"
 
-#: src/protocols/oscar/oscar.c:207
+#: ../src/protocols/oscar/oscar.c:209
 msgid "Service not defined"
 msgstr "Storitev nedefinirana"
 
-#: src/protocols/oscar/oscar.c:208
+#: ../src/protocols/oscar/oscar.c:210
 msgid "Obsolete SNAC"
 msgstr "Zastarel SNAC"
 
-#: src/protocols/oscar/oscar.c:209
+#: ../src/protocols/oscar/oscar.c:211
 msgid "Not supported by host"
 msgstr "Gostitelj ne podpira"
 
-#: src/protocols/oscar/oscar.c:210
+#: ../src/protocols/oscar/oscar.c:212
 msgid "Not supported by client"
 msgstr "Odjemalec ne podpira"
 
-#: src/protocols/oscar/oscar.c:211
+#: ../src/protocols/oscar/oscar.c:213
 msgid "Refused by client"
 msgstr "Odjemalec je zavrnil"
 
-#: src/protocols/oscar/oscar.c:212
+#: ../src/protocols/oscar/oscar.c:214
 msgid "Reply too big"
 msgstr "Odgovor prevelik"
 
-#: src/protocols/oscar/oscar.c:213
+#: ../src/protocols/oscar/oscar.c:215
 msgid "Responses lost"
 msgstr "Odgovori so se izgubili"
 
-#: src/protocols/oscar/oscar.c:214
+#: ../src/protocols/oscar/oscar.c:216
 msgid "Request denied"
 msgstr "Zahteva zavrnjena"
 
-#: src/protocols/oscar/oscar.c:215
+#: ../src/protocols/oscar/oscar.c:217
 msgid "Busted SNAC payload"
 msgstr "Odkrit SNAC podatek"
 
-#: src/protocols/oscar/oscar.c:216
+#: ../src/protocols/oscar/oscar.c:218
 msgid "Insufficient rights"
 msgstr "Premalo pravic"
 
-#: src/protocols/oscar/oscar.c:217
+#: ../src/protocols/oscar/oscar.c:219
 msgid "In local permit/deny"
 msgstr "V lokalnem dovoljenju/prepovedi"
 
-#: src/protocols/oscar/oscar.c:218
+#: ../src/protocols/oscar/oscar.c:220
 msgid "Too evil (sender)"
 msgstr "Preveč zloben (pošiljatelj)"
 
-#: src/protocols/oscar/oscar.c:219
+#: ../src/protocols/oscar/oscar.c:221
 msgid "Too evil (receiver)"
 msgstr "Preveč zloben (prejemnik)"
 
-#: src/protocols/oscar/oscar.c:220
+#: ../src/protocols/oscar/oscar.c:222
 msgid "User temporarily unavailable"
 msgstr "Uporabnik začasno ni dostopen"
 
-#: src/protocols/oscar/oscar.c:221
+#: ../src/protocols/oscar/oscar.c:223
 msgid "No match"
 msgstr "Ni zadetka"
 
-#: src/protocols/oscar/oscar.c:222
+#: ../src/protocols/oscar/oscar.c:224
 msgid "List overflow"
 msgstr "Prekoračitev seznama"
 
-#: src/protocols/oscar/oscar.c:223
+#: ../src/protocols/oscar/oscar.c:225
 msgid "Request ambiguous"
 msgstr "Zahteva nejasna"
 
-#: src/protocols/oscar/oscar.c:224
+#: ../src/protocols/oscar/oscar.c:226
 msgid "Queue full"
 msgstr "Čakalna vrsta je polna"
 
-#: src/protocols/oscar/oscar.c:225
+#: ../src/protocols/oscar/oscar.c:227
 msgid "Not while on AOL"
 msgstr "Na omrežju AOL ni dovoljeno"
 
-#: src/protocols/oscar/oscar.c:419
-#: src/protocols/oscar/oscar.c:521
+#: ../src/protocols/oscar/oscar.c:421
+#: ../src/protocols/oscar/oscar.c:523
 msgid "(There was an error receiving this message.  The buddy you are speaking to most likely has a buggy client.)"
 msgstr "(Prišlo je do napake pri prejemu tega sporočila. Prijatelj, s katerim se pogovarjate, ima verjetno hroščastega odjemalca.)"
 
-#: src/protocols/oscar/oscar.c:635
+#: ../src/protocols/oscar/oscar.c:638
 msgid "Voice"
 msgstr "Glasovno"
 
-#: src/protocols/oscar/oscar.c:638
+#: ../src/protocols/oscar/oscar.c:641
 msgid "AIM Direct IM"
 msgstr "Neposredni pogovor AIM"
 
-#: src/protocols/oscar/oscar.c:641
-#: src/protocols/silc/silc.c:693
-#: src/protocols/silc/util.c:510
+#: ../src/protocols/oscar/oscar.c:644
+#: ../src/protocols/silc/silc.c:693
+#: ../src/protocols/silc/util.c:510
 msgid "Chat"
 msgstr "Pomenek"
 
-#: src/protocols/oscar/oscar.c:644
-#: src/protocols/oscar/oscar.c:8119
+#: ../src/protocols/oscar/oscar.c:647
+#: ../src/protocols/oscar/oscar.c:8095
 msgid "Get File"
 msgstr "Sprejmi datoteko"
 
-#: src/protocols/oscar/oscar.c:651
+#: ../src/protocols/oscar/oscar.c:654
 msgid "Games"
 msgstr "Igre"
 
-#: src/protocols/oscar/oscar.c:654
+#: ../src/protocols/oscar/oscar.c:657
 msgid "Add-Ins"
 msgstr "Dodatki"
 
-#: src/protocols/oscar/oscar.c:657
+#: ../src/protocols/oscar/oscar.c:660
 msgid "Send Buddy List"
 msgstr "Pošlji seznam prijateljev"
 
-#: src/protocols/oscar/oscar.c:660
+#: ../src/protocols/oscar/oscar.c:663
 msgid "ICQ Direct Connect"
 msgstr "Neposredna povezava ICQ"
 
-#: src/protocols/oscar/oscar.c:663
+#: ../src/protocols/oscar/oscar.c:666
 msgid "AP User"
 msgstr "AP uporabnik"
 
-#: src/protocols/oscar/oscar.c:666
+#: ../src/protocols/oscar/oscar.c:669
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:669
+#: ../src/protocols/oscar/oscar.c:672
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:672
+#: ../src/protocols/oscar/oscar.c:675
 msgid "ICQ Server Relay"
 msgstr "ICQ strežniški posrednik"
 
-#: src/protocols/oscar/oscar.c:675
+#: ../src/protocols/oscar/oscar.c:678
 msgid "Old ICQ UTF8"
 msgstr "Star ICQ UTF-8"
 
-#: src/protocols/oscar/oscar.c:678
+#: ../src/protocols/oscar/oscar.c:681
 msgid "Trillian Encryption"
 msgstr "Trillian kodiranje"
 
-#: src/protocols/oscar/oscar.c:681
+#: ../src/protocols/oscar/oscar.c:684
 msgid "ICQ UTF8"
 msgstr "ICQ UTF-8"
 
-#: src/protocols/oscar/oscar.c:684
+#: ../src/protocols/oscar/oscar.c:687
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:687
+#: ../src/protocols/oscar/oscar.c:690
 msgid "Security Enabled"
 msgstr "Varnost vključena"
 
-#: src/protocols/oscar/oscar.c:690
+#: ../src/protocols/oscar/oscar.c:693
 msgid "Video Chat"
 msgstr "Video.pomenek"
 
-#: src/protocols/oscar/oscar.c:694
+#: ../src/protocols/oscar/oscar.c:697
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:697
+#: ../src/protocols/oscar/oscar.c:700
 msgid "Live Video"
 msgstr "Video v živo"
 
-#: src/protocols/oscar/oscar.c:700
+#: ../src/protocols/oscar/oscar.c:703
 msgid "Camera"
 msgstr "Kamera"
 
-#: src/protocols/oscar/oscar.c:718
-#: src/protocols/oscar/oscar.c:7981
+#: ../src/protocols/oscar/oscar.c:721
+#: ../src/protocols/oscar/oscar.c:7957
 msgid "Free For Chat"
 msgstr "Na voljo za pogovor"
 
-#: src/protocols/oscar/oscar.c:722
-#: src/protocols/oscar/oscar.c:8009
+#: ../src/protocols/oscar/oscar.c:725
+#: ../src/protocols/oscar/oscar.c:7985
 msgid "Not Available"
 msgstr "Ni na voljo"
 
-#: src/protocols/oscar/oscar.c:724
-#: src/protocols/oscar/oscar.c:7999
+#: ../src/protocols/oscar/oscar.c:727
+#: ../src/protocols/oscar/oscar.c:7975
 msgid "Occupied"
 msgstr "Zaseden"
 
-#: src/protocols/oscar/oscar.c:728
+#: ../src/protocols/oscar/oscar.c:731
 msgid "Web Aware"
 msgstr "Zaveden interneta"
 
-#: src/protocols/oscar/oscar.c:732
+#: ../src/protocols/oscar/oscar.c:735
 msgid "Online"
 msgstr "Prisoten"
 
-#: src/protocols/oscar/oscar.c:809
-#: src/protocols/oscar/oscar.c:5155
+#: ../src/protocols/oscar/oscar.c:812
+#: ../src/protocols/oscar/oscar.c:5188
 msgid "Warning Level"
 msgstr "Stopnja opozoril"
 
-#: src/protocols/oscar/oscar.c:818
+#: ../src/protocols/oscar/oscar.c:821
 msgid "Buddy Comment"
 msgstr "Komentar prijatelja"
 
-#: src/protocols/oscar/oscar.c:969
+#: ../src/protocols/oscar/oscar.c:970
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Neposredni pogovor z %s končan"
 
-#: src/protocols/oscar/oscar.c:971
+#: ../src/protocols/oscar/oscar.c:972
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Neposredni pogovor z %s ni bil uspešen"
 
-#: src/protocols/oscar/oscar.c:979
+#: ../src/protocols/oscar/oscar.c:980
 msgid "Direct Connect failed"
 msgstr "Neposredna povezava spodletela"
 
-#: src/protocols/oscar/oscar.c:1056
-#: src/protocols/oscar/oscar.c:1187
+#: ../src/protocols/oscar/oscar.c:1060
+#: ../src/protocols/oscar/oscar.c:1189
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Neposredni pogovor z %s vzpostavljen"
 
-#: src/protocols/oscar/oscar.c:1137
+#: ../src/protocols/oscar/oscar.c:1141
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 msgstr "Poskus povezave z %s pri %s:%hu za Direct IM."
 
-#: src/protocols/oscar/oscar.c:1543
+#: ../src/protocols/oscar/oscar.c:1544
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Spraševanje %s za povezavo na nas pri %s:%hu za Direct IM."
 
-#: src/protocols/oscar/oscar.c:1548
-#: src/protocols/oscar/oscar.c:1595
+#: ../src/protocols/oscar/oscar.c:1549
+#: ../src/protocols/oscar/oscar.c:1596
 msgid "Unable to open Direct IM"
 msgstr "Neposredne povezave ni bilo mogoče vzpostaviti"
 
-#: src/protocols/oscar/oscar.c:1631
+#: ../src/protocols/oscar/oscar.c:1632
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Izbrali ste neposredno povezovanje z %s."
 
-#: src/protocols/oscar/oscar.c:1635
+#: ../src/protocols/oscar/oscar.c:1636
 msgid "Because this reveals your IP address, it may be considered a privacy risk.  Do you wish to continue?"
 msgstr "Ker to razkrije vaš IP naslov, se to obravnava kot kršenje zasebnosti. Ali želite nadaljevati?"
 
-#: src/protocols/oscar/oscar.c:1639
-#: src/protocols/oscar/oscar.c:4466
+#: ../src/protocols/oscar/oscar.c:1640
+#: ../src/protocols/oscar/oscar.c:4499
 msgid "_Connect"
 msgstr "_Poveži"
 
-#: src/protocols/oscar/oscar.c:1705
+#: ../src/protocols/oscar/oscar.c:1718
 #, c-format
 msgid "You have lost your connection to chat room %s."
 msgstr "Povezava do pogovorne sobe %s je bila prekinjena."
 
-#: src/protocols/oscar/oscar.c:1728
+#: ../src/protocols/oscar/oscar.c:1741
 msgid "Chat is currently unavailable"
 msgstr "Pomenek tenutno ni na voljo"
 
-#: src/protocols/oscar/oscar.c:1798
+#: ../src/protocols/oscar/oscar.c:1813
 msgid "Screen name sent"
 msgstr "Vzdevek poslan"
 
-#: src/protocols/oscar/oscar.c:1814
+#: ../src/protocols/oscar/oscar.c:1829
 #, c-format
 msgid "Unable to login: Could not sign on as %s because the screen name is invalid.  Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."
 msgstr "Prijava ni mogoča: ni se mogoče prijaviti kot %s, ker je vzdevek neveljaven. Vzdevki se morajo začeti s črko, vsebujejo lahko le črke, številke in presledke, lahko pa so tudi sestavljeni iz samih števil."
 
-#: src/protocols/oscar/oscar.c:1843
+#: ../src/protocols/oscar/oscar.c:1857
 msgid "Unable to login to AIM"
-msgstr "Nisem se mogel povezati na AIM"
-
-#: src/protocols/oscar/oscar.c:1947
-#: src/protocols/oscar/oscar.c:2928
+msgstr "Povezava na AIM ni uspela"
+
+#: ../src/protocols/oscar/oscar.c:1960
+#: ../src/protocols/oscar/oscar.c:2951
 msgid "Could Not Connect"
-msgstr "Nisem se mogel povezati"
-
-#: src/protocols/oscar/oscar.c:1955
+msgstr "Povezava ni uspela"
+
+#: ../src/protocols/oscar/oscar.c:1971
 msgid "Connection established, cookie sent"
 msgstr "Povezava vzpostavljena, piškotek poslan"
 
 #. 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:2107
+#: ../src/protocols/oscar/oscar.c:2130
 msgid "Attempting connection redirect..."
 msgstr "Poskus preusmeritve povezave ..."
 
 #. proxyip timed out
 #. * Yes, it's a bit odd to ask the user to enable proxied file transfers
 #. * when it's a proxied transfer that timed out. It is possible that a
-#. * stage 1/2 proxied transfer might work when a stage 3 will not.
-#: src/protocols/oscar/oscar.c:2152
+#. * stage 1 or 2 proxied transfer might work when a stage 3 will not.
+#: ../src/protocols/oscar/oscar.c:2176
 #, c-format
 msgid ""
 "Transfer of file %s timed out.\n"
-" Try enabling proxy servers for file transfers in Tools->Preferences->AIM/ICQ."
+" Try enabling proxy servers for file transfers in Accounts->%s->Edit Account->Advanced."
 msgstr ""
 "Prenos datoteke %s je prekoračil čas.\n"
-"Poskusite omogočiti strežnike proxy za prenos datotek vOrodja -> Nastavitve -> AIM/ICQ."
-
-#: src/protocols/oscar/oscar.c:2250
-#: src/protocols/yahoo/yahoo_filexfer.c:174
-#: src/protocols/yahoo/yahoo_filexfer.c:183
-#: src/protocols/yahoo/yahoo_filexfer.c:192
+"Poskusite omogočiti strežnike prehoda za prenos datotek v Računi -> %s -> Uredi račun -> Napredno."
+
+#: ../src/protocols/oscar/oscar.c:2274
+#: ../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 "Opisa datoteke ni bilo mogoče vzpostaviti."
 
-#: src/protocols/oscar/oscar.c:2255
+#: ../src/protocols/oscar/oscar.c:2279
 msgid "Unable to create new connection."
 msgstr "Ni bilo mogoče vzpostaviti nove povezave."
 
-#: src/protocols/oscar/oscar.c:2489
-#: src/protocols/oscar/oscar.c:2498
-#: src/protocols/oscar/oscar.c:2512
-#: src/protocols/oscar/oscar.c:2522
+#: ../src/protocols/oscar/oscar.c:2516
+#: ../src/protocols/oscar/oscar.c:2525
+#: ../src/protocols/oscar/oscar.c:2539
+#: ../src/protocols/oscar/oscar.c:2549
 msgid "Unable to log into file transfer proxy."
 msgstr "Prijava v proxy prenosa datotek ni bila mogoča."
 
-#: src/protocols/oscar/oscar.c:2576
+#: ../src/protocols/oscar/oscar.c:2603
 msgid "Unable to establish listener socket or no AOL proxy connection present."
 msgstr "Vtičnice za poslušanje ni bilo mogoče vzpostaviti ali pa povezava prehoda AOL ni prisotna."
 
-#: src/protocols/oscar/oscar.c:2814
-#: src/protocols/toc/toc.c:543
+#: ../src/protocols/oscar/oscar.c:2841
+#: ../src/protocols/toc/toc.c:543
 msgid "Incorrect nickname or password."
 msgstr "Neveljaven vzdevek ali geslo."
 
-#: src/protocols/oscar/oscar.c:2819
+#: ../src/protocols/oscar/oscar.c:2846
 msgid "Your account is currently suspended."
 msgstr "Vaš račun je trenutno zamrznjen."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2823
+#: ../src/protocols/oscar/oscar.c:2850
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Storitev AOL neposrednih sporočil je trenuno nedosegljiva."
 
-#: src/protocols/oscar/oscar.c:2828
+#: ../src/protocols/oscar/oscar.c:2855
 msgid "You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer."
 msgstr "Povezava ste prevečkrat vzpostavili in prekinili. Počakajte deset minut in poskusite ponovno. Če ne počakate sedaj, boste čakali še dalj."
 
-#: src/protocols/oscar/oscar.c:2833
+#: ../src/protocols/oscar/oscar.c:2860
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Različica odjemalca, ki ga uporabljate, je prestara. Prosim posodobite ga pri %s"
 
-#: src/protocols/oscar/oscar.c:2864
+#: ../src/protocols/oscar/oscar.c:2888
 msgid "Internal Error"
 msgstr "Interna napaka"
 
-#: src/protocols/oscar/oscar.c:2935
+#: ../src/protocols/oscar/oscar.c:2958
 msgid "Received authorization"
 msgstr "Ponovno zahtevaj pooblastitev"
 
-#: src/protocols/oscar/oscar.c:2959
+#: ../src/protocols/oscar/oscar.c:2982
 msgid "The SecurID key entered is invalid."
 msgstr "Vnešeni ključ SecurID ni veljaven."
 
-#: src/protocols/oscar/oscar.c:2973
+#: ../src/protocols/oscar/oscar.c:2996
 msgid "Enter SecurID"
 msgstr "Vnesite SecurID"
 
-#: src/protocols/oscar/oscar.c:2974
+#: ../src/protocols/oscar/oscar.c:2997
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Vnesite število s 6 ciframi iz digitalnega prikazovalnika."
 
-#: src/protocols/oscar/oscar.c:3014
-#: src/protocols/oscar/oscar.c:3044
-#: src/protocols/oscar/oscar.c:3133
+#: ../src/protocols/oscar/oscar.c:3037
+#: ../src/protocols/oscar/oscar.c:3067
+#: ../src/protocols/oscar/oscar.c:3158
 #, c-format
 msgid "You may be disconnected shortly.  You may want to use TOC until this is fixed.  Check %s for updates."
 msgstr "Morda bo povezava v kratkem prekinjena. Morda boste želeli uporabiti TOC dokler to ni popravljeno. Preverite %s za posodobitve."
 
-#: src/protocols/oscar/oscar.c:3017
-#: src/protocols/oscar/oscar.c:3047
+#: ../src/protocols/oscar/oscar.c:3040
+#: ../src/protocols/oscar/oscar.c:3070
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim ni mogel dobiti veljavnega prijavnega izvlečka za AIM."
 
-#: src/protocols/oscar/oscar.c:3136
+#: ../src/protocols/oscar/oscar.c:3161
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim ni mogel dobiti veljavnega prijavnega izvlečka."
 
-#: src/protocols/oscar/oscar.c:3157
+#: ../src/protocols/oscar/oscar.c:3182
 msgid "Password sent"
 msgstr "Geslo poslano"
 
-#: src/protocols/oscar/oscar.c:4457
+#: ../src/protocols/oscar/oscar.c:4490
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s je pravkar prosil za neposredno povezavo z %s"
 
-#: src/protocols/oscar/oscar.c:4460
+#: ../src/protocols/oscar/oscar.c:4493
 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 "To zahteva neposredno povezavo med dvema računalnikoma in je za vstavljene slike nujno potrebno. Ker bo izdan vaš IP naslov, je to lahko tveganje varnosti."
 
-#: src/protocols/oscar/oscar.c:4499
+#: ../src/protocols/oscar/oscar.c:4532
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Prosim za pooblastilo, da vas smem dodati na svoj seznam prijateljev."
 
-#: src/protocols/oscar/oscar.c:4507
+#: ../src/protocols/oscar/oscar.c:4540
 msgid "Authorization Request Message:"
 msgstr "Sporočilo o zahtevi po pooblastilu:"
 
-#: src/protocols/oscar/oscar.c:4508
+#: ../src/protocols/oscar/oscar.c:4541
 msgid "Please authorize me!"
 msgstr "Prosim za pooblastilo!"
 
-#: src/protocols/oscar/oscar.c:4538
+#: ../src/protocols/oscar/oscar.c:4571
 #, c-format
 msgid "The user %s requires authorization before being added to a buddy list.  Do you want to send an authorization request?"
 msgstr "Uporabnik %s zahteva pooblastilo preden je dodan na seznam prijateljev. Ali želite poslati zahtevo po pooblastilu?"
 
-#: src/protocols/oscar/oscar.c:4543
+#: ../src/protocols/oscar/oscar.c:4576
 msgid "Request Authorization"
 msgstr "Zahtevaj pooblastilo"
 
-#: src/protocols/oscar/oscar.c:4545
+#: ../src/protocols/oscar/oscar.c:4578
 msgid "_Request Authorization"
 msgstr "_Zahtevaj pooblastilo"
 
-#: src/protocols/oscar/oscar.c:4583
-#: src/protocols/oscar/oscar.c:4589
-#: src/protocols/oscar/oscar.c:4693
-#: src/protocols/oscar/oscar.c:4717
-#: src/protocols/oscar/oscar.c:7415
-#: src/protocols/oscar/oscar.c:7467
+#: ../src/protocols/oscar/oscar.c:4616
+#: ../src/protocols/oscar/oscar.c:4622
+#: ../src/protocols/oscar/oscar.c:4726
+#: ../src/protocols/oscar/oscar.c:4750
+#: ../src/protocols/oscar/oscar.c:7391
+#: ../src/protocols/oscar/oscar.c:7443
 msgid "No reason given."
 msgstr "Ni podanega razloga."
 
-#: src/protocols/oscar/oscar.c:4588
+#: ../src/protocols/oscar/oscar.c:4621
 msgid "Authorization Denied Message:"
 msgstr "Sporočilo o neodobrenem pooblastilu:"
 
-#: src/protocols/oscar/oscar.c:4695
+#: ../src/protocols/oscar/oscar.c:4728
 #, c-format
 msgid ""
 "The user %u wants to add %s to their buddy list for the following reason:\n"
@@ -9011,12 +9196,12 @@
 "Uporabnik %u želi dodati %s na svoj seznam prijateljev iz naslednjega razloga:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4705
-#: src/protocols/oscar/oscar.c:7427
+#: ../src/protocols/oscar/oscar.c:4738
+#: ../src/protocols/oscar/oscar.c:7403
 msgid "Authorization Request"
 msgstr "Zahtevek po pooblastilu"
 
-#: src/protocols/oscar/oscar.c:4717
+#: ../src/protocols/oscar/oscar.c:4750
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the following reason:\n"
@@ -9025,17 +9210,17 @@
 "Uporabnik %u je zavrnil zahtevo, da bi ga dodali na svoj seznam prijateljev z naslednjim razlogom:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4718
+#: ../src/protocols/oscar/oscar.c:4751
 msgid "ICQ authorization denied."
 msgstr "Overovitev ICQ zavrnjena."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:4725
+#: ../src/protocols/oscar/oscar.c:4758
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "Uporabik %u vam je dovolil, da ga dodate na svoj seznam prijateljev."
 
-#: src/protocols/oscar/oscar.c:4733
+#: ../src/protocols/oscar/oscar.c:4766
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -9048,7 +9233,7 @@
 "Od: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4741
+#: ../src/protocols/oscar/oscar.c:4774
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -9061,7 +9246,7 @@
 "Od: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4749
+#: ../src/protocols/oscar/oscar.c:4782
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -9074,20 +9259,20 @@
 "Sporočilo je:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4770
+#: ../src/protocols/oscar/oscar.c:4803
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "Uporabnik ICQ %u vam je poslal vizitko: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:4776
+#: ../src/protocols/oscar/oscar.c:4809
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Ali želite dodati prijatelja s to vizitko na vaš seznam prijateljev?"
 
-#: src/protocols/oscar/oscar.c:4780
+#: ../src/protocols/oscar/oscar.c:4813
 msgid "_Decline"
 msgstr "_Zavrni"
 
-#: src/protocols/oscar/oscar.c:4864
+#: ../src/protocols/oscar/oscar.c:4897
 #, 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."
@@ -9096,7 +9281,7 @@
 msgstr[2] "Spregledali ste %hu sporočili od %s, ker sta bili neveljavni."
 msgstr[3] "Spregledali ste %hu sporočila od %s, ker so bila neveljavna."
 
-#: src/protocols/oscar/oscar.c:4873
+#: ../src/protocols/oscar/oscar.c:4906
 #, 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."
@@ -9105,7 +9290,7 @@
 msgstr[2] "Spregledali ste %hu sporočili od %s, ker sta bili neveljavni."
 msgstr[3] "Spregledali ste %hu sporočila od %s, ker so bila neveljavna."
 
-#: src/protocols/oscar/oscar.c:4882
+#: ../src/protocols/oscar/oscar.c:4915
 #, c-format
 msgid "You missed %hu message from %s because the rate limit has been exceeded."
 msgid_plural "You missed %hu messages from %s because the rate limit has been exceeded."
@@ -9114,7 +9299,7 @@
 msgstr[2] "Spregledali ste %hu sporočili od %s, ker sta bili neveljavni."
 msgstr[3] "Spregledali ste %hu sporočila od %s, ker so bila neveljavna."
 
-#: src/protocols/oscar/oscar.c:4891
+#: ../src/protocols/oscar/oscar.c:4924
 #, 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."
@@ -9123,7 +9308,7 @@
 msgstr[2] "Spregledali ste %hu sporočili od %s, ker sta bili neveljavni."
 msgstr[3] "Spregledali ste %hu sporočila od %s, ker so bila neveljavna."
 
-#: src/protocols/oscar/oscar.c:4900
+#: ../src/protocols/oscar/oscar.c:4933
 #, 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."
@@ -9132,7 +9317,7 @@
 msgstr[2] "Spregledali ste %hu sporočili od %s, ker sta bili neveljavni."
 msgstr[3] "Spregledali ste %hu sporočila od %s, ker so bila neveljavna."
 
-#: src/protocols/oscar/oscar.c:4909
+#: ../src/protocols/oscar/oscar.c:4942
 #, 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."
@@ -9141,146 +9326,146 @@
 msgstr[2] "Spregledali ste %hu sporočili od %s, ker sta bili neveljavni."
 msgstr[3] "Spregledali ste %hu sporočila od %s, ker so bila neveljavna."
 
-#: src/protocols/oscar/oscar.c:4968
+#: ../src/protocols/oscar/oscar.c:5001
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>Stanje:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:5029
+#: ../src/protocols/oscar/oscar.c:5062
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC je izvrgel napako: %s\n"
 
 #  Data is assumed to be the destination sn
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:5066
+#: ../src/protocols/oscar/oscar.c:5099
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Ni moč poslati sporočila: %s"
 
-#: src/protocols/oscar/oscar.c:5066
-#: src/protocols/oscar/oscar.c:5071
-#: src/protocols/oscar/oscar.c:5129
-#: src/protocols/oscar/oscar.c:5133
+#: ../src/protocols/oscar/oscar.c:5099
+#: ../src/protocols/oscar/oscar.c:5104
+#: ../src/protocols/oscar/oscar.c:5162
+#: ../src/protocols/oscar/oscar.c:5166
 msgid "Unknown reason."
 msgstr "Neznan vzrok."
 
-#: src/protocols/oscar/oscar.c:5069
-#: src/protocols/sametime/sametime.c:2321
+#: ../src/protocols/oscar/oscar.c:5102
+#: ../src/protocols/sametime/sametime.c:2373
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Ni moč poslati sporočila k %s:"
 
-#: src/protocols/oscar/oscar.c:5129
+#: ../src/protocols/oscar/oscar.c:5162
 #, c-format
 msgid "User information not available: %s"
 msgstr "Podatki o uporabniku niso dostopni: %s"
 
-#: src/protocols/oscar/oscar.c:5132
+#: ../src/protocols/oscar/oscar.c:5165
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Podatki o uporabniku %s niso dostopni:"
 
-#: src/protocols/oscar/oscar.c:5159
+#: ../src/protocols/oscar/oscar.c:5192
 msgid "Online Since"
 msgstr "Na zvezi od"
 
-#: src/protocols/oscar/oscar.c:5164
-#: src/protocols/yahoo/yahoo_profile.c:1144
+#: ../src/protocols/oscar/oscar.c:5197
+#: ../src/protocols/yahoo/yahoo_profile.c:1153
 msgid "Member Since"
 msgstr "Član od"
 
-#: src/protocols/oscar/oscar.c:5169
+#: ../src/protocols/oscar/oscar.c:5202
 msgid "Capabilities"
 msgstr "Zmožnosti"
 
-#: src/protocols/oscar/oscar.c:5187
+#: ../src/protocols/oscar/oscar.c:5220
 msgid "Available Message"
 msgstr "Sporočilo o dosegljivosti"
 
-#: src/protocols/oscar/oscar.c:5304
+#: ../src/protocols/oscar/oscar.c:5337
 msgid "Your AIM connection may be lost."
 msgstr "Vaša povezava z AIM je morda prekinjena."
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:5490
+#: ../src/protocols/oscar/oscar.c:5523
 msgid "[Unable to display a message from this user because it contained invalid characters.]"
 msgstr "[Ni mogoče prikazati sporočila tega uporabnika, ker vsebuje neveljavne znake.]"
 
-#: src/protocols/oscar/oscar.c:5716
+#: ../src/protocols/oscar/oscar.c:5744
 msgid "Rate limiting error."
 msgstr "Napaka z omejevanjem pogostosti sporočil."
 
-#: src/protocols/oscar/oscar.c:5717
+#: ../src/protocols/oscar/oscar.c:5745
 msgid "The last action you attempted could not be performed because you are over the rate limit. Please wait 10 seconds and try again."
 msgstr "Zadnjega dejanja, ki ste ga želeli izvesti, ni bilo mogoče izvesti, ker ste prekoračili dovoljeno pogostost. Prosim počakajte 10 sekund in poskusite znova."
 
-#: src/protocols/oscar/oscar.c:5793
+#: ../src/protocols/oscar/oscar.c:5818
 msgid "You have been signed off for an unknown reason."
 msgstr "Odjavljeni ste bili iz neznanega razloga."
 
-#: src/protocols/oscar/oscar.c:5806
-#: src/protocols/toc/toc.c:971
+#: ../src/protocols/oscar/oscar.c:5831
+#: ../src/protocols/toc/toc.c:971
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Povezava do pogovorne sobe %s je bila prekinjena."
 
 #. XXX - Don't call this with ssi
-#: src/protocols/oscar/oscar.c:5835
+#: ../src/protocols/oscar/oscar.c:5860
 msgid "Finalizing connection"
 msgstr "Dokončujem povezavo"
 
-#: src/protocols/oscar/oscar.c:6147
-#: src/protocols/silc/util.c:542
+#: ../src/protocols/oscar/oscar.c:6125
+#: ../src/protocols/silc/util.c:542
 msgid "Mobile Phone"
 msgstr "Mobilni telefon"
 
-#: src/protocols/oscar/oscar.c:6165
+#: ../src/protocols/oscar/oscar.c:6142
 msgid "Personal Web Page"
 msgstr "Osebna spletna stran"
 
-#: src/protocols/oscar/oscar.c:6169
+#: ../src/protocols/oscar/oscar.c:6146
 msgid "Additional Information"
 msgstr "Dodatne informacije"
 
-#: src/protocols/oscar/oscar.c:6174
+#: ../src/protocols/oscar/oscar.c:6151
 msgid "Home Address"
 msgstr "Domači naslov"
 
-#: src/protocols/oscar/oscar.c:6178
-#: src/protocols/oscar/oscar.c:6186
+#: ../src/protocols/oscar/oscar.c:6155
+#: ../src/protocols/oscar/oscar.c:6163
 msgid "Zip Code"
 msgstr "Poštna številka"
 
-#: src/protocols/oscar/oscar.c:6182
+#: ../src/protocols/oscar/oscar.c:6159
 msgid "Work Address"
 msgstr "Službeni naslov"
 
-#: src/protocols/oscar/oscar.c:6190
+#: ../src/protocols/oscar/oscar.c:6167
 msgid "Work Information"
 msgstr "Informacije o zaposlitvi"
 
-#: src/protocols/oscar/oscar.c:6191
+#: ../src/protocols/oscar/oscar.c:6168
 msgid "Company"
 msgstr "Podjetje"
 
-#: src/protocols/oscar/oscar.c:6192
+#: ../src/protocols/oscar/oscar.c:6169
 msgid "Division"
 msgstr "Oddelek"
 
-#: src/protocols/oscar/oscar.c:6193
+#: ../src/protocols/oscar/oscar.c:6170
 msgid "Position"
 msgstr "Delovno mesto"
 
-#: src/protocols/oscar/oscar.c:6195
+#: ../src/protocols/oscar/oscar.c:6172
 msgid "Web Page"
 msgstr "Spletna stran"
 
-#: src/protocols/oscar/oscar.c:6253
+#: ../src/protocols/oscar/oscar.c:6230
 msgid "Pop-Up Message"
 msgstr "Pojavno sporočilo"
 
-#: src/protocols/oscar/oscar.c:6293
+#: ../src/protocols/oscar/oscar.c:6270
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
@@ -9289,60 +9474,60 @@
 msgstr[2] "Naslednja vzdevka sta povezana z %s"
 msgstr[3] "Naslednji vzdevki so povezani z %s"
 
-#: src/protocols/oscar/oscar.c:6324
+#: ../src/protocols/oscar/oscar.c:6301
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Za dani elektronski naslov %s ni bilo rezultatov"
 
-#: src/protocols/oscar/oscar.c:6345
+#: ../src/protocols/oscar/oscar.c:6322
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "Prejeti bi morali elektronsko pošto, da potrdite %s. "
 
-#: src/protocols/oscar/oscar.c:6347
+#: ../src/protocols/oscar/oscar.c:6324
 msgid "Account Confirmation Requested"
 msgstr "Potrditev računa je bila zahtevana"
 
-#: src/protocols/oscar/oscar.c:6378
+#: ../src/protocols/oscar/oscar.c:6355
 msgid "Error Changing Account Info"
 msgstr "Napaka pri spreminjanju podatkov o računu"
 
-#: src/protocols/oscar/oscar.c:6381
+#: ../src/protocols/oscar/oscar.c:6358
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because the requested screen name differs from the original."
 msgstr "Napaka 0x%04x: Ni bilo mogoče oblikovati poimenovanja, ker se zahtevano poimenovanje razlikuje od izvirnega."
 
-#: src/protocols/oscar/oscar.c:6384
+#: ../src/protocols/oscar/oscar.c:6361
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "Napaka 0x%04x: Ni bilo mogoče oblikovati poimenovanja, ker je neveljavno."
 
-#: src/protocols/oscar/oscar.c:6387
+#: ../src/protocols/oscar/oscar.c:6364
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because the requested screen name is too long."
 msgstr "Napaka 0x%04x: Ni bilo mogoče oblikovati poimenovanja, ker je zahtevano poimenovanje predolgo."
 
-#: src/protocols/oscar/oscar.c:6390
+#: ../src/protocols/oscar/oscar.c:6367
 #, c-format
 msgid "Error 0x%04x: Unable to change email address because there is already a request pending for this screen name."
 msgstr "Napaka 0x%04x: Ni bilo mogoče spremeniti elektronskega naslova, ker je že en zahtevek v čakanju za to ime."
 
-#: src/protocols/oscar/oscar.c:6393
+#: ../src/protocols/oscar/oscar.c:6370
 #, c-format
 msgid "Error 0x%04x: Unable to change email address because the given address has too many screen names associated with it."
 msgstr "Napaka 0x%04x: Ni mogoče spremeniti elektronskega naslova ker ima podan naslov že preveč računov."
 
-#: src/protocols/oscar/oscar.c:6396
+#: ../src/protocols/oscar/oscar.c:6373
 #, c-format
 msgid "Error 0x%04x: Unable to change email address because the given address is invalid."
 msgstr "Napaka 0x%04x: Ni mogoče spremeniti elektronskega naslova ker je podan naslov neveljaven."
 
-#: src/protocols/oscar/oscar.c:6399
+#: ../src/protocols/oscar/oscar.c:6376
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Napaka 0x%04x: Neznana napaka."
 
-#: src/protocols/oscar/oscar.c:6409
+#: ../src/protocols/oscar/oscar.c:6386
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -9351,29 +9536,29 @@
 "Vaše ime je trenutno naslednje oblike:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6410
-#: src/protocols/oscar/oscar.c:6417
+#: ../src/protocols/oscar/oscar.c:6387
+#: ../src/protocols/oscar/oscar.c:6394
 msgid "Account Info"
 msgstr "Podatki o računu"
 
-#: src/protocols/oscar/oscar.c:6415
+#: ../src/protocols/oscar/oscar.c:6392
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "Elektronski naslov za %s je %s"
 
-#: src/protocols/oscar/oscar.c:6487
+#: ../src/protocols/oscar/oscar.c:6464
 msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "Vaša slika IM ni bila poslana. Za pošiljanje slik IM morate biti \"neposredno povezani\"."
 
-#: src/protocols/oscar/oscar.c:6725
+#: ../src/protocols/oscar/oscar.c:6704
 msgid "Unable to set AIM profile."
 msgstr "Ni mogoče nastaviti AIM profila."
 
-#: src/protocols/oscar/oscar.c:6726
+#: ../src/protocols/oscar/oscar.c:6705
 msgid "You have probably requested to set your profile before the login procedure completed.  Your profile remains unset; try setting it again when you are fully connected."
 msgstr "Verjetno ste zahtevali, da spremenite svoj profil preden je bila prijava dokončana. Za zdaj je vaš profil nespremenjen; poskusite ponovno, ko boste zagotovo prijavljeni."
 
-#: src/protocols/oscar/oscar.c:6740
+#: ../src/protocols/oscar/oscar.c:6719
 #, c-format
 msgid "The maximum profile length of %d byte has been exceeded.  Gaim has truncated it for you."
 msgid_plural "The maximum profile length of %d bytes has been exceeded.  Gaim has truncated it for you."
@@ -9382,11 +9567,11 @@
 msgstr[2] "Največja dolžina profila %d bajta je bila presežena.  Gaim ga je skrajšal namesto vas."
 msgstr[3] "Največja dolžina profila %d bajte je bila presežena.  Gaim ga je skrajšal namesto vas."
 
-#: src/protocols/oscar/oscar.c:6745
+#: ../src/protocols/oscar/oscar.c:6724
 msgid "Profile too long."
 msgstr "Profil je predolg."
 
-#: src/protocols/oscar/oscar.c:6787
+#: ../src/protocols/oscar/oscar.c:6766
 #, c-format
 msgid "The maximum away message length of %d byte has been exceeded.  Gaim has truncated it for you."
 msgid_plural "The maximum away message length of %d bytes has been exceeded.  Gaim has truncated it for you."
@@ -9395,63 +9580,63 @@
 msgstr[2] "Največja dolžina sporočila odsotnosti %d bajta je bila presežena.  Gaim ga je skrajšal namesto vas."
 msgstr[3] "Največja dolžina sporočila odsotnosti %d bajte je bila presežena.  Gaim ga je skrajšal namesto vas."
 
-#: src/protocols/oscar/oscar.c:6792
+#: ../src/protocols/oscar/oscar.c:6771
 msgid "Away message too long."
 msgstr "Spo_ročilo o odsotnosti:"
 
-#: src/protocols/oscar/oscar.c:6861
+#: ../src/protocols/oscar/oscar.c:6840
 #, c-format
 msgid "Could not add the buddy %s because the screen name is invalid.  Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."
 msgstr "Ni mogoče dodati prijatelja %s, ker vzdevek ni veljaven. Vzdevki se morajo začeti s črko, vsebujejo lahko le črke, številke in presledke, lahko pa so tudi sestavljeni iz samih števil."
 
-#: src/protocols/oscar/oscar.c:6863
-#: src/protocols/oscar/oscar.c:7273
-#: src/protocols/oscar/oscar.c:7287
+#: ../src/protocols/oscar/oscar.c:6842
+#: ../src/protocols/oscar/oscar.c:7249
+#: ../src/protocols/oscar/oscar.c:7263
 msgid "Unable To Add"
 msgstr "Nemogoče dodati"
 
-#: src/protocols/oscar/oscar.c:6973
+#: ../src/protocols/oscar/oscar.c:6949
 msgid "Unable To Retrieve Buddy List"
 msgstr "Seznama prijateljev ni bilo mogoče pridobiti"
 
-#: src/protocols/oscar/oscar.c:6974
+#: ../src/protocols/oscar/oscar.c:6950
 msgid "Gaim was temporarily unable to retrieve your buddy list from the AIM servers.  Your buddy list is not lost, and will probably become available in a few hours."
 msgstr "Gaim začasno ni uspel pridobiti vašega seznama prijateljev z AIM strežnikov. Vaš seznam prijateljev ni izgubljen, verjetno pa bo postal dosegljiv v nekaj urah."
 
-#: src/protocols/oscar/oscar.c:7171
-#: src/protocols/oscar/oscar.c:7172
-#: src/protocols/oscar/oscar.c:7177
-#: src/protocols/oscar/oscar.c:7331
-#: src/protocols/oscar/oscar.c:7332
-#: src/protocols/oscar/oscar.c:7337
+#: ../src/protocols/oscar/oscar.c:7147
+#: ../src/protocols/oscar/oscar.c:7148
+#: ../src/protocols/oscar/oscar.c:7153
+#: ../src/protocols/oscar/oscar.c:7307
+#: ../src/protocols/oscar/oscar.c:7308
+#: ../src/protocols/oscar/oscar.c:7313
 msgid "Orphans"
 msgstr "Sirote"
 
-#: src/protocols/oscar/oscar.c:7271
+#: ../src/protocols/oscar/oscar.c:7247
 #, c-format
 msgid "Could not add the buddy %s because you have too many buddies in your buddy list.  Please remove one and try again."
 msgstr "Prijatelja %s ni bilo mogoče dodati, ker imate na seznamu preveč prijateljev. Prosim odstranite enega in poskusite ponovno."
 
-#: src/protocols/oscar/oscar.c:7271
-#: src/protocols/oscar/oscar.c:7285
+#: ../src/protocols/oscar/oscar.c:7247
+#: ../src/protocols/oscar/oscar.c:7261
 msgid "(no name)"
 msgstr "(brez imena)"
 
-#: src/protocols/oscar/oscar.c:7285
+#: ../src/protocols/oscar/oscar.c:7261
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason.  The most common reason for this is that you have the maximum number of allowed buddies in your buddy list."
 msgstr "Prijatelja %s iz neznanega razloga ni bilo mogoče dodati na seznam. Najpogostejši razlog za to je preveliko število prijateljev na vašem seznamu."
 
-#: src/protocols/oscar/oscar.c:7368
+#: ../src/protocols/oscar/oscar.c:7344
 #, c-format
 msgid "The user %s has given you permission to add you to their buddy list.  Do you want to add them?"
 msgstr "Uporabnik %s vam je dovolil, da ga dodate na svoj seznam prijateljev. Ali ga želite dodati?"
 
-#: src/protocols/oscar/oscar.c:7374
+#: ../src/protocols/oscar/oscar.c:7350
 msgid "Authorization Given"
 msgstr "Pooblastilo odobreno"
 
-#: src/protocols/oscar/oscar.c:7418
+#: ../src/protocols/oscar/oscar.c:7394
 #, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
@@ -9461,17 +9646,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:7463
+#: ../src/protocols/oscar/oscar.c:7439
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "Uporabnik %s je odobril zahtevo, da ga dodate na svoj seznam prijateljev."
 
-#: src/protocols/oscar/oscar.c:7464
+#: ../src/protocols/oscar/oscar.c:7440
 msgid "Authorization Granted"
 msgstr "Pooblastilo odobreno"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:7467
+#: ../src/protocols/oscar/oscar.c:7443
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the following reason:\n"
@@ -9480,161 +9665,163 @@
 "Uporabnik %s je zavrnil vašo zahtevo, da ga dodate na svoj seznam prijateljev, ker:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:7468
+#: ../src/protocols/oscar/oscar.c:7444
 msgid "Authorization Denied"
 msgstr "Pooblastilo zavrnjeno"
 
-#: src/protocols/oscar/oscar.c:7505
-#: src/protocols/toc/toc.c:1372
+#: ../src/protocols/oscar/oscar.c:7481
+#: ../src/protocols/toc/toc.c:1372
 msgid "_Exchange:"
 msgstr "_Izmenjaj:"
 
-#: src/protocols/oscar/oscar.c:7541
+#: ../src/protocols/oscar/oscar.c:7517
 msgid "Invalid chat name specified."
 msgstr "Navedeno je neveljavno ime pomenka."
 
-#: src/protocols/oscar/oscar.c:7611
+#: ../src/protocols/oscar/oscar.c:7587
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "Vaša slika IM ni bila poslana. Slik IM ne morete pošiljati v klepetih AIM."
 
-#: src/protocols/oscar/oscar.c:7766
+#: ../src/protocols/oscar/oscar.c:7742
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(pridobivanje ...)</i>"
 
-#: src/protocols/oscar/oscar.c:8072
+#: ../src/protocols/oscar/oscar.c:8048
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Komentar o prijatelju %s"
 
-#: src/protocols/oscar/oscar.c:8073
+#: ../src/protocols/oscar/oscar.c:8049
 msgid "Buddy Comment:"
 msgstr "Komentar prijatelja:"
 
-#: src/protocols/oscar/oscar.c:8092
+#: ../src/protocols/oscar/oscar.c:8068
 msgid "Edit Buddy Comment"
 msgstr "Uredi komentar prijatelja"
 
-#: src/protocols/oscar/oscar.c:8099
+#: ../src/protocols/oscar/oscar.c:8075
 msgid "Get Status Msg"
 msgstr "Poizvedi o stanju"
 
-#: src/protocols/oscar/oscar.c:8112
+#: ../src/protocols/oscar/oscar.c:8088
 msgid "Direct IM"
 msgstr "Neposredni pogovor"
 
-#: src/protocols/oscar/oscar.c:8131
+#: ../src/protocols/oscar/oscar.c:8107
 msgid "Re-request Authorization"
 msgstr "Ponovno zahtevaj pooblastilo"
 
-#: src/protocols/oscar/oscar.c:8188
+#: ../src/protocols/oscar/oscar.c:8164
 msgid "Require authorization"
 msgstr "Zahtevaj pooblastilo"
 
-#: src/protocols/oscar/oscar.c:8191
+#: ../src/protocols/oscar/oscar.c:8167
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Spletno zaveden (s to funkcijo boste prejemali tudi SPAM!)"
 
-#: src/protocols/oscar/oscar.c:8196
+#: ../src/protocols/oscar/oscar.c:8172
 msgid "ICQ Privacy Options"
 msgstr "Možnosti zasebnosti ICQ"
 
-#: src/protocols/oscar/oscar.c:8213
+#: ../src/protocols/oscar/oscar.c:8189
 msgid "The new formatting is invalid."
 msgstr "Oblika novega zapisa je neveljavna."
 
-#: src/protocols/oscar/oscar.c:8214
+#: ../src/protocols/oscar/oscar.c:8190
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "Z oblikovanjem vzdevka lahko spreminjate samo velike črke in presledke."
 
-#: src/protocols/oscar/oscar.c:8221
+#: ../src/protocols/oscar/oscar.c:8197
 msgid "New screen name formatting:"
 msgstr "Nov vzdevek za oblikovanje:"
 
-#: src/protocols/oscar/oscar.c:8273
+#: ../src/protocols/oscar/oscar.c:8249
 msgid "Change Address To:"
 msgstr "Spremeni naslov v:"
 
-#: src/protocols/oscar/oscar.c:8318
+#: ../src/protocols/oscar/oscar.c:8294
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>ne čakate na pooblastilo</i>"
 
-#: src/protocols/oscar/oscar.c:8321
+#: ../src/protocols/oscar/oscar.c:8297
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Pričakujete pooblastila od naslednjih prijateljev"
 
-#: src/protocols/oscar/oscar.c:8322
+#: ../src/protocols/oscar/oscar.c:8298
 msgid "You can re-request authorization from these buddies by right-clicking on them and selecting \"Re-request Authorization.\""
 msgstr "Če želite, lahko ponovno zahtevate pooblastilo od teh prijateljev, tako da desno kliknete na njih in izberete \"Ponovno zahtevaj pooblastilo.\""
 
-#: src/protocols/oscar/oscar.c:8339
+#: ../src/protocols/oscar/oscar.c:8315
 msgid "Find Buddy by E-mail"
 msgstr "Najdi prijatelja po e-pošti"
 
-#: src/protocols/oscar/oscar.c:8340
+#: ../src/protocols/oscar/oscar.c:8316
 msgid "Search for a buddy by e-mail address"
 msgstr "Išči prijatelje po naslovu e-pošte"
 
-#: src/protocols/oscar/oscar.c:8341
+#: ../src/protocols/oscar/oscar.c:8317
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Vnesite naslov e-pošte prijatelja, ki ga želite najti"
 
-#: src/protocols/oscar/oscar.c:8434
+#: ../src/protocols/oscar/oscar.c:8410
 msgid "Set User Info (URL)..."
 msgstr "Nastavi informacije o uporabniku (URL) ..."
 
-#: src/protocols/oscar/oscar.c:8445
+#: ../src/protocols/oscar/oscar.c:8421
 msgid "Change Password (URL)"
 msgstr "Spremeni geslo (URL povezava)"
 
-#: src/protocols/oscar/oscar.c:8449
+#: ../src/protocols/oscar/oscar.c:8425
 msgid "Configure IM Forwarding (URL)"
 msgstr "Nastavi posredovanje sporočil (URL)"
 
 #. ICQ actions
-#: src/protocols/oscar/oscar.c:8459
+#: ../src/protocols/oscar/oscar.c:8435
 msgid "Set Privacy Options..."
 msgstr "Nastavi možnosti zasebnosti ..."
 
 #. AIM actions
-#: src/protocols/oscar/oscar.c:8466
+#: ../src/protocols/oscar/oscar.c:8442
 msgid "Format Screen Name..."
 msgstr "Oblikuj vzdevek ..."
 
-#: src/protocols/oscar/oscar.c:8470
+#: ../src/protocols/oscar/oscar.c:8446
 msgid "Confirm Account"
 msgstr "Potrdi račun"
 
-#: src/protocols/oscar/oscar.c:8474
+#: ../src/protocols/oscar/oscar.c:8450
 msgid "Display Currently Registered Address"
 msgstr "Prikaži trenutno registriran naslov"
 
-#: src/protocols/oscar/oscar.c:8478
+#: ../src/protocols/oscar/oscar.c:8454
 msgid "Change Currently Registered Address..."
 msgstr "Spremeni trenutno registriran naslov ..."
 
-#: src/protocols/oscar/oscar.c:8485
+#: ../src/protocols/oscar/oscar.c:8461
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Pokaži prijatelje, ki čakajo na pooblastilo"
 
-#: src/protocols/oscar/oscar.c:8491
+#: ../src/protocols/oscar/oscar.c:8467
 msgid "Search for Buddy by Email..."
 msgstr "Išči prijatelja po e-pošti ..."
 
-#: src/protocols/oscar/oscar.c:8496
+#: ../src/protocols/oscar/oscar.c:8472
 msgid "Search for Buddy by Information"
 msgstr "Išči prijatelja po informaciji"
 
-#: src/protocols/oscar/oscar.c:8563
+#: ../src/protocols/oscar/oscar.c:8539
 msgid "Use recent buddies group"
 msgstr "Uporabi skupino zadnjih prijateljev"
 
-#: src/protocols/oscar/oscar.c:8566
+#: ../src/protocols/oscar/oscar.c:8542
 msgid "Show how long you have been idle"
 msgstr "Prikaži čas lastne neaktivnosti"
 
-#: src/protocols/oscar/oscar.c:8575
-msgid "Use AIM/ICQ proxy server (Slower/More Secure/Usually Works)"
-msgstr "Uporabi strežnik proxy AIM/ICQ (počasneje/varnejše/ponavadi deluje)"
+#: ../src/protocols/oscar/oscar.c:8551
+msgid "Use AIM/ICQ proxy server (slower, but usually works)"
+msgstr ""
+"Uporabi strežnik prehoda AIM/ICQ\n"
+"(počasneje, vendar ponavadi deluje)"
 
 #. *< type
 #. *< ui_requirement
@@ -9646,150 +9833,158 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:8708
-#: src/protocols/oscar/oscar.c:8710
+#: ../src/protocols/oscar/oscar.c:8684
+#: ../src/protocols/oscar/oscar.c:8686
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "Vstavek za protokol AIM/ICQ"
 
-#: src/protocols/oscar/oscar.c:8729
+#: ../src/protocols/oscar/oscar.c:8705
 msgid "Auth host"
 msgstr "Strežnik za avtentikacijo"
 
-#: src/protocols/oscar/oscar.c:8732
+#: ../src/protocols/oscar/oscar.c:8708
 msgid "Auth port"
 msgstr "Vrata za avtentikacijo"
 
-#: src/protocols/oscar/oscar.c:8735
-#: src/protocols/zephyr/zephyr.c:2901
+#: ../src/protocols/oscar/oscar.c:8711
+#: ../src/protocols/zephyr/zephyr.c:2901
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/protocols/sametime/sametime.c:359
+#: ../src/protocols/oscar/oscar.c:8715
+msgid ""
+"Use AIM/ICQ proxy server\n"
+"(slower, but usually works)"
+msgstr ""
+"Uporabi strežnik prehoda AIM/ICQ\n"
+"(počasneje, vendar ponavadi deluje)"
+
+#: ../src/protocols/sametime/sametime.c:415
 msgid "Connection closed (writing)"
 msgstr "Povezava zaprta (pisanje)"
 
-#: src/protocols/sametime/sametime.c:1204
+#: ../src/protocols/sametime/sametime.c:1267
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Ime skupine:</b> %s<br>"
 
-#: src/protocols/sametime/sametime.c:1205
+#: ../src/protocols/sametime/sametime.c:1268
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>ID skupine zapiskov:</b> %s<br>"
 
-#: src/protocols/sametime/sametime.c:1207
+#: ../src/protocols/sametime/sametime.c:1270
 #, c-format
 msgid "Info for Group %s"
 msgstr "Podatki za skupino %s"
 
-#: src/protocols/sametime/sametime.c:1209
+#: ../src/protocols/sametime/sametime.c:1272
 msgid "Notes Address Book Information"
 msgstr "Informacije o adresarju zapiskov"
 
-#: src/protocols/sametime/sametime.c:1241
+#: ../src/protocols/sametime/sametime.c:1304
 msgid "Invite Group to Conference..."
 msgstr "Povabi skupino na konferenčni pogovor ..."
 
-#: src/protocols/sametime/sametime.c:1251
+#: ../src/protocols/sametime/sametime.c:1314
 msgid "Get Notes Address Book Info"
 msgstr "Pridobi podatke o adresarju zapiskov"
 
-#: src/protocols/sametime/sametime.c:1404
+#: ../src/protocols/sametime/sametime.c:1467
 msgid "Sending Handshake"
 msgstr "Pošljanje rokovanja"
 
-#: src/protocols/sametime/sametime.c:1409
+#: ../src/protocols/sametime/sametime.c:1472
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "Čakanje na potrditev rokovanja"
 
-#: src/protocols/sametime/sametime.c:1414
+#: ../src/protocols/sametime/sametime.c:1477
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Rokovanje potrjeno, pošiljanje prijave"
 
-#: src/protocols/sametime/sametime.c:1419
+#: ../src/protocols/sametime/sametime.c:1482
 msgid "Waiting for Login Acknowledgement"
 msgstr "Čakanje na potrditev prijave"
 
-#: src/protocols/sametime/sametime.c:1424
+#: ../src/protocols/sametime/sametime.c:1487
 msgid "Login Redirected"
 msgstr "Prijava preusmerjena"
 
-#: src/protocols/sametime/sametime.c:1430
+#: ../src/protocols/sametime/sametime.c:1493
 msgid "Forcing Login"
 msgstr "Prisilno prijavljanje"
 
-#: src/protocols/sametime/sametime.c:1434
+#: ../src/protocols/sametime/sametime.c:1497
 msgid "Login Acknowledged"
 msgstr "Prijava potrjena"
 
-#: src/protocols/sametime/sametime.c:1439
+#: ../src/protocols/sametime/sametime.c:1502
 msgid "Starting Services"
 msgstr "Zagon storitev"
 
-#: src/protocols/sametime/sametime.c:1444
+#: ../src/protocols/sametime/sametime.c:1507
 msgid "Connected"
 msgstr "Povezano"
 
-#: src/protocols/sametime/sametime.c:1541
+#: ../src/protocols/sametime/sametime.c:1605
 #, c-format
 msgid "A Sametime administrator has issued the following announcement on server %s"
 msgstr "Upravljalec omrežja Sametime je izdal naslednje obvestilo na strežniku %s"
 
-#: src/protocols/sametime/sametime.c:1546
+#: ../src/protocols/sametime/sametime.c:1610
 msgid "Sametime Administrator Announcement"
 msgstr "Upravljalsko obvestilo Sametime"
 
-#: src/protocols/sametime/sametime.c:1605
+#: ../src/protocols/sametime/sametime.c:1662
 msgid "Connection reset"
 msgstr "Povezava ponovno nastavljena"
 
-#: src/protocols/sametime/sametime.c:1612
+#: ../src/protocols/sametime/sametime.c:1669
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Napaka pri branju iz vtičnice: %s"
 
 #. this is a regular connect, error out
-#: src/protocols/sametime/sametime.c:1641
-#: src/protocols/sametime/sametime.c:3595
+#: ../src/protocols/sametime/sametime.c:1698
+#: ../src/protocols/sametime/sametime.c:3696
 msgid "Unable to connect to host"
 msgstr "Ni se bilo mogoče povezati na strežnik."
 
-#: src/protocols/sametime/sametime.c:1678
+#: ../src/protocols/sametime/sametime.c:1736
 #, c-format
 msgid "Announcement from %s"
 msgstr "Oznanilo od %s"
 
-#: src/protocols/sametime/sametime.c:1852
+#: ../src/protocols/sametime/sametime.c:1910
 msgid "Conference Closed"
 msgstr "Konferenčni pogovor zaprt"
 
 #  Data is assumed to be the destination sn
-#: src/protocols/sametime/sametime.c:2315
+#: ../src/protocols/sametime/sametime.c:2367
 msgid "Unable to send message: "
 msgstr "Ni moč poslati sporočila: "
 
-#: src/protocols/sametime/sametime.c:2874
+#: ../src/protocols/sametime/sametime.c:2926
 msgid "Place Closed"
 msgstr "Zaprto mesto"
 
-#: src/protocols/sametime/sametime.c:3163
+#: ../src/protocols/sametime/sametime.c:3217
 msgid "Microphone"
 msgstr "Mikrofon"
 
-#: src/protocols/sametime/sametime.c:3164
+#: ../src/protocols/sametime/sametime.c:3218
 msgid "Speakers"
 msgstr "Zvočniki"
 
-#: src/protocols/sametime/sametime.c:3165
+#: ../src/protocols/sametime/sametime.c:3219
 msgid "Video Camera"
 msgstr "Videokamera"
 
-#: src/protocols/sametime/sametime.c:3169
+#: ../src/protocols/sametime/sametime.c:3223
 msgid "File Transfer"
 msgstr "Prenos datotek"
 
-#: src/protocols/sametime/sametime.c:3203
+#: ../src/protocols/sametime/sametime.c:3257
 #, c-format
 msgid ""
 "\n"
@@ -9798,7 +9993,7 @@
 "\n"
 "<b>Podpira:</b> %s"
 
-#: src/protocols/sametime/sametime.c:3208
+#: ../src/protocols/sametime/sametime.c:3262
 msgid ""
 "\n"
 "<b>External User</b>"
@@ -9806,143 +10001,147 @@
 "\n"
 "<b>Zunanji uporabnik</b>"
 
-#: src/protocols/sametime/sametime.c:3312
+#: ../src/protocols/sametime/sametime.c:3368
 msgid "Create conference with user"
 msgstr "Ustvari konferenčni pogovor z uporabnikom"
 
-#: src/protocols/sametime/sametime.c:3313
+#: ../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 "Vnesite temo za nov konferenčni pogovor in sporočilo vabila za %s"
 
-#: src/protocols/sametime/sametime.c:3317
+#: ../src/protocols/sametime/sametime.c:3373
 msgid "New Conference"
 msgstr "Nov konferenčni pogovor"
 
-#: src/protocols/sametime/sametime.c:3319
+#: ../src/protocols/sametime/sametime.c:3375
 msgid "Create"
 msgstr "Ustvari"
 
-#: src/protocols/sametime/sametime.c:3381
+#: ../src/protocols/sametime/sametime.c:3439
 msgid "Available Conferences"
 msgstr "Konferenčni pogovori na voljo"
 
-#: src/protocols/sametime/sametime.c:3387
+#: ../src/protocols/sametime/sametime.c:3445
 msgid "Create New Conference..."
 msgstr "Ustvari nov konferenčni pogovor ..."
 
-#: src/protocols/sametime/sametime.c:3394
+#: ../src/protocols/sametime/sametime.c:3452
 msgid "Invite user to a conference"
 msgstr "Povabi uporabnika na konferenčni pogovor"
 
-#: src/protocols/sametime/sametime.c:3395
+#: ../src/protocols/sametime/sametime.c:3453
 #, c-format
 msgid "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 "Iz spodnjega seznama izberite konferenco in pošljite povabilo uporabniku %s. Izberite \"Ustvari novo konferenco\", če bi želeli ustvariti novo konferenco in k njej povabili uporabnika."
 
-#: src/protocols/sametime/sametime.c:3400
+#: ../src/protocols/sametime/sametime.c:3458
 msgid "Invite to Conference"
 msgstr "Povabi na konferenčni pogovor"
 
-#: src/protocols/sametime/sametime.c:3402
+#: ../src/protocols/sametime/sametime.c:3460
 msgid "Invite"
 msgstr "Povabi"
 
-#: src/protocols/sametime/sametime.c:3454
+#: ../src/protocols/sametime/sametime.c:3548
 msgid "Invite to Conference..."
 msgstr "Povabi na konferenčni pogovor ..."
 
-#: src/protocols/sametime/sametime.c:3500
+#: ../src/protocols/sametime/sametime.c:3553
+msgid "Send TEST Announcement"
+msgstr "Pošlji obvestilo TEST"
+
+#: ../src/protocols/sametime/sametime.c:3600
 msgid "No Sametime Community Server specified"
 msgstr "Strežnik Sametime Community ni naveden"
 
-#: src/protocols/sametime/sametime.c:3521
+#: ../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 "Za račun Meanwhile %s ni bil nastavljen noben gostitelj ali naslov IP. Za nadaljevanje prijave vnesite spodaj potrebne podatke. "
 
-#: src/protocols/sametime/sametime.c:3526
+#: ../src/protocols/sametime/sametime.c:3627
 msgid "Meanwhile Connection Setup"
 msgstr "Namestitev povezave Meanwhile"
 
-#: src/protocols/sametime/sametime.c:3527
+#: ../src/protocols/sametime/sametime.c:3628
 msgid "No Sametime Community Server Specified"
 msgstr "Strežnik Sametime Community ni naveden"
 
-#: src/protocols/sametime/sametime.c:3529
+#: ../src/protocols/sametime/sametime.c:3630
 msgid "Connect"
 msgstr "Poveži se"
 
-#: src/protocols/sametime/sametime.c:3984
+#: ../src/protocols/sametime/sametime.c:4085
 msgid "<b>External User</b><br>"
 msgstr "<b>Zunanji uporabnik</b><br>"
 
-#: src/protocols/sametime/sametime.c:3987
+#: ../src/protocols/sametime/sametime.c:4088
 #, c-format
 msgid "<b>User ID:</b> %s<br>"
 msgstr "<b>Uporabniški ID:</b> %s<br>"
 
-#: src/protocols/sametime/sametime.c:3993
+#: ../src/protocols/sametime/sametime.c:4094
 #, c-format
 msgid "<b>Full Name:</b> %s<br>"
 msgstr "<b>Polno ime:</b> %s<br>"
 
-#: src/protocols/sametime/sametime.c:3999
+#: ../src/protocols/sametime/sametime.c:4100
 msgid "<b>Last Known Client:</b> "
 msgstr "<b>Zadnjič razpoznan odjemalec:</b> "
 
-#: src/protocols/sametime/sametime.c:4007
+#: ../src/protocols/sametime/sametime.c:4108
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Neznano (0x%04x)<br>"
 
-#: src/protocols/sametime/sametime.c:4014
+#: ../src/protocols/sametime/sametime.c:4115
 #, c-format
 msgid "<b>Supports:</b> %s<br>"
 msgstr "<b>Podpira:</b> %s<br>"
 
-#: src/protocols/sametime/sametime.c:4020
+#: ../src/protocols/sametime/sametime.c:4121
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>Stanje</b>: %s"
 
-#: src/protocols/sametime/sametime.c:4161
-#: src/protocols/sametime/sametime.c:5308
+#: ../src/protocols/sametime/sametime.c:4264
+#: ../src/protocols/sametime/sametime.c:5428
 msgid "User Name"
 msgstr "Uporabniško ime"
 
-#: src/protocols/sametime/sametime.c:4164
-#: src/protocols/sametime/sametime.c:5311
+#: ../src/protocols/sametime/sametime.c:4267
+#: ../src/protocols/sametime/sametime.c:5431
 msgid "Sametime ID"
 msgstr "ID Sametime"
 
-#: src/protocols/sametime/sametime.c:4188
+#: ../src/protocols/sametime/sametime.c:4291
 msgid "An ambiguous user ID was entered"
 msgstr "Vnesli ste dvoumen uporabniški ID"
 
-#: src/protocols/sametime/sametime.c:4189
+#: ../src/protocols/sametime/sametime.c:4292
 #, 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 "Imenovalec '%s' se morda nanaša na vse naštete uporabnike. Izberite ustreznega in ga dodajte na seznam prijateljev."
 
-#: src/protocols/sametime/sametime.c:4194
+#: ../src/protocols/sametime/sametime.c:4297
 msgid "Select User"
 msgstr "Izberite uporabnika"
 
-#: src/protocols/sametime/sametime.c:4262
+#: ../src/protocols/sametime/sametime.c:4367
 msgid "Unable to add user: user not found"
 msgstr "Ni moč dodati uporabnika: ni ga mogoče najti"
 
-#: src/protocols/sametime/sametime.c:4264
+#: ../src/protocols/sametime/sametime.c:4369
 #, 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 "Imenovalec '%s' se ne ujema z nobenim uporabnikom v vaši skupnosti Sametime. Ta vnos je bil odstranjen iz vašega seznama prijateljev."
 
-#: src/protocols/sametime/sametime.c:4269
+#: ../src/protocols/sametime/sametime.c:4374
 msgid "Unable to add user"
 msgstr "Ni mogoče dodati uporabnika"
 
-#: src/protocols/sametime/sametime.c:4839
+#: ../src/protocols/sametime/sametime.c:4946
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -9951,208 +10150,208 @@
 "Napaka pri branju datoteke %s: \n"
 "%s.\n"
 
-#: src/protocols/sametime/sametime.c:4968
+#: ../src/protocols/sametime/sametime.c:5078
 msgid "Remotely Stored Buddy List"
 msgstr "Oddaljeno shranjeni seznam prijateljev"
 
-#: src/protocols/sametime/sametime.c:4973
+#: ../src/protocols/sametime/sametime.c:5083
 msgid "Buddy List Storage Mode"
 msgstr "Način hrambe seznama prijateljev"
 
-#: src/protocols/sametime/sametime.c:4976
+#: ../src/protocols/sametime/sametime.c:5086
 msgid "Local Buddy List Only"
 msgstr "Le krajevni seznam prijateljev"
 
-#: src/protocols/sametime/sametime.c:4978
+#: ../src/protocols/sametime/sametime.c:5088
 msgid "Merge List from Server"
 msgstr "Spoji seznam prijateljev s strežnikovim"
 
-#: src/protocols/sametime/sametime.c:4980
+#: ../src/protocols/sametime/sametime.c:5090
 msgid "Merge and Save List to Server"
 msgstr "Spoji seznam prijateljev s strežnikovim in ga shrani"
 
-#: src/protocols/sametime/sametime.c:4982
+#: ../src/protocols/sametime/sametime.c:5092
 msgid "Synchronize List with Server"
 msgstr "Sinhroniziraj seznam s strežnikom"
 
-#: src/protocols/sametime/sametime.c:5031
+#: ../src/protocols/sametime/sametime.c:5141
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Uvozi seznam Sametime za račun %s"
 
-#: src/protocols/sametime/sametime.c:5070
+#: ../src/protocols/sametime/sametime.c:5180
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Izvozi seznam Sametime za račun %s"
 
-#: src/protocols/sametime/sametime.c:5121
+#: ../src/protocols/sametime/sametime.c:5233
 msgid "Unable to add group: group exists"
 msgstr "Skupine ni bilo mogoče dodati: že obstaja"
 
-#: src/protocols/sametime/sametime.c:5122
+#: ../src/protocols/sametime/sametime.c:5234
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Skupina z imenom '%s' že obstaja v vašem seznamu prijateljev."
 
-#: src/protocols/sametime/sametime.c:5125
-#: src/protocols/sametime/sametime.c:5250
+#: ../src/protocols/sametime/sametime.c:5237
+#: ../src/protocols/sametime/sametime.c:5366
 msgid "Unable to add group"
 msgstr "Skupine ni mogoče dodati"
 
-#: src/protocols/sametime/sametime.c:5182
+#: ../src/protocols/sametime/sametime.c:5296
 msgid "Possible Matches"
 msgstr "Možni zadetki"
 
-#: src/protocols/sametime/sametime.c:5198
+#: ../src/protocols/sametime/sametime.c:5312
 msgid "Notes Address Book group results"
 msgstr "Skupinski rezultati adresarjev zapiskov"
 
-#: src/protocols/sametime/sametime.c:5199
+#: ../src/protocols/sametime/sametime.c:5313
 #, c-format
 msgid "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 "Imenovalec '%s' se morda nanaša na eno od naslednjih skupin adresarjev zapiskov. Izberite pravo skupino s spodnjega seznama in ga dodajte v svoj seznam prijateljev."
 
-#: src/protocols/sametime/sametime.c:5204
+#: ../src/protocols/sametime/sametime.c:5318
 msgid "Select Notes Address Book"
 msgstr "Izberite adresar zapiskov"
 
-#: src/protocols/sametime/sametime.c:5244
+#: ../src/protocols/sametime/sametime.c:5360
 msgid "Unable to add group: group not found"
 msgstr "Dodajanje skupine ni uspelo: skupina ne obstaja"
 
-#: src/protocols/sametime/sametime.c:5246
+#: ../src/protocols/sametime/sametime.c:5362
 #, c-format
 msgid "The identifier '%s' did not match any Notes Address Book groups in your Sametime community."
 msgstr "Imenovalec '%s' se ne ujema z nobeno skupino adresarjev zapiskov v vaši skupnosti Sametime."
 
-#: src/protocols/sametime/sametime.c:5286
+#: ../src/protocols/sametime/sametime.c:5403
 msgid "Notes Address Book Group"
 msgstr "Skupina adresarja zapiskov"
 
-#: src/protocols/sametime/sametime.c:5287
+#: ../src/protocols/sametime/sametime.c:5404
 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 "Vnesite ime skupine opomb adresarja v spodnje polje, s čimer boste lahko v seznam prijateljev vnesli skupino in njene člane."
 
-#: src/protocols/sametime/sametime.c:5332
+#: ../src/protocols/sametime/sametime.c:5452
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Rezultati iskanja za '%s'"
 
-#: src/protocols/sametime/sametime.c:5333
+#: ../src/protocols/sametime/sametime.c:5453
 #, 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 "Imenovalec '%s' se lahko nanaša na katerega koli od naštetih uporabnikov. Izberite ustreznega in ga dodajte na seznam prijateljev ali pa jim pošljite sporočila s spodnjimi gumbi."
 
-#: src/protocols/sametime/sametime.c:5362
+#: ../src/protocols/sametime/sametime.c:5485
 msgid "No matches"
 msgstr "Ni zadetkov"
 
-#: src/protocols/sametime/sametime.c:5363
+#: ../src/protocols/sametime/sametime.c:5486
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr "Imenovalec '%s' se ne ujema z nobenim uporabnikom vaše skupnosti Sametime."
 
-#: src/protocols/sametime/sametime.c:5367
+#: ../src/protocols/sametime/sametime.c:5490
 msgid "No Matches"
 msgstr "Ni zadetkov"
 
-#: src/protocols/sametime/sametime.c:5403
+#: ../src/protocols/sametime/sametime.c:5527
 msgid "Search for a user"
 msgstr "Išči uporabnike"
 
-#: src/protocols/sametime/sametime.c:5404
+#: ../src/protocols/sametime/sametime.c:5528
 msgid "Enter a name or partial ID in the field below to search for matching users in your Sametime community."
 msgstr "Vnesite ime ali delni ID v spodnje polje za iskanje zadetkov v svoji skupnosti Sametime."
 
-#: src/protocols/sametime/sametime.c:5407
+#: ../src/protocols/sametime/sametime.c:5531
 msgid "User Search"
 msgstr "Iskanje uporabnikov"
 
-#: src/protocols/sametime/sametime.c:5419
+#: ../src/protocols/sametime/sametime.c:5543
 msgid "Import Sametime List..."
 msgstr "Uvozi seznam Sametime ..."
 
-#: src/protocols/sametime/sametime.c:5423
+#: ../src/protocols/sametime/sametime.c:5547
 msgid "Export Sametime List..."
 msgstr "Izvozi seznam Sametime ..."
 
-#: src/protocols/sametime/sametime.c:5427
+#: ../src/protocols/sametime/sametime.c:5551
 msgid "Add Notes Address Book Group..."
 msgstr "Dodaj skupino adresarja zapiskov ..."
 
-#: src/protocols/sametime/sametime.c:5431
+#: ../src/protocols/sametime/sametime.c:5555
 msgid "User Search..."
 msgstr "Iskanje uporabnikov ..."
 
-#: src/protocols/sametime/sametime.c:5528
+#: ../src/protocols/sametime/sametime.c:5652
 msgid "Force login (ignore server redirects)"
 msgstr "Prisilna prijava (prezri strežniške preusmeritve)"
 
 #. pretend to be Sametime Connect
-#: src/protocols/sametime/sametime.c:5538
+#: ../src/protocols/sametime/sametime.c:5662
 msgid "Hide client identity"
 msgstr "Skrij identiteto odjemalca"
 
-#: src/protocols/silc/buddy.c:52
-#: src/protocols/silc/buddy.c:420
-#: src/protocols/silc/buddy.c:545
-#: src/protocols/silc/buddy.c:711
-#: src/protocols/silc/ft.c:338
+#: ../src/protocols/silc/buddy.c:52
+#: ../src/protocols/silc/buddy.c:420
+#: ../src/protocols/silc/buddy.c:545
+#: ../src/protocols/silc/buddy.c:711
+#: ../src/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "Uporabnik %s ni prisoten v omrežju"
 
-#: src/protocols/silc/buddy.c:53
-#: src/protocols/silc/buddy.c:115
-#: src/protocols/silc/buddy.c:120
-#: src/protocols/silc/buddy.c:124
-#: src/protocols/silc/buddy.c:129
-#: src/protocols/silc/buddy.c:134
-#: src/protocols/silc/buddy.c:139
-#: src/protocols/silc/buddy.c:257
+#: ../src/protocols/silc/buddy.c:53
+#: ../src/protocols/silc/buddy.c:115
+#: ../src/protocols/silc/buddy.c:120
+#: ../src/protocols/silc/buddy.c:124
+#: ../src/protocols/silc/buddy.c:129
+#: ../src/protocols/silc/buddy.c:134
+#: ../src/protocols/silc/buddy.c:139
+#: ../src/protocols/silc/buddy.c:257
 msgid "Key Agreement"
 msgstr "Pogodba"
 
-#: src/protocols/silc/buddy.c:54
+#: ../src/protocols/silc/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "Ni mogoče izvesti pogodbe"
 
-#: src/protocols/silc/buddy.c:116
+#: ../src/protocols/silc/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "Prišlo je do napake med pogodbo"
 
-#: src/protocols/silc/buddy.c:120
+#: ../src/protocols/silc/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "Pogodba spodletela"
 
-#: src/protocols/silc/buddy.c:125
+#: ../src/protocols/silc/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "Časovna omejitev med pogodbo potekla"
 
-#: src/protocols/silc/buddy.c:130
+#: ../src/protocols/silc/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "Pogodba je bila preklicana"
 
-#: src/protocols/silc/buddy.c:135
+#: ../src/protocols/silc/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "Pogodba se je že začela"
 
-#: src/protocols/silc/buddy.c:140
+#: ../src/protocols/silc/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "Pogodba se ne more začeti z vami"
 
-#: src/protocols/silc/buddy.c:258
-#: src/protocols/silc/buddy.c:388
-#: src/protocols/silc/buddy.c:513
+#: ../src/protocols/silc/buddy.c:258
+#: ../src/protocols/silc/buddy.c:388
+#: ../src/protocols/silc/buddy.c:513
 msgid "The remote user is not present in the network any more"
 msgstr "Oddaljen uporabnik ni več prisoten v omrežju"
 
-#: src/protocols/silc/buddy.c:294
+#: ../src/protocols/silc/buddy.c:294
 #, c-format
 msgid "Key agreement request received from %s. Would you like to perform the key agreement?"
 msgstr "Zahteva po pogodbi sprejeta od %s. Želite izvesti pogodbo?"
 
-#: src/protocols/silc/buddy.c:298
+#: ../src/protocols/silc/buddy.c:298
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -10163,677 +10362,677 @@
 "Oddaljen gostitelj: %s\n"
 "Oddaljena vrata: %d"
 
-#: src/protocols/silc/buddy.c:311
+#: ../src/protocols/silc/buddy.c:311
 msgid "Key Agreement Request"
 msgstr "Zahteva pogodbe"
 
-#: src/protocols/silc/buddy.c:387
-#: src/protocols/silc/buddy.c:422
-#: src/protocols/silc/buddy.c:464
+#: ../src/protocols/silc/buddy.c:387
+#: ../src/protocols/silc/buddy.c:422
+#: ../src/protocols/silc/buddy.c:464
 msgid "IM With Password"
 msgstr "IM z geslom"
 
-#: src/protocols/silc/buddy.c:423
+#: ../src/protocols/silc/buddy.c:423
 msgid "Cannot set IM key"
 msgstr "Ni mogoče nastaviti ključa IM"
 
-#: src/protocols/silc/buddy.c:465
+#: ../src/protocols/silc/buddy.c:465
 msgid "Set IM Password"
 msgstr "Nastavi geslo IM"
 
-#: src/protocols/silc/buddy.c:512
-#: src/protocols/silc/buddy.c:547
-#: src/protocols/silc/ops.c:1492
-#: src/protocols/silc/ops.c:1503
+#: ../src/protocols/silc/buddy.c:512
+#: ../src/protocols/silc/buddy.c:547
+#: ../src/protocols/silc/ops.c:1492
+#: ../src/protocols/silc/ops.c:1503
 msgid "Get Public Key"
 msgstr "Dobi javni ključ"
 
-#: src/protocols/silc/buddy.c:548
-#: src/protocols/silc/ops.c:1493
-#: src/protocols/silc/ops.c:1504
+#: ../src/protocols/silc/buddy.c:548
+#: ../src/protocols/silc/ops.c:1493
+#: ../src/protocols/silc/ops.c:1504
 msgid "Cannot fetch the public key"
 msgstr "Javnega ključa ni mogoče dobiti"
 
-#: src/protocols/silc/buddy.c:634
-#: src/protocols/silc/buddy.c:1647
+#: ../src/protocols/silc/buddy.c:634
+#: ../src/protocols/silc/buddy.c:1647
 msgid "Show Public Key"
 msgstr "Prikaži javni ključ"
 
-#: src/protocols/silc/buddy.c:635
-#: src/protocols/silc/buddy.c:1030
-#: src/protocols/silc/chat.c:236
+#: ../src/protocols/silc/buddy.c:635
+#: ../src/protocols/silc/buddy.c:1030
+#: ../src/protocols/silc/chat.c:236
 msgid "Could not load public key"
 msgstr "Ni mogoče naložiti javnega ključa"
 
-#: src/protocols/silc/buddy.c:712
-#: src/protocols/silc/ops.c:1087
-#: src/protocols/silc/ops.c:1159
-#: src/protocols/silc/ops.c:1294
-#: src/protocols/silc/ops.c:1295
-#: src/protocols/silc/ops.c:1313
+#: ../src/protocols/silc/buddy.c:712
+#: ../src/protocols/silc/ops.c:1087
+#: ../src/protocols/silc/ops.c:1159
+#: ../src/protocols/silc/ops.c:1294
+#: ../src/protocols/silc/ops.c:1295
+#: ../src/protocols/silc/ops.c:1313
 msgid "User Information"
 msgstr "Informacije o uporabniku"
 
-#: src/protocols/silc/buddy.c:713
-#: src/protocols/silc/ops.c:1160
-#: src/protocols/silc/ops.c:1314
+#: ../src/protocols/silc/buddy.c:713
+#: ../src/protocols/silc/ops.c:1160
+#: ../src/protocols/silc/ops.c:1314
 msgid "Cannot get user information"
 msgstr "Ni mogoče dobiti informacij o uporabniku"
 
-#: src/protocols/silc/buddy.c:734
+#: ../src/protocols/silc/buddy.c:734
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "Prijatelj %s ni zaupljiv"
 
-#: src/protocols/silc/buddy.c:737
+#: ../src/protocols/silc/buddy.c:737
 msgid "You cannot receive buddy notifications until you import his/her public key.  You can use the Get Public Key command to get the public key."
 msgstr "Opozoril prijatelja ne morete sprejeti, dokler ne uvozite njegovega javnega ključa.  Uporabite lahko ukaz Dobi javni ključ."
 
 #. Open file selector to select the public key.
-#: src/protocols/silc/buddy.c:1064
+#: ../src/protocols/silc/buddy.c:1064
 msgid "Open..."
 msgstr "Odpri ..."
 
-#: src/protocols/silc/buddy.c:1073
+#: ../src/protocols/silc/buddy.c:1073
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "Prijatelj %s ni prisoten v omrežju"
 
-#: src/protocols/silc/buddy.c:1076
+#: ../src/protocols/silc/buddy.c:1076
 msgid "To add the buddy you must import his/her public key. Press Import to import a public key."
 msgstr "Če želite dodati prijatelja, morate uvoziti njegov javni ključ. Kliknite Uvozi za uvoz javnega ključa."
 
-#: src/protocols/silc/buddy.c:1079
+#: ../src/protocols/silc/buddy.c:1079
 msgid "_Import..."
 msgstr "_Uvozi ..."
 
-#: src/protocols/silc/buddy.c:1175
+#: ../src/protocols/silc/buddy.c:1175
 msgid "Select correct user"
 msgstr "Izberite ustreznega uporabnika"
 
-#: src/protocols/silc/buddy.c:1177
+#: ../src/protocols/silc/buddy.c:1177
 msgid "More than one user was found with the same public key. Select the correct user from the list to add to the buddy list."
 msgstr "Najden je bil več kot en uporabnik z enakim javnim ključem. Izberite ustreznega in ga dodajte na seznam prijateljev."
 
-#: src/protocols/silc/buddy.c:1179
+#: ../src/protocols/silc/buddy.c:1179
 msgid "More than one user was found with the same name. Select the correct user from the list to add to the buddy list."
 msgstr "Najden je bil več kot en uporabnik z enakim vzdevkom. Izberite ustreznega in ga dodajte na seznam prijateljev."
 
-#: src/protocols/silc/buddy.c:1467
+#: ../src/protocols/silc/buddy.c:1467
 msgid "Detached"
 msgstr "Odpeto"
 
-#: src/protocols/silc/buddy.c:1471
-#: src/protocols/silc/silc.c:55
+#: ../src/protocols/silc/buddy.c:1471
+#: ../src/protocols/silc/silc.c:55
 msgid "Indisposed"
 msgstr "Neurejeno"
 
-#: src/protocols/silc/buddy.c:1475
-#: src/protocols/silc/silc.c:57
+#: ../src/protocols/silc/buddy.c:1475
+#: ../src/protocols/silc/silc.c:57
 msgid "Wake Me Up"
 msgstr "Zbudi me"
 
-#: src/protocols/silc/buddy.c:1477
-#: src/protocols/silc/silc.c:49
+#: ../src/protocols/silc/buddy.c:1477
+#: ../src/protocols/silc/silc.c:49
 msgid "Hyper Active"
 msgstr "Hiperaktiven"
 
-#: src/protocols/silc/buddy.c:1479
+#: ../src/protocols/silc/buddy.c:1479
 msgid "Robot"
 msgstr "Robot"
 
-#: src/protocols/silc/buddy.c:1486
-#: src/protocols/silc/silc.c:668
-#: src/protocols/silc/util.c:473
+#: ../src/protocols/silc/buddy.c:1486
+#: ../src/protocols/silc/silc.c:668
+#: ../src/protocols/silc/util.c:473
 msgid "Happy"
 msgstr "Vesel"
 
-#: src/protocols/silc/buddy.c:1488
-#: src/protocols/silc/silc.c:670
-#: src/protocols/silc/util.c:475
+#: ../src/protocols/silc/buddy.c:1488
+#: ../src/protocols/silc/silc.c:670
+#: ../src/protocols/silc/util.c:475
 msgid "Sad"
 msgstr "Žalosten"
 
-#: src/protocols/silc/buddy.c:1490
-#: src/protocols/silc/silc.c:672
-#: src/protocols/silc/util.c:477
+#: ../src/protocols/silc/buddy.c:1490
+#: ../src/protocols/silc/silc.c:672
+#: ../src/protocols/silc/util.c:477
 msgid "Angry"
 msgstr "Jezen"
 
-#: src/protocols/silc/buddy.c:1492
-#: src/protocols/silc/silc.c:674
-#: src/protocols/silc/util.c:479
+#: ../src/protocols/silc/buddy.c:1492
+#: ../src/protocols/silc/silc.c:674
+#: ../src/protocols/silc/util.c:479
 msgid "Jealous"
 msgstr "Ljubosumen"
 
-#: src/protocols/silc/buddy.c:1494
-#: src/protocols/silc/silc.c:676
-#: src/protocols/silc/util.c:481
+#: ../src/protocols/silc/buddy.c:1494
+#: ../src/protocols/silc/silc.c:676
+#: ../src/protocols/silc/util.c:481
 msgid "Ashamed"
 msgstr "Osramočen"
 
-#: src/protocols/silc/buddy.c:1496
-#: src/protocols/silc/silc.c:678
-#: src/protocols/silc/util.c:483
+#: ../src/protocols/silc/buddy.c:1496
+#: ../src/protocols/silc/silc.c:678
+#: ../src/protocols/silc/util.c:483
 msgid "Invincible"
 msgstr "Nepremagljiv"
 
-#: src/protocols/silc/buddy.c:1498
-#: src/protocols/silc/silc.c:680
-#: src/protocols/silc/util.c:485
+#: ../src/protocols/silc/buddy.c:1498
+#: ../src/protocols/silc/silc.c:680
+#: ../src/protocols/silc/util.c:485
 msgid "In Love"
 msgstr "Zaljubljen"
 
-#: src/protocols/silc/buddy.c:1500
-#: src/protocols/silc/silc.c:682
-#: src/protocols/silc/util.c:487
+#: ../src/protocols/silc/buddy.c:1500
+#: ../src/protocols/silc/silc.c:682
+#: ../src/protocols/silc/util.c:487
 msgid "Sleepy"
 msgstr "Zaspan"
 
-#: src/protocols/silc/buddy.c:1502
-#: src/protocols/silc/silc.c:684
-#: src/protocols/silc/util.c:489
+#: ../src/protocols/silc/buddy.c:1502
+#: ../src/protocols/silc/silc.c:684
+#: ../src/protocols/silc/util.c:489
 msgid "Bored"
 msgstr "Zdolgočasen"
 
-#: src/protocols/silc/buddy.c:1504
-#: src/protocols/silc/silc.c:686
-#: src/protocols/silc/util.c:491
+#: ../src/protocols/silc/buddy.c:1504
+#: ../src/protocols/silc/silc.c:686
+#: ../src/protocols/silc/util.c:491
 msgid "Excited"
 msgstr "Razburjen"
 
-#: src/protocols/silc/buddy.c:1506
-#: src/protocols/silc/silc.c:688
-#: src/protocols/silc/util.c:493
+#: ../src/protocols/silc/buddy.c:1506
+#: ../src/protocols/silc/silc.c:688
+#: ../src/protocols/silc/util.c:493
 msgid "Anxious"
 msgstr "Vznemirjen"
 
-#: src/protocols/silc/buddy.c:1534
-#: src/protocols/silc/ops.c:1196
+#: ../src/protocols/silc/buddy.c:1534
+#: ../src/protocols/silc/ops.c:1196
 msgid "User Modes"
 msgstr "Načini uporabnika"
 
-#: src/protocols/silc/buddy.c:1550
-#: src/protocols/silc/ops.c:1205
+#: ../src/protocols/silc/buddy.c:1550
+#: ../src/protocols/silc/ops.c:1205
 msgid "Mood"
 msgstr "Razpoloženje"
 
-#: src/protocols/silc/buddy.c:1555
-#: src/protocols/silc/ops.c:1217
+#: ../src/protocols/silc/buddy.c:1555
+#: ../src/protocols/silc/ops.c:1217
 msgid "Preferred Contact"
 msgstr "Priljubljen stik"
 
-#: src/protocols/silc/buddy.c:1560
-#: src/protocols/silc/ops.c:1222
+#: ../src/protocols/silc/buddy.c:1560
+#: ../src/protocols/silc/ops.c:1222
 msgid "Preferred Language"
 msgstr "Priljubljen jezik"
 
-#: src/protocols/silc/buddy.c:1565
-#: src/protocols/silc/ops.c:1227
+#: ../src/protocols/silc/buddy.c:1565
+#: ../src/protocols/silc/ops.c:1227
 msgid "Device"
 msgstr "Naprava"
 
-#: src/protocols/silc/buddy.c:1570
-#: src/protocols/silc/ops.c:1232
-#: src/protocols/silc/silc.c:736
-#: src/protocols/silc/silc.c:738
+#: ../src/protocols/silc/buddy.c:1570
+#: ../src/protocols/silc/ops.c:1232
+#: ../src/protocols/silc/silc.c:736
+#: ../src/protocols/silc/silc.c:738
 msgid "Timezone"
 msgstr "Časovni pas"
 
-#: src/protocols/silc/buddy.c:1575
-#: src/protocols/silc/ops.c:1237
+#: ../src/protocols/silc/buddy.c:1575
+#: ../src/protocols/silc/ops.c:1237
 msgid "Geolocation"
 msgstr "Lokacija"
 
-#: src/protocols/silc/buddy.c:1629
+#: ../src/protocols/silc/buddy.c:1629
 msgid "Reset IM Key"
 msgstr "Ponastavi ključ IM"
 
-#: src/protocols/silc/buddy.c:1635
+#: ../src/protocols/silc/buddy.c:1635
 msgid "IM with Key Exchange"
 msgstr "Pogovor z izmenjavo ključev"
 
-#: src/protocols/silc/buddy.c:1640
+#: ../src/protocols/silc/buddy.c:1640
 msgid "IM with Password"
 msgstr "Pogovor z geslom"
 
-#: src/protocols/silc/buddy.c:1653
+#: ../src/protocols/silc/buddy.c:1653
 msgid "Get Public Key..."
 msgstr "Dobi javni ključ ..."
 
-#: src/protocols/silc/buddy.c:1660
-#: src/protocols/silc/ops.c:1623
+#: ../src/protocols/silc/buddy.c:1660
+#: ../src/protocols/silc/ops.c:1623
 msgid "Kill User"
 msgstr "Ubij uporabnika"
 
-#: src/protocols/silc/buddy.c:1670
-#: src/protocols/silc/chat.c:971
+#: ../src/protocols/silc/buddy.c:1670
+#: ../src/protocols/silc/chat.c:971
 msgid "Draw On Whiteboard"
 msgstr "Riši po tabli"
 
-#: src/protocols/silc/chat.c:39
+#: ../src/protocols/silc/chat.c:39
 msgid "_Passphrase:"
 msgstr "_Geslo:"
 
-#: src/protocols/silc/chat.c:80
+#: ../src/protocols/silc/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "kanal %s ne obstaja v omrežju"
 
-#: src/protocols/silc/chat.c:81
-#: src/protocols/silc/chat.c:173
+#: ../src/protocols/silc/chat.c:81
+#: ../src/protocols/silc/chat.c:173
 msgid "Channel Information"
 msgstr "Informacije o kanalu"
 
-#: src/protocols/silc/chat.c:82
+#: ../src/protocols/silc/chat.c:82
 msgid "Cannot get channel information"
 msgstr "Ni mogoče dobiti informacij o kanalu"
 
-#: src/protocols/silc/chat.c:119
+#: ../src/protocols/silc/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Ime kanala:</b> %s"
 
-#: src/protocols/silc/chat.c:122
+#: ../src/protocols/silc/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Število uporabnikov:</b> %d"
 
-#: src/protocols/silc/chat.c:129
+#: ../src/protocols/silc/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Ustanovitelj kanala:</b> %s"
 
-#: src/protocols/silc/chat.c:138
+#: ../src/protocols/silc/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Cifra kanala:</b> %s"
 
-#: src/protocols/silc/chat.c:141
+#: ../src/protocols/silc/chat.c:141
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>HMAC kanala:</b> %s"
 
-#: src/protocols/silc/chat.c:146
+#: ../src/protocols/silc/chat.c:146
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Tema kanala:</b><br>%s"
 
-#: src/protocols/silc/chat.c:151
+#: ../src/protocols/silc/chat.c:151
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Načini kanala:</b> "
 
-#: src/protocols/silc/chat.c:164
+#: ../src/protocols/silc/chat.c:164
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Prstni odtis ključa ustanovitelja:</b><br>%s"
 
-#: src/protocols/silc/chat.c:165
+#: ../src/protocols/silc/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Odtis ključa ustanovitelja:</b><br>%s"
 
-#: src/protocols/silc/chat.c:235
+#: ../src/protocols/silc/chat.c:235
 msgid "Add Channel Public Key"
 msgstr "Dodaj javni ključ kanala"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:290
+#: ../src/protocols/silc/chat.c:290
 msgid "Open Public Key..."
 msgstr "Odpri javni ključ ..."
 
-#: src/protocols/silc/chat.c:399
+#: ../src/protocols/silc/chat.c:399
 msgid "Channel Passphrase"
 msgstr "Geslo kanala"
 
-#: src/protocols/silc/chat.c:406
+#: ../src/protocols/silc/chat.c:406
 msgid "Channel Public Keys List"
 msgstr "Seznam javnih ključev kanala"
 
-#: src/protocols/silc/chat.c:411
+#: ../src/protocols/silc/chat.c:411
 msgid "Channel authentication is used to secure the channel from unauthorized access. The authentication may be based on passphrase and digital signatures. If passphrase is set, it is required to be able to join. If channel public keys are set then only users whose public keys are listed are able to join."
 msgstr "Overovitev kanala služi obrambi kanala pred neavtoriziranim dostopom. Overovitev lahko temelji na geslih in digitalnih podpisih. Če je geslo nastavljeno, je potrebno za pridružitev. Če so nastavljeni javni ključi kanala, se mu lahko pridružijo le uporabniki, katerih ključi so na seznamu."
 
-#: 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: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
 msgid "Channel Authentication"
 msgstr "Overovitev kanala"
 
-#: src/protocols/silc/chat.c:422
-#: src/protocols/silc/chat.c:460
+#: ../src/protocols/silc/chat.c:422
+#: ../src/protocols/silc/chat.c:460
 msgid "Add / Remove"
 msgstr "Dodaj / odstrani"
 
-#: src/protocols/silc/chat.c:577
+#: ../src/protocols/silc/chat.c:577
 msgid "Group Name"
 msgstr "Ime skupine"
 
-#: src/protocols/silc/chat.c:581
-#: src/protocols/silc/ops.c:1908
-#: src/protocols/silc/silc.c:944
+#: ../src/protocols/silc/chat.c:581
+#: ../src/protocols/silc/ops.c:1908
+#: ../src/protocols/silc/silc.c:944
 msgid "Passphrase"
 msgstr "Geslo"
 
-#: src/protocols/silc/chat.c:592
+#: ../src/protocols/silc/chat.c:592
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Vnesite ime zasebne skupine kanala %s in njeno geslo."
 
-#: src/protocols/silc/chat.c:594
+#: ../src/protocols/silc/chat.c:594
 msgid "Add Channel Private Group"
 msgstr "Dodaj zasebno skupino kanala"
 
-#: src/protocols/silc/chat.c:721
+#: ../src/protocols/silc/chat.c:721
 msgid "User Limit"
 msgstr "Meja uporabnikov"
 
-#: src/protocols/silc/chat.c:722
+#: ../src/protocols/silc/chat.c:722
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "Nastavite mejo uporabnikov kanala. Izberite 0 za ponastavitev meje."
 
-#: src/protocols/silc/chat.c:877
+#: ../src/protocols/silc/chat.c:877
 msgid "Get Info"
 msgstr "Informacije"
 
-#: src/protocols/silc/chat.c:885
+#: ../src/protocols/silc/chat.c:885
 msgid "Invite List"
 msgstr "Seznam povabljenih"
 
-#: src/protocols/silc/chat.c:890
+#: ../src/protocols/silc/chat.c:890
 msgid "Ban List"
 msgstr "Seznam prepovedanih"
 
-#: src/protocols/silc/chat.c:898
+#: ../src/protocols/silc/chat.c:898
 msgid "Add Private Group"
 msgstr "Dodaj zasebno skupino"
 
-#: src/protocols/silc/chat.c:911
+#: ../src/protocols/silc/chat.c:911
 msgid "Reset Permanent"
 msgstr "Začasno ponastavi"
 
-#: src/protocols/silc/chat.c:916
+#: ../src/protocols/silc/chat.c:916
 msgid "Set Permanent"
 msgstr "Začasno nastavi"
 
-#: src/protocols/silc/chat.c:924
+#: ../src/protocols/silc/chat.c:924
 msgid "Set User Limit"
 msgstr "Nastavi mejo uporabnikov"
 
-#: src/protocols/silc/chat.c:930
+#: ../src/protocols/silc/chat.c:930
 msgid "Reset Topic Restriction"
 msgstr "Ponastavi omejitev teme"
 
-#: src/protocols/silc/chat.c:935
+#: ../src/protocols/silc/chat.c:935
 msgid "Set Topic Restriction"
 msgstr "Nastavi omejitev teme"
 
-#: src/protocols/silc/chat.c:942
+#: ../src/protocols/silc/chat.c:942
 msgid "Reset Private Channel"
 msgstr "Ponastavi zasebni kanal"
 
-#: src/protocols/silc/chat.c:947
+#: ../src/protocols/silc/chat.c:947
 msgid "Set Private Channel"
 msgstr "Nastavi zasebni kanal"
 
-#: src/protocols/silc/chat.c:954
+#: ../src/protocols/silc/chat.c:954
 msgid "Reset Secret Channel"
 msgstr "Ponastavi skrivni kanal"
 
-#: src/protocols/silc/chat.c:959
+#: ../src/protocols/silc/chat.c:959
 msgid "Set Secret Channel"
 msgstr "Nastavi skrivni kanal"
 
-#: src/protocols/silc/chat.c:1033
+#: ../src/protocols/silc/chat.c:1033
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Ste ustanovitelj kanala <I>%s</I>"
 
-#: src/protocols/silc/chat.c:1037
+#: ../src/protocols/silc/chat.c:1037
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Ustanovitelj kanala na <I>%s</I> je <I>%s</I>"
 
-#: src/protocols/silc/chat.c:1096
+#: ../src/protocols/silc/chat.c:1096
 #, c-format
 msgid "You have to join the %s channel before you are able to join the private group"
 msgstr "Preden se pridružite zasebni skupini, se morate pridružiti kanalu %s"
 
-#: src/protocols/silc/chat.c:1098
+#: ../src/protocols/silc/chat.c:1098
 msgid "Join Private Group"
 msgstr "Pridruži se zasebni skupini"
 
-#: src/protocols/silc/chat.c:1099
+#: ../src/protocols/silc/chat.c:1099
 msgid "Cannot join private group"
 msgstr "Ni se mogoče pridružiti zasebni skupini"
 
-#: src/protocols/silc/chat.c:1293
-#: src/protocols/silc/silc.c:1152
+#: ../src/protocols/silc/chat.c:1293
+#: ../src/protocols/silc/silc.c:1152
 msgid "Call Command"
 msgstr "Ukaz klica"
 
-#: src/protocols/silc/chat.c:1293
-#: src/protocols/silc/silc.c:1152
+#: ../src/protocols/silc/chat.c:1293
+#: ../src/protocols/silc/silc.c:1152
 msgid "Cannot call command"
 msgstr "Ni mogoče klicati ukaza"
 
-#: src/protocols/silc/chat.c:1294
-#: src/protocols/silc/silc.c:1153
+#: ../src/protocols/silc/chat.c:1294
+#: ../src/protocols/silc/silc.c:1153
 msgid "Unknown command"
 msgstr "Neznan ukaz"
 
-#: src/protocols/silc/ft.c:89
-#: src/protocols/silc/ft.c:92
-#: src/protocols/silc/ft.c:96
-#: src/protocols/silc/ft.c:100
-#: src/protocols/silc/ft.c:104
-#: src/protocols/silc/ft.c:205
-#: src/protocols/silc/ft.c:210
-#: src/protocols/silc/ft.c:215
-#: src/protocols/silc/ft.c:221
-#: src/protocols/silc/ft.c:340
+#: ../src/protocols/silc/ft.c:89
+#: ../src/protocols/silc/ft.c:92
+#: ../src/protocols/silc/ft.c:96
+#: ../src/protocols/silc/ft.c:100
+#: ../src/protocols/silc/ft.c:104
+#: ../src/protocols/silc/ft.c:205
+#: ../src/protocols/silc/ft.c:210
+#: ../src/protocols/silc/ft.c:215
+#: ../src/protocols/silc/ft.c:221
+#: ../src/protocols/silc/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Varen prenos datotek"
 
-#: src/protocols/silc/ft.c:90
-#: src/protocols/silc/ft.c:93
-#: src/protocols/silc/ft.c:97
-#: src/protocols/silc/ft.c:101
-#: src/protocols/silc/ft.c:105
+#: ../src/protocols/silc/ft.c:90
+#: ../src/protocols/silc/ft.c:93
+#: ../src/protocols/silc/ft.c:97
+#: ../src/protocols/silc/ft.c:101
+#: ../src/protocols/silc/ft.c:105
 msgid "Error during file transfer"
 msgstr "Napaka pri prenosu datotek"
 
-#: src/protocols/silc/ft.c:94
+#: ../src/protocols/silc/ft.c:94
 msgid "Permission denied"
 msgstr "Ni dovoljeno"
 
-#: src/protocols/silc/ft.c:98
+#: ../src/protocols/silc/ft.c:98
 msgid "Key agreement failed"
 msgstr "Pogodba ni uspela"
 
-#: src/protocols/silc/ft.c:102
+#: ../src/protocols/silc/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "Seja za prenos datotek ne obstaja"
 
-#: src/protocols/silc/ft.c:206
+#: ../src/protocols/silc/ft.c:206
 msgid "No file transfer session active"
 msgstr "Nobena seja prenosa datotek ni aktivna"
 
-#: src/protocols/silc/ft.c:211
+#: ../src/protocols/silc/ft.c:211
 msgid "File transfer already started"
 msgstr "Prenos datotek se je že začel"
 
-#: src/protocols/silc/ft.c:216
+#: ../src/protocols/silc/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "Ni bilo mogoče izvesti pogodbe za prenos datotek"
 
-#: src/protocols/silc/ft.c:222
+#: ../src/protocols/silc/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "Ni bilo mogoče začeti prenosa datotek"
 
-#: src/protocols/silc/ft.c:341
+#: ../src/protocols/silc/ft.c:341
 msgid "Cannot send file"
 msgstr "Ni mogoče poslati datoteke"
 
-#: src/protocols/silc/ops.c:555
-#: src/protocols/silc/ops.c:564
-#: src/protocols/silc/ops.c:573
+#: ../src/protocols/silc/ops.c:555
+#: ../src/protocols/silc/ops.c:564
+#: ../src/protocols/silc/ops.c:573
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s je spremenil temo kanala <I>%s</I> na: %s"
 
-#: src/protocols/silc/ops.c:639
+#: ../src/protocols/silc/ops.c:639
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> je nastavil načine kanala <I>%s</I> na: %s"
 
-#: src/protocols/silc/ops.c:643
+#: ../src/protocols/silc/ops.c:643
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> je odstranil vse načine kanala <I>%s</I>"
 
-#: src/protocols/silc/ops.c:676
+#: ../src/protocols/silc/ops.c:676
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> je nastavil načine uporabnika <I>%s</I> na: %s"
 
-#: src/protocols/silc/ops.c:684
+#: ../src/protocols/silc/ops.c:684
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> je odstranil vse načine uporabnika <I>%s</I>"
 
-#: src/protocols/silc/ops.c:713
+#: ../src/protocols/silc/ops.c:713
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Iz <I>%s</I> vas je brcnil uporabnik <I>%s</I> (%s)"
 
-#: src/protocols/silc/ops.c:743
-#: src/protocols/silc/ops.c:748
-#: src/protocols/silc/ops.c:753
+#: ../src/protocols/silc/ops.c:743
+#: ../src/protocols/silc/ops.c:748
+#: ../src/protocols/silc/ops.c:753
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Ubil vas je %s (%s)"
 
-#: src/protocols/silc/ops.c:774
-#: src/protocols/silc/ops.c:779
-#: src/protocols/silc/ops.c:784
+#: ../src/protocols/silc/ops.c:774
+#: ../src/protocols/silc/ops.c:779
+#: ../src/protocols/silc/ops.c:784
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Ubil vas je %s (%s)"
 
-#: src/protocols/silc/ops.c:830
+#: ../src/protocols/silc/ops.c:830
 msgid "Server signoff"
 msgstr "Odjava strežnika"
 
-#: src/protocols/silc/ops.c:1017
+#: ../src/protocols/silc/ops.c:1017
 msgid "Personal Information"
 msgstr "Osebni podatki"
 
-#: src/protocols/silc/ops.c:1040
+#: ../src/protocols/silc/ops.c:1040
 msgid "Birth Day"
 msgstr "Rojstni dan"
 
-#: src/protocols/silc/ops.c:1044
+#: ../src/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "Naziv službe"
 
-#: src/protocols/silc/ops.c:1048
+#: ../src/protocols/silc/ops.c:1048
 msgid "Job Role"
 msgstr "Funkcija v službi"
 
-#: src/protocols/silc/ops.c:1052
-#: src/protocols/silc/silc.c:937
+#: ../src/protocols/silc/ops.c:1052
+#: ../src/protocols/silc/silc.c:937
 msgid "Organization"
 msgstr "Organizacija"
 
-#: src/protocols/silc/ops.c:1056
+#: ../src/protocols/silc/ops.c:1056
 msgid "Unit"
 msgstr "Enota"
 
-#: src/protocols/silc/ops.c:1075
+#: ../src/protocols/silc/ops.c:1075
 msgid "EMail"
 msgstr "E-pošta"
 
-#: src/protocols/silc/ops.c:1080
+#: ../src/protocols/silc/ops.c:1080
 msgid "Note"
 msgstr "Opomba"
 
-#: src/protocols/silc/ops.c:1128
+#: ../src/protocols/silc/ops.c:1128
 msgid "Join Chat"
 msgstr "Pridruži se klepetu"
 
-#: src/protocols/silc/ops.c:1211
+#: ../src/protocols/silc/ops.c:1211
 msgid "Status Text"
 msgstr "Besedilo stanja"
 
-#: src/protocols/silc/ops.c:1284
-#: src/protocols/silc/ops.c:1354
+#: ../src/protocols/silc/ops.c:1284
+#: ../src/protocols/silc/ops.c:1354
 msgid "Public Key Fingerprint"
 msgstr "Prstni odtis javnega ključa"
 
-#: src/protocols/silc/ops.c:1285
-#: src/protocols/silc/ops.c:1355
+#: ../src/protocols/silc/ops.c:1285
+#: ../src/protocols/silc/ops.c:1355
 msgid "Public Key Babbleprint"
 msgstr "Odtis javnega ključa"
 
-#: src/protocols/silc/ops.c:1298
+#: ../src/protocols/silc/ops.c:1298
 msgid "_More..."
 msgstr "_Več ..."
 
-#: src/protocols/silc/ops.c:1369
-#: src/protocols/silc/silc.c:1003
+#: ../src/protocols/silc/ops.c:1369
+#: ../src/protocols/silc/silc.c:1003
 msgid "Detach From Server"
 msgstr "Odpni se od strežnika"
 
-#: src/protocols/silc/ops.c:1369
+#: ../src/protocols/silc/ops.c:1369
 msgid "Cannot detach"
 msgstr "Odpenjanje ni možno"
 
-#: src/protocols/silc/ops.c:1380
+#: ../src/protocols/silc/ops.c:1380
 msgid "Cannot set topic"
 msgstr "Ne da se nastaviti teme"
 
-#: src/protocols/silc/ops.c:1412
+#: ../src/protocols/silc/ops.c:1412
 msgid "Failed to change nickname"
 msgstr "Vzdevka ni moč spremeniti"
 
-#: src/protocols/silc/ops.c:1460
+#: ../src/protocols/silc/ops.c:1460
 msgid "Roomlist"
 msgstr "Seznam sob"
 
-#: src/protocols/silc/ops.c:1460
+#: ../src/protocols/silc/ops.c:1460
 msgid "Cannot get room list"
 msgstr "Ni mogoče dobiti seznama sob"
 
-#: src/protocols/silc/ops.c:1505
+#: ../src/protocols/silc/ops.c:1505
 msgid "No public key was received"
 msgstr "Javni ključ ni bil sprejet"
 
-#: src/protocols/silc/ops.c:1518
-#: src/protocols/silc/ops.c:1531
+#: ../src/protocols/silc/ops.c:1518
+#: ../src/protocols/silc/ops.c:1531
 msgid "Server Information"
 msgstr "Informacije o strežniku"
 
-#: src/protocols/silc/ops.c:1519
+#: ../src/protocols/silc/ops.c:1519
 msgid "Cannot get server information"
 msgstr "Ni moč dobiti informacij o strežniku"
 
-#: src/protocols/silc/ops.c:1548
-#: src/protocols/silc/ops.c:1557
+#: ../src/protocols/silc/ops.c:1548
+#: ../src/protocols/silc/ops.c:1557
 msgid "Server Statistics"
 msgstr "Statistika strežnika"
 
-#: src/protocols/silc/ops.c:1549
+#: ../src/protocols/silc/ops.c:1549
 msgid "Cannot get server statistics"
 msgstr "Ni moč dobiti statistike strežnika"
 
-#: src/protocols/silc/ops.c:1558
+#: ../src/protocols/silc/ops.c:1558
 msgid "No server statistics available"
 msgstr "Statistika strežnika ni na voljo."
 
-#: src/protocols/silc/ops.c:1580
+#: ../src/protocols/silc/ops.c:1580
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -10868,112 +11067,112 @@
 "Vseh operaterjev strežnikov: %d\n"
 "Vseh operaterjev usmerjevalnikov: %d\n"
 
-#: src/protocols/silc/ops.c:1603
+#: ../src/protocols/silc/ops.c:1603
 msgid "Network Statistics"
 msgstr "Statistika omrežja"
 
-#: src/protocols/silc/ops.c:1611
-#: src/protocols/silc/ops.c:1616
+#: ../src/protocols/silc/ops.c:1611
+#: ../src/protocols/silc/ops.c:1616
 msgid "Ping"
 msgstr "Ping"
 
-#: src/protocols/silc/ops.c:1611
+#: ../src/protocols/silc/ops.c:1611
 msgid "Ping failed"
 msgstr "Ping ni uspel"
 
-#: src/protocols/silc/ops.c:1616
+#: ../src/protocols/silc/ops.c:1616
 msgid "Ping reply received from server"
 msgstr "Odgovor ping sprejet od strežnika"
 
-#: src/protocols/silc/ops.c:1624
+#: ../src/protocols/silc/ops.c:1624
 msgid "Could not kill user"
 msgstr "Ni bilo mogoče ubiti uporabnika"
 
-#: src/protocols/silc/ops.c:1708
+#: ../src/protocols/silc/ops.c:1708
 msgid "Error during connecting to SILC Server"
 msgstr "Napaka pri povezovanju s strežnikom SILC"
 
-#: src/protocols/silc/ops.c:1713
+#: ../src/protocols/silc/ops.c:1713
 msgid "Key Exchange failed"
 msgstr "Izmenjava ključa ni uspela"
 
-#: src/protocols/silc/ops.c:1722
+#: ../src/protocols/silc/ops.c:1722
 msgid "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "Nadaljevalna odpeta seja ni uspela. Pritisnite ponovna povezava za ustvarjanje nove povezave."
 
-#: src/protocols/silc/ops.c:1757
+#: ../src/protocols/silc/ops.c:1757
 msgid "Disconnected by server"
 msgstr "Strežnik je prekinil povezavo"
 
-#: src/protocols/silc/ops.c:1819
-#: src/protocols/silc/ops.c:1866
-#: src/protocols/silc/silc.c:195
+#: ../src/protocols/silc/ops.c:1819
+#: ../src/protocols/silc/ops.c:1866
+#: ../src/protocols/silc/silc.c:195
 msgid "Resuming session"
 msgstr "Nadaljevalna seja"
 
-#: src/protocols/silc/ops.c:1821
+#: ../src/protocols/silc/ops.c:1821
 msgid "Authenticating connection"
 msgstr "Overovljanje povezave"
 
-#: src/protocols/silc/ops.c:1868
+#: ../src/protocols/silc/ops.c:1868
 msgid "Verifying server public key"
 msgstr "Preverjanje javnega ključa strežnika"
 
-#: src/protocols/silc/ops.c:1909
+#: ../src/protocols/silc/ops.c:1909
 msgid "Passphrase required"
 msgstr "Zahtevano geslo"
 
-#: src/protocols/silc/ops.c:1938
+#: ../src/protocols/silc/ops.c:1938
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Napaka: Neustrezna različica, nadgradite svojega odjemalca"
 
-#: src/protocols/silc/ops.c:1941
+#: ../src/protocols/silc/ops.c:1941
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Napaka: Oddaljeni ne podpira vašega ključa ali mu ne zaupa"
 
-#: src/protocols/silc/ops.c:1944
+#: ../src/protocols/silc/ops.c:1944
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Napaka: Oddaljeni ne podpira predlagane skupine KE"
 
-#: src/protocols/silc/ops.c:1947
+#: ../src/protocols/silc/ops.c:1947
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Napaka: Oddaljeni ne podpira predlagane cifre"
 
-#: src/protocols/silc/ops.c:1950
+#: ../src/protocols/silc/ops.c:1950
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Napaka: Oddaljeni ne podpira predlaganega PKCS"
 
-#: src/protocols/silc/ops.c:1953
+#: ../src/protocols/silc/ops.c:1953
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Napaka: Oddaljeni ne podpira predlagane razpršene možnosti"
 
-#: src/protocols/silc/ops.c:1956
+#: ../src/protocols/silc/ops.c:1956
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Napaka: Oddaljeni ne podpira predlaganega HMAC"
 
-#: src/protocols/silc/ops.c:1958
+#: ../src/protocols/silc/ops.c:1958
 msgid "Failure: Incorrect signature"
 msgstr "Napaka: Napačen podpis"
 
-#: src/protocols/silc/ops.c:1960
+#: ../src/protocols/silc/ops.c:1960
 msgid "Failure: Invalid cookie"
 msgstr "Napaka: Napačen piškot"
 
-#: src/protocols/silc/ops.c:1971
+#: ../src/protocols/silc/ops.c:1971
 msgid "Failure: Authentication failed"
 msgstr "Napaka: Overovitev ni uspela"
 
-#: src/protocols/silc/pk.c:103
+#: ../src/protocols/silc/pk.c:103
 #, c-format
 msgid "Received %s's public key. Your local copy does not match this key. Would you still like to accept this public key?"
 msgstr "Sprejet javni ključ uporabnika %s. Vaša lokalna kopija ne ustreza temu ključu. Želite kljub temu sprejeti ta javni ključ?"
 
-#: src/protocols/silc/pk.c:108
+#: ../src/protocols/silc/pk.c:108
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "Sprejet javni ključ uporabnika %s. Želite sprejeti ta javni ključ?"
 
-#: src/protocols/silc/pk.c:112
+#: ../src/protocols/silc/pk.c:112
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -10986,62 +11185,62 @@
 "%s\n"
 "%s\n"
 
-#: src/protocols/silc/pk.c:115
-#: src/protocols/silc/pk.c:140
+#: ../src/protocols/silc/pk.c:115
+#: ../src/protocols/silc/pk.c:140
 msgid "Verify Public Key"
 msgstr "Preveri javni ključ"
 
-#: src/protocols/silc/pk.c:119
+#: ../src/protocols/silc/pk.c:119
 msgid "_View..."
 msgstr "_Pokaži ..."
 
-#: src/protocols/silc/pk.c:141
+#: ../src/protocols/silc/pk.c:141
 msgid "Unsupported public key type"
 msgstr "Nepodprt tip javnega ključa"
 
-#: src/protocols/silc/silc.c:155
+#: ../src/protocols/silc/silc.c:155
 msgid "Connection failed"
 msgstr "Povezava ni uspela"
 
-#: src/protocols/silc/silc.c:187
+#: ../src/protocols/silc/silc.c:187
 msgid "Cannot initialize SILC Client connection"
 msgstr "Ni moč začeti povezave odjemalca SILC"
 
-#: src/protocols/silc/silc.c:198
+#: ../src/protocols/silc/silc.c:198
 msgid "Performing key exchange"
 msgstr "Izvajanje izmenjave ključev"
 
-#: src/protocols/silc/silc.c:283
+#: ../src/protocols/silc/silc.c:283
 msgid "Out of memory"
 msgstr "Zmanjkalo je pomnilnika"
 
-#: src/protocols/silc/silc.c:324
+#: ../src/protocols/silc/silc.c:324
 msgid "Cannot initialize SILC protocol"
 msgstr "Protokola SILC ni mogoče inicializirati"
 
-#: src/protocols/silc/silc.c:331
+#: ../src/protocols/silc/silc.c:331
 msgid "Cannot find/access ~/.silc directory"
 msgstr "Imenika ~/.silc ni mogoče najti/do njega dostopati."
 
 #. Progress
-#: src/protocols/silc/silc.c:336
+#: ../src/protocols/silc/silc.c:336
 msgid "Connecting to SILC Server"
 msgstr "Povezovanjes strežnikom SILC"
 
-#: src/protocols/silc/silc.c:345
+#: ../src/protocols/silc/silc.c:345
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr "Ni mogoče naložiti para ključev SILC: %s"
 
-#: src/protocols/silc/silc.c:365
+#: ../src/protocols/silc/silc.c:365
 msgid "Unable to create connection"
 msgstr "Ni bilo mogoče ustvariti povezave"
 
-#: src/protocols/silc/silc.c:664
+#: ../src/protocols/silc/silc.c:664
 msgid "Your Current Mood"
 msgstr "Vaše trenutno razpoloženje"
 
-#: src/protocols/silc/silc.c:691
+#: ../src/protocols/silc/silc.c:691
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -11049,264 +11248,264 @@
 "\n"
 "Vaša priljubljena metoda stikov"
 
-#: src/protocols/silc/silc.c:699
-#: src/protocols/silc/util.c:518
+#: ../src/protocols/silc/silc.c:699
+#: ../src/protocols/silc/util.c:518
 msgid "SMS"
 msgstr "SMS"
 
-#: src/protocols/silc/silc.c:701
-#: src/protocols/silc/util.c:520
+#: ../src/protocols/silc/silc.c:701
+#: ../src/protocols/silc/util.c:520
 msgid "MMS"
 msgstr "MMS"
 
-#: src/protocols/silc/silc.c:703
-#: src/protocols/silc/util.c:522
+#: ../src/protocols/silc/silc.c:703
+#: ../src/protocols/silc/util.c:522
 msgid "Video Conferencing"
 msgstr "Video-konferenca"
 
-#: src/protocols/silc/silc.c:708
+#: ../src/protocols/silc/silc.c:708
 msgid "Your Current Status"
 msgstr "Vaše trenutno stanje"
 
-#: src/protocols/silc/silc.c:715
+#: ../src/protocols/silc/silc.c:715
 msgid "Online Services"
 msgstr "Storitve na zvezi"
 
-#: src/protocols/silc/silc.c:718
+#: ../src/protocols/silc/silc.c:718
 msgid "Let others see what services you are using"
 msgstr "Naj ostali vidijo, katere storitve uporabljate"
 
-#: src/protocols/silc/silc.c:724
+#: ../src/protocols/silc/silc.c:724
 msgid "Let others see what computer you are using"
 msgstr "Naj ostali vidijo, kakšen računalnik uporabljate"
 
-#: src/protocols/silc/silc.c:731
+#: ../src/protocols/silc/silc.c:731
 msgid "Your VCard File"
 msgstr "Vaša datoteka VCard"
 
-#: src/protocols/silc/silc.c:743
-#: src/protocols/silc/silc.c:744
+#: ../src/protocols/silc/silc.c:743
+#: ../src/protocols/silc/silc.c:744
 msgid "User Online Status Attributes"
 msgstr "Atributi stanja uporabnika na zvezi"
 
-#: src/protocols/silc/silc.c:745
+#: ../src/protocols/silc/silc.c:745
 msgid "You can let other users see your online status information and your personal information. Please fill the information you would like other users to see about yourself."
 msgstr "Ostalim uporabnikom lahko dovolite ogled informacij o vašem stanju na zvezi in osebnih informacij. Izpolnite informacije, ki jih želite pokazati ostalim uporabnikom."
 
-#: src/protocols/silc/silc.c:785
-#: src/protocols/silc/silc.c:791
-#: src/protocols/silc/silc.c:1431
+#: ../src/protocols/silc/silc.c:785
+#: ../src/protocols/silc/silc.c:791
+#: ../src/protocols/silc/silc.c:1431
 msgid "Message of the Day"
 msgstr "Sporočilo dneva"
 
-#: src/protocols/silc/silc.c:785
+#: ../src/protocols/silc/silc.c:785
 msgid "No Message of the Day available"
 msgstr "Sporočilo dneva ni na voljo"
 
-#: src/protocols/silc/silc.c:786
-#: src/protocols/silc/silc.c:1426
+#: ../src/protocols/silc/silc.c:786
+#: ../src/protocols/silc/silc.c:1426
 msgid "There is no Message of the Day associated with this connection"
 msgstr "S to povezavo ni povezano nobeno sporočilo dneva"
 
-#: src/protocols/silc/silc.c:837
-#: src/protocols/silc/silc.c:881
-#: src/protocols/silc/silc.c:952
-#: src/protocols/silc/silc.c:953
+#: ../src/protocols/silc/silc.c:837
+#: ../src/protocols/silc/silc.c:881
+#: ../src/protocols/silc/silc.c:952
+#: ../src/protocols/silc/silc.c:953
 msgid "Create New SILC Key Pair"
 msgstr "Ustvari nov par ključev SILC"
 
-#: src/protocols/silc/silc.c:837
+#: ../src/protocols/silc/silc.c:837
 msgid "Passphrases do not match"
 msgstr "Gesli se ne ujemata"
 
-#: src/protocols/silc/silc.c:881
+#: ../src/protocols/silc/silc.c:881
 msgid "Key Pair Generation failed"
 msgstr "Ustvarjanje para ključev ni uspelo"
 
-#: src/protocols/silc/silc.c:920
+#: ../src/protocols/silc/silc.c:920
 msgid "Key Length"
 msgstr "Dolžina ključa"
 
-#: src/protocols/silc/silc.c:922
+#: ../src/protocols/silc/silc.c:922
 msgid "Public Key File"
 msgstr "Datoteka z javnim ključem"
 
-#: src/protocols/silc/silc.c:924
+#: ../src/protocols/silc/silc.c:924
 msgid "Private Key File"
 msgstr "Datoteka z zasebnim ključem"
 
-#: src/protocols/silc/silc.c:933
+#: ../src/protocols/silc/silc.c:933
 msgid "Real Name"
 msgstr "Resnično ime"
 
-#: src/protocols/silc/silc.c:947
+#: ../src/protocols/silc/silc.c:947
 msgid "Re-type Passphrase"
 msgstr "Ponovno vnesite geslo"
 
-#: src/protocols/silc/silc.c:954
+#: ../src/protocols/silc/silc.c:954
 msgid "Generate Key Pair"
 msgstr "Ustvari par ključev"
 
-#: src/protocols/silc/silc.c:998
+#: ../src/protocols/silc/silc.c:998
 msgid "Online Status"
 msgstr "Stanje na zvezi"
 
-#: src/protocols/silc/silc.c:1007
+#: ../src/protocols/silc/silc.c:1007
 msgid "View Message of the Day"
 msgstr "Ogled sporočila dneva"
 
-#: src/protocols/silc/silc.c:1011
+#: ../src/protocols/silc/silc.c:1011
 msgid "Create SILC Key Pair..."
 msgstr "Ustvari par ključev SILC ..."
 
-#: src/protocols/silc/silc.c:1110
+#: ../src/protocols/silc/silc.c:1110
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "Uporabnik <I>%s</I> ni prisoten v omrežju"
 
-#: src/protocols/silc/silc.c:1302
+#: ../src/protocols/silc/silc.c:1302
 msgid "Topic too long"
 msgstr "Temal je predolga."
 
-#: src/protocols/silc/silc.c:1383
+#: ../src/protocols/silc/silc.c:1383
 msgid "You must specify a nick"
 msgstr "Določiti morate vzdevek"
 
-#: src/protocols/silc/silc.c:1485
+#: ../src/protocols/silc/silc.c:1485
 #, c-format
 msgid "channel %s not found"
 msgstr "kanala %s ni mogoče najti"
 
-#: src/protocols/silc/silc.c:1490
+#: ../src/protocols/silc/silc.c:1490
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "načini kanala za %s: %s"
 
-#: src/protocols/silc/silc.c:1492
+#: ../src/protocols/silc/silc.c:1492
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "načini kanala za %s niso nastavljeni"
 
-#: src/protocols/silc/silc.c:1505
+#: ../src/protocols/silc/silc.c:1505
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Ni mogoče nastaviti načinov za %s"
 
-#: src/protocols/silc/silc.c:1535
+#: ../src/protocols/silc/silc.c:1535
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "Neznan ukaz: %s, (morda hrošč v Gaimu)"
 
-#: src/protocols/silc/silc.c:1598
+#: ../src/protocols/silc/silc.c:1598
 msgid "part [channel]:  Leave the chat"
 msgstr "part [kanal]:  Zapusti klepet"
 
-#: src/protocols/silc/silc.c:1602
+#: ../src/protocols/silc/silc.c:1602
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [kanal]:  Zapusti klepet"
 
-#: src/protocols/silc/silc.c:1606
+#: ../src/protocols/silc/silc.c:1606
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;nova tema&gt;]:  Ogled ali sprememba teme"
 
-#: src/protocols/silc/silc.c:1611
+#: ../src/protocols/silc/silc.c:1611
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;kanal&gt; [&lt;geslo&gt;]:  Pridruži se klepetu na tem omrežju"
 
-#: src/protocols/silc/silc.c:1615
+#: ../src/protocols/silc/silc.c:1615
 msgid "list:  List channels on this network"
 msgstr "list:  Seznam kanalov na tem omrežju"
 
-#: src/protocols/silc/silc.c:1619
+#: ../src/protocols/silc/silc.c:1619
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;vzdevek&gt;:  Oglej si informacije vzdevka"
 
-#: src/protocols/silc/silc.c:1623
-#: src/protocols/zephyr/zephyr.c:2602
+#: ../src/protocols/silc/silc.c:1623
+#: ../src/protocols/zephyr/zephyr.c:2602
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;vzdevek&gt; &lt;sporočilo&gt;:  Pošlji zasebno sporočilo uporabniku"
 
-#: src/protocols/silc/silc.c:1627
+#: ../src/protocols/silc/silc.c:1627
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr "query &lt;vzdevek&gt; [&lt;sporočilo&gt;]:  Pošlji zasebno sporočilo uporabniku"
 
-#: src/protocols/silc/silc.c:1631
+#: ../src/protocols/silc/silc.c:1631
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Ogled sporočila dneva na strežniku"
 
-#: src/protocols/silc/silc.c:1635
+#: ../src/protocols/silc/silc.c:1635
 msgid "detach:  Detach this session"
 msgstr "odpni:  Odpni to sejo"
 
-#: src/protocols/silc/silc.c:1639
+#: ../src/protocols/silc/silc.c:1639
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [sporočilo]:  Prekini povezavo s strežnikom z možnostjo sporočila"
 
-#: src/protocols/silc/silc.c:1643
+#: ../src/protocols/silc/silc.c:1643
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "pomoč &lt;ukaz&gt;:  Pomoč o določenem ukazu"
 
-#: src/protocols/silc/silc.c:1649
+#: ../src/protocols/silc/silc.c:1649
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;vzdevek&gt; [-javniključ|&lt;razlog&gt;]:  Ubij vzdevek"
 
-#: src/protocols/silc/silc.c:1653
+#: ../src/protocols/silc/silc.c:1653
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;novvzdevek&gt;:  Spremenite vaš vzdevek"
 
-#: src/protocols/silc/silc.c:1657
+#: ../src/protocols/silc/silc.c:1657
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;vzdevek&gt;:  Ogled informacij o vzdevku"
 
-#: src/protocols/silc/silc.c:1661
+#: ../src/protocols/silc/silc.c:1661
 msgid "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display channel modes"
 msgstr "cmode &lt;kanall&gt; [+|-&lt;načini&gt;] [argumenti]:  Spremeni ali prikaži načine kanala"
 
-#: src/protocols/silc/silc.c:1665
+#: ../src/protocols/silc/silc.c:1665
 msgid "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes on channel"
 msgstr "cumode &lt;kanal&gt; +|-&lt;načini&gt; &lt;vzdevek&gt;:  Spremeni načine vzdevka na kanalu"
 
-#: src/protocols/silc/silc.c:1669
+#: ../src/protocols/silc/silc.c:1669
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;načiniuporabnika&gt;:  Nastavite vaše načine v omrežju"
 
-#: src/protocols/silc/silc.c:1673
+#: ../src/protocols/silc/silc.c:1673
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;vzdevek&gt; [-javniključ]:  Dodeli pravice operaterju strežnika"
 
-#: src/protocols/silc/silc.c:1677
+#: ../src/protocols/silc/silc.c:1677
 msgid "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from channel invite list"
 msgstr "invite &lt;kanal&gt; [-|+]&lt;vzdevek&gt;:  povabi vzdevek ali dodaj/odstrani iz seznama povabljenih na kanal"
 
-#: src/protocols/silc/silc.c:1681
+#: ../src/protocols/silc/silc.c:1681
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;kanal&gt; &lt;vzdevek&gt; [komentar]:  Brcni odjemalca s kanala"
 
-#: src/protocols/silc/silc.c:1685
+#: ../src/protocols/silc/silc.c:1685
 msgid "info [server]:  View server administrative details"
 msgstr "info [strežnik]:  Ogled skrbniških podrobnosti strežnika"
 
-#: src/protocols/silc/silc.c:1689
+#: ../src/protocols/silc/silc.c:1689
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;kanal&gt; +|-&lt;vzdevek&gt;]:  Prepovaj odjemalca na kanalu"
 
-#: src/protocols/silc/silc.c:1693
+#: ../src/protocols/silc/silc.c:1693
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "getkey &lt;vzdevek|strežnik&gt;:  Pridobi javni ključ odjemalca ali strežnika"
 
-#: src/protocols/silc/silc.c:1697
+#: ../src/protocols/silc/silc.c:1697
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Ogled statistike omrežja in strežnika"
 
-#: src/protocols/silc/silc.c:1701
+#: ../src/protocols/silc/silc.c:1701
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Pošlji PING povezanemu strežniku"
 
-#: src/protocols/silc/silc.c:1706
+#: ../src/protocols/silc/silc.c:1706
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;kanal&gt;:  Navedi uporabnike v kanalu"
 
-#: src/protocols/silc/silc.c:1710
+#: ../src/protocols/silc/silc.c:1710
 msgid "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List specific users in channel(s)"
 msgstr "names [-št|-op|-polop|-glas|-navadni] &lt;kanal(i)&gt;:  Seznam določenih uporabnikov na kanalu(ih)"
 
@@ -11319,112 +11518,112 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1820
+#: ../src/protocols/silc/silc.c:1820
 msgid "SILC Protocol Plugin"
 msgstr "Vstavek za protokol SILC"
 
 #. *  description
-#: src/protocols/silc/silc.c:1822
+#: ../src/protocols/silc/silc.c:1822
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Protokol SILC (Varen internetni konferenčni sistem v živo)"
 
-#: src/protocols/silc/silc.c:1859
+#: ../src/protocols/silc/silc.c:1859
 msgid "Public Key file"
 msgstr "Datoteka z javnim ključem"
 
-#: src/protocols/silc/silc.c:1863
+#: ../src/protocols/silc/silc.c:1863
 msgid "Private Key file"
 msgstr "Datoteka z zasebnim ključem"
 
-#: src/protocols/silc/silc.c:1873
+#: ../src/protocols/silc/silc.c:1873
 msgid "Cipher"
 msgstr "Cipher"
 
-#: src/protocols/silc/silc.c:1883
+#: ../src/protocols/silc/silc.c:1883
 msgid "HMAC"
 msgstr "HMAC"
 
-#: src/protocols/silc/silc.c:1886
+#: ../src/protocols/silc/silc.c:1886
 msgid "Public key authentication"
 msgstr "Overovitev javnega ključa"
 
-#: src/protocols/silc/silc.c:1889
+#: ../src/protocols/silc/silc.c:1889
 msgid "Reject watching by other users"
 msgstr "Zavrni ogledovanje drugih uporabnikov"
 
-#: src/protocols/silc/silc.c:1892
+#: ../src/protocols/silc/silc.c:1892
 msgid "Block invites"
 msgstr "Zavrni povabljene"
 
-#: src/protocols/silc/silc.c:1895
+#: ../src/protocols/silc/silc.c:1895
 msgid "Block IMs without Key Exchange"
 msgstr "Zavrni neposredno sporočanje brez izmenjave ključev"
 
-#: src/protocols/silc/silc.c:1898
+#: ../src/protocols/silc/silc.c:1898
 msgid "Reject online status attribute requests"
 msgstr "Zavrni zahtevke atributov stanja uporabnikov na zvezi"
 
-#: src/protocols/silc/silc.c:1901
+#: ../src/protocols/silc/silc.c:1901
 msgid "Block messages to whiteboard"
 msgstr "Blokiraj sporočila na tablo"
 
-#: src/protocols/silc/silc.c:1904
+#: ../src/protocols/silc/silc.c:1904
 msgid "Automatically open whiteboard"
 msgstr "Samodejno odpri tablo"
 
-#: src/protocols/silc/silc.c:1907
+#: ../src/protocols/silc/silc.c:1907
 msgid "Digitally sign and verify all messages"
 msgstr "Digitalno podpiši in preveri vsa sporočila"
 
-#: src/protocols/silc/util.c:206
-#: src/protocols/silc/util.c:231
+#: ../src/protocols/silc/util.c:206
+#: ../src/protocols/silc/util.c:231
 msgid "Creating SILC key pair..."
 msgstr "Ustvarjanje para ključev 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:314
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Pravo ime: \t%s\n"
 
-#: src/protocols/silc/util.c:316
+#: ../src/protocols/silc/util.c:316
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Uporabniško ime: \t%s\n"
 
-#: src/protocols/silc/util.c:318
+#: ../src/protocols/silc/util.c:318
 #, c-format
 msgid "EMail: \t\t%s\n"
 msgstr "E-pošta: \t\t%s\n"
 
-#: src/protocols/silc/util.c:320
+#: ../src/protocols/silc/util.c:320
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Ime gostitelja: \t%s\n"
 
-#: src/protocols/silc/util.c:322
+#: ../src/protocols/silc/util.c:322
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organizacija: \t%s\n"
 
-#: src/protocols/silc/util.c:324
+#: ../src/protocols/silc/util.c:324
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Država: \t%s\n"
 
-#: src/protocols/silc/util.c:325
+#: ../src/protocols/silc/util.c:325
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritem: \t%s\n"
 
-#: src/protocols/silc/util.c:326
+#: ../src/protocols/silc/util.c:326
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Dolžina ključa: \t%d bitov\n"
 
-#: src/protocols/silc/util.c:328
+#: ../src/protocols/silc/util.c:328
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -11435,7 +11634,7 @@
 "%s\n"
 "\n"
 
-#: src/protocols/silc/util.c:329
+#: ../src/protocols/silc/util.c:329
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -11444,53 +11643,67 @@
 "Odtis javnega ključa:\n"
 "%s"
 
-#: src/protocols/silc/util.c:333
-#: src/protocols/silc/util.c:334
+#: ../src/protocols/silc/util.c:333
+#: ../src/protocols/silc/util.c:334
 msgid "Public Key Information"
 msgstr "Informacije o javnem ključu"
 
-#: src/protocols/silc/util.c:516
+#: ../src/protocols/silc/util.c:516
 msgid "Paging"
 msgstr "Ostranjevanje"
 
-#: src/protocols/silc/util.c:540
+#: ../src/protocols/silc/util.c:540
 msgid "Computer"
 msgstr "Računalnik"
 
-#: src/protocols/silc/util.c:544
+#: ../src/protocols/silc/util.c:544
 msgid "PDA"
 msgstr "PDA"
 
-#: src/protocols/silc/util.c:546
+#: ../src/protocols/silc/util.c:546
 msgid "Terminal"
 msgstr "Terminal"
 
-#: src/protocols/silc/wb.c:284
+#: ../src/protocols/silc/wb.c:284
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr "%s je poslal sporočilo na tablo. Želite odpreti tablo?"
 
-#: src/protocols/silc/wb.c:288
+#: ../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 "%s je poslal sporočilo na tablo v kanalu %s. Želite odpreti tablo?"
 
-#: src/protocols/silc/wb.c:302
+#: ../src/protocols/silc/wb.c:302
 msgid "Whiteboard"
 msgstr "Tabla"
 
-#: src/protocols/simple/simple.c:1207
-#: src/protocols/simple/simple.c:1246
-#: src/protocols/simple/simple.c:1258
-#: src/protocols/simple/simple.c:1305
+#. TODO: do we really want to disconnect on a failure to write?
+#: ../src/protocols/simple/simple.c:415
+msgid "Could not write"
+msgstr "Ni mogoče pisati"
+
+#: ../src/protocols/simple/simple.c:430
+#: ../src/protocols/simple/simple.c:1331
+msgid "Could not connect"
+msgstr "Povezava ni uspela"
+
+#: ../src/protocols/simple/simple.c:924
+msgid "Wrong Password"
+msgstr "Napačno geslo"
+
+#: ../src/protocols/simple/simple.c:1362
+#: ../src/protocols/simple/simple.c:1401
+#: ../src/protocols/simple/simple.c:1413
+#: ../src/protocols/simple/simple.c:1460
 msgid "Could not create listen socket"
 msgstr "Vtičnice ni bilo mogoče ustvariti"
 
-#: src/protocols/simple/simple.c:1228
+#: ../src/protocols/simple/simple.c:1383
 msgid "Couldn't resolve host"
 msgstr "Gostitelja ni mogoče razbrati"
 
-#: src/protocols/simple/simple.c:1331
+#: ../src/protocols/simple/simple.c:1481
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Uporabniška imena SIP ne smejo vsebovati presledka ali simbola @"
 
@@ -11502,227 +11715,235 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/simple/simple.c:1477
+#: ../src/protocols/simple/simple.c:1643
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Vstavek za protokol SIP/SIMPLE"
 
 #. *  summary
-#: src/protocols/simple/simple.c:1478
+#: ../src/protocols/simple/simple.c:1644
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "Vstavek za protokol SIP/SIMPLE"
 
-#: src/protocols/simple/simple.c:1500
+#: ../src/protocols/simple/simple.c:1666
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Stanje objave (opomba: vsakdo vas lahko opazuje)"
 
-#: src/protocols/simple/simple.c:1507
+#: ../src/protocols/simple/simple.c:1672
 msgid "Use UDP"
 msgstr "Uporabi UDP"
 
-#: src/protocols/simple/simple.c:1509
+#: ../src/protocols/simple/simple.c:1674
 msgid "Use proxy"
 msgstr "Uporabi prehod (proxy)"
 
-#: src/protocols/simple/simple.c:1511
+#: ../src/protocols/simple/simple.c:1676
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/protocols/toc/toc.c:139
+#: ../src/protocols/simple/simple.c:1678
+msgid "Auth User"
+msgstr "Avtoriziraj uporabnika"
+
+#: ../src/protocols/simple/simple.c:1680
+msgid "Auth Domain"
+msgstr "Avtoriziraj domeno"
+
+#: ../src/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr "Poizvedujem za %s"
 
-#: src/protocols/toc/toc.c:148
+#: ../src/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Povezovanje na %s ni uspelo"
 
-#: src/protocols/toc/toc.c:200
+#: ../src/protocols/toc/toc.c:200
 #, c-format
 msgid "Signon: %s"
 msgstr "Prijavljanje: %s"
 
-#: src/protocols/toc/toc.c:482
+#: ../src/protocols/toc/toc.c:482
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Datoteke %s ni bilo mogoče zapisati."
 
-#: src/protocols/toc/toc.c:485
+#: ../src/protocols/toc/toc.c:485
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Datoteke %s ni bilo mogoče prebrati."
 
-#: src/protocols/toc/toc.c:488
+#: ../src/protocols/toc/toc.c:488
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Sporočilo je predolgo, zato je bilo skrajšano za %s znakov."
 
-#: src/protocols/toc/toc.c:491
+#: ../src/protocols/toc/toc.c:491
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s trenutno ni prijavljen."
 
-#: src/protocols/toc/toc.c:494
+#: ../src/protocols/toc/toc.c:494
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Opozarjanje %s ni dovoljeno."
 
-#: src/protocols/toc/toc.c:497
+#: ../src/protocols/toc/toc.c:497
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "Sporočilo je bilo izpuščeno, ker presegate omejitev hitrosti strežnika."
 
-#: src/protocols/toc/toc.c:500
+#: ../src/protocols/toc/toc.c:500
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Pomenek v %s ni dostopen."
 
-#: src/protocols/toc/toc.c:503
+#: ../src/protocols/toc/toc.c:503
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Prehitro pošiljate sporočila %s."
 
-#: src/protocols/toc/toc.c:506
+#: ../src/protocols/toc/toc.c:506
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Ker je bilo preveliko, ste zgrešili sporočilo, ki vam ga je poslal %s."
 
-#: src/protocols/toc/toc.c:509
+#: ../src/protocols/toc/toc.c:509
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "Zgrešili ste sporočilo od %s, ker je bilo poslano prehitro."
 
-#: src/protocols/toc/toc.c:512
+#: ../src/protocols/toc/toc.c:512
 msgid "Failure."
 msgstr "Neuspeh."
 
-#: src/protocols/toc/toc.c:515
+#: ../src/protocols/toc/toc.c:515
 msgid "Too many matches."
 msgstr "Preveč zadetkov."
 
-#: src/protocols/toc/toc.c:518
+#: ../src/protocols/toc/toc.c:518
 msgid "Need more qualifiers."
 msgstr "Potrebujem več selekcije."
 
-#: src/protocols/toc/toc.c:521
+#: ../src/protocols/toc/toc.c:521
 msgid "Dir service temporarily unavailable."
 msgstr "Imeniška storitev je trenutno nedosegljiva."
 
-#: src/protocols/toc/toc.c:524
+#: ../src/protocols/toc/toc.c:524
 msgid "Email lookup restricted."
 msgstr "Poizvedba po e-poštnem naslovu je omejena."
 
-#: src/protocols/toc/toc.c:527
+#: ../src/protocols/toc/toc.c:527
 msgid "Keyword ignored."
 msgstr "Ključna beseda zanemarjena."
 
-#: src/protocols/toc/toc.c:530
+#: ../src/protocols/toc/toc.c:530
 msgid "No keywords."
 msgstr "Brez ključnih besed."
 
-#: src/protocols/toc/toc.c:533
+#: ../src/protocols/toc/toc.c:533
 msgid "User has no directory information."
 msgstr "Uporabnik nima imeniških informacij."
 
-#: src/protocols/toc/toc.c:537
+#: ../src/protocols/toc/toc.c:537
 msgid "Country not supported."
 msgstr "Država ni podprta."
 
-#: src/protocols/toc/toc.c:540
+#: ../src/protocols/toc/toc.c:540
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Neznan vzrok neuspeha: %s."
 
-#: src/protocols/toc/toc.c:546
+#: ../src/protocols/toc/toc.c:546
 msgid "The service is temporarily unavailable."
 msgstr "Storitev je trenutno nedostopna."
 
-#: src/protocols/toc/toc.c:549
+#: ../src/protocols/toc/toc.c:549
 msgid "Your warning level is currently too high to log in."
 msgstr "Vaša raven opozoril je trenutno previsoka, da bi se lahko prijavili."
 
-#: src/protocols/toc/toc.c:552
+#: ../src/protocols/toc/toc.c:552
 msgid "You have been connecting and disconnecting too frequently.  Wait ten minutes and try again.  If you continue to try, you will need to wait even longer."
 msgstr "Prijavljali in odjavljali ste se prepogosto.  Počakajte deset minut in poskusite ponovno.  Če tega ne boste upoštevali, bo trajalo še dlje."
 
-#: src/protocols/toc/toc.c:554
+#: ../src/protocols/toc/toc.c:554
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Pri prijavljanju je prišlo do neznane napake: %s."
 
-#: src/protocols/toc/toc.c:557
+#: ../src/protocols/toc/toc.c:557
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Prišlo je do neznane napake %d. Info: %s"
 
-#: src/protocols/toc/toc.c:584
+#: ../src/protocols/toc/toc.c:584
 msgid "Invalid Groupname"
 msgstr "Neveljavno ime skupine"
 
-#: src/protocols/toc/toc.c:668
+#: ../src/protocols/toc/toc.c:668
 msgid "Connection Closed"
 msgstr "Povezava zaprta"
 
-#: src/protocols/toc/toc.c:708
+#: ../src/protocols/toc/toc.c:708
 msgid "Waiting for reply..."
 msgstr "Čakanje odgovora ..."
 
-#: src/protocols/toc/toc.c:786
+#: ../src/protocols/toc/toc.c:786
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC je nazaj z odmora. Sedaj lahko spet pošiljate sporočila."
 
-#: src/protocols/toc/toc.c:989
+#: ../src/protocols/toc/toc.c:989
 msgid "Password Change Successful"
 msgstr "Sprememba gesla uspešna"
 
-#: src/protocols/toc/toc.c:993
+#: ../src/protocols/toc/toc.c:993
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC je poslal ukaz PAUSE."
 
-#: src/protocols/toc/toc.c:994
+#: ../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 "Ko se to pripeti, TOC prezre vsa poslana sporočila in vas lahko celo brcne s kanala če pošljete sporočilo. Gaim bo poskrbel, da se to ne zgodi. Stanje je le začasno, prosim potrpite."
 
-#: src/protocols/toc/toc.c:1549
+#: ../src/protocols/toc/toc.c:1549
 msgid "Get Dir Info"
 msgstr "Prikaži imeniške podatke"
 
-#: src/protocols/toc/toc.c:1684
+#: ../src/protocols/toc/toc.c:1684
 msgid "Set User Info"
 msgstr "Nastavi informacije o uporabniku"
 
-#: src/protocols/toc/toc.c:1689
+#: ../src/protocols/toc/toc.c:1689
 msgid "Set Dir Info"
 msgstr "Nastavi imeniške podatke"
 
-#: src/protocols/toc/toc.c:1694
+#: ../src/protocols/toc/toc.c:1694
 msgid "Change Password"
 msgstr "Spremeni geslo"
 
-#: src/protocols/toc/toc.c:1811
+#: ../src/protocols/toc/toc.c:1811
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "Ne morem odpreti %s za pisanje!"
 
-#: src/protocols/toc/toc.c:1847
+#: ../src/protocols/toc/toc.c:1847
 msgid "File transfer failed; other side probably canceled."
 msgstr "Prenos datoteke ni bil uspešen; verjetno je prijatelj preklical prenos."
 
-#: src/protocols/toc/toc.c:1892
-#: src/protocols/toc/toc.c:1932
-#: src/protocols/toc/toc.c:2056
-#: src/protocols/toc/toc.c:2144
+#: ../src/protocols/toc/toc.c: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 "Ni se bilo mogoče povezati za prenos."
 
-#: src/protocols/toc/toc.c:2089
+#: ../src/protocols/toc/toc.c:2089
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "Ni bilo mogoče zapisati glave datoteke. Datoteka ne bo prenešena."
 
-#: src/protocols/toc/toc.c:2189
+#: ../src/protocols/toc/toc.c:2189
 msgid "Gaim - Save As..."
 msgstr "Gaim - Shrani kot ..."
 
-#: src/protocols/toc/toc.c:2223
+#: ../src/protocols/toc/toc.c:2223
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
@@ -11731,7 +11952,7 @@
 msgstr[2] "%s zahteva od %s, da sprejme %d datoteki: %s (%.2f %s)%s%s"
 msgstr[3] "%s zahteva od %s, da sprejme %d datoteke: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2230
+#: ../src/protocols/toc/toc.c:2230
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s zahteva, da jim pošljete datoteko"
@@ -11746,29 +11967,29 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2320
-#: src/protocols/toc/toc.c:2322
+#: ../src/protocols/toc/toc.c:2320
+#: ../src/protocols/toc/toc.c:2322
 msgid "TOC Protocol Plugin"
 msgstr "Dodatek za protokol TOC"
 
-#: src/protocols/toc/toc.c:2341
+#: ../src/protocols/toc/toc.c:2341
 msgid "TOC host"
 msgstr "TOC gostitelj"
 
-#: src/protocols/toc/toc.c:2345
+#: ../src/protocols/toc/toc.c:2345
 msgid "TOC port"
 msgstr "TOC vrata"
 
-#: src/protocols/yahoo/yahoo.c:712
+#: ../src/protocols/yahoo/yahoo.c:712
 msgid "Your Yahoo! message did not get sent."
 msgstr "Vaše sporočilo za Yahoo! ni bilo poslano."
 
-#: src/protocols/yahoo/yahoo.c:765
-#: src/protocols/yahoo/yahoo.c:3508
+#: ../src/protocols/yahoo/yahoo.c:765
+#: ../src/protocols/yahoo/yahoo.c:3561
 msgid "Buzz!!"
 msgstr "Brrr!!"
 
-#: src/protocols/yahoo/yahoo.c:810
+#: ../src/protocols/yahoo/yahoo.c:810
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Sistemsko sporočilo Yahoo! za %s:"
@@ -11776,199 +11997,200 @@
 #. TODO: this is almost exactly the same as what MSN does,
 #. * this should probably be moved to the core.
 #.
-#: src/protocols/yahoo/yahoo.c:906
+#: ../src/protocols/yahoo/yahoo.c:906
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list%s%s."
 msgstr "Uporabnik %s želi dodati %s na svoj seznam prijateljev%s%s."
 
-#: src/protocols/yahoo/yahoo.c:912
+#: ../src/protocols/yahoo/yahoo.c:912
 msgid "Message (optional) :"
 msgstr "Sporočilo (dodatno):"
 
-#: src/protocols/yahoo/yahoo.c:954
+#: ../src/protocols/yahoo/yahoo.c:954
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s je (že prej) zavrnil vašo zahtevo, da ga smete dodati na svoj seznam."
 
-#: src/protocols/yahoo/yahoo.c:957
+#: ../src/protocols/yahoo/yahoo.c:957
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list for the following reason: %s."
 msgstr "%s je (že prej) zavrnil vašo zahtevo, da bi ga dodali na svoj seznam prijateljev zaradi naslednjega razloga: %s."
 
-#: src/protocols/yahoo/yahoo.c:960
+#: ../src/protocols/yahoo/yahoo.c:960
 msgid "Add buddy rejected"
 msgstr "Dodajanje prijatelja zavrnjeno"
 
-#: src/protocols/yahoo/yahoo.c:1703
+#: ../src/protocols/yahoo/yahoo.c:1703
 #, c-format
 msgid "The Yahoo server has requested the use of an unrecognized authentication method.  This version of Gaim will likely not be able to successfully sign on to Yahoo.  Check %s for updates."
 msgstr "Strežnik Yahoo je zahteval uporabo neprepoznane metode overovitve. Ta različica Gaima se verjetno ne bo uspešno prijavila na Yahoo. Preverite %s za posodobitve."
 
-#: src/protocols/yahoo/yahoo.c:1706
+#: ../src/protocols/yahoo/yahoo.c:1706
 msgid "Failed Yahoo! Authentication"
 msgstr "Napaka pri overovitvi Yahoo!"
 
-#: src/protocols/yahoo/yahoo.c:1772
+#: ../src/protocols/yahoo/yahoo.c:1772
 #, 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 "Poskusili ste prezreti uporabnika %s, ki je na vašem seznamu prijateljev. Če kliknete \"Da\" boste odstranili prijatelja in ga prezrli."
 
-#: src/protocols/yahoo/yahoo.c:1775
+#: ../src/protocols/yahoo/yahoo.c:1775
 msgid "Ignore buddy?"
 msgstr "Prezrem prijatelja?"
 
-#: src/protocols/yahoo/yahoo.c:1809
+#: ../src/protocols/yahoo/yahoo.c:1809
 msgid "Invalid username."
 msgstr "Neveljavno uporabniško ime."
 
-#: src/protocols/yahoo/yahoo.c:1820
+#: ../src/protocols/yahoo/yahoo.c:1820
 msgid "Normal authentication failed!"
 msgstr "Navadna overovitev ni uspela!"
 
-#: src/protocols/yahoo/yahoo.c:1821
+#: ../src/protocols/yahoo/yahoo.c:1821
 msgid "The normal authentication method has failed. This means either your password is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now attempt to log in using Web Messenger authentication, which will result in reduced functionality and features."
 msgstr "Navadna metoda overovitve je spodletela. To lahko pomeni, da je napačno vaše geslo ali pa se je spremenila shema overovitve Yahoo! Gaim se bo zdaj poskušal prijaviti z uporabo overovitve Web Messengerja, kar se bo odrazilo v manj možnostih."
 
-#: src/protocols/yahoo/yahoo.c:1829
+#: ../src/protocols/yahoo/yahoo.c:1829
 msgid "Incorrect password."
 msgstr "Neveljavno geslo."
 
-#: src/protocols/yahoo/yahoo.c:1832
+#: ../src/protocols/yahoo/yahoo.c:1832
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Vaš račun je zaklenjen. Prijavite se na spletno stran Yahoo!"
 
-#: src/protocols/yahoo/yahoo.c:1835
+#: ../src/protocols/yahoo/yahoo.c:1835
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "Neznana številka napake %d. Prijavljanje v spletno stran Yahoo! lahko to odpravi."
 
-#: src/protocols/yahoo/yahoo.c:1889
+#: ../src/protocols/yahoo/yahoo.c:1889
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "Ni mogoče dodati prijatelja %s v skupino %s na seznamu strežnikov za račun %s."
 
-#: src/protocols/yahoo/yahoo.c:1892
+#: ../src/protocols/yahoo/yahoo.c:1892
 msgid "Could not add buddy to server list"
 msgstr "Prijatelja ni mogoče dodati ne seznam strežnikov"
 
-#: src/protocols/yahoo/yahoo.c:2011
+#: ../src/protocols/yahoo/yahoo.c:2011
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Slišni %s/%s/%s.swf ] %s"
 
-#: src/protocols/yahoo/yahoo.c:2150
-#: src/protocols/yahoo/yahoo.c:2296
-#: src/protocols/yahoo/ycht.c:413
+#: ../src/protocols/yahoo/yahoo.c:2150
+#: ../src/protocols/yahoo/yahoo.c:2297
+#: ../src/protocols/yahoo/yahoo.c:2312
+#: ../src/protocols/yahoo/ycht.c:472
 msgid "Unable to read"
 msgstr "Ni mogoče brati"
 
-#: src/protocols/yahoo/yahoo.c:2318
-#: src/protocols/yahoo/yahoo.c:2446
-#: src/protocols/yahoo/yahoo.c:2545
-#: src/protocols/yahoo/yahoo.c:2555
-#: src/protocols/yahoo/yahoochat.c:1414
-#: src/protocols/yahoo/yahoochat.c:1484
-#: src/protocols/yahoo/ycht.c:517
+#: ../src/protocols/yahoo/yahoo.c:2336
+#: ../src/protocols/yahoo/yahoo.c:2493
+#: ../src/protocols/yahoo/yahoo.c:2595
+#: ../src/protocols/yahoo/yahoo.c:2605
+#: ../src/protocols/yahoo/yahoochat.c:1447
+#: ../src/protocols/yahoo/yahoochat.c:1517
+#: ../src/protocols/yahoo/ycht.c:576
 msgid "Connection problem"
 msgstr "Težava s povezavo"
 
-#: src/protocols/yahoo/yahoo.c:2662
-#: src/protocols/yahoo/yahoo.c:3241
+#: ../src/protocols/yahoo/yahoo.c:2713
+#: ../src/protocols/yahoo/yahoo.c:3294
 msgid "Not at Home"
 msgstr "Nisem doma"
 
-#: src/protocols/yahoo/yahoo.c:2664
-#: src/protocols/yahoo/yahoo.c:3244
+#: ../src/protocols/yahoo/yahoo.c:2715
+#: ../src/protocols/yahoo/yahoo.c:3297
 msgid "Not at Desk"
 msgstr "Nisem za mizo"
 
-#: src/protocols/yahoo/yahoo.c:2666
-#: src/protocols/yahoo/yahoo.c:3247
+#: ../src/protocols/yahoo/yahoo.c:2717
+#: ../src/protocols/yahoo/yahoo.c:3300
 msgid "Not in Office"
 msgstr "Nisem v pisarni"
 
-#: src/protocols/yahoo/yahoo.c:2670
-#: src/protocols/yahoo/yahoo.c:3253
+#: ../src/protocols/yahoo/yahoo.c:2721
+#: ../src/protocols/yahoo/yahoo.c:3306
 msgid "On Vacation"
 msgstr "Na dopustu"
 
-#: src/protocols/yahoo/yahoo.c:2674
-#: src/protocols/yahoo/yahoo.c:3259
+#: ../src/protocols/yahoo/yahoo.c:2725
+#: ../src/protocols/yahoo/yahoo.c:3312
 msgid "Stepped Out"
 msgstr "Šel na pavzo"
 
-#: src/protocols/yahoo/yahoo.c:2767
-#: src/protocols/yahoo/yahoo.c:2795
+#: ../src/protocols/yahoo/yahoo.c:2818
+#: ../src/protocols/yahoo/yahoo.c:2848
 msgid "Not on server list"
 msgstr "Ni na seznamu strežnikov"
 
-#: src/protocols/yahoo/yahoo.c:2812
-#: src/protocols/yahoo/yahoo.c:2871
+#: ../src/protocols/yahoo/yahoo.c:2865
+#: ../src/protocols/yahoo/yahoo.c:2924
 msgid "Appear Online"
 msgstr "Izgledaj povezan"
 
-#: src/protocols/yahoo/yahoo.c:2815
-#: src/protocols/yahoo/yahoo.c:2892
+#: ../src/protocols/yahoo/yahoo.c:2868
+#: ../src/protocols/yahoo/yahoo.c:2945
 msgid "Appear Permanently Offline"
 msgstr "Izgledaj stalno povezan"
 
-#: src/protocols/yahoo/yahoo.c:2834
+#: ../src/protocols/yahoo/yahoo.c:2887
 msgid "Presence"
 msgstr "Prisotnost"
 
-#: src/protocols/yahoo/yahoo.c:2877
+#: ../src/protocols/yahoo/yahoo.c:2930
 msgid "Appear Offline"
 msgstr "Izgledaj brez povezave"
 
-#: src/protocols/yahoo/yahoo.c:2886
+#: ../src/protocols/yahoo/yahoo.c:2939
 msgid "Don't Appear Permanently Offline"
 msgstr "Izgledaj brez povezave"
 
-#: src/protocols/yahoo/yahoo.c:2934
+#: ../src/protocols/yahoo/yahoo.c:2987
 msgid "Join in Chat"
 msgstr "Pridruži se pomenku"
 
-#: src/protocols/yahoo/yahoo.c:2940
+#: ../src/protocols/yahoo/yahoo.c:2993
 msgid "Initiate Conference"
 msgstr "Začni konferenčni pogovor"
 
-#: src/protocols/yahoo/yahoo.c:2968
+#: ../src/protocols/yahoo/yahoo.c:3021
 msgid "Presence Settings"
 msgstr "Nastavitve prisotnosti"
 
-#: src/protocols/yahoo/yahoo.c:2974
+#: ../src/protocols/yahoo/yahoo.c:3027
 msgid "Start Doodling"
 msgstr "Začni Doodlati"
 
-#: src/protocols/yahoo/yahoo.c:3006
+#: ../src/protocols/yahoo/yahoo.c:3059
 msgid "Active which ID?"
 msgstr "Kateri ID naj aktiviram?"
 
-#: src/protocols/yahoo/yahoo.c:3015
+#: ../src/protocols/yahoo/yahoo.c:3068
 msgid "Join who in chat?"
 msgstr "Komu se želite pridružiti v pomenku?"
 
-#: src/protocols/yahoo/yahoo.c:3025
+#: ../src/protocols/yahoo/yahoo.c:3078
 msgid "Activate ID..."
 msgstr "Aktiviraj ID ..."
 
-#: src/protocols/yahoo/yahoo.c:3029
+#: ../src/protocols/yahoo/yahoo.c:3082
 msgid "Join User in Chat..."
 msgstr "Pridruži se uporabniku v pomenku ..."
 
-#: src/protocols/yahoo/yahoo.c:3567
+#: ../src/protocols/yahoo/yahoo.c:3620
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;soba&gt;:  Pridružite se klepetalnici v omrežju Yahoo."
 
-#: src/protocols/yahoo/yahoo.c:3572
+#: ../src/protocols/yahoo/yahoo.c:3625
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  Seznam sob na omrežju Yahoo"
 
-#: src/protocols/yahoo/yahoo.c:3576
+#: ../src/protocols/yahoo/yahoo.c:3629
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Pozvonite (buzznite) pri prijatelju, da vas bo opazil"
 
-#: src/protocols/yahoo/yahoo.c:3580
+#: ../src/protocols/yahoo/yahoo.c:3633
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Od uporabnika zahtevajte, da začne sejo Doodle"
 
@@ -11982,303 +12204,309 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3674
-#: src/protocols/yahoo/yahoo.c:3676
+#: ../src/protocols/yahoo/yahoo.c:3727
+#: ../src/protocols/yahoo/yahoo.c:3729
 msgid "Yahoo Protocol Plugin"
 msgstr "Dodatek za protokol Yahoo"
 
-#: src/protocols/yahoo/yahoo.c:3693
+#: ../src/protocols/yahoo/yahoo.c:3746
 msgid "Yahoo Japan"
 msgstr "Yahoo Japonska"
 
-#: src/protocols/yahoo/yahoo.c:3696
+#: ../src/protocols/yahoo/yahoo.c:3749
 msgid "Pager host"
 msgstr "Strežnik za pozivnik"
 
-#: src/protocols/yahoo/yahoo.c:3699
+#: ../src/protocols/yahoo/yahoo.c:3752
 msgid "Japan Pager host"
 msgstr "Japonski gostitelj pozivnika"
 
-#: src/protocols/yahoo/yahoo.c:3702
+#: ../src/protocols/yahoo/yahoo.c:3755
 msgid "Pager port"
 msgstr "Vrata za pozivnik"
 
-#: src/protocols/yahoo/yahoo.c:3705
+#: ../src/protocols/yahoo/yahoo.c:3758
 msgid "File transfer host"
 msgstr "Gostitelj prenosa datotek"
 
-#: src/protocols/yahoo/yahoo.c:3708
+#: ../src/protocols/yahoo/yahoo.c:3761
 msgid "Japan file transfer host"
 msgstr "Japonski gostitelj prenosa datotek"
 
-#: src/protocols/yahoo/yahoo.c:3711
+#: ../src/protocols/yahoo/yahoo.c:3764
 msgid "File transfer port"
 msgstr "Vrata za prenos datotek"
 
-#: src/protocols/yahoo/yahoo.c:3714
+#: ../src/protocols/yahoo/yahoo.c:3767
 msgid "Chat room locale"
 msgstr "Razpored tipk sobe pomenkov"
 
-#: src/protocols/yahoo/yahoo.c:3717
+#: ../src/protocols/yahoo/yahoo.c:3770
 msgid "Ignore conference and chatroom invitations"
 msgstr "Prezri povabila na konference in v klepetalnice"
 
-#: src/protocols/yahoo/yahoo.c:3721
+#: ../src/protocols/yahoo/yahoo.c:3774
 msgid "Chat room list URL"
 msgstr "URL seznama sob pomenkov"
 
-#: src/protocols/yahoo/yahoo.c:3724
+#: ../src/protocols/yahoo/yahoo.c:3777
 msgid "YCHT host"
 msgstr "Gostitelj YCHT"
 
-#: src/protocols/yahoo/yahoo.c:3727
+#: ../src/protocols/yahoo/yahoo.c:3780
 msgid "YCHT port"
 msgstr "Vrata YCHT"
 
-#: src/protocols/yahoo/yahoo_profile.c:698
+#. TODO: what to do here - do we really have to disconnect?
+#: ../src/protocols/yahoo/yahoo_packet.c:265
+msgid "Write Error"
+msgstr "Napaka pri pisanju"
+
+#: ../src/protocols/yahoo/yahoo_profile.c:707
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
 msgstr "<b>Naslov IP:</b> %s<br>"
 
-#: src/protocols/yahoo/yahoo_profile.c:774
+#: ../src/protocols/yahoo/yahoo_profile.c:783
 msgid "Yahoo! Japan Profile"
 msgstr "Profil Yahoo!-Japonska"
 
-#: src/protocols/yahoo/yahoo_profile.c:775
+#: ../src/protocols/yahoo/yahoo_profile.c:784
 msgid "Yahoo! Profile"
 msgstr "Profil Yahoo!"
 
-#: src/protocols/yahoo/yahoo_profile.c:819
+#: ../src/protocols/yahoo/yahoo_profile.c:828
 msgid "Sorry, profiles marked as containing adult content are not supported at this time."
 msgstr "Oprostite, profili označeni z vsebino za odrasle trenutno niso podprti."
 
-#: src/protocols/yahoo/yahoo_profile.c:821
+#: ../src/protocols/yahoo/yahoo_profile.c:830
 msgid "If you wish to view this profile, you will need to visit this link in your web browser"
 msgstr "Če si želite ogledati ta profil, morate obiskati to povezavo z vašim spletnim brskalnikom"
 
-#: src/protocols/yahoo/yahoo_profile.c:997
+#: ../src/protocols/yahoo/yahoo_profile.c:1006
 msgid "Yahoo! ID"
 msgstr "Yahoo ID"
 
-#: src/protocols/yahoo/yahoo_profile.c:1069
-#: src/protocols/yahoo/yahoo_profile.c:1073
-#: src/protocols/yahoo/yahoo_profile.c:1077
+#: ../src/protocols/yahoo/yahoo_profile.c:1078
+#: ../src/protocols/yahoo/yahoo_profile.c:1082
+#: ../src/protocols/yahoo/yahoo_profile.c:1086
 msgid "Hobbies"
 msgstr "Hobiji"
 
-#: src/protocols/yahoo/yahoo_profile.c:1087
-#: src/protocols/yahoo/yahoo_profile.c:1091
+#: ../src/protocols/yahoo/yahoo_profile.c:1096
+#: ../src/protocols/yahoo/yahoo_profile.c:1100
 msgid "Latest News"
 msgstr "Zadnje novice"
 
-#: src/protocols/yahoo/yahoo_profile.c:1112
+#: ../src/protocols/yahoo/yahoo_profile.c:1121
 msgid "Home Page"
 msgstr "Domača stran"
 
-#: src/protocols/yahoo/yahoo_profile.c:1127
+#: ../src/protocols/yahoo/yahoo_profile.c:1136
 msgid "Cool Link 1"
 msgstr "Zanimiva povezava št. 1"
 
-#: src/protocols/yahoo/yahoo_profile.c:1132
+#: ../src/protocols/yahoo/yahoo_profile.c:1141
 msgid "Cool Link 2"
 msgstr "Zanimiva povezava št. 2"
 
-#: src/protocols/yahoo/yahoo_profile.c:1136
+#: ../src/protocols/yahoo/yahoo_profile.c:1145
 msgid "Cool Link 3"
 msgstr "Zanimiva povezava št. 3"
 
-#: src/protocols/yahoo/yahoo_profile.c:1149
+#: ../src/protocols/yahoo/yahoo_profile.c:1158
 msgid "Last Update"
 msgstr "Nazadnje osveženo"
 
-#: src/protocols/yahoo/yahoo_profile.c:1155
+#: ../src/protocols/yahoo/yahoo_profile.c:1164
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Podatki o uporabniku %s niso dostopni"
 
-#: src/protocols/yahoo/yahoo_profile.c:1161
+#: ../src/protocols/yahoo/yahoo_profile.c:1170
 msgid "Sorry, this profile seems to be in a language or format that is not supported at this time."
 msgstr "Oprostite, profil je v jeziku ali obliki, ki trenutno ni podprta."
 
-#: src/protocols/yahoo/yahoo_profile.c:1177
+#: ../src/protocols/yahoo/yahoo_profile.c:1186
 msgid "Could not retrieve the user's profile. This most likely is a temporary server-side problem. Please try again later."
 msgstr "Ni mogoče pridobiti uporabnikovega profila. Ponavadi gre za začasno težavo na strežniku. Poskusite pozneje."
 
-#: src/protocols/yahoo/yahoo_profile.c:1180
+#: ../src/protocols/yahoo/yahoo_profile.c:1189
 msgid "Could not retrieve the user's profile. This most likely means that the user does not exist; however, Yahoo! sometimes does fail to find a user's profile. If you know that the user exists, please try again later."
 msgstr "Ni mogoče pridobiti uporabnikovega profila. To ponavadi pomeni, da uporabnik ne obstaja. Kljub temu Yahoo! občasno ne uspe najti uporabnikovega profila. Če veste, da uporabnik obstaja, poskusite pozneje."
 
-#: src/protocols/yahoo/yahoo_profile.c:1188
+#: ../src/protocols/yahoo/yahoo_profile.c:1197
 msgid "The user's profile is empty."
 msgstr "Uporabnikov profil je prazen."
 
-#: src/protocols/yahoo/yahoochat.c:203
+#: ../src/protocols/yahoo/yahoochat.c:203
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s je zavrnil vaše povabilo za pogovor v sobi \"%s\", ker \"%s\"."
 
-#: src/protocols/yahoo/yahoochat.c:205
+#: ../src/protocols/yahoo/yahoochat.c:205
 msgid "Invitation Rejected"
 msgstr "Povabilo zavrnjeno"
 
-#: src/protocols/yahoo/yahoochat.c:361
+#: ../src/protocols/yahoo/yahoochat.c:361
 msgid "Failed to join chat"
 msgstr "Pomenku se ni mogoče pridružiti"
 
 #. -6
-#: src/protocols/yahoo/yahoochat.c:364
+#: ../src/protocols/yahoo/yahoochat.c:364
 msgid "Unknown room"
 msgstr "Neznana soba"
 
 #. -15
-#: src/protocols/yahoo/yahoochat.c:367
+#: ../src/protocols/yahoo/yahoochat.c:367
 msgid "Maybe the room is full"
 msgstr "Morda je soba polna"
 
 #. -35
-#: src/protocols/yahoo/yahoochat.c:370
+#: ../src/protocols/yahoo/yahoochat.c:370
 msgid "Not available"
 msgstr "Ni na voljo"
 
-#: src/protocols/yahoo/yahoochat.c:374
+#: ../src/protocols/yahoo/yahoochat.c:374
 msgid "Unknown error. You may need to logout and wait five minutes before being able to rejoin a chatroom"
 msgstr "Neznana napaka. Morda se boste morali odjaviti in počakati pet minut, preden se boste lahko ponovno pridružili klepetalnici"
 
-#: src/protocols/yahoo/yahoochat.c:452
+#: ../src/protocols/yahoo/yahoochat.c:452
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Pogovarjate se v %s."
 
-#: src/protocols/yahoo/yahoochat.c:626
+#: ../src/protocols/yahoo/yahoochat.c:626
 msgid "Failed to join buddy in chat"
 msgstr "Prijatelju se ni bilo mogoče pridružiti na pomenku"
 
-#: src/protocols/yahoo/yahoochat.c:627
+#: ../src/protocols/yahoo/yahoochat.c:627
 msgid "Maybe they're not in a chat?"
 msgstr "Morda niso v pomenku?"
 
-#: src/protocols/yahoo/yahoochat.c:1345
+#: ../src/protocols/yahoo/yahoochat.c:1345
+#: ../src/protocols/yahoo/yahoochat.c:1372
 msgid "Fetching the room list failed."
 msgstr "Prejemanje seznama sob je spodletelo."
 
-#: src/protocols/yahoo/yahoochat.c:1400
+#: ../src/protocols/yahoo/yahoochat.c:1433
 msgid "Voices"
 msgstr "Glasovi"
 
-#: src/protocols/yahoo/yahoochat.c:1403
+#: ../src/protocols/yahoo/yahoochat.c:1436
 msgid "Webcams"
 msgstr "Spletne kamere"
 
-#: src/protocols/yahoo/yahoochat.c:1414
-#: src/protocols/yahoo/yahoochat.c:1484
+#: ../src/protocols/yahoo/yahoochat.c:1447
+#: ../src/protocols/yahoo/yahoochat.c:1517
 msgid "Unable to fetch room list."
 msgstr "Ni mogoče prenesti seznama sob."
 
-#: src/protocols/yahoo/yahoochat.c:1477
+#: ../src/protocols/yahoo/yahoochat.c:1510
 msgid "User Rooms"
 msgstr "Sobe uporabnikov"
 
-#: src/protocols/yahoo/ycht.c:400
+#: ../src/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr "Težava s povezavo s strežnikom YCHT."
 
-#: src/protocols/zephyr/zephyr.c:331
+#: ../src/protocols/zephyr/zephyr.c:331
 msgid "(There was an error converting this message.\t Check the 'Encoding' option in the Account Editor)"
 msgstr "(Prišlo je do napake pri pretvorbi tega sporočila. \t Preverite izbiro kodnega nabora v Upravitelju računov)"
 
-#: src/protocols/zephyr/zephyr.c:686
+#: ../src/protocols/zephyr/zephyr.c:686
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Ni mogoče poslati klepetu %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:719
-#: src/protocols/zephyr/zephyr.c:1134
+#: ../src/protocols/zephyr/zephyr.c:719
+#: ../src/protocols/zephyr/zephyr.c:1134
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Uporabnik:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:723
-#: src/protocols/zephyr/zephyr.c:1139
+#: ../src/protocols/zephyr/zephyr.c:723
+#: ../src/protocols/zephyr/zephyr.c:1139
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Skrit ali neprijavljen"
 
-#: src/protocols/zephyr/zephyr.c:728
-#: src/protocols/zephyr/zephyr.c:1141
+#: ../src/protocols/zephyr/zephyr.c:728
+#: ../src/protocols/zephyr/zephyr.c:1141
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>Pri %s od %s"
 
-#: src/protocols/zephyr/zephyr.c:1472
-#: src/protocols/zephyr/zephyr.c:1473
+#: ../src/protocols/zephyr/zephyr.c:1472
+#: ../src/protocols/zephyr/zephyr.c:1473
 msgid "Anyone"
 msgstr "Kdorkoli"
 
-#: src/protocols/zephyr/zephyr.c:2278
+#: ../src/protocols/zephyr/zephyr.c:2278
 msgid "_Class:"
 msgstr "_Razred:"
 
-#: src/protocols/zephyr/zephyr.c:2284
+#: ../src/protocols/zephyr/zephyr.c:2284
 msgid "_Instance:"
 msgstr "_Primer:"
 
-#: src/protocols/zephyr/zephyr.c:2290
+#: ../src/protocols/zephyr/zephyr.c:2290
 msgid "_Recipient:"
 msgstr "_Prejemnik:"
 
-#: src/protocols/zephyr/zephyr.c:2301
+#: ../src/protocols/zephyr/zephyr.c:2301
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Poskus prijave na %s,%s,%s je spodletel"
 
-#: src/protocols/zephyr/zephyr.c:2607
+#: ../src/protocols/zephyr/zephyr.c:2607
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;vzdevek&gt;: Najdi uporabnika"
 
-#: src/protocols/zephyr/zephyr.c:2612
+#: ../src/protocols/zephyr/zephyr.c:2612
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;vzdevek&gt;: Najdi uporabnika"
 
-#: src/protocols/zephyr/zephyr.c:2617
+#: ../src/protocols/zephyr/zephyr.c:2617
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instanca &lt;instanca&gt;: Nastavi instanco, ki naj bo uporabljena na tem razredu"
 
-#: src/protocols/zephyr/zephyr.c:2622
+#: ../src/protocols/zephyr/zephyr.c:2622
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;instanca&gt;: Nastavi instanco, ki naj bo uporabljena na tem razredu"
 
-#: src/protocols/zephyr/zephyr.c:2627
+#: ../src/protocols/zephyr/zephyr.c:2627
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;instanca&gt;: Nastavi instanco, ki naj bo uporabljena na tem razredu"
 
-#: src/protocols/zephyr/zephyr.c:2633
+#: ../src/protocols/zephyr/zephyr.c:2633
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr "sub &lt;razred&gt; &lt;instanca&gt; &lt;prejemnik&gt;: Pridruži se novemu klepetu"
 
-#: src/protocols/zephyr/zephyr.c:2638
+#: ../src/protocols/zephyr/zephyr.c:2638
 msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr "zi &lt;instanca&gt;: Pošlji sporočilo uporabniku &lt;sporočilo,<i>instanca</i>,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2644
+#: ../src/protocols/zephyr/zephyr.c:2644
 msgid "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,*&gt;"
 msgstr "zci &lt;razred&gt; &lt;instanca&gt;: Pošlji sporočilo uporabniku &lt;<i>razred</i>,<i>instanca</i>,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2650
+#: ../src/protocols/zephyr/zephyr.c:2650
 msgid "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
 msgstr "zcir &lt;razred&gt; &lt;instanca&gt; &lt;prejemnik&gt;: Pošlji sporočilo uporabniku &lt;<i>razred</i>,<i>instanca</i>,<i>prejemnik</i>&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2656
+#: ../src/protocols/zephyr/zephyr.c:2656
 msgid "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,<i>instance</i>,<i>recipient</i>&gt;"
 msgstr "zir &lt;instanca&gt; &lt;prejemnikt&gt;: Pošlji sporočilo uporabniku &lt;SPOROČILO,<i>instanca</i>,<i>prejemnik</i>&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2661
+#: ../src/protocols/zephyr/zephyr.c:2661
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;razred&gt;: Pošlji sporočilo uporabniku &lt;<i>razred</i>,OSEBNO,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2767
+#: ../src/protocols/zephyr/zephyr.c:2767
 msgid "Resubscribe"
 msgstr "Ponovna prijava"
 
-#: src/protocols/zephyr/zephyr.c:2770
+#: ../src/protocols/zephyr/zephyr.c:2770
 msgid "Retrieve subscriptions from server"
 msgstr "Pridobi prijave s strežnika"
 
@@ -12292,78 +12520,71 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:2856
-#: src/protocols/zephyr/zephyr.c:2858
+#: ../src/protocols/zephyr/zephyr.c:2856
+#: ../src/protocols/zephyr/zephyr.c:2858
 msgid "Zephyr Protocol Plugin"
 msgstr "Dodatek za protokol Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:2883
+#: ../src/protocols/zephyr/zephyr.c:2883
 msgid "Export to .anyone"
 msgstr "Izvozi v .kdorkoli"
 
-#: src/protocols/zephyr/zephyr.c:2886
+#: ../src/protocols/zephyr/zephyr.c:2886
 msgid "Export to .zephyr.subs"
 msgstr "Izvozi v .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:2889
+#: ../src/protocols/zephyr/zephyr.c:2889
 msgid "Import from .anyone"
 msgstr "Uvozi iz .kdorkoli"
 
-#: src/protocols/zephyr/zephyr.c:2892
+#: ../src/protocols/zephyr/zephyr.c:2892
 msgid "Import from .zephyr.subs"
 msgstr "Uvozi iz .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:2895
+#: ../src/protocols/zephyr/zephyr.c:2895
 msgid "Realm"
 msgstr "Področje"
 
-#: src/protocols/zephyr/zephyr.c:2898
+#: ../src/protocols/zephyr/zephyr.c:2898
 msgid "Exposure"
 msgstr "Izpostavljanje"
 
-#: src/proxy.c:1126
-#: src/proxy.c:1156
-#: src/proxy.c:1178
-#: src/proxy.c:1190
+#: ../src/proxy.c:1212
+#: ../src/proxy.c:1265
+#: ../src/proxy.c:1311
+#: ../src/proxy.c:1332
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "Napaka pri povezavi strežnika proxy %d"
 
 #. Forbidden
-#: src/proxy.c:1186
+#: ../src/proxy.c:1324
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "Dostop zavrnjen: strežnik proxy ne dovoljuje tuneliranja vrat %d."
 
-#: src/proxy.c:2025
+#: ../src/proxy.c:2318
 msgid "Invalid proxy settings"
 msgstr "Neveljavne proxy nastavitve"
 
-#: src/proxy.c:2025
+#: ../src/proxy.c:2318
 msgid "Either the host name or port number specified for your given proxy type is invalid."
 msgstr "Bodisi ime strežnika bodisi vrata, ki ste ju navedli za proxy, so neveljavna."
 
-#. *
-#. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
-#.
-#: src/request.h:1350
-msgid "_Accept"
-msgstr "_Sprejmi"
-
-#: src/savedstatuses.c:509
+#: ../src/savedstatuses.c:514
 msgid "saved statuses"
 msgstr "shranjena stanja"
 
-#: src/savedstatuses.c:757
+#: ../src/savedstatuses.c:767
 msgid "I'm not here right now"
 msgstr "Trenutno nisem tukaj"
 
-#: src/server.c:225
+#: ../src/server.c:225
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s je zdaj poznan kot %s.\n"
 
-#: src/server.c:675
+#: ../src/server.c:675
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -12372,118 +12593,145 @@
 "Uporabnik %s vabi %s na pomenek v sobo %s:\n"
 "%s"
 
-#: src/server.c:680
+#: ../src/server.c:680
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "Uporabnik %s vabi %s na pomenek v sobo %s\n"
 
-#: src/server.c:684
+#: ../src/server.c:684
 msgid "Accept chat invitation?"
 msgstr "Sprejmi povabilo na pomenek?"
 
-#: src/status.c:153
+#: ../src/status.c:153
 msgid "Unset"
 msgstr "Nenastavljeno"
 
-#: src/status.c:156
+#: ../src/status.c:156
 msgid "Unavailable"
 msgstr "Nedostopen"
 
-#: src/status.c:160
+#: ../src/status.c:160
 msgid "Mobile"
 msgstr "Mobilni telefon"
 
-#: src/status.c:623
+#: ../src/status.c:623
 #, c-format
 msgid "%s signed on"
 msgstr "%s se je prijavil(a)"
 
-#: src/status.c:627
+#: ../src/status.c:627
 #, c-format
 msgid "%s came back"
 msgstr "%s se je vrnil"
 
-#: src/status.c:634
+#: ../src/status.c:634
 #, c-format
 msgid "%s signed off"
 msgstr "%s se je odjavil(a)"
 
-#: src/status.c:638
+#: ../src/status.c:638
 #, c-format
 msgid "%s went away"
 msgstr "%s je postal odsoten"
 
-#: src/status.c:1284
+#: ../src/status.c:1284
 #, c-format
 msgid "%s became idle"
 msgstr "%s je postal nedejaven"
 
-#: src/status.c:1297
+#: ../src/status.c:1297
 #, c-format
 msgid "%s became unidle"
 msgstr "%s je postal dejaven"
 
-#: src/status.c:1359
+#: ../src/status.c:1359
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s je postal nedejaven"
 
-#: src/status.c:1361
+#: ../src/status.c:1361
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s je postal dejaven"
 
-#: src/util.c:2180
+#: ../src/util.c:649
+#, c-format
+msgid "%x %X"
+msgstr "%x %X"
+
+#: ../src/util.c:2439
 #, c-format
 msgid "Error Reading %s"
 msgstr "Napaka pri branju %s"
 
-#: src/util.c:2181
+#: ../src/util.c:2440
 #, c-format
 msgid "An error was encountered reading your %s.  They have not been loaded, and the old file has been renamed to %s~."
 msgstr "Pri branju vašega %s je prišlo do napake, zato ni bil naložen. Stara datoteka se je preimenovala v %s~."
 
-#: src/util.c:2676
+#: ../src/util.c:2933
 msgid "Calculating..."
 msgstr "Preračunavanje ..."
 
-#: src/util.c:2679
+#: ../src/util.c:2936
 msgid "Unknown."
 msgstr "Neznano."
 
-#: src/util.c:2709
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] "sekund"
-msgstr[1] "sekunda"
-msgstr[2] "sekundi"
-msgstr[3] "sekunde"
-
-#: src/util.c:2723
-msgid "day"
-msgid_plural "days"
-msgstr[0] "dni"
-msgstr[1] "dan"
-msgstr[2] "dneva"
-msgstr[3] "dnevi"
-
-#: src/util.c:2731
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "ur"
-msgstr[1] "ura"
-msgstr[2] "uri"
-msgstr[3] "ure"
-
-#: src/util.c:2739
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "minut"
-msgstr[1] "minuta"
-msgstr[2] "minuti"
-msgstr[3] "minute"
-
-#: src/util.c:3206
+#: ../src/util.c:2962
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekund"
+msgstr[1] "%d sekunda"
+msgstr[2] "%d sekundi"
+msgstr[3] "%d sekunde"
+
+#: ../src/util.c:2974
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d dni"
+msgstr[1] "%d dan"
+msgstr[2] "%d dneva"
+msgstr[3] "%d dni"
+
+#: ../src/util.c:2982
+#, c-format
+msgid "%s, %d hour"
+msgid_plural "%s, %d hours"
+msgstr[0] "%s, %d ur"
+msgstr[1] "%s, %d uro"
+msgstr[2] "%s, %d uri"
+msgstr[3] "%s, %d ur"
+
+#: ../src/util.c:2988
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d ur"
+msgstr[1] "%d ura"
+msgstr[2] "%d uri"
+msgstr[3] "%d ure"
+
+#: ../src/util.c:2996
+#, c-format
+msgid "%s, %d minute"
+msgid_plural "%s, %d minutes"
+msgstr[0] "%s, %d minut"
+msgstr[1] "%s, %d minuta"
+msgstr[2] "%s, %d minuti"
+msgstr[3] "%s, %d minut"
+
+#: ../src/util.c:3002
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minut"
+msgstr[1] "%d minuta"
+msgstr[2] "%d minuti"
+msgstr[3] "%d minut"
+
+#: ../src/util.c:3477
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Napaka pri vzpostavljanju povezave.\n"