changeset 14732:acd886ea473e

[gaim-migrate @ 17488] 4 translation updates, 1 spelling fix. the po files have not been updated to reflect the spelling fix. I don't feel like hand editing N po files and the mistake is in a number of them. I should learn sed. committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Mon, 16 Oct 2006 20:20:14 +0000
parents 5edfb6bce20e
children 4972fc6bc3bd
files libgaim/protocols/qq/send_file.c po/es.po po/fi.po po/fr.po po/hu.po
diffstat 5 files changed, 23688 insertions(+), 18526 deletions(-) [+]
line wrap: on
line diff
--- a/libgaim/protocols/qq/send_file.c	Mon Oct 16 20:15:30 2006 +0000
+++ b/libgaim/protocols/qq/send_file.c	Mon Oct 16 20:20:14 2006 +0000
@@ -449,7 +449,7 @@
 	qd->xfer->data = info;
 
 	filename_len = strlen(filename);
-	filelen_str = g_strdup_printf("%d ×Ö˝Ú", filesize);
+	filelen_str = g_strdup_printf("%d ?Ö˝?", filesize);
 	filelen_strlen = strlen(filelen_str);
 
 	packet_len = 82 + filename_len + filelen_strlen;
@@ -734,7 +734,7 @@
 	}
 	filename = strrchr(gaim_xfer_get_local_filename(qd->xfer), '/') + 1;
 	msg = g_strdup_printf
-		(_("The sending process of file[%s] has been cancaled by buddy[%d]"),
+		(_("The sending process of file[%s] has been canceled by buddy[%d]"),
 		 filename, sender_uid);
 
 	gaim_notify_warning (gc, _("File Send"), msg, NULL);
--- a/po/es.po	Mon Oct 16 20:15:30 2006 +0000
+++ b/po/es.po	Mon Oct 16 20:20:14 2006 +0000
@@ -6,12 +6,12 @@
 # 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/February 2006
+# 	      January 2005, January/February 2006, October 2006
 # 		Javier Fernández-Sanguino Peña  <jfs@debian.org>
 #
 # Agradecemos la ayuda de revisiĂłn realizada por:
 # Nathaniel Case, Santiago Erquicia, Francisco Javier F. Serrador,
-# Rafael Bermudez
+# Rafael Bermudez, Eduardo PĂ©rez
 #
 # This file is distributed under the same license as the Gaim package.
 #
@@ -33,6 +33,8 @@
 #
 # Otros términos comunes y sus traducciones:
 #
+# - Away: Ausente
+# - Idle: Inactivo
 # - Nickname o Nick: Apodo
 # - Smileys: emoticonos (no «caras gráficas»)
 # - Screenname: Nombre de usuario
@@ -44,13 +46,14 @@
 # - Plain text: «En claro» (refiriéndose a una autenticación que no está cifrada)
 # - Pounce: Aviso
 # - Smiley: Emoticono
-#
+# - Tab: solapa (pestaña está descartado por los traductores de
+#        GNOME desde la versiĂłn 2.6)
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-13 21:43+0100\n"
-"PO-Revision-Date: 2006-02-17 00:37+0100\n"
+"POT-Creation-Date: 2006-09-29 00:00-0400\n"
+"PO-Revision-Date: 2006-10-15 21:55+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team:  Spanish team <es@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -60,893 +63,989 @@
 
 #: ../gaim.desktop.in.h:1
 msgid "Gaim Internet Messenger"
-msgstr "Gaim - MensajerĂ­a en Internet"
+msgstr "Gaim - cliente de mensajerĂ­a de Internet"
 
 #: ../gaim.desktop.in.h:2
 msgid "Internet Messenger"
-msgstr "MensajerĂ­a en Internet"
+msgstr "Cliente de mensajerĂ­a de Internet"
 
 #: ../gaim.desktop.in.h:3
 msgid "Send instant messages over multiple protocols"
-msgstr "Envía mensajes instantáneos a través de múltiples protocolos"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ciphertest.c:264 plugins/ciphertest.c:264
-msgid "Cipher Test"
-msgstr "Prueba de cifrado"
-
-#. *< name
-#. *< 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 "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 ""
-"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 "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 ""
-"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
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/dbus-example.c:135
-msgid "DBus"
-msgstr "DBus"
-
-#. *< name
-#. *< version
-#. *  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)
-#.
-#: ../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
+msgstr "Cliente de mensajería instantánea multiprotocolo"
+
+#: ../console/gntaccount.c:119 ../console/gntblist.c:240
+#: ../console/gntblist.c:357 ../console/gntblist.c:370
+#: ../console/gntplugin.c:169 ../console/gntplugin.c:214
+#: ../console/gntstatus.c:240 ../console/gntstatus.c:248
+#: ../libgaim/protocols/jabber/buddy.c:1363
+#: ../libgaim/protocols/jabber/chat.c:677
+#: ../libgaim/protocols/jabber/chat.c:688
+#: ../libgaim/protocols/jabber/jabber.c:1197
+#: ../libgaim/protocols/qq/group_join.c:322
+#: ../libgaim/protocols/silc/ops.c:1448
+msgid "Error"
+msgstr "Error"
+
+#: ../console/gntaccount.c:119
+msgid "Account was not added"
+msgstr "No se ha añadido la cuenta"
+
+#: ../console/gntaccount.c:120
+msgid "Screenname of an account must be non-empty."
+msgstr "El nombre de usuario de una cuenta no puede estar vacĂ­o."
+
+#: ../console/gntaccount.c:423 ../gtk/gtkaccount.c:557
+msgid "New mail notifications"
+msgstr "Notificaciones de correo nuevo"
+
+#: ../console/gntaccount.c:433 ../gtk/gtkaccount.c:486
+msgid "Remember password"
+msgstr "Recordar contraseña"
+
+#: ../console/gntaccount.c:474 ../gtk/gtkaccount.c:1399 ../gtk/gtkblist.c:3771
+msgid "Modify Account"
+msgstr "Modificar cuenta"
+
+#: ../console/gntaccount.c:474
+msgid "New Account"
+msgstr "Nueva cuenta"
+
+#: ../console/gntaccount.c:500 ../gtk/gtkaccount.c:398 ../gtk/gtkft.c:695
+msgid "Protocol:"
+msgstr "Protocolo:"
+
+#: ../console/gntaccount.c:508 ../gtk/gtkaccount.c:403 ../gtk/gtkblist.c:4895
+#: ../gtk/plugins/gevolution/new_person_dialog.c:295
+msgid "Screen name:"
+msgstr "Nombre de usuario:"
+
+#: ../console/gntaccount.c:521 ../gtk/gtkaccount.c:477
+msgid "Password:"
+msgstr "Contraseña:"
+
+#: ../console/gntaccount.c:531 ../gtk/gtkblist.c:4916 ../gtk/gtkblist.c:5281
+msgid "Alias:"
+msgstr "Apodo:"
+
+#. Cancel
+#: ../console/gntaccount.c:554 ../console/gntaccount.c:615
+#: ../console/gntaccount.c:834 ../console/gntblist.c:281
+#: ../console/gntblist.c:347 ../console/gntblist.c:380
+#: ../console/gntblist.c:699 ../console/gntblist.c:863
+#: ../console/gntblist.c:951 ../console/gntprefs.c:224
+#: ../console/gntstatus.c:132 ../console/gntstatus.c:404
+#: ../console/gntstatus.c:524 ../gtk/gtkaccount.c:1832
+#: ../gtk/gtkaccount.c:2302 ../gtk/gtkblist.c:5337 ../gtk/gtkdialogs.c:667
+#: ../gtk/gtkdialogs.c:804 ../gtk/gtkdialogs.c:895 ../gtk/gtkdialogs.c:914
+#: ../gtk/gtkdialogs.c:936 ../gtk/gtkdialogs.c:956 ../gtk/gtkdialogs.c:1000
+#: ../gtk/gtkdialogs.c:1038 ../gtk/gtkdialogs.c:1092 ../gtk/gtkdialogs.c:1129
+#: ../gtk/gtkdialogs.c:1154 ../gtk/gtkimhtmltoolbar.c:419
+#: ../gtk/gtkplugin.c:296 ../gtk/gtkpounce.c:1088 ../gtk/gtkprivacy.c:566
+#: ../gtk/gtkprivacy.c:579 ../gtk/gtkprivacy.c:604 ../gtk/gtkprivacy.c:615
+#: ../gtk/gtkrequest.c:270 ../gtk/gtksavedstatuses.c:296
+#: ../libgaim/account.c:963 ../libgaim/account.c:1134
+#: ../libgaim/account.c:1168 ../libgaim/conversation.c:1164
+#: ../libgaim/protocols/gg/gg.c:498 ../libgaim/protocols/gg/gg.c:656
+#: ../libgaim/protocols/gg/gg.c:792 ../libgaim/protocols/gg/gg.c:871
+#: ../libgaim/protocols/jabber/buddy.c:588
+#: ../libgaim/protocols/jabber/buddy.c:1725
+#: ../libgaim/protocols/jabber/buddy.c:1759
+#: ../libgaim/protocols/jabber/chat.c:780
+#: ../libgaim/protocols/jabber/jabber.c:854
+#: ../libgaim/protocols/jabber/jabber.c:1352
+#: ../libgaim/protocols/jabber/xdata.c:338 ../libgaim/protocols/msn/msn.c:251
+#: ../libgaim/protocols/msn/msn.c:266 ../libgaim/protocols/msn/msn.c:281
+#: ../libgaim/protocols/msn/msn.c:296 ../libgaim/protocols/msn/msn.c:313
+#: ../libgaim/protocols/oscar/oscar.c:1387
+#: ../libgaim/protocols/oscar/oscar.c:2151
+#: ../libgaim/protocols/oscar/oscar.c:2190
+#: ../libgaim/protocols/oscar/oscar.c:2238
+#: ../libgaim/protocols/oscar/oscar.c:5732
+#: ../libgaim/protocols/oscar/oscar.c:5784
+#: ../libgaim/protocols/oscar/oscar.c:5936
+#: ../libgaim/protocols/oscar/oscar.c:5961
+#: ../libgaim/protocols/oscar/oscar.c:6017
+#: ../libgaim/protocols/oscar/oscar.c:6086
+#: ../libgaim/protocols/oscar/peer.c:991
+#: ../libgaim/protocols/qq/buddy_info.c:480
+#: ../libgaim/protocols/qq/buddy_opt.c:210
+#: ../libgaim/protocols/qq/buddy_opt.c:400 ../libgaim/protocols/qq/group.c:122
+#: ../libgaim/protocols/qq/group_join.c:136
+#: ../libgaim/protocols/qq/group_join.c:357
+#: ../libgaim/protocols/qq/group_opt.c:140
+#: ../libgaim/protocols/qq/group_opt.c:390 ../libgaim/protocols/qq/qq.c:459
+#: ../libgaim/protocols/qq/sendqueue.c:201
+#: ../libgaim/protocols/qq/sys_msg.c:102 ../libgaim/protocols/qq/sys_msg.c:157
+#: ../libgaim/protocols/qq/sys_msg.c:245
+#: ../libgaim/protocols/sametime/sametime.c:3364
+#: ../libgaim/protocols/sametime/sametime.c:3449
+#: ../libgaim/protocols/sametime/sametime.c:3619
+#: ../libgaim/protocols/sametime/sametime.c:5320
+#: ../libgaim/protocols/sametime/sametime.c:5409
+#: ../libgaim/protocols/sametime/sametime.c:5533
+#: ../libgaim/protocols/silc/buddy.c:467
+#: ../libgaim/protocols/silc/buddy.c:1078
+#: ../libgaim/protocols/silc/buddy.c:1183 ../libgaim/protocols/silc/chat.c:597
+#: ../libgaim/protocols/silc/chat.c:726 ../libgaim/protocols/silc/ops.c:1909
+#: ../libgaim/protocols/silc/silc.c:754 ../libgaim/protocols/silc/silc.c:959
+#: ../libgaim/protocols/yahoo/yahoo.c:3214
+#: ../libgaim/protocols/yahoo/yahoo.c:3223 ../libgaim/request.h:1344
+#: ../libgaim/request.h:1354
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. Save
+#: ../console/gntaccount.c:558 ../console/gntprefs.c:224
+#: ../console/gntstatus.c:407 ../console/gntstatus.c:512 ../gtk/gtkdebug.c:762
+#: ../gtk/gtkrequest.c:276 ../libgaim/account.c:1167
+#: ../libgaim/protocols/jabber/buddy.c:587
+msgid "Save"
+msgstr "Guardar"
+
+#: ../console/gntaccount.c:610 ../gtk/gtkaccount.c:1826
+#: ../gtk/gtksavedstatuses.c:293
+#, c-format
+msgid "Are you sure you want to delete %s?"
+msgstr "ÂżSeguro que quiere borrar a %s?"
+
+#. Close any other opened delete window
+#: ../console/gntaccount.c:614
+msgid "Delete Account"
+msgstr "Borrar cuenta"
+
+#: ../console/gntaccount.c:615 ../console/gntaccount.c:681
+#: ../console/gntstatus.c:132 ../console/gntstatus.c:194
+#: ../gtk/gtkaccount.c:1831 ../gtk/gtkpounce.c:1087 ../gtk/gtkrequest.c:273
+#: ../gtk/gtksavedstatuses.c:295
+msgid "Delete"
+msgstr "Borrar"
+
+#: ../console/gntaccount.c:644 ../console/gntblist.c:1638
+#: ../console/gntui.c:70 ../gtk/gtkaccount.c:2134
+#: ../gtk/plugins/docklet/docklet.c:519
+msgid "Accounts"
+msgstr "Cuentas"
+
+#: ../console/gntaccount.c:650
+msgid "You can enable/disable accounts from the following list."
+msgstr "Puede (desh)habilitar cuentas de la lista a continuaciĂłn."
+
+#: ../console/gntaccount.c:673 ../console/gntaccount.c:833
+#: ../console/gntblist.c:281 ../console/gntblist.c:347
+#: ../console/gntblist.c:380 ../console/gntnotify.c:306
+#: ../console/gntstatus.c:184 ../gtk/gtkaccount.c:2301 ../gtk/gtkblist.c:5336
+#: ../gtk/gtkconv.c:1626 ../gtk/gtkrequest.c:274
+#: ../libgaim/protocols/gg/gg.c:870 ../libgaim/protocols/oscar/oscar.c:2429
+#: ../libgaim/protocols/qq/sys_msg.c:102 ../libgaim/protocols/qq/sys_msg.c:157
+#: ../libgaim/protocols/qq/sys_msg.c:245
+#: ../libgaim/protocols/sametime/sametime.c:5408
+#: ../libgaim/protocols/silc/chat.c:596
+msgid "Add"
+msgstr "Añadir"
+
+#: ../console/gntaccount.c:677
+msgid "Modify"
+msgstr "Modificar"
+
+#: ../console/gntaccount.c:758 ../gtk/gtkaccount.c:2250
+#, 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"
+
+#: ../console/gntaccount.c:831 ../gtk/gtkaccount.c:2299
+msgid "Add buddy to your list?"
+msgstr "¿Desea añadir el amigo a su lista?"
+
+#: ../console/gntblist.c:232
+msgid "You must provide a screename for the buddy."
+msgstr "Debe dar un nombre de usuario para el amigo."
+
+#: ../console/gntblist.c:234
+msgid "You must provide a group."
+msgstr "Debe indicar un grupo."
+
+#: ../console/gntblist.c:236
+msgid "You must select an account."
+msgstr "Debe seleccionar una cuenta."
+
+#: ../console/gntblist.c:240
+msgid "Error adding buddy"
+msgstr "Error al añadiro al amigo"
+
+#: ../console/gntblist.c:265 ../gtk/gtkaccount.c:1895
+#: ../gtk/gtksavedstatuses.c:893 ../libgaim/protocols/oscar/oscar.c:2803
+msgid "Screen Name"
+msgstr "Nombre de usuario"
+
+#: ../console/gntblist.c:268 ../console/gntblist.c:339 ../gtk/gtkdialogs.c:913
+#: ../gtk/gtkdialogs.c:935 ../gtk/gtkdialogs.c:955 ../gtk/gtkrequest.c:277
+#: ../libgaim/protocols/silc/chat.c:587
+msgid "Alias"
+msgstr "Apodo"
+
+#: ../console/gntblist.c:271 ../console/gntblist.c:342
+msgid "Group"
+msgstr "Grupo"
+
+#: ../console/gntblist.c:274 ../console/gntblist.c:330
+#: ../console/gntnotify.c:155 ../console/gntstatus.c:495
+#: ../gtk/gtknotify.c:402 ../gtk/gtkpounce.c:1255
+#: ../gtk/plugins/gevolution/gevolution.c:450 ../libgaim/plugins/idle.c:153
+#: ../libgaim/plugins/idle.c:189
+msgid "Account"
+msgstr "Cuenta"
+
+#: ../console/gntblist.c:280 ../console/gntblist.c:739 ../gtk/gtkblist.c:4849
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:442
+#: ../libgaim/protocols/silc/buddy.c:736
+#: ../libgaim/protocols/silc/buddy.c:1030
+#: ../libgaim/protocols/silc/buddy.c:1075
+#: ../libgaim/protocols/silc/buddy.c:1174
+#: ../libgaim/protocols/yahoo/yahoo.c:3128
+msgid "Add Buddy"
+msgstr "Añadir amigo"
+
+#: ../console/gntblist.c:280
+msgid "Please enter buddy information."
+msgstr "Introduzca la informaciĂłn del amigo."
+
+#: ../console/gntblist.c:303 ../libgaim/blist.c:1182
+msgid "Chats"
+msgstr "Chats"
+
+#. Extract their Name and put it in
+#. Contact Info
+#. Personal
+#. Business
+#: ../console/gntblist.c:336 ../gtk/gtkplugin.c:589 ../gtk/gtkroomlist.c:600
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:131
+#: ../gtk/plugins/gevolution/assoc-buddy.c:119
+#: ../libgaim/protocols/jabber/jabber.c:785
+#: ../libgaim/protocols/msn/msn.c:1533 ../libgaim/protocols/msn/msn.c:1586
+#: ../libgaim/protocols/msn/msn.c:1608 ../libgaim/protocols/qq/buddy_info.c:42
+msgid "Name"
+msgstr "Nombre"
+
+#: ../console/gntblist.c:345 ../console/gntblist.c:741 ../gtk/gtkblist.c:5227
+msgid "Add Chat"
+msgstr "Añadir chat"
+
+#: ../console/gntblist.c:346
+msgid "You can edit more information from the context menu later."
+msgstr "Puede editar más información más adelante a través del menú contextual."
+
+#: ../console/gntblist.c:357 ../console/gntblist.c:370
+msgid "Error adding group"
+msgstr "Error al añadir al grupo"
+
+#: ../console/gntblist.c:358
+msgid "You must give a name for the group to add."
+msgstr "Debe dar un nombre al grupo a añadir."
+
+#: ../console/gntblist.c:371
+msgid "A group with the name already exists."
+msgstr "Ya existe un grupo con ese nombre"
+
+#: ../console/gntblist.c:378 ../console/gntblist.c:743 ../gtk/gtkblist.c:5333
+#: ../libgaim/protocols/sametime/sametime.c:5319
+#: ../libgaim/protocols/sametime/sametime.c:5406
+msgid "Add Group"
+msgstr "Añadir grupo"
+
+#: ../console/gntblist.c:378
+msgid "Enter the name of the group"
+msgstr "Introduzca el nombre del grupo"
+
+#: ../console/gntblist.c:698
+msgid "Edit Chat"
+msgstr "Editar chat"
+
+#: ../console/gntblist.c:698
+msgid "Please Update the necessary fields."
+msgstr "Por favor Actualice los campos necesarios."
+
+#: ../console/gntblist.c:699 ../console/gntstatus.c:189
+msgid "Edit"
+msgstr "Editar"
+
+#: ../console/gntblist.c:705
+msgid "Auto-join"
+msgstr "Conectarse automáticamente"
+
+#: ../console/gntblist.c:713
+msgid "Edit Settings"
+msgstr "Editar configuraciĂłn"
+
+# No se traduce como «Obtener Información» porque sino hace muy grande el 
+# botĂłn que utiliza este texto y, consecuentemente, la pantalla de Gaim, jfs
+#: ../console/gntblist.c:761 ../libgaim/protocols/silc/chat.c:878
+msgid "Get Info"
+msgstr "Info"
+
+#: ../console/gntblist.c:766
+msgid "Add Buddy Pounce"
+msgstr "Añadir aviso de amigo"
+
+#: ../console/gntblist.c:773 ../gtk/gtkconv.c:1574
+#: ../libgaim/protocols/oscar/oscar.c:615
+msgid "Send File"
+msgstr "Enviar archivo"
+
+#: ../console/gntblist.c:777
+msgid "View Log"
+msgstr "Ver registro"
+
+#: ../console/gntblist.c:859
+#, c-format
+msgid "Please enter the new name for %s"
+msgstr "Introduzca el nuevo nombre para %s"
+
+#. These are common for everything
+#: ../console/gntblist.c:861 ../console/gntblist.c:862
+#: ../console/gntblist.c:1005
+msgid "Rename"
+msgstr "Renombrar"
+
+#: ../console/gntblist.c:861
+msgid "Enter empty string to reset the name."
+msgstr "Introduzca una cadena vacĂ­a para resetear el nombre."
+
+#: ../console/gntblist.c:939
+msgid "Removing this group will also remove all the buddies in the group"
+msgstr "Si elimina este grupo también eliminará a todos los amigos en el grupo"
+
+#: ../console/gntblist.c:944
+#, c-format
+msgid "Are you sure you want to remove %s?"
+msgstr "¿Está seguro que quiere borrar a %s?"
+
+#. XXX: anything to do with the returned ui-handle?
+#: ../console/gntblist.c:947
+msgid "Confirm Remove"
+msgstr "Confirmar borrado"
+
+#: ../console/gntblist.c:950 ../console/gntblist.c:1007 ../gtk/gtkblist.c:1033
+#: ../gtk/gtkconv.c:1623 ../gtk/gtkrequest.c:275
+msgid "Remove"
+msgstr "Quitar"
+
+#: ../console/gntblist.c:1040 ../console/gntblist.c:1144
+#, c-format
+msgid "Account: %s (%s)"
+msgstr "Cuenta: %s (%s)"
+
+#: ../console/gntblist.c:1065
+#, c-format
+msgid ""
+"\n"
+"Idle: %s"
+msgstr "\nInactivo: %s"
+
+#: ../console/gntblist.c:1123
+#, c-format
+msgid "Nickname: %s\n"
+msgstr "Apodo: %s\n"
+
+#: ../console/gntblist.c:1135
+#, c-format
+msgid ""
+"Online: %d\n"
+"Total: %d"
+msgstr ""
+"En lĂ­nea: %d\n"
+"Total: %d"
+
+#: ../console/gntblist.c:1156
+#, c-format
+msgid ""
+"\n"
+"Last Seen: %s ago"
+msgstr "\nVisto por Ăşltima vez: hace %s"
+
+#: ../console/gntblist.c:1375 ../gtk/gtkstatusbox.c:947
+#: ../gtk/plugins/docklet/docklet.c:467
 msgid "New..."
 msgstr "Nuevo..."
 
-#: ../plugins/docklet/docklet.c:468 ../src/gtkstatusbox.c:672
-#: src/gtkstatusbox.c:444
+#: ../console/gntblist.c:1382 ../gtk/gtkstatusbox.c:948
+#: ../gtk/plugins/docklet/docklet.c:468
 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: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: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
+#. Buddy List
+#: ../console/gntblist.c:1695 ../console/gntprefs.c:219 ../console/gntui.c:71
+#: ../gtk/gtkblist.c:3888 ../gtk/plugins/win32/winprefs/winprefs.c:451
+msgid "Buddy List"
+msgstr "Lista de amigos"
+
+#: ../console/gntconn.c:36
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../console/gntconn.c:39
+#, c-format
+msgid "%s disconnected."
+msgstr "%s se ha desconectado."
+
+#: ../console/gntconn.c:40
+#, c-format
+msgid ""
+"%s was disconnected due to the following error:\n"
+"%s"
+msgstr ""
+"%s se ha desconectado por el siguiente error:\n"
+"%s"
+
+#: ../console/gntconn.c:43 ../gtk/gtkblist.c:3768 ../libgaim/account.c:990
+#: ../libgaim/connection.c:106
+msgid "Connection Error"
+msgstr "Error de conexiĂłn"
+
+#: ../console/gntconv.c:102 ../gtk/gtkconv.c:478
+msgid "No such command."
+msgstr "No existe esa orden."
+
+#: ../console/gntconv.c:106 ../gtk/gtkconv.c:485
+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."
+
+#: ../console/gntconv.c:111 ../gtk/gtkconv.c:490
+msgid "Your command failed for an unknown reason."
+msgstr "Su orden ha fallado por motivos desconocidos."
+
+#: ../console/gntconv.c:116 ../gtk/gtkconv.c:496
+msgid "That command only works in chats, not IMs."
+msgstr "Esa orden sĂłlo funciona en chats, no en MIs."
+
+#: ../console/gntconv.c:119 ../gtk/gtkconv.c:499
+msgid "That command only works in IMs, not chats."
+msgstr "Esa orden sĂłlo funciona en MIs, no en chats."
+
+#: ../console/gntconv.c:123 ../gtk/gtkconv.c:503
+msgid "That command doesn't work on this protocol."
+msgstr "Esa orden no funciona en este protocolo."
+
+#: ../console/gntconv.c:130
+msgid "Commands are not supported yet. Message was NOT sent."
+msgstr "Ă“rdenes no soportadas. NO se ha enviado el mensaje."
+
+#: ../console/gntconv.c:224
+#, c-format
+msgid "%s (%s -- %s)"
+msgstr "%s (%s -- %s)"
+
+#: ../console/gntconv.c:244
+#, c-format
+msgid "%s [%s]"
+msgstr "%s [%s]"
+
+#: ../console/gntconv.c:374
+msgid "<AUTO-REPLY> "
+msgstr "<RESPUESTA AUTOMĂTICA> "
+
+#. Print the list of users in the room
+#: ../console/gntconv.c:468
+msgid "List of users:\n"
+msgstr "Lista de usuarios:\n"
+
+#: ../console/gntconv.c:592 ../gtk/gtkconv.c:372
+msgid "Supported debug options are:  version"
+msgstr "Las opciones de depuraciĂłn soportadas son:  version"
+
+#: ../console/gntconv.c:627 ../gtk/gtkconv.c:408
+msgid "No such command (in this context)."
+msgstr "No existe esa orden (en este contexto)."
+
+#: ../console/gntconv.c:630 ../gtk/gtkconv.c:411
+msgid ""
+"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
+"The following commands are available in this context:\n"
+msgstr ""
+"Utilice \"/help &lt;orden&gt;\" para obtener ayuda de una orden concreta.\n"
+"Las siguientes órdenes están disponibles en este contexto:\n"
+
+#: ../console/gntconv.c:669 ../gtk/gtkconv.c:6639
+msgid ""
+"say &lt;message&gt;:  Send a message normally as if you weren't using a "
+"command."
+msgstr ""
+"say &lt;mensaje;gt;:  Enviar un mensaje como si no se estuviera utilizando "
+"una orden."
+
+#: ../console/gntconv.c:672 ../gtk/gtkconv.c:6642
+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."
+
+#: ../console/gntconv.c:675 ../gtk/gtkconv.c:6645
+msgid ""
+"debug &lt;option&gt;:  Send various debug information to the current "
+"conversation."
+msgstr ""
+"debug &lt;opciĂłn&gt;: Enviar informaciĂłn de depuraciĂłn sobre la conversaciĂłn "
+"actual."
+
+#: ../console/gntconv.c:678 ../gtk/gtkconv.c:6648
+msgid "clear: Clears the conversation scrollback."
+msgstr "clear: limpia el histĂłrico de la ventana de conversaciĂłn."
+
+#: ../console/gntconv.c:681 ../gtk/gtkconv.c:6651
+msgid "help &lt;command&gt;:  Help on a specific command."
+msgstr "help &lt;orden&gt;:  Recibir ayuda sobre una orden concreta."
+
+#: ../console/gntconv.c:686
+msgid "plugins: Show the plugins window."
+msgstr "plugins: Mostrar la ventana de complementos."
+
+#: ../console/gntconv.c:689
+msgid "buddylist: Show the buddylist."
+msgstr "buddylist: Mostrar la lista de amigos."
+
+#: ../console/gntconv.c:692
+msgid "accounts: Show the accounts window."
+msgstr "accounts: Muestra la ventana de cuentas."
+
+#: ../console/gntconv.c:695
+msgid "debugwin: Show the debug window."
+msgstr "debugwin: Muestra la ventana de depuraciĂłn."
+
+#: ../console/gntconv.c:698
+msgid "prefs: Show the preference window."
+msgstr "prefs: Muestra la ventana de preferencias."
+
+#: ../console/gntconv.c:701
+msgid "statuses: Show the savedstatuses window."
+msgstr "status: Muestra la ventana «savedstatuses»."
+
+#: ../console/gntdebug.c:119 ../console/gntui.c:72 ../gtk/gtkdebug.c:708
+msgid "Debug Window"
+msgstr "Ventana de depuraciĂłn"
+
+#: ../console/gntgaim.c:166
+#, c-format
+msgid "%s. Try `%s -h' for more information.\n"
+msgstr "%s. Intente `%s -h' para más información.\n"
+
+#: ../console/gntgaim.c:168
+#, c-format
+msgid ""
+"%s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -n, --nologin       don't automatically login\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+"%s\n"
+"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"
+"  -h, --help           mostrar este mensaje y salir\n"
+"  -n, --nologin        no conectarse de forma automática\n"
+"  -v, --version        mostrar la versiĂłn actual y salir\n"
+
+#. *
+#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
+#.
+#: ../console/gntnotify.c:79 ../gtk/gtkblist.c:3770 ../gtk/gtkdialogs.c:666
+#: ../gtk/gtkdialogs.c:803 ../gtk/gtkdialogs.c:894 ../gtk/gtkrequest.c:269
+#: ../libgaim/account.c:962 ../libgaim/account.c:1133
+#: ../libgaim/protocols/gg/gg.c:497 ../libgaim/protocols/gg/gg.c:655
+#: ../libgaim/protocols/gg/gg.c:791 ../libgaim/protocols/jabber/jabber.c:1351
+#: ../libgaim/protocols/jabber/xdata.c:337 ../libgaim/protocols/msn/msn.c:250
+#: ../libgaim/protocols/msn/msn.c:265 ../libgaim/protocols/msn/msn.c:280
+#: ../libgaim/protocols/msn/msn.c:295 ../libgaim/protocols/oscar/oscar.c:1386
+#: ../libgaim/protocols/oscar/oscar.c:2150
+#: ../libgaim/protocols/oscar/oscar.c:2237
+#: ../libgaim/protocols/oscar/oscar.c:5731
+#: ../libgaim/protocols/oscar/oscar.c:5935
+#: ../libgaim/protocols/oscar/oscar.c:5960
+#: ../libgaim/protocols/oscar/oscar.c:6016
+#: ../libgaim/protocols/silc/buddy.c:466
+#: ../libgaim/protocols/silc/buddy.c:1182 ../libgaim/protocols/silc/chat.c:424
+#: ../libgaim/protocols/silc/chat.c:462 ../libgaim/protocols/silc/chat.c:725
+#: ../libgaim/protocols/silc/ops.c:1296 ../libgaim/protocols/silc/ops.c:1908
+#: ../libgaim/protocols/silc/silc.c:753
+#: ../libgaim/protocols/yahoo/yahoo.c:3213
+#: ../libgaim/protocols/yahoo/yahoo.c:3222 ../libgaim/request.h:1344
+msgid "OK"
+msgstr "Aceptar"
+
+#: ../console/gntnotify.c:146
+msgid "Emails"
+msgstr "Correos"
+
+#: ../console/gntnotify.c:152 ../console/gntnotify.c:206
+msgid "You have mail!"
+msgstr "¡Tiene correo!"
+
+#: ../console/gntnotify.c:155 ../gtk/gtknotify.c:414
+#: ../libgaim/protocols/jabber/jabber.c:1147
+msgid "From"
+msgstr "De"
+
+#: ../console/gntnotify.c:155 ../gtk/gtknotify.c:423
+msgid "Subject"
+msgstr "Asunto"
+
+#: ../console/gntnotify.c:163 ../console/gntplugin.c:193
+#: ../console/gntplugin.c:274 ../console/gntstatus.c:199
+#: ../gtk/gtkrequest.c:272 ../libgaim/protocols/msn/msn.c:357
+#: ../libgaim/protocols/silc/util.c:377
+msgid "Close"
+msgstr "Cerrar"
+
+#: ../console/gntnotify.c:182
+#, c-format
+msgid "%s (%s) has %d new message."
+msgid_plural "%s (%s) has %d new messages."
+msgstr[0] "%s (%s) tiene %d mensaje nuevo."
+msgstr[1] "%s (%s) tiene %d nuevos mensajes."
+
+#: ../console/gntnotify.c:206 ../gtk/gtknotify.c:332
+msgid "New Mail"
+msgstr "Nuevo correo"
+
+#: ../console/gntnotify.c:229 ../gtk/gtknotify.c:849
+#: ../libgaim/protocols/oscar/oscar.c:2610
+#, c-format
+msgid "Info for %s"
+msgstr "InformaciĂłn sobre %s:"
+
+#: ../console/gntnotify.c:230 ../gtk/gtknotify.c:850
+#: ../libgaim/protocols/toc/toc.c:476
+msgid "Buddy Information"
+msgstr "InformaciĂłn de amigos"
+
+#: ../console/gntnotify.c:303
+msgid "Continue"
+msgstr "Continuar"
+
+#: ../console/gntnotify.c:309 ../gtk/gtkconv.c:1602 ../gtk/gtkdebug.c:862
+msgid "Info"
+msgstr "Info"
+
+#: ../console/gntnotify.c:312 ../gtk/gtkconv.c:1563
+msgid "IM"
+msgstr "MI"
+
+#: ../console/gntnotify.c:315
+msgid "Join"
+msgstr "Unirse"
+
+#: ../console/gntnotify.c:318 ../libgaim/protocols/sametime/sametime.c:3448
+msgid "Invite"
+msgstr "Invitar"
+
+#: ../console/gntnotify.c:321
+msgid "(none)"
+msgstr "(ninguno)"
+
+#: ../console/gntplugin.c:117
+#, c-format
+msgid ""
+"Name: %s\n"
+"Version: %s\n"
+"Description: %s\n"
+"Author: %s\n"
+"Website: %s\n"
+"Filename: %s\n"
+msgstr ""
+"Nombre: %s\n"
+"VersiĂłn: %s\n"
+"DescripciĂłn: %s\n"
+"Autor: %s\n"
+"Sitio web: %s\n"
+"Nombre de fichero: %s\n"
+
+#: ../console/gntplugin.c:170
+msgid "Plugin need to be loaded before you can configure it."
+msgstr "Debe cargar el complemento antes de poder configurarlo."
+
+#: ../console/gntplugin.c:208
+msgid "..."
+msgstr "..."
+
+#: ../console/gntplugin.c:209
+msgid "Still need to do something about this."
+msgstr "AĂşn hay que hacer algo sobre esto."
+
+#: ../console/gntplugin.c:215
+msgid "No configuration options for this plugin."
+msgstr "No hay opciones de configuraciĂłn para este complemento."
+
+#: ../console/gntplugin.c:231 ../console/gntui.c:73 ../gtk/gtkplugin.c:538
+#: ../gtk/plugins/docklet/docklet.c:520
 msgid "Plugins"
 msgstr "Complementos"
 
-#: ../plugins/docklet/docklet.c:521 ../src/gtkprefs.c:1900
-#: plugins/docklet/docklet.c:407 src/gtkprefs.c:1779
+#: ../console/gntplugin.c:236
+msgid "You can (un)load plugins from the following list."
+msgstr "Puede (des)cargar complementos de la lista mostrada a continuaciĂłn."
+
+#: ../console/gntplugin.c:279
+msgid "Configure Plugin"
+msgstr "Configurar complemento"
+
+#: ../console/gntprefs.c:122
+msgid "Show Idle Time"
+msgstr "Mostrar tiempos de inactividad"
+
+#: ../console/gntprefs.c:123
+msgid "Show Offline Buddies"
+msgstr "Mostrar amigos desconectados"
+
+#: ../console/gntprefs.c:129
+msgid "Show Timestamps"
+msgstr "Mostrar marcas de tiempo"
+
+#: ../console/gntprefs.c:130
+msgid "Notify buddies when you are typing"
+msgstr "Notificar a los amigos cuando les esté escribiendo"
+
+#: ../console/gntprefs.c:136
+msgid "Log format"
+msgstr "Formato de registro"
+
+#: ../console/gntprefs.c:137
+msgid "Log IMs"
+msgstr "Registrar MIs"
+
+#: ../console/gntprefs.c:138
+msgid "Log chats"
+msgstr "Registrar chats"
+
+#: ../console/gntprefs.c:139
+msgid "Log status change events"
+msgstr "Registrar los eventos de cambios de estado"
+
+#. Conversations
+#: ../console/gntprefs.c:220 ../gtk/gtkprefs.c:822 ../gtk/gtkprefs.c:1884
+#: ../gtk/plugins/win32/winprefs/winprefs.c:465
+msgid "Conversations"
+msgstr "Conversaciones"
+
+#: ../console/gntprefs.c:221 ../gtk/gtkprefs.c:1314 ../gtk/gtkprefs.c:1895
+msgid "Logging"
+msgstr "Registro"
+
+#: ../console/gntprefs.c:223 ../console/gntui.c:74 ../gtk/gtkprefs.c:1920
+#: ../gtk/plugins/docklet/docklet.c:521
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../plugins/docklet/docklet.c:525 plugins/docklet/docklet.c:413
-msgid "Mute Sounds"
-msgstr "Sin sonido"
-
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: ../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: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: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: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. 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, 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:101 plugins/extplacement.c:101
-msgid "Conversation Placement"
-msgstr "LocalizaciĂłn de la conversaciĂłn"
-
-#: ../plugins/extplacement.c:106 plugins/extplacement.c:106
-msgid "Number of conversations per window"
-msgstr "NĂşmero de conversaciones por ventana"
-
-#: ../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"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/extplacement.c:135 plugins/extplacement.c:133
-msgid "ExtPlacement"
-msgstr "_UbicaciĂłnExt"
-
-#. *< name
-#. *< version
-#: ../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:139 plugins/extplacement.c:137
-msgid ""
-"Restrict the number of conversations per windows, optionally separating IMs "
-"and Chats"
-msgstr ""
-"Restringir el nĂşmero de conversaciones por ventana, de forma optativa "
-"utilizar ventanas distintas para MIs y Chats"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/filectl.c:245 plugins/filectl.c:245
-msgid "Gaim File Control"
-msgstr "Control de archivos de Gaim"
-
-#. *< name
-#. *< 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 "Permite controlar Gaim introduciendo Ăłrdenes en un archivo."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../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
-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
-msgid ""
-"This is a really cool plugin that does a lot of stuff:\n"
-"- It tells you who wrote the program when you log in\n"
-"- It reverses all incoming text\n"
-"- It sends a message to people on your list immediately when they sign on"
-msgstr ""
-"Éste es un complemento muy interesante que hace muchas cosas:\n"
-"- Le dice quién escribió el programa cuando inicia la sesión\n"
-"- Transpone el texto que le envĂ­an\n"
-"- EnvĂ­a un mensaje a las personas en su lista inmediatamente cuando se "
-"conectan"
-
-#: ../plugins/gaimrc.c:41 plugins/gaimrc.c:41
-msgid "Cursor Color"
-msgstr ""
-"Color del puntero"
-
-#: ../plugins/gaimrc.c:42 plugins/gaimrc.c:42
-msgid "Secondary Cursor Color"
-msgstr ""
-"Color secundario del puntero"
-
-#: ../plugins/gaimrc.c:43 plugins/gaimrc.c:43
-msgid "Hyperlink Color"
-msgstr "Color de hiperenlace"
-
-#: ../plugins/gaimrc.c:56 plugins/gaimrc.c:58
-msgid "GtkTreeView Expander Size"
-msgstr "Tamaño del expansor GtkTreeView"
-
-#: 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:77 plugins/gaimrc.c:80
-msgid "Conversation History"
-msgstr ""
-"Historial de conversaciones"
-
-#: ../plugins/gaimrc.c:78 plugins/gaimrc.c:81
-msgid "Log Viewer"
-msgstr ""
-"Visor del registro"
-
-#: ../plugins/gaimrc.c:79 plugins/gaimrc.c:82
-msgid "Request Dialog"
-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: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:289 plugins/gaimrc.c:288
-msgid "Select Color"
-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:362 plugins/gaimrc.c:361
-msgid "Select Interface Font"
-msgstr "Seleccionar tipografĂ­a de la interfaz"
-
-#: ../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:440
-msgid "GTK+ Text Shortcut Theme"
-msgstr "Tema de atajos de teclado GTK+"
-
-#: ../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 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 los parámetros de configuración de gtkrc que se utilizan "
-"habitualmente."
-
-#. Configuration frame
-#: ../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:242 plugins/gestures/gestures.c:250
-msgid "Middle mouse button"
-msgstr "BotĂłn central del ratĂłn"
-
-#: ../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:259 plugins/gestures/gestures.c:267
-msgid "_Visual gesture display"
-msgstr "Mostrar gestos _visuales"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../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:292 plugins/gestures/gestures.c:299
-msgid "Provides support for mouse gestures"
-msgstr ""
-"Proporciona soporte para gestos con el ratĂłn"
-
-#. *  description
-#: ../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"
-"\n"
-"Drag down and then to the right to close a conversation.\n"
-"Drag up and then to the left to switch to the previous conversation.\n"
-"Drag up and then to the right to switch to the next conversation."
-msgstr ""
-"Añade soporte de gestos del ratón en las ventanas de conversación.\n"
-"Arrastre con el botĂłn central del ratĂłn para realizar las siguientes "
-"acciones:\n"
-"\n"
-"Abajo y después a la derecha para cerrar una ventana de conversación.\n"
-"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/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 ""
-"Seleccione una persona de su agenda mostrada abajo, o añada una nueva "
-"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:8198
-msgid "Search"
-msgstr "Buscar"
-
-#: ../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 "
-"person."
-msgstr ""
-"Seleccione una persona de su agenda a la que añadir este amigo, o cree una "
-"nueva persona."
-
-#. Add the expander
-#: ../plugins/gevolution/assoc-buddy.c:428
-#: plugins/gevolution/assoc-buddy.c:428
-msgid "User _details"
-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: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
-msgid "Unable to send e-mail"
-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 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 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
-msgid "Send E-Mail"
-msgstr "Enviar correo electrĂłnico"
-
-#. Configuration frame
-#: ../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: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: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"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/gevolution/gevolution.c:527 plugins/gevolution/gevolution.c:534
-msgid "Evolution Integration"
-msgstr "IntegraciĂłn con Evolution"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../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 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: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:"
-
-#. *< 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
+#: ../console/gntrequest.c:495
+msgid "Not implemented yet."
+msgstr "No implementado aĂşn."
+
+#: ../console/gntstatus.c:128
+#, c-format
+msgid "Are you sure you want to delete \"%s\""
+msgstr "¿Está seguro que quiere borrar a «%s»?"
+
+#: ../console/gntstatus.c:131
+msgid "Delete Status"
+msgstr "Borrar estado"
+
+#: ../console/gntstatus.c:160 ../gtk/gtksavedstatuses.c:526
+msgid "Saved Statuses"
+msgstr "Estados guardados"
+
+#: ../console/gntstatus.c:167 ../console/gntstatus.c:458
+#: ../gtk/gtksavedstatuses.c:433 ../libgaim/protocols/jabber/buddy.c:283
+#: ../libgaim/protocols/jabber/buddy.c:917
+#: ../libgaim/protocols/novell/novell.c:1484
+msgid "Title"
+msgstr "TĂ­tulo"
+
+#: ../console/gntstatus.c:167 ../gtk/gtksavedstatuses.c:448
+msgid "Type"
+msgstr "Tipo"
+
+#: ../console/gntstatus.c:167 ../console/gntstatus.c:483
+#: ../console/gntstatus.c:495 ../gtk/gtksavedstatuses.c:459
+#: ../gtk/gtksavedstatuses.c:923 ../libgaim/protocols/bonjour/bonjour.c:256
+#: ../libgaim/protocols/bonjour/bonjour.c:263
+#: ../libgaim/protocols/gg/gg.c:1592 ../libgaim/protocols/gg/gg.c:1602
+#: ../libgaim/protocols/gg/gg.c:1608 ../libgaim/protocols/gg/gg.c:1617
+#: ../libgaim/protocols/gg/gg.c:1622 ../libgaim/protocols/irc/irc.c:244
+#: ../libgaim/protocols/jabber/jabber.c:1214
+#: ../libgaim/protocols/jabber/jabber.c:1224
+#: ../libgaim/protocols/jabber/jabber.c:1234
+#: ../libgaim/protocols/jabber/jabber.c:1244
+#: ../libgaim/protocols/jabber/jabber.c:1254
+#: ../libgaim/protocols/jabber/jabber.c:1266
+#: ../libgaim/protocols/novell/novell.c:2876
+#: ../libgaim/protocols/novell/novell.c:2982
+#: ../libgaim/protocols/novell/novell.c:2988
+#: ../libgaim/protocols/novell/novell.c:2994
+#: ../libgaim/protocols/oscar/oscar.c:5395
+#: ../libgaim/protocols/oscar/oscar.c:5410
+#: ../libgaim/protocols/oscar/oscar.c:5415
+#: ../libgaim/protocols/oscar/oscar.c:5623
+#: ../libgaim/protocols/oscar/oscar.c:5635
+#: ../libgaim/protocols/oscar/oscar.c:5648
+#: ../libgaim/protocols/oscar/oscar.c:5655
+#: ../libgaim/protocols/oscar/oscar.c:5662
+#: ../libgaim/protocols/sametime/sametime.c:3262
+#: ../libgaim/protocols/sametime/sametime.c:3268
+#: ../libgaim/protocols/sametime/sametime.c:3274
+#: ../libgaim/protocols/sametime/sametime.c:3353
+#: ../libgaim/protocols/silc/buddy.c:1544
+#: ../libgaim/protocols/simple/simple.c:246
+#: ../libgaim/protocols/yahoo/yahoo.c:3456
+#: ../libgaim/protocols/yahoo/yahoo.c:3462
+#: ../libgaim/protocols/zephyr/zephyr.c:2333
+msgid "Message"
+msgstr "Mensaje"
+
+#: ../console/gntstatus.c:179
+msgid "Use"
+msgstr "Usar"
+
+#: ../console/gntstatus.c:240
+msgid "Invalid title"
+msgstr "Título no válido"
+
+#: ../console/gntstatus.c:241
+msgid "Please enter a non-empty title for the status."
+msgstr "Introduzca un tĂ­tulo no vacĂ­o para el estado."
+
+#: ../console/gntstatus.c:248
+msgid "Duplicate title"
+msgstr "TĂ­tulo duplicado"
+
+#: ../console/gntstatus.c:249
+msgid "Please enter a different title for the status."
+msgstr "Introduzca un tĂ­tulo distinto para el estado."
+
+#: ../console/gntstatus.c:372
+msgid "Substatus"
+msgstr "Sub-estado"
+
+#. Set up stuff for the account box
+#: ../console/gntstatus.c:375 ../gtk/gtkblist.c:4943 ../gtk/gtkblist.c:5261
+msgid "Account:"
+msgstr "Cuenta:"
+
+#: ../console/gntstatus.c:383 ../gtk/gtkft.c:698
+msgid "Status:"
+msgstr "Estado:"
+
+#: ../console/gntstatus.c:398
+msgid "Message:"
+msgstr "Mensaje:"
+
+#: ../console/gntstatus.c:447
+msgid "Edit Status"
+msgstr "Editar estado"
+
+#: ../console/gntstatus.c:466 ../console/gntstatus.c:495
+#: ../gtk/gtksavedstatuses.c:912 ../gtk/gtksavedstatuses.c:1059
+#: ../libgaim/protocols/gg/gg.c:1024 ../libgaim/protocols/gg/gg.c:1575
+#: ../libgaim/protocols/gg/gg.c:1579 ../libgaim/protocols/jabber/buddy.c:623
+#: ../libgaim/protocols/jabber/buddy.c:630
+#: ../libgaim/protocols/jabber/buddy.c:658
+#: ../libgaim/protocols/jabber/jabber.c:1185
+#: ../libgaim/protocols/msn/msn.c:546
+#: ../libgaim/protocols/novell/novell.c:2875
+#: ../libgaim/protocols/novell/novell.c:2879
+#: ../libgaim/protocols/oscar/oscar.c:759
+#: ../libgaim/protocols/oscar/oscar.c:765
+#: ../libgaim/protocols/oscar/oscar.c:768
+#: ../libgaim/protocols/yahoo/yahoo.c:3032
+msgid "Status"
+msgstr "Estado"
+
+#: ../console/gntstatus.c:489
+msgid "Use different status for following accounts"
+msgstr "Usar un estado diferente para las siguientes cuentas"
+
+#. Save & Use
+#: ../console/gntstatus.c:518
+msgid "Save & Use"
+msgstr "Guardar y usar"
+
+#: ../console/gntui.c:75
+msgid "Statuses"
+msgstr "Estados"
+
+#: ../console/plugins/gntgf.c:209
+#, c-format
+msgid "%s just signed on"
+msgstr "%s se acaba de conectar"
+
+#: ../console/plugins/gntgf.c:216
+#, c-format
+msgid "%s just signed off"
+msgstr "%s se acaba de desconectar"
+
+#: ../console/plugins/gntgf.c:224
+#, c-format
+msgid "%s sent you a message"
+msgstr "%s le envĂ­o un mensaje"
+
+#: ../console/plugins/gntgf.c:243
+#, c-format
+msgid "%s said your nick in %s"
+msgstr "%s dijo su apodo en %s"
+
+#: ../console/plugins/gntgf.c:245
+#, c-format
+msgid "%s sent a message in %s"
+msgstr "%s enviĂł un mensaje en %s"
+
+#: ../console/plugins/gntgf.c:283
+msgid "Buddy signs on/off"
+msgstr "Un amigo se conecta/desconecta"
+
+#: ../console/plugins/gntgf.c:284
+msgid "You receive an IM"
+msgstr "Recibe un MI"
+
+#: ../console/plugins/gntgf.c:285
+msgid "Someone speaks in a chat"
+msgstr "Alguien habla5~e en el chat"
+
+#: ../console/plugins/gntgf.c:286
+msgid "Someone says your name in a chat"
+msgstr "Alguien dice su nombre en el chat"
+
+#: ../console/plugins/gntgf.c:314
+msgid "Notify with a toaster when"
+msgstr "Notificar con un «toaster» cuando"
+
+#: ../console/plugins/gntgf.c:329
+msgid "Beep too!"
+msgstr "¡Pitar también!"
+
+#: ../console/plugins/gntgf.c:335
+msgid "Set URGENT for the terminal window."
+msgstr "Fija la ventana de terminal como URGENTE."
+
+#: ../console/plugins/gntgf.c:355
+msgid "GntGf"
+msgstr "GntFg"
+
+#: ../console/plugins/gntgf.c:357 ../console/plugins/gntgf.c:358
+msgid "Toaster plugin for GntGaim."
+msgstr "Complemento «toaster» para GntGaim."
+
+#: ../console/plugins/gnthistory.c:119 ../gtk/plugins/history.c:120
+#, c-format
+msgid "<b>Conversation with %s on %s:</b><br>"
+msgstr "<b>ConversaciĂłn con %s sobre %s:</b><br>"
+
+#: ../console/plugins/gnthistory.c:140 ../gtk/plugins/history.c:147
 msgid "History Plugin Requires Logging"
-msgstr ""
-"Debe estar conectad para utilizar el complemento de histĂłrico"
-
-#: ../plugins/history.c:144
+msgstr "Debe estar conectad para utilizar el complemento de histĂłrico"
+
+#: ../console/plugins/gnthistory.c:141 ../gtk/plugins/history.c:148
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -958,17 +1057,17 @@
 "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:186 plugins/history.c:188
+#: ../console/plugins/gnthistory.c:181
+msgid "GntHistory"
+msgstr "HistĂłricoGnt"
+
+#: ../console/plugins/gnthistory.c:183 ../gtk/plugins/history.c:190
 msgid "Shows recently logged conversations in new conversations."
 msgstr ""
 "Muestra las conversaciones registradas previamente en las nuevas "
 "conversaciones."
 
-#: ../plugins/history.c:187
+#: ../console/plugins/gnthistory.c:184 ../gtk/plugins/history.c:191
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -976,1850 +1075,361 @@
 "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
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/iconaway.c:82 plugins/iconaway.c:101
-msgid "Iconify on Away"
-msgstr "Iconizar en ausencia"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../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:152 ../plugins/idle.c:210 plugins/idle.c:116
-msgid "Minutes"
-msgstr "minutos"
-
-#: ../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: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:163 ../plugins/idle.c:221 plugins/idle.c:127
-msgid "_Set"
-msgstr "_Guardar"
-
-#: ../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: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:196 plugins/idle.c:160
-msgid "_Unset"
-msgstr "_Desactivar"
-
-#: ../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: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"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../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
-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
-msgid ""
-"Test plugin IPC support, as a client. This locates the server plugin and "
-"calls the commands registered."
-msgstr ""
-"Soporte de IPC como cliente, complemento de prueba. Éste localiza el "
-"complemento de servidor y llama a las Ăłrdenes registradas."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../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
-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
-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/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
-msgid "Checks for new local mail."
-msgstr "Comprueba si hay correo local nuevo."
-
-#: ../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:639
-msgid "Notify For"
-msgstr "Notificar de"
-
-#: ../plugins/notify.c:642 plugins/notify.c:643
-msgid "_IM windows"
-msgstr "Ventanas de M_I"
-
-#: ../plugins/notify.c:649 plugins/notify.c:650
-msgid "C_hat windows"
-msgstr "Ventanas de _chat"
-
-#: ../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:675 plugins/notify.c:665
-msgid "Notification Methods"
-msgstr "MĂ©todos de notificaciĂłn"
-
-#: ../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: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: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:719 plugins/notify.c:707
-msgid "R_aise conversation window"
-msgstr ""
-"_Subir la ventana de conversaciĂłn"
-
-#. ---------- "Notification Removals" ----------
-#: ../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: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: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: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: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:764 plugins/notify.c:752
-msgid "Remove on switch to conversation ta_b"
-msgstr "Eliminar al cambiar de _solapa de conversaciĂłn"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/notify.c:853 plugins/notify.c:842
-msgid "Message Notification"
-msgstr "NotificaciĂłn de mensajes"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../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."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../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/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: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: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 ""
-"Le permite enviar datos en bruto a protocolos basados en texto (Jabber, MSN, "
-"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
-#, 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
-#, c-format
-msgid ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
-msgstr ""
-"<b>Registro de cambios:</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 ""
-"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
-msgid "New Version Available"
-msgstr "Nueva versiĂłn disponible"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../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
-msgid "Checks periodically for new releases."
-msgstr "Comprueba periĂłdicamente la existencia de nuevas versiones."
-
-#. *  description
-#: ../plugins/relnot.c:142 plugins/relnot.c:142
-msgid ""
-"Checks periodically for new releases and notifies the user with the "
-"ChangeLog."
-msgstr ""
-"Comprueba periĂłdicamente si hay nuevas versiones disponibles y notifica al "
-"usuario mostrándole el registro de cambios."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/signals-test.c:674 plugins/signals-test.c:732
-msgid "Signals Test"
-msgstr "Prueba de señales"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../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."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/simple.c:34 plugins/simple.c:34
-msgid "Simple Plugin"
-msgstr "Complemento sencillo"
-
-#. *< name
-#. *< 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 "Hace pruebas para determinar si la mayor parte de las cosas funcionan."
-
-#: ../plugins/spellchk.c:1902
-msgid "Duplicate Correction"
-msgstr "CorrecciĂłn duplicada"
-
-#: ../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:2112 plugins/spellchk.c:1981
-msgid "Text Replacements"
-msgstr "Reemplazos de texto"
-
-#: ../plugins/spellchk.c:2135 plugins/spellchk.c:2005
-msgid "You type"
-msgstr "Usted escribe"
-
-#: ../plugins/spellchk.c:2149 plugins/spellchk.c:2017
-msgid "You send"
-msgstr "Usted envĂ­a"
-
-#: ../plugins/spellchk.c:2163 plugins/spellchk.c:2029
-msgid "Whole words only"
-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:2217 plugins/spellchk.c:2065
-msgid "You _type:"
-msgstr "Usted _escribe:"
-
-#: ../plugins/spellchk.c:2234 plugins/spellchk.c:2081
-msgid "You _send:"
-msgstr "Usted _envĂ­a:"
-
-#. 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 ""
-"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: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 "
-"el usuario."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ssl/ssl-gnutls.c:251 plugins/ssl/ssl-gnutls.c:227
-msgid "GNUTLS"
-msgstr "GNUTLS"
-
-#. *< name
-#. *< 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."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ssl/ssl-nss.c:412 plugins/ssl/ssl-nss.c:319
-msgid "NSS"
-msgstr "NSS"
-
-#. *< name
-#. *< 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."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ssl/ssl.c:94 plugins/ssl/ssl.c:94
-msgid "SSL"
-msgstr "SSL"
-
-#. *< name
-#. *< 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 ""
-"Proporciona un recubrimiento a través de las bibliotecas de soporte de SSL."
-
-#: ../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: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
-#, c-format
-msgid "%s is no longer idle."
-msgstr "%s ya no está inactivo."
-
-#: ../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:93 plugins/statenotify.c:93
-msgid "Buddy Goes _Away"
-msgstr "El amigo se _ausenta"
-
-#: ../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:141 plugins/statenotify.c:139
-msgid "Buddy State Notification"
-msgstr "NotificaciĂłn de estado de amigos"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../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."
-msgstr ""
-"Notifica en una ventana de conversaciĂłn cuando un amigo se ausenta o vuelve "
-"o está inactivo."
-
-#: ../plugins/tcl/tcl.c:369 plugins/tcl/tcl.c:363
-msgid "Tcl Plugin Loader"
-msgstr "Cargador de complementos Tcl"
-
-#: ../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"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../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"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../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:188 plugins/timestamp.c:198
-msgid "iChat Timestamp"
-msgstr "Sello temporal al estilo iChat"
-
-#: ../plugins/timestamp.c:195 plugins/timestamp.c:205
-msgid "Delay"
-msgstr "Retardo"
-
-#: ../plugins/timestamp.c:202 plugins/timestamp.c:212
-msgid "minutes."
-msgstr "minutos."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/timestamp.c:264 plugins/timestamp.c:275
-msgid "Timestamp"
-msgstr "Marca temporal"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../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
-msgid "Opacity:"
-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 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 enfoca"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/win32/transparency/win2ktrans.c:657
-#: plugins/win32/transparency/win2ktrans.c:657
-msgid "Transparency"
-msgstr "Transparencia"
-
-#. *< 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 "
-"the buddy list.\n"
-"\n"
-"* Note: This plugin requires Win2000 or greater."
-msgstr ""
-"Este complemento activa diversas transparencias alpha en las ventanas de conversaciĂłn y en la lista de amigos.\n"
-"\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: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 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 "Solamente cuando se apile"
-
-#. Conversations
-#: ../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
-msgid "accounts"
-msgstr "cuentas"
-
-#: ../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:948 src/account.c:948
-#, c-format
-msgid "Enter password for %s (%s)"
-msgstr "Introduzca la contraseña para %s (%s)"
-
-#: ../src/account.c:955 src/account.c:955
-msgid "Enter Password"
-msgstr "Introduzca la contraseña"
-
-#: ../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: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: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: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: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: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: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: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: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:1085 src/account.c:1085
-msgid "Fill out all fields completely."
-msgstr "Rellene todos los campos completamente."
-
-#: ../src/account.c:1108 src/account.c:1108
-msgid "Original password"
-msgstr "Contraseña original"
-
-#: ../src/account.c:1115 src/account.c:1115
-msgid "New password"
-msgstr "Nueva contraseña"
-
-#: ../src/account.c:1122 src/account.c:1122
-msgid "New password (again)"
-msgstr "Nueva contraseña (otra vez)"
-
-#: ../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: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:1169 src/account.c:1169
-#, c-format
-msgid "Change user information for %s"
-msgstr "Cambiar la informaciĂłn del usuario %s"
-
-#: ../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: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:2861
-msgid "Unknown"
-msgstr "Desconocido"
-
-#: ../src/blist.c:543 src/blist.c:545
-msgid "buddy list"
-msgstr "lista de amigos"
-
-#: ../src/blist.c:1173 src/blist.c:1178
-msgid "Chats"
-msgstr "Chats"
-
-#: ../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"
-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
-msgid "Registration Error"
-msgstr "Error de registro"
-
-#: 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: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:167 src/conversation.c:200
-msgid "The message is too large."
-msgstr "El mensaje es demasiado largo"
-
-#: ../src/conversation.c:176 src/conversation.c:209
-msgid "Unable to send message."
-msgstr "No se pudo enviar el mensaje."
-
-#: ../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: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:1627 src/conversation.c:1608
-#, c-format
-msgid "You are now known as %s"
-msgstr "Vd. ahora se llama %s"
-
-#: ../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: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/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"
-"%s.\n"
-msgstr ""
-"Error al leer %s: \n"
-"%s.\n"
-
-#: ../src/ft.c:193 src/ft.c:193
-#, c-format
-msgid ""
-"Error writing %s: \n"
-"%s.\n"
-msgstr ""
-"Error al escribir %s: \n"
-"%s.\n"
-
-#: ../src/ft.c:197 src/ft.c:197
-#, c-format
-msgid ""
-"Error accessing %s: \n"
-"%s.\n"
-msgstr ""
-"Error al acceder a %s: \n"
-"%s.\n"
-
-#: ../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:240 src/ft.c:240
-msgid "Cannot send a directory."
-msgstr "No se puede enviar un directorio."
-
-#: ../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:307 src/ft.c:307
-#, c-format
-msgid "%s wants to send you %s (%s)"
-msgstr "%s quiere enviarle %s (%s)"
-
-#: ../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: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:359 src/ft.c:359
-#, c-format
-msgid ""
-"A file is available for download from:\n"
-"Remote host: %s\n"
-"Remote port: %d"
-msgstr ""
-"Hay un archivo disponible a descargar desde:\n"
-"Servidor remoto: %s\n"
-"Puerto remoto: %d"
-
-#: ../src/ft.c:391 src/ft.c:383
-#, c-format
-msgid "%s is offering to send file %s"
-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:463 src/ft.c:448
-#, c-format
-msgid "Offering to send %s to %s"
-msgstr "Se ofrece enviar %s a %s"
-
-#: ../src/ft.c:474 src/ft.c:459
-#, c-format
-msgid "Starting transfer of %s from %s"
-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:631 src/ft.c:616
-msgid "File transfer complete"
-msgstr "Transferencia de archivos completa"
-
-#: ../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:1027 src/ft.c:1005
-msgid "File transfer cancelled"
-msgstr "Transferencia de archivos cancelada"
-
-#: ../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:1089 src/ft.c:1067
-#, c-format
-msgid "%s canceled the file transfer"
-msgstr "%s cancelĂł la transferencia de archivos"
-
-#: ../src/ft.c:1146 src/ft.c:1124
-#, c-format
-msgid "File transfer to %s failed."
-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 "FallĂł la transferencia del archivo de %s."
-
-#: ../src/gtkaccount.c:374 src/gtkaccount.c:357
-#, c-format
-msgid ""
-"<b>File:</b> %s\n"
-"<b>File size:</b> %s\n"
-"<b>Image size:</b> %dx%d"
-msgstr ""
-"<b>Fichero:</b> %s\n"
-"<b>Tamaño de archivo:</b> %s\n"
-"<b>Tamaño de imagen:</b> %dx%d"
+#: ../gtk/gaimstock.c:137
+msgid "_Alias"
+msgstr "_Apodo:"
+
+#. join button
+#: ../gtk/gaimstock.c:138 ../gtk/gtkblist.c:1114 ../gtk/gtkroomlist.c:285
+#: ../gtk/gtkroomlist.c:442
+msgid "_Join"
+msgstr "_Unirse"
+
+#: ../gtk/gaimstock.c:139
+msgid "Close _tabs"
+msgstr "Cerrar _solapas"
+
+#: ../gtk/gaimstock.c:140 ../gtk/gtkblist.c:998
+msgid "I_M"
+msgstr "_MI"
+
+#: ../gtk/gaimstock.c:141
+msgid "_Get Info"
+msgstr "Obtener _informaciĂłn"
+
+#: ../gtk/gaimstock.c:142
+msgid "_Invite"
+msgstr "_Invitar"
+
+#: ../gtk/gaimstock.c:143
+msgid "_Modify"
+msgstr "_Modificar"
+
+#: ../gtk/gaimstock.c:144
+msgid "_Open Mail"
+msgstr "_Abrir correo"
+
+#. Pause button
+#: ../gtk/gaimstock.c:145 ../gtk/gtkft.c:835
+msgid "_Pause"
+msgstr "_Pausar"
 
 #. Build the login options frame.
-#: ../src/gtkaccount.c:762 src/gtkaccount.c:742
+#: ../gtk/gtkaccount.c:381
 msgid "Login Options"
 msgstr "Opciones de conexiĂłn"
 
-#: ../src/gtkaccount.c:779 ../src/gtkft.c:640 src/gtkaccount.c:759
-#: src/gtkft.c:639
-msgid "Protocol:"
-msgstr "Protocolo:"
-
-#: ../src/gtkaccount.c:858 src/gtkaccount.c:841
-msgid "Password:"
-msgstr "Contraseña:"
-
-#: ../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:867 src/gtkaccount.c:850
-msgid "Remember password"
-msgstr "Recordar contraseña"
+#: ../gtk/gtkaccount.c:482
+msgid "Local alias:"
+msgstr "Apodo local:"
 
 #. Build the user options frame.
-#: ../src/gtkaccount.c:919 src/gtkaccount.c:900
+#: ../gtk/gtkaccount.c:544
 msgid "User Options"
 msgstr "Opciones de usuario"
 
-#: ../src/gtkaccount.c:932 src/gtkaccount.c:913
-msgid "New mail notifications"
-msgstr "Notificaciones de correo nuevo"
-
-#: ../src/gtkaccount.c:941 src/gtkaccount.c:922
-msgid "Buddy icon:"
-msgstr "Icono de amigo:"
+#. Buddy icon
+#: ../gtk/gtkaccount.c:562
+msgid "Use this buddy icon for this account:"
+msgstr "Utilizar este icono de amigo para esta cuenta:"
 
 #. Build the protocol options frame.
-#: ../src/gtkaccount.c:1032 src/gtkaccount.c:1013
+#: ../gtk/gtkaccount.c:670
 #, c-format
 msgid "%s Options"
 msgstr "Opciones de %s"
 
-#: ../src/gtkaccount.c:1233 src/gtkaccount.c:1214
+#: ../gtk/gtkaccount.c:866
 msgid "Use Global Proxy Settings"
 msgstr "Usar configuraciĂłn global del proxy"
 
-#: ../src/gtkaccount.c:1239 src/gtkaccount.c:1220
+#: ../gtk/gtkaccount.c:872
 msgid "No Proxy"
 msgstr "Sin proxy"
 
-#: ../src/gtkaccount.c:1245 src/gtkaccount.c:1226
+#: ../gtk/gtkaccount.c:878
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../src/gtkaccount.c:1251 src/gtkaccount.c:1232
+#: ../gtk/gtkaccount.c:884
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../src/gtkaccount.c:1257 src/gtkaccount.c:1238
+#: ../gtk/gtkaccount.c:890
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../src/gtkaccount.c:1263 ../src/gtkprefs.c:1043 src/gtkaccount.c:1244
-#: src/gtkprefs.c:1030
+#: ../gtk/gtkaccount.c:896 ../gtk/gtkprefs.c:1061
 msgid "Use Environmental Settings"
 msgstr "Usar configuraciĂłn del entorno"
 
-#: ../src/gtkaccount.c:1297 src/gtkaccount.c:1278
+#. This is an easter egg.
+#. It means one of two things, both intended as humourus:
+#. A) your network is really slow and you have nothing better to do than
+#. look at butterflies.
+#. B)You are looking really closely at something that shouldn't matter.
+#: ../gtk/gtkaccount.c:935
+msgid "If you look real closely"
+msgstr "Si miras de cerca"
+
+#. This is an easter egg. See the comment on the previous line in the source.
+#: ../gtk/gtkaccount.c:938
 msgid "you can see the butterflies mating"
 msgstr "puedes ver a las mariposas apareándose"
 
-#: ../src/gtkaccount.c:1301 src/gtkaccount.c:1282
-msgid "If you look real closely"
-msgstr "Si miras de cerca"
-
-#: ../src/gtkaccount.c:1317 src/gtkaccount.c:1298
+#: ../gtk/gtkaccount.c:959
 msgid "Proxy Options"
 msgstr "Opciones del proxy"
 
-#: ../src/gtkaccount.c:1331 ../src/gtkprefs.c:1037 src/gtkaccount.c:1312
-#: src/gtkprefs.c:1024
+#: ../gtk/gtkaccount.c:973 ../gtk/gtkprefs.c:1055
 msgid "Proxy _type:"
 msgstr "_Tipo de proxy:"
 
-#: ../src/gtkaccount.c:1340 ../src/gtkprefs.c:1058 src/gtkaccount.c:1321
-#: src/gtkprefs.c:1045
+#: ../gtk/gtkaccount.c:982 ../gtk/gtkprefs.c:1076
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: ../src/gtkaccount.c:1344 ../src/gtkprefs.c:1076 src/gtkaccount.c:1325
-#: src/gtkprefs.c:1063
+#: ../gtk/gtkaccount.c:986 ../gtk/gtkprefs.c:1094
 msgid "_Port:"
 msgstr "_Puerto:"
 
-#: ../src/gtkaccount.c:1352 src/gtkaccount.c:1333
+#: ../gtk/gtkaccount.c:994
 msgid "_Username:"
 msgstr "Nombre de _usuario:"
 
-#: ../src/gtkaccount.c:1358 ../src/gtkprefs.c:1113 src/gtkaccount.c:1339
-#: src/gtkprefs.c:1100
+#: ../gtk/gtkaccount.c:1000 ../gtk/gtkprefs.c:1131
 msgid "Pa_ssword:"
 msgstr "_Contraseña:"
 
-#: ../src/gtkaccount.c:1736 src/gtkaccount.c:1717
+#: ../gtk/gtkaccount.c:1397
 msgid "Add Account"
 msgstr "Añadir cuenta"
 
-#: ../src/gtkaccount.c:1738 src/gtkaccount.c:1719
-msgid "Modify Account"
-msgstr "Modificar cuenta"
-
-#: src/gtkaccount.c:1741
+#: ../gtk/gtkaccount.c:1421
 msgid "_Basic"
 msgstr "_Básica"
 
-#: src/gtkaccount.c:1752
+#: ../gtk/gtkaccount.c:1432
 msgid "_Advanced"
 msgstr "_Avanzadas"
 
 #. Register button
-#: ../src/gtkaccount.c:1786 ../src/protocols/jabber/jabber.c:822
-#: src/gtkaccount.c:1767 src/protocols/jabber/jabber.c:754
+#: ../gtk/gtkaccount.c:1447 ../libgaim/protocols/jabber/jabber.c:853
 msgid "Register"
 msgstr "Registrar"
 
-#: ../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: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: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:2259 src/gtkaccount.c:2244
+#. add enabled / disabled
+#: ../gtk/gtkaccount.c:1918 ../gtk/gtkplugin.c:576
+#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:345
+msgid "Enabled"
+msgstr "Habilitado"
+
+#: ../gtk/gtkaccount.c:1926
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: 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: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:678 src/gtkblist.c:662
+#: ../gtk/gtkblist.c:700
 msgid "Join a Chat"
 msgstr "Unirse a un chat"
 
-#: ../src/gtkblist.c:699 src/gtkblist.c:683
+#: ../gtk/gtkblist.c:721
 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:710 ../src/gtkpounce.c:527 ../src/gtkroomlist.c:377
-#: src/gtkblist.c:694 src/gtkpounce.c:500 src/gtkroomlist.c:354
+#: ../gtk/gtkblist.c:732 ../gtk/gtkpounce.c:523 ../gtk/gtkroomlist.c:378
 msgid "_Account:"
 msgstr "_Cuenta:"
 
-#: ../src/gtkblist.c:954 src/gtkblist.c:1002
+#: ../gtk/gtkblist.c:995
 msgid "Get _Info"
 msgstr "Obtener _informaciĂłn"
 
-#: ../src/gtkblist.c:957 ../src/gtkstock.c:141 src/gtkblist.c:1005
-msgid "I_M"
-msgstr "_MI"
-
-#: ../src/gtkblist.c:963 src/gtkblist.c:1011
+#: ../gtk/gtkblist.c:1004
 msgid "_Send File"
 msgstr "_Enviar archivo"
 
-#: src/gtkblist.c:1019
-msgid "Start _Voice Chat"
-msgstr "Iniciar chat de voz"
-
-#: ../src/gtkblist.c:977 src/gtkblist.c:1025
+#: ../gtk/gtkblist.c:1011
 msgid "Add Buddy _Pounce"
 msgstr "Añadir _aviso de amigo"
 
-#: ../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
+#: ../gtk/gtkblist.c:1015 ../gtk/gtkblist.c:1019 ../gtk/gtkblist.c:1118
+#: ../gtk/gtkblist.c:1141
 msgid "View _Log"
 msgstr "Ver _registro"
 
-#: src/gtkblist.c:1044
+#: ../gtk/gtkblist.c:1030
 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
+#: ../gtk/gtkblist.c:1039 ../gtk/gtkblist.c:1126 ../gtk/gtkblist.c:1147
 msgid "_Alias..."
 msgstr "_Apodo..."
 
-#: ../src/gtkblist.c:1007 ../src/gtkblist.c:1094 ../src/gtkblist.c:1115
-#: src/gtkblist.c:1055 src/gtkblist.c:1141 src/gtkblist.c:1162
+#: ../gtk/gtkblist.c:1041 ../gtk/gtkblist.c:1128 ../gtk/gtkblist.c:1149
 msgid "_Remove"
 msgstr "Elimina_r"
 
-#: ../src/gtkblist.c:1055 src/gtkblist.c:1102
+#: ../gtk/gtkblist.c:1089
 msgid "Add a _Buddy"
 msgstr "Añadir un _amigo"
 
-#: ../src/gtkblist.c:1057 src/gtkblist.c:1104
+#: ../gtk/gtkblist.c:1091
 msgid "Add a C_hat"
 msgstr "Añadir un _chat"
 
-#: ../src/gtkblist.c:1060 src/gtkblist.c:1107
+#: ../gtk/gtkblist.c:1094
 msgid "_Delete Group"
 msgstr "_Eliminar grupo"
 
-#: ../src/gtkblist.c:1062 src/gtkblist.c:1109
+#: ../gtk/gtkblist.c:1096
 msgid "_Rename"
 msgstr "_Renombrar"
 
-#. join button
-#: ../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:1082 src/gtkblist.c:1129
+#: ../gtk/gtkblist.c:1116
 msgid "Auto-Join"
 msgstr "Conectarse automáticamente"
 
-#: ../src/gtkblist.c:1120 ../src/gtkblist.c:1143 src/gtkblist.c:1167
-#: src/gtkblist.c:1190
+#: ../gtk/gtkblist.c:1154 ../gtk/gtkblist.c:1177
 msgid "_Collapse"
 msgstr "_Contraer"
 
-#: ../src/gtkblist.c:1148 src/gtkblist.c:1195
+#: ../gtk/gtkblist.c:1182
 msgid "_Expand"
 msgstr "_Expandir"
 
-#: ../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
+#: ../gtk/gtkblist.c:1428 ../gtk/gtkblist.c:1440 ../gtk/gtkblist.c:4077
+#: ../gtk/gtkblist.c:4087
 msgid "/Tools/Mute Sounds"
 msgstr "/Herramientas/Sin sonido"
 
-#: ../src/gtkblist.c:1901 ../src/gtkconv.c:4203 ../src/gtkpounce.c:426
-#: src/gtkblist.c:1895 src/gtkconv.c:3909 src/gtkpounce.c:399
+#: ../gtk/gtkblist.c:1900 ../gtk/gtkconv.c:4271 ../gtk/gtkpounce.c:422
 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:2475 src/gtkblist.c:2460
+#: ../gtk/gtkblist.c:2474
 msgid "/_Buddies"
 msgstr "/A_migos"
 
-#: ../src/gtkblist.c:2476 src/gtkblist.c:2461
+#: ../gtk/gtkblist.c:2475
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Amigos/Mensaje _instantáneo nuevo..."
 
-#: ../src/gtkblist.c:2477 src/gtkblist.c:2462
+#: ../gtk/gtkblist.c:2476
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Amigos/Unirse a un _chat..."
 
-#: ../src/gtkblist.c:2478 src/gtkblist.c:2463
+#: ../gtk/gtkblist.c:2477
 msgid "/Buddies/Get User _Info..."
 msgstr "/Amigos/Obtener _informaciĂłn del usuario..."
 
-#: ../src/gtkblist.c:2479 src/gtkblist.c:2464
+#: ../gtk/gtkblist.c:2478
 msgid "/Buddies/View User _Log..."
 msgstr "/Amigos/Ver _registro del usuario..."
 
-#: ../src/gtkblist.c:2481 src/gtkblist.c:2466
+#: ../gtk/gtkblist.c:2480
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Amigos/Mostrar amigos _desconectados"
 
-#: ../src/gtkblist.c:2482 src/gtkblist.c:2467
+#: ../gtk/gtkblist.c:2481
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Amigos/Mostrar grupos _vacĂ­os"
 
-#: ../src/gtkblist.c:2483 src/gtkblist.c:2468
+#: ../gtk/gtkblist.c:2482
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Amigos/Mostrar _detalles de amigo"
 
-#: ../src/gtkblist.c:2484
+#: ../gtk/gtkblist.c:2483
 msgid "/Buddies/Show Idle _Times"
-msgstr "/Amigos/Mostrar _tiempo de ausencia"
-
-#: src/gtkblist.c:2469
+msgstr "/Amigos/Mostrar _tiempo de inactividad"
+
+#: ../gtk/gtkblist.c:2484
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Amigos/Ordenar amigos"
 
-#: ../src/gtkblist.c:2487 src/gtkblist.c:2471
+#: ../gtk/gtkblist.c:2486
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Amigos/_Añadir un amigo..."
 
-#: ../src/gtkblist.c:2488 src/gtkblist.c:2472
+#: ../gtk/gtkblist.c:2487
 msgid "/Buddies/Add C_hat..."
 msgstr "/Amigos/Añadir un _chat..."
 
-#: ../src/gtkblist.c:2489 src/gtkblist.c:2473
+#: ../gtk/gtkblist.c:2488
 msgid "/Buddies/Add _Group..."
 msgstr "/Amigos/Añadir _grupo..."
 
-#: ../src/gtkblist.c:2491 src/gtkblist.c:2475
+#: ../gtk/gtkblist.c:2490
 msgid "/Buddies/_Quit"
 msgstr "/Amigos/_Salir"
 
 #. Accounts menu
-#: src/gtkblist.c:2478
+#: ../gtk/gtkblist.c:2493
 msgid "/_Accounts"
 msgstr "/_Cuentas"
 
-#: src/gtkblist.c:2479 src/gtkblist.c:5453
+#: ../gtk/gtkblist.c:2494 ../gtk/gtkblist.c:5920
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Cuentas/Añadir\\/Editar"
 
 #. Tools
-#: ../src/gtkblist.c:2498 src/gtkblist.c:2482
+#: ../gtk/gtkblist.c:2497
 msgid "/_Tools"
 msgstr "/_Herramientas"
 
-#: src/gtkblist.c:2483
+#: ../gtk/gtkblist.c:2498
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Herramientas/_Aviso de amigo"
 
-#: ../src/gtkblist.c:2500 src/gtkblist.c:2484
+#: ../gtk/gtkblist.c:2499
 msgid "/Tools/Plu_gins"
 msgstr "/Herramientas/Com_plementos"
 
-#: ../src/gtkblist.c:2501 src/gtkblist.c:2485
+#: ../gtk/gtkblist.c:2500
 msgid "/Tools/Pr_eferences"
 msgstr "/Herramientas/Pr_eferencias"
 
-#: ../src/gtkblist.c:2502 src/gtkblist.c:2486
+#: ../gtk/gtkblist.c:2501
 msgid "/Tools/Pr_ivacy"
 msgstr "/Herramientas/Pri_vacidad"
 
-#: ../src/gtkblist.c:2504 src/gtkblist.c:2488
+#: ../gtk/gtkblist.c:2503
 msgid "/Tools/_File Transfers"
 msgstr "/Herramientas/_Transferencias de archivos"
 
-#: ../src/gtkblist.c:2505 src/gtkblist.c:2489
+#: ../gtk/gtkblist.c:2504
 msgid "/Tools/R_oom List"
 msgstr "/Herramientas/_Lista de salas"
 
-#: src/gtkblist.c:2490
+#: ../gtk/gtkblist.c:2505
 msgid "/Tools/System _Log"
 msgstr "/Herramientas/Registro del sistema"
 
-#: ../src/gtkblist.c:2508 src/gtkblist.c:2492
+#: ../gtk/gtkblist.c:2507
 msgid "/Tools/Mute _Sounds"
 msgstr "/Herramientas/_Sin sonido"
 
 #. Help
-#: ../src/gtkblist.c:2511 src/gtkblist.c:2495
+#: ../gtk/gtkblist.c:2510
 msgid "/_Help"
 msgstr "/_Ayuda"
 
-#: ../src/gtkblist.c:2512 src/gtkblist.c:2496
+#: ../gtk/gtkblist.c:2511
 msgid "/Help/Online _Help"
 msgstr "/Ayuda/Ayuda en _lĂ­nea"
 
-#: ../src/gtkblist.c:2513 src/gtkblist.c:2497
+#: ../gtk/gtkblist.c:2512
 msgid "/Help/_Debug Window"
 msgstr "/Ayuda/Ventana de _depuraciĂłn"
 
-#: ../src/gtkblist.c:2514 src/gtkblist.c:2498
+#: ../gtk/gtkblist.c:2513
 msgid "/Help/_About"
 msgstr "/Ayuda/_Acerca de"
 
-#: ../src/gtkblist.c:2546 ../src/gtkblist.c:2615 src/gtkblist.c:2530
-#: src/gtkblist.c:2597
+#: ../gtk/gtkblist.c:2545 ../gtk/gtkblist.c:2614
 #, c-format
 msgid ""
 "\n"
@@ -2828,14 +1438,16 @@
 "\n"
 "<b>Cuenta:</b> %s"
 
-#: ../src/gtkblist.c:2627
+#: ../gtk/gtkblist.c:2626
 #, 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
+msgstr ""
+"\n"
+"<b>Apodo de amigo:</b> %s"
+
+#: ../gtk/gtkblist.c:2638
 #, c-format
 msgid ""
 "\n"
@@ -2844,7 +1456,7 @@
 "\n"
 "<b>Apodo:</b> %s"
 
-#: ../src/gtkblist.c:2648 src/gtkblist.c:2631
+#: ../gtk/gtkblist.c:2647
 #, c-format
 msgid ""
 "\n"
@@ -2853,23 +1465,23 @@
 "\n"
 "<b>Conectado:</b> %s"
 
-#: ../src/gtkblist.c:2659 src/gtkblist.c:2643
+#: ../gtk/gtkblist.c:2658
 #, c-format
 msgid ""
 "\n"
 "<b>Idle:</b> %s"
-msgstr ""
-"\n"
-"<b>Ausente:</b> %s"
-
-#: ../src/gtkblist.c:2694 src/gtkblist.c:2678
+msgstr "\n<b>Inactivo:</b> %s"
+
+#: ../gtk/gtkblist.c:2693
 #, c-format
 msgid ""
 "\n"
 "<b>Last Seen:</b> %s ago"
-msgstr "\n<b>Visto por Ăşltima vez:</b> hace %s"
-
-#: ../src/gtkblist.c:2703 src/gtkblist.c:2686
+msgstr ""
+"\n"
+"<b>Visto por Ăşltima vez:</b> hace %s"
+
+#: ../gtk/gtkblist.c:2702
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2877,7 +1489,7 @@
 "\n"
 "<b>Estado:</b> Desconectado"
 
-#: ../src/gtkblist.c:2714 src/gtkblist.c:2709
+#: ../gtk/gtkblist.c:2713
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2885,7 +1497,7 @@
 "\n"
 "<b>DescripciĂłn:</b> TerrorĂ­fica"
 
-#: ../src/gtkblist.c:2716 src/gtkblist.c:2711
+#: ../gtk/gtkblist.c:2715
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
@@ -2893,133 +1505,155 @@
 "\n"
 "<b>Estado:</b> Genial"
 
-#: ../src/gtkblist.c:2718 src/gtkblist.c:2713
+#: ../gtk/gtkblist.c:2717
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
-msgstr "\n<b>Estado:</b> Rock & roll"
-
-#: src/gtkblist.c:2981
+msgstr ""
+"\n"
+"<b>Estado:</b> Rock & roll"
+
+#: ../gtk/gtkblist.c:3184 ../gtk/gtkstatusbox.c:941
+#: ../gtk/plugins/docklet/docklet.c:447 ../libgaim/protocols/gg/gg.c:993
+#: ../libgaim/protocols/jabber/buddy.c:1365
+#: ../libgaim/protocols/novell/novell.c:2865
+#: ../libgaim/protocols/oscar/oscar.c:769
+#: ../libgaim/protocols/oscar/oscar.c:5445
+#: ../libgaim/protocols/yahoo/yahoo.c:2883 ../libgaim/status.c:154
+msgid "Offline"
+msgstr "Desconectado"
+
+#: ../gtk/gtkblist.c:3200
 #, c-format
 msgid "Idle %dh %02dm"
-msgstr "Ausente %dh %02dm"
-
-#: src/gtkblist.c:2983
+msgstr "Inactivo %dh %02dm"
+
+#: ../gtk/gtkblist.c:3202
 #, c-format
 msgid "Idle %dm"
-msgstr "Ausente %dm"
-
-#. #-#-#-#-#  es.po (Gaim)  #-#-#-#-#
+msgstr "Inactivo %dm"
+
 #. 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
+#: ../gtk/gtkblist.c:3205 ../gtk/gtkprefs.c:1765
+#: ../libgaim/protocols/bonjour/bonjour.c:333
+#: ../libgaim/protocols/jabber/buddy.c:635
+#: ../libgaim/protocols/jabber/buddy.c:668 ../libgaim/protocols/msn/msn.c:548
+#: ../libgaim/protocols/msn/state.c:32
+#: ../libgaim/protocols/novell/novell.c:2862
+#: ../libgaim/protocols/oscar/oscar.c:2824
+#: ../libgaim/protocols/yahoo/yahoo.c:2881
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:691
 msgid "Idle"
 msgstr "Está inactivo"
 
-#: ../src/gtkblist.c:3144 src/gtkblist.c:3108
+#: ../gtk/gtkblist.c:3333
 msgid "/Buddies/New Instant Message..."
 msgstr "/Amigos/Nuevo mensaje instantáneo..."
 
-#: ../src/gtkblist.c:3145 ../src/gtkblist.c:3178 src/gtkblist.c:3109
-#: src/gtkblist.c:3142
+#: ../gtk/gtkblist.c:3334 ../gtk/gtkblist.c:3367
 msgid "/Buddies/Join a Chat..."
 msgstr "/Amigos/Unirse a un chat..."
 
-#: ../src/gtkblist.c:3146 src/gtkblist.c:3110
+#: ../gtk/gtkblist.c:3335
 msgid "/Buddies/Get User Info..."
 msgstr "/Amigos/Obtener informaciĂłn del usuario..."
 
-#: ../src/gtkblist.c:3147 src/gtkblist.c:3111
+#: ../gtk/gtkblist.c:3336
 msgid "/Buddies/Add Buddy..."
 msgstr "/Amigos/Añadir un amigo..."
 
-#: ../src/gtkblist.c:3148 ../src/gtkblist.c:3181 src/gtkblist.c:3112
-#: src/gtkblist.c:3145
+#: ../gtk/gtkblist.c:3337 ../gtk/gtkblist.c:3370
 msgid "/Buddies/Add Chat..."
 msgstr "/Amigos/Añadir un chat..."
 
-#: ../src/gtkblist.c:3149 src/gtkblist.c:3113
+#: ../gtk/gtkblist.c:3338
 msgid "/Buddies/Add Group..."
 msgstr "/Amigos/Añadir un grupo..."
 
-#: src/gtkblist.c:3148
+#: ../gtk/gtkblist.c:3373
 msgid "/Tools/Buddy Pounces"
 msgstr "/Herramientas/Aviso de amigo"
 
-#: ../src/gtkblist.c:3187 src/gtkblist.c:3151
+#: ../gtk/gtkblist.c:3376
 msgid "/Tools/Privacy"
 msgstr "/Herramientas/Privacidad"
 
-#: ../src/gtkblist.c:3190 src/gtkblist.c:3154
+#: ../gtk/gtkblist.c:3379
 msgid "/Tools/Room List"
 msgstr "/Herramientas/Lista de salas"
 
-#: ../src/gtkblist.c:3384 src/gtkblist.c:3339
+#: ../gtk/gtkblist.c:3475 ../gtk/plugins/docklet/docklet.c:157
+#, 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"
+
+#: ../gtk/gtkblist.c:3551
 msgid "Manually"
 msgstr "Manualmente"
 
-#: ../src/gtkblist.c:3386 src/gtkblist.c:3341
+#: ../gtk/gtkblist.c:3553
 msgid "Alphabetically"
 msgstr "Alfabéticamente"
 
-#: ../src/gtkblist.c:3387 src/gtkblist.c:3342
+#: ../gtk/gtkblist.c:3554
 msgid "By status"
 msgstr "Por estado"
 
-#: ../src/gtkblist.c:3388 src/gtkblist.c:3343
+#: ../gtk/gtkblist.c:3555
 msgid "By log size"
 msgstr "Por tamaño de registro"
 
-#: ../src/gtkblist.c:3493 ../src/gtkconn.c:191 src/gtkconn.c:226
+#: ../gtk/gtkblist.c:3763 ../gtk/gtkconn.c:186
 #, c-format
 msgid "%s disconnected"
 msgstr "%s se ha desconectado"
 
-#: ../src/gtkblist.c:3515
+#: ../gtk/gtkblist.c:3772 ../libgaim/protocols/sametime/sametime.c:3618
+msgid "Connect"
+msgstr "Conectar"
+
+#: ../gtk/gtkblist.c:3772
+msgid "Re-enable Account"
+msgstr "Reactivar cuenta"
+
+#: ../gtk/gtkblist.c:3793
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s se ha desconectado: %s</span>"
 
-#: src/gtkblist.c:3532
+#: ../gtk/gtkblist.c:3922
 msgid "/Accounts"
 msgstr "/Cuentas"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../src/gtkblist.c:3747 src/gtkblist.c:3664
+#: ../gtk/gtkblist.c:4071
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Amigos/Mostrar amigos desconectados"
 
-#: ../src/gtkblist.c:3750 src/gtkblist.c:3666
+#: ../gtk/gtkblist.c:4074
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Amigos/Mostrar grupos vacĂ­os"
 
-#: ../src/gtkblist.c:3756 src/gtkblist.c:3670
+#: ../gtk/gtkblist.c:4080
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Amigos/Mostrar detalles de amigo"
 
-#: ../src/gtkblist.c:3759
+#: ../gtk/gtkblist.c:4083
 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:4495 src/gtkblist.c:4393
+msgstr "/Amigos/Mostrar tiempos de inactividad"
+
+#: ../gtk/gtkblist.c:4739 ../gtk/plugins/gevolution/gevolution.c:96
+#: ../gtk/plugins/gevolution/gevo-util.c:64 ../libgaim/blist.c:516
+#: ../libgaim/blist.c:1281 ../libgaim/blist.c:1508
+#: ../libgaim/protocols/jabber/roster.c:67
+msgid "Buddies"
+msgstr "Amigos"
+
+#: ../gtk/gtkblist.c:4873
 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. "
@@ -3030,21 +1664,17 @@
 "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:4565 ../src/gtkblist.c:4884 src/gtkblist.c:4463
-#: src/gtkblist.c:4798
-msgid "Account:"
-msgstr "Cuenta:"
-
-#: ../src/gtkblist.c:4817 src/gtkblist.c:4731
+#: ../gtk/gtkblist.c:4933 ../gtk/gtkblist.c:5296
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:549
+#: ../gtk/plugins/gevolution/new_person_dialog.c:307
+msgid "Group:"
+msgstr "Grupo:"
+
+#: ../gtk/gtkblist.c:5194
 msgid "This protocol does not support chat rooms."
 msgstr "Este protocolo no está soportado en las habitaciones de chats."
 
-#: ../src/gtkblist.c:4833 src/gtkblist.c:4747
+#: ../gtk/gtkblist.c:5210
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -3052,11 +1682,7 @@
 "No está conectado con ninguna cuenta que tenga la capacidad de acceder a "
 "chats."
 
-#: ../src/gtkblist.c:4850 src/gtkblist.c:4764
-msgid "Add Chat"
-msgstr "Añadir chat"
-
-#: ../src/gtkblist.c:4874 src/gtkblist.c:4788
+#: ../gtk/gtkblist.c:5251
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -3064,116 +1690,35 @@
 "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: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:4957 src/gtkblist.c:4871
+#: ../gtk/gtkblist.c:5334
 msgid "Please enter the name of the group to be added."
 msgstr "Introduzca el nombre del grupo a añadir."
 
-#: src/gtkblist.c:5495
+#: ../gtk/gtkblist.c:5960
 msgid "_Edit Account"
 msgstr "_Editar cuenta"
 
-#: ../src/gtkblist.c:5611 ../src/gtkblist.c:5617 src/gtkblist.c:5528
-#: src/gtkblist.c:5534
+#: ../gtk/gtkblist.c:5993 ../gtk/gtkblist.c:5999 ../gtk/gtkconv.c:2775
 msgid "No actions available"
 msgstr "No hay acciones disponibles"
 
-#: src/gtkblist.c:5542
+#: ../gtk/gtkblist.c:6007
 msgid "_Disable"
 msgstr "Deshabilitar"
 
-#: src/gtkblist.c:5554
+#: ../gtk/gtkblist.c:6019
 msgid "Enable Account"
 msgstr "Habilitar cuenta"
 
-#: ../src/gtkblist.c:5690 src/gtkblist.c:5609
+#: ../gtk/gtkblist.c:6072
 msgid "/Tools"
 msgstr "/Herramientas"
 
-#: ../src/gtkblist.c:5785 src/gtkblist.c:5704
+#: ../gtk/gtkblist.c:6158
 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
+#: ../gtk/gtkconn.c:187
 #, c-format
 msgid ""
 "%s was disconnected due to an error: %s\n"
@@ -3183,69 +1728,22 @@
 "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:373 src/gtkconv.c:358
-msgid "Supported debug options are:  version"
-msgstr "Las opciones de depuraciĂłn soportadas son:  version"
-
-#: ../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: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"
-msgstr ""
-"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:484 src/gtkconv.c:469
-msgid "No such command."
-msgstr "No existe esa orden."
-
-#: ../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:496 src/gtkconv.c:481
-msgid "Your command failed for an unknown reason."
-msgstr "Su orden ha fallado por motivos desconocidos."
-
-#: ../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: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: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:744 ../src/gtkconv.c:770 src/gtkconv.c:729
-#: src/gtkconv.c:755
+#: ../gtk/gtkconv.c:738 ../gtk/gtkconv.c:764
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Ese amigo no utiliza el mismo protocolo que este chat."
 
-#: ../src/gtkconv.c:764 src/gtkconv.c:749
+#: ../gtk/gtkconv.c:758
 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:817 src/gtkconv.c:802
+#: ../gtk/gtkconv.c:811
 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:847 src/gtkconv.c:832
+#: ../gtk/gtkconv.c:841
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -3253,767 +1751,801 @@
 "Introduzca el nombre de usuario al que desea invitar, junto con un mensaje "
 "de invitaciĂłn opcional."
 
-#: ../src/gtkconv.c:868 src/gtkconv.c:853
+#: ../gtk/gtkconv.c:862
 msgid "_Buddy:"
 msgstr "_Amigo:"
 
-#: ../src/gtkconv.c:888 ../src/gtksavedstatuses.c:1108
-#: ../src/gtksavedstatuses.c:1444 src/gtkconv.c:873
-#: src/gtksavedstatuses.c:1077 src/gtksavedstatuses.c:1395
+#: ../gtk/gtkconv.c:882 ../gtk/gtksavedstatuses.c:1111
+#: ../gtk/gtksavedstatuses.c:1447
 msgid "_Message:"
 msgstr "_Mensaje:"
 
-#: ../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
+#: ../gtk/gtkconv.c:939 ../gtk/gtkconv.c:2392 ../gtk/gtkdebug.c:218
+#: ../gtk/gtkft.c:542
 msgid "Unable to open file."
 msgstr "No se pudo leer el archivo."
 
-#: ../src/gtkconv.c:951 src/gtkconv.c:936
+#: ../gtk/gtkconv.c:945
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversaciones con %s</h1>\n"
 
-#: ../src/gtkconv.c:975 src/gtkconv.c:960
+#: ../gtk/gtkconv.c:969
 msgid "Save Conversation"
 msgstr "Guardar conversaciĂłn"
 
-#: ../src/gtkconv.c:1093 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
-#: src/gtkconv.c:1077 src/gtkdebug.c:165 src/gtkdebug.c:678
+#: ../gtk/gtkconv.c:1116 ../gtk/gtkdebug.c:166 ../gtk/gtkdebug.c:756
 msgid "Find"
 msgstr "Buscar"
 
-#: ../src/gtkconv.c:1119 ../src/gtkdebug.c:193 src/gtkconv.c:1103
-#: src/gtkdebug.c:193
+#: ../gtk/gtkconv.c:1142 ../gtk/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "TĂ©rmino a _buscar:"
 
-#: ../src/gtkconv.c:1290
+#: ../gtk/gtkconv.c:1313
 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:1298
+#: ../gtk/gtkconv.c:1321
 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:1578 src/gtkconv.c:1536
-msgid "IM"
-msgstr "MI"
-
-#: ../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:1591 src/gtkconv.c:1549
+#: ../gtk/gtkconv.c:1589
 msgid "Un-Ignore"
 msgstr "No ignorar"
 
-#: ../src/gtkconv.c:1594 src/gtkconv.c:1552
+#: ../gtk/gtkconv.c:1592
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../src/gtkconv.c:1600 src/gtkconv.c:1558
-msgid "Info"
-msgstr "Info"
-
-#: ../src/gtkconv.c:1606 src/gtkconv.c:1564
+#: ../gtk/gtkconv.c:1612
 msgid "Get Away Message"
 msgstr "Mensaje de ausencia"
 
-#: ../src/gtkconv.c:1621
+#: ../gtk/gtkconv.c:1635
 msgid "Last said"
 msgstr "Dicho la Ăşltima vez"
 
-#: ../src/gtkconv.c:2407 src/gtkconv.c:2283
+#: ../gtk/gtkconv.c:2400
 msgid "Unable to save icon file to disk."
 msgstr "No se pudo salvar el archivo de iconos al disco."
 
-#: ../src/gtkconv.c:2430 src/gtkconv.c:2306
+#: ../gtk/gtkconv.c:2424
 msgid "Save Icon"
 msgstr "Guardar icono"
 
-#: ../src/gtkconv.c:2479 src/gtkconv.c:2355
+#: ../gtk/gtkconv.c:2473
 msgid "Animate"
 msgstr "Animar"
 
-#: ../src/gtkconv.c:2484 src/gtkconv.c:2360
+#: ../gtk/gtkconv.c:2478
 msgid "Hide Icon"
 msgstr "Ocultar icono"
 
-#: ../src/gtkconv.c:2490 src/gtkconv.c:2366
+#: ../gtk/gtkconv.c:2484
 msgid "Save Icon As..."
 msgstr "Guardar icono como..."
 
 #. Conversation menu
-#: ../src/gtkconv.c:2631 src/gtkconv.c:2507
+#: ../gtk/gtkconv.c:2624
 msgid "/_Conversation"
 msgstr "/_ConversaciĂłn"
 
-#: ../src/gtkconv.c:2633 src/gtkconv.c:2509
+#: ../gtk/gtkconv.c:2626
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversación/Mensaje _instantáneo nuevo..."
 
-#: ../src/gtkconv.c:2638 src/gtkconv.c:2514
+#: ../gtk/gtkconv.c:2631
 msgid "/Conversation/_Find..."
 msgstr "/ConversaciĂłn/_Buscar..."
 
-#: ../src/gtkconv.c:2640 src/gtkconv.c:2516
+#: ../gtk/gtkconv.c:2633
 msgid "/Conversation/View _Log"
 msgstr "/ConversaciĂłn/Ver _historial"
 
-#: ../src/gtkconv.c:2641 src/gtkconv.c:2517
+#: ../gtk/gtkconv.c:2634
 msgid "/Conversation/_Save As..."
 msgstr "/ConversaciĂłn/_Guardar como..."
 
-#: ../src/gtkconv.c:2643
+#: ../gtk/gtkconv.c:2636
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/ConversaciĂłn/Limpia_r deslizable"
 
-#: ../src/gtkconv.c:2647 src/gtkconv.c:2523
+#: ../gtk/gtkconv.c:2640
 msgid "/Conversation/Se_nd File..."
 msgstr "/ConversaciĂłn/_Enviar archivo..."
 
-#: ../src/gtkconv.c:2648 src/gtkconv.c:2524
+#: ../gtk/gtkconv.c:2641
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversación/Añadir _aviso de amigo..."
 
-#: ../src/gtkconv.c:2650 src/gtkconv.c:2526
+#: ../gtk/gtkconv.c:2643
 msgid "/Conversation/_Get Info"
 msgstr "/ConversaciĂłn/_Obtener informaciĂłn"
 
-#: ../src/gtkconv.c:2652 src/gtkconv.c:2528
+#: ../gtk/gtkconv.c:2645
 msgid "/Conversation/In_vite..."
 msgstr "/ConversaciĂłn/In_vitar..."
 
-#: ../src/gtkconv.c:2657 src/gtkconv.c:2533
+#: ../gtk/gtkconv.c:2647
+msgid "/Conversation/M_ore"
+msgstr "/Conversación/_Más"
+
+#: ../gtk/gtkconv.c:2651
 msgid "/Conversation/Al_ias..."
 msgstr "/ConversaciĂłn/A_podo..."
 
-#: ../src/gtkconv.c:2659 src/gtkconv.c:2535
+#: ../gtk/gtkconv.c:2653
 msgid "/Conversation/_Block..."
 msgstr "/ConversaciĂłn/_Bloquear..."
 
-#: ../src/gtkconv.c:2661 src/gtkconv.c:2537
+#: ../gtk/gtkconv.c:2655
 msgid "/Conversation/_Add..."
 msgstr "/Conversación/_Añadir..."
 
-#: ../src/gtkconv.c:2663 src/gtkconv.c:2539
+#: ../gtk/gtkconv.c:2657
 msgid "/Conversation/_Remove..."
 msgstr "/ConversaciĂłn/Elimina_r..."
 
-#: ../src/gtkconv.c:2668 src/gtkconv.c:2544
+#: ../gtk/gtkconv.c:2662
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/ConversaciĂłn/Insertar en_lace..."
 
-#: ../src/gtkconv.c:2670 src/gtkconv.c:2546
+#: ../gtk/gtkconv.c:2664
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/ConversaciĂłn/Insertar imag_en..."
 
-#: ../src/gtkconv.c:2675 src/gtkconv.c:2551
+#: ../gtk/gtkconv.c:2669
 msgid "/Conversation/_Close"
 msgstr "/ConversaciĂłn/_Cerrar"
 
 #. Options
-#: ../src/gtkconv.c:2679 src/gtkconv.c:2555
+#: ../gtk/gtkconv.c:2673
 msgid "/_Options"
 msgstr "/_Opciones"
 
-#: ../src/gtkconv.c:2680 src/gtkconv.c:2556
+#: ../gtk/gtkconv.c:2674
 msgid "/Options/Enable _Logging"
 msgstr "/Opciones/_Habilitar registro"
 
-#: ../src/gtkconv.c:2681 src/gtkconv.c:2557
+#: ../gtk/gtkconv.c:2675
 msgid "/Options/Enable _Sounds"
 msgstr "/Opciones/Habilitar _sonidos"
 
-#: ../src/gtkconv.c:2682 src/gtkconv.c:2558
+#: ../gtk/gtkconv.c:2676
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Opciones/Mostrar _iconos de los amigos"
 
-#: ../src/gtkconv.c:2684 src/gtkconv.c:2560
+#: ../gtk/gtkconv.c:2678
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Opciones/Mostrar _barras de formato"
 
-#: ../src/gtkconv.c:2685 src/gtkconv.c:2561
+#: ../gtk/gtkconv.c:2679
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Opciones/Mostrar _marcas de tiempo"
 
-#: ../src/gtkconv.c:2777 src/gtkconv.c:2601
+#: ../gtk/gtkconv.c:2754
+msgid "/Conversation/More"
+msgstr "/Conversación/Más"
+
+#: ../gtk/gtkconv.c:2792 ../gtk/gtkconv.c:2819
+msgid "/Conversation"
+msgstr "/ConversaciĂłn"
+
+#: ../gtk/gtkconv.c:2829
 msgid "/Conversation/View Log"
 msgstr "/ConversaciĂłn/Ver registro"
 
-#: ../src/gtkconv.c:2783 src/gtkconv.c:2607
+#: ../gtk/gtkconv.c:2835
 msgid "/Conversation/Send File..."
 msgstr "/ConversaciĂłn/Enviar archivo..."
 
-#: ../src/gtkconv.c:2787 src/gtkconv.c:2611
+#: ../gtk/gtkconv.c:2839
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversación/Añadir aviso de amigo..."
 
-#: ../src/gtkconv.c:2793 src/gtkconv.c:2617
+#: ../gtk/gtkconv.c:2845
 msgid "/Conversation/Get Info"
 msgstr "/ConversaciĂłn/Obtener informaciĂłn"
 
-#: ../src/gtkconv.c:2797 src/gtkconv.c:2621
+#: ../gtk/gtkconv.c:2849
 msgid "/Conversation/Invite..."
 msgstr "/ConversaciĂłn/Invitar..."
 
-#: ../src/gtkconv.c:2803 src/gtkconv.c:2627
+#: ../gtk/gtkconv.c:2855
 msgid "/Conversation/Alias..."
 msgstr "/ConversaciĂłn/Apodo..."
 
-#: ../src/gtkconv.c:2807 src/gtkconv.c:2631
+#: ../gtk/gtkconv.c:2859
 msgid "/Conversation/Block..."
 msgstr "/ConversaciĂłn/Bloquear..."
 
-#: ../src/gtkconv.c:2811 src/gtkconv.c:2635
+#: ../gtk/gtkconv.c:2863
 msgid "/Conversation/Add..."
 msgstr "/Conversación/Añadir..."
 
-#: ../src/gtkconv.c:2815 src/gtkconv.c:2639
+#: ../gtk/gtkconv.c:2867
 msgid "/Conversation/Remove..."
 msgstr "/ConversaciĂłn/Eliminar..."
 
-#: ../src/gtkconv.c:2821 src/gtkconv.c:2645
+#: ../gtk/gtkconv.c:2873
 msgid "/Conversation/Insert Link..."
 msgstr "/Opciones/Insertar enlace..."
 
-#: ../src/gtkconv.c:2825 src/gtkconv.c:2649
+#: ../gtk/gtkconv.c:2877
 msgid "/Conversation/Insert Image..."
 msgstr "/Opciones/Insertar imagen..."
 
-#: ../src/gtkconv.c:2831 src/gtkconv.c:2655
+#: ../gtk/gtkconv.c:2883
 msgid "/Options/Enable Logging"
 msgstr "/Opciones/_Habilitar registro"
 
-#: ../src/gtkconv.c:2834 src/gtkconv.c:2658
+#: ../gtk/gtkconv.c:2886
 msgid "/Options/Enable Sounds"
 msgstr "/Opciones/Habilitar _sonidos"
 
-#: ../src/gtkconv.c:2847 src/gtkconv.c:2661
+#: ../gtk/gtkconv.c:2899
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Opciones/Mostrar barras de formato"
 
-#: ../src/gtkconv.c:2850 src/gtkconv.c:2664
+#: ../gtk/gtkconv.c:2902
 msgid "/Options/Show Timestamps"
 msgstr "/Opciones/Mostrar marcas de tiempo"
 
-#: ../src/gtkconv.c:2853 src/gtkconv.c:2667
+#: ../gtk/gtkconv.c:2905
 msgid "/Options/Show Buddy Icon"
 msgstr "/Opciones/Mostrar _iconos de los amigos"
 
-#: ../src/gtkconv.c:2933 src/gtkconv.c:2739
+#: ../gtk/gtkconv.c:2981
 msgid "User is typing..."
 msgstr "El usuario está escribiendo..."
 
-#: src/gtkconv.c:2742
+#: ../gtk/gtkconv.c:2984
 msgid "User has typed something and stopped"
 msgstr "El usuario ha escrito algo y ha parado"
 
 #. Build the Send To menu
-#: ../src/gtkconv.c:3119 src/gtkconv.c:2890
+#: ../gtk/gtkconv.c:3167
 msgid "_Send To"
 msgstr "_Enviar a"
 
-#: ../src/gtkconv.c:3771
+#: ../gtk/gtkconv.c:3869
 msgid "_Send"
 msgstr "_Enviar"
 
-#: ../src/gtkconv.c:3824 ../src/protocols/sametime/sametime.c:3572
-#: src/gtkconv.c:3537 src/protocols/sametime/sametime.c:3490
+#: ../gtk/gtkconv.c:3923 ../libgaim/protocols/sametime/sametime.c:3560
 msgid "Topic:"
 msgstr "Tema:"
 
 #. Setup the label telling how many people are in the room.
-#: ../src/gtkconv.c:3872 src/gtkconv.c:3585
+#: ../gtk/gtkconv.c:3975
 msgid "0 people in room"
 msgstr "0 personas en la conversaciĂłn"
 
-#: ../src/gtkconv.c:3951 src/gtkconv.c:3664
-msgid "IM the user"
-msgstr "Enviar un MI al usuario"
-
-#: ../src/gtkconv.c:3964 src/gtkconv.c:3677
-msgid "Ignore the user"
-msgstr "Ignorar al usuario"
-
-#: ../src/gtkconv.c:3976 src/gtkconv.c:3689
-msgid "Get the user's information"
-msgstr "Obtener la informaciĂłn del usuario"
-
-#: ../src/gtkconv.c:4942 ../src/gtkconv.c:5051 src/gtkconv.c:4575
-#: src/gtkconv.c:4680 src/gtkconv.c:4735
+#: ../gtk/gtkconv.c:5022 ../gtk/gtkconv.c:5143
 #, 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:6521 src/gtkconv.c:5973
-msgid ""
-"say &lt;message&gt;:  Send a message normally as if you weren't using a "
-"command."
-msgstr ""
-"say &lt;mensaje;gt;:  Enviar un mensaje como si no se estuviera utilizando "
-"una orden."
-
-#: ../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:6527 src/gtkconv.c:5979
-msgid ""
-"debug &lt;option&gt;:  Send various debug information to the current "
-"conversation."
-msgstr ""
-"debug &lt;opciĂłn&gt;: Enviar informaciĂłn de depuraciĂłn sobre la conversaciĂłn "
-"actual."
-
-#: ../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: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:6692 src/gtkconv.c:6118
+#: ../gtk/gtkconv.c:5696 ../gtk/gtkstatusbox.c:548
+msgid "Typing"
+msgstr "Tecleando"
+
+#: ../gtk/gtkconv.c:5702
+msgid "Stopped Typing"
+msgstr "Deja de escribi_r"
+
+#: ../gtk/gtkconv.c:5707
+msgid "Nick Said"
+msgstr "Apodo dijo"
+
+#: ../gtk/gtkconv.c:5712 ../gtk/plugins/docklet/docklet.c:489
+msgid "Unread Messages"
+msgstr "Mensajes sin leer"
+
+#: ../gtk/gtkconv.c:5717
+msgid "New Event"
+msgstr "Nuevo acontecimiento"
+
+#: ../gtk/gtkconv.c:6812
 msgid "Confirm close"
 msgstr "Confirmar cierre"
 
-#: ../src/gtkconv.c:6724 src/gtkconv.c:6150
+#: ../gtk/gtkconv.c:6844
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Tiene mensajes sin leer. ¿Está seguro que quiere cerrar la ventana?"
 
-#: ../src/gtkconv.c:7528 src/gtkconv.c:6946
+#: ../gtk/gtkconv.c:7366
+msgid "Close other tabs"
+msgstr "Cerrar otras solapas"
+
+#: ../gtk/gtkconv.c:7372
+msgid "Close all tabs"
+msgstr "Cerrar todas las solapas"
+
+#: ../gtk/gtkconv.c:7380
+msgid "Detach this tab"
+msgstr "Despegar esta solapa"
+
+#: ../gtk/gtkconv.c:7386
+msgid "Close this tab"
+msgstr "Cerrar esta solapa"
+
+#: ../gtk/gtkconv.c:7651
 msgid "Close conversation"
 msgstr "Cerrar conversaciĂłn"
 
-#: ../src/gtkconv.c:7992 src/gtkconv.c:7410
+#: ../gtk/gtkconv.c:8115
 msgid "Last created window"
 msgstr "Ăšltima ventana creada"
 
-#: ../src/gtkconv.c:7994 src/gtkconv.c:7412
+#: ../gtk/gtkconv.c:8117
 msgid "Separate IM and Chat windows"
 msgstr "Separar ventanas de MIs y chats"
 
-#: ../src/gtkconv.c:7996 ../src/gtkprefs.c:1243 src/gtkconv.c:7414
-#: src/gtkprefs.c:1230
+#: ../gtk/gtkconv.c:8119 ../gtk/gtkprefs.c:1263
 msgid "New window"
 msgstr "Ventana nueva"
 
-#: ../src/gtkconv.c:7998 src/gtkconv.c:7416
+#: ../gtk/gtkconv.c:8121
 msgid "By group"
 msgstr "Por grupo"
 
-#: ../src/gtkconv.c:8000 src/gtkconv.c:7418
+#: ../gtk/gtkconv.c:8123
 msgid "By account"
 msgstr "Por cuenta"
 
-#: ../src/gtkdebug.c:232 src/gtkdebug.c:232
+#: ../gtk/gtkdebug.c:233
 msgid "Save Debug Log"
 msgstr "Guardar registro de depuraciĂłn"
 
-#: ../src/gtkdebug.c:586 src/gtkdebug.c:586
+#: ../gtk/gtkdebug.c:594
 msgid "Invert"
 msgstr "Invertir"
 
-#: ../src/gtkdebug.c:589 src/gtkdebug.c:589
+#: ../gtk/gtkdebug.c:597
 msgid "Highlight matches"
 msgstr "Resaltar coincidencias"
 
-#: ../src/gtkdebug.c:636 src/gtkdebug.c:636
-msgid "Debug Window"
-msgstr "Ventana de depuraciĂłn"
-
-#: ../src/gtkdebug.c:689 src/gtkdebug.c:689
+#: ../gtk/gtkdebug.c:664
+msgid "_Icon Only"
+msgstr "SĂłlo _icono"
+
+#: ../gtk/gtkdebug.c:665
+msgid "_Text Only"
+msgstr "SĂłlo _texto"
+
+#: ../gtk/gtkdebug.c:666
+msgid "_Both Icon & Text"
+msgstr "_Tanto iconos como texto"
+
+#: ../gtk/gtkdebug.c:767
 msgid "Clear"
 msgstr "Limpiar"
 
-#: ../src/gtkdebug.c:698 src/gtkdebug.c:698
+#: ../gtk/gtkdebug.c:776
 msgid "Pause"
 msgstr "Pausar"
 
-#: ../src/gtkdebug.c:705 ../src/gtkdebug.c:706 src/gtkdebug.c:705
-#: src/gtkdebug.c:706
+#: ../gtk/gtkdebug.c:783 ../gtk/gtkdebug.c:784
 msgid "Timestamps"
 msgstr "Marcas de tiempo"
 
-#: ../src/gtkdebug.c:724 src/gtkdebug.c:724
+#: ../gtk/gtkdebug.c:802
 msgid "Filter"
 msgstr "Filtro"
 
-#: ../src/gtkdebug.c:743 src/gtkdebug.c:743
+#: ../gtk/gtkdebug.c:821
 msgid "Right click for more options."
 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
+#: ../gtk/gtkdebug.c:851
+msgid "Level "
+msgstr "Nivel "
+
+#: ../gtk/gtkdebug.c:852 ../gtk/gtkdebug.c:858
+msgid "Select the debug filter level."
+msgstr "Seleccione el nivel del filtro de depuraciĂłn."
+
+#: ../gtk/gtkdebug.c:860
+msgid "All"
+msgstr "Todos"
+
+#: ../gtk/gtkdebug.c:861
+msgid "Misc"
+msgstr "Misceláneo"
+
+#: ../gtk/gtkdebug.c:863
+msgid "Warning"
+msgstr "Advertencia"
+
+#: ../gtk/gtkdebug.c:864
+msgid "Error "
+msgstr "Error "
+
+#: ../gtk/gtkdebug.c:865
+msgid "Fatal Error"
+msgstr "Error fatal"
+
+#: ../gtk/gtkdialogs.c:66 ../gtk/gtkdialogs.c:109
 msgid "lead developer"
 msgstr "desarrollador principal"
 
-#: ../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
+#: ../gtk/gtkdialogs.c:67 ../gtk/gtkdialogs.c:68 ../gtk/gtkdialogs.c:69
+#: ../gtk/gtkdialogs.c:70 ../gtk/gtkdialogs.c:72 ../gtk/gtkdialogs.c:73
+#: ../gtk/gtkdialogs.c:74 ../gtk/gtkdialogs.c:75 ../gtk/gtkdialogs.c:76
+#: ../gtk/gtkdialogs.c:77 ../gtk/gtkdialogs.c:79 ../gtk/gtkdialogs.c:80
+#: ../gtk/gtkdialogs.c:81
 msgid "developer"
 msgstr "desarrollador"
 
-#: ../src/gtkdialogs.c:64 src/gtkdialogs.c:64
-msgid "win32 port"
-msgstr "adaptaciĂłn a win32"
-
-#: ../src/gtkdialogs.c:66 src/gtkdialogs.c:66
+#: ../gtk/gtkdialogs.c:71
 msgid "developer & webmaster"
 msgstr "desarrollador y webmaster"
 
-#: ../src/gtkdialogs.c:72 src/gtkdialogs.c:72
+#: ../gtk/gtkdialogs.c:78
 msgid "support"
 msgstr "soporte"
 
-#: ../src/gtkdialogs.c:94 ../src/gtkdialogs.c:95 src/gtkdialogs.c:93
-#: src/gtkdialogs.c:94
+#: ../gtk/gtkdialogs.c:101
+msgid "win32 port"
+msgstr "adaptaciĂłn a win32"
+
+#: ../gtk/gtkdialogs.c:102 ../gtk/gtkdialogs.c:103
 msgid "maintainer"
 msgstr "mantenedor"
 
-#: ../src/gtkdialogs.c:96 src/gtkdialogs.c:95
+#: ../gtk/gtkdialogs.c:104
 msgid "libfaim maintainer"
 msgstr "mantenedor de libfaim"
 
-#: ../src/gtkdialogs.c:97 src/gtkdialogs.c:96
+#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
+#: ../gtk/gtkdialogs.c:106
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker y diseñador de controladores [lazy bum]"
 
-#: ../src/gtkdialogs.c:98 src/gtkdialogs.c:97
+#: ../gtk/gtkdialogs.c:107
 msgid "Jabber developer"
 msgstr "desarrollador de Jabber"
 
-#: ../src/gtkdialogs.c:99 src/gtkdialogs.c:98
+#: ../gtk/gtkdialogs.c:108
 msgid "original author"
 msgstr "autor original"
 
-#: ../src/gtkdialogs.c:106 ../src/gtkdialogs.c:107 ../src/gtkdialogs.c:158
-#: src/gtkdialogs.c:105 src/gtkdialogs.c:106 src/gtkdialogs.c:154
+# Amhario
+#: ../gtk/gtkdialogs.c:115
+msgid "Arabic"
+msgstr "Ărabe"
+
+#: ../gtk/gtkdialogs.c:116 ../gtk/gtkdialogs.c:117 ../gtk/gtkdialogs.c:183
 msgid "Bulgarian"
 msgstr "BĂşlgaro"
 
-#: ../src/gtkdialogs.c:108 ../src/gtkdialogs.c:109
+#: ../gtk/gtkdialogs.c:118 ../gtk/gtkdialogs.c:119
 msgid "Bengali"
 msgstr "BengalĂ­"
 
-#: ../src/gtkdialogs.c:110 src/gtkdialogs.c:107
+#: ../gtk/gtkdialogs.c:120
 msgid "Bosnian"
 msgstr "Bosnio"
 
-#: ../src/gtkdialogs.c:111 ../src/gtkdialogs.c:159 ../src/gtkdialogs.c:160
-#: src/gtkdialogs.c:108 src/gtkdialogs.c:155 src/gtkdialogs.c:156
+#: ../gtk/gtkdialogs.c:121 ../gtk/gtkdialogs.c:184 ../gtk/gtkdialogs.c:185
 msgid "Catalan"
 msgstr "Catalán"
 
-#: ../src/gtkdialogs.c:112 ../src/gtkdialogs.c:161 src/gtkdialogs.c:109
-#: src/gtkdialogs.c:157
+#: ../gtk/gtkdialogs.c:122 ../gtk/gtkdialogs.c:123
+msgid "Valencian-Catalan"
+msgstr "Valenciano-Catalán"
+
+#: ../gtk/gtkdialogs.c:124 ../gtk/gtkdialogs.c:186
 msgid "Czech"
 msgstr "Checo"
 
-#: ../src/gtkdialogs.c:113 src/gtkdialogs.c:110
+#: ../gtk/gtkdialogs.c:125
 msgid "Danish"
 msgstr "Danés"
 
-#: ../src/gtkdialogs.c:114 ../src/gtkdialogs.c:162 src/gtkdialogs.c:111
-#: src/gtkdialogs.c:158
+#: ../gtk/gtkdialogs.c:126 ../gtk/gtkdialogs.c:127 ../gtk/gtkdialogs.c:187
 msgid "German"
 msgstr "Alemán"
 
-#: src/gtkdialogs.c:112 src/gtkdialogs.c:113
+#: ../gtk/gtkdialogs.c:128 ../gtk/gtkdialogs.c:129
 msgid "Greek"
 msgstr "Griego"
 
-#: ../src/gtkdialogs.c:117 src/gtkdialogs.c:114
+#: ../gtk/gtkdialogs.c:130
 msgid "Australian English"
 msgstr "Inglés australiano"
 
-#: ../src/gtkdialogs.c:118 src/gtkdialogs.c:115
+#: ../gtk/gtkdialogs.c:131
 msgid "Canadian English"
 msgstr "Inglés canadiense"
 
-#: ../src/gtkdialogs.c:119 src/gtkdialogs.c:116
+#: ../gtk/gtkdialogs.c:132
 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
+#: ../gtk/gtkdialogs.c:133 ../gtk/gtkdialogs.c:188 ../gtk/gtkdialogs.c:189
+#: ../gtk/gtkdialogs.c:190 ../gtk/gtkdialogs.c:191
 msgid "Spanish"
 msgstr "Español"
 
-#: ../src/gtkdialogs.c:121 ../src/gtkdialogs.c:167 ../src/gtkdialogs.c:168
-#: src/gtkdialogs.c:118 src/gtkdialogs.c:160
+#: ../gtk/gtkdialogs.c:134 ../gtk/gtkdialogs.c:135
+msgid "Euskera(Basque)"
+msgstr "Eusquera(Vasco)"
+
+#: ../gtk/gtkdialogs.c:136 ../gtk/gtkdialogs.c:137
+msgid "Persian"
+msgstr "Persa"
+
+#: ../gtk/gtkdialogs.c:138 ../gtk/gtkdialogs.c:192 ../gtk/gtkdialogs.c:193
 msgid "Finnish"
 msgstr "Finlandés"
 
-#: ../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
+#: ../gtk/gtkdialogs.c:139 ../gtk/gtkdialogs.c:194 ../gtk/gtkdialogs.c:195
+#: ../gtk/gtkdialogs.c:196 ../gtk/gtkdialogs.c:197
 msgid "French"
 msgstr "Francés"
 
-#: ../src/gtkdialogs.c:123 src/gtkdialogs.c:120
+#: ../gtk/gtkdialogs.c:140
+msgid "Galician"
+msgstr "Gallego"
+
+#: ../gtk/gtkdialogs.c:141 ../gtk/gtkdialogs.c:142
+msgid "Gujarati"
+msgstr "Gujarati"
+
+#: ../gtk/gtkdialogs.c:143 ../gtk/gtkdialogs.c:198
 msgid "Hebrew"
 msgstr "Hebreo"
 
-#: ../src/gtkdialogs.c:124 src/gtkdialogs.c:121
+#: ../gtk/gtkdialogs.c:144
 msgid "Hindi"
 msgstr "HindĂş"
 
-#: ../src/gtkdialogs.c:125 src/gtkdialogs.c:122
+#: ../gtk/gtkdialogs.c:145
 msgid "Hungarian"
 msgstr "HĂşngaro"
 
-#: ../src/gtkdialogs.c:126 ../src/gtkdialogs.c:173 src/gtkdialogs.c:123
-#: src/gtkdialogs.c:162
+#: ../gtk/gtkdialogs.c:146 ../gtk/gtkdialogs.c:199
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../src/gtkdialogs.c:127 ../src/gtkdialogs.c:174 ../src/gtkdialogs.c:175
-#: ../src/gtkdialogs.c:176 src/gtkdialogs.c:124 src/gtkdialogs.c:163
+#: ../gtk/gtkdialogs.c:147 ../gtk/gtkdialogs.c:200 ../gtk/gtkdialogs.c:201
+#: ../gtk/gtkdialogs.c:202
 msgid "Japanese"
 msgstr "Japonés"
 
-#: ../src/gtkdialogs.c:128 ../src/gtkdialogs.c:177 src/gtkdialogs.c:125
+#: ../gtk/gtkdialogs.c:148 ../gtk/gtkdialogs.c:203
 msgid "Georgian"
 msgstr "Georgiano"
 
-#: ../src/gtkdialogs.c:129 ../src/gtkdialogs.c:178 src/gtkdialogs.c:126
-#: src/gtkdialogs.c:164
+#: ../gtk/gtkdialogs.c:149 ../gtk/gtkdialogs.c:204
 msgid "Korean"
 msgstr "Coreano"
 
-#: src/gtkdialogs.c:127
+#: ../gtk/gtkdialogs.c:150 ../gtk/gtkdialogs.c:151 ../gtk/gtkdialogs.c:152
 msgid "Kurdish"
 msgstr "Kurdo"
 
-#: ../src/gtkdialogs.c:131 ../src/gtkdialogs.c:179 src/gtkdialogs.c:128
+#: ../gtk/gtkdialogs.c:153 ../gtk/gtkdialogs.c:205 ../gtk/gtkdialogs.c:206
 msgid "Lithuanian"
 msgstr "Lituano"
 
-#: ../src/gtkdialogs.c:132 src/gtkdialogs.c:129
+#: ../gtk/gtkdialogs.c:154
 msgid "Macedonian"
 msgstr "Macedonio"
 
-#: ../src/gtkdialogs.c:133 src/gtkdialogs.c:130
+#: ../gtk/gtkdialogs.c:155
+msgid "Nepali"
+msgstr "Nepalés"
+
+#: ../gtk/gtkdialogs.c:156
 msgid "Dutch, Flemish"
 msgstr "Danés, Flamenco"
 
-#: ../src/gtkdialogs.c:134 src/gtkdialogs.c:131
+#: ../gtk/gtkdialogs.c:157
 msgid "Norwegian"
 msgstr "Noruego"
 
-#: ../src/gtkdialogs.c:135 ../src/gtkdialogs.c:136 ../src/gtkdialogs.c:180
-#: src/gtkdialogs.c:132 src/gtkdialogs.c:133 src/gtkdialogs.c:165
+#: ../gtk/gtkdialogs.c:158 ../gtk/gtkdialogs.c:159 ../gtk/gtkdialogs.c:207
 msgid "Polish"
 msgstr "Polaco"
 
-#: ../src/gtkdialogs.c:137 src/gtkdialogs.c:134
+#: ../gtk/gtkdialogs.c:160
 msgid "Portuguese"
 msgstr "Portugués"
 
-#: ../src/gtkdialogs.c:138 src/gtkdialogs.c:135
+#: ../gtk/gtkdialogs.c:161
 msgid "Portuguese-Brazil"
 msgstr "Portugués brasileño"
 
-#: ../src/gtkdialogs.c:139 src/gtkdialogs.c:136
+#: ../gtk/gtkdialogs.c:162
 msgid "Romanian"
 msgstr "Rumano"
 
-#: ../src/gtkdialogs.c:140 ../src/gtkdialogs.c:181 ../src/gtkdialogs.c:182
-#: src/gtkdialogs.c:137 src/gtkdialogs.c:166 src/gtkdialogs.c:167
+#: ../gtk/gtkdialogs.c:163 ../gtk/gtkdialogs.c:208 ../gtk/gtkdialogs.c:209
 msgid "Russian"
 msgstr "Ruso"
 
-#: ../src/gtkdialogs.c:141 ../src/gtkdialogs.c:142 src/gtkdialogs.c:138
-#: src/gtkdialogs.c:139
+#: ../gtk/gtkdialogs.c:164 ../gtk/gtkdialogs.c:165
 msgid "Serbian"
 msgstr "Serbio"
 
-#: ../src/gtkdialogs.c:143 src/gtkdialogs.c:140
+#: ../gtk/gtkdialogs.c:166 ../gtk/gtkdialogs.c:210
+msgid "Slovak"
+msgstr "Eslovaco"
+
+#: ../gtk/gtkdialogs.c:167
 msgid "Slovenian"
 msgstr "Esloveno"
 
-#: ../src/gtkdialogs.c:144 ../src/gtkdialogs.c:184 src/gtkdialogs.c:141
-#: src/gtkdialogs.c:169
+#: ../gtk/gtkdialogs.c:168 ../gtk/gtkdialogs.c:211
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../src/gtkdialogs.c:145 src/gtkdialogs.c:142
+#: ../gtk/gtkdialogs.c:169
 msgid "Tamil"
 msgstr "Tamil"
 
-#: ../src/gtkdialogs.c:146
+#: ../gtk/gtkdialogs.c:170
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../src/gtkdialogs.c:147
+#: ../gtk/gtkdialogs.c:171
+msgid "Thai"
+msgstr "Thai"
+
+#: ../gtk/gtkdialogs.c:172
 msgid "Turkish"
 msgstr "Turco"
 
-#: ../src/gtkdialogs.c:148 src/gtkdialogs.c:144
+#: ../gtk/gtkdialogs.c:173
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: ../src/gtkdialogs.c:148 src/gtkdialogs.c:144
+#: ../gtk/gtkdialogs.c:173
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh y el equipo Gnome-Vi"
 
-#: ../src/gtkdialogs.c:149 ../src/gtkdialogs.c:185 src/gtkdialogs.c:145
-#: src/gtkdialogs.c:170
+#: ../gtk/gtkdialogs.c:174 ../gtk/gtkdialogs.c:212
 msgid "Simplified Chinese"
 msgstr "Chino simplificado"
 
-#: ../src/gtkdialogs.c:150 ../src/gtkdialogs.c:151 ../src/gtkdialogs.c:186
-#: src/gtkdialogs.c:146 src/gtkdialogs.c:147 src/gtkdialogs.c:171
+#: ../gtk/gtkdialogs.c:175 ../gtk/gtkdialogs.c:176 ../gtk/gtkdialogs.c:213
 msgid "Traditional Chinese"
 msgstr "Chino tradicional"
 
 # Amhario
-#: ../src/gtkdialogs.c:157 src/gtkdialogs.c:153
+#: ../gtk/gtkdialogs.c:182
 msgid "Amharic"
 msgstr "Amhárico"
 
-#: ../src/gtkdialogs.c:183 src/gtkdialogs.c:168
-msgid "Slovak"
-msgstr "Eslovaco"
-
-#: ../src/gtkdialogs.c:227 src/gtkdialogs.c:212
+#: ../gtk/gtkdialogs.c:294
 msgid "About Gaim"
 msgstr "Acerca de Gaim"
 
-#: ../src/gtkdialogs.c:251
+#: ../gtk/gtkdialogs.c:328
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
-"and Gadu-Gadu all at once.  It is written using GTK+.<BR><BR>You may modify "
-"and redistribute the program under the terms of the GPL (version 2 or "
-"later).  A copy of the GPL is contained in the 'COPYING' file distributed "
-"with Gaim.  Gaim is copyrighted by its contributors.  See the 'COPYRIGHT' "
-"file for the complete list of contributors.  We provide no warranty for this "
-"program.<BR><BR>"
-msgstr "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
+"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Zephyr, Gadu-Gadu, "
+"and QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
+"redistribute the program under the terms of the GPL (version 2 or later).  A "
+"copy of the GPL is contained in the 'COPYING' file distributed with Gaim.  "
+"Gaim is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
+"complete list of contributors.  We provide no warranty for this program."
+"<BR><BR>"
+msgstr "Gaim es un cliente de mensajería modular capaz de utilizar AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Zephyr, Gadu-Gadu y QQ 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>"
+
+#: ../gtk/gtkdialogs.c:342
 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:268 src/gtkdialogs.c:248
+#: ../gtk/gtkdialogs.c:345
 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:254
+#: ../gtk/gtkdialogs.c:351
 msgid "Current Developers"
 msgstr "Desarrolladores actuales"
 
-#: ../src/gtkdialogs.c:289 src/gtkdialogs.c:269
+#: ../gtk/gtkdialogs.c:366
 msgid "Crazy Patch Writers"
 msgstr "Locos escritores de parches"
 
-#: ../src/gtkdialogs.c:304 src/gtkdialogs.c:284
+#: ../gtk/gtkdialogs.c:381
 msgid "Retired Developers"
 msgstr "Desarrolladores retirados"
 
-#: ../src/gtkdialogs.c:319 src/gtkdialogs.c:299
+#: ../gtk/gtkdialogs.c:396
 msgid "Current Translators"
 msgstr "Traductores actuales"
 
-#: ../src/gtkdialogs.c:339 src/gtkdialogs.c:319
+#: ../gtk/gtkdialogs.c:416
 msgid "Past Translators"
 msgstr "Traductores anteriores"
 
-#: ../src/gtkdialogs.c:357 src/gtkdialogs.c:337
+#: ../gtk/gtkdialogs.c:434
 msgid "Debugging Information"
 msgstr "InformaciĂłn de depuraciĂłn"
 
-#: ../src/gtkdialogs.c:553 ../src/gtkdialogs.c:690 ../src/gtkdialogs.c:757
-#: src/gtkdialogs.c:527 src/gtkdialogs.c:664 src/gtkdialogs.c:731
+#: ../gtk/gtkdialogs.c:648 ../gtk/gtkdialogs.c:785 ../gtk/gtkdialogs.c:865
 msgid "_Name"
 msgstr "_Nombre"
 
-#: ../src/gtkdialogs.c:558 ../src/gtkdialogs.c:695 ../src/gtkdialogs.c:762
-#: src/gtkdialogs.c:532 src/gtkdialogs.c:669 src/gtkdialogs.c:736
+#: ../gtk/gtkdialogs.c:653 ../gtk/gtkdialogs.c:790 ../gtk/gtkdialogs.c:870
 msgid "_Account"
 msgstr "_Cuenta"
 
-#: ../src/gtkdialogs.c:566 src/gtkdialogs.c:540
+#: ../gtk/gtkdialogs.c:661
 msgid "New Instant Message"
 msgstr "Mensaje instantáneo nuevo"
 
-#: ../src/gtkdialogs.c:568 src/gtkdialogs.c:542
+#: ../gtk/gtkdialogs.c:663
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
-msgstr "Introduzca el nombre de usuario o apodo de la persona con la que quiere comunicarse."
-
-#: ../src/gtkdialogs.c:703 src/gtkdialogs.c:677
+msgstr ""
+"Introduzca el nombre de usuario o apodo de la persona con la que quiere "
+"comunicarse."
+
+#: ../gtk/gtkdialogs.c:798
 msgid "Get User Info"
 msgstr "Obtener datos del usuario"
 
-#: ../src/gtkdialogs.c:705 src/gtkdialogs.c:679
+#: ../gtk/gtkdialogs.c:800
 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:771 src/gtkdialogs.c:745
+msgstr ""
+"Introduzca el nombre de usuario o el apodo de la persona de la cual quiere "
+"ver informaciĂłn."
+
+#: ../gtk/gtkdialogs.c:889
 msgid "View User Log"
 msgstr "Ver registro de usuario"
 
-#: ../src/gtkdialogs.c:773 src/gtkdialogs.c:747
+#: ../gtk/gtkdialogs.c:891
 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:792 src/gtkdialogs.c:766
+msgstr ""
+"Introduzca el nombre de usuario o el apodo de la persona de la cual quiere "
+"ver informaciĂłn de registro."
+
+#: ../gtk/gtkdialogs.c:910
 msgid "Alias Contact"
 msgstr "Apodo para contacto"
 
-#: ../src/gtkdialogs.c:793 src/gtkdialogs.c:767
+#: ../gtk/gtkdialogs.c:911
 msgid "Enter an alias for this contact."
 msgstr "Introduzca un apodo para este contacto."
 
-#: ../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:813 src/gtkdialogs.c:787
+#: ../gtk/gtkdialogs.c:931
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Introduzca un alias para %s."
 
-#: ../src/gtkdialogs.c:815 src/gtkdialogs.c:789
+#: ../gtk/gtkdialogs.c:933
 msgid "Alias Buddy"
 msgstr "Apodo de amigo"
 
-#: ../src/gtkdialogs.c:834 src/gtkdialogs.c:808
+#: ../gtk/gtkdialogs.c:952
 msgid "Alias Chat"
 msgstr "Apodo en el chat"
 
-#: ../src/gtkdialogs.c:835 src/gtkdialogs.c:809
+#: ../gtk/gtkdialogs.c:953
 msgid "Enter an alias for this chat."
 msgstr "Introduzca un apodo para este chat."
 
-#: ../src/gtkdialogs.c:872 src/gtkdialogs.c:846
+#: ../gtk/gtkdialogs.c:990
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -4021,18 +2553,37 @@
 msgid_plural ""
 "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 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
+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 los contactos que contiene a %s y a otros %d amigos "
+"de su lista de amigos. ÂżDesea continuar?"
+
+#: ../gtk/gtkdialogs.c:998
 msgid "Remove Contact"
 msgstr "Eliminar contacto"
 
-#: ../src/gtkdialogs.c:881
+#: ../gtk/gtkdialogs.c:999
 msgid "_Remove Contact"
 msgstr "_Eliminar contacto"
 
-#: ../src/gtkdialogs.c:932 src/gtkdialogs.c:913
+#: ../gtk/gtkdialogs.c:1029
+#, c-format
+msgid ""
+"You are about to merge the group called %s into the group called %s. Do you "
+"want to continue?"
+msgstr "Está a punto de fusionar el grupo llamado %s con el grupo llamado %s. ¿Desea continuar?"
+
+#: ../gtk/gtkdialogs.c:1036
+msgid "Merge Groups"
+msgstr "Fusionar grupos"
+
+#: ../gtk/gtkdialogs.c:1037
+msgid "_Merge Groups"
+msgstr "_Fusionar grupos"
+
+#: ../gtk/gtkdialogs.c:1087
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -4041,29 +2592,29 @@
 "Está a punto de borrar el grupo %s junto con todos sus miembros de la lista "
 "de amigos. ÂżDesea continuar?"
 
-#: ../src/gtkdialogs.c:935 src/gtkdialogs.c:916 src/gtkdialogs.c:917
+#: ../gtk/gtkdialogs.c:1090
 msgid "Remove Group"
 msgstr "Eliminar grupo"
 
-#: ../src/gtkdialogs.c:936
+#: ../gtk/gtkdialogs.c:1091
 msgid "_Remove Group"
 msgstr "_Eliminar grupo"
 
-#: ../src/gtkdialogs.c:969 src/gtkdialogs.c:955
+#: ../gtk/gtkdialogs.c:1124
 #, 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:972 src/gtkdialogs.c:958 src/gtkdialogs.c:959
+#: ../gtk/gtkdialogs.c:1127
 msgid "Remove Buddy"
 msgstr "Eliminar amigo"
 
-#: ../src/gtkdialogs.c:973
+#: ../gtk/gtkdialogs.c:1128
 msgid "_Remove Buddy"
 msgstr "_Eliminar amigo"
 
-#: ../src/gtkdialogs.c:994 src/gtkdialogs.c:997
+#: ../gtk/gtkdialogs.c:1149
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -4071,177 +2622,187 @@
 msgstr ""
 "Está a punto de eliminar el chat %s de su lista de amigos. ¿Desea continuar?"
 
-#: ../src/gtkdialogs.c:997 src/gtkdialogs.c:1000 src/gtkdialogs.c:1001
+#: ../gtk/gtkdialogs.c:1152
 msgid "Remove Chat"
 msgstr "Eliminar chat"
 
-#: ../src/gtkdialogs.c:998
+#: ../gtk/gtkdialogs.c:1153
 msgid "_Remove Chat"
 msgstr "_Eliminar chat"
 
-#: ../src/gtkft.c:139 src/gtkft.c:139
+#: ../gtk/gtkft.c:133
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KiB/s"
 
-#: ../src/gtkft.c:160 ../src/gtkft.c:1063 src/gtkft.c:160 src/gtkft.c:1063
+#: ../gtk/gtkft.c:153
+msgid "Not started"
+msgstr "No iniciado"
+
+#: ../gtk/gtkft.c:159 ../libgaim/account.c:1661
+#: ../libgaim/protocols/gg/gg.c:1002 ../libgaim/protocols/jabber/buddy.c:630
+#: ../libgaim/protocols/jabber/buddy.c:1361
+#: ../libgaim/protocols/jabber/buddy.c:1378
+#: ../libgaim/protocols/novell/novell.c:2868
+msgid "Unknown"
+msgstr "Desconocido"
+
+#: ../gtk/gtkft.c:162 ../gtk/gtkft.c:1114
 msgid "Finished"
 msgstr "Terminado"
 
-#: ../src/gtkft.c:163 ../src/gtkft.c:1003 src/gtkft.c:163 src/gtkft.c:1003
+#: ../gtk/gtkft.c:165 ../gtk/gtkft.c:1054
 msgid "Canceled"
 msgstr "Cancelado"
 
-#: ../src/gtkft.c:166 ../src/gtkft.c:922 src/gtkft.c:166 src/gtkft.c:922
+#: ../gtk/gtkft.c:168 ../gtk/gtkft.c:970
 msgid "Waiting for transfer to begin"
 msgstr "Esperando el comienzo de la transferencia"
 
-#: ../src/gtkft.c:219 src/gtkft.c:219
+#: ../gtk/gtkft.c:228
+#, c-format
+msgid "File Transfers - %d%% of %d files"
+msgstr "Trasferencias de archivo - %d%% de %d archivos"
+
+#: ../gtk/gtkft.c:233 ../gtk/gtkft.c:763
+msgid "File Transfers"
+msgstr "Transferencia de archivos"
+
+#: ../gtk/gtkft.c:273
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Recibiendo como:</b>"
 
-#: ../src/gtkft.c:221 src/gtkft.c:221
+#: ../gtk/gtkft.c:275
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Recibiendo de:</b>"
 
-#: ../src/gtkft.c:225 src/gtkft.c:225
+#: ../gtk/gtkft.c:279
 msgid "<b>Sending To:</b>"
 msgstr "<b>Enviando a:</b>"
 
-#: ../src/gtkft.c:227 src/gtkft.c:227
+#: ../gtk/gtkft.c:281
 msgid "<b>Sending As:</b>"
 msgstr "<b>Enviando como:</b>"
 
-#: ../src/gtkft.c:443 src/gtkft.c:442
+#: ../gtk/gtkft.c:497
 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:448 src/gtkft.c:447
+#: ../gtk/gtkft.c:502
 msgid "An error occurred while opening the file."
 msgstr "Se produjo un error al abrir el archivo."
 
-#: ../src/gtkft.c:485 src/gtkft.c:484
+#: ../gtk/gtkft.c:539
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "Error al lanzar %s: %s"
 
-#: ../src/gtkft.c:494 src/gtkft.c:493
+#: ../gtk/gtkft.c:548
 #, c-format
 msgid "Error running %s"
 msgstr "Error al ejecutar %s"
 
-#: ../src/gtkft.c:495 src/gtkft.c:494
+#: ../gtk/gtkft.c:549
 #, c-format
 msgid "Process returned error code %d"
 msgstr "El proceso devolviĂł el cĂłdigo de error %d"
 
-#: ../src/gtkft.c:589 src/gtkft.c:588
+#: ../gtk/gtkft.c:644
 msgid "Progress"
 msgstr "Progreso"
 
-#: ../src/gtkft.c:596 src/gtkft.c:595
+#: ../gtk/gtkft.c:651
 msgid "Filename"
 msgstr "Nombre de archivo"
 
-#: ../src/gtkft.c:603 src/gtkft.c:602
+#: ../gtk/gtkft.c:658
 msgid "Size"
 msgstr "Tamaño"
 
-#: ../src/gtkft.c:610 src/gtkft.c:609
+#: ../gtk/gtkft.c:665
 msgid "Remaining"
 msgstr "Restante"
 
-#: ../src/gtkft.c:641 src/gtkft.c:640
+#: ../gtk/gtkft.c:696
 msgid "Filename:"
 msgstr "Nombre de archivo:"
 
-#: ../src/gtkft.c:642 src/gtkft.c:641
+#: ../gtk/gtkft.c:697
 msgid "Local File:"
 msgstr "Archivo local:"
 
-#: ../src/gtkft.c:643 src/gtkft.c:642
-msgid "Status:"
-msgstr "Estado:"
-
-#: ../src/gtkft.c:644 src/gtkft.c:643
+#: ../gtk/gtkft.c:699
 msgid "Speed:"
 msgstr "Velocidad:"
 
-#: ../src/gtkft.c:645 src/gtkft.c:644
+#: ../gtk/gtkft.c:700
 msgid "Time Elapsed:"
 msgstr "Tiempo transcurrido:"
 
-#: ../src/gtkft.c:646 src/gtkft.c:645
+#: ../gtk/gtkft.c:701
 msgid "Time Remaining:"
 msgstr "Tiempo restante:"
 
-#: ../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
+#: ../gtk/gtkft.c:786
 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
+#: ../gtk/gtkft.c:796
 msgid "C_lear finished transfers"
 msgstr "_Limpiar transferencias terminadas"
 
 #. "Download Details" arrow
-#: ../src/gtkft.c:750 src/gtkft.c:750
+#: ../gtk/gtkft.c:805
 msgid "File transfer _details"
 msgstr "_Detalles de la transferencia de archivos"
 
-#. Pause button
-#: ../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:790 src/gtkft.c:790
+#: ../gtk/gtkft.c:845
 msgid "_Resume"
 msgstr "_Continuar"
 
-#: ../src/gtkft.c:1005 src/gtkft.c:1005
+#: ../gtk/gtkft.c:1056
 msgid "Failed"
 msgstr "FallĂł"
 
-#: ../src/gtkimhtml.c:818
+#: ../gtk/gtkimhtml.c:814
 msgid "Paste as Plain _Text"
 msgstr "Pe_gar como texto en claro"
 
-#: ../src/gtkimhtml.c:1316 src/gtkimhtml.c:1313
+#: ../gtk/gtkimhtml.c:826
+msgid "_Reset formatting"
+msgstr "_Limpiar formato"
+
+#: ../gtk/gtkimhtml.c:1318
 msgid "Hyperlink color"
 msgstr "Color de hiperenlace"
 
-#: ../src/gtkimhtml.c:1317 src/gtkimhtml.c:1314
+#: ../gtk/gtkimhtml.c:1319
 msgid "Color to draw hyperlinks."
 msgstr "Color para dibujar hiperenlaces."
 
-#: ../src/gtkimhtml.c:1320 src/gtkimhtml.c:1317
+#: ../gtk/gtkimhtml.c:1322
 msgid "Hyperlink prelight color"
 msgstr "Color de hiperenlace pre-iluminado"
 
-#: ../src/gtkimhtml.c:1321 src/gtkimhtml.c:1318
+#: ../gtk/gtkimhtml.c:1323
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Color para dibujar hiperenlaces cuando el ratón esté encima."
 
-#: ../src/gtkimhtml.c:1542 src/gtkimhtml.c:1537
+#: ../gtk/gtkimhtml.c:1544
 msgid "_Copy E-Mail Address"
 msgstr "_Copiar direcciĂłn de correo electrĂłnico"
 
-#: ../src/gtkimhtml.c:1554 src/gtkimhtml.c:1549
+#: ../gtk/gtkimhtml.c:1556
 msgid "_Open Link in Browser"
 msgstr "_Abrir enlace en navegador"
 
-#: ../src/gtkimhtml.c:1564 src/gtkimhtml.c:1559
+#: ../gtk/gtkimhtml.c:1566
 msgid "_Copy Link Location"
 msgstr "_Copiar destino del enlace"
 
-#: ../src/gtkimhtml.c:3261
+#: ../gtk/gtkimhtml.c:3291
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -4251,7 +2812,7 @@
 "\n"
 "Tomando PNG por omisiĂłn."
 
-#: ../src/gtkimhtml.c:3264
+#: ../gtk/gtkimhtml.c:3294
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -4261,18 +2822,19 @@
 "\n"
 "Tomando PNG por omisiĂłn."
 
-#: ../src/gtkimhtml.c:3277 src/gtkimhtml.c:3259
+#: ../gtk/gtkimhtml.c:3307
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
 "\n"
 "%s"
 msgstr ""
-"<span size='larger' weight='bold'>Se produjo 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:3280
+#: ../gtk/gtkimhtml.c:3310
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -4283,36 +2845,35 @@
 "\n"
 "%s"
 
-#: ../src/gtkimhtml.c:3360 ../src/gtkimhtml.c:3372 src/gtkimhtml.c:3342
-#: src/gtkimhtml.c:3354
+#: ../gtk/gtkimhtml.c:3390 ../gtk/gtkimhtml.c:3402
 msgid "Save Image"
 msgstr "Guardar imagen"
 
-#: ../src/gtkimhtml.c:3400 src/gtkimhtml.c:3382
+#: ../gtk/gtkimhtml.c:3430
 msgid "_Save Image..."
 msgstr "_Guardar imagen..."
 
-#: ../src/gtkimhtmltoolbar.c:147 src/gtkimhtmltoolbar.c:147
+#: ../gtk/gtkimhtmltoolbar.c:147
 msgid "Select Font"
 msgstr "Seleccionar tipografĂ­a"
 
-#: ../src/gtkimhtmltoolbar.c:226 src/gtkimhtmltoolbar.c:226
+#: ../gtk/gtkimhtmltoolbar.c:226
 msgid "Select Text Color"
 msgstr "Seleccionar el color del texto"
 
-#: ../src/gtkimhtmltoolbar.c:305 src/gtkimhtmltoolbar.c:305
+#: ../gtk/gtkimhtmltoolbar.c:305
 msgid "Select Background Color"
 msgstr "Seleccionar el color de fondo"
 
-#: ../src/gtkimhtmltoolbar.c:394 src/gtkimhtmltoolbar.c:394
+#: ../gtk/gtkimhtmltoolbar.c:394
 msgid "_URL"
 msgstr "_URL"
 
-#: ../src/gtkimhtmltoolbar.c:402 src/gtkimhtmltoolbar.c:402
+#: ../gtk/gtkimhtmltoolbar.c:402
 msgid "_Description"
 msgstr "_DescripciĂłn"
 
-#: ../src/gtkimhtmltoolbar.c:405 src/gtkimhtmltoolbar.c:405
+#: ../gtk/gtkimhtmltoolbar.c:405
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -4320,143 +2881,150 @@
 "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
+#: ../gtk/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
+#: ../gtk/gtkimhtmltoolbar.c:414
 msgid "Insert Link"
 msgstr "Insertar enlace"
 
-#: ../src/gtkimhtmltoolbar.c:418 src/gtkimhtmltoolbar.c:418
+#: ../gtk/gtkimhtmltoolbar.c:418
 msgid "_Insert"
 msgstr "_Insertar"
 
-#: ../src/gtkimhtmltoolbar.c:487 src/gtkimhtmltoolbar.c:487
+#: ../gtk/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
+#: ../gtk/gtkimhtmltoolbar.c:513 ../gtk/gtkimhtmltoolbar.c:523
 msgid "Insert Image"
 msgstr "Insertar imagen"
 
-#: ../src/gtkimhtmltoolbar.c:721 src/gtkimhtmltoolbar.c:721
+#: ../gtk/gtkimhtmltoolbar.c:721
 msgid "This theme has no available smileys."
 msgstr "Este tema no tiene emoticonos disponibles."
 
 #. show everything
-#: ../src/gtkimhtmltoolbar.c:735 src/gtkimhtmltoolbar.c:735
+#: ../gtk/gtkimhtmltoolbar.c:735
 msgid "Smile!"
 msgstr "¡Sonría!"
 
-#: ../src/gtkimhtmltoolbar.c:923 src/gtkimhtmltoolbar.c:916
+#: ../gtk/gtkimhtmltoolbar.c:922
 msgid "Bold"
 msgstr "Negrita"
 
-#: ../src/gtkimhtmltoolbar.c:934 src/gtkimhtmltoolbar.c:927
+#: ../gtk/gtkimhtmltoolbar.c:933
 msgid "Italic"
 msgstr "Cursiva"
 
-#: ../src/gtkimhtmltoolbar.c:945 src/gtkimhtmltoolbar.c:938
+#: ../gtk/gtkimhtmltoolbar.c:944
 msgid "Underline"
 msgstr "Subrayado"
 
-#: ../src/gtkimhtmltoolbar.c:961 src/gtkimhtmltoolbar.c:954
+#: ../gtk/gtkimhtmltoolbar.c:960
 msgid "Larger font size"
 msgstr "Tamaño de tipografía mayor"
 
-#: ../src/gtkimhtmltoolbar.c:973 src/gtkimhtmltoolbar.c:966
+#: ../gtk/gtkimhtmltoolbar.c:972
 msgid "Smaller font size"
 msgstr "Tamaño de tipografía menor"
 
-#: ../src/gtkimhtmltoolbar.c:990 src/gtkimhtmltoolbar.c:983
-msgid "Font Face"
+#: ../gtk/gtkimhtmltoolbar.c:989
+msgid "Font face"
 msgstr "Estilo de tipografĂ­a"
 
-#: ../src/gtkimhtmltoolbar.c:1002 src/gtkimhtmltoolbar.c:995
+#: ../gtk/gtkimhtmltoolbar.c:1001
 msgid "Foreground font color"
 msgstr "Color del texto"
 
-#: ../src/gtkimhtmltoolbar.c:1030 src/gtkimhtmltoolbar.c:1023
-msgid "Clear formatting"
+#: ../gtk/gtkimhtmltoolbar.c:1013
+msgid "Background color"
+msgstr "Color de fondo"
+
+#: ../gtk/gtkimhtmltoolbar.c:1029
+msgid "Reset formatting"
 msgstr "Limpiar formato"
 
-#: ../src/gtkimhtmltoolbar.c:1045 src/gtkimhtmltoolbar.c:1038
+#: ../gtk/gtkimhtmltoolbar.c:1044
 msgid "Insert link"
 msgstr "Insertar enlace"
 
-#: ../src/gtkimhtmltoolbar.c:1055 src/gtkimhtmltoolbar.c:1048
+#: ../gtk/gtkimhtmltoolbar.c:1054
 msgid "Insert image"
 msgstr "Insertar imagen"
 
 # No estoy muy seguro de usar emoticono, quizás «smiley» sería más apropiado
-#: ../src/gtkimhtmltoolbar.c:1066 src/gtkimhtmltoolbar.c:1059
+#: ../gtk/gtkimhtmltoolbar.c:1065
 msgid "Insert smiley"
 msgstr "Insertar emoticono"
 
-#: ../src/gtklog.c:202
+#: ../gtk/gtklog.c:238
 #, 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
+#: ../gtk/gtklog.c:243
 #, 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
+#: ../gtk/gtklog.c:292
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../src/gtklog.c:311 src/gtklog.c:324
+#: ../gtk/gtklog.c:339
 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:315 src/gtklog.c:328
+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»."
+
+#: ../gtk/gtklog.c:343
 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:331
+msgstr ""
+"Sólo se registrarán los mensajes instantáneos si está habilitada la "
+"preferencia «Registrar todos los mensajes instantáneos»."
+
+#: ../gtk/gtklog.c:346
 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
+#: ../gtk/gtklog.c:350
 msgid "No logs were found"
 msgstr "No se encontraron registros"
 
-#: ../src/gtklog.c:398 src/gtklog.c:411
+#: ../gtk/gtklog.c:429
 msgid "Total log size:"
 msgstr "Tamaño total del registro:"
 
-#: ../src/gtklog.c:474 src/gtklog.c:487
+#: ../gtk/gtklog.c:495
 #, c-format
 msgid "Conversations in %s"
 msgstr "Conversaciones en %s"
 
-#: ../src/gtklog.c:482 ../src/gtklog.c:533 src/gtklog.c:495 src/gtklog.c:546
+#: ../gtk/gtklog.c:503 ../gtk/gtklog.c:554
 #, c-format
 msgid "Conversations with %s"
 msgstr "Conversaciones con %s"
 
-#: ../src/gtklog.c:558 src/gtklog.c:571
+#: ../gtk/gtklog.c:579
 msgid "System Log"
 msgstr "Registro del Sistema"
 
-#: ../src/gtkmain.c:312 src/gtkmain.c:326
+#: ../gtk/gtkmain.c:342
 #, 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:314
+#: ../gtk/gtkmain.c:344
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4484,7 +3052,7 @@
 "                       indica la(s) cuenta(s) a usar, separadas por comas)\n"
 "  -v, --version        mostrar la versiĂłn actual y salir\n"
 
-#: ../src/gtkmain.c:497
+#: ../gtk/gtkmain.c:526
 #, c-format
 msgid ""
 "Gaim has segfaulted and attempted to dump a core file.\n"
@@ -4523,72 +3091,22 @@
 "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
+#: ../gtk/gtknotify.c:348
 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
+#: ../gtk/gtknotify.c:432
 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:451 src/gtknotify.c:269
+#: ../gtk/gtknotify.c:498
 #, 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:456 src/gtknotify.c:313
+#: ../gtk/gtknotify.c:503
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -4599,59 +3117,45 @@
 "\n"
 "%s"
 
-#: ../src/gtknotify.c:643 ../src/protocols/sametime/sametime.c:5460
-#: src/gtknotify.c:500
+#: ../gtk/gtknotify.c:692 ../libgaim/protocols/sametime/sametime.c:5459
 msgid "Search Results"
 msgstr "Resultados de la bĂşsqueda"
 
-#: ../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: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: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: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
+#: ../gtk/gtknotify.c:890
+#, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr "La orden de navegador «%s» no es válida."
+
+#: ../gtk/gtknotify.c:892 ../gtk/gtknotify.c:904 ../gtk/gtknotify.c:917
+#: ../gtk/gtknotify.c:1045
 msgid "Unable to open URL"
 msgstr "No se pudo abrir la URL"
 
-#: ../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:993 src/gtknotify.c:834
+#: ../gtk/gtknotify.c:902 ../gtk/gtknotify.c:915
+#, c-format
+msgid "Error launching \"%s\": %s"
+msgstr "Error al lanzar «%s»: %s"
+
+#: ../gtk/gtknotify.c:1046
 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/gtkplugin.c:275
+#: ../gtk/gtkplugin.c:274
 msgid "The following plugins will be unloaded."
 msgstr "Se van a desactivar los siguientes complementos."
 
-#: ../src/gtkplugin.c:294
+#: ../gtk/gtkplugin.c:293
 msgid "Multiple plugins will be unloaded."
 msgstr "Se desactivarán múltiples complementos."
 
-#: ../src/gtkplugin.c:296
+#: ../gtk/gtkplugin.c:295
 msgid "Unload Plugins"
 msgstr "Desactivar complementos"
 
-#: ../src/gtkplugin.c:410
+#: ../gtk/gtkplugin.c:407
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -4662,7 +3166,7 @@
 "<span weight=\"bold\">Sitio Web:</span>\t\t%s\n"
 "<span weight=\"bold\">Nombre del archivo:</span>\t\t%s"
 
-#: ../src/gtkplugin.c:420
+#: ../gtk/gtkplugin.c:417
 #, c-format
 msgid ""
 "%s\n"
@@ -4673,203 +3177,212 @@
 "<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
+#: ../gtk/gtkplugin.c:543
 msgid "Configure Pl_ugin"
 msgstr "Configurar complemento"
 
-#: src/gtkplugin.c:437
+#: ../gtk/gtkplugin.c:603
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Detalles del complemento</b>"
 
-#: ../src/gtkpounce.c:162 src/gtkpounce.c:157
+#: ../gtk/gtkpounce.c:155
 msgid "Select a file"
 msgstr "Seleccione un archivo"
 
-#: ../src/gtkpounce.c:259 src/gtkpounce.c:254
+#: ../gtk/gtkpounce.c:252
 msgid "Please enter a buddy to pounce."
 msgstr "Indique el amigo del que avisar."
 
-#: ../src/gtkpounce.c:503 src/gtkpounce.c:476
+#: ../gtk/gtkpounce.c:499
 msgid "New Buddy Pounce"
 msgstr "Nuevo aviso de amigo"
 
-#: ../src/gtkpounce.c:503 src/gtkpounce.c:476
+#: ../gtk/gtkpounce.c:499
 msgid "Edit Buddy Pounce"
 msgstr "Editar aviso de amigo"
 
 #. Create the "Pounce on Whom" frame.
-#: ../src/gtkpounce.c:520
+#: ../gtk/gtkpounce.c:516
 msgid "Pounce on Whom"
 msgstr "A quién avisar"
 
-#: ../src/gtkpounce.c:547 src/gtkpounce.c:520
+#: ../gtk/gtkpounce.c:543
 msgid "_Buddy name:"
 msgstr "Nombre del _amigo:"
 
-#. Create the "Pounce When" frame.
-#: src/gtkpounce.c:544
+#. Create the "Pounce When Buddy..." frame.
+#: ../gtk/gtkpounce.c:569
 msgid "Pounce When Buddy..."
 msgstr "Avisar cuando un amigo..."
 
-#: src/gtkpounce.c:552
+#: ../gtk/gtkpounce.c:577
 msgid "Si_gns on"
-msgstr "_Conectarse"
-
-#: src/gtkpounce.c:554
+msgstr "Se _conecta"
+
+#: ../gtk/gtkpounce.c:579
 msgid "Signs o_ff"
-msgstr "_Desconectarse"
-
-#: src/gtkpounce.c:556
+msgstr "Se _desconecta"
+
+#: ../gtk/gtkpounce.c:581
 msgid "Goes a_way"
-msgstr "El amigo se _ausenta"
-
-#: src/gtkpounce.c:558
+msgstr "Se _ausenta"
+
+#: ../gtk/gtkpounce.c:583
 msgid "Ret_urns from away"
-msgstr "_Dejar de estar ausente"
-
-#: src/gtkpounce.c:560
+msgstr "_Deja de estar ausente"
+
+#: ../gtk/gtkpounce.c:585
 msgid "Becomes _idle"
-msgstr "Ahora está inactivo"
-
-#: src/gtkpounce.c:562
+msgstr "Está _inactivo"
+
+#: ../gtk/gtkpounce.c:587
 msgid "Is no longer i_dle"
-msgstr "Ya no está inactivo."
-
-#: src/gtkpounce.c:564
+msgstr "Ya no está i_nactivo."
+
+#: ../gtk/gtkpounce.c:589
 msgid "Starts _typing"
-msgstr "El amigo empieza a _escribir"
-
-#: src/gtkpounce.c:566
+msgstr "Empieza a _escribir"
+
+#: ../gtk/gtkpounce.c:591
+msgid "P_auses while typing"
+msgstr "Se _pausa mientras escribe"
+
+#: ../gtk/gtkpounce.c:593
 msgid "Stops t_yping"
-msgstr "El amigo deja de escribi_r"
-
-#: ../src/gtkpounce.c:595
+msgstr "Deja de escribi_r"
+
+#: ../gtk/gtkpounce.c:595
 msgid "Sends a _message"
 msgstr "EnvĂ­a un _mensaje"
 
 #. Create the "Action" frame.
-#: ../src/gtkpounce.c:627
+#: ../gtk/gtkpounce.c:630
 msgid "Action"
 msgstr "AcciĂłn"
 
-#: src/gtkpounce.c:603
+#: ../gtk/gtkpounce.c:638
 msgid "Ope_n an IM window"
 msgstr "_Abrir una ventana de MI"
 
-#: src/gtkpounce.c:605
+#: ../gtk/gtkpounce.c:640
 msgid "_Pop up a notification"
 msgstr "_NotificaciĂłn con una ventana emergente"
 
-#: ../src/gtkpounce.c:639 src/gtkpounce.c:607
+#: ../gtk/gtkpounce.c:642
 msgid "Send a _message"
 msgstr "Enviar un _mensaje"
 
-#: ../src/gtkpounce.c:641 src/gtkpounce.c:609
+#: ../gtk/gtkpounce.c:644
 msgid "E_xecute a command"
 msgstr "E_jecutar una orden"
 
-#: ../src/gtkpounce.c:643 src/gtkpounce.c:611
+#: ../gtk/gtkpounce.c:646
 msgid "P_lay a sound"
 msgstr "Re_producir un sonido"
 
 # Examinar puede ser también válido, comprobar, jfs.
-#: src/gtkpounce.c:615
+#: ../gtk/gtkpounce.c:651
 msgid "Brows_e..."
 msgstr "_Navegar..."
 
 # Examinar puede ser también válido, comprobar, jfs.
-#: src/gtkpounce.c:617
+#: ../gtk/gtkpounce.c:653
 msgid "Br_owse..."
 msgstr "_Navegar..."
 
-#: ../src/gtkpounce.c:651 src/gtkpounce.c:618
+#: ../gtk/gtkpounce.c:654
 msgid "Pre_view"
 msgstr "Pre_visualizar"
 
 #. Create the "Options" frame.
-#: ../src/gtkpounce.c:763
+#: ../gtk/gtkpounce.c:766
 msgid "Options"
 msgstr "Opciones"
 
-#: ../src/gtkpounce.c:771
+#: ../gtk/gtkpounce.c:774
 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
+#: ../gtk/gtkpounce.c:779
 msgid "_Recurring"
 msgstr "_Recurrente"
 
-#: src/gtkpounce.c:997
+#: ../gtk/gtkpounce.c:1085
 #, 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
+#: ../gtk/gtkpounce.c:1233
 msgid "Pounce Target"
 msgstr "Objetivo a avisar"
 
-#: ../src/gtkpounce.c:1273 src/gtkpounce.c:1180
+#: ../gtk/gtkpounce.c:1268
 msgid "Recurring"
 msgstr "Recurrente"
 
-#: src/gtkpounce.c:1227
+#: ../gtk/gtkpounce.c:1315
 msgid "Buddy Pounces"
 msgstr "Avisos de amigos"
 
-#: ../src/gtkpounce.c:1447 src/gtkpounce.c:1345
+#: ../gtk/gtkpounce.c:1442
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s ha comenzado a escribirle algo (%s)"
 
-#: ../src/gtkpounce.c:1449 src/gtkpounce.c:1347
+#: ../gtk/gtkpounce.c:1444
+#, c-format
+msgid "%s has paused while typing to you (%s)"
+msgstr "%s ha parado mientras le escribĂ­a algo (%s)"
+
+#: ../gtk/gtkpounce.c:1446
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s se ha conectado (%s)"
 
-#: ../src/gtkpounce.c:1451 src/gtkpounce.c:1349
+#: ../gtk/gtkpounce.c:1448
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s volviĂł de su inactividad (%s)"
 
-#: ../src/gtkpounce.c:1453 src/gtkpounce.c:1351
+#: ../gtk/gtkpounce.c:1450
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s ha dejado de estar ausente (%s)"
 
-#: ../src/gtkpounce.c:1455 src/gtkpounce.c:1353
+#: ../gtk/gtkpounce.c:1452
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s ha dejado de escribirle (%s)"
 
-#: ../src/gtkpounce.c:1457 src/gtkpounce.c:1355
+#: ../gtk/gtkpounce.c:1454
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s se ha desconectado (%s)"
 
-#: ../src/gtkpounce.c:1459 src/gtkpounce.c:1357
+#: ../gtk/gtkpounce.c:1456
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s está inactivo (%s)"
 
-#: ../src/gtkpounce.c:1461 src/gtkpounce.c:1359
+#: ../gtk/gtkpounce.c:1458
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s se ha marchado. (%s)"
 
-#: ../src/gtkpounce.c:1463
+#: ../gtk/gtkpounce.c:1460
 #, 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
+#: ../gtk/gtkpounce.c:1461
 msgid "Unknown pounce event. Please report this!"
 msgstr "Evento de aviso desconocido. ¡Por favor, informe de esto! "
 
-#: src/gtkprefs.c:511
+#: ../gtk/gtkprefs.c:512
 msgid "Smiley theme failed to unpack."
 msgstr "FallĂł el desempaque de tema de emoticonos"
 
-#: ../src/gtkprefs.c:638 src/gtkprefs.c:630
+#: ../gtk/gtkprefs.c:641
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -4877,55 +3390,66 @@
 "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:673 src/gtkprefs.c:665
+#: ../gtk/gtkprefs.c:676
 msgid "Icon"
 msgstr "Icono"
 
-#: ../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
+#: ../gtk/gtkprefs.c:683 ../libgaim/protocols/jabber/buddy.c:286
+#: ../libgaim/protocols/jabber/buddy.c:923
+#: ../libgaim/protocols/jabber/chat.c:769
 msgid "Description"
 msgstr "DescripciĂłn"
 
-#: src/gtkprefs.c:814
+#: ../gtk/gtkprefs.c:824
 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
+#: ../gtk/gtkprefs.c:826 ../gtk/gtkprefs.c:1769 ../gtk/gtkprefs.c:1783
+#: ../gtk/plugins/docklet/docklet.c:684 ../gtk/plugins/docklet/docklet.c:692
+#: ../gtk/plugins/win32/winprefs/winprefs.c:458
+msgid "Never"
+msgstr "Nunca"
+
+#: ../gtk/gtkprefs.c:827 ../gtk/gtkprefs.c:1784
 msgid "When away"
 msgstr "Cuando está ausente"
 
-#: ../src/gtkprefs.c:828 src/gtkprefs.c:821
+#: ../gtk/gtkprefs.c:828 ../gtk/plugins/docklet/docklet.c:686
+#: ../gtk/plugins/docklet/docklet.c:694 ../gtk/plugins/timestamp_format.c:39
+#: ../gtk/plugins/timestamp_format.c:48
+#: ../gtk/plugins/win32/winprefs/winprefs.c:459
+msgid "Always"
+msgstr "Siempre"
+
+#: ../gtk/gtkprefs.c:831
 msgid "Send unknown \"_slash\" commands as messages"
 msgstr "Enviar órdenes «_slash» desconocidas como mensajes"
 
-#: ../src/gtkprefs.c:830 src/gtkprefs.c:823
+#: ../gtk/gtkprefs.c:833
 msgid "Show _formatting on incoming messages"
 msgstr "Mostrar el _formato de los mensajes entrantes"
 
-#: ../src/gtkprefs.c:833 src/gtkprefs.c:826
+#: ../gtk/gtkprefs.c:836
 msgid "Show buddy _icons"
 msgstr "Mostrar _iconos de los amigos"
 
-#: ../src/gtkprefs.c:835 src/gtkprefs.c:828
+#: ../gtk/gtkprefs.c:838
 msgid "Enable buddy ic_on animation"
 msgstr "Habilitar animaciones en los i_conos de amigos"
 
-#: ../src/gtkprefs.c:842 src/gtkprefs.c:835
+#: ../gtk/gtkprefs.c:845
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Notificar a los amigos cuando les esté escribiendo"
 
-#: src/gtkprefs.c:838
+#: ../gtk/gtkprefs.c:848
 msgid "Highlight _misspelled words"
 msgstr "_Resaltar las faltas de ortografĂ­a"
 
-#: ../src/gtkprefs.c:849
+#: ../gtk/gtkprefs.c:852
 msgid "Use smooth-scrolling"
 msgstr "Utilizar paginado suave"
 
-#: ../src/gtkprefs.c:865 src/gtkprefs.c:856
+#: ../gtk/gtkprefs.c:868
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -4934,161 +3458,168 @@
 "soportan formatos. :)"
 
 #. All the tab options!
-#: ../src/gtkprefs.c:887 src/gtkprefs.c:878
+#: ../gtk/gtkprefs.c:890
 msgid "Tab Options"
 msgstr "Opciones de las solapas"
 
-#: ../src/gtkprefs.c:889 src/gtkprefs.c:880
+#: ../gtk/gtkprefs.c:892
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Mostrar MIs y chats en ventanas con solapas."
 
-#: ../src/gtkprefs.c:903 src/gtkprefs.c:894
+#: ../gtk/gtkprefs.c:906
 msgid "Show close b_utton on tabs"
 msgstr "Mostrar botones de _cierre en las solapas"
 
-#: ../src/gtkprefs.c:909 src/gtkprefs.c:900
+#: ../gtk/gtkprefs.c:912
 msgid "_Placement:"
 msgstr "_ColocaciĂłn:"
 
-#: ../src/gtkprefs.c:911 src/gtkprefs.c:902
+#: ../gtk/gtkprefs.c:914
 msgid "Top"
 msgstr "Arriba"
 
-#: ../src/gtkprefs.c:912 src/gtkprefs.c:903
+#: ../gtk/gtkprefs.c:915
 msgid "Bottom"
 msgstr "Abajo"
 
-#: ../src/gtkprefs.c:913 src/gtkprefs.c:904
+#: ../gtk/gtkprefs.c:916
 msgid "Left"
 msgstr "Izquierda"
 
-#: ../src/gtkprefs.c:914 src/gtkprefs.c:905
+#: ../gtk/gtkprefs.c:917
 msgid "Right"
 msgstr "Derecha"
 
-#: ../src/gtkprefs.c:916 src/gtkprefs.c:907
+#: ../gtk/gtkprefs.c:919
 msgid "Left Vertical"
 msgstr "Vertical a la izquierda"
 
-#: ../src/gtkprefs.c:917 src/gtkprefs.c:908
+#: ../gtk/gtkprefs.c:920
 msgid "Right Vertical"
 msgstr "Vertical a la derecha"
 
-#: ../src/gtkprefs.c:922 src/gtkprefs.c:913
+#: ../gtk/gtkprefs.c:925
 msgid "N_ew conversations:"
 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
+#: ../gtk/gtkprefs.c:976 ../libgaim/protocols/oscar/oscar.c:779
+#: ../libgaim/protocols/oscar/oscar.c:3627
 msgid "IP Address"
 msgstr "DirecciĂłn IP"
 
-#: src/gtkprefs.c:966
+#: ../gtk/gtkprefs.c:978
 msgid "ST_UN server:"
 msgstr "Servidor ST_UN:"
 
-#: src/gtkprefs.c:968
+#: ../gtk/gtkprefs.c:990
+msgid "<span style=\"italic\">Example: stunserver.org</span>"
+msgstr "<span style=\"italic\">Ejemplo: stunserver.org</span>"
+
+#: ../gtk/gtkprefs.c:994
 msgid "_Autodetect IP address"
 msgstr "_Auto detectar la direcciĂłn IP"
 
-#: ../src/gtkprefs.c:986 src/gtkprefs.c:977
+#: ../gtk/gtkprefs.c:1003
 msgid "Public _IP:"
 msgstr "_IP pĂşblica:"
 
-#: ../src/gtkprefs.c:1014 src/gtkprefs.c:1001
+#: ../gtk/gtkprefs.c:1032
 msgid "Ports"
 msgstr "Puertos"
 
-#: ../src/gtkprefs.c:1017 src/gtkprefs.c:1004
+#: ../gtk/gtkprefs.c:1035
 msgid "_Manually specify range of ports to listen on"
 msgstr "Especificar _manualmente el rango de puertos en el que se escuchará"
 
-#: src/gtkprefs.c:1007
+#: ../gtk/gtkprefs.c:1038
 msgid "_Start port:"
 msgstr "Puerto _inicial:"
 
-#: src/gtkprefs.c:1014
+#: ../gtk/gtkprefs.c:1045
 msgid "_End port:"
 msgstr "Puerto _final:"
 
-#: ../src/gtkprefs.c:1035 src/gtkprefs.c:1022
+#: ../gtk/gtkprefs.c:1053
 msgid "Proxy Server"
 msgstr "Servidor proxy"
 
-#: ../src/gtkprefs.c:1039 src/gtkprefs.c:1026
+#: ../gtk/gtkprefs.c:1057
 msgid "No proxy"
 msgstr "Sin proxy"
 
-#: ../src/gtkprefs.c:1095 src/gtkprefs.c:1082
+#: ../gtk/gtkprefs.c:1113
 msgid "_User:"
 msgstr "_Usuario:"
 
-#: ../src/gtkprefs.c:1157 src/gtkprefs.c:1144
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: ../src/gtkprefs.c:1158 src/gtkprefs.c:1145
-msgid "Firebird"
-msgstr "Firebird"
-
-#: ../src/gtkprefs.c:1159 src/gtkprefs.c:1146
-msgid "Firefox"
-msgstr "Firefox"
-
-#: ../src/gtkprefs.c:1160 src/gtkprefs.c:1147
-msgid "Galeon"
-msgstr "Galeon"
-
-#: ../src/gtkprefs.c:1161 src/gtkprefs.c:1148
-msgid "GNOME Default"
-msgstr "Valores por omisiĂłn de Gnome"
-
-#: ../src/gtkprefs.c:1162 src/gtkprefs.c:1149
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: ../src/gtkprefs.c:1163 src/gtkprefs.c:1150
+#: ../gtk/gtkprefs.c:1176
+msgid "Seamonkey"
+msgstr "Seamonkey"
+
+#: ../gtk/gtkprefs.c:1177
+msgid "Opera"
+msgstr "Opera"
+
+#: ../gtk/gtkprefs.c:1178
+msgid "Netscape"
+msgstr "Netscape"
+
+#: ../gtk/gtkprefs.c:1179
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../src/gtkprefs.c:1164 src/gtkprefs.c:1151
-msgid "Netscape"
-msgstr "Netscape"
-
-#: ../src/gtkprefs.c:1165 src/gtkprefs.c:1152
-msgid "Opera"
-msgstr "Opera"
-
-#: ../src/gtkprefs.c:1174 src/gtkprefs.c:1161
+#: ../gtk/gtkprefs.c:1180
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: ../gtk/gtkprefs.c:1181
+msgid "GNOME Default"
+msgstr "Valores por omisiĂłn de Gnome"
+
+#: ../gtk/gtkprefs.c:1182
+msgid "Galeon"
+msgstr "Galeon"
+
+#: ../gtk/gtkprefs.c:1183
+msgid "Firefox"
+msgstr "Firefox"
+
+#: ../gtk/gtkprefs.c:1184
+msgid "Firebird"
+msgstr "Firebird"
+
+#: ../gtk/gtkprefs.c:1185
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: ../gtk/gtkprefs.c:1194
 msgid "Manual"
 msgstr "Manual"
 
-#: ../src/gtkprefs.c:1227 src/gtkprefs.c:1214
+#: ../gtk/gtkprefs.c:1247
 msgid "Browser Selection"
 msgstr "SelecciĂłn de navegador"
 
-#: ../src/gtkprefs.c:1231 src/gtkprefs.c:1218
+#: ../gtk/gtkprefs.c:1251
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../src/gtkprefs.c:1239 src/gtkprefs.c:1226
+#: ../gtk/gtkprefs.c:1259
 msgid "_Open link in:"
 msgstr "_Abrir enlace en:"
 
-#: ../src/gtkprefs.c:1241 src/gtkprefs.c:1228
+#: ../gtk/gtkprefs.c:1261
 msgid "Browser default"
 msgstr "Navegador por omisiĂłn"
 
-#: ../src/gtkprefs.c:1242 src/gtkprefs.c:1229
+#: ../gtk/gtkprefs.c:1262
 msgid "Existing window"
 msgstr "Ventana existente"
 
-#: ../src/gtkprefs.c:1244 src/gtkprefs.c:1231
+#: ../gtk/gtkprefs.c:1264
 msgid "New tab"
-msgstr "Nueva pestaña"
-
-#: ../src/gtkprefs.c:1258 src/gtkprefs.c:1245
+msgstr "Nueva solapa"
+
+#: ../gtk/gtkprefs.c:1278
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -5097,85 +3628,79 @@
 "_Manual:\n"
 "(%s para URL)"
 
-#: ../src/gtkprefs.c:1294 ../src/gtkprefs.c:1875 src/gtkprefs.c:1281
-#: src/gtkprefs.c:1754
-msgid "Logging"
-msgstr "Registro"
-
-#: src/gtkprefs.c:1284
+#: ../gtk/gtkprefs.c:1317
 msgid "Log _format:"
 msgstr "Formato de _registro:"
 
-#: ../src/gtkprefs.c:1302 src/gtkprefs.c:1289
+#: ../gtk/gtkprefs.c:1322
 msgid "Log all _instant messages"
 msgstr "Registrar todos los mensajes _instantáneos"
 
-#: ../src/gtkprefs.c:1304 src/gtkprefs.c:1291
+#: ../gtk/gtkprefs.c:1324
 msgid "Log all c_hats"
 msgstr "Registrar todas las _charlas"
 
-#: ../src/gtkprefs.c:1306 src/gtkprefs.c:1293
+#: ../gtk/gtkprefs.c:1326
 msgid "Log all _status changes to system log"
 msgstr "Registrar todos los cambios de _estado en el registro del sistema"
 
-#: ../src/gtkprefs.c:1454 src/gtkprefs.c:1425
+#: ../gtk/gtkprefs.c:1474
 msgid "Sound Selection"
 msgstr "SelecciĂłn de sonido"
 
-#: ../src/gtkprefs.c:1462
+#: ../gtk/gtkprefs.c:1482
 msgid "Quietest"
 msgstr "El más silencioso"
 
-#: ../src/gtkprefs.c:1464
+#: ../gtk/gtkprefs.c:1484
 msgid "Quieter"
 msgstr "Más silencioso"
 
-#: ../src/gtkprefs.c:1466
+#: ../gtk/gtkprefs.c:1486
 msgid "Quiet"
 msgstr "Silencio"
 
-#: ../src/gtkprefs.c:1468 ../src/protocols/silc/silc.c:666
-#: src/protocols/silc/silc.c:656
+#: ../gtk/gtkprefs.c:1488 ../libgaim/protocols/silc/silc.c:670
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/gtkprefs.c:1470
+#: ../gtk/gtkprefs.c:1490
 msgid "Loud"
 msgstr "Ruidoso"
 
-#: ../src/gtkprefs.c:1472
+#: ../gtk/gtkprefs.c:1492
 msgid "Louder"
 msgstr "Más ruidoso"
 
-#: ../src/gtkprefs.c:1474
+#: ../gtk/gtkprefs.c:1494
 msgid "Loudest"
 msgstr "El más ruidoso"
 
-#: ../src/gtkprefs.c:1537 src/gtkprefs.c:1479
+#: ../gtk/gtkprefs.c:1557
 msgid "Sound Method"
 msgstr "MĂ©todo para reproducir sonidos"
 
-#: ../src/gtkprefs.c:1538 src/gtkprefs.c:1480
+#: ../gtk/gtkprefs.c:1558
 msgid "_Method:"
 msgstr "_MĂ©todo:"
 
-#: ../src/gtkprefs.c:1540 src/gtkprefs.c:1482
+#: ../gtk/gtkprefs.c:1560
 msgid "Console beep"
 msgstr "Timbre de la consola"
 
-#: ../src/gtkprefs.c:1542 src/gtkprefs.c:1484
+#: ../gtk/gtkprefs.c:1562
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../src/gtkprefs.c:1547 src/gtkprefs.c:1489
+#: ../gtk/gtkprefs.c:1567
 msgid "Command"
 msgstr "Comando"
 
-#: ../src/gtkprefs.c:1548 src/gtkprefs.c:1490
+#: ../gtk/gtkprefs.c:1568
 msgid "No sounds"
 msgstr "Sin sonido"
 
-#: ../src/gtkprefs.c:1556 src/gtkprefs.c:1498
+#: ../gtk/gtkprefs.c:1576
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -5184,572 +3709,477 @@
 "_Comando para sonido:\n"
 "(%s para nombre de archivo)"
 
-#: ../src/gtkprefs.c:1582 src/gtkprefs.c:1524
+#: ../gtk/gtkprefs.c:1602
 msgid "Sound Options"
 msgstr "Opciones de sonido"
 
-#: ../src/gtkprefs.c:1583 src/gtkprefs.c:1525
+#: ../gtk/gtkprefs.c:1603
 msgid "Sounds when conversation has _focus"
 msgstr "Suena cuando la conversaciĂłn obtiene el _foco"
 
-#: ../src/gtkprefs.c:1585 src/gtkprefs.c:1527
+#: ../gtk/gtkprefs.c:1605
 msgid "_Sounds while away"
 msgstr "_Sonidos mientras vd. está ausente"
 
-#: ../src/gtkprefs.c:1592
+#: ../gtk/gtkprefs.c:1612
 msgid "Volume:"
 msgstr "Volumen:"
 
-#: ../src/gtkprefs.c:1620 src/gtkprefs.c:1537
+#: ../gtk/gtkprefs.c:1640
 msgid "Sound Events"
 msgstr "Eventos de sonido"
 
-#: ../src/gtkprefs.c:1671 src/gtkprefs.c:1588
+#: ../gtk/gtkprefs.c:1691
 msgid "Play"
 msgstr "Reproducir"
 
-#: ../src/gtkprefs.c:1678 src/gtkprefs.c:1595
+#: ../gtk/gtkprefs.c:1698
 msgid "Event"
 msgstr "Acontecimiento"
 
-#: ../src/gtkprefs.c:1697 src/gtkprefs.c:1614
+#: ../gtk/gtkprefs.c:1717
 msgid "Test"
 msgstr "Probar"
 
-#: ../src/gtkprefs.c:1701 src/gtkprefs.c:1618
+#: ../gtk/gtkprefs.c:1721
 msgid "Reset"
 msgstr "Restablecer"
 
-#: ../src/gtkprefs.c:1705 src/gtkprefs.c:1622
+#: ../gtk/gtkprefs.c:1725
 msgid "Choose..."
 msgstr "Seleccionar..."
 
-#: ../src/gtkprefs.c:1747
+#: ../gtk/gtkprefs.c:1767
 msgid "_Report idle time:"
 msgstr "Mostrar el _tiempo de inactividad"
 
-#: ../src/gtkprefs.c:1750
+#: ../gtk/gtkprefs.c:1770
 msgid "From last sent message"
 msgstr "Del Ăşltimo mensaje enviado"
 
-#: ../src/gtkprefs.c:1752
+#: ../gtk/gtkprefs.c:1772
 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
+#. Away stuff
+#. get_yahoo_status_from_gaim_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#: ../gtk/gtkprefs.c:1779 ../gtk/gtkstatusbox.c:939
+#: ../gtk/plugins/docklet/docklet.c:439 ../libgaim/protocols/gg/gg.c:999
+#: ../libgaim/protocols/irc/irc.c:530 ../libgaim/protocols/irc/msgs.c:223
+#: ../libgaim/protocols/jabber/buddy.c:1371
+#: ../libgaim/protocols/novell/novell.c:2856
+#: ../libgaim/protocols/oscar/oscar.c:694
+#: ../libgaim/protocols/oscar/oscar.c:4406
+#: ../libgaim/protocols/oscar/oscar.c:5473
+#: ../libgaim/protocols/silc/buddy.c:1469
+#: ../libgaim/protocols/yahoo/yahoo.c:3359
+#: ../libgaim/protocols/yahoo/yahoo.c:3432 ../libgaim/status.c:158
+msgid "Away"
+msgstr "Ausente"
+
+#: ../gtk/gtkprefs.c:1781
 msgid "_Auto-reply:"
 msgstr "Respuesta _automática:"
 
-#: ../src/gtkprefs.c:1765 src/gtkprefs.c:1667
+#: ../gtk/gtkprefs.c:1785
 msgid "When both away and idle"
 msgstr "Cuando está ausente e inactivo"
 
-#. #-#-#-#-#  es.po (Gaim)  #-#-#-#-#
 #. Auto-away stuff
-#: ../src/gtkprefs.c:1771 src/gtkprefs.c:1673
+#: ../gtk/gtkprefs.c:1791
 msgid "Auto-away"
 msgstr "Auto-ausencia"
 
-#: ../src/gtkprefs.c:1773 src/gtkprefs.c:1674
+#: ../gtk/gtkprefs.c:1793
 msgid "Change status when _idle"
 msgstr "Cambiar el estado cuando esté _inactivo"
 
-#: ../src/gtkprefs.c:1777 src/gtkprefs.c:1678
+#: ../gtk/gtkprefs.c:1797
 msgid "_Minutes before changing status:"
 msgstr "_Minutos antes de cambiar el estado:"
 
-#: ../src/gtkprefs.c:1785 src/gtkprefs.c:1686
+#: ../gtk/gtkprefs.c:1805
 msgid "Change _status to:"
 msgstr "Cambiar _estado a:"
 
 #. Signon status stuff
-#: ../src/gtkprefs.c:1806
-msgid "Status at startup"
+#: ../gtk/gtkprefs.c:1826
+msgid "Status at Startup"
 msgstr "Estado al arrancar"
 
-#: ../src/gtkprefs.c:1808
+#: ../gtk/gtkprefs.c:1828
 msgid "Use status from last _exit at startup"
 msgstr "Utilizar el estado de mi Ăşltima _salida al empezar"
 
-#: ../src/gtkprefs.c:1814
+#: ../gtk/gtkprefs.c:1834
 msgid "Status to a_pply at startup:"
 msgstr "Estado a _aplicar al empezar:"
 
-#: ../src/gtkprefs.c:1865 src/gtkprefs.c:1744
+#: ../gtk/gtkprefs.c:1885
 msgid "Smiley Themes"
 msgstr "Temas de emoticonos"
 
-#: ../src/gtkprefs.c:1866 src/gtkprefs.c:1745
+#: ../gtk/gtkprefs.c:1886
 msgid "Sounds"
 msgstr "Sonidos"
 
-#: ../src/gtkprefs.c:1867 ../src/protocols/silc/silc.c:1848
-#: src/gtkprefs.c:1746 src/protocols/silc/silc.c:1828
+#: ../gtk/gtkprefs.c:1887 ../libgaim/protocols/silc/silc.c:1851
 msgid "Network"
 msgstr "Red"
 
-#: ../src/gtkprefs.c:1872 src/gtkprefs.c:1751
+#: ../gtk/gtkprefs.c:1892
 msgid "Browser"
 msgstr "Navegador"
 
-#: ../src/gtkprefs.c:1876 src/gtkprefs.c:1755
+#: ../gtk/gtkprefs.c:1896
 msgid "Away / Idle"
 msgstr "Ausencia / Inactividad"
 
-#: ../src/gtkprivacy.c:79 src/gtkprivacy.c:79
+#: ../gtk/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
+#: ../gtk/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
+#: ../gtk/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
+#: ../gtk/gtkprivacy.c:82
 msgid "Block all users"
 msgstr "Bloquear todos los usuarios"
 
-#: ../src/gtkprivacy.c:83 src/gtkprivacy.c:83
+#: ../gtk/gtkprivacy.c:83
 msgid "Block only the users below"
 msgstr "Bloquear sĂłlo los siguientes usuarios"
 
-#: ../src/gtkprivacy.c:372 src/gtkprivacy.c:398
+#: ../gtk/gtkprivacy.c:372
 msgid "Privacy"
 msgstr "Privacidad"
 
-#: ../src/gtkprivacy.c:385 src/gtkprivacy.c:411
+#: ../gtk/gtkprivacy.c:385
 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:397 src/gtkprivacy.c:423
+#: ../gtk/gtkprivacy.c:397
 msgid "Set privacy for:"
 msgstr "Establecer privacidad para:"
 
-#: ../src/gtkprivacy.c:562 ../src/gtkprivacy.c:578 src/gtkprivacy.c:589
-#: src/gtkprivacy.c:605
+#: ../gtk/gtkprivacy.c:560 ../gtk/gtkprivacy.c:576
 msgid "Permit User"
 msgstr "Permitir al usuario"
 
-#: ../src/gtkprivacy.c:563 src/gtkprivacy.c:590
+#: ../gtk/gtkprivacy.c:561
 msgid "Type a user you permit to contact you."
 msgstr "Escriba un usuario al que le permita contactar con vd."
 
-#: ../src/gtkprivacy.c:564 src/gtkprivacy.c:591
+#: ../gtk/gtkprivacy.c:562
 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:567 ../src/gtkprivacy.c:580
+#: ../gtk/gtkprivacy.c:565 ../gtk/gtkprivacy.c:578
 msgid "_Permit"
 msgstr "_Permitir"
 
-#: ../src/gtkprivacy.c:572 src/gtkprivacy.c:599
+#: ../gtk/gtkprivacy.c:570
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "ÂżPermitir a %s contactar con vd.?"
 
-#: ../src/gtkprivacy.c:574 src/gtkprivacy.c:601
+#: ../gtk/gtkprivacy.c:572
 #, 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:601 ../src/gtkprivacy.c:614 src/gtkprivacy.c:628
-#: src/gtkprivacy.c:641
+#: ../gtk/gtkprivacy.c:599 ../gtk/gtkprivacy.c:612
 msgid "Block User"
 msgstr "Bloquear al usuario"
 
-#: ../src/gtkprivacy.c:602 src/gtkprivacy.c:629
+#: ../gtk/gtkprivacy.c:600
 msgid "Type a user to block."
 msgstr "Escriba un usuario a bloquear."
 
-#: ../src/gtkprivacy.c:603 src/gtkprivacy.c:630
+#: ../gtk/gtkprivacy.c:601
 msgid "Please enter the name of the user you wish to block."
 msgstr "Introduzca el nombre del grupo a bloquear."
 
-#: ../src/gtkprivacy.c:605 ../src/gtkprivacy.c:616
+#: ../gtk/gtkprivacy.c:603 ../gtk/gtkprivacy.c:614
 msgid "_Block"
 msgstr "_Bloquear"
 
-#: ../src/gtkprivacy.c:610 src/gtkprivacy.c:637
+#: ../gtk/gtkprivacy.c:608
 #, c-format
 msgid "Block %s?"
 msgstr "ÂżBloquear a %s?"
 
-#: ../src/gtkprivacy.c:612 src/gtkprivacy.c:639
+#: ../gtk/gtkprivacy.c:610
 #, 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.
+#. * A wrapper for gaim_request_action() that uses @c Yes and @c 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/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
+#: ../gtk/gtkrequest.c:267 ../libgaim/protocols/msn/dialog.c:132
+#: ../libgaim/protocols/msn/msn.c:555 ../libgaim/protocols/msn/msn.c:564
+#: ../libgaim/protocols/novell/novell.c:1920
+#: ../libgaim/protocols/silc/buddy.c:313 ../libgaim/protocols/silc/pk.c:117
+#: ../libgaim/protocols/silc/wb.c:303 ../libgaim/request.h:1335
 msgid "Yes"
 msgstr "SĂ­"
 
-#: ../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
+#: ../gtk/gtkrequest.c:268 ../libgaim/protocols/msn/dialog.c:133
+#: ../libgaim/protocols/msn/msn.c:555 ../libgaim/protocols/msn/msn.c:564
+#: ../libgaim/protocols/novell/novell.c:1921
+#: ../libgaim/protocols/silc/buddy.c:314 ../libgaim/protocols/silc/pk.c:118
+#: ../libgaim/protocols/silc/wb.c:304 ../libgaim/request.h:1335
 msgid "No"
 msgstr "No"
 
-#: ../src/gtkrequest.c:289 src/gtkrequest.c:289
+#: ../gtk/gtkrequest.c:271
 msgid "Apply"
 msgstr "Aplicar"
 
-#: ../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:1839 src/gtkrequest.c:1832
+#: ../gtk/gtkrequest.c:1467
 msgid "That file already exists"
 msgstr "Ese archivo ya existe"
 
-#: ../src/gtkrequest.c:1840 src/gtkrequest.c:1833
+#: ../gtk/gtkrequest.c:1468
 msgid "Would you like to overwrite it?"
 msgstr "ÂżQuiere sobreescribirlo?"
 
-#: ../src/gtkrequest.c:1884 ../src/gtkrequest.c:1925 src/gtkrequest.c:1877
-#: src/gtkrequest.c:1918
+#: ../gtk/gtkrequest.c:1469
+msgid "Overwrite"
+msgstr "Sobreescribir"
+
+#: ../gtk/gtkrequest.c:1470
+msgid "Choose New Name"
+msgstr "Elegir un nuevo nombre"
+
+#: ../gtk/gtkrequest.c:1512 ../gtk/gtkrequest.c:1553
 msgid "Save File..."
 msgstr "Enviar archivo.."
 
-#: ../src/gtkrequest.c:1885 ../src/gtkrequest.c:1926 src/gtkrequest.c:1878
-#: src/gtkrequest.c:1919
+#: ../gtk/gtkrequest.c:1513 ../gtk/gtkrequest.c:1554
 msgid "Open File..."
 msgstr "Abrir archivo..."
 
-#: ../src/gtkroomlist.c:287
+#: ../gtk/gtkrequest.c:1601 ../gtk/gtkrequest.c:1615
+msgid "Select Folder..."
+msgstr "Seleccionar carpeta..."
+
+#: ../gtk/gtkroomlist.c:287
 msgid "_Add"
 msgstr "_Añadir"
 
-#: ../src/gtkroomlist.c:354 src/gtkroomlist.c:331
+#: ../gtk/gtkroomlist.c:355
 msgid "Room List"
 msgstr "Lista de salas"
 
 #. list button
-#: ../src/gtkroomlist.c:424 src/gtkroomlist.c:402
+#: ../gtk/gtkroomlist.c:425
 msgid "_Get List"
 msgstr "Obtener la lista"
 
 #. add button
-#: ../src/gtkroomlist.c:432
+#: ../gtk/gtkroomlist.c:433
 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:448 src/gtksavedstatuses.c:451
-msgid "Type"
-msgstr "Tipo"
-
-#. #-#-#-#-#  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:526 src/gtksavedstatuses.c:525
-msgid "Saved Statuses"
-msgstr "Estados guardados"
-
 #. Use button
-#: ../src/gtksavedstatuses.c:549 ../src/gtksavedstatuses.c:1180
-#: src/gtksavedstatuses.c:550 src/gtksavedstatuses.c:1150
+#: ../gtk/gtksavedstatuses.c:549 ../gtk/gtksavedstatuses.c:1183
 msgid "_Use"
 msgstr "_Usar"
 
-#: ../src/gtksavedstatuses.c:695 src/gtksavedstatuses.c:660
+#: ../gtk/gtksavedstatuses.c:695
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Ya se está utilizando ese título. Debe elegir un título único."
 
-#: src/gtksavedstatuses.c:862
+#: ../gtk/gtksavedstatuses.c:883
 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: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:2809
-msgid "Status"
-msgstr "Estado"
-
-#: ../src/gtksavedstatuses.c:1073 src/gtksavedstatuses.c:1038
+#: ../gtk/gtksavedstatuses.c:1076
 msgid "_Title:"
 msgstr "_TĂ­tulo:"
 
-#: ../src/gtksavedstatuses.c:1092 ../src/gtksavedstatuses.c:1413
-#: src/gtksavedstatuses.c:1058 src/gtksavedstatuses.c:1360
+#: ../gtk/gtksavedstatuses.c:1095 ../gtk/gtksavedstatuses.c:1416
 msgid "_Status:"
 msgstr "E_stado:"
 
 #. Different status message expander
-#: ../src/gtksavedstatuses.c:1124 src/gtksavedstatuses.c:1093
+#: ../gtk/gtksavedstatuses.c:1127
 msgid "Use a _different status for some accounts"
 msgstr "Usar un estado _diferente para algunas cuentas"
 
 #. Save & Use button
-#: ../src/gtksavedstatuses.c:1188 src/gtksavedstatuses.c:1159
+#: ../gtk/gtksavedstatuses.c:1191
 msgid "Sa_ve & Use"
 msgstr "Gua_rdar y usar"
 
-#: src/gtksavedstatuses.c:1339
+#: ../gtk/gtksavedstatuses.c:1397
 #, c-format
 msgid "Status for %s"
 msgstr "Estado de %s"
 
-#: ../src/gtksound.c:61 src/gtksound.c:61
+#: ../gtk/gtksound.c:63
 msgid "Buddy logs in"
 msgstr "Se conecta un amigo"
 
-#: ../src/gtksound.c:62 src/gtksound.c:62
+#: ../gtk/gtksound.c:64
 msgid "Buddy logs out"
 msgstr "Se desconecta un amigo"
 
-#: ../src/gtksound.c:63 src/gtksound.c:63
+#: ../gtk/gtksound.c:65
 msgid "Message received"
 msgstr "Se recibe un mensaje"
 
-#: ../src/gtksound.c:64 src/gtksound.c:64
+#: ../gtk/gtksound.c:66
 msgid "Message received begins conversation"
 msgstr "Se recibe un mensaje que comienza una conversaciĂłn"
 
-#: ../src/gtksound.c:65 src/gtksound.c:65
+#: ../gtk/gtksound.c:67
 msgid "Message sent"
 msgstr "Se envĂ­a un mensaje"
 
-#: ../src/gtksound.c:66 src/gtksound.c:66
+#: ../gtk/gtksound.c:68
 msgid "Person enters chat"
 msgstr "Alguien entra al chat"
 
-#: ../src/gtksound.c:67 src/gtksound.c:67
+#: ../gtk/gtksound.c:69
 msgid "Person leaves chat"
 msgstr "Alguien deja el chat"
 
-#: ../src/gtksound.c:68 src/gtksound.c:68
+#: ../gtk/gtksound.c:70
 msgid "You talk in chat"
 msgstr "Usted habla en el chat"
 
-#: ../src/gtksound.c:69 src/gtksound.c:69
+#: ../gtk/gtksound.c:71
 msgid "Others talk in chat"
 msgstr "Otros hablan en el chat"
 
-#: ../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: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:504 src/gtksound.c:430
-msgid ""
-"Unable to play sound because the 'Command' sound method has been chosen, but "
-"no command has been set."
-msgstr ""
-"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:516 src/gtksound.c:442
-#, c-format
-msgid ""
-"Unable to play sound because the configured sound command could not be "
-"launched: %s"
-msgstr ""
-"No fue posible reproducir el sonido porque el comando de sonido establecido "
-"no se ha podido lanzar: %s"
-
-#: ../src/gtkstatusbox.c:362 src/gtkstatusbox.c:287
-msgid "Typing"
-msgstr "Tecleando"
+#: ../gtk/gtksound.c:74
+msgid "Someone says your screen name in chat"
+msgstr "Alguien dice su nombre de usuario en el chat"
+
+#: ../gtk/gtksound.c:310
+msgid "GStreamer Failure"
+msgstr "Fallo de gstreamer"
+
+#: ../gtk/gtksound.c:311
+msgid "GStreamer failed to initialize."
+msgstr "No se pudo inicializar gstreamer."
 
 #. connect to the server
-#: ../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
+#: ../gtk/gtkstatusbox.c:550 ../libgaim/protocols/irc/irc.c:329
+#: ../libgaim/protocols/jabber/jabber.c:1009
+#: ../libgaim/protocols/msn/session.c:344
+#: ../libgaim/protocols/novell/novell.c:2185
+#: ../libgaim/protocols/oscar/oscar.c:1224 ../libgaim/protocols/qq/qq.c:134
+#: ../libgaim/protocols/sametime/sametime.c:3681
+#: ../libgaim/protocols/simple/simple.c:1673
+#: ../libgaim/protocols/yahoo/yahoo.c:2715
+#: ../libgaim/protocols/zephyr/zephyr.c:1617
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../src/gtkstock.c:138 src/gtkstock.c:138
-msgid "_Alias"
-msgstr "_Apodo:"
-
-#: ../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:144 src/gtkstock.c:141
-msgid "_Modify"
-msgstr "_Modificar"
-
-#: ../src/gtkstock.c:145 src/gtkstock.c:142
-msgid "_Open Mail"
-msgstr "_Abrir correo"
-
-#: ../src/gtkutils.c:1303 ../src/gtkutils.c:1328 src/gtkutils.c:1309
-#: src/gtkutils.c:1334
+#: ../gtk/gtkstatusbox.c:938 ../gtk/plugins/docklet/docklet.c:435
+#: ../libgaim/protocols/gg/gg.c:996 ../libgaim/protocols/jabber/buddy.c:1367
+#: ../libgaim/protocols/msn/state.c:29 ../libgaim/protocols/msn/state.c:30
+#: ../libgaim/protocols/msn/state.c:37 ../libgaim/protocols/msn/state.c:38
+#: ../libgaim/protocols/novell/novell.c:2853
+#: ../libgaim/protocols/yahoo/yahoo.c:2885 ../libgaim/status.c:155
+msgid "Available"
+msgstr "Disponible"
+
+#: ../gtk/gtkstatusbox.c:940 ../gtk/plugins/docklet/docklet.c:443
+#: ../libgaim/protocols/oscar/oscar.c:698
+#: ../libgaim/protocols/yahoo/yahoo.c:2879 ../libgaim/status.c:157
+msgid "Invisible"
+msgstr "Invisible"
+
+#: ../gtk/gtkutils.c:1308 ../gtk/gtkutils.c:1333
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 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
+#: ../gtk/gtkutils.c:1310 ../gtk/gtkutils.c:1335
 msgid "Failed to load image"
 msgstr "No se pudo cargar la imagen"
 
-#: ../src/gtkutils.c:1405 src/gtkutils.c:1411
+#: ../gtk/gtkutils.c:1410
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "No se puede enviar la carpeta %s."
 
-#: ../src/gtkutils.c:1407 src/gtkutils.c:1413
+#: ../gtk/gtkutils.c:1412
 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:1435 ../src/gtkutils.c:1444 ../src/gtkutils.c:1449
-#: src/gtkutils.c:1441 src/gtkutils.c:1450 src/gtkutils.c:1455
+msgstr ""
+"Gaim no puede transferir una carpeta. Necesita enviar los archivos que "
+"contiene individualmente."
+
+#: ../gtk/gtkutils.c:1440 ../gtk/gtkutils.c:1449 ../gtk/gtkutils.c:1454
 msgid "You have dragged an image"
 msgstr "Ha arrastrado una imagen"
 
-#: ../src/gtkutils.c:1436 src/gtkutils.c:1442
+#: ../gtk/gtkutils.c:1441
 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 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
+msgstr ""
+"Puede enviar esta imagen como una transferencia de archivo, introducirla en "
+"el mensaje, o usarla como icono de amigo para este usuario."
+
+#: ../gtk/gtkutils.c:1445 ../gtk/gtkutils.c:1460
 msgid "Set as buddy icon"
 msgstr "Establecer como icono de amigo"
 
-#: ../src/gtkutils.c:1441 ../src/gtkutils.c:1456 src/gtkutils.c:1447
-#: src/gtkutils.c:1462
+#: ../gtk/gtkutils.c:1446 ../gtk/gtkutils.c:1461
 msgid "Send image file"
 msgstr "Enviar archivo de imagen"
 
-#: ../src/gtkutils.c:1442 ../src/gtkutils.c:1456 src/gtkutils.c:1448
-#: src/gtkutils.c:1462
+#: ../gtk/gtkutils.c:1447 ../gtk/gtkutils.c:1461
 msgid "Insert in message"
 msgstr "Insertar en el mensaje"
 
-#: ../src/gtkutils.c:1445 src/gtkutils.c:1451
+#: ../gtk/gtkutils.c:1450
 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:1450 src/gtkutils.c:1456
+#: ../gtk/gtkutils.c:1455
 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 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
+msgstr ""
+"Puede enviar esta imagen como una transferencia de archivo, o introducirla "
+"en este mensaje, o usarla como icono de amigo para este usuario."
+
+#: ../gtk/gtkutils.c:1457
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
-msgstr "Puede insertar esta imagen en su mensaje, o utilizarla como icono de amigo para este usuario."
+msgstr ""
+"Puede insertar esta imagen en su mensaje, o utilizarla como icono de amigo "
+"para este usuario."
 
 #. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
 #. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../src/gtkutils.c:1506 src/gtkutils.c:1512
+#: ../gtk/gtkutils.c:1511
 msgid "Cannot send launcher"
 msgstr "No se puede enviar un lanzador"
 
-#: ../src/gtkutils.c:1506
+#: ../gtk/gtkutils.c:1511
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -5757,39 +4187,1639 @@
 "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
+#: ../gtk/gtkutils.c:2340
+#, c-format
+msgid ""
+"<b>File:</b> %s\n"
+"<b>File size:</b> %s\n"
+"<b>Image size:</b> %dx%d"
+msgstr ""
+"<b>Fichero:</b> %s\n"
+"<b>Tamaño de archivo:</b> %s\n"
+"<b>Tamaño de imagen:</b> %dx%d"
+
+#. Label
+#: ../gtk/gtkutils.c:2384 ../gtk/gtkutils.c:2406
+#: ../gtk/plugins/gevolution/new_person_dialog.c:338
+#: ../libgaim/protocols/oscar/oscar.c:600
+msgid "Buddy Icon"
+msgstr "Icono de amigo"
+
+#: ../gtk/gtkutils.c:2726
+#, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "No se pudo abrir el archivo «%s»: %s"
+
+#: ../gtk/gtkutils.c:2775
+#, c-format
+msgid ""
+"Failed to load image '%s': reason not known, probably a corrupt image file"
+msgstr "Se produjo un fallo al cargar la imagen «%s»: razón desconocida, posiblemente se trata de un archivo de imagen dañado"
+
+#: ../gtk/gtkwhiteboard.c:756 ../gtk/gtkwhiteboard.c:775
+msgid "Save File"
+msgstr "Guardar archivo"
+
+#: ../gtk/gtkwhiteboard.c:863
+msgid "Select color"
+msgstr "Seleccionar el color"
+
+#: ../gtk/plugins/cap/cap.c:428
+msgid "Display Statistics"
+msgstr "Mostrar estadĂ­sticas"
+
+#: ../gtk/plugins/cap/cap.c:440 ../gtk/plugins/cap/cap.c:443
+msgid "Response Probability:"
+msgstr "Probabilidad de respuesta"
+
+#: ../gtk/plugins/cap/cap.c:789
+msgid "Statistics Configuration"
+msgstr "ConfiguraciĂłn de estadĂ­sticas"
+
+#. msg_difference spinner
+#: ../gtk/plugins/cap/cap.c:792
+msgid "Maximum response timeout:"
+msgstr "Tiempo de espera máximo para respuestas:"
+
+#: ../gtk/plugins/cap/cap.c:795 ../gtk/plugins/cap/cap.c:802
+#: ../gtk/plugins/cap/cap.c:809
+msgid "minutes"
+msgstr "minutos"
+
+#. last_seen spinner
+#: ../gtk/plugins/cap/cap.c:799
+msgid "Maximum last-seen difference:"
+msgstr "Diferencia máxima de «visto por última vez»:"
+
+#. threshold spinner
+#: ../gtk/plugins/cap/cap.c:806
+msgid "Threshold:"
+msgstr "Umbral:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../gtk/plugins/cap/cap.c:915
+msgid "Contact Availability Prediction plugin."
+msgstr "Complemento de predicciĂłn de disponibilidad de contactos."
+
+#. *  summary
+#: ../gtk/plugins/cap/cap.c:916
+msgid ""
+"The contact availability plugin (cap) is used to display statistical "
+"information about buddies in a users contact list."
+msgstr "El complemento de disponibilidad de contactos («cap») se utiliza para mostrar información estadística sobre los amigos en la lista de contactos de un usuario."
+
+#: ../gtk/plugins/contact_priority.c:61
+msgid "Buddy is idle"
+msgstr "El amigo está inactivo"
+
+#: ../gtk/plugins/contact_priority.c:62
+msgid "Buddy is away"
+msgstr "El amigo está ausente"
+
+#: ../gtk/plugins/contact_priority.c:63
+msgid "Buddy is \"extended\" away"
+msgstr "El amigo está en ausencia «extendida»"
+
+#. Not used yet.
+#: ../gtk/plugins/contact_priority.c:66
+msgid "Buddy is mobile"
+msgstr "El amigo está móvil"
+
+#: ../gtk/plugins/contact_priority.c:68
+msgid "Buddy is offline"
+msgstr "El amigo está desconectado"
+
+#: ../gtk/plugins/contact_priority.c:90
+msgid "Point values to use when..."
+msgstr "Valores a utilizar cuando..."
+
+#: ../gtk/plugins/contact_priority.c:118
+msgid ""
+"The buddy with the <i>largest score</i> is the buddy who will have priority "
+"in the contact.\n"
+msgstr ""
+"El amigo con el <i>mayor marcador</i> es el que tendrá prioridad en el "
+"contacto.\n"
+
+#: ../gtk/plugins/contact_priority.c:125
+msgid "Use last buddy when scores are equal"
+msgstr "Usar el Ăşltimo amigo cuando los marcadores sean iguales"
+
+#: ../gtk/plugins/contact_priority.c:130
+msgid "Point values to use for account..."
+msgstr "Valores a utilizar para la cuenta..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/contact_priority.c:182
+msgid "Contact Priority"
+msgstr "Prioridad del contacto"
+
+#. *< name
+#. *< version
+#. *< summary
+#: ../gtk/plugins/contact_priority.c:185
+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
+#: ../gtk/plugins/contact_priority.c:187
+msgid ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
+msgstr ""
+"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
+#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:146
+msgid "Crazychat"
+msgstr "Crazychat"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:149
+msgid "Plugin to establish a Crazychat session."
+msgstr "Complemento para establecer una sesión de «Crazychat»"
+
+#. *  description
+#: ../gtk/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
+#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:295
+msgid "Network Configuration"
+msgstr "ConfiguraciĂłn de red"
+
+#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:307
+msgid "TCP port"
+msgstr "Puerto TCP"
+
+#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:317
+msgid "UDP port"
+msgstr "Puerto UDP"
+
+#. make the feature configuration frame
+#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:329
+msgid "Feature Calibration"
+msgstr "Ajuste de la funciĂłn"
+
+#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:350
+msgid "Disabled"
+msgstr "Deshabilitado"
+
+#: ../gtk/plugins/docklet/docklet.c:154
+msgid "Right-click for more unread messages...\n"
+msgstr "Pulse el botón derecho para ver más mensajes sin leer...\n"
+
+#: ../gtk/plugins/docklet/docklet.c:432
+msgid "Change Status"
+msgstr "Cambiar estado:"
+
+#: ../gtk/plugins/docklet/docklet.c:484
+msgid "Show Buddy List"
+msgstr "Mostrar la lista de amigos"
+
+#: ../gtk/plugins/docklet/docklet.c:510
+msgid "New Message..."
+msgstr "Mensaje nuevo..."
+
+#: ../gtk/plugins/docklet/docklet.c:525
+msgid "Mute Sounds"
+msgstr "Sin sonido"
+
+#. TODO: need a submenu to change status, this needs to "link"
+#. * to the status in the buddy list gtkstatusbox
 #.
-#: 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
+#: ../gtk/plugins/docklet/docklet.c:538
+msgid "Quit"
+msgstr "Salir"
+
+#: ../gtk/plugins/docklet/docklet.c:679
+msgid "Blink tray icon for unread..."
+msgstr ""
+"Hacer parpadear el icono en el área de notificación del sistema para los "
+"mensajes sin leer..."
+
+#: ../gtk/plugins/docklet/docklet.c:682
+msgid "_Instant Messages:"
+msgstr "Mensajes instantáneos:"
+
+#: ../gtk/plugins/docklet/docklet.c:685
+msgid "In hidden conversations"
+msgstr "En conversaciones ocultas"
+
+#: ../gtk/plugins/docklet/docklet.c:690
+msgid "C_hat Messages:"
+msgstr "Mensajes del c_hat"
+
+#: ../gtk/plugins/docklet/docklet.c:693
+msgid "When my nick is said"
+msgstr "Cuando mi apodo es mencionado"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/docklet/docklet.c:720
+msgid "System Tray Icon"
+msgstr "Icono del área de notificación del sistema"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/docklet/docklet.c:723
+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
+#: ../gtk/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 ""
+"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, e indicar si se debe mostrar la "
+"lista de de amigos. También ofrece opciones para hacer parpadear los "
+"mensajes sin leer."
+
+#: ../gtk/plugins/docklet/eggtrayicon.c:129
+msgid "Orientation"
+msgstr "OrientaciĂłn"
+
+#: ../gtk/plugins/docklet/eggtrayicon.c:130
+msgid "The orientation of the tray."
+msgstr "La orientación en el área de notificación."
+
+#: ../gtk/plugins/extplacement.c:80
+msgid "By conversation count"
+msgstr "Por nĂşmero de conversaciones"
+
+#: ../gtk/plugins/extplacement.c:101
+msgid "Conversation Placement"
+msgstr "LocalizaciĂłn de la conversaciĂłn"
+
+#: ../gtk/plugins/extplacement.c:106
+msgid "Number of conversations per window"
+msgstr "NĂşmero de conversaciones por ventana"
+
+#: ../gtk/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"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/extplacement.c:135
+msgid "ExtPlacement"
+msgstr "_UbicaciĂłnExt"
+
+#. *< name
+#. *< version
+#: ../gtk/plugins/extplacement.c:137
+msgid "Extra conversation placement options."
+msgstr "Opciones adicionales de ubicaciĂłn de conversaciones."
+
+#. *< summary
+#. *  description
+#: ../gtk/plugins/extplacement.c:139
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr ""
+"Restringir el nĂşmero de conversaciones por ventana, de forma optativa "
+"utilizar ventanas distintas para MIs y Chats"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gaiminc.c:91
+msgid "Gaim Demonstration Plugin"
+msgstr "Complemento de demostraciĂłn de Gaim"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/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
+#: ../gtk/plugins/gaiminc.c:96
+msgid ""
+"This is a really cool plugin that does a lot of stuff:\n"
+"- It tells you who wrote the program when you log in\n"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
+msgstr ""
+"Éste es un complemento muy interesante que hace muchas cosas:\n"
+"- Le dice quién escribió el programa cuando inicia la sesión\n"
+"- Transpone el texto que le envĂ­an\n"
+"- EnvĂ­a un mensaje a las personas en su lista inmediatamente cuando se "
+"conectan"
+
+#: ../gtk/plugins/gaimrc.c:41
+msgid "Cursor Color"
+msgstr "Color del puntero"
+
+#: ../gtk/plugins/gaimrc.c:42
+msgid "Secondary Cursor Color"
+msgstr "Color secundario del puntero"
+
+#: ../gtk/plugins/gaimrc.c:43
+msgid "Hyperlink Color"
+msgstr "Color de hiperenlace"
+
+#: ../gtk/plugins/gaimrc.c:56
+msgid "GtkTreeView Expander Size"
+msgstr "Tamaño del expansor GtkTreeView"
+
+#: ../gtk/plugins/gaimrc.c:57
+msgid "GtkTreeView Horizontal Separation"
+msgstr "SeparaciĂłn horizontal GtkTreeView"
+
+#: ../gtk/plugins/gaimrc.c:76
+msgid "Conversation Entry"
+msgstr "Entrada de conversaciones"
+
+#: ../gtk/plugins/gaimrc.c:77
+msgid "Conversation History"
+msgstr "Historial de conversaciones"
+
+#: ../gtk/plugins/gaimrc.c:78
+msgid "Log Viewer"
+msgstr "Visor del registro"
+
+#: ../gtk/plugins/gaimrc.c:79
+msgid "Request Dialog"
+msgstr "Diálogo de solicitud"
+
+#: ../gtk/plugins/gaimrc.c:80
+msgid "Notify Dialog"
+msgstr "Diálogo de notificación"
+
+#: ../gtk/plugins/gaimrc.c:91
+msgid "GtkTreeView Indent Expanders"
+msgstr "Sangrado de los expansores GtkTreeView"
+
+#: ../gtk/plugins/gaimrc.c:320
+#, c-format
+msgid "Select Color for %s"
+msgstr "Seleccionar el color para %s"
+
+#: ../gtk/plugins/gaimrc.c:322
+msgid "Select Color"
+msgstr "Seleccionar el color"
+
+#: ../gtk/plugins/gaimrc.c:361
+#, c-format
+msgid "Select Font for %s"
+msgstr "Seleccionar tipografĂ­a para %s"
+
+#: ../gtk/plugins/gaimrc.c:398
+msgid "Select Interface Font"
+msgstr "Seleccionar tipografĂ­a de la interfaz"
+
+#: ../gtk/plugins/gaimrc.c:448
+msgid "General"
+msgstr "General"
+
+#: ../gtk/plugins/gaimrc.c:453
+msgid "GTK+ Interface Font"
+msgstr "TipografĂ­a de la interfaz GTK+"
+
+#: ../gtk/plugins/gaimrc.c:473
+msgid "GTK+ Text Shortcut Theme"
+msgstr "Tema de atajos de teclado GTK+"
+
+#: ../gtk/plugins/gaimrc.c:508
+msgid "Interface colors"
+msgstr "Colores de la interfaz"
+
+#: ../gtk/plugins/gaimrc.c:532
+msgid "Widget Sizes"
+msgstr "Tamaño de los controles"
+
+#: ../gtk/plugins/gaimrc.c:553
+msgid "Fonts"
+msgstr "TipografĂ­a"
+
+#: ../gtk/plugins/gaimrc.c:576
+msgid "Tools"
+msgstr "Herramientas"
+
+#: ../gtk/plugins/gaimrc.c:581
+#, c-format
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr "Escribir la configuraciĂłn en %s%sgtkrc-2.0"
+
+#: ../gtk/plugins/gaimrc.c:589
+msgid "Re-read gtkrc files"
+msgstr "Volver a leer archivos de configuraciĂłn gtkrc"
+
+#: ../gtk/plugins/gaimrc.c:616
+msgid "Gaim GTK+ Theme Control"
+msgstr "Control de tema GTK+ de Gaim"
+
+#: ../gtk/plugins/gaimrc.c:618 ../gtk/plugins/gaimrc.c:619
+msgid "Provides access to commonly used gtkrc settings."
+msgstr ""
+"Da acceso a los parámetros de configuración de gtkrc que se utilizan "
+"habitualmente."
+
+#. Configuration frame
+#: ../gtk/plugins/gestures/gestures.c:235
+msgid "Mouse Gestures Configuration"
+msgstr "ConfiguraciĂłn de los gestos con el ratĂłn"
+
+#: ../gtk/plugins/gestures/gestures.c:242
+msgid "Middle mouse button"
+msgstr "BotĂłn central del ratĂłn"
+
+#: ../gtk/plugins/gestures/gestures.c:247
+msgid "Right mouse button"
+msgstr "BotĂłn derecho del ratĂłn"
+
+#. "Visual gesture display" checkbox
+#: ../gtk/plugins/gestures/gestures.c:259
+msgid "_Visual gesture display"
+msgstr "Mostrar gestos _visuales"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gestures/gestures.c:289
+msgid "Mouse Gestures"
+msgstr "Gestos con el ratĂłn"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/gestures/gestures.c:292
+msgid "Provides support for mouse gestures"
+msgstr "Proporciona soporte para gestos con el ratĂłn"
+
+#. *  description
+#: ../gtk/plugins/gestures/gestures.c:294
+msgid ""
+"Allows support for mouse gestures in conversation windows.\n"
+"Drag the middle mouse button to perform certain actions:\n"
+"\n"
+"Drag down and then to the right to close a conversation.\n"
+"Drag up and then to the left to switch to the previous conversation.\n"
+"Drag up and then to the right to switch to the next conversation."
+msgstr ""
+"Añade soporte de gestos del ratón en las ventanas de conversación.\n"
+"Arrastre con el botĂłn central del ratĂłn para realizar las siguientes "
+"acciones:\n"
+"\n"
+"Abajo y después a la derecha para cerrar una ventana de conversación.\n"
+"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."
+
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:142
+msgid "Instant Messaging"
+msgstr "Mensajería Instantáneos"
+
+#. Add the label.
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:455
+msgid "Select a person from your address book below, or add a new person."
+msgstr ""
+"Seleccione una persona de su agenda mostrada abajo, o añada una nueva "
+"persona."
+
+#. "Search"
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:468
+#: ../gtk/plugins/gevolution/assoc-buddy.c:353
+#: ../libgaim/protocols/jabber/buddy.c:1724
+#: ../libgaim/protocols/oscar/oscar.c:6085 ../libgaim/protocols/qq/group.c:121
+#: ../libgaim/protocols/qq/group_im.c:137
+#: ../libgaim/protocols/qq/sys_msg.c:160 ../libgaim/protocols/qq/sys_msg.c:230
+#: ../libgaim/protocols/qq/sys_msg.c:248
+#: ../libgaim/protocols/sametime/sametime.c:5532
+msgid "Search"
+msgstr "Buscar"
+
+#. "New Person" button
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:575
+#: ../gtk/plugins/gevolution/assoc-buddy.c:464
+#: ../gtk/plugins/gevolution/new_person_dialog.c:251
+msgid "New Person"
+msgstr "Nueva persona"
+
+#. "Select Buddy" button
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:592
+msgid "Select Buddy"
+msgstr "Seleccionar amigo"
+
+#. Add the label.
+#: ../gtk/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 ""
+"Seleccione una persona de su agenda a la que añadir este amigo, o cree una "
+"nueva persona."
+
+#. Add the expander
+#: ../gtk/plugins/gevolution/assoc-buddy.c:428
+msgid "User _details"
+msgstr "_Detalles del usuario"
+
+#. "Associate Buddy" button
+#: ../gtk/plugins/gevolution/assoc-buddy.c:481
+msgid "_Associate Buddy"
+msgstr "_Asociar amigo"
+
+#: ../gtk/plugins/gevolution/eds-utils.c:73
+#: ../gtk/plugins/gevolution/eds-utils.c:86
+#: ../libgaim/protocols/jabber/jabber.c:1154
+msgid "None"
+msgstr "Ninguno"
+
+#: ../gtk/plugins/gevolution/gevolution.c:262
+#: ../gtk/plugins/gevolution/gevolution.c:268
+msgid "Unable to send e-mail"
+msgstr "No se pudo enviar el correo electrĂłnico"
+
+#: ../gtk/plugins/gevolution/gevolution.c:263
+msgid "The evolution executable was not found in the PATH."
+msgstr "No se encontrĂł el ejecutable de Evolution en la ruta."
+
+#: ../gtk/plugins/gevolution/gevolution.c:269
+msgid "The specified buddy was not found in the Evolution Contacts."
+msgstr ""
+"No se encontrĂł al amigo especificado dentro en los contactos de Evolution."
+
+#: ../gtk/plugins/gevolution/gevolution.c:286
+msgid "Add to Address Book"
+msgstr "Añadir a la agenda"
+
+#: ../gtk/plugins/gevolution/gevolution.c:290
+msgid "Send E-Mail"
+msgstr "Enviar correo electrĂłnico"
+
+#. Configuration frame
+#: ../gtk/plugins/gevolution/gevolution.c:417
+msgid "Evolution Integration Configuration"
+msgstr "ConfiguraciĂłn de la integraciĂłn con Evolution"
+
+#. Label
+#: ../gtk/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."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gevolution/gevolution.c:527
+msgid "Evolution Integration"
+msgstr "IntegraciĂłn con Evolution"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/gevolution/gevolution.c:530
+#: ../gtk/plugins/gevolution/gevolution.c:532
+msgid "Provides integration with Evolution."
+msgstr "Ofrece integraciĂłn con Evolution."
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:267
+msgid "Please enter the person's information below."
+msgstr "Introduzca la informaciĂłn de la persona a continuaciĂłn."
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:271
+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."
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:291
+msgid "Account type:"
+msgstr "Tipo de cuenta:"
+
+#. Optional Information section
+#: ../gtk/plugins/gevolution/new_person_dialog.c:315
+msgid "Optional information:"
+msgstr "InformaciĂłn opcional:"
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:350
+msgid "First name:"
+msgstr "Nombre:"
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:362
+msgid "Last name:"
+msgstr "Apellidos:"
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:382
+msgid "E-mail:"
+msgstr "Correo electrĂłnico:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gtk-signals-test.c:160
+msgid "GTK Signals Test"
+msgstr "Prueba de señales GTK"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/gtk-signals-test.c:163 ../gtk/plugins/gtk-signals-test.c:165
+msgid "Test to see that all ui signals are working properly."
+msgstr ""
+"Probar para ver si todas las señales de la interfaz de usuario funcionan "
+"correctamente."
+
+#: ../gtk/plugins/history.c:188
+msgid "History"
+msgstr "HistĂłrico"
+
+# Nota: ni «iconizar» ni «iconificar» están en el diccionario... jfs
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/iconaway.c:82
+msgid "Iconify on Away"
+msgstr "Iconizar en ausencia"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/iconaway.c:85 ../gtk/plugins/iconaway.c:87
+msgid "Iconifies the buddy list and your conversations when you go away."
+msgstr ""
+"Iconiza la lista de amigos y de conversaciones cuando usted está ausente."
+
+#: ../gtk/plugins/mailchk.c:160
+msgid "Mail Checker"
+msgstr "Comprobador de correo"
+
+#: ../gtk/plugins/mailchk.c:162
+msgid "Checks for new local mail."
+msgstr "Comprueba si hay correo local nuevo."
+
+#: ../gtk/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."
+
+#: ../gtk/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."
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:45
+msgid "Music messaging session confirmed."
+msgstr "Se ha confirmado la sesiĂłn de mensajerĂ­a musical."
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:416
+msgid "Music Messaging"
+msgstr "MensajerĂ­a musical"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:417
+msgid "There was a conflict in running the command:"
+msgstr "Se ha producido un conflicto al ejecutar la orden:"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:525
+msgid "Error Running Editor"
+msgstr "Error al ejecutar el editor"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:526
+msgid "The following error has occured:"
+msgstr "Ha ocurrido el siguiente error:"
+
+#. Configuration frame
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:625
+msgid "Music Messaging Configuration"
+msgstr "ConfiguraciĂłn de Mensajes de mĂşsica"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:629
+msgid "Score Editor Path"
+msgstr "Ruta del editor de partituras"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:630
+msgid "_Apply"
+msgstr "_Aplicar"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:665
+msgid "Music Messaging Plugin for collaborative composition."
+msgstr "Complemento de mensajerĂ­a musical para composiciĂłn colaborativa."
+
+#. *  summary
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:667
+msgid ""
+"The Music Messaging Plugin allows a number of users to simultaneously work "
+"on a piece of music by editting a common score in real-time."
+msgstr ""
+"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" ----------
+#: ../gtk/plugins/notify.c:687
+msgid "Notify For"
+msgstr "Notificar de"
+
+#: ../gtk/plugins/notify.c:691
+msgid "_IM windows"
+msgstr "Ventanas de M_I"
+
+#: ../gtk/plugins/notify.c:698
+msgid "C_hat windows"
+msgstr "Ventanas de _chat"
+
+#: ../gtk/plugins/notify.c:706
+msgid "\t_Only when someone says your screen name"
+msgstr "\t_SĂłlo si alguien menciona su nombre de usuario"
+
+#: ../gtk/plugins/notify.c:716
+msgid "_Focused windows"
+msgstr "Ventanas _enfocadas"
+
+#. ---------- "Notification Methods" ----------
+#: ../gtk/plugins/notify.c:724
+msgid "Notification Methods"
+msgstr "MĂ©todos de notificaciĂłn"
+
+#: ../gtk/plugins/notify.c:731
+msgid "Prepend _string into window title:"
+msgstr "Prefijar la _cadena en el tĂ­tulo de la ventana:"
+
+#. Count method button
+#: ../gtk/plugins/notify.c:750
+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"
+
+#. Count xprop method button
+#: ../gtk/plugins/notify.c:759
+msgid "Insert count of new message into _X property"
+msgstr "Insertar el nĂşmero de mensajes nuevos en la propiedad _X"
+
+#. Urgent method button
+#: ../gtk/plugins/notify.c:767
+msgid "Set window manager \"_URGENT\" hint"
+msgstr "Establecer pista «_URGENTE» del gestor de ventanas"
+
+#. Raise window method button
+#: ../gtk/plugins/notify.c:776
+msgid "R_aise conversation window"
+msgstr "_Subir la ventana de conversaciĂłn"
+
+#. ---------- "Notification Removals" ----------
+#: ../gtk/plugins/notify.c:784
+msgid "Notification Removal"
+msgstr "EliminaciĂłn de la notificaciĂłn"
+
+#. Remove on focus button
+#: ../gtk/plugins/notify.c:789
+msgid "Remove when conversation window _gains focus"
+msgstr "Eliminar cuando la ventana de la conversaciĂłn obtiene el _foco"
+
+#. Remove on click button
+#: ../gtk/plugins/notify.c:796
+msgid "Remove when conversation window _receives click"
+msgstr "Eliminar cuando la ventana de la conversaciĂłn _recibe una pulsaciĂłn"
+
+#. Remove on type button
+#: ../gtk/plugins/notify.c:804
+msgid "Remove when _typing in conversation window"
+msgstr "Eliminar cuando se _escriba en la ventana de la conversaciĂłn"
+
+#. Remove on message send button
+#: ../gtk/plugins/notify.c:812
+msgid "Remove when a _message gets sent"
+msgstr "Eliminar cuando se envĂ­e un _mensaje"
+
+#. Remove on conversation switch button
+#: ../gtk/plugins/notify.c:821
+msgid "Remove on switch to conversation ta_b"
+msgstr "Eliminar al cambiar de _solapa de conversaciĂłn"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/notify.c:910
+msgid "Message Notification"
+msgstr "NotificaciĂłn de mensajes"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/notify.c:913 ../gtk/plugins/notify.c:915
+msgid "Provides a variety of ways of notifying you of unread messages."
+msgstr ""
+"Permite notificar de diversas formas la presencia de mensajes sin leer."
+
+#: ../gtk/plugins/raw.c:175
+msgid "Raw"
+msgstr "En bruto"
+
+#: ../gtk/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."
+
+#: ../gtk/plugins/raw.c:178
+msgid ""
+"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"'Enter' in the entry box to send. Watch the debug window."
+msgstr ""
+"Le permite enviar datos en bruto a protocolos basados en texto (Jabber, MSN, "
+"IRC,  TOC). Pulse «Intro» en la caja de entrada para enviarlo. Observe la "
+"ventana de depuraciĂłn."
+
+#: ../gtk/plugins/relnot.c:69
+#, 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>"
+
+#: ../gtk/plugins/relnot.c:75
+#, c-format
+msgid ""
+"<b>ChangeLog:</b>\n"
+"%s<br><br>"
+msgstr ""
+"<b>Registro de cambios:</b>\n"
+"%s<br><br>"
+
+#: ../gtk/plugins/relnot.c:80
+#, c-format
+msgid ""
+"You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
+"\">http://gaim.sourceforge.net</a>."
+msgstr ""
+"Puede obtener la versiĂłn %s de:<br><a href=\"http://gaim.sourceforge.net/"
+"\">http://gaim.sourceforge.net</a>."
+
+#: ../gtk/plugins/relnot.c:84 ../gtk/plugins/relnot.c:85
+msgid "New Version Available"
+msgstr "Nueva versiĂłn disponible"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/relnot.c:143
+msgid "Release Notification"
+msgstr "NotificaciĂłn de versiones"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/relnot.c:146
+msgid "Checks periodically for new releases."
+msgstr "Comprueba periĂłdicamente la existencia de nuevas versiones."
+
+#. *  description
+#: ../gtk/plugins/relnot.c:148
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+msgstr ""
+"Comprueba periĂłdicamente si hay nuevas versiones disponibles y notifica al "
+"usuario mostrándole el registro de cambios."
+
+#: ../gtk/plugins/spellchk.c:1947
+msgid "Duplicate Correction"
+msgstr "CorrecciĂłn duplicada"
+
+#: ../gtk/plugins/spellchk.c:1948
+msgid "The specified word already exists in the correction list."
+msgstr "La palabra especĂ­fica ya existe en la lista de correcciĂłn."
+
+#: ../gtk/plugins/spellchk.c:2156
+msgid "Text Replacements"
+msgstr "Reemplazos de texto"
+
+#: ../gtk/plugins/spellchk.c:2179
+msgid "You type"
+msgstr "Usted escribe"
+
+#: ../gtk/plugins/spellchk.c:2193
+msgid "You send"
+msgstr "Usted envĂ­a"
+
+#: ../gtk/plugins/spellchk.c:2207
+msgid "Whole words only"
+msgstr "Solamente palabras enteras"
+
+#: ../gtk/plugins/spellchk.c:2219
+msgid "Case sensitive"
+msgstr "Distingue mayĂşsculas de minĂşsculas"
+
+#: ../gtk/plugins/spellchk.c:2245
+msgid "Add a new text replacement"
+msgstr "Añadir una regla nueva de reemplazo de texto"
+
+#: ../gtk/plugins/spellchk.c:2261
+msgid "You _type:"
+msgstr "Usted _escribe:"
+
+#: ../gtk/plugins/spellchk.c:2278
+msgid "You _send:"
+msgstr "Usted _envĂ­a:"
+
+#. Created here so it can be passed to whole_words_button_toggled.
+#: ../gtk/plugins/spellchk.c:2290
+msgid "_Exact case match (uncheck for automatic case handling)"
+msgstr ""
+"Ajustar al formato _exacto (desmarcar para gestionar mayĂşsculas y minĂşsculas "
+"automáticamente)"
+
+#: ../gtk/plugins/spellchk.c:2292
+msgid "Only replace _whole words"
+msgstr "Reemplazar solamente palabras _enteras"
+
+#: ../gtk/plugins/spellchk.c:2317
+msgid "General Text Replacement Options"
+msgstr "Opciones de reemplazos de texto general"
+
+#: ../gtk/plugins/spellchk.c:2318
+msgid "Enable replacement of last word on send"
+msgstr "Habilitar la sustituciĂłn de la Ăşltima palabra al enviar"
+
+#: ../gtk/plugins/spellchk.c:2343
+msgid "Text replacement"
+msgstr "Reemplazo de texto"
+
+#: ../gtk/plugins/spellchk.c:2345 ../gtk/plugins/spellchk.c:2346
+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 "
+"el usuario."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/ticker/ticker.c:77 ../gtk/plugins/ticker/ticker.c:355
+msgid "Buddy Ticker"
+msgstr "Deslizante de amigos"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/ticker/ticker.c:358 ../gtk/plugins/ticker/ticker.c:360
+msgid "A horizontal scrolling version of the buddy list."
+msgstr "Una versiĂłn horizontal deslizante de la lista de amigos."
+
+#: ../gtk/plugins/timestamp.c:186
+msgid "iChat Timestamp"
+msgstr "Sello temporal al estilo iChat"
+
+#: ../gtk/plugins/timestamp.c:193
+msgid "Delay"
+msgstr "Retardo"
+
+#: ../gtk/plugins/timestamp.c:200
+msgid "minutes."
+msgstr "minutos."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/timestamp.c:256
+msgid "Timestamp"
+msgstr "Marca temporal"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/timestamp.c:259 ../gtk/plugins/timestamp.c:261
+msgid "Adds iChat-style timestamps to conversations every N minutes."
+msgstr ""
+"Añade una marca de tiempo al estilo iChat en las conversaciones cada N "
+"minutos."
+
+#: ../gtk/plugins/timestamp_format.c:22
+msgid "Timestamp Format Options"
+msgstr "Opciones de formato de marca de tiempo"
+
+#: ../gtk/plugins/timestamp_format.c:27
+msgid "_Force (traditional Gaim) 24-hour time format"
+msgstr "_Forzar formato de tiempo de 24 horas (tradicional Gaim)"
+
+#: ../gtk/plugins/timestamp_format.c:30
+msgid "Show dates in..."
+msgstr "Mostrar las fechas en..."
+
+#: ../gtk/plugins/timestamp_format.c:35
+msgid "Co_nversations:"
+msgstr "Co_nversaciones:"
+
+#: ../gtk/plugins/timestamp_format.c:37 ../gtk/plugins/timestamp_format.c:46
+msgid "For delayed messages"
+msgstr "Para mensajes diferidos"
+
+#: ../gtk/plugins/timestamp_format.c:38 ../gtk/plugins/timestamp_format.c:47
+msgid "For delayed messages and in chats"
+msgstr "Para mensajes diferidos y para chats"
+
+#: ../gtk/plugins/timestamp_format.c:44
+msgid "_Message Logs:"
+msgstr "Registro de _mensajes:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/timestamp_format.c:149
+msgid "Message Timestamp Formats"
+msgstr "Formatos de marca de tiempo de mensajes"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/timestamp_format.c:152
+msgid "Customizes the message timestamp formats."
+msgstr "Configura el formato de la marca de tiempo de mensajes."
+
+#. *  description
+#: ../gtk/plugins/timestamp_format.c:154
+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."
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:183
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:569
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:616
+msgid "Opacity:"
+msgstr "Opacidad:"
+
+#. IM Convo trans options
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:533
+msgid "IM Conversation Windows"
+msgstr "Ventanas de conversaciĂłn de MI"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:534
+msgid "_IM window transparency"
+msgstr "Transparencia de las ventanas de M_I"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:548
+msgid "_Show slider bar in IM window"
+msgstr "_Mostrar barra deslizante en la ventana MI"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:555
+msgid "Remove IM window transparency on focus"
+msgstr "Eliminar la transparencia de las ventanas MI al enfocar"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:558
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:606
+msgid "Always on top"
+msgstr "Siempre en primer plano"
+
+#. Buddy List trans options
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:590
+msgid "Buddy List Window"
+msgstr "Ventana de la lista de amigos"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:591
+msgid "_Buddy List window transparency"
+msgstr "Transparencia de la ventana de lista de _amigos"
+
+#: ../gtk/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 enfoca"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:658
+msgid "Transparency"
+msgstr "Transparencia"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:661
+msgid "Variable Transparency for the buddy list and conversations."
+msgstr "Transparencia variable para la lista de amigos y las conversaciones."
+
+#. *  description
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:663
+msgid ""
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
+"\n"
+"* Note: This plugin requires Win2000 or greater."
+msgstr ""
+"Este complemento activa diversas transparencias alpha en las ventanas de "
+"conversaciĂłn y en la lista de amigos.\n"
+"\n"
+"* Nota: Este complemento requiere Win2000 o superior."
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:430
+msgid "GTK+ Runtime Version"
+msgstr "VersiĂłn en ejecuciĂłn de GTK+"
+
+#. Autostart
+#: ../gtk/plugins/win32/winprefs/winprefs.c:438
+msgid "Startup"
+msgstr "Inicio"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:439
+msgid "_Start Gaim on Windows startup"
+msgstr "_Iniciar Gaim al iniciar Windows"
+
+# Usar empotrable? (jfs)
+#: ../gtk/plugins/win32/winprefs/winprefs.c:452
+msgid "_Dockable Buddy List"
+msgstr "Lista de amigos a_pilable "
+
+#. Blist On Top
+#: ../gtk/plugins/win32/winprefs/winprefs.c:456
+msgid "_Keep Buddy List window on top:"
+msgstr "_Mantener la ventana de lista de amigos por encima del resto"
+
+#. XXX: Did this ever work?
+#: ../gtk/plugins/win32/winprefs/winprefs.c:461
+msgid "Only when docked"
+msgstr "Solamente cuando se apile"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:466
+msgid "_Flash window when IMs are received"
+msgstr "_Destello de ventana cuando se reciben MIs"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:468
+msgid "_Flash window when chat messages are received"
+msgstr "_Destello de ventana cuando se reciben mensajes de chat"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:492
+msgid "WinGaim Options"
+msgstr "Opciones de WinGaim"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:494
+msgid "Options specific to Windows Gaim."
+msgstr "Opciones especĂ­ficas de Gaim para Windows."
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:495
+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."
+
+#: ../libgaim/account.c:773
+msgid "accounts"
+msgstr "cuentas"
+
+#: ../libgaim/account.c:917
+msgid "Password is required to sign on."
+msgstr "Para conectarse se necesita una contraseña."
+
+#: ../libgaim/account.c:942
+#, c-format
+msgid "Enter password for %s (%s)"
+msgstr "Introduzca la contraseña para %s (%s)"
+
+#: ../libgaim/account.c:949
+msgid "Enter Password"
+msgstr "Introduzca la contraseña"
+
+#: ../libgaim/account.c:954
+msgid "Save password"
+msgstr "Guardar la contraseña"
+
+#: ../libgaim/account.c:988 ../libgaim/connection.c:103
+#, c-format
+msgid "Missing protocol plugin for %s"
+msgstr "Falta el complemento de protocolo para %s"
+
+#: ../libgaim/account.c:1070 ../libgaim/protocols/gg/gg.c:696
+#: ../libgaim/protocols/jabber/jabber.c:1304
+msgid "New passwords do not match."
+msgstr "Las nuevas contraseñas no coinciden."
+
+#: ../libgaim/account.c:1079
+msgid "Fill out all fields completely."
+msgstr "Rellene todos los campos completamente."
+
+#: ../libgaim/account.c:1102
+msgid "Original password"
+msgstr "Contraseña original"
+
+#: ../libgaim/account.c:1109
+msgid "New password"
+msgstr "Nueva contraseña"
+
+#: ../libgaim/account.c:1116
+msgid "New password (again)"
+msgstr "Nueva contraseña (otra vez)"
+
+#: ../libgaim/account.c:1122
+#, c-format
+msgid "Change password for %s"
+msgstr "Cambiar la contraseña de %s"
+
+#: ../libgaim/account.c:1130
+msgid "Please enter your current password and your new password."
+msgstr "Introduzca su contraseña actual y la contraseña nueva."
+
+#: ../libgaim/account.c:1160
+#, c-format
+msgid "Change user information for %s"
+msgstr "Cambiar la informaciĂłn del usuario %s"
+
+#: ../libgaim/account.c:1163 ../libgaim/protocols/toc/toc.c:1690
+msgid "Set User Info"
+msgstr "Establecer su informaciĂłn de usuario"
+
+#: ../libgaim/blist.c:543
+msgid "buddy list"
+msgstr "lista de amigos"
+
+#: ../libgaim/blist.c:1904
+#, c-format
+msgid ""
+"%d buddy from group %s was not removed because it belongs to an account "
+"which is disabled or offline.  This buddy and the group were not removed.\n"
+msgid_plural ""
+"%d buddies from group %s were not removed because they belong to accounts "
+"which are currently disabled or offline.  These buddies and the group were "
+"not removed.\n"
+msgstr[0] ""
+"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"
+
+#: ../libgaim/blist.c:1914
+msgid "Group not removed"
+msgstr "Grupo no eliminado"
+
+#: ../libgaim/connection.c:105
+msgid "Registration Error"
+msgstr "Error de registro"
+
+#: ../libgaim/connection.c:284
+#, c-format
+msgid "+++ %s signed on"
+msgstr "+++ %s se ha conectado"
+
+#: ../libgaim/connection.c:317
+#, c-format
+msgid "+++ %s signed off"
+msgstr "+++ %s se ha desconectado"
+
+#: ../libgaim/conversation.c:165
+msgid "Unable to send message: The message is too large."
+msgstr "No se pudo enviar el mensaje: es demasiado grande."
+
+#: ../libgaim/conversation.c:168 ../libgaim/conversation.c:181
+#, c-format
+msgid "Unable to send message to %s."
+msgstr "No se pudo enviar el mensaje a %s."
+
+#: ../libgaim/conversation.c:169
+msgid "The message is too large."
+msgstr "El mensaje es demasiado largo"
+
+#: ../libgaim/conversation.c:178
+msgid "Unable to send message."
+msgstr "No se pudo enviar el mensaje."
+
+#: ../libgaim/conversation.c:1162
+msgid "Send Message"
+msgstr "Enviar un mensaje"
+
+#: ../libgaim/conversation.c:1163
+msgid "_Send Message"
+msgstr "Enviar un _mensaje"
+
+#: ../libgaim/conversation.c:1566
+#, c-format
+msgid "%s entered the room."
+msgstr "%s ha entrado en la sala."
+
+#: ../libgaim/conversation.c:1569
+#, c-format
+msgid "%s [<I>%s</I>] entered the room."
+msgstr "%s [<I>%s</I>] ha entrado en la sala."
+
+#: ../libgaim/conversation.c:1674
+#, c-format
+msgid "You are now known as %s"
+msgstr "Vd. ahora se llama %s"
+
+#: ../libgaim/conversation.c:1694
+#, c-format
+msgid "%s is now known as %s"
+msgstr "%s ahora se llama %s"
+
+#: ../libgaim/conversation.c:1767
+#, c-format
+msgid "%s left the room."
+msgstr "%s ha salido de la sala."
+
+#: ../libgaim/conversation.c:1770
+#, c-format
+msgid "%s left the room (%s)."
+msgstr "%s ha salido de la sala (%s)."
+
+#: ../libgaim/desktopitem.c:286 ../libgaim/desktopitem.c:877
+msgid "No name"
+msgstr "Sin nombre"
+
+#: ../libgaim/dbus-server.c:577
+#, c-format
+msgid "Failed to get connection: %s"
+msgstr "No se pudo obtener la conexiĂłn: %s"
+
+#: ../libgaim/dbus-server.c:585
+#, c-format
+msgid "Failed to get name: %s"
+msgstr "No se pudo obtener un nombre: %s"
+
+#: ../libgaim/dbus-server.c:598
+#, c-format
+msgid "Failed to get serv name: %s"
+msgstr "No se pudo obtener el nombre del servidor: %s"
+
+#: ../libgaim/dnsquery.c:489
+msgid "Unable to create new resolver process\n"
+msgstr "No se pudo crear un proceso nuevo de resoluciĂłn\n"
+
+#: ../libgaim/dnsquery.c:494
+msgid "Unable to send request to resolver process\n"
+msgstr "No se pudo enviar una solicitud al proceso de resoluciĂłn\n"
+
+#: ../libgaim/dnsquery.c:527 ../libgaim/dnsquery.c:677
+#, c-format
+msgid ""
+"Error resolving %s:\n"
+"%s"
+msgstr ""
+"Error al resolver %s: \n"
+"%s"
+
+#: ../libgaim/dnsquery.c:530 ../libgaim/dnsquery.c:691
+#: ../libgaim/dnsquery.c:799
+#, c-format
+msgid "Error resolving %s: %d"
+msgstr "Error al resolver %s: %d"
+
+#: ../libgaim/dnsquery.c:552
+#, c-format
+msgid ""
+"Error reading from resolver process:\n"
+"%s"
+msgstr ""
+"Error al leer del proceso de resoluciĂłn:\n"
+"%s"
+
+#: ../libgaim/dnsquery.c:556
+msgid "EOF while reading from resolver process"
+msgstr "Fin de fichero mientras se leĂ­a del proceso de resoluciĂłn"
+
+#: ../libgaim/dnsquery.c:735
+#, c-format
+msgid "Thread creation failure: %s"
+msgstr "FallĂł en la creaciĂłn de hilos: %s"
+
+#: ../libgaim/dnsquery.c:736
+msgid "Unknown reason"
+msgstr "RazĂłn desconocida"
+
+#: ../libgaim/ft.c:189 ../libgaim/protocols/msn/msn.c:410
+#, c-format
+msgid ""
+"Error reading %s: \n"
+"%s.\n"
+msgstr ""
+"Error al leer %s: \n"
+"%s.\n"
+
+#: ../libgaim/ft.c:193
+#, c-format
+msgid ""
+"Error writing %s: \n"
+"%s.\n"
+msgstr ""
+"Error al escribir %s: \n"
+"%s.\n"
+
+#: ../libgaim/ft.c:197
+#, c-format
+msgid ""
+"Error accessing %s: \n"
+"%s.\n"
+msgstr ""
+"Error al acceder a %s: \n"
+"%s.\n"
+
+#: ../libgaim/ft.c:230
+msgid "Cannot send a file of 0 bytes."
+msgstr "No se puede enviar un archivo de 0 bytes."
+
+#: ../libgaim/ft.c:240
+msgid "Cannot send a directory."
+msgstr "No se puede enviar un directorio."
+
+#: ../libgaim/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"
+
+#: ../libgaim/ft.c:307
+#, c-format
+msgid "%s wants to send you %s (%s)"
+msgstr "%s quiere enviarle %s (%s)"
+
+#: ../libgaim/ft.c:314
+#, c-format
+msgid "%s wants to send you a file"
+msgstr "%s quiere enviarle un fichero"
+
+#: ../libgaim/ft.c:355
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr "ÂżAceptar solicitud de transferencia de archivo de %s?"
+
+#: ../libgaim/ft.c:359
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"Hay un archivo disponible a descargar desde:\n"
+"Servidor remoto: %s\n"
+"Puerto remoto: %d"
+
+#: ../libgaim/ft.c:392
+#, c-format
+msgid "%s is offering to send file %s"
+msgstr "%s se ofrece a enviarle el archivo %s"
+
+#: ../libgaim/ft.c:444
+#, c-format
+msgid "%s is not a valid filename.\n"
+msgstr "%s no es un nombre de archivo válido.\n"
+
+#: ../libgaim/ft.c:465
+#, c-format
+msgid "Offering to send %s to %s"
+msgstr "Se ofrece enviar %s a %s"
+
+#: ../libgaim/ft.c:477
+#, c-format
+msgid "Starting transfer of %s from %s"
+msgstr "Comienza la transferencia de %s de %s"
+
+#: ../libgaim/ft.c:631
+#, c-format
+msgid "Transfer of file %s complete"
+msgstr "Se ha completado la transferencia de %s"
+
+#: ../libgaim/ft.c:634
+msgid "File transfer complete"
+msgstr "Transferencia de archivos completa"
+
+#: ../libgaim/ft.c:1023
+#, c-format
+msgid "You canceled the transfer of %s"
+msgstr "Vd. cancelĂł la transferencia de %s"
+
+#: ../libgaim/ft.c:1028
+msgid "File transfer cancelled"
+msgstr "Transferencia de archivos cancelada"
+
+#: ../libgaim/ft.c:1086
+#, c-format
+msgid "%s canceled the transfer of %s"
+msgstr "%s cancelĂł la transferencia de %s"
+
+#: ../libgaim/ft.c:1091
+#, c-format
+msgid "%s canceled the file transfer"
+msgstr "%s cancelĂł la transferencia de archivos"
+
+#: ../libgaim/ft.c:1148
+#, c-format
+msgid "File transfer to %s failed."
+msgstr "FallĂł la transferencia del archivo a %s."
+
+#: ../libgaim/ft.c:1150
+#, c-format
+msgid "File transfer from %s failed."
+msgstr "FallĂł la transferencia del archivo de %s."
+
+#: ../libgaim/log.c:181
 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:547 src/log.c:497
+#: ../libgaim/log.c:562
 msgid "HTML"
 msgstr "HTML"
 
-#: ../src/log.c:558 src/log.c:508
+#: ../libgaim/log.c:573
 msgid "Plain text"
 msgstr "En claro"
 
-#: src/log.c:519
+#: ../libgaim/log.c:584
 msgid "Old Gaim"
 msgstr "Antiguo Gaim"
 
-#: ../src/log.c:668 src/log.c:577
+#: ../libgaim/log.c:691
 msgid "Logging of this conversation failed."
 msgstr "No se pudo registrar esta conversaciĂłn."
 
-#: ../src/log.c:969 src/log.c:839
+#: ../libgaim/log.c:1041
 msgid "XML"
 msgstr "XML"
 
-#: ../src/log.c:1037 src/log.c:904
+#: ../libgaim/log.c:1115
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -5798,7 +5828,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;RESPUESTA "
 "AUTOMĂTICA&gt;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:1039 src/log.c:906
+#: ../libgaim/log.c:1117
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -5807,43 +5837,45 @@
 "<font color=\"#A82F2f\"><font size=\"2\">(%s)</font> <b>%s &lt;RESPUESTA "
 "AUTOMĂTICA&gt;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:1096 ../src/log.c:1218 src/log.c:957 src/log.c:1074
+#: ../libgaim/log.c:1175 ../libgaim/log.c:1306
 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:1108 ../src/log.c:1230 src/log.c:967 src/log.c:1086
+#: ../libgaim/log.c:1187 ../libgaim/log.c:1320
 #, 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:1161 src/log.c:1019
+#: ../libgaim/log.c:1249
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RESPUESTA AUTOMĂTICA>: %s\n"
 
-#: ../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
+#: ../libgaim/plugin.c:281 ../libgaim/protocols/jabber/buddy.c:1649
+#: ../libgaim/protocols/msn/servconn.c:139
+#: ../libgaim/protocols/msn/session.c:321
+#: ../libgaim/protocols/oscar/oscar.c:2677
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: ../src/plugin.c:424
+#: ../libgaim/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
+msgstr ""
+"No hubo coincidencia en el número mágico del complemento %d (necesitaba %d)"
+
+#: ../libgaim/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
+msgstr ""
+"No hubo coincidencia en el nĂşmero de versiĂłn ABI %d.%d.x (necesitaba %d.%d.x)"
+
+#: ../libgaim/plugin.c:458
 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
+#: ../libgaim/plugin.c:523
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -5852,41 +5884,543 @@
 "No se encontrĂł el complemento necesario %s. Por favor, instale este "
 "complemento e inténtelo de nuevo."
 
-#: ../src/plugin.c:519
+#: ../libgaim/plugin.c:528
 msgid "Gaim encountered errors loading the plugin."
 msgstr "Gaim encontrĂł un error mientras cargaba este complemento."
 
-#: ../src/plugin.c:542 src/plugin.c:391
+#: ../libgaim/plugin.c:550
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "No se pudo cargar el complemento necesario %s."
 
-#: ../src/plugin.c:546 src/plugin.c:367 src/plugin.c:395
+#: ../libgaim/plugin.c:554
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim no pudo cargar su complemento."
 
-#: ../src/plugin.c:648
+#: ../libgaim/plugin.c:654
 #, c-format
 msgid "The dependent plugin %s failed to unload."
 msgstr "No se pudo cargar el complemento dependiente %s."
 
-#: ../src/plugin.c:653
+#: ../libgaim/plugin.c:659
 msgid "Gaim encountered errors unloading the plugin."
 msgstr "Gaim encontrĂł errores mientras descargaba el complemento."
 
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ciphertest.c:264
+msgid "Cipher Test"
+msgstr "Prueba de cifrado"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/ciphertest.c:267 ../libgaim/plugins/ciphertest.c:269
+msgid "Tests the ciphers that ship with gaim."
+msgstr "Prueba los cifrados que se incluyen en gaim."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/dbus-example.c:155
+msgid "DBus Example"
+msgstr "Ejemplo DBus"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/dbus-example.c:158 ../libgaim/plugins/dbus-example.c:160
+msgid "DBus Plugin Example"
+msgstr "Ejemplo de complemento DBus"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/filectl.c:248
+msgid "Gaim File Control"
+msgstr "Control de archivos de Gaim"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/filectl.c:251 ../libgaim/plugins/filectl.c:253
+msgid "Allows you to control Gaim by entering commands in a file."
+msgstr "Permite controlar Gaim introduciendo Ăłrdenes en un archivo."
+
+#: ../libgaim/plugins/idle.c:158 ../libgaim/plugins/idle.c:216
+msgid "Minutes"
+msgstr "minutos"
+
+#. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
+#. If that doesn't translate well into your language, drop the 's before translating.
+#: ../libgaim/plugins/idle.c:165 ../libgaim/plugins/idle.c:198
+#: ../libgaim/plugins/idle.c:223 ../libgaim/plugins/idle.c:315
+msgid "I'dle Mak'er"
+msgstr "Generador de ausencia"
+
+#: ../libgaim/plugins/idle.c:166 ../libgaim/plugins/idle.c:255
+msgid "Set Account Idle Time"
+msgstr "Establecer tiempo de inactividad de la cuenta"
+
+#: ../libgaim/plugins/idle.c:169 ../libgaim/plugins/idle.c:227
+msgid "_Set"
+msgstr "_Guardar"
+
+#: ../libgaim/plugins/idle.c:170 ../libgaim/plugins/idle.c:203
+#: ../libgaim/plugins/idle.c:228
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: ../libgaim/plugins/idle.c:183
+msgid "None of your accounts are idle."
+msgstr "Ninguna de sus cuentas está inactiva."
+
+#: ../libgaim/plugins/idle.c:199 ../libgaim/plugins/idle.c:259
+msgid "Unset Account Idle Time"
+msgstr "Desactivar tiempo de inactividad de la cuenta"
+
+#: ../libgaim/plugins/idle.c:202
+msgid "_Unset"
+msgstr "_Desactivar"
+
+#: ../libgaim/plugins/idle.c:224 ../libgaim/plugins/idle.c:263
+msgid "Set Idle Time for All Accounts"
+msgstr "Fijar tiempo de inactividad para todas las cuentas"
+
+#: ../libgaim/plugins/idle.c:268
+msgid "Unset Idle Time for All Idled Accounts"
+msgstr "Desactivar tiempo de inactividad para todas las cuentas inactivas"
+
+#: ../libgaim/plugins/idle.c:317 ../libgaim/plugins/idle.c:318
+msgid "Allows you to hand-configure how long you've been idle"
+msgstr "Permite configurar manualmente cuánto tiempo ha estado inactivo"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ipc-test-client.c:87
+msgid "IPC Test Client"
+msgstr "Cliente de prueba IPC"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../libgaim/plugins/ipc-test-client.c:90
+msgid "Test plugin IPC support, as a client."
+msgstr "Complemento de prueba con soporte IPC, como cliente."
+
+#. *  description
+#: ../libgaim/plugins/ipc-test-client.c:92
+msgid ""
+"Test plugin IPC support, as a client. This locates the server plugin and "
+"calls the commands registered."
+msgstr ""
+"Soporte de IPC como cliente, complemento de prueba. Éste localiza el "
+"complemento de servidor y llama a las Ăłrdenes registradas."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ipc-test-server.c:74
+msgid "IPC Test Server"
+msgstr "Servidor de prueba IPC"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../libgaim/plugins/ipc-test-server.c:77
+msgid "Test plugin IPC support, as a server."
+msgstr "Complemento de soporte IPC de prueba, como servidor."
+
+#. *  description
+#: ../libgaim/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."
+
+#: ../libgaim/plugins/log_reader.c:1412
+msgid "User is offline."
+msgstr "El usuario no está conectado."
+
+#: ../libgaim/plugins/log_reader.c:1418
+msgid "Auto-response sent:"
+msgstr "_Enviar respuesta automática:"
+
+#: ../libgaim/plugins/log_reader.c:1428 ../libgaim/plugins/log_reader.c:1431
+#: ../libgaim/plugins/statenotify.c:80
+#, c-format
+msgid "%s has signed off."
+msgstr "%s se ha desconectado."
+
+#: ../libgaim/plugins/log_reader.c:1445
+msgid "One or more messages may have been undeliverable."
+msgstr "Uno o más mensajes puede no haber llegado a destino."
+
+#: ../libgaim/plugins/log_reader.c:1455
+msgid "You were disconnected from the server."
+msgstr "Ha sido desconectado del servidor."
+
+#: ../libgaim/plugins/log_reader.c:1463
+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."
+
+#: ../libgaim/plugins/log_reader.c:1478
+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."
+
+#: ../libgaim/plugins/log_reader.c:1483
+msgid "Message could not be sent."
+msgstr "No se enviĂł su mensaje."
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libgaim/plugins/log_reader.c:1831 ../libgaim/plugins/log_reader.c:1940
+msgid "Adium"
+msgstr "Adium"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libgaim/plugins/log_reader.c:1844 ../libgaim/plugins/log_reader.c:1945
+msgid "Fire"
+msgstr "Fire"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libgaim/plugins/log_reader.c:1856 ../libgaim/plugins/log_reader.c:1949
+msgid "Messenger Plus!"
+msgstr "Messenger Plus!"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libgaim/plugins/log_reader.c:1869 ../libgaim/plugins/log_reader.c:1954
+msgid "MSN Messenger"
+msgstr "MSN Messenger"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libgaim/plugins/log_reader.c:1881 ../libgaim/plugins/log_reader.c:1958
+msgid "Trillian"
+msgstr "Trillian"
+
+#. Add general preferences.
+#: ../libgaim/plugins/log_reader.c:1922
+msgid "General Log Reading Configuration"
+msgstr "ConfiguraciĂłn general de lectura del registro"
+
+#: ../libgaim/plugins/log_reader.c:1926
+msgid "Fast size calculations"
+msgstr "Cálculos de tamaño rápido"
+
+#: ../libgaim/plugins/log_reader.c:1930
+msgid "Use name heuristics"
+msgstr "Utilizar heurĂ­sticos de nombres"
+
+#. Add Log Directory preferences.
+#: ../libgaim/plugins/log_reader.c:1936
+msgid "Log Directory"
+msgstr "Directorio de registro"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/log_reader.c:1981
+msgid "Log Reader"
+msgstr "Lector de registro"
+
+#. *< name
+#. *< version
+#. * summary
+#: ../libgaim/plugins/log_reader.c:1985
+msgid "Includes other IM clients' logs in the log viewer."
+msgstr "Incluir otros registros de clientes de MI en el visor de registro."
+
+#. * description
+#: ../libgaim/plugins/log_reader.c:1989
+msgid ""
+"When viewing logs, this plugin will include logs from other IM clients. "
+"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"\n"
+"WARNING: This plugin is still alpha code and may crash frequently.  Use it "
+"at your own risk!"
+msgstr ""
+"Cuando consulte los registros este complemento incluirá registros de otros clientes de IM. Actualmente, esto incluye a Adium, MSN Messenger y Trillian.\n"
+"\n"
+"AVISO: Este complemento aún es código en «alpha» y puede bloquearse con frecuencia. ¡Uselo bajo su propia responsabilidad!"
+
+#: ../libgaim/plugins/mono/loader/mono.c:213
+msgid "Mono Plugin Loader"
+msgstr "Cargador de complementos Mono"
+
+#: ../libgaim/plugins/mono/loader/mono.c:215
+#: ../libgaim/plugins/mono/loader/mono.c:216
+msgid "Loads .NET plugins with Mono."
+msgstr "Cargar complementos .NET con Mono."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/perl/perl.c:591
+msgid "Perl Plugin Loader"
+msgstr "Cargador de complementos Perl"
+
+#. *< name
+#. *< version
+#. *< summary
+#: ../libgaim/plugins/perl/perl.c:593 ../libgaim/plugins/perl/perl.c:594
+msgid "Provides support for loading perl plugins."
+msgstr "Provee soporte para cargar complementos en perl."
+
+#: ../libgaim/plugins/psychic.c:19
+msgid "Psychic Mode"
+msgstr "Modo psĂ­quico"
+
+#: ../libgaim/plugins/psychic.c:20
+msgid "Psychic mode for incoming conversation"
+msgstr "Modo psĂ­quico para conversaciones entrantes"
+
+#: ../libgaim/plugins/psychic.c:21
+msgid ""
+"Causes conversation windows to appear as other users begin to message you.  "
+"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+msgstr ""
+"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!"
+
+#. This is a quote from Star Wars.  You should
+#. probably not translate it literally.  If
+#. you can't find a fitting cultural reference
+#. in your language, consider translating
+#. something like this instead:
+#. "You feel a new message coming."
+#: ../libgaim/plugins/psychic.c:63
+msgid "You feel a disturbance in the force..."
+msgstr "Sientes una perturbaciĂłn en la fuerza..."
+
+#: ../libgaim/plugins/psychic.c:82
+msgid "Only enable for users on the buddy list"
+msgstr "Permitir sĂłlo a los usuarios en mi lista de amigos"
+
+#: ../libgaim/plugins/psychic.c:87
+msgid "Disable when away"
+msgstr "Deshabilitar cuando ausente"
+
+#: ../libgaim/plugins/psychic.c:91
+msgid "Display notification message in conversations"
+msgstr "Muestra el mensaje de notificaciĂłn en las conversaciones"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/signals-test.c:684
+msgid "Signals Test"
+msgstr "Prueba de señales"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/signals-test.c:687 ../libgaim/plugins/signals-test.c:689
+msgid "Test to see that all signals are working properly."
+msgstr "Probar para ver si todas las señales funcionan correctamente."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/simple.c:37
+msgid "Simple Plugin"
+msgstr "Complemento sencillo"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/simple.c:40 ../libgaim/plugins/simple.c:42
+msgid "Tests to see that most things are working."
+msgstr "Hace pruebas para determinar si la mayor parte de las cosas funcionan."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ssl/ssl.c:94
+msgid "SSL"
+msgstr "SSL"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/ssl/ssl.c:97 ../libgaim/plugins/ssl/ssl.c:99
+msgid "Provides a wrapper around SSL support libraries."
+msgstr ""
+"Proporciona un recubrimiento a través de las bibliotecas de soporte de SSL."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ssl/ssl-gnutls.c:240
+msgid "GNUTLS"
+msgstr "GNUTLS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/ssl/ssl-gnutls.c:243
+#: ../libgaim/plugins/ssl/ssl-gnutls.c:245
+msgid "Provides SSL support through GNUTLS."
+msgstr "Proporciona soporte SSL a través de GNUTLS."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ssl/ssl-nss.c:409
+msgid "NSS"
+msgstr "NSS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/ssl/ssl-nss.c:412 ../libgaim/plugins/ssl/ssl-nss.c:414
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "Proporciona soporte SSL a través del NSS de Mozilla."
+
+#: ../libgaim/plugins/statenotify.c:50
+#, c-format
+msgid "%s is no longer away."
+msgstr "%s ya no está ausente."
+
+#: ../libgaim/plugins/statenotify.c:52
+#, c-format
+msgid "%s has gone away."
+msgstr "%s se ha marchado."
+
+#: ../libgaim/plugins/statenotify.c:62
+#, c-format
+msgid "%s has become idle."
+msgstr "%s está ahora inactivo."
+
+#: ../libgaim/plugins/statenotify.c:64
+#, c-format
+msgid "%s is no longer idle."
+msgstr "%s ya no está inactivo."
+
+#: ../libgaim/plugins/statenotify.c:73
+#, c-format
+msgid "%s has signed on."
+msgstr "%s se ha conectado."
+
+#: ../libgaim/plugins/statenotify.c:91
+msgid "Notify When"
+msgstr "Notificar cuando"
+
+#: ../libgaim/plugins/statenotify.c:94
+msgid "Buddy Goes _Away"
+msgstr "El amigo se _ausenta"
+
+#: ../libgaim/plugins/statenotify.c:97
+msgid "Buddy Goes _Idle"
+msgstr "El amigo está _inactivo"
+
+#: ../libgaim/plugins/statenotify.c:100
+msgid "Buddy _Signs On/Off"
+msgstr "Un amigo se conecta/desconecta"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/statenotify.c:142
+msgid "Buddy State Notification"
+msgstr "NotificaciĂłn de estado de amigos"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/statenotify.c:145 ../libgaim/plugins/statenotify.c:148
+msgid ""
+"Notifies in a conversation window when a buddy goes or returns from away or "
+"idle."
+msgstr ""
+"Notifica en una ventana de conversaciĂłn cuando un amigo se ausenta o vuelve "
+"o está inactivo."
+
+#: ../libgaim/plugins/tcl/tcl.c:413
+msgid "Tcl Plugin Loader"
+msgstr "Cargador de complementos Tcl"
+
+#: ../libgaim/plugins/tcl/tcl.c:415 ../libgaim/plugins/tcl/tcl.c:416
+msgid "Provides support for loading Tcl plugins"
+msgstr "Provee soporte para cargar complementos Tcl"
+
 #. Send a message about the connection error
-#: src/protocols/bonjour/bonjour.c:107
+#: ../libgaim/protocols/bonjour/bonjour.c:111
 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
+#: ../libgaim/protocols/bonjour/bonjour.c:146
 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
+msgstr ""
+"No se pudo establecer una conexión con el servidor mDNS local. ¿Está "
+"arrancado?"
+
+#: ../libgaim/protocols/bonjour/bonjour.c:337
+#: ../libgaim/protocols/sametime/sametime.c:3239
 #, c-format
 msgid ""
 "\n"
@@ -5895,7 +6429,7 @@
 "\n"
 "<b>Estado:</b> %s"
 
-#: ../src/protocols/bonjour/bonjour.c:339 src/protocols/bonjour/bonjour.c:330
+#: ../libgaim/protocols/bonjour/bonjour.c:339
 #, c-format
 msgid ""
 "\n"
@@ -5914,411 +6448,400 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/bonjour/bonjour.c:434
-#: ../src/protocols/bonjour/bonjour.c:436 src/protocols/bonjour/bonjour.c:424
-#: src/protocols/bonjour/bonjour.c:426
+#: ../libgaim/protocols/bonjour/bonjour.c:435
+#: ../libgaim/protocols/bonjour/bonjour.c:437
 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
+#: ../libgaim/protocols/bonjour/bonjour.c:473
+#: ../libgaim/protocols/bonjour/bonjour.c:481
+#: ../libgaim/protocols/bonjour/bonjour.c:539
+#: ../libgaim/protocols/silc/silc.c:301
 msgid "Gaim User"
 msgstr "Usuario de Gaim"
 
 #. Creating the user splits
-#: src/protocols/bonjour/bonjour.c:553 src/protocols/silc/silc.c:921
+#: ../libgaim/protocols/bonjour/bonjour.c:577
+#: ../libgaim/protocols/silc/silc.c:935
 msgid "Hostname"
 msgstr "Servidor"
 
 #. Creating the options for the protocol
-#. 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: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
+#: ../libgaim/protocols/bonjour/bonjour.c:581 ../libgaim/protocols/gg/gg.c:622
+#: ../libgaim/protocols/jabber/jabber.c:800
 msgid "First name"
 msgstr "Nombre:"
 
-#: ../src/protocols/bonjour/bonjour.c:586 ../src/protocols/gg/gg.c:557
-#: src/protocols/bonjour/bonjour.c:563 src/protocols/gg/gg.c:566
+#: ../libgaim/protocols/bonjour/bonjour.c:584 ../libgaim/protocols/gg/gg.c:617
+#: ../libgaim/protocols/jabber/jabber.c:805
 msgid "Last name"
 msgstr "Apellidos:"
 
-#: ../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:685 src/protocols/silc/silc.c:925
-#: src/protocols/silc/util.c:512 src/protocols/yahoo/yahoo_profile.c:999
-msgid "Email"
+#: ../libgaim/protocols/bonjour/bonjour.c:587 ../libgaim/protocols/gg/gg.c:468
+#: ../libgaim/protocols/jabber/jabber.c:790
+#: ../libgaim/protocols/silc/silc.c:699 ../libgaim/protocols/silc/silc.c:939
+msgid "E-mail"
 msgstr "Correo electrĂłnico"
 
-#: ../src/protocols/bonjour/jabber.c:357
+#: ../libgaim/protocols/bonjour/bonjour.c:590
+msgid "AIM Account"
+msgstr "Cuenta AIM"
+
+#: ../libgaim/protocols/bonjour/bonjour.c:593
+msgid "Jabber Account"
+msgstr "Cuenta Jabber"
+
+#: ../libgaim/protocols/bonjour/bonjour.h:35
+msgid "Bonjour"
+msgstr "Bonjour"
+
+#: ../libgaim/protocols/bonjour/jabber.c:374
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s ha cerrado la conversaciĂłn."
 
-#: ../src/protocols/bonjour/jabber.c:439
+#: ../libgaim/protocols/bonjour/jabber.c:461
 msgid "Cannot open socket"
 msgstr "No se pudo abrir el socket"
 
-#: ../src/protocols/bonjour/jabber.c:447
+#: ../libgaim/protocols/bonjour/jabber.c:469
 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"
+#: ../libgaim/protocols/bonjour/jabber.c:493
+msgid "Could not bind socket to port"
+msgstr "No se pudo vincular el socket al puerto"
+
+#: ../libgaim/protocols/bonjour/jabber.c:501
+msgid "Could not listen on socket"
 msgstr "No se pudo escuchar en el socket"
 
-#: ../src/protocols/bonjour/jabber.c:559
+#: ../libgaim/protocols/bonjour/jabber.c:594
 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
+#: ../libgaim/protocols/gg/gg.c:76 ../libgaim/proxy.c:1776
+msgid "Invalid proxy settings"
+msgstr "Configuración inválida de proxy"
+
+#: ../libgaim/protocols/gg/gg.c:77 ../libgaim/proxy.c:1776
+msgid ""
+"Either the host name or port number specified for your given proxy type is "
+"invalid."
+msgstr ""
+"El nombre de servidor o el puerto especificados no son válidos para su tipo "
+"de proxy."
+
+#: ../libgaim/protocols/gg/gg.c:115 ../libgaim/protocols/gg/gg.c:137
+#: ../libgaim/protocols/gg/gg.c:180
 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
+#: ../libgaim/protocols/gg/gg.c:116 ../libgaim/protocols/gg/gg.c:138
+#: ../libgaim/protocols/gg/gg.c:181
 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
+#: ../libgaim/protocols/gg/gg.c:269 ../libgaim/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
 msgstr "Guardar la lista de amigos..."
 
-#: ../src/protocols/gg/gg.c:227 src/protocols/gg/gg.c:236
+#: ../libgaim/protocols/gg/gg.c:270
 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:233 ../src/protocols/gg/gg.c:235
-#: src/protocols/gg/gg.c:242 src/protocols/gg/gg.c:244
+msgstr ""
+"No se escribiĂł nada en el fichero ya que su lista de amigos esta vacĂ­a."
+
+#: ../libgaim/protocols/gg/gg.c:276 ../libgaim/protocols/gg/gg.c:278
 msgid "Couldn't open file"
 msgstr "No se pudo abrir el archivo"
 
-#: ../src/protocols/gg/gg.c:246 src/protocols/gg/gg.c:255
+#: ../libgaim/protocols/gg/gg.c:289
 msgid "Buddylist saved successfully!"
 msgstr "¡Se guardó con éxito la lista de amigos!"
 
-#: src/protocols/gg/gg.c:273 src/protocols/gg/gg.c:274
+#: ../libgaim/protocols/gg/gg.c:307 ../libgaim/protocols/gg/gg.c:308
 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
+#: ../libgaim/protocols/gg/gg.c:324
 msgid "Load Buddylist..."
 msgstr "Cargar lista de amigos..."
 
-#: ../src/protocols/gg/gg.c:282 src/protocols/gg/gg.c:291
+#: ../libgaim/protocols/gg/gg.c:325
 msgid "Buddylist loaded successfully!"
 msgstr "¡Éxito en la carga de la lista de amigos!"
 
-#: ../src/protocols/gg/gg.c:293 src/protocols/gg/gg.c:302
+#: ../libgaim/protocols/gg/gg.c:336
 msgid "Save buddylist..."
 msgstr "Guardar lista de amigos..."
 
-#: ../src/protocols/gg/gg.c:337 src/protocols/gg/gg.c:346
+#: ../libgaim/protocols/gg/gg.c:380
 msgid "Fill in the registration fields."
 msgstr "Rellene los campos de registro."
 
-#: ../src/protocols/gg/gg.c:342 src/protocols/gg/gg.c:351
+#: ../libgaim/protocols/gg/gg.c:385
 msgid "Passwords do not match."
 msgstr "Las contraseñas no coinciden."
 
-#: ../src/protocols/gg/gg.c:351 src/protocols/gg/gg.c:360
+#: ../libgaim/protocols/gg/gg.c:394
 msgid "Unable to register new account. Error occurred.\n"
 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
+#: ../libgaim/protocols/gg/gg.c:407
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Se ha registrado una nueva cuenta Gadu-Gadu"
 
-#: ../src/protocols/gg/gg.c:365 src/protocols/gg/gg.c:374
+#: ../libgaim/protocols/gg/gg.c:408
 msgid "Registration completed successfully!"
 msgstr "¡Se completó el registro con éxito!"
 
-#: ../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
+#: ../libgaim/protocols/gg/gg.c:473 ../libgaim/protocols/gg/gg.c:764
+#: ../libgaim/protocols/jabber/jabber.c:779
+#: ../libgaim/protocols/jabber/jabber.c:1339
 msgid "Password"
 msgstr "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
+#: ../libgaim/protocols/gg/gg.c:478 ../libgaim/protocols/gg/gg.c:769
 msgid "Password (retype)"
 msgstr "Contraseña (escribir de nuevo)"
 
-#: ../src/protocols/gg/gg.c:440 ../src/protocols/gg/gg.c:714
+#: ../libgaim/protocols/gg/gg.c:483 ../libgaim/protocols/gg/gg.c:774
 msgid "Enter current token"
 msgstr "Introduzca el token actual"
 
-#: ../src/protocols/gg/gg.c:446 ../src/protocols/gg/gg.c:720
+#: ../libgaim/protocols/gg/gg.c:489 ../libgaim/protocols/gg/gg.c:780
 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
+#: ../libgaim/protocols/gg/gg.c:493 ../libgaim/protocols/gg/gg.c:494
 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
+#: ../libgaim/protocols/gg/gg.c:495
 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: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
+#. General
+#: ../libgaim/protocols/gg/gg.c:627 ../libgaim/protocols/gg/gg.c:1038
+#: ../libgaim/protocols/gg/gg.c:1104 ../libgaim/protocols/gg/gg.c:2182
+#: ../libgaim/protocols/jabber/buddy.c:271
+#: ../libgaim/protocols/jabber/buddy.c:800
+#: ../libgaim/protocols/jabber/buddy.c:1526
+#: ../libgaim/protocols/jabber/buddy.c:1708
+#: ../libgaim/protocols/jabber/jabber.c:795
+#: ../libgaim/protocols/msn/msn.c:1370 ../libgaim/protocols/msn/msn.c:1536
+#: ../libgaim/protocols/qq/buddy_info.c:41
+#: ../libgaim/protocols/silc/buddy.c:1528 ../libgaim/protocols/silc/ops.c:1035
+#: ../libgaim/protocols/silc/ops.c:1178 ../libgaim/protocols/silc/ops.c:1327
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1055
 msgid "Nickname"
 msgstr "Apodo"
 
-#: ../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
+#: ../libgaim/protocols/gg/gg.c:632 ../libgaim/protocols/gg/gg.c:1043
+#: ../libgaim/protocols/gg/gg.c:1107 ../libgaim/protocols/jabber/jabber.c:815
+#: ../libgaim/protocols/oscar/oscar.c:3683
+#: ../libgaim/protocols/oscar/oscar.c:3691
+#: ../libgaim/protocols/qq/buddy_info.c:47
 msgid "City"
 msgstr "Ciudad"
 
-#: ../src/protocols/gg/gg.c:577 src/protocols/gg/gg.c:586
+#: ../libgaim/protocols/gg/gg.c:637
 msgid "Year of birth"
 msgstr "Año de nacimiento"
 
-#: ../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
+#: ../libgaim/protocols/gg/gg.c:640 ../libgaim/protocols/msn/msn.c:1538
+#: ../libgaim/protocols/oscar/oscar.c:3647
+#: ../libgaim/protocols/qq/buddy_info.c:44
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1080
 msgid "Gender"
 msgstr "Sexo"
 
-#: src/protocols/gg/gg.c:590
+#: ../libgaim/protocols/gg/gg.c:641
 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
+#: ../libgaim/protocols/gg/gg.c:642 ../libgaim/protocols/oscar/oscar.c:3647
+#: ../libgaim/protocols/qq/buddy_info.c:81
 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
+#: ../libgaim/protocols/gg/gg.c:643 ../libgaim/protocols/oscar/oscar.c:3647
+#: ../libgaim/protocols/qq/buddy_info.c:82
 msgid "Female"
 msgstr "Mujer"
 
-#: ../src/protocols/gg/gg.c:587 src/protocols/gg/gg.c:596
+#: ../libgaim/protocols/gg/gg.c:647
 msgid "Only online"
 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
+#: ../libgaim/protocols/gg/gg.c:651 ../libgaim/protocols/gg/gg.c:652
 msgid "Find buddies"
 msgstr "Encontrar amigos"
 
-#: ../src/protocols/gg/gg.c:593 src/protocols/gg/gg.c:602
+#: ../libgaim/protocols/gg/gg.c:653
 msgid "Please, enter your search criteria below"
 msgstr "Por favor, introduzca a continuaciĂłn su criterio de bĂşsqueda"
 
-#: ../src/protocols/gg/gg.c:630 src/protocols/gg/gg.c:639
+#: ../libgaim/protocols/gg/gg.c:690
 msgid "Fill in the fields."
 msgstr "Rellene los campos."
 
-#: ../src/protocols/gg/gg.c:642 src/protocols/gg/gg.c:651
+#: ../libgaim/protocols/gg/gg.c:702
 msgid "Your current password is different from the one that you specified."
 msgstr "Su contraseña actual es diferente de la que ha especificado."
 
-#: ../src/protocols/gg/gg.c:656 src/protocols/gg/gg.c:665
+#: ../libgaim/protocols/gg/gg.c:716
 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:665 src/protocols/gg/gg.c:674
+#: ../libgaim/protocols/gg/gg.c:725
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Cambiar la contraseña de la cuenta Gadu-Gadu"
 
-#: ../src/protocols/gg/gg.c:666 src/protocols/gg/gg.c:675
+#: ../libgaim/protocols/gg/gg.c:726
 msgid "Password was changed successfully!"
 msgstr "¡Se cambió con éxito la contraseña!"
 
-#: ../src/protocols/gg/gg.c:699 src/protocols/gg/gg.c:708
+#: ../libgaim/protocols/gg/gg.c:759
 msgid "Current password"
 msgstr "Contraseña actual"
 
-#: ../src/protocols/gg/gg.c:724 src/protocols/gg/gg.c:733
+#: ../libgaim/protocols/gg/gg.c:784
 msgid "Please, enter your current password and your new password for UIN: "
 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
+#: ../libgaim/protocols/gg/gg.c:788 ../libgaim/protocols/gg/gg.c:789
 msgid "Change Gadu-Gadu Password"
 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
+#: ../libgaim/protocols/gg/gg.c:863
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Seleccione un chat para el amigo: %s"
 
-#: ../src/protocols/gg/gg.c:807 ../src/protocols/gg/gg.c:808
-#: src/protocols/gg/gg.c:825 src/protocols/gg/gg.c:826
+#: ../libgaim/protocols/gg/gg.c:866 ../libgaim/protocols/gg/gg.c:867
 msgid "Add to chat..."
 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
+#: ../libgaim/protocols/gg/gg.c:1029 ../libgaim/protocols/gg/gg.c:1098
+#: ../libgaim/protocols/oscar/oscar.c:3619
 msgid "UIN"
 msgstr "UIN"
 
-#: src/protocols/gg/gg.c:995
-msgid "Birth year"
+#: ../libgaim/protocols/gg/gg.c:1033 ../libgaim/protocols/gg/gg.c:1101
+#: ../libgaim/protocols/jabber/buddy.c:1522
+#: ../libgaim/protocols/jabber/buddy.c:1698
+#: ../libgaim/protocols/oscar/oscar.c:3630
+#: ../libgaim/protocols/silc/ops.c:1023
+msgid "First Name"
+msgstr "Nombre"
+
+#: ../libgaim/protocols/gg/gg.c:1052 ../libgaim/protocols/gg/gg.c:1110
+msgid "Birth Year"
 msgstr "Año de nacimiento"
 
-#: ../src/protocols/gg/gg.c:1020 src/protocols/gg/gg.c:1035
+#: ../libgaim/protocols/gg/gg.c:1092 ../libgaim/protocols/gg/gg.c:1161
+#: ../libgaim/protocols/oscar/oscar.c:3794
+msgid "Unable to display the search results."
+msgstr "No se pueden mostrar los resultados de la bĂşsqueda."
+
+#: ../libgaim/protocols/gg/gg.c:1152
 msgid "Gadu-Gadu Public Directory"
 msgstr "Directorio pĂşblico Gadu-Gadu"
 
-#: ../src/protocols/gg/gg.c:1021 src/protocols/gg/gg.c:1036
+#: ../libgaim/protocols/gg/gg.c:1153
 msgid "Search results"
 msgstr "Resultados de la bĂşsqueda"
 
-#: ../src/protocols/gg/gg.c:1118 ../src/protocols/gg/gg.c:1265
-#: src/protocols/gg/gg.c:1132 src/protocols/gg/gg.c:1279
+#: ../libgaim/protocols/gg/gg.c:1196
+msgid "No matching users found"
+msgstr "No se encontraron usuarios que coincidan"
+
+#: ../libgaim/protocols/gg/gg.c:1197
+msgid "There are no users matching your search criteria."
+msgstr "No hay usuarios que coincidan con sus criterios de bĂşsqueda."
+
+#: ../libgaim/protocols/gg/gg.c:1291 ../libgaim/protocols/gg/gg.c:1440
 msgid "Unable to read socket"
 msgstr "No se pudo leer el socket"
 
-#: src/protocols/gg/gg.c:1215
+#: ../libgaim/protocols/gg/gg.c:1376
 msgid "Buddy list downloaded"
 msgstr "Lista de amigos descargada"
 
-#: src/protocols/gg/gg.c:1216
+#: ../libgaim/protocols/gg/gg.c:1377
 msgid "Your buddy list was downloaded from the server."
 msgstr "Su lista de amigos fue descargada del servidor."
 
-#: src/protocols/gg/gg.c:1223
+#: ../libgaim/protocols/gg/gg.c:1384
 msgid "Buddy list uploaded"
 msgstr "Lista de amigos exportada"
 
-#: src/protocols/gg/gg.c:1224
+#: ../libgaim/protocols/gg/gg.c:1385
 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
+#: ../libgaim/protocols/gg/gg.c:1486 ../libgaim/protocols/gg/gg.c:1710
 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
+#: ../libgaim/protocols/gg/gg.c:1616 ../libgaim/protocols/msn/msn.c:562
 msgid "Blocked"
 msgstr "Bloqueado"
 
-#: ../src/protocols/gg/gg.c:1468 src/protocols/gg/gg.c:1473
+#: ../libgaim/protocols/gg/gg.c:1639
 msgid "Add to chat"
 msgstr "Añadir al chat"
 
-#: ../src/protocols/gg/gg.c:1477 src/protocols/gg/gg.c:1478
+#: ../libgaim/protocols/gg/gg.c:1648
 msgid "Unblock"
 msgstr "Desbloquear"
 
-#: ../src/protocols/gg/gg.c:1481 src/gtkprivacy.c:632 src/gtkprivacy.c:643
-#: src/protocols/gg/gg.c:1481
+#: ../libgaim/protocols/gg/gg.c:1652
 msgid "Block"
 msgstr "Bloquear"
 
-#: ../src/protocols/gg/gg.c:1498 src/protocols/gg/gg.c:1497
+#: ../libgaim/protocols/gg/gg.c:1669
 msgid "Chat _name:"
 msgstr "_Nombre de chat:"
 
-#: ../src/protocols/gg/gg.c:1724 src/protocols/gg/gg.c:1716
+#: ../libgaim/protocols/gg/gg.c:1902
 msgid "Chat error"
 msgstr "Error de chat"
 
-#: ../src/protocols/gg/gg.c:1725 src/protocols/gg/gg.c:1717
+#: ../libgaim/protocols/gg/gg.c:1903
 msgid "This chat name is already in use"
 msgstr "Ya existe un chat con ese nombre"
 
-#: ../src/protocols/gg/gg.c:1808 src/protocols/gg/gg.c:1799
+#: ../libgaim/protocols/gg/gg.c:1986
 msgid "Not connected to the server."
 msgstr "No está conectado al servidor."
 
-#: src/protocols/gg/gg.c:1822
+#: ../libgaim/protocols/gg/gg.c:2009
 msgid "Find buddies..."
 msgstr "Encontrar amigos... "
 
-#: src/protocols/gg/gg.c:1828
+#: ../libgaim/protocols/gg/gg.c:2015
 msgid "Change password..."
 msgstr "Cambiar su contraseña..."
 
-#: ../src/protocols/gg/gg.c:1843 src/protocols/gg/gg.c:1834
+#: ../libgaim/protocols/gg/gg.c:2021
 msgid "Upload buddylist to Server"
 msgstr "Subir la lista de amigos al servidor"
 
-#: ../src/protocols/gg/gg.c:1847 src/protocols/gg/gg.c:1838
+#: ../libgaim/protocols/gg/gg.c:2025
 msgid "Download buddylist from Server"
 msgstr "Descargar la lista de amigos del servidor"
 
-#: ../src/protocols/gg/gg.c:1851 src/protocols/gg/gg.c:1842
+#: ../libgaim/protocols/gg/gg.c:2029
 msgid "Delete buddylist from Server"
 msgstr "Borrar la lista de amigos del servidor"
 
-#: src/protocols/gg/gg.c:1846
+#: ../libgaim/protocols/gg/gg.c:2033
 msgid "Save buddylist to file..."
 msgstr "Guardar lista de amigos a archivo..."
 
-#: src/protocols/gg/gg.c:1850
+#: ../libgaim/protocols/gg/gg.c:2037
 msgid "Load buddylist from file..."
 msgstr "Cargar la lista de amigos desde archivo..."
 
@@ -6333,137 +6856,122 @@
 #. id
 #. name
 #. version
-#: ../src/protocols/gg/gg.c:1949 src/protocols/gg/gg.c:1937
+#: ../libgaim/protocols/gg/gg.c:2134
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Complemento de protocolo Gadu-Gadu"
 
 #. summary
-#: ../src/protocols/gg/gg.c:1950 src/protocols/gg/gg.c:1938
+#: ../libgaim/protocols/gg/gg.c:2135
 msgid "Polish popular IM"
 msgstr "Mensajería instantánea polaca muy popular"
 
-#: ../src/protocols/gg/gg.c:1998 src/protocols/gg/gg.c:1986
+#: ../libgaim/protocols/gg/gg.c:2183
 msgid "Gadu-Gadu User"
 msgstr "Usuario de 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:1572
+#: ../libgaim/protocols/irc/cmds.c:43 ../libgaim/protocols/silc/silc.c:1585
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Orden desconocida: %s"
 
-#: ../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
+#: ../libgaim/protocols/irc/cmds.c:505 ../libgaim/protocols/jabber/chat.c:591
+#: ../libgaim/protocols/silc/silc.c:1293
 #, c-format
 msgid "current topic is: %s"
 msgstr "el tema actual es: %s"
 
-#: ../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
+#: ../libgaim/protocols/irc/cmds.c:509 ../libgaim/protocols/jabber/chat.c:595
+#: ../libgaim/protocols/silc/silc.c:1297
 msgid "No topic is set"
 msgstr "No hay tema establecido"
 
-#: ../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
+#: ../libgaim/protocols/irc/dcc_send.c:293
+#: ../libgaim/protocols/irc/dcc_send.c:334
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:268
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:277
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:290
 msgid "File Transfer Failed"
 msgstr "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
+#: ../libgaim/protocols/irc/dcc_send.c:294
+#: ../libgaim/protocols/irc/dcc_send.c:335
 msgid "Gaim could not open a listening port."
 msgstr "Gaim no pudo abrir un puerto de escucha."
 
-#: ../src/protocols/irc/irc.c:78 src/protocols/irc/irc.c:78
+#: ../libgaim/protocols/irc/irc.c:80
 msgid "Error displaying MOTD"
 msgstr "Error al mostrar el MOTD"
 
-#: ../src/protocols/irc/irc.c:78 src/protocols/irc/irc.c:78
+#: ../libgaim/protocols/irc/irc.c:80
 msgid "No MOTD available"
 msgstr "No hay MOTD disponible"
 
-#: ../src/protocols/irc/irc.c:79 src/protocols/irc/irc.c:79
+#: ../libgaim/protocols/irc/irc.c:81
 msgid "There is no MOTD associated with this connection."
 msgstr "No hay MOTD asociado con esta conexiĂłn."
 
-#: ../src/protocols/irc/irc.c:82 src/protocols/irc/irc.c:82
+#: ../libgaim/protocols/irc/irc.c:84
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD para %s"
 
-#: ../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
+#: ../libgaim/protocols/irc/irc.c:128 ../libgaim/protocols/irc/irc.c:166
+#: ../libgaim/protocols/irc/irc.c:614 ../libgaim/protocols/irc/irc.c:639
 msgid "Server has disconnected"
 msgstr "El servidor se ha desconectado"
 
-#: ../src/protocols/irc/irc.c:242 src/protocols/irc/irc.c:187
+#: ../libgaim/protocols/irc/irc.c:259
 msgid "View MOTD"
 msgstr "Ver MOTD"
 
-#: ../src/protocols/irc/irc.c:254 ../src/protocols/silc/chat.c:33
-#: src/protocols/irc/irc.c:199 src/protocols/silc/chat.c:33
+#: ../libgaim/protocols/irc/irc.c:271 ../libgaim/protocols/silc/chat.c:33
 msgid "_Channel:"
 msgstr "_Canal:"
 
-#: ../src/protocols/irc/irc.c:260 ../src/protocols/jabber/chat.c:59
-#: src/protocols/irc/irc.c:205 src/protocols/jabber/chat.c:59
+#: ../libgaim/protocols/irc/irc.c:277 ../libgaim/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "Contra_seña:"
 
-#: ../src/protocols/irc/irc.c:292 src/protocols/irc/irc.c:237
+#: ../libgaim/protocols/irc/irc.c:308
 msgid "IRC nicks may not contain whitespace"
 msgstr "Los apodos de IRC no pueden tener espacios en blanco"
 
-#: ../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
+#: ../libgaim/protocols/irc/irc.c:337 ../libgaim/protocols/jabber/jabber.c:575
+#: ../libgaim/protocols/jabber/jabber.c:920
 msgid "SSL support unavailable"
 msgstr "Soporte SSL no disponible"
 
-#: ../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
+#: ../libgaim/protocols/irc/irc.c:349 ../libgaim/protocols/simple/simple.c:466
+#: ../libgaim/protocols/simple/simple.c:1588
 msgid "Couldn't create socket"
 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
+#: ../libgaim/protocols/irc/irc.c:415 ../libgaim/protocols/jabber/jabber.c:451
+#: ../libgaim/protocols/oscar/oscar.c:1220
 msgid "Couldn't connect to host"
 msgstr "No se pudo conectar al servidor"
 
-#: ../src/protocols/irc/irc.c:429 ../src/protocols/jabber/jabber.c:447
-#: src/protocols/irc/irc.c:372 src/protocols/jabber/jabber.c:381
+#: ../libgaim/protocols/irc/irc.c:437 ../libgaim/protocols/jabber/jabber.c:475
 msgid "Connection Failed"
 msgstr "FallĂł la conexiĂłn"
 
-#: ../src/protocols/irc/irc.c:432 ../src/protocols/jabber/jabber.c:450
-#: src/protocols/irc/irc.c:375 src/protocols/jabber/jabber.c:384
+#: ../libgaim/protocols/irc/irc.c:440 ../libgaim/protocols/jabber/jabber.c:478
 msgid "SSL Handshake Failed"
 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
+#: ../libgaim/protocols/irc/irc.c:611 ../libgaim/protocols/irc/irc.c:636
 msgid "Read error"
 msgstr "Error de lectura"
 
-#: ../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
+#: ../libgaim/protocols/irc/irc.c:775 ../libgaim/protocols/silc/chat.c:1421
+#: ../libgaim/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
 msgstr "Usuarios"
 
-#: ../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
+#: ../libgaim/protocols/irc/irc.c:778
+#: ../libgaim/protocols/sametime/sametime.c:3350
+#: ../libgaim/protocols/silc/chat.c:1424 ../libgaim/protocols/silc/ops.c:1379
+#: ../libgaim/protocols/yahoo/yahoochat.c:1447
 msgid "Topic"
 msgstr "Tema"
 
@@ -6475,45 +6983,48 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../src/protocols/irc/irc.c:878 src/protocols/irc/irc.c:797
+#: ../libgaim/protocols/irc/irc.c:908
 msgid "IRC Protocol Plugin"
 msgstr "Complemento de protocolo IRC"
 
 #. *  summary
-#: ../src/protocols/irc/irc.c:879 src/protocols/irc/irc.c:798
+#: ../libgaim/protocols/irc/irc.c:909
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Complemento de protocolo IRC menos malo"
 
 #. 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
+#: ../libgaim/protocols/irc/irc.c:928 ../libgaim/protocols/irc/msgs.c:235
+#: ../libgaim/protocols/jabber/jabber.c:1970
+#: ../libgaim/protocols/msn/msn.c:2054 ../libgaim/protocols/oscar/oscar.c:6531
+#: ../libgaim/protocols/sametime/sametime.c:5638
+#: ../libgaim/protocols/silc/ops.c:1241 ../libgaim/protocols/silc/ops.c:1343
+#: ../libgaim/protocols/simple/simple.c:1839
+#: ../libgaim/protocols/toc/toc.c:2347
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/protocols/irc/irc.c:904 src/protocols/irc/irc.c:823
+#. port to connect to
+#: ../libgaim/protocols/irc/irc.c:931 ../libgaim/protocols/msn/msn.c:2059
+#: ../libgaim/protocols/oscar/oscar.c:6534
+#: ../libgaim/protocols/sametime/sametime.c:5643
+#: ../libgaim/protocols/silc/silc.c:1859 ../libgaim/protocols/toc/toc.c:2351
+msgid "Port"
+msgstr "Puerto"
+
+#: ../libgaim/protocols/irc/irc.c:934
 msgid "Encodings"
 msgstr "Codificaciones"
 
-#: ../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
+#: ../libgaim/protocols/irc/irc.c:937 ../libgaim/protocols/irc/msgs.c:229
+#: ../libgaim/protocols/jabber/jabber.c:775
+#: ../libgaim/protocols/silc/buddy.c:1531 ../libgaim/protocols/silc/ops.c:1188
+#: ../libgaim/protocols/silc/ops.c:1190 ../libgaim/protocols/silc/ops.c:1337
+#: ../libgaim/protocols/silc/ops.c:1339 ../libgaim/protocols/silc/silc.c:933
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: ../src/protocols/irc/irc.c:910 src/protocols/irc/irc.c:829
+#: ../libgaim/protocols/irc/irc.c:940 ../libgaim/protocols/irc/msgs.c:230
+#: ../libgaim/protocols/silc/silc.c:937
 msgid "Real name"
 msgstr "Nombre real"
 
@@ -6521,231 +7032,224 @@
 #. 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:918 src/protocols/irc/irc.c:837
+#: ../libgaim/protocols/irc/irc.c:948
 msgid "Use SSL"
 msgstr "Usar SSL"
 
-#: ../src/protocols/irc/msgs.c:103 src/protocols/irc/msgs.c:105
+#: ../libgaim/protocols/irc/msgs.c:107
 msgid "Bad mode"
 msgstr "Modo errĂłneo"
 
 # Banned puede ser expulsar o censurar, prefiero expulsar. jfs.
-#: ../src/protocols/irc/msgs.c:114 src/protocols/irc/msgs.c:116
+#: ../libgaim/protocols/irc/msgs.c:118
 #, c-format
 msgid "You are banned from %s."
 msgstr "Ha sido expulsado de %s."
 
-#: ../src/protocols/irc/msgs.c:115 src/protocols/irc/msgs.c:117
+#: ../libgaim/protocols/irc/msgs.c:119
 msgid "Banned"
 msgstr "Expulsado"
 
-#: ../src/protocols/irc/msgs.c:132 src/protocols/irc/msgs.c:134
+#: ../libgaim/protocols/irc/msgs.c:136
 #, 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: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
+#: ../libgaim/protocols/irc/msgs.c:215 ../libgaim/protocols/irc/msgs.c:235
+#: ../libgaim/protocols/irc/msgs.c:248
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../src/protocols/irc/msgs.c: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
+#: ../libgaim/protocols/irc/msgs.c:215 ../libgaim/protocols/oscar/oscar.c:3620
+#: ../libgaim/protocols/silc/ops.c:1411
 msgid "Nick"
 msgstr "Apodo"
 
-#: ../src/protocols/irc/msgs.c:214 src/protocols/irc/msgs.c:216
+#: ../libgaim/protocols/irc/msgs.c:218
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../src/protocols/irc/msgs.c:215 src/protocols/irc/msgs.c:217
+#: ../libgaim/protocols/irc/msgs.c:219
 msgid " <i>(identified)</i>"
 msgstr " <i>(identificado)</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: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
+#: ../libgaim/protocols/irc/msgs.c:223 ../libgaim/protocols/irc/msgs.c:229
+#: ../libgaim/protocols/irc/msgs.c:230 ../libgaim/protocols/irc/msgs.c:241
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:691
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: ../src/protocols/irc/msgs.c: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:237 ../src/protocols/silc/ops.c:1255
-#: src/protocols/irc/msgs.c:239 src/protocols/silc/ops.c:1255
+#: ../libgaim/protocols/irc/msgs.c:241 ../libgaim/protocols/silc/ops.c:1254
 msgid "Currently on"
 msgstr "Actualmente en"
 
-#: ../src/protocols/irc/msgs.c:242 src/protocols/irc/msgs.c:244
+#: ../libgaim/protocols/irc/msgs.c:246
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>Inactivo desde:</b> %s<br>"
 
-#: ../src/protocols/irc/msgs.c:244 src/protocols/irc/msgs.c:246
+#: ../libgaim/protocols/irc/msgs.c:248
 msgid "Online since"
 msgstr "Conectado desde"
 
-#: ../src/protocols/irc/msgs.c:248 src/protocols/irc/msgs.c:249
+#: ../libgaim/protocols/irc/msgs.c:252
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>Adjetivo que lo define:</b> Glorioso</b>"
 
-#: ../src/protocols/irc/msgs.c:316 src/protocols/irc/msgs.c:317
+#: ../libgaim/protocols/irc/msgs.c:329
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s ha cambiado el tema a: %s"
 
-#: ../src/protocols/irc/msgs.c:321 src/protocols/irc/msgs.c:322
+#: ../libgaim/protocols/irc/msgs.c:331
+#, c-format
+msgid "%s has cleared the topic."
+msgstr "%s ha borrado el tema."
+
+#: ../libgaim/protocols/irc/msgs.c:339
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "El tema de %s es: %s"
 
-#: ../src/protocols/irc/msgs.c:338 src/protocols/irc/msgs.c:339
+#: ../libgaim/protocols/irc/msgs.c:357
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Mensaje desconocido '%s'"
 
-#: ../src/protocols/irc/msgs.c:339 src/protocols/irc/msgs.c:340
+#: ../libgaim/protocols/irc/msgs.c:358
 msgid "Unknown message"
 msgstr "Mensaje desconocido"
 
-#: ../src/protocols/irc/msgs.c:339 src/protocols/irc/msgs.c:340
+#: ../libgaim/protocols/irc/msgs.c:358
 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:362 src/protocols/irc/msgs.c:363
+#: ../libgaim/protocols/irc/msgs.c:381
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Usuarios en %s: %s"
 
-#: ../src/protocols/irc/msgs.c:490 src/protocols/irc/msgs.c:491
+#: ../libgaim/protocols/irc/msgs.c:509
 msgid "Time Response"
 msgstr "Respuesta de hora"
 
-#: ../src/protocols/irc/msgs.c:491 src/protocols/irc/msgs.c:492
+#: ../libgaim/protocols/irc/msgs.c:510
 msgid "The IRC server's local time is:"
 msgstr "La hora local del servidor de IRC es:"
 
-#: ../src/protocols/irc/msgs.c:502 src/protocols/irc/msgs.c:503
+#: ../libgaim/protocols/irc/msgs.c:521
 msgid "No such channel"
 msgstr "No existe ese canal"
 
 #. does this happen?
-#: ../src/protocols/irc/msgs.c:513 src/protocols/irc/msgs.c:514
+#: ../libgaim/protocols/irc/msgs.c:532
 msgid "no such channel"
 msgstr "no existe el canal"
 
-#: ../src/protocols/irc/msgs.c:516 src/protocols/irc/msgs.c:517
+#: ../libgaim/protocols/irc/msgs.c:535
 msgid "User is not logged in"
 msgstr "El usuario no está conectado"
 
-#: ../src/protocols/irc/msgs.c:521 src/protocols/irc/msgs.c:522
+#: ../libgaim/protocols/irc/msgs.c:540
 msgid "No such nick or channel"
 msgstr "No existe el apodo o canal"
 
-#: ../src/protocols/irc/msgs.c:541 src/protocols/irc/msgs.c:542
+#: ../libgaim/protocols/irc/msgs.c:560
 msgid "Could not send"
 msgstr "No se pudo enviar"
 
-#: ../src/protocols/irc/msgs.c:597 src/protocols/irc/msgs.c:598
+#: ../libgaim/protocols/irc/msgs.c:616
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Para unirse a %s es necesaria una invitaciĂłn."
 
-#: ../src/protocols/irc/msgs.c:598 src/protocols/irc/msgs.c:599
+#: ../libgaim/protocols/irc/msgs.c:617
 msgid "Invitation only"
 msgstr "SĂłlo con invitaciĂłn"
 
-#: ../src/protocols/irc/msgs.c:699 src/protocols/irc/msgs.c:701
+#: ../libgaim/protocols/irc/msgs.c:726
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Ha sido expulsado por %s: (%s)"
 
-#. #-#-#-#-#  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
+#: ../libgaim/protocols/irc/msgs.c:731 ../libgaim/protocols/silc/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Expulsado por %s (%s)"
 
-#: ../src/protocols/irc/msgs.c:727 src/protocols/irc/msgs.c:730
+#: ../libgaim/protocols/irc/msgs.c:754
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "modo (%s %s) por %s"
 
-#: ../src/protocols/irc/msgs.c:812 ../src/protocols/irc/msgs.c:813
+#: ../libgaim/protocols/irc/msgs.c:839 ../libgaim/protocols/irc/msgs.c:840
 msgid "Invalid nickname"
 msgstr "Apodo inválido"
 
-#: ../src/protocols/irc/msgs.c:814
+#: ../libgaim/protocols/irc/msgs.c:841
 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
+msgstr ""
+"El servidor rechazĂł el nombre que escogiĂł para su cuenta. Es posible que "
+"incluya caracteres inválidos."
+
+#: ../libgaim/protocols/irc/msgs.c:845
 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 caracteres inválidos."
-
-#: ../src/protocols/irc/msgs.c:858 src/protocols/irc/msgs.c:853
+msgstr ""
+"El servidor rechazĂł el nombre que escogiĂł para su cuenta. Es posible que "
+"incluya caracteres inválidos."
+
+#: ../libgaim/protocols/irc/msgs.c:884
 msgid "Cannot change nick"
 msgstr "No se puede cambiar el alias"
 
-#: ../src/protocols/irc/msgs.c:858 src/protocols/irc/msgs.c:853
+#: ../libgaim/protocols/irc/msgs.c:884
 msgid "Could not change nick"
 msgstr "No se pudo cambiar el alias"
 
-#: ../src/protocols/irc/msgs.c:879 src/protocols/irc/msgs.c:874
+#: ../libgaim/protocols/irc/msgs.c:905
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Ha abandonado el canal %s%s"
 
-#: ../src/protocols/irc/msgs.c:921 src/protocols/irc/msgs.c:916
+#: ../libgaim/protocols/irc/msgs.c:947
 msgid "Error: invalid PONG from server"
 msgstr "Error: PONG inválido del servidor"
 
-#: ../src/protocols/irc/msgs.c:923 src/protocols/irc/msgs.c:918
+#: ../libgaim/protocols/irc/msgs.c:949
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Respuesta PING -- Retraso: %lu segundos"
 
-#: ../src/protocols/irc/msgs.c:998 src/protocols/irc/msgs.c:993
+#: ../libgaim/protocols/irc/msgs.c:1030
 #, c-format
 msgid "Cannot join %s:"
 msgstr "No se puede unir a %s:"
 
-#: ../src/protocols/irc/msgs.c:999 ../src/protocols/silc/ops.c:1128
-#: src/protocols/irc/msgs.c:994 src/protocols/silc/ops.c:1128
+#: ../libgaim/protocols/irc/msgs.c:1031 ../libgaim/protocols/silc/ops.c:1127
 msgid "Cannot join channel"
 msgstr "No se puede unir al canal"
 
-#: ../src/protocols/irc/msgs.c:1033 src/protocols/irc/msgs.c:1028
+#: ../libgaim/protocols/irc/msgs.c:1065
 msgid "Nick or channel is temporarily unavailable."
 msgstr "El apodo o el canal están temporalmente no disponibles."
 
-#: ../src/protocols/irc/msgs.c:1045 src/protocols/irc/msgs.c:1040
+#: ../libgaim/protocols/irc/msgs.c:1077
 #, c-format
 msgid "Wallops from %s"
 msgstr "Mensajes globales de %s"
 
-#: ../src/protocols/irc/parse.c:114 src/protocols/irc/parse.c:114
+#: ../libgaim/protocols/irc/parse.c:116
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;acciĂłn a realizar&gt;: Realiza una acciĂłn."
 
-#: ../src/protocols/irc/parse.c:115 src/protocols/irc/parse.c:115
+#: ../libgaim/protocols/irc/parse.c:117
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -6753,11 +7257,11 @@
 "away [mensaje]:  Fija el mensaje cuando se está ausente, o no utilizar un "
 "mensaje al dejar de estar ausente."
 
-#: src/protocols/irc/parse.c:116
+#: ../libgaim/protocols/irc/parse.c:118
 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
+#: ../libgaim/protocols/irc/parse.c:119
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -6765,7 +7269,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:118 src/protocols/irc/parse.c:118
+#: ../libgaim/protocols/irc/parse.c:120
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -6775,7 +7279,7 @@
 "hablar en el canal si éste está moderado (+m). Sólo lo puede hacer un "
 "operador de canal."
 
-#: ../src/protocols/irc/parse.c:119 src/protocols/irc/parse.c:119
+#: ../libgaim/protocols/irc/parse.c:121
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -6783,7 +7287,7 @@
 "invite %lt;apodo&gt; [sala]:  Invitar a alguien a unirse al canal "
 "especificado o al canal actual."
 
-#: ../src/protocols/irc/parse.c:120 src/protocols/irc/parse.c:120
+#: ../libgaim/protocols/irc/parse.c:122
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -6791,7 +7295,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:121 src/protocols/irc/parse.c:121
+#: ../libgaim/protocols/irc/parse.c:123
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -6799,7 +7303,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:122 src/protocols/irc/parse.c:122
+#: ../libgaim/protocols/irc/parse.c:124
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -6807,7 +7311,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:123 src/protocols/irc/parse.c:123
+#: ../libgaim/protocols/irc/parse.c:125
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -6815,15 +7319,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:124 src/protocols/irc/parse.c:124
+#: ../libgaim/protocols/irc/parse.c:126
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;acciĂłn a realizar&gt;:  Realizar una acciĂłn."
 
-#: src/protocols/irc/parse.c:125
+#: ../libgaim/protocols/irc/parse.c:127
 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
+#: ../libgaim/protocols/irc/parse.c:128
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
@@ -6831,7 +7335,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:127 src/protocols/irc/parse.c:127
+#: ../libgaim/protocols/irc/parse.c:129
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -6839,21 +7343,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:128 src/protocols/irc/parse.c:128
+#: ../libgaim/protocols/irc/parse.c:130
 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:129 ../src/protocols/jabber/jabber.c:1745
-#: src/protocols/irc/parse.c:129 src/protocols/jabber/jabber.c:1610
+#: ../libgaim/protocols/irc/parse.c:131
+#: ../libgaim/protocols/jabber/jabber.c:1775
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nuevo apodo&gt;:  Cambia su apodo."
 
-#: src/protocols/irc/parse.c:130
+#: ../libgaim/protocols/irc/parse.c:132
 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
+#: ../libgaim/protocols/irc/parse.c:133
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -6861,7 +7365,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:132 src/protocols/irc/parse.c:132
+#: ../libgaim/protocols/irc/parse.c:134
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -6869,11 +7373,11 @@
 "operwall &lt;mensaje&gt;:  Si no sabe lo que es probablemente no puede "
 "utilizarlo."
 
-#: src/protocols/irc/parse.c:133
+#: ../libgaim/protocols/irc/parse.c:135
 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
+#: ../libgaim/protocols/irc/parse.c:136
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -6881,7 +7385,7 @@
 "part [sala] [mensaje]:  Abandonar el canal actual, o un canal especĂ­fico, "
 "con el mensaje opcional."
 
-#: ../src/protocols/irc/parse.c:135 src/protocols/irc/parse.c:135
+#: ../libgaim/protocols/irc/parse.c:137
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -6889,7 +7393,7 @@
 "ping [apodo]:  Pregunta cuanta latencia tiene un usuario (o el servidor si "
 "no se especifica un usuario)."
 
-#: ../src/protocols/irc/parse.c:136 src/protocols/irc/parse.c:136
+#: ../libgaim/protocols/irc/parse.c:138
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -6897,17 +7401,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:137 src/protocols/irc/parse.c:137
+#: ../libgaim/protocols/irc/parse.c:139
 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:138 src/protocols/irc/parse.c:138
+#: ../libgaim/protocols/irc/parse.c:140
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Enviar un comando en crudo al servidor."
 
-#: ../src/protocols/irc/parse.c:139 src/protocols/irc/parse.c:139
+#: ../libgaim/protocols/irc/parse.c:141
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -6915,20 +7419,24 @@
 "remove &lt;apodo&gt; [mensaje]:  Eliminar a alguien de una sala. SĂłlo puede "
 "hacerlo un operador de canal."
 
-#: ../src/protocols/irc/parse.c:140 src/protocols/irc/parse.c:140
+#: ../libgaim/protocols/irc/parse.c:142
 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:141 src/protocols/irc/parse.c:141
+#: ../libgaim/protocols/irc/parse.c:143
 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:142 src/protocols/irc/parse.c:142
+#: ../libgaim/protocols/irc/parse.c:144
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr ""
 "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Establece o elimina un modo de usuario."
 
-#: ../src/protocols/irc/parse.c:143 src/protocols/irc/parse.c:143
+#: ../libgaim/protocols/irc/parse.c:145
+msgid "version [nick]: send CTCP VERSION request to a user"
+msgstr "version [apodo]: envĂ­a una solicitud CTCP VERSION al usuario"
+
+#: ../libgaim/protocols/irc/parse.c:146
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -6936,73 +7444,61 @@
 "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:144 src/protocols/irc/parse.c:144
+#: ../libgaim/protocols/irc/parse.c:147
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 msgstr ""
 "wallops &lt;mensaje&gt;:  Si no sabe lo que es probablemente no pueda usarlo."
 
-#: ../src/protocols/irc/parse.c:145 src/protocols/irc/parse.c:145
+#: ../libgaim/protocols/irc/parse.c:148
 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:439 src/protocols/irc/parse.c:439
+#: ../libgaim/protocols/irc/parse.c:442
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Tiempo de respuesta de %s: %lu segundos"
 
-#: ../src/protocols/irc/parse.c:440 src/protocols/irc/parse.c:440
+#: ../libgaim/protocols/irc/parse.c:443
 msgid "PONG"
 msgstr "PONG"
 
-#: ../src/protocols/irc/parse.c:440 src/protocols/irc/parse.c:440
+#: ../libgaim/protocols/irc/parse.c:443
 msgid "CTCP PING reply"
 msgstr "Respuesta a PING CTCP"
 
-#: ../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
+#: ../libgaim/protocols/irc/parse.c:548 ../libgaim/protocols/irc/parse.c:552
+#: ../libgaim/protocols/toc/toc.c:191 ../libgaim/protocols/toc/toc.c:694
+#: ../libgaim/protocols/toc/toc.c:710 ../libgaim/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "Desconectado."
 
-#: ../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 ""
-"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
+#: ../libgaim/protocols/jabber/auth.c:49
 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
+#: ../libgaim/protocols/jabber/auth.c:109
 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:234 src/protocols/jabber/auth.c:232
+#: ../libgaim/protocols/jabber/auth.c:229
 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
+#: ../libgaim/protocols/jabber/auth.c:232
+#: ../libgaim/protocols/jabber/auth.c:233
+#: ../libgaim/protocols/jabber/auth.c:401
+#: ../libgaim/protocols/jabber/auth.c:402
+#: ../libgaim/protocols/jabber/auth.c:483
+#: ../libgaim/protocols/jabber/auth.c:484
 msgid "Plaintext Authentication"
 msgstr "AutenticaciĂłn en claro"
 
-#: ../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
+#: ../libgaim/protocols/jabber/auth.c:234
+#: ../libgaim/protocols/jabber/auth.c:403
+#: ../libgaim/protocols/jabber/auth.c:485
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -7010,118 +7506,126 @@
 "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: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
+#: ../libgaim/protocols/jabber/auth.c:240
+#: ../libgaim/protocols/jabber/auth.c:411
+#: ../libgaim/protocols/jabber/auth.c:493
 msgid "Server does not use any supported authentication method"
 msgstr "El servidor no usa un método de autenticación conocido"
 
 #. 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
+#: ../libgaim/protocols/jabber/auth.c:324
+#: ../libgaim/protocols/jabber/auth.c:446
+#: ../libgaim/protocols/jabber/auth.c:614
+#: ../libgaim/protocols/jabber/auth.c:747
+#: ../libgaim/protocols/jabber/auth.c:759
+#: ../libgaim/protocols/jabber/auth.c:778
+#: ../libgaim/protocols/jabber/jabber.c:112
 msgid "Invalid response from server."
 msgstr "Respuesta inválida del servidor."
 
-#: ../src/protocols/jabber/auth.c:632 src/protocols/jabber/auth.c:615
+#: ../libgaim/protocols/jabber/auth.c:635
 msgid "Invalid challenge from server"
 msgstr "Desafío inválido del servidor"
 
-#: src/protocols/jabber/auth.c:701
+#: ../libgaim/protocols/jabber/auth.c:722
 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
+#: ../libgaim/protocols/jabber/buddy.c:268
+#: ../libgaim/protocols/jabber/buddy.c:769
+#: ../libgaim/protocols/silc/ops.c:1019
 msgid "Full Name"
 msgstr "Nombre completo"
 
-#: ../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
+#: ../libgaim/protocols/jabber/buddy.c:269
+#: ../libgaim/protocols/jabber/buddy.c:782
+#: ../libgaim/protocols/silc/ops.c:1031
 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
+#: ../libgaim/protocols/jabber/buddy.c:270
+#: ../libgaim/protocols/jabber/buddy.c:786
 msgid "Given Name"
 msgstr "Nombre propio"
 
-#: ../src/protocols/jabber/buddy.c:253 ../src/protocols/jabber/jabber.c:804
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/jabber.c:736
+#: ../libgaim/protocols/jabber/buddy.c:272
+#: ../libgaim/protocols/jabber/jabber.c:835
 msgid "URL"
 msgstr "URL"
 
-#: ../src/protocols/jabber/buddy.c:254 ../src/protocols/jabber/buddy.c:733
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:726
+#: ../libgaim/protocols/jabber/buddy.c:273
+#: ../libgaim/protocols/jabber/buddy.c:838
 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
+#: ../libgaim/protocols/jabber/buddy.c:274
+#: ../libgaim/protocols/jabber/buddy.c:834
 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
+#: ../libgaim/protocols/jabber/buddy.c:275
+#: ../libgaim/protocols/jabber/buddy.c:842
 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
+#: ../libgaim/protocols/jabber/buddy.c:276
+#: ../libgaim/protocols/jabber/buddy.c:846
 msgid "Region"
 msgstr "RegiĂłn"
 
-#: ../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
+#: ../libgaim/protocols/jabber/buddy.c:277
+#: ../libgaim/protocols/jabber/buddy.c:850
 msgid "Postal Code"
 msgstr "CĂłdigo postal"
 
-#: ../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
+#: ../libgaim/protocols/jabber/buddy.c:278
+#: ../libgaim/protocols/jabber/buddy.c:855
+#: ../libgaim/protocols/silc/silc.c:943
 msgid "Country"
 msgstr "PaĂ­s"
 
-#: ../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
+#: ../libgaim/protocols/jabber/buddy.c:279
+#: ../libgaim/protocols/jabber/buddy.c:866
+#: ../libgaim/protocols/jabber/buddy.c:873
 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
+#: ../libgaim/protocols/jabber/buddy.c:280
+#: ../libgaim/protocols/jabber/buddy.c:884
+#: ../libgaim/protocols/jabber/buddy.c:892
+#: ../libgaim/protocols/jabber/buddy.c:1528
+#: ../libgaim/protocols/silc/ops.c:1074 ../libgaim/protocols/silc/util.c:553
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1050
+msgid "E-Mail"
+msgstr "Correo electrĂłnico"
+
+#: ../libgaim/protocols/jabber/buddy.c:281
+#: ../libgaim/protocols/jabber/buddy.c:907
 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
+#: ../libgaim/protocols/jabber/buddy.c:282
+#: ../libgaim/protocols/jabber/buddy.c:911
 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
+#: ../libgaim/protocols/jabber/buddy.c:284
+#: ../libgaim/protocols/jabber/buddy.c:920
 msgid "Role"
 msgstr "Rol"
 
-#: ../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
+#: ../libgaim/protocols/jabber/buddy.c:285
+#: ../libgaim/protocols/jabber/buddy.c:803 ../libgaim/protocols/msn/msn.c:1595
+#: ../libgaim/protocols/oscar/oscar.c:3663
 msgid "Birthday"
 msgstr "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
+#: ../libgaim/protocols/jabber/buddy.c:582
+#: ../libgaim/protocols/jabber/buddy.c:583
 msgid "Edit Jabber vCard"
 msgstr "Editar vCard de Jabber"
 
-#: ../src/protocols/jabber/buddy.c:569 src/protocols/jabber/buddy.c:569
+#: ../libgaim/protocols/jabber/buddy.c:584
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -7129,655 +7633,680 @@
 "Todos los campos siguientes son opcionales. Introduzca sĂłlo la informaciĂłn "
 "con la que se sienta cĂłmodo."
 
-#: ../src/protocols/jabber/buddy.c:639 ../src/protocols/jabber/jabber.c:1911
-#: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1769
+#: ../libgaim/protocols/jabber/buddy.c:640
+msgid "Client:"
+msgstr "Cliente:"
+
+#: ../libgaim/protocols/jabber/buddy.c:644
+#: ../libgaim/protocols/jabber/buddy.c:677
+msgid "Operating System"
+msgstr "Sistema operativo"
+
+#: ../libgaim/protocols/jabber/buddy.c:654
+#: ../libgaim/protocols/jabber/jabber.c:1973
 msgid "Resource"
 msgstr "Recurso"
 
-#: ../src/protocols/jabber/buddy.c:685 ../src/protocols/silc/ops.c:1028
-#: src/protocols/jabber/buddy.c:688 src/protocols/silc/ops.c:1028
+#: ../libgaim/protocols/jabber/buddy.c:656
+#: ../libgaim/protocols/jabber/jabber.c:1213
+#: ../libgaim/protocols/jabber/jabber.c:1223
+#: ../libgaim/protocols/jabber/jabber.c:1233
+#: ../libgaim/protocols/jabber/jabber.c:1243
+#: ../libgaim/protocols/jabber/jabber.c:1253
+msgid "Priority"
+msgstr "Prioridad"
+
+#: ../libgaim/protocols/jabber/buddy.c:673
+msgid "Client"
+msgstr "Cliente"
+
+#: ../libgaim/protocols/jabber/buddy.c:790
+#: ../libgaim/protocols/silc/ops.c:1027
 msgid "Middle Name"
 msgstr "Nombre medio"
 
-#: ../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
+#: ../libgaim/protocols/jabber/buddy.c:823
+#: ../libgaim/protocols/jabber/jabber.c:810
+#: ../libgaim/protocols/oscar/oscar.c:3682
+#: ../libgaim/protocols/oscar/oscar.c:3690
+#: ../libgaim/protocols/qq/buddy_info.c:54
+#: ../libgaim/protocols/silc/ops.c:1063
 msgid "Address"
 msgstr "DirecciĂłn"
 
-#: ../src/protocols/jabber/buddy.c:725 src/protocols/jabber/buddy.c:718
+#: ../libgaim/protocols/jabber/buddy.c:830
 msgid "P.O. Box"
 msgstr "CĂłdigo postal"
 
-#: ../src/protocols/jabber/buddy.c:839 src/protocols/jabber/buddy.c:832
+#: ../libgaim/protocols/jabber/buddy.c:944
 msgid "Photo"
 msgstr "Foto"
 
-#: ../src/protocols/jabber/buddy.c:839 src/protocols/jabber/buddy.c:832
+#: ../libgaim/protocols/jabber/buddy.c:944
 msgid "Logo"
 msgstr "Logotipo"
 
-#: ../src/protocols/jabber/buddy.c:1042 src/protocols/jabber/buddy.c:1035
+#: ../libgaim/protocols/jabber/buddy.c:1308
 msgid "Un-hide From"
 msgstr "No ocultarse de"
 
-#: ../src/protocols/jabber/buddy.c:1046 src/protocols/jabber/buddy.c:1038
+#: ../libgaim/protocols/jabber/buddy.c:1312
 msgid "Temporarily Hide From"
 msgstr "Ocultarse temporalmente de"
 
 #. && NOT ME
-#: ../src/protocols/jabber/buddy.c:1054 src/protocols/jabber/buddy.c:1045
+#: ../libgaim/protocols/jabber/buddy.c:1320
 msgid "Cancel Presence Notification"
 msgstr "Cancelar notificaciĂłn de presencia"
 
-#: ../src/protocols/jabber/buddy.c:1061 src/protocols/jabber/buddy.c:1051
+#: ../libgaim/protocols/jabber/buddy.c:1327
 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:1070 src/protocols/jabber/buddy.c:1059
+#: ../libgaim/protocols/jabber/buddy.c:1336
 msgid "Unsubscribe"
 msgstr "De-suscribir"
 
-#: ../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:1103 ../src/protocols/jabber/jabber.c:1192
-#: src/protocols/jabber/buddy.c:1091 src/protocols/jabber/jabber.c:1102
+#: ../libgaim/protocols/jabber/buddy.c:1369
+#: ../libgaim/protocols/jabber/jabber.c:1222
 msgid "Chatty"
 msgstr "Hablador"
 
-#: ../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
+#: ../libgaim/protocols/jabber/buddy.c:1373 ../libgaim/status.c:159
 msgid "Extended Away"
 msgstr "Ausencia extendida"
 
-#: ../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
+#: ../libgaim/protocols/jabber/buddy.c:1375
+#: ../libgaim/protocols/jabber/jabber.c:1252
+#: ../libgaim/protocols/oscar/oscar.c:688
+#: ../libgaim/protocols/oscar/oscar.c:5654
+#: ../libgaim/protocols/sametime/sametime.c:3273
 msgid "Do Not Disturb"
 msgstr "No molestar"
 
-#: ../src/protocols/jabber/buddy.c:1289 src/protocols/jabber/buddy.c:1235
+#: ../libgaim/protocols/jabber/buddy.c:1520
+msgid "JID"
+msgstr "JID"
+
+#: ../libgaim/protocols/jabber/buddy.c:1524
+#: ../libgaim/protocols/jabber/buddy.c:1703
+#: ../libgaim/protocols/oscar/oscar.c:3631
+msgid "Last Name"
+msgstr "Apellidos"
+
+#: ../libgaim/protocols/jabber/buddy.c:1556
 msgid "The following are the results of your search"
 msgstr "Éstos son los resultados de su búsqueda"
 
-#: ../src/protocols/jabber/buddy.c:1381
+#. current comment from Jabber User Directory users.jabber.org
+#: ../libgaim/protocols/jabber/buddy.c:1631
+msgid ""
+"Find a contact by entering the search criteria in the given fields. Note: "
+"Each field supports wild card searches (%)"
+msgstr "Encuentra un contacto al introducir los criterios de bĂşsqueda en los campos proporcionados. Nota: puede hacer bĂşsquedas con comodines (%) en cada campo."
+
+#: ../libgaim/protocols/jabber/buddy.c:1651
+msgid "Directory Query Failed"
+msgstr "FallĂł la consulta al directorio"
+
+#: ../libgaim/protocols/jabber/buddy.c:1652
+msgid "Could not query the directory server."
+msgstr "No se pudo consultar con el servidor de directorio."
+
+#. Try to translate the message (see static message
+#. list in jabber_user_dir_comments[])
+#: ../libgaim/protocols/jabber/buddy.c:1686
+#, c-format
+msgid "Server Instructions: %s"
+msgstr "Instrucciones del servidor: %s"
+
+#: ../libgaim/protocols/jabber/buddy.c:1693
 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: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: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:1400 src/protocols/jabber/buddy.c:1346
+#: ../libgaim/protocols/jabber/buddy.c:1713
+#: ../libgaim/protocols/novell/novell.c:1488
+#: ../libgaim/protocols/oscar/oscar.c:3633
+#: ../libgaim/protocols/oscar/oscar.c:3640
 msgid "E-Mail Address"
 msgstr "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
+#: ../libgaim/protocols/jabber/buddy.c:1722
+#: ../libgaim/protocols/jabber/buddy.c:1723
 msgid "Search for Jabber users"
 msgstr "Buscar usuarios Jabber"
 
-#: ../src/protocols/jabber/buddy.c:1424 src/protocols/jabber/buddy.c:1370
+#: ../libgaim/protocols/jabber/buddy.c:1737
 msgid "Invalid Directory"
 msgstr "Directorio inválido"
 
-#: ../src/protocols/jabber/buddy.c:1441
+#: ../libgaim/protocols/jabber/buddy.c:1754
 msgid "Enter a User Directory"
 msgstr "Introduzca un directorio de usuario"
 
-#: ../src/protocols/jabber/buddy.c:1442 src/protocols/jabber/buddy.c:1388
+#: ../libgaim/protocols/jabber/buddy.c:1755
 msgid "Select a user directory to search"
 msgstr "Selecciona un directorio de usuario donde buscar"
 
-#: ../src/protocols/jabber/buddy.c:1445 src/protocols/jabber/buddy.c:1391
+#: ../libgaim/protocols/jabber/buddy.c:1758
 msgid "Search Directory"
 msgstr "Buscar en el directorio"
 
-#: ../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
+#: ../libgaim/protocols/jabber/chat.c:41
+#: ../libgaim/protocols/oscar/oscar.c:5137
+#: ../libgaim/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "_Sala:"
 
-#: ../src/protocols/jabber/chat.c:47 src/protocols/jabber/chat.c:47
+#: ../libgaim/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "S_ervidor:"
 
-#: ../src/protocols/jabber/chat.c:53 src/protocols/jabber/chat.c:53
+#: ../libgaim/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "_Manipulador:"
 
-#: ../src/protocols/jabber/chat.c:223 src/protocols/jabber/chat.c:223
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/protocols/jabber/chat.c:230
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/protocols/jabber/chat.c:236
+#: ../libgaim/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
+#: ../libgaim/protocols/jabber/chat.c:396
 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
+#: ../libgaim/protocols/jabber/chat.c:405
+#: ../libgaim/protocols/jabber/chat.c:548
 msgid "Unable to configure"
 msgstr "No se pudo configurar"
 
-#: ../src/protocols/jabber/chat.c:420 src/protocols/jabber/chat.c:420
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/protocols/jabber/chat.c:470
+#: ../libgaim/protocols/jabber/chat.c:539
 msgid "Registration error"
 msgstr "Error de registro"
 
-#: ../src/protocols/jabber/chat.c:628 src/protocols/jabber/chat.c:628
+#: ../libgaim/protocols/jabber/chat.c:627
 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:1449 src/protocols/jabber/chat.c:678
-#: src/protocols/jabber/chat.c:689 src/protocols/silc/ops.c:1449
+#: ../libgaim/protocols/jabber/chat.c:678
+#: ../libgaim/protocols/jabber/chat.c:689 ../libgaim/protocols/silc/ops.c:1448
 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
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/protocols/jabber/chat.c:779
 msgid "Find Rooms"
 msgstr "Buscar salas"
 
-#: ../src/protocols/jabber/jabber.c:79 src/protocols/jabber/jabber.c:79
+#: ../libgaim/protocols/jabber/jabber.c:81
 msgid "Error initializing session"
 msgstr "Error al inicializar la sesiĂłn"
 
-#: ../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
+#: ../libgaim/protocols/jabber/jabber.c:240
+#: ../libgaim/protocols/jabber/jabber.c:291
+#: ../libgaim/protocols/jabber/jabber.c:319
 msgid "Write error"
 msgstr "Error de escritura"
 
-#: ../src/protocols/jabber/jabber.c:353 ../src/protocols/jabber/jabber.c:387
-#: src/protocols/jabber/jabber.c:289 src/protocols/jabber/jabber.c:321
+#: ../libgaim/protocols/jabber/jabber.c:387
+#: ../libgaim/protocols/jabber/jabber.c:424
 msgid "Read Error"
 msgstr "Error de lectura"
 
-#: ../src/protocols/jabber/jabber.c:473 ../src/protocols/jabber/jabber.c:899
-#: src/protocols/jabber/jabber.c:407 src/protocols/jabber/jabber.c:828
+#: ../libgaim/protocols/jabber/jabber.c:497
+#: ../libgaim/protocols/jabber/jabber.c:930
 msgid "Unable to create socket"
 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
+#: ../libgaim/protocols/jabber/jabber.c:545
+#: ../libgaim/protocols/jabber/jabber.c:888
 msgid "Invalid Jabber ID"
 msgstr "ID de Jabber no válido"
 
-#: ../src/protocols/jabber/jabber.c:589 src/protocols/jabber/jabber.c:521
+#: ../libgaim/protocols/jabber/jabber.c:616
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registro de %s@%s efectuado con Ă©xito"
 
-#: ../src/protocols/jabber/jabber.c:591 ../src/protocols/jabber/jabber.c:592
-#: src/protocols/jabber/jabber.c:523 src/protocols/jabber/jabber.c:524
+#: ../libgaim/protocols/jabber/jabber.c:618
+#: ../libgaim/protocols/jabber/jabber.c:619
 msgid "Registration Successful"
 msgstr "Éxito en el registro"
 
-#: ../src/protocols/jabber/jabber.c:598 ../src/protocols/jabber/jabber.c:1458
-#: src/protocols/jabber/jabber.c:530 src/protocols/jabber/jabber.c:1354
+#: ../libgaim/protocols/jabber/jabber.c:625
+#: ../libgaim/protocols/jabber/jabber.c:1488
 msgid "Unknown Error"
 msgstr "Error desconocido"
 
-#: ../src/protocols/jabber/jabber.c:600 ../src/protocols/jabber/jabber.c:601
-#: src/protocols/jabber/jabber.c:532 src/protocols/jabber/jabber.c:533
+#: ../libgaim/protocols/jabber/jabber.c:627
+#: ../libgaim/protocols/jabber/jabber.c:628
 msgid "Registration Failed"
 msgstr "FallĂł el registro"
 
-#: ../src/protocols/jabber/jabber.c:712 ../src/protocols/jabber/jabber.c:713
-#: src/protocols/jabber/jabber.c:644 src/protocols/jabber/jabber.c:645
+#: ../libgaim/protocols/jabber/jabber.c:743
+#: ../libgaim/protocols/jabber/jabber.c:744
 msgid "Already Registered"
 msgstr "Ya está registrado"
 
-#: ../src/protocols/jabber/jabber.c:759 src/protocols/jabber/jabber.c:691
-msgid "E-Mail"
-msgstr "Correo electrĂłnico"
-
-#: ../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
+#: ../libgaim/protocols/jabber/jabber.c:820
+#: ../libgaim/protocols/oscar/oscar.c:3684
+#: ../libgaim/protocols/oscar/oscar.c:3692
 msgid "State"
 msgstr "Estado"
 
-#: ../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
+#: ../libgaim/protocols/jabber/jabber.c:825
+msgid "Postal code"
+msgstr "CĂłdigo postal"
+
+#: ../libgaim/protocols/jabber/jabber.c:830
+#: ../libgaim/protocols/silc/ops.c:1068 ../libgaim/protocols/silc/silc.c:701
+#: ../libgaim/protocols/silc/util.c:555
 msgid "Phone"
 msgstr "Teléfono"
 
-#: ../src/protocols/jabber/jabber.c:809 src/protocols/jabber/jabber.c:741
+#: ../libgaim/protocols/jabber/jabber.c:840
 msgid "Date"
 msgstr "Fecha"
 
-#: ../src/protocols/jabber/jabber.c:817 src/protocols/jabber/jabber.c:749
+#: ../libgaim/protocols/jabber/jabber.c:848
 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:820 ../src/protocols/jabber/jabber.c:821
-#: src/protocols/jabber/jabber.c:752 src/protocols/jabber/jabber.c:753
+#: ../libgaim/protocols/jabber/jabber.c:851
+#: ../libgaim/protocols/jabber/jabber.c:852
 msgid "Register New Jabber Account"
 msgstr "Registrando cuenta nueva de Jabber"
 
-#: ../src/protocols/jabber/jabber.c:986 src/protocols/jabber/jabber.c:897
+#: ../libgaim/protocols/jabber/jabber.c:1013
 msgid "Initializing Stream"
 msgstr "Inicializando flujo"
 
-#: ../src/protocols/jabber/jabber.c:992 ../src/protocols/msn/session.c:355
-#: src/protocols/jabber/jabber.c:903 src/protocols/msn/session.c:355
+#: ../libgaim/protocols/jabber/jabber.c:1018
+#: ../libgaim/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: ../src/protocols/jabber/jabber.c:1001 src/protocols/jabber/jabber.c:912
+#: ../libgaim/protocols/jabber/jabber.c:1027
 msgid "Re-initializing Stream"
 msgstr "Reinicializando flujo"
 
-#: ../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
+#: ../libgaim/protocols/jabber/jabber.c:1101
+#: ../libgaim/protocols/jabber/jabber.c:1466
+#: ../libgaim/protocols/jabber/jabber.c:1507
+#: ../libgaim/protocols/jabber/jabber.c:1541
+#: ../libgaim/protocols/oscar/oscar.c:766
+#: ../libgaim/protocols/oscar/oscar.c:5443
 msgid "Not Authorized"
 msgstr "No autorizado"
 
-#: ../src/protocols/jabber/jabber.c:1113 src/protocols/jabber/jabber.c:1026
+#: ../libgaim/protocols/jabber/jabber.c:1143
 msgid "Both"
 msgstr "Ambos"
 
-#: ../src/protocols/jabber/jabber.c:1115 src/protocols/jabber/jabber.c:1028
+#: ../libgaim/protocols/jabber/jabber.c:1145
 msgid "From (To pending)"
 msgstr "Desde (Destino pendiente)"
 
-#: ../src/protocols/jabber/jabber.c:1120 src/protocols/jabber/jabber.c:1033
+#: ../libgaim/protocols/jabber/jabber.c:1150
 msgid "To"
 msgstr "A"
 
-#: ../src/protocols/jabber/jabber.c:1122 src/protocols/jabber/jabber.c:1035
+#: ../libgaim/protocols/jabber/jabber.c:1152
 msgid "None (To pending)"
 msgstr "Nadie (Destino pendiente)"
 
-#: ../src/protocols/jabber/jabber.c:1126 src/protocols/jabber/jabber.c:1039
+#: ../libgaim/protocols/jabber/jabber.c:1156
 msgid "Subscription"
 msgstr "SubscripciĂłn"
 
-#: ../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:1252 src/protocols/jabber/jabber.c:1148
+#: ../libgaim/protocols/jabber/jabber.c:1282
 msgid "Password Changed"
 msgstr "Contraseña modificada"
 
-#: ../src/protocols/jabber/jabber.c:1253 src/protocols/jabber/jabber.c:1149
+#: ../libgaim/protocols/jabber/jabber.c:1283
 msgid "Your password has been changed."
 msgstr "Su contraseña ha sido modificada."
 
-#: ../src/protocols/jabber/jabber.c:1257 ../src/protocols/jabber/jabber.c:1258
-#: src/protocols/jabber/jabber.c:1153 src/protocols/jabber/jabber.c:1154
+#: ../libgaim/protocols/jabber/jabber.c:1287
+#: ../libgaim/protocols/jabber/jabber.c:1288
 msgid "Error changing password"
 msgstr "Error al cambiar la contraseña"
 
-#: ../src/protocols/jabber/jabber.c:1314 src/protocols/jabber/jabber.c:1210
+#: ../libgaim/protocols/jabber/jabber.c:1344
 msgid "Password (again)"
 msgstr "Contraseña (de nuevo)"
 
-#: ../src/protocols/jabber/jabber.c:1319 ../src/protocols/jabber/jabber.c:1320
-#: src/protocols/jabber/jabber.c:1215 src/protocols/jabber/jabber.c:1216
+#: ../libgaim/protocols/jabber/jabber.c:1349
+#: ../libgaim/protocols/jabber/jabber.c:1350
 msgid "Change Jabber Password"
 msgstr "Cambiar contraseña de Jabber"
 
-#: ../src/protocols/jabber/jabber.c:1320 src/protocols/jabber/jabber.c:1216
+#: ../libgaim/protocols/jabber/jabber.c:1350
 msgid "Please enter your new password"
 msgstr "Por favor, indique su nueva contraseña"
 
-#: ../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
+#: ../libgaim/protocols/jabber/jabber.c:1360
+#: ../libgaim/protocols/oscar/oscar.c:6245
+#: ../libgaim/protocols/silc/silc.c:1023
 msgid "Set User Info..."
 msgstr "Establecer su informaciĂłn de usuario..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../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
+#: ../libgaim/protocols/jabber/jabber.c:1365
+#: ../libgaim/protocols/oscar/oscar.c:6256
+#: ../libgaim/protocols/silc/silc.c:1019
 msgid "Change Password..."
 msgstr "Cambiar su contraseña..."
 
 #. }
-#: src/protocols/jabber/jabber.c:1236
+#: ../libgaim/protocols/jabber/jabber.c:1370
 msgid "Search for Users..."
 msgstr "Buscar usuarios..."
 
-#: ../src/protocols/jabber/jabber.c:1416 src/protocols/jabber/jabber.c:1312
+#: ../libgaim/protocols/jabber/jabber.c:1446
 msgid "Bad Request"
 msgstr "Solicitud errĂłnea"
 
-#: ../src/protocols/jabber/jabber.c:1418 src/protocols/jabber/jabber.c:1314
+#: ../libgaim/protocols/jabber/jabber.c:1448
 msgid "Conflict"
 msgstr "Conflicto"
 
-#: ../src/protocols/jabber/jabber.c:1420 src/protocols/jabber/jabber.c:1316
+#: ../libgaim/protocols/jabber/jabber.c:1450
 msgid "Feature Not Implemented"
 msgstr "Funcionalidad no implementada"
 
-#: ../src/protocols/jabber/jabber.c:1422 src/protocols/jabber/jabber.c:1318
+#: ../libgaim/protocols/jabber/jabber.c:1452
 msgid "Forbidden"
 msgstr "Prohibido"
 
-#: ../src/protocols/jabber/jabber.c:1424 src/protocols/jabber/jabber.c:1320
+#: ../libgaim/protocols/jabber/jabber.c:1454
 msgid "Gone"
 msgstr "Se fue"
 
-#: ../src/protocols/jabber/jabber.c:1426 ../src/protocols/jabber/jabber.c:1501
-#: src/protocols/jabber/jabber.c:1322 src/protocols/jabber/jabber.c:1396
+#: ../libgaim/protocols/jabber/jabber.c:1456
+#: ../libgaim/protocols/jabber/jabber.c:1531
 msgid "Internal Server Error"
 msgstr "Error interno del servidor"
 
-#: ../src/protocols/jabber/jabber.c:1428 src/protocols/jabber/jabber.c:1324
+#: ../libgaim/protocols/jabber/jabber.c:1458
 msgid "Item Not Found"
 msgstr "Elemento no encontrado"
 
-#: ../src/protocols/jabber/jabber.c:1430 src/protocols/jabber/jabber.c:1326
+#: ../libgaim/protocols/jabber/jabber.c:1460
 msgid "Malformed Jabber ID"
 msgstr "ID de Jabber no válido"
 
-#: ../src/protocols/jabber/jabber.c:1432 src/protocols/jabber/jabber.c:1328
+#: ../libgaim/protocols/jabber/jabber.c:1462
 msgid "Not Acceptable"
 msgstr "No aceptable"
 
-#: ../src/protocols/jabber/jabber.c:1434 src/protocols/jabber/jabber.c:1330
+#: ../libgaim/protocols/jabber/jabber.c:1464
 msgid "Not Allowed"
 msgstr "No permitido"
 
-#: ../src/protocols/jabber/jabber.c:1438 src/protocols/jabber/jabber.c:1334
+#: ../libgaim/protocols/jabber/jabber.c:1468
 msgid "Payment Required"
 msgstr "Pago necesario"
 
-#: ../src/protocols/jabber/jabber.c:1440 src/protocols/jabber/jabber.c:1336
+#: ../libgaim/protocols/jabber/jabber.c:1470
 msgid "Recipient Unavailable"
 msgstr "Destinatario no disponible"
 
-#: ../src/protocols/jabber/jabber.c:1444 src/protocols/jabber/jabber.c:1340
+#: ../libgaim/protocols/jabber/jabber.c:1474
 msgid "Registration Required"
 msgstr "Registro necesario"
 
-#: ../src/protocols/jabber/jabber.c:1446 src/protocols/jabber/jabber.c:1342
+#: ../libgaim/protocols/jabber/jabber.c:1476
 msgid "Remote Server Not Found"
 msgstr "No se encontrĂł el servidor remoto"
 
-#: ../src/protocols/jabber/jabber.c:1448 src/protocols/jabber/jabber.c:1344
+#: ../libgaim/protocols/jabber/jabber.c:1478
 msgid "Remote Server Timeout"
 msgstr "ExpirĂł el tiempo del servidor remoto"
 
-#: ../src/protocols/jabber/jabber.c:1450 src/protocols/jabber/jabber.c:1346
+#: ../libgaim/protocols/jabber/jabber.c:1480
 msgid "Server Overloaded"
 msgstr "Servidor sobrecargado"
 
-#: ../src/protocols/jabber/jabber.c:1452 src/protocols/jabber/jabber.c:1348
+#: ../libgaim/protocols/jabber/jabber.c:1482
 msgid "Service Unavailable"
 msgstr "Servicio no disponible"
 
-#: ../src/protocols/jabber/jabber.c:1454 src/protocols/jabber/jabber.c:1350
+#: ../libgaim/protocols/jabber/jabber.c:1484
 msgid "Subscription Required"
 msgstr "SubscripciĂłn necesaria"
 
-#: ../src/protocols/jabber/jabber.c:1456 src/protocols/jabber/jabber.c:1352
+#: ../libgaim/protocols/jabber/jabber.c:1486
 msgid "Unexpected Request"
 msgstr "Solicitud no esperada"
 
-#: ../src/protocols/jabber/jabber.c:1463 src/protocols/jabber/jabber.c:1359
+#: ../libgaim/protocols/jabber/jabber.c:1493
 msgid "Authorization Aborted"
 msgstr "AutorizaciĂłn interrumpida"
 
-#: ../src/protocols/jabber/jabber.c:1465 src/protocols/jabber/jabber.c:1361
+#: ../libgaim/protocols/jabber/jabber.c:1495
 msgid "Incorrect encoding in authorization"
 msgstr "CodificaciĂłn incorrecta en la autorizaciĂłn"
 
-#: ../src/protocols/jabber/jabber.c:1468 src/protocols/jabber/jabber.c:1364
+#: ../libgaim/protocols/jabber/jabber.c:1498
 msgid "Invalid authzid"
 msgstr "Authzid inválido"
 
-#: ../src/protocols/jabber/jabber.c:1471 src/protocols/jabber/jabber.c:1367
+#: ../libgaim/protocols/jabber/jabber.c:1501
 msgid "Invalid Authorization Mechanism"
 msgstr "Mecanismo de autorización inválido"
 
-#: ../src/protocols/jabber/jabber.c:1474 src/protocols/jabber/jabber.c:1370
+#: ../libgaim/protocols/jabber/jabber.c:1504
 msgid "Authorization mechanism too weak"
 msgstr "Mecanismo de autorización demasiado débil"
 
-#: ../src/protocols/jabber/jabber.c:1479 src/protocols/jabber/jabber.c:1375
+#: ../libgaim/protocols/jabber/jabber.c:1509
 msgid "Temporary Authentication Failure"
 msgstr "FallĂł temporal de la autenticaciĂłn"
 
-#: ../src/protocols/jabber/jabber.c:1482 src/protocols/jabber/jabber.c:1377
+#: ../libgaim/protocols/jabber/jabber.c:1512
 msgid "Authentication Failure"
 msgstr "FallĂł de autenticaciĂłn"
 
-#: ../src/protocols/jabber/jabber.c:1486 src/protocols/jabber/jabber.c:1381
+#: ../libgaim/protocols/jabber/jabber.c:1516
 msgid "Bad Format"
 msgstr "Formato errĂłneo"
 
-#: ../src/protocols/jabber/jabber.c:1488 src/protocols/jabber/jabber.c:1383
+#: ../libgaim/protocols/jabber/jabber.c:1518
 msgid "Bad Namespace Prefix"
 msgstr "Prefijo del espacio de nombres errĂłneo"
 
-#: ../src/protocols/jabber/jabber.c:1491 src/protocols/jabber/jabber.c:1386
+#: ../libgaim/protocols/jabber/jabber.c:1521
 msgid "Resource Conflict"
 msgstr "Conflicto de recursos"
 
-#: ../src/protocols/jabber/jabber.c:1493 ../src/protocols/silc/ops.c:1728
-#: src/protocols/jabber/jabber.c:1388 src/protocols/silc/ops.c:1728
+#: ../libgaim/protocols/jabber/jabber.c:1523
+#: ../libgaim/protocols/silc/ops.c:1726
 msgid "Connection Timeout"
 msgstr "ExpirĂł la conexiĂłn"
 
-#: ../src/protocols/jabber/jabber.c:1495 src/protocols/jabber/jabber.c:1390
+#: ../libgaim/protocols/jabber/jabber.c:1525
 msgid "Host Gone"
 msgstr "Servidor desaparecido"
 
-#: ../src/protocols/jabber/jabber.c:1497 src/protocols/jabber/jabber.c:1392
+#: ../libgaim/protocols/jabber/jabber.c:1527
 msgid "Host Unknown"
 msgstr "Servidor desconocido"
 
-#: ../src/protocols/jabber/jabber.c:1499 src/protocols/jabber/jabber.c:1394
+#: ../libgaim/protocols/jabber/jabber.c:1529
 msgid "Improper Addressing"
 msgstr "Direccionamiento incorrecto"
 
-#: ../src/protocols/jabber/jabber.c:1503 src/protocols/jabber/jabber.c:1398
+#: ../libgaim/protocols/jabber/jabber.c:1533
 msgid "Invalid ID"
 msgstr "ID no válido"
 
-#: ../src/protocols/jabber/jabber.c:1505 src/protocols/jabber/jabber.c:1400
+#: ../libgaim/protocols/jabber/jabber.c:1535
 msgid "Invalid Namespace"
 msgstr "Espacio de nombres no válido"
 
-#: ../src/protocols/jabber/jabber.c:1507 src/protocols/jabber/jabber.c:1402
+#: ../libgaim/protocols/jabber/jabber.c:1537
 msgid "Invalid XML"
 msgstr "XML inválido"
 
-#: ../src/protocols/jabber/jabber.c:1509 src/protocols/jabber/jabber.c:1404
+#: ../libgaim/protocols/jabber/jabber.c:1539
 msgid "Non-matching Hosts"
 msgstr "No existen servidores coincidentes"
 
-#: ../src/protocols/jabber/jabber.c:1513 src/protocols/jabber/jabber.c:1408
+#: ../libgaim/protocols/jabber/jabber.c:1543
 msgid "Policy Violation"
 msgstr "ViolaciĂłn de la polĂ­tica"
 
-#: ../src/protocols/jabber/jabber.c:1515 src/protocols/jabber/jabber.c:1410
+#: ../libgaim/protocols/jabber/jabber.c:1545
 msgid "Remote Connection Failed"
 msgstr "FallĂł la conexiĂłn remota"
 
-#: ../src/protocols/jabber/jabber.c:1517 src/protocols/jabber/jabber.c:1412
+#: ../libgaim/protocols/jabber/jabber.c:1547
 msgid "Resource Constraint"
 msgstr "RestricciĂłn de recursos"
 
-#: ../src/protocols/jabber/jabber.c:1519 src/protocols/jabber/jabber.c:1414
+#: ../libgaim/protocols/jabber/jabber.c:1549
 msgid "Restricted XML"
 msgstr "XML restringido"
 
-#: ../src/protocols/jabber/jabber.c:1521 src/protocols/jabber/jabber.c:1416
+#: ../libgaim/protocols/jabber/jabber.c:1551
 msgid "See Other Host"
 msgstr "Ver otros servidores"
 
-#: ../src/protocols/jabber/jabber.c:1523 src/protocols/jabber/jabber.c:1418
+#: ../libgaim/protocols/jabber/jabber.c:1553
 msgid "System Shutdown"
 msgstr "Parada del sistema"
 
-#: ../src/protocols/jabber/jabber.c:1525 src/protocols/jabber/jabber.c:1420
+#: ../libgaim/protocols/jabber/jabber.c:1555
 msgid "Undefined Condition"
 msgstr "CondiciĂłn no definida"
 
-#: ../src/protocols/jabber/jabber.c:1527 src/protocols/jabber/jabber.c:1422
+#: ../libgaim/protocols/jabber/jabber.c:1557
 msgid "Unsupported Encoding"
 msgstr "CodificaciĂłn no soportada"
 
-#: ../src/protocols/jabber/jabber.c:1529 src/protocols/jabber/jabber.c:1424
+#: ../libgaim/protocols/jabber/jabber.c:1559
 msgid "Unsupported Stanza Type"
 msgstr "Tipo de «stanza» no soportado"
 
-#: ../src/protocols/jabber/jabber.c:1531 src/protocols/jabber/jabber.c:1426
+#: ../libgaim/protocols/jabber/jabber.c:1561
 msgid "Unsupported Version"
 msgstr "VersiĂłn no soportada"
 
-#: ../src/protocols/jabber/jabber.c:1533 src/protocols/jabber/jabber.c:1428
+#: ../libgaim/protocols/jabber/jabber.c:1563
 msgid "XML Not Well Formed"
 msgstr "XML malformado"
 
-#: ../src/protocols/jabber/jabber.c:1535 src/protocols/jabber/jabber.c:1430
+#: ../libgaim/protocols/jabber/jabber.c:1565
 msgid "Stream Error"
 msgstr "Error de flujo"
 
-#: ../src/protocols/jabber/jabber.c:1602 src/protocols/jabber/jabber.c:1497
+#: ../libgaim/protocols/jabber/jabber.c:1632
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "No puede echar al usuario %s"
 
-#: ../src/protocols/jabber/jabber.c:1622 src/protocols/jabber/jabber.c:1519
+#: ../libgaim/protocols/jabber/jabber.c:1652
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "AfiliaciĂłn desconocida: \"%s\""
 
-#: ../src/protocols/jabber/jabber.c:1627 src/protocols/jabber/jabber.c:1524
+#: ../libgaim/protocols/jabber/jabber.c:1657
 #, 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:1646
+#: ../libgaim/protocols/jabber/jabber.c:1676
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Rol desconocido: \"%s\""
 
-#: ../src/protocols/jabber/jabber.c:1653
+#: ../libgaim/protocols/jabber/jabber.c:1683
 #, 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
+#: ../libgaim/protocols/jabber/jabber.c:1736
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "No puede expulsar al usuario %s"
 
-#: ../src/protocols/jabber/jabber.c:1737 src/protocols/jabber/jabber.c:1602
+#: ../libgaim/protocols/jabber/jabber.c:1767
 msgid "config:  Configure a chat room."
 msgstr "config:  Configurar una sala de chat."
 
-#: ../src/protocols/jabber/jabber.c:1741 src/protocols/jabber/jabber.c:1606
+#: ../libgaim/protocols/jabber/jabber.c:1771
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configurar una sala de chat"
 
-#: ../src/protocols/jabber/jabber.c:1750 src/protocols/jabber/jabber.c:1615
+#: ../libgaim/protocols/jabber/jabber.c:1780
 msgid "part [room]:  Leave the room."
 msgstr "part [habitaciĂłn]:  Abandonar la habitaciĂłn."
 
-#: ../src/protocols/jabber/jabber.c:1755 src/protocols/jabber/jabber.c:1620
+#: ../libgaim/protocols/jabber/jabber.c:1785
 msgid "register:  Register with a chat room."
 msgstr "register:  Registrarse en una sala de chat."
 
-#: ../src/protocols/jabber/jabber.c:1761 src/protocols/jabber/jabber.c:1626
+#: ../libgaim/protocols/jabber/jabber.c:1791
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nuevo tema]:  Mostrar o cambiar el tema."
 
-#: ../src/protocols/jabber/jabber.c:1767 src/protocols/jabber/jabber.c:1632
+#: ../libgaim/protocols/jabber/jabber.c:1797
 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:1773
+#: ../libgaim/protocols/jabber/jabber.c:1803
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -7785,26 +8314,28 @@
 "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
+#: ../libgaim/protocols/jabber/jabber.c:1809
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
-msgstr "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
+msgstr ""
+"rol &lt;usuario&gt; &lt;moderator|participant|visitor|none&gt;: Definir el "
+"rol de un usuario en la sala."
+
+#: ../libgaim/protocols/jabber/jabber.c:1815
 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:1791 src/protocols/jabber/jabber.c:1650
+#: ../libgaim/protocols/jabber/jabber.c:1821
 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:1797 src/protocols/jabber/jabber.c:1656
+#: ../libgaim/protocols/jabber/jabber.c:1827
 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:1802 src/protocols/jabber/jabber.c:1661
+#: ../libgaim/protocols/jabber/jabber.c:1832
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
@@ -7820,98 +8351,91 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/jabber/jabber.c:1886 ../src/protocols/jabber/jabber.c:1888
-#: src/protocols/jabber/jabber.c:1744 src/protocols/jabber/jabber.c:1746
+#: ../libgaim/protocols/jabber/jabber.c:1948
+#: ../libgaim/protocols/jabber/jabber.c:1950
 msgid "Jabber Protocol Plugin"
 msgstr "Complemento de protocolo Jabber"
 
-#: ../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:1919 src/protocols/jabber/jabber.c:1777
-msgid "Require TLS"
-msgstr "Requiere TLS"
-
-#: ../src/protocols/jabber/jabber.c:1922 src/protocols/jabber/jabber.c:1780
+#: ../libgaim/protocols/jabber/jabber.c:1976
 msgid "Force old (port 5223) SSL"
 msgstr "Forzar SSL antiguo (puerto 5323)"
 
-#: ../src/protocols/jabber/jabber.c:1927 src/protocols/jabber/jabber.c:1785
+#: ../libgaim/protocols/jabber/jabber.c:1981
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permitir autenticaciĂłn en claro sobre canales no cifrados"
 
-#: ../src/protocols/jabber/jabber.c:1932 ../src/protocols/simple/simple.c:1669
-#: src/protocols/jabber/jabber.c:1790
+#: ../libgaim/protocols/jabber/jabber.c:1986
+#: ../libgaim/protocols/simple/simple.c:1845
 msgid "Connect port"
 msgstr "Puerto de conexiĂłn"
 
 #. Account options
-#: ../src/protocols/jabber/jabber.c:1936 ../src/protocols/silc/silc.c:1852
-#: src/protocols/jabber/jabber.c:1794 src/protocols/silc/silc.c:1832
+#: ../libgaim/protocols/jabber/jabber.c:1990
+#: ../libgaim/protocols/silc/silc.c:1855
 msgid "Connect server"
 msgstr "Conectar con el servidor"
 
-#: ../src/protocols/jabber/message.c:114 src/protocols/jabber/message.c:114
+#: ../libgaim/protocols/jabber/message.c:117
 #, c-format
 msgid "Message from %s"
 msgstr "Mensaje de %s"
 
-#: ../src/protocols/jabber/message.c:178 src/protocols/jabber/message.c:178
+#: ../libgaim/protocols/jabber/message.c:181
 #, 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
+#: ../libgaim/protocols/jabber/message.c:183
 #, c-format
 msgid "The topic is: %s"
 msgstr "El tema es: %s"
 
-#: ../src/protocols/jabber/message.c:230 src/protocols/jabber/message.c:230
+#: ../libgaim/protocols/jabber/message.c:233
 #, 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
+#: ../libgaim/protocols/jabber/message.c:236
 msgid "Jabber Message Error"
 msgstr "Mensaje de error de Jabber"
 
-#: ../src/protocols/jabber/message.c:297 src/protocols/jabber/message.c:297
+#: ../libgaim/protocols/jabber/message.c:316
 #, c-format
 msgid " (Code %s)"
 msgstr " (CĂłdigo %s)"
 
-#: ../src/protocols/jabber/parser.c:131 src/protocols/jabber/parser.c:131
+#: ../libgaim/protocols/jabber/parser.c:179
 msgid "XML Parse error"
 msgstr "Error de tratamiento XML"
 
-#: ../src/protocols/jabber/presence.c:305 src/protocols/jabber/presence.c:305
+#: ../libgaim/protocols/jabber/presence.c:304
 msgid "Unknown Error in presence"
 msgstr "Error desconocido en presencia"
 
-#: ../src/protocols/jabber/presence.c:310 ../src/protocols/msn/userlist.c:104
-#: src/protocols/jabber/presence.c:310 src/protocols/msn/userlist.c:104
+#: ../libgaim/protocols/jabber/presence.c:309
+#: ../libgaim/protocols/msn/userlist.c:98
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list."
 msgstr "El usuario %s quiere añadir a %s a su lista de amigos."
 
-#: ../src/protocols/jabber/presence.c:319 ../src/protocols/oscar/oscar.c:4740
-#: ../src/protocols/oscar/oscar.c:7405
+#: ../libgaim/protocols/jabber/presence.c:318
+#: ../libgaim/protocols/oscar/oscar.c:2357
+#: ../libgaim/protocols/oscar/oscar.c:5068
 msgid "_Authorize"
 msgstr "_Autorizar"
 
-#: ../src/protocols/jabber/presence.c:320 ../src/protocols/oscar/oscar.c:4742
-#: ../src/protocols/oscar/oscar.c:7406
+#: ../libgaim/protocols/jabber/presence.c:319
+#: ../libgaim/protocols/oscar/oscar.c:2359
+#: ../libgaim/protocols/oscar/oscar.c:5069
 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
+#: ../libgaim/protocols/jabber/presence.c:376
+#: ../libgaim/protocols/jabber/presence.c:377
 msgid "Create New Room"
 msgstr "Crear una sala nueva"
 
-#: ../src/protocols/jabber/presence.c:378 src/protocols/jabber/presence.c:378
+#: ../libgaim/protocols/jabber/presence.c:378
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -7919,42 +8443,41 @@
 "Va a crear una sala nueva. ÂżDesea configurarla o aceptar los valores por "
 "omisiĂłn?"
 
-#: ../src/protocols/jabber/presence.c:380
+#: ../libgaim/protocols/jabber/presence.c:381
 msgid "_Configure Room"
 msgstr "_Configurar sala"
 
-#: ../src/protocols/jabber/presence.c:382
+#: ../libgaim/protocols/jabber/presence.c:383
 msgid "_Accept Defaults"
 msgstr "_Aceptar valores por omisiĂłn"
 
-#: ../src/protocols/jabber/presence.c:419 src/protocols/jabber/presence.c:419
+#: ../libgaim/protocols/jabber/presence.c:421
 #, c-format
 msgid "Error in chat %s"
 msgstr "Error en el chat %s"
 
-#: ../src/protocols/jabber/presence.c:422 src/protocols/jabber/presence.c:422
+#: ../libgaim/protocols/jabber/presence.c:424
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Error al unirse al chat %s"
 
-#: ../src/protocols/jabber/si.c:726 src/protocols/jabber/si.c:591
+#: ../libgaim/protocols/jabber/si.c:765
 #, 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
+#: ../libgaim/protocols/jabber/si.c:766 ../libgaim/protocols/jabber/si.c:767
 msgid "File Send Failed"
 msgstr "Fallo en el envĂ­o del archivo"
 
-#: ../src/protocols/msn/dialog.c:92 src/protocols/msn/dialog.c:92
+#: ../libgaim/protocols/msn/dialog.c:110
 #, 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:98 src/protocols/msn/dialog.c:98
+#: ../libgaim/protocols/msn/dialog.c:116
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
@@ -7963,7 +8486,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:106 src/protocols/msn/dialog.c:106
+#: ../libgaim/protocols/msn/dialog.c:124
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
@@ -7972,272 +8495,270 @@
 "%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
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/protocols/msn/error.c:42
 msgid "Invalid e-mail address"
 msgstr "Dirección de correo electrónico inválida"
 
-#: ../src/protocols/msn/error.c:45 src/protocols/msn/error.c:45
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/protocols/msn/error.c:61
 msgid "List Full"
 msgstr "Lista llena"
 
-#: ../src/protocols/msn/error.c:64 src/protocols/msn/error.c:64
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/protocols/msn/error.c:70
+#: ../libgaim/protocols/zephyr/zephyr.c:757
 msgid "User is offline"
 msgstr "El usuario no está conectado"
 
-#: ../src/protocols/msn/error.c:73 src/protocols/msn/error.c:73
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/protocols/msn/error.c:79
 msgid "Too many groups"
 msgstr "Demasiados grupos"
 
-#: ../src/protocols/msn/error.c:82 src/protocols/msn/error.c:82
+#: ../libgaim/protocols/msn/error.c:82
 msgid "Invalid group"
 msgstr "Grupo inválido"
 
-#: ../src/protocols/msn/error.c:85 src/protocols/msn/error.c:85
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/protocols/msn/error.c:91
 msgid "Cannot remove group zero"
 msgstr "No se puede eliminar el grupo cero"
 
-#: src/protocols/msn/error.c:95
+#: ../libgaim/protocols/msn/error.c:95
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Intentó añadir un contacto a un grupo que no existe"
 
-#: ../src/protocols/msn/error.c:99 src/protocols/msn/error.c:99
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/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:207
-#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:205
+#: ../libgaim/protocols/msn/error.c:112 ../libgaim/protocols/oscar/oscar.c:123
 msgid "Not logged in"
 msgstr "No ha iniciado sesiĂłn"
 
-#: ../src/protocols/msn/error.c:116 src/protocols/msn/error.c:116
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/protocols/msn/error.c:122
 msgid "Command disabled"
 msgstr "Orden deshabilitada"
 
-#: ../src/protocols/msn/error.c:125 src/protocols/msn/error.c:125
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/protocols/msn/error.c:138 ../libgaim/protocols/msn/error.c:151
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/protocols/msn/error.c:171
 msgid "Too many sessions"
 msgstr "Demasiadas sesiones"
 
-#: ../src/protocols/msn/error.c:174 src/protocols/msn/error.c:174
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/protocols/msn/error.c:180
 msgid "Not expected"
 msgstr "No se esperaba"
 
-#: ../src/protocols/msn/error.c:185 src/protocols/msn/error.c:185
+#: ../libgaim/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
+#: ../libgaim/protocols/msn/error.c:194
 msgid "Server too busy"
 msgstr "Servidor muy ocupado"
 
-#: ../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
+#: ../libgaim/protocols/msn/error.c:198
+#: ../libgaim/protocols/oscar/oscar.c:1310
+#: ../libgaim/protocols/silc/ops.c:1715 ../libgaim/protocols/toc/toc.c:728
+#: ../libgaim/proxy.c:1344
 msgid "Authentication failed"
 msgstr "FallĂł la autenticaciĂłn"
 
-#: ../src/protocols/msn/error.c:201 src/protocols/msn/error.c:201
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/protocols/msn/error.c:220
 msgid "Bad ticket"
 msgstr "Ticket errĂłneo"
 
-#: ../src/protocols/msn/error.c:224 src/protocols/msn/error.c:224
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/protocols/msn/msn.c:307
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -8245,32 +8766,31 @@
 "¿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
+#: ../libgaim/protocols/msn/msn.c:311
 msgid "Allow"
 msgstr "Permitir"
 
-#: ../src/protocols/msn/msn.c:312 src/protocols/msn/msn.c:312
+#: ../libgaim/protocols/msn/msn.c:312
 msgid "Disallow"
 msgstr "Rechazar"
 
-#: ../src/protocols/msn/msn.c:328
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/protocols/msn/msn.c:356
 msgid "Page"
 msgstr "Buscapersonas"
 
-#: ../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
+#: ../libgaim/protocols/msn/msn.c:546 ../libgaim/protocols/msn/msn.c:553
+#: ../libgaim/protocols/msn/msn.c:562
+#: ../libgaim/protocols/sametime/sametime.c:3235
+#: ../libgaim/protocols/yahoo/yahoo.c:3032
+#: ../libgaim/protocols/yahoo/yahoo.c:3038
 #, c-format
 msgid ""
 "\n"
@@ -8279,77 +8799,73 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: ../src/protocols/msn/msn.c:557 src/protocols/msn/msn.c:559
+#: ../libgaim/protocols/msn/msn.c:553
 msgid "Has you"
 msgstr "Le tiene"
 
-#: ../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
+#: ../libgaim/protocols/msn/msn.c:583 ../libgaim/protocols/msn/state.c:33
+#: ../libgaim/protocols/yahoo/yahoo.c:2861
+#: ../libgaim/protocols/yahoo/yahoo.c:3466
 msgid "Be Right Back"
 msgstr "Vuelvo enseguida"
 
-#: ../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
+#: ../libgaim/protocols/msn/msn.c:587 ../libgaim/protocols/msn/state.c:31
+#: ../libgaim/protocols/novell/novell.c:2859
+#: ../libgaim/protocols/novell/novell.c:2993
+#: ../libgaim/protocols/silc/buddy.c:1473 ../libgaim/protocols/silc/silc.c:53
+#: ../libgaim/protocols/yahoo/yahoo.c:2863
+#: ../libgaim/protocols/yahoo/yahoo.c:3469
 msgid "Busy"
 msgstr "Ocupado"
 
-#: src/protocols/msn/msn.c:597 src/protocols/yahoo/yahoo.c:2650
-#: src/protocols/yahoo/yahoo.c:3232
+#: ../libgaim/protocols/msn/msn.c:591 ../libgaim/protocols/yahoo/yahoo.c:2871
+#: ../libgaim/protocols/yahoo/yahoo.c:3481
 msgid "On the Phone"
 msgstr "Al teléfono"
 
-#: src/protocols/msn/msn.c:601 src/protocols/yahoo/yahoo.c:2654
-#: src/protocols/yahoo/yahoo.c:3238
+#: ../libgaim/protocols/msn/msn.c:595 ../libgaim/protocols/yahoo/yahoo.c:2875
+#: ../libgaim/protocols/yahoo/yahoo.c:3487
 msgid "Out to Lunch"
 msgstr "SalĂ­ a comer"
 
-#: src/protocols/msn/msn.c:621
+#: ../libgaim/protocols/msn/msn.c:619
 msgid "Set Friendly Name..."
 msgstr "Establecer su nombre de amigo..."
 
-#: src/protocols/msn/msn.c:626
+#: ../libgaim/protocols/msn/msn.c:624
 msgid "Set Home Phone Number..."
 msgstr "Establecer el número de teléfono de su domicilio..."
 
-#: src/protocols/msn/msn.c:630
+#: ../libgaim/protocols/msn/msn.c:628
 msgid "Set Work Phone Number..."
 msgstr "Establecer el número de teléfono de su trabajo..."
 
-#: src/protocols/msn/msn.c:634
+#: ../libgaim/protocols/msn/msn.c:632
 msgid "Set Mobile Phone Number..."
 msgstr "Establecer su número de teléfono móvil..."
 
-#: src/protocols/msn/msn.c:640
+#: ../libgaim/protocols/msn/msn.c:638
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Permitir/Rechazar dispositivos mĂłviles..."
 
-#: src/protocols/msn/msn.c:645
+#: ../libgaim/protocols/msn/msn.c:643
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Permitir/Rechazar páginas Mobile"
 
-#: ../src/protocols/msn/msn.c:657 src/protocols/msn/msn.c:655
+#: ../libgaim/protocols/msn/msn.c:653
 msgid "Open Hotmail Inbox"
 msgstr "Abrir bandeja de entrada de Hotmail"
 
-#: ../src/protocols/msn/msn.c:681 src/protocols/msn/msn.c:679
+#: ../libgaim/protocols/msn/msn.c:677
 msgid "Send to Mobile"
 msgstr "Enviar a un mĂłvil"
 
-#: ../src/protocols/msn/msn.c:691 ../src/protocols/novell/novell.c:3441
-#: src/protocols/msn/msn.c:688 src/protocols/novell/novell.c:3444
+#: ../libgaim/protocols/msn/msn.c:687
+#: ../libgaim/protocols/novell/novell.c:3449
 msgid "Initiate _Chat"
 msgstr "Iniciar _chat"
 
-#: ../src/protocols/msn/msn.c:729 src/protocols/msn/msn.c:725
+#: ../libgaim/protocols/msn/msn.c:725
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -8357,100 +8873,241 @@
 "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:757 src/protocols/msn/msn.c:753
+#: ../libgaim/protocols/msn/msn.c:752
 msgid "Failed to connect to server."
 msgstr "No se pudo conectar al servidor."
 
-#: ../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
+#: ../libgaim/protocols/msn/msn.c:1363
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:685
+#: ../libgaim/protocols/zephyr/zephyr.c:788
+#: ../libgaim/protocols/zephyr/zephyr.c:1205
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<B>Apodo:</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: ../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
+#: ../libgaim/protocols/msn/msn.c:1370
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1221 ../libgaim/util.c:1109
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b>"
 
-#: ../src/protocols/msn/msn.c:1456 src/protocols/msn/msn.c:1445
+#: ../libgaim/protocols/msn/msn.c:1462
 msgid "MSN Profile"
 msgstr "Perfil MSN"
 
-#: ../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
+#: ../libgaim/protocols/msn/msn.c:1467 ../libgaim/protocols/msn/msn.c:1796
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:794
 msgid "Error retrieving profile"
 msgstr "Error al obtener el perfil"
 
-#: ../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
+#: ../libgaim/protocols/msn/msn.c:1537 ../libgaim/protocols/oscar/oscar.c:3669
+#: ../libgaim/protocols/qq/buddy_info.c:43
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1070
 msgid "Age"
 msgstr "Edad"
 
-#: ../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: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:1562 ../src/protocols/yahoo/yahoo_profile.c:1065
-#: src/protocols/msn/msn.c:1551 src/protocols/yahoo/yahoo_profile.c:1034
+#: ../libgaim/protocols/msn/msn.c:1539 ../libgaim/protocols/qq/buddy_info.c:49
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1085
 msgid "Occupation"
 msgstr "OcupaciĂłn"
 
-#: ../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: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: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
+#: ../libgaim/protocols/msn/msn.c:1540
+#: ../libgaim/protocols/novell/novell.c:1478
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1065
+msgid "Location"
+msgstr "UbicaciĂłn"
+
+#: ../libgaim/protocols/msn/msn.c:1545 ../libgaim/protocols/msn/msn.c:1725
+#: ../libgaim/protocols/msn/msn.c:1731 ../libgaim/protocols/msn/msn.c:1738
 msgid "Hobbies and Interests"
 msgstr "Aficiones e intereses"
 
-#: ../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
+#: ../libgaim/protocols/msn/msn.c:1551 ../libgaim/protocols/msn/msn.c:1659
+#: ../libgaim/protocols/msn/msn.c:1665 ../libgaim/protocols/msn/msn.c:1672
+#: ../libgaim/protocols/msn/msn.c:1680 ../libgaim/protocols/msn/msn.c:1687
+msgid "A Little About Me"
+msgstr "Un poco sobre mĂ­"
+
+#: ../libgaim/protocols/msn/msn.c:1557
+#, c-format
+msgid "%s<b>General</b><br>%s"
+msgstr "%s<b>General</b><br>%s"
+
+#. Social
+#: ../libgaim/protocols/msn/msn.c:1566
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1075
+msgid "Marital Status"
+msgstr "Estado civil"
+
+#: ../libgaim/protocols/msn/msn.c:1567
+msgid "Interests"
+msgstr "Aficiones"
+
+#: ../libgaim/protocols/msn/msn.c:1568
+msgid "Pets"
+msgstr "Mascotas"
+
+#: ../libgaim/protocols/msn/msn.c:1569
+msgid "Hometown"
+msgstr "Ciudad donde vive"
+
+#: ../libgaim/protocols/msn/msn.c:1570
+msgid "Places Lived"
+msgstr "Lugares donde he vivido"
+
+#: ../libgaim/protocols/msn/msn.c:1571
+msgid "Fashion"
+msgstr "Moda"
+
+#: ../libgaim/protocols/msn/msn.c:1572
+msgid "Humor"
+msgstr "Humor"
+
+#: ../libgaim/protocols/msn/msn.c:1573
+msgid "Music"
+msgstr "MĂşsica"
+
+#: ../libgaim/protocols/msn/msn.c:1574 ../libgaim/protocols/msn/msn.c:1747
+#: ../libgaim/protocols/msn/msn.c:1753
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1127
 msgid "Favorite Quote"
 msgstr "Cita preferida"
 
-#: ../src/protocols/msn/msn.c:1681 src/protocols/msn/msn.c:1670
+#: ../libgaim/protocols/msn/msn.c:1578
+#, c-format
+msgid "%s<b>Social</b><br>%s"
+msgstr "%s<b>Social</b><br>%s"
+
+#: ../libgaim/protocols/msn/msn.c:1587
+msgid "Significant Other"
+msgstr "Otra persona importante"
+
+#: ../libgaim/protocols/msn/msn.c:1588
+msgid "Home Phone"
+msgstr "Teléfono de casa"
+
+#: ../libgaim/protocols/msn/msn.c:1589
+msgid "Home Phone 2"
+msgstr "Teléfono de casa (2)"
+
+#: ../libgaim/protocols/msn/msn.c:1590 ../libgaim/protocols/oscar/oscar.c:3681
+msgid "Home Address"
+msgstr "Domicilio"
+
+#: ../libgaim/protocols/msn/msn.c:1591
+msgid "Personal Mobile"
+msgstr "MĂłvil personal"
+
+#: ../libgaim/protocols/msn/msn.c:1592
+msgid "Home Fax"
+msgstr "Fax personal"
+
+#: ../libgaim/protocols/msn/msn.c:1593
+msgid "Personal E-Mail"
+msgstr "Correo-e personal"
+
+#: ../libgaim/protocols/msn/msn.c:1594
+msgid "Personal IM"
+msgstr "MI personal"
+
+#: ../libgaim/protocols/msn/msn.c:1596
+msgid "Anniversary"
+msgstr "Aniversario"
+
+#: ../libgaim/protocols/msn/msn.c:1597 ../libgaim/protocols/msn/msn.c:1622
+msgid "Notes"
+msgstr "Notas"
+
+#: ../libgaim/protocols/msn/msn.c:1601
+#, c-format
+msgid "<br><b>Personal</b><br>%s"
+msgstr "<br><b>Personal</b><br>%s"
+
+# Prefiero esto a "TĂ­tulo laboral" que puede ser ambiguo, jfs
+#: ../libgaim/protocols/msn/msn.c:1609 ../libgaim/protocols/silc/ops.c:1043
+msgid "Job Title"
+msgstr "Trabajo"
+
+#: ../libgaim/protocols/msn/msn.c:1610 ../libgaim/protocols/oscar/oscar.c:3698
+msgid "Company"
+msgstr "Compañía"
+
+#: ../libgaim/protocols/msn/msn.c:1611
+#: ../libgaim/protocols/novell/novell.c:1480
+msgid "Department"
+msgstr "Departamento"
+
+#: ../libgaim/protocols/msn/msn.c:1612
+msgid "Profession"
+msgstr "ProfesiĂłn"
+
+#: ../libgaim/protocols/msn/msn.c:1613
+msgid "Work Phone"
+msgstr "Teléfono del trabajo"
+
+#: ../libgaim/protocols/msn/msn.c:1614
+msgid "Work Phone 2"
+msgstr "Teléfono del trabajo (2)"
+
+#: ../libgaim/protocols/msn/msn.c:1615 ../libgaim/protocols/oscar/oscar.c:3689
+msgid "Work Address"
+msgstr "DirecciĂłn del trabajo"
+
+# El latinoamérica se prefiere 'Celular', creo, jfs
+#: ../libgaim/protocols/msn/msn.c:1616
+msgid "Work Mobile"
+msgstr "MĂłvil del trabajo"
+
+#: ../libgaim/protocols/msn/msn.c:1617
+msgid "Work Pager"
+msgstr "Buscapersonas del trabajo"
+
+#: ../libgaim/protocols/msn/msn.c:1618
+msgid "Work Fax"
+msgstr "Fax del trabajo"
+
+#: ../libgaim/protocols/msn/msn.c:1619
+msgid "Work E-Mail"
+msgstr "Correo-e del trabajo"
+
+#: ../libgaim/protocols/msn/msn.c:1620
+msgid "Work IM"
+msgstr "MI del trabajo"
+
+#: ../libgaim/protocols/msn/msn.c:1621
+msgid "Start Date"
+msgstr "Fecha inicial"
+
+#: ../libgaim/protocols/msn/msn.c:1626
+#, c-format
+msgid "<br><b>Business</b><br>%s"
+msgstr "<br><b>Negocio</b><br>%s"
+
+#: ../libgaim/protocols/msn/msn.c:1637
+#, c-format
+msgid "<hr><b>Contact Info</b>%s%s"
+msgstr "<hr><b>InformaciĂłn de contacto</b>%s%s"
+
+#: ../libgaim/protocols/msn/msn.c:1696 ../libgaim/protocols/msn/msn.c:1702
+#: ../libgaim/protocols/msn/msn.c:1709 ../libgaim/protocols/msn/msn.c:1716
+msgid "Favorite Things"
+msgstr "Cosas preferidas"
+
+#: ../libgaim/protocols/msn/msn.c:1761
 msgid "Last Updated"
 msgstr "Actualizado por Ăşltima vez"
 
-#: ../src/protocols/msn/msn.c:1692 ../src/protocols/silc/ops.c:1060
-#: src/protocols/msn/msn.c:1681 src/protocols/silc/ops.c:1060
+#: ../libgaim/protocols/msn/msn.c:1773 ../libgaim/protocols/qq/buddy_info.c:58
+#: ../libgaim/protocols/silc/ops.c:1059
 msgid "Homepage"
 msgstr "Página personal"
 
-#: ../src/protocols/msn/msn.c:1714 src/protocols/msn/msn.c:1703
+#: ../libgaim/protocols/msn/msn.c:1798
 msgid "The user has not created a public profile."
 msgstr "El usuario no ha creado un perfil pĂşblico."
 
-#: ../src/protocols/msn/msn.c:1715 src/protocols/msn/msn.c:1704
+#: ../libgaim/protocols/msn/msn.c:1799
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -8460,7 +9117,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:1719 src/protocols/msn/msn.c:1708
+#: ../libgaim/protocols/msn/msn.c:1803
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
@@ -8468,8 +9125,14 @@
 "Gaim no pudo encontrar informaciĂłn en el perfil de usuario. Es probable que "
 "el usuario no exista."
 
-#: ../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
+#. put a link to the actual profile URL
+#: ../libgaim/protocols/msn/msn.c:1808
+#, c-format
+msgid "<hr><b>%s:</b> "
+msgstr "<hr><b>%s:</b> "
+
+#: ../libgaim/protocols/msn/msn.c:1808
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1221
 msgid "Profile URL"
 msgstr "URL del perfil"
 
@@ -8483,99 +9146,96 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/msn/msn.c:1931 ../src/protocols/msn/msn.c:1933
-#: src/protocols/msn/msn.c:1917 src/protocols/msn/msn.c:1919
+#: ../libgaim/protocols/msn/msn.c:2033 ../libgaim/protocols/msn/msn.c:2035
 msgid "MSN Protocol Plugin"
 msgstr "Complemento de protocolo MSN"
 
-#: ../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:1961 src/protocols/msn/msn.c:1947
+#: ../libgaim/protocols/msn/msn.c:2063
 msgid "Use HTTP Method"
 msgstr "Usar método HTTP"
 
-#: ../src/protocols/msn/msn.c:1966
+#: ../libgaim/protocols/msn/msn.c:2068
 msgid "Show custom smileys"
 msgstr "Mostrar emoticonos a medida"
 
-#: src/protocols/msn/msn.c:1955
+#: ../libgaim/protocols/msn/msn.c:2076
 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
+#: ../libgaim/protocols/msn/nexus.c:146
+#: ../libgaim/protocols/msn/servconn.c:133
+#: ../libgaim/protocols/qq/qq_proxy.c:242
+#: ../libgaim/protocols/qq/qq_proxy.c:321
+#: ../libgaim/protocols/qq/qq_proxy.c:366
+#: ../libgaim/protocols/qq/qq_proxy.c:399
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:62
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:162
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:186
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:199
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:228
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:242
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:267
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:301
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:331
+#: ../libgaim/protocols/yahoo/yahoochat.c:1357
+#: ../libgaim/protocols/yahoo/yahoochat.c:1383
 msgid "Unable to connect"
 msgstr "No se pudo conectar"
 
-#: ../src/protocols/msn/notification.c:178
-#: src/protocols/msn/notification.c:178
+#: ../libgaim/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: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
+#: ../libgaim/protocols/msn/notification.c:184
+#: ../libgaim/protocols/msn/notification.c:532
+#: ../libgaim/protocols/msn/session.c:329
 msgid "Unknown error."
 msgstr "Error desconocido."
 
-#: ../src/protocols/msn/notification.c:187
-#: src/protocols/msn/notification.c:187
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/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:528
+#: ../libgaim/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
+#: ../libgaim/protocols/msn/notification.c:823
 msgid "Unable to rename group"
 msgstr "No se pudo cambiar el nombre del grupo"
 
-#: ../src/protocols/msn/notification.c:876
-#: src/protocols/msn/notification.c:876
+#: ../libgaim/protocols/msn/notification.c:878
 msgid "Unable to delete group"
 msgstr "No se pudo borrar el grupo"
 
-#: ../src/protocols/msn/notification.c:1309
-#: src/protocols/msn/notification.c:1309
+#: ../libgaim/protocols/msn/notification.c:1314
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -8606,15 +9266,15 @@
 "Después de que se hayan realizado las tareas de mantenimiento debería poder "
 "conectarse con Ă©xito de nuevo."
 
-#: ../src/protocols/msn/servconn.c:135 src/protocols/msn/servconn.c:129
+#: ../libgaim/protocols/msn/servconn.c:135
 msgid "Writing error"
 msgstr "Error de escritura"
 
-#: ../src/protocols/msn/servconn.c:137 src/protocols/msn/servconn.c:131
+#: ../libgaim/protocols/msn/servconn.c:137
 msgid "Reading error"
 msgstr "Error de lectura"
 
-#: src/protocols/msn/servconn.c:138
+#: ../libgaim/protocols/msn/servconn.c:144
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -8623,312 +9283,231 @@
 "Error de conexiĂłn del servidor %s:\n"
 "%s"
 
-#: ../src/protocols/msn/session.c:304 src/protocols/msn/session.c:304
+#: ../libgaim/protocols/msn/session.c:299
 msgid "Our protocol is not supported by the server."
 msgstr "El servidor no soporta nuestro protocolo."
 
-#: ../src/protocols/msn/session.c:308 src/protocols/msn/session.c:308
+#: ../libgaim/protocols/msn/session.c:303
 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: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
+#: ../libgaim/protocols/msn/session.c:307
+#: ../libgaim/protocols/oscar/oscar.c:3409
+#: ../libgaim/protocols/yahoo/yahoo.c:191
 msgid "You have signed on from another location."
 msgstr "Ha conectado desde otra ubicaciĂłn."
 
-#: ../src/protocols/msn/session.c:315 src/protocols/msn/session.c:315
+#: ../libgaim/protocols/msn/session.c:310
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Su lista de amigos MSN está indisponible temporalmente. Por favor, espere y "
 "vuelva a intentarlo más tarde."
 
-#: ../src/protocols/msn/session.c:320 src/protocols/msn/session.c:320
+#: ../libgaim/protocols/msn/session.c:315
 msgid "The MSN servers are going down temporarily."
 msgstr "Los servidores de MSN van a sufrir un apagado temporal."
 
-#: ../src/protocols/msn/session.c:324 src/protocols/msn/session.c:324
+#: ../libgaim/protocols/msn/session.c:319
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "No se pudo autenticar: %s"
 
-#: ../src/protocols/msn/session.c:329 src/protocols/msn/session.c:329
+#: ../libgaim/protocols/msn/session.c:324
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "Su lista de amigos MSN está indisponible temporalmente. Por favor, espere y "
 "vuelva a intentarlo más tarde."
 
-#: ../src/protocols/msn/session.c:350 ../src/protocols/msn/session.c:352
-#: src/protocols/msn/session.c:350 src/protocols/msn/session.c:352
+#: ../libgaim/protocols/msn/session.c:345
+#: ../libgaim/protocols/msn/session.c:347
 msgid "Handshaking"
 msgstr "NegociaciĂłn"
 
-#: ../src/protocols/msn/session.c:351 src/protocols/msn/session.c:351
+#: ../libgaim/protocols/msn/session.c:346
 msgid "Transferring"
 msgstr "Transfiriendo"
 
-#: ../src/protocols/msn/session.c:353 src/protocols/msn/session.c:353
+#: ../libgaim/protocols/msn/session.c:348
 msgid "Starting authentication"
 msgstr "Empezando la autenticaciĂłn"
 
-#: ../src/protocols/msn/session.c:354 src/protocols/msn/session.c:354
+#: ../libgaim/protocols/msn/session.c:349
 msgid "Getting cookie"
 msgstr "Obteniendo una cookie"
 
-#: ../src/protocols/msn/session.c:356 src/protocols/msn/session.c:356
+#: ../libgaim/protocols/msn/session.c:351
 msgid "Sending cookie"
 msgstr "Enviando cookie"
 
-#: ../src/protocols/msn/session.c:357 src/protocols/msn/session.c:357
+#: ../libgaim/protocols/msn/session.c:352
 msgid "Retrieving buddy list"
 msgstr "Recuperando lista de amigos"
 
-#: ../src/protocols/msn/state.c:34 src/protocols/msn/state.c:34
+#: ../libgaim/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "Ausente"
 
-#: ../src/protocols/msn/state.c:35 src/protocols/msn/state.c:35
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/protocols/msn/switchboard.c:400
 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:416 src/protocols/msn/switchboard.c:413
+#: ../libgaim/protocols/msn/switchboard.c:408
 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:420 src/protocols/msn/switchboard.c:417
+#: ../libgaim/protocols/msn/switchboard.c:412
 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:424 src/protocols/msn/switchboard.c:421
+#: ../libgaim/protocols/msn/switchboard.c:416
 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:428
+#: ../libgaim/protocols/msn/switchboard.c:420
 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
+#: ../libgaim/protocols/msn/switchboard.c:424
 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:440 src/protocols/msn/switchboard.c:433
+#: ../libgaim/protocols/msn/switchboard.c:432
 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:961 src/protocols/msn/switchboard.c:954
+#: ../libgaim/protocols/msn/switchboard.c:952
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "¡%s le acaba de dar un codazo!"
 
-#: ../src/protocols/msn/userlist.c:96 src/protocols/msn/userlist.c:96
+#: ../libgaim/protocols/msn/userlist.c:90
 #, 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: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
+#: ../libgaim/protocols/msn/userlist.c:105
+#: ../libgaim/protocols/yahoo/yahoo.c:1002
 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
+#: ../libgaim/protocols/msn/userlist.c:106
+#: ../libgaim/protocols/yahoo/yahoo.c:1004
 msgid "Deny"
 msgstr "Denegar"
 
-#: src/protocols/msn/userlist.c:286
+#: ../libgaim/protocols/msn/userlist.c:280
 #, 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
+#: ../libgaim/protocols/msn/userlist.c:349
 #, 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
+#: ../libgaim/protocols/msn/userlist.c:671
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "No se pudo añadir a \"%s\"."
 
-#: ../src/protocols/msn/userlist.c:680 src/protocols/msn/userlist.c:672
+#: ../libgaim/protocols/msn/userlist.c:673
 msgid "The screen name specified is invalid."
 msgstr "El nombre de usuario especificado no es válido."
 
-#: ../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: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:296 src/protocols/napster/napster.c:296
-msgid "Unknown server error."
-msgstr "Error desconocido del servidor."
-
-#: ../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: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_CLIENT_WHOIS
-#: ../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: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: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:599 ../src/protocols/toc/toc.c:1367
-#: src/protocols/napster/napster.c:596 src/protocols/toc/toc.c:1367
-msgid "_Group:"
-msgstr "_Grupo:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../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
+#: ../libgaim/protocols/novell/nmuser.c:1869
 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
+#: ../libgaim/protocols/novell/nmuser.c:1872
 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
+#: ../libgaim/protocols/novell/nmuser.c:1875
 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
+#: ../libgaim/protocols/novell/nmuser.c:1878
 msgid "Error communicating with server"
 msgstr "Error comunicándose con el servidor"
 
-#: ../src/protocols/novell/nmuser.c:1881 src/protocols/novell/nmuser.c:1881
+#: ../libgaim/protocols/novell/nmuser.c:1882
 msgid "Conference not found"
 msgstr "Conferencia no encontrada"
 
-#: ../src/protocols/novell/nmuser.c:1884 src/protocols/novell/nmuser.c:1884
+#: ../libgaim/protocols/novell/nmuser.c:1885
 msgid "Conference does not exist"
 msgstr "La conferencia no existe"
 
-#: ../src/protocols/novell/nmuser.c:1888 src/protocols/novell/nmuser.c:1888
+#: ../libgaim/protocols/novell/nmuser.c:1889
 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
+#: ../libgaim/protocols/novell/nmuser.c:1892
 msgid "Not supported"
 msgstr "No soportado"
 
-#: ../src/protocols/novell/nmuser.c:1895 src/protocols/novell/nmuser.c:1895
+#: ../libgaim/protocols/novell/nmuser.c:1896
 msgid "Password has expired"
 msgstr "La contraseña ha expirado"
 
-#: ../src/protocols/novell/nmuser.c:1898 src/protocols/novell/nmuser.c:1898
+#: ../libgaim/protocols/novell/nmuser.c:1899
 msgid "Invalid password"
 msgstr "Contraseña inválida"
 
-#: ../src/protocols/novell/nmuser.c:1901 src/protocols/novell/nmuser.c:1901
+#: ../libgaim/protocols/novell/nmuser.c:1902
 msgid "User not found"
 msgstr "Usuario no encontrado"
 
-#: ../src/protocols/novell/nmuser.c:1904 src/protocols/novell/nmuser.c:1904
+#: ../libgaim/protocols/novell/nmuser.c:1905
 msgid "Account has been disabled"
 msgstr "La cuenta ha sido deshabilitada"
 
-#: ../src/protocols/novell/nmuser.c:1907 src/protocols/novell/nmuser.c:1907
+#: ../libgaim/protocols/novell/nmuser.c:1908
 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
+#: ../libgaim/protocols/novell/nmuser.c:1911
 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
+#: ../libgaim/protocols/novell/nmuser.c:1914
 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
+#: ../libgaim/protocols/novell/nmuser.c:1917
 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
+#: ../libgaim/protocols/novell/nmuser.c:1920
 msgid "Cannot add yourself"
 msgstr "No se puede añadir uno mismo"
 
-#: ../src/protocols/novell/nmuser.c:1922 src/protocols/novell/nmuser.c:1922
+#: ../libgaim/protocols/novell/nmuser.c:1923
 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
+#: ../libgaim/protocols/novell/nmuser.c:1927
 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
+#: ../libgaim/protocols/novell/nmuser.c:1930
 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
+#: ../libgaim/protocols/novell/nmuser.c:1933
 msgid ""
 "Your account has been disabled because too many invalid passwords were "
 "entered"
@@ -8936,31 +9515,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
+#: ../libgaim/protocols/novell/nmuser.c:1936
 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
+#: ../libgaim/protocols/novell/nmuser.c:1940
 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
+#: ../libgaim/protocols/novell/nmuser.c:1943
 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
+#: ../libgaim/protocols/novell/nmuser.c:1946
 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
+#: ../libgaim/protocols/novell/nmuser.c:1949
 msgid "Incompatible protocol version"
 msgstr "VersiĂłn de protocolo incompatible"
 
-#: ../src/protocols/novell/nmuser.c:1951 src/protocols/novell/nmuser.c:1951
+#: ../libgaim/protocols/novell/nmuser.c:1952
 msgid "The user has blocked you"
 msgstr "El usuario le ha bloqueado"
 
-#: ../src/protocols/novell/nmuser.c:1954 src/protocols/novell/nmuser.c:1954
+#: ../libgaim/protocols/novell/nmuser.c:1955
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
@@ -8968,54 +9547,56 @@
 "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
+#: ../libgaim/protocols/novell/nmuser.c:1958
 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
+#: ../libgaim/protocols/novell/nmuser.c:1961
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Error desconocido: 0x%X"
 
-#: ../src/protocols/novell/novell.c:124 src/protocols/novell/novell.c:124
+#: ../libgaim/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr "Fallo en la conexiĂłn (%s)."
 
-#: ../src/protocols/novell/novell.c:247 src/protocols/novell/novell.c:247
+#: ../libgaim/protocols/novell/novell.c:247
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
-msgstr "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
+msgstr ""
+"No se pudo enviar el mensaje. No se pudieron obtener los detalles del "
+"usuario (%s)"
+
+#: ../libgaim/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:422 src/protocols/novell/novell.c:422
+#: ../libgaim/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:493 ../src/protocols/novell/novell.c:987
-#: src/protocols/novell/novell.c:493 src/protocols/novell/novell.c:987
+#: ../libgaim/protocols/novell/novell.c:493
+#: ../libgaim/protocols/novell/novell.c:985
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "No se pudo invitar al usuario (%s)."
 
-#: ../src/protocols/novell/novell.c:532 src/protocols/novell/novell.c:532
+#: ../libgaim/protocols/novell/novell.c:532
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
 "No se pudo enviar un mensaje a %s. No se pudo crear la conferencia (%s)."
 
-#: ../src/protocols/novell/novell.c:537 src/protocols/novell/novell.c:537
+#: ../libgaim/protocols/novell/novell.c:537
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "No se pudo enviar el mensaje. No se pudo crear la conferencia (%s)"
 
-#: ../src/protocols/novell/novell.c:584 src/protocols/novell/novell.c:584
+#: ../libgaim/protocols/novell/novell.c:584
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -9024,7 +9605,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:632 src/protocols/novell/novell.c:632
+#: ../libgaim/protocols/novell/novell.c:632
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -9033,71 +9614,61 @@
 "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:705 src/protocols/novell/novell.c:705
+#: ../libgaim/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:751 ../src/protocols/novell/novell.c:897
-#: src/protocols/novell/novell.c:751 src/protocols/novell/novell.c:897
+#: ../libgaim/protocols/novell/novell.c:751
+#: ../libgaim/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:798 src/protocols/novell/novell.c:798
+#: ../libgaim/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:851 src/protocols/novell/novell.c:851
+#: ../libgaim/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:919 src/protocols/novell/novell.c:919
+#: ../libgaim/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:942 ../src/protocols/novell/novell.c:1654
-#: src/protocols/novell/novell.c:942 src/protocols/novell/novell.c:1654
+#: ../libgaim/protocols/novell/novell.c:942
+#: ../libgaim/protocols/novell/novell.c:1652
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "No se pudieron cambiar las opciones de privacidad del servidor (%s)."
 
-#: ../src/protocols/novell/novell.c:1014 src/protocols/novell/novell.c:1014
+#: ../libgaim/protocols/novell/novell.c:1012
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "No se pudo crear la conferencia (%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
+#: ../libgaim/protocols/novell/novell.c:1121
+#: ../libgaim/protocols/novell/novell.c:1697
 msgid "Error communicating with server. Closing connection."
 msgstr "Error comunicándose con el servidor. Se cerrará la conexión."
 
-#: ../src/protocols/novell/novell.c:1478 src/protocols/novell/novell.c:1478
+#: ../libgaim/protocols/novell/novell.c:1476
 msgid "Telephone Number"
 msgstr "Número de teléfono"
 
-#: ../src/protocols/novell/novell.c:1482 src/protocols/novell/novell.c:1482
-msgid "Department"
-msgstr "Departamento"
-
-#: ../src/protocols/novell/novell.c:1484 src/protocols/novell/novell.c:1484
+#: ../libgaim/protocols/novell/novell.c:1482
 msgid "Personal Title"
 msgstr "TĂ­tulo"
 
-#: ../src/protocols/novell/novell.c:1488 src/protocols/novell/novell.c:1488
+#: ../libgaim/protocols/novell/novell.c:1486
 msgid "Mailstop"
 msgstr "BuzĂłn de correo"
 
-#: ../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:1506 src/protocols/novell/novell.c:1506
+#: ../libgaim/protocols/novell/novell.c:1504
 msgid "User ID"
 msgstr "ID de usuario"
 
@@ -9108,41 +9679,41 @@
 #. tag, value);
 #. }
 #.
-#: ../src/protocols/novell/novell.c:1520 src/protocols/novell/novell.c:1520
+#: ../libgaim/protocols/novell/novell.c:1518
 msgid "Full name"
 msgstr "Nombre completo"
 
-#: ../src/protocols/novell/novell.c:1644 src/protocols/novell/novell.c:1644
+#: ../libgaim/protocols/novell/novell.c:1642
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Conferencia GroupWise %d"
 
-#: ../src/protocols/novell/novell.c:1669 src/protocols/novell/novell.c:1669
+#: ../libgaim/protocols/novell/novell.c:1673
 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:1726 src/protocols/novell/novell.c:1726
+#: ../libgaim/protocols/novell/novell.c:1725
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-#: ../src/protocols/novell/novell.c:1738 src/protocols/novell/novell.c:1738
+#: ../libgaim/protocols/novell/novell.c:1737
 msgid "Unable to connect to server."
 msgstr "No se pudo conectar al servidor."
 
-#: ../src/protocols/novell/novell.c:1741 src/protocols/novell/novell.c:1741
+#: ../libgaim/protocols/novell/novell.c:1740
 msgid "Waiting for response..."
 msgstr "Esperando respuesta..."
 
-#: ../src/protocols/novell/novell.c:1876 src/protocols/novell/novell.c:1876
+#: ../libgaim/protocols/novell/novell.c:1875
 #, 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:1904 src/protocols/novell/novell.c:1904
+#: ../libgaim/protocols/novell/novell.c:1903
 msgid "Invitation to Conversation"
 msgstr "InvitaciĂłn a una conversaciĂłn"
 
-#: ../src/protocols/novell/novell.c:1905 src/protocols/novell/novell.c:1905
+#: ../libgaim/protocols/novell/novell.c:1904
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -9153,16 +9724,17 @@
 "\n"
 "Enviada: %s"
 
-#: ../src/protocols/novell/novell.c:1907 src/protocols/novell/novell.c:1907
+#: ../libgaim/protocols/novell/novell.c:1906
 msgid "Would you like to join the conversation?"
 msgstr "ÂżDesea unirse a la conversaciĂłn?"
 
-#: ../src/protocols/novell/novell.c:2014 src/protocols/novell/novell.c:2014
+#. we don't want to reconnect in this case
+#: ../libgaim/protocols/novell/novell.c:2015
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 "Ha sido desconectado porque se ha conectado desde otra estaciĂłn de trabajo."
 
-#: ../src/protocols/novell/novell.c:2070 src/protocols/novell/novell.c:2070
+#: ../libgaim/protocols/novell/novell.c:2072
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -9174,7 +9746,7 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../src/protocols/novell/novell.c:2168 src/protocols/novell/novell.c:2168
+#: ../libgaim/protocols/novell/novell.c:2170
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -9182,11 +9754,11 @@
 "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:2190 src/protocols/novell/novell.c:2190
+#: ../libgaim/protocols/novell/novell.c:2198
 msgid "Error. SSL support is not installed."
 msgstr "Error. El soporte de SSL no está instalado."
 
-#: ../src/protocols/novell/novell.c:2499 src/protocols/novell/novell.c:2499
+#: ../libgaim/protocols/novell/novell.c:2507
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Se ha cerrado esta conferencia. No se pueden enviar más mensajes."
 
@@ -9200,117 +9772,191 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/novell/novell.c:3544 ../src/protocols/novell/novell.c:3546
-#: src/protocols/novell/novell.c:3543 src/protocols/novell/novell.c:3545
+#: ../libgaim/protocols/novell/novell.c:3552
+#: ../libgaim/protocols/novell/novell.c:3554
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Complemento de protocolo de MensajerĂ­a de Grupos de Novell"
 
-#: ../src/protocols/novell/novell.c:3565 src/protocols/novell/novell.c:3564
+#: ../libgaim/protocols/novell/novell.c:3573
 msgid "Server address"
 msgstr "DirecciĂłn del servidor"
 
-#: ../src/protocols/novell/novell.c:3569 src/protocols/novell/novell.c:3568
+#: ../libgaim/protocols/novell/novell.c:3577
 msgid "Server port"
 msgstr "Puerto del servidor"
 
-#: ../src/protocols/oscar/oscar.c:203 src/protocols/oscar/oscar.c:201
+#: ../libgaim/protocols/oscar/flap_connection.c:237
+#: ../libgaim/protocols/yahoo/yahoo.c:2268
+#: ../libgaim/protocols/yahoo/yahoo.c:2426
+#: ../libgaim/protocols/yahoo/ycht.c:481 ../libgaim/proxy.c:570
+#: ../libgaim/proxy.c:1078 ../libgaim/proxy.c:1189 ../libgaim/proxy.c:1289
+#: ../libgaim/proxy.c:1417
+msgid "Server closed the connection."
+msgstr "El servidor ha cerrado la conexiĂłn."
+
+#: ../libgaim/protocols/oscar/flap_connection.c:239
+#: ../libgaim/protocols/yahoo/yahoo.c:2262
+#: ../libgaim/protocols/yahoo/yahoo.c:2420 ../libgaim/proxy.c:582
+#: ../libgaim/proxy.c:1090 ../libgaim/proxy.c:1201 ../libgaim/proxy.c:1301
+#: ../libgaim/proxy.c:1429
+#, c-format
+msgid ""
+"Lost connection with server:\n"
+"%s"
+msgstr ""
+"Se perdiĂł la conexiĂłn con el servidor:\n"
+"%s"
+
+#: ../libgaim/protocols/oscar/flap_connection.c:242 ../libgaim/proxy.c:1107
+#: ../libgaim/proxy.c:1214 ../libgaim/proxy.c:1313 ../libgaim/proxy.c:1385
+#: ../libgaim/proxy.c:1442
+msgid "Received invalid data on connection with server."
+msgstr "Se recibieron datos inválidos al conectarse al servidor."
+
+#: ../libgaim/protocols/oscar/flap_connection.c:244
+#, c-format
+msgid ""
+"Could not establish a connection with the server:\n"
+"%s"
+msgstr ""
+"No se pudo establecer una conexiĂłn con el servidor:\n"
+"%s"
+
+#: ../libgaim/protocols/oscar/odc.c:40
+msgid "The remote user has closed the connection."
+msgstr "El usuario remoto ha cerrado la conexiĂłn."
+
+#: ../libgaim/protocols/oscar/odc.c:42
+msgid "The remote user has declined your request."
+msgstr "El usuario remoto ha rechazado su solicitud."
+
+#: ../libgaim/protocols/oscar/odc.c:44
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr "Se perdiĂł la conexiĂłn con el usuario remoto:<br>%s"
+
+#: ../libgaim/protocols/oscar/odc.c:47
+msgid "Received invalid data on connection with remote user."
+msgstr "Se recibieron datos inválidos en la conexión con el usuario remoto."
+
+#: ../libgaim/protocols/oscar/odc.c:49
+msgid "Could not establish a connection with the remote user."
+msgstr "No se pudo establecer una conexiĂłn con el usuario remoto."
+
+#: ../libgaim/protocols/oscar/odc.c:561
+msgid "Direct IM established"
+msgstr "MI directo establecido"
+
+#: ../libgaim/protocols/oscar/oft.c:457
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr "El fichero %s es %s, que es más grande que el tamaño máximo de %s."
+
+#: ../libgaim/protocols/oscar/oscar.c:119
 msgid "Invalid error"
 msgstr "Error inválido"
 
-#: ../src/protocols/oscar/oscar.c:204 src/protocols/oscar/oscar.c:202
+#: ../libgaim/protocols/oscar/oscar.c:120
 msgid "Invalid SNAC"
 msgstr "SNAC inválido"
 
-#: ../src/protocols/oscar/oscar.c:205 src/protocols/oscar/oscar.c:203
+#: ../libgaim/protocols/oscar/oscar.c:121
 msgid "Rate to host"
 msgstr "Tasa de mensajes al servidor"
 
-#: ../src/protocols/oscar/oscar.c:206 src/protocols/oscar/oscar.c:204
+#: ../libgaim/protocols/oscar/oscar.c:122
 msgid "Rate to client"
 msgstr "Tasa de mensajes al cliente"
 
-#: ../src/protocols/oscar/oscar.c:208 src/protocols/oscar/oscar.c:206
+#: ../libgaim/protocols/oscar/oscar.c:124
 msgid "Service unavailable"
 msgstr "Servicio no disponible"
 
-#: ../src/protocols/oscar/oscar.c:209 src/protocols/oscar/oscar.c:207
+#: ../libgaim/protocols/oscar/oscar.c:125
 msgid "Service not defined"
 msgstr "Servicio no definido"
 
-#: ../src/protocols/oscar/oscar.c:210 src/protocols/oscar/oscar.c:208
+#: ../libgaim/protocols/oscar/oscar.c:126
 msgid "Obsolete SNAC"
 msgstr "SNAC obsoleto"
 
-#: ../src/protocols/oscar/oscar.c:211 src/protocols/oscar/oscar.c:209
+#: ../libgaim/protocols/oscar/oscar.c:127
 msgid "Not supported by host"
 msgstr "No soportado por el servidor"
 
-#: ../src/protocols/oscar/oscar.c:212 src/protocols/oscar/oscar.c:210
+#: ../libgaim/protocols/oscar/oscar.c:128
 msgid "Not supported by client"
 msgstr "No soportado por el cliente"
 
-#: ../src/protocols/oscar/oscar.c:213 src/protocols/oscar/oscar.c:211
+#: ../libgaim/protocols/oscar/oscar.c:129
 msgid "Refused by client"
 msgstr "Rechazado por el cliente"
 
-#: ../src/protocols/oscar/oscar.c:214 src/protocols/oscar/oscar.c:212
+#: ../libgaim/protocols/oscar/oscar.c:130
 msgid "Reply too big"
 msgstr "Respuesta demasiado grande"
 
-#: ../src/protocols/oscar/oscar.c:215 src/protocols/oscar/oscar.c:213
+#: ../libgaim/protocols/oscar/oscar.c:131
 msgid "Responses lost"
 msgstr "Respuestas perdidas"
 
-#: ../src/protocols/oscar/oscar.c:216 src/protocols/oscar/oscar.c:214
+#: ../libgaim/protocols/oscar/oscar.c:132
 msgid "Request denied"
 msgstr "Solicitud denegada"
 
-#: ../src/protocols/oscar/oscar.c:217 src/protocols/oscar/oscar.c:215
+#: ../libgaim/protocols/oscar/oscar.c:133
 msgid "Busted SNAC payload"
 msgstr "Carga de SNAC destrozada"
 
-#: ../src/protocols/oscar/oscar.c:218 src/protocols/oscar/oscar.c:216
+#: ../libgaim/protocols/oscar/oscar.c:134
 msgid "Insufficient rights"
 msgstr "Derechos insuficientes"
 
-#: ../src/protocols/oscar/oscar.c:219 src/protocols/oscar/oscar.c:217
+#: ../libgaim/protocols/oscar/oscar.c:135
 msgid "In local permit/deny"
 msgstr "En la lista local de autorizar/negar"
 
-#: ../src/protocols/oscar/oscar.c:220 src/protocols/oscar/oscar.c:218
+#: ../libgaim/protocols/oscar/oscar.c:136
 msgid "Too evil (sender)"
 msgstr "Demasiado malvado (remitente)"
 
-#: ../src/protocols/oscar/oscar.c:221 src/protocols/oscar/oscar.c:219
+#: ../libgaim/protocols/oscar/oscar.c:137
 msgid "Too evil (receiver)"
 msgstr "Demasiado malvado (destinatario)"
 
-#: ../src/protocols/oscar/oscar.c:222 src/protocols/oscar/oscar.c:220
+#: ../libgaim/protocols/oscar/oscar.c:138
 msgid "User temporarily unavailable"
 msgstr "Usuario temporalmente no disponible"
 
-#: ../src/protocols/oscar/oscar.c:223 src/protocols/oscar/oscar.c:221
+#: ../libgaim/protocols/oscar/oscar.c:139
 msgid "No match"
 msgstr "No hubo coincidencia"
 
-#: ../src/protocols/oscar/oscar.c:224 src/protocols/oscar/oscar.c:222
+#: ../libgaim/protocols/oscar/oscar.c:140
 msgid "List overflow"
 msgstr "Desbordamiento de la lista"
 
-#: ../src/protocols/oscar/oscar.c:225 src/protocols/oscar/oscar.c:223
+#: ../libgaim/protocols/oscar/oscar.c:141
 msgid "Request ambiguous"
 msgstr "Solicitud ambigua"
 
-#: ../src/protocols/oscar/oscar.c:226 src/protocols/oscar/oscar.c:224
+#: ../libgaim/protocols/oscar/oscar.c:142
 msgid "Queue full"
 msgstr "Cola llena"
 
-#: ../src/protocols/oscar/oscar.c:227 src/protocols/oscar/oscar.c:225
+#: ../libgaim/protocols/oscar/oscar.c:143
 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
+#: ../libgaim/protocols/oscar/oscar.c:321
+msgid ""
+"(There was an error receiving this message.  The buddy you are speaking with "
+"is probably using a different encoding than expected.  If you know what "
+"encoding he is using, you can specify it in the advanced account options for "
+"your AIM/ICQ account.)"
+msgstr "(Se produjo un error al recibir este mensaje. Es posible que el amigo con el que esta hablando utilice una codificación distinta de la que se esperaba. Puede indicar su condificación en las opciones de cuenta avanzadas para AIM/ICQ si sabe que codificación está utilizando.)"
+
+#: ../libgaim/protocols/oscar/oscar.c:424
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
@@ -9318,192 +9964,156 @@
 "(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:638 src/protocols/oscar/oscar.c:616
+#: ../libgaim/protocols/oscar/oscar.c:603
 msgid "Voice"
 msgstr "Voz"
 
-#: ../src/protocols/oscar/oscar.c:641 src/protocols/oscar/oscar.c:619
+#: ../libgaim/protocols/oscar/oscar.c:606
 msgid "AIM Direct IM"
 msgstr "MI Directo AIM"
 
-#: ../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
+#: ../libgaim/protocols/oscar/oscar.c:609 ../libgaim/protocols/silc/silc.c:697
+#: ../libgaim/protocols/silc/util.c:551
 msgid "Chat"
 msgstr "Charlar"
 
-#: ../src/protocols/oscar/oscar.c:647 ../src/protocols/oscar/oscar.c:8095
-#: src/protocols/oscar/oscar.c:625 src/protocols/oscar/oscar.c:7968
+#: ../libgaim/protocols/oscar/oscar.c:612
+#: ../libgaim/protocols/oscar/oscar.c:5852
 msgid "Get File"
 msgstr "Recibir archivo"
 
-#: ../src/protocols/oscar/oscar.c:654 src/protocols/oscar/oscar.c:632
+#: ../libgaim/protocols/oscar/oscar.c:619
 msgid "Games"
 msgstr "Juegos"
 
-#: ../src/protocols/oscar/oscar.c:657 src/protocols/oscar/oscar.c:635
+#: ../libgaim/protocols/oscar/oscar.c:622
 msgid "Add-Ins"
 msgstr "Extensiones"
 
-#: ../src/protocols/oscar/oscar.c:660 src/protocols/oscar/oscar.c:638
+#: ../libgaim/protocols/oscar/oscar.c:625
 msgid "Send Buddy List"
 msgstr "Enviar lista de amigos"
 
-#: ../src/protocols/oscar/oscar.c:663 src/protocols/oscar/oscar.c:641
+#: ../libgaim/protocols/oscar/oscar.c:628
 msgid "ICQ Direct Connect"
 msgstr "ConexiĂłn directa ICQ"
 
-#: ../src/protocols/oscar/oscar.c:666 src/protocols/oscar/oscar.c:644
+#: ../libgaim/protocols/oscar/oscar.c:631
 msgid "AP User"
 msgstr "Usuario de AP"
 
-#: ../src/protocols/oscar/oscar.c:669 src/protocols/oscar/oscar.c:647
+#: ../libgaim/protocols/oscar/oscar.c:634
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../src/protocols/oscar/oscar.c:672 src/protocols/oscar/oscar.c:650
+#: ../libgaim/protocols/oscar/oscar.c:637
 msgid "Nihilist"
 msgstr "Nihilista"
 
-#: ../src/protocols/oscar/oscar.c:675 src/protocols/oscar/oscar.c:653
+#: ../libgaim/protocols/oscar/oscar.c:640
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: ../src/protocols/oscar/oscar.c:678 src/protocols/oscar/oscar.c:656
+#: ../libgaim/protocols/oscar/oscar.c:643
 msgid "Old ICQ UTF8"
 msgstr "Antiguo ICQ UTF8"
 
-#: ../src/protocols/oscar/oscar.c:681 src/protocols/oscar/oscar.c:659
+#: ../libgaim/protocols/oscar/oscar.c:646
 msgid "Trillian Encryption"
 msgstr "Cifrado Trillian"
 
-#: ../src/protocols/oscar/oscar.c:684 src/protocols/oscar/oscar.c:662
+#: ../libgaim/protocols/oscar/oscar.c:649
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../src/protocols/oscar/oscar.c:687 src/protocols/oscar/oscar.c:665
+#: ../libgaim/protocols/oscar/oscar.c:652
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../src/protocols/oscar/oscar.c:690 src/protocols/oscar/oscar.c:668
+#: ../libgaim/protocols/oscar/oscar.c:655
 msgid "Security Enabled"
 msgstr "Seguridad activada"
 
-#: ../src/protocols/oscar/oscar.c:693 src/protocols/oscar/oscar.c:671
+#: ../libgaim/protocols/oscar/oscar.c:658
 msgid "Video Chat"
 msgstr "Video chat"
 
-#: ../src/protocols/oscar/oscar.c:697 src/protocols/oscar/oscar.c:675
+#: ../libgaim/protocols/oscar/oscar.c:662
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../src/protocols/oscar/oscar.c:700 src/protocols/oscar/oscar.c:678
+#: ../libgaim/protocols/oscar/oscar.c:665
 msgid "Live Video"
 msgstr "VĂ­deo en tiempo real"
 
-#: ../src/protocols/oscar/oscar.c:703 src/protocols/oscar/oscar.c:681
+#: ../libgaim/protocols/oscar/oscar.c:668
 msgid "Camera"
 msgstr "Cámara"
 
-#: ../src/protocols/oscar/oscar.c:721 ../src/protocols/oscar/oscar.c:7957
-#: src/protocols/oscar/oscar.c:699 src/protocols/oscar/oscar.c:7851
+#: ../libgaim/protocols/oscar/oscar.c:686
+#: ../libgaim/protocols/oscar/oscar.c:5629
 msgid "Free For Chat"
 msgstr "Disponible para conversar"
 
-#: ../src/protocols/oscar/oscar.c:725 ../src/protocols/oscar/oscar.c:7985
-#: src/protocols/oscar/oscar.c:703 src/protocols/oscar/oscar.c:7866
+#: ../libgaim/protocols/oscar/oscar.c:690
+#: ../libgaim/protocols/oscar/oscar.c:5661
 msgid "Not Available"
 msgstr "No disponible"
 
-#: ../src/protocols/oscar/oscar.c:727 ../src/protocols/oscar/oscar.c:7975
-#: src/protocols/oscar/oscar.c:705 src/protocols/oscar/oscar.c:7856
+#: ../libgaim/protocols/oscar/oscar.c:692
+#: ../libgaim/protocols/oscar/oscar.c:5647
 msgid "Occupied"
 msgstr "Ocupado"
 
-#: ../src/protocols/oscar/oscar.c:731 src/protocols/oscar/oscar.c:709
+#: ../libgaim/protocols/oscar/oscar.c:696
 msgid "Web Aware"
 msgstr "Capacidad web"
 
-#: ../src/protocols/oscar/oscar.c:735 src/protocols/oscar/oscar.c:713
+#: ../libgaim/protocols/oscar/oscar.c:700
 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
+#: ../libgaim/protocols/oscar/oscar.c:786
+#: ../libgaim/protocols/oscar/oscar.c:2804
 msgid "Warning Level"
 msgstr "Niveles de aviso"
 
-#: ../src/protocols/oscar/oscar.c:821 src/protocols/oscar/oscar.c:795
+#: ../libgaim/protocols/oscar/oscar.c:795
 msgid "Buddy Comment"
 msgstr "Comentario de amigo"
 
-#: ../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: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:980 src/protocols/oscar/oscar.c:956
-msgid "Direct Connect failed"
-msgstr "FallĂł la conexiĂłn directa"
-
-#: ../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: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: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: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: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: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?"
-msgstr ""
-"Como Ă©sto revela su direcciĂłn IP, puede ser considerado como un riesgo a su "
-"privacidad.  ÂżQuiere continuar?"
-
-#: ../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:1741 src/protocols/oscar/oscar.c:1672
-msgid "Chat is currently unavailable"
-msgstr "El chat no está disponible"
-
-#: ../src/protocols/oscar/oscar.c:1813 src/protocols/oscar/oscar.c:1742
+#: ../libgaim/protocols/oscar/oscar.c:931
+#, c-format
+msgid ""
+"Could not connect to authentication server:\n"
+"%s"
+msgstr ""
+"No se pudo conectar al servidor de autenticaciĂłn:\n"
+"%s"
+
+#: ../libgaim/protocols/oscar/oscar.c:939
+#, c-format
+msgid ""
+"Could not connect to BOS server:\n"
+"%s"
+msgstr ""
+"No se pudo conectar al servidor BOS:\n"
+"%s"
+
+#: ../libgaim/protocols/oscar/oscar.c:979
 msgid "Screen name sent"
 msgstr "Se ha enviado el nombre de usuario"
 
-#: ../src/protocols/oscar/oscar.c:1829 src/protocols/oscar/oscar.c:1758
+#: ../libgaim/protocols/oscar/oscar.c:984
+msgid "Connection established, cookie sent"
+msgstr "ConexiĂłn establecida, cookie enviada"
+
+#. TODO: Don't call this with ssi
+#: ../libgaim/protocols/oscar/oscar.c:1013
+msgid "Finalizing connection"
+msgstr "Terminando la conexiĂłn"
+
+#: ../libgaim/protocols/oscar/oscar.c:1197
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -9514,88 +10124,26 @@
 "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: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: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: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: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 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 Accounts->%s->Edit Account-"
-">Advanced."
-msgstr ""
-"ExpirĂł la transferencia del fichero %s.\n"
-" 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: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: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: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 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:2846 src/protocols/oscar/oscar.c:2733
+#: ../libgaim/protocols/oscar/oscar.c:1282
+msgid "Invalid screen name."
+msgstr "Nombre de usuario no válido"
+
+#: ../libgaim/protocols/oscar/oscar.c:1287
+#: ../libgaim/protocols/yahoo/yahoo.c:1928
+msgid "Incorrect password."
+msgstr "Contraseña incorrecta."
+
+#: ../libgaim/protocols/oscar/oscar.c:1292
 msgid "Your account is currently suspended."
 msgstr "Su cuenta está deshabilitada actualmente."
 
 #. service temporarily unavailable
-#: ../src/protocols/oscar/oscar.c:2850 src/protocols/oscar/oscar.c:2737
+#: ../libgaim/protocols/oscar/oscar.c:1296
 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:2855 src/protocols/oscar/oscar.c:2742
+#: ../libgaim/protocols/oscar/oscar.c:1301
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -9604,36 +10152,35 @@
 "inténtelo de nuevo. Si sigue intentándolo, necesitará esperar incluso más "
 "tiempo."
 
-#: ../src/protocols/oscar/oscar.c:2860 src/protocols/oscar/oscar.c:2747
+#: ../libgaim/protocols/oscar/oscar.c:1306
 #, 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:2888 src/protocols/oscar/oscar.c:2778
-msgid "Internal Error"
-msgstr "Error interno"
-
-#: ../src/protocols/oscar/oscar.c:2958 src/protocols/oscar/oscar.c:2849
+#: ../libgaim/protocols/oscar/oscar.c:1341
+msgid "Could Not Connect"
+msgstr "No se pudo conectar"
+
+#: ../libgaim/protocols/oscar/oscar.c:1346
 msgid "Received authorization"
 msgstr "Se recibiĂł la autorizaciĂłn"
 
-#: ../src/protocols/oscar/oscar.c:2982 src/protocols/oscar/oscar.c:2873
+#: ../libgaim/protocols/oscar/oscar.c:1369
 msgid "The SecurID key entered is invalid."
 msgstr "La clave SecurID que se ha introducido no es válida."
 
-#: ../src/protocols/oscar/oscar.c:2996 src/protocols/oscar/oscar.c:2887
+#: ../libgaim/protocols/oscar/oscar.c:1383
 msgid "Enter SecurID"
 msgstr "Introduzca SecurID"
 
-#: ../src/protocols/oscar/oscar.c:2997 src/protocols/oscar/oscar.c:2888
+#: ../libgaim/protocols/oscar/oscar.c:1384
 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: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
+#: ../libgaim/protocols/oscar/oscar.c:1424
+#: ../libgaim/protocols/oscar/oscar.c:1467
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -9642,47 +10189,41 @@
 "Quizá sea desconectado en breve.  Puede querer usar TOC hasta que esto se "
 "resuelva.  Compruebe %s para novedades."
 
-#: ../src/protocols/oscar/oscar.c:3040 ../src/protocols/oscar/oscar.c:3070
-#: src/protocols/oscar/oscar.c:2931 src/protocols/oscar/oscar.c:2961
+#: ../libgaim/protocols/oscar/oscar.c:1427
+#: ../libgaim/protocols/oscar/oscar.c:1470
 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:3161 src/protocols/oscar/oscar.c:3050
+#: ../libgaim/protocols/oscar/oscar.c:1556
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "Quizá sea desconectado en breve.  Compruebe %s para novedades."
+
+#: ../libgaim/protocols/oscar/oscar.c:1559
 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:3182 src/protocols/oscar/oscar.c:3071
+#: ../libgaim/protocols/oscar/oscar.c:1585
 msgid "Password sent"
 msgstr "Contraseña enviada"
 
-#: ../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: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 "
-"considered a privacy risk."
-msgstr ""
-"Esto requiere una conexiĂłn directa entre las dos computadoras y es necesario "
-"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:4532 src/protocols/oscar/oscar.c:4382
+#: ../libgaim/protocols/oscar/oscar.c:1641
+msgid "gaim_proxy_connect() failed"
+msgstr "FallĂł gaim_proxy_connect()"
+
+#: ../libgaim/protocols/oscar/oscar.c:2139
 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:4540 src/protocols/oscar/oscar.c:4390
+#: ../libgaim/protocols/oscar/oscar.c:2148
 msgid "Authorization Request Message:"
 msgstr "Mensaje de solicitud de autorizaciĂłn:"
 
-#: ../src/protocols/oscar/oscar.c:4541 src/protocols/oscar/oscar.c:4391
+#: ../libgaim/protocols/oscar/oscar.c:2149
 msgid "Please authorize me!"
 msgstr "¡Por favor, autoríceme!"
 
-#: ../src/protocols/oscar/oscar.c:4571 src/protocols/oscar/oscar.c:4421
+#: ../libgaim/protocols/oscar/oscar.c:2181
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -9691,29 +10232,28 @@
 "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:4576 src/protocols/oscar/oscar.c:4426
-#: src/protocols/oscar/oscar.c:4428
+#: ../libgaim/protocols/oscar/oscar.c:2186
 msgid "Request Authorization"
 msgstr "Pedir autorizaciĂłn"
 
-#: ../src/protocols/oscar/oscar.c:4578
+#: ../libgaim/protocols/oscar/oscar.c:2188
 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
+#: ../libgaim/protocols/oscar/oscar.c:2229
+#: ../libgaim/protocols/oscar/oscar.c:2236
+#: ../libgaim/protocols/oscar/oscar.c:2343
+#: ../libgaim/protocols/oscar/oscar.c:2367
+#: ../libgaim/protocols/oscar/oscar.c:5054
+#: ../libgaim/protocols/oscar/oscar.c:5106
 msgid "No reason given."
 msgstr "No se indicĂł una razĂłn."
 
-#: ../src/protocols/oscar/oscar.c:4621 src/protocols/oscar/oscar.c:4471
+#: ../libgaim/protocols/oscar/oscar.c:2235
 msgid "Authorization Denied Message:"
 msgstr "Mensaje de autorizaciĂłn denegada:"
 
-#: ../src/protocols/oscar/oscar.c:4728
+#: ../libgaim/protocols/oscar/oscar.c:2345
 #, c-format
 msgid ""
 "The user %u wants to add %s to their buddy list for the following reason:\n"
@@ -9723,12 +10263,12 @@
 "motivo:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4738 ../src/protocols/oscar/oscar.c:7403
-#: src/protocols/oscar/oscar.c:4588 src/protocols/oscar/oscar.c:7278
+#: ../libgaim/protocols/oscar/oscar.c:2355
+#: ../libgaim/protocols/oscar/oscar.c:5066
 msgid "Authorization Request"
 msgstr "Solicitud de autorizaciĂłn"
 
-#: ../src/protocols/oscar/oscar.c:4750 src/protocols/oscar/oscar.c:4600
+#: ../libgaim/protocols/oscar/oscar.c:2367
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -9739,18 +10279,18 @@
 "la siguiente razĂłn:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4751 src/protocols/oscar/oscar.c:4601
+#: ../libgaim/protocols/oscar/oscar.c:2368
 msgid "ICQ authorization denied."
 msgstr "AutorizaciĂłn ICQ denegada."
 
 #. Someone has granted you authorization
-#: ../src/protocols/oscar/oscar.c:4758 src/protocols/oscar/oscar.c:4608
+#: ../libgaim/protocols/oscar/oscar.c:2375
 #, 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:4766 src/protocols/oscar/oscar.c:4616
+#: ../libgaim/protocols/oscar/oscar.c:2383
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -9763,7 +10303,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4774 src/protocols/oscar/oscar.c:4624
+#: ../libgaim/protocols/oscar/oscar.c:2391
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -9776,7 +10316,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4782 src/protocols/oscar/oscar.c:4632
+#: ../libgaim/protocols/oscar/oscar.c:2399
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -9786,37 +10326,37 @@
 msgstr ""
 "Ha recibido un mensaje de correo electrĂłnico de ICQ de %s [%s]\n"
 "\n"
-"Mensaje:\n"
+"El mensaje es:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4803 src/protocols/oscar/oscar.c:4653
+#: ../libgaim/protocols/oscar/oscar.c:2420
 #, 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:4809 src/protocols/oscar/oscar.c:4659
+#: ../libgaim/protocols/oscar/oscar.c:2426
 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:4813
+#: ../libgaim/protocols/oscar/oscar.c:2430
 msgid "_Decline"
 msgstr "_Rehusar"
 
-#: ../src/protocols/oscar/oscar.c:4897 src/protocols/oscar/oscar.c:4747
+#: ../libgaim/protocols/oscar/oscar.c:2514
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "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:4906 src/protocols/oscar/oscar.c:4756
+#: ../libgaim/protocols/oscar/oscar.c:2523
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "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:4915 src/protocols/oscar/oscar.c:4765
+#: ../libgaim/protocols/oscar/oscar.c:2532
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -9826,92 +10366,89 @@
 msgstr[1] ""
 "Se perdieron %hu mensajes de %s porque fueron mandados demasiado rápido."
 
-#: ../src/protocols/oscar/oscar.c:4924 src/protocols/oscar/oscar.c:4774
+#: ../libgaim/protocols/oscar/oscar.c:2541
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "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:4933 src/protocols/oscar/oscar.c:4783
+#: ../libgaim/protocols/oscar/oscar.c:2550
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "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:4942 src/protocols/oscar/oscar.c:4792
+#: ../libgaim/protocols/oscar/oscar.c:2559
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "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:5001 src/protocols/oscar/oscar.c:4851
+#: ../libgaim/protocols/oscar/oscar.c:2615
 #, 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:5062 src/protocols/oscar/oscar.c:4912
+#: ../libgaim/protocols/oscar/oscar.c:2676
 #, 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:5099 src/protocols/oscar/oscar.c:4949
+#: ../libgaim/protocols/oscar/oscar.c:2712
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "No se pudo enviar el mensaje: %s"
 
-#: ../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
+#: ../libgaim/protocols/oscar/oscar.c:2712
+#: ../libgaim/protocols/oscar/oscar.c:2717
+#: ../libgaim/protocols/oscar/oscar.c:2779
+#: ../libgaim/protocols/oscar/oscar.c:2783
 msgid "Unknown reason."
 msgstr "RazĂłn desconocida."
 
-#: ../src/protocols/oscar/oscar.c:5102
-#: ../src/protocols/sametime/sametime.c:2373 src/protocols/oscar/oscar.c:4952
-#: src/protocols/sametime/sametime.c:2303
+#: ../libgaim/protocols/oscar/oscar.c:2715
+#: ../libgaim/protocols/sametime/sametime.c:2363
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "No se pudo enviar el mensaje a %s:"
 
-#: ../src/protocols/oscar/oscar.c:5162 src/protocols/oscar/oscar.c:5012
+#: ../libgaim/protocols/oscar/oscar.c:2779
 #, c-format
 msgid "User information not available: %s"
 msgstr "InformaciĂłn de usuario de no disponible: %s"
 
-#: ../src/protocols/oscar/oscar.c:5165 src/protocols/oscar/oscar.c:5015
+#: ../libgaim/protocols/oscar/oscar.c:2782
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "InformaciĂłn de usuario de %s no disponible:"
 
-#: ../src/protocols/oscar/oscar.c:5192 src/protocols/oscar/oscar.c:5042
+#: ../libgaim/protocols/oscar/oscar.c:2808
 msgid "Online Since"
 msgstr "Conectado desde"
 
-#: ../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
+#: ../libgaim/protocols/oscar/oscar.c:2813
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1173
 msgid "Member Since"
 msgstr "Miembro desde"
 
-#: ../src/protocols/oscar/oscar.c:5202 src/protocols/oscar/oscar.c:5052
+#: ../libgaim/protocols/oscar/oscar.c:2818
 msgid "Capabilities"
 msgstr "Capacidades"
 
-#. Available status messages are plain text
-#: src/protocols/oscar/oscar.c:7598
+#: ../libgaim/protocols/oscar/oscar.c:2836
 msgid "Available Message"
 msgstr "Mensajes disponibles"
 
-#: ../src/protocols/oscar/oscar.c:5337 src/protocols/oscar/oscar.c:5180
+#: ../libgaim/protocols/oscar/oscar.c:2936
 msgid "Your AIM connection may be lost."
 msgstr "Su conexiĂłn AIM puede haberse perdido."
 
 #. The conversion failed!
-#: ../src/protocols/oscar/oscar.c:5523 src/protocols/oscar/oscar.c:5366
+#: ../libgaim/protocols/oscar/oscar.c:3117
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -9919,11 +10456,11 @@
 "[No se pudo mostrar un mensaje de este usuario porque contenĂ­a caracteres "
 "inválidos.]"
 
-#: ../src/protocols/oscar/oscar.c:5744 src/protocols/oscar/oscar.c:5592
+#: ../libgaim/protocols/oscar/oscar.c:3338
 msgid "Rate limiting error."
 msgstr "Error del limitador de tasa de mensajes."
 
-#: ../src/protocols/oscar/oscar.c:5745 src/protocols/oscar/oscar.c:5593
+#: ../libgaim/protocols/oscar/oscar.c:3339
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -9932,97 +10469,84 @@
 "lĂ­mite en la tasa de envĂ­o de mensajes. Por favor, espere 10 segundos y "
 "vuelva a intentarlo."
 
-#: ../src/protocols/oscar/oscar.c:5818 src/protocols/oscar/oscar.c:5669
+#: ../libgaim/protocols/oscar/oscar.c:3411
 msgid "You have been signed off for an unknown reason."
 msgstr "Ha sido desconectado por motivos desconocidos."
 
-#: ../src/protocols/oscar/oscar.c:5831 ../src/protocols/toc/toc.c:971
-#: src/protocols/oscar/oscar.c:5682 src/protocols/toc/toc.c:971
+#: ../libgaim/protocols/oscar/oscar.c:3424 ../libgaim/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Ha sido desconectado de la sala de chat %s."
 
-#. XXX - Don't call this with ssi
-#: ../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:6125 ../src/protocols/silc/util.c:542
-#: src/protocols/oscar/oscar.c:6019 src/protocols/silc/util.c:542
+#: ../libgaim/protocols/oscar/oscar.c:3645
+#: ../libgaim/protocols/silc/util.c:583
 msgid "Mobile Phone"
 msgstr "Teléfono móvil"
 
-#: ../src/protocols/oscar/oscar.c:6142 src/protocols/oscar/oscar.c:6037
+#: ../libgaim/protocols/oscar/oscar.c:3672
 msgid "Personal Web Page"
 msgstr "Página web personal"
 
-#: ../src/protocols/oscar/oscar.c:6146 src/protocols/oscar/oscar.c:6041
+#: ../libgaim/protocols/oscar/oscar.c:3676
+#: ../libgaim/protocols/qq/buddy_info.c:38
 msgid "Additional Information"
 msgstr "InformaciĂłn adicional"
 
-#: ../src/protocols/oscar/oscar.c:6151 src/protocols/oscar/oscar.c:6046
-msgid "Home Address"
-msgstr "Domicilio"
-
-#: ../src/protocols/oscar/oscar.c:6155 ../src/protocols/oscar/oscar.c:6163
-#: src/protocols/oscar/oscar.c:6050 src/protocols/oscar/oscar.c:6058
+#: ../libgaim/protocols/oscar/oscar.c:3685
+#: ../libgaim/protocols/oscar/oscar.c:3693
 msgid "Zip Code"
 msgstr "CĂłdigo postal"
 
-#: ../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:6167 src/protocols/oscar/oscar.c:6062
+#: ../libgaim/protocols/oscar/oscar.c:3697
 msgid "Work Information"
 msgstr "InformaciĂłn de trabajo"
 
-#: ../src/protocols/oscar/oscar.c:6168 src/protocols/oscar/oscar.c:6063
-msgid "Company"
-msgstr "Compañía"
-
-#: ../src/protocols/oscar/oscar.c:6169 src/protocols/oscar/oscar.c:6064
+#: ../libgaim/protocols/oscar/oscar.c:3699
 msgid "Division"
 msgstr "SecciĂłn"
 
-#: ../src/protocols/oscar/oscar.c:6170 src/protocols/oscar/oscar.c:6065
+#: ../libgaim/protocols/oscar/oscar.c:3700
 msgid "Position"
 msgstr "Cargo"
 
-#: ../src/protocols/oscar/oscar.c:6172 src/protocols/oscar/oscar.c:6067
+#: ../libgaim/protocols/oscar/oscar.c:3702
 msgid "Web Page"
 msgstr "Página web"
 
-#: ../src/protocols/oscar/oscar.c:6230 src/protocols/oscar/oscar.c:6124
+#: ../libgaim/protocols/oscar/oscar.c:3760
 msgid "Pop-Up Message"
 msgstr "Mensaje emergente"
 
-#: src/protocols/oscar/oscar.c:6164
+#: ../libgaim/protocols/oscar/oscar.c:3800
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "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
+#: ../libgaim/protocols/oscar/oscar.c:3805
+msgid "Screen name"
+msgstr "Nombre de usuario"
+
+#: ../libgaim/protocols/oscar/oscar.c:3831
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "No se encontraron resultados para la direcciĂłn de correo %s"
 
-#: ../src/protocols/oscar/oscar.c:6322 src/protocols/oscar/oscar.c:6216
+#: ../libgaim/protocols/oscar/oscar.c:3852
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "DeberĂ­a recibir un mensaje solicitando confirmaciĂłn de %s."
 
-#: ../src/protocols/oscar/oscar.c:6324 src/protocols/oscar/oscar.c:6218
+#: ../libgaim/protocols/oscar/oscar.c:3854
 msgid "Account Confirmation Requested"
 msgstr "ConfirmaciĂłn de cuenta solicitada"
 
-#: ../src/protocols/oscar/oscar.c:6355 src/protocols/oscar/oscar.c:6249
+#: ../libgaim/protocols/oscar/oscar.c:3885
 msgid "Error Changing Account Info"
 msgstr "Error cambiando la informaciĂłn de la cuenta"
 
-#: ../src/protocols/oscar/oscar.c:6358 src/protocols/oscar/oscar.c:6252
+#: ../libgaim/protocols/oscar/oscar.c:3888
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -10031,14 +10555,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:6361
+#: ../libgaim/protocols/oscar/oscar.c:3891
 #, 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:6364 src/protocols/oscar/oscar.c:6258
+#: ../libgaim/protocols/oscar/oscar.c:3894
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -10047,7 +10571,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:6367 src/protocols/oscar/oscar.c:6261
+#: ../libgaim/protocols/oscar/oscar.c:3897
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -10056,7 +10580,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:6370 src/protocols/oscar/oscar.c:6264
+#: ../libgaim/protocols/oscar/oscar.c:3900
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -10065,7 +10589,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:6373 src/protocols/oscar/oscar.c:6267
+#: ../libgaim/protocols/oscar/oscar.c:3903
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -10074,12 +10598,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:6376 src/protocols/oscar/oscar.c:6270
+#: ../libgaim/protocols/oscar/oscar.c:3906
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: Error desconocido."
 
-#: ../src/protocols/oscar/oscar.c:6386 src/protocols/oscar/oscar.c:6280
+#: ../libgaim/protocols/oscar/oscar.c:3916
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -10088,28 +10612,28 @@
 "El formato de su nombre de usuario es actualmente el siguiente:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:6387 ../src/protocols/oscar/oscar.c:6394
-#: src/protocols/oscar/oscar.c:6281 src/protocols/oscar/oscar.c:6288
+#: ../libgaim/protocols/oscar/oscar.c:3917
+#: ../libgaim/protocols/oscar/oscar.c:3924
 msgid "Account Info"
 msgstr "InformaciĂłn de la cuenta"
 
-#: ../src/protocols/oscar/oscar.c:6392 src/protocols/oscar/oscar.c:6286
+#: ../libgaim/protocols/oscar/oscar.c:3922
 #, c-format
 msgid "The e-mail address for %s is %s"
-msgstr "La direcciĂłn de correo electrĂłnico de %s es %s"
-
-#: ../src/protocols/oscar/oscar.c:6464 src/protocols/oscar/oscar.c:6353
+msgstr "La direcciĂłn de correo electrĂłnico para %s es %s"
+
+#: ../libgaim/protocols/oscar/oscar.c:4097
 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:6704 src/protocols/oscar/oscar.c:6572
+#: ../libgaim/protocols/oscar/oscar.c:4349
 msgid "Unable to set AIM profile."
 msgstr "No se pudo establecer el perfil AIM."
 
-#: ../src/protocols/oscar/oscar.c:6705 src/protocols/oscar/oscar.c:6573
+#: ../libgaim/protocols/oscar/oscar.c:4350
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -10119,7 +10643,7 @@
 "conexión se haya completado.  Su perfil quedará sin cambiar, inténtelo "
 "nuevamente cuando ya esté conectado completamente."
 
-#: ../src/protocols/oscar/oscar.c:6719 src/protocols/oscar/oscar.c:6587
+#: ../libgaim/protocols/oscar/oscar.c:4364
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -10134,11 +10658,11 @@
 "Se ha excedido el tamaño máximo de perfil de %d bytes.  Gaim lo aplicó "
 "truncado."
 
-#: ../src/protocols/oscar/oscar.c:6724 src/protocols/oscar/oscar.c:6592
+#: ../libgaim/protocols/oscar/oscar.c:4369
 msgid "Profile too long."
 msgstr "Perfil demasiado largo."
 
-#: ../src/protocols/oscar/oscar.c:6766 src/protocols/oscar/oscar.c:6628
+#: ../libgaim/protocols/oscar/oscar.c:4413
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -10153,11 +10677,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:6771 src/protocols/oscar/oscar.c:6633
+#: ../libgaim/protocols/oscar/oscar.c:4418
 msgid "Away message too long."
 msgstr "Mensaje de ausencia demasiado largo"
 
-#: ../src/protocols/oscar/oscar.c:6840 src/protocols/oscar/oscar.c:6724
+#: ../libgaim/protocols/oscar/oscar.c:4487
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -10168,18 +10692,17 @@
 "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: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
+#: ../libgaim/protocols/oscar/oscar.c:4489
+#: ../libgaim/protocols/oscar/oscar.c:4902
+#: ../libgaim/protocols/oscar/oscar.c:4916
 msgid "Unable To Add"
 msgstr "No se pudo añadir"
 
-#: ../src/protocols/oscar/oscar.c:6949 src/protocols/oscar/oscar.c:6831
+#: ../libgaim/protocols/oscar/oscar.c:4593
 msgid "Unable To Retrieve Buddy List"
 msgstr "No se ha podido obtener la lista de amigos"
 
-#: ../src/protocols/oscar/oscar.c:6950 src/protocols/oscar/oscar.c:6832
+#: ../libgaim/protocols/oscar/oscar.c:4594
 msgid ""
 "Gaim was temporarily unable to retrieve your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
@@ -10189,16 +10712,16 @@
 "de AIM. La lista no se ha borrado, y seguramente volverá a estar disponible "
 "en unas horas."
 
-#: ../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
+#: ../libgaim/protocols/oscar/oscar.c:4797
+#: ../libgaim/protocols/oscar/oscar.c:4798
+#: ../libgaim/protocols/oscar/oscar.c:4803
+#: ../libgaim/protocols/oscar/oscar.c:4970
+#: ../libgaim/protocols/oscar/oscar.c:4971
+#: ../libgaim/protocols/oscar/oscar.c:4976
 msgid "Orphans"
 msgstr "Huérfanos"
 
-#: ../src/protocols/oscar/oscar.c:7247 src/protocols/oscar/oscar.c:7122
+#: ../libgaim/protocols/oscar/oscar.c:4900
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -10207,12 +10730,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:7247 ../src/protocols/oscar/oscar.c:7261
-#: src/protocols/oscar/oscar.c:7122 src/protocols/oscar/oscar.c:7136
+#: ../libgaim/protocols/oscar/oscar.c:4900
+#: ../libgaim/protocols/oscar/oscar.c:4914
 msgid "(no name)"
 msgstr "(sin nombre)"
 
-#: ../src/protocols/oscar/oscar.c:7261 src/protocols/oscar/oscar.c:7136
+#: ../libgaim/protocols/oscar/oscar.c:4914
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -10223,7 +10746,7 @@
 "habitual es que ha llegado al máximo número de amigos permitidos en su lista "
 "de amigos."
 
-#: ../src/protocols/oscar/oscar.c:7344 src/protocols/oscar/oscar.c:7219
+#: ../libgaim/protocols/oscar/oscar.c:5007
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -10232,11 +10755,11 @@
 "El usuario %s le ha dado a usted permiso para añadirle a su lista de "
 "amigos.  ÂżDesea hacerlo?"
 
-#: ../src/protocols/oscar/oscar.c:7350 src/protocols/oscar/oscar.c:7225
+#: ../libgaim/protocols/oscar/oscar.c:5013
 msgid "Authorization Given"
 msgstr "AutorizaciĂłn otorgada"
 
-#: ../src/protocols/oscar/oscar.c:7394 src/protocols/oscar/oscar.c:7269
+#: ../libgaim/protocols/oscar/oscar.c:5057
 #, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
@@ -10247,18 +10770,18 @@
 "%s"
 
 #. Granted
-#: ../src/protocols/oscar/oscar.c:7439 src/protocols/oscar/oscar.c:7314
+#: ../libgaim/protocols/oscar/oscar.c:5102
 #, 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:7440 src/protocols/oscar/oscar.c:7315
+#: ../libgaim/protocols/oscar/oscar.c:5103
 msgid "Authorization Granted"
 msgstr "AutorizaciĂłn aceptada"
 
 #. Denied
-#: ../src/protocols/oscar/oscar.c:7443 src/protocols/oscar/oscar.c:7318
+#: ../libgaim/protocols/oscar/oscar.c:5106
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -10269,92 +10792,112 @@
 "la siguiente razĂłn:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:7444 src/protocols/oscar/oscar.c:7319
+#: ../libgaim/protocols/oscar/oscar.c:5107
 msgid "Authorization Denied"
 msgstr "AutorizaciĂłn denegada"
 
-#: ../src/protocols/oscar/oscar.c:7481 ../src/protocols/toc/toc.c:1372
-#: src/protocols/oscar/oscar.c:7356 src/protocols/toc/toc.c:1372
+#: ../libgaim/protocols/oscar/oscar.c:5143 ../libgaim/protocols/toc/toc.c:1378
 msgid "_Exchange:"
 msgstr "_Intercambio:"
 
-#: ../src/protocols/oscar/oscar.c:7517 src/protocols/oscar/oscar.c:7392
+#: ../libgaim/protocols/oscar/oscar.c:5183
 msgid "Invalid chat name specified."
 msgstr "Se especificó un nombre de chat no válido."
 
-#: ../src/protocols/oscar/oscar.c:7587 src/protocols/oscar/oscar.c:7462
+#: ../libgaim/protocols/oscar/oscar.c:5253
 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:7742
+#: ../libgaim/protocols/oscar/oscar.c:5415
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(obteniendo)</i>"
 
-#: ../src/protocols/oscar/oscar.c:8048 src/protocols/oscar/oscar.c:7924
+#: ../libgaim/protocols/oscar/oscar.c:5728
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Comentario de amigo para %s"
 
-#: ../src/protocols/oscar/oscar.c:8049 src/protocols/oscar/oscar.c:7925
+#: ../libgaim/protocols/oscar/oscar.c:5729
 msgid "Buddy Comment:"
 msgstr "Comentario de amigo:"
 
-#: ../src/protocols/oscar/oscar.c:8068 src/protocols/oscar/oscar.c:7944
+#: ../libgaim/protocols/oscar/oscar.c:5775
+#, 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."
+
+#: ../libgaim/protocols/oscar/oscar.c:5779
+msgid ""
+"Because this reveals your IP address, it may be considered a security risk.  "
+"Do you wish to continue?"
+msgstr "Puede considerarse como un riesgo a su privacidad  ya que hacer Ă©sto revela su direcciĂłn IP. ÂżQuiere continuar?"
+
+#: ../libgaim/protocols/oscar/oscar.c:5783
+#: ../libgaim/protocols/oscar/peer.c:990
+msgid "_Connect"
+msgstr "_Conectar"
+
+# TBD - comprobar si esto afecta al botĂłn en pantalla
+#: ../libgaim/protocols/oscar/oscar.c:5817
+msgid "Get AIM Info"
+msgstr "Info"
+
+#: ../libgaim/protocols/oscar/oscar.c:5823
 msgid "Edit Buddy Comment"
 msgstr "Editar comentario de amigo"
 
-#: ../src/protocols/oscar/oscar.c:8075 src/protocols/oscar/oscar.c:7950
+#: ../libgaim/protocols/oscar/oscar.c:5831
 msgid "Get Status Msg"
 msgstr "Obtener msj de estado"
 
-#: ../src/protocols/oscar/oscar.c:8088 src/protocols/oscar/oscar.c:7962
+#: ../libgaim/protocols/oscar/oscar.c:5844
 msgid "Direct IM"
 msgstr "MI directo"
 
-#: ../src/protocols/oscar/oscar.c:8107 src/protocols/oscar/oscar.c:7979
+#: ../libgaim/protocols/oscar/oscar.c:5866
 msgid "Re-request Authorization"
 msgstr "Solicitar autorizaciĂłn otra vez"
 
-#: ../src/protocols/oscar/oscar.c:8164 src/protocols/oscar/oscar.c:8039
+#: ../libgaim/protocols/oscar/oscar.c:5925
 msgid "Require authorization"
 msgstr "Solicitar autorizaciĂłn"
 
-#: ../src/protocols/oscar/oscar.c:8167
+#: ../libgaim/protocols/oscar/oscar.c:5928
 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
+#: ../libgaim/protocols/oscar/oscar.c:5933
 msgid "ICQ Privacy Options"
 msgstr "Opciones de privacidad de ICQ"
 
-#: ../src/protocols/oscar/oscar.c:8189 src/protocols/oscar/oscar.c:8067
+#: ../libgaim/protocols/oscar/oscar.c:5950
 msgid "The new formatting is invalid."
 msgstr "El nuevo formato es inválido."
 
-#: ../src/protocols/oscar/oscar.c:8190 src/protocols/oscar/oscar.c:8068
+#: ../libgaim/protocols/oscar/oscar.c:5951
 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:8197 src/protocols/oscar/oscar.c:8075
+#: ../libgaim/protocols/oscar/oscar.c:5958
 msgid "New screen name formatting:"
 msgstr "Nuevo formato del nombre de usuario:"
 
-#: ../src/protocols/oscar/oscar.c:8249 src/protocols/oscar/oscar.c:8127
+#: ../libgaim/protocols/oscar/oscar.c:6014
 msgid "Change Address To:"
 msgstr "Cambiar direcciĂłn a:"
 
-#: ../src/protocols/oscar/oscar.c:8294 src/protocols/oscar/oscar.c:8172
+#: ../libgaim/protocols/oscar/oscar.c:6059
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>usted no está esperando autorización</i>"
 
-#: ../src/protocols/oscar/oscar.c:8297 src/protocols/oscar/oscar.c:8175
+#: ../libgaim/protocols/oscar/oscar.c:6062
 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:8298 src/protocols/oscar/oscar.c:8176
+#: ../libgaim/protocols/oscar/oscar.c:6063
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -10362,76 +10905,701 @@
 "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:8315 src/protocols/oscar/oscar.c:8193
+#: ../libgaim/protocols/oscar/oscar.c:6080
 msgid "Find Buddy by E-Mail"
 msgstr "Buscar un amigo en base a su correo electrĂłnico"
 
-#: ../src/protocols/oscar/oscar.c:8316 src/protocols/oscar/oscar.c:8194
+#: ../libgaim/protocols/oscar/oscar.c:6081
 msgid "Search for a buddy by e-mail address"
 msgstr "Buscar amigo por la direcciĂłn correo electrĂłnico"
 
-#: ../src/protocols/oscar/oscar.c:8317 src/protocols/oscar/oscar.c:8195
+#: ../libgaim/protocols/oscar/oscar.c:6082
 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:8410 src/protocols/oscar/oscar.c:8288
+#: ../libgaim/protocols/oscar/oscar.c:6251
 msgid "Set User Info (URL)..."
 msgstr "Establecer su informaciĂłn de usuario (URL)..."
 
-#: ../src/protocols/oscar/oscar.c:8421 src/protocols/oscar/oscar.c:8299
+#: ../libgaim/protocols/oscar/oscar.c:6262
 msgid "Change Password (URL)"
 msgstr "Cambiar su contraseña (URL)"
 
-#: ../src/protocols/oscar/oscar.c:8425 src/protocols/oscar/oscar.c:8303
+#: ../libgaim/protocols/oscar/oscar.c:6266
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configurar reenvĂ­o de MI (URL)"
 
 #. ICQ actions
-#: ../src/protocols/oscar/oscar.c:8435
+#: ../libgaim/protocols/oscar/oscar.c:6276
 msgid "Set Privacy Options..."
 msgstr "Configurar las opciones de privacidad..."
 
 #. AIM actions
-#: ../src/protocols/oscar/oscar.c:8442 src/protocols/oscar/oscar.c:8320
+#: ../libgaim/protocols/oscar/oscar.c:6283
 msgid "Format Screen Name..."
 msgstr "Formato del nombre de usuario..."
 
-#: ../src/protocols/oscar/oscar.c:8446 src/protocols/oscar/oscar.c:8324
+#: ../libgaim/protocols/oscar/oscar.c:6287
 msgid "Confirm Account"
 msgstr "Confirmar cuenta"
 
-#: ../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:8454 src/protocols/oscar/oscar.c:8332
-msgid "Change Currently Registered Address..."
-msgstr "Cambiar la direcciĂłn registrada..."
-
-#: ../src/protocols/oscar/oscar.c:8461 src/protocols/oscar/oscar.c:8339
+#: ../libgaim/protocols/oscar/oscar.c:6291
+msgid "Display Currently Registered E-Mail Address"
+msgstr "Mostrar direcciones de correo registradas actualmente"
+
+#: ../libgaim/protocols/oscar/oscar.c:6295
+msgid "Change Currently Registered E-Mail Address..."
+msgstr "Cambiar la direcciĂłn de correo registrada actualmente..."
+
+#: ../libgaim/protocols/oscar/oscar.c:6302
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Mostrar amigos pendientes de autorizaciĂłn"
 
-#: ../src/protocols/oscar/oscar.c:8467 src/protocols/oscar/oscar.c:8345
-msgid "Search for Buddy by E-Mail..."
-msgstr "Buscar amigo por correo electrĂłnico..."
-
-#: ../src/protocols/oscar/oscar.c:8472 src/protocols/oscar/oscar.c:8350
+#: ../libgaim/protocols/oscar/oscar.c:6308
+msgid "Search for Buddy by E-Mail Address..."
+msgstr "Buscar un amigo por correo electrĂłnico..."
+
+#: ../libgaim/protocols/oscar/oscar.c:6313
 msgid "Search for Buddy by Information"
 msgstr "Buscar un amigo a través de su información"
 
-#: ../src/protocols/oscar/oscar.c:8539 src/protocols/oscar/oscar.c:8416
+#: ../libgaim/protocols/oscar/oscar.c:6381
 msgid "Use recent buddies group"
 msgstr "Usar grupo de amigos reciente"
 
-#: ../src/protocols/oscar/oscar.c:8542 src/protocols/oscar/oscar.c:8419
+#: ../libgaim/protocols/oscar/oscar.c:6384
 msgid "Show how long you have been idle"
-msgstr "Mostrar cuánto tiempo se ha estado ausente"
-
-#: ../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)"
+msgstr "Mostrar cuánto tiempo se ha estado inactivo"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/protocols/oscar/oscar.c:6510
+#: ../libgaim/protocols/oscar/oscar.c:6512
+msgid "AIM/ICQ Protocol Plugin"
+msgstr "Complemento de protocolo AIM/ICQ"
+
+#: ../libgaim/protocols/oscar/oscar.c:6537
+#: ../libgaim/protocols/yahoo/yahoo.c:3950
+#: ../libgaim/protocols/zephyr/zephyr.c:2980
+msgid "Encoding"
+msgstr "CodificaciĂłn"
+
+#: ../libgaim/protocols/oscar/oscar.c:6541
+msgid ""
+"Always use AIM/ICQ proxy server for file transfers\n"
+"(slower, but does not reveal your IP address)"
+msgstr "Utilizar un servidor proxy de AIM/ICQ para transferencias de ficheros (lento, pero no descubre su direcciĂłn IP)"
+
+#: ../libgaim/protocols/oscar/peer.c:623
+#, 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."
+
+#: ../libgaim/protocols/oscar/peer.c:703 ../libgaim/protocols/oscar/peer.c:738
+#, c-format
+msgid "Attempting to connect to %s:%hu."
+msgstr "Intentando conectarse a %s:%hu."
+
+#: ../libgaim/protocols/oscar/peer.c:803
+msgid "Attempting to connect via proxy server."
+msgstr "Intentando la conexión a través de un servidor proxy."
+
+#: ../libgaim/protocols/oscar/peer.c:980
+#, c-format
+msgid "%s has just asked to directly connect to %s"
+msgstr "%s pide conectarse directamente a %s"
+
+#: ../libgaim/protocols/oscar/peer.c:984
+msgid ""
+"This requires a direct connection between the two computers and is necessary "
+"for IM Images.  Because your IP address will be revealed, this may be "
+"considered a privacy risk."
+msgstr ""
+"Esto requiere una conexiĂłn directa entre las dos computadoras y es necesario "
+"para Imágenes de MI.  Como su dirección IP será revelada, puede considerarse "
+"esto como un riesgo a su privacidad."
+
+#: ../libgaim/protocols/qq/buddy_info.c:37
+msgid "Primary Information"
+msgstr "InformaciĂłn principal"
+
+#: ../libgaim/protocols/qq/buddy_info.c:39
+msgid "Personal Introduction"
+msgstr "IntroducciĂłn personal"
+
+#: ../libgaim/protocols/qq/buddy_info.c:40
+msgid "QQ Number"
+msgstr "NĂşmero QQ"
+
+#: ../libgaim/protocols/qq/buddy_info.c:45
+msgid "Country/Region"
+msgstr "PaĂ­s/RegiĂłn"
+
+#: ../libgaim/protocols/qq/buddy_info.c:46
+msgid "Province/State"
+msgstr "Provincia/Estado"
+
+#: ../libgaim/protocols/qq/buddy_info.c:48
+msgid "Horoscope Symbol"
+msgstr "SĂ­mbolo del horĂłscopo"
+
+#: ../libgaim/protocols/qq/buddy_info.c:50
+msgid "Zodiac Sign"
+msgstr "Signo zodiacal"
+
+#: ../libgaim/protocols/qq/buddy_info.c:51
+msgid "Blood Type"
+msgstr "Grupo sanguĂ­neo"
+
+#: ../libgaim/protocols/qq/buddy_info.c:52
+msgid "College"
+msgstr "Universidad"
+
+#: ../libgaim/protocols/qq/buddy_info.c:53
+msgid "Email"
+msgstr "Correo electrĂłnico"
+
+#: ../libgaim/protocols/qq/buddy_info.c:55
+msgid "Zipcode"
+msgstr "CĂłdigo postal"
+
+#: ../libgaim/protocols/qq/buddy_info.c:56
+msgid "Cellphone Number"
+msgstr "NĂşmero de mĂłvil"
+
+#: ../libgaim/protocols/qq/buddy_info.c:57
+msgid "Phone Number"
+msgstr "Número de teléfono"
+
+#: ../libgaim/protocols/qq/buddy_info.c:62
+msgid "Aquarius"
+msgstr "Acuario"
+
+#: ../libgaim/protocols/qq/buddy_info.c:62
+msgid "Pisces"
+msgstr "Piscis"
+
+#: ../libgaim/protocols/qq/buddy_info.c:62
+msgid "Aries"
+msgstr "Aries"
+
+#: ../libgaim/protocols/qq/buddy_info.c:62
+msgid "Taurus"
+msgstr "Tauro"
+
+#: ../libgaim/protocols/qq/buddy_info.c:63
+msgid "Gemini"
+msgstr "GĂ©minis"
+
+#: ../libgaim/protocols/qq/buddy_info.c:63
+msgid "Cancer"
+msgstr "Cáncer"
+
+#: ../libgaim/protocols/qq/buddy_info.c:63
+msgid "Leo"
+msgstr "Leo"
+
+#: ../libgaim/protocols/qq/buddy_info.c:63
+msgid "Virgo"
+msgstr "Virgo"
+
+#: ../libgaim/protocols/qq/buddy_info.c:63
+msgid "Libra"
+msgstr "Libra"
+
+#: ../libgaim/protocols/qq/buddy_info.c:64
+msgid "Scorpio"
+msgstr "Escorpio"
+
+#: ../libgaim/protocols/qq/buddy_info.c:64
+msgid "Sagittarius"
+msgstr "Sagitario"
+
+#: ../libgaim/protocols/qq/buddy_info.c:64
+msgid "Capricorn"
+msgstr "Capricornio"
+
+#: ../libgaim/protocols/qq/buddy_info.c:69
+msgid "Rat"
+msgstr "Rata"
+
+#: ../libgaim/protocols/qq/buddy_info.c:69
+msgid "Ox"
+msgstr "Buey"
+
+#: ../libgaim/protocols/qq/buddy_info.c:69
+msgid "Tiger"
+msgstr "Tigre"
+
+#: ../libgaim/protocols/qq/buddy_info.c:69
+msgid "Rabbit"
+msgstr "Conejo"
+
+#: ../libgaim/protocols/qq/buddy_info.c:70
+msgid "Dragon"
+msgstr "DragĂłn"
+
+#: ../libgaim/protocols/qq/buddy_info.c:70
+msgid "Snake"
+msgstr "Serpiente"
+
+#: ../libgaim/protocols/qq/buddy_info.c:70
+msgid "Horse"
+msgstr "Caballo"
+
+#: ../libgaim/protocols/qq/buddy_info.c:70
+msgid "Goat"
+msgstr "Cabra"
+
+#: ../libgaim/protocols/qq/buddy_info.c:70
+msgid "Monkey"
+msgstr "Mono"
+
+#: ../libgaim/protocols/qq/buddy_info.c:71
+msgid "Rooster"
+msgstr "Gallo"
+
+#: ../libgaim/protocols/qq/buddy_info.c:71
+msgid "Dog"
+msgstr "Perro"
+
+#: ../libgaim/protocols/qq/buddy_info.c:71
+msgid "Pig"
+msgstr "Cerdo"
+
+#: ../libgaim/protocols/qq/buddy_info.c:76
+msgid "Other"
+msgstr "Otro"
+
+#: ../libgaim/protocols/qq/buddy_info.c:477
+#: ../libgaim/protocols/qq/buddy_info.c:478
+msgid "Modify my information"
+msgstr "Modificar mi informaciĂłn"
+
+#: ../libgaim/protocols/qq/buddy_info.c:479
+msgid "Update my information"
+msgstr "Actualizar mi informaciĂłn"
+
+#: ../libgaim/protocols/qq/buddy_info.c:502
+msgid "Your information has been updated"
+msgstr "Se ha modificado su informaciĂłn."
+
+#: ../libgaim/protocols/qq/buddy_opt.c:205
+#: ../libgaim/protocols/qq/group_opt.c:133
+#, c-format
+msgid "You rejected %d's request"
+msgstr "Ha rechazado la solicitud de %d"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:206
+#: ../libgaim/protocols/qq/group_opt.c:134
+msgid "Input your reason:"
+msgstr "Introduzca sus motivos:"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:208
+msgid "Reject request"
+msgstr "Rechazar solicitud"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:209
+#: ../libgaim/protocols/qq/group_opt.c:137
+msgid "Sorry, you are not my type..."
+msgstr "Lo siento, no eres mi tipo..."
+
+#: ../libgaim/protocols/qq/buddy_opt.c:210
+#: ../libgaim/protocols/qq/group_im.c:134
+#: ../libgaim/protocols/qq/group_opt.c:123
+#: ../libgaim/protocols/qq/sys_msg.c:83 ../libgaim/protocols/qq/sys_msg.c:226
+msgid "Reject"
+msgstr "Rechazar"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:270
+msgid "Add buddy with auth request fails"
+msgstr "Fallo al añadir un amigo con solicitud de autenticación"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:301
+msgid "You have successfully removed a buddy"
+msgstr "Ha eliminado un amigo con Ă©xito"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:329
+msgid "You have successfully removed yourself from a buddy"
+msgstr "Se ha borrado con Ă©xito de un amigo"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:393
+#, c-format
+msgid "User %d needs authentication"
+msgstr "El usuario %d necesita autenticaciĂłn"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:395
+#: ../libgaim/protocols/qq/group_join.c:132
+msgid "Input request here"
+msgstr "Introduzca su solicitud a continuaciĂłn"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:396
+#: ../libgaim/protocols/qq/group_join.c:133
+msgid "Would you be my friend?"
+msgstr "ÂżQuieres ser mi amigo?"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:397
+#: ../libgaim/protocols/qq/group_join.c:134
+#: ../libgaim/protocols/qq/group_opt.c:138
+#: ../libgaim/protocols/qq/sendqueue.c:198
+msgid "Send"
+msgstr "Enviar"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:404
+#, c-format
+msgid "You have added %d in buddy list"
+msgstr "Ha añadido %d a su lista de amigos."
+
+#: ../libgaim/protocols/qq/buddy_opt.c:501
+msgid "QQid Error"
+msgstr "Error QQid"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:502
+msgid "Invalid QQid"
+msgstr "QQid inválido"
+
+#: ../libgaim/protocols/qq/group.c:63
+msgid "ID: "
+msgstr "ID: "
+
+#: ../libgaim/protocols/qq/group.c:96
+msgid "Group ID"
+msgstr "ID de grupo:"
+
+#: ../libgaim/protocols/qq/group.c:98
+msgid "Creator"
+msgstr "Creador"
+
+#: ../libgaim/protocols/qq/group.c:101
+msgid "Group Description"
+msgstr "DescripciĂłn del grupo"
+
+#: ../libgaim/protocols/qq/group.c:107
+msgid "Auth"
+msgstr "Autorizar"
+
+#: ../libgaim/protocols/qq/group.c:117
+msgid "QQ Qun"
+msgstr "QQ Qun"
+
+#: ../libgaim/protocols/qq/group.c:118
+msgid "Please input external group ID"
+msgstr "Indique su ID de grupo externo"
+
+#: ../libgaim/protocols/qq/group.c:119
+msgid "You can only search for permanent QQ groups\n"
+msgstr "SĂłlo puede buscar grupos QQ permanentes\n"
+
+#: ../libgaim/protocols/qq/group_im.c:120
+#, c-format
+msgid "User %d applied to join group %d"
+msgstr "El usuario %d solicitĂł entrar en el grupo %d"
+
+#: ../libgaim/protocols/qq/group_im.c:121
+#: ../libgaim/protocols/qq/group_im.c:170
+#: ../libgaim/protocols/qq/sys_msg.c:178
+#, c-format
+msgid "Reason: %s"
+msgstr "RazĂłn: %s"
+
+#: ../libgaim/protocols/qq/group_im.c:128
+#: ../libgaim/protocols/qq/group_im.c:172
+#: ../libgaim/protocols/qq/group_im.c:212
+#: ../libgaim/protocols/qq/group_im.c:247
+#: ../libgaim/protocols/qq/group_im.c:281
+#: ../libgaim/protocols/qq/group_join.c:227
+#: ../libgaim/protocols/qq/group_join.c:353
+#: ../libgaim/protocols/qq/group_opt.c:228
+#: ../libgaim/protocols/qq/group_opt.c:298
+#: ../libgaim/protocols/qq/group_opt.c:384
+msgid "QQ Qun Operation"
+msgstr "Opciones QQ Qun"
+
+#: ../libgaim/protocols/qq/group_im.c:131
+#: ../libgaim/protocols/qq/group_opt.c:125
+#: ../libgaim/protocols/qq/sys_msg.c:85 ../libgaim/protocols/qq/sys_msg.c:228
+msgid "Approve"
+msgstr "Aprobar"
+
+#: ../libgaim/protocols/qq/group_im.c:169
+#, c-format
+msgid "You request to join group %d has been rejected by admin %d"
+msgstr "Su solicitud de unirse al grupo %d ha sido rechazada por el administrador %d"
+
+#: ../libgaim/protocols/qq/group_im.c:210
+#, c-format
+msgid "You request to join group %d has been approved by admin %d"
+msgstr "Su solicitud de unirse al grupo %d ha sido aprobada por el administrador %d"
+
+#: ../libgaim/protocols/qq/group_im.c:246
+#, c-format
+msgid "You [%d] has exit group \"%d\""
+msgstr "Vd. [%d] ha salido del grupo «%d»"
+
+#: ../libgaim/protocols/qq/group_im.c:280
+#, c-format
+msgid "You [%d] has been added by group \"%d\""
+msgstr "Vd. [%d] ha sido añadido al grupo «%d»"
+
+#: ../libgaim/protocols/qq/group_im.c:281
+msgid "This group has been added to your buddy list"
+msgstr "Se ha añadido este grupo a su lista de amigos."
+
+#: ../libgaim/protocols/qq/group_internal.c:39
+msgid "I am not member"
+msgstr "No soy miembro"
+
+#: ../libgaim/protocols/qq/group_internal.c:42
+msgid "I am a member"
+msgstr "Soy miembro"
+
+#: ../libgaim/protocols/qq/group_internal.c:45
+msgid "I am applying to join"
+msgstr "He solicitado unirme"
+
+#: ../libgaim/protocols/qq/group_internal.c:48
+msgid "I am the admin"
+msgstr "Soy el administrador"
+
+#: ../libgaim/protocols/qq/group_internal.c:51
+msgid "Unknown status"
+msgstr "Estado desconocido"
+
+#: ../libgaim/protocols/qq/group_join.c:78
+msgid "This group does not allow others to join"
+msgstr "Este grupo no permite que otros se unan"
+
+#: ../libgaim/protocols/qq/group_join.c:227
+msgid "You have successfully exited the group"
+msgstr "Ha salido con Ă©xito del grupo"
+
+#: ../libgaim/protocols/qq/group_join.c:251
+msgid "QQ Group Auth"
+msgstr "AutenticaciĂłn grupo QQ"
+
+#: ../libgaim/protocols/qq/group_join.c:252
+msgid "Your authorization operation has been accepted by the QQ server"
+msgstr "El servidor QQ ha aceptado su operaciĂłn de autorizaciĂłn"
+
+#: ../libgaim/protocols/qq/group_join.c:323
+msgid "You inputted a group id outside the acceptable range"
+msgstr "Ha introducido un identificador de grupo que está fuera del rango permitido"
+
+#: ../libgaim/protocols/qq/group_join.c:354
+msgid "Are you sure to exit this Qun?"
+msgstr "ÂżSeguro que quiere dejar este Qun?"
+
+#: ../libgaim/protocols/qq/group_join.c:356
+msgid ""
+"Note, if you are the creator, \n"
+"this operation will eventually remove this Qun."
+msgstr ""
+"Tenga en cuenta que si vd. lo ha creado\n"
+"esta operación eliminará este Qun eventualmente."
+
+#: ../libgaim/protocols/qq/group_join.c:359
+msgid "Go ahead"
+msgstr "Adelante"
+
+#: ../libgaim/protocols/qq/group_network.c:88
+#, c-format
+msgid "Code [0x%02X]: %s"
+msgstr "CĂłdigo [0x%02X]: %s"
+
+#: ../libgaim/protocols/qq/group_network.c:89
+msgid "Group Operation Error"
+msgstr "Error de operaciĂłn de grupo"
+
+#: ../libgaim/protocols/qq/group_opt.c:122
+#: ../libgaim/protocols/qq/sys_msg.c:82
+msgid "Do you wanna approve the request?"
+msgstr "ÂżDesea aprovar esta solicitud?"
+
+#: ../libgaim/protocols/qq/group_opt.c:228
+msgid "You have successfully modify Qun member"
+msgstr "Ha modificado el miembro Qun con Ă©xito"
+
+#: ../libgaim/protocols/qq/group_opt.c:298
+msgid "You have successfully modify Qun information"
+msgstr "Ha modificado la informaciĂłn Qun con Ă©xito"
+
+#: ../libgaim/protocols/qq/group_opt.c:385
+msgid "You have successfully created a Qun"
+msgstr "Ha creado un Qun con Ă©xito"
+
+#: ../libgaim/protocols/qq/group_opt.c:387
+msgid "Would you like to set up the Qun details now?"
+msgstr "ÂżDesea establecer los detalles de Qun ahora?"
+
+#: ../libgaim/protocols/qq/group_opt.c:388
+msgid "Setup"
+msgstr "Configurar"
+
+#: ../libgaim/protocols/qq/im.c:421
+msgid "System Message"
+msgstr "Mensaje del sistema"
+
+#: ../libgaim/protocols/qq/im.c:565
+msgid "Server ACK"
+msgstr "ACK de servidor"
+
+#: ../libgaim/protocols/qq/im.c:565
+msgid "Send IM fail\n"
+msgstr "Fallo en el envĂ­o de IM\n"
+
+#: ../libgaim/protocols/qq/keep_alive.c:81
+msgid "Keep alive error, seems connection lost!"
+msgstr "Error de mantenimiento, ¡parece que se ha perdido la conexión!"
+
+#: ../libgaim/protocols/qq/login_logout.c:401
+msgid "Request login token error!"
+msgstr "¡Error al solicitar token para conectarse!"
+
+#: ../libgaim/protocols/qq/login_logout.c:472
+msgid "Wrong password!"
+msgstr "¡Contraseña errónea!"
+
+#: ../libgaim/protocols/qq/login_logout.c:475
+msgid "Unable to login, check debug log"
+msgstr "No pudo conectarse, compruebe el registro de depuraciĂłn"
+
+#. we didn't successfully connect. tdt->toc_fd is valid here
+#: ../libgaim/protocols/qq/qq.c:137 ../libgaim/protocols/toc/toc.c:173
+#: ../libgaim/protocols/yahoo/yahoo.c:2356
+#: ../libgaim/protocols/yahoo/yahoo.c:2383
+#: ../libgaim/protocols/yahoo/yahoo.c:2490
+#: ../libgaim/protocols/yahoo/yahoo.c:2511
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:108
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:188
+#: ../libgaim/protocols/yahoo/ycht.c:549
+msgid "Unable to connect."
+msgstr "No se pudo conectar."
+
+#: ../libgaim/protocols/qq/qq.c:283
+msgid "QQ: Available"
+msgstr "QQ: Disponible"
+
+#: ../libgaim/protocols/qq/qq.c:287
+msgid "QQ: Away"
+msgstr "QQ: Ausente"
+
+#: ../libgaim/protocols/qq/qq.c:291
+msgid "QQ: Invisible"
+msgstr "QQ: Invisible"
+
+#: ../libgaim/protocols/qq/qq.c:295
+msgid "QQ: Offline"
+msgstr "QQ: Desconectado"
+
+#: ../libgaim/protocols/qq/qq.c:372
+msgid "Invalid name"
+msgstr "Nombre inválido"
+
+#: ../libgaim/protocols/qq/qq.c:442
+msgid "Selection"
+msgstr "SelecciĂłn"
+
+#: ../libgaim/protocols/qq/qq.c:445
+msgid "Select a number"
+msgstr "Seleccione un nĂşmero"
+
+#: ../libgaim/protocols/qq/qq.c:451
+msgid "Faces"
+msgstr "Caras"
+
+#: ../libgaim/protocols/qq/qq.c:456
+msgid "Change Your QQ Face"
+msgstr "Cambiaar tu cara QQ"
+
+#: ../libgaim/protocols/qq/qq.c:457
+msgid "Change Face"
+msgstr "Cambiar cara"
+
+#: ../libgaim/protocols/qq/qq.c:458
+msgid "Update"
+msgstr "Actualizar"
+
+#: ../libgaim/protocols/qq/qq.c:512
+#, c-format
+msgid "<b>Current Online</b>: %d<br>\n"
+msgstr "<b>Conectados actualmente</b>: %d<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:513
+#, c-format
+msgid "<b>Last Refresh</b>: %s<br>\n"
+msgstr "<b>Ăšltima actualizaciĂłn</b>: %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:517
+#, c-format
+msgid "<b>Connection Mode</b>: %s<br>\n"
+msgstr "<b>Modo de conexiĂłn</b>: %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:518
+#, c-format
+msgid "<b>Server IP</b>: %s: %d<br>\n"
+msgstr "<b>IP del servidor</b>: %s: %d<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:519
+#, c-format
+msgid "<b>My Public IP</b>: %s<br>\n"
+msgstr "<B>Mi IP pĂşblica</b>: %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:524
+#, c-format
+msgid "<b>Login Time</b>: %s<br>\n"
+msgstr "<b>Hora de conexiĂłn</b>: %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:525
+#, c-format
+msgid "<b>Last Login IP</b>: %s<br>\n"
+msgstr "<b>Ăšltima IP de conexiĂłn</b>: %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:526
+#, c-format
+msgid "<b>Last Login Time</b>: %s\n"
+msgstr "<b>Ăšltimo hora de conexiĂłn</b>: %s\n"
+
+#: ../libgaim/protocols/qq/qq.c:530
+msgid "Login Information"
+msgstr "InformaciĂłn de conexiĂłn"
+
+#: ../libgaim/protocols/qq/qq.c:802
+msgid "Modify My Information"
+msgstr "Modificar mi informaciĂłn"
+
+#: ../libgaim/protocols/qq/qq.c:805
+msgid "Change My Face"
+msgstr "Cambiar mi cara"
+
+#: ../libgaim/protocols/qq/qq.c:808 ../libgaim/protocols/toc/toc.c:1700
+msgid "Change Password"
+msgstr "Cambiar contraseña"
+
+#: ../libgaim/protocols/qq/qq.c:811
+msgid "Show Login Information"
+msgstr "Mostrar la informaciĂłn de conexiĂłn"
+
+#: ../libgaim/protocols/qq/qq.c:837
+msgid "Exit this QQ Qun"
+msgstr "Salir de este Qun QQ"
+
+#: ../libgaim/protocols/qq/qq.c:922
+msgid "This function has not be implemented yet"
+msgstr "AĂşn no se ha implementado esta funciĂłn"
+
+#: ../libgaim/protocols/qq/qq.c:922
+msgid "Please wait for new version"
+msgstr "Por favor, espere a una nueva versiĂłn"
 
 #. *< type
 #. *< ui_requirement
@@ -10443,169 +11611,267 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../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:8705 src/protocols/oscar/oscar.c:8566
-msgid "Auth host"
-msgstr "Servidor de autenticaciĂłn"
-
-#: ../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: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/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
+#: ../libgaim/protocols/qq/qq.c:1004 ../libgaim/protocols/qq/qq.c:1006
+msgid "QQ Protocol\tPlugin"
+msgstr "Complemento de protocolo QQ"
+
+#: ../libgaim/protocols/qq/qq.c:1025
+msgid "Login in TCP"
+msgstr "ConexiĂłn en TCP"
+
+#: ../libgaim/protocols/qq/qq.c:1028
+msgid "Login Hidden"
+msgstr "ConexiĂłn oculta"
+
+#: ../libgaim/protocols/qq/qq.c:1031
+msgid "QQ Server"
+msgstr "Servidor QQ"
+
+#: ../libgaim/protocols/qq/qq.c:1034
+msgid "QQ Port"
+msgstr "Puerto QQ"
+
+#: ../libgaim/protocols/qq/qq_proxy.c:493
+msgid "Socket send error"
+msgstr "Error de envĂ­o al socket"
+
+#: ../libgaim/protocols/qq/qq_proxy.c:496
+msgid "Connection refused"
+msgstr "ConexiĂłn rehusada"
+
+#: ../libgaim/protocols/qq/recv_core.c:298
+msgid "Socket error"
+msgstr "Error de socket"
+
+#: ../libgaim/protocols/qq/recv_core.c:308
+msgid "Unable to read from socket"
+msgstr "No se pudo leer del socket"
+
+#: ../libgaim/protocols/qq/send_file.c:708
+#, c-format
+msgid "Your request to send file[%s] has been rejected by buddy[%d]"
+msgstr "Su solicitud de envĂ­o de archivo[%s] ha sido rechazada por el amigo[%d]"
+
+#: ../libgaim/protocols/qq/send_file.c:711
+#: ../libgaim/protocols/qq/send_file.c:740
+msgid "File Send"
+msgstr "Archivo enviado"
+
+#: ../libgaim/protocols/qq/send_file.c:737
+#, c-format
+msgid "The sending process of file[%s] has been cancaled by buddy[%d]"
+msgstr "El proceso de envĂ­o de fichero[%s] ha sido cancelado por el amigo[%d]"
+
+#: ../libgaim/protocols/qq/sendqueue.c:167
+msgid "Connection lost!"
+msgstr "¡Conexión perdida!"
+
+#. cancel logging progress
+#: ../libgaim/protocols/qq/sendqueue.c:174
+msgid "Login failed, no reply!"
+msgstr "Fallo en la conexión, ¡no ha habido respuesta!"
+
+#: ../libgaim/protocols/qq/sendqueue.c:179
+msgid "Connection timeout!"
+msgstr "¡Expiró la conexión!"
+
+#: ../libgaim/protocols/qq/sendqueue.c:179
+msgid "User info is not updated"
+msgstr "La información del usuario no está actualizada"
+
+#: ../libgaim/protocols/qq/sendqueue.c:194
+msgid "Send packet"
+msgstr "Enviar paquete"
+
+#: ../libgaim/protocols/qq/sendqueue.c:196
+msgid "Packets lost, send again?"
+msgstr "Se han perdido paquetes, Âżenviar de nuevo?"
+
+#: ../libgaim/protocols/qq/sys_msg.c:101
+msgid "Do you wanna add this buddy?"
+msgstr "¿Desea añadir este amigo?"
+
+#. only need to get value
+#: ../libgaim/protocols/qq/sys_msg.c:153
+#, c-format
+msgid "You have been added by %s"
+msgstr "Ha sido añadido por %s"
+
+#: ../libgaim/protocols/qq/sys_msg.c:156
+msgid "Would like to add him?"
+msgstr "¿Desea añadirle?"
+
+#: ../libgaim/protocols/qq/sys_msg.c:162
+#, c-format
+msgid "%s has added you [%s]"
+msgstr "%s le ha añadido [%s]"
+
+#: ../libgaim/protocols/qq/sys_msg.c:177
+#, c-format
+msgid "User %s rejected your request"
+msgstr "El usuario %s rechazĂł su solicitud"
+
+#: ../libgaim/protocols/qq/sys_msg.c:197
+#, c-format
+msgid "User %s has approved your request"
+msgstr "El usuario %s ha aprobado su solicitud"
+
+#: ../libgaim/protocols/qq/sys_msg.c:220
+#, c-format
+msgid "%s wanna add you [%s] as friends"
+msgstr "%s quiere añadirle [%s] como amigo"
+
+#: ../libgaim/protocols/qq/sys_msg.c:221
+#, c-format
+msgid "Message: %s"
+msgstr "Mensaje: %s"
+
+#: ../libgaim/protocols/qq/sys_msg.c:242
+#, c-format
+msgid "%s is not in your buddy list"
+msgstr "%s no está en su lista de amigos"
+
+#: ../libgaim/protocols/qq/sys_msg.c:244
+msgid "Would you like to add him?"
+msgstr "¿Desea añadirle?"
+
+#: ../libgaim/protocols/sametime/sametime.c:415
 msgid "Connection closed (writing)"
 msgstr "ConexiĂłn cerrada (escribiendo)"
 
-#: src/protocols/sametime/sametime.c:1208
+#: ../libgaim/protocols/sametime/sametime.c:1261
 #, 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
+#: ../libgaim/protocols/sametime/sametime.c:1262
 #, 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
+#: ../libgaim/protocols/sametime/sametime.c:1264
 #, 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
+#: ../libgaim/protocols/sametime/sametime.c:1266
 msgid "Notes Address Book Information"
 msgstr "Información de la libreta de direcciones «Notes»"
 
-#: src/protocols/sametime/sametime.c:1245
+#: ../libgaim/protocols/sametime/sametime.c:1298
 msgid "Invite Group to Conference..."
 msgstr "Invitar grupo a la conferencia..."
 
-#: ../src/protocols/sametime/sametime.c:1314
-#: src/protocols/sametime/sametime.c:1254
+#: ../libgaim/protocols/sametime/sametime.c:1308
 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
+#: ../libgaim/protocols/sametime/sametime.c:1461
 msgid "Sending Handshake"
 msgstr "Enviando negociaciĂłn"
 
-#: ../src/protocols/sametime/sametime.c:1472
+#: ../libgaim/protocols/sametime/sametime.c:1466
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "Esperando a la aceptaciĂłn del saludo inicial"
 
-#: ../src/protocols/sametime/sametime.c:1477
+#: ../libgaim/protocols/sametime/sametime.c:1471
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Se aceptĂł el saludo inicial. Enviando la identificaciĂłn"
 
-#: ../src/protocols/sametime/sametime.c:1482
+#: ../libgaim/protocols/sametime/sametime.c:1476
 msgid "Waiting for Login Acknowledgement"
 msgstr "Esperando a la aceptaciĂłn de la identificaciĂłn"
 
-#: ../src/protocols/sametime/sametime.c:1487
-#: src/protocols/sametime/sametime.c:1426
+#: ../libgaim/protocols/sametime/sametime.c:1481
 msgid "Login Redirected"
 msgstr "IdentificaciĂłn redirigida"
 
-#: ../src/protocols/sametime/sametime.c:1493
-#: src/protocols/sametime/sametime.c:1432
+#: ../libgaim/protocols/sametime/sametime.c:1487
 msgid "Forcing Login"
 msgstr "Forzando la identificaciĂłn"
 
-#: ../src/protocols/sametime/sametime.c:1497
+#: ../libgaim/protocols/sametime/sametime.c:1491
 msgid "Login Acknowledged"
 msgstr "IdentificaciĂłn aceptada"
 
-#: ../src/protocols/sametime/sametime.c:1502
+#: ../libgaim/protocols/sametime/sametime.c:1496
 msgid "Starting Services"
 msgstr "Arrancando servicios"
 
-#: ../src/protocols/sametime/sametime.c:1507
+#: ../libgaim/protocols/sametime/sametime.c:1501
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../src/protocols/sametime/sametime.c:1605
+#: ../libgaim/protocols/sametime/sametime.c:1599
 #, 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
+msgstr ""
+"Un administrador de «Sametime» ha enviado el siguiente anuncio en el "
+"servidor %s"
+
+#: ../libgaim/protocols/sametime/sametime.c:1604
 msgid "Sametime Administrator Announcement"
 msgstr "Anuncio del administrador «Sametime»"
 
-#: src/protocols/sametime/sametime.c:1592
+#: ../libgaim/protocols/sametime/sametime.c:1656
 msgid "Connection reset"
 msgstr "ConexiĂłn rehusada"
 
-#: src/protocols/sametime/sametime.c:1599
+#: ../libgaim/protocols/sametime/sametime.c:1663
 #, 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
+#: ../libgaim/protocols/sametime/sametime.c:1688
+#: ../libgaim/protocols/sametime/sametime.c:3685
 msgid "Unable to connect to host"
 msgstr "No se pudo conectar al servidor"
 
-#: src/protocols/sametime/sametime.c:1665
+#: ../libgaim/protocols/sametime/sametime.c:1726
 #, c-format
 msgid "Announcement from %s"
 msgstr "Aviso de %s"
 
-#: src/protocols/sametime/sametime.c:1836
+#: ../libgaim/protocols/sametime/sametime.c:1900
 msgid "Conference Closed"
 msgstr "Conferencia cerrada"
 
-#: src/protocols/sametime/sametime.c:2297
+#: ../libgaim/protocols/sametime/sametime.c:2357
 msgid "Unable to send message: "
 msgstr "No se pudo enviar el mensaje:"
 
-#: src/protocols/sametime/sametime.c:2893
+#: ../libgaim/protocols/sametime/sametime.c:2914
 msgid "Place Closed"
 msgstr "Lugar cerrado"
 
-#: src/protocols/sametime/sametime.c:3180
+#: ../libgaim/protocols/sametime/sametime.c:3205
 msgid "Microphone"
 msgstr "MicrĂłfono"
 
-#: src/protocols/sametime/sametime.c:3181
+#: ../libgaim/protocols/sametime/sametime.c:3206
 msgid "Speakers"
 msgstr "Altavoces"
 
-#: src/protocols/sametime/sametime.c:3182
+#: ../libgaim/protocols/sametime/sametime.c:3207
 msgid "Video Camera"
 msgstr "Vídeo cámara"
 
-#: src/protocols/sametime/sametime.c:3186
+#: ../libgaim/protocols/sametime/sametime.c:3211
 msgid "File Transfer"
 msgstr "Transferencia de archivo"
 
-#: ../src/protocols/sametime/sametime.c:3257
+#: ../libgaim/protocols/sametime/sametime.c:3245
 #, c-format
 msgid ""
 "\n"
 "<b>Supports:</b> %s"
-msgstr "\n<b>Soporta:</b> %s"
-
-#: src/protocols/sametime/sametime.c:3223
+msgstr ""
+"\n"
+"<b>Soporta:</b> %s"
+
+#: ../libgaim/protocols/sametime/sametime.c:3250
 msgid ""
 "\n"
 "<b>External User</b>"
@@ -10613,11 +11879,11 @@
 "\n"
 "<b>Usuario externo</b>"
 
-#: src/protocols/sametime/sametime.c:3330
+#: ../libgaim/protocols/sametime/sametime.c:3356
 msgid "Create conference with user"
 msgstr "Crear conferencia con el usuario"
 
-#: src/protocols/sametime/sametime.c:3331
+#: ../libgaim/protocols/sametime/sametime.c:3357
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -10626,27 +11892,27 @@
 "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
+#: ../libgaim/protocols/sametime/sametime.c:3361
 msgid "New Conference"
 msgstr "Nueva conferencia"
 
-#: src/protocols/sametime/sametime.c:3337
+#: ../libgaim/protocols/sametime/sametime.c:3363
 msgid "Create"
 msgstr "Crear"
 
-#: src/protocols/sametime/sametime.c:3399
+#: ../libgaim/protocols/sametime/sametime.c:3427
 msgid "Available Conferences"
 msgstr "Conferencias disponibles"
 
-#: src/protocols/sametime/sametime.c:3405
+#: ../libgaim/protocols/sametime/sametime.c:3433
 msgid "Create New Conference..."
 msgstr "Crear nueva conferencia..."
 
-#: src/protocols/sametime/sametime.c:3412
+#: ../libgaim/protocols/sametime/sametime.c:3440
 msgid "Invite user to a conference"
 msgstr "Invitar a un usuario a una conferencia"
 
-#: src/protocols/sametime/sametime.c:3413
+#: ../libgaim/protocols/sametime/sametime.c:3441
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -10657,100 +11923,87 @@
 "Seleccione \"Crear nueva conferencia\" si quiere crear una nueva conferencia "
 "para invitar a este usuario también."
 
-#: src/protocols/sametime/sametime.c:3418
+#: ../libgaim/protocols/sametime/sametime.c:3446
 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
+#: ../libgaim/protocols/sametime/sametime.c:3536
 msgid "Invite to Conference..."
 msgstr "Invitar a conferencia..."
 
-#: ../src/protocols/sametime/sametime.c:3553
+#: ../libgaim/protocols/sametime/sametime.c:3541
 msgid "Send TEST Announcement"
 msgstr "Enviar anuncio de prueba"
 
-#: ../src/protocols/sametime/sametime.c:3600
-#: src/protocols/sametime/sametime.c:3518
+#: ../libgaim/protocols/sametime/sametime.c:3588
 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
+#: ../libgaim/protocols/sametime/sametime.c:3610
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
 "Please enter one below to continue logging in."
-msgstr "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
+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."
+
+#: ../libgaim/protocols/sametime/sametime.c:3615
 msgid "Meanwhile Connection Setup"
 msgstr "Configuración de la conexión «Meanwhile»"
 
-#: ../src/protocols/sametime/sametime.c:3628
-#: src/protocols/sametime/sametime.c:3545
+#: ../libgaim/protocols/sametime/sametime.c:3616
 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
+#: ../libgaim/protocols/sametime/sametime.c:4084
 msgid "<b>External User</b><br>"
 msgstr "<b>Usuario externo</b><br>"
 
-#: src/protocols/sametime/sametime.c:4064
+#: ../libgaim/protocols/sametime/sametime.c:4087
 #, c-format
 msgid "<b>User ID:</b> %s<br>"
 msgstr "<b>ID de usuario:</b> %s<br>"
 
-#: src/protocols/sametime/sametime.c:4070
+#: ../libgaim/protocols/sametime/sametime.c:4093
 #, c-format
 msgid "<b>Full Name:</b> %s<br>"
 msgstr "Nombre completo:</b> %s<br>"
 
-#: src/protocols/sametime/sametime.c:4076
+#: ../libgaim/protocols/sametime/sametime.c:4099
 msgid "<b>Last Known Client:</b> "
 msgstr "<b>Ăšltimo cliente conocido:</b> "
 
-#: src/protocols/sametime/sametime.c:4084
+#: ../libgaim/protocols/sametime/sametime.c:4107
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "(0x%04x) desconocido<br>"
 
-#: src/protocols/sametime/sametime.c:4091
+#: ../libgaim/protocols/sametime/sametime.c:4114
 #, c-format
 msgid "<b>Supports:</b> %s<br>"
 msgstr "<b>Soportados:</b> %s<br>"
 
-#: src/protocols/sametime/sametime.c:4097
+#: ../libgaim/protocols/sametime/sametime.c:4120
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>Estado:</b> %s"
 
-#: ../src/protocols/sametime/sametime.c:4264
-#: ../src/protocols/sametime/sametime.c:5428
+#: ../libgaim/protocols/sametime/sametime.c:4263
+#: ../libgaim/protocols/sametime/sametime.c:5427
 msgid "User Name"
 msgstr "Nombre de usuario"
 
-#: ../src/protocols/sametime/sametime.c:4267
-#: ../src/protocols/sametime/sametime.c:5431
+#: ../libgaim/protocols/sametime/sametime.c:4266
+#: ../libgaim/protocols/sametime/sametime.c:5430
 msgid "Sametime ID"
 msgstr "ID Sametime"
 
-#: ../src/protocols/sametime/sametime.c:4291
-#: src/protocols/sametime/sametime.c:4383
+#: ../libgaim/protocols/sametime/sametime.c:4290
 msgid "An ambiguous user ID was entered"
 msgstr "Se ha introducido un identificador de usuario ambiguo"
 
-#: src/protocols/sametime/sametime.c:4384
+#: ../libgaim/protocols/sametime/sametime.c:4291
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -10760,27 +12013,28 @@
 "usuarios. Por favor seleccione el usuario de la lista mostrada para añadirlo "
 "a su lista de amigos."
 
-#: ../src/protocols/sametime/sametime.c:4297
+#: ../libgaim/protocols/sametime/sametime.c:4296
 msgid "Select User"
 msgstr "Seleccionar usuario"
 
-#: src/protocols/sametime/sametime.c:4452
+#: ../libgaim/protocols/sametime/sametime.c:4366
 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
+#: ../libgaim/protocols/sametime/sametime.c:4368
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
 "entry has been removed from your buddy list."
-msgstr "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
+msgstr ""
+"El identificador «%s» no coincide con ningún usuario en la comunidad "
+"«Sametime». Se ha eliminado esta entrada de la lista de amigos."
+
+#: ../libgaim/protocols/sametime/sametime.c:4373
 msgid "Unable to add user"
 msgstr "No puede añadir al usuario"
 
-#: src/protocols/sametime/sametime.c:5029
+#: ../libgaim/protocols/sametime/sametime.c:4945
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10789,230 +12043,223 @@
 "Error al leer el archivo %s: \n"
 "%s\n"
 
-#: src/protocols/sametime/sametime.c:5155
+#: ../libgaim/protocols/sametime/sametime.c:5077
 msgid "Remotely Stored Buddy List"
 msgstr "Lista de amigos remotamente almacenada"
 
-#: src/protocols/sametime/sametime.c:5160
+#: ../libgaim/protocols/sametime/sametime.c:5082
 msgid "Buddy List Storage Mode"
 msgstr "Modo de almacenamiento de la lista de amigos"
 
 # Usar empotrable? (jfs)
-#: src/protocols/sametime/sametime.c:5163
+#: ../libgaim/protocols/sametime/sametime.c:5085
 msgid "Local Buddy List Only"
 msgstr "Solamente lista de amigos local"
 
-#: src/protocols/sametime/sametime.c:5165
+#: ../libgaim/protocols/sametime/sametime.c:5087
 msgid "Merge List from Server"
 msgstr "Fusionar lista desde el servidor"
 
-#: src/protocols/sametime/sametime.c:5167
+#: ../libgaim/protocols/sametime/sametime.c:5089
 msgid "Merge and Save List to Server"
 msgstr "Fusionar y guardar lista en el servidor"
 
-#: src/protocols/sametime/sametime.c:5169
+#: ../libgaim/protocols/sametime/sametime.c:5091
 msgid "Synchronize List with Server"
 msgstr "Sincronizar la lista con el servidor"
 
-#: ../src/protocols/sametime/sametime.c:5141
-#: src/protocols/sametime/sametime.c:5218
+#: ../libgaim/protocols/sametime/sametime.c:5140
 #, 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
+#: ../libgaim/protocols/sametime/sametime.c:5179
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Exportar la lista «Sametime» para la cuenta %s"
 
-#: src/protocols/sametime/sametime.c:5308
+#: ../libgaim/protocols/sametime/sametime.c:5232
 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
+#: ../libgaim/protocols/sametime/sametime.c:5233
 #, 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
+#: ../libgaim/protocols/sametime/sametime.c:5236
+#: ../libgaim/protocols/sametime/sametime.c:5365
 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
+#: ../libgaim/protocols/sametime/sametime.c:5295
 msgid "Possible Matches"
 msgstr "Posibles coincidencias"
 
-#: ../src/protocols/sametime/sametime.c:5312
-#: src/protocols/sametime/sametime.c:5385
+#: ../libgaim/protocols/sametime/sametime.c:5311
 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
+msgstr ""
+"Resultados de las notas de los grupos de la libreta de direcciones «Notes»"
+
+#: ../libgaim/protocols/sametime/sametime.c:5312
 #, 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
+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."
+
+#: ../libgaim/protocols/sametime/sametime.c:5317
 msgid "Select Notes Address Book"
 msgstr "Seleccionar libro de direcciones «Notes»"
 
-#: ../src/protocols/sametime/sametime.c:5360
-#: src/protocols/sametime/sametime.c:5431
+#: ../libgaim/protocols/sametime/sametime.c:5359
 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
+#: ../libgaim/protocols/sametime/sametime.c:5361
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
-msgstr "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
+msgstr ""
+"El identificador «%s» no coincide con ninguno de los grupos de la libreta de "
+"direcciones «Notes» en su comunidad «Sametime»."
+
+#: ../libgaim/protocols/sametime/sametime.c:5402
 msgid "Notes Address Book Group"
 msgstr "Libreta de direcciones de grupos «Notes»"
 
-#: ../src/protocols/sametime/sametime.c:5404
-#: src/protocols/sametime/sametime.c:5474
+#: ../libgaim/protocols/sametime/sametime.c:5403
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
-msgstr "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
+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."
+
+#: ../libgaim/protocols/sametime/sametime.c:5451
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Resultados de la bĂşsqueda '%s'"
 
-#: ../src/protocols/sametime/sametime.c:5453
+#: ../libgaim/protocols/sametime/sametime.c:5452
 #, 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
+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."
+
+#: ../libgaim/protocols/sametime/sametime.c:5484
 msgid "No matches"
 msgstr "No hubo coincidencias"
 
-#: ../src/protocols/sametime/sametime.c:5486
+#: ../libgaim/protocols/sametime/sametime.c:5485
 #, c-format
 msgid "The identifier '%s' did not match any 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
+#: ../libgaim/protocols/sametime/sametime.c:5489
 msgid "No Matches"
 msgstr "No hubo coincidencias"
 
-#: ../src/protocols/sametime/sametime.c:5527
+#: ../libgaim/protocols/sametime/sametime.c:5526
 msgid "Search for a user"
 msgstr "Buscar un usuario"
 
-#: ../src/protocols/sametime/sametime.c:5528
+#: ../libgaim/protocols/sametime/sametime.c:5527
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
-msgstr "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
+msgstr ""
+"Introduzca el nombre o identificador parcial en el campo mostrado a "
+"continuación para buscar usuarios coincidentes en su comunidad «Sametime»."
+
+#: ../libgaim/protocols/sametime/sametime.c:5530
 msgid "User Search"
 msgstr "BĂşsqueda de usuarios"
 
-#: ../src/protocols/sametime/sametime.c:5543
-#: src/protocols/sametime/sametime.c:5489
+#: ../libgaim/protocols/sametime/sametime.c:5542
 msgid "Import Sametime List..."
 msgstr "Importar la lista «Sametime»..."
 
-#: ../src/protocols/sametime/sametime.c:5547
-#: src/protocols/sametime/sametime.c:5493
+#: ../libgaim/protocols/sametime/sametime.c:5546
 msgid "Export Sametime List..."
 msgstr "Exportar la lista «Sametime»..."
 
-#: ../src/protocols/sametime/sametime.c:5551
-#: src/protocols/sametime/sametime.c:5497
+#: ../libgaim/protocols/sametime/sametime.c:5550
 msgid "Add Notes Address Book Group..."
 msgstr "Añadir a la libreta de direcciones de grupos «Notes»..."
 
-#: ../src/protocols/sametime/sametime.c:5555
+#: ../libgaim/protocols/sametime/sametime.c:5554
 msgid "User Search..."
 msgstr "BĂşsqueda de los usuarios..."
 
-#: src/protocols/sametime/sametime.c:5600
+#: ../libgaim/protocols/sametime/sametime.c:5651
 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
+#: ../libgaim/protocols/sametime/sametime.c:5661
 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
+#: ../libgaim/protocols/silc/buddy.c:52 ../libgaim/protocols/silc/buddy.c:420
+#: ../libgaim/protocols/silc/buddy.c:545 ../libgaim/protocols/silc/buddy.c:711
+#: ../libgaim/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "El usuario %s no está disponible en la red"
 
-#: ../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
+#: ../libgaim/protocols/silc/buddy.c:53 ../libgaim/protocols/silc/buddy.c:115
+#: ../libgaim/protocols/silc/buddy.c:120 ../libgaim/protocols/silc/buddy.c:124
+#: ../libgaim/protocols/silc/buddy.c:129 ../libgaim/protocols/silc/buddy.c:134
+#: ../libgaim/protocols/silc/buddy.c:139 ../libgaim/protocols/silc/buddy.c:257
 msgid "Key Agreement"
 msgstr "Acuerdo de claves"
 
-#: ../src/protocols/silc/buddy.c:54 src/protocols/silc/buddy.c:54
+#: ../libgaim/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:116 src/protocols/silc/buddy.c:116
+#: ../libgaim/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:120 src/protocols/silc/buddy.c:120
+#: ../libgaim/protocols/silc/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "FallĂł el acuerdo de claves"
 
-#: ../src/protocols/silc/buddy.c:125 src/protocols/silc/buddy.c:125
+#: ../libgaim/protocols/silc/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "ExpirĂł el tiempo durante el acuerdo de claves"
 
-#: ../src/protocols/silc/buddy.c:130 src/protocols/silc/buddy.c:130
+#: ../libgaim/protocols/silc/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "Se interrumpiĂł el acuerdo de claves"
 
-#: ../src/protocols/silc/buddy.c:135 src/protocols/silc/buddy.c:135
+#: ../libgaim/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:140 src/protocols/silc/buddy.c:140
+#: ../libgaim/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: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
+#: ../libgaim/protocols/silc/buddy.c:258 ../libgaim/protocols/silc/buddy.c:388
+#: ../libgaim/protocols/silc/buddy.c:513
 msgid "The remote user is not present in the network any more"
 msgstr "El usuario remoto ya no está activo dentro de la red"
 
-#: ../src/protocols/silc/buddy.c:294 src/protocols/silc/buddy.c:294
+#: ../libgaim/protocols/silc/buddy.c:294
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
@@ -11021,7 +12268,7 @@
 "Se ha recibido una solicitud de acuerdo de claves de %s. ÂżDesea realizar el "
 "intercambio de claves?"
 
-#: ../src/protocols/silc/buddy.c:298 src/protocols/silc/buddy.c:298
+#: ../libgaim/protocols/silc/buddy.c:298
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -11032,69 +12279,60 @@
 "Servidor remoto: %s\n"
 "Puerto remoto: %d"
 
-#: ../src/protocols/silc/buddy.c:311 src/protocols/silc/buddy.c:311
+#: ../libgaim/protocols/silc/buddy.c:311
 msgid "Key Agreement Request"
 msgstr "Solicitud de acuerdo de claves"
 
-#: ../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
+#: ../libgaim/protocols/silc/buddy.c:387 ../libgaim/protocols/silc/buddy.c:422
+#: ../libgaim/protocols/silc/buddy.c:464
 msgid "IM With Password"
 msgstr "MI con contraseña"
 
-#: ../src/protocols/silc/buddy.c:423 src/protocols/silc/buddy.c:423
+#: ../libgaim/protocols/silc/buddy.c:423
 msgid "Cannot set IM key"
 msgstr "No se pudo establecer la clave MI"
 
-#: ../src/protocols/silc/buddy.c:465 src/protocols/silc/buddy.c:465
+#: ../libgaim/protocols/silc/buddy.c:465
 msgid "Set IM Password"
 msgstr "Establecer contraseña MI"
 
-#: ../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
+#: ../libgaim/protocols/silc/buddy.c:512 ../libgaim/protocols/silc/buddy.c:547
+#: ../libgaim/protocols/silc/ops.c:1491 ../libgaim/protocols/silc/ops.c:1502
 msgid "Get Public Key"
 msgstr "Obtener clave pĂşblica"
 
-#: ../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
+#: ../libgaim/protocols/silc/buddy.c:548 ../libgaim/protocols/silc/ops.c:1492
+#: ../libgaim/protocols/silc/ops.c:1503
 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:1647
-#: src/protocols/silc/buddy.c:635 src/protocols/silc/buddy.c:1610
+#: ../libgaim/protocols/silc/buddy.c:634
+#: ../libgaim/protocols/silc/buddy.c:1647
 msgid "Show Public Key"
 msgstr "Mostrar clave pĂşblica"
 
-#: ../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
+#: ../libgaim/protocols/silc/buddy.c:635
+#: ../libgaim/protocols/silc/buddy.c:1030 ../libgaim/protocols/silc/chat.c:237
 msgid "Could not load public key"
 msgstr "No se pudo cargar la clave pĂşblica"
 
-#: ../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
+#: ../libgaim/protocols/silc/buddy.c:712 ../libgaim/protocols/silc/ops.c:1086
+#: ../libgaim/protocols/silc/ops.c:1158 ../libgaim/protocols/silc/ops.c:1293
+#: ../libgaim/protocols/silc/ops.c:1294 ../libgaim/protocols/silc/ops.c:1312
 msgid "User Information"
 msgstr "InformaciĂłn de usuario"
 
-#: ../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
+#: ../libgaim/protocols/silc/buddy.c:713 ../libgaim/protocols/silc/ops.c:1159
+#: ../libgaim/protocols/silc/ops.c:1313
 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:735
+#: ../libgaim/protocols/silc/buddy.c:734
 #, 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:738
+#: ../libgaim/protocols/silc/buddy.c:737
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
@@ -11103,16 +12341,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:1064 src/protocols/silc/buddy.c:1029
+#: ../libgaim/protocols/silc/buddy.c:1064
 msgid "Open..."
 msgstr "Abrir..."
 
-#: ../src/protocols/silc/buddy.c:1073 src/protocols/silc/buddy.c:1038
+#: ../libgaim/protocols/silc/buddy.c:1073
 #, 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:1076 src/protocols/silc/buddy.c:1041
+#: ../libgaim/protocols/silc/buddy.c:1076
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -11120,21 +12358,23 @@
 "Para añadir al amigo debe importar su clave pública. Pulse «Importar» para "
 "importar una clave pĂşblica."
 
-#: ../src/protocols/silc/buddy.c:1079
+#: ../libgaim/protocols/silc/buddy.c:1079
 msgid "_Import..."
 msgstr "_Importar..."
 
-#: ../src/protocols/silc/buddy.c:1175 src/protocols/silc/buddy.c:1140
+#: ../libgaim/protocols/silc/buddy.c:1175
 msgid "Select correct user"
 msgstr "Seleccione el usuario correcto"
 
-#: ../src/protocols/silc/buddy.c:1177 src/protocols/silc/buddy.c:1142
+#: ../libgaim/protocols/silc/buddy.c:1177
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
-msgstr "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
+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."
+
+#: ../libgaim/protocols/silc/buddy.c:1179
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -11142,238 +12382,213 @@
 "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:1467 src/protocols/silc/buddy.c:1429
+#: ../libgaim/protocols/silc/buddy.c:1467
 msgid "Detached"
 msgstr "Desligado"
 
-#: ../src/protocols/silc/buddy.c:1471 ../src/protocols/silc/silc.c:55
-#: src/protocols/silc/buddy.c:1433 src/protocols/silc/silc.c:57
+#: ../libgaim/protocols/silc/buddy.c:1471 ../libgaim/protocols/silc/silc.c:55
 msgid "Indisposed"
 msgstr "Indispuesto"
 
-#: ../src/protocols/silc/buddy.c:1475 ../src/protocols/silc/silc.c:57
-#: src/protocols/silc/buddy.c:1437 src/protocols/silc/silc.c:59
+#: ../libgaim/protocols/silc/buddy.c:1475 ../libgaim/protocols/silc/silc.c:57
 msgid "Wake Me Up"
 msgstr "Despiértame"
 
-#: ../src/protocols/silc/buddy.c:1477 ../src/protocols/silc/silc.c:49
-#: src/protocols/silc/buddy.c:1439 src/protocols/silc/silc.c:51
+#: ../libgaim/protocols/silc/buddy.c:1477 ../libgaim/protocols/silc/silc.c:49
 msgid "Hyper Active"
 msgstr "Hiper-activo"
 
-#: ../src/protocols/silc/buddy.c:1479 src/protocols/silc/buddy.c:1441
+#: ../libgaim/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:1448
-#: src/protocols/silc/silc.c:658 src/protocols/silc/util.c:473
+#: ../libgaim/protocols/silc/buddy.c:1486 ../libgaim/protocols/silc/silc.c:672
+#: ../libgaim/protocols/silc/util.c:514
 msgid "Happy"
 msgstr "Feliz"
 
-#: ../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
+#: ../libgaim/protocols/silc/buddy.c:1488 ../libgaim/protocols/silc/silc.c:674
+#: ../libgaim/protocols/silc/util.c:516
 msgid "Sad"
 msgstr "Triste"
 
-#: ../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
+#: ../libgaim/protocols/silc/buddy.c:1490 ../libgaim/protocols/silc/silc.c:676
+#: ../libgaim/protocols/silc/util.c:518
 msgid "Angry"
 msgstr "Furioso"
 
-#: ../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
+#: ../libgaim/protocols/silc/buddy.c:1492 ../libgaim/protocols/silc/silc.c:678
+#: ../libgaim/protocols/silc/util.c:520
 msgid "Jealous"
 msgstr "Celoso"
 
-#: ../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
+#: ../libgaim/protocols/silc/buddy.c:1494 ../libgaim/protocols/silc/silc.c:680
+#: ../libgaim/protocols/silc/util.c:522
 msgid "Ashamed"
 msgstr "Avergonzado"
 
-#: ../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
+#: ../libgaim/protocols/silc/buddy.c:1496 ../libgaim/protocols/silc/silc.c:682
+#: ../libgaim/protocols/silc/util.c:524
 msgid "Invincible"
 msgstr "Invencible"
 
-#: ../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
+#: ../libgaim/protocols/silc/buddy.c:1498 ../libgaim/protocols/silc/util.c:526
 msgid "In Love"
 msgstr "Enamorado"
 
-#: ../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
+#: ../libgaim/protocols/silc/buddy.c:1500 ../libgaim/protocols/silc/silc.c:686
+#: ../libgaim/protocols/silc/util.c:528
 msgid "Sleepy"
 msgstr "Dormido"
 
-#: ../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
+#: ../libgaim/protocols/silc/buddy.c:1502 ../libgaim/protocols/silc/silc.c:688
+#: ../libgaim/protocols/silc/util.c:530
 msgid "Bored"
 msgstr "Aburrido"
 
-#: ../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
+#: ../libgaim/protocols/silc/buddy.c:1504 ../libgaim/protocols/silc/silc.c:690
+#: ../libgaim/protocols/silc/util.c:532
 msgid "Excited"
 msgstr "Excitado"
 
-#: ../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
+#: ../libgaim/protocols/silc/buddy.c:1506 ../libgaim/protocols/silc/silc.c:692
+#: ../libgaim/protocols/silc/util.c:534
 msgid "Anxious"
 msgstr "Ansioso"
 
-#: ../src/protocols/silc/buddy.c:1534 ../src/protocols/silc/ops.c:1196
-#: src/protocols/silc/buddy.c:1500 src/protocols/silc/ops.c:1196
+#: ../libgaim/protocols/silc/buddy.c:1534 ../libgaim/protocols/silc/ops.c:1195
 msgid "User Modes"
 msgstr "Modos de usuario"
 
-#: ../src/protocols/silc/buddy.c:1550 ../src/protocols/silc/ops.c:1205
-#: src/protocols/silc/buddy.c:1509 src/protocols/silc/ops.c:1205
+#: ../libgaim/protocols/silc/buddy.c:1550 ../libgaim/protocols/silc/ops.c:1204
 msgid "Mood"
 msgstr "Ănimo"
 
-#: ../src/protocols/silc/buddy.c:1555 ../src/protocols/silc/ops.c:1217
-#: src/protocols/silc/buddy.c:1518 src/protocols/silc/ops.c:1217
+#: ../libgaim/protocols/silc/buddy.c:1555 ../libgaim/protocols/silc/ops.c:1216
 msgid "Preferred Contact"
 msgstr "Contacto preferido"
 
-#: ../src/protocols/silc/buddy.c:1560 ../src/protocols/silc/ops.c:1222
-#: src/protocols/silc/buddy.c:1523 src/protocols/silc/ops.c:1222
+#: ../libgaim/protocols/silc/buddy.c:1560 ../libgaim/protocols/silc/ops.c:1221
 msgid "Preferred Language"
 msgstr "Idioma preferido"
 
-#: ../src/protocols/silc/buddy.c:1565 ../src/protocols/silc/ops.c:1227
-#: src/protocols/silc/buddy.c:1528 src/protocols/silc/ops.c:1227
+#: ../libgaim/protocols/silc/buddy.c:1565 ../libgaim/protocols/silc/ops.c:1226
 msgid "Device"
 msgstr "Dispositivo"
 
-#: ../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
+#: ../libgaim/protocols/silc/buddy.c:1570 ../libgaim/protocols/silc/ops.c:1231
+#: ../libgaim/protocols/silc/silc.c:740 ../libgaim/protocols/silc/silc.c:742
 msgid "Timezone"
 msgstr "Zona horaria"
 
-#: ../src/protocols/silc/buddy.c:1575 ../src/protocols/silc/ops.c:1237
-#: src/protocols/silc/buddy.c:1538 src/protocols/silc/ops.c:1237
+#: ../libgaim/protocols/silc/buddy.c:1575 ../libgaim/protocols/silc/ops.c:1236
 msgid "Geolocation"
 msgstr "LocalizaciĂłn"
 
-#: ../src/protocols/silc/buddy.c:1629 src/protocols/silc/buddy.c:1594
+#: ../libgaim/protocols/silc/buddy.c:1629
 msgid "Reset IM Key"
 msgstr "Borrar la clave MI"
 
-#: ../src/protocols/silc/buddy.c:1635 src/protocols/silc/buddy.c:1599
+#: ../libgaim/protocols/silc/buddy.c:1635
 msgid "IM with Key Exchange"
 msgstr "MI con intercambio de claves"
 
-#: ../src/protocols/silc/buddy.c:1640 src/protocols/silc/buddy.c:1603
+#: ../libgaim/protocols/silc/buddy.c:1640
 msgid "IM with Password"
 msgstr "MI con contraseña"
 
-#: ../src/protocols/silc/buddy.c:1653 src/protocols/silc/buddy.c:1615
+#: ../libgaim/protocols/silc/buddy.c:1653
 msgid "Get Public Key..."
 msgstr "Obtener clave pĂşblica..."
 
-#: ../src/protocols/silc/buddy.c:1660 ../src/protocols/silc/ops.c:1623
-#: src/protocols/silc/buddy.c:1622 src/protocols/silc/ops.c:1623
+#: ../libgaim/protocols/silc/buddy.c:1660 ../libgaim/protocols/silc/ops.c:1621
 msgid "Kill User"
 msgstr "Matar usuario"
 
-#: ../src/protocols/silc/buddy.c:1670 ../src/protocols/silc/chat.c:971
-#: src/protocols/silc/buddy.c:1631 src/protocols/silc/chat.c:971
+#: ../libgaim/protocols/silc/buddy.c:1670 ../libgaim/protocols/silc/chat.c:972
 msgid "Draw On Whiteboard"
 msgstr "Escribir en la pizarra"
 
-#: ../src/protocols/silc/chat.c:39 src/protocols/silc/chat.c:39
+#: ../libgaim/protocols/silc/chat.c:39
 msgid "_Passphrase:"
 msgstr "Contra_seña:"
 
-#: ../src/protocols/silc/chat.c:80 src/protocols/silc/chat.c:80
+#: ../libgaim/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:81 ../src/protocols/silc/chat.c:173
-#: src/protocols/silc/chat.c:81 src/protocols/silc/chat.c:173
+#: ../libgaim/protocols/silc/chat.c:81 ../libgaim/protocols/silc/chat.c:174
 msgid "Channel Information"
 msgstr "InformaciĂłn de canal"
 
-#: ../src/protocols/silc/chat.c:82 src/protocols/silc/chat.c:82
+#: ../libgaim/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:119 src/protocols/silc/chat.c:119
+#: ../libgaim/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:122 src/protocols/silc/chat.c:122
+#: ../libgaim/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:129 src/protocols/silc/chat.c:129
+#: ../libgaim/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:138 src/protocols/silc/chat.c:138
+#: ../libgaim/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:141 src/protocols/silc/chat.c:141
+#. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
+#: ../libgaim/protocols/silc/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>HMAC de canal:</b> %s"
 
-#: ../src/protocols/silc/chat.c:146 src/protocols/silc/chat.c:146
+#: ../libgaim/protocols/silc/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Tema del canal:</b><br>%s"
 
-#: ../src/protocols/silc/chat.c:151 src/protocols/silc/chat.c:151
+#: ../libgaim/protocols/silc/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Modos del canal:</b> "
 
-#: ../src/protocols/silc/chat.c:164 src/protocols/silc/chat.c:164
+#: ../libgaim/protocols/silc/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Huella dactilar del fundador:</b><br>%s"
 
-#: ../src/protocols/silc/chat.c:165 src/protocols/silc/chat.c:165
+#: ../libgaim/protocols/silc/chat.c:166
 #, 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:235 src/protocols/silc/chat.c:235
+#: ../libgaim/protocols/silc/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Añadir clave pública del canal"
 
 #. Add new public key
-#: ../src/protocols/silc/chat.c:290 src/protocols/silc/chat.c:290
+#: ../libgaim/protocols/silc/chat.c:291
 msgid "Open Public Key..."
 msgstr "Abrir clave pĂşblica..."
 
-#: ../src/protocols/silc/chat.c:399 src/protocols/silc/chat.c:399
+#: ../libgaim/protocols/silc/chat.c:400
 msgid "Channel Passphrase"
 msgstr "Contraseña del canal"
 
-#: ../src/protocols/silc/chat.c:406 src/protocols/silc/chat.c:406
+#: ../libgaim/protocols/silc/chat.c:407
 msgid "Channel Public Keys List"
 msgstr "Lista de claves pĂşblicas del canal"
 
-#: ../src/protocols/silc/chat.c:411 src/protocols/silc/chat.c:411
+#: ../libgaim/protocols/silc/chat.c:412
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -11387,355 +12602,324 @@
 "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: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
+#: ../libgaim/protocols/silc/chat.c:421 ../libgaim/protocols/silc/chat.c:422
+#: ../libgaim/protocols/silc/chat.c:459 ../libgaim/protocols/silc/chat.c:460
+#: ../libgaim/protocols/silc/chat.c:906
 msgid "Channel Authentication"
 msgstr "AutenticaciĂłn de canal"
 
-#: ../src/protocols/silc/chat.c:422 ../src/protocols/silc/chat.c:460
-#: src/protocols/silc/chat.c:422 src/protocols/silc/chat.c:460
+#: ../libgaim/protocols/silc/chat.c:423 ../libgaim/protocols/silc/chat.c:461
 msgid "Add / Remove"
 msgstr "Añadir / Quitar"
 
-#: ../src/protocols/silc/chat.c:577 src/protocols/silc/chat.c:577
+#: ../libgaim/protocols/silc/chat.c:578
 msgid "Group Name"
 msgstr "Nombre de grupo"
 
-#: ../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
+#: ../libgaim/protocols/silc/chat.c:582 ../libgaim/protocols/silc/ops.c:1906
+#: ../libgaim/protocols/silc/silc.c:948
 msgid "Passphrase"
 msgstr "Contraseña"
 
-#: ../src/protocols/silc/chat.c:592 src/protocols/silc/chat.c:592
+#: ../libgaim/protocols/silc/chat.c:593
 #, 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:594 src/protocols/silc/chat.c:594
+#: ../libgaim/protocols/silc/chat.c:595
 msgid "Add Channel Private Group"
 msgstr "Añadir grupo de canales privados"
 
-#: ../src/protocols/silc/chat.c:721 src/protocols/silc/chat.c:721
+#: ../libgaim/protocols/silc/chat.c:722
 msgid "User Limit"
 msgstr "LĂ­mite de usuarios"
 
-#: ../src/protocols/silc/chat.c:722 src/protocols/silc/chat.c:722
+#: ../libgaim/protocols/silc/chat.c:723
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Fijar un limite de usuarios en el canal. Poner a cero para quitar el lĂ­mite "
 "de usuarios."
 
-#: ../src/protocols/silc/chat.c:877 src/protocols/silc/chat.c:877
-msgid "Get Info"
-msgstr "Info"
-
-#: ../src/protocols/silc/chat.c:885 src/protocols/silc/chat.c:885
+#: ../libgaim/protocols/silc/chat.c:886
 msgid "Invite List"
 msgstr "Lista de invitados"
 
-#: ../src/protocols/silc/chat.c:890 src/protocols/silc/chat.c:890
+#: ../libgaim/protocols/silc/chat.c:891
 msgid "Ban List"
 msgstr "Lista de expulsados"
 
-#: ../src/protocols/silc/chat.c:898 src/protocols/silc/chat.c:898
+#: ../libgaim/protocols/silc/chat.c:899
 msgid "Add Private Group"
 msgstr "Añadir grupo privado"
 
-#: ../src/protocols/silc/chat.c:911 src/protocols/silc/chat.c:911
+#: ../libgaim/protocols/silc/chat.c:912
 msgid "Reset Permanent"
 msgstr "Borrado permanente"
 
-#: ../src/protocols/silc/chat.c:916 src/protocols/silc/chat.c:916
+#: ../libgaim/protocols/silc/chat.c:917
 msgid "Set Permanent"
 msgstr "Fijar permanente"
 
-#: ../src/protocols/silc/chat.c:924 src/protocols/silc/chat.c:924
+#: ../libgaim/protocols/silc/chat.c:925
 msgid "Set User Limit"
 msgstr "Establecer lĂ­mite de usuarios"
 
-#: ../src/protocols/silc/chat.c:930 src/protocols/silc/chat.c:930
+#: ../libgaim/protocols/silc/chat.c:931
 msgid "Reset Topic Restriction"
 msgstr "Quitar restricciones de temas"
 
-#: ../src/protocols/silc/chat.c:935 src/protocols/silc/chat.c:935
+#: ../libgaim/protocols/silc/chat.c:936
 msgid "Set Topic Restriction"
 msgstr "Establecer restricciones de tema"
 
-#: ../src/protocols/silc/chat.c:942 src/protocols/silc/chat.c:942
+#: ../libgaim/protocols/silc/chat.c:943
 msgid "Reset Private Channel"
 msgstr "Limpiar canal privado"
 
-#: ../src/protocols/silc/chat.c:947 src/protocols/silc/chat.c:947
+#: ../libgaim/protocols/silc/chat.c:948
 msgid "Set Private Channel"
 msgstr "Establecer canal privado"
 
-#: ../src/protocols/silc/chat.c:954 src/protocols/silc/chat.c:954
+#: ../libgaim/protocols/silc/chat.c:955
 msgid "Reset Secret Channel"
 msgstr "Limpiar canal secreto"
 
-#: ../src/protocols/silc/chat.c:959 src/protocols/silc/chat.c:959
+#: ../libgaim/protocols/silc/chat.c:960
 msgid "Set Secret Channel"
 msgstr "Establecer canal secreto"
 
 # Banned puede ser expulsar o censurar, prefiero expulsar. jfs.
-#: ../src/protocols/silc/chat.c:1033 src/protocols/silc/chat.c:1032
+#: ../libgaim/protocols/silc/chat.c:1034
 #, 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:1037 src/protocols/silc/chat.c:1036
+#: ../libgaim/protocols/silc/chat.c:1038
 #, 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:1096 src/protocols/silc/chat.c:1095
+#: ../libgaim/protocols/silc/chat.c:1097
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "Tiene que unirse al canal %s antes de poder unirse al grupo privado"
 
-#: ../src/protocols/silc/chat.c:1098 src/protocols/silc/chat.c:1097
+#: ../libgaim/protocols/silc/chat.c:1099
 msgid "Join Private Group"
 msgstr "Unirse a un grupo privado"
 
-#: ../src/protocols/silc/chat.c:1099 src/protocols/silc/chat.c:1098
+#: ../libgaim/protocols/silc/chat.c:1100
 msgid "Cannot join private group"
 msgstr "No se pudo unir a un grupo privado"
 
-#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1152
+#: ../libgaim/protocols/silc/chat.c:1294 ../libgaim/protocols/silc/silc.c:1156
 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
+#: ../libgaim/protocols/silc/chat.c:1294 ../libgaim/protocols/silc/silc.c:1156
 msgid "Cannot call command"
 msgstr "No se pudo llamar la orden"
 
-#: ../src/protocols/silc/chat.c:1294 ../src/protocols/silc/silc.c:1153
-#: src/protocols/silc/chat.c:1293 src/protocols/silc/silc.c:1143
+#: ../libgaim/protocols/silc/chat.c:1295 ../libgaim/protocols/silc/silc.c:1157
 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
-#: src/protocols/silc/ft.c:210 src/protocols/silc/ft.c:215
-#: src/protocols/silc/ft.c:221 src/protocols/silc/ft.c:340
+#: ../libgaim/protocols/silc/ft.c:89 ../libgaim/protocols/silc/ft.c:92
+#: ../libgaim/protocols/silc/ft.c:96 ../libgaim/protocols/silc/ft.c:100
+#: ../libgaim/protocols/silc/ft.c:104 ../libgaim/protocols/silc/ft.c:205
+#: ../libgaim/protocols/silc/ft.c:210 ../libgaim/protocols/silc/ft.c:215
+#: ../libgaim/protocols/silc/ft.c:221 ../libgaim/protocols/silc/ft.c:340
 msgid "Secure File Transfer"
 msgstr "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
+#: ../libgaim/protocols/silc/ft.c:90 ../libgaim/protocols/silc/ft.c:93
+#: ../libgaim/protocols/silc/ft.c:97 ../libgaim/protocols/silc/ft.c:101
+#: ../libgaim/protocols/silc/ft.c:105
 msgid "Error during file transfer"
 msgstr "Se produjo un error durante la transferencia de archivos"
 
-#: ../src/protocols/silc/ft.c:94 src/protocols/silc/ft.c:94
+#: ../libgaim/protocols/silc/ft.c:94
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: ../src/protocols/silc/ft.c:98 src/protocols/silc/ft.c:98
+#: ../libgaim/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
+#: ../libgaim/protocols/silc/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "La sesiĂłn de transferencia de archivos no existe"
 
-#: ../src/protocols/silc/ft.c:206 src/protocols/silc/ft.c:206
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/protocols/silc/ft.c:341
 msgid "Cannot send file"
 msgstr "No se puede enviar el archivo."
 
-#: ../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
+#: ../libgaim/protocols/silc/ops.c:554 ../libgaim/protocols/silc/ops.c:563
+#: ../libgaim/protocols/silc/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s ha cambiado el tema a de <I>%s</I> a: %s"
 
-#: ../src/protocols/silc/ops.c:639 src/protocols/silc/ops.c:639
+#: ../libgaim/protocols/silc/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> fijo los modos del canal <I>%s</I> a: %s"
 
-#: ../src/protocols/silc/ops.c:643 src/protocols/silc/ops.c:643
+#: ../libgaim/protocols/silc/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> quitĂł todos los modos del canal <I>%s</I>"
 
-#: ../src/protocols/silc/ops.c:676 src/protocols/silc/ops.c:676
+#: ../libgaim/protocols/silc/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> fijo los modos del usuario <I>%s</I> a: %s"
 
-#: ../src/protocols/silc/ops.c:684 src/protocols/silc/ops.c:684
+#: ../libgaim/protocols/silc/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> quitĂł todos los modos del usuario <I>%s<I>"
 
-#: ../src/protocols/silc/ops.c:713 src/protocols/silc/ops.c:713
+#: ../libgaim/protocols/silc/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Ha sido expulsado de <I>%s</I> por %s (%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
+#: ../libgaim/protocols/silc/ops.c:742 ../libgaim/protocols/silc/ops.c:747
+#: ../libgaim/protocols/silc/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Ha sido expulsado por %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
+#: ../libgaim/protocols/silc/ops.c:773 ../libgaim/protocols/silc/ops.c:778
+#: ../libgaim/protocols/silc/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Expulsado por %s (%s)"
 
-#: ../src/protocols/silc/ops.c:830 src/protocols/silc/ops.c:830
+#: ../libgaim/protocols/silc/ops.c:829
 msgid "Server signoff"
 msgstr "Desconectado por el servidor"
 
-#: ../src/protocols/silc/ops.c:1017 src/protocols/silc/ops.c:1017
+#: ../libgaim/protocols/silc/ops.c:1016
 msgid "Personal Information"
 msgstr "InformaciĂłn personal"
 
-#: ../src/protocols/silc/ops.c:1040 src/protocols/silc/ops.c:1040
+#: ../libgaim/protocols/silc/ops.c:1039
 msgid "Birth Day"
 msgstr "Cumpleaños"
 
-# 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:1048 src/protocols/silc/ops.c:1048
+#: ../libgaim/protocols/silc/ops.c:1047
 msgid "Job Role"
 msgstr "Rol laboral"
 
-#: ../src/protocols/silc/ops.c:1052 ../src/protocols/silc/silc.c:937
-#: src/protocols/silc/ops.c:1052 src/protocols/silc/silc.c:927
+#: ../libgaim/protocols/silc/ops.c:1051 ../libgaim/protocols/silc/silc.c:941
 msgid "Organization"
 msgstr "OrganizaciĂłn"
 
-#: ../src/protocols/silc/ops.c:1056 src/protocols/silc/ops.c:1056
+#: ../libgaim/protocols/silc/ops.c:1055
 msgid "Unit"
 msgstr "Unidad"
 
-#: ../src/protocols/silc/ops.c:1075 src/protocols/silc/ops.c:1075
-msgid "EMail"
-msgstr "Correo electrĂłnico"
-
-#: ../src/protocols/silc/ops.c:1080 src/protocols/silc/ops.c:1080
+#: ../libgaim/protocols/silc/ops.c:1079
 msgid "Note"
 msgstr "Nota"
 
-#: ../src/protocols/silc/ops.c:1128 src/protocols/silc/ops.c:1128
+#: ../libgaim/protocols/silc/ops.c:1127
 msgid "Join Chat"
 msgstr "Unirse a un chat"
 
-#: ../src/protocols/silc/ops.c:1211 src/protocols/silc/buddy.c:1513
-#: src/protocols/silc/ops.c:1211
+#: ../libgaim/protocols/silc/ops.c:1182 ../libgaim/protocols/silc/ops.c:1331
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1060
+msgid "Real Name"
+msgstr "Nombre real"
+
+#: ../libgaim/protocols/silc/ops.c:1210
 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
+#: ../libgaim/protocols/silc/ops.c:1283 ../libgaim/protocols/silc/ops.c:1353
 msgid "Public Key Fingerprint"
 msgstr "Huella digital de la clave pĂşblica"
 
-#: ../src/protocols/silc/ops.c:1285 ../src/protocols/silc/ops.c:1355
-#: src/protocols/silc/ops.c:1285 src/protocols/silc/ops.c:1355
+#: ../libgaim/protocols/silc/ops.c:1284 ../libgaim/protocols/silc/ops.c:1354
 msgid "Public Key Babbleprint"
 msgstr "Huella babble de la clave pĂşblica"
 
-#: ../src/protocols/silc/ops.c:1298
+#: ../libgaim/protocols/silc/ops.c:1297
 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
+#: ../libgaim/protocols/silc/ops.c:1368 ../libgaim/protocols/silc/silc.c:1007
 msgid "Detach From Server"
 msgstr "Desligar del servidor"
 
-#: ../src/protocols/silc/ops.c:1369 src/protocols/silc/ops.c:1369
+#: ../libgaim/protocols/silc/ops.c:1368
 msgid "Cannot detach"
 msgstr "No se puede desligar"
 
-#: ../src/protocols/silc/ops.c:1380 src/protocols/silc/ops.c:1380
+#: ../libgaim/protocols/silc/ops.c:1379
 msgid "Cannot set topic"
 msgstr "No se puede cambiar el tema"
 
-#: ../src/protocols/silc/ops.c:1412 src/protocols/silc/ops.c:1412
+#: ../libgaim/protocols/silc/ops.c:1411
 msgid "Failed to change nickname"
 msgstr "No se pudo cambiar el alias"
 
-#: ../src/protocols/silc/ops.c:1460 src/protocols/silc/ops.c:1460
+#: ../libgaim/protocols/silc/ops.c:1459
 msgid "Roomlist"
 msgstr "Lista de salas"
 
-#: ../src/protocols/silc/ops.c:1460 src/protocols/silc/ops.c:1460
+#: ../libgaim/protocols/silc/ops.c:1459
 msgid "Cannot get room list"
 msgstr "No se pudo obtener la lista de salas"
 
-#: ../src/protocols/silc/ops.c:1505 src/protocols/silc/ops.c:1505
+#: ../libgaim/protocols/silc/ops.c:1504
 msgid "No public key was received"
 msgstr "No se ha recibido una clave pĂşblica"
 
-#: ../src/protocols/silc/ops.c:1518 ../src/protocols/silc/ops.c:1531
-#: src/protocols/silc/ops.c:1518 src/protocols/silc/ops.c:1531
+#: ../libgaim/protocols/silc/ops.c:1516 ../libgaim/protocols/silc/ops.c:1529
 msgid "Server Information"
 msgstr "InformaciĂłn del servidor"
 
-#: ../src/protocols/silc/ops.c:1519 src/protocols/silc/ops.c:1519
+#: ../libgaim/protocols/silc/ops.c:1517
 msgid "Cannot get server information"
 msgstr "No se pudo obtener la informaciĂłn del servidor"
 
-#: ../src/protocols/silc/ops.c:1548 ../src/protocols/silc/ops.c:1557
-#: src/protocols/silc/ops.c:1548 src/protocols/silc/ops.c:1557
+#: ../libgaim/protocols/silc/ops.c:1546 ../libgaim/protocols/silc/ops.c:1555
 msgid "Server Statistics"
 msgstr "EstadĂ­sticas del servidor"
 
-#: ../src/protocols/silc/ops.c:1549 src/protocols/silc/ops.c:1549
+#: ../libgaim/protocols/silc/ops.c:1547
 msgid "Cannot get server statistics"
 msgstr "No se pudieron obtener las estadĂ­sticas del servidor"
 
-#: ../src/protocols/silc/ops.c:1558 src/protocols/silc/ops.c:1558
+#: ../libgaim/protocols/silc/ops.c:1556
 msgid "No server statistics available"
 msgstr "No se disponen de estadĂ­sticas del servidor"
 
-#: ../src/protocols/silc/ops.c:1580 src/protocols/silc/ops.c:1580
+#: ../libgaim/protocols/silc/ops.c:1578
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -11770,108 +12954,106 @@
 "Operadores de servidor en total: %d\n"
 "Operadores de encaminadores en total: %d\n"
 
-#: ../src/protocols/silc/ops.c:1603 src/protocols/silc/ops.c:1603
+#: ../libgaim/protocols/silc/ops.c:1601
 msgid "Network Statistics"
 msgstr "EstadĂ­sticas de red"
 
-#: ../src/protocols/silc/ops.c:1611 ../src/protocols/silc/ops.c:1616
-#: src/protocols/silc/ops.c:1611 src/protocols/silc/ops.c:1616
+#: ../libgaim/protocols/silc/ops.c:1609 ../libgaim/protocols/silc/ops.c:1614
 msgid "Ping"
 msgstr "Ping"
 
-#: ../src/protocols/silc/ops.c:1611 src/protocols/silc/ops.c:1611
+#: ../libgaim/protocols/silc/ops.c:1609
 msgid "Ping failed"
 msgstr "FallĂł el ping"
 
-#: ../src/protocols/silc/ops.c:1616 src/protocols/silc/ops.c:1616
+#: ../libgaim/protocols/silc/ops.c:1614
 msgid "Ping reply received from server"
 msgstr "Se recibiĂł una respuesta al ping del servidor"
 
-#: ../src/protocols/silc/ops.c:1624 src/protocols/silc/ops.c:1624
+#: ../libgaim/protocols/silc/ops.c:1622
 msgid "Could not kill user"
 msgstr "No se pudo expulsar al usuario"
 
-#: ../src/protocols/silc/ops.c:1708 src/protocols/silc/ops.c:1708
+#: ../libgaim/protocols/silc/ops.c:1706
 msgid "Error during connecting to SILC Server"
 msgstr "Se produjo un error durante la conexiĂłn al servidor SILC"
 
-#: ../src/protocols/silc/ops.c:1713 src/protocols/silc/ops.c:1713
+#: ../libgaim/protocols/silc/ops.c:1711
 msgid "Key Exchange failed"
 msgstr "FallĂł el intercambio de claves"
 
-#: ../src/protocols/silc/ops.c:1722 src/protocols/silc/ops.c:1722
+#: ../libgaim/protocols/silc/ops.c:1720
 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:1757 src/protocols/silc/ops.c:1757
+#: ../libgaim/protocols/silc/ops.c:1755
 msgid "Disconnected by server"
 msgstr "Desconectado por el servidor"
 
-#: ../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
+#: ../libgaim/protocols/silc/ops.c:1817 ../libgaim/protocols/silc/ops.c:1864
+#: ../libgaim/protocols/silc/silc.c:189
 msgid "Resuming session"
 msgstr "Reanudando la sesiĂłn"
 
-#: ../src/protocols/silc/ops.c:1821 src/protocols/silc/ops.c:1821
+#: ../libgaim/protocols/silc/ops.c:1819
 msgid "Authenticating connection"
 msgstr "Autenticando la conexiĂłn"
 
-#: ../src/protocols/silc/ops.c:1868 src/protocols/silc/ops.c:1868
+#: ../libgaim/protocols/silc/ops.c:1866
 msgid "Verifying server public key"
 msgstr "Comprobando la clave pĂşblica del servidor"
 
-#: ../src/protocols/silc/ops.c:1909 src/protocols/silc/ops.c:1909
+#: ../libgaim/protocols/silc/ops.c:1907
 msgid "Passphrase required"
 msgstr "Se necesita una contraseña"
 
-#: ../src/protocols/silc/ops.c:1938 src/protocols/silc/ops.c:1938
+#: ../libgaim/protocols/silc/ops.c:1936
 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:1941 src/protocols/silc/ops.c:1941
+#: ../libgaim/protocols/silc/ops.c:1939
 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:1944 src/protocols/silc/ops.c:1944
+#: ../libgaim/protocols/silc/ops.c:1942
 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:1947 src/protocols/silc/ops.c:1947
+#: ../libgaim/protocols/silc/ops.c:1945
 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:1950 src/protocols/silc/ops.c:1950
+#: ../libgaim/protocols/silc/ops.c:1948
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Fallo: El servidor remoto no soporta los PKCS propuestos"
 
-#: ../src/protocols/silc/ops.c:1953 src/protocols/silc/ops.c:1953
+#: ../libgaim/protocols/silc/ops.c:1951
 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:1956 src/protocols/silc/ops.c:1956
+#: ../libgaim/protocols/silc/ops.c:1954
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Fallo: El servidor remoto no soporta el HMAC propuesto"
 
-#: ../src/protocols/silc/ops.c:1958 src/protocols/silc/ops.c:1958
+#: ../libgaim/protocols/silc/ops.c:1956
 msgid "Failure: Incorrect signature"
 msgstr "Fallo: Firma incorrecta"
 
-#: ../src/protocols/silc/ops.c:1960 src/protocols/silc/ops.c:1960
+#: ../libgaim/protocols/silc/ops.c:1958
 msgid "Failure: Invalid cookie"
 msgstr "Fallo: Cookie inválida"
 
-#: ../src/protocols/silc/ops.c:1971 src/protocols/silc/ops.c:1971
+#: ../libgaim/protocols/silc/ops.c:1969
 msgid "Failure: Authentication failed"
 msgstr "Fallo: FallĂł la autenticaciĂłn"
 
-#: ../src/protocols/silc/pk.c:103 src/protocols/silc/pk.c:103
+#: ../libgaim/protocols/silc/pk.c:103
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
@@ -11880,12 +13062,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
+#: ../libgaim/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
+#: ../libgaim/protocols/silc/pk.c:112
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -11898,62 +13080,65 @@
 "%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
+#: ../libgaim/protocols/silc/pk.c:115 ../libgaim/protocols/silc/pk.c:140
 msgid "Verify Public Key"
 msgstr "Verificar la clave pĂşblica"
 
-#: ../src/protocols/silc/pk.c:119
+#: ../libgaim/protocols/silc/pk.c:119
 msgid "_View..."
 msgstr "_Ver..."
 
-#: ../src/protocols/silc/pk.c:141 src/protocols/silc/pk.c:141
+#: ../libgaim/protocols/silc/pk.c:141
 msgid "Unsupported public key type"
 msgstr "Tipo de clave pĂşblica no soportada"
 
-#: ../src/protocols/silc/silc.c:155 src/protocols/silc/silc.c:155
+#: ../libgaim/protocols/silc/silc.c:160
 msgid "Connection failed"
 msgstr "FallĂł la conexiĂłn"
 
-#: ../src/protocols/silc/silc.c:187 src/protocols/silc/silc.c:187
+#: ../libgaim/protocols/silc/silc.c:181
 msgid "Cannot initialize SILC Client connection"
 msgstr "No se pudo inicializar al conexiĂłn del cliente SILC"
 
-#: ../src/protocols/silc/silc.c:198 src/protocols/silc/silc.c:198
+#: ../libgaim/protocols/silc/silc.c:192
 msgid "Performing key exchange"
 msgstr "Realizando intercambio de claves"
 
-#: ../src/protocols/silc/silc.c:283 src/protocols/silc/silc.c:273
+#: ../libgaim/protocols/silc/silc.c:278
 msgid "Out of memory"
 msgstr "Sin memoria"
 
-#: ../src/protocols/silc/silc.c:324
+#: ../libgaim/protocols/silc/silc.c:324
 msgid "Cannot initialize SILC protocol"
 msgstr "No se pudo inicializar el protocolo SILC"
 
-#: ../src/protocols/silc/silc.c:331
+#: ../libgaim/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:336 src/protocols/silc/silc.c:326
+#: ../libgaim/protocols/silc/silc.c:336
 msgid "Connecting to SILC Server"
 msgstr "Conectando con el servidor SILC"
 
-#: ../src/protocols/silc/silc.c:345
+#: ../libgaim/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
+#: ../libgaim/protocols/silc/silc.c:367
 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
+#: ../libgaim/protocols/silc/silc.c:668
 msgid "Your Current Mood"
 msgstr "Su estado de ánimo actual"
 
-#: ../src/protocols/silc/silc.c:691 src/protocols/silc/silc.c:681
+#: ../libgaim/protocols/silc/silc.c:684
+msgid "In love"
+msgstr "Enamorado"
+
+#: ../libgaim/protocols/silc/silc.c:695
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -11961,47 +13146,43 @@
 "\n"
 "Sus métodos de contacto preferidos"
 
-#: ../src/protocols/silc/silc.c:699 ../src/protocols/silc/util.c:518
-#: src/protocols/silc/silc.c:689 src/protocols/silc/util.c:518
+#: ../libgaim/protocols/silc/silc.c:703 ../libgaim/protocols/silc/util.c:559
 msgid "SMS"
 msgstr "SMS"
 
-#: ../src/protocols/silc/silc.c:701 ../src/protocols/silc/util.c:520
-#: src/protocols/silc/silc.c:691 src/protocols/silc/util.c:520
+#: ../libgaim/protocols/silc/silc.c:705 ../libgaim/protocols/silc/util.c:561
 msgid "MMS"
 msgstr "MMS"
 
-#: ../src/protocols/silc/silc.c:703 ../src/protocols/silc/util.c:522
-#: src/protocols/silc/silc.c:693 src/protocols/silc/util.c:522
-msgid "Video Conferencing"
+#: ../libgaim/protocols/silc/silc.c:707
+msgid "Video conferencing"
 msgstr "Video conferencia"
 
-#: ../src/protocols/silc/silc.c:708 src/protocols/silc/silc.c:698
+#: ../libgaim/protocols/silc/silc.c:712
 msgid "Your Current Status"
 msgstr "Su estado actual"
 
-#: ../src/protocols/silc/silc.c:715 src/protocols/silc/silc.c:705
+#: ../libgaim/protocols/silc/silc.c:719
 msgid "Online Services"
 msgstr "Servicios en lĂ­nea"
 
-#: ../src/protocols/silc/silc.c:718 src/protocols/silc/silc.c:708
+#: ../libgaim/protocols/silc/silc.c:722
 msgid "Let others see what services you are using"
 msgstr "Permitir que otros consulten qué servicios está utilizando"
 
-#: ../src/protocols/silc/silc.c:724 src/protocols/silc/silc.c:714
+#: ../libgaim/protocols/silc/silc.c:728
 msgid "Let others see what computer you are using"
 msgstr "Permitir que otros consulten qué ordenador está utilizando"
 
-#: ../src/protocols/silc/silc.c:731 src/protocols/silc/silc.c:721
+#: ../libgaim/protocols/silc/silc.c:735
 msgid "Your VCard File"
 msgstr "Su archivo VCard"
 
-#: ../src/protocols/silc/silc.c:743 ../src/protocols/silc/silc.c:744
-#: src/protocols/silc/silc.c:733 src/protocols/silc/silc.c:734
+#: ../libgaim/protocols/silc/silc.c:747 ../libgaim/protocols/silc/silc.c:748
 msgid "User Online Status Attributes"
 msgstr "Atributos del estado del usuario en lĂ­nea"
 
-#: ../src/protocols/silc/silc.c:745 src/protocols/silc/silc.c:735
+#: ../libgaim/protocols/silc/silc.c:749
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -12011,175 +13192,169 @@
 "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: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
+#: ../libgaim/protocols/silc/silc.c:789 ../libgaim/protocols/silc/silc.c:795
+#: ../libgaim/protocols/silc/silc.c:1434
 msgid "Message of the Day"
 msgstr "Mensaje del dĂ­a"
 
-#: ../src/protocols/silc/silc.c:785 src/protocols/silc/silc.c:775
+#: ../libgaim/protocols/silc/silc.c:789
 msgid "No Message of the Day available"
 msgstr "No hay disponible un mensaje del dĂ­a"
 
-#: ../src/protocols/silc/silc.c:786 ../src/protocols/silc/silc.c:1426
-#: src/protocols/silc/silc.c:776 src/protocols/silc/silc.c:1416
+#: ../libgaim/protocols/silc/silc.c:790 ../libgaim/protocols/silc/silc.c:1429
 msgid "There is no Message of the Day associated with this connection"
 msgstr "No hay un mensaje del dĂ­a asociado con esta conexiĂłn"
 
-#: src/protocols/silc/silc.c:827 src/protocols/silc/silc.c:871
-#: src/protocols/silc/silc.c:942 src/protocols/silc/silc.c:943
+#: ../libgaim/protocols/silc/silc.c:841 ../libgaim/protocols/silc/silc.c:885
+#: ../libgaim/protocols/silc/silc.c:956 ../libgaim/protocols/silc/silc.c:957
 msgid "Create New SILC Key Pair"
 msgstr "Crear nuevo par de claves SILC"
 
-#: src/protocols/silc/silc.c:827
+#: ../libgaim/protocols/silc/silc.c:841
 msgid "Passphrases do not match"
 msgstr "Las contraseñas no coinciden."
 
-#: src/protocols/silc/silc.c:871
+#: ../libgaim/protocols/silc/silc.c:885
 msgid "Key Pair Generation failed"
 msgstr "FallĂł la generaciĂłn de claves"
 
-#: src/protocols/silc/silc.c:910
+#: ../libgaim/protocols/silc/silc.c:924
 msgid "Key length"
 msgstr "Longitud de clave"
 
-#: src/protocols/silc/silc.c:912
+#: ../libgaim/protocols/silc/silc.c:926
 msgid "Public key file"
-msgstr "Archivo de clave pĂşblica"
-
-#: src/protocols/silc/silc.c:914
+msgstr "Fichero de clave pĂşblica"
+
+#: ../libgaim/protocols/silc/silc.c:928
 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
+msgstr "Fichero de clave privada"
+
+#: ../libgaim/protocols/silc/silc.c:951
+msgid "Passphrase (retype)"
+msgstr "Contraseña (escribir de nuevo)"
+
+#: ../libgaim/protocols/silc/silc.c:958
 msgid "Generate Key Pair"
 msgstr "Generar par de claves"
 
-#: ../src/protocols/silc/silc.c:998 src/protocols/silc/silc.c:988
+#: ../libgaim/protocols/silc/silc.c:1002
 msgid "Online Status"
 msgstr "Estado en lĂ­nea"
 
-#: ../src/protocols/silc/silc.c:1007 src/protocols/silc/silc.c:997
+#: ../libgaim/protocols/silc/silc.c:1011
 msgid "View Message of the Day"
 msgstr "Mostrar mensaje del dĂ­a"
 
-#: src/protocols/silc/silc.c:1001
+#: ../libgaim/protocols/silc/silc.c:1015
 msgid "Create SILC Key Pair..."
 msgstr "Crear par de claves SILC..."
 
-#: ../src/protocols/silc/silc.c:1110 src/protocols/silc/silc.c:1100
+#: ../libgaim/protocols/silc/silc.c:1114
 #, 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:1302 src/protocols/silc/silc.c:1292
+#: ../libgaim/protocols/silc/silc.c:1305
 msgid "Topic too long"
 msgstr "Tema demasiado largo"
 
-#: ../src/protocols/silc/silc.c:1383 src/protocols/silc/silc.c:1373
+#: ../libgaim/protocols/silc/silc.c:1386
 msgid "You must specify a nick"
 msgstr "Debe especificar un apodo"
 
-#: ../src/protocols/silc/silc.c:1485 src/protocols/silc/silc.c:1475
+#: ../libgaim/protocols/silc/silc.c:1488
 #, c-format
 msgid "channel %s not found"
 msgstr "no se ha encontrado el canal %s"
 
-#: ../src/protocols/silc/silc.c:1490 src/protocols/silc/silc.c:1480
+#: ../libgaim/protocols/silc/silc.c:1493
 #, 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:1492 src/protocols/silc/silc.c:1482
+#: ../libgaim/protocols/silc/silc.c:1495
 #, 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:1505 src/protocols/silc/silc.c:1495
+#: ../libgaim/protocols/silc/silc.c:1508
 #, 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:1535 src/protocols/silc/silc.c:1525
+#: ../libgaim/protocols/silc/silc.c:1538
 #, 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:1598 src/protocols/silc/silc.c:1588
+#: ../libgaim/protocols/silc/silc.c:1601
 msgid "part [channel]:  Leave the chat"
 msgstr "part [canal]:  Abandonar un chat"
 
-#: ../src/protocols/silc/silc.c:1602 src/protocols/silc/silc.c:1592
+#: ../libgaim/protocols/silc/silc.c:1605
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [canal]:  Abandonar un chat"
 
-#: ../src/protocols/silc/silc.c:1606 src/protocols/silc/silc.c:1596
+#: ../libgaim/protocols/silc/silc.c:1609
 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:1611 src/protocols/silc/silc.c:1601
+#: ../libgaim/protocols/silc/silc.c:1614
 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:1615 src/protocols/silc/silc.c:1605
+#: ../libgaim/protocols/silc/silc.c:1618
 msgid "list:  List channels on this network"
 msgstr "list:  Mostrar los canales en esta red"
 
-#: ../src/protocols/silc/silc.c:1619 src/protocols/silc/silc.c:1609
+#: ../libgaim/protocols/silc/silc.c:1622
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;apodo&gt;:  Mostrar informaciĂłn del apodo"
 
-#: ../src/protocols/silc/silc.c:1623 ../src/protocols/zephyr/zephyr.c:2602
-#: src/protocols/silc/silc.c:1613 src/protocols/zephyr/zephyr.c:2598
+#: ../libgaim/protocols/silc/silc.c:1626
+#: ../libgaim/protocols/zephyr/zephyr.c:2681
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;apodo&gt; &lt;mensaje&gt;:  Enviar un mensaje privado a un usuario"
 
-#: ../src/protocols/silc/silc.c:1627 src/protocols/silc/silc.c:1617
+#: ../libgaim/protocols/silc/silc.c:1630
 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:1631 src/protocols/silc/silc.c:1621
+#: ../libgaim/protocols/silc/silc.c:1634
 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:1635 src/protocols/silc/silc.c:1625
+#: ../libgaim/protocols/silc/silc.c:1638
 msgid "detach:  Detach this session"
 msgstr "detach:  Desligar esta sesiĂłn"
 
-#: ../src/protocols/silc/silc.c:1639 src/protocols/silc/silc.c:1629
+#: ../libgaim/protocols/silc/silc.c:1642
 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:1643 src/protocols/silc/silc.c:1633
+#: ../libgaim/protocols/silc/silc.c:1646
 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:1649 src/protocols/silc/silc.c:1639
+#: ../libgaim/protocols/silc/silc.c:1652
 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:1653 src/protocols/silc/silc.c:1643
+#: ../libgaim/protocols/silc/silc.c:1656
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;nuevo apodo&gt;:  Cambia su apodo"
 
-#: ../src/protocols/silc/silc.c:1657 src/protocols/silc/silc.c:1647
+#: ../libgaim/protocols/silc/silc.c:1660
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;apodo&gt;:  Mostrar informaciĂłn del apodo"
 
-#: ../src/protocols/silc/silc.c:1661 src/protocols/silc/silc.c:1651
+#: ../libgaim/protocols/silc/silc.c:1664
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -12187,7 +13362,7 @@
 "cmode &lt;canal&gt; [+|&lt;modos-&gt;] [argumentos]:  Cambia o muestra los "
 "modos del canal"
 
-#: ../src/protocols/silc/silc.c:1665 src/protocols/silc/silc.c:1655
+#: ../libgaim/protocols/silc/silc.c:1668
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -12195,15 +13370,15 @@
 "cumode &lt;canal&gt; +|-&lt;modos&gt &lt;apodo&gt;:  Cambia los modos del "
 "usuario o del canal"
 
-#: ../src/protocols/silc/silc.c:1669 src/protocols/silc/silc.c:1659
+#: ../libgaim/protocols/silc/silc.c:1672
 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:1673 src/protocols/silc/silc.c:1663
+#: ../libgaim/protocols/silc/silc.c:1676
 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:1677 src/protocols/silc/silc.c:1667
+#: ../libgaim/protocols/silc/silc.c:1680
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -12211,39 +13386,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:1681 src/protocols/silc/silc.c:1671
+#: ../libgaim/protocols/silc/silc.c:1684
 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:1685 src/protocols/silc/silc.c:1675
+#: ../libgaim/protocols/silc/silc.c:1688
 msgid "info [server]:  View server administrative details"
 msgstr "info [servidor]:  Consulta detalles administrativos del servidor"
 
-#: ../src/protocols/silc/silc.c:1689 src/protocols/silc/silc.c:1679
+#: ../libgaim/protocols/silc/silc.c:1692
 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:1693 src/protocols/silc/silc.c:1683
+#: ../libgaim/protocols/silc/silc.c:1696
 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:1697 src/protocols/silc/silc.c:1687
+#: ../libgaim/protocols/silc/silc.c:1700
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Muestra las estadĂ­sticas del servidor y de la red"
 
-#: ../src/protocols/silc/silc.c:1701 src/protocols/silc/silc.c:1691
+#: ../libgaim/protocols/silc/silc.c:1704
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Enviar un PING al servidor al que está conectado"
 
-#: ../src/protocols/silc/silc.c:1706 src/protocols/silc/silc.c:1696
+#: ../libgaim/protocols/silc/silc.c:1709
 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:1710 src/protocols/silc/silc.c:1700
+#: ../libgaim/protocols/silc/silc.c:1713
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -12260,112 +13435,111 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../src/protocols/silc/silc.c:1820 src/protocols/silc/silc.c:1800
+#: ../libgaim/protocols/silc/silc.c:1823
 msgid "SILC Protocol Plugin"
 msgstr "Complemento de protocolo SILC"
 
 #. *  description
-#: ../src/protocols/silc/silc.c:1822 src/protocols/silc/silc.c:1802
+#: ../libgaim/protocols/silc/silc.c:1825
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Protocolo de Conferencia segura en vivo en Internet (SILC)"
 
-#: ../src/protocols/silc/silc.c:1859 src/protocols/silc/silc.c:1839
+#: ../libgaim/protocols/silc/silc.c:1862
 msgid "Public Key file"
 msgstr "Fichero de clave pĂşblica"
 
-#: ../src/protocols/silc/silc.c:1863 src/protocols/silc/silc.c:1843
+#: ../libgaim/protocols/silc/silc.c:1866
 msgid "Private Key file"
 msgstr "Fichero de clave privada"
 
-#: ../src/protocols/silc/silc.c:1873 src/protocols/silc/silc.c:1853
+#: ../libgaim/protocols/silc/silc.c:1876
 msgid "Cipher"
 msgstr "Cifrado"
 
-#: ../src/protocols/silc/silc.c:1883 src/protocols/silc/silc.c:1863
+#: ../libgaim/protocols/silc/silc.c:1886
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../src/protocols/silc/silc.c:1886 src/protocols/silc/silc.c:1866
+#: ../libgaim/protocols/silc/silc.c:1889
 msgid "Public key authentication"
 msgstr "AutenticaciĂłn de clave pĂşblica"
 
-#: ../src/protocols/silc/silc.c:1889 src/protocols/silc/silc.c:1869
+#: ../libgaim/protocols/silc/silc.c:1892
 msgid "Reject watching by other users"
 msgstr "Impedir que otros usuarios miren"
 
-#: ../src/protocols/silc/silc.c:1892 src/protocols/silc/silc.c:1872
+#: ../libgaim/protocols/silc/silc.c:1895
 msgid "Block invites"
 msgstr "Bloquear invitaciones"
 
-#: ../src/protocols/silc/silc.c:1895 src/protocols/silc/silc.c:1875
+#: ../libgaim/protocols/silc/silc.c:1898
 msgid "Block IMs without Key Exchange"
 msgstr "Bloquear MIs que no hagan un intercambio de claves"
 
-#: ../src/protocols/silc/silc.c:1898 src/protocols/silc/silc.c:1878
+#: ../libgaim/protocols/silc/silc.c:1901
 msgid "Reject online status attribute requests"
 msgstr "Rechazar solicitudes de los atributos del estado en lĂ­nea"
 
-#: ../src/protocols/silc/silc.c:1901 src/protocols/silc/silc.c:1881
+#: ../libgaim/protocols/silc/silc.c:1904
 msgid "Block messages to whiteboard"
 msgstr "Bloquear mensajes a la pizarra"
 
-#: ../src/protocols/silc/silc.c:1904 src/protocols/silc/silc.c:1884
+#: ../libgaim/protocols/silc/silc.c:1907
 msgid "Automatically open whiteboard"
 msgstr "Abrir la pizarra automáticamente"
 
-#: src/protocols/silc/silc.c:1887
+#: ../libgaim/protocols/silc/silc.c:1910
 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
+#: ../libgaim/protocols/silc/util.c:207 ../libgaim/protocols/silc/util.c:247
 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:314 src/protocols/silc/util.c:314
+#: ../libgaim/protocols/silc/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Nombre real: \t%s\n"
 
-#: ../src/protocols/silc/util.c:316 src/protocols/silc/util.c:316
+#: ../libgaim/protocols/silc/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Nombre de usuario: \t%s\n"
 
-#: ../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:320 src/protocols/silc/util.c:320
+#: ../libgaim/protocols/silc/util.c:359
+#, c-format
+msgid "E-Mail: \t\t%s\n"
+msgstr "Correo electrĂłnico:     %s\n"
+
+#: ../libgaim/protocols/silc/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Nombre de servidor: \t%s\n"
 
-#: ../src/protocols/silc/util.c:322 src/protocols/silc/util.c:322
+#: ../libgaim/protocols/silc/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "OrganizaciĂłn: \t%s\n"
 
-#: ../src/protocols/silc/util.c:324 src/protocols/silc/util.c:324
+#: ../libgaim/protocols/silc/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "PaĂ­s: \t%s\n"
 
-#: ../src/protocols/silc/util.c:325 src/protocols/silc/util.c:325
+#: ../libgaim/protocols/silc/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritmo:      %s\n"
 
-#: ../src/protocols/silc/util.c:326 src/protocols/silc/util.c:326
-#, c-format
-msgid "Key length: \t%d bits\n"
+#: ../libgaim/protocols/silc/util.c:367
+#, c-format
+msgid "Key Length: \t%d bits\n"
 msgstr "Longitud de clave: \t%d bits\n"
 
-#: ../src/protocols/silc/util.c:328 src/protocols/silc/util.c:328
+#: ../libgaim/protocols/silc/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -12376,7 +13550,7 @@
 "%s\n"
 "\n"
 
-#: ../src/protocols/silc/util.c:329 src/protocols/silc/util.c:329
+#: ../libgaim/protocols/silc/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -12385,69 +13559,80 @@
 "Huella babble de la clave pĂşblica:\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
+#: ../libgaim/protocols/silc/util.c:374 ../libgaim/protocols/silc/util.c:375
 msgid "Public Key Information"
 msgstr "InformaciĂłn de clave pĂşblica"
 
-#: ../src/protocols/silc/util.c:516 src/protocols/silc/util.c:516
+#: ../libgaim/protocols/silc/util.c:557
 msgid "Paging"
 msgstr "Enviar"
 
-#: ../src/protocols/silc/util.c:540 src/protocols/silc/util.c:540
+#: ../libgaim/protocols/silc/util.c:563
+msgid "Video Conferencing"
+msgstr "Video conferencia"
+
+#: ../libgaim/protocols/silc/util.c:581
 msgid "Computer"
 msgstr "Ordenador"
 
-#: ../src/protocols/silc/util.c:544 src/protocols/silc/util.c:544
+#: ../libgaim/protocols/silc/util.c:585
 msgid "PDA"
 msgstr "PDA"
 
-#: ../src/protocols/silc/util.c:546 src/protocols/silc/util.c:546
+#: ../libgaim/protocols/silc/util.c:587
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../src/protocols/silc/wb.c:284 src/protocols/silc/wb.c:284
+#: ../libgaim/protocols/silc/wb.c:284
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr "%s enviĂł un mensaje a la pizarra. ÂżQuiere abrir la pizarra?"
 
-#: ../src/protocols/silc/wb.c:288 src/protocols/silc/wb.c:288
+#: ../libgaim/protocols/silc/wb.c:288
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
 "whiteboard?"
-msgstr "%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
+msgstr ""
+"%s enviĂł un mensaje a la pizarra del canal %s. ÂżQuiere abrir la pizarra?"
+
+#: ../libgaim/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
+#: ../libgaim/protocols/simple/simple.c:416
 msgid "Could not write"
 msgstr "No se pudo escribir"
 
-#: ../src/protocols/simple/simple.c:430 ../src/protocols/simple/simple.c:1331
+#: ../libgaim/protocols/simple/simple.c:438
+#: ../libgaim/protocols/simple/simple.c:1484
 msgid "Could not connect"
 msgstr "No se pudo conectar"
 
-#: ../src/protocols/simple/simple.c:924
+#: ../libgaim/protocols/simple/simple.c:1037
 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
+#: ../libgaim/protocols/simple/simple.c:1518
+#: ../libgaim/protocols/simple/simple.c:1560
+#: ../libgaim/protocols/simple/simple.c:1574
+#: ../libgaim/protocols/simple/simple.c:1626
 msgid "Could not create listen socket"
 msgstr "No se pudo crear el socket de escucha"
 
-#: ../src/protocols/simple/simple.c:1383
+#: ../libgaim/protocols/simple/simple.c:1541
 msgid "Couldn't resolve host"
 msgstr "No se pudo resolver el nombre"
 
-#: ../src/protocols/simple/simple.c:1481 src/protocols/simple/simple.c:1281
+#: ../libgaim/protocols/simple/simple.c:1634
+msgid "Could not resolve hostname"
+msgstr "No se pudo resolver el nombre de sistema"
+
+#: ../libgaim/protocols/simple/simple.c:1651
 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 @"
+msgstr ""
+"Los nombres de usuario SIP no pueden tener espacios en blanco ni el sĂ­mbolo @"
 
 #. *< type
 #. *< ui_requirement
@@ -12457,155 +13642,159 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../src/protocols/simple/simple.c:1643 src/protocols/simple/simple.c:1428
+#: ../libgaim/protocols/simple/simple.c:1819
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Complemento de protocolo SIP/SIMPLE"
 
 #. *  summary
-#: ../src/protocols/simple/simple.c:1644 src/protocols/simple/simple.c:1429
+#: ../libgaim/protocols/simple/simple.c:1820
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "El complemento de protocolo SIP/SIMPLE"
 
-#: src/protocols/simple/simple.c:1451
+#: ../libgaim/protocols/simple/simple.c:1842
 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
+#: ../libgaim/protocols/simple/simple.c:1848
 msgid "Use UDP"
 msgstr "Utilizar UDP"
 
-#: src/protocols/simple/simple.c:1456
+#: ../libgaim/protocols/simple/simple.c:1850
 msgid "Use proxy"
 msgstr "Usar proxy"
 
-#: ../src/protocols/simple/simple.c:1676 src/protocols/simple/simple.c:1458
+#: ../libgaim/protocols/simple/simple.c:1852
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../src/protocols/simple/simple.c:1678
+#: ../libgaim/protocols/simple/simple.c:1854
 msgid "Auth User"
 msgstr "Usuario de autenticaciĂłn"
 
-#: ../src/protocols/simple/simple.c:1680
+#: ../libgaim/protocols/simple/simple.c:1856
 msgid "Auth Domain"
 msgstr "Dominio de autenticaciĂłn"
 
-#: ../src/protocols/toc/toc.c:139 src/protocols/toc/toc.c:139
+#: ../libgaim/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
+#: ../libgaim/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
+#: ../libgaim/protocols/toc/toc.c:201
 #, c-format
 msgid "Signon: %s"
 msgstr "Conectado: %s"
 
-#: ../src/protocols/toc/toc.c:482 src/protocols/toc/toc.c:482
+#: ../libgaim/protocols/toc/toc.c:488
 #, 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
+#: ../libgaim/protocols/toc/toc.c:491
 #, 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
+#: ../libgaim/protocols/toc/toc.c:494
 #, 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
+#: ../libgaim/protocols/toc/toc.c:497
 #, 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
+#: ../libgaim/protocols/toc/toc.c:500
 #, 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
+#: ../libgaim/protocols/toc/toc.c:503
 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
+#: ../libgaim/protocols/toc/toc.c:506
 #, 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
+#: ../libgaim/protocols/toc/toc.c:509
 #, 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
+#: ../libgaim/protocols/toc/toc.c:512
 #, 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
+#: ../libgaim/protocols/toc/toc.c:515
 #, 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
+#: ../libgaim/protocols/toc/toc.c:518
 msgid "Failure."
 msgstr "Fallo."
 
-#: ../src/protocols/toc/toc.c:515 src/protocols/toc/toc.c:515
+#: ../libgaim/protocols/toc/toc.c:521
 msgid "Too many matches."
 msgstr "Demasiados resultados."
 
-#: ../src/protocols/toc/toc.c:518 src/protocols/toc/toc.c:518
+#: ../libgaim/protocols/toc/toc.c:524
 msgid "Need more qualifiers."
 msgstr "Necesito más calificadores."
 
-#: ../src/protocols/toc/toc.c:521 src/protocols/toc/toc.c:521
+#: ../libgaim/protocols/toc/toc.c:527
 msgid "Dir service temporarily unavailable."
 msgstr "Servicio de directorio temporalmente no disponible."
 
-#: ../src/protocols/toc/toc.c:524 src/protocols/toc/toc.c:524
+#: ../libgaim/protocols/toc/toc.c:530
 msgid "E-mail lookup restricted."
 msgstr "BĂşsqueda de direcciones de correo electrĂłnico restringida."
 
-#: ../src/protocols/toc/toc.c:527 src/protocols/toc/toc.c:527
+#: ../libgaim/protocols/toc/toc.c:533
 msgid "Keyword ignored."
 msgstr "Palabra clave ignorada."
 
-#: ../src/protocols/toc/toc.c:530 src/protocols/toc/toc.c:530
+#: ../libgaim/protocols/toc/toc.c:536
 msgid "No keywords."
 msgstr "Sin palabras clave."
 
-#: ../src/protocols/toc/toc.c:533 src/protocols/toc/toc.c:533
+#: ../libgaim/protocols/toc/toc.c:539
 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
+#: ../libgaim/protocols/toc/toc.c:543
 msgid "Country not supported."
 msgstr "PaĂ­s no soportado."
 
-#: ../src/protocols/toc/toc.c:540 src/protocols/toc/toc.c:540
+#: ../libgaim/protocols/toc/toc.c:546
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Fallo desconocido: %s."
 
-#: ../src/protocols/toc/toc.c:546 src/protocols/toc/toc.c:546
+#: ../libgaim/protocols/toc/toc.c:549
+msgid "Incorrect nickname or password."
+msgstr "Nombre de cuenta o contraseña incorrecta."
+
+#: ../libgaim/protocols/toc/toc.c:552
 msgid "The service is temporarily unavailable."
 msgstr "Servicio temporalmente no disponible."
 
-#: ../src/protocols/toc/toc.c:549 src/protocols/toc/toc.c:549
+#: ../libgaim/protocols/toc/toc.c:555
 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
+#: ../libgaim/protocols/toc/toc.c:558
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
@@ -12614,41 +13803,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
+#: ../libgaim/protocols/toc/toc.c:560
 #, 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
+#: ../libgaim/protocols/toc/toc.c:563
 #, 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
+#: ../libgaim/protocols/toc/toc.c:590
 msgid "Invalid Groupname"
 msgstr "Nombre de grupo inválido"
 
-#: ../src/protocols/toc/toc.c:668 src/protocols/toc/toc.c:668
+#: ../libgaim/protocols/toc/toc.c:674
 msgid "Connection Closed"
 msgstr "ConexiĂłn cerrada"
 
-#: ../src/protocols/toc/toc.c:708 src/protocols/toc/toc.c:708
+#: ../libgaim/protocols/toc/toc.c:714
 msgid "Waiting for reply..."
 msgstr "Esperando respuesta..."
 
-#: ../src/protocols/toc/toc.c:786 src/protocols/toc/toc.c:786
+#: ../libgaim/protocols/toc/toc.c:792
 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
+#: ../libgaim/protocols/toc/toc.c:995
 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
+#: ../libgaim/protocols/toc/toc.c:999
 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
+#: ../libgaim/protocols/toc/toc.c:1000
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
 "if you send a message. Gaim will prevent anything from going through. This "
@@ -12658,57 +13847,51 @@
 "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
+#: ../libgaim/protocols/toc/toc.c:1373
+msgid "_Group:"
+msgstr "_Grupo:"
+
+#: ../libgaim/protocols/toc/toc.c:1555
 msgid "Get Dir Info"
 msgstr "Obtener informaciĂłn del directorio"
 
-#: ../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
+#: ../libgaim/protocols/toc/toc.c:1695
 msgid "Set Dir Info"
 msgstr "Guardar informaciĂłn del directorio"
 
-#: ../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
+#: ../libgaim/protocols/toc/toc.c:1817
 #, 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
+#: ../libgaim/protocols/toc/toc.c:1853
 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
+#: ../libgaim/protocols/toc/toc.c:1898 ../libgaim/protocols/toc/toc.c:1938
+#: ../libgaim/protocols/toc/toc.c:2062 ../libgaim/protocols/toc/toc.c:2150
 msgid "Could not connect for transfer."
 msgstr "No se pudo conectar para realizar la transferencia."
 
-#: ../src/protocols/toc/toc.c:2089 src/protocols/toc/toc.c:2089
+#: ../libgaim/protocols/toc/toc.c:2095
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
 "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
+#: ../libgaim/protocols/toc/toc.c:2195
 msgid "Gaim - Save As..."
 msgstr "Gaim - Guardar como..."
 
-#: ../src/protocols/toc/toc.c:2223 src/protocols/toc/toc.c:2223
+#: ../libgaim/protocols/toc/toc.c:2229
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%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
+#: ../libgaim/protocols/toc/toc.c:2236
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s le solicita que le mande un archivo"
@@ -12723,29 +13906,20 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/toc/toc.c:2320 ../src/protocols/toc/toc.c:2322
-#: src/protocols/toc/toc.c:2317 src/protocols/toc/toc.c:2319
+#: ../libgaim/protocols/toc/toc.c:2326 ../libgaim/protocols/toc/toc.c:2328
 msgid "TOC Protocol Plugin"
 msgstr "Complemento de protocolo TOC"
 
-#: ../src/protocols/toc/toc.c:2341 src/protocols/toc/toc.c:2338
-msgid "TOC host"
-msgstr "Servidor TOC"
-
-#: ../src/protocols/toc/toc.c:2345 src/protocols/toc/toc.c:2342
-msgid "TOC port"
-msgstr "Puerto TOC"
-
-#: ../src/protocols/yahoo/yahoo.c:712 src/protocols/yahoo/yahoo.c:712
+#: ../libgaim/protocols/yahoo/yahoo.c:793
 msgid "Your Yahoo! message did not get sent."
 msgstr "Su mensaje Yahoo! no se enviĂł."
 
-#: ../src/protocols/yahoo/yahoo.c:765 ../src/protocols/yahoo/yahoo.c:3561
-#: src/protocols/yahoo/yahoo.c:758 src/protocols/yahoo/yahoo.c:3487
+#: ../libgaim/protocols/yahoo/yahoo.c:852
+#: ../libgaim/protocols/yahoo/yahoo.c:3738
 msgid "Buzz!!"
 msgstr "¡¡Buzz!!"
 
-#: ../src/protocols/yahoo/yahoo.c:810 src/protocols/yahoo/yahoo.c:803
+#: ../libgaim/protocols/yahoo/yahoo.c:898
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Mensaje del sistema Yahoo! para %s:"
@@ -12753,23 +13927,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:906 src/protocols/yahoo/yahoo.c:899
+#: ../libgaim/protocols/yahoo/yahoo.c:994
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list%s%s."
 msgstr "El usuario %s quiere añadir a %s a su lista de amigos%s%s."
 
-#: ../src/protocols/yahoo/yahoo.c:912 src/protocols/yahoo/yahoo.c:905
+#: ../libgaim/protocols/yahoo/yahoo.c:1000
 msgid "Message (optional) :"
 msgstr "Mensaje (opcional) :"
 
-#: ../src/protocols/yahoo/yahoo.c:954 src/protocols/yahoo/yahoo.c:947
+#: ../libgaim/protocols/yahoo/yahoo.c:1042
 #, 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:957 src/protocols/yahoo/yahoo.c:950
+#: ../libgaim/protocols/yahoo/yahoo.c:1045
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -12778,11 +13952,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:960 src/protocols/yahoo/yahoo.c:953
+#: ../libgaim/protocols/yahoo/yahoo.c:1048
 msgid "Add buddy rejected"
 msgstr "Se rechazĂł la adiciĂłn del amigo"
 
-#: ../src/protocols/yahoo/yahoo.c:1703 src/protocols/yahoo/yahoo.c:1696
+#: ../libgaim/protocols/yahoo/yahoo.c:1799
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -12793,11 +13967,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:1706 src/protocols/yahoo/yahoo.c:1699
+#: ../libgaim/protocols/yahoo/yahoo.c:1802
 msgid "Failed Yahoo! Authentication"
 msgstr "FallĂł la autenticaciĂłn en Yahoo!"
 
-#: ../src/protocols/yahoo/yahoo.c:1772 src/protocols/yahoo/yahoo.c:1772
+#: ../libgaim/protocols/yahoo/yahoo.c:1868
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -12806,19 +13980,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:1775 src/protocols/yahoo/yahoo.c:1775
+#: ../libgaim/protocols/yahoo/yahoo.c:1871
 msgid "Ignore buddy?"
 msgstr "ÂżIgnorar amigo?"
 
-#: ../src/protocols/yahoo/yahoo.c:1809 src/protocols/yahoo/yahoo.c:1809
+#: ../libgaim/protocols/yahoo/yahoo.c:1905
 msgid "Invalid username."
 msgstr "Nombre de usuario no válido."
 
-#: ../src/protocols/yahoo/yahoo.c:1820 src/protocols/yahoo/yahoo.c:1820
+#: ../libgaim/protocols/yahoo/yahoo.c:1919
 msgid "Normal authentication failed!"
 msgstr "¡Falló la autenticación habitual!"
 
-#: ../src/protocols/yahoo/yahoo.c:1821 src/protocols/yahoo/yahoo.c:1821
+#: ../libgaim/protocols/yahoo/yahoo.c:1920
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -12831,151 +14005,145 @@
 "Mensajería web que podrá dar lugar a un acceso a menos funcionalidades y "
 "funciones."
 
-#: ../src/protocols/yahoo/yahoo.c:1829 src/protocols/yahoo/yahoo.c:1829
-msgid "Incorrect password."
-msgstr "Contraseña incorrecta."
-
-#: ../src/protocols/yahoo/yahoo.c:1832 src/protocols/yahoo/yahoo.c:1832
+#: ../libgaim/protocols/yahoo/yahoo.c:1931
 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:1835 src/protocols/yahoo/yahoo.c:1835
+#: ../libgaim/protocols/yahoo/yahoo.c:1934
 #, 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:1889 src/protocols/yahoo/yahoo.c:1889
+#: ../libgaim/protocols/yahoo/yahoo.c:1988
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "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:1892 src/protocols/yahoo/yahoo.c:1892
+#: ../libgaim/protocols/yahoo/yahoo.c:1991
 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:2011
+#: ../libgaim/protocols/yahoo/yahoo.c:2110
 #, 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: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
+#: ../libgaim/protocols/yahoo/yahoo.c:2441
+msgid "Received unexpected HTTP response from server."
+msgstr "Se recibiĂł una respuesta HTTP del servidor que no se esperaba."
+
+#: ../libgaim/protocols/yahoo/yahoo.c:2465
+#: ../libgaim/protocols/yahoo/yahoo.c:2637
+#: ../libgaim/protocols/yahoo/yahoo.c:2740
+#: ../libgaim/protocols/yahoo/yahoo.c:2750
+#: ../libgaim/protocols/yahoo/yahoochat.c:1455
+#: ../libgaim/protocols/yahoo/yahoochat.c:1525
+#: ../libgaim/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Error de conexiĂłn"
 
-#: src/protocols/yahoo/yahoo.c:2644 src/protocols/yahoo/yahoo.c:3223
+#: ../libgaim/protocols/yahoo/yahoo.c:2865
+#: ../libgaim/protocols/yahoo/yahoo.c:3472
 msgid "Not at Home"
 msgstr "Fuera de casa"
 
-#: src/protocols/yahoo/yahoo.c:2646 src/protocols/yahoo/yahoo.c:3226
+#: ../libgaim/protocols/yahoo/yahoo.c:2867
+#: ../libgaim/protocols/yahoo/yahoo.c:3475
 msgid "Not at Desk"
 msgstr "Lejos del escritorio"
 
-#: src/protocols/yahoo/yahoo.c:2648 src/protocols/yahoo/yahoo.c:3229
+#: ../libgaim/protocols/yahoo/yahoo.c:2869
+#: ../libgaim/protocols/yahoo/yahoo.c:3478
 msgid "Not in Office"
 msgstr "Fuera de la oficina"
 
-#: ../src/protocols/yahoo/yahoo.c:2721 ../src/protocols/yahoo/yahoo.c:3306
-#: src/protocols/yahoo/yahoo.c:2652 src/protocols/yahoo/yahoo.c:3235
+#: ../libgaim/protocols/yahoo/yahoo.c:2873
+#: ../libgaim/protocols/yahoo/yahoo.c:3484
 msgid "On Vacation"
 msgstr "De vacaciones"
 
-#: ../src/protocols/yahoo/yahoo.c:2725 ../src/protocols/yahoo/yahoo.c:3312
-#: src/protocols/yahoo/yahoo.c:2656 src/protocols/yahoo/yahoo.c:3241
+#: ../libgaim/protocols/yahoo/yahoo.c:2877
+#: ../libgaim/protocols/yahoo/yahoo.c:3490
 msgid "Stepped Out"
 msgstr "Ha abandonado"
 
-#: ../src/protocols/yahoo/yahoo.c:2818 ../src/protocols/yahoo/yahoo.c:2848
-#: src/protocols/yahoo/yahoo.c:2749 src/protocols/yahoo/yahoo.c:2778
+#: ../libgaim/protocols/yahoo/yahoo.c:2970
+#: ../libgaim/protocols/yahoo/yahoo.c:3000
 msgid "Not on server list"
 msgstr "No está en la lista del servidor"
 
-#: ../src/protocols/yahoo/yahoo.c:2865 ../src/protocols/yahoo/yahoo.c:2924
-#: src/protocols/yahoo/yahoo.c:2795 src/protocols/yahoo/yahoo.c:2855
+#: ../libgaim/protocols/yahoo/yahoo.c:3017
+#: ../libgaim/protocols/yahoo/yahoo.c:3076
 msgid "Appear Online"
 msgstr "Parecer conectado"
 
-#: ../src/protocols/yahoo/yahoo.c:2868 ../src/protocols/yahoo/yahoo.c:2945
-#: src/protocols/yahoo/yahoo.c:2798 src/protocols/yahoo/yahoo.c:2877
+#: ../libgaim/protocols/yahoo/yahoo.c:3020
+#: ../libgaim/protocols/yahoo/yahoo.c:3097
 msgid "Appear Permanently Offline"
 msgstr "Parecer siempre desconectado"
 
-#: src/protocols/yahoo/yahoo.c:2816
+#: ../libgaim/protocols/yahoo/yahoo.c:3039
 msgid "Presence"
 msgstr "Presencia"
 
-#: ../src/protocols/yahoo/yahoo.c:2930 src/protocols/novell/novell.c:2996
-#: src/protocols/yahoo/yahoo.c:2861
+#: ../libgaim/protocols/yahoo/yahoo.c:3082
 msgid "Appear Offline"
 msgstr "Parecer desconectado"
 
-#: ../src/protocols/yahoo/yahoo.c:2939 src/protocols/yahoo/yahoo.c:2871
+#: ../libgaim/protocols/yahoo/yahoo.c:3091
 msgid "Don't Appear Permanently Offline"
 msgstr "No parecer siempre desconectado"
 
-#: ../src/protocols/yahoo/yahoo.c:2987 src/protocols/yahoo/yahoo.c:2918
+#: ../libgaim/protocols/yahoo/yahoo.c:3139
 msgid "Join in Chat"
 msgstr "Unirse a un chat"
 
-#: ../src/protocols/yahoo/yahoo.c:2993 src/protocols/yahoo/yahoo.c:2923
+#: ../libgaim/protocols/yahoo/yahoo.c:3145
 msgid "Initiate Conference"
 msgstr "Iniciar conferencia"
 
-#: src/protocols/yahoo/yahoo.c:2948
+#: ../libgaim/protocols/yahoo/yahoo.c:3173
 msgid "Presence Settings"
 msgstr "Usar configuraciĂłn del entorno"
 
-#: ../src/protocols/yahoo/yahoo.c:3027
+#: ../libgaim/protocols/yahoo/yahoo.c:3179
 msgid "Start Doodling"
 msgstr "Comenzar una sesiĂłn de Doodle"
 
-#: ../src/protocols/yahoo/yahoo.c:3059 src/protocols/yahoo/yahoo.c:2985
+#: ../libgaim/protocols/yahoo/yahoo.c:3211
 msgid "Active which ID?"
 msgstr "¿Qué ID quiere activar?"
 
-#: ../src/protocols/yahoo/yahoo.c:3068 src/protocols/yahoo/yahoo.c:2994
+#: ../libgaim/protocols/yahoo/yahoo.c:3220
 msgid "Join who in chat?"
 msgstr "¿Juntarse con quién en un chat?"
 
-#: ../src/protocols/yahoo/yahoo.c:3078 src/protocols/yahoo/yahoo.c:3004
+#: ../libgaim/protocols/yahoo/yahoo.c:3230
 msgid "Activate ID..."
 msgstr "Activar ID..."
 
-#: src/protocols/yahoo/yahoo.c:3008
+#: ../libgaim/protocols/yahoo/yahoo.c:3234
 msgid "Join User in Chat..."
 msgstr "Juntarse con un usuario en un chat..."
 
-#: ../src/protocols/yahoo/yahoo.c:3620 src/protocols/yahoo/yahoo.c:3529
+#: ../libgaim/protocols/yahoo/yahoo.c:3797
 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:3625
+#: ../libgaim/protocols/yahoo/yahoo.c:3802
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  Mostrar los canales de la red Yahoo"
 
-#: src/protocols/yahoo/yahoo.c:3533
+#: ../libgaim/protocols/yahoo/yahoo.c:3806
 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:3633 src/protocols/yahoo/yahoo.c:3538
+#: ../libgaim/protocols/yahoo/yahoo.c:3810
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Solicitar al usuario el comienzo de una sesiĂłn Doodle"
 
@@ -12989,82 +14157,163 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/yahoo/yahoo.c:3727 ../src/protocols/yahoo/yahoo.c:3729
-#: src/protocols/yahoo/yahoo.c:3630 src/protocols/yahoo/yahoo.c:3632
+#: ../libgaim/protocols/yahoo/yahoo.c:3904
+#: ../libgaim/protocols/yahoo/yahoo.c:3906
 msgid "Yahoo Protocol Plugin"
 msgstr "Complemento de protocolo Yahoo"
 
-#: ../src/protocols/yahoo/yahoo.c:3746 src/protocols/yahoo/yahoo.c:3649
+#: ../libgaim/protocols/yahoo/yahoo.c:3923
 msgid "Yahoo Japan"
 msgstr "Yahoo JapĂłn"
 
-#: ../src/protocols/yahoo/yahoo.c:3749 src/protocols/yahoo/yahoo.c:3652
-msgid "Pager host"
-msgstr "Servidor de buscapersonas"
-
-#: ../src/protocols/yahoo/yahoo.c:3752 src/protocols/yahoo/yahoo.c:3655
-msgid "Japan Pager host"
+#: ../libgaim/protocols/yahoo/yahoo.c:3926
+msgid "Pager server"
+msgstr "Servidor buscapersonas"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3929
+msgid "Japan Pager server"
 msgstr "Servidor de buscapersonas japonés"
 
-#: ../src/protocols/yahoo/yahoo.c:3755 src/protocols/yahoo/yahoo.c:3658
+#: ../libgaim/protocols/yahoo/yahoo.c:3932
 msgid "Pager port"
 msgstr "Puerto del buscapersonas"
 
-#: ../src/protocols/yahoo/yahoo.c:3758 src/protocols/yahoo/yahoo.c:3661
-msgid "File transfer host"
+#: ../libgaim/protocols/yahoo/yahoo.c:3935
+msgid "File transfer server"
 msgstr "Servidor de transferencia de archivos"
 
-#: src/protocols/yahoo/yahoo.c:3664
-msgid "Japan file transfer host"
+#: ../libgaim/protocols/yahoo/yahoo.c:3938
+msgid "Japan file transfer server"
 msgstr "Servidor de transferencia de archivos japonés"
 
-#: ../src/protocols/yahoo/yahoo.c:3764 src/protocols/yahoo/yahoo.c:3667
+#: ../libgaim/protocols/yahoo/yahoo.c:3941
 msgid "File transfer port"
 msgstr "Puerto de transferencia de archivos"
 
-#: ../src/protocols/yahoo/yahoo.c:3767 src/protocols/yahoo/yahoo.c:3670
+#: ../libgaim/protocols/yahoo/yahoo.c:3944
 msgid "Chat room locale"
 msgstr "LocalizaciĂłn de la sala de chat"
 
-#: ../src/protocols/yahoo/yahoo.c:3770
+#: ../libgaim/protocols/yahoo/yahoo.c:3947
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorar las invitaciones a salas de conferencias o chat"
 
-#: src/protocols/yahoo/yahoo.c:3673
+#: ../libgaim/protocols/yahoo/yahoo.c:3955
 msgid "Chat room list URL"
 msgstr "Url de lista de salas de chat"
 
-#: src/protocols/yahoo/yahoo.c:3676
-msgid "YCHT host"
-msgstr "Servidor YCHT"
-
-#: src/protocols/yahoo/yahoo.c:3679
-msgid "YCHT port"
-msgstr "Puerto YCHT"
+#: ../libgaim/protocols/yahoo/yahoo.c:3958
+msgid "Yahoo Chat server"
+msgstr "Servidor de chat de Yahoo"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3961
+msgid "Yahoo Chat port"
+msgstr "Puerto de chat de Yahoo"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:203
+#, 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»."
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:205
+msgid "Invitation Rejected"
+msgstr "InvitaciĂłn rechazada"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:361
+msgid "Failed to join chat"
+msgstr "No se pudo unir al chat"
+
+#. -6
+#: ../libgaim/protocols/yahoo/yahoochat.c:364
+msgid "Unknown room"
+msgstr "Sala desconocida"
+
+#. -15
+#: ../libgaim/protocols/yahoo/yahoochat.c:367
+msgid "Maybe the room is full"
+msgstr "Quizás la sala está llena"
+
+#. -35
+#: ../libgaim/protocols/yahoo/yahoochat.c:370
+msgid "Not available"
+msgstr "No disponible"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:374
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+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.
+#: ../libgaim/protocols/yahoo/yahoochat.c:452
+#, c-format
+msgid "You are now chatting in %s."
+msgstr "Ahora está chateando en %s."
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:627
+msgid "Failed to join buddy in chat"
+msgstr "No se pudo unir al amigo al chat"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:628
+msgid "Maybe they're not in a chat?"
+msgstr "¿Quizás no están en un chat?"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1357
+#: ../libgaim/protocols/yahoo/yahoochat.c:1383
+msgid "Fetching the room list failed."
+msgstr "No se pudo obtener la lista de salas."
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1441
+msgid "Voices"
+msgstr "Voces"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1444
+msgid "Webcams"
+msgstr "Cámaras web"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1455
+#: ../libgaim/protocols/yahoo/yahoochat.c:1525
+msgid "Unable to fetch room list."
+msgstr "No se pudo obtener la lista de salas."
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1518
+msgid "User Rooms"
+msgstr "Salas de usuarios"
+
+#. Write a local message to this conversation showing that a request for a
+#. * Doodle session has been made
+#.
+#: ../libgaim/protocols/yahoo/yahoo_doodle.c:96
+msgid "Sent Doodle request."
+msgstr "Enviar peticiĂłn Doodle."
+
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:269
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:278
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:291
+msgid "Unable to establish file descriptor."
+msgstr "No se pudo establecer el descriptor de archivo."
 
 #. TODO: what to do here - do we really have to disconnect?
-#: ../src/protocols/yahoo/yahoo_packet.c:265
+#: ../libgaim/protocols/yahoo/yahoo_packet.c:288
 msgid "Write Error"
 msgstr "Error de escritura"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:707
-#: src/protocols/yahoo/yahoo_profile.c:676
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:707
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
 msgstr "<b>DirecciĂłn IP:</b> %s<br>"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:783
-#: src/protocols/yahoo/yahoo_profile.c:752
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:782
 msgid "Yahoo! Japan Profile"
 msgstr "Perfil de Yahoo! JapĂłn"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:784
-#: src/protocols/yahoo/yahoo_profile.c:753
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:783
 msgid "Yahoo! Profile"
 msgstr "Perfil Yahoo!"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:828
-#: src/protocols/yahoo/yahoo_profile.c:797
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:827
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
@@ -13072,75 +14321,61 @@
 "Lo siento, los perfiles con contenido sólo para adultos no están soportados "
 "aĂşn."
 
-#: ../src/protocols/yahoo/yahoo_profile.c:830
-#: src/protocols/yahoo/yahoo_profile.c:799
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:829
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
 msgstr ""
 "Si desea ver este perfil, deberá visitar este enlace con su navegador web"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1006
-#: src/protocols/yahoo/yahoo_profile.c:975
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1026
 msgid "Yahoo! ID"
 msgstr "ID Yahoo!"
 
-#: ../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
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1098
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1102
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1106
 msgid "Hobbies"
 msgstr "Aficiones"
 
-#: ../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
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1116
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1120
 msgid "Latest News"
 msgstr "Ăšltimas noticias"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1121
-#: src/protocols/yahoo/yahoo_profile.c:1090
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1141
 msgid "Home Page"
 msgstr "Página personal"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1136
-#: src/protocols/yahoo/yahoo_profile.c:1105
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1156
 msgid "Cool Link 1"
 msgstr "Enlace interesante 1"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1141
-#: src/protocols/yahoo/yahoo_profile.c:1110
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1161
 msgid "Cool Link 2"
 msgstr "Enlace interesante 2"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1145
-#: src/protocols/yahoo/yahoo_profile.c:1114
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1165
 msgid "Cool Link 3"
 msgstr "Enlace interesante 3"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1158
-#: src/protocols/yahoo/yahoo_profile.c:1127
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1178
 msgid "Last Update"
 msgstr "Ăšltima actualizaciĂłn"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1164
-#: src/protocols/yahoo/yahoo_profile.c:1133
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1184
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "InformaciĂłn de usuario de %s no disponible"
 
-#: src/protocols/yahoo/yahoo_profile.c:1139
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1190
 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
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1206
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -13148,8 +14383,7 @@
 "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:1189
-#: src/protocols/yahoo/yahoo_profile.c:1158
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1209
 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 "
@@ -13160,91 +14394,24 @@
 "de usuario. Si está seguro de que el usuario existe inténtelo de nuevo más "
 "tarde."
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1197
-#: src/protocols/yahoo/yahoo_profile.c:1166
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1216
 msgid "The user's profile is empty."
 msgstr "El perfil del usuario está vacío."
 
-#: ../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:205 src/protocols/yahoo/yahoochat.c:204
-msgid "Invitation Rejected"
-msgstr "InvitaciĂłn rechazada"
-
-#: ../src/protocols/yahoo/yahoochat.c:361 src/protocols/yahoo/yahoochat.c:358
-msgid "Failed to join chat"
-msgstr "No se pudo unir al chat"
-
-#. -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: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: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: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:1433
-#: src/protocols/yahoo/yahoochat.c:1381
-msgid "Voices"
-msgstr "Voces"
-
-#: ../src/protocols/yahoo/yahoochat.c:1436
-#: src/protocols/yahoo/yahoochat.c:1384
-msgid "Webcams"
-msgstr "Cámaras web"
-
-#: ../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:1510
-#: src/protocols/yahoo/yahoochat.c:1458
-msgid "User Rooms"
-msgstr "Salas de usuarios"
-
-#: ../src/protocols/yahoo/ycht.c:456 src/protocols/yahoo/ycht.c:400
+#: ../libgaim/protocols/yahoo/ycht.c:456
 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
+#: ../libgaim/protocols/yahoo/ycht.c:475
+#, c-format
+msgid ""
+"Lost connection with server\n"
+"%s"
+msgstr ""
+"Se ha perdido la conexiĂłn con el servidor\n"
+"%s"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:355
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -13252,83 +14419,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
+#: ../libgaim/protocols/zephyr/zephyr.c:753
 #, 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:1134
-#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1134
+#: ../libgaim/protocols/zephyr/zephyr.c:786
+#: ../libgaim/protocols/zephyr/zephyr.c:1203
 #, 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:1139
-#: src/protocols/zephyr/zephyr.c:723 src/protocols/zephyr/zephyr.c:1139
+#: ../libgaim/protocols/zephyr/zephyr.c:790
+#: ../libgaim/protocols/zephyr/zephyr.c:1208
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Oculto o no conectado"
 
-#: ../src/protocols/zephyr/zephyr.c:728 ../src/protocols/zephyr/zephyr.c:1141
-#: src/protocols/zephyr/zephyr.c:728 src/protocols/zephyr/zephyr.c:1141
+#: ../libgaim/protocols/zephyr/zephyr.c:795
+#: ../libgaim/protocols/zephyr/zephyr.c:1210
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>En %s desde %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
+#: ../libgaim/protocols/zephyr/zephyr.c:1542
+#: ../libgaim/protocols/zephyr/zephyr.c:1543
 msgid "Anyone"
 msgstr "Cualquiera"
 
-#: ../src/protocols/zephyr/zephyr.c:2278 src/protocols/zephyr/zephyr.c:2274
+#: ../libgaim/protocols/zephyr/zephyr.c:2350
 msgid "_Class:"
 msgstr "_Clase:"
 
-#: ../src/protocols/zephyr/zephyr.c:2284 src/protocols/zephyr/zephyr.c:2280
+#: ../libgaim/protocols/zephyr/zephyr.c:2356
 msgid "_Instance:"
 msgstr "_Instancia:"
 
-#: ../src/protocols/zephyr/zephyr.c:2290 src/protocols/zephyr/zephyr.c:2286
+#: ../libgaim/protocols/zephyr/zephyr.c:2362
 msgid "_Recipient:"
 msgstr "_Destinatario:"
 
-#: ../src/protocols/zephyr/zephyr.c:2301 src/protocols/zephyr/zephyr.c:2297
+#: ../libgaim/protocols/zephyr/zephyr.c:2373
 #, 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:2607 src/protocols/zephyr/zephyr.c:2603
+#: ../libgaim/protocols/zephyr/zephyr.c:2686
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;apodo&gt;: Localiza un usuario"
 
-#: ../src/protocols/zephyr/zephyr.c:2612 src/protocols/zephyr/zephyr.c:2608
+#: ../libgaim/protocols/zephyr/zephyr.c:2691
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;apodo&gt;: Localiza un usuario"
 
-#: ../src/protocols/zephyr/zephyr.c:2617 src/protocols/zephyr/zephyr.c:2613
+#: ../libgaim/protocols/zephyr/zephyr.c:2696
 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:2622 src/protocols/zephyr/zephyr.c:2618
+#: ../libgaim/protocols/zephyr/zephyr.c:2701
 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:2627 src/protocols/zephyr/zephyr.c:2623
+#: ../libgaim/protocols/zephyr/zephyr.c:2706
 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:2633 src/protocols/zephyr/zephyr.c:2629
+#: ../libgaim/protocols/zephyr/zephyr.c:2712
 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:2638 src/protocols/zephyr/zephyr.c:2634
+#: ../libgaim/protocols/zephyr/zephyr.c:2717
 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:2644 src/protocols/zephyr/zephyr.c:2640
+#: ../libgaim/protocols/zephyr/zephyr.c:2723
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -13336,7 +14503,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:2650 src/protocols/zephyr/zephyr.c:2646
+#: ../libgaim/protocols/zephyr/zephyr.c:2729
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -13344,7 +14511,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:2656 src/protocols/zephyr/zephyr.c:2652
+#: ../libgaim/protocols/zephyr/zephyr.c:2735
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -13352,15 +14519,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:2661 src/protocols/zephyr/zephyr.c:2657
+#: ../libgaim/protocols/zephyr/zephyr.c:2740
 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:2767 src/protocols/zephyr/zephyr.c:2763
+#: ../libgaim/protocols/zephyr/zephyr.c:2846
 msgid "Resubscribe"
 msgstr "Re-suscribir"
 
-#: ../src/protocols/zephyr/zephyr.c:2770 src/protocols/zephyr/zephyr.c:2766
+#: ../libgaim/protocols/zephyr/zephyr.c:2849
 msgid "Retrieve subscriptions from server"
 msgstr "Obtener las suscripciones del servidor"
 
@@ -13374,74 +14541,102 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/zephyr/zephyr.c:2856 ../src/protocols/zephyr/zephyr.c:2858
-#: src/protocols/zephyr/zephyr.c:2849 src/protocols/zephyr/zephyr.c:2851
+#: ../libgaim/protocols/zephyr/zephyr.c:2935
+#: ../libgaim/protocols/zephyr/zephyr.c:2937
 msgid "Zephyr Protocol Plugin"
 msgstr "Complemento de protocolo Zephyr"
 
-#: ../src/protocols/zephyr/zephyr.c:2883 src/protocols/zephyr/zephyr.c:2876
+#: ../libgaim/protocols/zephyr/zephyr.c:2956
+msgid "Use tzc"
+msgstr "Use tzc"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2959
+msgid "tzc command"
+msgstr "orden tzc"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2962
 msgid "Export to .anyone"
 msgstr "Exportar a .anyone"
 
-#: ../src/protocols/zephyr/zephyr.c:2886 src/protocols/zephyr/zephyr.c:2879
+#: ../libgaim/protocols/zephyr/zephyr.c:2965
 msgid "Export to .zephyr.subs"
 msgstr "Exportar a .zephyr.subs"
 
-#: ../src/protocols/zephyr/zephyr.c:2889 src/protocols/zephyr/zephyr.c:2882
+#: ../libgaim/protocols/zephyr/zephyr.c:2968
 msgid "Import from .anyone"
 msgstr "Importar de .anyone"
 
-#: ../src/protocols/zephyr/zephyr.c:2892 src/protocols/zephyr/zephyr.c:2885
+#: ../libgaim/protocols/zephyr/zephyr.c:2971
 msgid "Import from .zephyr.subs"
 msgstr "Importar de .zephyr.subs"
 
-#: ../src/protocols/zephyr/zephyr.c:2895 src/protocols/zephyr/zephyr.c:2888
+#: ../libgaim/protocols/zephyr/zephyr.c:2974
 msgid "Realm"
 msgstr "Dominio"
 
-#: ../src/protocols/zephyr/zephyr.c:2898 src/protocols/zephyr/zephyr.c:2891
+#: ../libgaim/protocols/zephyr/zephyr.c:2977
 msgid "Exposure"
 msgstr "ExposiciĂłn"
 
-#: ../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: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:2318 src/proxy.c:2019
-msgid "Invalid proxy settings"
-msgstr "Configuración inválida de proxy"
-
-#: ../src/proxy.c:2318 src/proxy.c:2019
-msgid ""
-"Either the host name or port number specified for your given proxy type is "
-"invalid."
-msgstr ""
-"El nombre de servidor o el puerto especificados no son válidos para su tipo "
-"de proxy."
-
-#: src/savedstatuses.c:502
+#: ../libgaim/proxy.c:446 ../libgaim/proxy.c:868 ../libgaim/proxy.c:1025
+#: ../libgaim/proxy.c:1583
+#, c-format
+msgid ""
+"Unable to create socket:\n"
+"%s"
+msgstr ""
+"No se pudo crear el socket:\n"
+"%s"
+
+#: ../libgaim/proxy.c:648
+#, c-format
+msgid "Unable to parse response from HTTP proxy: %s\n"
+msgstr "No se pudo interpretar la respuesta del proxy HTTP: %s\n"
+
+#: ../libgaim/proxy.c:676 ../libgaim/proxy.c:722 ../libgaim/proxy.c:760
+#: ../libgaim/proxy.c:772
+#, c-format
+msgid "HTTP proxy connection error %d"
+msgstr "Error de conexiĂłn en el proxy HTTP %d"
+
+#: ../libgaim/proxy.c:768
+#, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgstr "Acceso denegado: el servidor proxy HTTP no permite tĂşneles en el puerto %d."
+
+#: ../libgaim/proxy.c:988
+#, c-format
+msgid "Error resolving %s"
+msgstr "Error al resolver %s"
+
+#: ../libgaim/proxy.c:1677
+msgid "Could not resolve host name"
+msgstr "No se pudo resolver el nombre de equipo"
+
+#. *
+#. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
+#.
+#: ../libgaim/request.h:1354
+msgid "_Accept"
+msgstr "_Aceptar"
+
+#. *
+#. * The default message to use when the user becomes auto-away.
+#.
+#: ../libgaim/savedstatuses.c:46
+msgid "I'm not here right now"
+msgstr "No estoy aquĂ­ ahora"
+
+#: ../libgaim/savedstatuses.c:525
 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
+#: ../libgaim/server.c:228
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s ahora se llama %s.\n"
 
-#: ../src/server.c:675 src/server.c:691
+#: ../libgaim/server.c:686
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13450,463 +14645,652 @@
 "%s ha invitado a %s a la sala de chat %s:\n"
 "%s"
 
-#: ../src/server.c:680 src/server.c:696
+#: ../libgaim/server.c:691
 #, 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:684 src/server.c:700
+#: ../libgaim/server.c:695
 msgid "Accept chat invitation?"
 msgstr "ÂżAceptar la invitaciĂłn de chat?"
 
-#: ../src/status.c:153
+#: ../libgaim/status.c:153
 msgid "Unset"
 msgstr "Desactivado"
 
-#: ../src/status.c:156 src/status.c:155
+#: ../libgaim/status.c:156
 msgid "Unavailable"
 msgstr "No disponible"
 
 # El latinoamérica se prefiere 'Celular', creo, jfs
-#: ../src/status.c:160
+#: ../libgaim/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: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:1284 src/status.c:1271
+#: ../libgaim/status.c:611
+#, c-format
+msgid "%s changed status from %s to %s"
+msgstr "el estado de %s cambiĂł de %s a %s"
+
+#: ../libgaim/status.c:621
+#, c-format
+msgid "%s is now %s"
+msgstr "%s es ahora %s"
+
+#: ../libgaim/status.c:626
+#, c-format
+msgid "%s is no longer %s"
+msgstr "%s ya no está %s "
+
+#: ../libgaim/status.c:1293
 #, c-format
 msgid "%s became idle"
 msgstr "%s ahora está inactivo"
 
-#: ../src/status.c:1297 src/status.c:1284
+#: ../libgaim/status.c:1310
 #, c-format
 msgid "%s became unidle"
 msgstr "%s ahora está activo"
 
-#: src/status.c:1357
+#: ../libgaim/status.c:1376
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s ahora está inactivo"
 
-#: src/status.c:1359
+#: ../libgaim/status.c:1378
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s ahora está activo"
 
-#: ../src/util.c:649
+#: ../libgaim/util.c:680
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../src/util.c:2439 src/util.c:2120
+#: ../libgaim/util.c:2429
 #, c-format
 msgid "Error Reading %s"
 msgstr "Error al leer %s"
 
-#: ../src/util.c:2440 src/util.c:2121
+#: ../libgaim/util.c:2430
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
 "the old file has been renamed to %s~."
-msgstr "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
+msgstr ""
+"Se ha encontrado un error al leer su %s. No se ha cargado, y el archivo "
+"antiguo se ha renombrado a %s~."
+
+#: ../libgaim/util.c:2893
 msgid "Calculating..."
 msgstr "Calculando..."
 
-#: ../src/util.c:2936 src/util.c:2619
+#: ../libgaim/util.c:2896
 msgid "Unknown."
 msgstr "Desconocido."
 
-#: ../src/util.c:2962
+#: ../libgaim/util.c:2922
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: ../src/util.c:2974
+#: ../libgaim/util.c:2934
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dĂ­a"
 msgstr[1] "%d dĂ­as"
 
-#: ../src/util.c:2982
+#: ../libgaim/util.c:2942
 #, 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
+#: ../libgaim/util.c:2948
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: ../src/util.c:2996
+#: ../libgaim/util.c:2956
 #, 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
+#: ../libgaim/util.c:2962
 #, 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 re-enable 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:2663
-msgid "day"
-msgid_plural "days"
-msgstr[0] "dĂ­a"
-msgstr[1] "dĂ­as"
-
-#: src/util.c:2671
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "hora"
-msgstr[1] "horas"
-
-#: src/util.c:2679
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "minuto"
-msgstr[1] "minutos"
+#: ../libgaim/util.c:3161 ../libgaim/util.c:3460
+#, c-format
+msgid "Unable to connect to %s"
+msgstr "No se pudo conectar a %s"
+
+#: ../libgaim/util.c:3287
+#, c-format
+msgid ""
+"Unable to allocate enough memory to hold the contents from %s.  The web "
+"server may be trying something malicious."
+msgstr "No se pudo obtener suficiente memoria para mantener los contenidos de %s. Es posible que el servidor web esté intentando algo con malas intenciones."
+
+#: ../libgaim/util.c:3324
+#, c-format
+msgid "Error reading from %s: %s"
+msgstr "Error al leer de %s: %s"
+
+#: ../libgaim/util.c:3355
+#, c-format
+msgid "Error writing to %s: %s"
+msgstr "Error al escribir a %s: %s"
+
+#: ../libgaim/util.c:3380
+#, c-format
+msgid "Unable to connect to %s: %s"
+msgstr "No se pudo conectar a %s: %s"
+
+#~ msgid "DBus"
+#~ msgstr "DBus"
+
+#~ msgid "%s logged out."
+#~ msgstr "%s se ha desconectado."
+
+#~ msgid "Buddy icon:"
+#~ msgstr "Icono de amigo:"
+
+#~ msgid "Start _Voice Chat"
+#~ msgstr "Iniciar chat de voz"
+
+#~ msgid "Screen Name:"
+#~ msgstr "Nombre de usuario:"
+
+#~ msgid "Background color name"
+#~ msgstr "Nombre del color de fondo"
+
+#~ msgid "Background color as a string"
+#~ msgstr "Cadena del color de fondo"
+
+#~ msgid "Background color as a GdkColor"
+#~ msgstr "Color de fondo como un GdkColor"
+
+#~ msgid "Background set"
+#~ msgstr "Establecer color de fondo"
+
+#~ msgid "Whether this tag affects the background color"
+#~ msgstr "Si esta marca afecta al color de fondo"
+
+#~ msgid "ComboBox model"
+#~ msgstr "Modelo «ComboBox»"
+
+#~ msgid "The model for the combo box"
+#~ msgstr "El modelo para el «combo box»"
+
+#~ msgid "Wrap width"
+#~ msgstr "Envolver ancho"
+
+#~ msgid "Wrap width for layouting the items in a grid"
+#~ msgstr ""
+#~ "Ancho a utilizar al envolver para mostrar elementos en una cuadrĂ­cula"
+
+#~ msgid "Row span column"
+#~ msgstr "Columnas que incluyen las filas"
+
+#~ msgid "TreeModel column containing the row span values"
+#~ msgstr "Columna «TreeModel» que contiene los valores que expanden las filas"
+
+#~ msgid "Column span column"
+#~ msgstr "Columna que incluye columnas"
+
+#~ msgid "TreeModel column containing the column span values"
+#~ msgstr "Columna «TreeModel» que contiene los valores que incluyen columnas"
+
+#~ msgid "Active item"
+#~ msgstr "Elemento activo"
+
+#~ msgid "The item which is currently active"
+#~ msgstr "El elemento que está activo actualmente"
+
+#~ msgid "Appears as list"
+#~ msgstr "Aparece como lista"
+
+#~ 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"
+
+#~ msgid "me is using Gaim v%s."
+#~ msgstr "yo estoy utilizando Gaim v%s."
+
+#~ msgid "IM the user"
+#~ msgstr "Enviar un MI al usuario"
+
+#~ msgid "Ignore the user"
+#~ msgstr "Ignorar al usuario"
+
+#~ msgid "Get the user's information"
+#~ msgstr "Obtener la informaciĂłn del usuario"
+
+#~ msgid "Call ended."
+#~ msgstr "Llamada terminada."
+
+#~ msgid "Calling %s"
+#~ msgstr "Llamando %s"
+
+#~ msgid "End Call"
+#~ msgstr "Terminar llamada"
+
+#~ msgid "Receiving call from %s"
+#~ msgstr "Recibiendo llamada de %s"
+
+#~ msgid "Reject Call"
+#~ msgstr "Rechazar llamada"
+
+#~ msgid "Accept call"
+#~ msgstr "Aceptar llamada"
+
+#~ msgid "Connected to %s"
+#~ msgstr "Conectado a %s"
+
+#~ msgid "_Mute"
+#~ msgstr "Silenciar"
+
+#~ msgid "Error launching <b>%s</b>: %s"
+#~ msgstr "Error al ejecutar <b>%s</b>: %s"
+
+#~ 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."
+
+#~ msgid ""
+#~ "Unable to play sound because the 'Command' sound method has been chosen, "
+#~ "but no command has been set."
+#~ msgstr ""
+#~ "No fue posible reproducir el sonido porque se ha escogido el método de "
+#~ "«Orden», pero no se ha especificado la orden."
+
+#~ msgid ""
+#~ "Unable to play sound because the configured sound command could not be "
+#~ "launched: %s"
+#~ msgstr ""
+#~ "No fue posible reproducir el sonido porque el comando de sonido "
+#~ "establecido no se ha podido lanzar: %s"
+
+#~ msgid "e-Mail"
+#~ msgstr "Correo electrĂłnico"
+
+#~ msgid "Unable to initiate a new search"
+#~ msgstr "No se pudo iniciar una nueva bĂşsqueda"
+
+#~ msgid "You have a pending search. Please wait for it to finish."
+#~ msgstr "Tiene una bĂşsqueda pendiente. Por favor espere a que termine."
+
+#~ msgid "Realname"
+#~ msgstr "Nombre real"
+
+#~ msgid ""
+#~ "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
+#~ "account properties"
+#~ msgstr ""
+#~ "El servidor necesita utilizar TLS/SSL para conectarle. Seleccione la "
+#~ "opción «Usar TLS si está disponible» en las propiedades de la cuenta"
+
+#~ msgid "Use TLS if available"
+#~ msgstr "Usar TLS si está disponible"
+
+#~ msgid "Require TLS"
+#~ msgstr "Requiere TLS"
+
+#~ msgid "Login server"
+#~ msgstr "Servidor de conexiĂłn"
+
+#~ msgid "Unable to read header from server"
+#~ msgstr "No se pudo leer las cabeceras del servidor"
+
+#~ 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."
+
+#~ msgid "Unknown server error."
+#~ msgstr "Error desconocido del servidor."
+
+#~ msgid "users: %s, files: %s, size: %sGB"
+#~ msgstr "usuarios: %s, archivos: %s, tamaño: %s GiB"
+
+#~ msgid "Unable to add \"%s\" to your Napster hotlist"
+#~ msgstr "Incapaz de añadir «%s» a su lista de amigos Napster"
+
+#~ msgid "%s requested your information"
+#~ msgstr "%s solicitĂł su informaciĂłn de usuario"
+
+#~ msgid "%s requested a PING"
+#~ msgstr "%s solicitĂł un PING"
+
+#~ msgid "NAPSTER Protocol Plugin"
+#~ msgstr "Complemento de protocolo NAPSTER"
+
+#~ msgid "Email Address"
+#~ msgstr "Correo electrĂłnico"
+
+#~ msgid "Direct IM with %s closed"
+#~ msgstr "Se cerrĂł el MI con %s"
+
+#~ msgid "Direct IM with %s failed"
+#~ msgstr "Fallo un MI directo con %s"
+
+#~ msgid "Unable to open Direct IM"
+#~ msgstr "No se pudo conectar a MI"
+
+#~ msgid "You have lost your connection to chat room %s."
+#~ msgstr "Ha perdido su conexiĂłn a la sala de chat %s."
+
+#~ msgid "Chat is currently unavailable"
+#~ msgstr "El chat no está disponible"
+
+#~ msgid "Unable to login to AIM"
+#~ msgstr "No se pudo conectar con AIM"
+
+#~ msgid ""
+#~ "Transfer of file %s timed out.\n"
+#~ " 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 "
+#~ "Cuentas->%s->Editar cuenta->Avanzadas."
+
+#~ msgid "Unable to create new connection."
+#~ msgstr "No se pudo crear una nueva conexiĂłn."
+
+#~ msgid "Unable to log into file transfer proxy."
+#~ msgstr "No se pudo conectar en el proxy de transferencia de archivos."
+
+#~ msgid ""
+#~ "Unable to establish listener socket or no AOL proxy connection present."
+#~ msgstr ""
+#~ "No se pudo crear el socket de escucha o no hay conexiĂłn al proxy AOL."
+
+#~ msgid "Auth host"
+#~ msgstr "Servidor de autenticaciĂłn"
+
+#~ msgid "Auth port"
+#~ msgstr "Puerto de autenticaciĂłn"
+
+#~ 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)"
+
+#~ msgid "EMail"
+#~ msgstr "Correo electrĂłnico"
+
+#~ msgid "Public Key File"
+#~ msgstr "Archivo de clave pĂşblica"
+
+#~ msgid "Private Key File"
+#~ msgstr "Archivo de clave privada"
+
+#~ msgid "Re-type Passphrase"
+#~ msgstr "Escriba nuevamente la contraseña"
+
+#~ msgid "TOC host"
+#~ msgstr "Servidor TOC"
+
+#~ msgid "TOC port"
+#~ msgstr "Puerto TOC"
+
+#~ msgid "Unable to read"
+#~ msgstr "No se pudo leer"
+
+#~ msgid "Pager host"
+#~ msgstr "Servidor de buscapersonas"
+
+#~ msgid "YCHT host"
+#~ msgstr "Servidor YCHT"
+
+#~ msgid "YCHT port"
+#~ msgstr "Puerto YCHT"
+
+#~ msgid "%s came back"
+#~ msgstr "%s ha vuelto"
+
+#~ msgid "%s went away"
+#~ msgstr "%s se ha marchado"
+
+#~ msgid "g003: Error opening connection.\n"
+#~ msgstr "g003: Error abriendo la conexiĂłn.\n"
+
+#~ msgid "Join A Chat..."
+#~ msgstr "Unirse a un chat..."
+
+#~ msgid "(+%d more)"
+#~ msgstr "(+%d más)"
+
+#~ msgid " left the room (%s)."
+#~ msgstr " saliĂł de la sala (%s)."
+
+#~ msgid "Offline "
+#~ msgstr "Desconectado "
+
+#~ msgid "Conversation in %s on %s"
+#~ msgstr "Conversaciones en %s sobre %s"
+
+#~ msgid "Default"
+#~ msgstr "Valores por omisiĂłn"
+
+#~ msgid "<span weight=\"bold\">From:</span> %s\n"
+#~ msgstr "<span weight=\"bold\">De:</span> %s\n"
+
+#~ msgid "<span weight=\"bold\">Subject:</span> %s\n"
+#~ msgstr "<span weight=\"bold\">Asunto:</span> %s\n"
+
+#~ 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"
+
+#~ msgid "Pounce Action"
+#~ msgstr "AcciĂłn del aviso"
+
+#~ msgid "Custom..."
+#~ msgstr "Personalizado..."
+
+#~ msgid "_Warn"
+#~ msgstr "_Avisar"
+
+#~ msgid "Jabber ID"
+#~ msgstr "ID Jabber"
+
+#~ msgid "Hide IP address"
+#~ msgstr "Ocultar direcciĂłn IP"
+
+#~ msgid "Web aware"
+#~ msgstr "Capacidad web"
+
+#~ msgid "GtkTreeView Expander Indentation"
+#~ msgstr "Muesca del expansor GtkTreeView"
+
+#~ msgid "Write a gtkrc file with these settings to %s"
+#~ msgstr "Escribir un archivo de configuraciĂłn gtkrc con esas opciones a %s"
+
+#~ 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"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Alias:</b> %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Apodo:</b> %s"
+
+#~ 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."
+
+#~ msgid "/Conversation/Clea_r"
+#~ msgstr "/ConversaciĂłn/Limpiar"
+
+#~ 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>"
+
+#~ msgid "Pa_ste as Plain Text"
+#~ msgstr "Pe_gar como texto sin formato"
+
+#~ 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"
+
+#~ msgid "Pounce Who"
+#~ msgstr "Avisar a quién"
+
+#~ msgid "_Report idle time"
+#~ msgstr "Mostrar el _tiempo de inactividad"
+
+#~ msgid "Permit"
+#~ msgstr "Permitir"
+
+#~ msgid "Configure Room"
+#~ msgstr "Configurar sala"
+
+#~ msgid "Accept Defaults"
+#~ msgstr "Aceptar valores por omisiĂłn"
+
+#~ 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."
+
+#~ msgid "Decline"
+#~ msgstr "No añadirlo"
+
+#~ msgid "(pending)"
+#~ msgstr "(Pendiente)"
+
+#~ msgid "Show Privacy Options..."
+#~ msgstr "Mostrar opciones de privacidad..."
+
+#~ 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)"
+
+#~ msgid "Connected to Sametime Community Server"
+#~ msgstr "Conectado al mismo servidor de comunidad «Sametime»"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Status</b>: %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Estado</b>: %s"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Message</b>: %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Mensaje</b>: %s"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Supports</b>: %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Soportados</b>: %s"
+
+#~ msgid "Active"
+#~ msgstr "Activo"
+
+#~ msgid "Select User to Add"
+#~ msgstr "Seleccionar el usuario a añadir"
+
+#~ msgid "Add User"
+#~ msgstr "Añadir usuario"
+
+#~ msgid "NotesBuddy encoding"
+#~ msgstr "Encodificación «NotesBuddy»"
+
+#~ msgid "Import..."
+#~ msgstr "Importar..."
+
+#~ msgid "More..."
+#~ msgstr "Más..."
+
+#~ msgid "View..."
+#~ msgstr "Ver..."
+
+#~ msgid "Maybe the room is full?"
+#~ msgstr "¿Quizás la sala está llena?"
+
+#~ msgid "Hello!"
+#~ msgstr "¡Hola!"
+
+#~ msgid "second"
+#~ msgid_plural "seconds"
+#~ msgstr[0] "segundo"
+#~ msgstr[1] "segundos"
+
+#~ msgid "day"
+#~ msgid_plural "days"
+#~ msgstr[0] "dĂ­a"
+#~ msgstr[1] "dĂ­as"
+
+#~ msgid "hour"
+#~ msgid_plural "hours"
+#~ msgstr[0] "hora"
+#~ msgstr[1] "horas"
+
+#~ msgid "minute"
+#~ msgid_plural "minutes"
+#~ msgstr[0] "minuto"
+#~ msgstr[1] "minutos"
 
 #~ msgid "Error Message Suppression"
 #~ msgstr "SupresiĂłn de mensajes de error"
@@ -13988,7 +15372,7 @@
 #~ msgstr "/Herramientas/_Cuentas"
 
 #~ msgid "Idle "
-#~ msgstr "Ausente "
+#~ msgstr "Inactivo "
 
 #~ msgid "/Tools/Account Actions"
 #~ msgstr "/Herramientas/Acciones de cuentas"
@@ -14119,7 +15503,7 @@
 #~ msgid "Check Mail"
 #~ msgstr "Comprobar correo"
 
-#~ msgid "Check e-mail every X seconds.\n"
+#~ msgid "Check email every X seconds.\n"
 #~ msgstr "Comprobar correo cada X segundos.\n"
 
 #~ msgid "Auto-login"
@@ -14337,9 +15721,6 @@
 #~ msgid "New group name"
 #~ msgstr "Nuevo nombre de grupo"
 
-#~ msgid "Please enter a new name for the selected group."
-#~ msgstr "Introduzca un nombre para el grupo seleccionado."
-
 #~ msgid "%d%%"
 #~ msgstr "%d%%"
 
@@ -14392,9 +15773,6 @@
 #~ msgid "Reason Unknown."
 #~ msgstr "RazĂłn desconocida."
 
-#~ msgid "Time"
-#~ msgstr "Tiempo"
-
 #~ msgid "Get Away Msg"
 #~ msgstr "Mensaje de ausencia"
 
@@ -14410,9 +15788,6 @@
 #~ msgid "/Conversation/Warn..."
 #~ msgstr "/ConversaciĂłn/Avisar..."
 
-#~ msgid "Warn"
-#~ msgstr "Advertir"
-
 #~ msgid "Warn the user"
 #~ msgstr "Avisar al usuario"
 
@@ -14422,9 +15797,6 @@
 #~ msgid "Send a file to the user"
 #~ msgstr "Enviar un archivo al usuario"
 
-#~ msgid "Add the user to your buddy list"
-#~ msgstr "Añadir al usuario a la lista de amigos"
-
 #~ msgid "Remove the user from your buddy list"
 #~ msgstr "Eliminar al usuario de la lista de amigos"
 
@@ -14541,9 +15913,6 @@
 #~ msgid "Show _buttons as:"
 #~ msgstr "Mostrar los _botones como:"
 
-#~ msgid "Pictures"
-#~ msgstr "Imágenes"
-
 #~ msgid "Text"
 #~ msgstr "Texto"
 
@@ -14596,7 +15965,7 @@
 #~ msgstr "Registrar cuándo los amigos se ausentan/_regresan"
 
 #~ msgid "Log your _own signons/idleness/awayness"
-#~ msgstr "Registrar sus _propias conexiones/ausencias/inactividades"
+#~ msgstr "Registrar sus _propias conexiones/inactividades/ausencias"
 
 #~ msgid "Idle _time reporting:"
 #~ msgstr "Informe de _tiempo de inactividad:"
@@ -14629,9 +15998,6 @@
 #~ msgid "Details"
 #~ msgstr "Detalles"
 
-#~ msgid "_Edit"
-#~ msgstr "_Editar"
-
 #~ msgid "Interface"
 #~ msgstr "Interfaz"
 
@@ -14884,18 +16250,12 @@
 #~ msgid "Logged out"
 #~ msgstr "Desconectado"
 
-#~ msgid "Hide Operating System"
-#~ msgstr "Ocultar el sistema operativo"
-
 #~ msgid "The user %s wants to add you to their buddy list."
 #~ msgstr "El usuario %s quiere añadirle a su lista de amigos."
 
 #~ msgid "Display conversation closed notices"
 #~ msgstr "Mostrar los avisos de cierre de conversaciĂłn"
 
-#~ msgid "Display timeout notices"
-#~ msgstr "Mostrar avisos de expiraciĂłn"
-
 #~ msgid "The conversation has become inactive and timed out."
 #~ msgstr "La conversaciĂłn ha pasado a ser inactiva y se ha desconectado."
 
@@ -14944,9 +16304,6 @@
 #~ msgid "Basic Profile"
 #~ msgstr "Perfil básico"
 
-#~ msgid "Profile Information"
-#~ msgstr "InformaciĂłn de perfil"
-
 #~ msgid "Instant Messagers"
 #~ msgstr "Mensajeros instantáneos"
 
@@ -15042,12 +16399,6 @@
 #~ "Error desconocido cuando se intentaba obtener autorizaciĂłn del servidor "
 #~ "de registro MSN."
 
-#~ msgid "Requesting to send password"
-#~ msgstr "Solicitando el envió de contraseña"
-
-#~ msgid "Unable to connect to %s server"
-#~ msgstr "No se pudo conectar al servidor %s"
-
 #~ msgid "Error writing to %s server"
 #~ msgstr "Error al leer del servidor %s"
 
@@ -15061,13 +16412,6 @@
 #~ msgstr "No se ha podido enviar el mensaje por motivos desconocidos."
 
 #~ msgid ""
-#~ "%s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "%s:\n"
-#~ "%s"
-
-#~ msgid ""
 #~ "Gaim cannot send files over Yahoo! that are bigger than %d megabytes (%d "
 #~ "bytes)."
 #~ msgstr ""
@@ -15113,9 +16457,7 @@
 #~ msgid ""
 #~ "\n"
 #~ "<b>Idle</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Ausente:</b>"
+#~ msgstr "\n<b>Inactivo</b>"
 
 #~ msgid "_Preferences"
 #~ msgstr "_Preferencias"
@@ -15218,12 +16560,6 @@
 #~ msgid "Co_lorize screen names"
 #~ msgstr "Co_lorear nombres de usuarios"
 
-#~ msgid "Proxy Type"
-#~ msgstr "Tipo de proxy"
-
-#~ msgid "IMs"
-#~ msgstr "MIs"
-
 #~ msgid "Protocols"
 #~ msgstr "Protocolos"
 
@@ -15246,9 +16582,6 @@
 #~ msgid "Unable to request USR\n"
 #~ msgstr "No se pudo pedir USR\n"
 
-#~ msgid "Unable to login using MD5"
-#~ msgstr "No se pudo entrar usando MD5"
-
 #~ msgid "Unable to send USR"
 #~ msgstr "No se pudo enviar USR"
 
@@ -15275,9 +16608,6 @@
 #~ "Quizá quiso decir %s@hotmail.com.  No se modificó su lista de usuarios "
 #~ "aceptados."
 
-#~ msgid "Invalid MSN screen name"
-#~ msgstr "Nombre de usuario MSN no válido"
-
 #~ msgid ""
 #~ "An MSN screen name must be in the form \"user@server.com\". Perhaps you "
 #~ "meant %s@hotmail.com. No changes were made to your block list."
@@ -15320,9 +16650,6 @@
 #~ msgid "Family Name:\t%s\n"
 #~ msgstr "Apellidos:\t%s\n"
 
-#~ msgid "Nickname:\t\t%s\n"
-#~ msgstr "Apodo:\t\t%s\n"
-
 #~ msgid "Birth Day:\t\t%s\n"
 #~ msgstr "Fecha de nacimiento:\t\t%s\n"
 
@@ -15335,20 +16662,14 @@
 #~ msgid "Server:\t\t%s\n"
 #~ msgstr "Servidor:\t\t%s\n"
 
-#~ msgid "Connection timeout"
-#~ msgstr "ExpirĂł la conexiĂłn"
-
 #~ msgid "Unknown error number %d."
 #~ msgstr "CĂłdigo de error desconocido %d."
 
 #~ msgid "ZLocate"
 #~ msgstr "ZLocate"
 
-#~ msgid "Set"
-#~ msgstr "Guardar"
-
 #~ msgid "idle for"
-#~ msgstr "ausente durante"
+#~ msgstr "inactivo durante"
 
 #~ msgid "/Tools/P_rotocol Actions"
 #~ msgstr "/Herramientas/Acciones del _protocolo"
@@ -15365,9 +16686,6 @@
 #~ msgid "_Strikethrough"
 #~ msgstr "_Tachado"
 
-#~ msgid "Face"
-#~ msgstr "Aspecto"
-
 #~ msgid "Use custo_m face"
 #~ msgstr "Usar aspecto _personalizado"
 
@@ -15377,9 +16695,6 @@
 #~ msgid "Color"
 #~ msgstr "Color"
 
-#~ msgid "_Text color"
-#~ msgstr "Color del _texto"
-
 #~ msgid "Bac_kground color"
 #~ msgstr "Color del _fondo"
 
@@ -15413,9 +16728,6 @@
 #~ msgid "Hide window on _send"
 #~ msgstr "Ocultar la ventana al _enviar"
 
-#~ msgid "Show _logins in window"
-#~ msgstr "Mostrar _conexiones en la ventana"
-
 #~ msgid "Tab Completion"
 #~ msgstr "Completado con el tabulador"
 
@@ -15472,10 +16784,10 @@
 #~ msgstr "Miembro desde: <b>%s</b><br>\n"
 
 #~ msgid "Idle: <b>%s</b>"
-#~ msgstr "Ausente: <b>%s</b>"
+#~ msgstr "Inactivo: <b>%s</b>"
 
 #~ msgid "Idle: <b>Active</b>"
-#~ msgstr "Ausencia: <b>Activo</b>"
+#~ msgstr "Inactivo: <b>Activo</b>"
 
 #~ msgid "Could not open config file %s."
 #~ msgstr "No se pudo abrir el archivo de configuraciĂłn %s."
@@ -15483,9 +16795,6 @@
 #~ msgid "Invalid Parameter (probably a Gaim bug)"
 #~ msgstr "Parámetro inválido (probablemente un error de Gaim)"
 
-#~ msgid "Invalid User"
-#~ msgstr "Usuario no válido"
-
 #~ msgid "<b>Buddy Comment:</b> "
 #~ msgstr "<b>Comentario de amigo:</b> "
 
@@ -15562,9 +16871,6 @@
 #~ msgid "(No"
 #~ msgstr "(Sin"
 
-#~ msgid "Change"
-#~ msgstr "Cambios"
-
 #~ msgid "Gaim - Away!"
 #~ msgstr "Gaim - ¡Ausente!"
 
@@ -15574,9 +16880,6 @@
 #~ msgid "Join Chat As:"
 #~ msgstr "Unirse a un chat como:"
 
-#~ msgid "Join"
-#~ msgstr "Unirse"
-
 #~ msgid "Alias chat"
 #~ msgstr "Apodo de chat"
 
@@ -15629,20 +16932,12 @@
 #~ msgid "Couldn't remove file %s."
 #~ msgstr "No se pudo borrar el archivo %s."
 
-#~ msgid ""
-#~ "You are about to remove the log file for %s.  Do you want to continue?"
-#~ msgstr ""
-#~ "Está a punto de borrar el archivo de registro de %s. ¿Desea continuar?"
-
 #~ msgid "Remove Log"
 #~ msgstr "Eliminar registro"
 
 #~ msgid "Couldn't open log file %s."
 #~ msgstr "No se pudo abrir el archivo de registro %s."
 
-#~ msgid "Log"
-#~ msgstr "HistĂłrico"
-
 #~ msgid ""
 #~ "<span weight='bold' size='larger'>Enter a search phrase\n"
 #~ "</span>"
@@ -15694,7 +16989,7 @@
 #~ msgstr "+++ %s (%s) cambio de estado de ausencia @ %s"
 
 #~ msgid "+++ %s (%s) became idle @ %s"
-#~ msgstr "+++ %s (%s) pasa a estar ausente @ %s"
+#~ msgstr "+++ %s (%s) pasa a estar inactivo @ %s"
 
 #~ msgid "+++ %s (%s) returned from idle @ %s"
 #~ msgstr "+++ %s (%s) vuelve a estar activo @ %s"
@@ -15715,10 +17010,10 @@
 #~ msgstr "%s (%s) informa que %s (%s) ha vuelto @ %s"
 
 #~ msgid "%s (%s) reported that %s (%s) became idle @ %s"
-#~ msgstr "%s (%s) informa que %s (%s) pasa a estar ausente @ %s"
+#~ msgstr "%s (%s) informa que %s (%s) pasa a estar inactivo @ %s"
 
 #~ msgid "%s (%s) reported that %s (%s) returned from idle @ %s"
-#~ msgstr "%s (%s) informa que %s (%s) ya no está ausente @ %s"
+#~ msgstr "%s (%s) informa que %s (%s) está activo ahora @ %s"
 
 #~ msgid "%s (%s) reported that %s signed on @ %s"
 #~ msgstr "%s (%s) informa que %s se ha conectado @ %s"
@@ -15738,9 +17033,6 @@
 #~ msgid "%s (%s) reported that %s returned from idle @ %s"
 #~ msgstr "%s (%s) informa que %s vuelve a estar activo @ %s"
 
-#~ msgid "%s (Code %s)"
-#~ msgstr "%s (CĂłdigo %s)"
-
 #~ msgid "Portuguese-Portugal"
 #~ msgstr "Portugués de Portugal"
 
@@ -15908,9 +17200,6 @@
 #~ msgid "Rehashing server"
 #~ msgstr "El servidor está efectuando la operación «rehash»"
 
-#~ msgid "No such server"
-#~ msgstr "No existe el servidor"
-
 #~ msgid "No nickname given"
 #~ msgstr "No se indicĂł un apodo"
 
@@ -15942,9 +17231,6 @@
 #~ msgid "CTCP Ping"
 #~ msgstr "Ping CTCP"
 
-#~ msgid "You have left %s"
-#~ msgstr "Ha abandonado %s"
-
 #~ msgid "IRC Part"
 #~ msgstr "Salir de IRC"
 
@@ -16003,9 +17289,6 @@
 #~ msgid "Age:"
 #~ msgstr "Edad:"
 
-#~ msgid "City:"
-#~ msgstr "Ciudad:"
-
 #~ msgid "State:"
 #~ msgstr "Estado:"
 
@@ -16110,9 +17393,6 @@
 #~ msgid "Refresh"
 #~ msgstr "Refrescar"
 
-#~ msgid "List of subscribed chats"
-#~ msgstr "Lista de los chats suscritos"
-
 #~ msgid "Allows you to add chat rooms to your buddy list."
 #~ msgstr "Permite añadir salas de chat a su lista de amigos."
 
@@ -16256,9 +17536,6 @@
 #~ "esta aplicación, y no está garantizado que funcione. Se recomienda que "
 #~ "utilice el protocolo AIM/ICQ para conectarse a ICQ"
 
-#~ msgid "%s has mail from %s: %s"
-#~ msgstr "%s tiene correo de %s: %s"
-
 #~ msgid "%s has new mail."
 #~ msgstr "%s tiene nuevo correo."
 
--- a/po/fi.po	Mon Oct 16 20:15:30 2006 +0000
+++ b/po/fi.po	Mon Oct 16 20:20:14 2006 +0000
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: Gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-09 17:59+0300\n"
-"PO-Revision-Date: 2006-08-09 18:00+0300\n"
+"POT-Creation-Date: 2006-10-13 21:38+0300\n"
+"PO-Revision-Date: 2006-10-13 21:38+0300\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -31,783 +31,1029 @@
 msgid "Send instant messages over multiple protocols"
 msgstr "Lähetä pikaviestejä monilla eri yhteyskäytännöillä"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ciphertest.c:264
-msgid "Cipher Test"
-msgstr "Salaustesti"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/ciphertest.c:267 ../plugins/ciphertest.c:269
-msgid "Tests the ciphers that ship with gaim."
-msgstr "Testaa Gaimin mukana tulevat salausmenetelmät"
-
-#: ../plugins/contact_priority.c:61
-msgid "Buddy is idle"
-msgstr "Tuttava on jouten"
-
-#: ../plugins/contact_priority.c:62
-msgid "Buddy is away"
-msgstr "Tuttava on poissa"
-
-#: ../plugins/contact_priority.c:63
-msgid "Buddy is \"extended\" away"
-msgstr "Tuttava on \"pidennetysti\" poissa"
-
-#. Not used yet.
-#: ../plugins/contact_priority.c:66
-msgid "Buddy is mobile"
-msgstr "Tuttava on liikkeellä"
-
-#: ../plugins/contact_priority.c:68
-msgid "Buddy is offline"
-msgstr "Tuttava on poissa linjoilta"
-
-#: ../plugins/contact_priority.c:90
-msgid "Point values to use when..."
-msgstr "Pistearvoja käytetään kun..."
-
-#: ../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 ""
-"Tuttava, jolla on <i>suurin pistemäärä</i>, on tärkein kontaktiryhmässä.\n"
-
-#: ../plugins/contact_priority.c:125
-msgid "Use last buddy when scores are equal"
-msgstr "Käytä viimeisintä tuttavaa, kun pisteet ovat samat"
-
-#: ../plugins/contact_priority.c:130
-msgid "Point values to use for account..."
-msgstr "Käytettävät pistearvot käyttäjätilille..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/contact_priority.c:182
-msgid "Contact Priority"
-msgstr "Kontaktin tärkeys"
-
-#. *< name
-#. *< version
-#. *< summary
-#: ../plugins/contact_priority.c:185
-msgid ""
-"Allows for controlling the values associated with different buddy states."
-msgstr "Mahdollistaa tuttavan tila-arvojen hallinnan"
-
-#. *< description
-#: ../plugins/contact_priority.c:187
-msgid ""
-"Allows for changing the point values of idle/away/offline states for buddies "
-"in contact priority computations."
-msgstr ""
-"Mahdollistaa pistearvojen muuttamisen jouten/poissa/poissa linjoilta -"
-"tiloille kontaktiryhmän prioriteettilaskelmia varten."
-
-#. *< api_version
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/crazychat/cc_gaim_plugin.c:146
-msgid "Crazychat"
-msgstr "Hassujuttelu"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/crazychat/cc_gaim_plugin.c:149
-msgid "Plugin to establish a Crazychat session."
-msgstr "Hassujutteluistunnot mahdollistava liitännäinen."
-
-#. *  description
-#: ../plugins/crazychat/cc_gaim_plugin.c:151
-msgid "Uses Gaim to obtain buddy ips to connect for a Crazychat session"
-msgstr "Hae tuttavien IP-osoitteet Gaimin avulla hassujutteluistuntoa varten"
-
-#. make the network configuration frame
-#: ../plugins/crazychat/cc_gaim_plugin.c:295
-msgid "Network Configuration"
-msgstr "Verkkoasetukset"
-
-#: ../plugins/crazychat/cc_gaim_plugin.c:307
-msgid "TCP port"
-msgstr "TCP-portti"
-
-#: ../plugins/crazychat/cc_gaim_plugin.c:317
-msgid "UDP port"
-msgstr "UDP-portti"
-
-#. make the feature configuration frame
-#: ../plugins/crazychat/cc_gaim_plugin.c:329
-msgid "Feature Calibration"
-msgstr "Piirteiden tarkistus"
-
-#. add enabled / disabled
-#: ../plugins/crazychat/cc_gaim_plugin.c:345 ../src/gtkaccount.c:2258
-#: ../src/gtkplugin.c:574
-msgid "Enabled"
-msgstr "Käytössä"
-
-#: ../plugins/crazychat/cc_gaim_plugin.c:350
-msgid "Disabled"
-msgstr "Pois päältä"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/dbus-example.c:155
-msgid "DBus Example"
-msgstr "DBus-esimerkki"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/dbus-example.c:158 ../plugins/dbus-example.c:160
-msgid "DBus Plugin Example"
-msgstr "DBus-esimerkkiliitännäinen"
-
-#: ../plugins/docklet/docklet.c:154
-msgid "Right-click for more unread messages...\n"
-msgstr "Näytä lisää viestejä hiiren oikealla painikkeella...\n"
-
-#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3239
-#, c-format
-msgid "%d unread message from %s\n"
-msgid_plural "%d unread messages from %s\n"
-msgstr[0] "%d lukematon viesti käyttäjältä %s\n"
-msgstr[1] "%d lukematonta viestiä käyttäjältä %s\n"
-
-#: ../plugins/docklet/docklet.c:432
-msgid "Change Status"
-msgstr "Vaihda tila"
-
-#: ../plugins/docklet/docklet.c:435 ../src/gtkstatusbox.c:673
-#: ../src/protocols/gg/gg.c:996 ../src/protocols/jabber/buddy.c:1363
-#: ../src/protocols/msn/state.c:29 ../src/protocols/msn/state.c:30
-#: ../src/protocols/msn/state.c:37 ../src/protocols/msn/state.c:38
-#: ../src/protocols/novell/novell.c:2843 ../src/protocols/yahoo/yahoo.c:2748
-#: ../src/status.c:155
-msgid "Available"
-msgstr "Tavoitettavissa"
-
-#. Away stuff
-#. get_yahoo_status_from_gaim_status() returns YAHOO_STATUS_CUSTOM for
-#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
-#: ../plugins/docklet/docklet.c:439 ../src/gtkprefs.c:1774
-#: ../src/gtkstatusbox.c:674 ../src/protocols/gg/gg.c:999
-#: ../src/protocols/irc/irc.c:520 ../src/protocols/irc/msgs.c:223
-#: ../src/protocols/jabber/buddy.c:1367 ../src/protocols/novell/novell.c:2846
-#: ../src/protocols/oscar/oscar.c:719 ../src/protocols/oscar/oscar.c:4422
-#: ../src/protocols/oscar/oscar.c:5486 ../src/protocols/silc/buddy.c:1469
-#: ../src/protocols/yahoo/yahoo.c:3218 ../src/protocols/yahoo/yahoo.c:3291
-#: ../src/status.c:158
-msgid "Away"
-msgstr "Poissa"
-
-#: ../plugins/docklet/docklet.c:443 ../src/gtkstatusbox.c:675
-#: ../src/protocols/oscar/oscar.c:723 ../src/protocols/yahoo/yahoo.c:2742
-#: ../src/status.c:157
-msgid "Invisible"
-msgstr "Näkymätön"
-
-#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:2969
-#: ../src/gtkstatusbox.c:676 ../src/protocols/gg/gg.c:993
-#: ../src/protocols/jabber/buddy.c:1361 ../src/protocols/novell/novell.c:2855
-#: ../src/protocols/oscar/oscar.c:794 ../src/protocols/oscar/oscar.c:5458
-#: ../src/protocols/yahoo/yahoo.c:2746 ../src/status.c:154
-msgid "Offline"
-msgstr "Poissa linjoilta"
-
-#: ../plugins/docklet/docklet.c:467 ../src/gtkstatusbox.c:681
-msgid "New..."
-msgstr "Uusi..."
-
-#: ../plugins/docklet/docklet.c:468 ../src/gtkstatusbox.c:682
-msgid "Saved..."
-msgstr "Tallennettu..."
-
-#: ../plugins/docklet/docklet.c:484
-msgid "Show Buddy List"
-msgstr "Näytä tuttavalista"
-
-#: ../plugins/docklet/docklet.c:489 ../src/gtkconv.c:5677
-msgid "Unread Messages"
-msgstr "Lukemattomat viestit"
-
-#: ../plugins/docklet/docklet.c:510
-msgid "New Message..."
-msgstr "Uusi viesti..."
-
-#: ../plugins/docklet/docklet.c:519 ../src/gtkaccount.c:2474
+#: ../console/gntaccount.c:119 ../console/gntblist.c:250
+#: ../console/gntblist.c:368 ../console/gntblist.c:381
+#: ../console/gntplugin.c:169 ../console/gntplugin.c:214
+#: ../console/gntstatus.c:259 ../console/gntstatus.c:267
+#: ../libgaim/protocols/jabber/buddy.c:1363
+#: ../libgaim/protocols/jabber/chat.c:677
+#: ../libgaim/protocols/jabber/chat.c:688
+#: ../libgaim/protocols/jabber/jabber.c:1197
+#: ../libgaim/protocols/qq/group_join.c:322
+#: ../libgaim/protocols/silc/ops.c:1449
+msgid "Error"
+msgstr "Virhe"
+
+#: ../console/gntaccount.c:119
+msgid "Account was not added"
+msgstr "Käyttäjätiliä ei lisätty"
+
+#: ../console/gntaccount.c:120
+msgid "Screenname of an account must be non-empty."
+msgstr "Käyttäjätilin näyttönimi ei voi olla tyhjä."
+
+#: ../console/gntaccount.c:423 ../gtk/gtkaccount.c:558
+msgid "New mail notifications"
+msgstr "Ilmoita uudesta sähköpostista"
+
+#: ../console/gntaccount.c:433 ../gtk/gtkaccount.c:487
+msgid "Remember password"
+msgstr "Muista salasana"
+
+#: ../console/gntaccount.c:474 ../gtk/gtkaccount.c:1400 ../gtk/gtkblist.c:3777
+msgid "Modify Account"
+msgstr "Muokkaa tiliä"
+
+#: ../console/gntaccount.c:474
+msgid "New Account"
+msgstr "Uusi tili"
+
+#: ../console/gntaccount.c:500 ../gtk/gtkaccount.c:399 ../gtk/gtkft.c:695
+msgid "Protocol:"
+msgstr "Yhteyskäytäntö:"
+
+#: ../console/gntaccount.c:508 ../gtk/gtkaccount.c:404 ../gtk/gtkblist.c:4920
+#: ../gtk/plugins/gevolution/new_person_dialog.c:295
+msgid "Screen name:"
+msgstr "Näyttönimi:"
+
+#: ../console/gntaccount.c:521 ../gtk/gtkaccount.c:478
+msgid "Password:"
+msgstr "Salasana:"
+
+#: ../console/gntaccount.c:531 ../gtk/gtkblist.c:4941 ../gtk/gtkblist.c:5306
+msgid "Alias:"
+msgstr "Alias:"
+
+#. Cancel
+#: ../console/gntaccount.c:554 ../console/gntaccount.c:615
+#: ../console/gntaccount.c:834 ../console/gntblist.c:291
+#: ../console/gntblist.c:358 ../console/gntblist.c:391
+#: ../console/gntblist.c:712 ../console/gntblist.c:893
+#: ../console/gntblist.c:984 ../console/gntprefs.c:224
+#: ../console/gntstatus.c:132 ../console/gntstatus.c:423
+#: ../console/gntstatus.c:548 ../gtk/gtkaccount.c:1833
+#: ../gtk/gtkaccount.c:2303 ../gtk/gtkblist.c:5362 ../gtk/gtkdialogs.c:667
+#: ../gtk/gtkdialogs.c:804 ../gtk/gtkdialogs.c:895 ../gtk/gtkdialogs.c:914
+#: ../gtk/gtkdialogs.c:936 ../gtk/gtkdialogs.c:956 ../gtk/gtkdialogs.c:1000
+#: ../gtk/gtkdialogs.c:1038 ../gtk/gtkdialogs.c:1092 ../gtk/gtkdialogs.c:1129
+#: ../gtk/gtkdialogs.c:1154 ../gtk/gtkimhtmltoolbar.c:419
+#: ../gtk/gtkplugin.c:296 ../gtk/gtkpounce.c:1088 ../gtk/gtkprivacy.c:566
+#: ../gtk/gtkprivacy.c:579 ../gtk/gtkprivacy.c:604 ../gtk/gtkprivacy.c:615
+#: ../gtk/gtkrequest.c:270 ../gtk/gtksavedstatuses.c:296
+#: ../libgaim/account.c:964 ../libgaim/account.c:1135
+#: ../libgaim/account.c:1169 ../libgaim/conversation.c:1164
+#: ../libgaim/protocols/gg/gg.c:498 ../libgaim/protocols/gg/gg.c:656
+#: ../libgaim/protocols/gg/gg.c:792 ../libgaim/protocols/gg/gg.c:871
+#: ../libgaim/protocols/jabber/buddy.c:588
+#: ../libgaim/protocols/jabber/buddy.c:1725
+#: ../libgaim/protocols/jabber/buddy.c:1759
+#: ../libgaim/protocols/jabber/chat.c:780
+#: ../libgaim/protocols/jabber/jabber.c:854
+#: ../libgaim/protocols/jabber/jabber.c:1352
+#: ../libgaim/protocols/jabber/xdata.c:338 ../libgaim/protocols/msn/msn.c:251
+#: ../libgaim/protocols/msn/msn.c:266 ../libgaim/protocols/msn/msn.c:281
+#: ../libgaim/protocols/msn/msn.c:296 ../libgaim/protocols/msn/msn.c:313
+#: ../libgaim/protocols/oscar/oscar.c:1387
+#: ../libgaim/protocols/oscar/oscar.c:2151
+#: ../libgaim/protocols/oscar/oscar.c:2190
+#: ../libgaim/protocols/oscar/oscar.c:2238
+#: ../libgaim/protocols/oscar/oscar.c:5732
+#: ../libgaim/protocols/oscar/oscar.c:5784
+#: ../libgaim/protocols/oscar/oscar.c:5936
+#: ../libgaim/protocols/oscar/oscar.c:5961
+#: ../libgaim/protocols/oscar/oscar.c:6017
+#: ../libgaim/protocols/oscar/oscar.c:6086
+#: ../libgaim/protocols/oscar/peer.c:991
+#: ../libgaim/protocols/qq/buddy_info.c:480
+#: ../libgaim/protocols/qq/buddy_opt.c:210
+#: ../libgaim/protocols/qq/buddy_opt.c:400 ../libgaim/protocols/qq/group.c:122
+#: ../libgaim/protocols/qq/group_join.c:136
+#: ../libgaim/protocols/qq/group_join.c:357
+#: ../libgaim/protocols/qq/group_opt.c:140
+#: ../libgaim/protocols/qq/group_opt.c:390 ../libgaim/protocols/qq/qq.c:459
+#: ../libgaim/protocols/qq/sendqueue.c:201
+#: ../libgaim/protocols/qq/sys_msg.c:102 ../libgaim/protocols/qq/sys_msg.c:157
+#: ../libgaim/protocols/qq/sys_msg.c:245
+#: ../libgaim/protocols/sametime/sametime.c:3364
+#: ../libgaim/protocols/sametime/sametime.c:3449
+#: ../libgaim/protocols/sametime/sametime.c:3619
+#: ../libgaim/protocols/sametime/sametime.c:5320
+#: ../libgaim/protocols/sametime/sametime.c:5409
+#: ../libgaim/protocols/sametime/sametime.c:5533
+#: ../libgaim/protocols/silc/buddy.c:467
+#: ../libgaim/protocols/silc/buddy.c:1078
+#: ../libgaim/protocols/silc/buddy.c:1183 ../libgaim/protocols/silc/chat.c:597
+#: ../libgaim/protocols/silc/chat.c:726 ../libgaim/protocols/silc/ops.c:1910
+#: ../libgaim/protocols/silc/silc.c:754 ../libgaim/protocols/silc/silc.c:959
+#: ../libgaim/protocols/yahoo/yahoo.c:3214
+#: ../libgaim/protocols/yahoo/yahoo.c:3223 ../libgaim/request.h:1344
+#: ../libgaim/request.h:1354
+msgid "Cancel"
+msgstr "Peru"
+
+#. Save
+#: ../console/gntaccount.c:558 ../console/gntprefs.c:224
+#: ../console/gntstatus.c:426 ../console/gntstatus.c:536 ../gtk/gtkdebug.c:762
+#: ../gtk/gtkrequest.c:276 ../libgaim/account.c:1168
+#: ../libgaim/protocols/jabber/buddy.c:587
+msgid "Save"
+msgstr "Tallenna"
+
+#: ../console/gntaccount.c:610 ../gtk/gtkaccount.c:1827
+#: ../gtk/gtksavedstatuses.c:293
+#, c-format
+msgid "Are you sure you want to delete %s?"
+msgstr "Haluatko varmasti poistaa %s:n?"
+
+#. Close any other opened delete window
+#: ../console/gntaccount.c:614
+msgid "Delete Account"
+msgstr "Poista tili"
+
+#: ../console/gntaccount.c:615 ../console/gntaccount.c:681
+#: ../console/gntstatus.c:132 ../console/gntstatus.c:194
+#: ../gtk/gtkaccount.c:1832 ../gtk/gtkpounce.c:1087 ../gtk/gtkrequest.c:273
+#: ../gtk/gtksavedstatuses.c:295
+msgid "Delete"
+msgstr "Poista"
+
+#: ../console/gntaccount.c:644 ../console/gntblist.c:1780
+#: ../console/gntui.c:70 ../gtk/gtkaccount.c:2135
 msgid "Accounts"
 msgstr "Käyttäjätilit"
 
-#: ../plugins/docklet/docklet.c:520 ../src/gtkplugin.c:538
-msgid "Plugins"
-msgstr "Liitännäiset"
-
-#: ../plugins/docklet/docklet.c:521 ../src/gtkprefs.c:1915
-msgid "Preferences"
-msgstr "Asetukset"
-
-#: ../plugins/docklet/docklet.c:525
-msgid "Mute Sounds"
-msgstr "Vaimenna äänet"
-
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: ../plugins/docklet/docklet.c:538
-msgid "Quit"
-msgstr "Lopeta"
-
-#: ../plugins/docklet/docklet.c:679
-msgid "Blink tray icon for unread..."
-msgstr "Vilkuta tarjotinkuvaketta, kun uusia..."
-
-#: ../plugins/docklet/docklet.c:682
-msgid "_Instant Messages:"
-msgstr "_Pikaviestejä:"
-
-#: ../plugins/docklet/docklet.c:684 ../plugins/docklet/docklet.c:692
-#: ../plugins/win32/winprefs/winprefs.c:462 ../src/gtkprefs.c:823
-#: ../src/gtkprefs.c:1764 ../src/gtkprefs.c:1778
-msgid "Never"
-msgstr "Ei koskaan"
-
-#: ../plugins/docklet/docklet.c:685
-msgid "In hidden conversations"
-msgstr "Piilotetuissa keskusteluissa"
-
-#: ../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:463 ../src/gtkprefs.c:825
-msgid "Always"
-msgstr "Aina"
-
-#: ../plugins/docklet/docklet.c:690
-msgid "C_hat Messages:"
-msgstr "_Ryhmäkeskusteluviestejä:"
-
-#: ../plugins/docklet/docklet.c:693
-msgid "When my nick is said"
-msgstr "Kun tuttavanimeni mainitaan"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/docklet/docklet.c:720
-msgid "System Tray Icon"
-msgstr "Tarjotinkuvake"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/docklet/docklet.c:723
-msgid "Displays an icon for Gaim in the system tray."
-msgstr "Näyttää Gaim-kuvakkeen järjestelmän kuvaketarjottimella."
-
-#. *  description
-#: ../plugins/docklet/docklet.c:725
-msgid ""
-"Displays a system tray icon (in GNOME, KDE, or Windows for example) to show "
-"the current status of Gaim, allow fast access to commonly used functions, "
-"and to toggle display of the buddy list. Also provides options to blink for "
-"unread messages."
-msgstr ""
-"Näyttää tarjotinkuvakkeen (esim. Gnomessa, KDE:ssä tai Windowsissa) joka "
-"ilmaisee Gaimin senhetkisen tilan ja mahdollistaa nopean pääsyn usein "
-"käytettyihin toimintoihin sekä tuttavalistan näytön. Tarjoaa myös valinnat "
-"tarjotinkuvakkeen vilkuttamiselle uusien viestien saapuessa."
-
-#: ../plugins/docklet/eggtrayicon.c:123
-msgid "Orientation"
-msgstr "Asento"
-
-#: ../plugins/docklet/eggtrayicon.c:124
-msgid "The orientation of the tray."
-msgstr "Tarjottimen asento."
-
-#: ../plugins/extplacement.c:80
-msgid "By conversation count"
-msgstr "Keskustelujen määrän mukaan"
-
-#: ../plugins/extplacement.c:101
-msgid "Conversation Placement"
-msgstr "Keskustelun asettelu"
-
-#: ../plugins/extplacement.c:106
-msgid "Number of conversations per window"
-msgstr "Keskustelujen määrä per ikkuna"
-
-#: ../plugins/extplacement.c:112
-msgid "Separate IM and Chat windows when placing by number"
-msgstr "Erota pikaviesti- ja ryhmäkeskusteluikkunat aseteltaessa määrän mukaan"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/extplacement.c:135
-msgid "ExtPlacement"
-msgstr "Lisäasettelu"
-
-#. *< name
-#. *< version
-#: ../plugins/extplacement.c:137
-msgid "Extra conversation placement options."
-msgstr "Keskustelun lisäasetteluvalinnat."
-
-#. *< summary
-#. *  description
-#: ../plugins/extplacement.c:139
-msgid ""
-"Restrict the number of conversations per windows, optionally separating IMs "
-"and Chats"
-msgstr ""
-"Rajoita keskustelujen määrää ikkunaa kohti, valinnaisesti erotellen "
-"pikaviesti- ja ryhmäkeskustelut"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/filectl.c:248
-msgid "Gaim File Control"
-msgstr "Gaimin tiedostohallinta"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/filectl.c:251 ../plugins/filectl.c:253
-msgid "Allows you to control Gaim by entering commands in a file."
-msgstr "Mahdollistaa Gaimin hallinnan komentotiedostolla."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/gaiminc.c:91
-msgid "Gaim Demonstration Plugin"
-msgstr "Gaim-esittelyliitännäinen"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/gaiminc.c:94
-msgid "An example plugin that does stuff - see the description."
-msgstr "Esimerkkiliitännäinen joka tekee jotain - katso kuvaus."
-
-#. *  description
-#: ../plugins/gaiminc.c:96
-msgid ""
-"This is a really cool plugin that does a lot of stuff:\n"
-"- It tells you who wrote the program when you log in\n"
-"- It reverses all incoming text\n"
-"- It sends a message to people on your list immediately when they sign on"
-msgstr ""
-"Tämä liitännäinen on tosi viilee ja tekee vaikka mitä:\n"
-"- Kertoo kuka laati ohjelman kun kirjaudut sisään\n"
-"- Kääntää kaiken tulevan tekstin ympäri\n"
-"- Lähettää viestin listallaoleville tuttavillesi aina kun he kirjautuvat "
-"sisään"
-
-#: ../plugins/gaimrc.c:41
-msgid "Cursor Color"
-msgstr "Kohdistimen väri"
-
-#: ../plugins/gaimrc.c:42
-msgid "Secondary Cursor Color"
-msgstr "Toissijainen kohdistimen väri"
-
-#: ../plugins/gaimrc.c:43
-msgid "Hyperlink Color"
-msgstr "Hyperlinkin väri"
-
-#: ../plugins/gaimrc.c:56
-msgid "GtkTreeView Expander Size"
-msgstr "Laajentajan koko"
-
-#: ../plugins/gaimrc.c:57
-msgid "GtkTreeView Horizontal Separation"
-msgstr "GtkTreeView - leveyssuuntainen erotus"
-
-#: ../plugins/gaimrc.c:76
-msgid "Conversation Entry"
-msgstr "Keskustelumerkintä"
-
-#: ../plugins/gaimrc.c:77
-msgid "Conversation History"
-msgstr "Keskusteluhistoria"
-
-#: ../plugins/gaimrc.c:78
-msgid "Log Viewer"
-msgstr "Lokikatselin"
-
-#: ../plugins/gaimrc.c:79
-msgid "Request Dialog"
-msgstr "Pyyntövalintaikkuna"
-
-#: ../plugins/gaimrc.c:80
-msgid "Notify Dialog"
-msgstr "Huomautusvalintaikunna"
-
-#: ../plugins/gaimrc.c:91
-msgid "GtkTreeView Indent Expanders"
-msgstr "Sisennä laajentajat"
-
-#: ../plugins/gaimrc.c:287
-#, c-format
-msgid "Select Color for %s"
-msgstr "Valitse %s:n väri"
-
-#: ../plugins/gaimrc.c:289
-msgid "Select Color"
-msgstr "Valitse väri"
-
-#: ../plugins/gaimrc.c:324
-#, c-format
-msgid "Select Font for %s"
-msgstr "Valitse %s:n kirjasin"
-
-#: ../plugins/gaimrc.c:364
-msgid "Select Interface Font"
-msgstr "Valitse käyttöliittymän kirjasin"
-
-#: ../plugins/gaimrc.c:420
-msgid "General"
-msgstr "Yleinen"
-
-#: ../plugins/gaimrc.c:425
-msgid "GTK+ Interface Font"
-msgstr "GTK+-käyttöliittymän kirjasin"
-
-#: ../plugins/gaimrc.c:445
-msgid "GTK+ Text Shortcut Theme"
-msgstr "GTK+-tekstioikopolkuteema"
-
-#: ../plugins/gaimrc.c:480
-msgid "Interface colors"
-msgstr "Käyttöliittymän värit"
-
-#: ../plugins/gaimrc.c:504
-msgid "Widget Sizes"
-msgstr "Säädinkoot"
-
-#: ../plugins/gaimrc.c:525
-msgid "Fonts"
-msgstr "Kirjasimet"
-
-#: ../plugins/gaimrc.c:548
-msgid "Tools"
-msgstr "Työkalut"
-
-#: ../plugins/gaimrc.c:553
-#, c-format
-msgid "Write settings to %s%sgtkrc-2.0"
-msgstr "Kirjoita asetukset tiedostoon %s%sgtkrc-2.0"
-
-#: ../plugins/gaimrc.c:561
-msgid "Re-read gtkrc files"
-msgstr "Lue uudelleen gtkrc-tiedostot"
-
-#: ../plugins/gaimrc.c:588
-msgid "Gaim GTK+ Theme Control"
-msgstr "Gaimin GTK+-teemanhallinta"
-
-#: ../plugins/gaimrc.c:590 ../plugins/gaimrc.c:591
-msgid "Provides access to commonly used gtkrc settings."
-msgstr "Antaa pääsyn usein käytettyihin gtkrc-asetuksiin."
-
-#. Configuration frame
-#: ../plugins/gestures/gestures.c:235
-msgid "Mouse Gestures Configuration"
-msgstr "Hiirieleasetukset"
-
-#: ../plugins/gestures/gestures.c:242
-msgid "Middle mouse button"
-msgstr "Keskimmäinen hiiren painike"
-
-#: ../plugins/gestures/gestures.c:247
-msgid "Right mouse button"
-msgstr "Oikea hiiren painike"
-
-#. "Visual gesture display" checkbox
-#: ../plugins/gestures/gestures.c:259
-msgid "_Visual gesture display"
-msgstr "_Visuaalinen ele -näyttö"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/gestures/gestures.c:289
-msgid "Mouse Gestures"
-msgstr "Hiirieleet"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/gestures/gestures.c:292
-msgid "Provides support for mouse gestures"
-msgstr "Lisää tuen hiirieleille"
-
-#. *  description
-#: ../plugins/gestures/gestures.c:294
-msgid ""
-"Allows support for mouse gestures in conversation windows.\n"
-"Drag the middle mouse button to perform certain actions:\n"
-"\n"
-"Drag down and then to the right to close a conversation.\n"
-"Drag up and then to the left to switch to the previous conversation.\n"
-"Drag up and then to the right to switch to the next conversation."
-msgstr ""
-"Mahdollistaa hiirieleiden käytön keskusteluikkunassa.\n"
-"Pidä keskimmäistä nappia alhaalla tehdessäsi seuraavia toimintoja:\n"
-"\n"
-"Liikuta alas ja sitten oikealle sulkeaksesi keskusteluikkunan.\n"
-"Liikuta ylös ja sitten vasemmalle vaihtaaksesi edelliseen keskusteluun.\n"
-"Liikuta ylös ja sitten oikealle vaihtaaksesi seuraavaan keskusteluun."
+#: ../console/gntaccount.c:650
+msgid "You can enable/disable accounts from the following list."
+msgstr ""
+"Voit ottaa käyttöön/pois käytöstä käyttäjätilejä seuraavasta luettelosta."
+
+#: ../console/gntaccount.c:673 ../console/gntaccount.c:833
+#: ../console/gntblist.c:291 ../console/gntblist.c:358
+#: ../console/gntblist.c:391 ../console/gntnotify.c:306
+#: ../console/gntstatus.c:184 ../gtk/gtkaccount.c:2302 ../gtk/gtkblist.c:5361
+#: ../gtk/gtkconv.c:1632 ../gtk/gtkrequest.c:274
+#: ../libgaim/protocols/gg/gg.c:870 ../libgaim/protocols/oscar/oscar.c:2429
+#: ../libgaim/protocols/qq/sys_msg.c:102 ../libgaim/protocols/qq/sys_msg.c:157
+#: ../libgaim/protocols/qq/sys_msg.c:245
+#: ../libgaim/protocols/sametime/sametime.c:5408
+#: ../libgaim/protocols/silc/chat.c:596
+msgid "Add"
+msgstr "Lisää"
+
+#: ../console/gntaccount.c:677
+msgid "Modify"
+msgstr "Muokkaa"
+
+#: ../console/gntaccount.c:758 ../gtk/gtkaccount.c:2251
+#, c-format
+msgid "%s%s%s%s has made %s his or her buddy%s%s"
+msgstr "%s%s%s%s on tehnyt käyttäjästä %s tuttavansa%s%s"
+
+#: ../console/gntaccount.c:831 ../gtk/gtkaccount.c:2300
+msgid "Add buddy to your list?"
+msgstr "Lisää tuttava listalle?"
+
+#: ../console/gntblist.c:242
+msgid "You must provide a screename for the buddy."
+msgstr "Tuttavan näyttönimi on annettava."
+
+#: ../console/gntblist.c:244
+msgid "You must provide a group."
+msgstr "Ryhmä on määritettävä."
+
+#: ../console/gntblist.c:246
+msgid "You must select an account."
+msgstr "Käyttäjätili täytyy valita."
+
+#: ../console/gntblist.c:250
+msgid "Error adding buddy"
+msgstr "Virhe lisättäessä tuttavaa"
+
+#: ../console/gntblist.c:275 ../gtk/gtkaccount.c:1896
+#: ../gtk/gtksavedstatuses.c:893 ../libgaim/protocols/oscar/oscar.c:2803
+msgid "Screen Name"
+msgstr "Näyttönimi"
+
+#: ../console/gntblist.c:278 ../console/gntblist.c:350 ../gtk/gtkdialogs.c:913
+#: ../gtk/gtkdialogs.c:935 ../gtk/gtkdialogs.c:955 ../gtk/gtkrequest.c:277
+#: ../libgaim/protocols/silc/chat.c:587
+msgid "Alias"
+msgstr "Alias"
+
+#: ../console/gntblist.c:281 ../console/gntblist.c:353
+msgid "Group"
+msgstr "Ryhmä"
+
+#: ../console/gntblist.c:284 ../console/gntblist.c:341
+#: ../console/gntnotify.c:155 ../console/gntstatus.c:514
+#: ../gtk/gtknotify.c:402 ../gtk/gtkpounce.c:1255
+#: ../gtk/plugins/gevolution/gevolution.c:450 ../libgaim/plugins/idle.c:153
+#: ../libgaim/plugins/idle.c:189
+msgid "Account"
+msgstr "Tili"
+
+#: ../console/gntblist.c:290 ../console/gntblist.c:752 ../gtk/gtkblist.c:4874
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:447
+#: ../libgaim/protocols/silc/buddy.c:736
+#: ../libgaim/protocols/silc/buddy.c:1030
+#: ../libgaim/protocols/silc/buddy.c:1075
+#: ../libgaim/protocols/silc/buddy.c:1174
+#: ../libgaim/protocols/yahoo/yahoo.c:3128
+msgid "Add Buddy"
+msgstr "Lisää tuttava"
+
+#: ../console/gntblist.c:290
+msgid "Please enter buddy information."
+msgstr "Syötä tuttavan tiedot."
+
+#: ../console/gntblist.c:313 ../libgaim/blist.c:1190
+msgid "Chats"
+msgstr "Ryhmäkeskustelut"
 
 #. Extract their Name and put it in
 #. Contact Info
 #. Personal
 #. Business
-#: ../plugins/gevolution/add_buddy_dialog.c:131
-#: ../plugins/gevolution/assoc-buddy.c:119 ../src/gtkplugin.c:587
-#: ../src/gtkroomlist.c:604 ../src/protocols/jabber/jabber.c:771
-#: ../src/protocols/msn/msn.c:1529 ../src/protocols/msn/msn.c:1582
-#: ../src/protocols/msn/msn.c:1603
+#: ../console/gntblist.c:347 ../gtk/gtkplugin.c:589 ../gtk/gtkroomlist.c:600
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:132
+#: ../gtk/plugins/gevolution/assoc-buddy.c:123
+#: ../libgaim/protocols/jabber/jabber.c:785
+#: ../libgaim/protocols/msn/msn.c:1533 ../libgaim/protocols/msn/msn.c:1586
+#: ../libgaim/protocols/msn/msn.c:1608 ../libgaim/protocols/qq/buddy_info.c:42
 msgid "Name"
 msgstr "Nimi"
 
-#: ../plugins/gevolution/add_buddy_dialog.c:142
-msgid "Instant Messaging"
-msgstr "Pikaviestintä"
-
-#: ../plugins/gevolution/add_buddy_dialog.c:442 ../src/gtkblist.c:4535
-#: ../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:2991
-msgid "Add Buddy"
-msgstr "Lisää tuttava"
-
-#. Add the label.
-#: ../plugins/gevolution/add_buddy_dialog.c:455
-msgid "Select a person from your address book below, or add a new person."
-msgstr "Valitse henkilö allaolevasta osoitekirjasta, tai lisää uusi henkilö."
-
-#. "Search"
-#: ../plugins/gevolution/add_buddy_dialog.c:468
-#: ../plugins/gevolution/assoc-buddy.c:353
-#: ../src/protocols/jabber/buddy.c:1720 ../src/protocols/oscar/oscar.c:6088
-#: ../src/protocols/sametime/sametime.c:5529
-msgid "Search"
-msgstr "Etsi"
-
-#: ../plugins/gevolution/add_buddy_dialog.c:549
-#: ../plugins/gevolution/new_person_dialog.c:307 ../src/gtkblist.c:4619
-#: ../src/gtkblist.c:4982
-msgid "Group:"
-msgstr "Ryhmä:"
-
-#. "New Person" button
-#: ../plugins/gevolution/add_buddy_dialog.c:575
-#: ../plugins/gevolution/assoc-buddy.c:464
-#: ../plugins/gevolution/new_person_dialog.c:251
-msgid "New Person"
-msgstr "Uusi henkilö"
-
-#. "Select Buddy" button
-#: ../plugins/gevolution/add_buddy_dialog.c:592
-msgid "Select Buddy"
-msgstr "Valitse tuttava"
-
-#. Add the label.
-#: ../plugins/gevolution/assoc-buddy.c:340
-msgid ""
-"Select a person from your address book to add this buddy to, or create a new "
-"person."
-msgstr ""
-"Valitse henkilö osoitekirjasta johon lisäät tämän tuttavan, tai luo uusi "
-"henkilö."
-
-#. Add the expander
-#: ../plugins/gevolution/assoc-buddy.c:428
-msgid "User _details"
-msgstr "Käyttäjän tiedot"
-
-#. "Associate Buddy" button
-#: ../plugins/gevolution/assoc-buddy.c:481
-msgid "_Associate Buddy"
-msgstr "_Yhdistä tuttava"
-
-#: ../plugins/gevolution/eds-utils.c:73 ../plugins/gevolution/eds-utils.c:86
-#: ../src/protocols/jabber/jabber.c:1134
-msgid "None"
-msgstr "Ei mitään"
-
-#: ../plugins/gevolution/gevo-util.c:64 ../plugins/gevolution/gevolution.c:96
-#: ../src/blist.c:516 ../src/blist.c:1278 ../src/blist.c:1505
-#: ../src/gtkblist.c:4425 ../src/protocols/jabber/roster.c:67
-msgid "Buddies"
-msgstr "Tuttavat"
-
-#: ../plugins/gevolution/gevolution.c:262
-#: ../plugins/gevolution/gevolution.c:268
-msgid "Unable to send e-mail"
-msgstr "Sähköpostia ei voitu lähettää."
-
-#: ../plugins/gevolution/gevolution.c:263
-msgid "The evolution executable was not found in the PATH."
-msgstr "Suoritettava evolution-tiedosto ei löytynyt PATH-muuttujasta."
-
-#: ../plugins/gevolution/gevolution.c:269
-msgid "The specified buddy was not found in the Evolution Contacts."
-msgstr "Määriteltyä tuttavaa ei löydetty Evolutionin yhteystiedoista."
-
-#: ../plugins/gevolution/gevolution.c:286
-msgid "Add to Address Book"
-msgstr "Lisää osoitekirjaan"
-
-#: ../plugins/gevolution/gevolution.c:290
-msgid "Send E-Mail"
-msgstr "Lähetä sähköposti"
-
-#. Configuration frame
-#: ../plugins/gevolution/gevolution.c:417
-msgid "Evolution Integration Configuration"
-msgstr "Evolution-integraatioasetukset"
-
-#. Label
-#: ../plugins/gevolution/gevolution.c:420
-msgid "Select all accounts that buddies should be auto-added to."
-msgstr "Valitse kaikki tilit, joihin tuttavat lisätään automaattisesti."
-
-#: ../plugins/gevolution/gevolution.c:450 ../plugins/idle.c:153
-#: ../plugins/idle.c:189 ../src/gtknotify.c:402 ../src/gtkpounce.c:1255
-msgid "Account"
-msgstr "Tili"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/gevolution/gevolution.c:527
-msgid "Evolution Integration"
-msgstr "Evolution-integrointi"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/gevolution/gevolution.c:530
-#: ../plugins/gevolution/gevolution.c:532
-msgid "Provides integration with Evolution."
-msgstr "Mahdollistaa integroinnin Evolutionin kanssa."
-
-#: ../plugins/gevolution/new_person_dialog.c:267
-msgid "Please enter the person's information below."
-msgstr "Syötä henkilön tiedot alle."
-
-#: ../plugins/gevolution/new_person_dialog.c:271
-msgid "Please enter the buddy's screen name and account type below."
-msgstr "Syötä tuttavan näyttönimi ja käyttäjätilin tyyppi alle."
-
-#: ../plugins/gevolution/new_person_dialog.c:291
-msgid "Account type:"
-msgstr "Käyttäjätilin tyyppi:"
-
-#: ../plugins/gevolution/new_person_dialog.c:295 ../src/gtkaccount.c:779
-#: ../src/gtkblist.c:4581
-msgid "Screen name:"
-msgstr "Näyttönimi:"
-
-#. Optional Information section
-#: ../plugins/gevolution/new_person_dialog.c:315
-msgid "Optional information:"
-msgstr "Valinnaisia tietoja:"
-
-#. Label
-#: ../plugins/gevolution/new_person_dialog.c:338 ../src/gtkaccount.c:421
-#: ../src/gtkaccount.c:443 ../src/protocols/oscar/oscar.c:625
-msgid "Buddy Icon"
-msgstr "Tuttavakuvake"
-
-#: ../plugins/gevolution/new_person_dialog.c:350
-msgid "First name:"
-msgstr "Etunimi:"
-
-#: ../plugins/gevolution/new_person_dialog.c:362
-msgid "Last name:"
-msgstr "Sukunimi:"
-
-#: ../plugins/gevolution/new_person_dialog.c:382
-msgid "E-mail:"
-msgstr "Sähköposti:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/gtk-signals-test.c:160
-msgid "GTK Signals Test"
-msgstr "GTK-signaalitesti"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/gtk-signals-test.c:163 ../plugins/gtk-signals-test.c:165
-msgid "Test to see that all ui signals are working properly."
-msgstr ""
-"Kokeile nähdäksesi, että kaikki käyttöliittymäsignaalit toimivat oikein."
-
-#: ../plugins/history.c:120
+#: ../console/gntblist.c:356 ../console/gntblist.c:754 ../gtk/gtkblist.c:5252
+msgid "Add Chat"
+msgstr "Lisää ryhmäkeskustelu"
+
+#: ../console/gntblist.c:357
+msgid "You can edit more information from the context menu later."
+msgstr "Voit muokata lisää tietoja myöhemmin pikavalikosta."
+
+#: ../console/gntblist.c:368 ../console/gntblist.c:381
+msgid "Error adding group"
+msgstr "Virhe lisättäessä ryhmää"
+
+#: ../console/gntblist.c:369
+msgid "You must give a name for the group to add."
+msgstr "Lisättävän ryhmän nimi on annettava."
+
+#: ../console/gntblist.c:382
+msgid "A group with the name already exists."
+msgstr "Valitun niminen ryhmä on jo olemassa"
+
+#: ../console/gntblist.c:389 ../console/gntblist.c:756 ../gtk/gtkblist.c:5358
+#: ../libgaim/protocols/sametime/sametime.c:5319
+#: ../libgaim/protocols/sametime/sametime.c:5406
+msgid "Add Group"
+msgstr "Lisää ryhmä"
+
+#: ../console/gntblist.c:389
+msgid "Enter the name of the group"
+msgstr "Anna ryhmän nimi"
+
+#: ../console/gntblist.c:711
+msgid "Edit Chat"
+msgstr "Muokkaa ryhmäkeskustelua"
+
+#: ../console/gntblist.c:711
+msgid "Please Update the necessary fields."
+msgstr "Päivitä vaaditut kentät."
+
+#: ../console/gntblist.c:712 ../console/gntstatus.c:189
+msgid "Edit"
+msgstr "Muokkaa"
+
+#: ../console/gntblist.c:718
+msgid "Auto-join"
+msgstr "Liity automaattisesti"
+
+#: ../console/gntblist.c:726
+msgid "Edit Settings"
+msgstr "Muokkaa asetuksia"
+
+#: ../console/gntblist.c:774 ../libgaim/protocols/silc/chat.c:878
+msgid "Get Info"
+msgstr "Hae tiedot"
+
+#: ../console/gntblist.c:779
+msgid "Add Buddy Pounce"
+msgstr "Lisää tuttavailmoitin"
+
+#: ../console/gntblist.c:786 ../gtk/gtkconv.c:1580
+#: ../libgaim/protocols/oscar/oscar.c:615
+msgid "Send File"
+msgstr "Lähetä tiedosto"
+
+#: ../console/gntblist.c:790
+msgid "View Log"
+msgstr "Näytä loki"
+
+#: ../console/gntblist.c:889
+#, c-format
+msgid "Please enter the new name for %s"
+msgstr "Anna uusi nimi kohteelle %s"
+
+#: ../console/gntblist.c:891 ../console/gntblist.c:892
+#: ../console/gntblist.c:1061
+msgid "Rename"
+msgstr "Nimeä uudelleen"
+
+#: ../console/gntblist.c:891
+msgid "Enter empty string to reset the name."
+msgstr "Syötä tyhjä merkkijono palauttaaksesi oletusnimen."
+
+#: ../console/gntblist.c:964
+msgid "Removing this contact will also remove all the buddies in the contact"
+msgstr "Kontaktin poistaminen poistaa myös kaikki kontaktissa olevat tuttavat"
+
+#: ../console/gntblist.c:972
+msgid "Removing this group will also remove all the buddies in the group"
+msgstr "Ryhmän poistaminen poistaa myös kaikki ryhmässä olevat tuttavat"
+
+#: ../console/gntblist.c:977
+#, c-format
+msgid "Are you sure you want to remove %s?"
+msgstr "Haluatko varmasti poistaa %s:n?"
+
+#. XXX: anything to do with the returned ui-handle?
+#: ../console/gntblist.c:980
+msgid "Confirm Remove"
+msgstr "Vahvista poistaminen"
+
+#: ../console/gntblist.c:983 ../console/gntblist.c:1063 ../gtk/gtkblist.c:1039
+#: ../gtk/gtkconv.c:1629 ../gtk/gtkrequest.c:275
+msgid "Remove"
+msgstr "Poista"
+
+#. Buddy List
+#: ../console/gntblist.c:1038 ../console/gntblist.c:1888
+#: ../console/gntprefs.c:219 ../console/gntui.c:71 ../gtk/gtkblist.c:3894
+#: ../gtk/plugins/win32/winprefs/winprefs.c:327
+msgid "Buddy List"
+msgstr "Tuttavalista"
+
+#: ../console/gntblist.c:1067
+msgid "Place tagged"
+msgstr "Paikka merkitty"
+
+#: ../console/gntblist.c:1070
+msgid "Tag"
+msgstr "Merkitse"
+
+#: ../console/gntblist.c:1105 ../console/gntblist.c:1209
+#, c-format
+msgid "Account: %s (%s)"
+msgstr "Tili: %s (%s)"
+
+#: ../console/gntblist.c:1130
+#, c-format
+msgid ""
+"\n"
+"Idle: %s"
+msgstr ""
+"\n"
+"Jouten: %s"
+
+#: ../console/gntblist.c:1188
+#, c-format
+msgid "Nickname: %s\n"
+msgstr "Kutsumanimi: %s\n"
+
+#: ../console/gntblist.c:1200
+#, c-format
+msgid ""
+"Online: %d\n"
+"Total: %d"
+msgstr ""
+"Kirjautuneena: %d\n"
+"Yhteensä: %d"
+
+#: ../console/gntblist.c:1221
+#, c-format
+msgid ""
+"\n"
+"Last Seen: %s ago"
+msgstr ""
+"\n"
+"Viimeksi nähty: %s sitten"
+
+#: ../console/gntblist.c:1451 ../gtk/gtkstatusbox.c:992
+msgid "New..."
+msgstr "Uusi..."
+
+#: ../console/gntblist.c:1458 ../gtk/gtkstatusbox.c:993
+msgid "Saved..."
+msgstr "Tallennettu..."
+
+#. Create the "Options" frame.
+#: ../console/gntblist.c:1850 ../gtk/gtkpounce.c:766
+msgid "Options"
+msgstr "Valinnat"
+
+#: ../console/gntblist.c:1856
+msgid "Toggle offline buddies"
+msgstr "Näytä/piilota poissaolevat tuttavat"
+
+#: ../console/gntblist.c:1860
+msgid "Sort by status"
+msgstr "Lajittele tilan mukaan"
+
+#: ../console/gntblist.c:1864
+msgid "Sort alphabetically"
+msgstr "Lajittele aakkosittain"
+
+#: ../console/gntblist.c:1868
+msgid "Sort by log size"
+msgstr "Lajittele lokin koon mukaan"
+
+#: ../console/gntconn.c:36
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../console/gntconn.c:39
+#, c-format
+msgid "%s disconnected."
+msgstr "Yhteys katkennut kohteeseen %s."
+
+#: ../console/gntconn.c:40
+#, c-format
+msgid ""
+"%s was disconnected due to the following error:\n"
+"%s"
+msgstr ""
+"Yhteys katkesi kohteeseen %s seuraavasta syystä:\n"
+"%s"
+
+#: ../console/gntconn.c:43 ../gtk/gtkblist.c:3774 ../libgaim/account.c:991
+#: ../libgaim/connection.c:106
+msgid "Connection Error"
+msgstr "Yhteysvirhe"
+
+#: ../console/gntconv.c:71 ../gtk/gtkconv.c:484
+msgid "No such command."
+msgstr "Sellaista komentoa ei ole."
+
+#: ../console/gntconv.c:75 ../gtk/gtkconv.c:491
+msgid "Syntax Error:  You typed the wrong number of arguments to that command."
+msgstr ""
+"Syntaksivirhe: Syötit väärän määrän argumentteja kyseiselle komennolle."
+
+#: ../console/gntconv.c:80 ../gtk/gtkconv.c:496
+msgid "Your command failed for an unknown reason."
+msgstr "Komento epäonnistui tuntemattomasta syystä."
+
+#: ../console/gntconv.c:85 ../gtk/gtkconv.c:502
+msgid "That command only works in chats, not IMs."
+msgstr "Komento toimii vain ryhmäkeskusteluissa, ei pikaviesteissä."
+
+#: ../console/gntconv.c:88 ../gtk/gtkconv.c:505
+msgid "That command only works in IMs, not chats."
+msgstr "Komento toimii vain pikaviesteissä, ei ryhmäkeskusteluissa."
+
+#: ../console/gntconv.c:92 ../gtk/gtkconv.c:509
+msgid "That command doesn't work on this protocol."
+msgstr "Tämä komento ei toimi tälle yhteyskäytännölle."
+
+#: ../console/gntconv.c:99
+msgid "Commands are not supported yet. Message was NOT sent."
+msgstr "Komentoja ei tueta vielä. Viestiä EI lähetetty."
+
+#: ../console/gntconv.c:193
+#, c-format
+msgid "%s (%s -- %s)"
+msgstr "%s (%s -- %s)"
+
+#: ../console/gntconv.c:214
+#, c-format
+msgid "%s [%s]"
+msgstr "%s [%s]"
+
+#: ../console/gntconv.c:344
+msgid "<AUTO-REPLY> "
+msgstr "<AUTOMAATTIVASTAUS> "
+
+#. Print the list of users in the room
+#: ../console/gntconv.c:438
+msgid "List of users:\n"
+msgstr "Luettelo käyttäjistä:\n"
+
+#: ../console/gntconv.c:562 ../gtk/gtkconv.c:378
+msgid "Supported debug options are:  version"
+msgstr "Tuetut vianjäljitysvalinnat ovat: versio"
+
+#: ../console/gntconv.c:597 ../gtk/gtkconv.c:414
+msgid "No such command (in this context)."
+msgstr "Komento ei saatavilla (tässä kontekstissa)."
+
+#: ../console/gntconv.c:600 ../gtk/gtkconv.c:417
+msgid ""
+"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
+"The following commands are available in this context:\n"
+msgstr ""
+"Kirjoita \"/help &lt;komento&gt;\" saadaksesi ohjeen tietystä komennosta.\n"
+"Seuraavat komennot ovat saatavilla tässä kontekstissa:\n"
+
+#: ../console/gntconv.c:639 ../gtk/gtkconv.c:6645
+msgid ""
+"say &lt;message&gt;:  Send a message normally as if you weren't using a "
+"command."
+msgstr ""
+"say &lt;viesti&gt;: Lähetä viesti normaalisti, niin kuin et olisi "
+"käyttämässä komentoa."
+
+#: ../console/gntconv.c:642 ../gtk/gtkconv.c:6648
+msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
+msgstr ""
+"me &lt;toiminta&gt;: Lähetä IRC-tyylinen toiminta tuttavalle tai "
+"keskusteluun."
+
+#: ../console/gntconv.c:645 ../gtk/gtkconv.c:6651
+msgid ""
+"debug &lt;option&gt;:  Send various debug information to the current "
+"conversation."
+msgstr ""
+"debug &lt;valinta&gt;: Lähetä eri debug-tietoja senhetkiseen keskusteluun."
+
+#: ../console/gntconv.c:648 ../gtk/gtkconv.c:6654
+msgid "clear: Clears the conversation scrollback."
+msgstr "clear: Tyhjentää keskustelun"
+
+#: ../console/gntconv.c:651 ../gtk/gtkconv.c:6657
+msgid "help &lt;command&gt;:  Help on a specific command."
+msgstr "help &lt;komento&gt;: Ohje tietylle komennolle."
+
+#: ../console/gntconv.c:656
+msgid "plugins: Show the plugins window."
+msgstr "plugins: Näytä liitännäiset-ikkuna."
+
+#: ../console/gntconv.c:659
+msgid "buddylist: Show the buddylist."
+msgstr "buddylist: Näytä tuttavaluettelo."
+
+#: ../console/gntconv.c:662
+msgid "accounts: Show the accounts window."
+msgstr "accounts: Näytä käyttäjätilit-ikkuna."
+
+#: ../console/gntconv.c:665
+msgid "debugwin: Show the debug window."
+msgstr "debugwin: Näytä virheenjäljitysikkuna."
+
+#: ../console/gntconv.c:668
+msgid "prefs: Show the preference window."
+msgstr "prefs: Näytä asetukset-ikkuna."
+
+#: ../console/gntconv.c:671
+msgid "statuses: Show the savedstatuses window."
+msgstr "statuses: Näytä tallennetut tilat -ikkuna"
+
+#: ../console/gntdebug.c:203 ../console/gntui.c:72 ../gtk/gtkdebug.c:708
+msgid "Debug Window"
+msgstr "Virheenjäljitysikkuna"
+
+#. XXX: Setting the GROW_Y for the following widgets don't make sense. But right now
+#. * it's necessary to make the width of the debug window resizable ... like I said,
+#. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
+#.
+#: ../console/gntdebug.c:220 ../gtk/gtkdebug.c:767
+msgid "Clear"
+msgstr "Tyhjennä"
+
+#: ../console/gntdebug.c:225 ../gtk/gtkdebug.c:776
+msgid "Pause"
+msgstr "Tauko"
+
+#: ../console/gntdebug.c:230 ../gtk/gtkdebug.c:783 ../gtk/gtkdebug.c:784
+msgid "Timestamps"
+msgstr "Aikaleimat"
+
+#: ../console/gntgaim.c:166
+#, c-format
+msgid "%s. Try `%s -h' for more information.\n"
+msgstr "%s. Kirjoita \"%s -h\" saadaksesi lisää tietoja.\n"
+
+#: ../console/gntgaim.c:168
+#, c-format
+msgid ""
+"%s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -n, --nologin       don't automatically login\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+"%s\n"
+"Käyttö: %s [VALITSIN]...\n"
+"\n"
+"  -c, --config=HAK    käytä hakemistoa HAK asetustiedostoille\n"
+"  -d, --debug         kirjoita virheenjäljitysviestit putkeen stdout\n"
+"  -h, --help          näytä tämä ohje ja poistu\n"
+"  -n, --nologin       älä kirjaudu automaattisesti\n"
+"  -v, --version       näytä nykyinen versionumero ja poistu\n"
+
+#. *
+#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
+#.
+#: ../console/gntnotify.c:79 ../gtk/gtkblist.c:3776 ../gtk/gtkdialogs.c:666
+#: ../gtk/gtkdialogs.c:803 ../gtk/gtkdialogs.c:894 ../gtk/gtkrequest.c:269
+#: ../libgaim/account.c:963 ../libgaim/account.c:1134
+#: ../libgaim/protocols/gg/gg.c:497 ../libgaim/protocols/gg/gg.c:655
+#: ../libgaim/protocols/gg/gg.c:791 ../libgaim/protocols/jabber/jabber.c:1351
+#: ../libgaim/protocols/jabber/xdata.c:337 ../libgaim/protocols/msn/msn.c:250
+#: ../libgaim/protocols/msn/msn.c:265 ../libgaim/protocols/msn/msn.c:280
+#: ../libgaim/protocols/msn/msn.c:295 ../libgaim/protocols/oscar/oscar.c:1386
+#: ../libgaim/protocols/oscar/oscar.c:2150
+#: ../libgaim/protocols/oscar/oscar.c:2237
+#: ../libgaim/protocols/oscar/oscar.c:5731
+#: ../libgaim/protocols/oscar/oscar.c:5935
+#: ../libgaim/protocols/oscar/oscar.c:5960
+#: ../libgaim/protocols/oscar/oscar.c:6016
+#: ../libgaim/protocols/silc/buddy.c:466
+#: ../libgaim/protocols/silc/buddy.c:1182 ../libgaim/protocols/silc/chat.c:424
+#: ../libgaim/protocols/silc/chat.c:462 ../libgaim/protocols/silc/chat.c:725
+#: ../libgaim/protocols/silc/ops.c:1297 ../libgaim/protocols/silc/ops.c:1909
+#: ../libgaim/protocols/silc/silc.c:753
+#: ../libgaim/protocols/yahoo/yahoo.c:3213
+#: ../libgaim/protocols/yahoo/yahoo.c:3222 ../libgaim/request.h:1344
+msgid "OK"
+msgstr "OK"
+
+#: ../console/gntnotify.c:146
+msgid "Emails"
+msgstr "Sähköpostit"
+
+#: ../console/gntnotify.c:152 ../console/gntnotify.c:206
+msgid "You have mail!"
+msgstr "Sinulle on postia."
+
+#: ../console/gntnotify.c:155 ../gtk/gtknotify.c:414
+#: ../libgaim/protocols/jabber/jabber.c:1147
+msgid "From"
+msgstr "Lähettäjä"
+
+#: ../console/gntnotify.c:155 ../gtk/gtknotify.c:423
+msgid "Subject"
+msgstr "Aihe"
+
+#: ../console/gntnotify.c:163 ../console/gntplugin.c:193
+#: ../console/gntplugin.c:274 ../console/gntstatus.c:199
+#: ../gtk/gtkrequest.c:272 ../libgaim/protocols/msn/msn.c:357
+#: ../libgaim/protocols/silc/util.c:377
+msgid "Close"
+msgstr "Sulje"
+
+#: ../console/gntnotify.c:182
+#, c-format
+msgid "%s (%s) has %d new message."
+msgid_plural "%s (%s) has %d new messages."
+msgstr[0] "%s (%s): %d uusi viesti."
+msgstr[1] "%s (%s): %d uutta viestiä."
+
+#: ../console/gntnotify.c:206 ../gtk/gtknotify.c:332
+msgid "New Mail"
+msgstr "Uusi sähköposti"
+
+#: ../console/gntnotify.c:229 ../gtk/gtknotify.c:849
+#: ../libgaim/protocols/oscar/oscar.c:2610
+#, c-format
+msgid "Info for %s"
+msgstr "%s tiedot"
+
+#: ../console/gntnotify.c:230 ../gtk/gtknotify.c:850
+#: ../libgaim/protocols/toc/toc.c:476
+msgid "Buddy Information"
+msgstr "Tuttavan tiedot"
+
+#: ../console/gntnotify.c:303
+msgid "Continue"
+msgstr "Jatka"
+
+#: ../console/gntnotify.c:309 ../gtk/gtkconv.c:1608 ../gtk/gtkdebug.c:862
+msgid "Info"
+msgstr "Tiedot"
+
+#: ../console/gntnotify.c:312 ../gtk/gtkconv.c:1569
+msgid "IM"
+msgstr "Pikaviesti"
+
+#: ../console/gntnotify.c:315
+msgid "Join"
+msgstr "Liity"
+
+#: ../console/gntnotify.c:318 ../libgaim/protocols/sametime/sametime.c:3448
+msgid "Invite"
+msgstr "Kutsu"
+
+#: ../console/gntnotify.c:321
+msgid "(none)"
+msgstr "(ei mitään)"
+
+#: ../console/gntplugin.c:117
+#, c-format
+msgid ""
+"Name: %s\n"
+"Version: %s\n"
+"Description: %s\n"
+"Author: %s\n"
+"Website: %s\n"
+"Filename: %s\n"
+msgstr ""
+"Nimi: %s\n"
+"Versio: %s\n"
+"Kuvaus: %s\n"
+"Tekijä: %s\n"
+"Sivusto: %s\n"
+"Tiedostonimi: %s\n"
+
+#: ../console/gntplugin.c:170
+msgid "Plugin need to be loaded before you can configure it."
+msgstr ""
+"Liitännäinen tulee olla käytössä ennen kuin sen asetuksia voidaan muuttaa."
+
+#: ../console/gntplugin.c:208
+msgid "..."
+msgstr "..."
+
+#: ../console/gntplugin.c:209
+msgid "Still need to do something about this."
+msgstr "Tälle täytyy edelleen tehdä jotain."
+
+#: ../console/gntplugin.c:215
+msgid "No configuration options for this plugin."
+msgstr "Tälle liitännäiselle ei ole asetuksia."
+
+#: ../console/gntplugin.c:231 ../console/gntui.c:73 ../gtk/gtkplugin.c:538
+msgid "Plugins"
+msgstr "Liitännäiset"
+
+#: ../console/gntplugin.c:236
+msgid "You can (un)load plugins from the following list."
+msgstr ""
+"Voit ottaa käyttöön/pois käytöstä liitännäisiä seuraavasta luettelosta."
+
+#: ../console/gntplugin.c:279
+msgid "Configure Plugin"
+msgstr "Liitännäisen asetukset"
+
+#: ../console/gntprefs.c:122
+msgid "Show Idle Time"
+msgstr "Näytä joutenoloaika"
+
+#: ../console/gntprefs.c:123
+msgid "Show Offline Buddies"
+msgstr "Näytä poissaolevat tuttavat"
+
+#: ../console/gntprefs.c:129
+msgid "Show Timestamps"
+msgstr "Näytä aikaleimat"
+
+#: ../console/gntprefs.c:130
+msgid "Notify buddies when you are typing"
+msgstr "Ilmoita tuttaville kun kirjoitat heille"
+
+#: ../console/gntprefs.c:136
+msgid "Log format"
+msgstr "Lokin muoto"
+
+#: ../console/gntprefs.c:137
+msgid "Log IMs"
+msgstr "Kirjaa pikaviestit"
+
+#: ../console/gntprefs.c:138
+msgid "Log chats"
+msgstr "Kirjaa ryhmäkeskustelut"
+
+#: ../console/gntprefs.c:139
+msgid "Log status change events"
+msgstr "Kirjaa tilamuutokset"
+
+#. Conversations
+#: ../console/gntprefs.c:220 ../gtk/gtkprefs.c:822 ../gtk/gtkprefs.c:1884
+#: ../gtk/plugins/win32/winprefs/winprefs.c:341
+msgid "Conversations"
+msgstr "Keskustelut"
+
+#: ../console/gntprefs.c:221 ../gtk/gtkprefs.c:1314 ../gtk/gtkprefs.c:1895
+msgid "Logging"
+msgstr "Kirjataan lokiin"
+
+#: ../console/gntprefs.c:223 ../console/gntui.c:74 ../gtk/gtkprefs.c:1920
+msgid "Preferences"
+msgstr "Asetukset"
+
+#: ../console/gntrequest.c:495
+msgid "Not implemented yet."
+msgstr "Ominaisuutta ei ole vielä toteutettu."
+
+#: ../console/gntstatus.c:128
+#, c-format
+msgid "Are you sure you want to delete \"%s\""
+msgstr "Haluatko varmasti poistaa kohteen \"%s\""
+
+#: ../console/gntstatus.c:131
+msgid "Delete Status"
+msgstr "Poista tila"
+
+#: ../console/gntstatus.c:160 ../gtk/gtksavedstatuses.c:526
+msgid "Saved Statuses"
+msgstr "Tallennetut tilat"
+
+#: ../console/gntstatus.c:167 ../console/gntstatus.c:477
+#: ../gtk/gtksavedstatuses.c:433 ../libgaim/protocols/jabber/buddy.c:283
+#: ../libgaim/protocols/jabber/buddy.c:917
+#: ../libgaim/protocols/novell/novell.c:1484
+msgid "Title"
+msgstr "Otsikko"
+
+#: ../console/gntstatus.c:167 ../gtk/gtksavedstatuses.c:448
+msgid "Type"
+msgstr "Tyyppi"
+
+#: ../console/gntstatus.c:167 ../console/gntstatus.c:502
+#: ../console/gntstatus.c:514 ../gtk/gtksavedstatuses.c:459
+#: ../gtk/gtksavedstatuses.c:923 ../libgaim/protocols/bonjour/bonjour.c:256
+#: ../libgaim/protocols/bonjour/bonjour.c:263
+#: ../libgaim/protocols/gg/gg.c:1592 ../libgaim/protocols/gg/gg.c:1602
+#: ../libgaim/protocols/gg/gg.c:1608 ../libgaim/protocols/gg/gg.c:1617
+#: ../libgaim/protocols/gg/gg.c:1622 ../libgaim/protocols/irc/irc.c:244
+#: ../libgaim/protocols/jabber/jabber.c:1214
+#: ../libgaim/protocols/jabber/jabber.c:1224
+#: ../libgaim/protocols/jabber/jabber.c:1234
+#: ../libgaim/protocols/jabber/jabber.c:1244
+#: ../libgaim/protocols/jabber/jabber.c:1254
+#: ../libgaim/protocols/jabber/jabber.c:1266
+#: ../libgaim/protocols/novell/novell.c:2876
+#: ../libgaim/protocols/novell/novell.c:2982
+#: ../libgaim/protocols/novell/novell.c:2988
+#: ../libgaim/protocols/novell/novell.c:2994
+#: ../libgaim/protocols/oscar/oscar.c:5395
+#: ../libgaim/protocols/oscar/oscar.c:5410
+#: ../libgaim/protocols/oscar/oscar.c:5415
+#: ../libgaim/protocols/oscar/oscar.c:5623
+#: ../libgaim/protocols/oscar/oscar.c:5635
+#: ../libgaim/protocols/oscar/oscar.c:5648
+#: ../libgaim/protocols/oscar/oscar.c:5655
+#: ../libgaim/protocols/oscar/oscar.c:5662
+#: ../libgaim/protocols/sametime/sametime.c:3262
+#: ../libgaim/protocols/sametime/sametime.c:3268
+#: ../libgaim/protocols/sametime/sametime.c:3274
+#: ../libgaim/protocols/sametime/sametime.c:3353
+#: ../libgaim/protocols/silc/buddy.c:1544
+#: ../libgaim/protocols/simple/simple.c:246
+#: ../libgaim/protocols/yahoo/yahoo.c:3456
+#: ../libgaim/protocols/yahoo/yahoo.c:3462
+#: ../libgaim/protocols/zephyr/zephyr.c:2333
+msgid "Message"
+msgstr "Viesti"
+
+#. Use
+#: ../console/gntstatus.c:179 ../console/gntstatus.c:531
+msgid "Use"
+msgstr "Käytä"
+
+#: ../console/gntstatus.c:259
+msgid "Invalid title"
+msgstr "Epäkelpo otsikko"
+
+#: ../console/gntstatus.c:260
+msgid "Please enter a non-empty title for the status."
+msgstr "Tilan otsikko ei voi olla tyhjä."
+
+#: ../console/gntstatus.c:267
+msgid "Duplicate title"
+msgstr "Otsikon toisinto"
+
+#: ../console/gntstatus.c:268
+msgid "Please enter a different title for the status."
+msgstr "Anna toinen otsikko tilalle."
+
+#: ../console/gntstatus.c:391
+msgid "Substatus"
+msgstr "Alatila"
+
+#. Set up stuff for the account box
+#: ../console/gntstatus.c:394 ../gtk/gtkblist.c:4968 ../gtk/gtkblist.c:5286
+msgid "Account:"
+msgstr "Käyttäjätili:"
+
+#: ../console/gntstatus.c:402 ../gtk/gtkft.c:698
+msgid "Status:"
+msgstr "Tila:"
+
+#: ../console/gntstatus.c:417
+msgid "Message:"
+msgstr "Viesti:"
+
+#: ../console/gntstatus.c:466
+msgid "Edit Status"
+msgstr "Muokkaa tilaa"
+
+#: ../console/gntstatus.c:485 ../console/gntstatus.c:514
+#: ../gtk/gtksavedstatuses.c:912 ../gtk/gtksavedstatuses.c:1059
+#: ../libgaim/protocols/gg/gg.c:1024 ../libgaim/protocols/gg/gg.c:1575
+#: ../libgaim/protocols/gg/gg.c:1579 ../libgaim/protocols/jabber/buddy.c:623
+#: ../libgaim/protocols/jabber/buddy.c:630
+#: ../libgaim/protocols/jabber/buddy.c:658
+#: ../libgaim/protocols/jabber/jabber.c:1185
+#: ../libgaim/protocols/msn/msn.c:546
+#: ../libgaim/protocols/novell/novell.c:2875
+#: ../libgaim/protocols/novell/novell.c:2879
+#: ../libgaim/protocols/oscar/oscar.c:759
+#: ../libgaim/protocols/oscar/oscar.c:765
+#: ../libgaim/protocols/oscar/oscar.c:768
+#: ../libgaim/protocols/yahoo/yahoo.c:3032
+msgid "Status"
+msgstr "Tila"
+
+#: ../console/gntstatus.c:508
+msgid "Use different status for following accounts"
+msgstr "Käytä eri tilaa seuraaville käyttäjätileille"
+
+#. Save & Use
+#: ../console/gntstatus.c:542
+msgid "Save & Use"
+msgstr "Tallenna ja käytä"
+
+#: ../console/gntui.c:75
+msgid "Statuses"
+msgstr "Tilat"
+
+#: ../console/plugins/gntgf.c:209
+#, c-format
+msgid "%s just signed on"
+msgstr "%s kirjautui sisään"
+
+#: ../console/plugins/gntgf.c:216
+#, c-format
+msgid "%s just signed off"
+msgstr "%s kirjautui ulos"
+
+#: ../console/plugins/gntgf.c:224
+#, c-format
+msgid "%s sent you a message"
+msgstr "%s lähetti sinulle viestin"
+
+#: ../console/plugins/gntgf.c:243
+#, c-format
+msgid "%s said your nick in %s"
+msgstr "%s mainitsi kutsumanimesi keskustelussa %s"
+
+#: ../console/plugins/gntgf.c:245
+#, c-format
+msgid "%s sent a message in %s"
+msgstr "%s lähetti viestin keskustelussa %s"
+
+#: ../console/plugins/gntgf.c:283
+msgid "Buddy signs on/off"
+msgstr "Tuttava kirjautuu sisään/ulos"
+
+#: ../console/plugins/gntgf.c:284
+msgid "You receive an IM"
+msgstr "Saat pikaviestin"
+
+#: ../console/plugins/gntgf.c:285
+msgid "Someone speaks in a chat"
+msgstr "Joku sanoo jotain ryhmäkeskustelussa"
+
+#: ../console/plugins/gntgf.c:286
+msgid "Someone says your name in a chat"
+msgstr "Joku sanoo nimesi ryhmäkeskustelussa"
+
+#: ../console/plugins/gntgf.c:314
+msgid "Notify with a toaster when"
+msgstr "Huomauta leivänpaahtimella kun"
+
+#: ../console/plugins/gntgf.c:329
+msgid "Beep too!"
+msgstr "Anna myös äänimerkki."
+
+#: ../console/plugins/gntgf.c:335
+msgid "Set URGENT for the terminal window."
+msgstr "Aseta pääteikkuna tilaan \"kiireellinen\"."
+
+#: ../console/plugins/gntgf.c:355
+msgid "GntGf"
+msgstr "GntGf"
+
+#: ../console/plugins/gntgf.c:357 ../console/plugins/gntgf.c:358
+msgid "Toaster plugin for GntGaim."
+msgstr "Leivänpaahdin-liitännäinen GntGaim:lle."
+
+#: ../console/plugins/gnthistory.c:119 ../gtk/plugins/history.c:120
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Keskustelu käyttäjän %s kanssa %s:</b><br>"
 
-#: ../plugins/history.c:147
+#: ../console/plugins/gnthistory.c:140 ../gtk/plugins/history.c:147
 msgid "History Plugin Requires Logging"
 msgstr "Historia-liitännäinen vaatii lokiinkirjauksen käyttöä"
 
-#: ../plugins/history.c:148
+#: ../console/plugins/gnthistory.c:141 ../gtk/plugins/history.c:148
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -820,15 +1066,15 @@
 "Lokien käyttöönotto pikaviesteille ja/tai ryhmäkeskusteluille ottaa käyttöön "
 "historiatoiminnon vastaaville keskustelutyypeille."
 
-#: ../plugins/history.c:188
-msgid "History"
-msgstr "Historia"
-
-#: ../plugins/history.c:190
+#: ../console/plugins/gnthistory.c:181
+msgid "GntHistory"
+msgstr "GntHistory"
+
+#: ../console/plugins/gnthistory.c:183 ../gtk/plugins/history.c:190
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Näyttää osan edellistä keskustelua uudessa keskustelussa."
 
-#: ../plugins/history.c:191
+#: ../console/plugins/gnthistory.c:184 ../gtk/plugins/history.c:191
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -836,1436 +1082,91 @@
 "Kun uusi keskustelu aloitetaan, tämä liitännäinen näytää edellisen "
 "keskustelun keskusteluikkunassa."
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/iconaway.c:82
-msgid "Iconify on Away"
-msgstr "Pienennä poissaollessa"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/iconaway.c:85 ../plugins/iconaway.c:87
-msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr "Pienentää tuttavalista- ja keskusteluikkunan poissaoloajaksi."
-
-#: ../plugins/idle.c:158 ../plugins/idle.c:216
-msgid "Minutes"
-msgstr "Minuuttia"
-
-#. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
-#. If that doesn't translate well into your language, drop the 's before translating.
-#: ../plugins/idle.c:165 ../plugins/idle.c:198 ../plugins/idle.c:223
-#: ../plugins/idle.c:315
-msgid "I'dle Mak'er"
-msgstr "Joutenoloajan säätö"
-
-#: ../plugins/idle.c:166 ../plugins/idle.c:255
-msgid "Set Account Idle Time"
-msgstr "Aseta tilin joutenoloaika"
-
-#: ../plugins/idle.c:169 ../plugins/idle.c:227
-msgid "_Set"
-msgstr "_Aseta"
-
-#: ../plugins/idle.c:170 ../plugins/idle.c:203 ../plugins/idle.c:228
-msgid "_Cancel"
-msgstr "_Peru"
-
-#: ../plugins/idle.c:183
-msgid "None of your accounts are idle."
-msgstr "Yksikään käyttäjätileistäsi ei ole jouten."
-
-#: ../plugins/idle.c:199 ../plugins/idle.c:259
-msgid "Unset Account Idle Time"
-msgstr "Poista tilin joutenoloajan asetus"
-
-#: ../plugins/idle.c:202
-msgid "_Unset"
-msgstr "_Poista asetus"
-
-#: ../plugins/idle.c:224 ../plugins/idle.c:263
-msgid "Set Idle Time for All Accounts"
-msgstr "Aseta joutenoloaika kaikille käyttäjätileille"
-
-#: ../plugins/idle.c:268
-msgid "Unset Idle Time for All Idled Accounts"
-msgstr "Ota pois joutenoloaika kaikilta jouten olevilta tileiltä"
-
-#: ../plugins/idle.c:317 ../plugins/idle.c:318
-msgid "Allows you to hand-configure how long you've been idle"
-msgstr "Antaa sinun säätää itse kuinka kauan olet ollut jouten"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ipc-test-client.c:87
-msgid "IPC Test Client"
-msgstr "IPC-testiasiakasohjelma"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/ipc-test-client.c:90
-msgid "Test plugin IPC support, as a client."
-msgstr "Testiliitännäinen - IPC asiakasohjelmana"
-
-#. *  description
-#: ../plugins/ipc-test-client.c:92
-msgid ""
-"Test plugin IPC support, as a client. This locates the server plugin and "
-"calls the commands registered."
-msgstr ""
-"Testiliitännäinen - IPC asiakasohjelmana. Tämä etsii palvelinliitännäisen ja "
-"kutsuu rekisteröityjä komentoja."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ipc-test-server.c:74
-msgid "IPC Test Server"
-msgstr "IPC-testipalvelin"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/ipc-test-server.c:77
-msgid "Test plugin IPC support, as a server."
-msgstr "Testiliitännäinen - IPC palvelimena"
-
-#. *  description
-#: ../plugins/ipc-test-server.c:79
-msgid "Test plugin IPC support, as a server. This registers the IPC commands."
-msgstr "Testiliitännäinen - IPC palvelimena. Tämä rekisteröi IPC-komennot."
-
-#: ../plugins/log_reader.c:1405
-msgid "User is offline."
-msgstr "Käyttäjä on poissa linjoilta."
-
-#: ../plugins/log_reader.c:1411
-msgid "Auto-response sent:"
-msgstr "Automaattinen vastaus lähetetty:"
-
-#: ../plugins/log_reader.c:1421 ../plugins/log_reader.c:1424
-#: ../plugins/statenotify.c:80
-#, c-format
-msgid "%s has signed off."
-msgstr "%s on kirjautunut ulos."
-
-#: ../plugins/log_reader.c:1438
-msgid "One or more messages may have been undeliverable."
-msgstr "Yksi tai useampi viesti on saattanut jäädä lähettämättä."
-
-#: ../plugins/log_reader.c:1448
-msgid "You were disconnected from the server."
-msgstr "Yhteys palvelimeen on katkennut."
-
-#: ../plugins/log_reader.c:1456
-msgid ""
-"You are currently disconnected. Messages will not be received unless you are "
-"logged in."
-msgstr ""
-"Yhteyttä ei tällä hetkellä ole. Viestejä ei vastaanoteta ellet olet "
-"kirjautuneena sisään."
-
-#: ../plugins/log_reader.c:1471
-msgid "Message could not be sent because the maximum length was exceeded."
-msgstr "Viestiä ei voitu lähettää koska suurin viestin koko ylitettiin."
-
-#: ../plugins/log_reader.c:1476
-msgid "Message could not be sent."
-msgstr "Viestiäsi ei voitu lähetettää."
-
-#. The names of IM clients are marked for translation at the request of
-#. translators who wanted to transliterate them.  Many translators
-#. choose to leave them alone.  Choose what's best for your language.
-#: ../plugins/log_reader.c:1838 ../plugins/log_reader.c:1943
-msgid "Adium"
-msgstr "Adium"
-
-#. The names of IM clients are marked for translation at the request of
-#. translators who wanted to transliterate them.  Many translators
-#. choose to leave them alone.  Choose what's best for your language.
-#: ../plugins/log_reader.c:1850 ../plugins/log_reader.c:1947
-msgid "Fire"
-msgstr "Fire"
-
-#. The names of IM clients are marked for translation at the request of
-#. translators who wanted to transliterate them.  Many translators
-#. choose to leave them alone.  Choose what's best for your language.
-#: ../plugins/log_reader.c:1862 ../plugins/log_reader.c:1951
-msgid "Messenger Plus!"
-msgstr "Messenger Plus!"
-
-#. The names of IM clients are marked for translation at the request of
-#. translators who wanted to transliterate them.  Many translators
-#. choose to leave them alone.  Choose what's best for your language.
-#: ../plugins/log_reader.c:1874 ../plugins/log_reader.c:1955
-msgid "MSN Messenger"
-msgstr "MSN Messenger"
-
-#. The names of IM clients are marked for translation at the request of
-#. translators who wanted to transliterate them.  Many translators
-#. choose to leave them alone.  Choose what's best for your language.
-#: ../plugins/log_reader.c:1886 ../plugins/log_reader.c:1959
-msgid "Trillian"
-msgstr "Trillian"
-
-#. Add general preferences.
-#: ../plugins/log_reader.c:1925
-msgid "General Log Reading Configuration"
-msgstr "Yleiset lokikatselimen asetukset"
-
-#: ../plugins/log_reader.c:1929
-msgid "Fast size calculations"
-msgstr "Nopeat koon laskemiset"
-
-#: ../plugins/log_reader.c:1933
-msgid "Use name heuristics"
-msgstr "Käytä nimiheuristiikkaa"
-
-#. Add Log Directory preferences.
-#: ../plugins/log_reader.c:1939
-msgid "Log Directory"
-msgstr "Lokihakemisto"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/log_reader.c:1982
-msgid "Log Reader"
-msgstr "Lokikatselin"
-
-#. *< name
-#. *< version
-#. * summary
-#: ../plugins/log_reader.c:1986
-msgid "Includes other IM clients' logs in the log viewer."
-msgstr "Sisällyttää muiden pikaviestinohjelmien lokit lokikatselimeen."
-
-#. * description
-#: ../plugins/log_reader.c:1990
-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 ""
-"Katsottaessa lokeja tämä liitännäinen sisällyttää niihin myös muiden "
-"pikaviestinohjelmien lokit. Tällä hetkellä tuettuina ovat Adium, Fire, "
-"Messenger Plus!, MSN Messenger ja Trillian."
-
-#: ../plugins/mailchk.c:160
-msgid "Mail Checker"
-msgstr "Sähköpostitarkistin"
-
-#: ../plugins/mailchk.c:162
-msgid "Checks for new local mail."
-msgstr "Tarkistaa paikallisen koneen sähköpostin."
-
-#: ../plugins/mailchk.c:163
-msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr ""
-"Lisää pienen neliön tuttavalistaan, joka ilmoittaa uudesta sähköpostista."
-
-#: ../plugins/mono/loader/mono.c:213
-msgid "Mono Plugin Loader"
-msgstr "Mono-liitännäisen lataaja"
-
-#: ../plugins/mono/loader/mono.c:215 ../plugins/mono/loader/mono.c:216
-msgid "Loads .NET plugins with Mono."
-msgstr "Lataa .NET-liitännäisiä Monon avulla."
-
-#: ../plugins/musicmessaging/musicmessaging.c:44
-msgid ""
-"A music messaging session has been requested. Please click the MM icon to "
-"accept."
-msgstr ""
-"Musiikkiviestintäistunto pyydetty aloitettavaksi. Napsauta MM-kuvaketta "
-"hyväksyäksesi pyynnön."
-
-#: ../plugins/musicmessaging/musicmessaging.c:45
-msgid "Music messaging session confirmed."
-msgstr "Musiikkiviestintäistunto varmistettu."
-
-#: ../plugins/musicmessaging/musicmessaging.c:416
-msgid "Music Messaging"
-msgstr "Musiikkiviestintä"
-
-#: ../plugins/musicmessaging/musicmessaging.c:417
-msgid "There was a conflict in running the command:"
-msgstr "Tapahtui virhe suoritettaessa komentoa:"
-
-#: ../plugins/musicmessaging/musicmessaging.c:525
-msgid "Error Running Editor"
-msgstr "Virhe ajettaessa muokkainta"
-
-#: ../plugins/musicmessaging/musicmessaging.c:526
-msgid "The following error has occured:"
-msgstr "Seuraava virhe esiintyi:"
-
-#. Configuration frame
-#: ../plugins/musicmessaging/musicmessaging.c:625
-msgid "Music Messaging Configuration"
-msgstr "Musiikkiviestinnän asetukset"
-
-#: ../plugins/musicmessaging/musicmessaging.c:629
-msgid "Score Editor Path"
-msgstr "Sävellysmuokkaimen polku"
-
-#: ../plugins/musicmessaging/musicmessaging.c:630
-msgid "_Apply"
-msgstr "_Toteuta"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#: ../plugins/musicmessaging/musicmessaging.c:665
-msgid "Music Messaging Plugin for collaborative composition."
-msgstr "Musiikkiviestintäliitännäinen yhdessä säveltämistä varten."
-
-#. *  summary
-#: ../plugins/musicmessaging/musicmessaging.c:667
-msgid ""
-"The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
-msgstr ""
-"Musiikkiviestintäliitännäinen sallii usean käyttäjän työskennellä yhtä aikaa "
-"musiikkikappaleen parissa, muokkaamalla samaa sävellystä yhdessä, "
-"reaaliaikaisesti."
-
-#. ---------- "Notify For" ----------
-#: ../plugins/notify.c:638
-msgid "Notify For"
-msgstr "Huomautus"
-
-#: ../plugins/notify.c:642
-msgid "_IM windows"
-msgstr "_Pikaviesti-ikkunoille"
-
-#: ../plugins/notify.c:649
-msgid "C_hat windows"
-msgstr "_Ryhmäkeskusteluikkunoille"
-
-#: ../plugins/notify.c:657
-msgid "\t_Only when someone says your screen name"
-msgstr "\t_Vain kun joku sanoo kutsumanimesi"
-
-#: ../plugins/notify.c:667
-msgid "_Focused windows"
-msgstr "_Kohdistetuille ikkunoille"
-
-#. ---------- "Notification Methods" ----------
-#: ../plugins/notify.c:675
-msgid "Notification Methods"
-msgstr "Ilmoitustavat"
-
-#: ../plugins/notify.c:682
-msgid "Prepend _string into window title:"
-msgstr "Lisää _merkkijono ikkunaotsikon eteen:"
-
-#. Count method button
-#: ../plugins/notify.c:701
-msgid "Insert c_ount of new messages into window title"
-msgstr "Lisää uusien _viestien määrä ikkunaotsikkoon"
-
-#. Urgent method button
-#: ../plugins/notify.c:710
-msgid "Set window manager \"_URGENT\" hint"
-msgstr "Aseta ikkunointiohjelman \"_URGENT\"(kiireellinen)-lippu"
-
-#. Raise window method button
-#: ../plugins/notify.c:719
-msgid "R_aise conversation window"
-msgstr "N_osta keskusteluikkuna"
-
-#. ---------- "Notification Removals" ----------
-#: ../plugins/notify.c:727
-msgid "Notification Removal"
-msgstr "Huomautuksen poisto"
-
-#. Remove on focus button
-#: ../plugins/notify.c:732
-msgid "Remove when conversation window _gains focus"
-msgstr "Poista kun keskusteluikkuna on _aktiivinen"
-
-#. Remove on click button
-#: ../plugins/notify.c:739
-msgid "Remove when conversation window _receives click"
-msgstr "Poista kun keskusteluikkunaa _napsautetaan"
-
-#. Remove on type button
-#: ../plugins/notify.c:747
-msgid "Remove when _typing in conversation window"
-msgstr "Poista kun keskusteluikkunaan _kirjoitetaan"
-
-#. Remove on message send button
-#: ../plugins/notify.c:755
-msgid "Remove when a _message gets sent"
-msgstr "Poista kun viesti _lähetetään"
-
-#. Remove on conversation switch button
-#: ../plugins/notify.c:764
-msgid "Remove on switch to conversation ta_b"
-msgstr "Poista kun _välilehti vaihtuu"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/notify.c:853
-msgid "Message Notification"
-msgstr "Viestihuomautus"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/notify.c:856 ../plugins/notify.c:858
-msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr "Ilmoittaa lukemattomista viesteistä monilla tavoilla."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/perl/perl.c:583
-msgid "Perl Plugin Loader"
-msgstr "Perl-liitännäisten lataaja"
-
-#. *< name
-#. *< version
-#. *< summary
-#: ../plugins/perl/perl.c:585 ../plugins/perl/perl.c:586
-msgid "Provides support for loading perl plugins."
-msgstr "Tuo mahdollisuuden ladata perl-liitännäisiä."
-
-#: ../plugins/psychic.c:19
-msgid "Psychic Mode"
-msgstr "Meediotila"
-
-#: ../plugins/psychic.c:20
-msgid "Psychic mode for incoming conversation"
-msgstr "Meediotila sisääntuleville keskusteluille"
-
-#: ../plugins/psychic.c:21
-msgid ""
-"Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
-msgstr ""
-"Keskusteluikkunat ilmestyvät, kun muut käyttäjät alkavat kirjoittaa viestiä "
-"sinulle. Tämä toimii AIM-, ICQ-, Jabber-, Sametime- ja Yahoo!-"
-"yhteiskäytännöillä."
-
-#. This is a quote from Star Wars.  You should
-#. probably not translate it literally.  If
-#. you can't find a fitting cultural reference
-#. in your language, consider translating
-#. something like this instead:
-#. "You feel a new message coming."
-#: ../plugins/psychic.c:63
-msgid "You feel a disturbance in the force..."
-msgstr "Tunnet häiriön voimassa..."
-
-#: ../plugins/psychic.c:82
-msgid "Only enable for users on the buddy list"
-msgstr "Salli vain tuttavalistassa oleville käyttäjille"
-
-#: ../plugins/psychic.c:87
-msgid "Disable when away"
-msgstr "Pois käytöstä poissaollessa"
-
-#: ../plugins/psychic.c:91
-msgid "Display notification message in conversations"
-msgstr "Näytä ilmoitusviesti keskusteluissa"
-
-#: ../plugins/raw.c:175
-msgid "Raw"
-msgstr "Raakasyöttö"
-
-#: ../plugins/raw.c:177
-msgid "Lets you send raw input to text-based protocols."
-msgstr ""
-"Mahdollistaa raakamuotoisen syötteen antamisen tekstipohjaisille "
-"yhteyskäytännöille."
-
-#: ../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 ""
-"Antaa sinun lähettää raakamuotoista syötettä tekstipohjaisilla  "
-"yhteyskäytännöillä (Jabber MSN, IRC, TOC). Paina \"Enter\" "
-"viestinsyöttölaatikossa lähettääksesi. Tarkkaile virheenjäljitysikkunaa."
-
-#: ../plugins/relnot.c:63
-#, c-format
-msgid "You are using Gaim version %s.  The current version is %s.<hr>"
-msgstr "Käyttämäsi Gaim-versio on %s. Uusin versio on %s.<hr>"
-
-#: ../plugins/relnot.c:69
-#, c-format
-msgid ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
-msgstr ""
-"<b>Muutosloki:</b>\n"
-"%s<br><br>"
-
-#: ../plugins/relnot.c:74
-#, c-format
-msgid ""
-"You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
-"\">http://gaim.sourceforge.net</a>."
-msgstr ""
-"Version %s voi noutaa osoitteesta:<br><a href=\"http://gaim.sourceforge.net/"
-"\">http://gaim.sourceforge.net</a>."
-
-#: ../plugins/relnot.c:78 ../plugins/relnot.c:79
-msgid "New Version Available"
-msgstr "Uusi versio saatavilla"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/relnot.c:137
-msgid "Release Notification"
-msgstr "Julkaisuilmoitus"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/relnot.c:140
-msgid "Checks periodically for new releases."
-msgstr "Tarkistaa määräajoin onko uusi Gaim-versio julkaistu."
-
-#. *  description
-#: ../plugins/relnot.c:142
-msgid ""
-"Checks periodically for new releases and notifies the user with the "
-"ChangeLog."
-msgstr ""
-"Tarkistaa määräajoin onko uusi Gaim-versio julkaistu ja huomauttaa käyttäjää "
-"näyttämällä muutoslokin."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/signals-test.c:684
-msgid "Signals Test"
-msgstr "Signaalitesti"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/signals-test.c:687 ../plugins/signals-test.c:689
-msgid "Test to see that all signals are working properly."
-msgstr "Kokeile nähdäksesi että kaikki signaalit toimivat oikein."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/simple.c:37
-msgid "Simple Plugin"
-msgstr "\"Yksinkertainen\"-liitännäinen"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/simple.c:40 ../plugins/simple.c:42
-msgid "Tests to see that most things are working."
-msgstr "Kokeilee että useimmat asiat toimivat."
-
-#: ../plugins/spellchk.c:1945
-msgid "Duplicate Correction"
-msgstr "Korjauksen toisinto"
-
-#: ../plugins/spellchk.c:1946
-msgid "The specified word already exists in the correction list."
-msgstr "Määritetty sana on jo korjauslistassa."
-
-#: ../plugins/spellchk.c:2154
-msgid "Text Replacements"
-msgstr "Tekstin korvaus"
-
-#: ../plugins/spellchk.c:2177
-msgid "You type"
-msgstr "Kirjoitettu"
-
-#: ../plugins/spellchk.c:2191
-msgid "You send"
-msgstr "Lähetetty"
-
-#: ../plugins/spellchk.c:2205
-msgid "Whole words only"
-msgstr "Vain kokonaiset sanat"
-
-#: ../plugins/spellchk.c:2217
-msgid "Case sensitive"
-msgstr "Sama kirjainkoko"
-
-#: ../plugins/spellchk.c:2243
-msgid "Add a new text replacement"
-msgstr "Lisää uusi korvausehto"
-
-#: ../plugins/spellchk.c:2259
-msgid "You _type:"
-msgstr "_Kirjoitettu:"
-
-#: ../plugins/spellchk.c:2276
-msgid "You _send:"
-msgstr "_Lähetetty:"
-
-#. Created here so it can be passed to whole_words_button_toggled.
-#: ../plugins/spellchk.c:2288
-msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr ""
-"_Ehdoton kirjainkoon täsmäys (poista valinta jos haluat automaattisen "
-"kirjainkoon hallinnan)"
-
-#: ../plugins/spellchk.c:2290
-msgid "Only replace _whole words"
-msgstr "Korvaa vain _kokonaiset sanat"
-
-#: ../plugins/spellchk.c:2315
-msgid "General Text Replacement Options"
-msgstr "Tekstin korvauksen yleiset valinnat"
-
-#: ../plugins/spellchk.c:2316
-msgid "Enable replacement of last word on send"
-msgstr "Salli viimeisen sanan korvaus lähetettäessä"
-
-#: ../plugins/spellchk.c:2341
-msgid "Text replacement"
-msgstr "Tekstin korvaus"
-
-#: ../plugins/spellchk.c:2343 ../plugins/spellchk.c:2344
-msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr "Korvaa lähetetettävän tekstin käyttäjän määritelmän mukaan."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ssl/ssl-gnutls.c:256
-msgid "GNUTLS"
-msgstr "GNUTLS"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/ssl/ssl-gnutls.c:259 ../plugins/ssl/ssl-gnutls.c:261
-msgid "Provides SSL support through GNUTLS."
-msgstr "Tuo SSL-tuen GNUTLS:n kautta."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ssl/ssl-nss.c:412
-msgid "NSS"
-msgstr "NSS"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/ssl/ssl-nss.c:415 ../plugins/ssl/ssl-nss.c:417
-msgid "Provides SSL support through Mozilla NSS."
-msgstr "Tuo SSL-tuen Mozilla-NSS:n kautta."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ssl/ssl.c:94
-msgid "SSL"
-msgstr "SSL"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/ssl/ssl.c:97 ../plugins/ssl/ssl.c:99
-msgid "Provides a wrapper around SSL support libraries."
-msgstr "Luo liittymän eri SSL-tukikirjastoille."
-
-#: ../plugins/statenotify.c:50
-#, c-format
-msgid "%s is no longer away."
-msgstr "%s palasi."
-
-#: ../plugins/statenotify.c:52
-#, c-format
-msgid "%s has gone away."
-msgstr "%s poistui."
-
-#: ../plugins/statenotify.c:62
-#, c-format
-msgid "%s has become idle."
-msgstr "%s on jouten."
-
-#: ../plugins/statenotify.c:64
-#, c-format
-msgid "%s is no longer idle."
-msgstr "%s ei enää ole jouten."
-
-#: ../plugins/statenotify.c:73
-#, c-format
-msgid "%s has signed on."
-msgstr "%s on kirjautunut sisään."
-
-#: ../plugins/statenotify.c:91
-msgid "Notify When"
-msgstr "Huomautus kun"
-
-#: ../plugins/statenotify.c:94
-msgid "Buddy Goes _Away"
-msgstr "Tuttava poi_stuu"
-
-#: ../plugins/statenotify.c:97
-msgid "Buddy Goes _Idle"
-msgstr "Tuttava on _jouten"
-
-#: ../plugins/statenotify.c:100
-msgid "Buddy _Signs On/Off"
-msgstr "Tuttava _kirjautuu sisään/ulos"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/statenotify.c:142
-msgid "Buddy State Notification"
-msgstr "Tuttavan tilan ilmoitus"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/statenotify.c:145 ../plugins/statenotify.c:148
-msgid ""
-"Notifies in a conversation window when a buddy goes or returns from away or "
-"idle."
-msgstr ""
-"Ilmoittaa keskusteluikkunassa kun tuttava on poissa tai jouten ja kun hän "
-"palaa."
-
-#: ../plugins/tcl/tcl.c:369
-msgid "Tcl Plugin Loader"
-msgstr "Tcl-liitännäisten lataaja"
-
-#: ../plugins/tcl/tcl.c:371 ../plugins/tcl/tcl.c:372
-msgid "Provides support for loading Tcl plugins"
-msgstr "Mahdollistaa Tcl-liitännäisten latauksen."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ticker/ticker.c:77 ../plugins/ticker/ticker.c:355
-msgid "Buddy Ticker"
-msgstr "Rullaava tuttavataulu"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/ticker/ticker.c:358 ../plugins/ticker/ticker.c:360
-msgid "A horizontal scrolling version of the buddy list."
-msgstr "Vaakatasossa rullaava versio tuttavalistasta."
-
-#: ../plugins/timestamp.c:186
-msgid "iChat Timestamp"
-msgstr "iChat-tyylinen aikaleima"
-
-#: ../plugins/timestamp.c:193
-msgid "Delay"
-msgstr "Viive"
-
-#: ../plugins/timestamp.c:200
-msgid "minutes."
-msgstr "minuuttia."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/timestamp.c:256
-msgid "Timestamp"
-msgstr "Aikaleima"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/timestamp.c:259 ../plugins/timestamp.c:261
-msgid "Adds iChat-style timestamps to conversations every N minutes."
-msgstr "Lisää iChat-tyylisen aikaleiman keskusteluihin N minuutin välein."
-
-#: ../plugins/timestamp_format.c:22
-msgid "Timestamp Format Options"
-msgstr "Aikaleiman muotoiluasetukset"
-
-#: ../plugins/timestamp_format.c:27
-msgid "_Force (traditional Gaim) 24-hour time format"
-msgstr "_Pakota (Gaimin perinteinen) 24 tunnin aikamuoto"
-
-#: ../plugins/timestamp_format.c:30
-msgid "Show dates in..."
-msgstr "Näytä päivämäärät..."
-
-#: ../plugins/timestamp_format.c:35
-msgid "Co_nversations:"
-msgstr "Ke_skustelut:"
-
-#: ../plugins/timestamp_format.c:37 ../plugins/timestamp_format.c:46
-msgid "For delayed messages"
-msgstr "Viivästetyille viesteille"
-
-#: ../plugins/timestamp_format.c:38 ../plugins/timestamp_format.c:47
-msgid "For delayed messages and in chats"
-msgstr "Viivästetyille viesteille, ja ryhmäkeskusteluissa"
-
-#: ../plugins/timestamp_format.c:44
-msgid "_Message Logs:"
-msgstr "_Viestilokit:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/timestamp_format.c:149
-msgid "Message Timestamp Formats"
-msgstr "Viestin aikaleimamuodot"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/timestamp_format.c:152
-msgid "Customizes the message timestamp formats."
-msgstr "Muokkaa viestin aikaleimamuotoja."
-
-#. *  description
-#: ../plugins/timestamp_format.c:154
-msgid ""
-"This plugin allows the user to customize conversation and logging message "
-"timestamp formats."
-msgstr ""
-"Tämä liitännäinen mahdollistaa keskustelu- ja lokiviestien aikaleimamuotojen "
-"muokkaamisen."
-
-#: ../plugins/win32/transparency/win2ktrans.c:183
-#: ../plugins/win32/transparency/win2ktrans.c:569
-#: ../plugins/win32/transparency/win2ktrans.c:616
-msgid "Opacity:"
-msgstr "Peitto:"
-
-#. IM Convo trans options
-#: ../plugins/win32/transparency/win2ktrans.c:533
-msgid "IM Conversation Windows"
-msgstr "Pikaviesti-ikkunat"
-
-# NOTE source: gimp + google
-#: ../plugins/win32/transparency/win2ktrans.c:534
-msgid "_IM window transparency"
-msgstr "_Pikaviesti-ikkunan läpinäkyvyys"
-
-#: ../plugins/win32/transparency/win2ktrans.c:548
-msgid "_Show slider bar in IM window"
-msgstr "_Näytä vierityspalkki pikaviesti-ikkunassa"
-
-# NOTE source: gimp + google
-#: ../plugins/win32/transparency/win2ktrans.c:555
-msgid "Remove IM window transparency on focus"
-msgstr "Poista pikaviesti-ikkunan läpinäkyvyys sen ollessa kohdistettuna"
-
-#: ../plugins/win32/transparency/win2ktrans.c:558
-#: ../plugins/win32/transparency/win2ktrans.c:606
-msgid "Always on top"
-msgstr "Aina päällimmäisenä"
-
-#. Buddy List trans options
-#: ../plugins/win32/transparency/win2ktrans.c:590
-msgid "Buddy List Window"
-msgstr "Tuttavalistaikkuna"
-
-# NOTE source: gimp + google
-#: ../plugins/win32/transparency/win2ktrans.c:591
-msgid "_Buddy List window transparency"
-msgstr "_Tuttavalistaikkunan läpinäkyvyys"
-
-# NOTE source: gimp + google
-#: ../plugins/win32/transparency/win2ktrans.c:604
-msgid "Remove Buddy List window transparency on focus"
-msgstr "Poista tuttavalistaikkunan läpinäkyvyys sen ollessa kohdistettuna"
-
-# NOTE source: gimp + google
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/win32/transparency/win2ktrans.c:658
-msgid "Transparency"
-msgstr "Läpinäkyvyys"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/win32/transparency/win2ktrans.c:661
-msgid "Variable Transparency for the buddy list and conversations."
-msgstr "Vaihteleva läpinäkyvyys tuttavalistalle ja keskusteluille."
-
-#. *  description
-#: ../plugins/win32/transparency/win2ktrans.c:663
-msgid ""
-"This plugin enables variable alpha transparency on conversation windows and "
-"the buddy list.\n"
-"\n"
-"* Note: This plugin requires Win2000 or greater."
-msgstr ""
-"Tämä liitännäinen mahdollistaa keskusteluikkunoiden ja tuttavalistaikkunan "
-"läpinäkyvyyden.\n"
-"\n"
-"Huomaa: Tämä liitännäinen vaatii Win2000 tai uudemman."
-
-#: ../plugins/win32/winprefs/winprefs.c:434
-msgid "GTK+ Runtime Version"
-msgstr "GTK+ Runtime -versio"
-
-#. Autostart
-#: ../plugins/win32/winprefs/winprefs.c:442
-msgid "Startup"
-msgstr "Käynnistys"
-
-#: ../plugins/win32/winprefs/winprefs.c:443
-msgid "_Start Gaim on Windows startup"
-msgstr "_Käynnistä Gaim Windowsin käynnistyessä."
-
-#. Buddy List
-#: ../plugins/win32/winprefs/winprefs.c:455 ../src/gtkblist.c:3672
-msgid "Buddy List"
-msgstr "Tuttavalista"
-
-#: ../plugins/win32/winprefs/winprefs.c:456
-msgid "_Dockable Buddy List"
-msgstr "_Telakoi tuttavalista ruudun reunaan"
-
-#. Blist On Top
-#: ../plugins/win32/winprefs/winprefs.c:460
-msgid "_Keep Buddy List window on top:"
-msgstr "_Pidä tuttavalistaikkuna päällimmäisenä:"
-
-#. XXX: Did this ever work?
-#: ../plugins/win32/winprefs/winprefs.c:465
-msgid "Only when docked"
-msgstr "Vain telakoituna"
-
-#. Conversations
-#: ../plugins/win32/winprefs/winprefs.c:469 ../src/gtkprefs.c:819
-#: ../src/gtkprefs.c:1879
-msgid "Conversations"
-msgstr "Keskustelut"
-
-#: ../plugins/win32/winprefs/winprefs.c:470
-msgid "_Flash window when messages are received"
-msgstr "_Vilkuta ikkunaa viestien saapuessa"
-
-#: ../plugins/win32/winprefs/winprefs.c:494
-msgid "WinGaim Options"
-msgstr "WinGaim-valinnat"
-
-#: ../plugins/win32/winprefs/winprefs.c:496
-msgid "Options specific to Windows Gaim."
-msgstr "Windows-Gaimin erityiset asetukset"
-
-#: ../plugins/win32/winprefs/winprefs.c:497
-msgid ""
-"Provides options specific to Windows Gaim, such as buddy list docking and "
-"conversation flashing."
-msgstr ""
-"Tarjoaa Windows Gaim -sidonnaisia valintoja, kuten tuttavalistan telakoinnin "
-"ja keskustelujen vilkuttamisen."
-
-#: ../src/account.c:773
-msgid "accounts"
-msgstr "käyttäjätilit"
-
-#: ../src/account.c:917
-msgid "Password is required to sign on."
-msgstr "Salasana tarvitaan kirjautumiseen."
-
-#: ../src/account.c:942
-#, c-format
-msgid "Enter password for %s (%s)"
-msgstr "Anna salasana käyttäjätilille %s (%s)"
-
-#: ../src/account.c:949
-msgid "Enter Password"
-msgstr "Anna salasana"
-
-#: ../src/account.c:954
-msgid "Save password"
-msgstr "Tallenna salasana"
-
-#. *
-#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
-#.
-#: ../src/account.c:962 ../src/account.c:1133 ../src/gtkblist.c:3556
-#: ../src/gtkdialogs.c:613 ../src/gtkdialogs.c:750 ../src/gtkdialogs.c:824
-#: ../src/gtkrequest.c:269 ../src/protocols/gg/gg.c:497
-#: ../src/protocols/gg/gg.c:655 ../src/protocols/gg/gg.c:791
-#: ../src/protocols/jabber/jabber.c:1331 ../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:1417 ../src/protocols/oscar/oscar.c:2175
-#: ../src/protocols/oscar/oscar.c:2262 ../src/protocols/oscar/oscar.c:5736
-#: ../src/protocols/oscar/oscar.c:5938 ../src/protocols/oscar/oscar.c:5963
-#: ../src/protocols/oscar/oscar.c:6019 ../src/protocols/silc/buddy.c:466
-#: ../src/protocols/silc/buddy.c:1182 ../src/protocols/silc/chat.c:424
-#: ../src/protocols/silc/chat.c:462 ../src/protocols/silc/chat.c:725
-#: ../src/protocols/silc/ops.c:1297 ../src/protocols/silc/ops.c:1910
-#: ../src/protocols/silc/silc.c:755 ../src/protocols/yahoo/yahoo.c:3076
-#: ../src/protocols/yahoo/yahoo.c:3085 ../src/request.h:1344
-msgid "OK"
-msgstr "OK"
-
-#: ../src/account.c:963 ../src/account.c:1134 ../src/account.c:1171
-#: ../src/gtkaccount.c:2172 ../src/gtkaccount.c:2642 ../src/gtkblist.c:5023
-#: ../src/gtkdialogs.c:614 ../src/gtkdialogs.c:751 ../src/gtkdialogs.c:825
-#: ../src/gtkdialogs.c:844 ../src/gtkdialogs.c:866 ../src/gtkdialogs.c:886
-#: ../src/gtkdialogs.c:930 ../src/gtkdialogs.c:985 ../src/gtkdialogs.c:1022
-#: ../src/gtkdialogs.c:1047 ../src/gtkimhtmltoolbar.c:419
-#: ../src/gtkplugin.c:296 ../src/gtkpounce.c:1088 ../src/gtkprivacy.c:566
-#: ../src/gtkprivacy.c:579 ../src/gtkprivacy.c:604 ../src/gtkprivacy.c:615
-#: ../src/gtkrequest.c:270 ../src/gtksavedstatuses.c:296
-#: ../src/protocols/gg/gg.c:498 ../src/protocols/gg/gg.c:656
-#: ../src/protocols/gg/gg.c:792 ../src/protocols/gg/gg.c:871
-#: ../src/protocols/jabber/buddy.c:594 ../src/protocols/jabber/buddy.c:1721
-#: ../src/protocols/jabber/buddy.c:1755 ../src/protocols/jabber/chat.c:778
-#: ../src/protocols/jabber/jabber.c:840 ../src/protocols/jabber/jabber.c:1332
-#: ../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:1418 ../src/protocols/oscar/oscar.c:2176
-#: ../src/protocols/oscar/oscar.c:2215 ../src/protocols/oscar/oscar.c:2263
-#: ../src/protocols/oscar/oscar.c:5737 ../src/protocols/oscar/oscar.c:5789
-#: ../src/protocols/oscar/oscar.c:5939 ../src/protocols/oscar/oscar.c:5964
-#: ../src/protocols/oscar/oscar.c:6020 ../src/protocols/oscar/oscar.c:6089
-#: ../src/protocols/oscar/peer.c:942 ../src/protocols/sametime/sametime.c:3368
-#: ../src/protocols/sametime/sametime.c:3453
-#: ../src/protocols/sametime/sametime.c:3623
-#: ../src/protocols/sametime/sametime.c:5317
-#: ../src/protocols/sametime/sametime.c:5406
-#: ../src/protocols/sametime/sametime.c:5530 ../src/protocols/silc/buddy.c:467
-#: ../src/protocols/silc/buddy.c:1078 ../src/protocols/silc/buddy.c:1183
-#: ../src/protocols/silc/chat.c:597 ../src/protocols/silc/chat.c:726
-#: ../src/protocols/silc/ops.c:1911 ../src/protocols/silc/silc.c:756
-#: ../src/protocols/silc/silc.c:961 ../src/protocols/yahoo/yahoo.c:3077
-#: ../src/protocols/yahoo/yahoo.c:3086 ../src/request.h:1344
-#: ../src/request.h:1354
-msgid "Cancel"
-msgstr "Peru"
-
-#: ../src/account.c:988 ../src/connection.c:96
-#, c-format
-msgid "Missing protocol plugin for %s"
-msgstr "%s-yhteyskäytäntöliitännäinen puuttuu"
-
-#: ../src/account.c:990 ../src/connection.c:99 ../src/gtkblist.c:3554
-msgid "Connection Error"
-msgstr "Yhteysvirhe"
-
-#: ../src/account.c:1070 ../src/protocols/gg/gg.c:696
-#: ../src/protocols/jabber/jabber.c:1284
-msgid "New passwords do not match."
-msgstr "Uudet salasanat eivät täsmää."
-
-#: ../src/account.c:1079
-msgid "Fill out all fields completely."
-msgstr "Täytä kaikki kentät kokonaan."
-
-#: ../src/account.c:1102
-msgid "Original password"
-msgstr "Vanha salasana"
-
-#: ../src/account.c:1109
-msgid "New password"
-msgstr "Uusi salasana"
-
-#: ../src/account.c:1116
-msgid "New password (again)"
-msgstr "Uusi salasana (uudelleen)"
-
-#: ../src/account.c:1122
-#, c-format
-msgid "Change password for %s"
-msgstr "Vaihda %s:n salasana"
-
-#: ../src/account.c:1130
-msgid "Please enter your current password and your new password."
-msgstr "Anna nykyinen sekä uusi salasana."
-
-#: ../src/account.c:1163
-#, c-format
-msgid "Change user information for %s"
-msgstr "Vaihda käyttäjätietoja - %s"
-
-#: ../src/account.c:1166 ../src/protocols/toc/toc.c:1684
-msgid "Set User Info"
-msgstr "Aseta käyttäjätiedot"
-
-#: ../src/account.c:1170 ../src/gtkdebug.c:684 ../src/gtkrequest.c:276
-#: ../src/protocols/jabber/buddy.c:593
-msgid "Save"
-msgstr "Tallenna"
-
-#: ../src/account.c:1675 ../src/gtkft.c:159 ../src/protocols/gg/gg.c:1002
-#: ../src/protocols/jabber/buddy.c:636 ../src/protocols/jabber/buddy.c:1357
-#: ../src/protocols/jabber/buddy.c:1374 ../src/protocols/novell/novell.c:2858
-msgid "Unknown"
-msgstr "Tuntematon"
-
-#: ../src/blist.c:543
-msgid "buddy list"
-msgstr "tuttavalista"
-
-#: ../src/blist.c:1179
-msgid "Chats"
-msgstr "Ryhmäkeskustelut"
-
-#: ../src/blist.c:1901
-#, c-format
-msgid ""
-"%d buddy from group %s was not removed because it belongs to an account "
-"which is disabled or offline.  This buddy and the group were not removed.\n"
-msgid_plural ""
-"%d buddies from group %s were not removed because they belong to accounts "
-"which are currently disabled or offline.  These buddies and the group were "
-"not removed.\n"
-msgstr[0] ""
-"%d tuttava ryhmästä %s ei poistettu koska se kuuluu tilille joka on poissa "
-"käytöstä tai ei kirjautuneena sisään. Tätä tuttavaa ja ryhmää ei poistettu.\n"
-msgstr[1] ""
-"%d tuttavaa ryhmästä %s ei poistettu koska se kuuluu tilille joka on poissa "
-"käytöstä tai ei kirjautuneena sisään. Näitä tuttavia ja ryhmiä ei "
-"poistettu.\n"
-
-#: ../src/blist.c:1911
-msgid "Group not removed"
-msgstr "Ryhmää ei poistettu"
-
-#: ../src/connection.c:98
-msgid "Registration Error"
-msgstr "Rekisteröintivirhe"
-
-#: ../src/connection.c:277
-#, c-format
-msgid "+++ %s signed on"
-msgstr "+++ %s kirjautui sisään"
-
-#: ../src/connection.c:310
-#, c-format
-msgid "+++ %s signed off"
-msgstr "+++ %s kirjautui ulos"
-
-#: ../src/conversation.c:164
-msgid "Unable to send message: The message is too large."
-msgstr "Viestiä ei voitu lähettää: viesti on liian suuri."
-
-#: ../src/conversation.c:167 ../src/conversation.c:180
-#, c-format
-msgid "Unable to send message to %s."
-msgstr "Viestiä ei voitu lähettää käyttäjälle %s."
-
-#: ../src/conversation.c:168
-msgid "The message is too large."
-msgstr "Viesti on liian suuri."
-
-#: ../src/conversation.c:177
-msgid "Unable to send message."
-msgstr "Viestiä ei voitu lähettää."
-
-#: ../src/conversation.c:1528
-#, c-format
-msgid "%s entered the room."
-msgstr "%s saapui huoneeseen."
-
-#: ../src/conversation.c:1531
-#, c-format
-msgid "%s [<I>%s</I>] entered the room."
-msgstr "%s [<I>%s</I>] saapui huoneeseen."
-
-#: ../src/conversation.c:1636
-#, c-format
-msgid "You are now known as %s"
-msgstr "Olet nyt nimeltäsi %s"
-
-#: ../src/conversation.c:1656
-#, c-format
-msgid "%s is now known as %s"
-msgstr "%s on nyt nimeltään %s"
-
-#: ../src/conversation.c:1729
-#, c-format
-msgid "%s left the room."
-msgstr "%s poistui huoneesta."
-
-#: ../src/conversation.c:1732
-#, c-format
-msgid "%s left the room (%s)."
-msgstr "%s poistui huoneesta (%s)."
-
-#: ../src/desktopitem.c:286 ../src/desktopitem.c:877
-msgid "No name"
-msgstr "Ei nimeä"
-
-#: ../src/ft.c:189 ../src/protocols/msn/msn.c:410
-#, c-format
-msgid ""
-"Error reading %s: \n"
-"%s.\n"
-msgstr ""
-"Virhe luettaessa %s:  \n"
-"%s.\n"
-
-#: ../src/ft.c:193
-#, c-format
-msgid ""
-"Error writing %s: \n"
-"%s.\n"
-msgstr ""
-"Virhe kirjoitettaessa %s: \n"
-"%s.\n"
-
-#: ../src/ft.c:197
-#, c-format
-msgid ""
-"Error accessing %s: \n"
-"%s.\n"
-msgstr ""
-"Virhe käytettäessä tiedostoa %s: \n"
-"%s.\n"
-
-#: ../src/ft.c:230
-msgid "Cannot send a file of 0 bytes."
-msgstr "Ei voida lähettää tiedostoa, jonka koko on 0 tavua."
-
-#: ../src/ft.c:240
-msgid "Cannot send a directory."
-msgstr "Ei voida lähettää kansiota."
-
-#: ../src/ft.c:249
-#, c-format
-msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
-msgstr "%s ei ole tavallinen tiedosto. Ei suostuta ylikirjoittamaan sitä.\n"
-
-#: ../src/ft.c:307
-#, c-format
-msgid "%s wants to send you %s (%s)"
-msgstr "%s on lähettämässä sinulle %s (%s)"
-
-#: ../src/ft.c:314
-#, c-format
-msgid "%s wants to send you a file"
-msgstr "Käyttäjä %s tahtoo lähettää sinulle tiedoston"
-
-#: ../src/ft.c:355
-#, c-format
-msgid "Accept file transfer request from %s?"
-msgstr "Hyväksytäänkö tiedostonsiirtopyyntö käyttäjältä %s?"
-
-#: ../src/ft.c:359
-#, c-format
-msgid ""
-"A file is available for download from:\n"
-"Remote host: %s\n"
-"Remote port: %d"
-msgstr ""
-"Tiedosto on ladattavissa:\n"
-"Etäkone: %s\n"
-"Portti: %d"
-
-#: ../src/ft.c:392
-#, c-format
-msgid "%s is offering to send file %s"
-msgstr "%s tarjoaa tiedostoa %s"
-
-#: ../src/ft.c:444
-#, c-format
-msgid "%s is not a valid filename.\n"
-msgstr "%s ei ole kelvollinen tiedostonimi.\n"
-
-#: ../src/ft.c:465
-#, c-format
-msgid "Offering to send %s to %s"
-msgstr "Tarjotaan tiedostoa %s lähetettäväksi käyttäjälle %s."
-
-#: ../src/ft.c:477
-#, c-format
-msgid "Starting transfer of %s from %s"
-msgstr "Aloitetaan tiedoston %s siirto käyttäjältä %s"
-
-#: ../src/ft.c:631
-#, c-format
-msgid "Transfer of file %s complete"
-msgstr "Tiedoston %s siirto valmis"
-
-#: ../src/ft.c:634
-msgid "File transfer complete"
-msgstr "Tiedostonsiirto valmis"
-
-#: ../src/ft.c:1023
-#, c-format
-msgid "You canceled the transfer of %s"
-msgstr "Peruutit tiedoston %s siirron"
-
-#: ../src/ft.c:1028
-msgid "File transfer cancelled"
-msgstr "Tiedostonsiirto peruutettu"
-
-#: ../src/ft.c:1086
-#, c-format
-msgid "%s canceled the transfer of %s"
-msgstr "%s peruutti tiedoston %s siirron"
-
-#: ../src/ft.c:1091
-#, c-format
-msgid "%s canceled the file transfer"
-msgstr "Käyttäjä %s peruutti tiedostonsiirron"
-
-#: ../src/ft.c:1148
-#, c-format
-msgid "File transfer to %s failed."
-msgstr "Tiedostonsiirto käyttäjälle %s epäonnistui."
-
-#: ../src/ft.c:1150
-#, c-format
-msgid "File transfer from %s failed."
-msgstr "Tiedostonsiirto käyttäjältä %s epäonnistui."
-
-#: ../src/gtkaccount.c:371
-#, c-format
-msgid ""
-"<b>File:</b> %s\n"
-"<b>File size:</b> %s\n"
-"<b>Image size:</b> %dx%d"
-msgstr ""
-"<b>Tiedosto:</b> %s\n"
-"<b>Tiedoston koko:</b> %s\n"
-"<b>Kuvan koko:</b> %d Ă— %d"
+#: ../gtk/gaimstock.c:137
+msgid "_Alias"
+msgstr "_Alias"
+
+#. join button
+#: ../gtk/gaimstock.c:138 ../gtk/gtkblist.c:1120 ../gtk/gtkroomlist.c:285
+#: ../gtk/gtkroomlist.c:442
+msgid "_Join"
+msgstr "_Liity"
+
+#: ../gtk/gaimstock.c:139
+msgid "Close _tabs"
+msgstr "Sulje _välilehdet"
+
+#: ../gtk/gaimstock.c:140 ../gtk/gtkblist.c:1004
+msgid "I_M"
+msgstr "_Pikaviesti"
+
+#: ../gtk/gaimstock.c:141
+msgid "_Get Info"
+msgstr "_Hae tiedot"
+
+#: ../gtk/gaimstock.c:142
+msgid "_Invite"
+msgstr "_Kutsu"
+
+#: ../gtk/gaimstock.c:143
+msgid "_Modify"
+msgstr "_Muokkaa"
+
+#: ../gtk/gaimstock.c:144
+msgid "_Open Mail"
+msgstr "_Avaa sähköposti"
+
+#. Pause button
+#: ../gtk/gaimstock.c:145 ../gtk/gtkft.c:835
+msgid "_Pause"
+msgstr "_Tauko"
 
 #. Build the login options frame.
-#: ../src/gtkaccount.c:757
+#: ../gtk/gtkaccount.c:382
 msgid "Login Options"
 msgstr "Sisäänkirjautumisvalinnat"
 
-#: ../src/gtkaccount.c:774 ../src/gtkft.c:642
-msgid "Protocol:"
-msgstr "Yhteyskäytäntö:"
-
-#: ../src/gtkaccount.c:853
-msgid "Password:"
-msgstr "Salasana:"
-
-#: ../src/gtkaccount.c:858
+#: ../gtk/gtkaccount.c:483
 msgid "Local alias:"
 msgstr "Paikallinen lempinimi:"
 
-#: ../src/gtkaccount.c:862
-msgid "Remember password"
-msgstr "Muista salasana"
-
 #. Build the user options frame.
-#: ../src/gtkaccount.c:914
+#: ../gtk/gtkaccount.c:545
 msgid "User Options"
 msgstr "Käyttäjän valinnat"
 
-#: ../src/gtkaccount.c:927
-msgid "New mail notifications"
-msgstr "Ilmoita uudesta sähköpostista"
-
-#: ../src/gtkaccount.c:936
-msgid "Buddy icon:"
-msgstr "Tuttavakuvake:"
+#. Buddy icon
+#: ../gtk/gtkaccount.c:563
+msgid "Use this buddy icon for this account:"
+msgstr "Käytä tätä tuttavakuvaketta tälle käyttäjätilille:"
 
 #. Build the protocol options frame.
-#: ../src/gtkaccount.c:1027
+#: ../gtk/gtkaccount.c:671
 #, c-format
 msgid "%s Options"
 msgstr "%s-valinnat"
 
-#: ../src/gtkaccount.c:1228
+#: ../gtk/gtkaccount.c:867
 msgid "Use Global Proxy Settings"
 msgstr "Käytä yleistä välipalvelimen asetusta"
 
-#: ../src/gtkaccount.c:1234
+#: ../gtk/gtkaccount.c:873
 msgid "No Proxy"
 msgstr "Ei välipalvelinta"
 
-#: ../src/gtkaccount.c:1240
+#: ../gtk/gtkaccount.c:879
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../src/gtkaccount.c:1246
+#: ../gtk/gtkaccount.c:885
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../src/gtkaccount.c:1252
+#: ../gtk/gtkaccount.c:891
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../src/gtkaccount.c:1258 ../src/gtkprefs.c:1058
+#: ../gtk/gtkaccount.c:897 ../gtk/gtkprefs.c:1061
 msgid "Use Environmental Settings"
 msgstr "Käytä ympäristöasetuksia"
 
@@ -2274,186 +1175,143 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../src/gtkaccount.c:1297
+#: ../gtk/gtkaccount.c:936
 msgid "If you look real closely"
 msgstr "Jos katsot todella tarkkaan"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../src/gtkaccount.c:1300
+#: ../gtk/gtkaccount.c:939
 msgid "you can see the butterflies mating"
 msgstr "voit nähdä perhosten parittelevan"
 
-#: ../src/gtkaccount.c:1321
+#: ../gtk/gtkaccount.c:960
 msgid "Proxy Options"
 msgstr "Välipalvelinvalinnat"
 
-#: ../src/gtkaccount.c:1335 ../src/gtkprefs.c:1052
+#: ../gtk/gtkaccount.c:974 ../gtk/gtkprefs.c:1055
 msgid "Proxy _type:"
 msgstr "Välipalvelimen _tyyppi:"
 
-#: ../src/gtkaccount.c:1344 ../src/gtkprefs.c:1073
+#: ../gtk/gtkaccount.c:983 ../gtk/gtkprefs.c:1076
 msgid "_Host:"
 msgstr "P_alvelin:"
 
-#: ../src/gtkaccount.c:1348 ../src/gtkprefs.c:1091
+#: ../gtk/gtkaccount.c:987 ../gtk/gtkprefs.c:1094
 msgid "_Port:"
 msgstr "_Portti:"
 
-#: ../src/gtkaccount.c:1356
+#: ../gtk/gtkaccount.c:995
 msgid "_Username:"
 msgstr "_Käyttäjänimi:"
 
-#: ../src/gtkaccount.c:1362 ../src/gtkprefs.c:1128
+#: ../gtk/gtkaccount.c:1001 ../gtk/gtkprefs.c:1131
 msgid "Pa_ssword:"
 msgstr "_Salasana:"
 
-#: ../src/gtkaccount.c:1737
+#: ../gtk/gtkaccount.c:1398
 msgid "Add Account"
 msgstr "Lisää tili"
 
-#: ../src/gtkaccount.c:1739 ../src/gtkblist.c:3557
-msgid "Modify Account"
-msgstr "Muokkaa tiliä"
-
-#: ../src/gtkaccount.c:1761
+#: ../gtk/gtkaccount.c:1422
 msgid "_Basic"
 msgstr "_Perus"
 
-#: ../src/gtkaccount.c:1772
+#: ../gtk/gtkaccount.c:1433
 msgid "_Advanced"
 msgstr "_Lisäasetukset"
 
 #. Register button
-#: ../src/gtkaccount.c:1787 ../src/protocols/jabber/jabber.c:839
+#: ../gtk/gtkaccount.c:1448 ../libgaim/protocols/jabber/jabber.c:853
 msgid "Register"
 msgstr "Rekisteröi"
 
-#: ../src/gtkaccount.c:2166 ../src/gtksavedstatuses.c:293
-#, c-format
-msgid "Are you sure you want to delete %s?"
-msgstr "Haluatko varmasti poistaa %s:n?"
-
-#: ../src/gtkaccount.c:2171 ../src/gtkpounce.c:1087 ../src/gtkrequest.c:273
-#: ../src/gtksavedstatuses.c:295
-msgid "Delete"
-msgstr "Poista"
-
-#: ../src/gtkaccount.c:2235 ../src/gtksavedstatuses.c:893
-#: ../src/protocols/oscar/oscar.c:2827
-msgid "Screen Name"
-msgstr "Näyttönimi"
-
-#: ../src/gtkaccount.c:2266
+#. add enabled / disabled
+#: ../gtk/gtkaccount.c:1919 ../gtk/gtkplugin.c:576
+#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:345
+msgid "Enabled"
+msgstr "Käytössä"
+
+#: ../gtk/gtkaccount.c:1927
 msgid "Protocol"
 msgstr "Yhteyskäytäntö"
 
-#: ../src/gtkaccount.c:2590
-#, c-format
-msgid "%s%s%s%s has made %s his or her buddy%s%s"
-msgstr "%s%s%s%s on tehnyt käyttäjästä %s tuttavansa%s%s"
-
-#: ../src/gtkaccount.c:2639
-msgid "Add buddy to your list?"
-msgstr "Lisää tuttava listalle?"
-
-#: ../src/gtkaccount.c:2641 ../src/gtkblist.c:5022 ../src/gtkconv.c:1617
-#: ../src/gtkrequest.c:274 ../src/protocols/gg/gg.c:870
-#: ../src/protocols/oscar/oscar.c:2453
-#: ../src/protocols/sametime/sametime.c:5405 ../src/protocols/silc/chat.c:596
-msgid "Add"
-msgstr "Lisää"
-
-#: ../src/gtkblist.c:671
+#: ../gtk/gtkblist.c:705
 msgid "Join a Chat"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: ../src/gtkblist.c:692
+#: ../gtk/gtkblist.c:726
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Syötä tiedot ryhmäkeskustelusta, johon haluaisit liittyä.\n"
 
-#: ../src/gtkblist.c:703 ../src/gtkpounce.c:523 ../src/gtkroomlist.c:377
+#: ../gtk/gtkblist.c:737 ../gtk/gtkpounce.c:523 ../gtk/gtkroomlist.c:378
 msgid "_Account:"
 msgstr "_Käyttäjätili:"
 
-#: ../src/gtkblist.c:947
+#: ../gtk/gtkblist.c:1001
 msgid "Get _Info"
 msgstr "Hae _tiedot"
 
-#: ../src/gtkblist.c:950 ../src/gtkstock.c:141
-msgid "I_M"
-msgstr "_Pikaviesti"
-
-#: ../src/gtkblist.c:956
+#: ../gtk/gtkblist.c:1010
 msgid "_Send File"
 msgstr "_Lähetä tiedosto"
 
-#: ../src/gtkblist.c:963
+#: ../gtk/gtkblist.c:1017
 msgid "Add Buddy _Pounce"
 msgstr "Lisää tuttava_ilmoitin"
 
-#: ../src/gtkblist.c:967 ../src/gtkblist.c:971 ../src/gtkblist.c:1070
-#: ../src/gtkblist.c:1093
+#: ../gtk/gtkblist.c:1021 ../gtk/gtkblist.c:1025 ../gtk/gtkblist.c:1124
+#: ../gtk/gtkblist.c:1147
 msgid "View _Log"
 msgstr "Näytä _loki"
 
-#: ../src/gtkblist.c:982
+#: ../gtk/gtkblist.c:1036
 msgid "Alias..."
 msgstr "Alias..."
 
-#: ../src/gtkblist.c:985 ../src/gtkconv.c:1614 ../src/gtkrequest.c:275
-msgid "Remove"
-msgstr "Poista"
-
-#: ../src/gtkblist.c:991 ../src/gtkblist.c:1078 ../src/gtkblist.c:1099
+#: ../gtk/gtkblist.c:1045 ../gtk/gtkblist.c:1132 ../gtk/gtkblist.c:1153
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../src/gtkblist.c:993 ../src/gtkblist.c:1080 ../src/gtkblist.c:1101
+#: ../gtk/gtkblist.c:1047 ../gtk/gtkblist.c:1134 ../gtk/gtkblist.c:1155
 msgid "_Remove"
 msgstr "_Poista"
 
-#: ../src/gtkblist.c:1041
+#: ../gtk/gtkblist.c:1095
 msgid "Add a _Buddy"
 msgstr "Lisää _tuttava"
 
-#: ../src/gtkblist.c:1043
+#: ../gtk/gtkblist.c:1097
 msgid "Add a C_hat"
 msgstr "Lisää _ryhmäkeskustelu"
 
-#: ../src/gtkblist.c:1046
+#: ../gtk/gtkblist.c:1100
 msgid "_Delete Group"
 msgstr "_Poista ryhmä"
 
-#: ../src/gtkblist.c:1048
+#: ../gtk/gtkblist.c:1102
 msgid "_Rename"
 msgstr "Nimeä _uudelleen"
 
-#. join button
-#: ../src/gtkblist.c:1066 ../src/gtkroomlist.c:285 ../src/gtkroomlist.c:441
-#: ../src/gtkstock.c:139
-msgid "_Join"
-msgstr "_Liity"
-
-#: ../src/gtkblist.c:1068
+#: ../gtk/gtkblist.c:1122
 msgid "Auto-Join"
-msgstr "Kirjaudu sisään automaattisesti"
-
-#: ../src/gtkblist.c:1106 ../src/gtkblist.c:1129
+msgstr "Liity automaattisesti"
+
+#: ../gtk/gtkblist.c:1160 ../gtk/gtkblist.c:1183
 msgid "_Collapse"
 msgstr "_Pienennä"
 
-#: ../src/gtkblist.c:1134
+#: ../gtk/gtkblist.c:1188
 msgid "_Expand"
 msgstr "_Laajenna"
 
-#: ../src/gtkblist.c:1380 ../src/gtkblist.c:1392 ../src/gtkblist.c:3817
-#: ../src/gtkblist.c:3827
+#: ../gtk/gtkblist.c:1434 ../gtk/gtkblist.c:1446 ../gtk/gtkblist.c:4095
+#: ../gtk/gtkblist.c:4105
 msgid "/Tools/Mute Sounds"
 msgstr "/Työkalut/Vaimenna äänet"
 
-#: ../src/gtkblist.c:1852 ../src/gtkconv.c:4241 ../src/gtkpounce.c:422
+#: ../gtk/gtkblist.c:1906 ../gtk/gtkconv.c:4277 ../gtk/gtkpounce.c:422
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
@@ -2461,126 +1319,126 @@
 "tuttavan."
 
 #. Buddies menu
-#: ../src/gtkblist.c:2426
+#: ../gtk/gtkblist.c:2480
 msgid "/_Buddies"
 msgstr "/_Tuttavat"
 
-#: ../src/gtkblist.c:2427
+#: ../gtk/gtkblist.c:2481
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Tuttavat/Uusi _pikaviesti..."
 
-#: ../src/gtkblist.c:2428
+#: ../gtk/gtkblist.c:2482
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Tuttavat/Liity _ryhmäkeskusteluun..."
 
-#: ../src/gtkblist.c:2429
+#: ../gtk/gtkblist.c:2483
 msgid "/Buddies/Get User _Info..."
 msgstr "/Tuttavat/Hae _käyttäjätiedot..."
 
-#: ../src/gtkblist.c:2430
+#: ../gtk/gtkblist.c:2484
 msgid "/Buddies/View User _Log..."
 msgstr "/Tuttavat/Näytä käyttäjä_loki..."
 
-#: ../src/gtkblist.c:2432
+#: ../gtk/gtkblist.c:2486
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Tuttavat/Näytä poissaolevat tuttavat"
 
-#: ../src/gtkblist.c:2433
+#: ../gtk/gtkblist.c:2487
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Tuttavat/Näytä tyhjät ryhmät"
 
-#: ../src/gtkblist.c:2434
+#: ../gtk/gtkblist.c:2488
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Tuttavat/Näytä tuttavien tiedot"
 
-#: ../src/gtkblist.c:2435
+#: ../gtk/gtkblist.c:2489
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Tuttavat/Näytä _joutenoloajat"
 
-#: ../src/gtkblist.c:2436
+#: ../gtk/gtkblist.c:2490
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Tuttavat/L_ajittele tuttavat"
 
-#: ../src/gtkblist.c:2438
+#: ../gtk/gtkblist.c:2492
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Tuttavat/_Lisää tuttava..."
 
-#: ../src/gtkblist.c:2439
+#: ../gtk/gtkblist.c:2493
 msgid "/Buddies/Add C_hat..."
 msgstr "/Tuttavat/Lisää ryhmäkeskustelu..."
 
-#: ../src/gtkblist.c:2440
+#: ../gtk/gtkblist.c:2494
 msgid "/Buddies/Add _Group..."
 msgstr "/Tuttavat/Lisää _ryhmä..."
 
-#: ../src/gtkblist.c:2442
+#: ../gtk/gtkblist.c:2496
 msgid "/Buddies/_Quit"
 msgstr "/Tuttavat/_Lopeta"
 
 #. Accounts menu
-#: ../src/gtkblist.c:2445
+#: ../gtk/gtkblist.c:2499
 msgid "/_Accounts"
 msgstr "/_Käyttäjätilit"
 
-#: ../src/gtkblist.c:2446 ../src/gtkblist.c:5599
+#: ../gtk/gtkblist.c:2500 ../gtk/gtkblist.c:5945
 msgid "/Accounts/Add\\/Edit"
-msgstr "/Käyttäjätilit/Lisää\\/Muokkaa"
+msgstr "/Käyttäjätilit/Lisää\\/muokkaa"
 
 #. Tools
-#: ../src/gtkblist.c:2449
+#: ../gtk/gtkblist.c:2503
 msgid "/_Tools"
 msgstr "/T_yökalut"
 
-#: ../src/gtkblist.c:2450
+#: ../gtk/gtkblist.c:2504
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Työkalut/Tuttava_ilmoittimet"
 
-#: ../src/gtkblist.c:2451
+#: ../gtk/gtkblist.c:2505
 msgid "/Tools/Plu_gins"
 msgstr "/Työkalut/_Liitännäiset"
 
-#: ../src/gtkblist.c:2452
+#: ../gtk/gtkblist.c:2506
 msgid "/Tools/Pr_eferences"
 msgstr "/Työkalut/A_setukset"
 
-#: ../src/gtkblist.c:2453
+#: ../gtk/gtkblist.c:2507
 msgid "/Tools/Pr_ivacy"
 msgstr "/Työkalut/Yks_ityisyys"
 
-#: ../src/gtkblist.c:2455
+#: ../gtk/gtkblist.c:2509
 msgid "/Tools/_File Transfers"
 msgstr "/Työkalut/_Tiedostonsiirrot..."
 
-#: ../src/gtkblist.c:2456
+#: ../gtk/gtkblist.c:2510
 msgid "/Tools/R_oom List"
 msgstr "/Työkalut/Huone_lista"
 
-#: ../src/gtkblist.c:2457
+#: ../gtk/gtkblist.c:2511
 msgid "/Tools/System _Log"
 msgstr "/Työkalut/Järjestelmä_loki"
 
-#: ../src/gtkblist.c:2459
+#: ../gtk/gtkblist.c:2513
 msgid "/Tools/Mute _Sounds"
 msgstr "/Työkalut/Vaimenna _äänet"
 
 #. Help
-#: ../src/gtkblist.c:2462
+#: ../gtk/gtkblist.c:2516
 msgid "/_Help"
-msgstr "/_Ohje"
-
-#: ../src/gtkblist.c:2463
+msgstr "/O_hje"
+
+#: ../gtk/gtkblist.c:2517
 msgid "/Help/Online _Help"
-msgstr "/Ohje/_Ohjeita verkossa"
-
-#: ../src/gtkblist.c:2464
+msgstr "/Ohje/O_hjeita verkossa"
+
+#: ../gtk/gtkblist.c:2518
 msgid "/Help/_Debug Window"
 msgstr "/Ohje/_Virheenjäljitysikkuna"
 
-#: ../src/gtkblist.c:2465
+#: ../gtk/gtkblist.c:2519
 msgid "/Help/_About"
 msgstr "/Ohje/Tietoj_a"
 
-#: ../src/gtkblist.c:2497 ../src/gtkblist.c:2566
+#: ../gtk/gtkblist.c:2551 ../gtk/gtkblist.c:2620
 #, c-format
 msgid ""
 "\n"
@@ -2589,7 +1447,7 @@
 "\n"
 "<b>Käyttäjätili:</b> %s"
 
-#: ../src/gtkblist.c:2578
+#: ../gtk/gtkblist.c:2632
 #, c-format
 msgid ""
 "\n"
@@ -2598,7 +1456,7 @@
 "\n"
 "<b>Tuttavan lempinimi:</b> %s"
 
-#: ../src/gtkblist.c:2590
+#: ../gtk/gtkblist.c:2644
 #, c-format
 msgid ""
 "\n"
@@ -2607,7 +1465,7 @@
 "\n"
 "<b>Kutsumanimi:</b> %s"
 
-#: ../src/gtkblist.c:2599
+#: ../gtk/gtkblist.c:2653
 #, c-format
 msgid ""
 "\n"
@@ -2616,7 +1474,7 @@
 "\n"
 "<b>Kirjautuneena sisään:</b> %s"
 
-#: ../src/gtkblist.c:2610
+#: ../gtk/gtkblist.c:2664
 #, c-format
 msgid ""
 "\n"
@@ -2625,7 +1483,7 @@
 "\n"
 "<b>Jouten:</b> %s"
 
-#: ../src/gtkblist.c:2645
+#: ../gtk/gtkblist.c:2699
 #, c-format
 msgid ""
 "\n"
@@ -2634,7 +1492,7 @@
 "\n"
 "<b>Viimeksi nähty:</b> %s sitten"
 
-#: ../src/gtkblist.c:2654
+#: ../gtk/gtkblist.c:2708
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2642,7 +1500,7 @@
 "\n"
 "<b>Tila:</b> Poissa linjoilta"
 
-#: ../src/gtkblist.c:2665
+#: ../gtk/gtkblist.c:2719
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2650,7 +1508,7 @@
 "\n"
 "<b>Kuvaus:</b> Aavemainen"
 
-#: ../src/gtkblist.c:2667
+#: ../gtk/gtkblist.c:2721
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
@@ -2658,7 +1516,7 @@
 "\n"
 "<b>Tila</b>: Mahtava"
 
-#: ../src/gtkblist.c:2669
+#: ../gtk/gtkblist.c:2723
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
@@ -2666,120 +1524,146 @@
 "\n"
 "<b>Tila</b>: Rokkaava"
 
-#: ../src/gtkblist.c:2960
+#: ../gtk/gtkblist.c:3190 ../gtk/gtkstatusbox.c:986
+#: ../libgaim/protocols/gg/gg.c:993 ../libgaim/protocols/jabber/buddy.c:1365
+#: ../libgaim/protocols/novell/novell.c:2865
+#: ../libgaim/protocols/oscar/oscar.c:769
+#: ../libgaim/protocols/oscar/oscar.c:5445
+#: ../libgaim/protocols/yahoo/yahoo.c:2883 ../libgaim/status.c:154
+msgid "Offline"
+msgstr "Poissa linjoilta"
+
+#: ../gtk/gtkblist.c:3206
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Jouten %dt %02dm"
 
-#: ../src/gtkblist.c:2962
+#: ../gtk/gtkblist.c:3208
 #, c-format
 msgid "Idle %dm"
 msgstr "Jouten %dm"
 
 #. Idle stuff
-#: ../src/gtkblist.c:2965 ../src/gtkprefs.c:1760
-#: ../src/protocols/bonjour/bonjour.c:333 ../src/protocols/jabber/buddy.c:641
-#: ../src/protocols/jabber/buddy.c:672 ../src/protocols/msn/msn.c:548
-#: ../src/protocols/msn/state.c:32 ../src/protocols/novell/novell.c:2852
-#: ../src/protocols/oscar/oscar.c:2848 ../src/protocols/yahoo/yahoo.c:2744
-#: ../src/protocols/yahoo/yahoo_profile.c:691
+#: ../gtk/gtkblist.c:3211 ../gtk/gtkprefs.c:1765
+#: ../libgaim/protocols/bonjour/bonjour.c:333
+#: ../libgaim/protocols/jabber/buddy.c:635
+#: ../libgaim/protocols/jabber/buddy.c:668 ../libgaim/protocols/msn/msn.c:548
+#: ../libgaim/protocols/msn/state.c:32
+#: ../libgaim/protocols/novell/novell.c:2862
+#: ../libgaim/protocols/oscar/oscar.c:2824
+#: ../libgaim/protocols/yahoo/yahoo.c:2881
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:691
 msgid "Idle"
 msgstr "Jouten"
 
-#: ../src/gtkblist.c:3097
+#: ../gtk/gtkblist.c:3339
 msgid "/Buddies/New Instant Message..."
 msgstr "/Tuttavat/Uusi pikaviesti..."
 
-#: ../src/gtkblist.c:3098 ../src/gtkblist.c:3131
+#: ../gtk/gtkblist.c:3340 ../gtk/gtkblist.c:3373
 msgid "/Buddies/Join a Chat..."
 msgstr "/Tuttavat/Liity ryhmäkeskusteluun..."
 
-#: ../src/gtkblist.c:3099
+#: ../gtk/gtkblist.c:3341
 msgid "/Buddies/Get User Info..."
 msgstr "/Tuttavat/Hae käyttäjätiedot..."
 
-#: ../src/gtkblist.c:3100
+#: ../gtk/gtkblist.c:3342
 msgid "/Buddies/Add Buddy..."
 msgstr "/Tuttavat/Lisää tuttava..."
 
-#: ../src/gtkblist.c:3101 ../src/gtkblist.c:3134
+#: ../gtk/gtkblist.c:3343 ../gtk/gtkblist.c:3376
 msgid "/Buddies/Add Chat..."
 msgstr "/Tuttavat/Lisää ryhmäkeskustelu..."
 
-#: ../src/gtkblist.c:3102
+#: ../gtk/gtkblist.c:3344
 msgid "/Buddies/Add Group..."
 msgstr "/Tuttavat/Lisää ryhmä..."
 
-#: ../src/gtkblist.c:3137
+#: ../gtk/gtkblist.c:3379
 msgid "/Tools/Buddy Pounces"
 msgstr "/Työkalut/Tuttavailmoittimet"
 
-#: ../src/gtkblist.c:3140
+#: ../gtk/gtkblist.c:3382
 msgid "/Tools/Privacy"
 msgstr "/Työkalut/Yksityisyys"
 
-#: ../src/gtkblist.c:3143
+#: ../gtk/gtkblist.c:3385
 msgid "/Tools/Room List"
 msgstr "/Työkalut/Huonelista"
 
-#: ../src/gtkblist.c:3337
+#: ../gtk/gtkblist.c:3481
+#, c-format
+msgid "%d unread message from %s\n"
+msgid_plural "%d unread messages from %s\n"
+msgstr[0] "%d lukematon viesti käyttäjältä %s\n"
+msgstr[1] "%d lukematonta viestiä käyttäjältä %s\n"
+
+#: ../gtk/gtkblist.c:3557
 msgid "Manually"
 msgstr "Käsin"
 
-#: ../src/gtkblist.c:3339
+#: ../gtk/gtkblist.c:3559
 msgid "Alphabetically"
 msgstr "Aakkosittain"
 
-#: ../src/gtkblist.c:3340
+#: ../gtk/gtkblist.c:3560
 msgid "By status"
 msgstr "Tilan mukaan"
 
-#: ../src/gtkblist.c:3341
+#: ../gtk/gtkblist.c:3561
 msgid "By log size"
 msgstr "Lokin koon mukaan"
 
-#: ../src/gtkblist.c:3549 ../src/gtkconn.c:186
+#: ../gtk/gtkblist.c:3769 ../gtk/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "Yhteys katkennut kohteeseen %s"
 
-#: ../src/gtkblist.c:3558 ../src/protocols/sametime/sametime.c:3622
+#: ../gtk/gtkblist.c:3778 ../libgaim/protocols/sametime/sametime.c:3618
 msgid "Connect"
 msgstr "Yhdistä"
 
-#: ../src/gtkblist.c:3558
+#: ../gtk/gtkblist.c:3778
 msgid "Re-enable Account"
 msgstr "Ota tili uudelleen käyttöön"
 
-#: ../src/gtkblist.c:3579
+#: ../gtk/gtkblist.c:3799
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s kirjautui ulos: %s</span>"
 
-#: ../src/gtkblist.c:3706
+#: ../gtk/gtkblist.c:3928
 msgid "/Accounts"
 msgstr "/Käyttäjätilit"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../src/gtkblist.c:3811
+#: ../gtk/gtkblist.c:4089
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Tuttavat/Näytä poissaolevat tuttavat"
 
-#: ../src/gtkblist.c:3814
+#: ../gtk/gtkblist.c:4092
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Tuttavat/Näytä tyhjät ryhmät"
 
-#: ../src/gtkblist.c:3820
+#: ../gtk/gtkblist.c:4098
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Tuttavat/Näytä tuttavien tiedot"
 
-#: ../src/gtkblist.c:3823
+#: ../gtk/gtkblist.c:4101
 msgid "/Buddies/Show Idle Times"
 msgstr "/Tuttavat/Näytä joutenoloajat"
 
-#: ../src/gtkblist.c:4559
+#: ../gtk/gtkblist.c:4764 ../gtk/plugins/gevolution/gevolution.c:96
+#: ../gtk/plugins/gevolution/gevo-util.c:64 ../libgaim/blist.c:516
+#: ../libgaim/blist.c:1289 ../libgaim/blist.c:1518
+#: ../libgaim/protocols/jabber/roster.c:67
+msgid "Buddies"
+msgstr "Tuttavat"
+
+#: ../gtk/gtkblist.c:4898
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -2789,20 +1673,17 @@
 "myös valita lempinimen tuttavalle. Lempinimi näytetään näyttönimen sijasta "
 "aina kuin mahdollista.\n"
 
-#: ../src/gtkblist.c:4602 ../src/gtkblist.c:4967
-msgid "Alias:"
-msgstr "Alias:"
-
-#. Set up stuff for the account box
-#: ../src/gtkblist.c:4629 ../src/gtkblist.c:4947
-msgid "Account:"
-msgstr "Käyttäjätili:"
-
-#: ../src/gtkblist.c:4880
+#: ../gtk/gtkblist.c:4958 ../gtk/gtkblist.c:5321
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:554
+#: ../gtk/plugins/gevolution/new_person_dialog.c:307
+msgid "Group:"
+msgstr "Ryhmä:"
+
+#: ../gtk/gtkblist.c:5219
 msgid "This protocol does not support chat rooms."
 msgstr "Tämä yhteyskäytäntö ei tue keskusteluhuoneita."
 
-#: ../src/gtkblist.c:4896
+#: ../gtk/gtkblist.c:5235
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -2810,11 +1691,7 @@
 "Et ole kirjautuneena millään yhteyskäytännöllä jolla voisi käyttää "
 "ryhmäkeskustelua."
 
-#: ../src/gtkblist.c:4913
-msgid "Add Chat"
-msgstr "Lisää ryhmäkeskustelu"
-
-#: ../src/gtkblist.c:4937
+#: ../gtk/gtkblist.c:5276
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2822,40 +1699,35 @@
 "Anna lempinimi, ja tiedot ryhmäkeskustelusta jonka haluat lisätä "
 "tuttavalistalle.\n"
 
-#: ../src/gtkblist.c:5019 ../src/protocols/sametime/sametime.c:5316
-#: ../src/protocols/sametime/sametime.c:5403
-msgid "Add Group"
-msgstr "Lisää ryhmä"
-
-#: ../src/gtkblist.c:5020
+#: ../gtk/gtkblist.c:5359
 msgid "Please enter the name of the group to be added."
 msgstr "Anna lisättävän ryhmän nimi."
 
-#: ../src/gtkblist.c:5639
+#: ../gtk/gtkblist.c:5985
 msgid "_Edit Account"
 msgstr "_Muokaa käyttäjätiliä"
 
-#: ../src/gtkblist.c:5672 ../src/gtkblist.c:5678 ../src/gtkconv.c:2743
+#: ../gtk/gtkblist.c:6018 ../gtk/gtkblist.c:6024 ../gtk/gtkconv.c:2781
 msgid "No actions available"
 msgstr "Ei toimintoja saatavilla."
 
-#: ../src/gtkblist.c:5686
+#: ../gtk/gtkblist.c:6032
 msgid "_Disable"
 msgstr "_Poista käytöstä"
 
-#: ../src/gtkblist.c:5698
+#: ../gtk/gtkblist.c:6044
 msgid "Enable Account"
 msgstr "Ota tili käyttöön"
 
-#: ../src/gtkblist.c:5751
+#: ../gtk/gtkblist.c:6097
 msgid "/Tools"
 msgstr "/Työkalut"
 
-#: ../src/gtkblist.c:5837
+#: ../gtk/gtkblist.c:6183
 msgid "/Buddies/Sort Buddies"
 msgstr "/Tuttavat/Lajittele tuttavat"
 
-#: ../src/gtkconn.c:187
+#: ../gtk/gtkconn.c:179
 #, c-format
 msgid ""
 "%s was disconnected due to an error: %s\n"
@@ -2866,742 +1738,700 @@
 "Gaim ei yritä uudelleenyhdistää käyttäjätiliä kunnes korjaat virheen ja otat "
 "tilin uudelleen käyttöön."
 
-#: ../src/gtkconv.c:366
-msgid "Supported debug options are:  version"
-msgstr "Tuetut vianjäljitysvalinnat ovat: versio"
-
-#: ../src/gtkconv.c:402
-msgid "No such command (in this context)."
-msgstr "Komento ei saatavilla (tässä kontekstissa)."
-
-#: ../src/gtkconv.c:405
-msgid ""
-"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
-"The following commands are available in this context:\n"
-msgstr ""
-"Kirjoita \"/help &lt;komento&gt;\" saadaksesi ohjeen tietystä komennosta.\n"
-"Seuraavat komennot ovat saatavilla tässä kontekstissa:\n"
-
-#: ../src/gtkconv.c:472
-msgid "No such command."
-msgstr "Sellaista komentoa ei ole."
-
-#: ../src/gtkconv.c:479
-msgid "Syntax Error:  You typed the wrong number of arguments to that command."
-msgstr ""
-"Syntaksivirhe: Syötit väärän määrän argumentteja kyseiselle komennolle."
-
-#: ../src/gtkconv.c:484
-msgid "Your command failed for an unknown reason."
-msgstr "Komento epäonnistui tuntemattomasta syystä."
-
-#: ../src/gtkconv.c:490
-msgid "That command only works in chats, not IMs."
-msgstr "Komento toimii vain ryhmäkeskusteluissa, ei pikaviesteissä."
-
-#: ../src/gtkconv.c:493
-msgid "That command only works in IMs, not chats."
-msgstr "Komento toimii vain pikaviesteissä, ei ryhmäkeskusteluissa."
-
-#: ../src/gtkconv.c:497
-msgid "That command doesn't work on this protocol."
-msgstr "Tämä komento ei toimi tälle yhteyskäytännölle."
-
-#: ../src/gtkconv.c:732 ../src/gtkconv.c:758
+#: ../gtk/gtkconv.c:744 ../gtk/gtkconv.c:770
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Tuttava ei käytä samaa yhteyskäytäntöä kuin tämä ryhmäkeskustelu."
 
-#: ../src/gtkconv.c:752
+#: ../gtk/gtkconv.c:764
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "Et ole kirjautuneena millään käyttäjätilillä jolla voisi kutsua tämän "
 "tuttavan."
 
-#: ../src/gtkconv.c:805
+#: ../gtk/gtkconv.c:817
 msgid "Invite Buddy Into Chat Room"
 msgstr "Kutsu tuttava keskusteluhuoneeseen"
 
 #. Put our happy label in it.
-#: ../src/gtkconv.c:835
+#: ../gtk/gtkconv.c:847
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "Anna kutsuttavan käyttäjän nimi sekä vapaaehtoinen viesti."
 
-#: ../src/gtkconv.c:856
+#: ../gtk/gtkconv.c:868
 msgid "_Buddy:"
 msgstr "_Tuttava:"
 
-#: ../src/gtkconv.c:876 ../src/gtksavedstatuses.c:1111
-#: ../src/gtksavedstatuses.c:1447
+#: ../gtk/gtkconv.c:888 ../gtk/gtksavedstatuses.c:1111
+#: ../gtk/gtksavedstatuses.c:1447
 msgid "_Message:"
 msgstr "_Viesti:"
 
-#: ../src/gtkconv.c:933 ../src/gtkconv.c:2360 ../src/gtkdebug.c:217
-#: ../src/gtkft.c:490
+#: ../gtk/gtkconv.c:945 ../gtk/gtkconv.c:2398 ../gtk/gtkdebug.c:218
+#: ../gtk/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Tiedoston avaaminen epäonnistui."
 
-#: ../src/gtkconv.c:939
+#: ../gtk/gtkconv.c:951
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Keskustelu käyttäjän %s kanssa</h1>\n"
 
-#: ../src/gtkconv.c:963
+#: ../gtk/gtkconv.c:975
 msgid "Save Conversation"
 msgstr "Tallenna keskustelu"
 
-#: ../src/gtkconv.c:1084 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
+#: ../gtk/gtkconv.c:1122 ../gtk/gtkdebug.c:166 ../gtk/gtkdebug.c:756
 msgid "Find"
 msgstr "Etsi"
 
-#: ../src/gtkconv.c:1110 ../src/gtkdebug.c:193
+#: ../gtk/gtkconv.c:1148 ../gtk/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "_Haettava termi:"
 
-#: ../src/gtkconv.c:1281
+#: ../gtk/gtkconv.c:1319
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Kirjaaminen lokiin aloitettu. Tämän keskustelun viestit kirjataan nyt lokiin."
 
-#: ../src/gtkconv.c:1289
+#: ../gtk/gtkconv.c:1327
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "Kirjaaminen lokiin lopetettu. Tämän keskustelun viestejä ei enää kirjata "
 "lokiin."
 
-#: ../src/gtkconv.c:1554
-msgid "IM"
-msgstr "Pikaviesti"
-
-#: ../src/gtkconv.c:1565 ../src/protocols/oscar/oscar.c:640
-msgid "Send File"
-msgstr "Lähetä tiedosto"
-
-#: ../src/gtkconv.c:1580
+#: ../gtk/gtkconv.c:1595
 msgid "Un-Ignore"
 msgstr "Huomioi"
 
-#: ../src/gtkconv.c:1583
+#: ../gtk/gtkconv.c:1598
 msgid "Ignore"
 msgstr "Jätä huomiotta"
 
-#: ../src/gtkconv.c:1593
-msgid "Info"
-msgstr "Tietoja"
-
-#: ../src/gtkconv.c:1603
+#: ../gtk/gtkconv.c:1618
 msgid "Get Away Message"
 msgstr "Hae poissaoloviesti"
 
-#: ../src/gtkconv.c:1626
+#: ../gtk/gtkconv.c:1641
 msgid "Last said"
 msgstr "Viimeksi sanottu"
 
-#: ../src/gtkconv.c:2368
+#: ../gtk/gtkconv.c:2406
 msgid "Unable to save icon file to disk."
 msgstr "Kuvaketiedostoa ei voida tallentaa levylle."
 
-#: ../src/gtkconv.c:2392
+#: ../gtk/gtkconv.c:2430
 msgid "Save Icon"
 msgstr "Tallenna kuvake"
 
-#: ../src/gtkconv.c:2441
+#: ../gtk/gtkconv.c:2479
 msgid "Animate"
 msgstr "Animoi"
 
-#: ../src/gtkconv.c:2446
+#: ../gtk/gtkconv.c:2484
 msgid "Hide Icon"
 msgstr "Piilota kuvake"
 
-#: ../src/gtkconv.c:2452
+#: ../gtk/gtkconv.c:2490
 msgid "Save Icon As..."
 msgstr "Tallenna kuvake nimellä..."
 
 #. Conversation menu
-#: ../src/gtkconv.c:2592
+#: ../gtk/gtkconv.c:2630
 msgid "/_Conversation"
 msgstr "/_Keskustelu"
 
-#: ../src/gtkconv.c:2594
+#: ../gtk/gtkconv.c:2632
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Keskustelu/Uusi _pikaviesti..."
 
-#: ../src/gtkconv.c:2599
+#: ../gtk/gtkconv.c:2637
 msgid "/Conversation/_Find..."
 msgstr "/Keskustelu/_Etsi..."
 
-#: ../src/gtkconv.c:2601
+#: ../gtk/gtkconv.c:2639
 msgid "/Conversation/View _Log"
 msgstr "/Keskustelu/Näytä l_oki..."
 
-#: ../src/gtkconv.c:2602
+#: ../gtk/gtkconv.c:2640
 msgid "/Conversation/_Save As..."
 msgstr "/Keskustelu/_Tallenna nimellä..."
 
-#: ../src/gtkconv.c:2604
+#: ../gtk/gtkconv.c:2642
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Keskustelu/T_yhjennä takaisinvieritys"
 
-#: ../src/gtkconv.c:2608
+#: ../gtk/gtkconv.c:2646
 msgid "/Conversation/Se_nd File..."
 msgstr "/Keskustelu/_Lähetä tiedosto..."
 
-#: ../src/gtkconv.c:2609
+#: ../gtk/gtkconv.c:2647
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Keskustelu/Lisää tuttava_ilmoitin..."
 
-#: ../src/gtkconv.c:2611
+#: ../gtk/gtkconv.c:2649
 msgid "/Conversation/_Get Info"
 msgstr "/Keskustelu/_Hae tiedot..."
 
-#: ../src/gtkconv.c:2613
+#: ../gtk/gtkconv.c:2651
 msgid "/Conversation/In_vite..."
 msgstr "/Keskustelu/Kut_su..."
 
-#: ../src/gtkconv.c:2615
+#: ../gtk/gtkconv.c:2653
 msgid "/Conversation/M_ore"
 msgstr "/Keskustelu/Lis_ää"
 
-#: ../src/gtkconv.c:2619
+#: ../gtk/gtkconv.c:2657
 msgid "/Conversation/Al_ias..."
 msgstr "/Keskustelu/_Alias..."
 
-#: ../src/gtkconv.c:2621
+#: ../gtk/gtkconv.c:2659
 msgid "/Conversation/_Block..."
 msgstr "/Keskustelu/E_stä..."
 
-#: ../src/gtkconv.c:2623
+#: ../gtk/gtkconv.c:2661
 msgid "/Conversation/_Add..."
 msgstr "/Keskustelu/_Lisää..."
 
-#: ../src/gtkconv.c:2625
+#: ../gtk/gtkconv.c:2663
 msgid "/Conversation/_Remove..."
 msgstr "/Keskustelu/_Poista..."
 
-#: ../src/gtkconv.c:2630
+#: ../gtk/gtkconv.c:2668
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Keskustelu/Lisää lin_kki..."
 
-#: ../src/gtkconv.c:2632
+#: ../gtk/gtkconv.c:2670
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Keskustelu/Liitä _kuva..."
 
-#: ../src/gtkconv.c:2637
+#: ../gtk/gtkconv.c:2675
 msgid "/Conversation/_Close"
 msgstr "/Keskustelu/_Sulje"
 
 #. Options
-#: ../src/gtkconv.c:2641
+#: ../gtk/gtkconv.c:2679
 msgid "/_Options"
 msgstr "/_Valinnat"
 
-#: ../src/gtkconv.c:2642
+#: ../gtk/gtkconv.c:2680
 msgid "/Options/Enable _Logging"
 msgstr "/Valinnat/_Lokiinkirjaus"
 
-#: ../src/gtkconv.c:2643
+#: ../gtk/gtkconv.c:2681
 msgid "/Options/Enable _Sounds"
 msgstr "/Valinnat/S_oita merkkiäänet"
 
-#: ../src/gtkconv.c:2644
+#: ../gtk/gtkconv.c:2682
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Valinnat/Näytä tuttava_kuvake"
 
-#: ../src/gtkconv.c:2646
+#: ../gtk/gtkconv.c:2684
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Valinnat/Näytä muokkaus-_työkalurivit"
 
-#: ../src/gtkconv.c:2647
+#: ../gtk/gtkconv.c:2685
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Valinnat/Näytä aika_leima"
 
-#: ../src/gtkconv.c:2722
+#: ../gtk/gtkconv.c:2760
 msgid "/Conversation/More"
 msgstr "/Keskustelu/Lisää"
 
-#: ../src/gtkconv.c:2760 ../src/gtkconv.c:2787
+#: ../gtk/gtkconv.c:2798 ../gtk/gtkconv.c:2825
 msgid "/Conversation"
 msgstr "/Keskustelu"
 
-#: ../src/gtkconv.c:2797
+#: ../gtk/gtkconv.c:2835
 msgid "/Conversation/View Log"
 msgstr "/Keskustelu/Näytä loki..."
 
-#: ../src/gtkconv.c:2803
+#: ../gtk/gtkconv.c:2841
 msgid "/Conversation/Send File..."
 msgstr "/Keskustelu/Lähetä tiedosto..."
 
-#: ../src/gtkconv.c:2807
+#: ../gtk/gtkconv.c:2845
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Keskustelu/Lisää tuttavailmoitin..."
 
-#: ../src/gtkconv.c:2813
+#: ../gtk/gtkconv.c:2851
 msgid "/Conversation/Get Info"
 msgstr "/Keskustelu/Hae tiedot..."
 
-#: ../src/gtkconv.c:2817
+#: ../gtk/gtkconv.c:2855
 msgid "/Conversation/Invite..."
 msgstr "/Keskustelu/Kutsu..."
 
-#: ../src/gtkconv.c:2823
+#: ../gtk/gtkconv.c:2861
 msgid "/Conversation/Alias..."
 msgstr "/Keskustelu/Alias..."
 
-#: ../src/gtkconv.c:2827
+#: ../gtk/gtkconv.c:2865
 msgid "/Conversation/Block..."
 msgstr "/Keskustelu/Estä..."
 
-#: ../src/gtkconv.c:2831
+#: ../gtk/gtkconv.c:2869
 msgid "/Conversation/Add..."
 msgstr "/Keskustelu/Lisää..."
 
-#: ../src/gtkconv.c:2835
+#: ../gtk/gtkconv.c:2873
 msgid "/Conversation/Remove..."
 msgstr "/Keskustelu/Poista..."
 
-#: ../src/gtkconv.c:2841
+#: ../gtk/gtkconv.c:2879
 msgid "/Conversation/Insert Link..."
 msgstr "/Keskustelu/Lisää linkki..."
 
-#: ../src/gtkconv.c:2845
+#: ../gtk/gtkconv.c:2883
 msgid "/Conversation/Insert Image..."
 msgstr "/Keskustelu/Lisää kuva..."
 
-#: ../src/gtkconv.c:2851
+#: ../gtk/gtkconv.c:2889
 msgid "/Options/Enable Logging"
 msgstr "/Valinnat/Lokiinkirjaus"
 
-#: ../src/gtkconv.c:2854
+#: ../gtk/gtkconv.c:2892
 msgid "/Options/Enable Sounds"
 msgstr "/Valinnat/Soita merkkiäänet"
 
-#: ../src/gtkconv.c:2867
+#: ../gtk/gtkconv.c:2905
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Valinnat/Näytä muokkaustyökalurivit"
 
-#: ../src/gtkconv.c:2870
+#: ../gtk/gtkconv.c:2908
 msgid "/Options/Show Timestamps"
 msgstr "/Valinnat/Näytä aikaleima"
 
-#: ../src/gtkconv.c:2873
+#: ../gtk/gtkconv.c:2911
 msgid "/Options/Show Buddy Icon"
 msgstr "/Valinnat/Näytä tuttava_kuvake"
 
-#: ../src/gtkconv.c:2949
+#: ../gtk/gtkconv.c:2987
 msgid "User is typing..."
 msgstr "Käyttäjä kirjoittaa..."
 
-#: ../src/gtkconv.c:2952
+#: ../gtk/gtkconv.c:2990
 msgid "User has typed something and stopped"
 msgstr "Käyttäjä kirjoitti jotain ja keskeytti"
 
 #. Build the Send To menu
-#: ../src/gtkconv.c:3135
+#: ../gtk/gtkconv.c:3173
 msgid "_Send To"
 msgstr "_Lähetä käyttäjälle"
 
-#: ../src/gtkconv.c:3841
+#: ../gtk/gtkconv.c:3875
 msgid "_Send"
 msgstr "_Lähetä"
 
-#: ../src/gtkconv.c:3895 ../src/protocols/sametime/sametime.c:3564
+#: ../gtk/gtkconv.c:3929 ../libgaim/protocols/sametime/sametime.c:3560
 msgid "Topic:"
 msgstr "Aihe:"
 
 #. Setup the label telling how many people are in the room.
-#: ../src/gtkconv.c:3947
+#: ../gtk/gtkconv.c:3981
 msgid "0 people in room"
 msgstr "0 ihmistä huoneessa"
 
-#: ../src/gtkconv.c:4996 ../src/gtkconv.c:5115
+#: ../gtk/gtkconv.c:5028 ../gtk/gtkconv.c:5149
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d ihminen huoneessa"
 msgstr[1] "%d ihmistä huoneessa"
 
-#: ../src/gtkconv.c:5661 ../src/gtkstatusbox.c:366
+#: ../gtk/gtkconv.c:5702 ../gtk/gtkstatusbox.c:554
 msgid "Typing"
 msgstr "Kirjoittaa"
 
-#: ../src/gtkconv.c:5667
+#: ../gtk/gtkconv.c:5708
 msgid "Stopped Typing"
 msgstr "Lopetti kirjoittamisen"
 
-#: ../src/gtkconv.c:5672
+#: ../gtk/gtkconv.c:5713
 msgid "Nick Said"
 msgstr "Sanoi"
 
-#: ../src/gtkconv.c:5682
+#: ../gtk/gtkconv.c:5718
+msgid "Unread Messages"
+msgstr "Lukemattomat viestit"
+
+#: ../gtk/gtkconv.c:5723
 msgid "New Event"
 msgstr "Uusi tapahtuma"
 
-#: ../src/gtkconv.c:6584
-msgid ""
-"say &lt;message&gt;:  Send a message normally as if you weren't using a "
-"command."
-msgstr ""
-"say &lt;viesti&gt;: Lähetä viesti normaalisti, niin kuin et olisi "
-"käyttämässä komentoa."
-
-#: ../src/gtkconv.c:6587
-msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr ""
-"me &lt;toiminta&gt;: Lähetä IRC-tyylinen toiminta tuttavalle tai "
-"keskusteluun."
-
-#: ../src/gtkconv.c:6590
-msgid ""
-"debug &lt;option&gt;:  Send various debug information to the current "
-"conversation."
-msgstr ""
-"debug &lt;valinta&gt;: Lähetä eri debug-tietoja senhetkiseen keskusteluun."
-
-#: ../src/gtkconv.c:6593
-msgid "clear: Clears the conversation scrollback."
-msgstr "clear: Tyhjentää keskustelun"
-
-#: ../src/gtkconv.c:6596
-msgid "help &lt;command&gt;:  Help on a specific command."
-msgstr "help &lt;komento&gt;: Ohje tietylle komennolle."
-
-#: ../src/gtkconv.c:6755
+#: ../gtk/gtkconv.c:6818
 msgid "Confirm close"
 msgstr "Vahvista sulkeminen"
 
-#: ../src/gtkconv.c:6787
+#: ../gtk/gtkconv.c:6850
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr ""
 "Sinulla on lukemattomia viestejä. Haluatko varmasti sulkea tämän ikkunan?"
 
-#: ../src/gtkconv.c:7309
+#: ../gtk/gtkconv.c:7385
 msgid "Close other tabs"
 msgstr "Sulje muut välilehdet"
 
-#: ../src/gtkconv.c:7315
+#: ../gtk/gtkconv.c:7391
 msgid "Close all tabs"
 msgstr "Sulje kaikki välilehdet"
 
-#: ../src/gtkconv.c:7323
+#: ../gtk/gtkconv.c:7399
 msgid "Detach this tab"
 msgstr "Irrota tämä välilehti"
 
-#: ../src/gtkconv.c:7329
+#: ../gtk/gtkconv.c:7405
 msgid "Close this tab"
 msgstr "Sulje tämä välilehti"
 
-#: ../src/gtkconv.c:7589
+#: ../gtk/gtkconv.c:7672
 msgid "Close conversation"
 msgstr "Sulje keskustelu"
 
-#: ../src/gtkconv.c:8053
+#: ../gtk/gtkconv.c:8136
 msgid "Last created window"
 msgstr "Viimeksi luotu ikkuna"
 
-#: ../src/gtkconv.c:8055
+#: ../gtk/gtkconv.c:8138
 msgid "Separate IM and Chat windows"
 msgstr "Näytä pikaviestit ja ryhmäkeskustelut eri ikkunoissa"
 
-#: ../src/gtkconv.c:8057 ../src/gtkprefs.c:1258
+#: ../gtk/gtkconv.c:8140 ../gtk/gtkprefs.c:1263
 msgid "New window"
 msgstr "Uusi ikkuna"
 
-#: ../src/gtkconv.c:8059
+#: ../gtk/gtkconv.c:8142
 msgid "By group"
 msgstr "Ryhmän mukaan"
 
-#: ../src/gtkconv.c:8061
+#: ../gtk/gtkconv.c:8144
 msgid "By account"
 msgstr "Tilin mukaan"
 
-#: ../src/gtkdebug.c:232
+#: ../gtk/gtkdebug.c:233
 msgid "Save Debug Log"
 msgstr "Tallenna virheenjäljitysloki"
 
-#: ../src/gtkdebug.c:586
+#: ../gtk/gtkdebug.c:594
 msgid "Invert"
 msgstr "Käännä"
 
-#: ../src/gtkdebug.c:589
+#: ../gtk/gtkdebug.c:597
 msgid "Highlight matches"
 msgstr "Korosta osumat"
 
-#: ../src/gtkdebug.c:636
-msgid "Debug Window"
-msgstr "Virheenjäljitysikkuna"
-
-#: ../src/gtkdebug.c:689
-msgid "Clear"
-msgstr "Tyhjennä"
-
-#: ../src/gtkdebug.c:698
-msgid "Pause"
-msgstr "Tauko"
-
-#: ../src/gtkdebug.c:705 ../src/gtkdebug.c:706
-msgid "Timestamps"
-msgstr "Aikaleimat"
-
-#: ../src/gtkdebug.c:724
+#: ../gtk/gtkdebug.c:664
+msgid "_Icon Only"
+msgstr "Vain _kuvake"
+
+#: ../gtk/gtkdebug.c:665
+msgid "_Text Only"
+msgstr "Vain _teksti"
+
+#: ../gtk/gtkdebug.c:666
+msgid "_Both Icon & Text"
+msgstr "_Sekä kuvake että teksti"
+
+#: ../gtk/gtkdebug.c:802
 msgid "Filter"
 msgstr "Suodin"
 
-#: ../src/gtkdebug.c:743
+#: ../gtk/gtkdebug.c:821
 msgid "Right click for more options."
 msgstr "Näytä lisää valintoja oikealla hiiren painikkeella."
 
-#: ../src/gtkdialogs.c:61 ../src/gtkdialogs.c:104
+#: ../gtk/gtkdebug.c:851
+msgid "Level "
+msgstr "Taso "
+
+#: ../gtk/gtkdebug.c:852 ../gtk/gtkdebug.c:858
+msgid "Select the debug filter level."
+msgstr "Valitse virheenjäljityssuodattimen taso."
+
+#: ../gtk/gtkdebug.c:860
+msgid "All"
+msgstr "Kaikki"
+
+#: ../gtk/gtkdebug.c:861
+msgid "Misc"
+msgstr "Muut"
+
+#: ../gtk/gtkdebug.c:863
+msgid "Warning"
+msgstr "Varoitukset"
+
+#: ../gtk/gtkdebug.c:864
+msgid "Error "
+msgstr "Virheet "
+
+#: ../gtk/gtkdebug.c:865
+msgid "Fatal Error"
+msgstr "Vakavat virheet"
+
+#: ../gtk/gtkdialogs.c:66 ../gtk/gtkdialogs.c:109
 msgid "lead developer"
 msgstr "pääkehittäjä"
 
-#: ../src/gtkdialogs.c:62 ../src/gtkdialogs.c:63 ../src/gtkdialogs.c:65
-#: ../src/gtkdialogs.c:66 ../src/gtkdialogs.c:68 ../src/gtkdialogs.c:69
-#: ../src/gtkdialogs.c:70 ../src/gtkdialogs.c:71 ../src/gtkdialogs.c:72
-#: ../src/gtkdialogs.c:73 ../src/gtkdialogs.c:75 ../src/gtkdialogs.c:76
-#: ../src/gtkdialogs.c:77
+#: ../gtk/gtkdialogs.c:67 ../gtk/gtkdialogs.c:68 ../gtk/gtkdialogs.c:69
+#: ../gtk/gtkdialogs.c:70 ../gtk/gtkdialogs.c:71 ../gtk/gtkdialogs.c:73
+#: ../gtk/gtkdialogs.c:74 ../gtk/gtkdialogs.c:75 ../gtk/gtkdialogs.c:76
+#: ../gtk/gtkdialogs.c:77 ../gtk/gtkdialogs.c:78 ../gtk/gtkdialogs.c:80
+#: ../gtk/gtkdialogs.c:81 ../gtk/gtkdialogs.c:82
 msgid "developer"
 msgstr "kehittäjä"
 
-#: ../src/gtkdialogs.c:64
+#: ../gtk/gtkdialogs.c:72
+msgid "developer & webmaster"
+msgstr "kehittäjä & verkkosivujen ylläpitäjä"
+
+#: ../gtk/gtkdialogs.c:79
+msgid "support"
+msgstr "tuki"
+
+#: ../gtk/gtkdialogs.c:101
 msgid "win32 port"
 msgstr "win32-käännös"
 
-#: ../src/gtkdialogs.c:67
-msgid "developer & webmaster"
-msgstr "kehittäjä & verkkosivujen ylläpitäjä"
-
-#: ../src/gtkdialogs.c:74
-msgid "support"
-msgstr "tuki"
-
-#: ../src/gtkdialogs.c:97 ../src/gtkdialogs.c:98
+#: ../gtk/gtkdialogs.c:102 ../gtk/gtkdialogs.c:103
 msgid "maintainer"
 msgstr "ylläpitäjä"
 
-#: ../src/gtkdialogs.c:99
+#: ../gtk/gtkdialogs.c:104
 msgid "libfaim maintainer"
 msgstr "libfaim-ylläpitäjä"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../src/gtkdialogs.c:101
+#: ../gtk/gtkdialogs.c:106
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hakkeri ja kuski [laiska pummi]"
 
-#: ../src/gtkdialogs.c:102
+#: ../gtk/gtkdialogs.c:107
 msgid "Jabber developer"
 msgstr "Jabber-kehittäjä"
 
-#: ../src/gtkdialogs.c:103
+#: ../gtk/gtkdialogs.c:108
 msgid "original author"
 msgstr "alkuperäinen tekijä"
 
-#: ../src/gtkdialogs.c:110 ../src/gtkdialogs.c:111 ../src/gtkdialogs.c:174
+#: ../gtk/gtkdialogs.c:115
+msgid "Arabic"
+msgstr "arabia"
+
+#: ../gtk/gtkdialogs.c:116 ../gtk/gtkdialogs.c:117 ../gtk/gtkdialogs.c:183
 msgid "Bulgarian"
 msgstr "bulgaria"
 
-#: ../src/gtkdialogs.c:112 ../src/gtkdialogs.c:113
+#: ../gtk/gtkdialogs.c:118 ../gtk/gtkdialogs.c:119
 msgid "Bengali"
 msgstr "bengali"
 
-#: ../src/gtkdialogs.c:114
+#: ../gtk/gtkdialogs.c:120
 msgid "Bosnian"
 msgstr "bosnia"
 
-#: ../src/gtkdialogs.c:115 ../src/gtkdialogs.c:175 ../src/gtkdialogs.c:176
+#: ../gtk/gtkdialogs.c:121 ../gtk/gtkdialogs.c:184 ../gtk/gtkdialogs.c:185
 msgid "Catalan"
 msgstr "katalaani"
 
-#: ../src/gtkdialogs.c:116 ../src/gtkdialogs.c:117
+#: ../gtk/gtkdialogs.c:122 ../gtk/gtkdialogs.c:123
 msgid "Valencian-Catalan"
 msgstr "valencian katalaani"
 
-#: ../src/gtkdialogs.c:118 ../src/gtkdialogs.c:177
+#: ../gtk/gtkdialogs.c:124 ../gtk/gtkdialogs.c:186
 msgid "Czech"
 msgstr "tšekki"
 
-#: ../src/gtkdialogs.c:119
+#: ../gtk/gtkdialogs.c:125
 msgid "Danish"
 msgstr "tanska"
 
-#: ../src/gtkdialogs.c:120 ../src/gtkdialogs.c:121 ../src/gtkdialogs.c:178
+#: ../gtk/gtkdialogs.c:126 ../gtk/gtkdialogs.c:127 ../gtk/gtkdialogs.c:187
 msgid "German"
 msgstr "saksa"
 
-#: ../src/gtkdialogs.c:122 ../src/gtkdialogs.c:123
+#: ../gtk/gtkdialogs.c:128 ../gtk/gtkdialogs.c:129
 msgid "Greek"
 msgstr "kreikka"
 
-#: ../src/gtkdialogs.c:124
+#: ../gtk/gtkdialogs.c:130
 msgid "Australian English"
 msgstr "australian englanti"
 
-#: ../src/gtkdialogs.c:125
+#: ../gtk/gtkdialogs.c:131
 msgid "Canadian English"
 msgstr "kanadan englanti"
 
-#: ../src/gtkdialogs.c:126
+#: ../gtk/gtkdialogs.c:132
 msgid "British English"
 msgstr "brittienglanti"
 
-#: ../src/gtkdialogs.c:127 ../src/gtkdialogs.c:179 ../src/gtkdialogs.c:180
-#: ../src/gtkdialogs.c:181 ../src/gtkdialogs.c:182
+#: ../gtk/gtkdialogs.c:133 ../gtk/gtkdialogs.c:188 ../gtk/gtkdialogs.c:189
+#: ../gtk/gtkdialogs.c:190 ../gtk/gtkdialogs.c:191
 msgid "Spanish"
 msgstr "espanja"
 
-#: ../src/gtkdialogs.c:128 ../src/gtkdialogs.c:129
+#: ../gtk/gtkdialogs.c:134 ../gtk/gtkdialogs.c:135
 msgid "Euskera(Basque)"
 msgstr "euskara (baski)"
 
-#: ../src/gtkdialogs.c:130 ../src/gtkdialogs.c:131
+#: ../gtk/gtkdialogs.c:136 ../gtk/gtkdialogs.c:137
 msgid "Persian"
 msgstr "persia"
 
-#: ../src/gtkdialogs.c:132 ../src/gtkdialogs.c:183 ../src/gtkdialogs.c:184
+#: ../gtk/gtkdialogs.c:138 ../gtk/gtkdialogs.c:192 ../gtk/gtkdialogs.c:193
 msgid "Finnish"
 msgstr "suomi"
 
-#: ../src/gtkdialogs.c:133 ../src/gtkdialogs.c:185 ../src/gtkdialogs.c:186
-#: ../src/gtkdialogs.c:187 ../src/gtkdialogs.c:188
+#: ../gtk/gtkdialogs.c:139 ../gtk/gtkdialogs.c:194 ../gtk/gtkdialogs.c:195
+#: ../gtk/gtkdialogs.c:196 ../gtk/gtkdialogs.c:197
 msgid "French"
 msgstr "ranska"
 
-#: ../src/gtkdialogs.c:134
+#: ../gtk/gtkdialogs.c:140
 msgid "Galician"
 msgstr "galego"
 
-#: ../src/gtkdialogs.c:135 ../src/gtkdialogs.c:189
+#: ../gtk/gtkdialogs.c:141 ../gtk/gtkdialogs.c:142
+msgid "Gujarati"
+msgstr "gudĹľarati"
+
+#: ../gtk/gtkdialogs.c:143 ../gtk/gtkdialogs.c:198
 msgid "Hebrew"
 msgstr "heprea"
 
-#: ../src/gtkdialogs.c:136
+#: ../gtk/gtkdialogs.c:144
 msgid "Hindi"
 msgstr "hindi"
 
-#: ../src/gtkdialogs.c:137
+#: ../gtk/gtkdialogs.c:145
 msgid "Hungarian"
 msgstr "unkari"
 
-#: ../src/gtkdialogs.c:138 ../src/gtkdialogs.c:190
+#: ../gtk/gtkdialogs.c:146 ../gtk/gtkdialogs.c:199
 msgid "Italian"
 msgstr "italia"
 
-#: ../src/gtkdialogs.c:139 ../src/gtkdialogs.c:191 ../src/gtkdialogs.c:192
-#: ../src/gtkdialogs.c:193
+#: ../gtk/gtkdialogs.c:147 ../gtk/gtkdialogs.c:200 ../gtk/gtkdialogs.c:201
+#: ../gtk/gtkdialogs.c:202
 msgid "Japanese"
 msgstr "japani"
 
-#: ../src/gtkdialogs.c:140 ../src/gtkdialogs.c:194
+#: ../gtk/gtkdialogs.c:148 ../gtk/gtkdialogs.c:203
 msgid "Georgian"
 msgstr "georgia"
 
-#: ../src/gtkdialogs.c:141 ../src/gtkdialogs.c:195
+#: ../gtk/gtkdialogs.c:149 ../gtk/gtkdialogs.c:204
 msgid "Korean"
 msgstr "korea"
 
-#: ../src/gtkdialogs.c:142 ../src/gtkdialogs.c:143 ../src/gtkdialogs.c:144
+#: ../gtk/gtkdialogs.c:150 ../gtk/gtkdialogs.c:151 ../gtk/gtkdialogs.c:152
 msgid "Kurdish"
 msgstr "kurdi"
 
-#: ../src/gtkdialogs.c:145 ../src/gtkdialogs.c:196 ../src/gtkdialogs.c:197
+#: ../gtk/gtkdialogs.c:153 ../gtk/gtkdialogs.c:205 ../gtk/gtkdialogs.c:206
 msgid "Lithuanian"
 msgstr "liettua"
 
-#: ../src/gtkdialogs.c:146
+#: ../gtk/gtkdialogs.c:154
 msgid "Macedonian"
 msgstr "makedonia"
 
-#: ../src/gtkdialogs.c:147
+#: ../gtk/gtkdialogs.c:155
+msgid "Nepali"
+msgstr "nepal"
+
+#: ../gtk/gtkdialogs.c:156
 msgid "Dutch, Flemish"
 msgstr "hollanti, flaami"
 
-#: ../src/gtkdialogs.c:148
+#: ../gtk/gtkdialogs.c:157
 msgid "Norwegian"
 msgstr "norja"
 
-#: ../src/gtkdialogs.c:149 ../src/gtkdialogs.c:150 ../src/gtkdialogs.c:198
+#: ../gtk/gtkdialogs.c:158 ../gtk/gtkdialogs.c:159 ../gtk/gtkdialogs.c:207
 msgid "Polish"
 msgstr "puola"
 
-#: ../src/gtkdialogs.c:151
+#: ../gtk/gtkdialogs.c:160
 msgid "Portuguese"
 msgstr "portugali"
 
-#: ../src/gtkdialogs.c:152
+#: ../gtk/gtkdialogs.c:161
 msgid "Portuguese-Brazil"
 msgstr "portugali (brasilialainen)"
 
-#: ../src/gtkdialogs.c:153
+#: ../gtk/gtkdialogs.c:162
 msgid "Romanian"
 msgstr "romania"
 
-#: ../src/gtkdialogs.c:154 ../src/gtkdialogs.c:199 ../src/gtkdialogs.c:200
+#: ../gtk/gtkdialogs.c:163 ../gtk/gtkdialogs.c:208 ../gtk/gtkdialogs.c:209
 msgid "Russian"
 msgstr "venäjä"
 
-#: ../src/gtkdialogs.c:155 ../src/gtkdialogs.c:156
+#: ../gtk/gtkdialogs.c:164 ../gtk/gtkdialogs.c:165
 msgid "Serbian"
 msgstr "serbia"
 
-#: ../src/gtkdialogs.c:157 ../src/gtkdialogs.c:201
+#: ../gtk/gtkdialogs.c:166 ../gtk/gtkdialogs.c:210
 msgid "Slovak"
 msgstr "slovakki"
 
-#: ../src/gtkdialogs.c:158
+#: ../gtk/gtkdialogs.c:167
 msgid "Slovenian"
 msgstr "sloveeni"
 
-#: ../src/gtkdialogs.c:159 ../src/gtkdialogs.c:202
+#: ../gtk/gtkdialogs.c:168 ../gtk/gtkdialogs.c:211
 msgid "Swedish"
 msgstr "ruotsi"
 
-#: ../src/gtkdialogs.c:160
+#: ../gtk/gtkdialogs.c:169
 msgid "Tamil"
 msgstr "tamil"
 
-#: ../src/gtkdialogs.c:161
+#: ../gtk/gtkdialogs.c:170
 msgid "Telugu"
 msgstr "telugu"
 
-#: ../src/gtkdialogs.c:162
+#: ../gtk/gtkdialogs.c:171
 msgid "Thai"
 msgstr "thai"
 
-#: ../src/gtkdialogs.c:163
+#: ../gtk/gtkdialogs.c:172
 msgid "Turkish"
 msgstr "turkki"
 
-#: ../src/gtkdialogs.c:164
+#: ../gtk/gtkdialogs.c:173
 msgid "Vietnamese"
 msgstr "vietnam"
 
-#: ../src/gtkdialogs.c:164
+#: ../gtk/gtkdialogs.c:173
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M Thanh ja Gnomen Vi-työryhmä"
 
-#: ../src/gtkdialogs.c:165 ../src/gtkdialogs.c:203
+#: ../gtk/gtkdialogs.c:174 ../gtk/gtkdialogs.c:212
 msgid "Simplified Chinese"
 msgstr "kiina (yksinkertaistettu)"
 
-#: ../src/gtkdialogs.c:166 ../src/gtkdialogs.c:167 ../src/gtkdialogs.c:204
+#: ../gtk/gtkdialogs.c:175 ../gtk/gtkdialogs.c:176 ../gtk/gtkdialogs.c:213
 msgid "Traditional Chinese"
 msgstr "kiina (perinteinen)"
 
-#: ../src/gtkdialogs.c:173
+#: ../gtk/gtkdialogs.c:182
 msgid "Amharic"
 msgstr "amhara"
 
-#: ../src/gtkdialogs.c:245
+#: ../gtk/gtkdialogs.c:294
 msgid "About Gaim"
 msgstr "Tietoja Gaimista"
 
-#: ../src/gtkdialogs.c:269
+#: ../gtk/gtkdialogs.c:328
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Zephyr, and Gadu-"
-"Gadu all at once.  It is written using GTK+.<BR><BR>You may modify and "
+"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Zephyr, Gadu-Gadu, "
+"and QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
 "redistribute the program under the terms of the GPL (version 2 or later).  A "
 "copy of the GPL is contained in the 'COPYING' file distributed with Gaim.  "
 "Gaim is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
@@ -3610,7 +2440,7 @@
 msgstr ""
 "Gaim on modulaarinen pikaviestinsovellus, joka kykenee käyttämään AIM-, "
 "MSN-, Yahoo!-, Jabber-, ICQ-, IRC-, SILC-, Novell GroupWise-, Lotus "
-"Sametime-, Zephyr- ja Gadu-Gadu-yhteyskäytäntöjä yhtäaikaisesti. Se on "
+"Sametime-, Zephyr-, Gadu-Gadu- ja QQ-yhteyskäytäntöjä yhtäaikaisesti. Se on "
 "ohjelmoitu käyttäen Gtk+-kirjastoa.<BR><BR>Voit muokata ja jakaa ohjelmaa "
 "GPL-lisenssin (versio 2 tai myöhempi) ehdoilla. Kopio GPL:stä on "
 "sisällytetty 'COPYING'-tiedostoon, joka tulee Gaimin mukana. Gaimin "
@@ -3618,111 +2448,106 @@
 "osallistuneista löytyy 'COPYRIGHT'-tiedostosta. Emme anna ohjelmalle "
 "minkäänlaista takuuta.<BR><BR>"
 
-#: ../src/gtkdialogs.c:283
+#: ../gtk/gtkdialogs.c:342
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> #wingaim palvelimella irc.freenode.net<BR><BR>"
 
-#: ../src/gtkdialogs.c:286
+#: ../gtk/gtkdialogs.c:345
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> #gaim palvelimella irc.freenode.net<BR><BR>"
 
-#: ../src/gtkdialogs.c:292
+#: ../gtk/gtkdialogs.c:351
 msgid "Current Developers"
 msgstr "Nykyiset kehittäjät"
 
-#: ../src/gtkdialogs.c:307
+#: ../gtk/gtkdialogs.c:366
 msgid "Crazy Patch Writers"
 msgstr "Villit korjauspäivitysten kirjoittajat"
 
-#: ../src/gtkdialogs.c:322
+#: ../gtk/gtkdialogs.c:381
 msgid "Retired Developers"
 msgstr "Lopettaneet kehittäjät"
 
-#: ../src/gtkdialogs.c:337
+#: ../gtk/gtkdialogs.c:396
 msgid "Current Translators"
 msgstr "Nykyiset kielenkääntäjät"
 
-#: ../src/gtkdialogs.c:357
+#: ../gtk/gtkdialogs.c:416
 msgid "Past Translators"
 msgstr "Aikaisemmat kielenkääntäjät"
 
-#: ../src/gtkdialogs.c:375
+#: ../gtk/gtkdialogs.c:434
 msgid "Debugging Information"
 msgstr "Virheenjäljitystietoja"
 
-#: ../src/gtkdialogs.c:595 ../src/gtkdialogs.c:732 ../src/gtkdialogs.c:795
+#: ../gtk/gtkdialogs.c:648 ../gtk/gtkdialogs.c:785 ../gtk/gtkdialogs.c:865
 msgid "_Name"
 msgstr "_Nimi"
 
-#: ../src/gtkdialogs.c:600 ../src/gtkdialogs.c:737 ../src/gtkdialogs.c:800
+#: ../gtk/gtkdialogs.c:653 ../gtk/gtkdialogs.c:790 ../gtk/gtkdialogs.c:870
 msgid "_Account"
 msgstr "_Käyttäjätili"
 
-#: ../src/gtkdialogs.c:608
+#: ../gtk/gtkdialogs.c:661
 msgid "New Instant Message"
 msgstr "Uusi pikaviesti"
 
-#: ../src/gtkdialogs.c:610
+#: ../gtk/gtkdialogs.c:663
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
 "Syötä sen henkilön näyttönimi tai lempinimi, jolle haluat lähettää "
 "pikaviestin."
 
-#: ../src/gtkdialogs.c:745
+#: ../gtk/gtkdialogs.c:798
 msgid "Get User Info"
 msgstr "Hae käyttäjätiedot"
 
-#: ../src/gtkdialogs.c:747
+#: ../gtk/gtkdialogs.c:800
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr ""
 "Syötä sen henkilön näyttönimi tai lempinimi, jonka tiedot haluat nähdä."
 
-#: ../src/gtkdialogs.c:819
+#: ../gtk/gtkdialogs.c:889
 msgid "View User Log"
 msgstr "Näytä käyttäjäloki"
 
-#: ../src/gtkdialogs.c:821
+#: ../gtk/gtkdialogs.c:891
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr "Syötä sen henkilön näyttönimi jonka lokia haluat katsella."
 
-#: ../src/gtkdialogs.c:840
+#: ../gtk/gtkdialogs.c:910
 msgid "Alias Contact"
 msgstr "Anna kontaktiryhmälle lempinimi"
 
-#: ../src/gtkdialogs.c:841
+#: ../gtk/gtkdialogs.c:911
 msgid "Enter an alias for this contact."
 msgstr "Anna lempinimi tälle kontaktiryhmälle."
 
-#: ../src/gtkdialogs.c:843 ../src/gtkdialogs.c:865 ../src/gtkdialogs.c:885
-#: ../src/gtkrequest.c:277 ../src/protocols/silc/chat.c:587
-msgid "Alias"
-msgstr "Alias"
-
-#: ../src/gtkdialogs.c:861
+#: ../gtk/gtkdialogs.c:931
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Anna %s:n lempinimi."
 
-#: ../src/gtkdialogs.c:863
+#: ../gtk/gtkdialogs.c:933
 msgid "Alias Buddy"
 msgstr "Anna tuttavalle lempinimi"
 
-#: ../src/gtkdialogs.c:882
+#: ../gtk/gtkdialogs.c:952
 msgid "Alias Chat"
 msgstr "Anna ryhmäkeskustelulle lempinimi"
 
-#: ../src/gtkdialogs.c:883
+#: ../gtk/gtkdialogs.c:953
 msgid "Enter an alias for this chat."
 msgstr "Syötä lempinimi tälle ryhmäkeskustelulle."
 
-#: ../src/gtkdialogs.c:920
+#: ../gtk/gtkdialogs.c:990
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -3737,15 +2562,30 @@
 "Olet poistamassa kontaktin, jossa on %s sekä %d muuta tuttavaa "
 "tuttavalistaltasi.  Haluatko jatkaa?"
 
-#: ../src/gtkdialogs.c:928
+#: ../gtk/gtkdialogs.c:998
 msgid "Remove Contact"
 msgstr "Poista kontakti"
 
-#: ../src/gtkdialogs.c:929
+#: ../gtk/gtkdialogs.c:999
 msgid "_Remove Contact"
 msgstr "_Poista kontakti"
 
-#: ../src/gtkdialogs.c:980
+#: ../gtk/gtkdialogs.c:1029
+#, c-format
+msgid ""
+"You are about to merge the group called %s into the group called %s. Do you "
+"want to continue?"
+msgstr "Olet yhdistämässä ryhmää \"%s\" ryhmään \"%s\".  Haluatko jatkaa?"
+
+#: ../gtk/gtkdialogs.c:1036
+msgid "Merge Groups"
+msgstr "Yhdistä ryhmät"
+
+#: ../gtk/gtkdialogs.c:1037
+msgid "_Merge Groups"
+msgstr "_Yhdistä ryhmät"
+
+#: ../gtk/gtkdialogs.c:1087
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -3753,29 +2593,29 @@
 msgstr ""
 "Olet poistamassa ryhmää nimeltä \"%s\" tuttavalistaltasi.  Haluatko jatkaa?"
 
-#: ../src/gtkdialogs.c:983
+#: ../gtk/gtkdialogs.c:1090
 msgid "Remove Group"
 msgstr "Poista ryhmä"
 
-#: ../src/gtkdialogs.c:984
+#: ../gtk/gtkdialogs.c:1091
 msgid "_Remove Group"
 msgstr "_Poista ryhmä"
 
-#: ../src/gtkdialogs.c:1017
+#: ../gtk/gtkdialogs.c:1124
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Olet poistamassa \"%s\":n tuttavalistaltasi.  Haluatko jatkaa?"
 
-#: ../src/gtkdialogs.c:1020
+#: ../gtk/gtkdialogs.c:1127
 msgid "Remove Buddy"
 msgstr "Poista tuttava"
 
-#: ../src/gtkdialogs.c:1021
+#: ../gtk/gtkdialogs.c:1128
 msgid "_Remove Buddy"
 msgstr "_Poista tuttava"
 
-#: ../src/gtkdialogs.c:1042
+#: ../gtk/gtkdialogs.c:1149
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -3784,182 +2624,186 @@
 "Olet poistamassa ryhmäkeskustelun nimeltä \"%s\" tuttavalistaltasi. Haluatko "
 "jatkaa?"
 
-#: ../src/gtkdialogs.c:1045
+#: ../gtk/gtkdialogs.c:1152
 msgid "Remove Chat"
 msgstr "Poista ryhmäkeskustelu"
 
-#: ../src/gtkdialogs.c:1046
+#: ../gtk/gtkdialogs.c:1153
 msgid "_Remove Chat"
 msgstr "_Poista ryhmäkeskustelu"
 
-#: ../src/gtkft.c:133
+#: ../gtk/gtkft.c:133
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f kt/s"
 
-#: ../src/gtkft.c:153
+#: ../gtk/gtkft.c:153
 msgid "Not started"
 msgstr "Ei aloitettu"
 
-#: ../src/gtkft.c:162 ../src/gtkft.c:1063
+#: ../gtk/gtkft.c:159 ../libgaim/account.c:1662
+#: ../libgaim/protocols/gg/gg.c:1002 ../libgaim/protocols/jabber/buddy.c:630
+#: ../libgaim/protocols/jabber/buddy.c:1361
+#: ../libgaim/protocols/jabber/buddy.c:1378
+#: ../libgaim/protocols/novell/novell.c:2868
+msgid "Unknown"
+msgstr "Tuntematon"
+
+#: ../gtk/gtkft.c:162 ../gtk/gtkft.c:1119
 msgid "Finished"
 msgstr "Valmis"
 
-#: ../src/gtkft.c:165 ../src/gtkft.c:1003
+#: ../gtk/gtkft.c:165 ../gtk/gtkft.c:1059
 msgid "Canceled"
 msgstr "Peruutettu"
 
-#: ../src/gtkft.c:168 ../src/gtkft.c:922
+#: ../gtk/gtkft.c:168 ../gtk/gtkft.c:975
 msgid "Waiting for transfer to begin"
 msgstr "Odotetaan lähetyksen alkamista"
 
-#: ../src/gtkft.c:221
+#: ../gtk/gtkft.c:228
+#, c-format
+msgid "File Transfers - %d%% of %d files"
+msgstr "Tiedostonsiirrrot - tiedosto %d%% / %d"
+
+#: ../gtk/gtkft.c:233 ../gtk/gtkft.c:763
+msgid "File Transfers"
+msgstr "Tiedostonsiirrot"
+
+#: ../gtk/gtkft.c:273
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Otetaan vastaan käyttäjänä:</b>"
 
-#: ../src/gtkft.c:223
+#: ../gtk/gtkft.c:275
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Otetaan vastaan käyttäjältä:</b>"
 
-#: ../src/gtkft.c:227
+#: ../gtk/gtkft.c:279
 msgid "<b>Sending To:</b>"
 msgstr "<b>Lähetetään:</b>"
 
-#: ../src/gtkft.c:229
+#: ../gtk/gtkft.c:281
 msgid "<b>Sending As:</b>"
 msgstr "<b>Lähetetään käyttäjänä:</b>"
 
-#: ../src/gtkft.c:445
+#: ../gtk/gtkft.c:497
 msgid "There is no application configured to open this type of file."
 msgstr "Ohjelmaa tämän tiedostotyypin avaamiseen ei ole asetettu."
 
-#: ../src/gtkft.c:450
+#: ../gtk/gtkft.c:502
 msgid "An error occurred while opening the file."
 msgstr "Virhe tapahtui avattaessa tiedostoa."
 
-#: ../src/gtkft.c:487
+#: ../gtk/gtkft.c:539
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "Virhe käynnistettäessä %s: %s"
 
-#: ../src/gtkft.c:496
+#: ../gtk/gtkft.c:548
 #, c-format
 msgid "Error running %s"
 msgstr "Virhe ajettaessa %s"
 
-#: ../src/gtkft.c:497
+#: ../gtk/gtkft.c:549
 #, c-format
 msgid "Process returned error code %d"
 msgstr "Käsittele palautettu virhekoodi %d"
 
-#: ../src/gtkft.c:591
+#: ../gtk/gtkft.c:644
 msgid "Progress"
 msgstr "Valmiina"
 
-#: ../src/gtkft.c:598
+#: ../gtk/gtkft.c:651
 msgid "Filename"
 msgstr "Tiedoston nimi"
 
-#: ../src/gtkft.c:605
+#: ../gtk/gtkft.c:658
 msgid "Size"
 msgstr "Koko"
 
-#: ../src/gtkft.c:612
+#: ../gtk/gtkft.c:665
 msgid "Remaining"
 msgstr "Jäljellä"
 
-#: ../src/gtkft.c:643
+#: ../gtk/gtkft.c:696
 msgid "Filename:"
 msgstr "Tiedostonimi:"
 
-#: ../src/gtkft.c:644
+#: ../gtk/gtkft.c:697
 msgid "Local File:"
 msgstr "Paikallinen tiedosto:"
 
-#: ../src/gtkft.c:645
-msgid "Status:"
-msgstr "Tila:"
-
-#: ../src/gtkft.c:646
+#: ../gtk/gtkft.c:699
 msgid "Speed:"
 msgstr "Nopeus:"
 
-#: ../src/gtkft.c:647
+#: ../gtk/gtkft.c:700
 msgid "Time Elapsed:"
 msgstr "Aikaa kulunut:"
 
-#: ../src/gtkft.c:648
+#: ../gtk/gtkft.c:701
 msgid "Time Remaining:"
 msgstr "Aikaa jäljellä:"
 
-#: ../src/gtkft.c:710
-msgid "File Transfers"
-msgstr "Tiedostonsiirrot"
-
-#: ../src/gtkft.c:733
+#: ../gtk/gtkft.c:786
 msgid "Close this window when all transfers _finish"
 msgstr "Sulje tämä ikkuna kun kaikki siirrot ovat _valmiita"
 
-#: ../src/gtkft.c:743
+#: ../gtk/gtkft.c:796
 msgid "C_lear finished transfers"
 msgstr "_Poista valmiit siirrot"
 
 #. "Download Details" arrow
-#: ../src/gtkft.c:752
+#: ../gtk/gtkft.c:805
 msgid "File transfer _details"
 msgstr "Tiedostonsiirron yksityiskohdat"
 
-#. Pause button
-#: ../src/gtkft.c:782 ../src/gtkstock.c:146
-msgid "_Pause"
-msgstr "_Tauko"
-
 #. Resume button
-#: ../src/gtkft.c:792
+#: ../gtk/gtkft.c:845
 msgid "_Resume"
 msgstr "_Jatka"
 
-#: ../src/gtkft.c:1005
+#: ../gtk/gtkft.c:1061
 msgid "Failed"
 msgstr "Epäonnistunut"
 
-#: ../src/gtkimhtml.c:814
+#: ../gtk/gtkimhtml.c:814
 msgid "Paste as Plain _Text"
 msgstr "Liimaa pelkkänä _tekstinä"
 
-#: ../src/gtkimhtml.c:826
+#: ../gtk/gtkimhtml.c:826
 msgid "_Reset formatting"
 msgstr "_Poista muotoilu"
 
-#: ../src/gtkimhtml.c:1318
+#: ../gtk/gtkimhtml.c:1318
 msgid "Hyperlink color"
 msgstr "Hyperlinkin väri"
 
-#: ../src/gtkimhtml.c:1319
+#: ../gtk/gtkimhtml.c:1319
 msgid "Color to draw hyperlinks."
 msgstr "Väri jolla piirretään hyperlinkit"
 
-#: ../src/gtkimhtml.c:1322
+#: ../gtk/gtkimhtml.c:1322
 msgid "Hyperlink prelight color"
 msgstr "Hyperlinkin ensiväri"
 
-#: ../src/gtkimhtml.c:1323
+#: ../gtk/gtkimhtml.c:1323
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Väri jolla piirretään hyperlinkit kun hiiren kursori on niiden päällä."
 
-#: ../src/gtkimhtml.c:1544
+#: ../gtk/gtkimhtml.c:1544
 msgid "_Copy E-Mail Address"
 msgstr "_Kopioi sähköpostiosoite"
 
-#: ../src/gtkimhtml.c:1556
+#: ../gtk/gtkimhtml.c:1556
 msgid "_Open Link in Browser"
 msgstr "_Avaa linkki selaimessa"
 
-#: ../src/gtkimhtml.c:1566
+#: ../gtk/gtkimhtml.c:1566
 msgid "_Copy Link Location"
 msgstr "_Kopioi linkin sijainti"
 
-#: ../src/gtkimhtml.c:3257
+#: ../gtk/gtkimhtml.c:3291
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -3969,7 +2813,7 @@
 "\n"
 "Oletetaan PNG-kuvaksi."
 
-#: ../src/gtkimhtml.c:3260
+#: ../gtk/gtkimhtml.c:3294
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -3979,7 +2823,7 @@
 "\n"
 "Oletetaan PNG-kuvaksi."
 
-#: ../src/gtkimhtml.c:3273
+#: ../gtk/gtkimhtml.c:3307
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -3990,7 +2834,7 @@
 "\n"
 "%s"
 
-#: ../src/gtkimhtml.c:3276
+#: ../gtk/gtkimhtml.c:3310
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -4001,35 +2845,35 @@
 "\n"
 "%s"
 
-#: ../src/gtkimhtml.c:3356 ../src/gtkimhtml.c:3368
+#: ../gtk/gtkimhtml.c:3390 ../gtk/gtkimhtml.c:3402
 msgid "Save Image"
 msgstr "Tallenna kuva"
 
-#: ../src/gtkimhtml.c:3396
+#: ../gtk/gtkimhtml.c:3430
 msgid "_Save Image..."
 msgstr "_Tallenna kuva nimellä..."
 
-#: ../src/gtkimhtmltoolbar.c:147
+#: ../gtk/gtkimhtmltoolbar.c:147
 msgid "Select Font"
 msgstr "Valitse kirjasin"
 
-#: ../src/gtkimhtmltoolbar.c:226
+#: ../gtk/gtkimhtmltoolbar.c:226
 msgid "Select Text Color"
 msgstr "Valitse tekstin väri"
 
-#: ../src/gtkimhtmltoolbar.c:305
+#: ../gtk/gtkimhtmltoolbar.c:305
 msgid "Select Background Color"
 msgstr "Valitse taustaväri"
 
-#: ../src/gtkimhtmltoolbar.c:394
+#: ../gtk/gtkimhtmltoolbar.c:394
 msgid "_URL"
 msgstr "_URL"
 
-#: ../src/gtkimhtmltoolbar.c:402
+#: ../gtk/gtkimhtmltoolbar.c:402
 msgid "_Description"
 msgstr "_Kuvaus"
 
-#: ../src/gtkimhtmltoolbar.c:405
+#: ../gtk/gtkimhtmltoolbar.c:405
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -4037,100 +2881,100 @@
 "Syötä URL, jonka haluat liittää, sekä sen kuvaus. \n"
 "Kuvaus on valinnainen."
 
-#: ../src/gtkimhtmltoolbar.c:409
+#: ../gtk/gtkimhtmltoolbar.c:409
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Syötä URL jonka haluat liittää."
 
-#: ../src/gtkimhtmltoolbar.c:414
+#: ../gtk/gtkimhtmltoolbar.c:414
 msgid "Insert Link"
 msgstr "Lisää linkki"
 
-#: ../src/gtkimhtmltoolbar.c:418
+#: ../gtk/gtkimhtmltoolbar.c:418
 msgid "_Insert"
 msgstr "_Lisää"
 
-#: ../src/gtkimhtmltoolbar.c:487
+#: ../gtk/gtkimhtmltoolbar.c:487
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Kuvan tallennus epäonnistui: %s\n"
 
-#: ../src/gtkimhtmltoolbar.c:513 ../src/gtkimhtmltoolbar.c:523
+#: ../gtk/gtkimhtmltoolbar.c:513 ../gtk/gtkimhtmltoolbar.c:523
 msgid "Insert Image"
 msgstr "Liitä kuva"
 
-#: ../src/gtkimhtmltoolbar.c:721
+#: ../gtk/gtkimhtmltoolbar.c:721
 msgid "This theme has no available smileys."
 msgstr "Tälle teemalle ei ole saatavissa hymiöitä."
 
 #. show everything
-#: ../src/gtkimhtmltoolbar.c:735
+#: ../gtk/gtkimhtmltoolbar.c:735
 msgid "Smile!"
 msgstr "Hymyile!"
 
-#: ../src/gtkimhtmltoolbar.c:922
+#: ../gtk/gtkimhtmltoolbar.c:922
 msgid "Bold"
 msgstr "Lihavoi"
 
-#: ../src/gtkimhtmltoolbar.c:933
+#: ../gtk/gtkimhtmltoolbar.c:933
 msgid "Italic"
 msgstr "Kursivoi"
 
-#: ../src/gtkimhtmltoolbar.c:944
+#: ../gtk/gtkimhtmltoolbar.c:944
 msgid "Underline"
 msgstr "Alleviivaa"
 
-#: ../src/gtkimhtmltoolbar.c:960
+#: ../gtk/gtkimhtmltoolbar.c:960
 msgid "Larger font size"
 msgstr "Suurempi kirjasinkoko"
 
-#: ../src/gtkimhtmltoolbar.c:972
+#: ../gtk/gtkimhtmltoolbar.c:972
 msgid "Smaller font size"
 msgstr "Pienempi kirjasinkoko"
 
-#: ../src/gtkimhtmltoolbar.c:989
-msgid "Font Face"
+#: ../gtk/gtkimhtmltoolbar.c:989
+msgid "Font face"
 msgstr "Kirjasintyyppi"
 
-#: ../src/gtkimhtmltoolbar.c:1001
+#: ../gtk/gtkimhtmltoolbar.c:1001
 msgid "Foreground font color"
 msgstr "Kirjasimen etualaväri"
 
-#: ../src/gtkimhtmltoolbar.c:1013
+#: ../gtk/gtkimhtmltoolbar.c:1013
 msgid "Background color"
 msgstr "Taustaväri"
 
-#: ../src/gtkimhtmltoolbar.c:1029
+#: ../gtk/gtkimhtmltoolbar.c:1029
 msgid "Reset formatting"
 msgstr "Poista muotoilu"
 
-#: ../src/gtkimhtmltoolbar.c:1044
+#: ../gtk/gtkimhtmltoolbar.c:1044
 msgid "Insert link"
 msgstr "Lisää linkki"
 
-#: ../src/gtkimhtmltoolbar.c:1054
+#: ../gtk/gtkimhtmltoolbar.c:1054
 msgid "Insert image"
 msgstr "Liitä kuva"
 
-#: ../src/gtkimhtmltoolbar.c:1065
+#: ../gtk/gtkimhtmltoolbar.c:1065
 msgid "Insert smiley"
 msgstr "Lisää hymiö"
 
-#: ../src/gtklog.c:203
+#: ../gtk/gtklog.c:238
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Keskustelu huoneessa %s: %s</span>"
 
-#: ../src/gtklog.c:208
+#: ../gtk/gtklog.c:243
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr ""
 "<span size='larger' weight='bold'>Keskustelu käyttäjän %s kanssa %s</span>"
 
-#: ../src/gtklog.c:257
+#: ../gtk/gtklog.c:292
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../src/gtklog.c:304
+#: ../gtk/gtklog.c:339
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
@@ -4138,7 +2982,7 @@
 "Järjestelmätapahtumat kirjataan lokiin vain jos \"Kirjaa kaikki "
 "tilamuutokset järjestelmälokiin\" on asetettu."
 
-#: ../src/gtklog.c:308
+#: ../gtk/gtklog.c:343
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
@@ -4146,41 +2990,41 @@
 "Pikaviestit kirjataan lokiin vain jos \"Kirjaa kaikki pikaviestit lokiin\" "
 "on asetettu."
 
-#: ../src/gtklog.c:311
+#: ../gtk/gtklog.c:346
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
 "Ryhmäkeskustelut kirjataan lokiin vain jos \"Kirjaa kaikki ryhmäkeskustelut "
 "lokiin\" on asetettu."
 
-#: ../src/gtklog.c:315
+#: ../gtk/gtklog.c:350
 msgid "No logs were found"
 msgstr "Lokeja ei löytynyt"
 
-#: ../src/gtklog.c:394
+#: ../gtk/gtklog.c:429
 msgid "Total log size:"
 msgstr "Lokin kokonaiskoko:"
 
-#: ../src/gtklog.c:460
+#: ../gtk/gtklog.c:495
 #, c-format
 msgid "Conversations in %s"
 msgstr "Keskustelut paikassa %s"
 
-#: ../src/gtklog.c:468 ../src/gtklog.c:519
+#: ../gtk/gtklog.c:503 ../gtk/gtklog.c:554
 #, c-format
 msgid "Conversations with %s"
 msgstr "Keskustelut käyttäjän %s kanssa"
 
-#: ../src/gtklog.c:544
+#: ../gtk/gtklog.c:579
 msgid "System Log"
 msgstr "Järjestelmäloki"
 
-#: ../src/gtkmain.c:307
+#: ../gtk/gtkmain.c:344
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. Kirjoita \"%s -h\" saadaksesi lisää tietoja.\n"
 
-#: ../src/gtkmain.c:309
+#: ../gtk/gtkmain.c:346
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4205,7 +3049,7 @@
 "                      määrittelee käytettävät tilit pilkuin eroteltuina)\n"
 "  -v, --version       näytä nykyinen versionumero ja poistu\n"
 
-#: ../src/gtkmain.c:493
+#: ../gtk/gtkmain.c:528
 #, c-format
 msgid ""
 "Gaim has segfaulted and attempted to dump a core file.\n"
@@ -4244,34 +3088,22 @@
 "ovat osoitteessa\n"
 "%scontactinfo.php.\n"
 
-#: ../src/gtknotify.c:332
-msgid "New Mail"
-msgstr "Uusi sähköposti"
-
-#: ../src/gtknotify.c:348
+#: ../gtk/gtknotify.c:348
 msgid "Open All Messages"
 msgstr "Avaa kaikki viestit"
 
-#: ../src/gtknotify.c:414 ../src/protocols/jabber/jabber.c:1127
-msgid "From"
-msgstr "Lähettäjä"
-
-#: ../src/gtknotify.c:423
-msgid "Subject"
-msgstr "Aihe"
-
-#: ../src/gtknotify.c:432
+#: ../gtk/gtknotify.c:432
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Sinulle on postia!</span>"
 
-#: ../src/gtknotify.c:498
+#: ../gtk/gtknotify.c:498
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s:lla on %d uusi viesti."
 msgstr[1] "%s:lla on %d uutta viestiä."
 
-#: ../src/gtknotify.c:503
+#: ../gtk/gtknotify.c:503
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -4282,52 +3114,43 @@
 "\n"
 "%s"
 
-#: ../src/gtknotify.c:692 ../src/protocols/sametime/sametime.c:5456
+#: ../gtk/gtknotify.c:692 ../libgaim/protocols/sametime/sametime.c:5459
 msgid "Search Results"
 msgstr "Hakutulokset"
 
-#: ../src/gtknotify.c:850 ../src/protocols/oscar/oscar.c:2634
-#, c-format
-msgid "Info for %s"
-msgstr "%s tiedot"
-
-#: ../src/gtknotify.c:851 ../src/protocols/toc/toc.c:470
-msgid "Buddy Information"
-msgstr "Tuttavan tiedot"
-
-#: ../src/gtknotify.c:891
+#: ../gtk/gtknotify.c:890
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "Selainkomento \"%s\" on virheellinen."
 
-#: ../src/gtknotify.c:893 ../src/gtknotify.c:905 ../src/gtknotify.c:918
-#: ../src/gtknotify.c:1041
+#: ../gtk/gtknotify.c:892 ../gtk/gtknotify.c:904 ../gtk/gtknotify.c:917
+#: ../gtk/gtknotify.c:1045
 msgid "Unable to open URL"
 msgstr "URL:n avaaminen epäonnistui"
 
-#: ../src/gtknotify.c:903 ../src/gtknotify.c:916
+#: ../gtk/gtknotify.c:902 ../gtk/gtknotify.c:915
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Virhe käynnistettäessä \"%s\": %s"
 
-#: ../src/gtknotify.c:1042
+#: ../gtk/gtknotify.c:1046
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Oma selainkomento -asetus valittu, mutta komentoa ei ole asetettu."
 
-#: ../src/gtkplugin.c:274
+#: ../gtk/gtkplugin.c:274
 msgid "The following plugins will be unloaded."
 msgstr "Seuraavat liitännäiset otetaan pois käytöstä."
 
-#: ../src/gtkplugin.c:293
+#: ../gtk/gtkplugin.c:293
 msgid "Multiple plugins will be unloaded."
 msgstr "Useita liitännäisiä otetaan pois käytöstä."
 
-#: ../src/gtkplugin.c:295
+#: ../gtk/gtkplugin.c:295
 msgid "Unload Plugins"
 msgstr "Poista liitännäiset käytöstä"
 
-#: ../src/gtkplugin.c:407
+#: ../gtk/gtkplugin.c:407
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -4338,7 +3161,7 @@
 "<span weight=\"bold\">Web-sivusto:</span>\t\t%s\n"
 "<span weight=\"bold\">Tiedostopolku:</span>\t%s"
 
-#: ../src/gtkplugin.c:417
+#: ../gtk/gtkplugin.c:417
 #, c-format
 msgid ""
 "%s\n"
@@ -4349,210 +3172,205 @@
 "<span foreground=\"#ff0000\" weight=\"bold\">Virhe: %s\n"
 "Tarkista onko liitännäiswebsivustolla päivitystä.</span>"
 
-#: ../src/gtkplugin.c:543
+#: ../gtk/gtkplugin.c:543
 msgid "Configure Pl_ugin"
 msgstr "Liitännäisen _asetukset"
 
-#: ../src/gtkplugin.c:601
+#: ../gtk/gtkplugin.c:603
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Liitännäisen yksityiskohdat</b>"
 
-#: ../src/gtkpounce.c:155
+#: ../gtk/gtkpounce.c:155
 msgid "Select a file"
 msgstr "Valitse tiedosto"
 
-#: ../src/gtkpounce.c:252
+#: ../gtk/gtkpounce.c:252
 msgid "Please enter a buddy to pounce."
 msgstr "Syötä ilmoitettava tuttava."
 
-#: ../src/gtkpounce.c:499
+#: ../gtk/gtkpounce.c:499
 msgid "New Buddy Pounce"
 msgstr "Uusi tuttavailmoitin"
 
-#: ../src/gtkpounce.c:499
+#: ../gtk/gtkpounce.c:499
 msgid "Edit Buddy Pounce"
 msgstr "Muokkaa tuttavailmoitinta"
 
 #. Create the "Pounce on Whom" frame.
-#: ../src/gtkpounce.c:516
+#: ../gtk/gtkpounce.c:516
 msgid "Pounce on Whom"
 msgstr "Kenestä ilmoitetaan"
 
-#: ../src/gtkpounce.c:543
+#: ../gtk/gtkpounce.c:543
 msgid "_Buddy name:"
 msgstr "_Tuttavan nimi:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../src/gtkpounce.c:569
+#: ../gtk/gtkpounce.c:569
 msgid "Pounce When Buddy..."
 msgstr "Ilmoita kun tuttava..."
 
-#: ../src/gtkpounce.c:577
+#: ../gtk/gtkpounce.c:577
 msgid "Si_gns on"
 msgstr "_kirjautuu sisään"
 
-#: ../src/gtkpounce.c:579
+#: ../gtk/gtkpounce.c:579
 msgid "Signs o_ff"
 msgstr "kirjautuu _ulos"
 
-#: ../src/gtkpounce.c:581
+#: ../gtk/gtkpounce.c:581
 msgid "Goes a_way"
 msgstr "poi_stuu"
 
-#: ../src/gtkpounce.c:583
+#: ../gtk/gtkpounce.c:583
 msgid "Ret_urns from away"
 msgstr "_palaa"
 
-#: ../src/gtkpounce.c:585
+#: ../gtk/gtkpounce.c:585
 msgid "Becomes _idle"
 msgstr "on _jouten"
 
-#: ../src/gtkpounce.c:587
+#: ../gtk/gtkpounce.c:587
 msgid "Is no longer i_dle"
 msgstr "ei enää ole j_outen"
 
-#: ../src/gtkpounce.c:589
+#: ../gtk/gtkpounce.c:589
 msgid "Starts _typing"
 msgstr "_alkaa kirjoittaa"
 
-#: ../src/gtkpounce.c:591
+#: ../gtk/gtkpounce.c:591
 msgid "P_auses while typing"
 msgstr "_keskeyttää kirjoittamisen"
 
-#: ../src/gtkpounce.c:593
+#: ../gtk/gtkpounce.c:593
 msgid "Stops t_yping"
 msgstr "lope_ttaa kirjoittamisen"
 
-#: ../src/gtkpounce.c:595
+#: ../gtk/gtkpounce.c:595
 msgid "Sends a _message"
 msgstr "lähettää _viestin"
 
 #. Create the "Action" frame.
-#: ../src/gtkpounce.c:630
+#: ../gtk/gtkpounce.c:630
 msgid "Action"
 msgstr "Toiminto"
 
-#: ../src/gtkpounce.c:638
+#: ../gtk/gtkpounce.c:638
 msgid "Ope_n an IM window"
 msgstr "Avaa pikav_iesti-ikkuna"
 
-#: ../src/gtkpounce.c:640
+#: ../gtk/gtkpounce.c:640
 msgid "_Pop up a notification"
 msgstr "_Ponnahdusilmoitus"
 
-#: ../src/gtkpounce.c:642
+#: ../gtk/gtkpounce.c:642
 msgid "Send a _message"
 msgstr "Lähetä _viesti"
 
-#: ../src/gtkpounce.c:644
+#: ../gtk/gtkpounce.c:644
 msgid "E_xecute a command"
 msgstr "Suorita _komento"
 
-#: ../src/gtkpounce.c:646
+#: ../gtk/gtkpounce.c:646
 msgid "P_lay a sound"
 msgstr "S_oita ääni"
 
-#: ../src/gtkpounce.c:651
+#: ../gtk/gtkpounce.c:651
 msgid "Brows_e..."
 msgstr "_Selaa"
 
-#: ../src/gtkpounce.c:653
+#: ../gtk/gtkpounce.c:653
 msgid "Br_owse..."
 msgstr "S_elaa"
 
-#: ../src/gtkpounce.c:654
+#: ../gtk/gtkpounce.c:654
 msgid "Pre_view"
 msgstr "_Esikatselu"
 
-#. Create the "Options" frame.
-#: ../src/gtkpounce.c:766
-msgid "Options"
-msgstr "Valinnat"
-
-#: ../src/gtkpounce.c:774
+#: ../gtk/gtkpounce.c:774
 msgid "P_ounce only when my status is not available"
 msgstr "I_lmoita vain kun tilani on \"ei tavoitettavissa\""
 
-#: ../src/gtkpounce.c:779
+#: ../gtk/gtkpounce.c:779
 msgid "_Recurring"
 msgstr "_Toistuva"
 
-#: ../src/gtkpounce.c:1085
+#: ../gtk/gtkpounce.c:1085
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Haluatko varmasti poistaa ilmoituksen %s käyttäjältä %s?"
 
-#: ../src/gtkpounce.c:1233
+#: ../gtk/gtkpounce.c:1233
 msgid "Pounce Target"
 msgstr "Ilmoituksen kohde"
 
-#: ../src/gtkpounce.c:1268
+#: ../gtk/gtkpounce.c:1268
 msgid "Recurring"
 msgstr "Toistuva"
 
-#: ../src/gtkpounce.c:1315
+#: ../gtk/gtkpounce.c:1315
 msgid "Buddy Pounces"
 msgstr "Tuttavailmoittimet"
 
-#: ../src/gtkpounce.c:1442
+#: ../gtk/gtkpounce.c:1442
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s alkoi kirjoittaa sinulle (%s)"
 
-#: ../src/gtkpounce.c:1444
+#: ../gtk/gtkpounce.c:1444
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s keskeytti kirjoittamisen sinulle (%s)"
 
-#: ../src/gtkpounce.c:1446
+#: ../gtk/gtkpounce.c:1446
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s on kirjautunut sisään (%s)"
 
-#: ../src/gtkpounce.c:1448
+#: ../gtk/gtkpounce.c:1448
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s on palannut oltuaan jouten (%s)"
 
-#: ../src/gtkpounce.c:1450
+#: ../gtk/gtkpounce.c:1450
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s on palannut oltuaan poissa (%s)"
 
-#: ../src/gtkpounce.c:1452
+#: ../gtk/gtkpounce.c:1452
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s on lopettanut kirjoittamisen sinulle (%s)"
 
-#: ../src/gtkpounce.c:1454
+#: ../gtk/gtkpounce.c:1454
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s on kirjautunut ulos (%s)"
 
-#: ../src/gtkpounce.c:1456
+#: ../gtk/gtkpounce.c:1456
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s on jouten (%s)"
 
-#: ../src/gtkpounce.c:1458
+#: ../gtk/gtkpounce.c:1458
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s on poissa. (%s)"
 
-#: ../src/gtkpounce.c:1460
+#: ../gtk/gtkpounce.c:1460
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s on lähettämässä sinulle viestiä. (%s)"
 
-#: ../src/gtkpounce.c:1461
+#: ../gtk/gtkpounce.c:1461
 msgid "Unknown pounce event. Please report this!"
 msgstr "Tuntematon ilmoitinviesti. Raportoi tästä!"
 
-#: ../src/gtkprefs.c:512
+#: ../gtk/gtkprefs.c:512
 msgid "Smiley theme failed to unpack."
 msgstr "Hymiöteeman purkaminen epäonnistui."
 
-#: ../src/gtkprefs.c:638
+#: ../gtk/gtkprefs.c:641
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -4560,52 +3378,64 @@
 "Valitse haluamasi hymiöteema alla olevasta listasta. Uudet teemat voi "
 "asentaa vedä&pudota-menetelmällä pudottamalla ne teemalistaan."
 
-#: ../src/gtkprefs.c:673
+#: ../gtk/gtkprefs.c:676
 msgid "Icon"
 msgstr "Kuvake"
 
-#: ../src/gtkprefs.c:680 ../src/protocols/jabber/buddy.c:286
-#: ../src/protocols/jabber/buddy.c:926 ../src/protocols/jabber/chat.c:767
+#: ../gtk/gtkprefs.c:683 ../libgaim/protocols/jabber/buddy.c:286
+#: ../libgaim/protocols/jabber/buddy.c:923
+#: ../libgaim/protocols/jabber/chat.c:769
 msgid "Description"
 msgstr "Kuvaus"
 
-#: ../src/gtkprefs.c:821
+#: ../gtk/gtkprefs.c:824
 msgid "_Hide new IM conversations"
 msgstr "_Piilota uudet keskustelut"
 
-#: ../src/gtkprefs.c:824 ../src/gtkprefs.c:1779
+#: ../gtk/gtkprefs.c:826 ../gtk/gtkprefs.c:1769 ../gtk/gtkprefs.c:1783
+#: ../gtk/plugins/win32/winprefs/winprefs.c:334
+msgid "Never"
+msgstr "Ei koskaan"
+
+#: ../gtk/gtkprefs.c:827 ../gtk/gtkprefs.c:1784
 msgid "When away"
 msgstr "Poissaollessa"
 
-#: ../src/gtkprefs.c:828
+#: ../gtk/gtkprefs.c:828 ../gtk/plugins/timestamp_format.c:39
+#: ../gtk/plugins/timestamp_format.c:48
+#: ../gtk/plugins/win32/winprefs/winprefs.c:335
+msgid "Always"
+msgstr "Aina"
+
+#: ../gtk/gtkprefs.c:831
 msgid "Send unknown \"_slash\" commands as messages"
 msgstr "Lähetä _tuntemattomia \"kauttaviiva\"-komentoja viesteinä"
 
-#: ../src/gtkprefs.c:830
+#: ../gtk/gtkprefs.c:833
 msgid "Show _formatting on incoming messages"
 msgstr "Näytä _muotoilu tulevissa viesteissä"
 
-#: ../src/gtkprefs.c:833
+#: ../gtk/gtkprefs.c:836
 msgid "Show buddy _icons"
 msgstr "Näytä tuttavien _kuvakkeet"
 
-#: ../src/gtkprefs.c:835
+#: ../gtk/gtkprefs.c:838
 msgid "Enable buddy ic_on animation"
 msgstr "Näytä tuttavakuvakkeen a_nimaatio"
 
-#: ../src/gtkprefs.c:842
+#: ../gtk/gtkprefs.c:845
 msgid "_Notify buddies that you are typing to them"
 msgstr "Ilmoita tuttaville kun _kirjoitat heille"
 
-#: ../src/gtkprefs.c:845
+#: ../gtk/gtkprefs.c:848
 msgid "Highlight _misspelled words"
 msgstr "Korosta _väärinkirjoitetut sanat"
 
-#: ../src/gtkprefs.c:849
+#: ../gtk/gtkprefs.c:852
 msgid "Use smooth-scrolling"
 msgstr "Käytä portaatonta tekstinvieritystä"
 
-#: ../src/gtkprefs.c:865
+#: ../gtk/gtkprefs.c:868
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -4614,164 +3444,168 @@
 "muotoiluja. :)"
 
 #. All the tab options!
-#: ../src/gtkprefs.c:887
+#: ../gtk/gtkprefs.c:890
 msgid "Tab Options"
 msgstr "Välilehtivalinnat"
 
-#: ../src/gtkprefs.c:889
+#: ../gtk/gtkprefs.c:892
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Näytä pikaviestit ja ryhmäkeskustelut _jaetuissa ikkunoissa"
 
-#: ../src/gtkprefs.c:903
+#: ../gtk/gtkprefs.c:906
 msgid "Show close b_utton on tabs"
 msgstr "Näytä _sulkemispainikkeet välilehdissä"
 
-#: ../src/gtkprefs.c:909
+#: ../gtk/gtkprefs.c:912
 msgid "_Placement:"
 msgstr "_Asettelu:"
 
-#: ../src/gtkprefs.c:911
+#: ../gtk/gtkprefs.c:914
 msgid "Top"
 msgstr "Ylhäällä"
 
-#: ../src/gtkprefs.c:912
+#: ../gtk/gtkprefs.c:915
 msgid "Bottom"
 msgstr "Alhaalla"
 
-#: ../src/gtkprefs.c:913
+#: ../gtk/gtkprefs.c:916
 msgid "Left"
 msgstr "Vasemmalla"
 
-#: ../src/gtkprefs.c:914
+#: ../gtk/gtkprefs.c:917
 msgid "Right"
 msgstr "Oikealla"
 
-#: ../src/gtkprefs.c:916
+#: ../gtk/gtkprefs.c:919
 msgid "Left Vertical"
 msgstr "Vasemmalla pystysuuntaisesti"
 
-#: ../src/gtkprefs.c:917
+#: ../gtk/gtkprefs.c:920
 msgid "Right Vertical"
 msgstr "Oikealla pystysuuntaisesti"
 
-#: ../src/gtkprefs.c:922
+#: ../gtk/gtkprefs.c:925
 msgid "N_ew conversations:"
 msgstr "_Uudet keskustelut:"
 
-#: ../src/gtkprefs.c:973 ../src/protocols/oscar/oscar.c:804
-#: ../src/protocols/oscar/oscar.c:3651
+#: ../gtk/gtkprefs.c:976 ../libgaim/protocols/oscar/oscar.c:779
+#: ../libgaim/protocols/oscar/oscar.c:3627
 msgid "IP Address"
 msgstr "IP-osoite"
 
-#: ../src/gtkprefs.c:975
+#: ../gtk/gtkprefs.c:978
 msgid "ST_UN server:"
 msgstr "ST_UN-palvelin:"
 
-#: ../src/gtkprefs.c:987
+#: ../gtk/gtkprefs.c:990
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Esimerkki: stunserver.org</span>"
 
-#: ../src/gtkprefs.c:991
+#: ../gtk/gtkprefs.c:994
 msgid "_Autodetect IP address"
 msgstr "_Hae IP-osoite automaattisesti"
 
-#: ../src/gtkprefs.c:1000
+#: ../gtk/gtkprefs.c:1003
 msgid "Public _IP:"
 msgstr "Julkinen _IP:"
 
-#: ../src/gtkprefs.c:1029
+#: ../gtk/gtkprefs.c:1032
 msgid "Ports"
 msgstr "Portit"
 
-#: ../src/gtkprefs.c:1032
+#: ../gtk/gtkprefs.c:1035
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Aseta kuunneltava porttialue"
 
-#: ../src/gtkprefs.c:1035
+#: ../gtk/gtkprefs.c:1038
 msgid "_Start port:"
 msgstr "_Ensimmäinen portti:"
 
-#: ../src/gtkprefs.c:1042
+#: ../gtk/gtkprefs.c:1045
 msgid "_End port:"
 msgstr "Viimeinen _portti:"
 
-#: ../src/gtkprefs.c:1050
+#: ../gtk/gtkprefs.c:1053
 msgid "Proxy Server"
 msgstr "Välipalvelin"
 
-#: ../src/gtkprefs.c:1054
+#: ../gtk/gtkprefs.c:1057
 msgid "No proxy"
 msgstr "Ei välipalvelinta"
 
-#: ../src/gtkprefs.c:1110
+#: ../gtk/gtkprefs.c:1113
 msgid "_User:"
 msgstr "_Käyttäjä:"
 
-#: ../src/gtkprefs.c:1172
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: ../src/gtkprefs.c:1173
-msgid "Firebird"
-msgstr "Firebird"
-
-#: ../src/gtkprefs.c:1174
-msgid "Firefox"
-msgstr "Firefox"
-
-#: ../src/gtkprefs.c:1175
-msgid "Galeon"
-msgstr "Galeon"
-
-#: ../src/gtkprefs.c:1176
-msgid "GNOME Default"
-msgstr "Gnomen oletus"
-
-#: ../src/gtkprefs.c:1177
+#: ../gtk/gtkprefs.c:1176
+msgid "Seamonkey"
+msgstr "Seamonkey"
+
+#: ../gtk/gtkprefs.c:1177
+msgid "Opera"
+msgstr "Opera"
+
+#: ../gtk/gtkprefs.c:1178
+msgid "Netscape"
+msgstr "Netscape"
+
+#: ../gtk/gtkprefs.c:1179
+msgid "Mozilla"
+msgstr "Mozilla"
+
+#: ../gtk/gtkprefs.c:1180
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../src/gtkprefs.c:1178
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: ../src/gtkprefs.c:1179
-msgid "Netscape"
-msgstr "Netscape"
-
-#: ../src/gtkprefs.c:1180
-msgid "Opera"
-msgstr "Opera"
-
-#: ../src/gtkprefs.c:1189
+#: ../gtk/gtkprefs.c:1181
+msgid "GNOME Default"
+msgstr "Gnomen oletus"
+
+#: ../gtk/gtkprefs.c:1182
+msgid "Galeon"
+msgstr "Galeon"
+
+#: ../gtk/gtkprefs.c:1183
+msgid "Firefox"
+msgstr "Firefox"
+
+#: ../gtk/gtkprefs.c:1184
+msgid "Firebird"
+msgstr "Firebird"
+
+#: ../gtk/gtkprefs.c:1185
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: ../gtk/gtkprefs.c:1194
 msgid "Manual"
 msgstr "Oma komento"
 
-#: ../src/gtkprefs.c:1242
+#: ../gtk/gtkprefs.c:1247
 msgid "Browser Selection"
 msgstr "Selaimen valinta"
 
-#: ../src/gtkprefs.c:1246
+#: ../gtk/gtkprefs.c:1251
 msgid "_Browser:"
 msgstr "_Selain:"
 
-#: ../src/gtkprefs.c:1254
+#: ../gtk/gtkprefs.c:1259
 msgid "_Open link in:"
 msgstr "_Avaa linkki:"
 
-#: ../src/gtkprefs.c:1256
+#: ../gtk/gtkprefs.c:1261
 msgid "Browser default"
 msgstr "Selaimen oletus"
 
-#: ../src/gtkprefs.c:1257
+#: ../gtk/gtkprefs.c:1262
 msgid "Existing window"
 msgstr "Olemassaolevaan ikkunaan"
 
-#: ../src/gtkprefs.c:1259
+#: ../gtk/gtkprefs.c:1264
 msgid "New tab"
 msgstr "Uuteen välilehteen"
 
-#: ../src/gtkprefs.c:1273
+#: ../gtk/gtkprefs.c:1278
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -4780,83 +3614,79 @@
 "_Komento:\n"
 "(URL:ksi %s)"
 
-#: ../src/gtkprefs.c:1309 ../src/gtkprefs.c:1890
-msgid "Logging"
-msgstr "Kirjataan lokiin"
-
-#: ../src/gtkprefs.c:1312
+#: ../gtk/gtkprefs.c:1317
 msgid "Log _format:"
 msgstr "Lokin _muoto:"
 
-#: ../src/gtkprefs.c:1317
+#: ../gtk/gtkprefs.c:1322
 msgid "Log all _instant messages"
 msgstr "Kirjaa kaikki pikaviestit _lokiin"
 
-#: ../src/gtkprefs.c:1319
+#: ../gtk/gtkprefs.c:1324
 msgid "Log all c_hats"
 msgstr "Kirjaa kaikki ryhmä_keskustelut lokiin"
 
-#: ../src/gtkprefs.c:1321
+#: ../gtk/gtkprefs.c:1326
 msgid "Log all _status changes to system log"
 msgstr "Kirjaa kaikki _tilamuutokset järjestelmälokiin"
 
-#: ../src/gtkprefs.c:1469
+#: ../gtk/gtkprefs.c:1474
 msgid "Sound Selection"
 msgstr "Äänivalinta"
 
-#: ../src/gtkprefs.c:1477
+#: ../gtk/gtkprefs.c:1482
 msgid "Quietest"
 msgstr "Hiljaisin"
 
-#: ../src/gtkprefs.c:1479
+#: ../gtk/gtkprefs.c:1484
 msgid "Quieter"
 msgstr "Hiljaisempi"
 
-#: ../src/gtkprefs.c:1481
+#: ../gtk/gtkprefs.c:1486
 msgid "Quiet"
 msgstr "Hiljainen"
 
-#: ../src/gtkprefs.c:1483 ../src/protocols/silc/silc.c:672
+#: ../gtk/gtkprefs.c:1488 ../libgaim/protocols/silc/silc.c:670
 msgid "Normal"
 msgstr "Normaali"
 
-#: ../src/gtkprefs.c:1485
+#: ../gtk/gtkprefs.c:1490
 msgid "Loud"
 msgstr "Äänekäs"
 
-#: ../src/gtkprefs.c:1487
+#: ../gtk/gtkprefs.c:1492
 msgid "Louder"
 msgstr "Äänekkäämpi"
 
-#: ../src/gtkprefs.c:1489
+#: ../gtk/gtkprefs.c:1494
 msgid "Loudest"
 msgstr "Äänekkäin"
 
-#: ../src/gtkprefs.c:1552
+#: ../gtk/gtkprefs.c:1557
 msgid "Sound Method"
 msgstr "Äänimenetelmä"
 
-#: ../src/gtkprefs.c:1553
+#: ../gtk/gtkprefs.c:1558
 msgid "_Method:"
 msgstr "_Menetelmä:"
 
-#: ../src/gtkprefs.c:1555
+#: ../gtk/gtkprefs.c:1560
 msgid "Console beep"
 msgstr "Konsoliäänimerkki"
 
-#: ../src/gtkprefs.c:1557
+#: ../gtk/gtkprefs.c:1562
 msgid "Automatic"
 msgstr "Automaattinen"
 
-#: ../src/gtkprefs.c:1562
+#: ../gtk/gtkprefs.c:1567
 msgid "Command"
 msgstr "Komento"
 
-#: ../src/gtkprefs.c:1563
+#: ../gtk/gtkprefs.c:1568
 msgid "No sounds"
 msgstr "Ei ääniä"
 
-#: ../src/gtkprefs.c:1571
+#: ../gtk/gtkprefs.c:1576
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4865,197 +3695,214 @@
 "Äänik_omento:\n"
 "(%s tiedostonimeksi)"
 
-#: ../src/gtkprefs.c:1597
+#: ../gtk/gtkprefs.c:1602
 msgid "Sound Options"
 msgstr "Äänivalinnat"
 
-#: ../src/gtkprefs.c:1598
+#: ../gtk/gtkprefs.c:1603
 msgid "Sounds when conversation has _focus"
 msgstr "Äänet kun keskusteluikkuna on _aktiivinen"
 
-#: ../src/gtkprefs.c:1600
+#: ../gtk/gtkprefs.c:1605
 msgid "_Sounds while away"
 msgstr "Ää_net poissaollessasi"
 
-#: ../src/gtkprefs.c:1607
+#: ../gtk/gtkprefs.c:1612
 msgid "Volume:"
 msgstr "Äänenvoimakkuus:"
 
-#: ../src/gtkprefs.c:1635
+#: ../gtk/gtkprefs.c:1640
 msgid "Sound Events"
 msgstr "Äänitapahtumat"
 
-#: ../src/gtkprefs.c:1686
+#: ../gtk/gtkprefs.c:1691
 msgid "Play"
 msgstr "Soita"
 
-#: ../src/gtkprefs.c:1693
+#: ../gtk/gtkprefs.c:1698
 msgid "Event"
 msgstr "Tapahtuma"
 
-#: ../src/gtkprefs.c:1712
+#: ../gtk/gtkprefs.c:1717
 msgid "Test"
 msgstr "Kokeile"
 
-#: ../src/gtkprefs.c:1716
+#: ../gtk/gtkprefs.c:1721
 msgid "Reset"
 msgstr "Nollaa"
 
-#: ../src/gtkprefs.c:1720
+#: ../gtk/gtkprefs.c:1725
 msgid "Choose..."
 msgstr "Valitse..."
 
-#: ../src/gtkprefs.c:1762
+#: ../gtk/gtkprefs.c:1767
 msgid "_Report idle time:"
 msgstr "_Ilmoita joutenoloaika:"
 
-#: ../src/gtkprefs.c:1765
+#: ../gtk/gtkprefs.c:1770
 msgid "From last sent message"
 msgstr "Viimeisestä lähetetystä viestistä"
 
-#: ../src/gtkprefs.c:1767
+#: ../gtk/gtkprefs.c:1772
 msgid "Based on keyboard or mouse use"
 msgstr "Perustuen näppäimistön tai hiiren käyttöön"
 
-#: ../src/gtkprefs.c:1776
+#. Away stuff
+#. get_yahoo_status_from_gaim_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#: ../gtk/gtkprefs.c:1779 ../gtk/gtkstatusbox.c:984
+#: ../libgaim/protocols/gg/gg.c:999 ../libgaim/protocols/irc/irc.c:530
+#: ../libgaim/protocols/irc/msgs.c:223
+#: ../libgaim/protocols/jabber/buddy.c:1371
+#: ../libgaim/protocols/novell/novell.c:2856
+#: ../libgaim/protocols/oscar/oscar.c:694
+#: ../libgaim/protocols/oscar/oscar.c:4406
+#: ../libgaim/protocols/oscar/oscar.c:5473
+#: ../libgaim/protocols/silc/buddy.c:1469
+#: ../libgaim/protocols/yahoo/yahoo.c:3359
+#: ../libgaim/protocols/yahoo/yahoo.c:3432 ../libgaim/status.c:158
+msgid "Away"
+msgstr "Poissa"
+
+#: ../gtk/gtkprefs.c:1781
 msgid "_Auto-reply:"
 msgstr "_Automaattivastaus:"
 
-#: ../src/gtkprefs.c:1780
+#: ../gtk/gtkprefs.c:1785
 msgid "When both away and idle"
 msgstr "Poissa ja jouten ollessa"
 
 #. Auto-away stuff
-#: ../src/gtkprefs.c:1786
+#: ../gtk/gtkprefs.c:1791
 msgid "Auto-away"
 msgstr "Automaattinen poissaoloasetus"
 
-#: ../src/gtkprefs.c:1788
+#: ../gtk/gtkprefs.c:1793
 msgid "Change status when _idle"
 msgstr "Vaihda tila, kun ollaan _jouten"
 
-#: ../src/gtkprefs.c:1792
+#: ../gtk/gtkprefs.c:1797
 msgid "_Minutes before changing status:"
 msgstr "_Minuutteja ennen tilan asetusta:"
 
-#: ../src/gtkprefs.c:1800
+#: ../gtk/gtkprefs.c:1805
 msgid "Change _status to:"
 msgstr "Vaihda tila seuraavaksi:"
 
 #. Signon status stuff
-#: ../src/gtkprefs.c:1821
+#: ../gtk/gtkprefs.c:1826
 msgid "Status at Startup"
 msgstr "Tila käynnistettäessä"
 
-#: ../src/gtkprefs.c:1823
+#: ../gtk/gtkprefs.c:1828
 msgid "Use status from last _exit at startup"
 msgstr "Käytä viimeksi poistuttaessa ollutta tilaa"
 
-#: ../src/gtkprefs.c:1829
+#: ../gtk/gtkprefs.c:1834
 msgid "Status to a_pply at startup:"
 msgstr "Tila jota _käytetään käynnistettäessä:"
 
-#: ../src/gtkprefs.c:1880
+#: ../gtk/gtkprefs.c:1885
 msgid "Smiley Themes"
 msgstr "Hymiöteemat"
 
-#: ../src/gtkprefs.c:1881
+#: ../gtk/gtkprefs.c:1886
 msgid "Sounds"
 msgstr "Äänet"
 
-#: ../src/gtkprefs.c:1882 ../src/protocols/silc/silc.c:1852
+#: ../gtk/gtkprefs.c:1887 ../libgaim/protocols/silc/silc.c:1851
 msgid "Network"
 msgstr "Verkko"
 
-#: ../src/gtkprefs.c:1887
+#: ../gtk/gtkprefs.c:1892
 msgid "Browser"
 msgstr "Selain"
 
-#: ../src/gtkprefs.c:1891
+#: ../gtk/gtkprefs.c:1896
 msgid "Away / Idle"
 msgstr "Poissa/joutenolot"
 
-#: ../src/gtkprivacy.c:79
+#: ../gtk/gtkprivacy.c:79
 msgid "Allow all users to contact me"
 msgstr "Salli kaikkien käyttäjien ottaa minuun yhteyttä"
 
-#: ../src/gtkprivacy.c:80
+#: ../gtk/gtkprivacy.c:80
 msgid "Allow only the users on my buddy list"
 msgstr "Salli vain käyttäjät tuttavalistassa"
 
-#: ../src/gtkprivacy.c:81
+#: ../gtk/gtkprivacy.c:81
 msgid "Allow only the users below"
 msgstr "Salli vain allaolevat käyttäjät"
 
-#: ../src/gtkprivacy.c:82
+#: ../gtk/gtkprivacy.c:82
 msgid "Block all users"
 msgstr "Estä kaikki käyttäjät"
 
-#: ../src/gtkprivacy.c:83
+#: ../gtk/gtkprivacy.c:83
 msgid "Block only the users below"
 msgstr "Estä vain allaolevat käyttäjät"
 
-#: ../src/gtkprivacy.c:372
+#: ../gtk/gtkprivacy.c:372
 msgid "Privacy"
 msgstr "Yksityisyys"
 
-#: ../src/gtkprivacy.c:385
+#: ../gtk/gtkprivacy.c:385
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Muutokset yksityisyysasetuksiin tulevat voimaan heti."
 
 #. "Set privacy for:" label
-#: ../src/gtkprivacy.c:397
+#: ../gtk/gtkprivacy.c:397
 msgid "Set privacy for:"
 msgstr "Yksityisyysasetukset tilille:"
 
-#: ../src/gtkprivacy.c:560 ../src/gtkprivacy.c:576
+#: ../gtk/gtkprivacy.c:560 ../gtk/gtkprivacy.c:576
 msgid "Permit User"
 msgstr "Salli käyttäjä"
 
-#: ../src/gtkprivacy.c:561
+#: ../gtk/gtkprivacy.c:561
 msgid "Type a user you permit to contact you."
 msgstr "Kirjoita tuttavan nimi jonka valtuutat ottamaan yhteyttä sinuun."
 
-#: ../src/gtkprivacy.c:562
+#: ../gtk/gtkprivacy.c:562
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "Syötä käyttäjän nimi, jonka tahdot voivan ottaa sinuun yhteyttä."
 
-#: ../src/gtkprivacy.c:565 ../src/gtkprivacy.c:578
+#: ../gtk/gtkprivacy.c:565 ../gtk/gtkprivacy.c:578
 msgid "_Permit"
 msgstr "_Salli"
 
-#: ../src/gtkprivacy.c:570
+#: ../gtk/gtkprivacy.c:570
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Sallitaanko %s:n yhteydenotot?"
 
-#: ../src/gtkprivacy.c:572
+#: ../gtk/gtkprivacy.c:572
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Sallitaanko varmasti %s:n yhteydenotot?"
 
-#: ../src/gtkprivacy.c:599 ../src/gtkprivacy.c:612
+#: ../gtk/gtkprivacy.c:599 ../gtk/gtkprivacy.c:612
 msgid "Block User"
 msgstr "Estä käyttäjää"
 
-#: ../src/gtkprivacy.c:600
+#: ../gtk/gtkprivacy.c:600
 msgid "Type a user to block."
 msgstr "Kirjoita estettävä käyttäjä."
 
-#: ../src/gtkprivacy.c:601
+#: ../gtk/gtkprivacy.c:601
 msgid "Please enter the name of the user you wish to block."
 msgstr "Kirjoita käyttäjän nimi jonka tahdot estää ottamasta yhteyttä."
 
-#: ../src/gtkprivacy.c:603 ../src/gtkprivacy.c:614
+#: ../gtk/gtkprivacy.c:603 ../gtk/gtkprivacy.c:614
 msgid "_Block"
 msgstr "_Estä"
 
-#: ../src/gtkprivacy.c:608
+#: ../gtk/gtkprivacy.c:608
 #, c-format
 msgid "Block %s?"
 msgstr "Estetäänkö %s?"
 
-#: ../src/gtkprivacy.c:610
+#: ../gtk/gtkprivacy.c:610
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Haluatko varmasti estää %s?"
@@ -5063,249 +3910,202 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../src/gtkrequest.c:267 ../src/protocols/msn/dialog.c:106
-#: ../src/protocols/msn/msn.c:555 ../src/protocols/msn/msn.c:564
-#: ../src/protocols/novell/novell.c:1919 ../src/protocols/silc/buddy.c:313
-#: ../src/protocols/silc/pk.c:117 ../src/protocols/silc/wb.c:303
-#: ../src/request.h:1335
+#: ../gtk/gtkrequest.c:267 ../libgaim/protocols/msn/dialog.c:132
+#: ../libgaim/protocols/msn/msn.c:555 ../libgaim/protocols/msn/msn.c:564
+#: ../libgaim/protocols/novell/novell.c:1920
+#: ../libgaim/protocols/silc/buddy.c:313 ../libgaim/protocols/silc/pk.c:117
+#: ../libgaim/protocols/silc/wb.c:303 ../libgaim/request.h:1335
 msgid "Yes"
 msgstr "Kyllä"
 
-#: ../src/gtkrequest.c:268 ../src/protocols/msn/dialog.c:107
-#: ../src/protocols/msn/msn.c:555 ../src/protocols/msn/msn.c:564
-#: ../src/protocols/novell/novell.c:1920 ../src/protocols/silc/buddy.c:314
-#: ../src/protocols/silc/pk.c:118 ../src/protocols/silc/wb.c:304
-#: ../src/request.h:1335
+#: ../gtk/gtkrequest.c:268 ../libgaim/protocols/msn/dialog.c:133
+#: ../libgaim/protocols/msn/msn.c:555 ../libgaim/protocols/msn/msn.c:564
+#: ../libgaim/protocols/novell/novell.c:1921
+#: ../libgaim/protocols/silc/buddy.c:314 ../libgaim/protocols/silc/pk.c:118
+#: ../libgaim/protocols/silc/wb.c:304 ../libgaim/request.h:1335
 msgid "No"
 msgstr "Ei"
 
-#: ../src/gtkrequest.c:271
+#: ../gtk/gtkrequest.c:271
 msgid "Apply"
 msgstr "Toteuta"
 
-#: ../src/gtkrequest.c:272 ../src/protocols/msn/msn.c:357
-#: ../src/protocols/silc/util.c:350
-msgid "Close"
-msgstr "Sulje"
-
-#: ../src/gtkrequest.c:1467
+#: ../gtk/gtkrequest.c:1467
 msgid "That file already exists"
 msgstr "Tiedosto on jo olemassa"
 
-#: ../src/gtkrequest.c:1468
+#: ../gtk/gtkrequest.c:1468
 msgid "Would you like to overwrite it?"
 msgstr "Haluatko korvata sen?"
 
-#: ../src/gtkrequest.c:1469
+#: ../gtk/gtkrequest.c:1469
 msgid "Overwrite"
 msgstr "Korvaa"
 
-#: ../src/gtkrequest.c:1470
+#: ../gtk/gtkrequest.c:1470
 msgid "Choose New Name"
 msgstr "Valitse uusi nimi"
 
-#: ../src/gtkrequest.c:1512 ../src/gtkrequest.c:1553
+#: ../gtk/gtkrequest.c:1512 ../gtk/gtkrequest.c:1553
 msgid "Save File..."
 msgstr "Tallenna tiedosto..."
 
-#: ../src/gtkrequest.c:1513 ../src/gtkrequest.c:1554
+#: ../gtk/gtkrequest.c:1513 ../gtk/gtkrequest.c:1554
 msgid "Open File..."
 msgstr "Avaa tiedosto..."
 
-#: ../src/gtkrequest.c:1601 ../src/gtkrequest.c:1615
+#: ../gtk/gtkrequest.c:1601 ../gtk/gtkrequest.c:1615
 msgid "Select Folder..."
 msgstr "Valitse kansio..."
 
-#: ../src/gtkroomlist.c:287
+#: ../gtk/gtkroomlist.c:287
 msgid "_Add"
 msgstr "_Lisää"
 
-#: ../src/gtkroomlist.c:354
+#: ../gtk/gtkroomlist.c:355
 msgid "Room List"
 msgstr "Huonelista"
 
 #. list button
-#: ../src/gtkroomlist.c:424
+#: ../gtk/gtkroomlist.c:425
 msgid "_Get List"
 msgstr "_Hae lista"
 
 #. add button
-#: ../src/gtkroomlist.c:432
+#: ../gtk/gtkroomlist.c:433
 msgid "_Add Chat"
 msgstr "_Lisää ryhmäkeskustelu"
 
-#: ../src/gtksavedstatuses.c:433 ../src/protocols/jabber/buddy.c:283
-#: ../src/protocols/jabber/buddy.c:920 ../src/protocols/novell/novell.c:1484
-msgid "Title"
-msgstr "Otsikko"
-
-#: ../src/gtksavedstatuses.c:448
-msgid "Type"
-msgstr "Tyyppi"
-
-#: ../src/gtksavedstatuses.c:459 ../src/gtksavedstatuses.c:923
-#: ../src/protocols/bonjour/bonjour.c:256
-#: ../src/protocols/bonjour/bonjour.c:263 ../src/protocols/gg/gg.c:1591
-#: ../src/protocols/gg/gg.c:1601 ../src/protocols/gg/gg.c:1607
-#: ../src/protocols/gg/gg.c:1616 ../src/protocols/gg/gg.c:1621
-#: ../src/protocols/irc/irc.c:227 ../src/protocols/jabber/jabber.c:1194
-#: ../src/protocols/jabber/jabber.c:1204 ../src/protocols/jabber/jabber.c:1214
-#: ../src/protocols/jabber/jabber.c:1224 ../src/protocols/jabber/jabber.c:1234
-#: ../src/protocols/jabber/jabber.c:1246 ../src/protocols/novell/novell.c:2866
-#: ../src/protocols/novell/novell.c:2972 ../src/protocols/novell/novell.c:2978
-#: ../src/protocols/novell/novell.c:2984 ../src/protocols/oscar/oscar.c:5408
-#: ../src/protocols/oscar/oscar.c:5423 ../src/protocols/oscar/oscar.c:5428
-#: ../src/protocols/oscar/oscar.c:5636 ../src/protocols/oscar/oscar.c:5648
-#: ../src/protocols/sametime/sametime.c:3266
-#: ../src/protocols/sametime/sametime.c:3272
-#: ../src/protocols/sametime/sametime.c:3278
-#: ../src/protocols/sametime/sametime.c:3357
-#: ../src/protocols/silc/buddy.c:1544 ../src/protocols/simple/simple.c:242
-#: ../src/protocols/yahoo/yahoo.c:3315 ../src/protocols/yahoo/yahoo.c:3321
-#: ../src/protocols/zephyr/zephyr.c:2281
-msgid "Message"
-msgstr "Viesti"
-
-#: ../src/gtksavedstatuses.c:526
-msgid "Saved Statuses"
-msgstr "Tallennetut tilat"
-
 #. Use button
-#: ../src/gtksavedstatuses.c:549 ../src/gtksavedstatuses.c:1183
+#: ../gtk/gtksavedstatuses.c:549 ../gtk/gtksavedstatuses.c:1183
 msgid "_Use"
 msgstr "_Käytä"
 
-#: ../src/gtksavedstatuses.c:695
+#: ../gtk/gtksavedstatuses.c:695
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Otsikko on käytössä. Sinun täytyy valita yksilöllinen otsikko."
 
-#: ../src/gtksavedstatuses.c:883
+#: ../gtk/gtksavedstatuses.c:883
 msgid "Different"
 msgstr "Eriävyys"
 
-#: ../src/gtksavedstatuses.c:912 ../src/gtksavedstatuses.c:1059
-#: ../src/protocols/gg/gg.c:1024 ../src/protocols/gg/gg.c:1574
-#: ../src/protocols/gg/gg.c:1578 ../src/protocols/jabber/buddy.c:629
-#: ../src/protocols/jabber/buddy.c:636 ../src/protocols/jabber/buddy.c:662
-#: ../src/protocols/jabber/jabber.c:1165 ../src/protocols/msn/msn.c:546
-#: ../src/protocols/novell/novell.c:2865 ../src/protocols/novell/novell.c:2869
-#: ../src/protocols/oscar/oscar.c:784 ../src/protocols/oscar/oscar.c:790
-#: ../src/protocols/oscar/oscar.c:793 ../src/protocols/yahoo/yahoo.c:2895
-msgid "Status"
-msgstr "Tila"
-
-#: ../src/gtksavedstatuses.c:1076
+#: ../gtk/gtksavedstatuses.c:1076
 msgid "_Title:"
 msgstr "_Otsikko"
 
-#: ../src/gtksavedstatuses.c:1095 ../src/gtksavedstatuses.c:1416
+#: ../gtk/gtksavedstatuses.c:1095 ../gtk/gtksavedstatuses.c:1416
 msgid "_Status:"
 msgstr "_Tila:"
 
 #. Different status message expander
-#: ../src/gtksavedstatuses.c:1127
+#: ../gtk/gtksavedstatuses.c:1127
 msgid "Use a _different status for some accounts"
 msgstr "Käytä eri tilaa joillekin käyttäjätileille"
 
 #. Save & Use button
-#: ../src/gtksavedstatuses.c:1191
+#: ../gtk/gtksavedstatuses.c:1191
 msgid "Sa_ve & Use"
 msgstr "Tallenna ja _käytä"
 
-#: ../src/gtksavedstatuses.c:1397
+#: ../gtk/gtksavedstatuses.c:1397
 #, c-format
 msgid "Status for %s"
 msgstr "%s:n tila"
 
-#: ../src/gtksound.c:59
+#: ../gtk/gtksound.c:63
 msgid "Buddy logs in"
 msgstr "Tuttava kirjautuu sisään"
 
-#: ../src/gtksound.c:60
+#: ../gtk/gtksound.c:64
 msgid "Buddy logs out"
 msgstr "Tuttava kirjautuu ulos"
 
-#: ../src/gtksound.c:61
+#: ../gtk/gtksound.c:65
 msgid "Message received"
 msgstr "Viesti vastaanotettu"
 
-#: ../src/gtksound.c:62
+#: ../gtk/gtksound.c:66
 msgid "Message received begins conversation"
 msgstr "Vastaanotettu viesti aloittaa keskustelun"
 
-#: ../src/gtksound.c:63
+#: ../gtk/gtksound.c:67
 msgid "Message sent"
 msgstr "Viesti lähetetty"
 
-#: ../src/gtksound.c:64
+#: ../gtk/gtksound.c:68
 msgid "Person enters chat"
 msgstr "Joku saapuu ryhmäkeskusteluun"
 
-#: ../src/gtksound.c:65
+#: ../gtk/gtksound.c:69
 msgid "Person leaves chat"
 msgstr "Joku poistuu ryhmäkeskustelusta"
 
-#: ../src/gtksound.c:66
+#: ../gtk/gtksound.c:70
 msgid "You talk in chat"
 msgstr "Sinä puhut ryhmäkeskustelussa"
 
-#: ../src/gtksound.c:67
+#: ../gtk/gtksound.c:71
 msgid "Others talk in chat"
 msgstr "Muut puhuvat ryhmäkeskustelussa"
 
-#: ../src/gtksound.c:70
+#: ../gtk/gtksound.c:74
 msgid "Someone says your screen name in chat"
 msgstr "Joku sanoo kutsumanimesi ryhmäkeskustelussa"
 
+#: ../gtk/gtksound.c:310
+msgid "GStreamer Failure"
+msgstr "GStreamer-virhe"
+
+#: ../gtk/gtksound.c:311
+msgid "GStreamer failed to initialize."
+msgstr "GStreameria ei voitu alustaa."
+
 #. connect to the server
-#: ../src/gtkstatusbox.c:368 ../src/protocols/irc/irc.c:313
-#: ../src/protocols/jabber/jabber.c:992 ../src/protocols/msn/session.c:344
-#: ../src/protocols/novell/novell.c:2181 ../src/protocols/oscar/oscar.c:1259
-#: ../src/protocols/sametime/sametime.c:3685
-#: ../src/protocols/simple/simple.c:1615 ../src/protocols/yahoo/yahoo.c:2587
-#: ../src/protocols/zephyr/zephyr.c:1565
+#: ../gtk/gtkstatusbox.c:556 ../libgaim/protocols/irc/irc.c:329
+#: ../libgaim/protocols/jabber/jabber.c:1009
+#: ../libgaim/protocols/msn/session.c:344
+#: ../libgaim/protocols/novell/novell.c:2185
+#: ../libgaim/protocols/oscar/oscar.c:1224 ../libgaim/protocols/qq/qq.c:134
+#: ../libgaim/protocols/sametime/sametime.c:3681
+#: ../libgaim/protocols/simple/simple.c:1673
+#: ../libgaim/protocols/yahoo/yahoo.c:2715
+#: ../libgaim/protocols/zephyr/zephyr.c:1617
 msgid "Connecting"
 msgstr "Yhdistetään"
 
-#: ../src/gtkstock.c:138
-msgid "_Alias"
-msgstr "_Alias"
-
-#: ../src/gtkstock.c:140
-msgid "Close _tabs"
-msgstr "Sulje _välilehdet"
-
-#: ../src/gtkstock.c:142
-msgid "_Get Info"
-msgstr "_Hae tiedot"
-
-#: ../src/gtkstock.c:143
-msgid "_Invite"
-msgstr "_Kutsu"
-
-#: ../src/gtkstock.c:144
-msgid "_Modify"
-msgstr "_Muokkaa"
-
-#: ../src/gtkstock.c:145
-msgid "_Open Mail"
-msgstr "_Avaa sähköposti"
-
-#: ../src/gtkutils.c:1306 ../src/gtkutils.c:1331
+#: ../gtk/gtkstatusbox.c:558
+msgid "Waiting for network connection"
+msgstr "Odotetaan verkkoyhteyttä"
+
+#: ../gtk/gtkstatusbox.c:983 ../libgaim/protocols/gg/gg.c:996
+#: ../libgaim/protocols/jabber/buddy.c:1367
+#: ../libgaim/protocols/msn/state.c:29 ../libgaim/protocols/msn/state.c:30
+#: ../libgaim/protocols/msn/state.c:37 ../libgaim/protocols/msn/state.c:38
+#: ../libgaim/protocols/novell/novell.c:2853
+#: ../libgaim/protocols/yahoo/yahoo.c:2885 ../libgaim/status.c:155
+msgid "Available"
+msgstr "Tavoitettavissa"
+
+#: ../gtk/gtkstatusbox.c:985 ../libgaim/protocols/oscar/oscar.c:698
+#: ../libgaim/protocols/yahoo/yahoo.c:2879 ../libgaim/status.c:157
+msgid "Invisible"
+msgstr "Näkymätön"
+
+#: ../gtk/gtkutils.c:1310 ../gtk/gtkutils.c:1335
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Seuraava virhe esiintyi ladattaessa komponenttia %s: %s"
 
-#: ../src/gtkutils.c:1308 ../src/gtkutils.c:1333
+#: ../gtk/gtkutils.c:1312 ../gtk/gtkutils.c:1337
 msgid "Failed to load image"
 msgstr "Kuvan avaus epäonnistui"
 
-#: ../src/gtkutils.c:1408
+#: ../gtk/gtkutils.c:1412
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Ei voida lähettää kansiota %s."
 
-#: ../src/gtkutils.c:1410
+#: ../gtk/gtkutils.c:1414
 msgid ""
 "Gaim cannot transfer a folder. You will need to send the files within "
 "individually"
@@ -5313,11 +4113,11 @@
 "Gaim ei voi siirtää kansiota. Sinun täytyy lähettää kansion sisältämät "
 "tiedostot erikseen."
 
-#: ../src/gtkutils.c:1438 ../src/gtkutils.c:1447 ../src/gtkutils.c:1452
+#: ../gtk/gtkutils.c:1442 ../gtk/gtkutils.c:1451 ../gtk/gtkutils.c:1456
 msgid "You have dragged an image"
 msgstr "Olet raahannut kuvan"
 
-#: ../src/gtkutils.c:1439
+#: ../gtk/gtkutils.c:1443
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -5325,23 +4125,23 @@
 "Voit lähettää tämän kuvan tiedostonsiirtona, sisällyttää sen tähän viestiin "
 "tai käyttää sitä tuttavakuvakkeena tälle käyttäjälle."
 
-#: ../src/gtkutils.c:1443 ../src/gtkutils.c:1458
+#: ../gtk/gtkutils.c:1447 ../gtk/gtkutils.c:1462
 msgid "Set as buddy icon"
 msgstr "Aseta tuttavakuvakkeeksi"
 
-#: ../src/gtkutils.c:1444 ../src/gtkutils.c:1459
+#: ../gtk/gtkutils.c:1448 ../gtk/gtkutils.c:1463
 msgid "Send image file"
 msgstr "Lähetä kuvatiedosto"
 
-#: ../src/gtkutils.c:1445 ../src/gtkutils.c:1459
+#: ../gtk/gtkutils.c:1449 ../gtk/gtkutils.c:1463
 msgid "Insert in message"
 msgstr "Liitä viestiin"
 
-#: ../src/gtkutils.c:1448
+#: ../gtk/gtkutils.c:1452
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Haluatko asettaa sen tuttavakuvakkeeksi tälle käyttäjälle?"
 
-#: ../src/gtkutils.c:1453
+#: ../gtk/gtkutils.c:1457
 msgid ""
 "You can send this image as a file transfer or embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -5349,7 +4149,7 @@
 "Voit lähettää tämän kuvan tiedostonsiirtona, sisällyttää sen tähän viestiin "
 "tai käyttää sitä tuttavakuvakkeena tälle käyttäjälle."
 
-#: ../src/gtkutils.c:1455
+#: ../gtk/gtkutils.c:1459
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -5362,11 +4162,11 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../src/gtkutils.c:1509
+#: ../gtk/gtkutils.c:1513
 msgid "Cannot send launcher"
 msgstr "Ei voida lähettää käynnistintä"
 
-#: ../src/gtkutils.c:1509
+#: ../gtk/gtkutils.c:1513
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -5374,39 +4174,1700 @@
 "Raahasit työpöytäkäynnistimen. Luultavasti halusit lähettää tiedoston johon "
 "käynnistin osoittaa, käynnistimen itsensä sijaan."
 
-#: ../src/gtkwhiteboard.c:756 ../src/gtkwhiteboard.c:775
+#: ../gtk/gtkutils.c:2342
+#, c-format
+msgid ""
+"<b>File:</b> %s\n"
+"<b>File size:</b> %s\n"
+"<b>Image size:</b> %dx%d"
+msgstr ""
+"<b>Tiedosto:</b> %s\n"
+"<b>Tiedoston koko:</b> %s\n"
+"<b>Kuvan koko:</b> %d Ă— %d"
+
+#. Label
+#: ../gtk/gtkutils.c:2386 ../gtk/gtkutils.c:2408
+#: ../gtk/plugins/gevolution/new_person_dialog.c:338
+#: ../libgaim/protocols/oscar/oscar.c:600
+msgid "Buddy Icon"
+msgstr "Tuttavakuvake"
+
+#: ../gtk/gtkutils.c:2735
+#, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "Ei voitu avata tiedostoa \"%s\": %s"
+
+#: ../gtk/gtkutils.c:2784
+#, c-format
+msgid ""
+"Failed to load image '%s': reason not known, probably a corrupt image file"
+msgstr ""
+"Ei voitu ladata kuvaa \"%s\": syy ei ole tiedossa, mahdollisesti vioittunut "
+"kuvatiedosto"
+
+#: ../gtk/gtkwhiteboard.c:756 ../gtk/gtkwhiteboard.c:775
 msgid "Save File"
 msgstr "Tallenna tiedosto"
 
-#: ../src/gtkwhiteboard.c:863
+#: ../gtk/gtkwhiteboard.c:863
 msgid "Select color"
 msgstr "Valitse väri"
 
-#: ../src/log.c:180
+#: ../gtk/plugins/cap/cap.c:428
+msgid "Display Statistics"
+msgstr "Näytä tilastot"
+
+#: ../gtk/plugins/cap/cap.c:440 ../gtk/plugins/cap/cap.c:443
+msgid "Response Probability:"
+msgstr "Vastaustodennäköisyys:"
+
+#: ../gtk/plugins/cap/cap.c:789
+msgid "Statistics Configuration"
+msgstr "Tilastoinnin asetukset"
+
+#. msg_difference spinner
+#: ../gtk/plugins/cap/cap.c:792
+msgid "Maximum response timeout:"
+msgstr "Suurin vastauksen aikakatkaisu:"
+
+#: ../gtk/plugins/cap/cap.c:795 ../gtk/plugins/cap/cap.c:802
+#: ../gtk/plugins/cap/cap.c:809
+msgid "minutes"
+msgstr "minuuttia"
+
+#. last_seen spinner
+#: ../gtk/plugins/cap/cap.c:799
+msgid "Maximum last-seen difference:"
+msgstr "Suurin viimeksi-nähty -arvon ero:"
+
+#. threshold spinner
+#: ../gtk/plugins/cap/cap.c:806
+msgid "Threshold:"
+msgstr "Kynnys:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../gtk/plugins/cap/cap.c:915
+msgid "Contact Availability Prediction plugin."
+msgstr "Tuttavan paikallaolon ennustava liitännäinen."
+
+#. *  summary
+#: ../gtk/plugins/cap/cap.c:916
+msgid ""
+"The contact availability plugin (cap) is used to display statistical "
+"information about buddies in a users contact list."
+msgstr ""
+"Tuttavan paikallaolon liitännäinen (cap) näyttää tilastollisia tietoja "
+"tuttavalistalla olevista tuttavista."
+
+#: ../gtk/plugins/contact_priority.c:61
+msgid "Buddy is idle"
+msgstr "Tuttava on jouten"
+
+#: ../gtk/plugins/contact_priority.c:62
+msgid "Buddy is away"
+msgstr "Tuttava on poissa"
+
+#: ../gtk/plugins/contact_priority.c:63
+msgid "Buddy is \"extended\" away"
+msgstr "Tuttava on \"pidennetysti\" poissa"
+
+#. Not used yet.
+#: ../gtk/plugins/contact_priority.c:66
+msgid "Buddy is mobile"
+msgstr "Tuttava on liikkeellä"
+
+#: ../gtk/plugins/contact_priority.c:68
+msgid "Buddy is offline"
+msgstr "Tuttava on poissa linjoilta"
+
+#: ../gtk/plugins/contact_priority.c:90
+msgid "Point values to use when..."
+msgstr "Pistearvoja käytetään kun..."
+
+#: ../gtk/plugins/contact_priority.c:118
+msgid ""
+"The buddy with the <i>largest score</i> is the buddy who will have priority "
+"in the contact.\n"
+msgstr ""
+"Tuttava, jolla on <i>suurin pistemäärä</i>, on tärkein kontaktiryhmässä.\n"
+
+#: ../gtk/plugins/contact_priority.c:125
+msgid "Use last buddy when scores are equal"
+msgstr "Käytä viimeisintä tuttavaa, kun pisteet ovat samat"
+
+#: ../gtk/plugins/contact_priority.c:130
+msgid "Point values to use for account..."
+msgstr "Käytettävät pistearvot käyttäjätilille..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/contact_priority.c:182
+msgid "Contact Priority"
+msgstr "Kontaktin tärkeys"
+
+#. *< name
+#. *< version
+#. *< summary
+#: ../gtk/plugins/contact_priority.c:185
+msgid ""
+"Allows for controlling the values associated with different buddy states."
+msgstr "Mahdollistaa tuttavan tila-arvojen hallinnan"
+
+#. *< description
+#: ../gtk/plugins/contact_priority.c:187
+msgid ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
+msgstr ""
+"Mahdollistaa pistearvojen muuttamisen jouten/poissa/poissa linjoilta -"
+"tiloille kontaktiryhmän prioriteettilaskelmia varten."
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:146
+msgid "Crazychat"
+msgstr "Hassujuttelu"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:149
+msgid "Plugin to establish a Crazychat session."
+msgstr "Hassujutteluistunnot mahdollistava liitännäinen."
+
+#. *  description
+#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:151
+msgid "Uses Gaim to obtain buddy ips to connect for a Crazychat session"
+msgstr "Hae tuttavien IP-osoitteet Gaimin avulla hassujutteluistuntoa varten"
+
+#. make the network configuration frame
+#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:295
+msgid "Network Configuration"
+msgstr "Verkkoasetukset"
+
+#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:307
+msgid "TCP port"
+msgstr "TCP-portti"
+
+#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:317
+msgid "UDP port"
+msgstr "UDP-portti"
+
+#. make the feature configuration frame
+#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:329
+msgid "Feature Calibration"
+msgstr "Piirteiden tarkistus"
+
+#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:350
+msgid "Disabled"
+msgstr "Pois päältä"
+
+#: ../gtk/plugins/extplacement.c:80
+msgid "By conversation count"
+msgstr "Keskustelujen määrän mukaan"
+
+#: ../gtk/plugins/extplacement.c:101
+msgid "Conversation Placement"
+msgstr "Keskustelun asettelu"
+
+#: ../gtk/plugins/extplacement.c:106
+msgid "Number of conversations per window"
+msgstr "Keskustelujen määrä per ikkuna"
+
+#: ../gtk/plugins/extplacement.c:112
+msgid "Separate IM and Chat windows when placing by number"
+msgstr "Erota pikaviesti- ja ryhmäkeskusteluikkunat aseteltaessa määrän mukaan"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/extplacement.c:135
+msgid "ExtPlacement"
+msgstr "Lisäasettelu"
+
+#. *< name
+#. *< version
+#: ../gtk/plugins/extplacement.c:137
+msgid "Extra conversation placement options."
+msgstr "Keskustelun lisäasetteluvalinnat."
+
+#. *< summary
+#. *  description
+#: ../gtk/plugins/extplacement.c:139
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr ""
+"Rajoita keskustelujen määrää ikkunaa kohti, valinnaisesti erotellen "
+"pikaviesti- ja ryhmäkeskustelut"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gaiminc.c:91
+msgid "Gaim Demonstration Plugin"
+msgstr "Gaim-esittelyliitännäinen"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/gaiminc.c:94
+msgid "An example plugin that does stuff - see the description."
+msgstr "Esimerkkiliitännäinen joka tekee jotain - katso kuvaus."
+
+#. *  description
+#: ../gtk/plugins/gaiminc.c:96
+msgid ""
+"This is a really cool plugin that does a lot of stuff:\n"
+"- It tells you who wrote the program when you log in\n"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
+msgstr ""
+"Tämä liitännäinen on tosi viilee ja tekee vaikka mitä:\n"
+"- Kertoo kuka laati ohjelman kun kirjaudut sisään\n"
+"- Kääntää kaiken tulevan tekstin ympäri\n"
+"- Lähettää viestin listallaoleville tuttavillesi aina kun he kirjautuvat "
+"sisään"
+
+#: ../gtk/plugins/gaimrc.c:41
+msgid "Cursor Color"
+msgstr "Kohdistimen väri"
+
+#: ../gtk/plugins/gaimrc.c:42
+msgid "Secondary Cursor Color"
+msgstr "Toissijainen kohdistimen väri"
+
+#: ../gtk/plugins/gaimrc.c:43
+msgid "Hyperlink Color"
+msgstr "Hyperlinkin väri"
+
+#: ../gtk/plugins/gaimrc.c:56
+msgid "GtkTreeView Expander Size"
+msgstr "Laajentajan koko"
+
+#: ../gtk/plugins/gaimrc.c:57
+msgid "GtkTreeView Horizontal Separation"
+msgstr "GtkTreeView - leveyssuuntainen erotus"
+
+#: ../gtk/plugins/gaimrc.c:76
+msgid "Conversation Entry"
+msgstr "Keskustelumerkintä"
+
+#: ../gtk/plugins/gaimrc.c:77
+msgid "Conversation History"
+msgstr "Keskusteluhistoria"
+
+#: ../gtk/plugins/gaimrc.c:78
+msgid "Log Viewer"
+msgstr "Lokikatselin"
+
+#: ../gtk/plugins/gaimrc.c:79
+msgid "Request Dialog"
+msgstr "Pyyntövalintaikkuna"
+
+#: ../gtk/plugins/gaimrc.c:80
+msgid "Notify Dialog"
+msgstr "Huomautusvalintaikunna"
+
+#: ../gtk/plugins/gaimrc.c:91
+msgid "GtkTreeView Indent Expanders"
+msgstr "Sisennä laajentajat"
+
+#: ../gtk/plugins/gaimrc.c:320
+#, c-format
+msgid "Select Color for %s"
+msgstr "Valitse %s:n väri"
+
+#: ../gtk/plugins/gaimrc.c:322
+msgid "Select Color"
+msgstr "Valitse väri"
+
+#: ../gtk/plugins/gaimrc.c:361
+#, c-format
+msgid "Select Font for %s"
+msgstr "Valitse %s:n kirjasin"
+
+#: ../gtk/plugins/gaimrc.c:398
+msgid "Select Interface Font"
+msgstr "Valitse käyttöliittymän kirjasin"
+
+#: ../gtk/plugins/gaimrc.c:448
+msgid "General"
+msgstr "Yleinen"
+
+#: ../gtk/plugins/gaimrc.c:453
+msgid "GTK+ Interface Font"
+msgstr "GTK+-käyttöliittymän kirjasin"
+
+#: ../gtk/plugins/gaimrc.c:473
+msgid "GTK+ Text Shortcut Theme"
+msgstr "GTK+-tekstioikopolkuteema"
+
+#: ../gtk/plugins/gaimrc.c:508
+msgid "Interface colors"
+msgstr "Käyttöliittymän värit"
+
+#: ../gtk/plugins/gaimrc.c:532
+msgid "Widget Sizes"
+msgstr "Säädinkoot"
+
+#: ../gtk/plugins/gaimrc.c:553
+msgid "Fonts"
+msgstr "Kirjasimet"
+
+#: ../gtk/plugins/gaimrc.c:576
+msgid "Tools"
+msgstr "Työkalut"
+
+#: ../gtk/plugins/gaimrc.c:581
+#, c-format
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr "Kirjoita asetukset tiedostoon %s%sgtkrc-2.0"
+
+#: ../gtk/plugins/gaimrc.c:589
+msgid "Re-read gtkrc files"
+msgstr "Lue uudelleen gtkrc-tiedostot"
+
+#: ../gtk/plugins/gaimrc.c:616
+msgid "Gaim GTK+ Theme Control"
+msgstr "Gaimin GTK+-teemanhallinta"
+
+#: ../gtk/plugins/gaimrc.c:618 ../gtk/plugins/gaimrc.c:619
+msgid "Provides access to commonly used gtkrc settings."
+msgstr "Antaa pääsyn usein käytettyihin gtkrc-asetuksiin."
+
+#. Configuration frame
+#: ../gtk/plugins/gestures/gestures.c:235
+msgid "Mouse Gestures Configuration"
+msgstr "Hiirieleasetukset"
+
+#: ../gtk/plugins/gestures/gestures.c:242
+msgid "Middle mouse button"
+msgstr "Keskimmäinen hiiren painike"
+
+#: ../gtk/plugins/gestures/gestures.c:247
+msgid "Right mouse button"
+msgstr "Oikea hiiren painike"
+
+#. "Visual gesture display" checkbox
+#: ../gtk/plugins/gestures/gestures.c:259
+msgid "_Visual gesture display"
+msgstr "_Visuaalinen ele -näyttö"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gestures/gestures.c:289
+msgid "Mouse Gestures"
+msgstr "Hiirieleet"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/gestures/gestures.c:292
+msgid "Provides support for mouse gestures"
+msgstr "Lisää tuen hiirieleille"
+
+#. *  description
+#: ../gtk/plugins/gestures/gestures.c:294
+msgid ""
+"Allows support for mouse gestures in conversation windows.\n"
+"Drag the middle mouse button to perform certain actions:\n"
+"\n"
+"Drag down and then to the right to close a conversation.\n"
+"Drag up and then to the left to switch to the previous conversation.\n"
+"Drag up and then to the right to switch to the next conversation."
+msgstr ""
+"Mahdollistaa hiirieleiden käytön keskusteluikkunassa.\n"
+"Pidä keskimmäistä nappia alhaalla tehdessäsi seuraavia toimintoja:\n"
+"\n"
+"Liikuta alas ja sitten oikealle sulkeaksesi keskusteluikkunan.\n"
+"Liikuta ylös ja sitten vasemmalle vaihtaaksesi edelliseen keskusteluun.\n"
+"Liikuta ylös ja sitten oikealle vaihtaaksesi seuraavaan keskusteluun."
+
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:143
+msgid "Instant Messaging"
+msgstr "Pikaviestintä"
+
+#. Add the label.
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:460
+msgid "Select a person from your address book below, or add a new person."
+msgstr "Valitse henkilö allaolevasta osoitekirjasta, tai lisää uusi henkilö."
+
+#. "Search"
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:473
+#: ../gtk/plugins/gevolution/assoc-buddy.c:358
+#: ../libgaim/protocols/jabber/buddy.c:1724
+#: ../libgaim/protocols/oscar/oscar.c:6085 ../libgaim/protocols/qq/group.c:121
+#: ../libgaim/protocols/qq/group_im.c:137
+#: ../libgaim/protocols/qq/sys_msg.c:160 ../libgaim/protocols/qq/sys_msg.c:230
+#: ../libgaim/protocols/qq/sys_msg.c:248
+#: ../libgaim/protocols/sametime/sametime.c:5532
+msgid "Search"
+msgstr "Etsi"
+
+#. "New Person" button
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:580
+#: ../gtk/plugins/gevolution/assoc-buddy.c:469
+#: ../gtk/plugins/gevolution/new_person_dialog.c:251
+msgid "New Person"
+msgstr "Uusi henkilö"
+
+#. "Select Buddy" button
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:597
+msgid "Select Buddy"
+msgstr "Valitse tuttava"
+
+#. Add the label.
+#: ../gtk/plugins/gevolution/assoc-buddy.c:345
+msgid ""
+"Select a person from your address book to add this buddy to, or create a new "
+"person."
+msgstr ""
+"Valitse henkilö osoitekirjasta johon lisäät tämän tuttavan, tai luo uusi "
+"henkilö."
+
+#. Add the expander
+#: ../gtk/plugins/gevolution/assoc-buddy.c:433
+msgid "User _details"
+msgstr "Käyttäjän tiedot"
+
+#. "Associate Buddy" button
+#: ../gtk/plugins/gevolution/assoc-buddy.c:486
+msgid "_Associate Buddy"
+msgstr "_Yhdistä tuttava"
+
+#: ../gtk/plugins/gevolution/eds-utils.c:73
+#: ../gtk/plugins/gevolution/eds-utils.c:86
+#: ../libgaim/protocols/jabber/jabber.c:1154
+msgid "None"
+msgstr "Ei mitään"
+
+#: ../gtk/plugins/gevolution/gevolution.c:262
+#: ../gtk/plugins/gevolution/gevolution.c:268
+msgid "Unable to send e-mail"
+msgstr "Sähköpostia ei voitu lähettää."
+
+#: ../gtk/plugins/gevolution/gevolution.c:263
+msgid "The evolution executable was not found in the PATH."
+msgstr "Suoritettava evolution-tiedosto ei löytynyt PATH-muuttujasta."
+
+#: ../gtk/plugins/gevolution/gevolution.c:269
+msgid "The specified buddy was not found in the Evolution Contacts."
+msgstr "Määriteltyä tuttavaa ei löydetty Evolutionin yhteystiedoista."
+
+#: ../gtk/plugins/gevolution/gevolution.c:286
+msgid "Add to Address Book"
+msgstr "Lisää osoitekirjaan"
+
+#: ../gtk/plugins/gevolution/gevolution.c:290
+msgid "Send E-Mail"
+msgstr "Lähetä sähköposti"
+
+#. Configuration frame
+#: ../gtk/plugins/gevolution/gevolution.c:417
+msgid "Evolution Integration Configuration"
+msgstr "Evolution-integraatioasetukset"
+
+#. Label
+#: ../gtk/plugins/gevolution/gevolution.c:420
+msgid "Select all accounts that buddies should be auto-added to."
+msgstr "Valitse kaikki tilit, joihin tuttavat lisätään automaattisesti."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gevolution/gevolution.c:527
+msgid "Evolution Integration"
+msgstr "Evolution-integrointi"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/gevolution/gevolution.c:530
+#: ../gtk/plugins/gevolution/gevolution.c:532
+msgid "Provides integration with Evolution."
+msgstr "Mahdollistaa integroinnin Evolutionin kanssa."
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:267
+msgid "Please enter the person's information below."
+msgstr "Syötä henkilön tiedot alle."
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:271
+msgid "Please enter the buddy's screen name and account type below."
+msgstr "Syötä tuttavan näyttönimi ja käyttäjätilin tyyppi alle."
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:291
+msgid "Account type:"
+msgstr "Käyttäjätilin tyyppi:"
+
+#. Optional Information section
+#: ../gtk/plugins/gevolution/new_person_dialog.c:315
+msgid "Optional information:"
+msgstr "Valinnaisia tietoja:"
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:350
+msgid "First name:"
+msgstr "Etunimi:"
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:362
+msgid "Last name:"
+msgstr "Sukunimi:"
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:382
+msgid "E-mail:"
+msgstr "Sähköposti:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gtk-signals-test.c:160
+msgid "GTK Signals Test"
+msgstr "GTK-signaalitesti"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/gtk-signals-test.c:163 ../gtk/plugins/gtk-signals-test.c:165
+msgid "Test to see that all ui signals are working properly."
+msgstr ""
+"Kokeile nähdäksesi, että kaikki käyttöliittymäsignaalit toimivat oikein."
+
+#: ../gtk/plugins/history.c:188
+msgid "History"
+msgstr "Historia"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/iconaway.c:82
+msgid "Iconify on Away"
+msgstr "Pienennä poissaollessa"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/iconaway.c:85 ../gtk/plugins/iconaway.c:87
+msgid "Iconifies the buddy list and your conversations when you go away."
+msgstr "Pienentää tuttavalista- ja keskusteluikkunan poissaoloajaksi."
+
+#: ../gtk/plugins/mailchk.c:160
+msgid "Mail Checker"
+msgstr "Sähköpostitarkistin"
+
+#: ../gtk/plugins/mailchk.c:162
+msgid "Checks for new local mail."
+msgstr "Tarkistaa paikallisen koneen sähköpostin."
+
+#: ../gtk/plugins/mailchk.c:163
+msgid "Adds a small box to the buddy list that shows if you have new mail."
+msgstr ""
+"Lisää pienen neliön tuttavalistaan, joka ilmoittaa uudesta sähköpostista."
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:44
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr ""
+"Musiikkiviestintäistunto pyydetty aloitettavaksi. Napsauta MM-kuvaketta "
+"hyväksyäksesi pyynnön."
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:45
+msgid "Music messaging session confirmed."
+msgstr "Musiikkiviestintäistunto varmistettu."
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:416
+msgid "Music Messaging"
+msgstr "Musiikkiviestintä"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:417
+msgid "There was a conflict in running the command:"
+msgstr "Tapahtui virhe suoritettaessa komentoa:"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:525
+msgid "Error Running Editor"
+msgstr "Virhe ajettaessa muokkainta"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:526
+msgid "The following error has occurred:"
+msgstr "Seuraava virhe tapahtui:"
+
+#. Configuration frame
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:625
+msgid "Music Messaging Configuration"
+msgstr "Musiikkiviestinnän asetukset"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:629
+msgid "Score Editor Path"
+msgstr "Sävellysmuokkaimen polku"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:630
+msgid "_Apply"
+msgstr "_Toteuta"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:665
+msgid "Music Messaging Plugin for collaborative composition."
+msgstr "Musiikkiviestintäliitännäinen yhdessä säveltämistä varten."
+
+#. *  summary
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:667
+msgid ""
+"The Music Messaging Plugin allows a number of users to simultaneously work "
+"on a piece of music by editting a common score in real-time."
+msgstr ""
+"Musiikkiviestintäliitännäinen sallii usean käyttäjän työskennellä yhtä aikaa "
+"musiikkikappaleen parissa, muokkaamalla samaa sävellystä yhdessä, "
+"reaaliaikaisesti."
+
+#. ---------- "Notify For" ----------
+#: ../gtk/plugins/notify.c:687
+msgid "Notify For"
+msgstr "Huomautus"
+
+#: ../gtk/plugins/notify.c:691
+msgid "_IM windows"
+msgstr "_Pikaviesti-ikkunoille"
+
+#: ../gtk/plugins/notify.c:698
+msgid "C_hat windows"
+msgstr "_Ryhmäkeskusteluikkunoille"
+
+#: ../gtk/plugins/notify.c:706
+msgid "\t_Only when someone says your screen name"
+msgstr "\t_Vain kun joku sanoo kutsumanimesi"
+
+#: ../gtk/plugins/notify.c:716
+msgid "_Focused windows"
+msgstr "_Kohdistetuille ikkunoille"
+
+#. ---------- "Notification Methods" ----------
+#: ../gtk/plugins/notify.c:724
+msgid "Notification Methods"
+msgstr "Ilmoitustavat"
+
+#: ../gtk/plugins/notify.c:731
+msgid "Prepend _string into window title:"
+msgstr "Lisää _merkkijono ikkunaotsikon eteen:"
+
+#. Count method button
+#: ../gtk/plugins/notify.c:750
+msgid "Insert c_ount of new messages into window title"
+msgstr "Lisää uusien _viestien määrä ikkunaotsikkoon"
+
+#. Count xprop method button
+#: ../gtk/plugins/notify.c:759
+msgid "Insert count of new message into _X property"
+msgstr "Lisää uusien viestien määrä _X-ominaisuuteen (xprop)"
+
+#. Urgent method button
+#: ../gtk/plugins/notify.c:767
+msgid "Set window manager \"_URGENT\" hint"
+msgstr "Aseta ikkunointiohjelman \"_URGENT\"(kiireellinen)-lippu"
+
+#. Raise window method button
+#: ../gtk/plugins/notify.c:776
+msgid "R_aise conversation window"
+msgstr "N_osta keskusteluikkuna"
+
+#. ---------- "Notification Removals" ----------
+#: ../gtk/plugins/notify.c:784
+msgid "Notification Removal"
+msgstr "Huomautuksen poisto"
+
+#. Remove on focus button
+#: ../gtk/plugins/notify.c:789
+msgid "Remove when conversation window _gains focus"
+msgstr "Poista kun keskusteluikkuna on _aktiivinen"
+
+#. Remove on click button
+#: ../gtk/plugins/notify.c:796
+msgid "Remove when conversation window _receives click"
+msgstr "Poista kun keskusteluikkunaa _napsautetaan"
+
+#. Remove on type button
+#: ../gtk/plugins/notify.c:804
+msgid "Remove when _typing in conversation window"
+msgstr "Poista kun keskusteluikkunaan _kirjoitetaan"
+
+#. Remove on message send button
+#: ../gtk/plugins/notify.c:812
+msgid "Remove when a _message gets sent"
+msgstr "Poista kun viesti _lähetetään"
+
+#. Remove on conversation switch button
+#: ../gtk/plugins/notify.c:821
+msgid "Remove on switch to conversation ta_b"
+msgstr "Poista kun _välilehti vaihtuu"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/notify.c:910
+msgid "Message Notification"
+msgstr "Viestihuomautus"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/notify.c:913 ../gtk/plugins/notify.c:915
+msgid "Provides a variety of ways of notifying you of unread messages."
+msgstr "Ilmoittaa lukemattomista viesteistä monilla tavoilla."
+
+#: ../gtk/plugins/raw.c:175
+msgid "Raw"
+msgstr "Raakasyöttö"
+
+#: ../gtk/plugins/raw.c:177
+msgid "Lets you send raw input to text-based protocols."
+msgstr ""
+"Mahdollistaa raakamuotoisen syötteen antamisen tekstipohjaisille "
+"yhteyskäytännöille."
+
+#: ../gtk/plugins/raw.c:178
+msgid ""
+"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"'Enter' in the entry box to send. Watch the debug window."
+msgstr ""
+"Antaa sinun lähettää raakamuotoista syötettä tekstipohjaisilla  "
+"yhteyskäytännöillä (Jabber MSN, IRC, TOC). Paina \"Enter\" "
+"viestinsyöttölaatikossa lähettääksesi. Tarkkaile virheenjäljitysikkunaa."
+
+#: ../gtk/plugins/relnot.c:69
+#, c-format
+msgid "You are using Gaim version %s.  The current version is %s.<hr>"
+msgstr "Käyttämäsi Gaim-versio on %s. Uusin versio on %s.<hr>"
+
+#: ../gtk/plugins/relnot.c:75
+#, c-format
+msgid ""
+"<b>ChangeLog:</b>\n"
+"%s<br><br>"
+msgstr ""
+"<b>Muutosloki:</b>\n"
+"%s<br><br>"
+
+#: ../gtk/plugins/relnot.c:80
+#, c-format
+msgid ""
+"You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
+"\">http://gaim.sourceforge.net</a>."
+msgstr ""
+"Version %s voi noutaa osoitteesta:<br><a href=\"http://gaim.sourceforge.net/"
+"\">http://gaim.sourceforge.net</a>."
+
+#: ../gtk/plugins/relnot.c:84 ../gtk/plugins/relnot.c:85
+msgid "New Version Available"
+msgstr "Uusi versio saatavilla"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/relnot.c:143
+msgid "Release Notification"
+msgstr "Julkaisuilmoitus"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/relnot.c:146
+msgid "Checks periodically for new releases."
+msgstr "Tarkistaa määräajoin onko uusi Gaim-versio julkaistu."
+
+#. *  description
+#: ../gtk/plugins/relnot.c:148
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+msgstr ""
+"Tarkistaa määräajoin onko uusi Gaim-versio julkaistu ja huomauttaa käyttäjää "
+"näyttämällä muutoslokin."
+
+#: ../gtk/plugins/spellchk.c:1936
+msgid "Duplicate Correction"
+msgstr "Korjauksen toisinto"
+
+#: ../gtk/plugins/spellchk.c:1937
+msgid "The specified word already exists in the correction list."
+msgstr "Määritetty sana on jo korjauslistassa."
+
+#: ../gtk/plugins/spellchk.c:2145
+msgid "Text Replacements"
+msgstr "Tekstin korvaus"
+
+#: ../gtk/plugins/spellchk.c:2168
+msgid "You type"
+msgstr "Kirjoitettu"
+
+#: ../gtk/plugins/spellchk.c:2182
+msgid "You send"
+msgstr "Lähetetty"
+
+#: ../gtk/plugins/spellchk.c:2196
+msgid "Whole words only"
+msgstr "Vain kokonaiset sanat"
+
+#: ../gtk/plugins/spellchk.c:2208
+msgid "Case sensitive"
+msgstr "Sama kirjainkoko"
+
+#: ../gtk/plugins/spellchk.c:2234
+msgid "Add a new text replacement"
+msgstr "Lisää uusi korvausehto"
+
+#: ../gtk/plugins/spellchk.c:2250
+msgid "You _type:"
+msgstr "_Kirjoitettu:"
+
+#: ../gtk/plugins/spellchk.c:2267
+msgid "You _send:"
+msgstr "_Lähetetty:"
+
+#. Created here so it can be passed to whole_words_button_toggled.
+#: ../gtk/plugins/spellchk.c:2279
+msgid "_Exact case match (uncheck for automatic case handling)"
+msgstr ""
+"_Ehdoton kirjainkoon täsmäys (poista valinta jos haluat automaattisen "
+"kirjainkoon hallinnan)"
+
+#: ../gtk/plugins/spellchk.c:2281
+msgid "Only replace _whole words"
+msgstr "Korvaa vain _kokonaiset sanat"
+
+#: ../gtk/plugins/spellchk.c:2306
+msgid "General Text Replacement Options"
+msgstr "Tekstin korvauksen yleiset valinnat"
+
+#: ../gtk/plugins/spellchk.c:2307
+msgid "Enable replacement of last word on send"
+msgstr "Salli viimeisen sanan korvaus lähetettäessä"
+
+#: ../gtk/plugins/spellchk.c:2332
+msgid "Text replacement"
+msgstr "Tekstin korvaus"
+
+#: ../gtk/plugins/spellchk.c:2334 ../gtk/plugins/spellchk.c:2335
+msgid "Replaces text in outgoing messages according to user-defined rules."
+msgstr "Korvaa lähetetettävän tekstin käyttäjän määritelmän mukaan."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/ticker/ticker.c:77 ../gtk/plugins/ticker/ticker.c:355
+msgid "Buddy Ticker"
+msgstr "Rullaava tuttavataulu"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/ticker/ticker.c:358 ../gtk/plugins/ticker/ticker.c:360
+msgid "A horizontal scrolling version of the buddy list."
+msgstr "Vaakatasossa rullaava versio tuttavalistasta."
+
+#: ../gtk/plugins/timestamp.c:186
+msgid "iChat Timestamp"
+msgstr "iChat-tyylinen aikaleima"
+
+#: ../gtk/plugins/timestamp.c:193
+msgid "Delay"
+msgstr "Viive"
+
+#: ../gtk/plugins/timestamp.c:200
+msgid "minutes."
+msgstr "minuuttia."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/timestamp.c:256
+msgid "Timestamp"
+msgstr "Aikaleima"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/timestamp.c:259 ../gtk/plugins/timestamp.c:261
+msgid "Adds iChat-style timestamps to conversations every N minutes."
+msgstr "Lisää iChat-tyylisen aikaleiman keskusteluihin N minuutin välein."
+
+#: ../gtk/plugins/timestamp_format.c:22
+msgid "Timestamp Format Options"
+msgstr "Aikaleiman muotoiluasetukset"
+
+#: ../gtk/plugins/timestamp_format.c:27
+msgid "_Force (traditional Gaim) 24-hour time format"
+msgstr "_Pakota (Gaimin perinteinen) 24 tunnin aikamuoto"
+
+#: ../gtk/plugins/timestamp_format.c:30
+msgid "Show dates in..."
+msgstr "Näytä päivämäärät..."
+
+#: ../gtk/plugins/timestamp_format.c:35
+msgid "Co_nversations:"
+msgstr "Ke_skustelut:"
+
+#: ../gtk/plugins/timestamp_format.c:37 ../gtk/plugins/timestamp_format.c:46
+msgid "For delayed messages"
+msgstr "Viivästetyille viesteille"
+
+#: ../gtk/plugins/timestamp_format.c:38 ../gtk/plugins/timestamp_format.c:47
+msgid "For delayed messages and in chats"
+msgstr "Viivästetyille viesteille, ja ryhmäkeskusteluissa"
+
+#: ../gtk/plugins/timestamp_format.c:44
+msgid "_Message Logs:"
+msgstr "_Viestilokit:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/timestamp_format.c:149
+msgid "Message Timestamp Formats"
+msgstr "Viestin aikaleimamuodot"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/timestamp_format.c:152
+msgid "Customizes the message timestamp formats."
+msgstr "Muokkaa viestin aikaleimamuotoja."
+
+#. *  description
+#: ../gtk/plugins/timestamp_format.c:154
+msgid ""
+"This plugin allows the user to customize conversation and logging message "
+"timestamp formats."
+msgstr ""
+"Tämä liitännäinen mahdollistaa keskustelu- ja lokiviestien aikaleimamuotojen "
+"muokkaamisen."
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:183
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:569
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:616
+msgid "Opacity:"
+msgstr "Peitto:"
+
+#. IM Convo trans options
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:533
+msgid "IM Conversation Windows"
+msgstr "Pikaviesti-ikkunat"
+
+# NOTE source: gimp + google
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:534
+msgid "_IM window transparency"
+msgstr "_Pikaviesti-ikkunan läpinäkyvyys"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:548
+msgid "_Show slider bar in IM window"
+msgstr "_Näytä vierityspalkki pikaviesti-ikkunassa"
+
+# NOTE source: gimp + google
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:555
+msgid "Remove IM window transparency on focus"
+msgstr "Poista pikaviesti-ikkunan läpinäkyvyys sen ollessa kohdistettuna"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:558
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:606
+msgid "Always on top"
+msgstr "Aina päällimmäisenä"
+
+#. Buddy List trans options
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:590
+msgid "Buddy List Window"
+msgstr "Tuttavalistaikkuna"
+
+# NOTE source: gimp + google
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:591
+msgid "_Buddy List window transparency"
+msgstr "_Tuttavalistaikkunan läpinäkyvyys"
+
+# NOTE source: gimp + google
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:604
+msgid "Remove Buddy List window transparency on focus"
+msgstr "Poista tuttavalistaikkunan läpinäkyvyys sen ollessa kohdistettuna"
+
+# NOTE source: gimp + google
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:658
+msgid "Transparency"
+msgstr "Läpinäkyvyys"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:661
+msgid "Variable Transparency for the buddy list and conversations."
+msgstr "Vaihteleva läpinäkyvyys tuttavalistalle ja keskusteluille."
+
+#. *  description
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:663
+msgid ""
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
+"\n"
+"* Note: This plugin requires Win2000 or greater."
+msgstr ""
+"Tämä liitännäinen mahdollistaa keskusteluikkunoiden ja tuttavalistaikkunan "
+"läpinäkyvyyden.\n"
+"\n"
+"Huomaa: Tämä liitännäinen vaatii Win2000 tai uudemman."
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:306
+msgid "GTK+ Runtime Version"
+msgstr "GTK+ Runtime -versio"
+
+#. Autostart
+#: ../gtk/plugins/win32/winprefs/winprefs.c:314
+msgid "Startup"
+msgstr "Käynnistys"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:315
+msgid "_Start Gaim on Windows startup"
+msgstr "_Käynnistä Gaim Windowsin käynnistyessä."
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:328
+msgid "_Dockable Buddy List"
+msgstr "_Telakoi tuttavalista ruudun reunaan"
+
+#. Blist On Top
+#: ../gtk/plugins/win32/winprefs/winprefs.c:332
+msgid "_Keep Buddy List window on top:"
+msgstr "_Pidä tuttavalistaikkuna päällimmäisenä:"
+
+#. XXX: Did this ever work?
+#: ../gtk/plugins/win32/winprefs/winprefs.c:337
+msgid "Only when docked"
+msgstr "Vain telakoituna"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:342
+msgid "_Flash window when chat messages are received"
+msgstr "_Vilkuta ikkunaa ryhmäkeskusteluviestien saapuessa"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:366
+msgid "WinGaim Options"
+msgstr "WinGaim-valinnat"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:368
+msgid "Options specific to Windows Gaim."
+msgstr "Windows-Gaimin erityiset asetukset"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:369
+msgid "Provides options specific to Windows Gaim, such as buddy list docking."
+msgstr ""
+"Tarjoaa Windows Gaim -sidonnaisia valintoja, kuten tuttavalistan telakoinnin."
+
+#: ../libgaim/account.c:774
+msgid "accounts"
+msgstr "käyttäjätilit"
+
+#: ../libgaim/account.c:918
+msgid "Password is required to sign on."
+msgstr "Salasana tarvitaan kirjautumiseen."
+
+#: ../libgaim/account.c:943
+#, c-format
+msgid "Enter password for %s (%s)"
+msgstr "Anna salasana käyttäjätilille %s (%s)"
+
+#: ../libgaim/account.c:950
+msgid "Enter Password"
+msgstr "Anna salasana"
+
+#: ../libgaim/account.c:955
+msgid "Save password"
+msgstr "Tallenna salasana"
+
+#: ../libgaim/account.c:989 ../libgaim/connection.c:103
+#, c-format
+msgid "Missing protocol plugin for %s"
+msgstr "%s-yhteyskäytäntöliitännäinen puuttuu"
+
+#: ../libgaim/account.c:1071 ../libgaim/protocols/gg/gg.c:696
+#: ../libgaim/protocols/jabber/jabber.c:1304
+msgid "New passwords do not match."
+msgstr "Uudet salasanat eivät täsmää."
+
+#: ../libgaim/account.c:1080
+msgid "Fill out all fields completely."
+msgstr "Täytä kaikki kentät kokonaan."
+
+#: ../libgaim/account.c:1103
+msgid "Original password"
+msgstr "Vanha salasana"
+
+#: ../libgaim/account.c:1110
+msgid "New password"
+msgstr "Uusi salasana"
+
+#: ../libgaim/account.c:1117
+msgid "New password (again)"
+msgstr "Uusi salasana (uudelleen)"
+
+#: ../libgaim/account.c:1123
+#, c-format
+msgid "Change password for %s"
+msgstr "Vaihda %s:n salasana"
+
+#: ../libgaim/account.c:1131
+msgid "Please enter your current password and your new password."
+msgstr "Anna nykyinen sekä uusi salasana."
+
+#: ../libgaim/account.c:1161
+#, c-format
+msgid "Change user information for %s"
+msgstr "Vaihda käyttäjätietoja - %s"
+
+#: ../libgaim/account.c:1164 ../libgaim/protocols/toc/toc.c:1690
+msgid "Set User Info"
+msgstr "Aseta käyttäjätiedot"
+
+#: ../libgaim/blist.c:543
+msgid "buddy list"
+msgstr "tuttavalista"
+
+#: ../libgaim/blist.c:1914
+#, c-format
+msgid ""
+"%d buddy from group %s was not removed because it belongs to an account "
+"which is disabled or offline.  This buddy and the group were not removed.\n"
+msgid_plural ""
+"%d buddies from group %s were not removed because they belong to accounts "
+"which are currently disabled or offline.  These buddies and the group were "
+"not removed.\n"
+msgstr[0] ""
+"%d tuttava ryhmästä %s ei poistettu koska se kuuluu tilille joka on poissa "
+"käytöstä tai ei kirjautuneena sisään. Tätä tuttavaa ja ryhmää ei poistettu.\n"
+msgstr[1] ""
+"%d tuttavaa ryhmästä %s ei poistettu koska se kuuluu tilille joka on poissa "
+"käytöstä tai ei kirjautuneena sisään. Näitä tuttavia ja ryhmiä ei "
+"poistettu.\n"
+
+#: ../libgaim/blist.c:1924
+msgid "Group not removed"
+msgstr "Ryhmää ei poistettu"
+
+#: ../libgaim/connection.c:105
+msgid "Registration Error"
+msgstr "Rekisteröintivirhe"
+
+#: ../libgaim/connection.c:284
+#, c-format
+msgid "+++ %s signed on"
+msgstr "+++ %s kirjautui sisään"
+
+#: ../libgaim/connection.c:317
+#, c-format
+msgid "+++ %s signed off"
+msgstr "+++ %s kirjautui ulos"
+
+#: ../libgaim/conversation.c:165
+msgid "Unable to send message: The message is too large."
+msgstr "Viestiä ei voitu lähettää: viesti on liian suuri."
+
+#: ../libgaim/conversation.c:168 ../libgaim/conversation.c:181
+#, c-format
+msgid "Unable to send message to %s."
+msgstr "Viestiä ei voitu lähettää käyttäjälle %s."
+
+#: ../libgaim/conversation.c:169
+msgid "The message is too large."
+msgstr "Viesti on liian suuri."
+
+#: ../libgaim/conversation.c:178
+msgid "Unable to send message."
+msgstr "Viestiä ei voitu lähettää."
+
+#: ../libgaim/conversation.c:1162
+msgid "Send Message"
+msgstr "Lähetä viest"
+
+#: ../libgaim/conversation.c:1163
+msgid "_Send Message"
+msgstr "_Lähetä viesti"
+
+#: ../libgaim/conversation.c:1566
+#, c-format
+msgid "%s entered the room."
+msgstr "%s saapui huoneeseen."
+
+#: ../libgaim/conversation.c:1569
+#, c-format
+msgid "%s [<I>%s</I>] entered the room."
+msgstr "%s [<I>%s</I>] saapui huoneeseen."
+
+#: ../libgaim/conversation.c:1674
+#, c-format
+msgid "You are now known as %s"
+msgstr "Olet nyt nimeltäsi %s"
+
+#: ../libgaim/conversation.c:1694
+#, c-format
+msgid "%s is now known as %s"
+msgstr "%s on nyt nimeltään %s"
+
+#: ../libgaim/conversation.c:1767
+#, c-format
+msgid "%s left the room."
+msgstr "%s poistui huoneesta."
+
+#: ../libgaim/conversation.c:1770
+#, c-format
+msgid "%s left the room (%s)."
+msgstr "%s poistui huoneesta (%s)."
+
+#: ../libgaim/desktopitem.c:286 ../libgaim/desktopitem.c:877
+msgid "No name"
+msgstr "Ei nimeä"
+
+#: ../libgaim/dbus-server.c:577
+#, c-format
+msgid "Failed to get connection: %s"
+msgstr "Yhteyden saaminen epäonnistui: %s"
+
+# c-format
+#: ../libgaim/dbus-server.c:585
+#, c-format
+msgid "Failed to get name: %s"
+msgstr "Nimen saaminen epäonnistui: %s"
+
+#: ../libgaim/dbus-server.c:598
+#, c-format
+msgid "Failed to get serv name: %s"
+msgstr "Palvelinnimen saaminen epäonnistui: %s"
+
+#: ../libgaim/dnsquery.c:490
+msgid "Unable to create new resolver process\n"
+msgstr "Selvitysprosessin luominen epäonnistui\n"
+
+#: ../libgaim/dnsquery.c:495
+msgid "Unable to send request to resolver process\n"
+msgstr "Pyyntöä ei voitu lähettää selvitysprosessille\n"
+
+#: ../libgaim/dnsquery.c:528 ../libgaim/dnsquery.c:676
+#, c-format
+msgid ""
+"Error resolving %s:\n"
+"%s"
+msgstr ""
+"Virhe selvitettäessä %s:\n"
+"%s"
+
+#: ../libgaim/dnsquery.c:531 ../libgaim/dnsquery.c:690
+#: ../libgaim/dnsquery.c:798
+#, c-format
+msgid "Error resolving %s: %d"
+msgstr "Virhe selvitettäessä %s: %d"
+
+#: ../libgaim/dnsquery.c:553
+#, c-format
+msgid ""
+"Error reading from resolver process:\n"
+"%s"
+msgstr ""
+"Virhe luettaessa selvitysprosessista:\n"
+"%s"
+
+#: ../libgaim/dnsquery.c:557
+msgid "EOF while reading from resolver process"
+msgstr "EOF luettaessa selvitysprosessista"
+
+#: ../libgaim/dnsquery.c:734
+#, c-format
+msgid "Thread creation failure: %s"
+msgstr "Säikeen luonti epäonnistui: %s"
+
+#: ../libgaim/dnsquery.c:735
+msgid "Unknown reason"
+msgstr "Tuntematon syy"
+
+#: ../libgaim/ft.c:189 ../libgaim/protocols/msn/msn.c:410
+#, c-format
+msgid ""
+"Error reading %s: \n"
+"%s.\n"
+msgstr ""
+"Virhe luettaessa %s:  \n"
+"%s.\n"
+
+#: ../libgaim/ft.c:193
+#, c-format
+msgid ""
+"Error writing %s: \n"
+"%s.\n"
+msgstr ""
+"Virhe kirjoitettaessa %s: \n"
+"%s.\n"
+
+#: ../libgaim/ft.c:197
+#, c-format
+msgid ""
+"Error accessing %s: \n"
+"%s.\n"
+msgstr ""
+"Virhe käytettäessä tiedostoa %s: \n"
+"%s.\n"
+
+#: ../libgaim/ft.c:230
+msgid "Cannot send a file of 0 bytes."
+msgstr "Ei voida lähettää tiedostoa, jonka koko on 0 tavua."
+
+#: ../libgaim/ft.c:240
+msgid "Cannot send a directory."
+msgstr "Ei voida lähettää kansiota."
+
+#: ../libgaim/ft.c:249
+#, c-format
+msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
+msgstr "%s ei ole tavallinen tiedosto. Ei suostuta ylikirjoittamaan sitä.\n"
+
+#: ../libgaim/ft.c:307
+#, c-format
+msgid "%s wants to send you %s (%s)"
+msgstr "%s on lähettämässä sinulle %s (%s)"
+
+#: ../libgaim/ft.c:314
+#, c-format
+msgid "%s wants to send you a file"
+msgstr "Käyttäjä %s tahtoo lähettää sinulle tiedoston"
+
+#: ../libgaim/ft.c:355
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr "Hyväksytäänkö tiedostonsiirtopyyntö käyttäjältä %s?"
+
+#: ../libgaim/ft.c:359
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"Tiedosto on ladattavissa:\n"
+"Etäkone: %s\n"
+"Portti: %d"
+
+#: ../libgaim/ft.c:392
+#, c-format
+msgid "%s is offering to send file %s"
+msgstr "%s tarjoaa tiedostoa %s"
+
+#: ../libgaim/ft.c:444
+#, c-format
+msgid "%s is not a valid filename.\n"
+msgstr "%s ei ole kelvollinen tiedostonimi.\n"
+
+#: ../libgaim/ft.c:465
+#, c-format
+msgid "Offering to send %s to %s"
+msgstr "Tarjotaan tiedostoa %s lähetettäväksi käyttäjälle %s."
+
+#: ../libgaim/ft.c:477
+#, c-format
+msgid "Starting transfer of %s from %s"
+msgstr "Aloitetaan tiedoston %s siirto käyttäjältä %s"
+
+#: ../libgaim/ft.c:631
+#, c-format
+msgid "Transfer of file %s complete"
+msgstr "Tiedoston %s siirto valmis"
+
+#: ../libgaim/ft.c:634
+msgid "File transfer complete"
+msgstr "Tiedostonsiirto valmis"
+
+#: ../libgaim/ft.c:1023
+#, c-format
+msgid "You canceled the transfer of %s"
+msgstr "Peruutit tiedoston %s siirron"
+
+#: ../libgaim/ft.c:1028
+msgid "File transfer cancelled"
+msgstr "Tiedostonsiirto peruutettu"
+
+#: ../libgaim/ft.c:1086
+#, c-format
+msgid "%s canceled the transfer of %s"
+msgstr "%s peruutti tiedoston %s siirron"
+
+#: ../libgaim/ft.c:1091
+#, c-format
+msgid "%s canceled the file transfer"
+msgstr "Käyttäjä %s peruutti tiedostonsiirron"
+
+#: ../libgaim/ft.c:1148
+#, c-format
+msgid "File transfer to %s failed."
+msgstr "Tiedostonsiirto käyttäjälle %s epäonnistui."
+
+#: ../libgaim/ft.c:1150
+#, c-format
+msgid "File transfer from %s failed."
+msgstr "Tiedostonsiirto käyttäjältä %s epäonnistui."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:1
+msgid "Run the command in a terminal"
+msgstr "Suorita komento päätteessä"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:2
+msgid "The command used to handle \"aim\" URLs, if enabled."
+msgstr "Komento jota käytetään \"aim\"-URLien käsittelyyn, jos käytössä."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:3
+msgid "The command used to handle \"gg\" URLs, if enabled."
+msgstr "Komento jota käytetään \"gg\"-URLien käsittelyyn, jos käytössä."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:4
+msgid "The command used to handle \"icq\" URLs, if enabled."
+msgstr "Komento jota käytetään \"icq\"-URLien käsittelyyn, jos käytössä."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:5
+msgid "The command used to handle \"irc\" URLs, if enabled."
+msgstr "Komento jota käytetään \"irc\"-URLien käsittelyyn, jos käytössä."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:6
+msgid "The command used to handle \"msnim\" URLs, if enabled."
+msgstr "Komento jota käytetään \"msnim\"-URLien käsittelyyn, jos käytössä."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:7
+msgid "The command used to handle \"sip\" URLs, if enabled."
+msgstr "Komento jota käytetään \"sip\"-URLien käsittelyyn, jos käytössä."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:8
+msgid "The command used to handle \"xmpp\" URLs, if enabled."
+msgstr "Komento jota käytetään \"xmpp\"-URLien käsittelyyn, jos käytössä."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:9
+msgid "The command used to handle \"ymsgr\" URLs, if enabled."
+msgstr "Komento jota käytetään \"ymsgr\"-URLien käsittelyyn, jos käytössä."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:10
+msgid "The handler for \"aim\" URLs"
+msgstr "\"aim\"-URLien käsittelijä"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:11
+msgid "The handler for \"gg\" URLs"
+msgstr "\"gg\"-URLien käsittelijä"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:12
+msgid "The handler for \"icq\" URLs"
+msgstr "\"icq\"-URLien käsittelijä"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:13
+msgid "The handler for \"irc\" URLs"
+msgstr "\"irc\"-URLien käsittelijä"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:14
+msgid "The handler for \"msnim\" URLs"
+msgstr "\"msnim\"-URLien käsittelijä"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:15
+msgid "The handler for \"sip\" URLs"
+msgstr "\"sip\"-URLien käsittelijä"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:16
+msgid "The handler for \"xmpp\" URLs"
+msgstr "\"xmpp\"-URLien käsittelijä"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:17
+msgid "The handler for \"ymsgr\" URLs"
+msgstr "\"ymsgr\"-URLien käsittelijä"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:18
+msgid ""
+"True if the command specified in the \"command\" key should handle \"aim\" "
+"URLs."
+msgstr ""
+"Tosi, jos \"komento\"-avaimessa määriteltyä komentoa tulisi käyttää \"aim\"-"
+"URLien käsittelyyn."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:19
+msgid ""
+"True if the command specified in the \"command\" key should handle \"gg\" "
+"URLs."
+msgstr ""
+"Tosi, jos \"komento\"-avaimessa määriteltyä komentoa tulisi käyttää \"gg\"-"
+"URLien käsittelyyn."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:20
+msgid ""
+"True if the command specified in the \"command\" key should handle \"icq\" "
+"URLs."
+msgstr ""
+"Tosi, jos \"komento\"-avaimessa määriteltyä komentoa tulisi käyttää \"icq\"-"
+"URLien käsittelyyn."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:21
+msgid ""
+"True if the command specified in the \"command\" key should handle \"irc\" "
+"URLs."
+msgstr ""
+"Tosi, jos \"komento\"-avaimessa määriteltyä komentoa tulisi käyttää \"irc\"-"
+"URLien käsittelyyn."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:22
+msgid ""
+"True if the command specified in the \"command\" key should handle \"msnim\" "
+"URLs."
+msgstr ""
+"Tosi, jos \"komento\"-avaimessa määriteltyä komentoa tulisi käyttää \"msnim"
+"\"-URLien käsittelyyn."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:23
+msgid ""
+"True if the command specified in the \"command\" key should handle \"sip\" "
+"URLs."
+msgstr ""
+"Tosi, jos \"komento\"-avaimessa määriteltyä komentoa tulisi käyttää \"sip\"-"
+"URLien käsittelyyn."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:24
+msgid ""
+"True if the command specified in the \"command\" key should handle \"xmpp\" "
+"URLs."
+msgstr ""
+"Tosi, jos \"komento\"-avaimessa määriteltyä komentoa tulisi käyttää \"xmpp\"-"
+"URLien käsittelyyn."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:25
+msgid ""
+"True if the command specified in the \"command\" key should handle \"ymsgr\" "
+"URLs."
+msgstr ""
+"Tosi, jos \"komento\"-avaimessa määriteltyä komentoa tulisi käyttää \"ymsgr"
+"\"-URLien käsittelyyn."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:26
+msgid ""
+"True if the command used to handle this type of URL should be run in a "
+"terminal."
+msgstr ""
+"Tosi, jos tämäntyyppisen URL:n käsittelyyn käytettävä komento tulisi ajaa "
+"päätteessä."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:27
+msgid "Whether the specified command should handle \"aim\" URLs"
+msgstr "Määritellyn komennon tulee käsitellä \"aim\"-URLt"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:28
+msgid "Whether the specified command should handle \"gg\" URLs"
+msgstr "Määritellyn komennon tulee käsitellä \"gg\"-URLt"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:29
+msgid "Whether the specified command should handle \"icq\" URLs"
+msgstr "Määritellyn komennon tulee käsitellä \"icq\"-URLt"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:30
+msgid "Whether the specified command should handle \"irc\" URLs"
+msgstr "Määritellyn komennon tulee käsitellä \"irc\"-URLt"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:31
+msgid "Whether the specified command should handle \"msnim\" URLs"
+msgstr "Määritellyn komennon tulee käsitellä \"msnim\"-URLt"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:32
+msgid "Whether the specified command should handle \"sip\" URLs"
+msgstr "Määritellyn komennon tulee käsitellä \"sip\"-URLt"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:33
+msgid "Whether the specified command should handle \"xmpp\" URLs"
+msgstr "Määritellyn komennon tulee käsitellä \"xmpp\"-URLt"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:34
+msgid "Whether the specified command should handle \"ymsgr\" URLs"
+msgstr "Määritellyn komennon tulee käsitellä \"ymsgr\"-URLt"
+
+#: ../libgaim/log.c:181
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">Lokilla ei ole read-funktiota</font></b>"
 
-#: ../src/log.c:561
+#: ../libgaim/log.c:562
 msgid "HTML"
 msgstr "HTML"
 
-#: ../src/log.c:572
+#: ../libgaim/log.c:573
 msgid "Plain text"
 msgstr "Teksti"
 
-#: ../src/log.c:583
+#: ../libgaim/log.c:584
 msgid "Old Gaim"
 msgstr "Vanha Gaim"
 
-#: ../src/log.c:690
+#: ../libgaim/log.c:691
 msgid "Logging of this conversation failed."
 msgstr "Tämän keskustelun kirjaaminen lokiin epäonnistui."
 
-#: ../src/log.c:1040
+#: ../libgaim/log.c:1041
 msgid "XML"
 msgstr "XML"
 
-#: ../src/log.c:1114
+#: ../libgaim/log.c:1115
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -5415,7 +5876,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;"
 "AUTOMAATTIVASTAUS&gt;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:1116
+#: ../libgaim/log.c:1117
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -5424,41 +5885,42 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;"
 "AUTOMAATTIVASTAUS&gt;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:1174 ../src/log.c:1305
+#: ../libgaim/log.c:1175 ../libgaim/log.c:1306
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Lokin hakemistopolkua ei löydy!</b></font>"
 
-#: ../src/log.c:1186 ../src/log.c:1319
+#: ../libgaim/log.c:1187 ../libgaim/log.c:1320
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Ei voitu lukea tiedostoa: %s</b></font>"
 
-#: ../src/log.c:1248
+#: ../libgaim/log.c:1249
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTOMAATTIVASTAUS>: %s\n"
 
-#: ../src/plugin.c:281 ../src/protocols/jabber/buddy.c:1645
-#: ../src/protocols/msn/servconn.c:139 ../src/protocols/msn/session.c:321
-#: ../src/protocols/oscar/oscar.c:2701
+#: ../libgaim/plugin.c:281 ../libgaim/protocols/jabber/buddy.c:1649
+#: ../libgaim/protocols/msn/servconn.c:139
+#: ../libgaim/protocols/msn/session.c:321
+#: ../libgaim/protocols/oscar/oscar.c:2677
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
-#: ../src/plugin.c:424
+#: ../libgaim/plugin.c:424
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr "Liitännäistaikojen ristiriita %d (tarvitaan %d)"
 
-#: ../src/plugin.c:441
+#: ../libgaim/plugin.c:441
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "ABI-version ristiriita %d.%d.x (tarvitaan %d.%d.x)"
 
-#: ../src/plugin.c:458
+#: ../libgaim/plugin.c:458
 msgid "Plugin does not implement all required functions"
 msgstr "Liitännäinen ei toteuta kaikkia tarvittavia toimintoja"
 
-#: ../src/plugin.c:523
+#: ../libgaim/plugin.c:523
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -5466,41 +5928,541 @@
 msgstr ""
 "Vaadittu liitännäinen %s puuttuu. Ole hyvä ja asenna se ja yritä uudelleen."
 
-#: ../src/plugin.c:528
+#: ../libgaim/plugin.c:528
 msgid "Gaim encountered errors loading the plugin."
 msgstr "Liitännäistä ladattaessa tapahtui virheitä."
 
-#: ../src/plugin.c:550
+#: ../libgaim/plugin.c:550
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Vaadittu liitännäinen %s ei latautunut."
 
-#: ../src/plugin.c:554
+#: ../libgaim/plugin.c:554
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim ei kyennyt lataamaan liitännäistäsi."
 
-#: ../src/plugin.c:654
+#: ../libgaim/plugin.c:654
 #, c-format
 msgid "The dependent plugin %s failed to unload."
 msgstr "Riippuvaista liitännäista %s ei voitu poistaa käytöstä."
 
-#: ../src/plugin.c:659
+#: ../libgaim/plugin.c:659
 msgid "Gaim encountered errors unloading the plugin."
 msgstr "Poistettaessa liitännäistä käytöstä tapahtui virheitä."
 
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ciphertest.c:264
+msgid "Cipher Test"
+msgstr "Salaustesti"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/ciphertest.c:267 ../libgaim/plugins/ciphertest.c:269
+msgid "Tests the ciphers that ship with gaim."
+msgstr "Testaa Gaimin mukana tulevat salausmenetelmät"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/dbus-example.c:155
+msgid "DBus Example"
+msgstr "DBus-esimerkki"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/dbus-example.c:158 ../libgaim/plugins/dbus-example.c:160
+msgid "DBus Plugin Example"
+msgstr "DBus-esimerkkiliitännäinen"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/filectl.c:248
+msgid "Gaim File Control"
+msgstr "Gaimin tiedostohallinta"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/filectl.c:251 ../libgaim/plugins/filectl.c:253
+msgid "Allows you to control Gaim by entering commands in a file."
+msgstr "Mahdollistaa Gaimin hallinnan komentotiedostolla."
+
+#: ../libgaim/plugins/idle.c:158 ../libgaim/plugins/idle.c:216
+msgid "Minutes"
+msgstr "Minuuttia"
+
+#. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
+#. If that doesn't translate well into your language, drop the 's before translating.
+#: ../libgaim/plugins/idle.c:165 ../libgaim/plugins/idle.c:198
+#: ../libgaim/plugins/idle.c:223 ../libgaim/plugins/idle.c:315
+msgid "I'dle Mak'er"
+msgstr "Joutenoloajan säätö"
+
+#: ../libgaim/plugins/idle.c:166 ../libgaim/plugins/idle.c:255
+msgid "Set Account Idle Time"
+msgstr "Aseta tilin joutenoloaika"
+
+#: ../libgaim/plugins/idle.c:169 ../libgaim/plugins/idle.c:227
+msgid "_Set"
+msgstr "_Aseta"
+
+#: ../libgaim/plugins/idle.c:170 ../libgaim/plugins/idle.c:203
+#: ../libgaim/plugins/idle.c:228
+msgid "_Cancel"
+msgstr "_Peru"
+
+#: ../libgaim/plugins/idle.c:183
+msgid "None of your accounts are idle."
+msgstr "Yksikään käyttäjätileistäsi ei ole jouten."
+
+#: ../libgaim/plugins/idle.c:199 ../libgaim/plugins/idle.c:259
+msgid "Unset Account Idle Time"
+msgstr "Poista tilin joutenoloajan asetus"
+
+#: ../libgaim/plugins/idle.c:202
+msgid "_Unset"
+msgstr "_Poista asetus"
+
+#: ../libgaim/plugins/idle.c:224 ../libgaim/plugins/idle.c:263
+msgid "Set Idle Time for All Accounts"
+msgstr "Aseta joutenoloaika kaikille käyttäjätileille"
+
+#: ../libgaim/plugins/idle.c:268
+msgid "Unset Idle Time for All Idled Accounts"
+msgstr "Ota pois joutenoloaika kaikilta jouten olevilta tileiltä"
+
+#: ../libgaim/plugins/idle.c:317 ../libgaim/plugins/idle.c:318
+msgid "Allows you to hand-configure how long you've been idle"
+msgstr "Antaa sinun säätää itse kuinka kauan olet ollut jouten"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ipc-test-client.c:87
+msgid "IPC Test Client"
+msgstr "IPC-testiasiakasohjelma"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../libgaim/plugins/ipc-test-client.c:90
+msgid "Test plugin IPC support, as a client."
+msgstr "Testiliitännäinen - IPC asiakasohjelmana"
+
+#. *  description
+#: ../libgaim/plugins/ipc-test-client.c:92
+msgid ""
+"Test plugin IPC support, as a client. This locates the server plugin and "
+"calls the commands registered."
+msgstr ""
+"Testiliitännäinen - IPC asiakasohjelmana. Tämä etsii palvelinliitännäisen ja "
+"kutsuu rekisteröityjä komentoja."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ipc-test-server.c:74
+msgid "IPC Test Server"
+msgstr "IPC-testipalvelin"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../libgaim/plugins/ipc-test-server.c:77
+msgid "Test plugin IPC support, as a server."
+msgstr "Testiliitännäinen - IPC palvelimena"
+
+#. *  description
+#: ../libgaim/plugins/ipc-test-server.c:79
+msgid "Test plugin IPC support, as a server. This registers the IPC commands."
+msgstr "Testiliitännäinen - IPC palvelimena. Tämä rekisteröi IPC-komennot."
+
+#: ../libgaim/plugins/log_reader.c:1412
+msgid "User is offline."
+msgstr "Käyttäjä on poissa linjoilta."
+
+#: ../libgaim/plugins/log_reader.c:1418
+msgid "Auto-response sent:"
+msgstr "Automaattinen vastaus lähetetty:"
+
+#: ../libgaim/plugins/log_reader.c:1428 ../libgaim/plugins/log_reader.c:1431
+#: ../libgaim/plugins/statenotify.c:80
+#, c-format
+msgid "%s has signed off."
+msgstr "%s on kirjautunut ulos."
+
+#: ../libgaim/plugins/log_reader.c:1445
+msgid "One or more messages may have been undeliverable."
+msgstr "Yksi tai useampi viesti on saattanut jäädä lähettämättä."
+
+#: ../libgaim/plugins/log_reader.c:1455
+msgid "You were disconnected from the server."
+msgstr "Yhteys palvelimeen on katkennut."
+
+#: ../libgaim/plugins/log_reader.c:1463
+msgid ""
+"You are currently disconnected. Messages will not be received unless you are "
+"logged in."
+msgstr ""
+"Yhteyttä ei tällä hetkellä ole. Viestejä ei vastaanoteta ellet olet "
+"kirjautuneena sisään."
+
+#: ../libgaim/plugins/log_reader.c:1478
+msgid "Message could not be sent because the maximum length was exceeded."
+msgstr "Viestiä ei voitu lähettää koska suurin viestin koko ylitettiin."
+
+#: ../libgaim/plugins/log_reader.c:1483
+msgid "Message could not be sent."
+msgstr "Viestiäsi ei voitu lähetettää."
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libgaim/plugins/log_reader.c:1831 ../libgaim/plugins/log_reader.c:1940
+msgid "Adium"
+msgstr "Adium"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libgaim/plugins/log_reader.c:1844 ../libgaim/plugins/log_reader.c:1945
+msgid "Fire"
+msgstr "Fire"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libgaim/plugins/log_reader.c:1856 ../libgaim/plugins/log_reader.c:1949
+msgid "Messenger Plus!"
+msgstr "Messenger Plus!"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libgaim/plugins/log_reader.c:1869 ../libgaim/plugins/log_reader.c:1954
+msgid "MSN Messenger"
+msgstr "MSN Messenger"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libgaim/plugins/log_reader.c:1881 ../libgaim/plugins/log_reader.c:1958
+msgid "Trillian"
+msgstr "Trillian"
+
+#. Add general preferences.
+#: ../libgaim/plugins/log_reader.c:1922
+msgid "General Log Reading Configuration"
+msgstr "Yleiset lokikatselimen asetukset"
+
+#: ../libgaim/plugins/log_reader.c:1926
+msgid "Fast size calculations"
+msgstr "Nopeat koon laskemiset"
+
+#: ../libgaim/plugins/log_reader.c:1930
+msgid "Use name heuristics"
+msgstr "Käytä nimiheuristiikkaa"
+
+#. Add Log Directory preferences.
+#: ../libgaim/plugins/log_reader.c:1936
+msgid "Log Directory"
+msgstr "Lokihakemisto"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/log_reader.c:1981
+msgid "Log Reader"
+msgstr "Lokikatselin"
+
+#. *< name
+#. *< version
+#. * summary
+#: ../libgaim/plugins/log_reader.c:1985
+msgid "Includes other IM clients' logs in the log viewer."
+msgstr "Sisällyttää muiden pikaviestinohjelmien lokit lokikatselimeen."
+
+#. * description
+#: ../libgaim/plugins/log_reader.c:1989
+msgid ""
+"When viewing logs, this plugin will include logs from other IM clients. "
+"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"\n"
+"WARNING: This plugin is still alpha code and may crash frequently.  Use it "
+"at your own risk!"
+msgstr ""
+"Katsottaessa lokeja tämä liitännäinen sisällyttää niihin myös muiden "
+"pikaviestinohjelmien lokit. Tällä hetkellä tuettuina ovat Adium, MSN "
+"Messenger ja Trillian.\n"
+"\n"
+"Varoitus: Tämä liitännäinen on vielä kehitysasteella ja voi kaatua usein."
+
+#: ../libgaim/plugins/mono/loader/mono.c:213
+msgid "Mono Plugin Loader"
+msgstr "Mono-liitännäisen lataaja"
+
+#: ../libgaim/plugins/mono/loader/mono.c:215
+#: ../libgaim/plugins/mono/loader/mono.c:216
+msgid "Loads .NET plugins with Mono."
+msgstr "Lataa .NET-liitännäisiä Monon avulla."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/perl/perl.c:588
+msgid "Perl Plugin Loader"
+msgstr "Perl-liitännäisten lataaja"
+
+#. *< name
+#. *< version
+#. *< summary
+#: ../libgaim/plugins/perl/perl.c:590 ../libgaim/plugins/perl/perl.c:591
+msgid "Provides support for loading perl plugins."
+msgstr "Tuo mahdollisuuden ladata perl-liitännäisiä."
+
+#: ../libgaim/plugins/psychic.c:19
+msgid "Psychic Mode"
+msgstr "Meediotila"
+
+#: ../libgaim/plugins/psychic.c:20
+msgid "Psychic mode for incoming conversation"
+msgstr "Meediotila sisääntuleville keskusteluille"
+
+#: ../libgaim/plugins/psychic.c:21
+msgid ""
+"Causes conversation windows to appear as other users begin to message you.  "
+"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+msgstr ""
+"Keskusteluikkunat ilmestyvät, kun muut käyttäjät alkavat kirjoittaa viestiä "
+"sinulle. Tämä toimii AIM-, ICQ-, Jabber-, Sametime- ja Yahoo!-"
+"yhteiskäytännöillä."
+
+#. This is a quote from Star Wars.  You should
+#. probably not translate it literally.  If
+#. you can't find a fitting cultural reference
+#. in your language, consider translating
+#. something like this instead:
+#. "You feel a new message coming."
+#: ../libgaim/plugins/psychic.c:63
+msgid "You feel a disturbance in the force..."
+msgstr "Tunnet häiriön voimassa..."
+
+#: ../libgaim/plugins/psychic.c:82
+msgid "Only enable for users on the buddy list"
+msgstr "Salli vain tuttavalistassa oleville käyttäjille"
+
+#: ../libgaim/plugins/psychic.c:87
+msgid "Disable when away"
+msgstr "Pois käytöstä poissaollessa"
+
+#: ../libgaim/plugins/psychic.c:91
+msgid "Display notification message in conversations"
+msgstr "Näytä ilmoitusviesti keskusteluissa"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/signals-test.c:684
+msgid "Signals Test"
+msgstr "Signaalitesti"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/signals-test.c:687 ../libgaim/plugins/signals-test.c:689
+msgid "Test to see that all signals are working properly."
+msgstr "Kokeile nähdäksesi että kaikki signaalit toimivat oikein."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/simple.c:37
+msgid "Simple Plugin"
+msgstr "\"Yksinkertainen\"-liitännäinen"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/simple.c:40 ../libgaim/plugins/simple.c:42
+msgid "Tests to see that most things are working."
+msgstr "Kokeilee että useimmat asiat toimivat."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ssl/ssl.c:94
+msgid "SSL"
+msgstr "SSL"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/ssl/ssl.c:97 ../libgaim/plugins/ssl/ssl.c:99
+msgid "Provides a wrapper around SSL support libraries."
+msgstr "Luo liittymän eri SSL-tukikirjastoille."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ssl/ssl-gnutls.c:240
+msgid "GNUTLS"
+msgstr "GNUTLS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/ssl/ssl-gnutls.c:243
+#: ../libgaim/plugins/ssl/ssl-gnutls.c:245
+msgid "Provides SSL support through GNUTLS."
+msgstr "Tuo SSL-tuen GNUTLS:n kautta."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ssl/ssl-nss.c:409
+msgid "NSS"
+msgstr "NSS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/ssl/ssl-nss.c:412 ../libgaim/plugins/ssl/ssl-nss.c:414
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "Tuo SSL-tuen Mozilla-NSS:n kautta."
+
+#: ../libgaim/plugins/statenotify.c:50
+#, c-format
+msgid "%s is no longer away."
+msgstr "%s palasi."
+
+#: ../libgaim/plugins/statenotify.c:52
+#, c-format
+msgid "%s has gone away."
+msgstr "%s poistui."
+
+#: ../libgaim/plugins/statenotify.c:62
+#, c-format
+msgid "%s has become idle."
+msgstr "%s on jouten."
+
+#: ../libgaim/plugins/statenotify.c:64
+#, c-format
+msgid "%s is no longer idle."
+msgstr "%s ei enää ole jouten."
+
+#: ../libgaim/plugins/statenotify.c:73
+#, c-format
+msgid "%s has signed on."
+msgstr "%s on kirjautunut sisään."
+
+#: ../libgaim/plugins/statenotify.c:91
+msgid "Notify When"
+msgstr "Huomautus kun"
+
+#: ../libgaim/plugins/statenotify.c:94
+msgid "Buddy Goes _Away"
+msgstr "Tuttava poi_stuu"
+
+#: ../libgaim/plugins/statenotify.c:97
+msgid "Buddy Goes _Idle"
+msgstr "Tuttava on _jouten"
+
+#: ../libgaim/plugins/statenotify.c:100
+msgid "Buddy _Signs On/Off"
+msgstr "Tuttava _kirjautuu sisään/ulos"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/statenotify.c:142
+msgid "Buddy State Notification"
+msgstr "Tuttavan tilan ilmoitus"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/statenotify.c:145 ../libgaim/plugins/statenotify.c:148
+msgid ""
+"Notifies in a conversation window when a buddy goes or returns from away or "
+"idle."
+msgstr ""
+"Ilmoittaa keskusteluikkunassa kun tuttava on poissa tai jouten ja kun hän "
+"palaa."
+
+#: ../libgaim/plugins/tcl/tcl.c:413
+msgid "Tcl Plugin Loader"
+msgstr "Tcl-liitännäisten lataaja"
+
+#: ../libgaim/plugins/tcl/tcl.c:415 ../libgaim/plugins/tcl/tcl.c:416
+msgid "Provides support for loading Tcl plugins"
+msgstr "Mahdollistaa Tcl-liitännäisten latauksen."
+
 #. Send a message about the connection error
-#: ../src/protocols/bonjour/bonjour.c:111
+#: ../libgaim/protocols/bonjour/bonjour.c:111
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Ei voitu kuunnella sisääntulevia pikaviestintäyhteyksiä\n"
 
-#: ../src/protocols/bonjour/bonjour.c:146
+#: ../libgaim/protocols/bonjour/bonjour.c:146
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 "Ei voitu luoda yhteyttä paikalliseen mDNS-palvelimeen. Onko se käynnissä?"
 
-#: ../src/protocols/bonjour/bonjour.c:337
-#: ../src/protocols/sametime/sametime.c:3243
+#: ../libgaim/protocols/bonjour/bonjour.c:337
+#: ../libgaim/protocols/sametime/sametime.c:3239
 #, c-format
 msgid ""
 "\n"
@@ -5509,7 +6471,7 @@
 "\n"
 "<b>Tila</b>: %s"
 
-#: ../src/protocols/bonjour/bonjour.c:339
+#: ../libgaim/protocols/bonjour/bonjour.c:339
 #, c-format
 msgid ""
 "\n"
@@ -5528,385 +6490,398 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/bonjour/bonjour.c:434
-#: ../src/protocols/bonjour/bonjour.c:436
+#: ../libgaim/protocols/bonjour/bonjour.c:435
+#: ../libgaim/protocols/bonjour/bonjour.c:437
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour-yhteyskäytäntöliitännäinen"
 
-#: ../src/protocols/bonjour/bonjour.c:472
-#: ../src/protocols/bonjour/bonjour.c:480
-#: ../src/protocols/bonjour/bonjour.c:538 ../src/protocols/silc/silc.c:307
+#: ../libgaim/protocols/bonjour/bonjour.c:473
+#: ../libgaim/protocols/bonjour/bonjour.c:481
+#: ../libgaim/protocols/bonjour/bonjour.c:539
+#: ../libgaim/protocols/silc/silc.c:301
 msgid "Gaim User"
 msgstr "Gaim-käyttäjä"
 
 #. Creating the user splits
-#: ../src/protocols/bonjour/bonjour.c:576 ../src/protocols/silc/silc.c:937
+#: ../libgaim/protocols/bonjour/bonjour.c:577
+#: ../libgaim/protocols/silc/silc.c:935
 msgid "Hostname"
 msgstr "Isäntä"
 
 #. Creating the options for the protocol
-#: ../src/protocols/bonjour/bonjour.c:580 ../src/protocols/gg/gg.c:622
-#: ../src/protocols/jabber/jabber.c:786
+#: ../libgaim/protocols/bonjour/bonjour.c:581 ../libgaim/protocols/gg/gg.c:622
+#: ../libgaim/protocols/jabber/jabber.c:800
 msgid "First name"
 msgstr "Etunimi"
 
-#: ../src/protocols/bonjour/bonjour.c:583 ../src/protocols/gg/gg.c:617
-#: ../src/protocols/jabber/jabber.c:791
+#: ../libgaim/protocols/bonjour/bonjour.c:584 ../libgaim/protocols/gg/gg.c:617
+#: ../libgaim/protocols/jabber/jabber.c:805
 msgid "Last name"
 msgstr "Sukunimi"
 
-#: ../src/protocols/bonjour/bonjour.c:586 ../src/protocols/gg/gg.c:468
-#: ../src/protocols/jabber/jabber.c:776 ../src/protocols/silc/silc.c:701
-#: ../src/protocols/silc/silc.c:941
+#: ../libgaim/protocols/bonjour/bonjour.c:587 ../libgaim/protocols/gg/gg.c:468
+#: ../libgaim/protocols/jabber/jabber.c:790
+#: ../libgaim/protocols/silc/silc.c:699 ../libgaim/protocols/silc/silc.c:939
 msgid "E-mail"
 msgstr "Sähköposti"
 
-#: ../src/protocols/bonjour/bonjour.c:589
+#: ../libgaim/protocols/bonjour/bonjour.c:590
 msgid "AIM Account"
 msgstr "AIM-tili"
 
-#: ../src/protocols/bonjour/bonjour.c:592
+#: ../libgaim/protocols/bonjour/bonjour.c:593
 msgid "Jabber Account"
 msgstr "Jabber-tili"
 
-#: ../src/protocols/bonjour/bonjour.h:35
+#: ../libgaim/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../src/protocols/bonjour/jabber.c:374
+#: ../libgaim/protocols/bonjour/jabber.c:374
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s on sulkenut keskustelun."
 
-#: ../src/protocols/bonjour/jabber.c:461
+#: ../libgaim/protocols/bonjour/jabber.c:461
 msgid "Cannot open socket"
 msgstr "Pistoketta ei voida avata"
 
-#: ../src/protocols/bonjour/jabber.c:469
+#: ../libgaim/protocols/bonjour/jabber.c:469
 msgid "Error setting socket options"
 msgstr "Virhe asetettaessa pistokevalintoja"
 
-#: ../src/protocols/bonjour/jabber.c:493
+#: ../libgaim/protocols/bonjour/jabber.c:493
 msgid "Could not bind socket to port"
 msgstr "Ei voitu liittää pistoketta porttiin"
 
-#: ../src/protocols/bonjour/jabber.c:501
+#: ../libgaim/protocols/bonjour/jabber.c:501
 msgid "Could not listen on socket"
 msgstr "Ei voitu kuunnella pistoketta"
 
-#: ../src/protocols/bonjour/jabber.c:594
+#: ../libgaim/protocols/bonjour/jabber.c:594
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Viestiä ei voida lähettää, keskustelua ei voitu aloittaa."
 
-#: ../src/protocols/gg/gg.c:76 ../src/proxy.c:2346
+#: ../libgaim/protocols/gg/gg.c:76 ../libgaim/proxy.c:1776
 msgid "Invalid proxy settings"
 msgstr "Epäkelvot välipalvelinvalinnat"
 
-#: ../src/protocols/gg/gg.c:77 ../src/proxy.c:2346
+#: ../libgaim/protocols/gg/gg.c:77 ../libgaim/proxy.c:1776
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr ""
 "Joko isäntä tai porttinumero on virheellinen annetulle proxy-asetukselle."
 
-#: ../src/protocols/gg/gg.c:115 ../src/protocols/gg/gg.c:137
-#: ../src/protocols/gg/gg.c:180
+#: ../libgaim/protocols/gg/gg.c:115 ../libgaim/protocols/gg/gg.c:137
+#: ../libgaim/protocols/gg/gg.c:180
 msgid "Token Error"
 msgstr "Vastamerkkivirhe"
 
-#: ../src/protocols/gg/gg.c:116 ../src/protocols/gg/gg.c:138
-#: ../src/protocols/gg/gg.c:181
+#: ../libgaim/protocols/gg/gg.c:116 ../libgaim/protocols/gg/gg.c:138
+#: ../libgaim/protocols/gg/gg.c:181
 msgid "Unable to fetch the token.\n"
 msgstr "Ei voitu hakea vastamerkkiä.\n"
 
-#: ../src/protocols/gg/gg.c:269 ../src/protocols/gg/gg.c:288
+#: ../libgaim/protocols/gg/gg.c:269 ../libgaim/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
 msgstr "Tallenna tuttavalista..."
 
-#: ../src/protocols/gg/gg.c:270
+#: ../libgaim/protocols/gg/gg.c:270
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "Tuttavalistasi on tyhjä, mitään ei kirjoitettu tiedostoon."
 
-#: ../src/protocols/gg/gg.c:276 ../src/protocols/gg/gg.c:278
+#: ../libgaim/protocols/gg/gg.c:276 ../libgaim/protocols/gg/gg.c:278
 msgid "Couldn't open file"
 msgstr "Tiedoston avaus ei onnistunut"
 
-#: ../src/protocols/gg/gg.c:289
+#: ../libgaim/protocols/gg/gg.c:289
 msgid "Buddylist saved successfully!"
 msgstr "Tuttavalista tallennettiin onnistuneesti!"
 
-#: ../src/protocols/gg/gg.c:307 ../src/protocols/gg/gg.c:308
+#: ../libgaim/protocols/gg/gg.c:307 ../libgaim/protocols/gg/gg.c:308
 msgid "Couldn't load buddylist"
 msgstr "Tuttavalistan lataus ei onnistunut"
 
-#: ../src/protocols/gg/gg.c:324
+#: ../libgaim/protocols/gg/gg.c:324
 msgid "Load Buddylist..."
 msgstr "Avaa tuttavalista..."
 
-#: ../src/protocols/gg/gg.c:325
+#: ../libgaim/protocols/gg/gg.c:325
 msgid "Buddylist loaded successfully!"
 msgstr "Tuttavalista avattiin onnistuneesti!"
 
-#: ../src/protocols/gg/gg.c:336
+#: ../libgaim/protocols/gg/gg.c:336
 msgid "Save buddylist..."
 msgstr "Tallenna tuttavalista..."
 
-#: ../src/protocols/gg/gg.c:380
+#: ../libgaim/protocols/gg/gg.c:380
 msgid "Fill in the registration fields."
 msgstr "Täytä rekisteröitymiskentät."
 
-#: ../src/protocols/gg/gg.c:385
+#: ../libgaim/protocols/gg/gg.c:385
 msgid "Passwords do not match."
 msgstr "Salasanat eivät täsmää."
 
-#: ../src/protocols/gg/gg.c:394
+#: ../libgaim/protocols/gg/gg.c:394
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "Uuden käyttäjätilin rekisteröinti epäonnistui virheen takia.\n"
 
-#: ../src/protocols/gg/gg.c:407
+#: ../libgaim/protocols/gg/gg.c:407
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Uusi Gadu-Gadu-käyttäjätili rekisteröity"
 
-#: ../src/protocols/gg/gg.c:408
+#: ../libgaim/protocols/gg/gg.c:408
 msgid "Registration completed successfully!"
 msgstr "Rekisteröinti onnistui!"
 
-#: ../src/protocols/gg/gg.c:473 ../src/protocols/gg/gg.c:764
-#: ../src/protocols/jabber/jabber.c:765 ../src/protocols/jabber/jabber.c:1319
+#: ../libgaim/protocols/gg/gg.c:473 ../libgaim/protocols/gg/gg.c:764
+#: ../libgaim/protocols/jabber/jabber.c:779
+#: ../libgaim/protocols/jabber/jabber.c:1339
 msgid "Password"
 msgstr "Salasana"
 
-#: ../src/protocols/gg/gg.c:478 ../src/protocols/gg/gg.c:769
+#: ../libgaim/protocols/gg/gg.c:478 ../libgaim/protocols/gg/gg.c:769
 msgid "Password (retype)"
 msgstr "Salasana (uudelleen)"
 
-#: ../src/protocols/gg/gg.c:483 ../src/protocols/gg/gg.c:774
+#: ../libgaim/protocols/gg/gg.c:483 ../libgaim/protocols/gg/gg.c:774
 msgid "Enter current token"
 msgstr "Syötä nykyinen vastamerkki"
 
-#: ../src/protocols/gg/gg.c:489 ../src/protocols/gg/gg.c:780
+#: ../libgaim/protocols/gg/gg.c:489 ../libgaim/protocols/gg/gg.c:780
 msgid "Current token"
 msgstr "Nykyinen vastamerkki"
 
-#: ../src/protocols/gg/gg.c:493 ../src/protocols/gg/gg.c:494
+#: ../libgaim/protocols/gg/gg.c:493 ../libgaim/protocols/gg/gg.c:494
 msgid "Register New Gadu-Gadu Account"
 msgstr "Rekisteröi uusi Gadu-Gadu-käyttäjätili"
 
-#: ../src/protocols/gg/gg.c:495
+#: ../libgaim/protocols/gg/gg.c:495
 msgid "Please, fill in the following fields"
 msgstr "Täytä seuraavat kentät"
 
 #. General
-#: ../src/protocols/gg/gg.c:627 ../src/protocols/gg/gg.c:1038
-#: ../src/protocols/gg/gg.c:1104 ../src/protocols/gg/gg.c:2175
-#: ../src/protocols/jabber/buddy.c:271 ../src/protocols/jabber/buddy.c:803
-#: ../src/protocols/jabber/buddy.c:1522 ../src/protocols/jabber/buddy.c:1704
-#: ../src/protocols/jabber/jabber.c:781 ../src/protocols/msn/msn.c:1370
-#: ../src/protocols/msn/msn.c:1532 ../src/protocols/silc/buddy.c:1528
-#: ../src/protocols/silc/ops.c:1036 ../src/protocols/silc/ops.c:1179
-#: ../src/protocols/silc/ops.c:1328
-#: ../src/protocols/yahoo/yahoo_profile.c:1041
+#: ../libgaim/protocols/gg/gg.c:627 ../libgaim/protocols/gg/gg.c:1038
+#: ../libgaim/protocols/gg/gg.c:1104 ../libgaim/protocols/gg/gg.c:2182
+#: ../libgaim/protocols/jabber/buddy.c:271
+#: ../libgaim/protocols/jabber/buddy.c:800
+#: ../libgaim/protocols/jabber/buddy.c:1526
+#: ../libgaim/protocols/jabber/buddy.c:1708
+#: ../libgaim/protocols/jabber/jabber.c:795
+#: ../libgaim/protocols/msn/msn.c:1370 ../libgaim/protocols/msn/msn.c:1536
+#: ../libgaim/protocols/qq/buddy_info.c:41
+#: ../libgaim/protocols/silc/buddy.c:1528 ../libgaim/protocols/silc/ops.c:1036
+#: ../libgaim/protocols/silc/ops.c:1179 ../libgaim/protocols/silc/ops.c:1328
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1055
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
-#: ../src/protocols/gg/gg.c:632 ../src/protocols/gg/gg.c:1043
-#: ../src/protocols/gg/gg.c:1107 ../src/protocols/jabber/jabber.c:801
-#: ../src/protocols/oscar/oscar.c:3707 ../src/protocols/oscar/oscar.c:3715
+#: ../libgaim/protocols/gg/gg.c:632 ../libgaim/protocols/gg/gg.c:1043
+#: ../libgaim/protocols/gg/gg.c:1107 ../libgaim/protocols/jabber/jabber.c:815
+#: ../libgaim/protocols/oscar/oscar.c:3683
+#: ../libgaim/protocols/oscar/oscar.c:3691
+#: ../libgaim/protocols/qq/buddy_info.c:47
 msgid "City"
 msgstr "Paikkakunta"
 
-#: ../src/protocols/gg/gg.c:637
+#: ../libgaim/protocols/gg/gg.c:637
 msgid "Year of birth"
 msgstr "Syntymävuosi"
 
-#: ../src/protocols/gg/gg.c:640 ../src/protocols/msn/msn.c:1534
-#: ../src/protocols/oscar/oscar.c:3671
-#: ../src/protocols/yahoo/yahoo_profile.c:1066
+#: ../libgaim/protocols/gg/gg.c:640 ../libgaim/protocols/msn/msn.c:1538
+#: ../libgaim/protocols/oscar/oscar.c:3647
+#: ../libgaim/protocols/qq/buddy_info.c:44
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1080
 msgid "Gender"
 msgstr "Sukupuoli"
 
-#: ../src/protocols/gg/gg.c:641
+#: ../libgaim/protocols/gg/gg.c:641
 msgid "Male or female"
 msgstr "Mies vai nainen"
 
-#: ../src/protocols/gg/gg.c:642 ../src/protocols/oscar/oscar.c:3671
+#: ../libgaim/protocols/gg/gg.c:642 ../libgaim/protocols/oscar/oscar.c:3647
+#: ../libgaim/protocols/qq/buddy_info.c:81
 msgid "Male"
 msgstr "Mies"
 
-#: ../src/protocols/gg/gg.c:643 ../src/protocols/oscar/oscar.c:3671
+#: ../libgaim/protocols/gg/gg.c:643 ../libgaim/protocols/oscar/oscar.c:3647
+#: ../libgaim/protocols/qq/buddy_info.c:82
 msgid "Female"
 msgstr "Nainen"
 
-#: ../src/protocols/gg/gg.c:647
+#: ../libgaim/protocols/gg/gg.c:647
 msgid "Only online"
 msgstr "Vain linjoilla"
 
-#: ../src/protocols/gg/gg.c:651 ../src/protocols/gg/gg.c:652
+#: ../libgaim/protocols/gg/gg.c:651 ../libgaim/protocols/gg/gg.c:652
 msgid "Find buddies"
 msgstr "Etsi tuttavia"
 
-#: ../src/protocols/gg/gg.c:653
+#: ../libgaim/protocols/gg/gg.c:653
 msgid "Please, enter your search criteria below"
 msgstr "Anna hakukriteerisi alla"
 
-#: ../src/protocols/gg/gg.c:690
+#: ../libgaim/protocols/gg/gg.c:690
 msgid "Fill in the fields."
 msgstr "Täytä kentät."
 
-#: ../src/protocols/gg/gg.c:702
+#: ../libgaim/protocols/gg/gg.c:702
 msgid "Your current password is different from the one that you specified."
 msgstr "Nykyinen salasanasi ei ole se jonka kirjoitit."
 
-#: ../src/protocols/gg/gg.c:716
-msgid "Unable to change password. Error occured.\n"
-msgstr "Ei kyetty muuttamaan salasanaa virheen takia.\n"
-
-#: ../src/protocols/gg/gg.c:725
+#: ../libgaim/protocols/gg/gg.c:716
+msgid "Unable to change password. Error occurred.\n"
+msgstr "Salasanaa ei voitu muuttaa. Tapahtui virhe.\n"
+
+#: ../libgaim/protocols/gg/gg.c:725
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Vaihda Gadu-Gadu-käyttäjätilin salasana"
 
-#: ../src/protocols/gg/gg.c:726
+#: ../libgaim/protocols/gg/gg.c:726
 msgid "Password was changed successfully!"
 msgstr "Salasanan vaihto onnistui!"
 
-#: ../src/protocols/gg/gg.c:759
+#: ../libgaim/protocols/gg/gg.c:759
 msgid "Current password"
 msgstr "Nykyinen salasana"
 
-#: ../src/protocols/gg/gg.c:784
+#: ../libgaim/protocols/gg/gg.c:784
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Syötä sekä nykyinen että uusi salasana tunnukselle: "
 
-#: ../src/protocols/gg/gg.c:788 ../src/protocols/gg/gg.c:789
+#: ../libgaim/protocols/gg/gg.c:788 ../libgaim/protocols/gg/gg.c:789
 msgid "Change Gadu-Gadu Password"
 msgstr "Muuta Gadu-Gadu-salasana"
 
-#: ../src/protocols/gg/gg.c:863
+#: ../libgaim/protocols/gg/gg.c:863
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Valitse ryhmäkeskustelu tuttavalle: %s"
 
-#: ../src/protocols/gg/gg.c:866 ../src/protocols/gg/gg.c:867
+#: ../libgaim/protocols/gg/gg.c:866 ../libgaim/protocols/gg/gg.c:867
 msgid "Add to chat..."
 msgstr "Lisää ryhmäkeskusteluun..."
 
-#: ../src/protocols/gg/gg.c:1029 ../src/protocols/gg/gg.c:1098
-#: ../src/protocols/oscar/oscar.c:3643
+#: ../libgaim/protocols/gg/gg.c:1029 ../libgaim/protocols/gg/gg.c:1098
+#: ../libgaim/protocols/oscar/oscar.c:3619
 msgid "UIN"
 msgstr "UIN"
 
-#: ../src/protocols/gg/gg.c:1033 ../src/protocols/gg/gg.c:1101
-#: ../src/protocols/jabber/buddy.c:1518 ../src/protocols/jabber/buddy.c:1694
-#: ../src/protocols/oscar/oscar.c:3654 ../src/protocols/silc/ops.c:1024
+#: ../libgaim/protocols/gg/gg.c:1033 ../libgaim/protocols/gg/gg.c:1101
+#: ../libgaim/protocols/jabber/buddy.c:1522
+#: ../libgaim/protocols/jabber/buddy.c:1698
+#: ../libgaim/protocols/oscar/oscar.c:3630
+#: ../libgaim/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "Etunimi"
 
-#: ../src/protocols/gg/gg.c:1052 ../src/protocols/gg/gg.c:1110
+#: ../libgaim/protocols/gg/gg.c:1052 ../libgaim/protocols/gg/gg.c:1110
 msgid "Birth Year"
 msgstr "Syntymävuosi"
 
-#: ../src/protocols/gg/gg.c:1092 ../src/protocols/gg/gg.c:1161
-#: ../src/protocols/oscar/oscar.c:3818
+#: ../libgaim/protocols/gg/gg.c:1092 ../libgaim/protocols/gg/gg.c:1161
+#: ../libgaim/protocols/oscar/oscar.c:3794
 msgid "Unable to display the search results."
 msgstr "Ei voida näyttää hakutuloksia."
 
-#: ../src/protocols/gg/gg.c:1152
+#: ../libgaim/protocols/gg/gg.c:1152
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadun julkinen hakemisto"
 
-#: ../src/protocols/gg/gg.c:1153
+#: ../libgaim/protocols/gg/gg.c:1153
 msgid "Search results"
 msgstr "Hakutulokset"
 
-#: ../src/protocols/gg/gg.c:1197
+#: ../libgaim/protocols/gg/gg.c:1196
 msgid "No matching users found"
 msgstr "Käyttäjistä ei löytynyt osumia"
 
-#: ../src/protocols/gg/gg.c:1198
+#: ../libgaim/protocols/gg/gg.c:1197
 msgid "There are no users matching your search criteria."
 msgstr "Hakuvalintojasi vastaavia käyttäjiä ei ole."
 
-#: ../src/protocols/gg/gg.c:1292 ../src/protocols/gg/gg.c:1439
+#: ../libgaim/protocols/gg/gg.c:1291 ../libgaim/protocols/gg/gg.c:1440
 msgid "Unable to read socket"
 msgstr "Ei kyetty lukemaan pistoketta"
 
-#: ../src/protocols/gg/gg.c:1375
+#: ../libgaim/protocols/gg/gg.c:1376
 msgid "Buddy list downloaded"
 msgstr "Tuttavalista ladattu"
 
-#: ../src/protocols/gg/gg.c:1376
+#: ../libgaim/protocols/gg/gg.c:1377
 msgid "Your buddy list was downloaded from the server."
 msgstr "Tuttavalistasi ladattiin palvelimelta."
 
-#: ../src/protocols/gg/gg.c:1383
+#: ../libgaim/protocols/gg/gg.c:1384
 msgid "Buddy list uploaded"
 msgstr "Tuttavalista lähetettiin"
 
-#: ../src/protocols/gg/gg.c:1384
+#: ../libgaim/protocols/gg/gg.c:1385
 msgid "Your buddy list was stored on the server."
 msgstr "Tuttavalistasi tallennettiin palvelimelle."
 
-#: ../src/protocols/gg/gg.c:1485 ../src/protocols/gg/gg.c:1709
+#: ../libgaim/protocols/gg/gg.c:1486 ../libgaim/protocols/gg/gg.c:1710
 msgid "Connection failed."
 msgstr "Yhteys epäonnistui."
 
-#: ../src/protocols/gg/gg.c:1615 ../src/protocols/msn/msn.c:562
+#: ../libgaim/protocols/gg/gg.c:1616 ../libgaim/protocols/msn/msn.c:562
 msgid "Blocked"
 msgstr "Estetty"
 
-#: ../src/protocols/gg/gg.c:1638
+#: ../libgaim/protocols/gg/gg.c:1639
 msgid "Add to chat"
 msgstr "Lisää ryhmäkeskusteluun"
 
-#: ../src/protocols/gg/gg.c:1647
+#: ../libgaim/protocols/gg/gg.c:1648
 msgid "Unblock"
 msgstr "Poista esto"
 
-#: ../src/protocols/gg/gg.c:1651
+#: ../libgaim/protocols/gg/gg.c:1652
 msgid "Block"
 msgstr "Estä"
 
-#: ../src/protocols/gg/gg.c:1668
+#: ../libgaim/protocols/gg/gg.c:1669
 msgid "Chat _name:"
 msgstr "Keskustelunimi:"
 
-#: ../src/protocols/gg/gg.c:1896
+#: ../libgaim/protocols/gg/gg.c:1902
 msgid "Chat error"
 msgstr "Keskusteluvirhe"
 
-#: ../src/protocols/gg/gg.c:1897
+#: ../libgaim/protocols/gg/gg.c:1903
 msgid "This chat name is already in use"
 msgstr "Tämä keskustelunimi on jo käytössä"
 
-#: ../src/protocols/gg/gg.c:1980
+#: ../libgaim/protocols/gg/gg.c:1986
 msgid "Not connected to the server."
 msgstr "Ei yhdistettynä palvelimeen."
 
-#: ../src/protocols/gg/gg.c:2003
+#: ../libgaim/protocols/gg/gg.c:2009
 msgid "Find buddies..."
 msgstr "Etsi tuttavia..."
 
-#: ../src/protocols/gg/gg.c:2009
+#: ../libgaim/protocols/gg/gg.c:2015
 msgid "Change password..."
 msgstr "Vaihda salasana..."
 
-#: ../src/protocols/gg/gg.c:2015
+#: ../libgaim/protocols/gg/gg.c:2021
 msgid "Upload buddylist to Server"
 msgstr "Vie tuttavalista palvelimelle"
 
-#: ../src/protocols/gg/gg.c:2019
+#: ../libgaim/protocols/gg/gg.c:2025
 msgid "Download buddylist from Server"
 msgstr "Tuo tuttavalista palvelimelta"
 
-#: ../src/protocols/gg/gg.c:2023
+#: ../libgaim/protocols/gg/gg.c:2029
 msgid "Delete buddylist from Server"
 msgstr "Poista tuttavalista palvelimelta"
 
-#: ../src/protocols/gg/gg.c:2027
+#: ../libgaim/protocols/gg/gg.c:2033
 msgid "Save buddylist to file..."
 msgstr "Vie tuttavalista tiedostoon..."
 
-#: ../src/protocols/gg/gg.c:2031
+#: ../libgaim/protocols/gg/gg.c:2037
 msgid "Load buddylist from file..."
 msgstr "Tuo tuttavalista tiedostosta..."
 
@@ -5921,119 +6896,122 @@
 #. id
 #. name
 #. version
-#: ../src/protocols/gg/gg.c:2127
+#: ../libgaim/protocols/gg/gg.c:2134
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu-yhteyskäytäntöliitännäinen"
 
 #. summary
-#: ../src/protocols/gg/gg.c:2128
+#: ../libgaim/protocols/gg/gg.c:2135
 msgid "Polish popular IM"
 msgstr "Puolalainen suosittu pikaviestin"
 
-#: ../src/protocols/gg/gg.c:2176
+#: ../libgaim/protocols/gg/gg.c:2183
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu-käyttäjä"
 
-#: ../src/protocols/irc/cmds.c:43 ../src/protocols/silc/silc.c:1587
+#: ../libgaim/protocols/irc/cmds.c:43 ../libgaim/protocols/silc/silc.c:1585
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Tuntematon komento: %s"
 
-#: ../src/protocols/irc/cmds.c:500 ../src/protocols/jabber/chat.c:590
-#: ../src/protocols/silc/silc.c:1295
+#: ../libgaim/protocols/irc/cmds.c:505 ../libgaim/protocols/jabber/chat.c:591
+#: ../libgaim/protocols/silc/silc.c:1293
 #, c-format
 msgid "current topic is: %s"
 msgstr "nykyinen aihe on: %s"
 
-#: ../src/protocols/irc/cmds.c:504 ../src/protocols/jabber/chat.c:594
-#: ../src/protocols/silc/silc.c:1299
+#: ../libgaim/protocols/irc/cmds.c:509 ../libgaim/protocols/jabber/chat.c:595
+#: ../libgaim/protocols/silc/silc.c:1297
 msgid "No topic is set"
 msgstr "Aihetta ei ole asetettu"
 
-#: ../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
+#: ../libgaim/protocols/irc/dcc_send.c:293
+#: ../libgaim/protocols/irc/dcc_send.c:334
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:268
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:277
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:290
 msgid "File Transfer Failed"
 msgstr "Tiedostonsiirto epäonnistui"
 
-#: ../src/protocols/irc/dcc_send.c:288 ../src/protocols/irc/dcc_send.c:327
+#: ../libgaim/protocols/irc/dcc_send.c:294
+#: ../libgaim/protocols/irc/dcc_send.c:335
 msgid "Gaim could not open a listening port."
 msgstr "Gaim ei voinut avata kuuntelevaa porttia."
 
-#: ../src/protocols/irc/irc.c:78
+#: ../libgaim/protocols/irc/irc.c:80
 msgid "Error displaying MOTD"
 msgstr "Virhe näytettäessä MOTD:tä"
 
-#: ../src/protocols/irc/irc.c:78
+#: ../libgaim/protocols/irc/irc.c:80
 msgid "No MOTD available"
 msgstr "MOTD ei ole käytettävissä"
 
-#: ../src/protocols/irc/irc.c:79
+#: ../libgaim/protocols/irc/irc.c:81
 msgid "There is no MOTD associated with this connection."
 msgstr "MOTD:tä ei ole assosioitu tälle yhteydelle."
 
-#: ../src/protocols/irc/irc.c:82
+#: ../libgaim/protocols/irc/irc.c:84
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD %s:lle"
 
-#: ../src/protocols/irc/irc.c:119 ../src/protocols/irc/irc.c:149
-#: ../src/protocols/irc/irc.c:604 ../src/protocols/irc/irc.c:629
+#: ../libgaim/protocols/irc/irc.c:128 ../libgaim/protocols/irc/irc.c:166
+#: ../libgaim/protocols/irc/irc.c:614 ../libgaim/protocols/irc/irc.c:639
 msgid "Server has disconnected"
 msgstr "Palvelin on katkaissut yhteyden"
 
-#: ../src/protocols/irc/irc.c:242
+#: ../libgaim/protocols/irc/irc.c:259
 msgid "View MOTD"
 msgstr "Näytä MOTD"
 
-#: ../src/protocols/irc/irc.c:254 ../src/protocols/silc/chat.c:33
+#: ../libgaim/protocols/irc/irc.c:271 ../libgaim/protocols/silc/chat.c:33
 msgid "_Channel:"
 msgstr "_Kanava:"
 
-#: ../src/protocols/irc/irc.c:260 ../src/protocols/jabber/chat.c:59
+#: ../libgaim/protocols/irc/irc.c:277 ../libgaim/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "_Salasana:"
 
-#: ../src/protocols/irc/irc.c:292
+#: ../libgaim/protocols/irc/irc.c:308
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC-kutsumanimissä ei tule olla välilyöntejä"
 
-#: ../src/protocols/irc/irc.c:321 ../src/protocols/jabber/jabber.c:566
-#: ../src/protocols/jabber/jabber.c:905
+#: ../libgaim/protocols/irc/irc.c:337 ../libgaim/protocols/jabber/jabber.c:575
+#: ../libgaim/protocols/jabber/jabber.c:920
 msgid "SSL support unavailable"
 msgstr "SSL-tuki ei saatavilla"
 
-#: ../src/protocols/irc/irc.c:333 ../src/protocols/simple/simple.c:452
-#: ../src/protocols/simple/simple.c:1527
+#: ../libgaim/protocols/irc/irc.c:349 ../libgaim/protocols/simple/simple.c:466
+#: ../libgaim/protocols/simple/simple.c:1588
 msgid "Couldn't create socket"
 msgstr "Pistokkeen luominen epäonnistui"
 
-#: ../src/protocols/irc/irc.c:404 ../src/protocols/jabber/jabber.c:427
-#: ../src/protocols/oscar/oscar.c:1255
+#: ../libgaim/protocols/irc/irc.c:415 ../libgaim/protocols/jabber/jabber.c:451
+#: ../libgaim/protocols/oscar/oscar.c:1220
 msgid "Couldn't connect to host"
 msgstr "Yhteyttä isäntään ei voitu muodostaa"
 
-#: ../src/protocols/irc/irc.c:429 ../src/protocols/jabber/jabber.c:454
+#: ../libgaim/protocols/irc/irc.c:437 ../libgaim/protocols/jabber/jabber.c:475
 msgid "Connection Failed"
 msgstr "Yhteysvirhe"
 
-#: ../src/protocols/irc/irc.c:432 ../src/protocols/jabber/jabber.c:457
+#: ../libgaim/protocols/irc/irc.c:440 ../libgaim/protocols/jabber/jabber.c:478
 msgid "SSL Handshake Failed"
 msgstr "SSL-kättely epäonnistui"
 
-#: ../src/protocols/irc/irc.c:601 ../src/protocols/irc/irc.c:626
+#: ../libgaim/protocols/irc/irc.c:611 ../libgaim/protocols/irc/irc.c:636
 msgid "Read error"
 msgstr "Virhe luettaessa"
 
-#: ../src/protocols/irc/irc.c:765 ../src/protocols/silc/chat.c:1421
-#: ../src/protocols/yahoo/yahoochat.c:1431
+#: ../libgaim/protocols/irc/irc.c:775 ../libgaim/protocols/silc/chat.c:1421
+#: ../libgaim/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
 msgstr "Käyttäjät"
 
-#: ../src/protocols/irc/irc.c:768 ../src/protocols/sametime/sametime.c:3354
-#: ../src/protocols/silc/chat.c:1424 ../src/protocols/silc/ops.c:1380
-#: ../src/protocols/yahoo/yahoochat.c:1440
+#: ../libgaim/protocols/irc/irc.c:778
+#: ../libgaim/protocols/sametime/sametime.c:3350
+#: ../libgaim/protocols/silc/chat.c:1424 ../libgaim/protocols/silc/ops.c:1380
+#: ../libgaim/protocols/yahoo/yahoochat.c:1447
 msgid "Topic"
 msgstr "Aihe"
 
@@ -6045,47 +7023,48 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../src/protocols/irc/irc.c:877
+#: ../libgaim/protocols/irc/irc.c:908
 msgid "IRC Protocol Plugin"
 msgstr "IRC-yhteyskäytäntöliitännäinen"
 
 #. *  summary
-#: ../src/protocols/irc/irc.c:878
+#: ../libgaim/protocols/irc/irc.c:909
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "IRC-yhteyskäytäntöliitännäinen joka on vähemmän huono..."
 
 #. host to connect to
-#: ../src/protocols/irc/irc.c:897 ../src/protocols/irc/msgs.c:235
-#: ../src/protocols/jabber/jabber.c:1917 ../src/protocols/msn/msn.c:2046
-#: ../src/protocols/oscar/oscar.c:6531
-#: ../src/protocols/sametime/sametime.c:5635 ../src/protocols/silc/ops.c:1242
-#: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1775
-#: ../src/protocols/toc/toc.c:2340
+#: ../libgaim/protocols/irc/irc.c:928 ../libgaim/protocols/irc/msgs.c:235
+#: ../libgaim/protocols/jabber/jabber.c:1970
+#: ../libgaim/protocols/msn/msn.c:2054 ../libgaim/protocols/oscar/oscar.c:6531
+#: ../libgaim/protocols/sametime/sametime.c:5638
+#: ../libgaim/protocols/silc/ops.c:1242 ../libgaim/protocols/silc/ops.c:1344
+#: ../libgaim/protocols/simple/simple.c:1839
+#: ../libgaim/protocols/toc/toc.c:2347
 msgid "Server"
 msgstr "Palvelin"
 
 #. port to connect to
-#: ../src/protocols/irc/irc.c:900 ../src/protocols/msn/msn.c:2051
-#: ../src/protocols/oscar/oscar.c:6534
-#: ../src/protocols/sametime/sametime.c:5640 ../src/protocols/silc/silc.c:1860
-#: ../src/protocols/toc/toc.c:2344
+#: ../libgaim/protocols/irc/irc.c:931 ../libgaim/protocols/msn/msn.c:2059
+#: ../libgaim/protocols/oscar/oscar.c:6534
+#: ../libgaim/protocols/sametime/sametime.c:5643
+#: ../libgaim/protocols/silc/silc.c:1859 ../libgaim/protocols/toc/toc.c:2351
 msgid "Port"
 msgstr "Portti"
 
-#: ../src/protocols/irc/irc.c:903
+#: ../libgaim/protocols/irc/irc.c:934
 msgid "Encodings"
 msgstr "Merkistöt"
 
-#: ../src/protocols/irc/irc.c:906 ../src/protocols/irc/msgs.c:229
-#: ../src/protocols/jabber/jabber.c:761 ../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:935
+#: ../libgaim/protocols/irc/irc.c:937 ../libgaim/protocols/irc/msgs.c:229
+#: ../libgaim/protocols/jabber/jabber.c:775
+#: ../libgaim/protocols/silc/buddy.c:1531 ../libgaim/protocols/silc/ops.c:1189
+#: ../libgaim/protocols/silc/ops.c:1191 ../libgaim/protocols/silc/ops.c:1338
+#: ../libgaim/protocols/silc/ops.c:1340 ../libgaim/protocols/silc/silc.c:933
 msgid "Username"
 msgstr "Käyttäjänimi"
 
-#: ../src/protocols/irc/irc.c:909 ../src/protocols/irc/msgs.c:230
-#: ../src/protocols/silc/silc.c:939
+#: ../libgaim/protocols/irc/irc.c:940 ../libgaim/protocols/irc/msgs.c:230
+#: ../libgaim/protocols/silc/silc.c:937
 msgid "Real name"
 msgstr "Oikea nimi"
 
@@ -6093,163 +7072,163 @@
 #. option = gaim_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../src/protocols/irc/irc.c:917
+#: ../libgaim/protocols/irc/irc.c:948
 msgid "Use SSL"
 msgstr "Käytä SSL:ää"
 
-#: ../src/protocols/irc/msgs.c:107
+#: ../libgaim/protocols/irc/msgs.c:107
 msgid "Bad mode"
 msgstr "Väärä tila"
 
-#: ../src/protocols/irc/msgs.c:118
+#: ../libgaim/protocols/irc/msgs.c:118
 #, c-format
 msgid "You are banned from %s."
 msgstr "Sinut on kielletty kanavalta %s."
 
-#: ../src/protocols/irc/msgs.c:119
+#: ../libgaim/protocols/irc/msgs.c:119
 msgid "Banned"
 msgstr "Kielletty"
 
-#: ../src/protocols/irc/msgs.c:136
+#: ../libgaim/protocols/irc/msgs.c:136
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "Ei voida estää käyttäjää %s: estolista on täynnä"
 
-#: ../src/protocols/irc/msgs.c:215 ../src/protocols/irc/msgs.c:235
-#: ../src/protocols/irc/msgs.c:248
+#: ../libgaim/protocols/irc/msgs.c:215 ../libgaim/protocols/irc/msgs.c:235
+#: ../libgaim/protocols/irc/msgs.c:248
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../src/protocols/irc/msgs.c:215 ../src/protocols/oscar/oscar.c:3644
-#: ../src/protocols/silc/ops.c:1412
+#: ../libgaim/protocols/irc/msgs.c:215 ../libgaim/protocols/oscar/oscar.c:3620
+#: ../libgaim/protocols/silc/ops.c:1412
 msgid "Nick"
 msgstr "Kutsumanimi"
 
-#: ../src/protocols/irc/msgs.c:218
+#: ../libgaim/protocols/irc/msgs.c:218
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../src/protocols/irc/msgs.c:219
+#: ../libgaim/protocols/irc/msgs.c:219
 msgid " <i>(identified)</i>"
 msgstr "<i>(tunnistettu)</i>"
 
-#: ../src/protocols/irc/msgs.c:223 ../src/protocols/irc/msgs.c:229
-#: ../src/protocols/irc/msgs.c:230 ../src/protocols/irc/msgs.c:241
-#: ../src/protocols/yahoo/yahoo_profile.c:691
+#: ../libgaim/protocols/irc/msgs.c:223 ../libgaim/protocols/irc/msgs.c:229
+#: ../libgaim/protocols/irc/msgs.c:230 ../libgaim/protocols/irc/msgs.c:241
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:691
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: ../src/protocols/irc/msgs.c:241 ../src/protocols/silc/ops.c:1255
+#: ../libgaim/protocols/irc/msgs.c:241 ../libgaim/protocols/silc/ops.c:1255
 msgid "Currently on"
 msgstr "Tällä hetkellä"
 
-#: ../src/protocols/irc/msgs.c:246
+#: ../libgaim/protocols/irc/msgs.c:246
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>Jouten:</b> %s<br>"
 
-#: ../src/protocols/irc/msgs.c:248
+#: ../libgaim/protocols/irc/msgs.c:248
 msgid "Online since"
 msgstr "Linjoilla"
 
-#: ../src/protocols/irc/msgs.c:252
+#: ../libgaim/protocols/irc/msgs.c:252
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>Kuvaava adjektiivi</b> Kunniakas<br>"
 
-#: ../src/protocols/irc/msgs.c:329
+#: ../libgaim/protocols/irc/msgs.c:329
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s on vaihtanut aiheeksi: %s"
 
-#: ../src/protocols/irc/msgs.c:331
+#: ../libgaim/protocols/irc/msgs.c:331
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s on poistanut aiheen."
 
-#: ../src/protocols/irc/msgs.c:339
+#: ../libgaim/protocols/irc/msgs.c:339
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s:n aihe on: %s"
 
-#: ../src/protocols/irc/msgs.c:357
+#: ../libgaim/protocols/irc/msgs.c:357
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Tuntematon viesti \"%s\""
 
-#: ../src/protocols/irc/msgs.c:358
+#: ../libgaim/protocols/irc/msgs.c:358
 msgid "Unknown message"
 msgstr "Tuntematon viesti"
 
-#: ../src/protocols/irc/msgs.c:358
+#: ../libgaim/protocols/irc/msgs.c:358
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim on lähettänyt viestin jota IRC-palvelin ei ymmärrä."
 
-#: ../src/protocols/irc/msgs.c:381
+#: ../libgaim/protocols/irc/msgs.c:381
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Käyttäjät %s: %s"
 
-#: ../src/protocols/irc/msgs.c:509
+#: ../libgaim/protocols/irc/msgs.c:509
 msgid "Time Response"
 msgstr "Vastaus time-komentoon "
 
-#: ../src/protocols/irc/msgs.c:510
+#: ../libgaim/protocols/irc/msgs.c:510
 msgid "The IRC server's local time is:"
 msgstr "IRC palvelimen paikallinen aika:"
 
-#: ../src/protocols/irc/msgs.c:521
+#: ../libgaim/protocols/irc/msgs.c:521
 msgid "No such channel"
 msgstr "Kanavaa ei ole"
 
 #. does this happen?
-#: ../src/protocols/irc/msgs.c:532
+#: ../libgaim/protocols/irc/msgs.c:532
 msgid "no such channel"
 msgstr "kanavaa ei ole"
 
-#: ../src/protocols/irc/msgs.c:535
+#: ../libgaim/protocols/irc/msgs.c:535
 msgid "User is not logged in"
 msgstr "Käyttäjä ei ole kirjautuneena sisään"
 
-#: ../src/protocols/irc/msgs.c:540
+#: ../libgaim/protocols/irc/msgs.c:540
 msgid "No such nick or channel"
 msgstr "Kutsumanimeä/kanavaa ei ole olemassa"
 
-#: ../src/protocols/irc/msgs.c:560
+#: ../libgaim/protocols/irc/msgs.c:560
 msgid "Could not send"
 msgstr "Ei voitu lähettää"
 
-#: ../src/protocols/irc/msgs.c:616
+#: ../libgaim/protocols/irc/msgs.c:616
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Liittyminen kanavalle %s vaatii kutsun."
 
-#: ../src/protocols/irc/msgs.c:617
+#: ../libgaim/protocols/irc/msgs.c:617
 msgid "Invitation only"
 msgstr "Vain kutsu"
 
-#: ../src/protocols/irc/msgs.c:726
+#: ../libgaim/protocols/irc/msgs.c:726
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "%s on poistanut sinut kanavalta: (%s)"
 
 #. Remove user from channel
-#: ../src/protocols/irc/msgs.c:731 ../src/protocols/silc/ops.c:721
+#: ../libgaim/protocols/irc/msgs.c:731 ../libgaim/protocols/silc/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "%s potkaisi (%s)"
 
-#: ../src/protocols/irc/msgs.c:754
+#: ../libgaim/protocols/irc/msgs.c:754
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "moodin (%s %s) asetti %s"
 
-#: ../src/protocols/irc/msgs.c:839 ../src/protocols/irc/msgs.c:840
+#: ../libgaim/protocols/irc/msgs.c:839 ../libgaim/protocols/irc/msgs.c:840
 msgid "Invalid nickname"
 msgstr "Virheellinen lempinimi"
 
-#: ../src/protocols/irc/msgs.c:841
+#: ../libgaim/protocols/irc/msgs.c:841
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -6257,7 +7236,7 @@
 "Palvelin hylkäsi valitsemasi kutsumanimen. Siinä on todennäköisesti "
 "kiellettyjä merkkejä."
 
-#: ../src/protocols/irc/msgs.c:845
+#: ../libgaim/protocols/irc/msgs.c:846
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -6265,51 +7244,51 @@
 "Palvelin hylkäsi valitsemasi tilinimen. Siinä on todennäköisesti kiellettyjä "
 "merkkejä."
 
-#: ../src/protocols/irc/msgs.c:884
+#: ../libgaim/protocols/irc/msgs.c:885
 msgid "Cannot change nick"
 msgstr "Ei kyetty muuttamaan kutsumanimeä"
 
-#: ../src/protocols/irc/msgs.c:884
+#: ../libgaim/protocols/irc/msgs.c:885
 msgid "Could not change nick"
 msgstr "Ei kyetty muuttamaan kutsumanimeä"
 
-#: ../src/protocols/irc/msgs.c:905
+#: ../libgaim/protocols/irc/msgs.c:906
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Olet poistunut kanavalta %s%s"
 
-#: ../src/protocols/irc/msgs.c:947
+#: ../libgaim/protocols/irc/msgs.c:948
 msgid "Error: invalid PONG from server"
 msgstr "Virhe: epäkelpo PONG palvelimelta"
 
-#: ../src/protocols/irc/msgs.c:949
+#: ../libgaim/protocols/irc/msgs.c:950
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING vastaus -- Viive: %lu sekuntia"
 
-#: ../src/protocols/irc/msgs.c:1030
+#: ../libgaim/protocols/irc/msgs.c:1031
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Ei voi liittyä %s:"
 
-#: ../src/protocols/irc/msgs.c:1031 ../src/protocols/silc/ops.c:1128
+#: ../libgaim/protocols/irc/msgs.c:1032 ../libgaim/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Ei voida liittyä kanavalle"
 
-#: ../src/protocols/irc/msgs.c:1065
+#: ../libgaim/protocols/irc/msgs.c:1066
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Kutsumanimi tai kanava ei tilapäisesti ole käytössä."
 
-#: ../src/protocols/irc/msgs.c:1077
+#: ../libgaim/protocols/irc/msgs.c:1078
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops %s:ltä"
 
-#: ../src/protocols/irc/parse.c:114
+#: ../libgaim/protocols/irc/parse.c:116
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;tehtävä toiminta&gt;: Tee toiminta."
 
-#: ../src/protocols/irc/parse.c:115
+#: ../libgaim/protocols/irc/parse.c:117
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -6317,11 +7296,11 @@
 "away [viesti]: Aseta poissaoloviesti, tai jätä viesti tyhjäksi poistaaksesi "
 "poissaolotilan."
 
-#: ../src/protocols/irc/parse.c:116
+#: ../libgaim/protocols/irc/parse.c:118
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: Lähetä komento chanserv:lle"
 
-#: ../src/protocols/irc/parse.c:117
+#: ../libgaim/protocols/irc/parse.c:119
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -6329,7 +7308,7 @@
 "deop &lt;nimi1&gt; [nimi2] ...: Poista kanavaoperaattorin status joltakulta. "
 "Sinun tulee olla kanavaoperaattori tehdäksesi näin."
 
-#: ../src/protocols/irc/parse.c:118
+#: ../libgaim/protocols/irc/parse.c:120
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -6339,7 +7318,7 @@
 "puhumasta jos kanava on moderoitu (+m). Sinun tulee olla kanavaperaattori "
 "tehdäksesi näin."
 
-#: ../src/protocols/irc/parse.c:119
+#: ../libgaim/protocols/irc/parse.c:121
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -6347,7 +7326,7 @@
 "invite &lt;nimi&gt; [huone]: Kutsu joku liittymään kanssasi tietylle tai "
 "tämänhetkiselle kanavalle."
 
-#: ../src/protocols/irc/parse.c:120
+#: ../libgaim/protocols/irc/parse.c:122
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -6355,7 +7334,7 @@
 "j &lt;huone1&gt;[,huone2][,...] [avain1[,avain2][,...]]: Liity yhdelle tai "
 "useammalle kanavalle, antaen myös kanava-avaimen mikäli tarpeen."
 
-#: ../src/protocols/irc/parse.c:121
+#: ../libgaim/protocols/irc/parse.c:123
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -6363,7 +7342,7 @@
 "join &lt;huone1&gt;[,huone2][,...] [avain1[,avain2][,...]]: Liity yhdelle "
 "tai useammalle kanavalle antaen myös kanava-avaimen mikäli tarpeen."
 
-#: ../src/protocols/irc/parse.c:122
+#: ../libgaim/protocols/irc/parse.c:124
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -6371,7 +7350,7 @@
 "kick &lt;nimi&gt; [viesti]: Poista joku kanavalta. Sinun tulee olla "
 "kanavaoperaattori tehdäksesi näin."
 
-#: ../src/protocols/irc/parse.c:123
+#: ../libgaim/protocols/irc/parse.c:125
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -6379,15 +7358,15 @@
 "list: Näytä lista keskusteluhuoneista verkossa. <i>Varoitus, jotkut "
 "palvelimet saattavat katkaista yhteytesi jos teet näin.</i>"
 
-#: ../src/protocols/irc/parse.c:124
+#: ../libgaim/protocols/irc/parse.c:126
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;tehtävä toiminto&gt;: Suorita toiminto."
 
-#: ../src/protocols/irc/parse.c:125
+#: ../libgaim/protocols/irc/parse.c:127
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv: Lähetä komento memoserv:lle"
 
-#: ../src/protocols/irc/parse.c:126
+#: ../libgaim/protocols/irc/parse.c:128
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
@@ -6395,7 +7374,7 @@
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nimi|kanava&gt;: Aseta tai poista kanavan "
 "tai käyttäjän tila."
 
-#: ../src/protocols/irc/parse.c:127
+#: ../libgaim/protocols/irc/parse.c:129
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -6403,19 +7382,20 @@
 "msg &lt;nimi&gt; &lt;viesti&gt;: Lähetä yksityisviesti käyttäjälle "
 "(ollessasi kanavalla)."
 
-#: ../src/protocols/irc/parse.c:128
+#: ../libgaim/protocols/irc/parse.c:130
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [kanava]: Listaa kanavalla olevat käyttäjät."
 
-#: ../src/protocols/irc/parse.c:129 ../src/protocols/jabber/jabber.c:1755
+#: ../libgaim/protocols/irc/parse.c:131
+#: ../libgaim/protocols/jabber/jabber.c:1775
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;uusi nimi&gt;: Muuta nimesi."
 
-#: ../src/protocols/irc/parse.c:130
+#: ../libgaim/protocols/irc/parse.c:132
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: Lähetä komento nickserv:lle"
 
-#: ../src/protocols/irc/parse.c:131
+#: ../libgaim/protocols/irc/parse.c:133
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -6423,7 +7403,7 @@
 "op &lt;nimi1&gt; [nimi2] ...: Anna kanavaoperaattorin status jollekulle. "
 "Sinun tulee olla kanavaoperaattori tehdäksesi näin."
 
-#: ../src/protocols/irc/parse.c:132
+#: ../libgaim/protocols/irc/parse.c:134
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -6431,11 +7411,11 @@
 "operwall &lt;viesti&gt;: Jos et tiedä mikä tämä on, sinun ei todennäköisesti "
 "tule käyttää tätä."
 
-#: ../src/protocols/irc/parse.c:133
+#: ../libgaim/protocols/irc/parse.c:135
 msgid "operserv: Send a command to operserv"
 msgstr "operserv: Lähetä komento operserv:lle"
 
-#: ../src/protocols/irc/parse.c:134
+#: ../libgaim/protocols/irc/parse.c:136
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -6443,7 +7423,7 @@
 "part [huone] [viesti]: Poistu tämänhetkiseltä kanavalta tai tietyltä "
 "kanavalta valinnaisen viestin kanssa."
 
-#: ../src/protocols/irc/parse.c:135
+#: ../libgaim/protocols/irc/parse.c:137
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -6451,7 +7431,7 @@
 "ping [nimi]: Kysyy kuinka paljon viivettä käyttäjällä(tai palvelimella jos "
 "ei käyttäjää annettu) on."
 
-#: ../src/protocols/irc/parse.c:136
+#: ../libgaim/protocols/irc/parse.c:138
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -6459,15 +7439,15 @@
 "query &lt;nimi&gt; &lt;viesti&gt;: Lähetä yksityisviesti käyttäjälle (kun "
 "olet kanavalla)."
 
-#: ../src/protocols/irc/parse.c:137
+#: ../libgaim/protocols/irc/parse.c:139
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [viesti]: Katkaise yhteys palvelimelle + valinnainen viesti."
 
-#: ../src/protocols/irc/parse.c:138
+#: ../libgaim/protocols/irc/parse.c:140
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]: Lähetä \"raaka\" komento palvelimelle."
 
-#: ../src/protocols/irc/parse.c:139
+#: ../libgaim/protocols/irc/parse.c:141
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -6475,23 +7455,23 @@
 "remove &lt;nimi&gt; [viesti]: Poista joku huoneesta. Sinun tulee olla "
 "kanavaoperaattori tehdäksesi näin."
 
-#: ../src/protocols/irc/parse.c:140
+#: ../libgaim/protocols/irc/parse.c:142
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Näyttää paikallisen ajan IRC palvelimella."
 
-#: ../src/protocols/irc/parse.c:141
+#: ../libgaim/protocols/irc/parse.c:143
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [uusi aihe]: Näytä tai vaihda kanavan aihetta."
 
-#: ../src/protocols/irc/parse.c:142
+#: ../libgaim/protocols/irc/parse.c:144
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr "umode &lt;nimi1&gt; [nimi2] ...: Aseta tai poista käyttäjän tila."
 
-#: ../src/protocols/irc/parse.c:143
+#: ../libgaim/protocols/irc/parse.c:145
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [nimi]: lähetä CTCP VERSION -pyyntö käyttäjälle"
 
-#: ../src/protocols/irc/parse.c:144
+#: ../libgaim/protocols/irc/parse.c:146
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -6499,7 +7479,7 @@
 "voice &lt;nimi1&gt; [nimi2] ...: Aseta kanavan ääni-tila jollekulle. Sinun "
 "tulee olla kanavaoperaattori tehdäksesi näin."
 
-#: ../src/protocols/irc/parse.c:145
+#: ../libgaim/protocols/irc/parse.c:147
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -6507,58 +7487,54 @@
 "wallops &lt;viesti&gt;: Jos et tiedä mikä tämä on, sinun ei todennäköisesti "
 "tulee käyttää sitä."
 
-#: ../src/protocols/irc/parse.c:146
+#: ../libgaim/protocols/irc/parse.c:148
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [palvelin] &lt;nimi&gt;: Hae tietoja käyttäjästä."
 
-#: ../src/protocols/irc/parse.c:440
+#: ../libgaim/protocols/irc/parse.c:442
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Vastausaika %s:ltä: %lu sekuntia"
 
-#: ../src/protocols/irc/parse.c:441
+#: ../libgaim/protocols/irc/parse.c:443
 msgid "PONG"
 msgstr "PONG"
 
-#: ../src/protocols/irc/parse.c:441
+#: ../libgaim/protocols/irc/parse.c:443
 msgid "CTCP PING reply"
 msgstr "CTCP PING:n vastaus"
 
-#: ../src/protocols/irc/parse.c:543 ../src/protocols/irc/parse.c:547
-#: ../src/protocols/toc/toc.c:190 ../src/protocols/toc/toc.c:688
-#: ../src/protocols/toc/toc.c:704 ../src/protocols/toc/toc.c:780
+#: ../libgaim/protocols/irc/parse.c:548 ../libgaim/protocols/irc/parse.c:552
+#: ../libgaim/protocols/toc/toc.c:191 ../libgaim/protocols/toc/toc.c:694
+#: ../libgaim/protocols/toc/toc.c:710 ../libgaim/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "Yhteys katkennut."
 
-#: ../src/protocols/jabber/auth.c:51
-msgid ""
-"Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
-"account properties"
-msgstr ""
-"Palvelin vaatii TLS/SSL kirjautumiseen. Valitse \"Käytä TLS jos mahdollista"
-"\" käyttäjätilit-valikosta."
-
-#: ../src/protocols/jabber/auth.c:53
+#: ../libgaim/protocols/jabber/auth.c:49
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "Palvelin vaatii TSL/SSL-tuen kirjautumiseen. TLS/SSL tukea ei löydy."
 
-#: ../src/protocols/jabber/auth.c:114
+#: ../libgaim/protocols/jabber/auth.c:109
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "Palvelin vaatii salaamattoman tunnistautumisen salaamattoman yhteyden yli"
 
-#: ../src/protocols/jabber/auth.c:234
+#: ../libgaim/protocols/jabber/auth.c:229
 msgid "Server couldn't authenticate you without a password"
 msgstr "Palvelin ei voinut todentaa sinua ilman salasanaa"
 
-#: ../src/protocols/jabber/auth.c:237 ../src/protocols/jabber/auth.c:238
-#: ../src/protocols/jabber/auth.c:398 ../src/protocols/jabber/auth.c:399
-#: ../src/protocols/jabber/auth.c:480 ../src/protocols/jabber/auth.c:481
+#: ../libgaim/protocols/jabber/auth.c:232
+#: ../libgaim/protocols/jabber/auth.c:233
+#: ../libgaim/protocols/jabber/auth.c:401
+#: ../libgaim/protocols/jabber/auth.c:402
+#: ../libgaim/protocols/jabber/auth.c:483
+#: ../libgaim/protocols/jabber/auth.c:484
 msgid "Plaintext Authentication"
 msgstr "Tekstipohjainen tunnistus"
 
-#: ../src/protocols/jabber/auth.c:239 ../src/protocols/jabber/auth.c:400
-#: ../src/protocols/jabber/auth.c:482
+#: ../libgaim/protocols/jabber/auth.c:234
+#: ../libgaim/protocols/jabber/auth.c:403
+#: ../libgaim/protocols/jabber/auth.c:485
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -6566,104 +7542,126 @@
 "Tämä palvelin vaatii tekstipohjaisen tunnistautumisen salaamattoman yhteyden "
 "yli. Sallitaanko tämä ja jatketaan?"
 
-#: ../src/protocols/jabber/auth.c:245 ../src/protocols/jabber/auth.c:408
-#: ../src/protocols/jabber/auth.c:490
+#: ../libgaim/protocols/jabber/auth.c:240
+#: ../libgaim/protocols/jabber/auth.c:411
+#: ../libgaim/protocols/jabber/auth.c:493
 msgid "Server does not use any supported authentication method"
 msgstr "Palvelin ei käytä mitään tuettuista tunnistautumismenetelmistä"
 
 #. This should never happen!
-#: ../src/protocols/jabber/auth.c:321 ../src/protocols/jabber/auth.c:443
-#: ../src/protocols/jabber/auth.c:611 ../src/protocols/jabber/auth.c:744
-#: ../src/protocols/jabber/auth.c:756 ../src/protocols/jabber/auth.c:775
-#: ../src/protocols/jabber/jabber.c:110
+#: ../libgaim/protocols/jabber/auth.c:324
+#: ../libgaim/protocols/jabber/auth.c:446
+#: ../libgaim/protocols/jabber/auth.c:614
+#: ../libgaim/protocols/jabber/auth.c:747
+#: ../libgaim/protocols/jabber/auth.c:759
+#: ../libgaim/protocols/jabber/auth.c:778
+#: ../libgaim/protocols/jabber/jabber.c:112
 msgid "Invalid response from server."
 msgstr "Kelvoton vastaus palvelimelta."
 
-#: ../src/protocols/jabber/auth.c:632
+#: ../libgaim/protocols/jabber/auth.c:635
 msgid "Invalid challenge from server"
 msgstr "Virheellinen tunnistushaaste palvelimelta"
 
-#: ../src/protocols/jabber/auth.c:719
+#: ../libgaim/protocols/jabber/auth.c:722
 msgid "SASL error"
 msgstr "SASL-virhe"
 
-#: ../src/protocols/jabber/buddy.c:268 ../src/protocols/jabber/buddy.c:772
-#: ../src/protocols/silc/ops.c:1020
+#: ../libgaim/protocols/jabber/buddy.c:268
+#: ../libgaim/protocols/jabber/buddy.c:769
+#: ../libgaim/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "Koko nimi"
 
-#: ../src/protocols/jabber/buddy.c:269 ../src/protocols/jabber/buddy.c:785
-#: ../src/protocols/silc/ops.c:1032
+#: ../libgaim/protocols/jabber/buddy.c:269
+#: ../libgaim/protocols/jabber/buddy.c:782
+#: ../libgaim/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "Sukunimi"
 
-#: ../src/protocols/jabber/buddy.c:270 ../src/protocols/jabber/buddy.c:789
+#: ../libgaim/protocols/jabber/buddy.c:270
+#: ../libgaim/protocols/jabber/buddy.c:786
 msgid "Given Name"
 msgstr "Etunimi"
 
-#: ../src/protocols/jabber/buddy.c:272 ../src/protocols/jabber/jabber.c:821
+#: ../libgaim/protocols/jabber/buddy.c:272
+#: ../libgaim/protocols/jabber/jabber.c:835
 msgid "URL"
 msgstr "URL"
 
-#: ../src/protocols/jabber/buddy.c:273 ../src/protocols/jabber/buddy.c:841
+#: ../libgaim/protocols/jabber/buddy.c:273
+#: ../libgaim/protocols/jabber/buddy.c:838
 msgid "Street Address"
 msgstr "Katuosoite"
 
-#: ../src/protocols/jabber/buddy.c:274 ../src/protocols/jabber/buddy.c:837
+#: ../libgaim/protocols/jabber/buddy.c:274
+#: ../libgaim/protocols/jabber/buddy.c:834
 msgid "Extended Address"
 msgstr "Laajennettu osoite"
 
-#: ../src/protocols/jabber/buddy.c:275 ../src/protocols/jabber/buddy.c:845
+#: ../libgaim/protocols/jabber/buddy.c:275
+#: ../libgaim/protocols/jabber/buddy.c:842
 msgid "Locality"
 msgstr "Alue"
 
-#: ../src/protocols/jabber/buddy.c:276 ../src/protocols/jabber/buddy.c:849
+#: ../libgaim/protocols/jabber/buddy.c:276
+#: ../libgaim/protocols/jabber/buddy.c:846
 msgid "Region"
 msgstr "Seutu"
 
-#: ../src/protocols/jabber/buddy.c:277 ../src/protocols/jabber/buddy.c:853
+#: ../libgaim/protocols/jabber/buddy.c:277
+#: ../libgaim/protocols/jabber/buddy.c:850
 msgid "Postal Code"
 msgstr "Postinumero"
 
-#: ../src/protocols/jabber/buddy.c:278 ../src/protocols/jabber/buddy.c:858
-#: ../src/protocols/silc/silc.c:945
+#: ../libgaim/protocols/jabber/buddy.c:278
+#: ../libgaim/protocols/jabber/buddy.c:855
+#: ../libgaim/protocols/silc/silc.c:943
 msgid "Country"
 msgstr "Maa"
 
-#: ../src/protocols/jabber/buddy.c:279 ../src/protocols/jabber/buddy.c:869
-#: ../src/protocols/jabber/buddy.c:876
+#: ../libgaim/protocols/jabber/buddy.c:279
+#: ../libgaim/protocols/jabber/buddy.c:866
+#: ../libgaim/protocols/jabber/buddy.c:873
 msgid "Telephone"
 msgstr "Puhelin"
 
-#: ../src/protocols/jabber/buddy.c:280 ../src/protocols/jabber/buddy.c:887
-#: ../src/protocols/jabber/buddy.c:895 ../src/protocols/jabber/buddy.c:1524
-#: ../src/protocols/silc/ops.c:1075 ../src/protocols/silc/util.c:526
-#: ../src/protocols/yahoo/yahoo_profile.c:1036
+#: ../libgaim/protocols/jabber/buddy.c:280
+#: ../libgaim/protocols/jabber/buddy.c:884
+#: ../libgaim/protocols/jabber/buddy.c:892
+#: ../libgaim/protocols/jabber/buddy.c:1528
+#: ../libgaim/protocols/silc/ops.c:1075 ../libgaim/protocols/silc/util.c:553
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1050
 msgid "E-Mail"
 msgstr "Sähköposti"
 
-#: ../src/protocols/jabber/buddy.c:281 ../src/protocols/jabber/buddy.c:910
+#: ../libgaim/protocols/jabber/buddy.c:281
+#: ../libgaim/protocols/jabber/buddy.c:907
 msgid "Organization Name"
 msgstr "Organisaation nimi"
 
-#: ../src/protocols/jabber/buddy.c:282 ../src/protocols/jabber/buddy.c:914
+#: ../libgaim/protocols/jabber/buddy.c:282
+#: ../libgaim/protocols/jabber/buddy.c:911
 msgid "Organization Unit"
 msgstr "Organisaatioyksikkö"
 
-#: ../src/protocols/jabber/buddy.c:284 ../src/protocols/jabber/buddy.c:923
+#: ../libgaim/protocols/jabber/buddy.c:284
+#: ../libgaim/protocols/jabber/buddy.c:920
 msgid "Role"
 msgstr "Asema"
 
-#: ../src/protocols/jabber/buddy.c:285 ../src/protocols/jabber/buddy.c:806
-#: ../src/protocols/msn/msn.c:1591 ../src/protocols/oscar/oscar.c:3687
+#: ../libgaim/protocols/jabber/buddy.c:285
+#: ../libgaim/protocols/jabber/buddy.c:803 ../libgaim/protocols/msn/msn.c:1595
+#: ../libgaim/protocols/oscar/oscar.c:3663
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
-#: ../src/protocols/jabber/buddy.c:588 ../src/protocols/jabber/buddy.c:589
+#: ../libgaim/protocols/jabber/buddy.c:582
+#: ../libgaim/protocols/jabber/buddy.c:583
 msgid "Edit Jabber vCard"
 msgstr "Muokkaa Jabberin vCardia"
 
-#: ../src/protocols/jabber/buddy.c:590
+#: ../libgaim/protocols/jabber/buddy.c:584
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -6671,99 +7669,116 @@
 "Kaikki allaolevat kentät ovat valinnaisia. Kirjoita vain tiedot, joiden "
 "luovuttamista pidät sopivana."
 
-#: ../src/protocols/jabber/buddy.c:646 ../src/protocols/jabber/buddy.c:677
+#: ../libgaim/protocols/jabber/buddy.c:640
 msgid "Client:"
 msgstr "Asiakasohjelma:"
 
-#: ../src/protocols/jabber/buddy.c:650 ../src/protocols/jabber/buddy.c:681
+#: ../libgaim/protocols/jabber/buddy.c:644
+#: ../libgaim/protocols/jabber/buddy.c:677
 msgid "Operating System"
 msgstr "Käyttöjärjestelmä"
 
-#: ../src/protocols/jabber/buddy.c:660 ../src/protocols/jabber/jabber.c:1920
+#: ../libgaim/protocols/jabber/buddy.c:654
+#: ../libgaim/protocols/jabber/jabber.c:1973
 msgid "Resource"
 msgstr "Lähde"
 
-#: ../src/protocols/jabber/buddy.c:793 ../src/protocols/silc/ops.c:1028
+#: ../libgaim/protocols/jabber/buddy.c:656
+#: ../libgaim/protocols/jabber/jabber.c:1213
+#: ../libgaim/protocols/jabber/jabber.c:1223
+#: ../libgaim/protocols/jabber/jabber.c:1233
+#: ../libgaim/protocols/jabber/jabber.c:1243
+#: ../libgaim/protocols/jabber/jabber.c:1253
+msgid "Priority"
+msgstr "Tärkeys"
+
+#: ../libgaim/protocols/jabber/buddy.c:673
+msgid "Client"
+msgstr "Asiakasohjelma"
+
+#: ../libgaim/protocols/jabber/buddy.c:790
+#: ../libgaim/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "Muut etunimet"
 
-#: ../src/protocols/jabber/buddy.c:826 ../src/protocols/jabber/jabber.c:796
-#: ../src/protocols/oscar/oscar.c:3706 ../src/protocols/oscar/oscar.c:3714
-#: ../src/protocols/silc/ops.c:1064
+#: ../libgaim/protocols/jabber/buddy.c:823
+#: ../libgaim/protocols/jabber/jabber.c:810
+#: ../libgaim/protocols/oscar/oscar.c:3682
+#: ../libgaim/protocols/oscar/oscar.c:3690
+#: ../libgaim/protocols/qq/buddy_info.c:54
+#: ../libgaim/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "Osoite"
 
-#: ../src/protocols/jabber/buddy.c:833
+#: ../libgaim/protocols/jabber/buddy.c:830
 msgid "P.O. Box"
 msgstr "Postilokero"
 
-#: ../src/protocols/jabber/buddy.c:947
+#: ../libgaim/protocols/jabber/buddy.c:944
 msgid "Photo"
 msgstr "Valokuva"
 
-#: ../src/protocols/jabber/buddy.c:947
+#: ../libgaim/protocols/jabber/buddy.c:944
 msgid "Logo"
 msgstr "Logo"
 
-#: ../src/protocols/jabber/buddy.c:1304
+#: ../libgaim/protocols/jabber/buddy.c:1308
 msgid "Un-hide From"
 msgstr "\"Tule esiin\""
 
-#: ../src/protocols/jabber/buddy.c:1308
+#: ../libgaim/protocols/jabber/buddy.c:1312
 msgid "Temporarily Hide From"
 msgstr "Piiloudu väliaikaisesti tuttavalta"
 
 #. && NOT ME
-#: ../src/protocols/jabber/buddy.c:1316
+#: ../libgaim/protocols/jabber/buddy.c:1320
 msgid "Cancel Presence Notification"
 msgstr "Peru paikallaoloilmoitus"
 
-#: ../src/protocols/jabber/buddy.c:1323
+#: ../libgaim/protocols/jabber/buddy.c:1327
 msgid "(Re-)Request authorization"
 msgstr "Pyydä valtuutusta uudelleen"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../src/protocols/jabber/buddy.c:1332
+#: ../libgaim/protocols/jabber/buddy.c:1336
 msgid "Unsubscribe"
 msgstr "Poista listalta"
 
-#: ../src/protocols/jabber/buddy.c:1359 ../src/protocols/jabber/chat.c:675
-#: ../src/protocols/jabber/chat.c:686 ../src/protocols/jabber/jabber.c:1177
-#: ../src/protocols/silc/ops.c:1449
-msgid "Error"
-msgstr "Virhe"
-
-#: ../src/protocols/jabber/buddy.c:1365 ../src/protocols/jabber/jabber.c:1202
+#: ../libgaim/protocols/jabber/buddy.c:1369
+#: ../libgaim/protocols/jabber/jabber.c:1222
 msgid "Chatty"
 msgstr "Juttelutuulella"
 
-#: ../src/protocols/jabber/buddy.c:1369 ../src/status.c:159
+#: ../libgaim/protocols/jabber/buddy.c:1373 ../libgaim/status.c:159
 msgid "Extended Away"
 msgstr "Pidennetty poissaolo"
 
-#: ../src/protocols/jabber/buddy.c:1371 ../src/protocols/jabber/jabber.c:1232
-#: ../src/protocols/oscar/oscar.c:713 ../src/protocols/oscar/oscar.c:5665
-#: ../src/protocols/sametime/sametime.c:3277
+#: ../libgaim/protocols/jabber/buddy.c:1375
+#: ../libgaim/protocols/jabber/jabber.c:1252
+#: ../libgaim/protocols/oscar/oscar.c:688
+#: ../libgaim/protocols/oscar/oscar.c:5654
+#: ../libgaim/protocols/sametime/sametime.c:3273
 msgid "Do Not Disturb"
 msgstr "Älä häiritse"
 
-#: ../src/protocols/jabber/buddy.c:1516
+#: ../libgaim/protocols/jabber/buddy.c:1520
 msgid "JID"
 msgstr "JID"
 
-#: ../src/protocols/jabber/buddy.c:1520 ../src/protocols/jabber/buddy.c:1699
-#: ../src/protocols/oscar/oscar.c:3655
+#: ../libgaim/protocols/jabber/buddy.c:1524
+#: ../libgaim/protocols/jabber/buddy.c:1703
+#: ../libgaim/protocols/oscar/oscar.c:3631
 msgid "Last Name"
 msgstr "Sukunimi"
 
-#: ../src/protocols/jabber/buddy.c:1552
+#: ../libgaim/protocols/jabber/buddy.c:1556
 msgid "The following are the results of your search"
 msgstr "Hakutulokset"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../src/protocols/jabber/buddy.c:1627
+#: ../libgaim/protocols/jabber/buddy.c:1631
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -6771,538 +7786,561 @@
 "Etsi henkilöä syöttämällä hakukriteerit kenttiin. Huom: jokainen kenttä "
 "tukee jokerimerkkejä (%)"
 
-#: ../src/protocols/jabber/buddy.c:1647
+#: ../libgaim/protocols/jabber/buddy.c:1651
 msgid "Directory Query Failed"
 msgstr "Hakemistohaku epäonnistui"
 
-#: ../src/protocols/jabber/buddy.c:1648
+#: ../libgaim/protocols/jabber/buddy.c:1652
 msgid "Could not query the directory server."
 msgstr "Ei voitu hakea hakemistopalvelimelta."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../src/protocols/jabber/buddy.c:1682
+#: ../libgaim/protocols/jabber/buddy.c:1686
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Palvelimen ohjeet: %s"
 
-#: ../src/protocols/jabber/buddy.c:1689
+#: ../libgaim/protocols/jabber/buddy.c:1693
 msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr "Täytä yksi tai useampia kentistä etsiäksesi Jabber-käyttäjiä."
 
-#: ../src/protocols/jabber/buddy.c:1709 ../src/protocols/novell/novell.c:1488
-#: ../src/protocols/oscar/oscar.c:3657 ../src/protocols/oscar/oscar.c:3664
+#: ../libgaim/protocols/jabber/buddy.c:1713
+#: ../libgaim/protocols/novell/novell.c:1488
+#: ../libgaim/protocols/oscar/oscar.c:3633
+#: ../libgaim/protocols/oscar/oscar.c:3640
 msgid "E-Mail Address"
 msgstr "Sähköpostiosoite"
 
-#: ../src/protocols/jabber/buddy.c:1718 ../src/protocols/jabber/buddy.c:1719
+#: ../libgaim/protocols/jabber/buddy.c:1722
+#: ../libgaim/protocols/jabber/buddy.c:1723
 msgid "Search for Jabber users"
 msgstr "Etsi Jabber-käyttäjiä"
 
-#: ../src/protocols/jabber/buddy.c:1733
+#: ../libgaim/protocols/jabber/buddy.c:1737
 msgid "Invalid Directory"
 msgstr "Virheellinen kansio"
 
-#: ../src/protocols/jabber/buddy.c:1750
+#: ../libgaim/protocols/jabber/buddy.c:1754
 msgid "Enter a User Directory"
 msgstr "Syötä käyttäjähakemisto"
 
-#: ../src/protocols/jabber/buddy.c:1751
+#: ../libgaim/protocols/jabber/buddy.c:1755
 msgid "Select a user directory to search"
 msgstr "Valitse käyttäjähakemisto, josta haetaan"
 
-#: ../src/protocols/jabber/buddy.c:1754
+#: ../libgaim/protocols/jabber/buddy.c:1758
 msgid "Search Directory"
 msgstr "Etsi hakemistosta"
 
-#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:5150
-#: ../src/protocols/yahoo/yahoochat.c:999
+#: ../libgaim/protocols/jabber/chat.c:41
+#: ../libgaim/protocols/oscar/oscar.c:5137
+#: ../libgaim/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "_Huone:"
 
-#: ../src/protocols/jabber/chat.c:47
+#: ../libgaim/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "_Palvelin:"
 
-#: ../src/protocols/jabber/chat.c:53
+#: ../libgaim/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "_Keskustelunimi:"
 
-#: ../src/protocols/jabber/chat.c:223
+#: ../libgaim/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s ei ole kelvollinen keskusteluhuoneen nimi"
 
-#: ../src/protocols/jabber/chat.c:224
+#: ../libgaim/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "Epäkelpo keskusteluhuoneen nimi"
 
-#: ../src/protocols/jabber/chat.c:229
+#: ../libgaim/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s ei ole kelvollinen palvelinnimi."
 
-#: ../src/protocols/jabber/chat.c:230 ../src/protocols/jabber/chat.c:231
+#: ../libgaim/protocols/jabber/chat.c:230
+#: ../libgaim/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "Palvelimen nimi ei kelpaa"
 
-#: ../src/protocols/jabber/chat.c:235
+#: ../libgaim/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s ei ole kelvollinen keskustelunimi (room handle)"
 
-#: ../src/protocols/jabber/chat.c:236 ../src/protocols/jabber/chat.c:237
+#: ../libgaim/protocols/jabber/chat.c:236
+#: ../libgaim/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "Keskustelunimi ei kelpaa"
 
-#: ../src/protocols/jabber/chat.c:395
+#: ../libgaim/protocols/jabber/chat.c:396
 msgid "Configuration error"
 msgstr "Konfigurointivirhe"
 
-#: ../src/protocols/jabber/chat.c:404 ../src/protocols/jabber/chat.c:547
+#: ../libgaim/protocols/jabber/chat.c:405
+#: ../libgaim/protocols/jabber/chat.c:548
 msgid "Unable to configure"
 msgstr "Ei voida konfiguroida"
 
-#: ../src/protocols/jabber/chat.c:419
+#: ../libgaim/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "Huoneen konfigurointivirhe"
 
-#: ../src/protocols/jabber/chat.c:420
+#: ../libgaim/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "Tätä huonetta ei voida konfiguroida"
 
-#: ../src/protocols/jabber/chat.c:469 ../src/protocols/jabber/chat.c:538
+#: ../libgaim/protocols/jabber/chat.c:470
+#: ../libgaim/protocols/jabber/chat.c:539
 msgid "Registration error"
 msgstr "Rekisteröintivirhe"
 
-#: ../src/protocols/jabber/chat.c:626
+#: ../libgaim/protocols/jabber/chat.c:627
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Kutsumanimeä ei voi muuttaa muissa kuin MUC-keskusteluhuoneissa"
 
-#: ../src/protocols/jabber/chat.c:676 ../src/protocols/jabber/chat.c:687
-#: ../src/protocols/silc/ops.c:1449
+#: ../libgaim/protocols/jabber/chat.c:678
+#: ../libgaim/protocols/jabber/chat.c:689 ../libgaim/protocols/silc/ops.c:1449
 msgid "Error retrieving room list"
 msgstr "Virhe haettaessa huonelistaa"
 
-#: ../src/protocols/jabber/chat.c:735
+#: ../libgaim/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "Palvelin ei kelpaa"
 
-#: ../src/protocols/jabber/chat.c:773
+#: ../libgaim/protocols/jabber/chat.c:775
 msgid "Enter a Conference Server"
 msgstr "Syötä konferenssipalvelin"
 
-#: ../src/protocols/jabber/chat.c:774
+#: ../libgaim/protocols/jabber/chat.c:776
 msgid "Select a conference server to query"
 msgstr "Valitse konferenssipalvelin"
 
-#: ../src/protocols/jabber/chat.c:777
+#: ../libgaim/protocols/jabber/chat.c:779
 msgid "Find Rooms"
 msgstr "Etsi huoneita"
 
-#: ../src/protocols/jabber/jabber.c:79
+#: ../libgaim/protocols/jabber/jabber.c:81
 msgid "Error initializing session"
 msgstr "Virhe istunnon alustuksessa"
 
-#: ../src/protocols/jabber/jabber.c:232 ../src/protocols/jabber/jabber.c:281
-#: ../src/protocols/jabber/jabber.c:309
+#: ../libgaim/protocols/jabber/jabber.c:240
+#: ../libgaim/protocols/jabber/jabber.c:291
+#: ../libgaim/protocols/jabber/jabber.c:319
 msgid "Write error"
 msgstr "Virhe kirjoituksessa"
 
-#: ../src/protocols/jabber/jabber.c:362 ../src/protocols/jabber/jabber.c:395
+#: ../libgaim/protocols/jabber/jabber.c:387
+#: ../libgaim/protocols/jabber/jabber.c:424
 msgid "Read Error"
 msgstr "Epäkelpo käyttäjä"
 
-#: ../src/protocols/jabber/jabber.c:480 ../src/protocols/jabber/jabber.c:915
+#: ../libgaim/protocols/jabber/jabber.c:497
+#: ../libgaim/protocols/jabber/jabber.c:930
 msgid "Unable to create socket"
 msgstr "Pistokkeen luonti epäonnistui"
 
-#: ../src/protocols/jabber/jabber.c:536 ../src/protocols/jabber/jabber.c:873
+#: ../libgaim/protocols/jabber/jabber.c:545
+#: ../libgaim/protocols/jabber/jabber.c:888
 msgid "Invalid Jabber ID"
 msgstr "Epäkelpo Jabber ID"
 
-#: ../src/protocols/jabber/jabber.c:606
+#: ../libgaim/protocols/jabber/jabber.c:616
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s:n rekisteröinti onnistui"
 
-#: ../src/protocols/jabber/jabber.c:608 ../src/protocols/jabber/jabber.c:609
+#: ../libgaim/protocols/jabber/jabber.c:618
+#: ../libgaim/protocols/jabber/jabber.c:619
 msgid "Registration Successful"
 msgstr "Rekisteröinti onnistui"
 
-#: ../src/protocols/jabber/jabber.c:615 ../src/protocols/jabber/jabber.c:1468
+#: ../libgaim/protocols/jabber/jabber.c:625
+#: ../libgaim/protocols/jabber/jabber.c:1488
 msgid "Unknown Error"
 msgstr "Tuntematon virhe"
 
-#: ../src/protocols/jabber/jabber.c:617 ../src/protocols/jabber/jabber.c:618
+#: ../libgaim/protocols/jabber/jabber.c:627
+#: ../libgaim/protocols/jabber/jabber.c:628
 msgid "Registration Failed"
 msgstr "Rekisteröinti epäonnistui"
 
-#: ../src/protocols/jabber/jabber.c:729 ../src/protocols/jabber/jabber.c:730
+#: ../libgaim/protocols/jabber/jabber.c:743
+#: ../libgaim/protocols/jabber/jabber.c:744
 msgid "Already Registered"
 msgstr "Valmiiksi rekisteröity"
 
-#: ../src/protocols/jabber/jabber.c:806 ../src/protocols/oscar/oscar.c:3708
-#: ../src/protocols/oscar/oscar.c:3716
+#: ../libgaim/protocols/jabber/jabber.c:820
+#: ../libgaim/protocols/oscar/oscar.c:3684
+#: ../libgaim/protocols/oscar/oscar.c:3692
 msgid "State"
 msgstr "Lääni"
 
-#: ../src/protocols/jabber/jabber.c:811
+#: ../libgaim/protocols/jabber/jabber.c:825
 msgid "Postal code"
 msgstr "Postinumero"
 
-#: ../src/protocols/jabber/jabber.c:816 ../src/protocols/silc/ops.c:1069
-#: ../src/protocols/silc/silc.c:703 ../src/protocols/silc/util.c:528
+#: ../libgaim/protocols/jabber/jabber.c:830
+#: ../libgaim/protocols/silc/ops.c:1069 ../libgaim/protocols/silc/silc.c:701
+#: ../libgaim/protocols/silc/util.c:555
 msgid "Phone"
 msgstr "Puhelin"
 
-#: ../src/protocols/jabber/jabber.c:826
+#: ../libgaim/protocols/jabber/jabber.c:840
 msgid "Date"
 msgstr "Päiväys"
 
-#: ../src/protocols/jabber/jabber.c:834
+#: ../libgaim/protocols/jabber/jabber.c:848
 msgid "Please fill out the information below to register your new account."
 msgstr "Syötä alla olevat tiedot rekisteröidäksesi uuden tilin."
 
-#: ../src/protocols/jabber/jabber.c:837 ../src/protocols/jabber/jabber.c:838
+#: ../libgaim/protocols/jabber/jabber.c:851
+#: ../libgaim/protocols/jabber/jabber.c:852
 msgid "Register New Jabber Account"
 msgstr "Rekisteröi uusi Jabber-tili"
 
-#: ../src/protocols/jabber/jabber.c:996
+#: ../libgaim/protocols/jabber/jabber.c:1013
 msgid "Initializing Stream"
 msgstr "Alustetaan datavirtaa"
 
-#: ../src/protocols/jabber/jabber.c:1001 ../src/protocols/msn/session.c:350
+#: ../libgaim/protocols/jabber/jabber.c:1018
+#: ../libgaim/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "Todennetaan"
 
-#: ../src/protocols/jabber/jabber.c:1010
+#: ../libgaim/protocols/jabber/jabber.c:1027
 msgid "Re-initializing Stream"
 msgstr "Uudelleenalustetaan datavirtaa"
 
-#: ../src/protocols/jabber/jabber.c:1081 ../src/protocols/jabber/jabber.c:1446
-#: ../src/protocols/jabber/jabber.c:1487 ../src/protocols/jabber/jabber.c:1521
-#: ../src/protocols/oscar/oscar.c:791 ../src/protocols/oscar/oscar.c:5456
+#: ../libgaim/protocols/jabber/jabber.c:1101
+#: ../libgaim/protocols/jabber/jabber.c:1466
+#: ../libgaim/protocols/jabber/jabber.c:1507
+#: ../libgaim/protocols/jabber/jabber.c:1541
+#: ../libgaim/protocols/oscar/oscar.c:766
+#: ../libgaim/protocols/oscar/oscar.c:5443
 msgid "Not Authorized"
 msgstr "Ei valtuuksia"
 
-#: ../src/protocols/jabber/jabber.c:1123
+#: ../libgaim/protocols/jabber/jabber.c:1143
 msgid "Both"
 msgstr "molemmille"
 
-#: ../src/protocols/jabber/jabber.c:1125
+#: ../libgaim/protocols/jabber/jabber.c:1145
 msgid "From (To pending)"
 msgstr "vain sinulle (odottaa lupaa)"
 
-#: ../src/protocols/jabber/jabber.c:1130
+#: ../libgaim/protocols/jabber/jabber.c:1150
 msgid "To"
 msgstr "vain sinulta"
 
-#: ../src/protocols/jabber/jabber.c:1132
+#: ../libgaim/protocols/jabber/jabber.c:1152
 msgid "None (To pending)"
 msgstr "Ei mitään (odottaa lupaa)"
 
-#: ../src/protocols/jabber/jabber.c:1136
+#: ../libgaim/protocols/jabber/jabber.c:1156
 msgid "Subscription"
 msgstr "Tilailmoitus"
 
-#: ../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:1233
-msgid "Priority"
-msgstr "Tärkeys"
-
-#: ../src/protocols/jabber/jabber.c:1262
+#: ../libgaim/protocols/jabber/jabber.c:1282
 msgid "Password Changed"
 msgstr "Salasana muutettu"
 
-#: ../src/protocols/jabber/jabber.c:1263
+#: ../libgaim/protocols/jabber/jabber.c:1283
 msgid "Your password has been changed."
 msgstr "Salasana vaihdettu"
 
-#: ../src/protocols/jabber/jabber.c:1267 ../src/protocols/jabber/jabber.c:1268
+#: ../libgaim/protocols/jabber/jabber.c:1287
+#: ../libgaim/protocols/jabber/jabber.c:1288
 msgid "Error changing password"
 msgstr "Virhe vaihdettaessa salasanaa"
 
-#: ../src/protocols/jabber/jabber.c:1324
+#: ../libgaim/protocols/jabber/jabber.c:1344
 msgid "Password (again)"
 msgstr "Salasana (uudelleen)"
 
-#: ../src/protocols/jabber/jabber.c:1329 ../src/protocols/jabber/jabber.c:1330
+#: ../libgaim/protocols/jabber/jabber.c:1349
+#: ../libgaim/protocols/jabber/jabber.c:1350
 msgid "Change Jabber Password"
 msgstr "Vaihda Jabber-salasana"
 
-#: ../src/protocols/jabber/jabber.c:1330
+#: ../libgaim/protocols/jabber/jabber.c:1350
 msgid "Please enter your new password"
 msgstr "Anna uusi salasanasi"
 
-#: ../src/protocols/jabber/jabber.c:1340 ../src/protocols/oscar/oscar.c:6248
-#: ../src/protocols/silc/silc.c:1025
+#: ../libgaim/protocols/jabber/jabber.c:1360
+#: ../libgaim/protocols/oscar/oscar.c:6245
+#: ../libgaim/protocols/silc/silc.c:1023
 msgid "Set User Info..."
 msgstr "Aseta käyttäjätiedot..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../src/protocols/jabber/jabber.c:1345 ../src/protocols/oscar/oscar.c:6259
-#: ../src/protocols/silc/silc.c:1021
+#: ../libgaim/protocols/jabber/jabber.c:1365
+#: ../libgaim/protocols/oscar/oscar.c:6256
+#: ../libgaim/protocols/silc/silc.c:1019
 msgid "Change Password..."
 msgstr "Vaihda salasana..."
 
 #. }
-#: ../src/protocols/jabber/jabber.c:1350
+#: ../libgaim/protocols/jabber/jabber.c:1370
 msgid "Search for Users..."
 msgstr "Etsi käyttäjiä..."
 
-#: ../src/protocols/jabber/jabber.c:1426
+#: ../libgaim/protocols/jabber/jabber.c:1446
 msgid "Bad Request"
 msgstr "Virheellinen pyyntö"
 
-#: ../src/protocols/jabber/jabber.c:1428
+#: ../libgaim/protocols/jabber/jabber.c:1448
 msgid "Conflict"
 msgstr "Ristiriita"
 
-#: ../src/protocols/jabber/jabber.c:1430
+#: ../libgaim/protocols/jabber/jabber.c:1450
 msgid "Feature Not Implemented"
 msgstr "Ominaisuutta ei ole implementoitu."
 
-#: ../src/protocols/jabber/jabber.c:1432
+#: ../libgaim/protocols/jabber/jabber.c:1452
 msgid "Forbidden"
 msgstr "Estetty"
 
-#: ../src/protocols/jabber/jabber.c:1434
+#: ../libgaim/protocols/jabber/jabber.c:1454
 msgid "Gone"
 msgstr "Poistunut"
 
-#: ../src/protocols/jabber/jabber.c:1436 ../src/protocols/jabber/jabber.c:1511
+#: ../libgaim/protocols/jabber/jabber.c:1456
+#: ../libgaim/protocols/jabber/jabber.c:1531
 msgid "Internal Server Error"
 msgstr "Sisäinen palvelinvirhe"
 
-#: ../src/protocols/jabber/jabber.c:1438
+#: ../libgaim/protocols/jabber/jabber.c:1458
 msgid "Item Not Found"
 msgstr "Kohdetta ei löytynyt"
 
-#: ../src/protocols/jabber/jabber.c:1440
+#: ../libgaim/protocols/jabber/jabber.c:1460
 msgid "Malformed Jabber ID"
 msgstr "Epäkelpo Jabber ID"
 
-#: ../src/protocols/jabber/jabber.c:1442
+#: ../libgaim/protocols/jabber/jabber.c:1462
 msgid "Not Acceptable"
 msgstr "Ei kelvollinen"
 
-#: ../src/protocols/jabber/jabber.c:1444
+#: ../libgaim/protocols/jabber/jabber.c:1464
 msgid "Not Allowed"
 msgstr "Ei sallittu"
 
-#: ../src/protocols/jabber/jabber.c:1448
+#: ../libgaim/protocols/jabber/jabber.c:1468
 msgid "Payment Required"
 msgstr "Vaatii maksun"
 
-#: ../src/protocols/jabber/jabber.c:1450
+#: ../libgaim/protocols/jabber/jabber.c:1470
 msgid "Recipient Unavailable"
 msgstr "Vastaanottaja ei saatavilla."
 
-#: ../src/protocols/jabber/jabber.c:1454
+#: ../libgaim/protocols/jabber/jabber.c:1474
 msgid "Registration Required"
 msgstr "Vaatii rekisteröinnin"
 
-#: ../src/protocols/jabber/jabber.c:1456
+#: ../libgaim/protocols/jabber/jabber.c:1476
 msgid "Remote Server Not Found"
 msgstr "Palvelinta ei löytynyt"
 
-#: ../src/protocols/jabber/jabber.c:1458
+#: ../libgaim/protocols/jabber/jabber.c:1478
 msgid "Remote Server Timeout"
 msgstr "Palvelin aikakatkaisi"
 
-#: ../src/protocols/jabber/jabber.c:1460
+#: ../libgaim/protocols/jabber/jabber.c:1480
 msgid "Server Overloaded"
 msgstr "Palvelin ylikuormitettu"
 
-#: ../src/protocols/jabber/jabber.c:1462
+#: ../libgaim/protocols/jabber/jabber.c:1482
 msgid "Service Unavailable"
 msgstr "Palvelu ei käytettävissä"
 
-#: ../src/protocols/jabber/jabber.c:1464
+#: ../libgaim/protocols/jabber/jabber.c:1484
 msgid "Subscription Required"
 msgstr "Vaatii tilailmoitukset"
 
-#: ../src/protocols/jabber/jabber.c:1466
+#: ../libgaim/protocols/jabber/jabber.c:1486
 msgid "Unexpected Request"
 msgstr "Odottamaton pyyntö"
 
-#: ../src/protocols/jabber/jabber.c:1473
+#: ../libgaim/protocols/jabber/jabber.c:1493
 msgid "Authorization Aborted"
 msgstr "Valtuutus keskeytetty"
 
-#: ../src/protocols/jabber/jabber.c:1475
+#: ../libgaim/protocols/jabber/jabber.c:1495
 msgid "Incorrect encoding in authorization"
 msgstr "Väärä merkistö valtuutusviestissä"
 
-#: ../src/protocols/jabber/jabber.c:1478
+#: ../libgaim/protocols/jabber/jabber.c:1498
 msgid "Invalid authzid"
 msgstr "Epäkelpo authzid"
 
-#: ../src/protocols/jabber/jabber.c:1481
+#: ../libgaim/protocols/jabber/jabber.c:1501
 msgid "Invalid Authorization Mechanism"
 msgstr "Epäkelpo tunnistautumismekanismi"
 
-#: ../src/protocols/jabber/jabber.c:1484
+#: ../libgaim/protocols/jabber/jabber.c:1504
 msgid "Authorization mechanism too weak"
 msgstr "Tunnistautumismekanismi liian heikko"
 
-#: ../src/protocols/jabber/jabber.c:1489
+#: ../libgaim/protocols/jabber/jabber.c:1509
 msgid "Temporary Authentication Failure"
 msgstr "Väliaikainen todennusvirhe"
 
-#: ../src/protocols/jabber/jabber.c:1492
+#: ../libgaim/protocols/jabber/jabber.c:1512
 msgid "Authentication Failure"
 msgstr "Todennus epäonnistui"
 
-#: ../src/protocols/jabber/jabber.c:1496
+#: ../libgaim/protocols/jabber/jabber.c:1516
 msgid "Bad Format"
 msgstr "Väärä muoto"
 
-#: ../src/protocols/jabber/jabber.c:1498
+#: ../libgaim/protocols/jabber/jabber.c:1518
 msgid "Bad Namespace Prefix"
 msgstr "Väärä nimiavaruuden etuliite"
 
-#: ../src/protocols/jabber/jabber.c:1501
+#: ../libgaim/protocols/jabber/jabber.c:1521
 msgid "Resource Conflict"
 msgstr "Lähdekonflikti"
 
-#: ../src/protocols/jabber/jabber.c:1503 ../src/protocols/silc/ops.c:1728
+#: ../libgaim/protocols/jabber/jabber.c:1523
+#: ../libgaim/protocols/silc/ops.c:1727
 msgid "Connection Timeout"
 msgstr "Ei yhteyttä määräajassa"
 
-#: ../src/protocols/jabber/jabber.c:1505
+#: ../libgaim/protocols/jabber/jabber.c:1525
 msgid "Host Gone"
 msgstr "Verkkoisäntä kadonnut"
 
-#: ../src/protocols/jabber/jabber.c:1507
+#: ../libgaim/protocols/jabber/jabber.c:1527
 msgid "Host Unknown"
 msgstr "Tuntematon isäntä"
 
-#: ../src/protocols/jabber/jabber.c:1509
+#: ../libgaim/protocols/jabber/jabber.c:1529
 msgid "Improper Addressing"
 msgstr "Vääränlainen osoitus"
 
-#: ../src/protocols/jabber/jabber.c:1513
+#: ../libgaim/protocols/jabber/jabber.c:1533
 msgid "Invalid ID"
 msgstr "Epäkelpo ID"
 
-#: ../src/protocols/jabber/jabber.c:1515
+#: ../libgaim/protocols/jabber/jabber.c:1535
 msgid "Invalid Namespace"
 msgstr "Väärä nimiavaruus"
 
-#: ../src/protocols/jabber/jabber.c:1517
+#: ../libgaim/protocols/jabber/jabber.c:1537
 msgid "Invalid XML"
 msgstr "Epäkelpo XML"
 
-#: ../src/protocols/jabber/jabber.c:1519
+#: ../libgaim/protocols/jabber/jabber.c:1539
 msgid "Non-matching Hosts"
 msgstr "Verkkoisännät eivät täsmää"
 
-#: ../src/protocols/jabber/jabber.c:1523
+#: ../libgaim/protocols/jabber/jabber.c:1543
 msgid "Policy Violation"
 msgstr "Menettelykäytäntörikkomus"
 
-#: ../src/protocols/jabber/jabber.c:1525
+#: ../libgaim/protocols/jabber/jabber.c:1545
 msgid "Remote Connection Failed"
 msgstr "Etäyhteydessä yhteydessä virhe"
 
-#: ../src/protocols/jabber/jabber.c:1527
+#: ../libgaim/protocols/jabber/jabber.c:1547
 msgid "Resource Constraint"
 msgstr "Lähderajoite"
 
-#: ../src/protocols/jabber/jabber.c:1529
+#: ../libgaim/protocols/jabber/jabber.c:1549
 msgid "Restricted XML"
 msgstr "Rajoitettu XML"
 
-#: ../src/protocols/jabber/jabber.c:1531
+#: ../libgaim/protocols/jabber/jabber.c:1551
 msgid "See Other Host"
 msgstr "Etsi toinen isäntä"
 
-#: ../src/protocols/jabber/jabber.c:1533
+#: ../libgaim/protocols/jabber/jabber.c:1553
 msgid "System Shutdown"
 msgstr "Järjestelmän alasajo"
 
-#: ../src/protocols/jabber/jabber.c:1535
+#: ../libgaim/protocols/jabber/jabber.c:1555
 msgid "Undefined Condition"
 msgstr "Määrittelemätön tila"
 
-#: ../src/protocols/jabber/jabber.c:1537
+#: ../libgaim/protocols/jabber/jabber.c:1557
 msgid "Unsupported Encoding"
 msgstr "Merkistöä ei tueta"
 
-#: ../src/protocols/jabber/jabber.c:1539
+#: ../libgaim/protocols/jabber/jabber.c:1559
 msgid "Unsupported Stanza Type"
 msgstr "Säkeistötyyppiä(stanza type) ei tuettu"
 
-#: ../src/protocols/jabber/jabber.c:1541
+#: ../libgaim/protocols/jabber/jabber.c:1561
 msgid "Unsupported Version"
 msgstr "Versiota ei tueta"
 
-#: ../src/protocols/jabber/jabber.c:1543
+#: ../libgaim/protocols/jabber/jabber.c:1563
 msgid "XML Not Well Formed"
 msgstr "Huonosti muotoiltua XML:ää"
 
-#: ../src/protocols/jabber/jabber.c:1545
+#: ../libgaim/protocols/jabber/jabber.c:1565
 msgid "Stream Error"
 msgstr "Datavirtavirhe"
 
-#: ../src/protocols/jabber/jabber.c:1612
+#: ../libgaim/protocols/jabber/jabber.c:1632
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Ei voitu kieltää käyttäjää %s."
 
-#: ../src/protocols/jabber/jabber.c:1632
+#: ../libgaim/protocols/jabber/jabber.c:1652
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Tuntematon kytkös: \"%s\""
 
-#: ../src/protocols/jabber/jabber.c:1637
+#: ../libgaim/protocols/jabber/jabber.c:1657
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Ei voitua tehdä käyttäjälle %s kytköstä \"%s\""
 
-#: ../src/protocols/jabber/jabber.c:1656
+#: ../libgaim/protocols/jabber/jabber.c:1676
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Tuntematon rooli: \"%s\""
 
-#: ../src/protocols/jabber/jabber.c:1663
+#: ../libgaim/protocols/jabber/jabber.c:1683
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Ei voitu asettaa roolia \"%s\" käyttäjälle: %s"
 
-#: ../src/protocols/jabber/jabber.c:1716
+#: ../libgaim/protocols/jabber/jabber.c:1736
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Ei voitu potkaista käyttäjää %s ulos."
 
-#: ../src/protocols/jabber/jabber.c:1747
+#: ../libgaim/protocols/jabber/jabber.c:1767
 msgid "config:  Configure a chat room."
 msgstr "config: Configuroi ryhmäkeskusteluhuone."
 
-#: ../src/protocols/jabber/jabber.c:1751
+#: ../libgaim/protocols/jabber/jabber.c:1771
 msgid "configure:  Configure a chat room."
 msgstr "configure: Configuroi ryhmäkeskusteluhuone."
 
-#: ../src/protocols/jabber/jabber.c:1760
+#: ../libgaim/protocols/jabber/jabber.c:1780
 msgid "part [room]:  Leave the room."
 msgstr "part [huone]: Poistu huoneesta."
 
-#: ../src/protocols/jabber/jabber.c:1765
+#: ../libgaim/protocols/jabber/jabber.c:1785
 msgid "register:  Register with a chat room."
 msgstr "register: Rekisteröidy ryhmäkeskusteluhuoneeseen."
 
-#: ../src/protocols/jabber/jabber.c:1771
+#: ../libgaim/protocols/jabber/jabber.c:1791
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [uusi aihe]: Näytä tai vaihda aihe."
 
-#: ../src/protocols/jabber/jabber.c:1777
+#: ../libgaim/protocols/jabber/jabber.c:1797
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;käyttäjä&gt; [huone]: Kiellä käyttäjä huoneesta."
 
-#: ../src/protocols/jabber/jabber.c:1783
+#: ../libgaim/protocols/jabber/jabber.c:1803
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -7310,7 +8348,7 @@
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Aseta "
 "käyttäjän käyttäjäluokka tälle huoneelle."
 
-#: ../src/protocols/jabber/jabber.c:1789
+#: ../libgaim/protocols/jabber/jabber.c:1809
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -7318,20 +8356,20 @@
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Aseta "
 "käyttäjän rooli huoneessa."
 
-#: ../src/protocols/jabber/jabber.c:1795
+#: ../libgaim/protocols/jabber/jabber.c:1815
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;käyttäjä&gt; [viesti]: Kutsu käyttäjä huoneeseen."
 
-#: ../src/protocols/jabber/jabber.c:1801
+#: ../libgaim/protocols/jabber/jabber.c:1821
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr ""
 "join: &lt;huone&gt; [palvelin]: Liity ryhmäkeskusteluun tällä palvelimella."
 
-#: ../src/protocols/jabber/jabber.c:1807
+#: ../libgaim/protocols/jabber/jabber.c:1827
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;käyttäjä&gt; [huone]: Potkaise käyttäjä ulos huoneesta."
 
-#: ../src/protocols/jabber/jabber.c:1812
+#: ../libgaim/protocols/jabber/jabber.c:1832
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
@@ -7347,93 +8385,91 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/jabber/jabber.c:1895 ../src/protocols/jabber/jabber.c:1897
+#: ../libgaim/protocols/jabber/jabber.c:1948
+#: ../libgaim/protocols/jabber/jabber.c:1950
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber-yhteyskäytäntöliitännäinen"
 
-#: ../src/protocols/jabber/jabber.c:1923
-msgid "Use TLS if available"
-msgstr "Käytä TLS:ää jos mahdollista"
-
-#: ../src/protocols/jabber/jabber.c:1928
-msgid "Require TLS"
-msgstr "Vaadi TLS"
-
-#: ../src/protocols/jabber/jabber.c:1931
+#: ../libgaim/protocols/jabber/jabber.c:1976
 msgid "Force old (port 5223) SSL"
 msgstr "Käytä vanhaa (portti 5223) SSL:ää"
 
-#: ../src/protocols/jabber/jabber.c:1936
+#: ../libgaim/protocols/jabber/jabber.c:1981
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Salli salaamaton tunnistautuminen salaamattoman yhteyden yli"
 
-#: ../src/protocols/jabber/jabber.c:1941 ../src/protocols/simple/simple.c:1781
+#: ../libgaim/protocols/jabber/jabber.c:1986
+#: ../libgaim/protocols/simple/simple.c:1845
 msgid "Connect port"
 msgstr "Yhdistä porttiin"
 
 #. Account options
-#: ../src/protocols/jabber/jabber.c:1945 ../src/protocols/silc/silc.c:1856
+#: ../libgaim/protocols/jabber/jabber.c:1990
+#: ../libgaim/protocols/silc/silc.c:1855
 msgid "Connect server"
 msgstr "Yhdistä palvelimeen"
 
-#: ../src/protocols/jabber/message.c:117
+#: ../libgaim/protocols/jabber/message.c:117
 #, c-format
 msgid "Message from %s"
 msgstr "Viesti %s:lta"
 
-#: ../src/protocols/jabber/message.c:181
+#: ../libgaim/protocols/jabber/message.c:181
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s vaihtoi aiheeksi: %s"
 
-#: ../src/protocols/jabber/message.c:183
+#: ../libgaim/protocols/jabber/message.c:183
 #, c-format
 msgid "The topic is: %s"
 msgstr "Aihe on: %s"
 
-#: ../src/protocols/jabber/message.c:233
+#: ../libgaim/protocols/jabber/message.c:233
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Viestin toimitus %s:lle epäonnistui: %s"
 
-#: ../src/protocols/jabber/message.c:236
+#: ../libgaim/protocols/jabber/message.c:236
 msgid "Jabber Message Error"
 msgstr "Jabber viestivirhe"
 
-#: ../src/protocols/jabber/message.c:316
+#: ../libgaim/protocols/jabber/message.c:316
 #, c-format
 msgid " (Code %s)"
 msgstr " (Koodi %s)"
 
-#: ../src/protocols/jabber/parser.c:279 ../src/protocols/jabber/parser.c:288
+#: ../libgaim/protocols/jabber/parser.c:179
 msgid "XML Parse error"
 msgstr "Virhe XML-jäsennyksessä"
 
-#: ../src/protocols/jabber/presence.c:305
+#: ../libgaim/protocols/jabber/presence.c:304
 msgid "Unknown Error in presence"
 msgstr "Tuntematon virhe tavoitettavuudessa"
 
-#: ../src/protocols/jabber/presence.c:310 ../src/protocols/msn/userlist.c:98
+#: ../libgaim/protocols/jabber/presence.c:309
+#: ../libgaim/protocols/msn/userlist.c:98
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list."
 msgstr "Käyttäjä %s haluaa lisätä käyttäjän %s tuttavalistalleen."
 
-#: ../src/protocols/jabber/presence.c:319 ../src/protocols/oscar/oscar.c:2381
-#: ../src/protocols/oscar/oscar.c:5081
+#: ../libgaim/protocols/jabber/presence.c:318
+#: ../libgaim/protocols/oscar/oscar.c:2357
+#: ../libgaim/protocols/oscar/oscar.c:5068
 msgid "_Authorize"
 msgstr "_Valtuuta"
 
-#: ../src/protocols/jabber/presence.c:320 ../src/protocols/oscar/oscar.c:2383
-#: ../src/protocols/oscar/oscar.c:5082
+#: ../libgaim/protocols/jabber/presence.c:319
+#: ../libgaim/protocols/oscar/oscar.c:2359
+#: ../libgaim/protocols/oscar/oscar.c:5069
 msgid "_Deny"
 msgstr "_Kiellä"
 
-#: ../src/protocols/jabber/presence.c:377
-#: ../src/protocols/jabber/presence.c:378
+#: ../libgaim/protocols/jabber/presence.c:376
+#: ../libgaim/protocols/jabber/presence.c:377
 msgid "Create New Room"
 msgstr "Luo uusi huone"
 
-#: ../src/protocols/jabber/presence.c:379
+#: ../libgaim/protocols/jabber/presence.c:378
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -7441,40 +8477,40 @@
 "Olet luomassa uutta huonetta. Haluatko muuttaa asetuksia vai käytetäänkö "
 "oletusasetuksia?"
 
-#: ../src/protocols/jabber/presence.c:382
+#: ../libgaim/protocols/jabber/presence.c:381
 msgid "_Configure Room"
 msgstr "_Aseta huoneen asetuksia"
 
-#: ../src/protocols/jabber/presence.c:384
+#: ../libgaim/protocols/jabber/presence.c:383
 msgid "_Accept Defaults"
 msgstr "_Hyväksy oletusasetukset"
 
-#: ../src/protocols/jabber/presence.c:422
+#: ../libgaim/protocols/jabber/presence.c:421
 #, c-format
 msgid "Error in chat %s"
 msgstr "Virhe ryhmäkeskustelussa: %s"
 
-#: ../src/protocols/jabber/presence.c:425
+#: ../libgaim/protocols/jabber/presence.c:424
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Virhe liityttäessä ryhmäkeskusteluun %s"
 
-#: ../src/protocols/jabber/si.c:728
+#: ../libgaim/protocols/jabber/si.c:764
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "Ei voida lähettää tiedostoa käyttäjälle %s, käyttäjä ei tue tiedostonsiirtoja"
 
-#: ../src/protocols/jabber/si.c:729 ../src/protocols/jabber/si.c:730
+#: ../libgaim/protocols/jabber/si.c:765 ../libgaim/protocols/jabber/si.c:766
 msgid "File Send Failed"
 msgstr "Tiedoston lähetys epäonnistui"
 
-#: ../src/protocols/msn/dialog.c:84
+#: ../libgaim/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Tuttavalistan synkronointiongelma käyttäjätilillä %s (%s)"
 
-#: ../src/protocols/msn/dialog.c:90
+#: ../libgaim/protocols/msn/dialog.c:116
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
@@ -7483,7 +8519,7 @@
 "%s paikallisella listalla on ryhmässä \"%s\" mutta ei ole palvelimen "
 "listalla. Haluatko että tämä tuttava lisätään?"
 
-#: ../src/protocols/msn/dialog.c:98
+#: ../libgaim/protocols/msn/dialog.c:124
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
@@ -7492,263 +8528,266 @@
 "%s paikallisella listalla mutta ei palvelimen listalla. Haluatko että tämä "
 "tuttava lisätään?"
 
-#: ../src/protocols/msn/error.c:35
+#: ../libgaim/protocols/msn/error.c:35
 msgid "Unable to parse message"
 msgstr "Viestin jäsennys epäonnistui"
 
-#: ../src/protocols/msn/error.c:38
+#: ../libgaim/protocols/msn/error.c:38
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "Syntaksivirhe (todennäköisesti ohjelmistovirhe Gaimissa)"
 
-#: ../src/protocols/msn/error.c:42
+#: ../libgaim/protocols/msn/error.c:42
 msgid "Invalid e-mail address"
 msgstr "Epäkelpo sähköpostiosoite"
 
-#: ../src/protocols/msn/error.c:45
+#: ../libgaim/protocols/msn/error.c:45
 msgid "User does not exist"
 msgstr "Käyttäjää ei ole"
 
-#: ../src/protocols/msn/error.c:49
+#: ../libgaim/protocols/msn/error.c:49
 msgid "Fully Qualified Domain Name missing"
 msgstr "Täysin kelvollinen verkkoalueen nimi puuttuu"
 
-#: ../src/protocols/msn/error.c:52
+#: ../libgaim/protocols/msn/error.c:52
 msgid "Already Logged In"
 msgstr "Olet jo kirjautuneena sisään"
 
-#: ../src/protocols/msn/error.c:55
+#: ../libgaim/protocols/msn/error.c:55
 msgid "Invalid Username"
 msgstr "Epäkelpo käyttäjänimi"
 
-#: ../src/protocols/msn/error.c:58
+#: ../libgaim/protocols/msn/error.c:58
 msgid "Invalid Friendly Name"
 msgstr "Epäkelpo tuttavanimi"
 
-#: ../src/protocols/msn/error.c:61
+#: ../libgaim/protocols/msn/error.c:61
 msgid "List Full"
 msgstr "Lista täynnä"
 
-#: ../src/protocols/msn/error.c:64
+#: ../libgaim/protocols/msn/error.c:64
 msgid "Already there"
 msgstr "On jo siellä"
 
-#: ../src/protocols/msn/error.c:67
+#: ../libgaim/protocols/msn/error.c:67
 msgid "Not on list"
 msgstr "Ei listalla"
 
-#: ../src/protocols/msn/error.c:70 ../src/protocols/zephyr/zephyr.c:705
+#: ../libgaim/protocols/msn/error.c:70
+#: ../libgaim/protocols/zephyr/zephyr.c:757
 msgid "User is offline"
 msgstr "Käyttäjä on poissa linjoilta"
 
-#: ../src/protocols/msn/error.c:73
+#: ../libgaim/protocols/msn/error.c:73
 msgid "Already in the mode"
 msgstr "Olet jo kyseisessä tilassa"
 
-#: ../src/protocols/msn/error.c:76
+#: ../libgaim/protocols/msn/error.c:76
 msgid "Already in opposite list"
 msgstr "On jo vastakkaisessa listassa"
 
-#: ../src/protocols/msn/error.c:79
+#: ../libgaim/protocols/msn/error.c:79
 msgid "Too many groups"
 msgstr "Liian monta ryhmää"
 
-#: ../src/protocols/msn/error.c:82
+#: ../libgaim/protocols/msn/error.c:82
 msgid "Invalid group"
 msgstr "Epäkelpo ryhmä"
 
-#: ../src/protocols/msn/error.c:85
+#: ../libgaim/protocols/msn/error.c:85
 msgid "User not in group"
 msgstr "Käyttäjä ei ole ryhmässä"
 
-#: ../src/protocols/msn/error.c:88
+#: ../libgaim/protocols/msn/error.c:88
 msgid "Group name too long"
 msgstr "Ryhmän nimi liian pitkä"
 
-#: ../src/protocols/msn/error.c:91
+#: ../libgaim/protocols/msn/error.c:91
 msgid "Cannot remove group zero"
 msgstr "Ei voida poistaa ryhmää nolla"
 
-#: ../src/protocols/msn/error.c:95
+#: ../libgaim/protocols/msn/error.c:95
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Yritettiin lisätä käyttäjää ryhmään jota ei ole"
 
-#: ../src/protocols/msn/error.c:99
+#: ../libgaim/protocols/msn/error.c:99
 msgid "Switchboard failed"
 msgstr "Kytkentä epäonnistui"
 
-#: ../src/protocols/msn/error.c:102
+#: ../libgaim/protocols/msn/error.c:102
 msgid "Notify Transfer failed"
 msgstr "Siirrosta tiedottaminen epäonnistui"
 
-#: ../src/protocols/msn/error.c:106
+#: ../libgaim/protocols/msn/error.c:106
 msgid "Required fields missing"
 msgstr "Vaadittuja kenttiä puuttuu"
 
-#: ../src/protocols/msn/error.c:109
+#: ../libgaim/protocols/msn/error.c:109
 msgid "Too many hits to a FND"
 msgstr "Liian monta osumaa FND:hen"
 
-#: ../src/protocols/msn/error.c:112 ../src/protocols/oscar/oscar.c:148
+#: ../libgaim/protocols/msn/error.c:112 ../libgaim/protocols/oscar/oscar.c:123
 msgid "Not logged in"
 msgstr "Et ole kirjautunut sisään."
 
-#: ../src/protocols/msn/error.c:116
+#: ../libgaim/protocols/msn/error.c:116
 msgid "Service Temporarily Unavailable"
 msgstr "Palvelu ei tilapäisesti ole käytettävissä."
 
-#: ../src/protocols/msn/error.c:119
+#: ../libgaim/protocols/msn/error.c:119
 msgid "Database server error"
 msgstr "Tietokantapalvelimen virhe"
 
-#: ../src/protocols/msn/error.c:122
+#: ../libgaim/protocols/msn/error.c:122
 msgid "Command disabled"
 msgstr "Komento poistettu käytöstä"
 
-#: ../src/protocols/msn/error.c:125
+#: ../libgaim/protocols/msn/error.c:125
 msgid "File operation error"
 msgstr "Tiedostotoiminnossa virhe"
 
-#: ../src/protocols/msn/error.c:128
+#: ../libgaim/protocols/msn/error.c:128
 msgid "Memory allocation error"
 msgstr "Muistin varaamisessa virhe"
 
-#: ../src/protocols/msn/error.c:131
+#: ../libgaim/protocols/msn/error.c:131
 msgid "Wrong CHL value sent to server"
 msgstr "Väärä CHL-arvo lähetetty palvelimelle"
 
-#: ../src/protocols/msn/error.c:135
+#: ../libgaim/protocols/msn/error.c:135
 msgid "Server busy"
 msgstr "Palvelimella ruuhkaa"
 
-#: ../src/protocols/msn/error.c:138 ../src/protocols/msn/error.c:151
-#: ../src/protocols/msn/error.c:206
+#: ../libgaim/protocols/msn/error.c:138 ../libgaim/protocols/msn/error.c:151
+#: ../libgaim/protocols/msn/error.c:206
 msgid "Server unavailable"
 msgstr "Palvelin on tavoittamattomissa"
 
-#: ../src/protocols/msn/error.c:141
+#: ../libgaim/protocols/msn/error.c:141
 msgid "Peer Notification server down"
 msgstr "Vastapään ilmoituspalvelin ei toiminnassa"
 
-#: ../src/protocols/msn/error.c:144
+#: ../libgaim/protocols/msn/error.c:144
 msgid "Database connect error"
 msgstr "Tietokantayhteysvirhe"
 
-#: ../src/protocols/msn/error.c:148
+#: ../libgaim/protocols/msn/error.c:148
 msgid "Server is going down (abandon ship)"
 msgstr "Palvelin on poistumassa toiminnasta (jättäkää laiva)"
 
-#: ../src/protocols/msn/error.c:155
+#: ../libgaim/protocols/msn/error.c:155
 msgid "Error creating connection"
 msgstr "Virhe luotaessa yhteyttä"
 
-#: ../src/protocols/msn/error.c:159
+#: ../libgaim/protocols/msn/error.c:159
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR-parametrit ovat joko tuntemattomat tai ne eivät ole sallittuja"
 
-#: ../src/protocols/msn/error.c:162
+#: ../libgaim/protocols/msn/error.c:162
 msgid "Unable to write"
 msgstr "Ei kyetty kirjoittamaan"
 
-#: ../src/protocols/msn/error.c:165
+#: ../libgaim/protocols/msn/error.c:165
 msgid "Session overload"
 msgstr "Istunnon ylikuormitus"
 
-#: ../src/protocols/msn/error.c:168
+#: ../libgaim/protocols/msn/error.c:168
 msgid "User is too active"
 msgstr "Käyttäjä on liian aktiivinen"
 
-#: ../src/protocols/msn/error.c:171
+#: ../libgaim/protocols/msn/error.c:171
 msgid "Too many sessions"
 msgstr "Liian monta istuntoa"
 
-#: ../src/protocols/msn/error.c:174
+#: ../libgaim/protocols/msn/error.c:174
 msgid "Passport not verified"
 msgstr "Passport-tiliä ei ole varmistettu"
 
-#: ../src/protocols/msn/error.c:177
+#: ../libgaim/protocols/msn/error.c:177
 msgid "Bad friend file"
 msgstr "Virheellinen tuttavatiedosto"
 
-#: ../src/protocols/msn/error.c:180
+#: ../libgaim/protocols/msn/error.c:180
 msgid "Not expected"
 msgstr "Odottamaton"
 
-#: ../src/protocols/msn/error.c:185
+#: ../libgaim/protocols/msn/error.c:185
 msgid "Friendly name changes too rapidly"
 msgstr "Tuttavanimi vaihtuu liian usein"
 
-#: ../src/protocols/msn/error.c:194
+#: ../libgaim/protocols/msn/error.c:194
 msgid "Server too busy"
 msgstr "Palvelimella liikaa ruuhkaa "
 
-#: ../src/protocols/msn/error.c:198 ../src/protocols/oscar/oscar.c:1340
-#: ../src/protocols/silc/ops.c:1717 ../src/protocols/toc/toc.c:722
+#: ../libgaim/protocols/msn/error.c:198
+#: ../libgaim/protocols/oscar/oscar.c:1310
+#: ../libgaim/protocols/silc/ops.c:1716 ../libgaim/protocols/toc/toc.c:728
+#: ../libgaim/proxy.c:1344
 msgid "Authentication failed"
 msgstr "Todennus epäonnistui"
 
-#: ../src/protocols/msn/error.c:201
+#: ../libgaim/protocols/msn/error.c:201
 msgid "Not allowed when offline"
 msgstr "Ei sallittu kun poissa linjoilta"
 
-#: ../src/protocols/msn/error.c:209
+#: ../libgaim/protocols/msn/error.c:209
 msgid "Not accepting new users"
 msgstr "Ei ota vastaan uusia käyttäjiä"
 
-#: ../src/protocols/msn/error.c:213
+#: ../libgaim/protocols/msn/error.c:213
 msgid "Kids Passport without parental consent"
 msgstr "Kids Passport - ilman vanhempien hyväksyntää"
 
-#: ../src/protocols/msn/error.c:217
+#: ../libgaim/protocols/msn/error.c:217
 msgid "Passport account not yet verified"
 msgstr "Passport-tiliä ei ole verifioitu"
 
-#: ../src/protocols/msn/error.c:220
+#: ../libgaim/protocols/msn/error.c:220
 msgid "Bad ticket"
 msgstr "Bad ticket"
 
-#: ../src/protocols/msn/error.c:224
+#: ../libgaim/protocols/msn/error.c:224
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Tuntematon virhekoodi %d"
 
-#: ../src/protocols/msn/error.c:236
+#: ../libgaim/protocols/msn/error.c:236
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN-virhe: %s\n"
 
-#: ../src/protocols/msn/msn.c:113
+#: ../libgaim/protocols/msn/msn.c:113
 msgid "You have just sent a Nudge!"
 msgstr "Olet lähettänyt tönäisyn!"
 
-#: ../src/protocols/msn/msn.c:138
+#: ../libgaim/protocols/msn/msn.c:138
 msgid "Your new MSN friendly name is too long."
 msgstr "Uusi MSN-tuttavanimesi on liian pitkä."
 
-#: ../src/protocols/msn/msn.c:246
+#: ../libgaim/protocols/msn/msn.c:246
 msgid "Set your friendly name."
 msgstr "Aseta tuttavanimesi."
 
-#: ../src/protocols/msn/msn.c:247
+#: ../libgaim/protocols/msn/msn.c:247
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Tämä on nimi jona MSN-tuttavasi sinut näkevät."
 
-#: ../src/protocols/msn/msn.c:263
+#: ../libgaim/protocols/msn/msn.c:263
 msgid "Set your home phone number."
 msgstr "Aseta kotipuhelinnumerosi"
 
-#: ../src/protocols/msn/msn.c:278
+#: ../libgaim/protocols/msn/msn.c:278
 msgid "Set your work phone number."
 msgstr "Aseta työpuhelinnumerosi"
 
-#: ../src/protocols/msn/msn.c:293
+#: ../libgaim/protocols/msn/msn.c:293
 msgid "Set your mobile phone number."
 msgstr "Aseta matkapuhelinnumerosi"
 
-#: ../src/protocols/msn/msn.c:306
+#: ../libgaim/protocols/msn/msn.c:306
 msgid "Allow MSN Mobile pages?"
 msgstr "Salli MSN-mobiilihaut"
 
-#: ../src/protocols/msn/msn.c:307
+#: ../libgaim/protocols/msn/msn.c:307
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -7756,29 +8795,31 @@
 "Haluatko sallia tai estää henkilöitä tuttavalistallasi lähettää MSN- "
 "mobiilihakuja matkapuhelimeesi tai muuhun mobiililaitteeseen?"
 
-#: ../src/protocols/msn/msn.c:311
+#: ../libgaim/protocols/msn/msn.c:311
 msgid "Allow"
 msgstr "Salli"
 
-#: ../src/protocols/msn/msn.c:312
+#: ../libgaim/protocols/msn/msn.c:312
 msgid "Disallow"
 msgstr "Kiellä"
 
-#: ../src/protocols/msn/msn.c:328
+#: ../libgaim/protocols/msn/msn.c:328
 msgid "This Hotmail account may not be active."
 msgstr "Tämä Hotmail-tili ei välttämättä ole aktiivinen."
 
-#: ../src/protocols/msn/msn.c:354
+#: ../libgaim/protocols/msn/msn.c:354
 msgid "Send a mobile message."
 msgstr "Lähetä mobiiliviestinä"
 
-#: ../src/protocols/msn/msn.c:356
+#: ../libgaim/protocols/msn/msn.c:356
 msgid "Page"
 msgstr "Lähetä"
 
-#: ../src/protocols/msn/msn.c:546 ../src/protocols/msn/msn.c:553
-#: ../src/protocols/msn/msn.c:562 ../src/protocols/sametime/sametime.c:3239
-#: ../src/protocols/yahoo/yahoo.c:2895 ../src/protocols/yahoo/yahoo.c:2901
+#: ../libgaim/protocols/msn/msn.c:546 ../libgaim/protocols/msn/msn.c:553
+#: ../libgaim/protocols/msn/msn.c:562
+#: ../libgaim/protocols/sametime/sametime.c:3235
+#: ../libgaim/protocols/yahoo/yahoo.c:3032
+#: ../libgaim/protocols/yahoo/yahoo.c:3038
 #, c-format
 msgid ""
 "\n"
@@ -7787,69 +8828,73 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: ../src/protocols/msn/msn.c:553
+#: ../libgaim/protocols/msn/msn.c:553
 msgid "Has you"
 msgstr "Olet hänen listallaan"
 
-#: ../src/protocols/msn/msn.c:583 ../src/protocols/msn/state.c:33
-#: ../src/protocols/yahoo/yahoo.c:2724 ../src/protocols/yahoo/yahoo.c:3325
+#: ../libgaim/protocols/msn/msn.c:583 ../libgaim/protocols/msn/state.c:33
+#: ../libgaim/protocols/yahoo/yahoo.c:2861
+#: ../libgaim/protocols/yahoo/yahoo.c:3466
 msgid "Be Right Back"
 msgstr "Tulen pian takaisin"
 
-#: ../src/protocols/msn/msn.c:587 ../src/protocols/msn/state.c:31
-#: ../src/protocols/novell/novell.c:2849 ../src/protocols/novell/novell.c:2983
-#: ../src/protocols/silc/buddy.c:1473 ../src/protocols/silc/silc.c:53
-#: ../src/protocols/yahoo/yahoo.c:2726 ../src/protocols/yahoo/yahoo.c:3328
+#: ../libgaim/protocols/msn/msn.c:587 ../libgaim/protocols/msn/state.c:31
+#: ../libgaim/protocols/novell/novell.c:2859
+#: ../libgaim/protocols/novell/novell.c:2993
+#: ../libgaim/protocols/silc/buddy.c:1473 ../libgaim/protocols/silc/silc.c:53
+#: ../libgaim/protocols/yahoo/yahoo.c:2863
+#: ../libgaim/protocols/yahoo/yahoo.c:3469
 msgid "Busy"
 msgstr "Varattu"
 
-#: ../src/protocols/msn/msn.c:591 ../src/protocols/yahoo/yahoo.c:2734
-#: ../src/protocols/yahoo/yahoo.c:3340
+#: ../libgaim/protocols/msn/msn.c:591 ../libgaim/protocols/yahoo/yahoo.c:2871
+#: ../libgaim/protocols/yahoo/yahoo.c:3481
 msgid "On the Phone"
 msgstr "Puhelimessa"
 
-#: ../src/protocols/msn/msn.c:595 ../src/protocols/yahoo/yahoo.c:2738
-#: ../src/protocols/yahoo/yahoo.c:3346
+#: ../libgaim/protocols/msn/msn.c:595 ../libgaim/protocols/yahoo/yahoo.c:2875
+#: ../libgaim/protocols/yahoo/yahoo.c:3487
 msgid "Out to Lunch"
 msgstr "Lounaalla"
 
-#: ../src/protocols/msn/msn.c:619
+#: ../libgaim/protocols/msn/msn.c:619
 msgid "Set Friendly Name..."
 msgstr "Aseta tuttavanimi..."
 
-#: ../src/protocols/msn/msn.c:624
+#: ../libgaim/protocols/msn/msn.c:624
 msgid "Set Home Phone Number..."
 msgstr "Aseta kotipuhelinnumero..."
 
-#: ../src/protocols/msn/msn.c:628
+#: ../libgaim/protocols/msn/msn.c:628
 msgid "Set Work Phone Number..."
 msgstr "Aseta työpuhelinnumero..."
 
-#: ../src/protocols/msn/msn.c:632
+#: ../libgaim/protocols/msn/msn.c:632
 msgid "Set Mobile Phone Number..."
 msgstr "Aseta matkapuhelinnumero..."
 
-#: ../src/protocols/msn/msn.c:638
+#: ../libgaim/protocols/msn/msn.c:638
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Aseta päälle/pois mobiililaitteet..."
 
-#: ../src/protocols/msn/msn.c:643
+#: ../libgaim/protocols/msn/msn.c:643
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Salli/estä mobiilihaut..."
 
-#: ../src/protocols/msn/msn.c:653
+#: ../libgaim/protocols/msn/msn.c:653
 msgid "Open Hotmail Inbox"
 msgstr "Avaa Hotmailin saapuneet-kansio"
 
-#: ../src/protocols/msn/msn.c:677
+#: ../libgaim/protocols/msn/msn.c:677
 msgid "Send to Mobile"
 msgstr "Lähetä mobiililaitteeseen"
 
-#: ../src/protocols/msn/msn.c:687 ../src/protocols/novell/novell.c:3439
+#: ../libgaim/protocols/msn/msn.c:687
+#: ../libgaim/protocols/novell/novell.c:3449
 msgid "Initiate _Chat"
 msgstr "Aloita _ryhmäkeskustelu"
 
-#: ../src/protocols/msn/msn.c:725
+#: ../libgaim/protocols/msn/msn.c:725
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -7857,230 +8902,239 @@
 "MSN vaatii SSL-tuen. Asenna tuettu SSL-kirjasto. Lisätietoja osoitteesta "
 "http://gaim.sf.net/faq-ssl.php."
 
-#: ../src/protocols/msn/msn.c:752
+#: ../libgaim/protocols/msn/msn.c:752
 msgid "Failed to connect to server."
 msgstr "Palvelimeen ei saatu yhteyttä."
 
-#: ../src/protocols/msn/msn.c:1363 ../src/protocols/yahoo/yahoo_profile.c:685
-#: ../src/protocols/zephyr/zephyr.c:736 ../src/protocols/zephyr/zephyr.c:1153
+#: ../libgaim/protocols/msn/msn.c:1363
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:685
+#: ../libgaim/protocols/zephyr/zephyr.c:788
+#: ../libgaim/protocols/zephyr/zephyr.c:1205
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Alias:</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: ../src/protocols/msn/msn.c:1370 ../src/protocols/yahoo/yahoo_profile.c:1208
-#: ../src/util.c:1059
+#: ../libgaim/protocols/msn/msn.c:1370
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1223 ../libgaim/util.c:1109
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b> "
 
-#: ../src/protocols/msn/msn.c:1460
+#: ../libgaim/protocols/msn/msn.c:1462
 msgid "MSN Profile"
 msgstr "MSN-profiili"
 
-#: ../src/protocols/msn/msn.c:1465 ../src/protocols/msn/msn.c:1791
-#: ../src/protocols/yahoo/yahoo_profile.c:795
+#: ../libgaim/protocols/msn/msn.c:1467 ../libgaim/protocols/msn/msn.c:1796
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:794
 msgid "Error retrieving profile"
 msgstr "Virhe haettaessa profiilia"
 
-#: ../src/protocols/msn/msn.c:1533 ../src/protocols/oscar/oscar.c:3693
-#: ../src/protocols/yahoo/yahoo_profile.c:1056
+#: ../libgaim/protocols/msn/msn.c:1537 ../libgaim/protocols/oscar/oscar.c:3669
+#: ../libgaim/protocols/qq/buddy_info.c:43
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1070
 msgid "Age"
 msgstr "Ikä"
 
-#: ../src/protocols/msn/msn.c:1535 ../src/protocols/yahoo/yahoo_profile.c:1071
+#: ../libgaim/protocols/msn/msn.c:1539 ../libgaim/protocols/qq/buddy_info.c:49
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1085
 msgid "Occupation"
 msgstr "Ammatti"
 
-#: ../src/protocols/msn/msn.c:1536 ../src/protocols/novell/novell.c:1478
-#: ../src/protocols/yahoo/yahoo_profile.c:1051
+#: ../libgaim/protocols/msn/msn.c:1540
+#: ../libgaim/protocols/novell/novell.c:1478
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1065
 msgid "Location"
 msgstr "Sijainti"
 
-#: ../src/protocols/msn/msn.c:1541 ../src/protocols/msn/msn.c:1720
-#: ../src/protocols/msn/msn.c:1726 ../src/protocols/msn/msn.c:1733
+#: ../libgaim/protocols/msn/msn.c:1545 ../libgaim/protocols/msn/msn.c:1725
+#: ../libgaim/protocols/msn/msn.c:1731 ../libgaim/protocols/msn/msn.c:1738
 msgid "Hobbies and Interests"
 msgstr "Harrastukset"
 
-#: ../src/protocols/msn/msn.c:1547 ../src/protocols/msn/msn.c:1654
-#: ../src/protocols/msn/msn.c:1660 ../src/protocols/msn/msn.c:1667
-#: ../src/protocols/msn/msn.c:1675 ../src/protocols/msn/msn.c:1682
+#: ../libgaim/protocols/msn/msn.c:1551 ../libgaim/protocols/msn/msn.c:1659
+#: ../libgaim/protocols/msn/msn.c:1665 ../libgaim/protocols/msn/msn.c:1672
+#: ../libgaim/protocols/msn/msn.c:1680 ../libgaim/protocols/msn/msn.c:1687
 msgid "A Little About Me"
 msgstr "Oma kuvaus"
 
-#: ../src/protocols/msn/msn.c:1553
+#: ../libgaim/protocols/msn/msn.c:1557
 #, c-format
 msgid "%s<b>General</b><br>%s"
 msgstr "%s<b>Yleinen</b><br>%s"
 
 #. Social
-#: ../src/protocols/msn/msn.c:1562 ../src/protocols/yahoo/yahoo_profile.c:1061
+#: ../libgaim/protocols/msn/msn.c:1566
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1075
 msgid "Marital Status"
 msgstr "Siviilisääty"
 
-#: ../src/protocols/msn/msn.c:1563
+#: ../libgaim/protocols/msn/msn.c:1567
 msgid "Interests"
 msgstr "Kiinnostukset"
 
-#: ../src/protocols/msn/msn.c:1564
+#: ../libgaim/protocols/msn/msn.c:1568
 msgid "Pets"
 msgstr "Lemmikit"
 
-#: ../src/protocols/msn/msn.c:1565
+#: ../libgaim/protocols/msn/msn.c:1569
 msgid "Hometown"
 msgstr "Kotikunta"
 
-#: ../src/protocols/msn/msn.c:1566
+#: ../libgaim/protocols/msn/msn.c:1570
 msgid "Places Lived"
 msgstr "Asumispaikat"
 
-#: ../src/protocols/msn/msn.c:1567
+#: ../libgaim/protocols/msn/msn.c:1571
 msgid "Fashion"
 msgstr "Tyyli"
 
-#: ../src/protocols/msn/msn.c:1568
+#: ../libgaim/protocols/msn/msn.c:1572
 msgid "Humor"
 msgstr "Huumorintaju"
 
-#: ../src/protocols/msn/msn.c:1569
+#: ../libgaim/protocols/msn/msn.c:1573
 msgid "Music"
 msgstr "Musiikki"
 
-#: ../src/protocols/msn/msn.c:1570 ../src/protocols/msn/msn.c:1742
-#: ../src/protocols/msn/msn.c:1748 ../src/protocols/yahoo/yahoo_profile.c:1113
+#: ../libgaim/protocols/msn/msn.c:1574 ../libgaim/protocols/msn/msn.c:1747
+#: ../libgaim/protocols/msn/msn.c:1753
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1127
 msgid "Favorite Quote"
 msgstr "Lempisanonta"
 
-#: ../src/protocols/msn/msn.c:1574
+#: ../libgaim/protocols/msn/msn.c:1578
 #, c-format
 msgid "%s<b>Social</b><br>%s"
 msgstr "%s<b>Vapaa-aika</b><br>%s"
 
-#: ../src/protocols/msn/msn.c:1583
+#: ../libgaim/protocols/msn/msn.c:1587
 msgid "Significant Other"
 msgstr "Elämänkumppani"
 
-#: ../src/protocols/msn/msn.c:1584
+#: ../libgaim/protocols/msn/msn.c:1588
 msgid "Home Phone"
 msgstr "Kotipuhelin"
 
-#: ../src/protocols/msn/msn.c:1585
+#: ../libgaim/protocols/msn/msn.c:1589
 msgid "Home Phone 2"
 msgstr "Kotipuhelin 2"
 
-#: ../src/protocols/msn/msn.c:1586 ../src/protocols/oscar/oscar.c:3705
+#: ../libgaim/protocols/msn/msn.c:1590 ../libgaim/protocols/oscar/oscar.c:3681
 msgid "Home Address"
 msgstr "Kotiosoite"
 
-#: ../src/protocols/msn/msn.c:1587
+#: ../libgaim/protocols/msn/msn.c:1591
 msgid "Personal Mobile"
 msgstr "Oma matkapuhelin"
 
-#: ../src/protocols/msn/msn.c:1588
+#: ../libgaim/protocols/msn/msn.c:1592
 msgid "Home Fax"
 msgstr "Kotifaksi"
 
-#: ../src/protocols/msn/msn.c:1589
+#: ../libgaim/protocols/msn/msn.c:1593
 msgid "Personal E-Mail"
 msgstr "Oma sähköposti"
 
-#: ../src/protocols/msn/msn.c:1590
+#: ../libgaim/protocols/msn/msn.c:1594
 msgid "Personal IM"
 msgstr "Oma pikaviestin"
 
-#: ../src/protocols/msn/msn.c:1592
+#: ../libgaim/protocols/msn/msn.c:1596
 msgid "Anniversary"
 msgstr "Vuosipäivä"
 
-#: ../src/protocols/msn/msn.c:1593 ../src/protocols/msn/msn.c:1617
+#: ../libgaim/protocols/msn/msn.c:1597 ../libgaim/protocols/msn/msn.c:1622
 msgid "Notes"
 msgstr "Huomautuksia"
 
-#: ../src/protocols/msn/msn.c:1597
+#: ../libgaim/protocols/msn/msn.c:1601
 #, c-format
 msgid "<br><b>Personal</b><br>%s"
 msgstr "<br><b>Koti</b><br>%s"
 
-#: ../src/protocols/msn/msn.c:1604 ../src/protocols/silc/ops.c:1044
+#: ../libgaim/protocols/msn/msn.c:1609 ../libgaim/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "Tehtävänimike"
 
-#: ../src/protocols/msn/msn.c:1605 ../src/protocols/oscar/oscar.c:3722
+#: ../libgaim/protocols/msn/msn.c:1610 ../libgaim/protocols/oscar/oscar.c:3698
 msgid "Company"
 msgstr "Yritys"
 
-#: ../src/protocols/msn/msn.c:1606 ../src/protocols/novell/novell.c:1480
+#: ../libgaim/protocols/msn/msn.c:1611
+#: ../libgaim/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Osasto"
 
-#: ../src/protocols/msn/msn.c:1607
+#: ../libgaim/protocols/msn/msn.c:1612
 msgid "Profession"
 msgstr "Asmatti"
 
-#: ../src/protocols/msn/msn.c:1608
+#: ../libgaim/protocols/msn/msn.c:1613
 msgid "Work Phone"
 msgstr "Työpuhelin"
 
-#: ../src/protocols/msn/msn.c:1609
+#: ../libgaim/protocols/msn/msn.c:1614
 msgid "Work Phone 2"
 msgstr "Työpuhelin 2"
 
-#: ../src/protocols/msn/msn.c:1610 ../src/protocols/oscar/oscar.c:3713
+#: ../libgaim/protocols/msn/msn.c:1615 ../libgaim/protocols/oscar/oscar.c:3689
 msgid "Work Address"
 msgstr "Työosoite"
 
-#: ../src/protocols/msn/msn.c:1611
+#: ../libgaim/protocols/msn/msn.c:1616
 msgid "Work Mobile"
 msgstr "Työmatkapuhelin"
 
-#: ../src/protocols/msn/msn.c:1612
+#: ../libgaim/protocols/msn/msn.c:1617
 msgid "Work Pager"
 msgstr "Työhakulaite"
 
-#: ../src/protocols/msn/msn.c:1613
+#: ../libgaim/protocols/msn/msn.c:1618
 msgid "Work Fax"
 msgstr "Työfaksi"
 
-#: ../src/protocols/msn/msn.c:1614
+#: ../libgaim/protocols/msn/msn.c:1619
 msgid "Work E-Mail"
 msgstr "Työsähköposti"
 
-#: ../src/protocols/msn/msn.c:1615
+#: ../libgaim/protocols/msn/msn.c:1620
 msgid "Work IM"
 msgstr "Työ pikaviestin"
 
-#: ../src/protocols/msn/msn.c:1616
+#: ../libgaim/protocols/msn/msn.c:1621
 msgid "Start Date"
 msgstr "Aloituspäivä"
 
-#: ../src/protocols/msn/msn.c:1621
+#: ../libgaim/protocols/msn/msn.c:1626
 #, c-format
 msgid "<br><b>Business</b><br>%s"
 msgstr "<br><b>Työ</b><br>%s"
 
-#: ../src/protocols/msn/msn.c:1632
+#: ../libgaim/protocols/msn/msn.c:1637
 #, c-format
 msgid "<hr><b>Contact Info</b>%s%s"
 msgstr "<hr><b>Yhteystiedot</b>%s%s"
 
-#: ../src/protocols/msn/msn.c:1691 ../src/protocols/msn/msn.c:1697
-#: ../src/protocols/msn/msn.c:1704 ../src/protocols/msn/msn.c:1711
+#: ../libgaim/protocols/msn/msn.c:1696 ../libgaim/protocols/msn/msn.c:1702
+#: ../libgaim/protocols/msn/msn.c:1709 ../libgaim/protocols/msn/msn.c:1716
 msgid "Favorite Things"
 msgstr "Lempiasiat"
 
-#: ../src/protocols/msn/msn.c:1756
+#: ../libgaim/protocols/msn/msn.c:1761
 msgid "Last Updated"
 msgstr "Edellinen päivitys"
 
-#: ../src/protocols/msn/msn.c:1768 ../src/protocols/silc/ops.c:1060
+#: ../libgaim/protocols/msn/msn.c:1773 ../libgaim/protocols/qq/buddy_info.c:58
+#: ../libgaim/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "Kotisivu"
 
-#: ../src/protocols/msn/msn.c:1793
+#: ../libgaim/protocols/msn/msn.c:1798
 msgid "The user has not created a public profile."
 msgstr "Käyttäjällä ei ole julkista profiilia."
 
-#: ../src/protocols/msn/msn.c:1794
+#: ../libgaim/protocols/msn/msn.c:1799
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -8089,7 +9143,7 @@
 "MSN ilmoitti ettei voida löytää käyttäjän profiilia. Tämä tarkoittaa joko "
 "sitä että käyttäjää ei ole tai käyttäjä ei ole luonut julkista profiilia."
 
-#: ../src/protocols/msn/msn.c:1798
+#: ../libgaim/protocols/msn/msn.c:1803
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
@@ -8098,12 +9152,13 @@
 "todennäköisesti ole olemassa."
 
 #. put a link to the actual profile URL
-#: ../src/protocols/msn/msn.c:1803
+#: ../libgaim/protocols/msn/msn.c:1808
 #, c-format
 msgid "<hr><b>%s:</b> "
 msgstr "<hr><b>%s:</b> "
 
-#: ../src/protocols/msn/msn.c:1803 ../src/protocols/yahoo/yahoo_profile.c:1208
+#: ../libgaim/protocols/msn/msn.c:1808
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1223
 msgid "Profile URL"
 msgstr "Profiilin URL"
 
@@ -8117,81 +9172,96 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/msn/msn.c:2025 ../src/protocols/msn/msn.c:2027
+#: ../libgaim/protocols/msn/msn.c:2033 ../libgaim/protocols/msn/msn.c:2035
 msgid "MSN Protocol Plugin"
 msgstr "MSN-yhteyskäytäntöliitännäinen"
 
-#: ../src/protocols/msn/msn.c:2055
+#: ../libgaim/protocols/msn/msn.c:2063
 msgid "Use HTTP Method"
 msgstr "Käytä HTTP-menetelmää"
 
-#: ../src/protocols/msn/msn.c:2060
+#: ../libgaim/protocols/msn/msn.c:2068
 msgid "Show custom smileys"
 msgstr "Näytä itse tehdyt / lisätyt hymiöt"
 
-#: ../src/protocols/msn/msn.c:2068
+#: ../libgaim/protocols/msn/msn.c:2076
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: tönäise tuttavaa huomion saamiseksi"
 
-#: ../src/protocols/msn/nexus.c:141 ../src/protocols/msn/servconn.c:133
-#: ../src/protocols/yahoo/yahoochat.c:1346
-#: ../src/protocols/yahoo/yahoochat.c:1373
+#: ../libgaim/protocols/msn/nexus.c:146
+#: ../libgaim/protocols/msn/servconn.c:133
+#: ../libgaim/protocols/qq/qq_proxy.c:242
+#: ../libgaim/protocols/qq/qq_proxy.c:321
+#: ../libgaim/protocols/qq/qq_proxy.c:366
+#: ../libgaim/protocols/qq/qq_proxy.c:399
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:62
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:162
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:186
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:199
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:228
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:242
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:267
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:301
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:331
+#: ../libgaim/protocols/yahoo/yahoochat.c:1357
+#: ../libgaim/protocols/yahoo/yahoochat.c:1383
 msgid "Unable to connect"
 msgstr "Yhteyden muodostaminen epäonnistui"
 
-#: ../src/protocols/msn/notification.c:178
+#: ../libgaim/protocols/msn/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s ei ole kelvollinen ryhmä"
 
-#: ../src/protocols/msn/notification.c:184
-#: ../src/protocols/msn/notification.c:532 ../src/protocols/msn/session.c:329
+#: ../libgaim/protocols/msn/notification.c:184
+#: ../libgaim/protocols/msn/notification.c:532
+#: ../libgaim/protocols/msn/session.c:329
 msgid "Unknown error."
 msgstr "Tuntematon virhe."
 
-#: ../src/protocols/msn/notification.c:187
+#: ../libgaim/protocols/msn/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s tilillä %s (%s)"
 
-#: ../src/protocols/msn/notification.c:498
+#: ../libgaim/protocols/msn/notification.c:498
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Ei voitu lisätä käyttäjää %s (%s)"
 
-#: ../src/protocols/msn/notification.c:502
+#: ../libgaim/protocols/msn/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "Ei voitu estää käyttäjää %s (%s)"
 
-#: ../src/protocols/msn/notification.c:506
+#: ../libgaim/protocols/msn/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Ei voida sallia käyttäjää %s (%s)"
 
-#: ../src/protocols/msn/notification.c:514
+#: ../libgaim/protocols/msn/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "Käyttäjää %s ei voitu lisätä koska tuttavalista on täynnä."
 
-#: ../src/protocols/msn/notification.c:523
+#: ../libgaim/protocols/msn/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s ei ole kelvollinen passport-tili"
 
-#: ../src/protocols/msn/notification.c:528
+#: ../libgaim/protocols/msn/notification.c:528
 msgid "Service Temporarily Unavailable."
 msgstr "Palvelu ei tilapäisesti ole käytettävissä."
 
-#: ../src/protocols/msn/notification.c:820
+#: ../libgaim/protocols/msn/notification.c:823
 msgid "Unable to rename group"
 msgstr "Ryhmän uudelleen nimeäminen epäonnistui"
 
-#: ../src/protocols/msn/notification.c:875
+#: ../libgaim/protocols/msn/notification.c:878
 msgid "Unable to delete group"
 msgstr "Ryhmää ei voitu poistaa"
 
-#: ../src/protocols/msn/notification.c:1308
+#: ../libgaim/protocols/msn/notification.c:1314
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -8220,15 +9290,15 @@
 "\n"
 "Kun huolto on suoritettu voit taas kirjautua palveluun."
 
-#: ../src/protocols/msn/servconn.c:135
+#: ../libgaim/protocols/msn/servconn.c:135
 msgid "Writing error"
 msgstr "Virhe kirjoitettaessa"
 
-#: ../src/protocols/msn/servconn.c:137
+#: ../libgaim/protocols/msn/servconn.c:137
 msgid "Reading error"
 msgstr "Virhe luettaessa"
 
-#: ../src/protocols/msn/servconn.c:144
+#: ../libgaim/protocols/msn/servconn.c:144
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -8237,225 +9307,229 @@
 "Yhteysvirhe palvelimelta %s:\n"
 "%s"
 
-#: ../src/protocols/msn/session.c:299
+#: ../libgaim/protocols/msn/session.c:299
 msgid "Our protocol is not supported by the server."
 msgstr "Palvelin ei tue yhteyskäytäntöä."
 
-#: ../src/protocols/msn/session.c:303
+#: ../libgaim/protocols/msn/session.c:303
 msgid "Error parsing HTTP."
 msgstr "Virhe jäsennettäessä HTTP:tä."
 
-#: ../src/protocols/msn/session.c:307 ../src/protocols/oscar/oscar.c:3430
-#: ../src/protocols/yahoo/yahoo.c:191
+#: ../libgaim/protocols/msn/session.c:307
+#: ../libgaim/protocols/oscar/oscar.c:3409
+#: ../libgaim/protocols/yahoo/yahoo.c:191
 msgid "You have signed on from another location."
 msgstr "Olet kirjautunut sisään toisesta paikasta."
 
-#: ../src/protocols/msn/session.c:310
+#: ../libgaim/protocols/msn/session.c:310
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN-palvelimet ovat väliaikaisesti tavoittamattomissa. Odota ja yritä "
 "uudelleen."
 
-#: ../src/protocols/msn/session.c:315
+#: ../libgaim/protocols/msn/session.c:315
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN-palvelimet ajetaan alas väliaikaisesti."
 
-#: ../src/protocols/msn/session.c:319
+#: ../libgaim/protocols/msn/session.c:319
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Ei voida tunnistautua: %s"
 
-#: ../src/protocols/msn/session.c:324
+#: ../libgaim/protocols/msn/session.c:324
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN-tuttavalistaa ei väliaikaisesti voida hakea. Yritä myöhemmin uudelleen."
 
-#: ../src/protocols/msn/session.c:345 ../src/protocols/msn/session.c:347
+#: ../libgaim/protocols/msn/session.c:345
+#: ../libgaim/protocols/msn/session.c:347
 msgid "Handshaking"
 msgstr "Kättely"
 
-#: ../src/protocols/msn/session.c:346
+#: ../libgaim/protocols/msn/session.c:346
 msgid "Transferring"
 msgstr "Siirtää"
 
-#: ../src/protocols/msn/session.c:348
+#: ../libgaim/protocols/msn/session.c:348
 msgid "Starting authentication"
 msgstr "Aloitetaan tunnistautumista"
 
-#: ../src/protocols/msn/session.c:349
+#: ../libgaim/protocols/msn/session.c:349
 msgid "Getting cookie"
 msgstr "Haetaan evästettä"
 
-#: ../src/protocols/msn/session.c:351
+#: ../libgaim/protocols/msn/session.c:351
 msgid "Sending cookie"
 msgstr "Lähetetään evästettä"
 
-#: ../src/protocols/msn/session.c:352
+#: ../libgaim/protocols/msn/session.c:352
 msgid "Retrieving buddy list"
 msgstr "Noudetaan tuttavalista"
 
-#: ../src/protocols/msn/state.c:34
+#: ../libgaim/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "Poissa tietokoneelta"
 
-#: ../src/protocols/msn/state.c:35
+#: ../libgaim/protocols/msn/state.c:35
 msgid "On The Phone"
 msgstr "Puhelimessa"
 
-#: ../src/protocols/msn/state.c:36
+#: ../libgaim/protocols/msn/state.c:36
 msgid "Out To Lunch"
 msgstr "Lounaalla"
 
-#: ../src/protocols/msn/switchboard.c:401
+#: ../libgaim/protocols/msn/switchboard.c:400
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "Viestiä ei välttämättä lähetetty koska tapahtui aikakatkaisu:"
 
-#: ../src/protocols/msn/switchboard.c:409
+#: ../libgaim/protocols/msn/switchboard.c:408
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "Viestien lähetys ei ole sallittu näkymättömänä:"
 
-#: ../src/protocols/msn/switchboard.c:413
+#: ../libgaim/protocols/msn/switchboard.c:412
 msgid "Message could not be sent because the user is offline:"
 msgstr "Viestiä ei voitu lähettää koska käyttäjä on poissa linjoilta:"
 
-#: ../src/protocols/msn/switchboard.c:417
+#: ../libgaim/protocols/msn/switchboard.c:416
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Viestiä ei voitu lähettää yhteysvirheen vuoksi:"
 
-#: ../src/protocols/msn/switchboard.c:421
+#: ../libgaim/protocols/msn/switchboard.c:420
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr "Viestiä ei voitu lähettää koska viestejä lähetetään liian nopeasti:"
 
-#: ../src/protocols/msn/switchboard.c:425
+#: ../libgaim/protocols/msn/switchboard.c:424
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
 "Viestiä ei voitu lähettää kytkentäpalvelimen kanssa tapahtuneen virheen "
 "vuoksi:"
 
-#: ../src/protocols/msn/switchboard.c:433
+#: ../libgaim/protocols/msn/switchboard.c:432
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Viestiä ei voitu lähettää tuntemattoman virheen vuoksi:"
 
-#: ../src/protocols/msn/switchboard.c:953
+#: ../libgaim/protocols/msn/switchboard.c:952
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "Käyttäjä %s lähetti sinulle juuri tönäisyn!"
 
-#: ../src/protocols/msn/userlist.c:90
+#: ../libgaim/protocols/msn/userlist.c:90
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "Käyttäjä %s (%s) haluaa lisätä käyttäjän %s tuttavalistalleen."
 
-#: ../src/protocols/msn/userlist.c:105 ../src/protocols/yahoo/yahoo.c:920
+#: ../libgaim/protocols/msn/userlist.c:105
+#: ../libgaim/protocols/yahoo/yahoo.c:1002
 msgid "Authorize"
 msgstr "Valtuuta"
 
-#: ../src/protocols/msn/userlist.c:106 ../src/protocols/yahoo/yahoo.c:922
+#: ../libgaim/protocols/msn/userlist.c:106
+#: ../libgaim/protocols/yahoo/yahoo.c:1004
 msgid "Deny"
 msgstr "Kiellä"
 
-#: ../src/protocols/msn/userlist.c:280
+#: ../libgaim/protocols/msn/userlist.c:280
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "Käyttäjä %s on lisännyt sinut tuttavalistalleen."
 
-#: ../src/protocols/msn/userlist.c:344
+#: ../libgaim/protocols/msn/userlist.c:349
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s on poistanut sinut tuttavalistaltaan."
 
-#: ../src/protocols/msn/userlist.c:661
+#: ../libgaim/protocols/msn/userlist.c:671
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Ei voitu lisätä \"%s\"."
 
-#: ../src/protocols/msn/userlist.c:663
+#: ../libgaim/protocols/msn/userlist.c:673
 msgid "The screen name specified is invalid."
 msgstr "Syötetty näyttönimi on virheellinen."
 
-#: ../src/protocols/novell/nmuser.c:1868
+#: ../libgaim/protocols/novell/nmuser.c:1879
 msgid "Required parameters not passed in"
 msgstr "Vaadittuja parametreja ei syötetty"
 
-#: ../src/protocols/novell/nmuser.c:1871
+#: ../libgaim/protocols/novell/nmuser.c:1882
 msgid "Unable to write to network"
 msgstr "Ei voida kirjoittaa verkkoon"
 
-#: ../src/protocols/novell/nmuser.c:1874
+#: ../libgaim/protocols/novell/nmuser.c:1885
 msgid "Unable to read from network"
 msgstr "Ei voida lukea verkosta"
 
-#: ../src/protocols/novell/nmuser.c:1877
+#: ../libgaim/protocols/novell/nmuser.c:1888
 msgid "Error communicating with server"
 msgstr "Virhe kommunikoitaessa palvelimelle"
 
-#: ../src/protocols/novell/nmuser.c:1881
+#: ../libgaim/protocols/novell/nmuser.c:1892
 msgid "Conference not found"
 msgstr "Konferenssia ei löydy"
 
-#: ../src/protocols/novell/nmuser.c:1884
+#: ../libgaim/protocols/novell/nmuser.c:1895
 msgid "Conference does not exist"
 msgstr "Konferenssia ei ole"
 
-#: ../src/protocols/novell/nmuser.c:1888
+#: ../libgaim/protocols/novell/nmuser.c:1899
 msgid "A folder with that name already exists"
-msgstr "Sen niminen kansio on jo olemassa"
-
-#: ../src/protocols/novell/nmuser.c:1891
+msgstr "Valitun niminen kansio on jo olemassa"
+
+#: ../libgaim/protocols/novell/nmuser.c:1902
 msgid "Not supported"
 msgstr "Ei tueta"
 
-#: ../src/protocols/novell/nmuser.c:1895
+#: ../libgaim/protocols/novell/nmuser.c:1906
 msgid "Password has expired"
 msgstr "Salasana vanhentunut"
 
-#: ../src/protocols/novell/nmuser.c:1898
+#: ../libgaim/protocols/novell/nmuser.c:1909
 msgid "Invalid password"
 msgstr "Virheellinen salasana"
 
-#: ../src/protocols/novell/nmuser.c:1901
+#: ../libgaim/protocols/novell/nmuser.c:1912
 msgid "User not found"
 msgstr "Käyttäjää ei löydy"
 
-#: ../src/protocols/novell/nmuser.c:1904
+#: ../libgaim/protocols/novell/nmuser.c:1915
 msgid "Account has been disabled"
 msgstr "Käyttäjätili on poistettu käytöstä"
 
-#: ../src/protocols/novell/nmuser.c:1907
+#: ../libgaim/protocols/novell/nmuser.c:1918
 msgid "The server could not access the directory"
 msgstr "Palvelin ei pääse hakemistoon"
 
-#: ../src/protocols/novell/nmuser.c:1910
+#: ../libgaim/protocols/novell/nmuser.c:1921
 msgid "Your system administrator has disabled this operation"
 msgstr "Järjestelmänne ylläpitäjä on estänyt tämän toiminnon."
 
-#: ../src/protocols/novell/nmuser.c:1913
+#: ../libgaim/protocols/novell/nmuser.c:1924
 msgid "The server is unavailable; try again later"
 msgstr "Palvelin ei ole käytössä; yritä myöhemmin uudelleen"
 
-#: ../src/protocols/novell/nmuser.c:1916
+#: ../libgaim/protocols/novell/nmuser.c:1927
 msgid "Cannot add a contact to the same folder twice"
 msgstr "Tuttavaa ei voi lisätä samaan kansioon kahdesti"
 
-#: ../src/protocols/novell/nmuser.c:1919
+#: ../libgaim/protocols/novell/nmuser.c:1930
 msgid "Cannot add yourself"
 msgstr "Et voi lisätä itseäsi"
 
-#: ../src/protocols/novell/nmuser.c:1922
+#: ../libgaim/protocols/novell/nmuser.c:1933
 msgid "Master archive is misconfigured"
 msgstr "Pääarkisto on väärin konfiguroitu"
 
-#: ../src/protocols/novell/nmuser.c:1926
+#: ../libgaim/protocols/novell/nmuser.c:1937
 msgid "Invalid username or password"
 msgstr "Epäkelpo käyttäjänimi tai salasana"
 
-#: ../src/protocols/novell/nmuser.c:1929
+#: ../libgaim/protocols/novell/nmuser.c:1940
 msgid "Could not recognize the host of the username you entered"
 msgstr "Ei voitu tunnistaa syöttämäsi käyttäjän isäntää."
 
-#: ../src/protocols/novell/nmuser.c:1932
+#: ../libgaim/protocols/novell/nmuser.c:1943
 msgid ""
 "Your account has been disabled because too many invalid passwords were "
 "entered"
@@ -8463,31 +9537,31 @@
 "Käyttäjätilisi käyttö on estetty koska liian monta väärää salasanaa on "
 "syötetty"
 
-#: ../src/protocols/novell/nmuser.c:1935
+#: ../libgaim/protocols/novell/nmuser.c:1946
 msgid "You cannot add the same person twice to a conversation"
 msgstr "Et voi lisätä samaa henkilöä kahdesti keskusteluun"
 
-#: ../src/protocols/novell/nmuser.c:1939
+#: ../libgaim/protocols/novell/nmuser.c:1950
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "Olet saavuttanut rajasi sallittujen tuttavien määrässä"
 
-#: ../src/protocols/novell/nmuser.c:1942
+#: ../libgaim/protocols/novell/nmuser.c:1953
 msgid "You have entered an invalid username"
 msgstr "Olet syöttänyt epäkelvon käyttäjänimen"
 
-#: ../src/protocols/novell/nmuser.c:1945
+#: ../libgaim/protocols/novell/nmuser.c:1956
 msgid "An error occurred while updating the directory"
 msgstr "Virhe tapahtui päivitettäessä hakemistoa"
 
-#: ../src/protocols/novell/nmuser.c:1948
+#: ../libgaim/protocols/novell/nmuser.c:1959
 msgid "Incompatible protocol version"
 msgstr "Epäyhteensopiva yhteyskäytäntöversio"
 
-#: ../src/protocols/novell/nmuser.c:1951
+#: ../libgaim/protocols/novell/nmuser.c:1962
 msgid "The user has blocked you"
 msgstr "Käyttäjä on estänyt sinut"
 
-#: ../src/protocols/novell/nmuser.c:1954
+#: ../libgaim/protocols/novell/nmuser.c:1965
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
@@ -8495,53 +9569,54 @@
 "Tämä kokeiluversio ei salli enempää kuin kymmenen käyttäjää kirjautuneena "
 "sisään samaan aikaan"
 
-#: ../src/protocols/novell/nmuser.c:1957
+#: ../libgaim/protocols/novell/nmuser.c:1968
 msgid "The user is either offline or you are blocked"
 msgstr "Käyttäjä on joko poissa linjoilta tai sinut on estetty"
 
-#: ../src/protocols/novell/nmuser.c:1960
+#: ../libgaim/protocols/novell/nmuser.c:1971
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Tuntematon virhe: 0x%X"
 
-#: ../src/protocols/novell/novell.c:124
+#: ../libgaim/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr "Kirjautuminen epäonnistui (%s)."
 
-#: ../src/protocols/novell/novell.c:247
+#: ../libgaim/protocols/novell/novell.c:247
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr "Viestiä ei voitu lähettää. Ei saatu yksityiskohtia käyttäjälle (%s)."
 
-#: ../src/protocols/novell/novell.c:396
+#: ../libgaim/protocols/novell/novell.c:396
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "Ei voitu lisätä %s tuttavalistalle (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../src/protocols/novell/novell.c:422
+#: ../libgaim/protocols/novell/novell.c:422
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Viestiä ei voitu lähettää (%s)."
 
-#: ../src/protocols/novell/novell.c:493 ../src/protocols/novell/novell.c:985
+#: ../libgaim/protocols/novell/novell.c:493
+#: ../libgaim/protocols/novell/novell.c:985
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Ei voitu kutsua käyttäjää (%s)."
 
-#: ../src/protocols/novell/novell.c:532
+#: ../libgaim/protocols/novell/novell.c:532
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
 "Ei voitu lähettää viestiä käyttäjälle %s. Ei voutu luoda konferenssia (%s)."
 
-#: ../src/protocols/novell/novell.c:537
+#: ../libgaim/protocols/novell/novell.c:537
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "Viestiä ei voitu lähettää. Ei voitu luoda konferenssia (%s)."
 
-#: ../src/protocols/novell/novell.c:584
+#: ../libgaim/protocols/novell/novell.c:584
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -8550,7 +9625,7 @@
 "Ei voitu siirtää käyttäjää %s kansioon %s palvelinpuolen listalla. Virhe "
 "luotaessa kansiota (%s)."
 
-#: ../src/protocols/novell/novell.c:632
+#: ../libgaim/protocols/novell/novell.c:632
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -8559,58 +9634,61 @@
 "Ei voitu lisätä %s tuttavalistalle. Virhe luotaessa kansiota palvelinpuolen "
 "listalle (%s)."
 
-#: ../src/protocols/novell/novell.c:705
+#: ../libgaim/protocols/novell/novell.c:705
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Ei saatu yksityiskohtia käyttäjälle %s (%s)."
 
-#: ../src/protocols/novell/novell.c:751 ../src/protocols/novell/novell.c:897
+#: ../libgaim/protocols/novell/novell.c:751
+#: ../libgaim/protocols/novell/novell.c:897
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Ei voitu lisätä käyttäjää yksityisyys-listalle (%s)."
 
-#: ../src/protocols/novell/novell.c:798
+#: ../libgaim/protocols/novell/novell.c:798
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "Ei voitu lisätä %s kieltolistalle (%s)."
 
-#: ../src/protocols/novell/novell.c:851
+#: ../libgaim/protocols/novell/novell.c:851
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "Ei voitu lisätä %s sallitut-listalle (%s)."
 
-#: ../src/protocols/novell/novell.c:919
+#: ../libgaim/protocols/novell/novell.c:919
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Ei voitu poistaa %s yksityisyys-listalta (%s)."
 
-#: ../src/protocols/novell/novell.c:942 ../src/protocols/novell/novell.c:1652
+#: ../libgaim/protocols/novell/novell.c:942
+#: ../libgaim/protocols/novell/novell.c:1652
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Ei voitu muuttaa palvelinpuolen yksityisyys-asetuksia (%s)."
 
-#: ../src/protocols/novell/novell.c:1012
+#: ../libgaim/protocols/novell/novell.c:1012
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Ei voitu luoda konferenssia (%s)."
 
-#: ../src/protocols/novell/novell.c:1121 ../src/protocols/novell/novell.c:1691
+#: ../libgaim/protocols/novell/novell.c:1121
+#: ../libgaim/protocols/novell/novell.c:1697
 msgid "Error communicating with server. Closing connection."
 msgstr "Virhe kommunikoitaessa palvelimelle. Suljetaan yhteys."
 
-#: ../src/protocols/novell/novell.c:1476
+#: ../libgaim/protocols/novell/novell.c:1476
 msgid "Telephone Number"
 msgstr "Puhelinnumero"
 
-#: ../src/protocols/novell/novell.c:1482
+#: ../libgaim/protocols/novell/novell.c:1482
 msgid "Personal Title"
 msgstr "Titteli"
 
-#: ../src/protocols/novell/novell.c:1486
+#: ../libgaim/protocols/novell/novell.c:1486
 msgid "Mailstop"
 msgstr "Mailstop"
 
-#: ../src/protocols/novell/novell.c:1504
+#: ../libgaim/protocols/novell/novell.c:1504
 msgid "User ID"
 msgstr "Käyttäjän ID"
 
@@ -8621,41 +9699,41 @@
 #. tag, value);
 #. }
 #.
-#: ../src/protocols/novell/novell.c:1518
+#: ../libgaim/protocols/novell/novell.c:1518
 msgid "Full name"
 msgstr "Koko nimi"
 
-#: ../src/protocols/novell/novell.c:1642
+#: ../libgaim/protocols/novell/novell.c:1642
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise-konferenssi %d"
 
-#: ../src/protocols/novell/novell.c:1667
+#: ../libgaim/protocols/novell/novell.c:1673
 msgid "Unable to make SSL connection to server."
 msgstr "Palvelimeen ei kyetty muodostamaan SSL-yhteyttä."
 
-#: ../src/protocols/novell/novell.c:1724
+#: ../libgaim/protocols/novell/novell.c:1725
 msgid "Authenticating..."
 msgstr "Todennetaan..."
 
-#: ../src/protocols/novell/novell.c:1736
+#: ../libgaim/protocols/novell/novell.c:1737
 msgid "Unable to connect to server."
 msgstr "Palvelimeen ei kyetty muodostamaan yhteyttä."
 
-#: ../src/protocols/novell/novell.c:1739
+#: ../libgaim/protocols/novell/novell.c:1740
 msgid "Waiting for response..."
 msgstr "Odotetaan vastausta..."
 
-#: ../src/protocols/novell/novell.c:1874
+#: ../libgaim/protocols/novell/novell.c:1875
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s on kutsuttu tähän keskusteluun."
 
-#: ../src/protocols/novell/novell.c:1902
+#: ../libgaim/protocols/novell/novell.c:1903
 msgid "Invitation to Conversation"
 msgstr "Keskustelukutsu"
 
-#: ../src/protocols/novell/novell.c:1903
+#: ../libgaim/protocols/novell/novell.c:1904
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8666,16 +9744,17 @@
 "\n"
 "Lähetetty: %s"
 
-#: ../src/protocols/novell/novell.c:1905
+#: ../libgaim/protocols/novell/novell.c:1906
 msgid "Would you like to join the conversation?"
 msgstr "Haluatko liittyä keskusteluun?"
 
-#: ../src/protocols/novell/novell.c:2012
+#. we don't want to reconnect in this case
+#: ../libgaim/protocols/novell/novell.c:2015
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 "Sinut on kirjattu ulos koska olet kirjautunut sisään toiselta työasemalta."
 
-#: ../src/protocols/novell/novell.c:2068
+#: ../libgaim/protocols/novell/novell.c:2072
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -8685,7 +9764,7 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../src/protocols/novell/novell.c:2166
+#: ../libgaim/protocols/novell/novell.c:2170
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -8693,11 +9772,11 @@
 "Ei voitu yhdistää palvelimeen. Ole hyvä, syötä palvelimen osoite jolle "
 "haluat yhdistää."
 
-#: ../src/protocols/novell/novell.c:2188
+#: ../libgaim/protocols/novell/novell.c:2198
 msgid "Error. SSL support is not installed."
 msgstr "Virhe. SSL-tuki ei ole asennettu."
 
-#: ../src/protocols/novell/novell.c:2497
+#: ../libgaim/protocols/novell/novell.c:2507
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Tämä konferenssi on suljettu. Uusia viestejä ei voi lähettää."
 
@@ -8711,155 +9790,184 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/novell/novell.c:3541 ../src/protocols/novell/novell.c:3543
+#: ../libgaim/protocols/novell/novell.c:3552
+#: ../libgaim/protocols/novell/novell.c:3554
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger -yhteyskäytäntöliitännäinen"
 
-#: ../src/protocols/novell/novell.c:3562
+#: ../libgaim/protocols/novell/novell.c:3573
 msgid "Server address"
 msgstr "Palvelimen osoite"
 
-#: ../src/protocols/novell/novell.c:3566
+#: ../libgaim/protocols/novell/novell.c:3577
 msgid "Server port"
 msgstr "Palvelimen portti"
 
-#: ../src/protocols/oscar/flap_connection.c:221
+#: ../libgaim/protocols/oscar/flap_connection.c:237
+#: ../libgaim/protocols/yahoo/yahoo.c:2268
+#: ../libgaim/protocols/yahoo/yahoo.c:2426
+#: ../libgaim/protocols/yahoo/ycht.c:481 ../libgaim/proxy.c:570
+#: ../libgaim/proxy.c:1078 ../libgaim/proxy.c:1189 ../libgaim/proxy.c:1289
+#: ../libgaim/proxy.c:1417
 msgid "Server closed the connection."
 msgstr "Palvelin on katkaissut yhteyden."
 
-#: ../src/protocols/oscar/flap_connection.c:223
-msgid "Lost connection with server for an unknown reason."
-msgstr "Yhteys palvelimeen katkesi tuntemattomasta syystä."
-
-#: ../src/protocols/oscar/flap_connection.c:225
+#: ../libgaim/protocols/oscar/flap_connection.c:239
+#: ../libgaim/protocols/yahoo/yahoo.c:2262
+#: ../libgaim/protocols/yahoo/yahoo.c:2420 ../libgaim/proxy.c:582
+#: ../libgaim/proxy.c:1090 ../libgaim/proxy.c:1201 ../libgaim/proxy.c:1301
+#: ../libgaim/proxy.c:1429
+#, c-format
+msgid ""
+"Lost connection with server:\n"
+"%s"
+msgstr ""
+"Yhteys palvelimeen katkesi:\n"
+"%s"
+
+#: ../libgaim/protocols/oscar/flap_connection.c:242 ../libgaim/proxy.c:1107
+#: ../libgaim/proxy.c:1214 ../libgaim/proxy.c:1313 ../libgaim/proxy.c:1385
+#: ../libgaim/proxy.c:1442
 msgid "Received invalid data on connection with server."
 msgstr "Palvelimeen yhdistettäessä vastaanotettiin virheellisiä tietoja."
 
-#: ../src/protocols/oscar/flap_connection.c:227
-msgid "Could not establish a connection with the server."
-msgstr "Ei voitu muodostaa yhteyttä palvelimeen."
-
-#: ../src/protocols/oscar/odc.c:40
+#: ../libgaim/protocols/oscar/flap_connection.c:244
+#, c-format
+msgid ""
+"Could not establish a connection with the server:\n"
+"%s"
+msgstr ""
+"Ei voitu muodostaa yhteyttä palvelimeen:\n"
+"%s"
+
+#: ../libgaim/protocols/oscar/odc.c:40
 msgid "The remote user has closed the connection."
 msgstr "Käyttäjä on katkaissut yhteyden."
 
-#: ../src/protocols/oscar/odc.c:42
+#: ../libgaim/protocols/oscar/odc.c:42
 msgid "The remote user has declined your request."
 msgstr "Käyttäjä on kieltäytynyt pyynnöstäsi."
 
-#: ../src/protocols/oscar/odc.c:44
-msgid "Lost connection with the remote user for an unknown reason."
-msgstr "Yhteys käyttäjään katkesi tuntemattomasta syystä."
-
-#: ../src/protocols/oscar/odc.c:46
+#: ../libgaim/protocols/oscar/odc.c:44
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr "Yhteys käyttäjään katkesi:<br>%s"
+
+#: ../libgaim/protocols/oscar/odc.c:47
 msgid "Received invalid data on connection with remote user."
 msgstr "Vastaanotettiin virheellisiä tietoja luotaessa yhteyttä käyttäjään."
 
-#: ../src/protocols/oscar/odc.c:48
+#: ../libgaim/protocols/oscar/odc.c:49
 msgid "Could not establish a connection with the remote user."
 msgstr "Ei voitu muodostaa yhteyttä käyttäjän kanssa."
 
-#: ../src/protocols/oscar/odc.c:557
+#: ../libgaim/protocols/oscar/odc.c:561
 msgid "Direct IM established"
 msgstr "Suora pikaviestiyhteys muodostettu"
 
-#: ../src/protocols/oscar/oscar.c:144
+#: ../libgaim/protocols/oscar/oft.c:457
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr ""
+"Tiedosto %s on kooltaan %s, mikä on enemmän kuin suurin sallittu koko %s."
+
+#: ../libgaim/protocols/oscar/oscar.c:119
 msgid "Invalid error"
 msgstr "Epäkelpo virhe"
 
-#: ../src/protocols/oscar/oscar.c:145
+#: ../libgaim/protocols/oscar/oscar.c:120
 msgid "Invalid SNAC"
 msgstr "Epäkelpo SNAC"
 
-#: ../src/protocols/oscar/oscar.c:146
+#: ../libgaim/protocols/oscar/oscar.c:121
 msgid "Rate to host"
 msgstr "Nopeus isäntään"
 
-#: ../src/protocols/oscar/oscar.c:147
+#: ../libgaim/protocols/oscar/oscar.c:122
 msgid "Rate to client"
 msgstr "Nopeus asiakasohjelmaan"
 
-#: ../src/protocols/oscar/oscar.c:149
+#: ../libgaim/protocols/oscar/oscar.c:124
 msgid "Service unavailable"
 msgstr "Palvelu ei ole käytettävissä"
 
-#: ../src/protocols/oscar/oscar.c:150
+#: ../libgaim/protocols/oscar/oscar.c:125
 msgid "Service not defined"
 msgstr "Palvelua ei määritelty"
 
-#: ../src/protocols/oscar/oscar.c:151
+#: ../libgaim/protocols/oscar/oscar.c:126
 msgid "Obsolete SNAC"
 msgstr "Vanhentunut SNAC"
 
-#: ../src/protocols/oscar/oscar.c:152
+#: ../libgaim/protocols/oscar/oscar.c:127
 msgid "Not supported by host"
 msgstr "Ei tuettu verkkoisännässä"
 
-#: ../src/protocols/oscar/oscar.c:153
+#: ../libgaim/protocols/oscar/oscar.c:128
 msgid "Not supported by client"
 msgstr "Ei tuettu asiakasohjelmassa"
 
-#: ../src/protocols/oscar/oscar.c:154
+#: ../libgaim/protocols/oscar/oscar.c:129
 msgid "Refused by client"
 msgstr "Asiakasohjelma torjui"
 
-#: ../src/protocols/oscar/oscar.c:155
+#: ../libgaim/protocols/oscar/oscar.c:130
 msgid "Reply too big"
 msgstr "Vastaus liian suuri"
 
-#: ../src/protocols/oscar/oscar.c:156
+#: ../libgaim/protocols/oscar/oscar.c:131
 msgid "Responses lost"
 msgstr "Vastaukset menetetty"
 
-#: ../src/protocols/oscar/oscar.c:157
+#: ../libgaim/protocols/oscar/oscar.c:132
 msgid "Request denied"
 msgstr "Pyyntö evätty"
 
-#: ../src/protocols/oscar/oscar.c:158
+#: ../libgaim/protocols/oscar/oscar.c:133
 msgid "Busted SNAC payload"
 msgstr "Rikkoutunut SNAC-data"
 
-#: ../src/protocols/oscar/oscar.c:159
+#: ../libgaim/protocols/oscar/oscar.c:134
 msgid "Insufficient rights"
 msgstr "Liian vähän oikeuksia"
 
-#: ../src/protocols/oscar/oscar.c:160
+#: ../libgaim/protocols/oscar/oscar.c:135
 msgid "In local permit/deny"
 msgstr "Paikallisessa sallittujen/estettyjen listassa"
 
-#: ../src/protocols/oscar/oscar.c:161
+#: ../libgaim/protocols/oscar/oscar.c:136
 msgid "Too evil (sender)"
 msgstr "Lähettäjä liian paha(evil)"
 
-#: ../src/protocols/oscar/oscar.c:162
+#: ../libgaim/protocols/oscar/oscar.c:137
 msgid "Too evil (receiver)"
 msgstr "Vastaanottaja liian paha(evil)"
 
-#: ../src/protocols/oscar/oscar.c:163
+#: ../libgaim/protocols/oscar/oscar.c:138
 msgid "User temporarily unavailable"
 msgstr "Käyttäjä ei tilapäisesti saatavilla."
 
-#: ../src/protocols/oscar/oscar.c:164
+#: ../libgaim/protocols/oscar/oscar.c:139
 msgid "No match"
 msgstr "Ei tuloksia"
 
-#: ../src/protocols/oscar/oscar.c:165
+#: ../libgaim/protocols/oscar/oscar.c:140
 msgid "List overflow"
 msgstr "Lista-ylivuoto"
 
-#: ../src/protocols/oscar/oscar.c:166
+#: ../libgaim/protocols/oscar/oscar.c:141
 msgid "Request ambiguous"
 msgstr "Pyyntö ei ole yksiselitteinen"
 
-#: ../src/protocols/oscar/oscar.c:167
+#: ../libgaim/protocols/oscar/oscar.c:142
 msgid "Queue full"
 msgstr "Jono täynnä"
 
-#: ../src/protocols/oscar/oscar.c:168
+#: ../libgaim/protocols/oscar/oscar.c:143
 msgid "Not while on AOL"
 msgstr "Ei kun AOL on käytössä"
 
-#: ../src/protocols/oscar/oscar.c:346
+#: ../libgaim/protocols/oscar/oscar.c:321
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
 "is probably using a different encoding than expected.  If you know what "
@@ -8871,7 +9979,7 @@
 "merkistöä hän käyttää, voit määritellä sen AIM/ICQ-käyttäjätilisi "
 "lisäasetuksissa.)"
 
-#: ../src/protocols/oscar/oscar.c:449
+#: ../libgaim/protocols/oscar/oscar.c:424
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
@@ -8879,141 +9987,156 @@
 "(Tämän viestin vastaanotossa oli virhe. Henkilö jonka kanssa keskustelet "
 "käyttää todennäköisesti virheellistä asiakasohjelmaa.)"
 
-#: ../src/protocols/oscar/oscar.c:628
+#: ../libgaim/protocols/oscar/oscar.c:603
 msgid "Voice"
 msgstr "Ääni"
 
-#: ../src/protocols/oscar/oscar.c:631
+#: ../libgaim/protocols/oscar/oscar.c:606
 msgid "AIM Direct IM"
 msgstr "AIM:n suora pikaviesti"
 
-#: ../src/protocols/oscar/oscar.c:634 ../src/protocols/silc/silc.c:699
-#: ../src/protocols/silc/util.c:524
+#: ../libgaim/protocols/oscar/oscar.c:609 ../libgaim/protocols/silc/silc.c:697
+#: ../libgaim/protocols/silc/util.c:551
 msgid "Chat"
 msgstr "Keskustelu"
 
-#: ../src/protocols/oscar/oscar.c:637 ../src/protocols/oscar/oscar.c:5857
+#: ../libgaim/protocols/oscar/oscar.c:612
+#: ../libgaim/protocols/oscar/oscar.c:5852
 msgid "Get File"
 msgstr "Vastaanota tiedosto"
 
-#: ../src/protocols/oscar/oscar.c:644
+#: ../libgaim/protocols/oscar/oscar.c:619
 msgid "Games"
 msgstr "Pelit"
 
-#: ../src/protocols/oscar/oscar.c:647
+#: ../libgaim/protocols/oscar/oscar.c:622
 msgid "Add-Ins"
 msgstr "Lisäykset"
 
-#: ../src/protocols/oscar/oscar.c:650
+#: ../libgaim/protocols/oscar/oscar.c:625
 msgid "Send Buddy List"
 msgstr "Lähetä tuttavalista"
 
-#: ../src/protocols/oscar/oscar.c:653
+#: ../libgaim/protocols/oscar/oscar.c:628
 msgid "ICQ Direct Connect"
 msgstr "ICQ-suorayhteys"
 
-#: ../src/protocols/oscar/oscar.c:656
+#: ../libgaim/protocols/oscar/oscar.c:631
 msgid "AP User"
 msgstr "AP-käyttäjä"
 
-#: ../src/protocols/oscar/oscar.c:659
+#: ../libgaim/protocols/oscar/oscar.c:634
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../src/protocols/oscar/oscar.c:662
+#: ../libgaim/protocols/oscar/oscar.c:637
 msgid "Nihilist"
 msgstr "Nihilistinen"
 
-#: ../src/protocols/oscar/oscar.c:665
+#: ../libgaim/protocols/oscar/oscar.c:640
 msgid "ICQ Server Relay"
 msgstr "ICQ-palvelimen välitys"
 
-#: ../src/protocols/oscar/oscar.c:668
+#: ../libgaim/protocols/oscar/oscar.c:643
 msgid "Old ICQ UTF8"
 msgstr "Vanha ICQ UTF8"
 
-#: ../src/protocols/oscar/oscar.c:671
+#: ../libgaim/protocols/oscar/oscar.c:646
 msgid "Trillian Encryption"
 msgstr "Trillian-salaus"
 
-#: ../src/protocols/oscar/oscar.c:674
+#: ../libgaim/protocols/oscar/oscar.c:649
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../src/protocols/oscar/oscar.c:677
+#: ../libgaim/protocols/oscar/oscar.c:652
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../src/protocols/oscar/oscar.c:680
+#: ../libgaim/protocols/oscar/oscar.c:655
 msgid "Security Enabled"
 msgstr "Turvatoimet käytössä"
 
-#: ../src/protocols/oscar/oscar.c:683
+#: ../libgaim/protocols/oscar/oscar.c:658
 msgid "Video Chat"
 msgstr "Videokeskustelu"
 
-#: ../src/protocols/oscar/oscar.c:687
+#: ../libgaim/protocols/oscar/oscar.c:662
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../src/protocols/oscar/oscar.c:690
+#: ../libgaim/protocols/oscar/oscar.c:665
 msgid "Live Video"
 msgstr "Live-video"
 
-#: ../src/protocols/oscar/oscar.c:693
+#: ../libgaim/protocols/oscar/oscar.c:668
 msgid "Camera"
 msgstr "Kamera"
 
-#: ../src/protocols/oscar/oscar.c:711 ../src/protocols/oscar/oscar.c:5642
+#: ../libgaim/protocols/oscar/oscar.c:686
+#: ../libgaim/protocols/oscar/oscar.c:5629
 msgid "Free For Chat"
 msgstr "Vapaana keskusteluun"
 
-#: ../src/protocols/oscar/oscar.c:715 ../src/protocols/oscar/oscar.c:5670
+#: ../libgaim/protocols/oscar/oscar.c:690
+#: ../libgaim/protocols/oscar/oscar.c:5661
 msgid "Not Available"
 msgstr "Ei tavoittevissa"
 
-#: ../src/protocols/oscar/oscar.c:717 ../src/protocols/oscar/oscar.c:5660
+#: ../libgaim/protocols/oscar/oscar.c:692
+#: ../libgaim/protocols/oscar/oscar.c:5647
 msgid "Occupied"
 msgstr "Varattu"
 
-#: ../src/protocols/oscar/oscar.c:721
+#: ../libgaim/protocols/oscar/oscar.c:696
 msgid "Web Aware"
 msgstr "Net-tietoinen"
 
-#: ../src/protocols/oscar/oscar.c:725
+#: ../libgaim/protocols/oscar/oscar.c:700
 msgid "Online"
 msgstr "Linjoilla"
 
-#: ../src/protocols/oscar/oscar.c:811 ../src/protocols/oscar/oscar.c:2828
+#: ../libgaim/protocols/oscar/oscar.c:786
+#: ../libgaim/protocols/oscar/oscar.c:2804
 msgid "Warning Level"
 msgstr "Varoitustaso"
 
-#: ../src/protocols/oscar/oscar.c:820
+#: ../libgaim/protocols/oscar/oscar.c:795
 msgid "Buddy Comment"
 msgstr "Tuttavakommentti"
 
-#: ../src/protocols/oscar/oscar.c:975
-msgid "Could not connect to authentication server"
-msgstr "Ei saatu yhteyttä todentamispalvelimeen"
-
-#: ../src/protocols/oscar/oscar.c:977
-msgid "Could not connect to BOS server"
-msgstr "Ei saatu yhteyttä BOS-palvelimeen"
-
-#: ../src/protocols/oscar/oscar.c:1007
+#: ../libgaim/protocols/oscar/oscar.c:931
+#, c-format
+msgid ""
+"Could not connect to authentication server:\n"
+"%s"
+msgstr ""
+"Ei saatu yhteyttä todentamispalvelimeen:\n"
+"%s"
+
+#: ../libgaim/protocols/oscar/oscar.c:939
+#, c-format
+msgid ""
+"Could not connect to BOS server:\n"
+"%s"
+msgstr ""
+"Ei saatu yhteyttä BOS-palvelimeen:\n"
+"%s"
+
+#: ../libgaim/protocols/oscar/oscar.c:979
 msgid "Screen name sent"
 msgstr "Näyttönimi lähetetty"
 
-#: ../src/protocols/oscar/oscar.c:1012
+#: ../libgaim/protocols/oscar/oscar.c:984
 msgid "Connection established, cookie sent"
 msgstr "Yhteys muodostettu, eväste lähetetty"
 
 #. TODO: Don't call this with ssi
-#: ../src/protocols/oscar/oscar.c:1043
+#: ../libgaim/protocols/oscar/oscar.c:1013
 msgid "Finalizing connection"
 msgstr "Viimeistellään yhteyttä"
 
-#: ../src/protocols/oscar/oscar.c:1227
+#: ../libgaim/protocols/oscar/oscar.c:1197
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -9024,20 +10147,25 @@
 "virheellinen. Näyttönimien tulee alkaa joko kirjaimella ja sisältää vain "
 "kirjaimia, numeroita ja välilyöntejä tai sisältää vain numeroita."
 
-#: ../src/protocols/oscar/oscar.c:1317 ../src/protocols/toc/toc.c:543
-msgid "Incorrect nickname or password."
-msgstr "Virheellinen kutsumanimi tai salasana."
-
-#: ../src/protocols/oscar/oscar.c:1322
+#: ../libgaim/protocols/oscar/oscar.c:1282
+msgid "Invalid screen name."
+msgstr "Epäkelpo näyttöjänimi."
+
+#: ../libgaim/protocols/oscar/oscar.c:1287
+#: ../libgaim/protocols/yahoo/yahoo.c:1928
+msgid "Incorrect password."
+msgstr "Virheellinen salasana."
+
+#: ../libgaim/protocols/oscar/oscar.c:1292
 msgid "Your account is currently suspended."
 msgstr "Käyttäjätilisi palvelu on parhaillaan keskeytetty."
 
 #. service temporarily unavailable
-#: ../src/protocols/oscar/oscar.c:1326
+#: ../libgaim/protocols/oscar/oscar.c:1296
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL-pikaviestipalvelu ei tilapäisesti ole käytössä."
 
-#: ../src/protocols/oscar/oscar.c:1331
+#: ../libgaim/protocols/oscar/oscar.c:1301
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -9046,32 +10174,33 @@
 "ja yritä uudelleen. Jos jatkat yrittämistä, joudut odottamaan vielä "
 "pidempään."
 
-#: ../src/protocols/oscar/oscar.c:1336
+#: ../libgaim/protocols/oscar/oscar.c:1306
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Asiakasohjelmasi versio on liian vanha. Päivitä osoitteessa %s"
 
-#: ../src/protocols/oscar/oscar.c:1372
+#: ../libgaim/protocols/oscar/oscar.c:1341
 msgid "Could Not Connect"
 msgstr "Yhteyttä ei voitu muodostaa"
 
-#: ../src/protocols/oscar/oscar.c:1377
+#: ../libgaim/protocols/oscar/oscar.c:1346
 msgid "Received authorization"
 msgstr "Saatiin lupa"
 
-#: ../src/protocols/oscar/oscar.c:1400
+#: ../libgaim/protocols/oscar/oscar.c:1369
 msgid "The SecurID key entered is invalid."
 msgstr "Syötetty SecurID-avain on virheellinen."
 
-#: ../src/protocols/oscar/oscar.c:1414
+#: ../libgaim/protocols/oscar/oscar.c:1383
 msgid "Enter SecurID"
 msgstr "Syötä SecurID"
 
-#: ../src/protocols/oscar/oscar.c:1415
+#: ../libgaim/protocols/oscar/oscar.c:1384
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Syötä 6 numeroinen luku digitaaliselta näytöltä."
 
-#: ../src/protocols/oscar/oscar.c:1455 ../src/protocols/oscar/oscar.c:1489
+#: ../libgaim/protocols/oscar/oscar.c:1424
+#: ../libgaim/protocols/oscar/oscar.c:1467
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -9080,36 +10209,41 @@
 "Yhteytesi saatetaan katkaista kohta. Saatat haluta käyttää TOC-"
 "yhteyskäytäntöä kunnes tämä on korjattu. Tarkista päivitykset: %s"
 
-#: ../src/protocols/oscar/oscar.c:1458 ../src/protocols/oscar/oscar.c:1492
+#: ../libgaim/protocols/oscar/oscar.c:1427
+#: ../libgaim/protocols/oscar/oscar.c:1470
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim ei saanut kelvollista AIM-sisäänkirjautumistiivistettä."
 
-#: ../src/protocols/oscar/oscar.c:1578
+#: ../libgaim/protocols/oscar/oscar.c:1556
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "Yhteytesi saatetaan katkaista kohta. Tarkista päivitykset: %s."
 
-#: ../src/protocols/oscar/oscar.c:1581
+#: ../libgaim/protocols/oscar/oscar.c:1559
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim ei saanut kelvollista sisäänkirjautumistiivistettä."
 
-#: ../src/protocols/oscar/oscar.c:1607
+#: ../libgaim/protocols/oscar/oscar.c:1585
 msgid "Password sent"
 msgstr "Salasana lähetetty"
 
-#: ../src/protocols/oscar/oscar.c:2164
+#: ../libgaim/protocols/oscar/oscar.c:1641
+msgid "gaim_proxy_connect() failed"
+msgstr "gaim_proxy_connect() epäonnistui"
+
+#: ../libgaim/protocols/oscar/oscar.c:2139
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Valtuuta minut jotta voin lisätä sinut tuttavalistalleni."
 
-#: ../src/protocols/oscar/oscar.c:2173
+#: ../libgaim/protocols/oscar/oscar.c:2148
 msgid "Authorization Request Message:"
 msgstr "Valtuutuksen pyyntöviesti:"
 
-#: ../src/protocols/oscar/oscar.c:2174
+#: ../libgaim/protocols/oscar/oscar.c:2149
 msgid "Please authorize me!"
 msgstr "Valtuuta minut."
 
-#: ../src/protocols/oscar/oscar.c:2206
+#: ../libgaim/protocols/oscar/oscar.c:2181
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -9118,25 +10252,28 @@
 "Käyttäjä %s vaatii valtuutuksen ennenkuin hänet voi lisätä tuttavalistalle. "
 "Haluatko lähettää valtuutuspyynnön?"
 
-#: ../src/protocols/oscar/oscar.c:2211
+#: ../libgaim/protocols/oscar/oscar.c:2186
 msgid "Request Authorization"
 msgstr "Pyydä valtuutusta"
 
-#: ../src/protocols/oscar/oscar.c:2213
+#: ../libgaim/protocols/oscar/oscar.c:2188
 msgid "_Request Authorization"
 msgstr "_Pyydä valtuutusta"
 
-#: ../src/protocols/oscar/oscar.c:2254 ../src/protocols/oscar/oscar.c:2261
-#: ../src/protocols/oscar/oscar.c:2367 ../src/protocols/oscar/oscar.c:2391
-#: ../src/protocols/oscar/oscar.c:5067 ../src/protocols/oscar/oscar.c:5119
+#: ../libgaim/protocols/oscar/oscar.c:2229
+#: ../libgaim/protocols/oscar/oscar.c:2236
+#: ../libgaim/protocols/oscar/oscar.c:2343
+#: ../libgaim/protocols/oscar/oscar.c:2367
+#: ../libgaim/protocols/oscar/oscar.c:5054
+#: ../libgaim/protocols/oscar/oscar.c:5106
 msgid "No reason given."
 msgstr "Syytä ei annettu."
 
-#: ../src/protocols/oscar/oscar.c:2260
+#: ../libgaim/protocols/oscar/oscar.c:2235
 msgid "Authorization Denied Message:"
 msgstr "Valtuutuspyyntö evätty:"
 
-#: ../src/protocols/oscar/oscar.c:2369
+#: ../libgaim/protocols/oscar/oscar.c:2345
 #, c-format
 msgid ""
 "The user %u wants to add %s to their buddy list for the following reason:\n"
@@ -9145,11 +10282,12 @@
 "Käyttäjä %u haluaa lisätä %s:n tuttavalistalleen seuraavasta syystä:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:2379 ../src/protocols/oscar/oscar.c:5079
+#: ../libgaim/protocols/oscar/oscar.c:2355
+#: ../libgaim/protocols/oscar/oscar.c:5066
 msgid "Authorization Request"
 msgstr "Valtuutuspyyntö"
 
-#: ../src/protocols/oscar/oscar.c:2391
+#: ../libgaim/protocols/oscar/oscar.c:2367
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -9160,17 +10298,17 @@
 "syystä:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:2392
+#: ../libgaim/protocols/oscar/oscar.c:2368
 msgid "ICQ authorization denied."
 msgstr "ICQ-valtuutus evätty."
 
 #. Someone has granted you authorization
-#: ../src/protocols/oscar/oscar.c:2399
+#: ../libgaim/protocols/oscar/oscar.c:2375
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "Käyttäjä %u on hyväksynyt pyyntösi lisätä hänet tuttavalistallesi."
 
-#: ../src/protocols/oscar/oscar.c:2407
+#: ../libgaim/protocols/oscar/oscar.c:2383
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -9183,7 +10321,7 @@
 "Lähettäjä: %s [%s]\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:2415
+#: ../libgaim/protocols/oscar/oscar.c:2391
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -9196,7 +10334,7 @@
 "Lähettäjä: %s [%s]\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:2423
+#: ../libgaim/protocols/oscar/oscar.c:2399
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -9209,34 +10347,34 @@
 "Viesti on:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:2444
+#: ../libgaim/protocols/oscar/oscar.c:2420
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ-käyttäjä %u on lähettänyt sinulle tuttavan: %s (%s)"
 
-#: ../src/protocols/oscar/oscar.c:2450
+#: ../libgaim/protocols/oscar/oscar.c:2426
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Haluatko lisätä hänet tuttavalistallesi?"
 
-#: ../src/protocols/oscar/oscar.c:2454
+#: ../libgaim/protocols/oscar/oscar.c:2430
 msgid "_Decline"
 msgstr "_Kieltäydy"
 
-#: ../src/protocols/oscar/oscar.c:2538
+#: ../libgaim/protocols/oscar/oscar.c:2514
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "Et saanut %hu viestiä %s:lta koska se oli epäkelpo."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska ne olivat epäkelpoja."
 
-#: ../src/protocols/oscar/oscar.c:2547
+#: ../libgaim/protocols/oscar/oscar.c:2523
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "Et saanut %hu viestiä %s:lta koska se oli liian suuri."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska ne olivat liian suuria."
 
-#: ../src/protocols/oscar/oscar.c:2556
+#: ../libgaim/protocols/oscar/oscar.c:2532
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -9245,87 +10383,89 @@
 msgstr[0] "Et saanut %hu viestiä %s:lta koska taajuusraja ylittyi."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska taajuusraja ylittyi."
 
-#: ../src/protocols/oscar/oscar.c:2565
+#: ../libgaim/protocols/oscar/oscar.c:2541
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "Et saanut %hu viestiä %s:lta koska hän on liian hirveä."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska hän on liian hirveä."
 
-#: ../src/protocols/oscar/oscar.c:2574
+#: ../libgaim/protocols/oscar/oscar.c:2550
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "Et saanut %hu viestiä %s:lta koska olet liian hirveä."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska olet liian hirveä."
 
-#: ../src/protocols/oscar/oscar.c:2583
+#: ../libgaim/protocols/oscar/oscar.c:2559
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Et saanut %hu viestiä %s:lta tuntemattomasta syystä."
 msgstr[1] "Et saanut %hu viestiä %s:lta tuntemattomasta syystä."
 
-#: ../src/protocols/oscar/oscar.c:2639
+#: ../libgaim/protocols/oscar/oscar.c:2615
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>Tila:</B> %s<HR>%s"
 
-#: ../src/protocols/oscar/oscar.c:2700
+#: ../libgaim/protocols/oscar/oscar.c:2676
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC antoi virheen: %s\n"
 
 #. Data is assumed to be the destination sn
-#: ../src/protocols/oscar/oscar.c:2736
+#: ../libgaim/protocols/oscar/oscar.c:2712
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Viestiä ei voitu lähettää: %s"
 
-#: ../src/protocols/oscar/oscar.c:2736 ../src/protocols/oscar/oscar.c:2741
-#: ../src/protocols/oscar/oscar.c:2803 ../src/protocols/oscar/oscar.c:2807
+#: ../libgaim/protocols/oscar/oscar.c:2712
+#: ../libgaim/protocols/oscar/oscar.c:2717
+#: ../libgaim/protocols/oscar/oscar.c:2779
+#: ../libgaim/protocols/oscar/oscar.c:2783
 msgid "Unknown reason."
 msgstr "Tuntematon syy."
 
-#: ../src/protocols/oscar/oscar.c:2739
-#: ../src/protocols/sametime/sametime.c:2367
+#: ../libgaim/protocols/oscar/oscar.c:2715
+#: ../libgaim/protocols/sametime/sametime.c:2363
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Viestiä ei voitu lähettää käyttäjälle %s."
 
-#: ../src/protocols/oscar/oscar.c:2803
+#: ../libgaim/protocols/oscar/oscar.c:2779
 #, c-format
 msgid "User information not available: %s"
 msgstr "Käyttäjätiedot eivät ole saatavilla: %s"
 
-#: ../src/protocols/oscar/oscar.c:2806
+#: ../libgaim/protocols/oscar/oscar.c:2782
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s:n käyttäjätiedot eivät ole saatavilla"
 
-#: ../src/protocols/oscar/oscar.c:2832
+#: ../libgaim/protocols/oscar/oscar.c:2808
 msgid "Online Since"
 msgstr "Kirjautunut"
 
-#: ../src/protocols/oscar/oscar.c:2837
-#: ../src/protocols/yahoo/yahoo_profile.c:1159
+#: ../libgaim/protocols/oscar/oscar.c:2813
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1174
 msgid "Member Since"
 msgstr "Rekisteröitynyt"
 
-#: ../src/protocols/oscar/oscar.c:2842
+#: ../libgaim/protocols/oscar/oscar.c:2818
 msgid "Capabilities"
 msgstr "Kyvyt"
 
-#: ../src/protocols/oscar/oscar.c:2860
+#: ../libgaim/protocols/oscar/oscar.c:2836
 msgid "Available Message"
 msgstr "Paikallaoloviesti"
 
-#: ../src/protocols/oscar/oscar.c:2957
+#: ../libgaim/protocols/oscar/oscar.c:2936
 msgid "Your AIM connection may be lost."
 msgstr "AIM-yhteytesi saattaa olla katkennut."
 
 #. The conversion failed!
-#: ../src/protocols/oscar/oscar.c:3138
+#: ../libgaim/protocols/oscar/oscar.c:3117
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -9333,11 +10473,11 @@
 "[Ei voitu näyttää viestiä tältä käyttäjältä koska se sisälsi epäkelpoja "
 "merkkejä.]"
 
-#: ../src/protocols/oscar/oscar.c:3359
+#: ../libgaim/protocols/oscar/oscar.c:3338
 msgid "Rate limiting error."
 msgstr "Määrärajoitusvirhe"
 
-#: ../src/protocols/oscar/oscar.c:3360
+#: ../libgaim/protocols/oscar/oscar.c:3339
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -9345,81 +10485,84 @@
 "Viimeistä viestiä ei lähetetty koska olet ylittänyt taajuusrajan. Odota 10 "
 "sekuntia ja yritä uudelleen."
 
-#: ../src/protocols/oscar/oscar.c:3432
+#: ../libgaim/protocols/oscar/oscar.c:3411
 msgid "You have been signed off for an unknown reason."
 msgstr "Yhteytesi on katkaistu tuntemattomasta syystä."
 
-#: ../src/protocols/oscar/oscar.c:3445 ../src/protocols/toc/toc.c:971
+#: ../libgaim/protocols/oscar/oscar.c:3424 ../libgaim/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Yhteytesi keskusteluhuoneeseen %s on katkennut."
 
-#: ../src/protocols/oscar/oscar.c:3669 ../src/protocols/silc/util.c:556
+#: ../libgaim/protocols/oscar/oscar.c:3645
+#: ../libgaim/protocols/silc/util.c:583
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
-#: ../src/protocols/oscar/oscar.c:3696
+#: ../libgaim/protocols/oscar/oscar.c:3672
 msgid "Personal Web Page"
 msgstr "Henkilökohtainen kotisivu"
 
-#: ../src/protocols/oscar/oscar.c:3700
+#: ../libgaim/protocols/oscar/oscar.c:3676
+#: ../libgaim/protocols/qq/buddy_info.c:38
 msgid "Additional Information"
 msgstr "Lisätiedot"
 
-#: ../src/protocols/oscar/oscar.c:3709 ../src/protocols/oscar/oscar.c:3717
+#: ../libgaim/protocols/oscar/oscar.c:3685
+#: ../libgaim/protocols/oscar/oscar.c:3693
 msgid "Zip Code"
 msgstr "Postinumero"
 
-#: ../src/protocols/oscar/oscar.c:3721
+#: ../libgaim/protocols/oscar/oscar.c:3697
 msgid "Work Information"
 msgstr "Työtiedot"
 
-#: ../src/protocols/oscar/oscar.c:3723
+#: ../libgaim/protocols/oscar/oscar.c:3699
 msgid "Division"
 msgstr "Osasto"
 
-#: ../src/protocols/oscar/oscar.c:3724
+#: ../libgaim/protocols/oscar/oscar.c:3700
 msgid "Position"
 msgstr "Asema"
 
-#: ../src/protocols/oscar/oscar.c:3726
+#: ../libgaim/protocols/oscar/oscar.c:3702
 msgid "Web Page"
 msgstr "Kotisivu"
 
-#: ../src/protocols/oscar/oscar.c:3784
+#: ../libgaim/protocols/oscar/oscar.c:3760
 msgid "Pop-Up Message"
 msgstr "Ponnahdusviesti"
 
-#: ../src/protocols/oscar/oscar.c:3824
+#: ../libgaim/protocols/oscar/oscar.c:3800
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "Seuraava näyttönimi on assosioitu %s kanssa"
 msgstr[1] "Seuraavat näyttönimet on assosioitu %s kanssa"
 
-#: ../src/protocols/oscar/oscar.c:3829
+#: ../libgaim/protocols/oscar/oscar.c:3805
 msgid "Screen name"
 msgstr "Näyttönimi"
 
-#: ../src/protocols/oscar/oscar.c:3855
+#: ../libgaim/protocols/oscar/oscar.c:3831
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Ei hakutuloksia sähköpostiosoitteelle %s"
 
-#: ../src/protocols/oscar/oscar.c:3876
+#: ../libgaim/protocols/oscar/oscar.c:3852
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Sinun tulisi saada sähköpostiviesti %s:n varmistusta varten."
 
-#: ../src/protocols/oscar/oscar.c:3878
+#: ../libgaim/protocols/oscar/oscar.c:3854
 msgid "Account Confirmation Requested"
 msgstr "Tilin varmistusta pyydetty"
 
-#: ../src/protocols/oscar/oscar.c:3909
+#: ../libgaim/protocols/oscar/oscar.c:3885
 msgid "Error Changing Account Info"
 msgstr "Virhe muutettaessa käyttäjätilin tietoja"
 
-#: ../src/protocols/oscar/oscar.c:3912
+#: ../libgaim/protocols/oscar/oscar.c:3888
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -9428,14 +10571,14 @@
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi eroaa "
 "alkuperäisestä."
 
-#: ../src/protocols/oscar/oscar.c:3915
+#: ../libgaim/protocols/oscar/oscar.c:3891
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi on "
 "virheellinen."
 
-#: ../src/protocols/oscar/oscar.c:3918
+#: ../libgaim/protocols/oscar/oscar.c:3894
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -9444,7 +10587,7 @@
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi on "
 "liian pitkä."
 
-#: ../src/protocols/oscar/oscar.c:3921
+#: ../libgaim/protocols/oscar/oscar.c:3897
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -9453,7 +10596,7 @@
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska tälle näyttönimelle "
 "on jo käsittelemätön muutospyyntö."
 
-#: ../src/protocols/oscar/oscar.c:3924
+#: ../libgaim/protocols/oscar/oscar.c:3900
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -9462,7 +10605,7 @@
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska annettu osoite on "
 "assosioitu liian moneen näyttönimeen."
 
-#: ../src/protocols/oscar/oscar.c:3927
+#: ../libgaim/protocols/oscar/oscar.c:3903
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -9471,12 +10614,12 @@
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska annettu osoite on "
 "virheellinen."
 
-#: ../src/protocols/oscar/oscar.c:3930
+#: ../libgaim/protocols/oscar/oscar.c:3906
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Virhe 0x%04x: Tuntematon virhe."
 
-#: ../src/protocols/oscar/oscar.c:3940
+#: ../libgaim/protocols/oscar/oscar.c:3916
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -9485,27 +10628,28 @@
 "Näyttönimesi on tällä hetkellä muotoiltu seuraavasti:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:3941 ../src/protocols/oscar/oscar.c:3948
+#: ../libgaim/protocols/oscar/oscar.c:3917
+#: ../libgaim/protocols/oscar/oscar.c:3924
 msgid "Account Info"
 msgstr "Tilin tiedot"
 
-#: ../src/protocols/oscar/oscar.c:3946
+#: ../libgaim/protocols/oscar/oscar.c:3922
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s:n sähköpostiosoite on %s"
 
-#: ../src/protocols/oscar/oscar.c:4121
+#: ../libgaim/protocols/oscar/oscar.c:4097
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Pikaviesti kuvaasi ei lähetetty. Sinun tulee käyttää suorayhteyttä "
 "lähettääksesi pikaviestikuvia."
 
-#: ../src/protocols/oscar/oscar.c:4366
+#: ../libgaim/protocols/oscar/oscar.c:4349
 msgid "Unable to set AIM profile."
 msgstr "AIM-profiilia ei saatu asetettua."
 
-#: ../src/protocols/oscar/oscar.c:4367
+#: ../libgaim/protocols/oscar/oscar.c:4350
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -9515,7 +10659,7 @@
 "suoritettua loppuun. Profiilia ei asetettu. Yritä asettaa se kun "
 "kirjautuminen on suoritettu."
 
-#: ../src/protocols/oscar/oscar.c:4381
+#: ../libgaim/protocols/oscar/oscar.c:4364
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -9528,11 +10672,11 @@
 msgstr[1] ""
 "Maksimi profiilin koko %d tavua ylitetty. Gaim on lyhentänyt sen puolestasi."
 
-#: ../src/protocols/oscar/oscar.c:4386
+#: ../libgaim/protocols/oscar/oscar.c:4369
 msgid "Profile too long."
 msgstr "Profiili on liian pitkä."
 
-#: ../src/protocols/oscar/oscar.c:4429
+#: ../libgaim/protocols/oscar/oscar.c:4413
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -9545,11 +10689,11 @@
 msgstr[1] ""
 "Maksimi profiilin koko %d tavua ylitetty. Gaim on lyhentänyt sen puolestasi."
 
-#: ../src/protocols/oscar/oscar.c:4434
+#: ../libgaim/protocols/oscar/oscar.c:4418
 msgid "Away message too long."
 msgstr "Poissaoloviesti on liian pitkä."
 
-#: ../src/protocols/oscar/oscar.c:4503
+#: ../libgaim/protocols/oscar/oscar.c:4487
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -9560,16 +10704,17 @@
 "tulee alkaa joko kirjaimella ja sisältää vain kirjaimia, numeroita ja \n"
 "välilyöntejä tai sisältää vain numeroita."
 
-#: ../src/protocols/oscar/oscar.c:4505 ../src/protocols/oscar/oscar.c:4915
-#: ../src/protocols/oscar/oscar.c:4929
+#: ../libgaim/protocols/oscar/oscar.c:4489
+#: ../libgaim/protocols/oscar/oscar.c:4902
+#: ../libgaim/protocols/oscar/oscar.c:4916
 msgid "Unable To Add"
 msgstr "Lisääminen epäonnistui"
 
-#: ../src/protocols/oscar/oscar.c:4609
+#: ../libgaim/protocols/oscar/oscar.c:4593
 msgid "Unable To Retrieve Buddy List"
 msgstr "Tuttavalistan nouto ei onnistunut"
 
-#: ../src/protocols/oscar/oscar.c:4610
+#: ../libgaim/protocols/oscar/oscar.c:4594
 msgid ""
 "Gaim was temporarily unable to retrieve your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
@@ -9578,13 +10723,16 @@
 "Gaim epäonnistui hakiessaan tuttavalistaa AIM-pavelimelta. Tuttavalistasi ei "
 "ole kadonnut, se tulee luultavasti saataville muutamassa tunnissa."
 
-#: ../src/protocols/oscar/oscar.c:4813 ../src/protocols/oscar/oscar.c:4814
-#: ../src/protocols/oscar/oscar.c:4819 ../src/protocols/oscar/oscar.c:4983
-#: ../src/protocols/oscar/oscar.c:4984 ../src/protocols/oscar/oscar.c:4989
+#: ../libgaim/protocols/oscar/oscar.c:4797
+#: ../libgaim/protocols/oscar/oscar.c:4798
+#: ../libgaim/protocols/oscar/oscar.c:4803
+#: ../libgaim/protocols/oscar/oscar.c:4970
+#: ../libgaim/protocols/oscar/oscar.c:4971
+#: ../libgaim/protocols/oscar/oscar.c:4976
 msgid "Orphans"
 msgstr "Orvot"
 
-#: ../src/protocols/oscar/oscar.c:4913
+#: ../libgaim/protocols/oscar/oscar.c:4900
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9593,11 +10741,12 @@
 "Ei voitu lisätä tuttavaa %s koska listallasi on liian monta tuttavaa. Ole "
 "hyvä ja poista joku ja yritä uudelleen."
 
-#: ../src/protocols/oscar/oscar.c:4913 ../src/protocols/oscar/oscar.c:4927
+#: ../libgaim/protocols/oscar/oscar.c:4900
+#: ../libgaim/protocols/oscar/oscar.c:4914
 msgid "(no name)"
 msgstr "(nimetön)"
 
-#: ../src/protocols/oscar/oscar.c:4927
+#: ../libgaim/protocols/oscar/oscar.c:4914
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -9607,7 +10756,7 @@
 "Ei voitu lisätä tuttavaa %s tuntemattomasta syystä. Yleisin syy tälle on se "
 "että listasi maksimituttavamäärä on ylittynyt."
 
-#: ../src/protocols/oscar/oscar.c:5020
+#: ../libgaim/protocols/oscar/oscar.c:5007
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -9616,11 +10765,11 @@
 "Käyttäjälle %s on annettu lupa lisätä sinut heidän tuttavalistalleen. "
 "Haluatko lisätä heidät omalle listallesi?"
 
-#: ../src/protocols/oscar/oscar.c:5026
+#: ../libgaim/protocols/oscar/oscar.c:5013
 msgid "Authorization Given"
 msgstr "Valtuutus annettu"
 
-#: ../src/protocols/oscar/oscar.c:5070
+#: ../libgaim/protocols/oscar/oscar.c:5057
 #, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
@@ -9631,17 +10780,17 @@
 "%s"
 
 #. Granted
-#: ../src/protocols/oscar/oscar.c:5115
+#: ../libgaim/protocols/oscar/oscar.c:5102
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "Käyttäjä %s on hyväksynyt pyyntösi lisätä hänet tuttavalistallesi."
 
-#: ../src/protocols/oscar/oscar.c:5116
+#: ../libgaim/protocols/oscar/oscar.c:5103
 msgid "Authorization Granted"
 msgstr "Valtuutus hyväksytty"
 
 #. Denied
-#: ../src/protocols/oscar/oscar.c:5119
+#: ../libgaim/protocols/oscar/oscar.c:5106
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9652,43 +10801,43 @@
 "syystä:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:5120
+#: ../libgaim/protocols/oscar/oscar.c:5107
 msgid "Authorization Denied"
 msgstr "Valtuutus evätty"
 
-#: ../src/protocols/oscar/oscar.c:5156 ../src/protocols/toc/toc.c:1372
+#: ../libgaim/protocols/oscar/oscar.c:5143 ../libgaim/protocols/toc/toc.c:1378
 msgid "_Exchange:"
 msgstr "_Vaihto:"
 
-#: ../src/protocols/oscar/oscar.c:5196
+#: ../libgaim/protocols/oscar/oscar.c:5183
 msgid "Invalid chat name specified."
 msgstr "Virheellinen ryhmäkeskustelun nimi annettu."
 
-#: ../src/protocols/oscar/oscar.c:5266
+#: ../libgaim/protocols/oscar/oscar.c:5253
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Pikaviestikuvaasi ei lähetetty. Et voi lähettää pikaviestikuvia AIM- "
 "ryhmäkeskustelussa."
 
-#: ../src/protocols/oscar/oscar.c:5428
+#: ../libgaim/protocols/oscar/oscar.c:5415
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(vastaanotetaan)</i>"
 
-#: ../src/protocols/oscar/oscar.c:5733
+#: ../libgaim/protocols/oscar/oscar.c:5728
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Tuttavakommentti käyttäjälle %s"
 
-#: ../src/protocols/oscar/oscar.c:5734
+#: ../libgaim/protocols/oscar/oscar.c:5729
 msgid "Buddy Comment:"
 msgstr "Kommentti"
 
-#: ../src/protocols/oscar/oscar.c:5780
+#: ../libgaim/protocols/oscar/oscar.c:5775
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Olet päättänyt avata suoran pikaviestiyhteyden %s:n kanssa."
 
-#: ../src/protocols/oscar/oscar.c:5784
+#: ../libgaim/protocols/oscar/oscar.c:5779
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -9696,69 +10845,70 @@
 "Koska tämä paljastaa IP-osoitteesi, sitä voidaan pitää turvallisuusriskinä.  "
 "Haluatko jatkaa?"
 
-#: ../src/protocols/oscar/oscar.c:5788 ../src/protocols/oscar/peer.c:941
+#: ../libgaim/protocols/oscar/oscar.c:5783
+#: ../libgaim/protocols/oscar/peer.c:990
 msgid "_Connect"
 msgstr "_Yhdistä"
 
-#: ../src/protocols/oscar/oscar.c:5822
+#: ../libgaim/protocols/oscar/oscar.c:5817
 msgid "Get AIM Info"
 msgstr "Hae AIM-tiedot"
 
-#: ../src/protocols/oscar/oscar.c:5828
+#: ../libgaim/protocols/oscar/oscar.c:5823
 msgid "Edit Buddy Comment"
 msgstr "Muokkaa kommenttia"
 
-#: ../src/protocols/oscar/oscar.c:5836
+#: ../libgaim/protocols/oscar/oscar.c:5831
 msgid "Get Status Msg"
 msgstr "Hae tilaviesti"
 
-#: ../src/protocols/oscar/oscar.c:5849
+#: ../libgaim/protocols/oscar/oscar.c:5844
 msgid "Direct IM"
 msgstr "Suora pikaviesti"
 
-#: ../src/protocols/oscar/oscar.c:5871
+#: ../libgaim/protocols/oscar/oscar.c:5866
 msgid "Re-request Authorization"
 msgstr "Pyydä valtuutus uudelleen"
 
-#: ../src/protocols/oscar/oscar.c:5928
+#: ../libgaim/protocols/oscar/oscar.c:5925
 msgid "Require authorization"
 msgstr "Pyydä valtuutusta"
 
-#: ../src/protocols/oscar/oscar.c:5931
+#: ../libgaim/protocols/oscar/oscar.c:5928
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Web-tietoinen (tämän käyttö altistaa sinut roskaposteille)"
 
-#: ../src/protocols/oscar/oscar.c:5936
+#: ../libgaim/protocols/oscar/oscar.c:5933
 msgid "ICQ Privacy Options"
 msgstr "ICQ-yksityisyysvalinnat"
 
-#: ../src/protocols/oscar/oscar.c:5953
+#: ../libgaim/protocols/oscar/oscar.c:5950
 msgid "The new formatting is invalid."
 msgstr "Uusi muotoilu on virheellinen."
 
-#: ../src/protocols/oscar/oscar.c:5954
+#: ../libgaim/protocols/oscar/oscar.c:5951
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "Näyttönimen muotoilu voi vaikuttaa ainoastaan alkukirjaimeen sekä "
 "välilyönteihin."
 
-#: ../src/protocols/oscar/oscar.c:5961
+#: ../libgaim/protocols/oscar/oscar.c:5958
 msgid "New screen name formatting:"
 msgstr "Uusi näyttönimen muotoilu:"
 
-#: ../src/protocols/oscar/oscar.c:6017
+#: ../libgaim/protocols/oscar/oscar.c:6014
 msgid "Change Address To:"
 msgstr "Vaihda osoite:"
 
-#: ../src/protocols/oscar/oscar.c:6062
+#: ../libgaim/protocols/oscar/oscar.c:6059
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>Et odota valtuutusta</i>"
 
-#: ../src/protocols/oscar/oscar.c:6065
+#: ../libgaim/protocols/oscar/oscar.c:6062
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Odotat valtuutusta seuraavilta tuttavilta"
 
-#: ../src/protocols/oscar/oscar.c:6066
+#: ../libgaim/protocols/oscar/oscar.c:6063
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9766,69 +10916,69 @@
 "Voit pyytää valtuutuksen uudelleen näiltä tuttavilta napsauttamalla oikeaa "
 "nappia heihin ja valitsemalla \"Pyydä valtuutus uudelleen\"."
 
-#: ../src/protocols/oscar/oscar.c:6083
+#: ../libgaim/protocols/oscar/oscar.c:6080
 msgid "Find Buddy by E-Mail"
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
-#: ../src/protocols/oscar/oscar.c:6084
+#: ../libgaim/protocols/oscar/oscar.c:6081
 msgid "Search for a buddy by e-mail address"
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
-#: ../src/protocols/oscar/oscar.c:6085
+#: ../libgaim/protocols/oscar/oscar.c:6082
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Syötä etsimäsi tuttavan sähköpostiosoite."
 
-#: ../src/protocols/oscar/oscar.c:6254
+#: ../libgaim/protocols/oscar/oscar.c:6251
 msgid "Set User Info (URL)..."
 msgstr "Aseta käyttäjätiedot (URL)..."
 
-#: ../src/protocols/oscar/oscar.c:6265
+#: ../libgaim/protocols/oscar/oscar.c:6262
 msgid "Change Password (URL)"
 msgstr "Vaihda salasana (URL)"
 
-#: ../src/protocols/oscar/oscar.c:6269
+#: ../libgaim/protocols/oscar/oscar.c:6266
 msgid "Configure IM Forwarding (URL)"
 msgstr "Aseta pikaviestien edelleenlähetys (URL)"
 
 #. ICQ actions
-#: ../src/protocols/oscar/oscar.c:6279
+#: ../libgaim/protocols/oscar/oscar.c:6276
 msgid "Set Privacy Options..."
 msgstr "Aseta yksityisyysvalinnat..."
 
 #. AIM actions
-#: ../src/protocols/oscar/oscar.c:6286
+#: ../libgaim/protocols/oscar/oscar.c:6283
 msgid "Format Screen Name..."
 msgstr "Muotoile näyttönimi..."
 
-#: ../src/protocols/oscar/oscar.c:6290
+#: ../libgaim/protocols/oscar/oscar.c:6287
 msgid "Confirm Account"
 msgstr "Vahvista tili"
 
-#: ../src/protocols/oscar/oscar.c:6294
+#: ../libgaim/protocols/oscar/oscar.c:6291
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Näytä tällä hetkellä rekisteröity sähköpostiosoite"
 
-#: ../src/protocols/oscar/oscar.c:6298
+#: ../libgaim/protocols/oscar/oscar.c:6295
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Muuta tällä hetkellä rekisteröityä sähköpostiosoitetta..."
 
-#: ../src/protocols/oscar/oscar.c:6305
+#: ../libgaim/protocols/oscar/oscar.c:6302
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Näytä tuttavat jotka odottavat valtuutusta"
 
-#: ../src/protocols/oscar/oscar.c:6311
+#: ../libgaim/protocols/oscar/oscar.c:6308
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Etsi tuttavaa sähköpostiosoitteen perusteella..."
 
-#: ../src/protocols/oscar/oscar.c:6316
+#: ../libgaim/protocols/oscar/oscar.c:6313
 msgid "Search for Buddy by Information"
 msgstr "Etsi tuttavaa tietojen perusteella"
 
-#: ../src/protocols/oscar/oscar.c:6382
+#: ../libgaim/protocols/oscar/oscar.c:6381
 msgid "Use recent buddies group"
 msgstr "Käytä viimeaikaisten tuttavien ryhmää"
 
-#: ../src/protocols/oscar/oscar.c:6385
+#: ../libgaim/protocols/oscar/oscar.c:6384
 msgid "Show how long you have been idle"
 msgstr "Näyttää kuinka kauan olet ollut jouten."
 
@@ -9842,43 +10992,46 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/oscar/oscar.c:6510 ../src/protocols/oscar/oscar.c:6512
+#: ../libgaim/protocols/oscar/oscar.c:6510
+#: ../libgaim/protocols/oscar/oscar.c:6512
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ-yhteyskäytäntöliitännäinen"
 
-#: ../src/protocols/oscar/oscar.c:6537 ../src/protocols/zephyr/zephyr.c:2927
+#: ../libgaim/protocols/oscar/oscar.c:6537
+#: ../libgaim/protocols/yahoo/yahoo.c:3950
+#: ../libgaim/protocols/zephyr/zephyr.c:2980
 msgid "Encoding"
 msgstr "Merkistö"
 
-#: ../src/protocols/oscar/oscar.c:6541
-msgid ""
-"Always use AIM/ICQ proxy server\n"
+#: ../libgaim/protocols/oscar/oscar.c:6541
+msgid ""
+"Always use AIM/ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
 msgstr ""
-"Käytä aina AIM/ICQ-välipalvelinta\n"
+"Käytä aina AIM/ICQ-välipalvelinta tiedostonsiirroille\n"
 "(hitaampi, mutta ei paljasta IP-osoitettasi)"
 
-#: ../src/protocols/oscar/peer.c:613
+#: ../libgaim/protocols/oscar/peer.c:623
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr ""
 "Pyydetään %s yhdistämään meihin at %s:%hu suoraa pikaviestiyhteyttä varten."
 
-#: ../src/protocols/oscar/peer.c:662 ../src/protocols/oscar/peer.c:693
+#: ../libgaim/protocols/oscar/peer.c:703 ../libgaim/protocols/oscar/peer.c:738
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Yritetään yhdistää kohteeseen %s:%hu."
 
-#: ../src/protocols/oscar/peer.c:753
+#: ../libgaim/protocols/oscar/peer.c:803
 msgid "Attempting to connect via proxy server."
 msgstr "Yritetään yhdistämistä välipalvelimen kautta."
 
-#: ../src/protocols/oscar/peer.c:931
+#: ../libgaim/protocols/oscar/peer.c:980
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s on juuri pyytänyt suoraa yhteyttä %s:n"
 
-#: ../src/protocols/oscar/peer.c:935
+#: ../libgaim/protocols/oscar/peer.c:984
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -9888,132 +11041,838 @@
 "lähetettäessä kuvia. Koska IP-osoitteesi paljastuu, tätä voi pitää "
 "yksityisyysriskinä."
 
-#: ../src/protocols/sametime/sametime.c:415
+#: ../libgaim/protocols/qq/buddy_info.c:37
+msgid "Primary Information"
+msgstr "Ensisijaiset tiedot"
+
+#: ../libgaim/protocols/qq/buddy_info.c:39
+msgid "Personal Introduction"
+msgstr "Henkilökohtainen esittely"
+
+#: ../libgaim/protocols/qq/buddy_info.c:40
+msgid "QQ Number"
+msgstr "QQ-numero"
+
+#: ../libgaim/protocols/qq/buddy_info.c:45
+msgid "Country/Region"
+msgstr "Maa/alue"
+
+#: ../libgaim/protocols/qq/buddy_info.c:46
+msgid "Province/State"
+msgstr "Lääni/osavaltio"
+
+#: ../libgaim/protocols/qq/buddy_info.c:48
+msgid "Horoscope Symbol"
+msgstr "Horoskooppimerkki"
+
+#: ../libgaim/protocols/qq/buddy_info.c:50
+msgid "Zodiac Sign"
+msgstr "Eläinradan merkki"
+
+#: ../libgaim/protocols/qq/buddy_info.c:51
+msgid "Blood Type"
+msgstr "Veriryhmä"
+
+#: ../libgaim/protocols/qq/buddy_info.c:52
+msgid "College"
+msgstr "Yliopisto"
+
+#: ../libgaim/protocols/qq/buddy_info.c:53
+msgid "Email"
+msgstr "Sähköposti"
+
+#: ../libgaim/protocols/qq/buddy_info.c:55
+msgid "Zipcode"
+msgstr "Postinumero"
+
+#: ../libgaim/protocols/qq/buddy_info.c:56
+msgid "Cellphone Number"
+msgstr "Matkapuhelinnumero"
+
+#: ../libgaim/protocols/qq/buddy_info.c:57
+msgid "Phone Number"
+msgstr "Puhelinnumero"
+
+#: ../libgaim/protocols/qq/buddy_info.c:62
+msgid "Aquarius"
+msgstr "vesimies"
+
+#: ../libgaim/protocols/qq/buddy_info.c:62
+msgid "Pisces"
+msgstr "kalat"
+
+#: ../libgaim/protocols/qq/buddy_info.c:62
+msgid "Aries"
+msgstr "oinas"
+
+#: ../libgaim/protocols/qq/buddy_info.c:62
+msgid "Taurus"
+msgstr "härkä"
+
+#: ../libgaim/protocols/qq/buddy_info.c:63
+msgid "Gemini"
+msgstr "kaksoset"
+
+#: ../libgaim/protocols/qq/buddy_info.c:63
+msgid "Cancer"
+msgstr "rapu"
+
+#: ../libgaim/protocols/qq/buddy_info.c:63
+msgid "Leo"
+msgstr "leijona"
+
+#: ../libgaim/protocols/qq/buddy_info.c:63
+msgid "Virgo"
+msgstr "neitsyt"
+
+#: ../libgaim/protocols/qq/buddy_info.c:63
+msgid "Libra"
+msgstr "vaaka"
+
+#: ../libgaim/protocols/qq/buddy_info.c:64
+msgid "Scorpio"
+msgstr "skorpioni"
+
+#: ../libgaim/protocols/qq/buddy_info.c:64
+msgid "Sagittarius"
+msgstr "jousimies"
+
+#: ../libgaim/protocols/qq/buddy_info.c:64
+msgid "Capricorn"
+msgstr "kauris"
+
+#: ../libgaim/protocols/qq/buddy_info.c:69
+msgid "Rat"
+msgstr "rotta"
+
+#: ../libgaim/protocols/qq/buddy_info.c:69
+msgid "Ox"
+msgstr "härkä"
+
+#: ../libgaim/protocols/qq/buddy_info.c:69
+msgid "Tiger"
+msgstr "tiikeri"
+
+#: ../libgaim/protocols/qq/buddy_info.c:69
+msgid "Rabbit"
+msgstr "jänis"
+
+#: ../libgaim/protocols/qq/buddy_info.c:70
+msgid "Dragon"
+msgstr "lohikäärme"
+
+#: ../libgaim/protocols/qq/buddy_info.c:70
+msgid "Snake"
+msgstr "käärme"
+
+#: ../libgaim/protocols/qq/buddy_info.c:70
+msgid "Horse"
+msgstr "hevonen"
+
+#: ../libgaim/protocols/qq/buddy_info.c:70
+msgid "Goat"
+msgstr "vuohi"
+
+#: ../libgaim/protocols/qq/buddy_info.c:70
+msgid "Monkey"
+msgstr "apina"
+
+#: ../libgaim/protocols/qq/buddy_info.c:71
+msgid "Rooster"
+msgstr "kukko"
+
+#: ../libgaim/protocols/qq/buddy_info.c:71
+msgid "Dog"
+msgstr "koira"
+
+#: ../libgaim/protocols/qq/buddy_info.c:71
+msgid "Pig"
+msgstr "sika"
+
+#: ../libgaim/protocols/qq/buddy_info.c:76
+msgid "Other"
+msgstr "Muu"
+
+#: ../libgaim/protocols/qq/buddy_info.c:477
+#: ../libgaim/protocols/qq/buddy_info.c:478
+msgid "Modify my information"
+msgstr "Muokkaa tietojani"
+
+#: ../libgaim/protocols/qq/buddy_info.c:479
+msgid "Update my information"
+msgstr "Päivitä tietoni"
+
+#: ../libgaim/protocols/qq/buddy_info.c:502
+msgid "Your information has been updated"
+msgstr "Tietosi on päivitetty"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:205
+#: ../libgaim/protocols/qq/group_opt.c:133
+#, c-format
+msgid "You rejected %d's request"
+msgstr "Kieltäydyit %d:n pyynnöstä"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:206
+#: ../libgaim/protocols/qq/group_opt.c:134
+msgid "Input your reason:"
+msgstr "Anna syy:"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:208
+msgid "Reject request"
+msgstr "Kieltäydy pyynnöstä"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:209
+#: ../libgaim/protocols/qq/group_opt.c:137
+msgid "Sorry, you are not my type..."
+msgstr "Pahoittelut, en ole kiinnostunut..."
+
+#: ../libgaim/protocols/qq/buddy_opt.c:210
+#: ../libgaim/protocols/qq/group_im.c:134
+#: ../libgaim/protocols/qq/group_opt.c:123
+#: ../libgaim/protocols/qq/sys_msg.c:83 ../libgaim/protocols/qq/sys_msg.c:226
+msgid "Reject"
+msgstr "Kieltäydy"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:270
+msgid "Add buddy with auth request fails"
+msgstr "Lisää tuttava jolla on valtuuspyyntöjen epännistumisia"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:301
+msgid "You have successfully removed a buddy"
+msgstr "Tuttava poistettu onnistuneesti"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:329
+msgid "You have successfully removed yourself from a buddy"
+msgstr "Olet poistanut itsesi tuttavaltasi"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:393
+#, c-format
+msgid "User %d needs authentication"
+msgstr "Käyttäjä %d tarvitsee valtuutuksen"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:395
+#: ../libgaim/protocols/qq/group_join.c:132
+msgid "Input request here"
+msgstr "Anna syy tähän"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:396
+#: ../libgaim/protocols/qq/group_join.c:133
+msgid "Would you be my friend?"
+msgstr "Haluaisitko olla kaverini?"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:397
+#: ../libgaim/protocols/qq/group_join.c:134
+#: ../libgaim/protocols/qq/group_opt.c:138
+#: ../libgaim/protocols/qq/sendqueue.c:198
+msgid "Send"
+msgstr "Lähetä"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:404
+#, c-format
+msgid "You have added %d in buddy list"
+msgstr "Käyttäjä %d lisätty tuttavalistalle"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:501
+msgid "QQid Error"
+msgstr "QQid-virhe"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:502
+msgid "Invalid QQid"
+msgstr "Epäkelpo QQid"
+
+#: ../libgaim/protocols/qq/group.c:63
+msgid "ID: "
+msgstr "Tunniste (ID): "
+
+#: ../libgaim/protocols/qq/group.c:96
+msgid "Group ID"
+msgstr "Ryhmätunniste (ID):"
+
+#: ../libgaim/protocols/qq/group.c:98
+msgid "Creator"
+msgstr "Luoja"
+
+#: ../libgaim/protocols/qq/group.c:101
+msgid "Group Description"
+msgstr "Ryhmän kuvaus"
+
+#: ../libgaim/protocols/qq/group.c:107
+msgid "Auth"
+msgstr "Valtuutus"
+
+#: ../libgaim/protocols/qq/group.c:117
+msgid "QQ Qun"
+msgstr "QQ Qun"
+
+#: ../libgaim/protocols/qq/group.c:118
+msgid "Please input external group ID"
+msgstr "Syötä ulkopuolisen ryhmän tunniste (ID)"
+
+#: ../libgaim/protocols/qq/group.c:119
+msgid "You can only search for permanent QQ groups\n"
+msgstr "Voit etsiä vain pysyviä QQ-ryhmiä\n"
+
+#: ../libgaim/protocols/qq/group_im.c:120
+#, c-format
+msgid "User %d applied to join group %d"
+msgstr "Käyttäjä %d haki ryhmän %d jäsenyyttä"
+
+#: ../libgaim/protocols/qq/group_im.c:121
+#: ../libgaim/protocols/qq/group_im.c:170
+#: ../libgaim/protocols/qq/sys_msg.c:178
+#, c-format
+msgid "Reason: %s"
+msgstr "Syy: %s"
+
+#: ../libgaim/protocols/qq/group_im.c:128
+#: ../libgaim/protocols/qq/group_im.c:172
+#: ../libgaim/protocols/qq/group_im.c:212
+#: ../libgaim/protocols/qq/group_im.c:247
+#: ../libgaim/protocols/qq/group_im.c:281
+#: ../libgaim/protocols/qq/group_join.c:227
+#: ../libgaim/protocols/qq/group_join.c:353
+#: ../libgaim/protocols/qq/group_opt.c:228
+#: ../libgaim/protocols/qq/group_opt.c:298
+#: ../libgaim/protocols/qq/group_opt.c:384
+msgid "QQ Qun Operation"
+msgstr "QQ Qun -toiminta"
+
+#: ../libgaim/protocols/qq/group_im.c:131
+#: ../libgaim/protocols/qq/group_opt.c:125
+#: ../libgaim/protocols/qq/sys_msg.c:85 ../libgaim/protocols/qq/sys_msg.c:228
+msgid "Approve"
+msgstr "Hyväksy"
+
+#: ../libgaim/protocols/qq/group_im.c:169
+#, c-format
+msgid "You request to join group %d has been rejected by admin %d"
+msgstr "Pyyntösi liittyä ryhmään %d evättiin ylläpitäjän %d toimesta"
+
+#: ../libgaim/protocols/qq/group_im.c:210
+#, c-format
+msgid "You request to join group %d has been approved by admin %d"
+msgstr "Pyyntösi liittyä ryhmään %d hyväksyttiin ylläpitäjän %d toimesta"
+
+#: ../libgaim/protocols/qq/group_im.c:246
+#, c-format
+msgid "You [%d] has exit group \"%d\""
+msgstr "Sinä (%d) olet poistunut ryhmästä \"%d\""
+
+#: ../libgaim/protocols/qq/group_im.c:280
+#, c-format
+msgid "You [%d] has been added by group \"%d\""
+msgstr "Sinä (%d) olet lisätty ryhmään \"%d\""
+
+#: ../libgaim/protocols/qq/group_im.c:281
+msgid "This group has been added to your buddy list"
+msgstr "Tämä ryhmä on lisätty tuttavalistallesi"
+
+#: ../libgaim/protocols/qq/group_internal.c:39
+msgid "I am not member"
+msgstr "En ole jäsen"
+
+#: ../libgaim/protocols/qq/group_internal.c:42
+msgid "I am a member"
+msgstr "Olen jäsen"
+
+#: ../libgaim/protocols/qq/group_internal.c:45
+msgid "I am applying to join"
+msgstr "Pyydän liittymistä"
+
+#: ../libgaim/protocols/qq/group_internal.c:48
+msgid "I am the admin"
+msgstr "Olen ylläpitäjä"
+
+#: ../libgaim/protocols/qq/group_internal.c:51
+msgid "Unknown status"
+msgstr "Tuntematon tila"
+
+#: ../libgaim/protocols/qq/group_join.c:78
+msgid "This group does not allow others to join"
+msgstr "Tämä ryhmä ei salli muiden liittyä"
+
+#: ../libgaim/protocols/qq/group_join.c:227
+msgid "You have successfully exited the group"
+msgstr "Ryhmästä poistuminen onnistui"
+
+#: ../libgaim/protocols/qq/group_join.c:251
+msgid "QQ Group Auth"
+msgstr "QQ-ryhmän valtuutus"
+
+#: ../libgaim/protocols/qq/group_join.c:252
+msgid "Your authorization operation has been accepted by the QQ server"
+msgstr "QQ-palvelin on hyväksynyt valtuutustoimintosi"
+
+#: ../libgaim/protocols/qq/group_join.c:323
+msgid "You inputted a group id outside the acceptable range"
+msgstr "Olet syöttänyt hyväksyttävän skaalan ulkopuolisen ryhmätunnisteen (ID)"
+
+#: ../libgaim/protocols/qq/group_join.c:354
+msgid "Are you sure to exit this Qun?"
+msgstr "Haluatko varmasti poistua tästä Qun:sta?"
+
+#: ../libgaim/protocols/qq/group_join.c:356
+msgid ""
+"Note, if you are the creator, \n"
+"this operation will eventually remove this Qun."
+msgstr ""
+"Huomaa, että olet samalla Qun:n luoja, \n"
+"Tämä toiminto poistaa lopulta tämän Qun:n."
+
+#: ../libgaim/protocols/qq/group_join.c:359
+msgid "Go ahead"
+msgstr "Jatka"
+
+#: ../libgaim/protocols/qq/group_network.c:88
+#, c-format
+msgid "Code [0x%02X]: %s"
+msgstr "Koodi [0x%02X]: %s"
+
+#: ../libgaim/protocols/qq/group_network.c:89
+msgid "Group Operation Error"
+msgstr "Ryhmätoimintovirhe"
+
+#: ../libgaim/protocols/qq/group_opt.c:122
+#: ../libgaim/protocols/qq/sys_msg.c:82
+msgid "Do you wanna approve the request?"
+msgstr "Haluatko hyväksyä pyynnön?"
+
+#: ../libgaim/protocols/qq/group_opt.c:228
+msgid "You have successfully modify Qun member"
+msgstr "Qun-jäsentä muokattu onnistuneesti"
+
+#: ../libgaim/protocols/qq/group_opt.c:298
+msgid "You have successfully modify Qun information"
+msgstr "Qun-tietojen muokkaus onnistui"
+
+#: ../libgaim/protocols/qq/group_opt.c:385
+msgid "You have successfully created a Qun"
+msgstr "Qun:n luonti onnistui"
+
+#: ../libgaim/protocols/qq/group_opt.c:387
+msgid "Would you like to set up the Qun details now?"
+msgstr "Haluatko asettaa Qun:n yksityiskohdat nyt?"
+
+#: ../libgaim/protocols/qq/group_opt.c:388
+msgid "Setup"
+msgstr "Asetukset"
+
+#: ../libgaim/protocols/qq/im.c:421
+msgid "System Message"
+msgstr "Järjestelmäviesti"
+
+#: ../libgaim/protocols/qq/im.c:565
+msgid "Server ACK"
+msgstr "Palvelimen \"ACK\""
+
+#: ../libgaim/protocols/qq/im.c:565
+msgid "Send IM fail\n"
+msgstr "Pikaviestin lähetys epäonnistui\n"
+
+#: ../libgaim/protocols/qq/keep_alive.c:81
+msgid "Keep alive error, seems connection lost!"
+msgstr "Keepalive-virhe, yhteys vaikutta katkenneen."
+
+#: ../libgaim/protocols/qq/login_logout.c:404
+msgid "Request login token error!"
+msgstr "Kirjautumistunnisteen pyytämisvirhe."
+
+#: ../libgaim/protocols/qq/login_logout.c:479
+msgid "Wrong password!"
+msgstr "Väärä salasana."
+
+#: ../libgaim/protocols/qq/login_logout.c:482
+msgid "Unable to login, check debug log"
+msgstr "Ei kyetty kirjautumaan, tarkista virheenjäljitysloki"
+
+#. we didn't successfully connect. tdt->toc_fd is valid here
+#: ../libgaim/protocols/qq/qq.c:137 ../libgaim/protocols/toc/toc.c:173
+#: ../libgaim/protocols/yahoo/yahoo.c:2356
+#: ../libgaim/protocols/yahoo/yahoo.c:2383
+#: ../libgaim/protocols/yahoo/yahoo.c:2490
+#: ../libgaim/protocols/yahoo/yahoo.c:2511
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:108
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:188
+#: ../libgaim/protocols/yahoo/ycht.c:549
+msgid "Unable to connect."
+msgstr "Yhteyden muodostaminen epäonnistui."
+
+#: ../libgaim/protocols/qq/qq.c:283
+msgid "QQ: Available"
+msgstr "QQ: Tavoitettavissa"
+
+#: ../libgaim/protocols/qq/qq.c:287
+msgid "QQ: Away"
+msgstr "QQ: Poissa"
+
+#: ../libgaim/protocols/qq/qq.c:291
+msgid "QQ: Invisible"
+msgstr "QQ: Näkymätön"
+
+#: ../libgaim/protocols/qq/qq.c:295
+msgid "QQ: Offline"
+msgstr "QQ: Poissa linjoilta"
+
+#: ../libgaim/protocols/qq/qq.c:372
+msgid "Invalid name"
+msgstr "Epäkelpo nimi"
+
+#: ../libgaim/protocols/qq/qq.c:442
+msgid "Selection"
+msgstr "Valinta"
+
+#: ../libgaim/protocols/qq/qq.c:445
+msgid "Select a number"
+msgstr "Valitse numero"
+
+#: ../libgaim/protocols/qq/qq.c:451
+msgid "Faces"
+msgstr "Kasvot"
+
+#: ../libgaim/protocols/qq/qq.c:456
+msgid "Change Your QQ Face"
+msgstr "Vaihda QQ-kasvot"
+
+#: ../libgaim/protocols/qq/qq.c:457
+msgid "Change Face"
+msgstr "Vaihda kasvot"
+
+#: ../libgaim/protocols/qq/qq.c:458
+msgid "Update"
+msgstr "Päivitä"
+
+#: ../libgaim/protocols/qq/qq.c:512
+#, c-format
+msgid "<b>Current Online</b>: %d<br>\n"
+msgstr "<b>Parhaillaan kirjautuneena</b>: %d<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:513
+#, c-format
+msgid "<b>Last Refresh</b>: %s<br>\n"
+msgstr "<b>Viimeisin päivitys:</b> %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:517
+#, c-format
+msgid "<b>Connection Mode</b>: %s<br>\n"
+msgstr "<b>Yhteystila</b>: %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:518
+#, c-format
+msgid "<b>Server IP</b>: %s: %d<br>\n"
+msgstr "<b>Palvelimen IP:</b>: %s: %d<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:519
+#, c-format
+msgid "<b>My Public IP</b>: %s<br>\n"
+msgstr "<b>Oma julkinen IP</b>: %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:524
+#, c-format
+msgid "<b>Login Time</b>: %s<br>\n"
+msgstr "<b>Kirjautumisaika</b>: %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:525
+#, c-format
+msgid "<b>Last Login IP</b>: %s<br>\n"
+msgstr "<b>Viimeisimmän kirjautumisen IP</b>: %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:526
+#, c-format
+msgid "<b>Last Login Time</b>: %s\n"
+msgstr "<b>Viimeisin kirjautumisaika:</b>: %s\n"
+
+#: ../libgaim/protocols/qq/qq.c:530
+msgid "Login Information"
+msgstr "Kirjautumistietoja"
+
+#: ../libgaim/protocols/qq/qq.c:802
+msgid "Modify My Information"
+msgstr "Muokkaa tietojani"
+
+#: ../libgaim/protocols/qq/qq.c:805
+msgid "Change My Face"
+msgstr "Vaihda kasvot"
+
+#: ../libgaim/protocols/qq/qq.c:808 ../libgaim/protocols/toc/toc.c:1700
+msgid "Change Password"
+msgstr "Vaihda salasana"
+
+#: ../libgaim/protocols/qq/qq.c:811
+msgid "Show Login Information"
+msgstr "Näytä kirjautumistiedot"
+
+#: ../libgaim/protocols/qq/qq.c:837
+msgid "Exit this QQ Qun"
+msgstr "Poistu tästä QQ-Qun:sta"
+
+#: ../libgaim/protocols/qq/qq.c:922
+msgid "This function has not be implemented yet"
+msgstr "Tätä toimintoa ei ole vielä toteutettu"
+
+#: ../libgaim/protocols/qq/qq.c:922
+msgid "Please wait for new version"
+msgstr "Odota uutta versiota"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/protocols/qq/qq.c:1004 ../libgaim/protocols/qq/qq.c:1006
+msgid "QQ Protocol\tPlugin"
+msgstr "QQ-yhteyskäytäntöliitännäinen"
+
+#: ../libgaim/protocols/qq/qq.c:1025
+msgid "Login in TCP"
+msgstr "Kirjaudu TCP:llä"
+
+#: ../libgaim/protocols/qq/qq.c:1028
+msgid "Login Hidden"
+msgstr "Piilotettu kirjautuminen"
+
+#: ../libgaim/protocols/qq/qq.c:1031
+msgid "QQ Server"
+msgstr "QQ-palvelin"
+
+#: ../libgaim/protocols/qq/qq.c:1034
+msgid "QQ Port"
+msgstr "QQ-portti"
+
+#: ../libgaim/protocols/qq/qq_proxy.c:493
+msgid "Socket send error"
+msgstr "Pistokkeen lähetysvirhe"
+
+#: ../libgaim/protocols/qq/qq_proxy.c:496
+msgid "Connection refused"
+msgstr "Yhteys torjuttu"
+
+#: ../libgaim/protocols/qq/recv_core.c:304
+msgid "Socket error"
+msgstr "Pistokevirhe"
+
+#: ../libgaim/protocols/qq/recv_core.c:314
+msgid "Unable to read from socket"
+msgstr "Ei kyetty lukemaan pistoketta"
+
+#: ../libgaim/protocols/qq/send_file.c:708
+#, c-format
+msgid "Your request to send file[%s] has been rejected by buddy[%d]"
+msgstr "Pyyntösi lähettää tiedosto (%s) one evätty tuttavan (%d) toimesta"
+
+#: ../libgaim/protocols/qq/send_file.c:711
+#: ../libgaim/protocols/qq/send_file.c:740
+msgid "File Send"
+msgstr "Tiedoston lähetys"
+
+#: ../libgaim/protocols/qq/send_file.c:737
+#, c-format
+msgid "The sending process of file[%s] has been cancaled by buddy[%d]"
+msgstr "Tiedoston (%s) lähetys on peruutettu tuttavan (%d) toimesta"
+
+#: ../libgaim/protocols/qq/sendqueue.c:167
+msgid "Connection lost!"
+msgstr "Yhteys sulkeutui."
+
+#. cancel logging progress
+#: ../libgaim/protocols/qq/sendqueue.c:174
+msgid "Login failed, no reply!"
+msgstr "Kirjautuminen epäonnistui, ei vastausta."
+
+#: ../libgaim/protocols/qq/sendqueue.c:179
+msgid "Connection timeout!"
+msgstr "Ei yhteyttä määräajassa"
+
+#: ../libgaim/protocols/qq/sendqueue.c:179
+msgid "User info is not updated"
+msgstr "Käyttäjätietoja ei ole päivitetty"
+
+#: ../libgaim/protocols/qq/sendqueue.c:194
+msgid "Send packet"
+msgstr "Lähetä paketti"
+
+#: ../libgaim/protocols/qq/sendqueue.c:196
+msgid "Packets lost, send again?"
+msgstr "Paketteja hukkui, lähetä uudelleen?"
+
+#: ../libgaim/protocols/qq/sys_msg.c:101
+msgid "Do you wanna add this buddy?"
+msgstr "Haluatko lisätä tämän tuttavan?"
+
+#. only need to get value
+#: ../libgaim/protocols/qq/sys_msg.c:153
+#, c-format
+msgid "You have been added by %s"
+msgstr "Sinut on lisännyt %s"
+
+#: ../libgaim/protocols/qq/sys_msg.c:156
+msgid "Would like to add him?"
+msgstr "Haluatko lisätä hänet?"
+
+#: ../libgaim/protocols/qq/sys_msg.c:162
+#, c-format
+msgid "%s has added you [%s]"
+msgstr "%s on lisännyt sinut (%s)"
+
+#: ../libgaim/protocols/qq/sys_msg.c:177
+#, c-format
+msgid "User %s rejected your request"
+msgstr "Käyttäjä %s on kieltäytynyt pyynnöstäsi"
+
+#: ../libgaim/protocols/qq/sys_msg.c:197
+#, c-format
+msgid "User %s has approved your request"
+msgstr "Käyttäjä %s on hyväksynyt pyyntösi."
+
+#: ../libgaim/protocols/qq/sys_msg.c:220
+#, c-format
+msgid "%s wanna add you [%s] as friends"
+msgstr "Käyttäjä %s tahtoo lisätä sinut (%s) kaverikseen"
+
+#: ../libgaim/protocols/qq/sys_msg.c:221
+#, c-format
+msgid "Message: %s"
+msgstr "Viesti: %s"
+
+#: ../libgaim/protocols/qq/sys_msg.c:242
+#, c-format
+msgid "%s is not in your buddy list"
+msgstr "%s ei ole tuttavalistallasi"
+
+#: ../libgaim/protocols/qq/sys_msg.c:244
+msgid "Would you like to add him?"
+msgstr "Haluatko lisätä hänet?"
+
+#: ../libgaim/protocols/sametime/sametime.c:415
 msgid "Connection closed (writing)"
 msgstr "Yhteys suljettu (kirjoitus)"
 
-#: ../src/protocols/sametime/sametime.c:1261
+#: ../libgaim/protocols/sametime/sametime.c:1261
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Ryhmän nimi:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:1262
+#: ../libgaim/protocols/sametime/sametime.c:1262
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>Notesin ryhmä-ID:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:1264
+#: ../libgaim/protocols/sametime/sametime.c:1264
 #, c-format
 msgid "Info for Group %s"
 msgstr "Tietoja ryhmästä %s"
 
-#: ../src/protocols/sametime/sametime.c:1266
+#: ../libgaim/protocols/sametime/sametime.c:1266
 msgid "Notes Address Book Information"
 msgstr "Notesin osoitekirjatiedot"
 
-#: ../src/protocols/sametime/sametime.c:1298
+#: ../libgaim/protocols/sametime/sametime.c:1298
 msgid "Invite Group to Conference..."
 msgstr "Kutsu ryhmä neuvotteluun..."
 
-#: ../src/protocols/sametime/sametime.c:1308
+#: ../libgaim/protocols/sametime/sametime.c:1308
 msgid "Get Notes Address Book Info"
 msgstr "Hae Notesin osoitekirjatiedot"
 
-#: ../src/protocols/sametime/sametime.c:1461
+#: ../libgaim/protocols/sametime/sametime.c:1461
 msgid "Sending Handshake"
 msgstr "Lähetetään kättelyä"
 
-#: ../src/protocols/sametime/sametime.c:1466
+#: ../libgaim/protocols/sametime/sametime.c:1466
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "Odotetaan kättelyn vahvistusta"
 
-#: ../src/protocols/sametime/sametime.c:1471
+#: ../libgaim/protocols/sametime/sametime.c:1471
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Kättely vahvistettu, kirjaudutaan"
 
-#: ../src/protocols/sametime/sametime.c:1476
+#: ../libgaim/protocols/sametime/sametime.c:1476
 msgid "Waiting for Login Acknowledgement"
 msgstr "Odotetaan kirjautumisen vahvistusta"
 
-#: ../src/protocols/sametime/sametime.c:1481
+#: ../libgaim/protocols/sametime/sametime.c:1481
 msgid "Login Redirected"
 msgstr "Sisäänkirjautuminen uudelleenohjattu"
 
-#: ../src/protocols/sametime/sametime.c:1487
+#: ../libgaim/protocols/sametime/sametime.c:1487
 msgid "Forcing Login"
 msgstr "Pakotetaan sisäänkirjautuminen"
 
-#: ../src/protocols/sametime/sametime.c:1491
+#: ../libgaim/protocols/sametime/sametime.c:1491
 msgid "Login Acknowledged"
 msgstr "Kirjautuminen vahvistettu"
 
-#: ../src/protocols/sametime/sametime.c:1496
+#: ../libgaim/protocols/sametime/sametime.c:1496
 msgid "Starting Services"
 msgstr "Käynnistetään palveluja"
 
-#: ../src/protocols/sametime/sametime.c:1501
+#: ../libgaim/protocols/sametime/sametime.c:1501
 msgid "Connected"
 msgstr "Yhdistetty"
 
-#: ../src/protocols/sametime/sametime.c:1599
+#: ../libgaim/protocols/sametime/sametime.c:1599
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr "Sametime-ylläpitäjä on julkaissut seuraavan tiedotteen palvelimella %s"
 
-#: ../src/protocols/sametime/sametime.c:1604
+#: ../libgaim/protocols/sametime/sametime.c:1604
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime-ylläpitäjän tiedote"
 
-#: ../src/protocols/sametime/sametime.c:1656
+#: ../libgaim/protocols/sametime/sametime.c:1656
 msgid "Connection reset"
 msgstr "Yhteys suljettu"
 
-#: ../src/protocols/sametime/sametime.c:1663
+#: ../libgaim/protocols/sametime/sametime.c:1663
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Virhe luettaessa socketista: %s"
 
 #. this is a regular connect, error out
-#: ../src/protocols/sametime/sametime.c:1692
-#: ../src/protocols/sametime/sametime.c:3688
+#: ../libgaim/protocols/sametime/sametime.c:1688
+#: ../libgaim/protocols/sametime/sametime.c:3685
 msgid "Unable to connect to host"
 msgstr "Palvelimeen ei kyetty muodostamaan yhteyttä"
 
-#: ../src/protocols/sametime/sametime.c:1730
+#: ../libgaim/protocols/sametime/sametime.c:1726
 #, c-format
 msgid "Announcement from %s"
 msgstr "Ilmoitus käyttäjältä %s"
 
-#: ../src/protocols/sametime/sametime.c:1904
+#: ../libgaim/protocols/sametime/sametime.c:1900
 msgid "Conference Closed"
 msgstr "Neuvottelu suljettu"
 
-#: ../src/protocols/sametime/sametime.c:2361
+#: ../libgaim/protocols/sametime/sametime.c:2357
 msgid "Unable to send message: "
 msgstr "Viestiä ei voitu lähettää: "
 
-#: ../src/protocols/sametime/sametime.c:2918
+#: ../libgaim/protocols/sametime/sametime.c:2914
 msgid "Place Closed"
 msgstr "Paikka suljettu"
 
-#: ../src/protocols/sametime/sametime.c:3209
+#: ../libgaim/protocols/sametime/sametime.c:3205
 msgid "Microphone"
 msgstr "Mikrofoni"
 
-#: ../src/protocols/sametime/sametime.c:3210
+#: ../libgaim/protocols/sametime/sametime.c:3206
 msgid "Speakers"
 msgstr "Kaiuttimet"
 
-#: ../src/protocols/sametime/sametime.c:3211
+#: ../libgaim/protocols/sametime/sametime.c:3207
 msgid "Video Camera"
 msgstr "Videokamera"
 
-#: ../src/protocols/sametime/sametime.c:3215
+#: ../libgaim/protocols/sametime/sametime.c:3211
 msgid "File Transfer"
 msgstr "Tiedostonsiirto"
 
-#: ../src/protocols/sametime/sametime.c:3249
+#: ../libgaim/protocols/sametime/sametime.c:3245
 #, c-format
 msgid ""
 "\n"
@@ -10022,7 +11881,7 @@
 "\n"
 "<b>Tukee</b>: %s"
 
-#: ../src/protocols/sametime/sametime.c:3254
+#: ../libgaim/protocols/sametime/sametime.c:3250
 msgid ""
 "\n"
 "<b>External User</b>"
@@ -10030,11 +11889,11 @@
 "\n"
 "<b>Ulkoinen käyttäjä</b>"
 
-#: ../src/protocols/sametime/sametime.c:3360
+#: ../libgaim/protocols/sametime/sametime.c:3356
 msgid "Create conference with user"
 msgstr "Aloita neuvottelu käyttäjän kanssa"
 
-#: ../src/protocols/sametime/sametime.c:3361
+#: ../libgaim/protocols/sametime/sametime.c:3357
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -10043,27 +11902,27 @@
 "Kirjoita uuden neuvottelun puheenaihe sekä kutsuviesti joka lähetetään "
 "käyttäjälle %s"
 
-#: ../src/protocols/sametime/sametime.c:3365
+#: ../libgaim/protocols/sametime/sametime.c:3361
 msgid "New Conference"
 msgstr "Aloita neuvottelu"
 
-#: ../src/protocols/sametime/sametime.c:3367
+#: ../libgaim/protocols/sametime/sametime.c:3363
 msgid "Create"
 msgstr "Aloita"
 
-#: ../src/protocols/sametime/sametime.c:3431
+#: ../libgaim/protocols/sametime/sametime.c:3427
 msgid "Available Conferences"
 msgstr "Käynnissä olevat neuvottelut"
 
-#: ../src/protocols/sametime/sametime.c:3437
+#: ../libgaim/protocols/sametime/sametime.c:3433
 msgid "Create New Conference..."
 msgstr "Aloita uusi neuvottelu..."
 
-#: ../src/protocols/sametime/sametime.c:3444
+#: ../libgaim/protocols/sametime/sametime.c:3440
 msgid "Invite user to a conference"
 msgstr "Kutsu käyttäjä neuvotteluun"
 
-#: ../src/protocols/sametime/sametime.c:3445
+#: ../libgaim/protocols/sametime/sametime.c:3441
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -10074,27 +11933,23 @@
 "Valitse \"Aloita uusi neuvottelu\" jos haluat aloittaa uuden neuvottelun ja "
 "kutsua tämän käyttäjän sinne."
 
-#: ../src/protocols/sametime/sametime.c:3450
+#: ../libgaim/protocols/sametime/sametime.c:3446
 msgid "Invite to Conference"
 msgstr "Kutsu neuvotteluun"
 
-#: ../src/protocols/sametime/sametime.c:3452
-msgid "Invite"
-msgstr "Kutsu"
-
-#: ../src/protocols/sametime/sametime.c:3540
+#: ../libgaim/protocols/sametime/sametime.c:3536
 msgid "Invite to Conference..."
 msgstr "Kutsu neuvotteluun..."
 
-#: ../src/protocols/sametime/sametime.c:3545
+#: ../libgaim/protocols/sametime/sametime.c:3541
 msgid "Send TEST Announcement"
 msgstr "Lähetä TEST-ilmoitus"
 
-#: ../src/protocols/sametime/sametime.c:3592
+#: ../libgaim/protocols/sametime/sametime.c:3588
 msgid "No Sametime Community Server specified"
 msgstr "Sametime-yhteisöpalvelinta ei ole määritelty"
 
-#: ../src/protocols/sametime/sametime.c:3614
+#: ../libgaim/protocols/sametime/sametime.c:3610
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -10103,62 +11958,62 @@
 "Isäntää tai IP-osoitetta ei ole astetettu Meanwhile-käyttäjätilille %s. "
 "Lisää sellainen alle ennen kirjautumista sisään."
 
-#: ../src/protocols/sametime/sametime.c:3619
+#: ../libgaim/protocols/sametime/sametime.c:3615
 msgid "Meanwhile Connection Setup"
 msgstr "Meanwhilen yhteysasetukset"
 
-#: ../src/protocols/sametime/sametime.c:3620
+#: ../libgaim/protocols/sametime/sametime.c:3616
 msgid "No Sametime Community Server Specified"
 msgstr "Sametime-yhteisöpalvelinta ei ole määritelty"
 
-#: ../src/protocols/sametime/sametime.c:4082
+#: ../libgaim/protocols/sametime/sametime.c:4084
 msgid "<b>External User</b><br>"
 msgstr "<b>Ulkoinen käyttäjä</b><br>"
 
-#: ../src/protocols/sametime/sametime.c:4085
+#: ../libgaim/protocols/sametime/sametime.c:4087
 #, c-format
 msgid "<b>User ID:</b> %s<br>"
 msgstr "<b>Käyttäjän ID:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4091
+#: ../libgaim/protocols/sametime/sametime.c:4093
 #, c-format
 msgid "<b>Full Name:</b> %s<br>"
 msgstr "<b>Koko nimi:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4097
+#: ../libgaim/protocols/sametime/sametime.c:4099
 msgid "<b>Last Known Client:</b> "
 msgstr "<b>Viimeksi nähty asiakas:</b> "
 
-#: ../src/protocols/sametime/sametime.c:4105
+#: ../libgaim/protocols/sametime/sametime.c:4107
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Tuntematon (0x%04x)<br>"
 
-#: ../src/protocols/sametime/sametime.c:4112
+#: ../libgaim/protocols/sametime/sametime.c:4114
 #, c-format
 msgid "<b>Supports:</b> %s<br>"
 msgstr "<b>Tukee:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4118
+#: ../libgaim/protocols/sametime/sametime.c:4120
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>Tila:</b> %s"
 
-#: ../src/protocols/sametime/sametime.c:4261
-#: ../src/protocols/sametime/sametime.c:5424
+#: ../libgaim/protocols/sametime/sametime.c:4263
+#: ../libgaim/protocols/sametime/sametime.c:5427
 msgid "User Name"
 msgstr "Käyttäjänimi"
 
-#: ../src/protocols/sametime/sametime.c:4264
-#: ../src/protocols/sametime/sametime.c:5427
+#: ../libgaim/protocols/sametime/sametime.c:4266
+#: ../libgaim/protocols/sametime/sametime.c:5430
 msgid "Sametime ID"
 msgstr "Sametime-tunnus"
 
-#: ../src/protocols/sametime/sametime.c:4288
+#: ../libgaim/protocols/sametime/sametime.c:4290
 msgid "An ambiguous user ID was entered"
 msgstr "Epäselvä käyttäjätunnus syötetty"
 
-#: ../src/protocols/sametime/sametime.c:4289
+#: ../libgaim/protocols/sametime/sametime.c:4291
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -10167,15 +12022,15 @@
 "Tunniste '%s' voi viitata keneen tahansa seuraavista käyttäjistä. Valitse "
 "oikea käyttäjä alla olevasta luettelosta lisätäksesi hänet tuttavalistallesi."
 
-#: ../src/protocols/sametime/sametime.c:4294
+#: ../libgaim/protocols/sametime/sametime.c:4296
 msgid "Select User"
 msgstr "Valitse käyttäjä"
 
-#: ../src/protocols/sametime/sametime.c:4364
+#: ../libgaim/protocols/sametime/sametime.c:4366
 msgid "Unable to add user: user not found"
 msgstr "Ei voitu lisätä käyttäjää: käyttäjää ei löydy"
 
-#: ../src/protocols/sametime/sametime.c:4366
+#: ../libgaim/protocols/sametime/sametime.c:4368
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -10184,11 +12039,11 @@
 "Tunnisteella '%s' ei löytynyt osumia Sametime-yhteisöstäsi. Tämä hakusana "
 "onpoistettu tuttavalistaltasi."
 
-#: ../src/protocols/sametime/sametime.c:4371
+#: ../libgaim/protocols/sametime/sametime.c:4373
 msgid "Unable to add user"
 msgstr "Ei voitu lisätä käyttäjää"
 
-#: ../src/protocols/sametime/sametime.c:4943
+#: ../libgaim/protocols/sametime/sametime.c:4945
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10197,64 +12052,64 @@
 "Virhe luettaessa tiedostoa %s:  \n"
 "%s.\n"
 
-#: ../src/protocols/sametime/sametime.c:5074
+#: ../libgaim/protocols/sametime/sametime.c:5077
 msgid "Remotely Stored Buddy List"
 msgstr "Etätallennettu tuttavalista"
 
 # NOTE source: gftt glossary
-#: ../src/protocols/sametime/sametime.c:5079
+#: ../libgaim/protocols/sametime/sametime.c:5082
 msgid "Buddy List Storage Mode"
 msgstr "Tuttavalistan tallennustapa"
 
-#: ../src/protocols/sametime/sametime.c:5082
+#: ../libgaim/protocols/sametime/sametime.c:5085
 msgid "Local Buddy List Only"
 msgstr "Vain paikallinen tuttavalista"
 
-#: ../src/protocols/sametime/sametime.c:5084
+#: ../libgaim/protocols/sametime/sametime.c:5087
 msgid "Merge List from Server"
 msgstr "Yhdistä tuttavalista palvelimelta"
 
-#: ../src/protocols/sametime/sametime.c:5086
+#: ../libgaim/protocols/sametime/sametime.c:5089
 msgid "Merge and Save List to Server"
 msgstr "Yhdistä ja tallenna lista palvelimelle"
 
-#: ../src/protocols/sametime/sametime.c:5088
+#: ../libgaim/protocols/sametime/sametime.c:5091
 msgid "Synchronize List with Server"
 msgstr "Täsmää lista palvelimen kanssa"
 
-#: ../src/protocols/sametime/sametime.c:5137
+#: ../libgaim/protocols/sametime/sametime.c:5140
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Tuo Sametime-lista käyttäjätililtä %s"
 
-#: ../src/protocols/sametime/sametime.c:5176
+#: ../libgaim/protocols/sametime/sametime.c:5179
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Vie Sametime-lista käyttäjätilille %s"
 
-#: ../src/protocols/sametime/sametime.c:5229
+#: ../libgaim/protocols/sametime/sametime.c:5232
 msgid "Unable to add group: group exists"
 msgstr "Ei voitu lisätä ryhmää: ryhmä on jo olemassa"
 
-#: ../src/protocols/sametime/sametime.c:5230
+#: ../libgaim/protocols/sametime/sametime.c:5233
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Ryhmä '%s' on jo tuttavalistallasi."
 
-#: ../src/protocols/sametime/sametime.c:5233
-#: ../src/protocols/sametime/sametime.c:5362
+#: ../libgaim/protocols/sametime/sametime.c:5236
+#: ../libgaim/protocols/sametime/sametime.c:5365
 msgid "Unable to add group"
 msgstr "Ryhmää ei voitu lisätä"
 
-#: ../src/protocols/sametime/sametime.c:5292
+#: ../libgaim/protocols/sametime/sametime.c:5295
 msgid "Possible Matches"
 msgstr "Mahdollisia osumia"
 
-#: ../src/protocols/sametime/sametime.c:5308
+#: ../libgaim/protocols/sametime/sametime.c:5311
 msgid "Notes Address Book group results"
 msgstr "Notesin osoitekirjan ryhmätulokset"
 
-#: ../src/protocols/sametime/sametime.c:5309
+#: ../libgaim/protocols/sametime/sametime.c:5312
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -10265,15 +12120,15 @@
 "ryhmistä. Valitse oikea ryhmä alla olevasta luettelosta lisätäksesi sen "
 "tuttavalistallesi."
 
-#: ../src/protocols/sametime/sametime.c:5314
+#: ../libgaim/protocols/sametime/sametime.c:5317
 msgid "Select Notes Address Book"
 msgstr "Valitse Notesin osoitekirja"
 
-#: ../src/protocols/sametime/sametime.c:5356
+#: ../libgaim/protocols/sametime/sametime.c:5359
 msgid "Unable to add group: group not found"
 msgstr "Ei voitu lisätä ryhmää: ryhmää ei löytynyt"
 
-#: ../src/protocols/sametime/sametime.c:5358
+#: ../libgaim/protocols/sametime/sametime.c:5361
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -10282,11 +12137,11 @@
 "Tunnisteella '%s' ei löytynyt osumia Sametime-yhteisösi Notesin osoitekirjan "
 "ryhmistä."
 
-#: ../src/protocols/sametime/sametime.c:5399
+#: ../libgaim/protocols/sametime/sametime.c:5402
 msgid "Notes Address Book Group"
 msgstr "Notesin osoitekirjan ryhmä"
 
-#: ../src/protocols/sametime/sametime.c:5400
+#: ../libgaim/protocols/sametime/sametime.c:5403
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
@@ -10294,12 +12149,12 @@
 "Kirjoita Notesin osoitekirjan ryhmän nimi allaolevaan kenttään lisätäksesi "
 "ryhmän ja sen jäsenet tuttavalistallesi."
 
-#: ../src/protocols/sametime/sametime.c:5448
+#: ../libgaim/protocols/sametime/sametime.c:5451
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Hakutulokset haulle '%s'"
 
-#: ../src/protocols/sametime/sametime.c:5449
+#: ../libgaim/protocols/sametime/sametime.c:5452
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -10310,24 +12165,24 @@
 "lisätä nämä käyttäjät tuttavalistallesi tai lähettää heille viestejä alla "
 "olevilla painikkeilla."
 
-#: ../src/protocols/sametime/sametime.c:5481
+#: ../libgaim/protocols/sametime/sametime.c:5484
 msgid "No matches"
 msgstr "Ei tuloksia"
 
-#: ../src/protocols/sametime/sametime.c:5482
+#: ../libgaim/protocols/sametime/sametime.c:5485
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr "Tunnisteella '%s' ei löytynyt osumia Sametime-yhteisöstäsi."
 
-#: ../src/protocols/sametime/sametime.c:5486
+#: ../libgaim/protocols/sametime/sametime.c:5489
 msgid "No Matches"
 msgstr "Ei tuloksia"
 
-#: ../src/protocols/sametime/sametime.c:5523
+#: ../libgaim/protocols/sametime/sametime.c:5526
 msgid "Search for a user"
 msgstr "Etsi käyttäjiä"
 
-#: ../src/protocols/sametime/sametime.c:5524
+#: ../libgaim/protocols/sametime/sametime.c:5527
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -10335,83 +12190,83 @@
 "Kirjoita nimi tai osittainen käyttäjätunnus alla olevaan kenttään etsiäksesi "
 "käyttäjiä Sametime-yhteisöstäsi."
 
-#: ../src/protocols/sametime/sametime.c:5527
+#: ../libgaim/protocols/sametime/sametime.c:5530
 msgid "User Search"
 msgstr "Käyttäjähaku"
 
-#: ../src/protocols/sametime/sametime.c:5539
+#: ../libgaim/protocols/sametime/sametime.c:5542
 msgid "Import Sametime List..."
 msgstr "Tuo Sametime-lista..."
 
-#: ../src/protocols/sametime/sametime.c:5543
+#: ../libgaim/protocols/sametime/sametime.c:5546
 msgid "Export Sametime List..."
 msgstr "Vie Sametime-lista..."
 
-#: ../src/protocols/sametime/sametime.c:5547
+#: ../libgaim/protocols/sametime/sametime.c:5550
 msgid "Add Notes Address Book Group..."
 msgstr "Lisää Notesin osoitekirjan ryhmä..."
 
-#: ../src/protocols/sametime/sametime.c:5551
+#: ../libgaim/protocols/sametime/sametime.c:5554
 msgid "User Search..."
 msgstr "Käyttäjähaku..."
 
-#: ../src/protocols/sametime/sametime.c:5648
+#: ../libgaim/protocols/sametime/sametime.c:5651
 msgid "Force login (ignore server redirects)"
 msgstr "Pakota sisäänkirjautuminen (älä välitä palvelinuudelleenohjauksista)"
 
 #. pretend to be Sametime Connect
-#: ../src/protocols/sametime/sametime.c:5658
+#: ../libgaim/protocols/sametime/sametime.c:5661
 msgid "Hide client identity"
 msgstr "Piilota asiakasohjelman tunniste"
 
-#: ../src/protocols/silc/buddy.c:52 ../src/protocols/silc/buddy.c:420
-#: ../src/protocols/silc/buddy.c:545 ../src/protocols/silc/buddy.c:711
-#: ../src/protocols/silc/ft.c:338
+#: ../libgaim/protocols/silc/buddy.c:52 ../libgaim/protocols/silc/buddy.c:420
+#: ../libgaim/protocols/silc/buddy.c:545 ../libgaim/protocols/silc/buddy.c:711
+#: ../libgaim/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "Käyttäjä %s ei ole läsnä verkossa"
 
-#: ../src/protocols/silc/buddy.c:53 ../src/protocols/silc/buddy.c:115
-#: ../src/protocols/silc/buddy.c:120 ../src/protocols/silc/buddy.c:124
-#: ../src/protocols/silc/buddy.c:129 ../src/protocols/silc/buddy.c:134
-#: ../src/protocols/silc/buddy.c:139 ../src/protocols/silc/buddy.c:257
+#: ../libgaim/protocols/silc/buddy.c:53 ../libgaim/protocols/silc/buddy.c:115
+#: ../libgaim/protocols/silc/buddy.c:120 ../libgaim/protocols/silc/buddy.c:124
+#: ../libgaim/protocols/silc/buddy.c:129 ../libgaim/protocols/silc/buddy.c:134
+#: ../libgaim/protocols/silc/buddy.c:139 ../libgaim/protocols/silc/buddy.c:257
 msgid "Key Agreement"
 msgstr "Avainsopimus"
 
-#: ../src/protocols/silc/buddy.c:54
+#: ../libgaim/protocols/silc/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "Ei voida suorittaa avainsopimusta"
 
-#: ../src/protocols/silc/buddy.c:116
+#: ../libgaim/protocols/silc/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "Virhe tapahtui avainsopimuksen aikana"
 
-#: ../src/protocols/silc/buddy.c:120
+#: ../libgaim/protocols/silc/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "Avainsopimus epäonnistui"
 
-#: ../src/protocols/silc/buddy.c:125
+#: ../libgaim/protocols/silc/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "Aikakatkaisu avainsopimuksen aikana"
 
-#: ../src/protocols/silc/buddy.c:130
+#: ../libgaim/protocols/silc/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "Avainsopimus peruutettiin"
 
-#: ../src/protocols/silc/buddy.c:135
+#: ../libgaim/protocols/silc/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "Avainsopimus on jo aloitettu"
 
-#: ../src/protocols/silc/buddy.c:140
+#: ../libgaim/protocols/silc/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "Avainsopimusta et voi tehdä itsesi kanssa"
 
-#: ../src/protocols/silc/buddy.c:258 ../src/protocols/silc/buddy.c:388
-#: ../src/protocols/silc/buddy.c:513
+#: ../libgaim/protocols/silc/buddy.c:258 ../libgaim/protocols/silc/buddy.c:388
+#: ../libgaim/protocols/silc/buddy.c:513
 msgid "The remote user is not present in the network any more"
 msgstr "Etäkäyttäjä ei enää ole paikalla verkossa"
 
-#: ../src/protocols/silc/buddy.c:294
+#: ../libgaim/protocols/silc/buddy.c:294
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
@@ -10420,7 +12275,7 @@
 "Avainsopimuspyyntö vastaanotettu käyttäjältä %s. Haluatko suorittaa "
 "avainsopimuksen?"
 
-#: ../src/protocols/silc/buddy.c:298
+#: ../libgaim/protocols/silc/buddy.c:298
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -10431,59 +12286,60 @@
 "Etäkone: %s\n"
 "Portti: %d"
 
-#: ../src/protocols/silc/buddy.c:311
+#: ../libgaim/protocols/silc/buddy.c:311
 msgid "Key Agreement Request"
 msgstr "Avainsopimuspyyntö"
 
-#: ../src/protocols/silc/buddy.c:387 ../src/protocols/silc/buddy.c:422
-#: ../src/protocols/silc/buddy.c:464
+#: ../libgaim/protocols/silc/buddy.c:387 ../libgaim/protocols/silc/buddy.c:422
+#: ../libgaim/protocols/silc/buddy.c:464
 msgid "IM With Password"
 msgstr "Pikaviesti salasanalla"
 
-#: ../src/protocols/silc/buddy.c:423
+#: ../libgaim/protocols/silc/buddy.c:423
 msgid "Cannot set IM key"
 msgstr "Ei voida asettaa pikaviestiavainta"
 
-#: ../src/protocols/silc/buddy.c:465
+#: ../libgaim/protocols/silc/buddy.c:465
 msgid "Set IM Password"
 msgstr "Aseta pikaviestin salasana"
 
-#: ../src/protocols/silc/buddy.c:512 ../src/protocols/silc/buddy.c:547
-#: ../src/protocols/silc/ops.c:1492 ../src/protocols/silc/ops.c:1503
+#: ../libgaim/protocols/silc/buddy.c:512 ../libgaim/protocols/silc/buddy.c:547
+#: ../libgaim/protocols/silc/ops.c:1492 ../libgaim/protocols/silc/ops.c:1503
 msgid "Get Public Key"
 msgstr "Hae julkinen avain"
 
-#: ../src/protocols/silc/buddy.c:548 ../src/protocols/silc/ops.c:1493
-#: ../src/protocols/silc/ops.c:1504
+#: ../libgaim/protocols/silc/buddy.c:548 ../libgaim/protocols/silc/ops.c:1493
+#: ../libgaim/protocols/silc/ops.c:1504
 msgid "Cannot fetch the public key"
 msgstr "Ei voitu hakea julkista avainta"
 
-#: ../src/protocols/silc/buddy.c:634 ../src/protocols/silc/buddy.c:1647
+#: ../libgaim/protocols/silc/buddy.c:634
+#: ../libgaim/protocols/silc/buddy.c:1647
 msgid "Show Public Key"
 msgstr "Näytä julkinen avain"
 
-#: ../src/protocols/silc/buddy.c:635 ../src/protocols/silc/buddy.c:1030
-#: ../src/protocols/silc/chat.c:237
+#: ../libgaim/protocols/silc/buddy.c:635
+#: ../libgaim/protocols/silc/buddy.c:1030 ../libgaim/protocols/silc/chat.c:237
 msgid "Could not load public key"
 msgstr "Ei voitu ladata julkista avainta"
 
-#: ../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
+#: ../libgaim/protocols/silc/buddy.c:712 ../libgaim/protocols/silc/ops.c:1087
+#: ../libgaim/protocols/silc/ops.c:1159 ../libgaim/protocols/silc/ops.c:1294
+#: ../libgaim/protocols/silc/ops.c:1295 ../libgaim/protocols/silc/ops.c:1313
 msgid "User Information"
 msgstr "Käyttäjätiedot"
 
-#: ../src/protocols/silc/buddy.c:713 ../src/protocols/silc/ops.c:1160
-#: ../src/protocols/silc/ops.c:1314
+#: ../libgaim/protocols/silc/buddy.c:713 ../libgaim/protocols/silc/ops.c:1160
+#: ../libgaim/protocols/silc/ops.c:1314
 msgid "Cannot get user information"
 msgstr "Ei voitu hakea käyttäjätietoja"
 
-#: ../src/protocols/silc/buddy.c:734
+#: ../libgaim/protocols/silc/buddy.c:734
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "Käyttäjä %s ei ole luotettu"
 
-#: ../src/protocols/silc/buddy.c:737
+#: ../libgaim/protocols/silc/buddy.c:737
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
@@ -10492,16 +12348,16 @@
 "Voit käyttää Hae julkinen avain -komentoa saadaksesi julkisen avaimen."
 
 #. Open file selector to select the public key.
-#: ../src/protocols/silc/buddy.c:1064
+#: ../libgaim/protocols/silc/buddy.c:1064
 msgid "Open..."
 msgstr "Avaa..."
 
-#: ../src/protocols/silc/buddy.c:1073
+#: ../libgaim/protocols/silc/buddy.c:1073
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "Tuttava %s ei ole kirjautuneena verkossa"
 
-#: ../src/protocols/silc/buddy.c:1076
+#: ../libgaim/protocols/silc/buddy.c:1076
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -10509,15 +12365,15 @@
 "Lisätäksesi tuttavan tarvitsen hänen julkisen avaimensa. Paina Tuo "
 "tuodaksesi julkisen avaimen."
 
-#: ../src/protocols/silc/buddy.c:1079
+#: ../libgaim/protocols/silc/buddy.c:1079
 msgid "_Import..."
 msgstr "_Tuo..."
 
-#: ../src/protocols/silc/buddy.c:1175
+#: ../libgaim/protocols/silc/buddy.c:1175
 msgid "Select correct user"
 msgstr "Valitse oikea käyttäjä"
 
-#: ../src/protocols/silc/buddy.c:1177
+#: ../libgaim/protocols/silc/buddy.c:1177
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
@@ -10525,7 +12381,7 @@
 "Useammalla kuin yhdellä käyttäjällä on sama julkinen avain. Valitse oikea "
 "käyttäjä listalta."
 
-#: ../src/protocols/silc/buddy.c:1179
+#: ../libgaim/protocols/silc/buddy.c:1179
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -10533,213 +12389,213 @@
 "Useammalla kuin yhdellä käyttäjällä on sama nimi. Valitse oikea käyttäjä "
 "listalta."
 
-#: ../src/protocols/silc/buddy.c:1467
+#: ../libgaim/protocols/silc/buddy.c:1467
 msgid "Detached"
 msgstr "Irroitettu"
 
-#: ../src/protocols/silc/buddy.c:1471 ../src/protocols/silc/silc.c:55
+#: ../libgaim/protocols/silc/buddy.c:1471 ../libgaim/protocols/silc/silc.c:55
 msgid "Indisposed"
 msgstr "Vastahakoinen"
 
-#: ../src/protocols/silc/buddy.c:1475 ../src/protocols/silc/silc.c:57
+#: ../libgaim/protocols/silc/buddy.c:1475 ../libgaim/protocols/silc/silc.c:57
 msgid "Wake Me Up"
 msgstr "Herätä minut"
 
-#: ../src/protocols/silc/buddy.c:1477 ../src/protocols/silc/silc.c:49
+#: ../libgaim/protocols/silc/buddy.c:1477 ../libgaim/protocols/silc/silc.c:49
 msgid "Hyper Active"
 msgstr "Hyperaktiivinen"
 
-#: ../src/protocols/silc/buddy.c:1479
+#: ../libgaim/protocols/silc/buddy.c:1479
 msgid "Robot"
 msgstr "Robotti"
 
-#: ../src/protocols/silc/buddy.c:1486 ../src/protocols/silc/silc.c:674
-#: ../src/protocols/silc/util.c:487
+#: ../libgaim/protocols/silc/buddy.c:1486 ../libgaim/protocols/silc/silc.c:672
+#: ../libgaim/protocols/silc/util.c:514
 msgid "Happy"
 msgstr "Onnellinen"
 
-#: ../src/protocols/silc/buddy.c:1488 ../src/protocols/silc/silc.c:676
-#: ../src/protocols/silc/util.c:489
+#: ../libgaim/protocols/silc/buddy.c:1488 ../libgaim/protocols/silc/silc.c:674
+#: ../libgaim/protocols/silc/util.c:516
 msgid "Sad"
 msgstr "Surullinen"
 
-#: ../src/protocols/silc/buddy.c:1490 ../src/protocols/silc/silc.c:678
-#: ../src/protocols/silc/util.c:491
+#: ../libgaim/protocols/silc/buddy.c:1490 ../libgaim/protocols/silc/silc.c:676
+#: ../libgaim/protocols/silc/util.c:518
 msgid "Angry"
 msgstr "Vihainen"
 
-#: ../src/protocols/silc/buddy.c:1492 ../src/protocols/silc/silc.c:680
-#: ../src/protocols/silc/util.c:493
+#: ../libgaim/protocols/silc/buddy.c:1492 ../libgaim/protocols/silc/silc.c:678
+#: ../libgaim/protocols/silc/util.c:520
 msgid "Jealous"
 msgstr "Mustasukkainen"
 
-#: ../src/protocols/silc/buddy.c:1494 ../src/protocols/silc/silc.c:682
-#: ../src/protocols/silc/util.c:495
+#: ../libgaim/protocols/silc/buddy.c:1494 ../libgaim/protocols/silc/silc.c:680
+#: ../libgaim/protocols/silc/util.c:522
 msgid "Ashamed"
 msgstr "Häpeää"
 
-#: ../src/protocols/silc/buddy.c:1496 ../src/protocols/silc/silc.c:684
-#: ../src/protocols/silc/util.c:497
+#: ../libgaim/protocols/silc/buddy.c:1496 ../libgaim/protocols/silc/silc.c:682
+#: ../libgaim/protocols/silc/util.c:524
 msgid "Invincible"
 msgstr "Haavoittumaton"
 
-#: ../src/protocols/silc/buddy.c:1498 ../src/protocols/silc/util.c:499
+#: ../libgaim/protocols/silc/buddy.c:1498 ../libgaim/protocols/silc/util.c:526
 msgid "In Love"
 msgstr "Rakastunut"
 
-#: ../src/protocols/silc/buddy.c:1500 ../src/protocols/silc/silc.c:688
-#: ../src/protocols/silc/util.c:501
+#: ../libgaim/protocols/silc/buddy.c:1500 ../libgaim/protocols/silc/silc.c:686
+#: ../libgaim/protocols/silc/util.c:528
 msgid "Sleepy"
 msgstr "Unelias"
 
-#: ../src/protocols/silc/buddy.c:1502 ../src/protocols/silc/silc.c:690
-#: ../src/protocols/silc/util.c:503
+#: ../libgaim/protocols/silc/buddy.c:1502 ../libgaim/protocols/silc/silc.c:688
+#: ../libgaim/protocols/silc/util.c:530
 msgid "Bored"
 msgstr "Tylsistynyt"
 
-#: ../src/protocols/silc/buddy.c:1504 ../src/protocols/silc/silc.c:692
-#: ../src/protocols/silc/util.c:505
+#: ../libgaim/protocols/silc/buddy.c:1504 ../libgaim/protocols/silc/silc.c:690
+#: ../libgaim/protocols/silc/util.c:532
 msgid "Excited"
 msgstr "Innostunut"
 
-#: ../src/protocols/silc/buddy.c:1506 ../src/protocols/silc/silc.c:694
-#: ../src/protocols/silc/util.c:507
+#: ../libgaim/protocols/silc/buddy.c:1506 ../libgaim/protocols/silc/silc.c:692
+#: ../libgaim/protocols/silc/util.c:534
 msgid "Anxious"
 msgstr "Levoton"
 
-#: ../src/protocols/silc/buddy.c:1534 ../src/protocols/silc/ops.c:1196
+#: ../libgaim/protocols/silc/buddy.c:1534 ../libgaim/protocols/silc/ops.c:1196
 msgid "User Modes"
 msgstr "Käyttäjätilat"
 
-#: ../src/protocols/silc/buddy.c:1550 ../src/protocols/silc/ops.c:1205
+#: ../libgaim/protocols/silc/buddy.c:1550 ../libgaim/protocols/silc/ops.c:1205
 msgid "Mood"
 msgstr "Mieliala"
 
-#: ../src/protocols/silc/buddy.c:1555 ../src/protocols/silc/ops.c:1217
+#: ../libgaim/protocols/silc/buddy.c:1555 ../libgaim/protocols/silc/ops.c:1217
 msgid "Preferred Contact"
 msgstr "Suosikkituttava"
 
-#: ../src/protocols/silc/buddy.c:1560 ../src/protocols/silc/ops.c:1222
+#: ../libgaim/protocols/silc/buddy.c:1560 ../libgaim/protocols/silc/ops.c:1222
 msgid "Preferred Language"
 msgstr "Ensisijainen kieli"
 
-#: ../src/protocols/silc/buddy.c:1565 ../src/protocols/silc/ops.c:1227
+#: ../libgaim/protocols/silc/buddy.c:1565 ../libgaim/protocols/silc/ops.c:1227
 msgid "Device"
 msgstr "Laite"
 
-#: ../src/protocols/silc/buddy.c:1570 ../src/protocols/silc/ops.c:1232
-#: ../src/protocols/silc/silc.c:742 ../src/protocols/silc/silc.c:744
+#: ../libgaim/protocols/silc/buddy.c:1570 ../libgaim/protocols/silc/ops.c:1232
+#: ../libgaim/protocols/silc/silc.c:740 ../libgaim/protocols/silc/silc.c:742
 msgid "Timezone"
 msgstr "Aikavyöhyke"
 
-#: ../src/protocols/silc/buddy.c:1575 ../src/protocols/silc/ops.c:1237
+#: ../libgaim/protocols/silc/buddy.c:1575 ../libgaim/protocols/silc/ops.c:1237
 msgid "Geolocation"
 msgstr "Maantieteellinen paikka"
 
-#: ../src/protocols/silc/buddy.c:1629
+#: ../libgaim/protocols/silc/buddy.c:1629
 msgid "Reset IM Key"
 msgstr "Tyhjennä pikaviestiavain"
 
-#: ../src/protocols/silc/buddy.c:1635
+#: ../libgaim/protocols/silc/buddy.c:1635
 msgid "IM with Key Exchange"
 msgstr "Pikaviesti avaimienvaihdolla"
 
-#: ../src/protocols/silc/buddy.c:1640
+#: ../libgaim/protocols/silc/buddy.c:1640
 msgid "IM with Password"
 msgstr "Pikaviesti salasanalla"
 
-#: ../src/protocols/silc/buddy.c:1653
+#: ../libgaim/protocols/silc/buddy.c:1653
 msgid "Get Public Key..."
 msgstr "Hae julkinen avain..."
 
-#: ../src/protocols/silc/buddy.c:1660 ../src/protocols/silc/ops.c:1623
+#: ../libgaim/protocols/silc/buddy.c:1660 ../libgaim/protocols/silc/ops.c:1622
 msgid "Kill User"
 msgstr "Poista käyttäjä"
 
-#: ../src/protocols/silc/buddy.c:1670 ../src/protocols/silc/chat.c:972
+#: ../libgaim/protocols/silc/buddy.c:1670 ../libgaim/protocols/silc/chat.c:972
 msgid "Draw On Whiteboard"
 msgstr "Piirrä kirjoitustaululle"
 
-#: ../src/protocols/silc/chat.c:39
+#: ../libgaim/protocols/silc/chat.c:39
 msgid "_Passphrase:"
 msgstr "_Salasana:"
 
-#: ../src/protocols/silc/chat.c:80
+#: ../libgaim/protocols/silc/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "Kanavaa %s ei ole verkossa"
 
-#: ../src/protocols/silc/chat.c:81 ../src/protocols/silc/chat.c:174
+#: ../libgaim/protocols/silc/chat.c:81 ../libgaim/protocols/silc/chat.c:174
 msgid "Channel Information"
 msgstr "Kanavatiedot"
 
-#: ../src/protocols/silc/chat.c:82
+#: ../libgaim/protocols/silc/chat.c:82
 msgid "Cannot get channel information"
 msgstr "Ei saada kanavatietoja"
 
-#: ../src/protocols/silc/chat.c:119
+#: ../libgaim/protocols/silc/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Kanavan nimi:</b> %s"
 
-#: ../src/protocols/silc/chat.c:122
+#: ../libgaim/protocols/silc/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Käyttäjämäärä:</b> %d"
 
-#: ../src/protocols/silc/chat.c:129
+#: ../libgaim/protocols/silc/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Kanavan perustaja:</b> %s"
 
-#: ../src/protocols/silc/chat.c:138
+#: ../libgaim/protocols/silc/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Kanavan salausalgoritmi:<b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../src/protocols/silc/chat.c:142
+#: ../libgaim/protocols/silc/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>Kanavan HMAC:</b> %s"
 
-#: ../src/protocols/silc/chat.c:147
+#: ../libgaim/protocols/silc/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Kanavan aihe:</b><br>%s"
 
-#: ../src/protocols/silc/chat.c:152
+#: ../libgaim/protocols/silc/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Kanavan tilat:</b> "
 
-#: ../src/protocols/silc/chat.c:165
+#: ../libgaim/protocols/silc/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Perustajan avain Fingerprint</b><br>%s"
 
-#: ../src/protocols/silc/chat.c:166
+#: ../libgaim/protocols/silc/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Perustajan avain Babbleprint:</b><br>%s"
 
-#: ../src/protocols/silc/chat.c:236
+#: ../libgaim/protocols/silc/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Lisää kanavan julkinen avain"
 
 #. Add new public key
-#: ../src/protocols/silc/chat.c:291
+#: ../libgaim/protocols/silc/chat.c:291
 msgid "Open Public Key..."
 msgstr "Avaa julkinen avain..."
 
-#: ../src/protocols/silc/chat.c:400
+#: ../libgaim/protocols/silc/chat.c:400
 msgid "Channel Passphrase"
 msgstr "Kanavan salasana"
 
-#: ../src/protocols/silc/chat.c:407
+#: ../libgaim/protocols/silc/chat.c:407
 msgid "Channel Public Keys List"
 msgstr "Kanavan julkisten avainten lista"
 
-#: ../src/protocols/silc/chat.c:412
+#: ../libgaim/protocols/silc/chat.c:412
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -10753,323 +12609,319 @@
 "pääsemiseksi. Jos käytetään kanavan julkisia avaimia niin silloin pääsevät "
 "vain käyttäjät joiden julkinen avain on listalla."
 
-#: ../src/protocols/silc/chat.c:421 ../src/protocols/silc/chat.c:422
-#: ../src/protocols/silc/chat.c:459 ../src/protocols/silc/chat.c:460
-#: ../src/protocols/silc/chat.c:906
+#: ../libgaim/protocols/silc/chat.c:421 ../libgaim/protocols/silc/chat.c:422
+#: ../libgaim/protocols/silc/chat.c:459 ../libgaim/protocols/silc/chat.c:460
+#: ../libgaim/protocols/silc/chat.c:906
 msgid "Channel Authentication"
 msgstr "Kanavalle tunnistautuminen"
 
-#: ../src/protocols/silc/chat.c:423 ../src/protocols/silc/chat.c:461
+#: ../libgaim/protocols/silc/chat.c:423 ../libgaim/protocols/silc/chat.c:461
 msgid "Add / Remove"
 msgstr "Lisää / poista"
 
-#: ../src/protocols/silc/chat.c:578
+#: ../libgaim/protocols/silc/chat.c:578
 msgid "Group Name"
 msgstr "Ryhmän nimi"
 
-#: ../src/protocols/silc/chat.c:582 ../src/protocols/silc/ops.c:1908
-#: ../src/protocols/silc/silc.c:950
+#: ../libgaim/protocols/silc/chat.c:582 ../libgaim/protocols/silc/ops.c:1907
+#: ../libgaim/protocols/silc/silc.c:948
 msgid "Passphrase"
 msgstr "Salasana"
 
-#: ../src/protocols/silc/chat.c:593
+#: ../libgaim/protocols/silc/chat.c:593
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Syötä kanavan %s yksityinen ryhmänimi ja salasana."
 
-#: ../src/protocols/silc/chat.c:595
+#: ../libgaim/protocols/silc/chat.c:595
 msgid "Add Channel Private Group"
 msgstr "Lisää kanavaan yksityinen ryhmä"
 
-#: ../src/protocols/silc/chat.c:722
+#: ../libgaim/protocols/silc/chat.c:722
 msgid "User Limit"
 msgstr "Käyttäjäraja"
 
-#: ../src/protocols/silc/chat.c:723
+#: ../libgaim/protocols/silc/chat.c:723
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Aseta käyttäjärajoitus kanavalle. Aseta nollaksi poistaaksesi rajoituksen."
 
-#: ../src/protocols/silc/chat.c:878
-msgid "Get Info"
-msgstr "Hae tiedot"
-
-#: ../src/protocols/silc/chat.c:886
+#: ../libgaim/protocols/silc/chat.c:886
 msgid "Invite List"
 msgstr "Kutsulista"
 
-#: ../src/protocols/silc/chat.c:891
+#: ../libgaim/protocols/silc/chat.c:891
 msgid "Ban List"
 msgstr "Kieltolista"
 
-#: ../src/protocols/silc/chat.c:899
+#: ../libgaim/protocols/silc/chat.c:899
 msgid "Add Private Group"
 msgstr "Lisää yksityinen ryhmä"
 
-#: ../src/protocols/silc/chat.c:912
+#: ../libgaim/protocols/silc/chat.c:912
 msgid "Reset Permanent"
 msgstr "Nollaa pysyvä"
 
-#: ../src/protocols/silc/chat.c:917
+#: ../libgaim/protocols/silc/chat.c:917
 msgid "Set Permanent"
 msgstr "Aseta pysyvä"
 
-#: ../src/protocols/silc/chat.c:925
+#: ../libgaim/protocols/silc/chat.c:925
 msgid "Set User Limit"
 msgstr "Aseta käyttäjärajoitus"
 
-#: ../src/protocols/silc/chat.c:931
+#: ../libgaim/protocols/silc/chat.c:931
 msgid "Reset Topic Restriction"
 msgstr "Poista aiherajoitus"
 
-#: ../src/protocols/silc/chat.c:936
+#: ../libgaim/protocols/silc/chat.c:936
 msgid "Set Topic Restriction"
 msgstr "Aseta aiherajoitus"
 
-#: ../src/protocols/silc/chat.c:943
+#: ../libgaim/protocols/silc/chat.c:943
 msgid "Reset Private Channel"
 msgstr "Poista yksityinen kanava"
 
-#: ../src/protocols/silc/chat.c:948
+#: ../libgaim/protocols/silc/chat.c:948
 msgid "Set Private Channel"
 msgstr "Aseta yksityinen kanava"
 
-#: ../src/protocols/silc/chat.c:955
+#: ../libgaim/protocols/silc/chat.c:955
 msgid "Reset Secret Channel"
 msgstr "Poista salainen kanava"
 
-#: ../src/protocols/silc/chat.c:960
+#: ../libgaim/protocols/silc/chat.c:960
 msgid "Set Secret Channel"
 msgstr "Aseta salainen kanava"
 
-#: ../src/protocols/silc/chat.c:1034
+#: ../libgaim/protocols/silc/chat.c:1034
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Olet kanavan perustaja kanavalla <I>%s</I>"
 
-#: ../src/protocols/silc/chat.c:1038
+#: ../libgaim/protocols/silc/chat.c:1038
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Kanavan perustaja kanavalla <I>%s</I> on <I>%s</I>"
 
-#: ../src/protocols/silc/chat.c:1097
+#: ../libgaim/protocols/silc/chat.c:1097
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr ""
 "Sinun tulee liittyä kanavalle %s ennenkuin voit liittyä yksityiseen ryhmään"
 
-#: ../src/protocols/silc/chat.c:1099
+#: ../libgaim/protocols/silc/chat.c:1099
 msgid "Join Private Group"
 msgstr "Liity yksityiseen ryhmään"
 
-#: ../src/protocols/silc/chat.c:1100
+#: ../libgaim/protocols/silc/chat.c:1100
 msgid "Cannot join private group"
 msgstr "Ei voida liittyä yksityiseen ryhmään"
 
-#: ../src/protocols/silc/chat.c:1294 ../src/protocols/silc/silc.c:1158
+#: ../libgaim/protocols/silc/chat.c:1294 ../libgaim/protocols/silc/silc.c:1156
 msgid "Call Command"
 msgstr "Kutsu komentoa"
 
-#: ../src/protocols/silc/chat.c:1294 ../src/protocols/silc/silc.c:1158
+#: ../libgaim/protocols/silc/chat.c:1294 ../libgaim/protocols/silc/silc.c:1156
 msgid "Cannot call command"
 msgstr "Komentoa ei voida kutsua"
 
-#: ../src/protocols/silc/chat.c:1295 ../src/protocols/silc/silc.c:1159
+#: ../libgaim/protocols/silc/chat.c:1295 ../libgaim/protocols/silc/silc.c:1157
 msgid "Unknown command"
 msgstr "Tuntematon komento"
 
-#: ../src/protocols/silc/ft.c:89 ../src/protocols/silc/ft.c:92
-#: ../src/protocols/silc/ft.c:96 ../src/protocols/silc/ft.c:100
-#: ../src/protocols/silc/ft.c:104 ../src/protocols/silc/ft.c:205
-#: ../src/protocols/silc/ft.c:210 ../src/protocols/silc/ft.c:215
-#: ../src/protocols/silc/ft.c:221 ../src/protocols/silc/ft.c:340
+#: ../libgaim/protocols/silc/ft.c:89 ../libgaim/protocols/silc/ft.c:92
+#: ../libgaim/protocols/silc/ft.c:96 ../libgaim/protocols/silc/ft.c:100
+#: ../libgaim/protocols/silc/ft.c:104 ../libgaim/protocols/silc/ft.c:205
+#: ../libgaim/protocols/silc/ft.c:210 ../libgaim/protocols/silc/ft.c:215
+#: ../libgaim/protocols/silc/ft.c:221 ../libgaim/protocols/silc/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Turvallinen tiedostonsiirto"
 
-#: ../src/protocols/silc/ft.c:90 ../src/protocols/silc/ft.c:93
-#: ../src/protocols/silc/ft.c:97 ../src/protocols/silc/ft.c:101
-#: ../src/protocols/silc/ft.c:105
+#: ../libgaim/protocols/silc/ft.c:90 ../libgaim/protocols/silc/ft.c:93
+#: ../libgaim/protocols/silc/ft.c:97 ../libgaim/protocols/silc/ft.c:101
+#: ../libgaim/protocols/silc/ft.c:105
 msgid "Error during file transfer"
 msgstr "Virhe tiedostonsiirrossa"
 
-#: ../src/protocols/silc/ft.c:94
+#: ../libgaim/protocols/silc/ft.c:94
 msgid "Permission denied"
 msgstr "Pääsy evätty"
 
-#: ../src/protocols/silc/ft.c:98
+#: ../libgaim/protocols/silc/ft.c:98
 msgid "Key agreement failed"
 msgstr "Avain sopimus epäonnistui"
 
-#: ../src/protocols/silc/ft.c:102
+#: ../libgaim/protocols/silc/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "Tiedostonsiirtoistuntoa ei ole"
 
-#: ../src/protocols/silc/ft.c:206
+#: ../libgaim/protocols/silc/ft.c:206
 msgid "No file transfer session active"
 msgstr "Ei aktiivista tiedostonsiirtoistuntoa"
 
-#: ../src/protocols/silc/ft.c:211
+#: ../libgaim/protocols/silc/ft.c:211
 msgid "File transfer already started"
 msgstr "Tiedostonsiirto on jo aloitettu"
 
-#: ../src/protocols/silc/ft.c:216
+#: ../libgaim/protocols/silc/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "Ei voitu suorittaa avainsopimusta tiedostonsiirtoa varten"
 
-#: ../src/protocols/silc/ft.c:222
+#: ../libgaim/protocols/silc/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "Ei voitu aloittaa tiedostonsiirtoa"
 
-#: ../src/protocols/silc/ft.c:341
+#: ../libgaim/protocols/silc/ft.c:341
 msgid "Cannot send file"
 msgstr "Tiedoston lähetys ei onnistu"
 
-#: ../src/protocols/silc/ops.c:555 ../src/protocols/silc/ops.c:564
-#: ../src/protocols/silc/ops.c:573
+#: ../libgaim/protocols/silc/ops.c:554 ../libgaim/protocols/silc/ops.c:563
+#: ../libgaim/protocols/silc/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s on vaihtanut <I>%s</I> aiheeksi: %s"
 
-#: ../src/protocols/silc/ops.c:639
+#: ../libgaim/protocols/silc/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> muutti kanavan <I>%s</I> tilaa: %s"
 
-#: ../src/protocols/silc/ops.c:643
+#: ../libgaim/protocols/silc/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> muutti kaikki kanavan <I>%s</I> tilat"
 
-#: ../src/protocols/silc/ops.c:676
+#: ../libgaim/protocols/silc/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> asetti <I>%s</I> tilan: %s"
 
-#: ../src/protocols/silc/ops.c:684
+#: ../libgaim/protocols/silc/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> poisti kaikki <I>%s</I> tilat"
 
-#: ../src/protocols/silc/ops.c:713
+#: ../libgaim/protocols/silc/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Sinut on poistettu <I>%s</I> käyttäjä <I>%s</I> (%s)"
 
-#: ../src/protocols/silc/ops.c:743 ../src/protocols/silc/ops.c:748
-#: ../src/protocols/silc/ops.c:753
+#: ../libgaim/protocols/silc/ops.c:742 ../libgaim/protocols/silc/ops.c:747
+#: ../libgaim/protocols/silc/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Sinut on poistanut %s (%s)"
 
-#: ../src/protocols/silc/ops.c:774 ../src/protocols/silc/ops.c:779
-#: ../src/protocols/silc/ops.c:784
+#: ../libgaim/protocols/silc/ops.c:773 ../libgaim/protocols/silc/ops.c:778
+#: ../libgaim/protocols/silc/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Poistettu käyttäjän %s toimesta (%s)"
 
-#: ../src/protocols/silc/ops.c:830
+#: ../libgaim/protocols/silc/ops.c:829
 msgid "Server signoff"
 msgstr "Kirjaudu ulos palvelimelta"
 
-#: ../src/protocols/silc/ops.c:1017
+#: ../libgaim/protocols/silc/ops.c:1017
 msgid "Personal Information"
 msgstr "Henkilökohtaiset tiedot"
 
-#: ../src/protocols/silc/ops.c:1040
+#: ../libgaim/protocols/silc/ops.c:1040
 msgid "Birth Day"
 msgstr "Syntymäpäivä"
 
-#: ../src/protocols/silc/ops.c:1048
+#: ../libgaim/protocols/silc/ops.c:1048
 msgid "Job Role"
 msgstr "Asema työssä"
 
-#: ../src/protocols/silc/ops.c:1052 ../src/protocols/silc/silc.c:943
+#: ../libgaim/protocols/silc/ops.c:1052 ../libgaim/protocols/silc/silc.c:941
 msgid "Organization"
 msgstr "Organisaatio"
 
-#: ../src/protocols/silc/ops.c:1056
+#: ../libgaim/protocols/silc/ops.c:1056
 msgid "Unit"
 msgstr "Yksikkö"
 
-#: ../src/protocols/silc/ops.c:1080
+#: ../libgaim/protocols/silc/ops.c:1080
 msgid "Note"
 msgstr "Huomautus"
 
-#: ../src/protocols/silc/ops.c:1128
+#: ../libgaim/protocols/silc/ops.c:1128
 msgid "Join Chat"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: ../src/protocols/silc/ops.c:1183 ../src/protocols/silc/ops.c:1332
-#: ../src/protocols/yahoo/yahoo_profile.c:1046
+#: ../libgaim/protocols/silc/ops.c:1183 ../libgaim/protocols/silc/ops.c:1332
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1060
 msgid "Real Name"
 msgstr "Oikea nimi"
 
-#: ../src/protocols/silc/ops.c:1211
+#: ../libgaim/protocols/silc/ops.c:1211
 msgid "Status Text"
 msgstr "Tilateksti"
 
-#: ../src/protocols/silc/ops.c:1284 ../src/protocols/silc/ops.c:1354
+#: ../libgaim/protocols/silc/ops.c:1284 ../libgaim/protocols/silc/ops.c:1354
 msgid "Public Key Fingerprint"
 msgstr "Julkisen avaimen sormenjälki"
 
-#: ../src/protocols/silc/ops.c:1285 ../src/protocols/silc/ops.c:1355
+#: ../libgaim/protocols/silc/ops.c:1285 ../libgaim/protocols/silc/ops.c:1355
 msgid "Public Key Babbleprint"
 msgstr "Julkisen avaimen \"babbleprint\""
 
-#: ../src/protocols/silc/ops.c:1298
+#: ../libgaim/protocols/silc/ops.c:1298
 msgid "_More..."
 msgstr "_Lisää..."
 
-#: ../src/protocols/silc/ops.c:1369 ../src/protocols/silc/silc.c:1009
+#: ../libgaim/protocols/silc/ops.c:1369 ../libgaim/protocols/silc/silc.c:1007
 msgid "Detach From Server"
 msgstr "Irroita palvelimelta"
 
-#: ../src/protocols/silc/ops.c:1369
+#: ../libgaim/protocols/silc/ops.c:1369
 msgid "Cannot detach"
 msgstr "Ei voida irroittaa"
 
-#: ../src/protocols/silc/ops.c:1380
+#: ../libgaim/protocols/silc/ops.c:1380
 msgid "Cannot set topic"
 msgstr "Ei voida asettaa aihetta"
 
-#: ../src/protocols/silc/ops.c:1412
+#: ../libgaim/protocols/silc/ops.c:1412
 msgid "Failed to change nickname"
 msgstr "Ei kyetty muuttamaan kutsumanimeä"
 
-#: ../src/protocols/silc/ops.c:1460
+#: ../libgaim/protocols/silc/ops.c:1460
 msgid "Roomlist"
 msgstr "Huonelista"
 
-#: ../src/protocols/silc/ops.c:1460
+#: ../libgaim/protocols/silc/ops.c:1460
 msgid "Cannot get room list"
 msgstr "Huonelistaa ei saatu"
 
-#: ../src/protocols/silc/ops.c:1505
+#: ../libgaim/protocols/silc/ops.c:1505
 msgid "No public key was received"
 msgstr "Ei saatu julkista avainta"
 
-#: ../src/protocols/silc/ops.c:1518 ../src/protocols/silc/ops.c:1531
+#: ../libgaim/protocols/silc/ops.c:1517 ../libgaim/protocols/silc/ops.c:1530
 msgid "Server Information"
 msgstr "Palvelimen tiedot"
 
-#: ../src/protocols/silc/ops.c:1519
+#: ../libgaim/protocols/silc/ops.c:1518
 msgid "Cannot get server information"
 msgstr "Ei saada palvelimen tietoja"
 
-#: ../src/protocols/silc/ops.c:1548 ../src/protocols/silc/ops.c:1557
+#: ../libgaim/protocols/silc/ops.c:1547 ../libgaim/protocols/silc/ops.c:1556
 msgid "Server Statistics"
 msgstr "Palvelimen tilastoja"
 
-#: ../src/protocols/silc/ops.c:1549
+#: ../libgaim/protocols/silc/ops.c:1548
 msgid "Cannot get server statistics"
 msgstr "Ei saatu palvelimen tilastoja"
 
-#: ../src/protocols/silc/ops.c:1558
+#: ../libgaim/protocols/silc/ops.c:1557
 msgid "No server statistics available"
 msgstr "Palvelimen tilastoja ei saatavilla."
 
-#: ../src/protocols/silc/ops.c:1580
+#: ../libgaim/protocols/silc/ops.c:1579
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -11104,103 +12956,103 @@
 "Palvelinoperaattorit yhteensä: %d\n"
 "Reititinoperaattorit yhteensä: %d\n"
 
-#: ../src/protocols/silc/ops.c:1603
+#: ../libgaim/protocols/silc/ops.c:1602
 msgid "Network Statistics"
 msgstr "Verkkotilastoja"
 
-#: ../src/protocols/silc/ops.c:1611 ../src/protocols/silc/ops.c:1616
+#: ../libgaim/protocols/silc/ops.c:1610 ../libgaim/protocols/silc/ops.c:1615
 msgid "Ping"
 msgstr "Ping"
 
-#: ../src/protocols/silc/ops.c:1611
+#: ../libgaim/protocols/silc/ops.c:1610
 msgid "Ping failed"
 msgstr "Ping epäonnistui"
 
-#: ../src/protocols/silc/ops.c:1616
+#: ../libgaim/protocols/silc/ops.c:1615
 msgid "Ping reply received from server"
 msgstr "Ping-vastaus saatu palvelimelta"
 
-#: ../src/protocols/silc/ops.c:1624
+#: ../libgaim/protocols/silc/ops.c:1623
 msgid "Could not kill user"
 msgstr "Ei voitu poistaa käyttäjää"
 
-#: ../src/protocols/silc/ops.c:1708
+#: ../libgaim/protocols/silc/ops.c:1707
 msgid "Error during connecting to SILC Server"
 msgstr "Virhe luotaessa yhteyttä SILC-palvelimelle"
 
-#: ../src/protocols/silc/ops.c:1713
+#: ../libgaim/protocols/silc/ops.c:1712
 msgid "Key Exchange failed"
 msgstr "Avaintenvaihto epäonnistui"
 
-#: ../src/protocols/silc/ops.c:1722
+#: ../libgaim/protocols/silc/ops.c:1721
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "Irroitetun yhteyden palauttaminen epäonnistui. Paina Uudelleenyhdistä "
 "luodaksesi uuden yhteyden."
 
-#: ../src/protocols/silc/ops.c:1757
+#: ../libgaim/protocols/silc/ops.c:1756
 msgid "Disconnected by server"
 msgstr "Palvelin katkaisi yhteyden"
 
-#: ../src/protocols/silc/ops.c:1819 ../src/protocols/silc/ops.c:1866
-#: ../src/protocols/silc/silc.c:195
+#: ../libgaim/protocols/silc/ops.c:1818 ../libgaim/protocols/silc/ops.c:1865
+#: ../libgaim/protocols/silc/silc.c:189
 msgid "Resuming session"
 msgstr "Palautetaan istunto"
 
-#: ../src/protocols/silc/ops.c:1821
+#: ../libgaim/protocols/silc/ops.c:1820
 msgid "Authenticating connection"
 msgstr "Todennetaan yhteys"
 
-#: ../src/protocols/silc/ops.c:1868
+#: ../libgaim/protocols/silc/ops.c:1867
 msgid "Verifying server public key"
 msgstr "Tarkistetaan palvelimen julkinen avain"
 
-#: ../src/protocols/silc/ops.c:1909
+#: ../libgaim/protocols/silc/ops.c:1908
 msgid "Passphrase required"
 msgstr "Vaatii salasanan"
 
-#: ../src/protocols/silc/ops.c:1938
+#: ../libgaim/protocols/silc/ops.c:1937
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Virhe: Versioepäyhteensopivuus, päivitä ohjelmasi"
 
-#: ../src/protocols/silc/ops.c:1941
+#: ../libgaim/protocols/silc/ops.c:1940
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Virhe: Etäkone ei luota/tue julkista avaintasi"
 
-#: ../src/protocols/silc/ops.c:1944
+#: ../libgaim/protocols/silc/ops.c:1943
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Virhe: Etäkone ei tue ehdotettua KE-ryhmää"
 
-#: ../src/protocols/silc/ops.c:1947
+#: ../libgaim/protocols/silc/ops.c:1946
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Virhe: Etäkone ei tue ehdotettua salausta"
 
-#: ../src/protocols/silc/ops.c:1950
+#: ../libgaim/protocols/silc/ops.c:1949
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Virhe: Etäkone ei tuo ehdotettua PKCS:aa"
 
-#: ../src/protocols/silc/ops.c:1953
+#: ../libgaim/protocols/silc/ops.c:1952
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Virhe: Etäkone ei tue ehdotettua tiivistysfunktiota"
 
-#: ../src/protocols/silc/ops.c:1956
+#: ../libgaim/protocols/silc/ops.c:1955
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Virhe: Etäkone ei tue ehdotettua HMAC:ia"
 
-#: ../src/protocols/silc/ops.c:1958
+#: ../libgaim/protocols/silc/ops.c:1957
 msgid "Failure: Incorrect signature"
 msgstr "Virhe: Virheellinen allekirjoitus"
 
-#: ../src/protocols/silc/ops.c:1960
+#: ../libgaim/protocols/silc/ops.c:1959
 msgid "Failure: Invalid cookie"
 msgstr "Virhe: Virheellinen eväste"
 
-#: ../src/protocols/silc/ops.c:1971
+#: ../libgaim/protocols/silc/ops.c:1970
 msgid "Failure: Authentication failed"
 msgstr "Virhe: Todennus epäonnistui"
 
-#: ../src/protocols/silc/pk.c:103
+#: ../libgaim/protocols/silc/pk.c:103
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
@@ -11209,12 +13061,12 @@
 "Vastaanotettiin käyttäjän %s julkinen avain. Paikallinen kopiosi ei täsmää. "
 "Haluatko silti hyväksyä tämän julkisen avaimen?"
 
-#: ../src/protocols/silc/pk.c:108
+#: ../libgaim/protocols/silc/pk.c:108
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "Vastaanotettiin julkinen avain käyttäjältä %s. Hyväksytäänkö se?"
 
-#: ../src/protocols/silc/pk.c:112
+#: ../libgaim/protocols/silc/pk.c:112
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -11227,65 +13079,65 @@
 "%s\n"
 "%s\n"
 
-#: ../src/protocols/silc/pk.c:115 ../src/protocols/silc/pk.c:140
+#: ../libgaim/protocols/silc/pk.c:115 ../libgaim/protocols/silc/pk.c:140
 msgid "Verify Public Key"
 msgstr "Tarkista julkinen avain"
 
-#: ../src/protocols/silc/pk.c:119
+#: ../libgaim/protocols/silc/pk.c:119
 msgid "_View..."
 msgstr "_Näytä..."
 
-#: ../src/protocols/silc/pk.c:141
+#: ../libgaim/protocols/silc/pk.c:141
 msgid "Unsupported public key type"
 msgstr "Julkisen avaimen tyyppiä ei tuettu"
 
-#: ../src/protocols/silc/silc.c:162
+#: ../libgaim/protocols/silc/silc.c:160
 msgid "Connection failed"
 msgstr "Yhteys epäonnistui"
 
-#: ../src/protocols/silc/silc.c:187
+#: ../libgaim/protocols/silc/silc.c:181
 msgid "Cannot initialize SILC Client connection"
 msgstr "Ei voida alustaa SILC-asiakasyhteyttä"
 
-#: ../src/protocols/silc/silc.c:198
+#: ../libgaim/protocols/silc/silc.c:192
 msgid "Performing key exchange"
 msgstr "Suoritetaan avaintenvaihto"
 
-#: ../src/protocols/silc/silc.c:284
+#: ../libgaim/protocols/silc/silc.c:278
 msgid "Out of memory"
 msgstr "Muisti loppu"
 
-#: ../src/protocols/silc/silc.c:330
+#: ../libgaim/protocols/silc/silc.c:324
 msgid "Cannot initialize SILC protocol"
 msgstr "Ei voida alustaa SILC-yhteyskäytäntöä"
 
-#: ../src/protocols/silc/silc.c:337
+#: ../libgaim/protocols/silc/silc.c:331
 msgid "Cannot find/access ~/.silc directory"
 msgstr "Ei voida löytää/käyttää ~/.silc-hakemistoa"
 
 #. Progress
-#: ../src/protocols/silc/silc.c:342
+#: ../libgaim/protocols/silc/silc.c:336
 msgid "Connecting to SILC Server"
 msgstr "Yhdistetään SILC-palvelimelle"
 
-#: ../src/protocols/silc/silc.c:351
+#: ../libgaim/protocols/silc/silc.c:345
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr "Ei voitu ladata SILC-avainparia: %s"
 
-#: ../src/protocols/silc/silc.c:371
+#: ../libgaim/protocols/silc/silc.c:367
 msgid "Unable to create connection"
 msgstr "Yhteyden luominen epäonnistui"
 
-#: ../src/protocols/silc/silc.c:670
+#: ../libgaim/protocols/silc/silc.c:668
 msgid "Your Current Mood"
 msgstr "Tämänhetkinen mielialasi"
 
-#: ../src/protocols/silc/silc.c:686
+#: ../libgaim/protocols/silc/silc.c:684
 msgid "In love"
 msgstr "Rakastunut"
 
-#: ../src/protocols/silc/silc.c:697
+#: ../libgaim/protocols/silc/silc.c:695
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -11293,43 +13145,43 @@
 "\n"
 "Suosimasi yhteystavat"
 
-#: ../src/protocols/silc/silc.c:705 ../src/protocols/silc/util.c:532
+#: ../libgaim/protocols/silc/silc.c:703 ../libgaim/protocols/silc/util.c:559
 msgid "SMS"
 msgstr "SMS"
 
-#: ../src/protocols/silc/silc.c:707 ../src/protocols/silc/util.c:534
+#: ../libgaim/protocols/silc/silc.c:705 ../libgaim/protocols/silc/util.c:561
 msgid "MMS"
 msgstr "MMS"
 
-#: ../src/protocols/silc/silc.c:709
+#: ../libgaim/protocols/silc/silc.c:707
 msgid "Video conferencing"
 msgstr "Videoneuvottelu"
 
-#: ../src/protocols/silc/silc.c:714
+#: ../libgaim/protocols/silc/silc.c:712
 msgid "Your Current Status"
 msgstr "Tämänhetkinen tilasi"
 
-#: ../src/protocols/silc/silc.c:721
+#: ../libgaim/protocols/silc/silc.c:719
 msgid "Online Services"
 msgstr "Online-palvelut"
 
-#: ../src/protocols/silc/silc.c:724
+#: ../libgaim/protocols/silc/silc.c:722
 msgid "Let others see what services you are using"
 msgstr "Anna muiden nähdä mitä palveluja käytät"
 
-#: ../src/protocols/silc/silc.c:730
+#: ../libgaim/protocols/silc/silc.c:728
 msgid "Let others see what computer you are using"
 msgstr "Anna muiden nähdä mitä tietokonetta käytät"
 
-#: ../src/protocols/silc/silc.c:737
+#: ../libgaim/protocols/silc/silc.c:735
 msgid "Your VCard File"
 msgstr "VCard-tiedostosi"
 
-#: ../src/protocols/silc/silc.c:749 ../src/protocols/silc/silc.c:750
+#: ../libgaim/protocols/silc/silc.c:747 ../libgaim/protocols/silc/silc.c:748
 msgid "User Online Status Attributes"
 msgstr "Käyttäjän paikallaolo-ominaisuudet"
 
-#: ../src/protocols/silc/silc.c:751
+#: ../libgaim/protocols/silc/silc.c:749
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -11339,163 +13191,164 @@
 "henkilökohtaiset tietosi. Syötä tiedot jotka haluat toisten näkevän "
 "itsestäsi."
 
-#: ../src/protocols/silc/silc.c:791 ../src/protocols/silc/silc.c:797
-#: ../src/protocols/silc/silc.c:1436
+#: ../libgaim/protocols/silc/silc.c:789 ../libgaim/protocols/silc/silc.c:795
+#: ../libgaim/protocols/silc/silc.c:1434
 msgid "Message of the Day"
 msgstr "Päivän viesti"
 
-#: ../src/protocols/silc/silc.c:791
+#: ../libgaim/protocols/silc/silc.c:789
 msgid "No Message of the Day available"
 msgstr "Päivän viestiä ei ole"
 
-#: ../src/protocols/silc/silc.c:792 ../src/protocols/silc/silc.c:1431
+#: ../libgaim/protocols/silc/silc.c:790 ../libgaim/protocols/silc/silc.c:1429
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Ei ole Päivän viestiä joka olisi assosioitu tälle yhteydelle."
 
-#: ../src/protocols/silc/silc.c:843 ../src/protocols/silc/silc.c:887
-#: ../src/protocols/silc/silc.c:958 ../src/protocols/silc/silc.c:959
+#: ../libgaim/protocols/silc/silc.c:841 ../libgaim/protocols/silc/silc.c:885
+#: ../libgaim/protocols/silc/silc.c:956 ../libgaim/protocols/silc/silc.c:957
 msgid "Create New SILC Key Pair"
 msgstr "Luo uusi SILC-avainpari"
 
-#: ../src/protocols/silc/silc.c:843
+#: ../libgaim/protocols/silc/silc.c:841
 msgid "Passphrases do not match"
 msgstr "Salasanat eivät täsmää"
 
-#: ../src/protocols/silc/silc.c:887
+#: ../libgaim/protocols/silc/silc.c:885
 msgid "Key Pair Generation failed"
 msgstr "Avainparin luonti epäonnistui"
 
-#: ../src/protocols/silc/silc.c:926
+#: ../libgaim/protocols/silc/silc.c:924
 msgid "Key length"
 msgstr "Avaimen pituus"
 
-#: ../src/protocols/silc/silc.c:928
+#: ../libgaim/protocols/silc/silc.c:926
 msgid "Public key file"
 msgstr "Julkinen avaintiedosto"
 
-#: ../src/protocols/silc/silc.c:930
+#: ../libgaim/protocols/silc/silc.c:928
 msgid "Private key file"
 msgstr "Yksityinen avaintiedosto"
 
-#: ../src/protocols/silc/silc.c:953
+#: ../libgaim/protocols/silc/silc.c:951
 msgid "Passphrase (retype)"
 msgstr "Salasana (uudelleen)"
 
-#: ../src/protocols/silc/silc.c:960
+#: ../libgaim/protocols/silc/silc.c:958
 msgid "Generate Key Pair"
 msgstr "Luo avainpari"
 
-#: ../src/protocols/silc/silc.c:1004
+#: ../libgaim/protocols/silc/silc.c:1002
 msgid "Online Status"
 msgstr "Tila"
 
-#: ../src/protocols/silc/silc.c:1013
+#: ../libgaim/protocols/silc/silc.c:1011
 msgid "View Message of the Day"
 msgstr "Näytä päivän viesti"
 
-#: ../src/protocols/silc/silc.c:1017
+#: ../libgaim/protocols/silc/silc.c:1015
 msgid "Create SILC Key Pair..."
 msgstr "Luo SILC-avainpari..."
 
-#: ../src/protocols/silc/silc.c:1116
+#: ../libgaim/protocols/silc/silc.c:1114
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "Käyttäjä <I>%s</I> ei ole verkossa"
 
-#: ../src/protocols/silc/silc.c:1307
+#: ../libgaim/protocols/silc/silc.c:1305
 msgid "Topic too long"
 msgstr "Aihe liian pitkä"
 
-#: ../src/protocols/silc/silc.c:1388
+#: ../libgaim/protocols/silc/silc.c:1386
 msgid "You must specify a nick"
 msgstr "Sinun täytyy syöttää lempinimi"
 
-#: ../src/protocols/silc/silc.c:1490
+#: ../libgaim/protocols/silc/silc.c:1488
 #, c-format
 msgid "channel %s not found"
 msgstr "Kanavaa %s ei löydy"
 
-#: ../src/protocols/silc/silc.c:1495
+#: ../libgaim/protocols/silc/silc.c:1493
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "kanavan tilat kanavalle %s: %s"
 
-#: ../src/protocols/silc/silc.c:1497
+#: ../libgaim/protocols/silc/silc.c:1495
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "ei kanavan tiloja asetettu kanavalle %s"
 
-#: ../src/protocols/silc/silc.c:1510
+#: ../libgaim/protocols/silc/silc.c:1508
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "cmodes asetus epäonnistui, %s"
 
-#: ../src/protocols/silc/silc.c:1540
+#: ../libgaim/protocols/silc/silc.c:1538
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "Tuntematon komento: %s, (mahdollisesti Gaimin virhe)"
 
-#: ../src/protocols/silc/silc.c:1603
+#: ../libgaim/protocols/silc/silc.c:1601
 msgid "part [channel]:  Leave the chat"
 msgstr "part [kanava]:  Poistu keskustelusta"
 
-#: ../src/protocols/silc/silc.c:1607
+#: ../libgaim/protocols/silc/silc.c:1605
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [kanava]:  Poistu keskustelusta"
 
-#: ../src/protocols/silc/silc.c:1611
+#: ../libgaim/protocols/silc/silc.c:1609
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;uusi aihe&gt;]: Näytä tai aseta aihe"
 
-#: ../src/protocols/silc/silc.c:1616
+#: ../libgaim/protocols/silc/silc.c:1614
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;kanava&gt; [&lt;salasana&gt;]: Liity kanavalle tässä verkossa"
 
-#: ../src/protocols/silc/silc.c:1620
+#: ../libgaim/protocols/silc/silc.c:1618
 msgid "list:  List channels on this network"
 msgstr "list: Listaa kanavat tässä verkossa"
 
-#: ../src/protocols/silc/silc.c:1624
+#: ../libgaim/protocols/silc/silc.c:1622
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;nimi&gt;: Näytä nimen tiedot"
 
-#: ../src/protocols/silc/silc.c:1628 ../src/protocols/zephyr/zephyr.c:2629
+#: ../libgaim/protocols/silc/silc.c:1626
+#: ../libgaim/protocols/zephyr/zephyr.c:2681
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;nimi&gt; &lt;viesti&gt;: Lähetä yksityisviesti käyttäjälle"
 
-#: ../src/protocols/silc/silc.c:1632
+#: ../libgaim/protocols/silc/silc.c:1630
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr "query &lt;nimi&gt; [&lt;viesti&gt;]: Lähetä yksityisviesti käyttäjälle"
 
-#: ../src/protocols/silc/silc.c:1636
+#: ../libgaim/protocols/silc/silc.c:1634
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd: Näytä palvelimen päivän viesti"
 
-#: ../src/protocols/silc/silc.c:1640
+#: ../libgaim/protocols/silc/silc.c:1638
 msgid "detach:  Detach this session"
 msgstr "detach: Irroita tämä istunto"
 
-#: ../src/protocols/silc/silc.c:1644
+#: ../libgaim/protocols/silc/silc.c:1642
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [viesti]: Katkaise yhteys palvelimelle, valinnainen viesti"
 
-#: ../src/protocols/silc/silc.c:1648
+#: ../libgaim/protocols/silc/silc.c:1646
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;komento&gt;: Kutsu mitä vain silc:n asiakaskomentoa."
 
-#: ../src/protocols/silc/silc.c:1654
+#: ../libgaim/protocols/silc/silc.c:1652
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;nimi&gt; [-pubkey|&lt;syy&gt;]: Tuhoa nimi"
 
-#: ../src/protocols/silc/silc.c:1658
+#: ../libgaim/protocols/silc/silc.c:1656
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;uusi nimi&gt;: Muuta (lempi)nimesi."
 
-#: ../src/protocols/silc/silc.c:1662
+#: ../libgaim/protocols/silc/silc.c:1660
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;nimi&gt;: Näytä nimen tiedot"
 
-#: ../src/protocols/silc/silc.c:1666
+#: ../libgaim/protocols/silc/silc.c:1664
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -11503,7 +13356,7 @@
 "cmode &lt;kanava&gt; [+|-&lt;tila&gt;] [argumentit]: Aseta tai näytä kanavan "
 "tilat."
 
-#: ../src/protocols/silc/silc.c:1670
+#: ../libgaim/protocols/silc/silc.c:1668
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -11511,15 +13364,15 @@
 "cumode &lt;kanava&gt; +|-&lt;tila&gt; &lt;nimi&gt;: Muuta nimen tilaa "
 "kanavalla."
 
-#: ../src/protocols/silc/silc.c:1674
+#: ../libgaim/protocols/silc/silc.c:1672
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;käyttäjätilat&gt;: Aseta omat tilasi verkossa"
 
-#: ../src/protocols/silc/silc.c:1678
+#: ../libgaim/protocols/silc/silc.c:1676
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;nimi&gt; [-pubkey]: Palvelinoperaattorin oikeudet"
 
-#: ../src/protocols/silc/silc.c:1682
+#: ../libgaim/protocols/silc/silc.c:1680
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -11527,37 +13380,37 @@
 "invite &lt;kanava&gt; [-|+]&lt;nimi&gt;: Kutsu käyttäjä tai lisää/poista "
 "kanavan kutsu- listalta"
 
-#: ../src/protocols/silc/silc.c:1686
+#: ../libgaim/protocols/silc/silc.c:1684
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;kanava&gt; &lt;nimi&gt; [kommentti]: Poista käyttäjä kanavalta"
 
-#: ../src/protocols/silc/silc.c:1690
+#: ../libgaim/protocols/silc/silc.c:1688
 msgid "info [server]:  View server administrative details"
 msgstr "info [palvelin]: Näytä palvelimen ylläpidolliset yksityiskohdat"
 
-#: ../src/protocols/silc/silc.c:1694
+#: ../libgaim/protocols/silc/silc.c:1692
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [%lt;kanava%gt; +|-&lt;nimi&gt;]: Kiellä käyttäjä kanavalta"
 
-#: ../src/protocols/silc/silc.c:1698
+#: ../libgaim/protocols/silc/silc.c:1696
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;nimi|palvelin&gt;: Hae käyttäjän tai palvelimen julkinen avain"
 
-#: ../src/protocols/silc/silc.c:1702
+#: ../libgaim/protocols/silc/silc.c:1700
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Näytä palvelimen ja verkon tilastot"
 
-#: ../src/protocols/silc/silc.c:1706
+#: ../libgaim/protocols/silc/silc.c:1704
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Lähetä PING palvelimelle, johon ollaan yhteydessä"
 
-#: ../src/protocols/silc/silc.c:1711
+#: ../libgaim/protocols/silc/silc.c:1709
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;kanava&gt;: Näytä käyttäjät kanavalla"
 
-#: ../src/protocols/silc/silc.c:1715
+#: ../libgaim/protocols/silc/silc.c:1713
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -11574,111 +13427,111 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../src/protocols/silc/silc.c:1824
+#: ../libgaim/protocols/silc/silc.c:1823
 msgid "SILC Protocol Plugin"
 msgstr "SILC-yhteyskäytäntöliitännäinen"
 
 #. *  description
-#: ../src/protocols/silc/silc.c:1826
+#: ../libgaim/protocols/silc/silc.c:1825
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) -yhteyskäytäntö"
 
-#: ../src/protocols/silc/silc.c:1863
+#: ../libgaim/protocols/silc/silc.c:1862
 msgid "Public Key file"
 msgstr "Julkinen avaintiedosto"
 
-#: ../src/protocols/silc/silc.c:1867
+#: ../libgaim/protocols/silc/silc.c:1866
 msgid "Private Key file"
 msgstr "Yksityinen avaintiedosto"
 
-#: ../src/protocols/silc/silc.c:1877
+#: ../libgaim/protocols/silc/silc.c:1876
 msgid "Cipher"
 msgstr "Salaus"
 
-#: ../src/protocols/silc/silc.c:1887
+#: ../libgaim/protocols/silc/silc.c:1886
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../src/protocols/silc/silc.c:1890
+#: ../libgaim/protocols/silc/silc.c:1889
 msgid "Public key authentication"
 msgstr "Julkisella avaimella todentaminen"
 
-#: ../src/protocols/silc/silc.c:1893
+#: ../libgaim/protocols/silc/silc.c:1892
 msgid "Reject watching by other users"
 msgstr "Evää katsominen toisilta käyttäjiltä"
 
-#: ../src/protocols/silc/silc.c:1896
+#: ../libgaim/protocols/silc/silc.c:1895
 msgid "Block invites"
 msgstr "Estä kutsut"
 
-#: ../src/protocols/silc/silc.c:1899
+#: ../libgaim/protocols/silc/silc.c:1898
 msgid "Block IMs without Key Exchange"
 msgstr "Estä pikaviestit ilman avaintenvaihtoa"
 
-#: ../src/protocols/silc/silc.c:1902
+#: ../libgaim/protocols/silc/silc.c:1901
 msgid "Reject online status attribute requests"
 msgstr "Evää paikallaolotilan pyynnöt"
 
-#: ../src/protocols/silc/silc.c:1905
+#: ../libgaim/protocols/silc/silc.c:1904
 msgid "Block messages to whiteboard"
 msgstr "Estä viestit kirjoitustaululle"
 
-#: ../src/protocols/silc/silc.c:1908
+#: ../libgaim/protocols/silc/silc.c:1907
 msgid "Automatically open whiteboard"
-msgstr "_Avaa kirjoitustaulu automaattisesti"
-
-#: ../src/protocols/silc/silc.c:1911
+msgstr "Avaa kirjoitustaulu automaattisesti"
+
+#: ../libgaim/protocols/silc/silc.c:1910
 msgid "Digitally sign and verify all messages"
 msgstr "Allekirjoita ja tarkista kaikki viestit digitaalisesti"
 
-#: ../src/protocols/silc/util.c:207 ../src/protocols/silc/util.c:233
+#: ../libgaim/protocols/silc/util.c:207 ../libgaim/protocols/silc/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "Luodaan SILC-avainpari"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../src/protocols/silc/util.c:328
+#: ../libgaim/protocols/silc/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Oikea nimi: \t%s\n"
 
-#: ../src/protocols/silc/util.c:330
+#: ../libgaim/protocols/silc/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Käyttäjänimi: \t%s\n"
 
-#: ../src/protocols/silc/util.c:332
+#: ../libgaim/protocols/silc/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "Sähköposti: \t\t%s\n"
 
-#: ../src/protocols/silc/util.c:334
+#: ../libgaim/protocols/silc/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Palvelin: \t%s\n"
 
-#: ../src/protocols/silc/util.c:336
+#: ../libgaim/protocols/silc/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organisaatio: \t%s\n"
 
-#: ../src/protocols/silc/util.c:338
+#: ../libgaim/protocols/silc/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Maa: \t%s\n"
 
-#: ../src/protocols/silc/util.c:339
+#: ../libgaim/protocols/silc/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritmi: \t%s\n"
 
-#: ../src/protocols/silc/util.c:340
+#: ../libgaim/protocols/silc/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Avaimen pituus: \t%d bittiä\n"
 
-#: ../src/protocols/silc/util.c:342
+#: ../libgaim/protocols/silc/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -11689,7 +13542,7 @@
 "%s\n"
 "\n"
 
-#: ../src/protocols/silc/util.c:343
+#: ../libgaim/protocols/silc/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -11698,37 +13551,37 @@
 "Julkisen avaimen babbleprint\n"
 "%s"
 
-#: ../src/protocols/silc/util.c:347 ../src/protocols/silc/util.c:348
+#: ../libgaim/protocols/silc/util.c:374 ../libgaim/protocols/silc/util.c:375
 msgid "Public Key Information"
 msgstr "Julkisen avaimen tiedot"
 
-#: ../src/protocols/silc/util.c:530
+#: ../libgaim/protocols/silc/util.c:557
 msgid "Paging"
 msgstr "Kaukohaku"
 
-#: ../src/protocols/silc/util.c:536
+#: ../libgaim/protocols/silc/util.c:563
 msgid "Video Conferencing"
 msgstr "Videoneuvottelu"
 
-#: ../src/protocols/silc/util.c:554
+#: ../libgaim/protocols/silc/util.c:581
 msgid "Computer"
 msgstr "Tietokone"
 
-#: ../src/protocols/silc/util.c:558
+#: ../libgaim/protocols/silc/util.c:585
 msgid "PDA"
 msgstr "PDA"
 
-#: ../src/protocols/silc/util.c:560
+#: ../libgaim/protocols/silc/util.c:587
 msgid "Terminal"
 msgstr "Pääte"
 
-#: ../src/protocols/silc/wb.c:284
+#: ../libgaim/protocols/silc/wb.c:284
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr ""
 "%s lähetti viestin kirjoitustaululle. Haluatko aukaista kirjoitustaulun?"
 
-#: ../src/protocols/silc/wb.c:288
+#: ../libgaim/protocols/silc/wb.c:288
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
@@ -11737,33 +13590,40 @@
 "%s lähetti viestin kirjoitustaululle kanavalla %s. Haluatko aukaista "
 "kirjoitustaulun?"
 
-#: ../src/protocols/silc/wb.c:302
+#: ../libgaim/protocols/silc/wb.c:302
 msgid "Whiteboard"
 msgstr "Kirjoitustaulu"
 
 #. TODO: do we really want to disconnect on a failure to write?
-#: ../src/protocols/simple/simple.c:411
+#: ../libgaim/protocols/simple/simple.c:416
 msgid "Could not write"
 msgstr "Ei voitu kirjoittaa"
 
-#: ../src/protocols/simple/simple.c:426 ../src/protocols/simple/simple.c:1431
+#: ../libgaim/protocols/simple/simple.c:438
+#: ../libgaim/protocols/simple/simple.c:1484
 msgid "Could not connect"
 msgstr "Ei voitu yhdistää"
 
-#: ../src/protocols/simple/simple.c:997
+#: ../libgaim/protocols/simple/simple.c:1037
 msgid "Wrong Password"
 msgstr "Väärä salasana"
 
-#: ../src/protocols/simple/simple.c:1462 ../src/protocols/simple/simple.c:1501
-#: ../src/protocols/simple/simple.c:1513 ../src/protocols/simple/simple.c:1571
+#: ../libgaim/protocols/simple/simple.c:1518
+#: ../libgaim/protocols/simple/simple.c:1560
+#: ../libgaim/protocols/simple/simple.c:1574
+#: ../libgaim/protocols/simple/simple.c:1626
 msgid "Could not create listen socket"
 msgstr "Kuuntelupistokkeen luominen epäonnistui"
 
-#: ../src/protocols/simple/simple.c:1483
+#: ../libgaim/protocols/simple/simple.c:1541
 msgid "Couldn't resolve host"
 msgstr "Yhteyttä isäntään ei voitu löytää"
 
-#: ../src/protocols/simple/simple.c:1593
+#: ../libgaim/protocols/simple/simple.c:1634
+msgid "Could not resolve hostname"
+msgstr "Isäntänimeä ei voitu selvittää"
+
+#: ../libgaim/protocols/simple/simple.c:1651
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP-käyttäjänimissä ei tule olla välilyöntejä tai @-merkkejä"
 
@@ -11775,163 +13635,157 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../src/protocols/simple/simple.c:1755
+#: ../libgaim/protocols/simple/simple.c:1819
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE-yhteyskäytäntöliitännäinen"
 
 #. *  summary
-#: ../src/protocols/simple/simple.c:1756
+#: ../libgaim/protocols/simple/simple.c:1820
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE-yhteyskäytäntöliitännäinen"
 
-#: ../src/protocols/simple/simple.c:1778
+#: ../libgaim/protocols/simple/simple.c:1842
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Julkaise tilasi (huom: kuka tahansa voi seurata tilaasi)"
 
-#: ../src/protocols/simple/simple.c:1784
+#: ../libgaim/protocols/simple/simple.c:1848
 msgid "Use UDP"
 msgstr "Käytä UDP:tä"
 
-#: ../src/protocols/simple/simple.c:1786
+#: ../libgaim/protocols/simple/simple.c:1850
 msgid "Use proxy"
 msgstr "Käytä välipalvelinta"
 
-#: ../src/protocols/simple/simple.c:1788
+#: ../libgaim/protocols/simple/simple.c:1852
 msgid "Proxy"
 msgstr "Välipalvelin"
 
-#: ../src/protocols/simple/simple.c:1790
+#: ../libgaim/protocols/simple/simple.c:1854
 msgid "Auth User"
 msgstr "Todennus/käyttäjä"
 
-#: ../src/protocols/simple/simple.c:1792
+#: ../libgaim/protocols/simple/simple.c:1856
 msgid "Auth Domain"
 msgstr "Todennus/verkkoalue"
 
-#: ../src/protocols/toc/toc.c:139
+#: ../libgaim/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr "Etsitään %s"
 
-#: ../src/protocols/toc/toc.c:148
+#: ../libgaim/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr "%s: yhteyden muodostaminen epäonnistui"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../src/protocols/toc/toc.c:172 ../src/protocols/yahoo/yahoo.c:2254
-#: ../src/protocols/yahoo/yahoo.c:2281 ../src/protocols/yahoo/yahoo.c:2364
-#: ../src/protocols/yahoo/yahoo.c:2379
-#: ../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 "Yhteyden muodostaminen epäonnistui."
-
-#: ../src/protocols/toc/toc.c:200
+#: ../libgaim/protocols/toc/toc.c:201
 #, c-format
 msgid "Signon: %s"
 msgstr "Kirjautuminen: %s"
 
-#: ../src/protocols/toc/toc.c:482
+#: ../libgaim/protocols/toc/toc.c:488
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Ei kyetty kirjoittamaan tiedostoa %s."
 
-#: ../src/protocols/toc/toc.c:485
+#: ../libgaim/protocols/toc/toc.c:491
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Ei kyetty lukemaan tiedostoa %s."
 
-#: ../src/protocols/toc/toc.c:488
+#: ../libgaim/protocols/toc/toc.c:494
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Viesti on liian pitkä, viimeiset %s tavua katkaistu."
 
-#: ../src/protocols/toc/toc.c:491
+#: ../libgaim/protocols/toc/toc.c:497
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s ei ole parhaillaan kirjautuneena sisään."
 
-#: ../src/protocols/toc/toc.c:494
+#: ../libgaim/protocols/toc/toc.c:500
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "%s:n varoittaminen ei ole sallittua."
 
-#: ../src/protocols/toc/toc.c:497
+#: ../libgaim/protocols/toc/toc.c:503
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "Viesti on hylätty, ylität palvelimen nopeusrajan."
 
-#: ../src/protocols/toc/toc.c:500
+#: ../libgaim/protocols/toc/toc.c:506
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Ryhmäkeskustelu %s ei ole käytettävissä."
 
-#: ../src/protocols/toc/toc.c:503
+#: ../libgaim/protocols/toc/toc.c:509
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Lähetät viestejä %s:lle liian nopeasti."
 
-#: ../src/protocols/toc/toc.c:506
+#: ../libgaim/protocols/toc/toc.c:512
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Et saanut %s:n pikaviestiä koska se oli liian suuri."
 
-#: ../src/protocols/toc/toc.c:509
+#: ../libgaim/protocols/toc/toc.c:515
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "Et saanut %s:n pikaviestiä koska se lähetettiin liian nopeasti."
 
-#: ../src/protocols/toc/toc.c:512
+#: ../libgaim/protocols/toc/toc.c:518
 msgid "Failure."
 msgstr "Epäonnistuminen."
 
-#: ../src/protocols/toc/toc.c:515
+#: ../libgaim/protocols/toc/toc.c:521
 msgid "Too many matches."
 msgstr "Liian monta tulosta."
 
-#: ../src/protocols/toc/toc.c:518
+#: ../libgaim/protocols/toc/toc.c:524
 msgid "Need more qualifiers."
 msgstr "Tarvitaan lisää määritteitä."
 
-#: ../src/protocols/toc/toc.c:521
+#: ../libgaim/protocols/toc/toc.c:527
 msgid "Dir service temporarily unavailable."
 msgstr "Hakemistopalvelu ei tilapäisesti ole käytettävissä."
 
-#: ../src/protocols/toc/toc.c:524
+#: ../libgaim/protocols/toc/toc.c:530
 msgid "E-mail lookup restricted."
 msgstr "Sähköpostin katsominen rajoitettu."
 
-#: ../src/protocols/toc/toc.c:527
+#: ../libgaim/protocols/toc/toc.c:533
 msgid "Keyword ignored."
 msgstr "Avainsanasta ei välitetty."
 
-#: ../src/protocols/toc/toc.c:530
+#: ../libgaim/protocols/toc/toc.c:536
 msgid "No keywords."
 msgstr "Ei avainsanoja."
 
-#: ../src/protocols/toc/toc.c:533
+#: ../libgaim/protocols/toc/toc.c:539
 msgid "User has no directory information."
 msgstr "Käyttäjällä ei ole hakemistotietoja."
 
-#: ../src/protocols/toc/toc.c:537
+#: ../libgaim/protocols/toc/toc.c:543
 msgid "Country not supported."
 msgstr "Maa ei tuettu."
 
-#: ../src/protocols/toc/toc.c:540
+#: ../libgaim/protocols/toc/toc.c:546
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Tunnistamaton epäonnistuminen: %s."
 
-#: ../src/protocols/toc/toc.c:546
+#: ../libgaim/protocols/toc/toc.c:549
+msgid "Incorrect nickname or password."
+msgstr "Virheellinen kutsumanimi tai salasana."
+
+#: ../libgaim/protocols/toc/toc.c:552
 msgid "The service is temporarily unavailable."
 msgstr "Palvelu ei tilapäisesti ole käytössä."
 
-#: ../src/protocols/toc/toc.c:549
+#: ../libgaim/protocols/toc/toc.c:555
 msgid "Your warning level is currently too high to log in."
 msgstr "Varoitustasosi on parhaillaan liian korkea kirjautuaksesi sisään."
 
-#: ../src/protocols/toc/toc.c:552
+#: ../libgaim/protocols/toc/toc.c:558
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
@@ -11940,41 +13794,41 @@
 "ja yritä uudestaan. Jos jatkat yrittämistä, joudut odottamaan vielä "
 "pidempään."
 
-#: ../src/protocols/toc/toc.c:554
+#: ../libgaim/protocols/toc/toc.c:560
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Tuntematon sisäänkirjautumisvirhe esiintyi: %s."
 
-#: ../src/protocols/toc/toc.c:557
+#: ../libgaim/protocols/toc/toc.c:563
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Tuntematon virhe, %d, esiintyi. Tiedot: %s"
 
-#: ../src/protocols/toc/toc.c:584
+#: ../libgaim/protocols/toc/toc.c:590
 msgid "Invalid Groupname"
 msgstr "Epäkelpo ryhmän nimi"
 
-#: ../src/protocols/toc/toc.c:668
+#: ../libgaim/protocols/toc/toc.c:674
 msgid "Connection Closed"
 msgstr "Yhteys suljettu"
 
-#: ../src/protocols/toc/toc.c:708
+#: ../libgaim/protocols/toc/toc.c:714
 msgid "Waiting for reply..."
 msgstr "Odotetaan vastausta..."
 
-#: ../src/protocols/toc/toc.c:786
+#: ../libgaim/protocols/toc/toc.c:792
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC on palannut tauoltaan. Voit lähettää viestejä jälleen."
 
-#: ../src/protocols/toc/toc.c:989
+#: ../libgaim/protocols/toc/toc.c:995
 msgid "Password Change Successful"
 msgstr "Salasanan vaihto onnistui"
 
-#: ../src/protocols/toc/toc.c:993
+#: ../libgaim/protocols/toc/toc.c:999
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC on lähettänyt PAUSE-komennon."
 
-#: ../src/protocols/toc/toc.c:994
+#: ../libgaim/protocols/toc/toc.c:1000
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
 "if you send a message. Gaim will prevent anything from going through. This "
@@ -11984,53 +13838,49 @@
 "voi potkaista sinut ulos jos lähetät viestin. Gaim estää kaiken läpimenon. "
 "Tämä on vain väliaikaista, ole kärsivällinen."
 
-#: ../src/protocols/toc/toc.c:1367
+#: ../libgaim/protocols/toc/toc.c:1373
 msgid "_Group:"
 msgstr "_Ryhmä:"
 
-#: ../src/protocols/toc/toc.c:1549
+#: ../libgaim/protocols/toc/toc.c:1555
 msgid "Get Dir Info"
 msgstr "Hae hakemistotiedot"
 
-#: ../src/protocols/toc/toc.c:1689
+#: ../libgaim/protocols/toc/toc.c:1695
 msgid "Set Dir Info"
 msgstr "Aseta hakemistotiedot"
 
-#: ../src/protocols/toc/toc.c:1694
-msgid "Change Password"
-msgstr "Vaihda salasana"
-
-#: ../src/protocols/toc/toc.c:1811
+#: ../libgaim/protocols/toc/toc.c:1817
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "%s:n avaaminen kirjoitusta varten epäonnistui!"
 
-#: ../src/protocols/toc/toc.c:1847
+#: ../libgaim/protocols/toc/toc.c:1853
 msgid "File transfer failed; other side probably canceled."
 msgstr ""
 "Tiedostonsiirto epäonnistui. Toinen osapuoli luultavasti katkaisi siirron."
 
-#: ../src/protocols/toc/toc.c:1892 ../src/protocols/toc/toc.c:1932
-#: ../src/protocols/toc/toc.c:2056 ../src/protocols/toc/toc.c:2144
+#: ../libgaim/protocols/toc/toc.c:1898 ../libgaim/protocols/toc/toc.c:1938
+#: ../libgaim/protocols/toc/toc.c:2062 ../libgaim/protocols/toc/toc.c:2150
 msgid "Could not connect for transfer."
 msgstr "Yhteyttä siirtoa varten ei voitu muodostaa."
 
-#: ../src/protocols/toc/toc.c:2089
+#: ../libgaim/protocols/toc/toc.c:2095
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "Tiedosto-otsikkoa ei voitu kirjoittaa. Tiedostoa ei siirretä."
 
-#: ../src/protocols/toc/toc.c:2189
+#: ../libgaim/protocols/toc/toc.c:2195
 msgid "Gaim - Save As..."
 msgstr "Gaim - Tallenna nimellä..."
 
-#: ../src/protocols/toc/toc.c:2223
+#: ../libgaim/protocols/toc/toc.c:2229
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s pyytää %s hyväksymään %d tiedoston: %s (%.2f %s)%s%s"
 msgstr[1] "%s pyytää %s hyväksymään %d tiedostot: %s (%.2f %s)%s%s"
 
-#: ../src/protocols/toc/toc.c:2230
+#: ../libgaim/protocols/toc/toc.c:2236
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s pyytää sinua lähettämään hänelle tiedoston"
@@ -12045,19 +13895,20 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/toc/toc.c:2319 ../src/protocols/toc/toc.c:2321
+#: ../libgaim/protocols/toc/toc.c:2326 ../libgaim/protocols/toc/toc.c:2328
 msgid "TOC Protocol Plugin"
 msgstr "TOC-yhteyskäytäntöliitännäinen"
 
-#: ../src/protocols/yahoo/yahoo.c:711
+#: ../libgaim/protocols/yahoo/yahoo.c:793
 msgid "Your Yahoo! message did not get sent."
 msgstr "Yahoo!-viestiäsi ei lähetetty."
 
-#: ../src/protocols/yahoo/yahoo.c:770 ../src/protocols/yahoo/yahoo.c:3597
+#: ../libgaim/protocols/yahoo/yahoo.c:852
+#: ../libgaim/protocols/yahoo/yahoo.c:3738
 msgid "Buzz!!"
 msgstr "Huomio!"
 
-#: ../src/protocols/yahoo/yahoo.c:816
+#: ../libgaim/protocols/yahoo/yahoo.c:898
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo!-järjestelmäviesti käyttäjälle %s:"
@@ -12065,23 +13916,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:912
+#: ../libgaim/protocols/yahoo/yahoo.c:994
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list%s%s."
 msgstr "Käyttäjä %s haluaa lisätä käyttäjän %s tuttavalistalleen %s%s."
 
-#: ../src/protocols/yahoo/yahoo.c:918
+#: ../libgaim/protocols/yahoo/yahoo.c:1000
 msgid "Message (optional) :"
 msgstr "Viesti (valinnainen) :"
 
-#: ../src/protocols/yahoo/yahoo.c:960
+#: ../libgaim/protocols/yahoo/yahoo.c:1042
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "Käyttäjä %s on (taannehtivasti) evännyt pyyntösi lisätä hänet "
 "tuttavalistallesi."
 
-#: ../src/protocols/yahoo/yahoo.c:963
+#: ../libgaim/protocols/yahoo/yahoo.c:1045
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -12090,11 +13941,11 @@
 "Käyttäjä %s on (taannehtivasti) evännyt pyyntösi lisätä hänet "
 "tuttavalistallesi seuraavasta syystä: %s."
 
-#: ../src/protocols/yahoo/yahoo.c:966
+#: ../libgaim/protocols/yahoo/yahoo.c:1048
 msgid "Add buddy rejected"
 msgstr "Tuttavan lisääminen estetty"
 
-#: ../src/protocols/yahoo/yahoo.c:1716
+#: ../libgaim/protocols/yahoo/yahoo.c:1799
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -12105,11 +13956,11 @@
 "versio ei todennäköisesti pysty kirjautumaan Yahoo-palveluun. Tarkista "
 "päivitykset osoitteesta: %s."
 
-#: ../src/protocols/yahoo/yahoo.c:1719
+#: ../libgaim/protocols/yahoo/yahoo.c:1802
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo!:n todennus epäonnistui"
 
-#: ../src/protocols/yahoo/yahoo.c:1785
+#: ../libgaim/protocols/yahoo/yahoo.c:1868
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -12119,19 +13970,19 @@
 "tuttavalistalla. Painaessasi \"Kyllä\" poistat hänet tuttavalistalta eikä "
 "häneltä saapuneista viesteistä enää välitetä."
 
-#: ../src/protocols/yahoo/yahoo.c:1788
+#: ../libgaim/protocols/yahoo/yahoo.c:1871
 msgid "Ignore buddy?"
 msgstr "Jätä tuttava huomiotta?"
 
-#: ../src/protocols/yahoo/yahoo.c:1822
+#: ../libgaim/protocols/yahoo/yahoo.c:1905
 msgid "Invalid username."
 msgstr "Epäkelpo käyttäjänimi."
 
-#: ../src/protocols/yahoo/yahoo.c:1833
+#: ../libgaim/protocols/yahoo/yahoo.c:1919
 msgid "Normal authentication failed!"
 msgstr "Tavallinen tunnistautumismenetelmä epäonnistui!"
 
-#: ../src/protocols/yahoo/yahoo.c:1834
+#: ../libgaim/protocols/yahoo/yahoo.c:1920
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -12143,137 +13994,143 @@
 "muuttunut. Gaim yrittää nyt kirjautua käyttäen Web Messenger- "
 "tunnistautumista josta seuraa vähentynyt toiminnallisuus ja ominaisuudet."
 
-#: ../src/protocols/yahoo/yahoo.c:1842
-msgid "Incorrect password."
-msgstr "Virheellinen salasana."
-
-#: ../src/protocols/yahoo/yahoo.c:1845
+#: ../libgaim/protocols/yahoo/yahoo.c:1931
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Käyttäjätilisi on lukittu, kirjaudu sisään yahoo-websivustolta."
 
-#: ../src/protocols/yahoo/yahoo.c:1848
+#: ../libgaim/protocols/yahoo/yahoo.c:1934
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Tuntematon viesti numero %d. Kirjautumalla Yahoo! verkkosivuille saattaa "
 "korjata tämän."
 
-#: ../src/protocols/yahoo/yahoo.c:1902
+#: ../libgaim/protocols/yahoo/yahoo.c:1988
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Ei voitu lisätä tuttavaa %s ryhmään %s palvelimen listalle, tilillä %s."
 
-#: ../src/protocols/yahoo/yahoo.c:1905
+#: ../libgaim/protocols/yahoo/yahoo.c:1991
 msgid "Could not add buddy to server list"
 msgstr "Ei voitu lisätä tuttavaa palvelimen listalle"
 
-#: ../src/protocols/yahoo/yahoo.c:2024
+#: ../libgaim/protocols/yahoo/yahoo.c:2110
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Ääniäinen %s/%s/%s.swf ] %s"
 
-#: ../src/protocols/yahoo/yahoo.c:2166 ../src/protocols/yahoo/yahoo.c:2313
-#: ../src/protocols/yahoo/yahoo.c:2328 ../src/protocols/yahoo/ycht.c:472
-msgid "Unable to read"
-msgstr "Ei kyetty lukemaan"
-
-#: ../src/protocols/yahoo/yahoo.c:2352 ../src/protocols/yahoo/yahoo.c:2509
-#: ../src/protocols/yahoo/yahoo.c:2612 ../src/protocols/yahoo/yahoo.c:2622
-#: ../src/protocols/yahoo/yahoochat.c:1448
-#: ../src/protocols/yahoo/yahoochat.c:1518 ../src/protocols/yahoo/ycht.c:576
+#: ../libgaim/protocols/yahoo/yahoo.c:2441
+msgid "Received unexpected HTTP response from server."
+msgstr "Odottamaton HTTP-vastaus palvelimelta."
+
+#: ../libgaim/protocols/yahoo/yahoo.c:2465
+#: ../libgaim/protocols/yahoo/yahoo.c:2637
+#: ../libgaim/protocols/yahoo/yahoo.c:2740
+#: ../libgaim/protocols/yahoo/yahoo.c:2750
+#: ../libgaim/protocols/yahoo/yahoochat.c:1455
+#: ../libgaim/protocols/yahoo/yahoochat.c:1525
+#: ../libgaim/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Yhteysvirhe"
 
-#: ../src/protocols/yahoo/yahoo.c:2728 ../src/protocols/yahoo/yahoo.c:3331
+#: ../libgaim/protocols/yahoo/yahoo.c:2865
+#: ../libgaim/protocols/yahoo/yahoo.c:3472
 msgid "Not at Home"
 msgstr "Poissa kotoa"
 
-#: ../src/protocols/yahoo/yahoo.c:2730 ../src/protocols/yahoo/yahoo.c:3334
+#: ../libgaim/protocols/yahoo/yahoo.c:2867
+#: ../libgaim/protocols/yahoo/yahoo.c:3475
 msgid "Not at Desk"
 msgstr "Poissa työpöydältä"
 
-#: ../src/protocols/yahoo/yahoo.c:2732 ../src/protocols/yahoo/yahoo.c:3337
+#: ../libgaim/protocols/yahoo/yahoo.c:2869
+#: ../libgaim/protocols/yahoo/yahoo.c:3478
 msgid "Not in Office"
 msgstr "Poissa toimistolta"
 
-#: ../src/protocols/yahoo/yahoo.c:2736 ../src/protocols/yahoo/yahoo.c:3343
+#: ../libgaim/protocols/yahoo/yahoo.c:2873
+#: ../libgaim/protocols/yahoo/yahoo.c:3484
 msgid "On Vacation"
 msgstr "Lomalla"
 
-#: ../src/protocols/yahoo/yahoo.c:2740 ../src/protocols/yahoo/yahoo.c:3349
+#: ../libgaim/protocols/yahoo/yahoo.c:2877
+#: ../libgaim/protocols/yahoo/yahoo.c:3490
 msgid "Stepped Out"
 msgstr "Piipahdan ulkona"
 
-#: ../src/protocols/yahoo/yahoo.c:2833 ../src/protocols/yahoo/yahoo.c:2863
+#: ../libgaim/protocols/yahoo/yahoo.c:2970
+#: ../libgaim/protocols/yahoo/yahoo.c:3000
 msgid "Not on server list"
 msgstr "Ei palvelimen listalla"
 
-#: ../src/protocols/yahoo/yahoo.c:2880 ../src/protocols/yahoo/yahoo.c:2939
+#: ../libgaim/protocols/yahoo/yahoo.c:3017
+#: ../libgaim/protocols/yahoo/yahoo.c:3076
 msgid "Appear Online"
 msgstr "Näytä linjoilla olevalta"
 
-#: ../src/protocols/yahoo/yahoo.c:2883 ../src/protocols/yahoo/yahoo.c:2960
+#: ../libgaim/protocols/yahoo/yahoo.c:3020
+#: ../libgaim/protocols/yahoo/yahoo.c:3097
 msgid "Appear Permanently Offline"
 msgstr "Näytä pysyvästi poissaolevalta"
 
-#: ../src/protocols/yahoo/yahoo.c:2902
+#: ../libgaim/protocols/yahoo/yahoo.c:3039
 msgid "Presence"
 msgstr "Läsnäolo"
 
-#: ../src/protocols/yahoo/yahoo.c:2945
+#: ../libgaim/protocols/yahoo/yahoo.c:3082
 msgid "Appear Offline"
 msgstr "Näytä poissaolevalta"
 
-#: ../src/protocols/yahoo/yahoo.c:2954
+#: ../libgaim/protocols/yahoo/yahoo.c:3091
 msgid "Don't Appear Permanently Offline"
 msgstr "Älä näytä pysyvästi poissaolevalta"
 
-#: ../src/protocols/yahoo/yahoo.c:3002
+#: ../libgaim/protocols/yahoo/yahoo.c:3139
 msgid "Join in Chat"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: ../src/protocols/yahoo/yahoo.c:3008
+#: ../libgaim/protocols/yahoo/yahoo.c:3145
 msgid "Initiate Conference"
 msgstr "Aloita neuvottelu"
 
-#: ../src/protocols/yahoo/yahoo.c:3036
+#: ../libgaim/protocols/yahoo/yahoo.c:3173
 msgid "Presence Settings"
 msgstr "Läsnäoloasetukset"
 
-#: ../src/protocols/yahoo/yahoo.c:3042
+#: ../libgaim/protocols/yahoo/yahoo.c:3179
 msgid "Start Doodling"
 msgstr "Aloita piirtely"
 
-#: ../src/protocols/yahoo/yahoo.c:3074
+#: ../libgaim/protocols/yahoo/yahoo.c:3211
 msgid "Active which ID?"
 msgstr "Minkä tunnuksen (ID) haluat aktivoida?"
 
-#: ../src/protocols/yahoo/yahoo.c:3083
+#: ../libgaim/protocols/yahoo/yahoo.c:3220
 msgid "Join who in chat?"
 msgstr "Kenen seuraan liitytään ryhmäkeskustelussa?"
 
-#: ../src/protocols/yahoo/yahoo.c:3093
+#: ../libgaim/protocols/yahoo/yahoo.c:3230
 msgid "Activate ID..."
 msgstr "Aktivoi tunnus (ID)..."
 
-#: ../src/protocols/yahoo/yahoo.c:3097
+#: ../libgaim/protocols/yahoo/yahoo.c:3234
 msgid "Join User in Chat..."
 msgstr "Liity käyttäjän seuraan ryhmäkeskustelussa..."
 
-#: ../src/protocols/yahoo/yahoo.c:3656
+#: ../libgaim/protocols/yahoo/yahoo.c:3797
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;huone&gt;: Liity keskusteluhuoneeseen Yahoo-verkossa"
 
-#: ../src/protocols/yahoo/yahoo.c:3661
+#: ../libgaim/protocols/yahoo/yahoo.c:3802
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Listaa kanavat Yahoo-verkossa"
 
-#: ../src/protocols/yahoo/yahoo.c:3665
+#: ../libgaim/protocols/yahoo/yahoo.c:3806
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Anna tuttavalle äänimerkki huomion saamiseksi"
 
-#: ../src/protocols/yahoo/yahoo.c:3669
+#: ../libgaim/protocols/yahoo/yahoo.c:3810
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Pyydä käyttäjää aloittamaan piirtelyistunto"
 
@@ -12287,90 +14144,162 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/yahoo/yahoo.c:3762 ../src/protocols/yahoo/yahoo.c:3764
+#: ../libgaim/protocols/yahoo/yahoo.c:3904
+#: ../libgaim/protocols/yahoo/yahoo.c:3906
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo-yhteyskäytäntöliitännäinen"
 
-#: ../src/protocols/yahoo/yahoo.c:3781
+#: ../libgaim/protocols/yahoo/yahoo.c:3923
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../src/protocols/yahoo/yahoo.c:3784
+#: ../libgaim/protocols/yahoo/yahoo.c:3926
 msgid "Pager server"
 msgstr "Hakulaitepalvelin"
 
-#: ../src/protocols/yahoo/yahoo.c:3787
+#: ../libgaim/protocols/yahoo/yahoo.c:3929
 msgid "Japan Pager server"
 msgstr "Hakulaitepalvelin (Japani)"
 
-#: ../src/protocols/yahoo/yahoo.c:3790
+#: ../libgaim/protocols/yahoo/yahoo.c:3932
 msgid "Pager port"
 msgstr "Hakulaiteportti"
 
-#: ../src/protocols/yahoo/yahoo.c:3793
+#: ../libgaim/protocols/yahoo/yahoo.c:3935
 msgid "File transfer server"
 msgstr "Tiedostonsiirtopalvelin"
 
-#: ../src/protocols/yahoo/yahoo.c:3796
+#: ../libgaim/protocols/yahoo/yahoo.c:3938
 msgid "Japan file transfer server"
 msgstr "Tiedostonsiirtopalvelin (Japani)"
 
-#: ../src/protocols/yahoo/yahoo.c:3799
+#: ../libgaim/protocols/yahoo/yahoo.c:3941
 msgid "File transfer port"
 msgstr "Tiedostonsiirtoportti"
 
-#: ../src/protocols/yahoo/yahoo.c:3802
+#: ../libgaim/protocols/yahoo/yahoo.c:3944
 msgid "Chat room locale"
 msgstr "Keskusteluhuoneen paikallisasetus"
 
-#: ../src/protocols/yahoo/yahoo.c:3805
+#: ../libgaim/protocols/yahoo/yahoo.c:3947
 msgid "Ignore conference and chatroom invitations"
 msgstr "Jätä konferenssi- ja keskusteluhuonekutsut huomiotta"
 
-#: ../src/protocols/yahoo/yahoo.c:3809
+#: ../libgaim/protocols/yahoo/yahoo.c:3955
 msgid "Chat room list URL"
 msgstr "Keskusteluhuoneluettelon URL"
 
-#: ../src/protocols/yahoo/yahoo.c:3812
+#: ../libgaim/protocols/yahoo/yahoo.c:3958
 msgid "Yahoo Chat server"
 msgstr "Yahoo-ryhmäkeskustelupalvelin"
 
-#: ../src/protocols/yahoo/yahoo.c:3815
+#: ../libgaim/protocols/yahoo/yahoo.c:3961
 msgid "Yahoo Chat port"
 msgstr "Yahoo-ryhmäkeskustelupalvelimen portti"
 
+#: ../libgaim/protocols/yahoo/yahoochat.c:203
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgstr "%s kieltäytyi kutsustasi huoneeseen \"%s\" koska \"%s\"."
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:205
+msgid "Invitation Rejected"
+msgstr "Kutsusta kieltäydytty"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:361
+msgid "Failed to join chat"
+msgstr "Ryhmäkeskusteluun liittyminen epäonnistui"
+
+#. -6
+#: ../libgaim/protocols/yahoo/yahoochat.c:364
+msgid "Unknown room"
+msgstr "Tuntematon huone"
+
+#. -15
+#: ../libgaim/protocols/yahoo/yahoochat.c:367
+msgid "Maybe the room is full"
+msgstr "Ehkä huone on täynnä"
+
+#. -35
+#: ../libgaim/protocols/yahoo/yahoochat.c:370
+msgid "Not available"
+msgstr "Ei olemassa"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:374
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+msgstr ""
+"Tuntematon virhe. Voi olla että sinun pitää kirjautua ulos ja odottaa viisi "
+"minuuttia ennen uudelleenliittymistä keskusteluhuoneeseen"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:452
+#, c-format
+msgid "You are now chatting in %s."
+msgstr "Olet nyt keskustelemassa huoneessa %s"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:627
+msgid "Failed to join buddy in chat"
+msgstr "Liittyminen tuttavan seuraan keskusteluhuoneeseen epäonnistui"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:628
+msgid "Maybe they're not in a chat?"
+msgstr "Ehkä he eivät ole ryhmäkeskustelussa?"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1357
+#: ../libgaim/protocols/yahoo/yahoochat.c:1383
+msgid "Fetching the room list failed."
+msgstr "Huonelistan haku epäonnistui."
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1441
+msgid "Voices"
+msgstr "Äänet"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1444
+msgid "Webcams"
+msgstr "Web-kamerat"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1455
+#: ../libgaim/protocols/yahoo/yahoochat.c:1525
+msgid "Unable to fetch room list."
+msgstr "Huonelistaa ei voida hakea."
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1518
+msgid "User Rooms"
+msgstr "Käyttäjän huoneet"
+
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
-#: ../src/protocols/yahoo/yahoo_doodle.c:96
+#: ../libgaim/protocols/yahoo/yahoo_doodle.c:96
 msgid "Sent Doodle request."
 msgstr "Lähetä piirtelypyyntö (doodle)."
 
-#: ../src/protocols/yahoo/yahoo_filexfer.c:253
-#: ../src/protocols/yahoo/yahoo_filexfer.c:262
-#: ../src/protocols/yahoo/yahoo_filexfer.c:271
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:269
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:278
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:291
 msgid "Unable to establish file descriptor."
 msgstr "Ei kyetty muodostamaan tiedostokahvaa."
 
 #. TODO: what to do here - do we really have to disconnect?
-#: ../src/protocols/yahoo/yahoo_packet.c:279
+#: ../libgaim/protocols/yahoo/yahoo_packet.c:288
 msgid "Write Error"
 msgstr "Virhe kirjoituksessa"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:707
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:707
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
 msgstr "<b>IP-osoite:</b> %s<br>"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:783
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:782
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan -profiili"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:784
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:783
 msgid "Yahoo! Profile"
 msgstr "Yahoo!-profiili"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:828
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:827
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
@@ -12378,7 +14307,7 @@
 "Tällä hetkellä profiileja jotka on merkitty sisältämään aikuisviihdettä, ei "
 "tueta."
 
-#: ../src/protocols/yahoo/yahoo_profile.c:830
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:829
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
@@ -12386,47 +14315,47 @@
 "Jos haluat katsoa tätä profiilia, sinun tulee seurata tätä linkkiä "
 "selaimessasi"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1012
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1026
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1084
-#: ../src/protocols/yahoo/yahoo_profile.c:1088
-#: ../src/protocols/yahoo/yahoo_profile.c:1092
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1098
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1102
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1106
 msgid "Hobbies"
 msgstr "Harrastukset"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1102
-#: ../src/protocols/yahoo/yahoo_profile.c:1106
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1116
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1120
 msgid "Latest News"
 msgstr "Uutiset"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1127
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1141
 msgid "Home Page"
 msgstr "Kotisivu"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1142
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1156
 msgid "Cool Link 1"
 msgstr "Linkki 1"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1147
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1161
 msgid "Cool Link 2"
 msgstr "Linkki 2"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1151
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1165
 msgid "Cool Link 3"
 msgstr "Linkki 3"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1164
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1179
 msgid "Last Update"
 msgstr "Edellinen päivitys"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1170
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1186
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "%s:n käyttäjätiedot eivät ole saatavilla"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1176
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1192
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
@@ -12434,7 +14363,7 @@
 "Tämä profiili näyttää käyttävän kieltä tai muotoa jota ei tueta tällä "
 "hetkellä."
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1192
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1208
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -12442,7 +14371,7 @@
 "Ei voitu hakea käyttäjän profiilia. Tämä on todennäköisesti väliaikainen "
 "palvelimen ongelma. Ole hyvä ja yritä myöhemmin uudestaan."
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1195
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1211
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
@@ -12453,86 +14382,24 @@
 "käyttäjän profiilin. Jos olet varma että käyttäjä on olemassa, yritä "
 "myöhemmin uudelleen."
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1203
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1218
 msgid "The user's profile is empty."
 msgstr "Käyttäjän profiili on tyhjä."
 
-#: ../src/protocols/yahoo/yahoochat.c:203
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s kieltäytyi kutsustasi huoneeseen \"%s\" koska \"%s\"."
-
-#: ../src/protocols/yahoo/yahoochat.c:205
-msgid "Invitation Rejected"
-msgstr "Kutsusta kieltäydytty"
-
-#: ../src/protocols/yahoo/yahoochat.c:361
-msgid "Failed to join chat"
-msgstr "Ryhmäkeskusteluun liittyminen epäonnistui"
-
-#. -6
-#: ../src/protocols/yahoo/yahoochat.c:364
-msgid "Unknown room"
-msgstr "Tuntematon huone"
-
-#. -15
-#: ../src/protocols/yahoo/yahoochat.c:367
-msgid "Maybe the room is full"
-msgstr "Ehkä huone on täynnä"
-
-#. -35
-#: ../src/protocols/yahoo/yahoochat.c:370
-msgid "Not available"
-msgstr "Ei olemassa"
-
-#: ../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 ""
-"Tuntematon virhe. Voi olla että sinun pitää kirjautua ulos ja odottaa viisi "
-"minuuttia ennen uudelleenliittymistä keskusteluhuoneeseen"
-
-#: ../src/protocols/yahoo/yahoochat.c:452
-#, c-format
-msgid "You are now chatting in %s."
-msgstr "Olet nyt keskustelemassa huoneessa %s"
-
-#: ../src/protocols/yahoo/yahoochat.c:627
-msgid "Failed to join buddy in chat"
-msgstr "Liittyminen tuttavan seuraan keskusteluhuoneeseen epäonnistui"
-
-#: ../src/protocols/yahoo/yahoochat.c:628
-msgid "Maybe they're not in a chat?"
-msgstr "Ehkä he eivät ole ryhmäkeskustelussa?"
-
-#: ../src/protocols/yahoo/yahoochat.c:1346
-#: ../src/protocols/yahoo/yahoochat.c:1373
-msgid "Fetching the room list failed."
-msgstr "Huonelistan haku epäonnistui."
-
-#: ../src/protocols/yahoo/yahoochat.c:1434
-msgid "Voices"
-msgstr "Äänet"
-
-#: ../src/protocols/yahoo/yahoochat.c:1437
-msgid "Webcams"
-msgstr "Web-kamerat"
-
-#: ../src/protocols/yahoo/yahoochat.c:1448
-#: ../src/protocols/yahoo/yahoochat.c:1518
-msgid "Unable to fetch room list."
-msgstr "Huonelistaa ei voida hakea."
-
-#: ../src/protocols/yahoo/yahoochat.c:1511
-msgid "User Rooms"
-msgstr "Käyttäjän huoneet"
-
-#: ../src/protocols/yahoo/ycht.c:456
+#: ../libgaim/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr "Yhteysvirhe YCHT-palvelimen kanssa"
 
-#: ../src/protocols/zephyr/zephyr.c:346
+#: ../libgaim/protocols/yahoo/ycht.c:475
+#, c-format
+msgid ""
+"Lost connection with server\n"
+"%s"
+msgstr ""
+"Yhteys palvelimeen katkesi\n"
+"%s"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:355
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -12540,79 +14407,83 @@
 "(Tämän viestin muunnoksessa oli virhe.\t Katso \"koodaus\"-optio "
 "tilieditorista)"
 
-#: ../src/protocols/zephyr/zephyr.c:701
+#: ../libgaim/protocols/zephyr/zephyr.c:753
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Ei voida lähettää ryhmäkeskusteluun %s,%s,%s"
 
-#: ../src/protocols/zephyr/zephyr.c:734 ../src/protocols/zephyr/zephyr.c:1151
+#: ../libgaim/protocols/zephyr/zephyr.c:786
+#: ../libgaim/protocols/zephyr/zephyr.c:1203
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Käyttäjä:</b> %s<br>"
 
-#: ../src/protocols/zephyr/zephyr.c:738 ../src/protocols/zephyr/zephyr.c:1156
+#: ../libgaim/protocols/zephyr/zephyr.c:790
+#: ../libgaim/protocols/zephyr/zephyr.c:1208
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Näkymättömänä tai poissa linjoilta"
 
-#: ../src/protocols/zephyr/zephyr.c:743 ../src/protocols/zephyr/zephyr.c:1158
+#: ../libgaim/protocols/zephyr/zephyr.c:795
+#: ../libgaim/protocols/zephyr/zephyr.c:1210
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>Paikassa: %s saapunut: %s"
 
-#: ../src/protocols/zephyr/zephyr.c:1490 ../src/protocols/zephyr/zephyr.c:1491
+#: ../libgaim/protocols/zephyr/zephyr.c:1542
+#: ../libgaim/protocols/zephyr/zephyr.c:1543
 msgid "Anyone"
 msgstr "Kuka tahansa"
 
-#: ../src/protocols/zephyr/zephyr.c:2298
+#: ../libgaim/protocols/zephyr/zephyr.c:2350
 msgid "_Class:"
 msgstr "_Luokka:"
 
-#: ../src/protocols/zephyr/zephyr.c:2304
+#: ../libgaim/protocols/zephyr/zephyr.c:2356
 msgid "_Instance:"
 msgstr "_Ilmentymä:"
 
-#: ../src/protocols/zephyr/zephyr.c:2310
+#: ../libgaim/protocols/zephyr/zephyr.c:2362
 msgid "_Recipient:"
 msgstr "_Vastaanottaja:"
 
-#: ../src/protocols/zephyr/zephyr.c:2321
+#: ../libgaim/protocols/zephyr/zephyr.c:2373
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Yritys tilata %s,%s,%s epäonnistui"
 
-#: ../src/protocols/zephyr/zephyr.c:2634
+#: ../libgaim/protocols/zephyr/zephyr.c:2686
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;nimi&gt;: Paikanna käyttäjä"
 
-#: ../src/protocols/zephyr/zephyr.c:2639
+#: ../libgaim/protocols/zephyr/zephyr.c:2691
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;nimi&gt;: Paikanna käyttäjä"
 
-#: ../src/protocols/zephyr/zephyr.c:2644
+#: ../libgaim/protocols/zephyr/zephyr.c:2696
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "instance &lt;ilmentymä&gt;: Aseta ilmentymä jota käytetään tässä luokassa"
 
-#: ../src/protocols/zephyr/zephyr.c:2649
+#: ../libgaim/protocols/zephyr/zephyr.c:2701
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;ilmentymä&gt;: Aseta ilmentymä jota käytetään tässä luokassa"
 
-#: ../src/protocols/zephyr/zephyr.c:2654
+#: ../libgaim/protocols/zephyr/zephyr.c:2706
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;ilmentymä&gt;: Aseta ilmentymä jota käytetään tässä luokassa"
 
-#: ../src/protocols/zephyr/zephyr.c:2660
+#: ../libgaim/protocols/zephyr/zephyr.c:2712
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 "sub &lt;luokka&gt; &lt;ilmentymä&gt; &lt;vastaanottaja&gt;: Liity uuteen "
 "ryhmäkeskusteluun"
 
-#: ../src/protocols/zephyr/zephyr.c:2665
+#: ../libgaim/protocols/zephyr/zephyr.c:2717
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr "zi &lt;ilmentymä&gt;: Lähetä viesti &lt;viesti,<i>ilmentymä</i>,*&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2671
+#: ../libgaim/protocols/zephyr/zephyr.c:2723
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -12620,7 +14491,7 @@
 "zci &lt;luokka&gt; &lt;ilmentymä&gt;: Lähetä viesti &lt;<i>luokka</i>,"
 "<i>ilmentymä</i>,*&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2677
+#: ../libgaim/protocols/zephyr/zephyr.c:2729
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -12628,7 +14499,7 @@
 "zcir &lt;luokka&gt; &lt;ilmentymä&gt; &lt;vastaanottaja&gt;: Lähetä viesti "
 "&lt;<i>luokka</i>,<i>ilmentymä</i>,<i>vastaanottaja</i>&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2683
+#: ../libgaim/protocols/zephyr/zephyr.c:2735
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -12636,15 +14507,15 @@
 "zir &lt;ilmentymä&gt; &lt;vastaanottaja&gt;: Lähetä viesti &lt;VIESTI,"
 "<i>ilmentymä</i>,<i>vastaanottaja</i>&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2688
+#: ../libgaim/protocols/zephyr/zephyr.c:2740
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;luokka&gt;: Lähetä viesti &lt;<i>luokka</i>,YKSITYINEN,*&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2794
+#: ../libgaim/protocols/zephyr/zephyr.c:2846
 msgid "Resubscribe"
 msgstr "Uudelleentilaa"
 
-#: ../src/protocols/zephyr/zephyr.c:2797
+#: ../libgaim/protocols/zephyr/zephyr.c:2849
 msgid "Retrieve subscriptions from server"
 msgstr "Hae tilaukset palvelimelta"
 
@@ -12658,78 +14529,102 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/zephyr/zephyr.c:2882 ../src/protocols/zephyr/zephyr.c:2884
+#: ../libgaim/protocols/zephyr/zephyr.c:2935
+#: ../libgaim/protocols/zephyr/zephyr.c:2937
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr-yhteyskäytäntöliitännäinen"
 
-#: ../src/protocols/zephyr/zephyr.c:2903
+#: ../libgaim/protocols/zephyr/zephyr.c:2956
 msgid "Use tzc"
 msgstr "Käytä tzc"
 
-#: ../src/protocols/zephyr/zephyr.c:2906
+#: ../libgaim/protocols/zephyr/zephyr.c:2959
 msgid "tzc command"
 msgstr "tzc-komento"
 
-#: ../src/protocols/zephyr/zephyr.c:2909
+#: ../libgaim/protocols/zephyr/zephyr.c:2962
 msgid "Export to .anyone"
 msgstr "Vie tiedostoon .anyone"
 
-#: ../src/protocols/zephyr/zephyr.c:2912
+#: ../libgaim/protocols/zephyr/zephyr.c:2965
 msgid "Export to .zephyr.subs"
 msgstr "Vie tiedostoon .zephyr.subs"
 
-#: ../src/protocols/zephyr/zephyr.c:2915
+#: ../libgaim/protocols/zephyr/zephyr.c:2968
 msgid "Import from .anyone"
 msgstr "Tuo tiedostosta .anyone"
 
-#: ../src/protocols/zephyr/zephyr.c:2918
+#: ../libgaim/protocols/zephyr/zephyr.c:2971
 msgid "Import from .zephyr.subs"
 msgstr "Tuo tiedostosta .zephyr.subs"
 
-#: ../src/protocols/zephyr/zephyr.c:2921
+#: ../libgaim/protocols/zephyr/zephyr.c:2974
 msgid "Realm"
 msgstr "Alue(realm)"
 
-#: ../src/protocols/zephyr/zephyr.c:2924
+#: ../libgaim/protocols/zephyr/zephyr.c:2977
 msgid "Exposure"
 msgstr "Altistus"
 
-#: ../src/proxy.c:1211 ../src/proxy.c:1267 ../src/proxy.c:1315
-#: ../src/proxy.c:1342
-#, c-format
-msgid "Proxy connection error %d"
-msgstr "Välipalvelimen yhteysvirhe %d"
-
-#. Forbidden
-#: ../src/proxy.c:1331
-#, c-format
-msgid "Access denied: proxy server forbids port %d tunnelling."
-msgstr "Pääsy evätty: välipalvelin estää portin %d tunneloinnin."
+#: ../libgaim/proxy.c:446 ../libgaim/proxy.c:868 ../libgaim/proxy.c:1025
+#: ../libgaim/proxy.c:1583
+#, c-format
+msgid ""
+"Unable to create socket:\n"
+"%s"
+msgstr ""
+"Pistokkeen luonti epäonnistui:\n"
+"%s"
+
+#: ../libgaim/proxy.c:648
+#, c-format
+msgid "Unable to parse response from HTTP proxy: %s\n"
+msgstr "Ei voitu jäsentää vastausta HTTP-välipalvelimelta: %s\n"
+
+#: ../libgaim/proxy.c:676 ../libgaim/proxy.c:722 ../libgaim/proxy.c:760
+#: ../libgaim/proxy.c:772
+#, c-format
+msgid "HTTP proxy connection error %d"
+msgstr "HTTP-välipalvelimen yhteysvirhe %d"
+
+#: ../libgaim/proxy.c:768
+#, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgstr "Pääsy evätty: HTTP-välipalvelin estää portin %d tunneloinnin."
+
+#: ../libgaim/proxy.c:988
+#, c-format
+msgid "Error resolving %s"
+msgstr "Virhe selvitettäessä %s"
+
+#: ../libgaim/proxy.c:1677
+msgid "Could not resolve host name"
+msgstr "Ei voitu selvittää isäntänimeä"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../src/request.h:1354
+#: ../libgaim/request.h:1354
 msgid "_Accept"
 msgstr "_Hyväksy"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../src/savedstatuses.c:45
+#: ../libgaim/savedstatuses.c:46
 msgid "I'm not here right now"
 msgstr "En ole täällä juuri nyt"
 
-#: ../src/savedstatuses.c:524
+#: ../libgaim/savedstatuses.c:525
 msgid "saved statuses"
 msgstr "tallennetut tilat"
 
-#: ../src/server.c:225
+#: ../libgaim/server.c:228
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s on nyt nimeltään %s.\n"
 
-#: ../src/server.c:678
+#: ../libgaim/server.c:686
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -12738,73 +14633,73 @@
 "Käyttäjä %s on kutsunut käyttäjän %s keskusteluhuoneeseen %s:\n"
 "%s"
 
-#: ../src/server.c:683
+#: ../libgaim/server.c:691
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "Käyttäjä %s on kutsunut käyttäjän %s keskusteluhuoneeseen %s\n"
 
-#: ../src/server.c:687
+#: ../libgaim/server.c:695
 msgid "Accept chat invitation?"
 msgstr "Hyväksy ryhmäkeskustelukutsu?"
 
-#: ../src/status.c:153
+#: ../libgaim/status.c:153
 msgid "Unset"
 msgstr "Poista asetus"
 
-#: ../src/status.c:156
+#: ../libgaim/status.c:156
 msgid "Unavailable"
 msgstr "Tavoittamattomissa"
 
-#: ../src/status.c:160
+#: ../libgaim/status.c:160
 msgid "Mobile"
 msgstr "Liikkeellä"
 
-#: ../src/status.c:611
+#: ../libgaim/status.c:611
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s on vaihtanut tilasta %s tilaan %s"
 
-#: ../src/status.c:621
+#: ../libgaim/status.c:621
 #, c-format
 msgid "%s is now %s"
 msgstr "%s on nyt %s"
 
-#: ../src/status.c:626
+#: ../libgaim/status.c:626
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s ei ole enää %s"
 
-#: ../src/status.c:1296
+#: ../libgaim/status.c:1293
 #, c-format
 msgid "%s became idle"
 msgstr "%s on jouten"
 
-#: ../src/status.c:1313
+#: ../libgaim/status.c:1310
 #, c-format
 msgid "%s became unidle"
 msgstr "%s on aktiivinen"
 
-#: ../src/status.c:1379
+#: ../libgaim/status.c:1376
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s on jouten"
 
-#: ../src/status.c:1381
+#: ../libgaim/status.c:1378
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s on aktiivinen"
 
-#: ../src/util.c:679
+#: ../libgaim/util.c:680
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../src/util.c:2449
+#: ../libgaim/util.c:2429
 #, c-format
 msgid "Error Reading %s"
 msgstr "Virhe luettaessa %s"
 
-#: ../src/util.c:2450
+#: ../libgaim/util.c:2430
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -12813,59 +14708,177 @@
 "%s:n lukemisessa tapahtui virhe. Niitä ei ladattu ja vanha tiedosto on "
 "nimetty uudelleen nimellä %s~."
 
-#: ../src/util.c:2903
+#: ../libgaim/util.c:2893
 msgid "Calculating..."
 msgstr "Lasketaan..."
 
-#: ../src/util.c:2906
+#: ../libgaim/util.c:2896
 msgid "Unknown."
 msgstr "Tuntematon."
 
-#: ../src/util.c:2932
+#: ../libgaim/util.c:2922
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekunti"
 msgstr[1] "%d sekuntia"
 
-#: ../src/util.c:2944
+#: ../libgaim/util.c:2934
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d päivä"
 msgstr[1] "%d päivää"
 
-#: ../src/util.c:2952
+#: ../libgaim/util.c:2942
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d tunti"
 msgstr[1] "%s, %d tuntia"
 
-#: ../src/util.c:2958
+#: ../libgaim/util.c:2948
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d tunti"
 msgstr[1] "%d tuntia"
 
-#: ../src/util.c:2966
+#: ../libgaim/util.c:2956
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuutti"
 msgstr[1] "%s, %d minuuttia"
 
-#: ../src/util.c:2972
+#: ../libgaim/util.c:2962
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuutti"
 msgstr[1] "%d minuuttia"
 
-#: ../src/util.c:3439
-msgid "g003: Error opening connection.\n"
-msgstr "g003: Virhe avattaessa yhteyttä.\n"
+#: ../libgaim/util.c:3161 ../libgaim/util.c:3460
+#, c-format
+msgid "Unable to connect to %s"
+msgstr "Kohteeseen %s ei kyetty muodostamaan yhteyttä"
+
+#: ../libgaim/util.c:3287
+#, c-format
+msgid ""
+"Unable to allocate enough memory to hold the contents from %s.  The web "
+"server may be trying something malicious."
+msgstr ""
+"Ei voitu varata riittävästi muistia säilyttämään kohteen %s sisältö. "
+"Verkkopalvelin voi olla yrittämässä tehdä jotain pahantahtoista."
+
+#: ../libgaim/util.c:3324
+#, c-format
+msgid "Error reading from %s: %s"
+msgstr "Virhe luettaessa kohteesta %s: %s"
+
+#: ../libgaim/util.c:3355
+#, c-format
+msgid "Error writing to %s: %s"
+msgstr "Virhe kirjoitettaessa kohteseen %s: %s"
+
+#: ../libgaim/util.c:3380
+#, c-format
+msgid "Unable to connect to %s: %s"
+msgstr "Ei voitu yhdistää kohteeseen %s: %s"
+
+#~ msgid "Right-click for more unread messages...\n"
+#~ msgstr "Näytä lisää viestejä hiiren oikealla painikkeella...\n"
+
+#~ msgid "Change Status"
+#~ msgstr "Vaihda tila"
+
+#~ msgid "Show Buddy List"
+#~ msgstr "Näytä tuttavalista"
+
+#~ msgid "New Message..."
+#~ msgstr "Uusi viesti..."
+
+#~ msgid "Mute Sounds"
+#~ msgstr "Vaimenna äänet"
+
+#~ msgid "Quit"
+#~ msgstr "Lopeta"
+
+#~ msgid "Blink tray icon for unread..."
+#~ msgstr "Vilkuta tarjotinkuvaketta, kun uusia..."
+
+#~ msgid "_Instant Messages:"
+#~ msgstr "_Pikaviestejä:"
+
+#~ msgid "In hidden conversations"
+#~ msgstr "Piilotetuissa keskusteluissa"
+
+#~ msgid "C_hat Messages:"
+#~ msgstr "_Ryhmäkeskusteluviestejä:"
+
+#~ msgid "When my nick is said"
+#~ msgstr "Kun tuttavanimeni mainitaan"
+
+#~ msgid "System Tray Icon"
+#~ msgstr "Tarjotinkuvake"
+
+#~ msgid "Displays an icon for Gaim in the system tray."
+#~ msgstr "Näyttää Gaim-kuvakkeen järjestelmän kuvaketarjottimella."
+
+#~ 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 ""
+#~ "Näyttää tarjotinkuvakkeen (esim. Gnomessa, KDE:ssä tai Windowsissa) joka "
+#~ "ilmaisee Gaimin senhetkisen tilan ja mahdollistaa nopean pääsyn usein "
+#~ "käytettyihin toimintoihin sekä tuttavalistan näytön. Tarjoaa myös "
+#~ "valinnat tarjotinkuvakkeen vilkuttamiselle uusien viestien saapuessa."
+
+#~ msgid "Orientation"
+#~ msgstr "Asento"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "Tarjottimen asento."
+
+#~ msgid "_Flash window when IMs are received"
+#~ msgstr "_Vilkuta ikkunaa pikaviestien saapuessa"
+
+#~ msgid ""
+#~ "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
+#~ "account properties"
+#~ msgstr ""
+#~ "Palvelin vaatii TLS/SSL kirjautumiseen. Valitse \"Käytä TLS jos "
+#~ "mahdollista\" käyttäjätilit-valikosta."
+
+#~ msgid "Use TLS if available"
+#~ msgstr "Käytä TLS:ää jos mahdollista"
+
+#~ msgid "Require TLS"
+#~ msgstr "Vaadi TLS"
+
+#~ msgid "A"
+#~ msgstr "A"
+
+#~ msgid "B"
+#~ msgstr "B"
+
+#~ msgid "AB"
+#~ msgstr "AB"
+
+#~ msgid "Buddy icon:"
+#~ msgstr "Tuttavakuvake:"
+
+#~ msgid "Lost connection with server for an unknown reason."
+#~ msgstr "Yhteys palvelimeen katkesi tuntemattomasta syystä."
+
+#~ msgid "Unable to read"
+#~ msgstr "Ei kyetty lukemaan"
+
+#~ msgid "g003: Error opening connection.\n"
+#~ msgstr "g003: Virhe avattaessa yhteyttä.\n"
 
 #~ msgid "DBus"
 #~ msgstr "DBus"
@@ -12972,9 +14985,6 @@
 #~ msgid "Chat is currently unavailable"
 #~ msgstr "Ryhmäkeskustelu ei ole parhaillaan käytettävissä"
 
-#~ msgid "Unable to login to AIM"
-#~ msgstr "Ei kyetty kirjautumaan AIM:iin"
-
 #~ msgid ""
 #~ "Transfer of file %s timed out.\n"
 #~ " Try enabling proxy servers for file transfers in Accounts -> %s -> Edit "
@@ -12995,18 +15005,12 @@
 #~ msgstr ""
 #~ "Pistokkeen muodostus epäonnistui, tai AOL-välipalvelinyhteyttä ei ole."
 
-#~ msgid "Internal Error"
-#~ msgstr "Sisäinen virhe"
-
 #~ msgid "Screen Name:"
 #~ msgstr "Näyttönimi:"
 
 #~ msgid "Error launching <b>%s</b>: %s"
 #~ msgstr "Virhe käynnistettäessä <b>%s</b>: %s"
 
-#~ msgid "Email"
-#~ msgstr "Sähköposti"
-
 #~ msgid "Realname"
 #~ msgstr "Oikea nimi"
 
@@ -13019,15 +15023,9 @@
 #~ msgid "Re-type Passphrase"
 #~ msgstr "Kirjoita salasana uudelleen"
 
-#~ msgid "%s signed on"
-#~ msgstr "%s kirjautui sisään"
-
 #~ msgid "%s came back"
 #~ msgstr "%s palasi"
 
-#~ msgid "%s signed off"
-#~ msgstr "%s kirjautui ulos"
-
 #~ msgid "%s went away"
 #~ msgstr "%s on poissa"
 
@@ -13268,9 +15266,6 @@
 #~ msgid "Jabber ID"
 #~ msgstr "Jabber ID"
 
-#~ msgid "Hidden"
-#~ msgstr "Piilotettu"
-
 #~ msgid "(pending)"
 #~ msgstr "(odottaa)"
 
@@ -13289,9 +15284,6 @@
 #~ msgid "Add User"
 #~ msgstr "Lisää käyttäjä"
 
-#~ msgid "Active Message"
-#~ msgstr "Aktiiviviesti"
-
 #~ msgid "Busy Message"
 #~ msgstr "Poissaoloviesti"
 
@@ -13572,9 +15564,6 @@
 #~ msgid "Basic Profile"
 #~ msgstr "Perusprofiili"
 
-#~ msgid "Profile Information"
-#~ msgstr "Profiilitiedot"
-
 #~ msgid "AIM"
 #~ msgstr "AIM"
 
@@ -13617,9 +15606,6 @@
 #~ msgid "_Reconnect"
 #~ msgstr "_Uudelleenyhdistä"
 
-#~ msgid "Time"
-#~ msgstr "Aika"
-
 #~ msgid "Buddy Information for %s"
 #~ msgstr "Tuttavan %s tiedot"
 
@@ -13833,15 +15819,9 @@
 #~ msgid "/Buddies/_Signoff"
 #~ msgstr "/Tuttavat/Kirjaudu _ulos"
 
-#~ msgid "Rename Group"
-#~ msgstr "Nimeä ryhmä uudelleen"
-
 #~ msgid "New group name"
 #~ msgstr "Uusi ryhmänimi"
 
-#~ msgid "Please enter a new name for the selected group."
-#~ msgstr "Anna uusi nimi valitulle ryhmälle."
-
 #~ msgid "%d%%"
 #~ msgstr "%d%%"
 
@@ -13897,9 +15877,6 @@
 #~ msgid "/Conversation/Warn..."
 #~ msgstr "/Keskustelu/Varoita..."
 
-#~ msgid "Warn"
-#~ msgstr "Varoita"
-
 #~ msgid "Warn the user"
 #~ msgstr "Varoita käyttäjää"
 
@@ -13918,9 +15895,6 @@
 #~ msgid "Invite a user"
 #~ msgstr "Kutsu käyttäjä"
 
-#~ msgid "Add the chat to your buddy list"
-#~ msgstr "Lisää ryhmäkeskustelu tuttavalistalle"
-
 #~ msgid "<main>/Conversation/Close"
 #~ msgstr "<main>/Keskustelu/Sulje"
 
@@ -14028,9 +16002,6 @@
 #~ msgid "Show _buttons as:"
 #~ msgstr "Näytä _painikkeissa:"
 
-#~ msgid "Pictures"
-#~ msgstr "Kuvat"
-
 #~ msgid "Text"
 #~ msgstr "Teksti"
 
@@ -14064,9 +16035,6 @@
 #~ msgid "New conversation _placement:"
 #~ msgstr "Uusi keskustelu_asetettelu:"
 
-#~ msgid "_Edit"
-#~ msgstr "_Muokkaa"
-
 #~ msgid "Message Text"
 #~ msgstr "Viestin teksti"
 
@@ -14180,9 +16148,6 @@
 #~ msgid "Unable to ping server"
 #~ msgstr "Palvelinta ei kyetty pingaamaan"
 
-#~ msgid "Send as message"
-#~ msgstr "Lähetä viestinä"
-
 #~ msgid "Looking up GG server"
 #~ msgstr "Etsitään GG-palvelinta"
 
@@ -14303,9 +16268,6 @@
 #~ msgid "Display conversation closed notices"
 #~ msgstr "Näytä keskustelu suljettu -viestit"
 
-#~ msgid "Display timeout notices"
-#~ msgstr "Näytä aikakatkaisuviestit"
-
 #~ msgid "The conversation has become inactive and timed out."
 #~ msgstr "Keskustelu on tullut inaktiiviseksi ja aikakatkaistu."
 
--- a/po/fr.po	Mon Oct 16 20:15:30 2006 +0000
+++ b/po/fr.po	Mon Oct 16 20:20:14 2006 +0000
@@ -18,8 +18,8 @@
 msgstr ""
 "Project-Id-Version: Gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-10 00:00-0400\n"
-"PO-Revision-Date: 2006-08-10 15:45+0200\n"
+"POT-Creation-Date: 2006-09-28 22:51+0200\n"
+"PO-Revision-Date: 2006-09-28 22:47+0200\n"
 "Last-Translator: Éric Boumaour <zongo_fr@users.sourceforge.net>\n"
 "Language-Team: fr <fr@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -39,797 +39,987 @@
 msgid "Send instant messages over multiple protocols"
 msgstr "Envoie des messages instantanés en utilisant divers protocoles"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ciphertest.c:264
-msgid "Cipher Test"
-msgstr "Test de chiffre"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/ciphertest.c:267 ../plugins/ciphertest.c:269
-msgid "Tests the ciphers that ship with gaim."
-msgstr "Teste le système de chiffrement intégré à Gaim."
-
-#: ../plugins/contact_priority.c:61
-msgid "Buddy is idle"
-msgstr "L'utilisateur est inactif"
-
-#: ../plugins/contact_priority.c:62
-msgid "Buddy is away"
-msgstr "L'utilisateur est absent"
-
-#: ../plugins/contact_priority.c:63
-msgid "Buddy is \"extended\" away"
-msgstr "L'utilisateur est en absence prolongée"
-
-#. Not used yet.
-#: ../plugins/contact_priority.c:66
-msgid "Buddy is mobile"
-msgstr "L'utilisateur est sur téléphone portable"
-
-#: ../plugins/contact_priority.c:68
-msgid "Buddy is offline"
-msgstr "L'utilisateur est déconnecté"
-
-#: ../plugins/contact_priority.c:90
-msgid "Point values to use when..."
-msgstr "Choisissez les valeurs Ă  utiliser quand..."
-
-#: ../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 ""
-"Le nom d'utilisateur avec le score <i>le plus grand</i> sera l'entrée "
-"utilisée pour le contact>\n"
-
-#: ../plugins/contact_priority.c:125
-msgid "Use last buddy when scores are equal"
-msgstr "Utiliser l'utilisateur précédent tant que les scores sont égaux"
-
-#: ../plugins/contact_priority.c:130
-msgid "Point values to use for account..."
-msgstr "Choisissez les valeurs Ă  utiliser pour chaque compte..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/contact_priority.c:182
-msgid "Contact Priority"
-msgstr "Priorité du contact"
-
-#. *< name
-#. *< version
-#. *< summary
-#: ../plugins/contact_priority.c:185
-msgid ""
-"Allows for controlling the values associated with different buddy states."
-msgstr ""
-"Permet de changer les valeurs associés aux différents états des utilisateurs "
-"dans un contact."
-
-#. *< description
-#: ../plugins/contact_priority.c:187
-msgid ""
-"Allows for changing the point values of idle/away/offline states for buddies "
-"in contact priority computations."
-msgstr ""
-"Permet de changer les valeurs attribuées aux états inactif, absent et "
-"déconnecté pour le calcul de la priorité des utilisateurs d'un contact."
-
-#. *< api_version
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../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 "Plugin pour Ă©tablir une session de Crazychat"
-
-#. *  description
-#: ../plugins/crazychat/cc_gaim_plugin.c:151
-msgid "Uses Gaim to obtain buddy ips to connect for a Crazychat session"
-msgstr ""
-"Utilise Gaim pour récupérer les adresses IP des contacts avec lesquels se "
-"connecter pour une session de Crazychat."
-
-#. make the network configuration frame
-#: ../plugins/crazychat/cc_gaim_plugin.c:295
-msgid "Network Configuration"
-msgstr "Configuration du réseau"
-
-#: ../plugins/crazychat/cc_gaim_plugin.c:307
-msgid "TCP port"
-msgstr "Port TCP"
-
-#: ../plugins/crazychat/cc_gaim_plugin.c:317
-msgid "UDP port"
-msgstr "Port UDP"
-
-#. make the feature configuration frame
-#: ../plugins/crazychat/cc_gaim_plugin.c:329
-msgid "Feature Calibration"
-msgstr "Étalonnage facial"
-
-#. add enabled / disabled
-#: ../plugins/crazychat/cc_gaim_plugin.c:345 ../src/gtkaccount.c:2258
-#: ../src/gtkplugin.c:574
-msgid "Enabled"
-msgstr "Activé"
-
-#: ../plugins/crazychat/cc_gaim_plugin.c:350
-msgid "Disabled"
-msgstr "Désactivé"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/dbus-example.c:155
-msgid "DBus Example"
-msgstr "Exemple DBus"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/dbus-example.c:158 ../plugins/dbus-example.c:160
-msgid "DBus Plugin Example"
-msgstr "Exemple de plugin DBus"
-
-#: ../plugins/docklet/docklet.c:154
-msgid "Right-click for more unread messages...\n"
-msgstr "Clic droit pour plus de messages non lus...\n"
-
-#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3255
-#, c-format
-msgid "%d unread message from %s\n"
-msgid_plural "%d unread messages from %s\n"
-msgstr[0] "%d message non lu de %s\n"
-msgstr[1] "%d messages non lus de %s\n"
-
-#: ../plugins/docklet/docklet.c:432
-msgid "Change Status"
-msgstr "Changer d'Ă©tat"
-
-#: ../plugins/docklet/docklet.c:435 ../src/gtkstatusbox.c:673
-#: ../src/protocols/gg/gg.c:996 ../src/protocols/jabber/buddy.c:1363
-#: ../src/protocols/msn/state.c:29 ../src/protocols/msn/state.c:30
-#: ../src/protocols/msn/state.c:37 ../src/protocols/msn/state.c:38
-#: ../src/protocols/novell/novell.c:2843 ../src/protocols/yahoo/yahoo.c:2748
-#: ../src/status.c:155
-msgid "Available"
-msgstr "Disponible"
-
-#. Away stuff
-#. get_yahoo_status_from_gaim_status() returns YAHOO_STATUS_CUSTOM for
-#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
-#: ../plugins/docklet/docklet.c:439 ../src/gtkprefs.c:1774
-#: ../src/gtkstatusbox.c:674 ../src/protocols/gg/gg.c:999
-#: ../src/protocols/irc/irc.c:520 ../src/protocols/irc/msgs.c:223
-#: ../src/protocols/jabber/buddy.c:1367 ../src/protocols/novell/novell.c:2846
-#: ../src/protocols/oscar/oscar.c:719 ../src/protocols/oscar/oscar.c:4423
-#: ../src/protocols/oscar/oscar.c:5487 ../src/protocols/silc/buddy.c:1469
-#: ../src/protocols/yahoo/yahoo.c:3218 ../src/protocols/yahoo/yahoo.c:3291
-#: ../src/status.c:158
-msgid "Away"
-msgstr "Absent"
-
-#: ../plugins/docklet/docklet.c:443 ../src/gtkstatusbox.c:675
-#: ../src/protocols/oscar/oscar.c:723 ../src/protocols/yahoo/yahoo.c:2742
-#: ../src/status.c:157
-msgid "Invisible"
-msgstr "Invisible"
-
-#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:2959
-#: ../src/gtkstatusbox.c:676 ../src/protocols/gg/gg.c:993
-#: ../src/protocols/jabber/buddy.c:1361 ../src/protocols/novell/novell.c:2855
-#: ../src/protocols/oscar/oscar.c:794 ../src/protocols/oscar/oscar.c:5459
-#: ../src/protocols/yahoo/yahoo.c:2746 ../src/status.c:154
-msgid "Offline"
-msgstr "Déconnecté"
-
-#: ../plugins/docklet/docklet.c:467 ../src/gtkstatusbox.c:681
-msgid "New..."
-msgstr "Nouveau..."
-
-#: ../plugins/docklet/docklet.c:468 ../src/gtkstatusbox.c:682
-msgid "Saved..."
-msgstr "Sauvé..."
-
-#: ../plugins/docklet/docklet.c:484
-msgid "Show Buddy List"
-msgstr "Afficher la liste de contacts"
-
-#: ../plugins/docklet/docklet.c:489 ../src/gtkconv.c:5677
-msgid "Unread Messages"
-msgstr "Messages non lus"
-
-#: ../plugins/docklet/docklet.c:510
-msgid "New Message..."
-msgstr "Nouveau message..."
-
-#: ../plugins/docklet/docklet.c:519 ../src/gtkaccount.c:2474
+#: ../console/gntaccount.c:119 ../console/gntblist.c:240
+#: ../console/gntblist.c:357 ../console/gntblist.c:370
+#: ../console/gntplugin.c:169 ../console/gntplugin.c:214
+#: ../console/gntstatus.c:240 ../console/gntstatus.c:248
+#: ../libgaim/protocols/jabber/buddy.c:1363
+#: ../libgaim/protocols/jabber/chat.c:677
+#: ../libgaim/protocols/jabber/chat.c:688
+#: ../libgaim/protocols/jabber/jabber.c:1197
+#: ../libgaim/protocols/qq/group_join.c:322
+#: ../libgaim/protocols/silc/ops.c:1448
+msgid "Error"
+msgstr "Erreur"
+
+#: ../console/gntaccount.c:119
+msgid "Account was not added"
+msgstr "Le compté n'a pas été ajouté."
+
+#: ../console/gntaccount.c:120
+msgid "Screenname of an account must be non-empty."
+msgstr "Le nom d'utilisateur d'un compte ne doit pas ĂŞtre vide."
+
+#: ../console/gntaccount.c:423 ../gtk/gtkaccount.c:557
+msgid "New mail notifications"
+msgstr "Avertir des nouveaux courriers"
+
+#: ../console/gntaccount.c:433 ../gtk/gtkaccount.c:486
+msgid "Remember password"
+msgstr "MĂ©moriser le mot de passe"
+
+#: ../console/gntaccount.c:474 ../gtk/gtkaccount.c:1399 ../gtk/gtkblist.c:3771
+msgid "Modify Account"
+msgstr "Modification du compte"
+
+#: ../console/gntaccount.c:474
+msgid "New Account"
+msgstr "Nouveau compte"
+
+#: ../console/gntaccount.c:500 ../gtk/gtkaccount.c:398 ../gtk/gtkft.c:695
+msgid "Protocol:"
+msgstr "Protocole :"
+
+#: ../console/gntaccount.c:508 ../gtk/gtkaccount.c:403 ../gtk/gtkblist.c:4895
+#: ../gtk/plugins/gevolution/new_person_dialog.c:295
+msgid "Screen name:"
+msgstr "Nom d'utilisateur :"
+
+#: ../console/gntaccount.c:521 ../gtk/gtkaccount.c:477
+msgid "Password:"
+msgstr "Mot de passe :"
+
+#: ../console/gntaccount.c:531 ../gtk/gtkblist.c:4916 ../gtk/gtkblist.c:5281
+msgid "Alias:"
+msgstr "Alias :"
+
+#. Cancel
+#: ../console/gntaccount.c:554 ../console/gntaccount.c:615
+#: ../console/gntaccount.c:834 ../console/gntblist.c:281
+#: ../console/gntblist.c:347 ../console/gntblist.c:380
+#: ../console/gntblist.c:699 ../console/gntblist.c:863
+#: ../console/gntblist.c:951 ../console/gntprefs.c:224
+#: ../console/gntstatus.c:132 ../console/gntstatus.c:404
+#: ../console/gntstatus.c:524 ../gtk/gtkaccount.c:1832
+#: ../gtk/gtkaccount.c:2302 ../gtk/gtkblist.c:5337 ../gtk/gtkdialogs.c:667
+#: ../gtk/gtkdialogs.c:804 ../gtk/gtkdialogs.c:895 ../gtk/gtkdialogs.c:914
+#: ../gtk/gtkdialogs.c:936 ../gtk/gtkdialogs.c:956 ../gtk/gtkdialogs.c:1000
+#: ../gtk/gtkdialogs.c:1038 ../gtk/gtkdialogs.c:1092 ../gtk/gtkdialogs.c:1129
+#: ../gtk/gtkdialogs.c:1154 ../gtk/gtkimhtmltoolbar.c:419
+#: ../gtk/gtkplugin.c:296 ../gtk/gtkpounce.c:1088 ../gtk/gtkprivacy.c:566
+#: ../gtk/gtkprivacy.c:579 ../gtk/gtkprivacy.c:604 ../gtk/gtkprivacy.c:615
+#: ../gtk/gtkrequest.c:270 ../gtk/gtksavedstatuses.c:296
+#: ../libgaim/account.c:963 ../libgaim/account.c:1134
+#: ../libgaim/account.c:1168 ../libgaim/conversation.c:1164
+#: ../libgaim/protocols/gg/gg.c:498 ../libgaim/protocols/gg/gg.c:656
+#: ../libgaim/protocols/gg/gg.c:792 ../libgaim/protocols/gg/gg.c:871
+#: ../libgaim/protocols/jabber/buddy.c:588
+#: ../libgaim/protocols/jabber/buddy.c:1725
+#: ../libgaim/protocols/jabber/buddy.c:1759
+#: ../libgaim/protocols/jabber/chat.c:780
+#: ../libgaim/protocols/jabber/jabber.c:854
+#: ../libgaim/protocols/jabber/jabber.c:1352
+#: ../libgaim/protocols/jabber/xdata.c:338 ../libgaim/protocols/msn/msn.c:251
+#: ../libgaim/protocols/msn/msn.c:266 ../libgaim/protocols/msn/msn.c:281
+#: ../libgaim/protocols/msn/msn.c:296 ../libgaim/protocols/msn/msn.c:313
+#: ../libgaim/protocols/oscar/oscar.c:1387
+#: ../libgaim/protocols/oscar/oscar.c:2151
+#: ../libgaim/protocols/oscar/oscar.c:2190
+#: ../libgaim/protocols/oscar/oscar.c:2238
+#: ../libgaim/protocols/oscar/oscar.c:5732
+#: ../libgaim/protocols/oscar/oscar.c:5784
+#: ../libgaim/protocols/oscar/oscar.c:5936
+#: ../libgaim/protocols/oscar/oscar.c:5961
+#: ../libgaim/protocols/oscar/oscar.c:6017
+#: ../libgaim/protocols/oscar/oscar.c:6086
+#: ../libgaim/protocols/oscar/peer.c:991
+#: ../libgaim/protocols/qq/buddy_info.c:480
+#: ../libgaim/protocols/qq/buddy_opt.c:210
+#: ../libgaim/protocols/qq/buddy_opt.c:400 ../libgaim/protocols/qq/group.c:122
+#: ../libgaim/protocols/qq/group_join.c:136
+#: ../libgaim/protocols/qq/group_join.c:357
+#: ../libgaim/protocols/qq/group_opt.c:140
+#: ../libgaim/protocols/qq/group_opt.c:390 ../libgaim/protocols/qq/qq.c:459
+#: ../libgaim/protocols/qq/sendqueue.c:201
+#: ../libgaim/protocols/qq/sys_msg.c:102 ../libgaim/protocols/qq/sys_msg.c:157
+#: ../libgaim/protocols/qq/sys_msg.c:245
+#: ../libgaim/protocols/sametime/sametime.c:3364
+#: ../libgaim/protocols/sametime/sametime.c:3449
+#: ../libgaim/protocols/sametime/sametime.c:3619
+#: ../libgaim/protocols/sametime/sametime.c:5320
+#: ../libgaim/protocols/sametime/sametime.c:5409
+#: ../libgaim/protocols/sametime/sametime.c:5533
+#: ../libgaim/protocols/silc/buddy.c:467
+#: ../libgaim/protocols/silc/buddy.c:1078
+#: ../libgaim/protocols/silc/buddy.c:1183 ../libgaim/protocols/silc/chat.c:597
+#: ../libgaim/protocols/silc/chat.c:726 ../libgaim/protocols/silc/ops.c:1909
+#: ../libgaim/protocols/silc/silc.c:754 ../libgaim/protocols/silc/silc.c:959
+#: ../libgaim/protocols/yahoo/yahoo.c:3214
+#: ../libgaim/protocols/yahoo/yahoo.c:3223 ../libgaim/request.h:1344
+#: ../libgaim/request.h:1354
+msgid "Cancel"
+msgstr "Annuler"
+
+#. Save
+#: ../console/gntaccount.c:558 ../console/gntprefs.c:224
+#: ../console/gntstatus.c:407 ../console/gntstatus.c:512 ../gtk/gtkdebug.c:762
+#: ../gtk/gtkrequest.c:276 ../libgaim/account.c:1167
+#: ../libgaim/protocols/jabber/buddy.c:587
+msgid "Save"
+msgstr "Enregistrer"
+
+#: ../console/gntaccount.c:610 ../gtk/gtkaccount.c:1826
+#: ../gtk/gtksavedstatuses.c:293
+#, c-format
+msgid "Are you sure you want to delete %s?"
+msgstr "Êtes-vous sûr de vouloir supprimer %s ?"
+
+#. Close any other opened delete window
+#: ../console/gntaccount.c:614
+msgid "Delete Account"
+msgstr "Supprimer le compte"
+
+#: ../console/gntaccount.c:615 ../console/gntaccount.c:681
+#: ../console/gntstatus.c:132 ../console/gntstatus.c:194
+#: ../gtk/gtkaccount.c:1831 ../gtk/gtkpounce.c:1087 ../gtk/gtkrequest.c:273
+#: ../gtk/gtksavedstatuses.c:295
+msgid "Delete"
+msgstr "Supprimer"
+
+#: ../console/gntaccount.c:644 ../console/gntblist.c:1638
+#: ../console/gntui.c:70 ../gtk/gtkaccount.c:2134
+#: ../gtk/plugins/docklet/docklet.c:519
 msgid "Accounts"
 msgstr "Comptes"
 
-#: ../plugins/docklet/docklet.c:520 ../src/gtkplugin.c:538
-msgid "Plugins"
-msgstr "Plugins"
-
-#: ../plugins/docklet/docklet.c:521 ../src/gtkprefs.c:1915
-msgid "Preferences"
-msgstr "Préférences"
-
-#: ../plugins/docklet/docklet.c:525
-msgid "Mute Sounds"
-msgstr "Silencieux"
-
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: ../plugins/docklet/docklet.c:538
-msgid "Quit"
-msgstr "Quitter"
-
-#: ../plugins/docklet/docklet.c:679
-msgid "Blink tray icon for unread..."
-msgstr "Faire clignoter l'icĂ´ne de notification pour les messages non lus..."
-
-#: ../plugins/docklet/docklet.c:682
-msgid "_Instant Messages:"
-msgstr "Messages _instantanés :"
-
-#: ../plugins/docklet/docklet.c:684 ../plugins/docklet/docklet.c:692
-#: ../plugins/win32/winprefs/winprefs.c:462 ../src/gtkprefs.c:823
-#: ../src/gtkprefs.c:1764 ../src/gtkprefs.c:1778
-msgid "Never"
-msgstr "Jamais"
-
-#: ../plugins/docklet/docklet.c:685
-msgid "In hidden conversations"
-msgstr "Pour les conversations cachées"
-
-#: ../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:463 ../src/gtkprefs.c:825
-msgid "Always"
-msgstr "Toujours"
-
-#: ../plugins/docklet/docklet.c:690
-msgid "C_hat Messages:"
-msgstr "Discussions :"
-
-#: ../plugins/docklet/docklet.c:693
-msgid "When my nick is said"
-msgstr "Quand mon pseudo apparaît"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/docklet/docklet.c:720
-msgid "System Tray Icon"
-msgstr "IcĂ´ne de notification"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/docklet/docklet.c:723
-msgid "Displays an icon for Gaim in the system tray."
-msgstr "Affiche une icĂ´ne pour Gaim dans la zone de notification."
-
-#. *  description
-#: ../plugins/docklet/docklet.c:725
-msgid ""
-"Displays a system tray icon (in GNOME, KDE, or Windows for example) to show "
-"the current status of Gaim, allow fast access to commonly used functions, "
-"and to toggle display of the buddy list. Also provides options to blink for "
-"unread messages."
-msgstr ""
-"Ajoute une icĂ´ne de notification (pour Gnome, KDE ou Windows par exemple) "
-"pour afficher l'état de Gaim, permettre un accès rapide aux fonctions "
-"usuelles et cacher ou non la liste de contacts. Il permet aussi de prévenir "
-"quand il reste des messages non lus."
-
-#: ../plugins/docklet/eggtrayicon.c:123
-msgid "Orientation"
-msgstr "Disposition"
-
-#: ../plugins/docklet/eggtrayicon.c:124
-msgid "The orientation of the tray."
-msgstr "Orientation de l'espace de notification"
-
-#: ../plugins/extplacement.c:80
-msgid "By conversation count"
-msgstr "Par nombre de conversations"
-
-#: ../plugins/extplacement.c:101
-msgid "Conversation Placement"
-msgstr "Emplacement des conversations"
-
-#: ../plugins/extplacement.c:106
-msgid "Number of conversations per window"
-msgstr "Nombre de conversations par fenĂŞtre"
-
-#: ../plugins/extplacement.c:112
-msgid "Separate IM and Chat windows when placing by number"
-msgstr ""
-"SĂ©parer les messages et les discussions quand leur nombre par fenĂŞtre est "
-"limité"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/extplacement.c:135
-msgid "ExtPlacement"
-msgstr "ExtEmplacement"
-
-#. *< name
-#. *< version
-#: ../plugins/extplacement.c:137
-msgid "Extra conversation placement options."
-msgstr "Options supplémentaires d'emplacement des conversations"
-
-#. *< summary
-#. *  description
-#: ../plugins/extplacement.c:139
-msgid ""
-"Restrict the number of conversations per windows, optionally separating IMs "
-"and Chats"
-msgstr ""
-"Limite le nombre de conversation par fenĂŞtre ou permet d'utiliser des "
-"fenêtres différentes pour les messages et les discussions."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/filectl.c:248
-msgid "Gaim File Control"
-msgstr "ContrĂ´le de Gaim par fichier"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/filectl.c:251 ../plugins/filectl.c:253
-msgid "Allows you to control Gaim by entering commands in a file."
-msgstr "Permet de contrĂ´ler Gaim en entrant des commandes dans un fichier."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/gaiminc.c:91
-msgid "Gaim Demonstration Plugin"
-msgstr "Plugin de démonstration"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/gaiminc.c:94
-msgid "An example plugin that does stuff - see the description."
-msgstr "Un exemple de plugin -- cf. description."
-
-#. *  description
-#: ../plugins/gaiminc.c:96
-msgid ""
-"This is a really cool plugin that does a lot of stuff:\n"
-"- It tells you who wrote the program when you log in\n"
-"- It reverses all incoming text\n"
-"- It sends a message to people on your list immediately when they sign on"
-msgstr ""
-"Ce plugin vraiment cool fait plein de choses :\n"
-"- il annonce qui a Ă©crit le programme Ă  la connexion\n"
-"- il écrit à l'envers tous les messages reçus\n"
-"- il envoie automatiquement un message Ă  tous les contacts qui se connectent"
-
-#: ../plugins/gaimrc.c:41
-msgid "Cursor Color"
-msgstr "Couleur du curseur"
-
-#: ../plugins/gaimrc.c:42
-msgid "Secondary Cursor Color"
-msgstr "Deuxième couleur du curseur"
-
-#: ../plugins/gaimrc.c:43
-msgid "Hyperlink Color"
-msgstr "Couleur des liens hypertextes"
-
-#: ../plugins/gaimrc.c:56
-msgid "GtkTreeView Expander Size"
-msgstr "Taille de l'Ă©tendeur GtkTreeView"
-
-#: ../plugins/gaimrc.c:57
-msgid "GtkTreeView Horizontal Separation"
-msgstr "SĂ©paration horizontale GtkTreeView"
-
-#: ../plugins/gaimrc.c:76
-msgid "Conversation Entry"
-msgstr "Ligne de conversation"
-
-#: ../plugins/gaimrc.c:77
-msgid "Conversation History"
-msgstr "Archive de conversation"
-
-#: ../plugins/gaimrc.c:78
-msgid "Log Viewer"
-msgstr "Afficheur d'archives"
-
-#: ../plugins/gaimrc.c:79
-msgid "Request Dialog"
-msgstr "Boite de message pour requĂŞte"
-
-#: ../plugins/gaimrc.c:80
-msgid "Notify Dialog"
-msgstr "Boite de message de notification"
-
-#: ../plugins/gaimrc.c:91
-msgid "GtkTreeView Indent Expanders"
-msgstr "Indentation des Ă©tendeurs GtkTreeView"
-
-#: ../plugins/gaimrc.c:287
-#, c-format
-msgid "Select Color for %s"
-msgstr "Choisissez la couleur pour %s"
-
-#: ../plugins/gaimrc.c:289
-msgid "Select Color"
-msgstr "Choisissez la couleur"
-
-#: ../plugins/gaimrc.c:324
-#, c-format
-msgid "Select Font for %s"
-msgstr "Choisissez la police pour %s"
-
-#: ../plugins/gaimrc.c:364
-msgid "Select Interface Font"
-msgstr "Choisissez la police"
-
-#: ../plugins/gaimrc.c:420
-msgid "General"
-msgstr "Général"
-
-#: ../plugins/gaimrc.c:425
-msgid "GTK+ Interface Font"
-msgstr "Police de l'interface GTK+"
-
-#: ../plugins/gaimrc.c:445
-msgid "GTK+ Text Shortcut Theme"
-msgstr "Raccourci du thème GTK+"
-
-#: ../plugins/gaimrc.c:480
-msgid "Interface colors"
-msgstr "Couleurs de l'interface"
-
-#: ../plugins/gaimrc.c:504
-msgid "Widget Sizes"
-msgstr "Tailles des éléments"
-
-#: ../plugins/gaimrc.c:525
-msgid "Fonts"
-msgstr "Polices"
-
-#: ../plugins/gaimrc.c:548
-msgid "Tools"
-msgstr "Outils"
-
-#: ../plugins/gaimrc.c:553
-#, c-format
-msgid "Write settings to %s%sgtkrc-2.0"
-msgstr "Écrire les préférences dans %s%sgtkrc-2.0"
-
-#: ../plugins/gaimrc.c:561
-msgid "Re-read gtkrc files"
-msgstr "Relire les fichiers gtkrc"
-
-#: ../plugins/gaimrc.c:588
-msgid "Gaim GTK+ Theme Control"
-msgstr "Contrôle du thème GTK+ Gaim"
-
-#: ../plugins/gaimrc.c:590 ../plugins/gaimrc.c:591
-msgid "Provides access to commonly used gtkrc settings."
-msgstr "Fournit un accès aux préférences couramment utilisés du fichier gtkrc."
-
-#. Configuration frame
-#: ../plugins/gestures/gestures.c:235
-msgid "Mouse Gestures Configuration"
-msgstr "Configuration des mouvements de souris"
-
-#: ../plugins/gestures/gestures.c:242
-msgid "Middle mouse button"
-msgstr "Bouton du milieu"
-
-#: ../plugins/gestures/gestures.c:247
-msgid "Right mouse button"
-msgstr "Bouton de droite"
-
-#. "Visual gesture display" checkbox
-#: ../plugins/gestures/gestures.c:259
-msgid "_Visual gesture display"
-msgstr "Montrer _visuellement le mouvement"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/gestures/gestures.c:289
-msgid "Mouse Gestures"
-msgstr "Mouvements de souris"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/gestures/gestures.c:292
-msgid "Provides support for mouse gestures"
-msgstr "Fournit le support pour les mouvements de souris."
-
-#. *  description
-#: ../plugins/gestures/gestures.c:294
-msgid ""
-"Allows support for mouse gestures in conversation windows.\n"
-"Drag the middle mouse button to perform certain actions:\n"
-"\n"
-"Drag down and then to the right to close a conversation.\n"
-"Drag up and then to the left to switch to the previous conversation.\n"
-"Drag up and then to the right to switch to the next conversation."
-msgstr ""
-"Permet d'utiliser les mouvements de souris dans les fenĂŞtres de "
-"conversation.\n"
-"Utilisez le bouton du milieu pour effectuer diverses actions :\n"
-"\n"
-"Glissez vers le bas puis la droite pour fermer une conversation.\n"
-"Glissez vers le haut puis la gauche pour passer Ă  la conversation "
-"précédente.\n"
-"Glissez vers le haut puis la droite pour passer Ă  la conversation suivante."
+#: ../console/gntaccount.c:650
+msgid "You can enable/disable accounts from the following list."
+msgstr "Vous pouvez activer/désactiver les comptes de la liste suivante."
+
+#: ../console/gntaccount.c:673 ../console/gntaccount.c:833
+#: ../console/gntblist.c:281 ../console/gntblist.c:347
+#: ../console/gntblist.c:380 ../console/gntnotify.c:306
+#: ../console/gntstatus.c:184 ../gtk/gtkaccount.c:2301 ../gtk/gtkblist.c:5336
+#: ../gtk/gtkconv.c:1626 ../gtk/gtkrequest.c:274
+#: ../libgaim/protocols/gg/gg.c:870 ../libgaim/protocols/oscar/oscar.c:2429
+#: ../libgaim/protocols/qq/sys_msg.c:102 ../libgaim/protocols/qq/sys_msg.c:157
+#: ../libgaim/protocols/qq/sys_msg.c:245
+#: ../libgaim/protocols/sametime/sametime.c:5408
+#: ../libgaim/protocols/silc/chat.c:596
+msgid "Add"
+msgstr "Ajouter"
+
+#: ../console/gntaccount.c:677
+msgid "Modify"
+msgstr "Modifier"
+
+#: ../console/gntaccount.c:758 ../gtk/gtkaccount.c:2250
+#, c-format
+msgid "%s%s%s%s has made %s his or her buddy%s%s"
+msgstr "%s%s%s%s a fait de %s son contact%s%s"
+
+#: ../console/gntaccount.c:831 ../gtk/gtkaccount.c:2299
+msgid "Add buddy to your list?"
+msgstr "Ajouter cet utilisateur à la liste de contacts ?"
+
+#: ../console/gntblist.c:232
+msgid "You must provide a screename for the buddy."
+msgstr "Vous devez fournir un nom d'utilisateur pour le contact."
+
+#: ../console/gntblist.c:234
+msgid "You must provide a group."
+msgstr "Vous devez fournir un groupe."
+
+#: ../console/gntblist.c:236
+msgid "You must select an account."
+msgstr "Vous devez choisir un compte."
+
+#: ../console/gntblist.c:240
+msgid "Error adding buddy"
+msgstr "Erreur Ă  l'ajout du contact."
+
+#: ../console/gntblist.c:265 ../gtk/gtkaccount.c:1895
+#: ../gtk/gtksavedstatuses.c:893 ../libgaim/protocols/oscar/oscar.c:2803
+msgid "Screen Name"
+msgstr "Pseudo"
+
+#: ../console/gntblist.c:268 ../console/gntblist.c:339 ../gtk/gtkdialogs.c:913
+#: ../gtk/gtkdialogs.c:935 ../gtk/gtkdialogs.c:955 ../gtk/gtkrequest.c:277
+#: ../libgaim/protocols/silc/chat.c:587
+msgid "Alias"
+msgstr "Alias"
+
+#: ../console/gntblist.c:271 ../console/gntblist.c:342
+msgid "Group"
+msgstr "Groupe"
+
+#: ../console/gntblist.c:274 ../console/gntblist.c:330
+#: ../console/gntnotify.c:155 ../console/gntstatus.c:495
+#: ../gtk/gtknotify.c:402 ../gtk/gtkpounce.c:1255
+#: ../gtk/plugins/gevolution/gevolution.c:450 ../libgaim/plugins/idle.c:153
+#: ../libgaim/plugins/idle.c:189
+msgid "Account"
+msgstr "Compte"
+
+#: ../console/gntblist.c:280 ../console/gntblist.c:739 ../gtk/gtkblist.c:4849
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:442
+#: ../libgaim/protocols/silc/buddy.c:736
+#: ../libgaim/protocols/silc/buddy.c:1030
+#: ../libgaim/protocols/silc/buddy.c:1075
+#: ../libgaim/protocols/silc/buddy.c:1174
+#: ../libgaim/protocols/yahoo/yahoo.c:3128
+msgid "Add Buddy"
+msgstr "Nouveau contact"
+
+#: ../console/gntblist.c:280
+msgid "Please enter buddy information."
+msgstr "Veuillez saisir les informations du contact."
+
+#: ../console/gntblist.c:303 ../libgaim/blist.c:1182
+msgid "Chats"
+msgstr "Discussions"
 
 #. Extract their Name and put it in
 #. Contact Info
 #. Personal
 #. Business
-#: ../plugins/gevolution/add_buddy_dialog.c:131
-#: ../plugins/gevolution/assoc-buddy.c:119 ../src/gtkplugin.c:587
-#: ../src/gtkroomlist.c:604 ../src/protocols/jabber/jabber.c:774
-#: ../src/protocols/msn/msn.c:1529 ../src/protocols/msn/msn.c:1582
-#: ../src/protocols/msn/msn.c:1603
+#: ../console/gntblist.c:336 ../gtk/gtkplugin.c:589 ../gtk/gtkroomlist.c:600
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:131
+#: ../gtk/plugins/gevolution/assoc-buddy.c:119
+#: ../libgaim/protocols/jabber/jabber.c:785
+#: ../libgaim/protocols/msn/msn.c:1533 ../libgaim/protocols/msn/msn.c:1586
+#: ../libgaim/protocols/msn/msn.c:1608 ../libgaim/protocols/qq/buddy_info.c:42
 msgid "Name"
 msgstr "Nom"
 
-#: ../plugins/gevolution/add_buddy_dialog.c:142
-msgid "Instant Messaging"
-msgstr "Messagerie instantanée"
-
-#: ../plugins/gevolution/add_buddy_dialog.c:442 ../src/gtkblist.c:4563
-#: ../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:2991
-msgid "Add Buddy"
-msgstr "Nouveau contact"
-
-#. Add the label.
-#: ../plugins/gevolution/add_buddy_dialog.c:455
-msgid "Select a person from your address book below, or add a new person."
-msgstr ""
-"Choisissez une personne dans votre carnet d'adresses ou créez une nouvelle "
-"personne."
-
-#. "Search"
-#: ../plugins/gevolution/add_buddy_dialog.c:468
-#: ../plugins/gevolution/assoc-buddy.c:353
-#: ../src/protocols/jabber/buddy.c:1720 ../src/protocols/oscar/oscar.c:6089
-#: ../src/protocols/sametime/sametime.c:5529
-msgid "Search"
-msgstr "Recherche"
-
-#: ../plugins/gevolution/add_buddy_dialog.c:549
-#: ../plugins/gevolution/new_person_dialog.c:307 ../src/gtkblist.c:4647
-#: ../src/gtkblist.c:5010
-msgid "Group:"
-msgstr "Groupe :"
-
-#. "New Person" button
-#: ../plugins/gevolution/add_buddy_dialog.c:575
-#: ../plugins/gevolution/assoc-buddy.c:464
-#: ../plugins/gevolution/new_person_dialog.c:251
-msgid "New Person"
-msgstr "Nouvelle personne"
-
-#. "Select Buddy" button
-#: ../plugins/gevolution/add_buddy_dialog.c:592
-msgid "Select Buddy"
-msgstr "Choisir contact"
-
-#. Add the label.
-#: ../plugins/gevolution/assoc-buddy.c:340
-msgid ""
-"Select a person from your address book to add this buddy to, or create a new "
-"person."
-msgstr ""
-"Choisissez une personne dans votre carnet d'adresses pour ajouter ce contact "
-"ou créez une nouvelle personne."
-
-#. Add the expander
-#: ../plugins/gevolution/assoc-buddy.c:428
-msgid "User _details"
-msgstr "_DĂ©tails du contact"
-
-#. "Associate Buddy" button
-#: ../plugins/gevolution/assoc-buddy.c:481
-msgid "_Associate Buddy"
-msgstr "_Associer un contact"
-
-#: ../plugins/gevolution/eds-utils.c:73 ../plugins/gevolution/eds-utils.c:86
-#: ../src/protocols/jabber/jabber.c:1142
-msgid "None"
-msgstr "Aucun"
-
-#: ../plugins/gevolution/gevo-util.c:64 ../plugins/gevolution/gevolution.c:96
-#: ../src/blist.c:516 ../src/blist.c:1281 ../src/blist.c:1508
-#: ../src/gtkblist.c:4453 ../src/protocols/jabber/roster.c:67
-msgid "Buddies"
-msgstr "Contacts"
-
-#: ../plugins/gevolution/gevolution.c:262
-#: ../plugins/gevolution/gevolution.c:268
-msgid "Unable to send e-mail"
-msgstr "Impossible d'envoyer un courrier Ă©lectronique"
-
-#: ../plugins/gevolution/gevolution.c:263
-msgid "The evolution executable was not found in the PATH."
-msgstr ""
-"Le binaire « evolution » n'a pas été trouvé dans les dossiers par défaut du "
-"PATH."
-
-#: ../plugins/gevolution/gevolution.c:269
-msgid "The specified buddy was not found in the Evolution Contacts."
-msgstr "Le contact choisi n'a pas été trouvé dans les contacts d'Evolution."
-
-#: ../plugins/gevolution/gevolution.c:286
-msgid "Add to Address Book"
-msgstr "Ajouter au carnet d'adresses"
-
-#: ../plugins/gevolution/gevolution.c:290
-msgid "Send E-Mail"
-msgstr "Envoyer un courriel"
-
-#. Configuration frame
-#: ../plugins/gevolution/gevolution.c:417
-msgid "Evolution Integration Configuration"
-msgstr "Configuration de l'intégration avec Evolution"
-
-#. Label
-#: ../plugins/gevolution/gevolution.c:420
-msgid "Select all accounts that buddies should be auto-added to."
-msgstr ""
-"Choisissez tous les comptes dont les contacts seront automatiquement ajoutés."
-
-#: ../plugins/gevolution/gevolution.c:450 ../plugins/idle.c:153
-#: ../plugins/idle.c:189 ../src/gtknotify.c:402 ../src/gtkpounce.c:1255
-msgid "Account"
-msgstr "Compte"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/gevolution/gevolution.c:527
-msgid "Evolution Integration"
-msgstr "Intégration avec Evolution"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/gevolution/gevolution.c:530
-#: ../plugins/gevolution/gevolution.c:532
-msgid "Provides integration with Evolution."
-msgstr "Fournit une intégration avec Evolution."
-
-#: ../plugins/gevolution/new_person_dialog.c:267
-msgid "Please enter the person's information below."
-msgstr "Veuillez saisir les informations de la personne"
-
-#: ../plugins/gevolution/new_person_dialog.c:271
-msgid "Please enter the buddy's screen name and account type below."
-msgstr "Veuillez saisir le pseudo et le type de compte du contact"
-
-#: ../plugins/gevolution/new_person_dialog.c:291
-msgid "Account type:"
-msgstr "Type de compte :"
-
-#: ../plugins/gevolution/new_person_dialog.c:295 ../src/gtkaccount.c:779
-#: ../src/gtkblist.c:4609
-msgid "Screen name:"
-msgstr "Nom d'utilisateur :"
-
-#. Optional Information section
-#: ../plugins/gevolution/new_person_dialog.c:315
-msgid "Optional information:"
-msgstr "Informations facultatives :"
-
-#. Label
-#: ../plugins/gevolution/new_person_dialog.c:338 ../src/gtkaccount.c:421
-#: ../src/gtkaccount.c:443 ../src/protocols/oscar/oscar.c:625
-msgid "Buddy Icon"
-msgstr "IcĂ´ne du contact"
-
-#: ../plugins/gevolution/new_person_dialog.c:350
-msgid "First name:"
-msgstr "Prénom :"
-
-#: ../plugins/gevolution/new_person_dialog.c:362
-msgid "Last name:"
-msgstr "Nom :"
-
-#: ../plugins/gevolution/new_person_dialog.c:382
-msgid "E-mail:"
-msgstr "Adresse électronique :"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/gtk-signals-test.c:160
-msgid "GTK Signals Test"
-msgstr "Test des signaux GTK"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/gtk-signals-test.c:163 ../plugins/gtk-signals-test.c:165
-msgid "Test to see that all ui signals are working properly."
-msgstr ""
-"VĂ©rifie que tous les signaux de l'interface graphique fonctionnent "
-"correctement."
-
-#: ../plugins/history.c:120
+#: ../console/gntblist.c:345 ../console/gntblist.c:741 ../gtk/gtkblist.c:5227
+msgid "Add Chat"
+msgstr "Ajouter discussion"
+
+#: ../console/gntblist.c:346
+msgid "You can edit more information from the context menu later."
+msgstr ""
+"Vous pouvez changer les information plus tard grâce au menu contextuel."
+
+#: ../console/gntblist.c:357 ../console/gntblist.c:370
+msgid "Error adding group"
+msgstr "Erreur Ă  l'ajout d'un groupe."
+
+#: ../console/gntblist.c:358
+msgid "You must give a name for the group to add."
+msgstr "Vous devez fournir un nom pour le groupe Ă  ajouter."
+
+#: ../console/gntblist.c:371
+msgid "A group with the name already exists."
+msgstr "Un groupe avec ce nom existe déjà."
+
+#: ../console/gntblist.c:378 ../console/gntblist.c:743 ../gtk/gtkblist.c:5333
+#: ../libgaim/protocols/sametime/sametime.c:5319
+#: ../libgaim/protocols/sametime/sametime.c:5406
+msgid "Add Group"
+msgstr "Nouveau groupe"
+
+#: ../console/gntblist.c:378
+msgid "Enter the name of the group"
+msgstr "Saisissez le nom du groupe"
+
+#: ../console/gntblist.c:698
+msgid "Edit Chat"
+msgstr "Modifier la discussion"
+
+#: ../console/gntblist.c:698
+msgid "Please Update the necessary fields."
+msgstr "Veuillez mettre à jour les champs nécessaires."
+
+#: ../console/gntblist.c:699 ../console/gntstatus.c:189
+msgid "Edit"
+msgstr "Modifier"
+
+#: ../console/gntblist.c:705
+msgid "Auto-join"
+msgstr "Connexion auto"
+
+#: ../console/gntblist.c:713
+msgid "Edit Settings"
+msgstr "Modifier les paramètres"
+
+#: ../console/gntblist.c:761 ../libgaim/protocols/silc/chat.c:878
+msgid "Get Info"
+msgstr "Infos"
+
+#: ../console/gntblist.c:766
+msgid "Add Buddy Pounce"
+msgstr "Ajouter une alerte"
+
+#: ../console/gntblist.c:773 ../gtk/gtkconv.c:1574
+#: ../libgaim/protocols/oscar/oscar.c:615
+msgid "Send File"
+msgstr "Envoyer un fichier"
+
+#: ../console/gntblist.c:777
+msgid "View Log"
+msgstr "Voir les archives"
+
+#: ../console/gntblist.c:859
+#, c-format
+msgid "Please enter the new name for %s"
+msgstr "Saisissez le nouveau nom pour %s"
+
+#. These are common for everything
+#: ../console/gntblist.c:861 ../console/gntblist.c:862
+#: ../console/gntblist.c:1005
+msgid "Rename"
+msgstr "Renommer"
+
+#: ../console/gntblist.c:861
+msgid "Enter empty string to reset the name."
+msgstr "Laissez la rubrique vide pour réinitialiser le nom."
+
+#: ../console/gntblist.c:939
+msgid "Removing this group will also remove all the buddies in the group"
+msgstr "Supprimer ce groupe supprimera tous les contacts du groupe."
+
+#: ../console/gntblist.c:944
+#, c-format
+msgid "Are you sure you want to remove %s?"
+msgstr "Êtes-vous sûr de vouloir supprimer %s ?"
+
+#. XXX: anything to do with the returned ui-handle?
+#: ../console/gntblist.c:947
+msgid "Confirm Remove"
+msgstr "Confirmez la suppression"
+
+#: ../console/gntblist.c:950 ../console/gntblist.c:1007 ../gtk/gtkblist.c:1033
+#: ../gtk/gtkconv.c:1623 ../gtk/gtkrequest.c:275
+msgid "Remove"
+msgstr "Enlever"
+
+#: ../console/gntblist.c:1040 ../console/gntblist.c:1144
+#, c-format
+msgid "Account: %s (%s)"
+msgstr "Compte : %s (%s)"
+
+#: ../console/gntblist.c:1065
+#, c-format
+msgid ""
+"\n"
+"Idle: %s"
+msgstr ""
+"\n"
+"Inactif : %s"
+
+#: ../console/gntblist.c:1123
+#, c-format
+msgid "Nickname: %s\n"
+msgstr "Pseudonyme :%s\n"
+
+#: ../console/gntblist.c:1135
+#, c-format
+msgid ""
+"Online: %d\n"
+"Total: %d"
+msgstr ""
+"Connectés : %d\n"
+"Total : %d"
+
+#: ../console/gntblist.c:1156
+#, c-format
+msgid ""
+"\n"
+"Last Seen: %s ago"
+msgstr ""
+"\n"
+"Vu récemment : il y a %s"
+
+#: ../console/gntblist.c:1375 ../gtk/gtkstatusbox.c:947
+#: ../gtk/plugins/docklet/docklet.c:467
+msgid "New..."
+msgstr "Nouveau..."
+
+#: ../console/gntblist.c:1382 ../gtk/gtkstatusbox.c:948
+#: ../gtk/plugins/docklet/docklet.c:468
+msgid "Saved..."
+msgstr "Sauvé..."
+
+#. Buddy List
+#: ../console/gntblist.c:1695 ../console/gntprefs.c:219 ../console/gntui.c:71
+#: ../gtk/gtkblist.c:3888 ../gtk/plugins/win32/winprefs/winprefs.c:451
+msgid "Buddy List"
+msgstr "Liste de contacts"
+
+#: ../console/gntconn.c:36
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../console/gntconn.c:39
+#, c-format
+msgid "%s disconnected."
+msgstr "DĂ©connexion de %s."
+
+#: ../console/gntconn.c:40
+#, c-format
+msgid ""
+"%s was disconnected due to the following error:\n"
+"%s"
+msgstr ""
+"L'erreur suivante a provoqué la déconnexion de %s :\n"
+"%s"
+
+#: ../console/gntconn.c:43 ../gtk/gtkblist.c:3768 ../libgaim/account.c:990
+#: ../libgaim/connection.c:106
+msgid "Connection Error"
+msgstr "Erreur de connexion"
+
+#: ../console/gntconv.c:102 ../gtk/gtkconv.c:478
+msgid "No such command."
+msgstr "Cette commande n'existe pas."
+
+#: ../console/gntconv.c:106 ../gtk/gtkconv.c:485
+msgid "Syntax Error:  You typed the wrong number of arguments to that command."
+msgstr "Erreur de syntaxe : mauvais nombre d'arguments pour cette commande."
+
+#: ../console/gntconv.c:111 ../gtk/gtkconv.c:490
+msgid "Your command failed for an unknown reason."
+msgstr "La commande a échoué pour une raison inconnue."
+
+#: ../console/gntconv.c:116 ../gtk/gtkconv.c:496
+msgid "That command only works in chats, not IMs."
+msgstr ""
+"Cette commande fonctionne uniquement dans les discussions, pas les messages."
+
+#: ../console/gntconv.c:119 ../gtk/gtkconv.c:499
+msgid "That command only works in IMs, not chats."
+msgstr ""
+"Cette commande fonctionne uniquement dans les messages, pas les discussions."
+
+#: ../console/gntconv.c:123 ../gtk/gtkconv.c:503
+msgid "That command doesn't work on this protocol."
+msgstr "Cette commande ne fonctionne pas avec ce protocole."
+
+#: ../console/gntconv.c:130
+msgid "Commands are not supported yet. Message was NOT sent."
+msgstr ""
+"Les commandes ne sont pas encore supportées. Le message n'a pas été envoyé."
+
+#: ../console/gntconv.c:224
+#, c-format
+msgid "%s (%s -- %s)"
+msgstr "%s (%s -- %s)"
+
+#: ../console/gntconv.c:244
+#, c-format
+msgid "%s [%s]"
+msgstr "%s [%s]"
+
+#: ../console/gntconv.c:374
+msgid "<AUTO-REPLY> "
+msgstr "<RĂ©ponse automatique> "
+
+#. Print the list of users in the room
+#: ../console/gntconv.c:468
+msgid "List of users:\n"
+msgstr "Liste des utilisateurs :\n"
+
+#: ../console/gntconv.c:592 ../gtk/gtkconv.c:372
+msgid "Supported debug options are:  version"
+msgstr "Les options de debuggage supportées sont : version"
+
+#: ../console/gntconv.c:627 ../gtk/gtkconv.c:408
+msgid "No such command (in this context)."
+msgstr "Cette commande n'existe pas dans ce contexte."
+
+#: ../console/gntconv.c:630 ../gtk/gtkconv.c:411
+msgid ""
+"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
+"The following commands are available in this context:\n"
+msgstr ""
+"Utilisez « /help &lt;commande&gt; » pour obtenir de l'aide pour une commande "
+"spécifique.\n"
+"Les commandes actuellement disponibles sont :\n"
+
+#: ../console/gntconv.c:669 ../gtk/gtkconv.c:6639
+msgid ""
+"say &lt;message&gt;:  Send a message normally as if you weren't using a "
+"command."
+msgstr ""
+"say &lt;message&gt; : Envoyer un message comme si les commandes étaient "
+"désactivées."
+
+#: ../console/gntconv.c:672 ../gtk/gtkconv.c:6642
+msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
+msgstr ""
+"me &lt;action&gt; : Envoyer une action à la IRC à un contact ou discussion."
+
+#: ../console/gntconv.c:675 ../gtk/gtkconv.c:6645
+msgid ""
+"debug &lt;option&gt;:  Send various debug information to the current "
+"conversation."
+msgstr ""
+"debug &lt;option&gt; : Mettre en place des options de debogage dans la "
+"conversation courante."
+
+#: ../console/gntconv.c:678 ../gtk/gtkconv.c:6648
+msgid "clear: Clears the conversation scrollback."
+msgstr "clear : Efface le contenu de la fenêtre de dialogue."
+
+#: ../console/gntconv.c:681 ../gtk/gtkconv.c:6651
+msgid "help &lt;command&gt;:  Help on a specific command."
+msgstr ""
+"help &lt;commande&gt; : Demander de l'aide sur une commande particulière."
+
+#: ../console/gntconv.c:686
+msgid "plugins: Show the plugins window."
+msgstr "plugins : affiche la fenêtre des plugins."
+
+#: ../console/gntconv.c:689
+msgid "buddylist: Show the buddylist."
+msgstr "buddylist : affiche la liste de contacts."
+
+#: ../console/gntconv.c:692
+msgid "accounts: Show the accounts window."
+msgstr "accounts : affiche la fenêtre des comptes."
+
+#: ../console/gntconv.c:695
+msgid "debugwin: Show the debug window."
+msgstr "debugwin : affiche la fenêtre de debuggage."
+
+#: ../console/gntconv.c:698
+msgid "prefs: Show the preference window."
+msgstr "prefs : affiche la fenêtre des options."
+
+#: ../console/gntconv.c:701
+msgid "statuses: Show the savedstatuses window."
+msgstr "statuses : affiche la fenêtre des états sauvegardés."
+
+#: ../console/gntdebug.c:119 ../console/gntui.c:72 ../gtk/gtkdebug.c:708
+msgid "Debug Window"
+msgstr "FenĂŞtre de debug"
+
+#: ../console/gntgaim.c:166
+#, c-format
+msgid "%s. Try `%s -h' for more information.\n"
+msgstr "%s. « %s -h » pour plus d'informations.\n"
+
+#: ../console/gntgaim.c:168
+#, c-format
+msgid ""
+"%s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -n, --nologin       don't automatically login\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+"%s\n"
+"Usage : %s [options] ...\n"
+"\n"
+"  -c, --config=DIR    lit les fichiers de configuration depuis le dossier "
+"DIR\n"
+"  -d, --debug         affiche les messages de debug  sur la sortie standard\n"
+"  -h, --help          affiche ce texte d'aide\n"
+"  -n, --nologin       ne se connecte pas automatiquement au lancement\n"
+"  -v, --version       affiche le numéro de la version actuelle\n"
+
+#. *
+#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
+#.
+#: ../console/gntnotify.c:79 ../gtk/gtkblist.c:3770 ../gtk/gtkdialogs.c:666
+#: ../gtk/gtkdialogs.c:803 ../gtk/gtkdialogs.c:894 ../gtk/gtkrequest.c:269
+#: ../libgaim/account.c:962 ../libgaim/account.c:1133
+#: ../libgaim/protocols/gg/gg.c:497 ../libgaim/protocols/gg/gg.c:655
+#: ../libgaim/protocols/gg/gg.c:791 ../libgaim/protocols/jabber/jabber.c:1351
+#: ../libgaim/protocols/jabber/xdata.c:337 ../libgaim/protocols/msn/msn.c:250
+#: ../libgaim/protocols/msn/msn.c:265 ../libgaim/protocols/msn/msn.c:280
+#: ../libgaim/protocols/msn/msn.c:295 ../libgaim/protocols/oscar/oscar.c:1386
+#: ../libgaim/protocols/oscar/oscar.c:2150
+#: ../libgaim/protocols/oscar/oscar.c:2237
+#: ../libgaim/protocols/oscar/oscar.c:5731
+#: ../libgaim/protocols/oscar/oscar.c:5935
+#: ../libgaim/protocols/oscar/oscar.c:5960
+#: ../libgaim/protocols/oscar/oscar.c:6016
+#: ../libgaim/protocols/silc/buddy.c:466
+#: ../libgaim/protocols/silc/buddy.c:1182 ../libgaim/protocols/silc/chat.c:424
+#: ../libgaim/protocols/silc/chat.c:462 ../libgaim/protocols/silc/chat.c:725
+#: ../libgaim/protocols/silc/ops.c:1296 ../libgaim/protocols/silc/ops.c:1908
+#: ../libgaim/protocols/silc/silc.c:753
+#: ../libgaim/protocols/yahoo/yahoo.c:3213
+#: ../libgaim/protocols/yahoo/yahoo.c:3222 ../libgaim/request.h:1344
+msgid "OK"
+msgstr "OK"
+
+#: ../console/gntnotify.c:146
+msgid "Emails"
+msgstr "Courriers Ă©lectroniques"
+
+#: ../console/gntnotify.c:152 ../console/gntnotify.c:206
+msgid "You have mail!"
+msgstr "Vous avez du courrier !"
+
+#: ../console/gntnotify.c:155 ../gtk/gtknotify.c:414
+#: ../libgaim/protocols/jabber/jabber.c:1147
+msgid "From"
+msgstr "Source"
+
+#: ../console/gntnotify.c:155 ../gtk/gtknotify.c:423
+msgid "Subject"
+msgstr "Sujet"
+
+#: ../console/gntnotify.c:163 ../console/gntplugin.c:193
+#: ../console/gntplugin.c:274 ../console/gntstatus.c:199
+#: ../gtk/gtkrequest.c:272 ../libgaim/protocols/msn/msn.c:357
+#: ../libgaim/protocols/silc/util.c:377
+msgid "Close"
+msgstr "Fermer"
+
+#: ../console/gntnotify.c:182
+#, c-format
+msgid "%s (%s) has %d new message."
+msgid_plural "%s (%s) has %d new messages."
+msgstr[0] "%s (%s) a reçu %d nouveau message."
+msgstr[1] "%s (%s) a reçu %d nouveaux messages."
+
+#: ../console/gntnotify.c:206 ../gtk/gtknotify.c:332
+msgid "New Mail"
+msgstr "Nouveau courriel"
+
+#: ../console/gntnotify.c:229 ../gtk/gtknotify.c:849
+#: ../libgaim/protocols/oscar/oscar.c:2610
+#, c-format
+msgid "Info for %s"
+msgstr "Informations pour %s"
+
+#: ../console/gntnotify.c:230 ../gtk/gtknotify.c:850
+#: ../libgaim/protocols/toc/toc.c:476
+msgid "Buddy Information"
+msgstr "Informations sur le contact"
+
+#: ../console/gntnotify.c:303
+msgid "Continue"
+msgstr "Continuer"
+
+#: ../console/gntnotify.c:309 ../gtk/gtkconv.c:1602 ../gtk/gtkdebug.c:862
+msgid "Info"
+msgstr "Info"
+
+#: ../console/gntnotify.c:312 ../gtk/gtkconv.c:1563
+msgid "IM"
+msgstr "Message"
+
+#: ../console/gntnotify.c:315
+msgid "Join"
+msgstr "Joindre"
+
+#: ../console/gntnotify.c:318 ../libgaim/protocols/sametime/sametime.c:3448
+msgid "Invite"
+msgstr "Inviter"
+
+#: ../console/gntnotify.c:321
+msgid "(none)"
+msgstr "(aucun)"
+
+#: ../console/gntplugin.c:117
+#, c-format
+msgid ""
+"Name: %s\n"
+"Version: %s\n"
+"Description: %s\n"
+"Author: %s\n"
+"Website: %s\n"
+"Filename: %s\n"
+msgstr ""
+"Nom : %s\n"
+"Version : %s\n"
+"Description : %s\n"
+"Auteur : %s\n"
+"Site web : %s\n"
+"Fichier : %s\n"
+
+#: ../console/gntplugin.c:170
+msgid "Plugin need to be loaded before you can configure it."
+msgstr "Le plugin doit être chargé avant de pouvoir le configurer."
+
+#: ../console/gntplugin.c:208
+msgid "..."
+msgstr "..."
+
+#: ../console/gntplugin.c:209
+msgid "Still need to do something about this."
+msgstr "Il faut encore faire quelque chose pour cela."
+
+#: ../console/gntplugin.c:215
+msgid "No configuration options for this plugin."
+msgstr "Aucune option Ă  configurer pour ce plugin."
+
+#: ../console/gntplugin.c:231 ../console/gntui.c:73 ../gtk/gtkplugin.c:538
+#: ../gtk/plugins/docklet/docklet.c:520
+msgid "Plugins"
+msgstr "Plugins"
+
+#: ../console/gntplugin.c:236
+msgid "You can (un)load plugins from the following list."
+msgstr "Vous pouver charger/décharger les plugins de la liste suivante."
+
+#: ../console/gntplugin.c:279
+msgid "Configure Plugin"
+msgstr "Configurer le plugin"
+
+#: ../console/gntprefs.c:122
+msgid "Show Idle Time"
+msgstr "Afficher les temps d'inactivité"
+
+#: ../console/gntprefs.c:123
+msgid "Show Offline Buddies"
+msgstr "Afficher les contacts déconnectés"
+
+#: ../console/gntprefs.c:129
+msgid "Show Timestamps"
+msgstr "Afficher l'horodatage"
+
+#: ../console/gntprefs.c:130
+msgid "Notify buddies when you are typing"
+msgstr "Notifier les contacts que vous ĂŞtes en train de leur Ă©crire"
+
+#: ../console/gntprefs.c:136
+msgid "Log format"
+msgstr "Format des archives"
+
+#: ../console/gntprefs.c:137
+msgid "Log IMs"
+msgstr "Archiver les messages"
+
+#: ../console/gntprefs.c:138
+msgid "Log chats"
+msgstr "Archiver les discussions"
+
+#: ../console/gntprefs.c:139
+msgid "Log status change events"
+msgstr "Archiver les changements d'Ă©tat"
+
+#. Conversations
+#: ../console/gntprefs.c:220 ../gtk/gtkprefs.c:822 ../gtk/gtkprefs.c:1884
+#: ../gtk/plugins/win32/winprefs/winprefs.c:465
+msgid "Conversations"
+msgstr "Conversations"
+
+#: ../console/gntprefs.c:221 ../gtk/gtkprefs.c:1314 ../gtk/gtkprefs.c:1895
+msgid "Logging"
+msgstr "Enregistrement"
+
+#: ../console/gntprefs.c:223 ../console/gntui.c:74 ../gtk/gtkprefs.c:1920
+#: ../gtk/plugins/docklet/docklet.c:521
+msgid "Preferences"
+msgstr "Préférences"
+
+#: ../console/gntrequest.c:495
+msgid "Not implemented yet."
+msgstr "Fonction non implémentée."
+
+#: ../console/gntstatus.c:128
+#, c-format
+msgid "Are you sure you want to delete \"%s\""
+msgstr "Êtes-vous sûr de vouloir supprimer %s ?"
+
+#: ../console/gntstatus.c:131
+msgid "Delete Status"
+msgstr "Supprimer un Ă©tat"
+
+#: ../console/gntstatus.c:160 ../gtk/gtksavedstatuses.c:526
+msgid "Saved Statuses"
+msgstr "États prédéfinis"
+
+#: ../console/gntstatus.c:167 ../console/gntstatus.c:458
+#: ../gtk/gtksavedstatuses.c:433 ../libgaim/protocols/jabber/buddy.c:283
+#: ../libgaim/protocols/jabber/buddy.c:917
+#: ../libgaim/protocols/novell/novell.c:1484
+msgid "Title"
+msgstr "Titre"
+
+#: ../console/gntstatus.c:167 ../gtk/gtksavedstatuses.c:448
+msgid "Type"
+msgstr "Type"
+
+#: ../console/gntstatus.c:167 ../console/gntstatus.c:483
+#: ../console/gntstatus.c:495 ../gtk/gtksavedstatuses.c:459
+#: ../gtk/gtksavedstatuses.c:923 ../libgaim/protocols/bonjour/bonjour.c:256
+#: ../libgaim/protocols/bonjour/bonjour.c:263
+#: ../libgaim/protocols/gg/gg.c:1592 ../libgaim/protocols/gg/gg.c:1602
+#: ../libgaim/protocols/gg/gg.c:1608 ../libgaim/protocols/gg/gg.c:1617
+#: ../libgaim/protocols/gg/gg.c:1622 ../libgaim/protocols/irc/irc.c:244
+#: ../libgaim/protocols/jabber/jabber.c:1214
+#: ../libgaim/protocols/jabber/jabber.c:1224
+#: ../libgaim/protocols/jabber/jabber.c:1234
+#: ../libgaim/protocols/jabber/jabber.c:1244
+#: ../libgaim/protocols/jabber/jabber.c:1254
+#: ../libgaim/protocols/jabber/jabber.c:1266
+#: ../libgaim/protocols/novell/novell.c:2876
+#: ../libgaim/protocols/novell/novell.c:2982
+#: ../libgaim/protocols/novell/novell.c:2988
+#: ../libgaim/protocols/novell/novell.c:2994
+#: ../libgaim/protocols/oscar/oscar.c:5395
+#: ../libgaim/protocols/oscar/oscar.c:5410
+#: ../libgaim/protocols/oscar/oscar.c:5415
+#: ../libgaim/protocols/oscar/oscar.c:5623
+#: ../libgaim/protocols/oscar/oscar.c:5635
+#: ../libgaim/protocols/oscar/oscar.c:5648
+#: ../libgaim/protocols/oscar/oscar.c:5655
+#: ../libgaim/protocols/oscar/oscar.c:5662
+#: ../libgaim/protocols/sametime/sametime.c:3262
+#: ../libgaim/protocols/sametime/sametime.c:3268
+#: ../libgaim/protocols/sametime/sametime.c:3274
+#: ../libgaim/protocols/sametime/sametime.c:3353
+#: ../libgaim/protocols/silc/buddy.c:1544
+#: ../libgaim/protocols/simple/simple.c:246
+#: ../libgaim/protocols/yahoo/yahoo.c:3456
+#: ../libgaim/protocols/yahoo/yahoo.c:3462
+#: ../libgaim/protocols/zephyr/zephyr.c:2333
+msgid "Message"
+msgstr "Message"
+
+#: ../console/gntstatus.c:179
+msgid "Use"
+msgstr "Utiliser"
+
+#: ../console/gntstatus.c:240
+msgid "Invalid title"
+msgstr "Titre non valide"
+
+#: ../console/gntstatus.c:241
+msgid "Please enter a non-empty title for the status."
+msgstr "Saisissez un titre non vide pour l'Ă©tat."
+
+#: ../console/gntstatus.c:248
+msgid "Duplicate title"
+msgstr "Titre en double"
+
+#: ../console/gntstatus.c:249
+msgid "Please enter a different title for the status."
+msgstr "Saisissez un titre différent pour cet état."
+
+#: ../console/gntstatus.c:372
+msgid "Substatus"
+msgstr "Sous-Ă©tat"
+
+#. Set up stuff for the account box
+#: ../console/gntstatus.c:375 ../gtk/gtkblist.c:4943 ../gtk/gtkblist.c:5261
+msgid "Account:"
+msgstr "Compte :"
+
+#: ../console/gntstatus.c:383 ../gtk/gtkft.c:698
+msgid "Status:"
+msgstr "État :"
+
+#: ../console/gntstatus.c:398
+msgid "Message:"
+msgstr "Message :"
+
+#: ../console/gntstatus.c:447
+msgid "Edit Status"
+msgstr "Modifier l'Ă©tat"
+
+#: ../console/gntstatus.c:466 ../console/gntstatus.c:495
+#: ../gtk/gtksavedstatuses.c:912 ../gtk/gtksavedstatuses.c:1059
+#: ../libgaim/protocols/gg/gg.c:1024 ../libgaim/protocols/gg/gg.c:1575
+#: ../libgaim/protocols/gg/gg.c:1579 ../libgaim/protocols/jabber/buddy.c:623
+#: ../libgaim/protocols/jabber/buddy.c:630
+#: ../libgaim/protocols/jabber/buddy.c:658
+#: ../libgaim/protocols/jabber/jabber.c:1185
+#: ../libgaim/protocols/msn/msn.c:546
+#: ../libgaim/protocols/novell/novell.c:2875
+#: ../libgaim/protocols/novell/novell.c:2879
+#: ../libgaim/protocols/oscar/oscar.c:759
+#: ../libgaim/protocols/oscar/oscar.c:765
+#: ../libgaim/protocols/oscar/oscar.c:768
+#: ../libgaim/protocols/yahoo/yahoo.c:3032
+msgid "Status"
+msgstr "État"
+
+#: ../console/gntstatus.c:489
+msgid "Use different status for following accounts"
+msgstr "Utiliser un état différent pour les comptes suivant"
+
+#. Save & Use
+#: ../console/gntstatus.c:518
+msgid "Save & Use"
+msgstr "Enregistrer et utiliser"
+
+#: ../console/gntui.c:75
+msgid "Statuses"
+msgstr "États"
+
+#: ../console/plugins/gntgf.c:209
+#, c-format
+msgid "%s just signed on"
+msgstr "%s vient de se connecter."
+
+#: ../console/plugins/gntgf.c:216
+#, c-format
+msgid "%s just signed off"
+msgstr "%s vient de partir."
+
+#: ../console/plugins/gntgf.c:224
+#, c-format
+msgid "%s sent you a message"
+msgstr "%s vous a envoyé un message."
+
+#: ../console/plugins/gntgf.c:243
+#, c-format
+msgid "%s said your nick in %s"
+msgstr "%s a Ă©crit votre pseudonyme dans %s."
+
+#: ../console/plugins/gntgf.c:245
+#, c-format
+msgid "%s sent a message in %s"
+msgstr "%s vous a envoyé un message dans %s."
+
+#: ../console/plugins/gntgf.c:283
+msgid "Buddy signs on/off"
+msgstr "Connexion/déconnexion d'un contact"
+
+#: ../console/plugins/gntgf.c:284
+msgid "You receive an IM"
+msgstr "RĂ©ception d'un message"
+
+#: ../console/plugins/gntgf.c:285
+msgid "Someone speaks in a chat"
+msgstr "Quelqu'un Ă©crit votre pseudonyme dans une discussion"
+
+#: ../console/plugins/gntgf.c:286
+msgid "Someone says your name in a chat"
+msgstr "Quelqu'un Ă©crit votre nom dans une discussion"
+
+#: ../console/plugins/gntgf.c:314
+msgid "Notify with a toaster when"
+msgstr "Alerter par grille-pain quand"
+
+#: ../console/plugins/gntgf.c:329
+msgid "Beep too!"
+msgstr "Faire un son aussi !"
+
+#: ../console/plugins/gntgf.c:335
+msgid "Set URGENT for the terminal window."
+msgstr "Utiliser le message URGENT du terminal."
+
+#: ../console/plugins/gntgf.c:355
+msgid "GntGf"
+msgstr "GntGf"
+
+#: ../console/plugins/gntgf.c:357 ../console/plugins/gntgf.c:358
+msgid "Toaster plugin for GntGaim."
+msgstr "Plugin grille-pain pour GntGaim."
+
+#: ../console/plugins/gnthistory.c:119 ../gtk/plugins/history.c:120
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Conversation avec %s le %s :</b><br>"
 
-#: ../plugins/history.c:147
+#: ../console/plugins/gnthistory.c:140 ../gtk/plugins/history.c:147
 msgid "History Plugin Requires Logging"
 msgstr "Le plugin d'historique nécessite l'activation des archives."
 
-#: ../plugins/history.c:148
+#: ../console/plugins/gnthistory.c:141 ../gtk/plugins/history.c:148
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -842,15 +1032,15 @@
 "discussion permettra l'utilisation de l'historique pour ces types de "
 "messages."
 
-#: ../plugins/history.c:188
-msgid "History"
-msgstr "Historique"
-
-#: ../plugins/history.c:190
+#: ../console/plugins/gnthistory.c:181
+msgid "GntHistory"
+msgstr "HistoriqueGnt"
+
+#: ../console/plugins/gnthistory.c:183 ../gtk/plugins/history.c:190
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Affiche l'historique dans les nouvelles conversations."
 
-#: ../plugins/history.c:191
+#: ../console/plugins/gnthistory.c:184 ../gtk/plugins/history.c:191
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -858,1436 +1048,91 @@
 "Quand une nouvelle conversation est ouverte, le plugin rajoute la dernière "
 "conversation avec l'interlocuteur dans la fenĂŞtre."
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/iconaway.c:82
-msgid "Iconify on Away"
-msgstr "IcĂ´nifier lors des absences"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/iconaway.c:85 ../plugins/iconaway.c:87
-msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr ""
-"Met en icĂ´ne la liste de contacts et les conversations lors des absences."
-
-#: ../plugins/idle.c:158 ../plugins/idle.c:216
-msgid "Minutes"
-msgstr "Minutes"
-
-#. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
-#. If that doesn't translate well into your language, drop the 's before translating.
-#: ../plugins/idle.c:165 ../plugins/idle.c:198 ../plugins/idle.c:223
-#: ../plugins/idle.c:315
-msgid "I'dle Mak'er"
-msgstr "I'nactivat'eur"
-
-#: ../plugins/idle.c:166 ../plugins/idle.c:255
-msgid "Set Account Idle Time"
-msgstr "Durée d'inactivité pour le compte"
-
-#: ../plugins/idle.c:169 ../plugins/idle.c:227
-msgid "_Set"
-msgstr "_Changer"
-
-#: ../plugins/idle.c:170 ../plugins/idle.c:203 ../plugins/idle.c:228
-msgid "_Cancel"
-msgstr "_Annuler"
-
-#: ../plugins/idle.c:183
-msgid "None of your accounts are idle."
-msgstr "Aucun de vos comptes n'est inactif."
-
-#: ../plugins/idle.c:199 ../plugins/idle.c:259
-msgid "Unset Account Idle Time"
-msgstr "Désactiver le temps d'inactivité pour le compte"
-
-#: ../plugins/idle.c:202
-msgid "_Unset"
-msgstr "_DĂ©sactiver"
-
-#: ../plugins/idle.c:224 ../plugins/idle.c:263
-msgid "Set Idle Time for All Accounts"
-msgstr "Changer le temps d'inactivité pour tous les comptes"
-
-#: ../plugins/idle.c:268
-msgid "Unset Idle Time for All Idled Accounts"
-msgstr "Désactiver le temps d'inactivité pour tous les comptes inactifs"
-
-#: ../plugins/idle.c:317 ../plugins/idle.c:318
-msgid "Allows you to hand-configure how long you've been idle"
-msgstr "Permet de changer manuellement le temps d'inactivité."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ipc-test-client.c:87
-msgid "IPC Test Client"
-msgstr "Test pour le client IPC"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/ipc-test-client.c:90
-msgid "Test plugin IPC support, as a client."
-msgstr "Plugin de test du support d'IPC en tant que client"
-
-#. *  description
-#: ../plugins/ipc-test-client.c:92
-msgid ""
-"Test plugin IPC support, as a client. This locates the server plugin and "
-"calls the commands registered."
-msgstr ""
-"Teste le support du client IPC. Recherche le plugin serveur et appelle les "
-"commandes existantes."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ipc-test-server.c:74
-msgid "IPC Test Server"
-msgstr "Test pour le serveur IPC"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/ipc-test-server.c:77
-msgid "Test plugin IPC support, as a server."
-msgstr "Plugin de test du support d'IPC en tant que serveur"
-
-#. *  description
-#: ../plugins/ipc-test-server.c:79
-msgid "Test plugin IPC support, as a server. This registers the IPC commands."
-msgstr "Teste le support du serveur IPC. Enregistre les commandes IPC."
-
-#: ../plugins/log_reader.c:1405
-msgid "User is offline."
-msgstr "L'utilisateur est déconnecté."
-
-#: ../plugins/log_reader.c:1411
-msgid "Auto-response sent:"
-msgstr "Réponse automatique envoyée :"
-
-#: ../plugins/log_reader.c:1421 ../plugins/log_reader.c:1424
-#: ../plugins/statenotify.c:80
-#, c-format
-msgid "%s has signed off."
-msgstr "%s vient de se déconnecter ."
-
-#: ../plugins/log_reader.c:1438
-msgid "One or more messages may have been undeliverable."
-msgstr "Un ou plusieurs messages ne sont peut-être pas arrivés à destination."
-
-#: ../plugins/log_reader.c:1448
-msgid "You were disconnected from the server."
-msgstr "Vous avez été déconnecté du serveur"
-
-#: ../plugins/log_reader.c:1456
-msgid ""
-"You are currently disconnected. Messages will not be received unless you are "
-"logged in."
-msgstr ""
-"Vous êtes actuellement déconnecté. Vous ne pouvez pas recevoir de messages à "
-"moins de vous connecter."
-
-#: ../plugins/log_reader.c:1471
-msgid "Message could not be sent because the maximum length was exceeded."
-msgstr ""
-"Le message n'a pas pu être envoyé car la taille maximale a été dépassée."
-
-#: ../plugins/log_reader.c:1476
-msgid "Message could not be sent."
-msgstr "Le message n'a pas pu être envoyé."
-
-#. The names of IM clients are marked for translation at the request of
-#. translators who wanted to transliterate them.  Many translators
-#. choose to leave them alone.  Choose what's best for your language.
-#: ../plugins/log_reader.c:1838 ../plugins/log_reader.c:1943
-msgid "Adium"
-msgstr "Adium"
-
-#. The names of IM clients are marked for translation at the request of
-#. translators who wanted to transliterate them.  Many translators
-#. choose to leave them alone.  Choose what's best for your language.
-#: ../plugins/log_reader.c:1850 ../plugins/log_reader.c:1947
-msgid "Fire"
-msgstr "Fire"
-
-#. The names of IM clients are marked for translation at the request of
-#. translators who wanted to transliterate them.  Many translators
-#. choose to leave them alone.  Choose what's best for your language.
-#: ../plugins/log_reader.c:1862 ../plugins/log_reader.c:1951
-msgid "Messenger Plus!"
-msgstr "Messenger Plus!"
-
-#. The names of IM clients are marked for translation at the request of
-#. translators who wanted to transliterate them.  Many translators
-#. choose to leave them alone.  Choose what's best for your language.
-#: ../plugins/log_reader.c:1874 ../plugins/log_reader.c:1955
-msgid "MSN Messenger"
-msgstr "MSN Messenger"
-
-#. The names of IM clients are marked for translation at the request of
-#. translators who wanted to transliterate them.  Many translators
-#. choose to leave them alone.  Choose what's best for your language.
-#: ../plugins/log_reader.c:1886 ../plugins/log_reader.c:1959
-msgid "Trillian"
-msgstr "Trillian"
-
-#. Add general preferences.
-#: ../plugins/log_reader.c:1925
-msgid "General Log Reading Configuration"
-msgstr "Configuration général du lecteur d'archives."
-
-#: ../plugins/log_reader.c:1929
-msgid "Fast size calculations"
-msgstr "Calcul rapide de la taille"
-
-#: ../plugins/log_reader.c:1933
-msgid "Use name heuristics"
-msgstr "Utiliser une heuristique sur les noms"
-
-#. Add Log Directory preferences.
-#: ../plugins/log_reader.c:1939
-msgid "Log Directory"
-msgstr "Dossier des archives"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/log_reader.c:1982
-msgid "Log Reader"
-msgstr "Lecteur d'archives"
-
-#. *< name
-#. *< version
-#. * summary
-#: ../plugins/log_reader.c:1986
-msgid "Includes other IM clients' logs in the log viewer."
-msgstr ""
-"Inclut les archives d'autres clients de messagerie dans le lecteur "
-"d'archives."
-
-#. * description
-#: ../plugins/log_reader.c:1990
-msgid ""
-"When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, Fire, Messenger Plus!, MSN Messenger, and "
-"Trillian."
-msgstr ""
-"Quand les archives sont consultés, ce plugin ajoute les archives d'autres "
-"clients de messagerie instantanée. Cela inclut actuellement Adium, Fire, "
-"Messenger Plus!, MSN Messenger et Trillian."
-
-#: ../plugins/mailchk.c:160
-msgid "Mail Checker"
-msgstr "Nouveaux courriers"
-
-#: ../plugins/mailchk.c:162
-msgid "Checks for new local mail."
-msgstr ""
-"Vérifie le contenu de la boîte au lettres locale pour des nouveaux courriers."
-
-#: ../plugins/mailchk.c:163
-msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr ""
-"Ajoute une petite zone de notification dans la liste de contacts pour "
-"indiquer l'arrivée de nouveaux courriers."
-
-#: ../plugins/mono/loader/mono.c:213
-msgid "Mono Plugin Loader"
-msgstr "Chargeur de plugins Mono"
-
-#: ../plugins/mono/loader/mono.c:215 ../plugins/mono/loader/mono.c:216
-msgid "Loads .NET plugins with Mono."
-msgstr "Charge les plugins .NET Ă  l'aide de Mono."
-
-#: ../plugins/musicmessaging/musicmessaging.c:44
-msgid ""
-"A music messaging session has been requested. Please click the MM icon to "
-"accept."
-msgstr ""
-"Une partie de messagerie musicale a été demandée. Veuillez cliquer sur "
-"l'icĂ´ne MM pour l'accepter."
-
-#: ../plugins/musicmessaging/musicmessaging.c:45
-msgid "Music messaging session confirmed."
-msgstr "Partie de messagerie musicale confirmée."
-
-#: ../plugins/musicmessaging/musicmessaging.c:416
-msgid "Music Messaging"
-msgstr "Messagerie musicale"
-
-#: ../plugins/musicmessaging/musicmessaging.c:417
-msgid "There was a conflict in running the command:"
-msgstr "Un conflit a eu lieu en exécutant la commande :"
-
-#: ../plugins/musicmessaging/musicmessaging.c:525
-msgid "Error Running Editor"
-msgstr "Erreur à l'exécution de l'éditeur"
-
-#: ../plugins/musicmessaging/musicmessaging.c:526
-msgid "The following error has occured:"
-msgstr "L'erreur suivante est survenue :"
-
-#. Configuration frame
-#: ../plugins/musicmessaging/musicmessaging.c:625
-msgid "Music Messaging Configuration"
-msgstr "Configuration de messagerie musicale"
-
-#: ../plugins/musicmessaging/musicmessaging.c:629
-msgid "Score Editor Path"
-msgstr "Chemin de l'Ă©diteur de partitions"
-
-#: ../plugins/musicmessaging/musicmessaging.c:630
-msgid "_Apply"
-msgstr "_Appliquer"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#: ../plugins/musicmessaging/musicmessaging.c:665
-msgid "Music Messaging Plugin for collaborative composition."
-msgstr "Plugin de messagerie musicale pour la composition collaborative."
-
-#. *  summary
-#: ../plugins/musicmessaging/musicmessaging.c:667
-msgid ""
-"The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
-msgstr ""
-"Permet à plusieurs utilisateurs de travailler simultanément sur un morceau "
-"de musique en modifiant une partition commune en temps réel."
-
-#. ---------- "Notify For" ----------
-#: ../plugins/notify.c:638
-msgid "Notify For"
-msgstr "Notification pour"
-
-#: ../plugins/notify.c:642
-msgid "_IM windows"
-msgstr "FenĂŞtres de _message"
-
-#: ../plugins/notify.c:649
-msgid "C_hat windows"
-msgstr "FenĂŞtres de _discussions"
-
-#: ../plugins/notify.c:657
-msgid "\t_Only when someone says your screen name"
-msgstr "\t_Seulement quand on dit votre pseudonyme"
-
-#: ../plugins/notify.c:667
-msgid "_Focused windows"
-msgstr "_FenĂŞtres actives"
-
-#. ---------- "Notification Methods" ----------
-#: ../plugins/notify.c:675
-msgid "Notification Methods"
-msgstr "MĂ©thode de notification"
-
-#: ../plugins/notify.c:682
-msgid "Prepend _string into window title:"
-msgstr "Préfixer un _texte au titre de la fenêtre :"
-
-#. Count method button
-#: ../plugins/notify.c:701
-msgid "Insert c_ount of new messages into window title"
-msgstr "Mettre le n_ombre de nouveaux messages dans le titre de la fenĂŞtre"
-
-#. Urgent method button
-#: ../plugins/notify.c:710
-msgid "Set window manager \"_URGENT\" hint"
-msgstr "Envoyer le message « _URGENT » au gestionnaire de fenêtres"
-
-#. Raise window method button
-#: ../plugins/notify.c:719
-msgid "R_aise conversation window"
-msgstr "Passer la conversation en _avant plan"
-
-#. ---------- "Notification Removals" ----------
-#: ../plugins/notify.c:727
-msgid "Notification Removal"
-msgstr "Suppression de la notification"
-
-#. Remove on focus button
-#: ../plugins/notify.c:732
-msgid "Remove when conversation window _gains focus"
-msgstr "Supprimer quand la _fenĂŞtre devient active"
-
-#. Remove on click button
-#: ../plugins/notify.c:739
-msgid "Remove when conversation window _receives click"
-msgstr "Supprimer quand la fenêtre est _cliquée"
-
-#. Remove on type button
-#: ../plugins/notify.c:747
-msgid "Remove when _typing in conversation window"
-msgstr "Supprimer lors de l'Ă©c_riture dans la fenĂŞtre"
-
-#. Remove on message send button
-#: ../plugins/notify.c:755
-msgid "Remove when a _message gets sent"
-msgstr "Enlever sur envoi d'un _message"
-
-#. Remove on conversation switch button
-#: ../plugins/notify.c:764
-msgid "Remove on switch to conversation ta_b"
-msgstr "Supprimer lors du changement d'_onglet"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/notify.c:853
-msgid "Message Notification"
-msgstr "Notification de message"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/notify.c:856 ../plugins/notify.c:858
-msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr "Fournit différents moyens d'avertissement de messages non lus."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/perl/perl.c:583
-msgid "Perl Plugin Loader"
-msgstr "Chargeur de plugins Perl"
-
-#. *< name
-#. *< version
-#. *< summary
-#: ../plugins/perl/perl.c:585 ../plugins/perl/perl.c:586
-msgid "Provides support for loading perl plugins."
-msgstr "Fournit le support pour charger des plugins Perl"
-
-#: ../plugins/psychic.c:19
-msgid "Psychic Mode"
-msgstr "Mode psychique"
-
-#: ../plugins/psychic.c:20
-msgid "Psychic mode for incoming conversation"
-msgstr "Mode psychique pour le début des nouvelles conversations."
-
-#: ../plugins/psychic.c:21
-msgid ""
-"Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
-msgstr ""
-"Ouvre les fenêtres des nouvelles conversations dès qu'un utilisateur "
-"commence Ă  vous Ă©crire un message. Celq fonctionne pour AIM, ICQ, Jabber, "
-"Sametime et Yahoo."
-
-#. This is a quote from Star Wars.  You should
-#. probably not translate it literally.  If
-#. you can't find a fitting cultural reference
-#. in your language, consider translating
-#. something like this instead:
-#. "You feel a new message coming."
-#: ../plugins/psychic.c:63
-msgid "You feel a disturbance in the force..."
-msgstr "Vous sentez une perturbation dans la force..."
-
-#: ../plugins/psychic.c:82
-msgid "Only enable for users on the buddy list"
-msgstr "Activer uniquement pour les utilisateurs dans ma liste de contacts"
-
-#: ../plugins/psychic.c:87
-msgid "Disable when away"
-msgstr "DĂ©sactiver pendant les absences"
-
-#: ../plugins/psychic.c:91
-msgid "Display notification message in conversations"
-msgstr "Afficher un message de notification dans les conversations"
-
-#: ../plugins/raw.c:175
-msgid "Raw"
-msgstr "Brut"
-
-#: ../plugins/raw.c:177
-msgid "Lets you send raw input to text-based protocols."
-msgstr "Permet d'envoyer des données brutes à un protocole en mode texte."
-
-#: ../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 ""
-"Permet d'envoyer des données bruts aux protocoles en mode texte (Jabber, "
-"MSN, IRC, TOC). Tapez « Entrée » dans la boîte de saisie pour envoyer. "
-"Observez le résultat dans la fenêtre de debug."
-
-#: ../plugins/relnot.c:63
-#, c-format
-msgid "You are using Gaim version %s.  The current version is %s.<hr>"
-msgstr "Vous utilisez Gaim version %s. La dernière version est %s.<hr>"
-
-#: ../plugins/relnot.c:69
-#, c-format
-msgid ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
-msgstr ""
-"<b>Nouveautés :</b>\n"
-"%s<br><br>"
-
-#: ../plugins/relnot.c:74
-#, c-format
-msgid ""
-"You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
-"\">http://gaim.sourceforge.net</a>."
-msgstr ""
-"Vous pouvez télécharger la version %s sur :<br><a href=\"http://gaim."
-"sourceforge.net/\">http://gaim.sourceforge.net</a>."
-
-#: ../plugins/relnot.c:78 ../plugins/relnot.c:79
-msgid "New Version Available"
-msgstr "Nouvelle version disponible"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/relnot.c:137
-msgid "Release Notification"
-msgstr "Notification de nouvelle version"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/relnot.c:140
-msgid "Checks periodically for new releases."
-msgstr "Vérifie périodiquement pour de nouvelles mises à jour."
-
-#. *  description
-#: ../plugins/relnot.c:142
-msgid ""
-"Checks periodically for new releases and notifies the user with the "
-"ChangeLog."
-msgstr ""
-"Vérifie périodiquement pour de nouvelles versions et les annonce ainsi que "
-"les nouveauté dans ces mises à jour."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/signals-test.c:684
-msgid "Signals Test"
-msgstr "Test des événements"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/signals-test.c:687 ../plugins/signals-test.c:689
-msgid "Test to see that all signals are working properly."
-msgstr "Vérifie que tous les événements fonctionnent correctement."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/simple.c:37
-msgid "Simple Plugin"
-msgstr "Plugin simple"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/simple.c:40 ../plugins/simple.c:42
-msgid "Tests to see that most things are working."
-msgstr "VĂ©rifie que la plupart des choses fonctionne correctement."
-
-#: ../plugins/spellchk.c:1945
-msgid "Duplicate Correction"
-msgstr "Correction en double"
-
-#: ../plugins/spellchk.c:1946
-msgid "The specified word already exists in the correction list."
-msgstr "Le mot existe déjà dans la liste de corrections."
-
-#: ../plugins/spellchk.c:2154
-msgid "Text Replacements"
-msgstr "Substitutions de texte"
-
-#: ../plugins/spellchk.c:2177
-msgid "You type"
-msgstr "Vous saisissez"
-
-#: ../plugins/spellchk.c:2191
-msgid "You send"
-msgstr "Vous envoyez"
-
-#: ../plugins/spellchk.c:2205
-msgid "Whole words only"
-msgstr "Mots entiers uniquement"
-
-#: ../plugins/spellchk.c:2217
-msgid "Case sensitive"
-msgstr "Sensible Ă  la casse"
-
-#: ../plugins/spellchk.c:2243
-msgid "Add a new text replacement"
-msgstr "Ajouter une nouvelle substitution"
-
-#: ../plugins/spellchk.c:2259
-msgid "You _type:"
-msgstr "Vous _saisissez :"
-
-#: ../plugins/spellchk.c:2276
-msgid "You _send:"
-msgstr "Vous _envoyez :"
-
-#. Created here so it can be passed to whole_words_button_toggled.
-#: ../plugins/spellchk.c:2288
-msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr "Correspondance _parfaite uniquement (décoche la gestion automatique)"
-
-#: ../plugins/spellchk.c:2290
-msgid "Only replace _whole words"
-msgstr "Remplace uniquement les mots _complets"
-
-#: ../plugins/spellchk.c:2315
-msgid "General Text Replacement Options"
-msgstr "Options de substitutions globales de texte"
-
-#: ../plugins/spellchk.c:2316
-msgid "Enable replacement of last word on send"
-msgstr "Permet la substitution des mots Ă  l'envoi"
-
-#: ../plugins/spellchk.c:2341
-msgid "Text replacement"
-msgstr "Substitutions de texte"
-
-#: ../plugins/spellchk.c:2343 ../plugins/spellchk.c:2344
-msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr ""
-"Remplace le texte dans les messages envoyés grâce à des règles de "
-"substitution."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ssl/ssl-gnutls.c:256
-msgid "GNUTLS"
-msgstr "GNUTLS"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/ssl/ssl-gnutls.c:259 ../plugins/ssl/ssl-gnutls.c:261
-msgid "Provides SSL support through GNUTLS."
-msgstr "Fournit le support SSL grâce à la bibliothèque GNUTLS"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ssl/ssl-nss.c:412
-msgid "NSS"
-msgstr "NSS"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/ssl/ssl-nss.c:415 ../plugins/ssl/ssl-nss.c:417
-msgid "Provides SSL support through Mozilla NSS."
-msgstr "Fournit le support SSL grâce à la bibliothèque NSS"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ssl/ssl.c:94
-msgid "SSL"
-msgstr "SSL"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/ssl/ssl.c:97 ../plugins/ssl/ssl.c:99
-msgid "Provides a wrapper around SSL support libraries."
-msgstr "Fournit une interface pour les bibliothèques SSL"
-
-#: ../plugins/statenotify.c:50
-#, c-format
-msgid "%s is no longer away."
-msgstr "%s n'est plus absent"
-
-#: ../plugins/statenotify.c:52
-#, c-format
-msgid "%s has gone away."
-msgstr "%s est passé absent"
-
-#: ../plugins/statenotify.c:62
-#, c-format
-msgid "%s has become idle."
-msgstr "%s est devenu inactif"
-
-#: ../plugins/statenotify.c:64
-#, c-format
-msgid "%s is no longer idle."
-msgstr "%s n'est plus inactif"
-
-#: ../plugins/statenotify.c:73
-#, c-format
-msgid "%s has signed on."
-msgstr "%s vient de se connecter."
-
-#: ../plugins/statenotify.c:91
-msgid "Notify When"
-msgstr "Notification quand"
-
-#: ../plugins/statenotify.c:94
-msgid "Buddy Goes _Away"
-msgstr "L'utilisateur s'absente"
-
-#: ../plugins/statenotify.c:97
-msgid "Buddy Goes _Idle"
-msgstr "L'utilisateur passe inactif"
-
-#: ../plugins/statenotify.c:100
-msgid "Buddy _Signs On/Off"
-msgstr "_Connexion/déconnexion d'un contact"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/statenotify.c:142
-msgid "Buddy State Notification"
-msgstr "Notification de changement d'Ă©tat"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/statenotify.c:145 ../plugins/statenotify.c:148
-msgid ""
-"Notifies in a conversation window when a buddy goes or returns from away or "
-"idle."
-msgstr ""
-"Indique dans la fenĂŞtre de conversation quand un contact part ou revient "
-"d'une absence ou d'une inactivité."
-
-#: ../plugins/tcl/tcl.c:413
-msgid "Tcl Plugin Loader"
-msgstr "Chargeur de plugins Tcl"
-
-#: ../plugins/tcl/tcl.c:415 ../plugins/tcl/tcl.c:416
-msgid "Provides support for loading Tcl plugins"
-msgstr "Fournit le support pour charger des plugins Tcl"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ticker/ticker.c:77 ../plugins/ticker/ticker.c:355
-msgid "Buddy Ticker"
-msgstr "DĂ©filement des contacts"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/ticker/ticker.c:358 ../plugins/ticker/ticker.c:360
-msgid "A horizontal scrolling version of the buddy list."
-msgstr "Une version horizontale avec défilement de la liste de contacts."
-
-#: ../plugins/timestamp.c:186
-msgid "iChat Timestamp"
-msgstr "Horodatage iChat"
-
-#: ../plugins/timestamp.c:193
-msgid "Delay"
-msgstr "Intervalle"
-
-#: ../plugins/timestamp.c:200
-msgid "minutes."
-msgstr "minutes"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/timestamp.c:256
-msgid "Timestamp"
-msgstr "Horodatage"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/timestamp.c:259 ../plugins/timestamp.c:261
-msgid "Adds iChat-style timestamps to conversations every N minutes."
-msgstr "Ajoute l'heure dans la conversation à intervalle régulier."
-
-#: ../plugins/timestamp_format.c:22
-msgid "Timestamp Format Options"
-msgstr "Options du formatage de l'horodatage"
-
-#: ../plugins/timestamp_format.c:27
-msgid "_Force (traditional Gaim) 24-hour time format"
-msgstr "_Forcer au format 24 heures (traditionnel Ă  Gaim)"
-
-#: ../plugins/timestamp_format.c:30
-msgid "Show dates in..."
-msgstr "Afficher les dates dans..."
-
-#: ../plugins/timestamp_format.c:35
-msgid "Co_nversations:"
-msgstr "Les con-versations :"
-
-#: ../plugins/timestamp_format.c:37 ../plugins/timestamp_format.c:46
-msgid "For delayed messages"
-msgstr "Pour les messages retardés"
-
-#: ../plugins/timestamp_format.c:38 ../plugins/timestamp_format.c:47
-msgid "For delayed messages and in chats"
-msgstr "Pour les messages retardés et dans les salons de discussion"
-
-#: ../plugins/timestamp_format.c:44
-msgid "_Message Logs:"
-msgstr "Les _archives :"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/timestamp_format.c:149
-msgid "Message Timestamp Formats"
-msgstr "Formatage de l'horodatage des messages."
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/timestamp_format.c:152
-msgid "Customizes the message timestamp formats."
-msgstr "Personnaliser l'affichage de l'horodatage des messages."
-
-#. *  description
-#: ../plugins/timestamp_format.c:154
-msgid ""
-"This plugin allows the user to customize conversation and logging message "
-"timestamp formats."
-msgstr ""
-"Permet Ă  l'utilisateur de personnaliser dans les conversions et les archives "
-"la manière dont est affiché l'horodatage."
-
-#: ../plugins/win32/transparency/win2ktrans.c:183
-#: ../plugins/win32/transparency/win2ktrans.c:569
-#: ../plugins/win32/transparency/win2ktrans.c:616
-msgid "Opacity:"
-msgstr "Opacité :"
-
-#. IM Convo trans options
-#: ../plugins/win32/transparency/win2ktrans.c:533
-msgid "IM Conversation Windows"
-msgstr "FenĂŞtres de messages"
-
-#: ../plugins/win32/transparency/win2ktrans.c:534
-msgid "_IM window transparency"
-msgstr "FenĂŞtre de _messages transparente"
-
-#: ../plugins/win32/transparency/win2ktrans.c:548
-msgid "_Show slider bar in IM window"
-msgstr "Afficher la barre de défilement dans la fenêtre"
-
-#: ../plugins/win32/transparency/win2ktrans.c:555
-msgid "Remove IM window transparency on focus"
-msgstr "Supprimer la transparence pour les fenĂŞtres de messages actives"
-
-#: ../plugins/win32/transparency/win2ktrans.c:558
-#: ../plugins/win32/transparency/win2ktrans.c:606
-msgid "Always on top"
-msgstr "Toujours en avant plan"
-
-#. Buddy List trans options
-#: ../plugins/win32/transparency/win2ktrans.c:590
-msgid "Buddy List Window"
-msgstr "FenĂŞtre de la liste de contacts"
-
-#: ../plugins/win32/transparency/win2ktrans.c:591
-msgid "_Buddy List window transparency"
-msgstr "FenĂŞtre de la liste de _contacts transparente"
-
-#: ../plugins/win32/transparency/win2ktrans.c:604
-msgid "Remove Buddy List window transparency on focus"
-msgstr "Supprimer la transparence quand la liste des contacts est active"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/win32/transparency/win2ktrans.c:658
-msgid "Transparency"
-msgstr "Transparence"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/win32/transparency/win2ktrans.c:661
-msgid "Variable Transparency for the buddy list and conversations."
-msgstr "Transparence variable pour la liste de contacts et les conversations."
-
-#. *  description
-#: ../plugins/win32/transparency/win2ktrans.c:663
-msgid ""
-"This plugin enables variable alpha transparency on conversation windows and "
-"the buddy list.\n"
-"\n"
-"* Note: This plugin requires Win2000 or greater."
-msgstr ""
-"Active la transparence des fenĂŞtres de conversation et de la liste de "
-"contacts.\n"
-"\n"
-"Note : Ce plugin nécessite Windows 2000 ou plus récent."
-
-#: ../plugins/win32/winprefs/winprefs.c:434
-msgid "GTK+ Runtime Version"
-msgstr "Version des bibliothèques GTK+"
-
-#. Autostart
-#: ../plugins/win32/winprefs/winprefs.c:442
-msgid "Startup"
-msgstr "DĂ©marrage"
-
-#: ../plugins/win32/winprefs/winprefs.c:443
-msgid "_Start Gaim on Windows startup"
-msgstr "_DĂ©marrer Gaim au lancement de Windows"
-
-#. Buddy List
-#: ../plugins/win32/winprefs/winprefs.c:455 ../src/gtkblist.c:3688
-msgid "Buddy List"
-msgstr "Liste de contacts"
-
-#: ../plugins/win32/winprefs/winprefs.c:456
-msgid "_Dockable Buddy List"
-msgstr "Liste de contacts _accrochable"
-
-#. Blist On Top
-#: ../plugins/win32/winprefs/winprefs.c:460
-msgid "_Keep Buddy List window on top:"
-msgstr "Liste de contacts toujours _visible :"
-
-#. XXX: Did this ever work?
-#: ../plugins/win32/winprefs/winprefs.c:465
-msgid "Only when docked"
-msgstr "Seulement quand la fenêtre est accrochée"
-
-#. Conversations
-#: ../plugins/win32/winprefs/winprefs.c:469 ../src/gtkprefs.c:819
-#: ../src/gtkprefs.c:1879
-msgid "Conversations"
-msgstr "Conversations"
-
-#: ../plugins/win32/winprefs/winprefs.c:470
-msgid "_Flash window when messages are received"
-msgstr "_Faire clignoter la fenêtre sur la réception de messages"
-
-#: ../plugins/win32/winprefs/winprefs.c:494
-msgid "WinGaim Options"
-msgstr "Préférences de WinGaim"
-
-#: ../plugins/win32/winprefs/winprefs.c:496
-msgid "Options specific to Windows Gaim."
-msgstr "Options spécifiques à Gaim Windows"
-
-#: ../plugins/win32/winprefs/winprefs.c:497
-msgid ""
-"Provides options specific to Windows Gaim, such as buddy list docking and "
-"conversation flashing."
-msgstr ""
-"Fournit des options spécifiques à Gaim Windows, tels que l'accrochage de la "
-"liste de contacts et le clignotement des fenĂŞtres de conversation."
-
-#: ../src/account.c:773
-msgid "accounts"
-msgstr "Comptes"
-
-#: ../src/account.c:917
-msgid "Password is required to sign on."
-msgstr "Un mot de passe est nécessaire pour la connexion."
-
-#: ../src/account.c:942
-#, c-format
-msgid "Enter password for %s (%s)"
-msgstr "Saisissez le mot de passe pour %s (%s)"
-
-#: ../src/account.c:949
-msgid "Enter Password"
-msgstr "Saisissez le mot de passe"
-
-#: ../src/account.c:954
-msgid "Save password"
-msgstr "MĂ©moriser le mot de passe"
-
-#. *
-#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
-#.
-#: ../src/account.c:962 ../src/account.c:1133 ../src/gtkblist.c:3572
-#: ../src/gtkdialogs.c:615 ../src/gtkdialogs.c:752 ../src/gtkdialogs.c:826
-#: ../src/gtkrequest.c:269 ../src/protocols/gg/gg.c:497
-#: ../src/protocols/gg/gg.c:655 ../src/protocols/gg/gg.c:791
-#: ../src/protocols/jabber/jabber.c:1339 ../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:1417 ../src/protocols/oscar/oscar.c:2176
-#: ../src/protocols/oscar/oscar.c:2263 ../src/protocols/oscar/oscar.c:5737
-#: ../src/protocols/oscar/oscar.c:5939 ../src/protocols/oscar/oscar.c:5964
-#: ../src/protocols/oscar/oscar.c:6020 ../src/protocols/silc/buddy.c:466
-#: ../src/protocols/silc/buddy.c:1182 ../src/protocols/silc/chat.c:424
-#: ../src/protocols/silc/chat.c:462 ../src/protocols/silc/chat.c:725
-#: ../src/protocols/silc/ops.c:1297 ../src/protocols/silc/ops.c:1910
-#: ../src/protocols/silc/silc.c:755 ../src/protocols/yahoo/yahoo.c:3076
-#: ../src/protocols/yahoo/yahoo.c:3085 ../src/request.h:1344
-msgid "OK"
-msgstr "OK"
-
-#: ../src/account.c:963 ../src/account.c:1134 ../src/account.c:1171
-#: ../src/gtkaccount.c:2172 ../src/gtkaccount.c:2642 ../src/gtkblist.c:5051
-#: ../src/gtkdialogs.c:616 ../src/gtkdialogs.c:753 ../src/gtkdialogs.c:827
-#: ../src/gtkdialogs.c:846 ../src/gtkdialogs.c:868 ../src/gtkdialogs.c:888
-#: ../src/gtkdialogs.c:932 ../src/gtkdialogs.c:987 ../src/gtkdialogs.c:1024
-#: ../src/gtkdialogs.c:1049 ../src/gtkimhtmltoolbar.c:419
-#: ../src/gtkplugin.c:296 ../src/gtkpounce.c:1088 ../src/gtkprivacy.c:566
-#: ../src/gtkprivacy.c:579 ../src/gtkprivacy.c:604 ../src/gtkprivacy.c:615
-#: ../src/gtkrequest.c:270 ../src/gtksavedstatuses.c:296
-#: ../src/protocols/gg/gg.c:498 ../src/protocols/gg/gg.c:656
-#: ../src/protocols/gg/gg.c:792 ../src/protocols/gg/gg.c:871
-#: ../src/protocols/jabber/buddy.c:594 ../src/protocols/jabber/buddy.c:1721
-#: ../src/protocols/jabber/buddy.c:1755 ../src/protocols/jabber/chat.c:778
-#: ../src/protocols/jabber/jabber.c:843 ../src/protocols/jabber/jabber.c:1340
-#: ../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:1418 ../src/protocols/oscar/oscar.c:2177
-#: ../src/protocols/oscar/oscar.c:2216 ../src/protocols/oscar/oscar.c:2264
-#: ../src/protocols/oscar/oscar.c:5738 ../src/protocols/oscar/oscar.c:5790
-#: ../src/protocols/oscar/oscar.c:5940 ../src/protocols/oscar/oscar.c:5965
-#: ../src/protocols/oscar/oscar.c:6021 ../src/protocols/oscar/oscar.c:6090
-#: ../src/protocols/oscar/peer.c:942 ../src/protocols/sametime/sametime.c:3368
-#: ../src/protocols/sametime/sametime.c:3453
-#: ../src/protocols/sametime/sametime.c:3623
-#: ../src/protocols/sametime/sametime.c:5317
-#: ../src/protocols/sametime/sametime.c:5406
-#: ../src/protocols/sametime/sametime.c:5530 ../src/protocols/silc/buddy.c:467
-#: ../src/protocols/silc/buddy.c:1078 ../src/protocols/silc/buddy.c:1183
-#: ../src/protocols/silc/chat.c:597 ../src/protocols/silc/chat.c:726
-#: ../src/protocols/silc/ops.c:1911 ../src/protocols/silc/silc.c:756
-#: ../src/protocols/silc/silc.c:961 ../src/protocols/yahoo/yahoo.c:3077
-#: ../src/protocols/yahoo/yahoo.c:3086 ../src/request.h:1344
-#: ../src/request.h:1354
-msgid "Cancel"
-msgstr "Annuler"
-
-#: ../src/account.c:988 ../src/connection.c:96
-#, c-format
-msgid "Missing protocol plugin for %s"
-msgstr "Plugin pour le protocole %s manquant"
-
-#: ../src/account.c:990 ../src/connection.c:99 ../src/gtkblist.c:3570
-msgid "Connection Error"
-msgstr "Erreur de connexion"
-
-#: ../src/account.c:1070 ../src/protocols/gg/gg.c:696
-#: ../src/protocols/jabber/jabber.c:1292
-msgid "New passwords do not match."
-msgstr "Les nouveaux mots de passe diffèrent"
-
-#: ../src/account.c:1079
-msgid "Fill out all fields completely."
-msgstr "Veuillez renseigner toutes les rubriques."
-
-#: ../src/account.c:1102
-msgid "Original password"
-msgstr "Mot de passe courant"
-
-#: ../src/account.c:1109
-msgid "New password"
-msgstr "Nouveau mot de passe"
-
-#: ../src/account.c:1116
-msgid "New password (again)"
-msgstr "Nouveau mot de passe (confirmation)"
-
-#: ../src/account.c:1122
-#, c-format
-msgid "Change password for %s"
-msgstr "Changer le mot de passe pour %s"
-
-#: ../src/account.c:1130
-msgid "Please enter your current password and your new password."
-msgstr "Saisissez votre mot de passe et un nouveau mot de passe"
-
-#: ../src/account.c:1163
-#, c-format
-msgid "Change user information for %s"
-msgstr "Changer les informations pour %s"
-
-#: ../src/account.c:1166 ../src/protocols/toc/toc.c:1684
-msgid "Set User Info"
-msgstr "Éditer les informations"
-
-#: ../src/account.c:1170 ../src/gtkdebug.c:684 ../src/gtkrequest.c:276
-#: ../src/protocols/jabber/buddy.c:593
-msgid "Save"
-msgstr "Enregistrer"
-
-#: ../src/account.c:1675 ../src/gtkft.c:159 ../src/protocols/gg/gg.c:1002
-#: ../src/protocols/jabber/buddy.c:636 ../src/protocols/jabber/buddy.c:1357
-#: ../src/protocols/jabber/buddy.c:1374 ../src/protocols/novell/novell.c:2858
-msgid "Unknown"
-msgstr "Inconnu"
-
-#: ../src/blist.c:543
-msgid "buddy list"
-msgstr "Liste de contacts"
-
-#: ../src/blist.c:1182
-msgid "Chats"
-msgstr "Discussions"
-
-#: ../src/blist.c:1904
-#, c-format
-msgid ""
-"%d buddy from group %s was not removed because it belongs to an account "
-"which is disabled or offline.  This buddy and the group were not removed.\n"
-msgid_plural ""
-"%d buddies from group %s were not removed because they belong to accounts "
-"which are currently disabled or offline.  These buddies and the group were "
-"not removed.\n"
-msgstr[0] ""
-"%d contact du groupe %s n'a pas été supprimé parce qu'il est lié à un compte "
-"désactivé ou déconnecté. Ce contact et le groupe n'ont pas été supprimés.\n"
-msgstr[1] ""
-"%d contacts du groupe %s n'ont pas été supprimés parce qu'ils sont liés à "
-"des comptes désactivés ou déconnectés. Ces contacts et le groupe n'ont pas "
-"été supprimés.\n"
-
-#: ../src/blist.c:1914
-msgid "Group not removed"
-msgstr "Groupe non supprimé"
-
-#: ../src/connection.c:98
-msgid "Registration Error"
-msgstr "Erreur d'enregistrement"
-
-#: ../src/connection.c:277
-#, c-format
-msgid "+++ %s signed on"
-msgstr "+++ %s vient de se connecter"
-
-#: ../src/connection.c:310
-#, c-format
-msgid "+++ %s signed off"
-msgstr "+++ %s a quitté"
-
-#: ../src/conversation.c:164
-msgid "Unable to send message: The message is too large."
-msgstr "Impossible d'envoyer le message : trop gros"
-
-#: ../src/conversation.c:167 ../src/conversation.c:180
-#, c-format
-msgid "Unable to send message to %s."
-msgstr "Impossible d'envoyer le message vers %s."
-
-#: ../src/conversation.c:168
-msgid "The message is too large."
-msgstr "Message trop long"
-
-#: ../src/conversation.c:177
-msgid "Unable to send message."
-msgstr "Impossible d'envoyer le message"
-
-#: ../src/conversation.c:1528
-#, c-format
-msgid "%s entered the room."
-msgstr "%s est entré dans le salon"
-
-#: ../src/conversation.c:1531
-#, c-format
-msgid "%s [<I>%s</I>] entered the room."
-msgstr "%s [<I>%s</I>] est entré dans le salon"
-
-#: ../src/conversation.c:1636
-#, c-format
-msgid "You are now known as %s"
-msgstr "Vous êtes désormais connu sous le nom de %s"
-
-#: ../src/conversation.c:1656
-#, c-format
-msgid "%s is now known as %s"
-msgstr "%s est désormais connu sous le nom de %s"
-
-#: ../src/conversation.c:1729
-#, c-format
-msgid "%s left the room."
-msgstr "%s a quitté le salon"
-
-#: ../src/conversation.c:1732
-#, c-format
-msgid "%s left the room (%s)."
-msgstr "%s a quitté le salon (%s)"
-
-#: ../src/desktopitem.c:286 ../src/desktopitem.c:877
-msgid "No name"
-msgstr "Anonyme"
-
-#: ../src/ft.c:189 ../src/protocols/msn/msn.c:410
-#, c-format
-msgid ""
-"Error reading %s: \n"
-"%s.\n"
-msgstr ""
-"Erreur à la lecture de « %s » :\n"
-"%s\n"
-
-#: ../src/ft.c:193
-#, c-format
-msgid ""
-"Error writing %s: \n"
-"%s.\n"
-msgstr ""
-"Erreur à l'écriture de « %s » :\n"
-"%s\n"
-
-#: ../src/ft.c:197
-#, c-format
-msgid ""
-"Error accessing %s: \n"
-"%s.\n"
-msgstr ""
-"Erreur lors de l'accès à « %s » :\n"
-"%s\n"
-
-#: ../src/ft.c:230
-msgid "Cannot send a file of 0 bytes."
-msgstr "Impossible d'envoyer un fichier de taille nulle"
-
-#: ../src/ft.c:240
-msgid "Cannot send a directory."
-msgstr "Impossible d'envoyer un dossier"
-
-#: ../src/ft.c:249
-#, c-format
-msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
-msgstr ""
-"« %s » n'est pas un fichier régulier. Gaim refuse lâchement d'écraser ce "
-"fichier.\n"
-
-#: ../src/ft.c:307
-#, c-format
-msgid "%s wants to send you %s (%s)"
-msgstr "%s veut vous envoyer %s (%s)"
-
-#: ../src/ft.c:314
-#, c-format
-msgid "%s wants to send you a file"
-msgstr "%s veut vous envoyer un fichier"
-
-#: ../src/ft.c:355
-#, c-format
-msgid "Accept file transfer request from %s?"
-msgstr "Accepter la requête de transfert de %s ?"
-
-#: ../src/ft.c:359
-#, c-format
-msgid ""
-"A file is available for download from:\n"
-"Remote host: %s\n"
-"Remote port: %d"
-msgstr ""
-"Un fichier est disponible pour le téléchargement depuis :\n"
-"Hôte distant : %s\n"
-"Port distant : %d"
-
-#: ../src/ft.c:392
-#, c-format
-msgid "%s is offering to send file %s"
-msgstr "%s propose de vous envoyer le fichier %s"
-
-#: ../src/ft.c:444
-#, c-format
-msgid "%s is not a valid filename.\n"
-msgstr "%s n'est pas un nom de fichier valide\n"
-
-#: ../src/ft.c:465
-#, c-format
-msgid "Offering to send %s to %s"
-msgstr "Proposition d'envoyer « %s » à %s"
-
-#: ../src/ft.c:477
-#, c-format
-msgid "Starting transfer of %s from %s"
-msgstr "DĂ©marrage du transfert de %s depuis %s."
-
-#: ../src/ft.c:631
-#, c-format
-msgid "Transfer of file %s complete"
-msgstr "Transfert du fichier « %s » terminé"
-
-#: ../src/ft.c:634
-msgid "File transfer complete"
-msgstr "Transfert de fichier terminé"
-
-#: ../src/ft.c:1023
-#, c-format
-msgid "You canceled the transfer of %s"
-msgstr "Vous avez a annulé le transfert de « %s »"
-
-#: ../src/ft.c:1028
-msgid "File transfer cancelled"
-msgstr "Transfert de fichier annulé"
-
-#: ../src/ft.c:1086
-#, c-format
-msgid "%s canceled the transfer of %s"
-msgstr "%s a annulé le transfert de « %s »"
-
-#: ../src/ft.c:1091
-#, c-format
-msgid "%s canceled the file transfer"
-msgstr "%s a annulé le transfert du fichier"
-
-#: ../src/ft.c:1148
-#, c-format
-msgid "File transfer to %s failed."
-msgstr "Échec du transfert vers %s."
-
-#: ../src/ft.c:1150
-#, c-format
-msgid "File transfer from %s failed."
-msgstr "Échec du transfert depuis %s."
-
-#: ../src/gtkaccount.c:371
-#, c-format
-msgid ""
-"<b>File:</b> %s\n"
-"<b>File size:</b> %s\n"
-"<b>Image size:</b> %dx%d"
-msgstr ""
-"<b>Fichier :</b> %s\n"
-"<b>Taille du fichier :</b> %s\n"
-"<b>Taille de l'image :</b> %dx%d"
+#: ../gtk/gaimstock.c:137
+msgid "_Alias"
+msgstr "_Alias"
+
+#. join button
+#: ../gtk/gaimstock.c:138 ../gtk/gtkblist.c:1114 ../gtk/gtkroomlist.c:285
+#: ../gtk/gtkroomlist.c:442
+msgid "_Join"
+msgstr "_Joindre"
+
+#: ../gtk/gaimstock.c:139
+msgid "Close _tabs"
+msgstr "Fermer les _onglets"
+
+#: ../gtk/gaimstock.c:140 ../gtk/gtkblist.c:998
+msgid "I_M"
+msgstr "_Message"
+
+#: ../gtk/gaimstock.c:141
+msgid "_Get Info"
+msgstr "_Récupérer les infos"
+
+#: ../gtk/gaimstock.c:142
+msgid "_Invite"
+msgstr "_Inviter"
+
+#: ../gtk/gaimstock.c:143
+msgid "_Modify"
+msgstr "_Modifier"
+
+#: ../gtk/gaimstock.c:144
+msgid "_Open Mail"
+msgstr "_Ouvrir le courrier"
+
+#. Pause button
+#: ../gtk/gaimstock.c:145 ../gtk/gtkft.c:835
+msgid "_Pause"
+msgstr "_Pause"
 
 #. Build the login options frame.
-#: ../src/gtkaccount.c:757
+#: ../gtk/gtkaccount.c:381
 msgid "Login Options"
 msgstr "Options de connexion"
 
-#: ../src/gtkaccount.c:774 ../src/gtkft.c:642
-msgid "Protocol:"
-msgstr "Protocole :"
-
-#: ../src/gtkaccount.c:853
-msgid "Password:"
-msgstr "Mot de passe :"
-
-#: ../src/gtkaccount.c:858
+#: ../gtk/gtkaccount.c:482
 msgid "Local alias:"
 msgstr "Alias local :"
 
-#: ../src/gtkaccount.c:862
-msgid "Remember password"
-msgstr "MĂ©moriser le mot de passe"
-
 #. Build the user options frame.
-#: ../src/gtkaccount.c:914
+#: ../gtk/gtkaccount.c:544
 msgid "User Options"
 msgstr "Options de l'utilisateur"
 
-#: ../src/gtkaccount.c:927
-msgid "New mail notifications"
-msgstr "Avertir des nouveaux courriers"
-
-#: ../src/gtkaccount.c:936
-msgid "Buddy icon:"
-msgstr "Icône :"
+#. Buddy icon
+#: ../gtk/gtkaccount.c:562
+msgid "Use this buddy icon for this account:"
+msgstr "Utiliser cette icône pour ce compte :"
 
 #. Build the protocol options frame.
-#: ../src/gtkaccount.c:1027
+#: ../gtk/gtkaccount.c:670
 #, c-format
 msgid "%s Options"
 msgstr "Options de %s"
 
-#: ../src/gtkaccount.c:1228
+#: ../gtk/gtkaccount.c:866
 msgid "Use Global Proxy Settings"
 msgstr "Utiliser les paramètres globaux"
 
-#: ../src/gtkaccount.c:1234
+#: ../gtk/gtkaccount.c:872
 msgid "No Proxy"
 msgstr "Pas de serveur mandataire"
 
-#: ../src/gtkaccount.c:1240
+#: ../gtk/gtkaccount.c:878
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../src/gtkaccount.c:1246
+#: ../gtk/gtkaccount.c:884
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../src/gtkaccount.c:1252
+#: ../gtk/gtkaccount.c:890
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../src/gtkaccount.c:1258 ../src/gtkprefs.c:1058
+#: ../gtk/gtkaccount.c:896 ../gtk/gtkprefs.c:1061
 msgid "Use Environmental Settings"
 msgstr "Utiliser les paramètres globaux"
 
@@ -2296,100 +1141,71 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../src/gtkaccount.c:1297
+#: ../gtk/gtkaccount.c:935
 msgid "If you look real closely"
 msgstr "Si on regarde de très près"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../src/gtkaccount.c:1300
+#: ../gtk/gtkaccount.c:938
 msgid "you can see the butterflies mating"
 msgstr "on peut voir les papillons s'accoupler"
 
-#: ../src/gtkaccount.c:1321
+#: ../gtk/gtkaccount.c:959
 msgid "Proxy Options"
 msgstr "Options du serveur mandataire"
 
-#: ../src/gtkaccount.c:1335 ../src/gtkprefs.c:1052
+#: ../gtk/gtkaccount.c:973 ../gtk/gtkprefs.c:1055
 msgid "Proxy _type:"
 msgstr "_Type :"
 
-#: ../src/gtkaccount.c:1344 ../src/gtkprefs.c:1073
+#: ../gtk/gtkaccount.c:982 ../gtk/gtkprefs.c:1076
 msgid "_Host:"
 msgstr "_Hôte :"
 
-#: ../src/gtkaccount.c:1348 ../src/gtkprefs.c:1091
+#: ../gtk/gtkaccount.c:986 ../gtk/gtkprefs.c:1094
 msgid "_Port:"
 msgstr "_Port :"
 
-#: ../src/gtkaccount.c:1356
+#: ../gtk/gtkaccount.c:994
 msgid "_Username:"
 msgstr "_Utilisateur :"
 
-#: ../src/gtkaccount.c:1362 ../src/gtkprefs.c:1128
+#: ../gtk/gtkaccount.c:1000 ../gtk/gtkprefs.c:1131
 msgid "Pa_ssword:"
 msgstr "_Mot de passe :"
 
-#: ../src/gtkaccount.c:1737
+#: ../gtk/gtkaccount.c:1397
 msgid "Add Account"
 msgstr "Ajouter un compte"
 
-#: ../src/gtkaccount.c:1739 ../src/gtkblist.c:3573
-msgid "Modify Account"
-msgstr "Modification du compte"
-
-#: ../src/gtkaccount.c:1761
+#: ../gtk/gtkaccount.c:1421
 msgid "_Basic"
 msgstr "_Basic"
 
-#: ../src/gtkaccount.c:1772
+#: ../gtk/gtkaccount.c:1432
 msgid "_Advanced"
 msgstr "_Avancé"
 
 #. Register button
-#: ../src/gtkaccount.c:1787 ../src/protocols/jabber/jabber.c:842
+#: ../gtk/gtkaccount.c:1447 ../libgaim/protocols/jabber/jabber.c:853
 msgid "Register"
 msgstr "S'enregistrer"
 
-#: ../src/gtkaccount.c:2166 ../src/gtksavedstatuses.c:293
-#, c-format
-msgid "Are you sure you want to delete %s?"
-msgstr "Êtes-vous sûr de vouloir supprimer %s ?"
-
-#: ../src/gtkaccount.c:2171 ../src/gtkpounce.c:1087 ../src/gtkrequest.c:273
-#: ../src/gtksavedstatuses.c:295
-msgid "Delete"
-msgstr "Supprimer"
-
-#: ../src/gtkaccount.c:2235 ../src/gtksavedstatuses.c:893
-#: ../src/protocols/oscar/oscar.c:2828
-msgid "Screen Name"
-msgstr "Pseudo"
-
-#: ../src/gtkaccount.c:2266
+#. add enabled / disabled
+#: ../gtk/gtkaccount.c:1918 ../gtk/gtkplugin.c:576
+#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:345
+msgid "Enabled"
+msgstr "Activé"
+
+#: ../gtk/gtkaccount.c:1926
 msgid "Protocol"
 msgstr "Protocole"
 
-#: ../src/gtkaccount.c:2590
-#, c-format
-msgid "%s%s%s%s has made %s his or her buddy%s%s"
-msgstr "%s%s%s%s a fait de %s son contact%s%s"
-
-#: ../src/gtkaccount.c:2639
-msgid "Add buddy to your list?"
-msgstr "Ajouter cet utilisateur à la liste de contacts ?"
-
-#: ../src/gtkaccount.c:2641 ../src/gtkblist.c:5050 ../src/gtkconv.c:1617
-#: ../src/gtkrequest.c:274 ../src/protocols/gg/gg.c:870
-#: ../src/protocols/oscar/oscar.c:2454
-#: ../src/protocols/sametime/sametime.c:5405 ../src/protocols/silc/chat.c:596
-msgid "Add"
-msgstr "Ajouter"
-
-#: ../src/gtkblist.c:683
+#: ../gtk/gtkblist.c:700
 msgid "Join a Chat"
 msgstr "Joindre une discussion"
 
-#: ../src/gtkblist.c:704
+#: ../gtk/gtkblist.c:721
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -2397,213 +1213,199 @@
 "Saisissez les informations appropriées à propos du salon de discussions que "
 "vous voulez joindre.\n"
 
-#: ../src/gtkblist.c:715 ../src/gtkpounce.c:523 ../src/gtkroomlist.c:377
+#: ../gtk/gtkblist.c:732 ../gtk/gtkpounce.c:523 ../gtk/gtkroomlist.c:378
 msgid "_Account:"
 msgstr "_Compte :"
 
-#: ../src/gtkblist.c:958
+#: ../gtk/gtkblist.c:995
 msgid "Get _Info"
 msgstr "_Infos"
 
-#: ../src/gtkblist.c:961 ../src/gtkstock.c:141
-msgid "I_M"
-msgstr "_Message"
-
-#: ../src/gtkblist.c:967
+#: ../gtk/gtkblist.c:1004
 msgid "_Send File"
 msgstr "Envoyer un _fichier"
 
-#: ../src/gtkblist.c:974
+#: ../gtk/gtkblist.c:1011
 msgid "Add Buddy _Pounce"
 msgstr "Ajouter une a_lerte"
 
-#: ../src/gtkblist.c:978 ../src/gtkblist.c:982 ../src/gtkblist.c:1081
-#: ../src/gtkblist.c:1104
+#: ../gtk/gtkblist.c:1015 ../gtk/gtkblist.c:1019 ../gtk/gtkblist.c:1118
+#: ../gtk/gtkblist.c:1141
 msgid "View _Log"
 msgstr "_Voir les archives"
 
-#: ../src/gtkblist.c:993
+#: ../gtk/gtkblist.c:1030
 msgid "Alias..."
 msgstr "Alias..."
 
-#: ../src/gtkblist.c:996 ../src/gtkconv.c:1614 ../src/gtkrequest.c:275
-msgid "Remove"
-msgstr "Enlever"
-
-#: ../src/gtkblist.c:1002 ../src/gtkblist.c:1089 ../src/gtkblist.c:1110
+#: ../gtk/gtkblist.c:1039 ../gtk/gtkblist.c:1126 ../gtk/gtkblist.c:1147
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../src/gtkblist.c:1004 ../src/gtkblist.c:1091 ../src/gtkblist.c:1112
+#: ../gtk/gtkblist.c:1041 ../gtk/gtkblist.c:1128 ../gtk/gtkblist.c:1149
 msgid "_Remove"
 msgstr "_Supprimer"
 
-#: ../src/gtkblist.c:1052
+#: ../gtk/gtkblist.c:1089
 msgid "Add a _Buddy"
 msgstr "_Ajouter un contact"
 
-#: ../src/gtkblist.c:1054
+#: ../gtk/gtkblist.c:1091
 msgid "Add a C_hat"
 msgstr "Ajouter une d_iscussion"
 
-#: ../src/gtkblist.c:1057
+#: ../gtk/gtkblist.c:1094
 msgid "_Delete Group"
 msgstr "_Supprimer un groupe"
 
-#: ../src/gtkblist.c:1059
+#: ../gtk/gtkblist.c:1096
 msgid "_Rename"
 msgstr "_Renommer"
 
-#. join button
-#: ../src/gtkblist.c:1077 ../src/gtkroomlist.c:285 ../src/gtkroomlist.c:441
-#: ../src/gtkstock.c:139
-msgid "_Join"
-msgstr "_Joindre"
-
-#: ../src/gtkblist.c:1079
+#: ../gtk/gtkblist.c:1116
 msgid "Auto-Join"
 msgstr "Connexion auto"
 
-#: ../src/gtkblist.c:1117 ../src/gtkblist.c:1140
+#: ../gtk/gtkblist.c:1154 ../gtk/gtkblist.c:1177
 msgid "_Collapse"
 msgstr "Re_plier"
 
-#: ../src/gtkblist.c:1145
+#: ../gtk/gtkblist.c:1182
 msgid "_Expand"
 msgstr "_Etendre"
 
-#: ../src/gtkblist.c:1391 ../src/gtkblist.c:1403 ../src/gtkblist.c:3833
-#: ../src/gtkblist.c:3843
+#: ../gtk/gtkblist.c:1428 ../gtk/gtkblist.c:1440 ../gtk/gtkblist.c:4077
+#: ../gtk/gtkblist.c:4087
 msgid "/Tools/Mute Sounds"
 msgstr "/Outils/Silencieux"
 
-#: ../src/gtkblist.c:1863 ../src/gtkconv.c:4241 ../src/gtkpounce.c:422
+#: ../gtk/gtkblist.c:1900 ../gtk/gtkconv.c:4271 ../gtk/gtkpounce.c:422
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
 "Vous n'êtes connecté à aucun compte permettant d'ajouter cet utilisateur."
 
 #. Buddies menu
-#: ../src/gtkblist.c:2437
+#: ../gtk/gtkblist.c:2474
 msgid "/_Buddies"
 msgstr "/_Contacts"
 
-#: ../src/gtkblist.c:2438
+#: ../gtk/gtkblist.c:2475
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Contacts/Envoyer un _message..."
 
-#: ../src/gtkblist.c:2439
+#: ../gtk/gtkblist.c:2476
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Contacts/_Joindre une discussion..."
 
-#: ../src/gtkblist.c:2440
+#: ../gtk/gtkblist.c:2477
 msgid "/Buddies/Get User _Info..."
 msgstr "/Contacts/Voir les _informations..."
 
-#: ../src/gtkblist.c:2441
+#: ../gtk/gtkblist.c:2478
 msgid "/Buddies/View User _Log..."
 msgstr "/Contacts/Voir les _archives..."
 
-#: ../src/gtkblist.c:2443
+#: ../gtk/gtkblist.c:2480
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Contacts/Afficher les contacts _déconnectés"
 
-#: ../src/gtkblist.c:2444
+#: ../gtk/gtkblist.c:2481
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Contacts/Afficher les groupes _vides"
 
-#: ../src/gtkblist.c:2445
+#: ../gtk/gtkblist.c:2482
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Contacts/_Afficher les informations des contacts"
 
-#: ../src/gtkblist.c:2446
+#: ../gtk/gtkblist.c:2483
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Contacts/Afficher les tem_ps d'inactivité"
 
-#: ../src/gtkblist.c:2447
+#: ../gtk/gtkblist.c:2484
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Contacts/_Trier les contacts"
 
-#: ../src/gtkblist.c:2449
+#: ../gtk/gtkblist.c:2486
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Contacts/Ajouter un _contact..."
 
-#: ../src/gtkblist.c:2450
+#: ../gtk/gtkblist.c:2487
 msgid "/Buddies/Add C_hat..."
 msgstr "/Contacts/Ajouter une _discussion..."
 
-#: ../src/gtkblist.c:2451
+#: ../gtk/gtkblist.c:2488
 msgid "/Buddies/Add _Group..."
 msgstr "/Contacts/Ajouter un _groupe..."
 
-#: ../src/gtkblist.c:2453
+#: ../gtk/gtkblist.c:2490
 msgid "/Buddies/_Quit"
 msgstr "/Contacts/_Quitter"
 
 #. Accounts menu
-#: ../src/gtkblist.c:2456
+#: ../gtk/gtkblist.c:2493
 msgid "/_Accounts"
 msgstr "/_Comptes"
 
-#: ../src/gtkblist.c:2457 ../src/gtkblist.c:5627
+#: ../gtk/gtkblist.c:2494 ../gtk/gtkblist.c:5920
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Comptes/_Modifier"
 
 #. Tools
-#: ../src/gtkblist.c:2460
+#: ../gtk/gtkblist.c:2497
 msgid "/_Tools"
 msgstr "/_Outils"
 
-#: ../src/gtkblist.c:2461
+#: ../gtk/gtkblist.c:2498
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Outils/_Alertes"
 
-#: ../src/gtkblist.c:2462
+#: ../gtk/gtkblist.c:2499
 msgid "/Tools/Plu_gins"
 msgstr "/Outils/Plu_gins"
 
-#: ../src/gtkblist.c:2463
+#: ../gtk/gtkblist.c:2500
 msgid "/Tools/Pr_eferences"
 msgstr "/Outils/_Préférences"
 
-#: ../src/gtkblist.c:2464
+#: ../gtk/gtkblist.c:2501
 msgid "/Tools/Pr_ivacy"
 msgstr "/Outils/_Filtres"
 
-#: ../src/gtkblist.c:2466
+#: ../gtk/gtkblist.c:2503
 msgid "/Tools/_File Transfers"
 msgstr "/Outils/_Transferts de fichier"
 
-#: ../src/gtkblist.c:2467
+#: ../gtk/gtkblist.c:2504
 msgid "/Tools/R_oom List"
 msgstr "/Outils/_Liste des salons de discussion"
 
-#: ../src/gtkblist.c:2468
+#: ../gtk/gtkblist.c:2505
 msgid "/Tools/System _Log"
 msgstr "/Outils/Voir les archives s_ystème"
 
-#: ../src/gtkblist.c:2470
+#: ../gtk/gtkblist.c:2507
 msgid "/Tools/Mute _Sounds"
 msgstr "/Outils/_Silencieux"
 
 #. Help
-#: ../src/gtkblist.c:2473
+#: ../gtk/gtkblist.c:2510
 msgid "/_Help"
 msgstr "/_Aide"
 
-#: ../src/gtkblist.c:2474
+#: ../gtk/gtkblist.c:2511
 msgid "/Help/Online _Help"
 msgstr "/Aide/_Aide en ligne"
 
-#: ../src/gtkblist.c:2475
+#: ../gtk/gtkblist.c:2512
 msgid "/Help/_Debug Window"
 msgstr "/Aide/FenĂŞtre de _debug"
 
-#: ../src/gtkblist.c:2476
+#: ../gtk/gtkblist.c:2513
 msgid "/Help/_About"
 msgstr "/Aide/_A propos de"
 
-#: ../src/gtkblist.c:2508 ../src/gtkblist.c:2577
+#: ../gtk/gtkblist.c:2545 ../gtk/gtkblist.c:2614
 #, c-format
 msgid ""
 "\n"
@@ -2612,7 +1414,7 @@
 "\n"
 "<b>Compte :</b> %s"
 
-#: ../src/gtkblist.c:2589
+#: ../gtk/gtkblist.c:2626
 #, c-format
 msgid ""
 "\n"
@@ -2621,7 +1423,7 @@
 "\n"
 "<b>Alias du contact :</b> %s"
 
-#: ../src/gtkblist.c:2601
+#: ../gtk/gtkblist.c:2638
 #, c-format
 msgid ""
 "\n"
@@ -2630,7 +1432,7 @@
 "\n"
 "<b>Pseudonyme :</b> %s"
 
-#: ../src/gtkblist.c:2610
+#: ../gtk/gtkblist.c:2647
 #, c-format
 msgid ""
 "\n"
@@ -2639,7 +1441,7 @@
 "\n"
 "<b>Connexion :</b> %s"
 
-#: ../src/gtkblist.c:2621
+#: ../gtk/gtkblist.c:2658
 #, c-format
 msgid ""
 "\n"
@@ -2648,7 +1450,7 @@
 "\n"
 "<b>Inactif :</b> %s"
 
-#: ../src/gtkblist.c:2656
+#: ../gtk/gtkblist.c:2693
 #, c-format
 msgid ""
 "\n"
@@ -2657,7 +1459,7 @@
 "\n"
 "<b>Vu récemment :</b> il y a %s"
 
-#: ../src/gtkblist.c:2665
+#: ../gtk/gtkblist.c:2702
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2665,7 +1467,7 @@
 "\n"
 "<b>État :</b> Déconnecté"
 
-#: ../src/gtkblist.c:2676
+#: ../gtk/gtkblist.c:2713
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2673,7 +1475,7 @@
 "\n"
 "<b>Description :</b> Bizarre"
 
-#: ../src/gtkblist.c:2678
+#: ../gtk/gtkblist.c:2715
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
@@ -2681,7 +1483,7 @@
 "\n"
 "<b>État :</b> Fabuleux"
 
-#: ../src/gtkblist.c:2680
+#: ../gtk/gtkblist.c:2717
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
@@ -2689,120 +1491,147 @@
 "\n"
 "<b>État :</b> Génial"
 
-#: ../src/gtkblist.c:2975
+#: ../gtk/gtkblist.c:3184 ../gtk/gtkstatusbox.c:941
+#: ../gtk/plugins/docklet/docklet.c:447 ../libgaim/protocols/gg/gg.c:993
+#: ../libgaim/protocols/jabber/buddy.c:1365
+#: ../libgaim/protocols/novell/novell.c:2865
+#: ../libgaim/protocols/oscar/oscar.c:769
+#: ../libgaim/protocols/oscar/oscar.c:5445
+#: ../libgaim/protocols/yahoo/yahoo.c:2883 ../libgaim/status.c:154
+msgid "Offline"
+msgstr "Déconnecté"
+
+#: ../gtk/gtkblist.c:3200
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Inactif %dh %02dm"
 
-#: ../src/gtkblist.c:2977
+#: ../gtk/gtkblist.c:3202
 #, c-format
 msgid "Idle %dm"
 msgstr "Inactif %dm"
 
 #. Idle stuff
-#: ../src/gtkblist.c:2980 ../src/gtkprefs.c:1760
-#: ../src/protocols/bonjour/bonjour.c:333 ../src/protocols/jabber/buddy.c:641
-#: ../src/protocols/jabber/buddy.c:672 ../src/protocols/msn/msn.c:548
-#: ../src/protocols/msn/state.c:32 ../src/protocols/novell/novell.c:2852
-#: ../src/protocols/oscar/oscar.c:2849 ../src/protocols/yahoo/yahoo.c:2744
-#: ../src/protocols/yahoo/yahoo_profile.c:691
+#: ../gtk/gtkblist.c:3205 ../gtk/gtkprefs.c:1765
+#: ../libgaim/protocols/bonjour/bonjour.c:333
+#: ../libgaim/protocols/jabber/buddy.c:635
+#: ../libgaim/protocols/jabber/buddy.c:668 ../libgaim/protocols/msn/msn.c:548
+#: ../libgaim/protocols/msn/state.c:32
+#: ../libgaim/protocols/novell/novell.c:2862
+#: ../libgaim/protocols/oscar/oscar.c:2824
+#: ../libgaim/protocols/yahoo/yahoo.c:2881
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:691
 msgid "Idle"
 msgstr "Inactif"
 
-#: ../src/gtkblist.c:3113
+#: ../gtk/gtkblist.c:3333
 msgid "/Buddies/New Instant Message..."
 msgstr "/Contacts/Envoyer un _message..."
 
-#: ../src/gtkblist.c:3114 ../src/gtkblist.c:3147
+#: ../gtk/gtkblist.c:3334 ../gtk/gtkblist.c:3367
 msgid "/Buddies/Join a Chat..."
 msgstr "/Contacts/Joindre une discussion..."
 
-#: ../src/gtkblist.c:3115
+#: ../gtk/gtkblist.c:3335
 msgid "/Buddies/Get User Info..."
 msgstr "/Contacts/Voir les _informations..."
 
-#: ../src/gtkblist.c:3116
+#: ../gtk/gtkblist.c:3336
 msgid "/Buddies/Add Buddy..."
 msgstr "/Contacts/_Ajouter un contact..."
 
-#: ../src/gtkblist.c:3117 ../src/gtkblist.c:3150
+#: ../gtk/gtkblist.c:3337 ../gtk/gtkblist.c:3370
 msgid "/Buddies/Add Chat..."
 msgstr "/Contacts/Ajouter une _discussion..."
 
-#: ../src/gtkblist.c:3118
+#: ../gtk/gtkblist.c:3338
 msgid "/Buddies/Add Group..."
 msgstr "/Contacts/Ajouter un _groupe..."
 
-#: ../src/gtkblist.c:3153
+#: ../gtk/gtkblist.c:3373
 msgid "/Tools/Buddy Pounces"
 msgstr "/Outils/Alertes"
 
-#: ../src/gtkblist.c:3156
+#: ../gtk/gtkblist.c:3376
 msgid "/Tools/Privacy"
 msgstr "/Outils/Filtres"
 
-#: ../src/gtkblist.c:3159
+#: ../gtk/gtkblist.c:3379
 msgid "/Tools/Room List"
 msgstr "/Outils/Liste des salons"
 
-#: ../src/gtkblist.c:3353
+#: ../gtk/gtkblist.c:3475 ../gtk/plugins/docklet/docklet.c:157
+#, c-format
+msgid "%d unread message from %s\n"
+msgid_plural "%d unread messages from %s\n"
+msgstr[0] "%d message non lu de %s\n"
+msgstr[1] "%d messages non lus de %s\n"
+
+#: ../gtk/gtkblist.c:3551
 msgid "Manually"
 msgstr "Manuel"
 
-#: ../src/gtkblist.c:3355
+#: ../gtk/gtkblist.c:3553
 msgid "Alphabetically"
 msgstr "Alphabétique"
 
-#: ../src/gtkblist.c:3356
+#: ../gtk/gtkblist.c:3554
 msgid "By status"
 msgstr "Par Ă©tat"
 
-#: ../src/gtkblist.c:3357
+#: ../gtk/gtkblist.c:3555
 msgid "By log size"
 msgstr "Par la taille des archives"
 
-#: ../src/gtkblist.c:3565 ../src/gtkconn.c:186
+#: ../gtk/gtkblist.c:3763 ../gtk/gtkconn.c:186
 #, c-format
 msgid "%s disconnected"
 msgstr "DĂ©connexion de %s"
 
-#: ../src/gtkblist.c:3574 ../src/protocols/sametime/sametime.c:3622
+#: ../gtk/gtkblist.c:3772 ../libgaim/protocols/sametime/sametime.c:3618
 msgid "Connect"
 msgstr "Connecter"
 
-#: ../src/gtkblist.c:3574
+#: ../gtk/gtkblist.c:3772
 msgid "Re-enable Account"
 msgstr "RĂ©activer le compte"
 
-#: ../src/gtkblist.c:3595
+#: ../gtk/gtkblist.c:3793
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s déconnecté : %s</span>"
 
-#: ../src/gtkblist.c:3722
+#: ../gtk/gtkblist.c:3922
 msgid "/Accounts"
 msgstr "/Comptes"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../src/gtkblist.c:3827
+#: ../gtk/gtkblist.c:4071
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Contacts/Afficher les contacts _déconnectés"
 
-#: ../src/gtkblist.c:3830
+#: ../gtk/gtkblist.c:4074
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Contacts/Ajouter les groupes vides"
 
-#: ../src/gtkblist.c:3836
+#: ../gtk/gtkblist.c:4080
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Contacts/Afficher les informations des contacts"
 
-#: ../src/gtkblist.c:3839
+#: ../gtk/gtkblist.c:4083
 msgid "/Buddies/Show Idle Times"
 msgstr "/Contacts/Afficher les temps d'inactivité"
 
-#: ../src/gtkblist.c:4587
+#: ../gtk/gtkblist.c:4739 ../gtk/plugins/gevolution/gevolution.c:96
+#: ../gtk/plugins/gevolution/gevo-util.c:64 ../libgaim/blist.c:516
+#: ../libgaim/blist.c:1281 ../libgaim/blist.c:1508
+#: ../libgaim/protocols/jabber/roster.c:67
+msgid "Buddies"
+msgstr "Contacts"
+
+#: ../gtk/gtkblist.c:4873
 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. "
@@ -2812,20 +1641,17 @@
 "contacts. Vous pouvez choisir un alias ou surnom pour le contact. L'alias "
 "sera affiché à la place du pseudo chaque fois que cela est possible.\n"
 
-#: ../src/gtkblist.c:4630 ../src/gtkblist.c:4995
-msgid "Alias:"
-msgstr "Alias :"
-
-#. Set up stuff for the account box
-#: ../src/gtkblist.c:4657 ../src/gtkblist.c:4975
-msgid "Account:"
-msgstr "Compte :"
-
-#: ../src/gtkblist.c:4908
+#: ../gtk/gtkblist.c:4933 ../gtk/gtkblist.c:5296
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:549
+#: ../gtk/plugins/gevolution/new_person_dialog.c:307
+msgid "Group:"
+msgstr "Groupe :"
+
+#: ../gtk/gtkblist.c:5194
 msgid "This protocol does not support chat rooms."
 msgstr "Les salons de discussions ne sont pas supportés par ce protocole."
 
-#: ../src/gtkblist.c:4924
+#: ../gtk/gtkblist.c:5210
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -2833,11 +1659,7 @@
 "Vous n'avez pas de protocole disponible vous permettant de joindre des "
 "groupes de discussion."
 
-#: ../src/gtkblist.c:4941
-msgid "Add Chat"
-msgstr "Ajouter discussion"
-
-#: ../src/gtkblist.c:4965
+#: ../gtk/gtkblist.c:5251
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2845,40 +1667,35 @@
 "Saisissez un alias et les informations nécessaires pour le groupe de "
 "discussion que vous voulez ajouter dans la liste de contacts.\n"
 
-#: ../src/gtkblist.c:5047 ../src/protocols/sametime/sametime.c:5316
-#: ../src/protocols/sametime/sametime.c:5403
-msgid "Add Group"
-msgstr "Nouveau groupe"
-
-#: ../src/gtkblist.c:5048
+#: ../gtk/gtkblist.c:5334
 msgid "Please enter the name of the group to be added."
 msgstr "Saisissez le nom du groupe Ă  ajouter"
 
-#: ../src/gtkblist.c:5667
+#: ../gtk/gtkblist.c:5960
 msgid "_Edit Account"
 msgstr "Modifier le _compte"
 
-#: ../src/gtkblist.c:5700 ../src/gtkblist.c:5706 ../src/gtkconv.c:2743
+#: ../gtk/gtkblist.c:5993 ../gtk/gtkblist.c:5999 ../gtk/gtkconv.c:2775
 msgid "No actions available"
 msgstr "Aucune action disponible"
 
-#: ../src/gtkblist.c:5714
+#: ../gtk/gtkblist.c:6007
 msgid "_Disable"
 msgstr "_Désactivé"
 
-#: ../src/gtkblist.c:5726
+#: ../gtk/gtkblist.c:6019
 msgid "Enable Account"
 msgstr "Activer le compte"
 
-#: ../src/gtkblist.c:5779
+#: ../gtk/gtkblist.c:6072
 msgid "/Tools"
 msgstr "/Outils"
 
-#: ../src/gtkblist.c:5865
+#: ../gtk/gtkblist.c:6158
 msgid "/Buddies/Sort Buddies"
 msgstr "/Contacts/Trier les contacts"
 
-#: ../src/gtkconn.c:187
+#: ../gtk/gtkconn.c:187
 #, c-format
 msgid ""
 "%s was disconnected due to an error: %s\n"
@@ -2889,65 +1706,22 @@
 "Gaim n'essaiera pas de se reconnecter avec ce compte tant que cette erreur "
 "ne sera pas corrigée et que vous ne réactiviez pas le compte."
 
-#: ../src/gtkconv.c:366
-msgid "Supported debug options are:  version"
-msgstr "Les options de debuggage supportées sont : version"
-
-#: ../src/gtkconv.c:402
-msgid "No such command (in this context)."
-msgstr "Cette commande n'existe pas dans ce contexte."
-
-#: ../src/gtkconv.c:405
-msgid ""
-"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
-"The following commands are available in this context:\n"
-msgstr ""
-"Utilisez « /help &lt;commande&gt; » pour obtenir de l'aide pour une commande "
-"spécifique.\n"
-"Les commandes actuellement disponibles sont :\n"
-
-#: ../src/gtkconv.c:472
-msgid "No such command."
-msgstr "Cette commande n'existe pas."
-
-#: ../src/gtkconv.c:479
-msgid "Syntax Error:  You typed the wrong number of arguments to that command."
-msgstr "Erreur de syntaxe : mauvais nombre d'arguments pour cette commande."
-
-#: ../src/gtkconv.c:484
-msgid "Your command failed for an unknown reason."
-msgstr "La commande a échoué pour une raison inconnue."
-
-#: ../src/gtkconv.c:490
-msgid "That command only works in chats, not IMs."
-msgstr ""
-"Cette commande fonctionne uniquement dans les discussions, pas les messages."
-
-#: ../src/gtkconv.c:493
-msgid "That command only works in IMs, not chats."
-msgstr ""
-"Cette commande fonctionne uniquement dans les messages, pas les discussions."
-
-#: ../src/gtkconv.c:497
-msgid "That command doesn't work on this protocol."
-msgstr "Cette commande ne fonctionne pas avec ce protocole."
-
-#: ../src/gtkconv.c:732 ../src/gtkconv.c:758
+#: ../gtk/gtkconv.c:738 ../gtk/gtkconv.c:764
 msgid "That buddy is not on the same protocol as this chat."
 msgstr ""
 "Ce contact n'utilise pas le mĂŞme protocole que ce salon de discussions."
 
-#: ../src/gtkconv.c:752
+#: ../gtk/gtkconv.c:758
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "Vous n'êtes connecté à aucun compte permettant d'inviter ce contact."
 
-#: ../src/gtkconv.c:805
+#: ../gtk/gtkconv.c:811
 msgid "Invite Buddy Into Chat Room"
 msgstr "Inviter le contact dans une discussion"
 
 #. Put our happy label in it.
-#: ../src/gtkconv.c:835
+#: ../gtk/gtkconv.c:841
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2955,690 +1729,692 @@
 "Saisissez le nom de l'utilisateur que vous voulez inviter dans la "
 "discussion, ainsi qu'un message optionnel d'invitation."
 
-#: ../src/gtkconv.c:856
+#: ../gtk/gtkconv.c:862
 msgid "_Buddy:"
 msgstr "_Contact :"
 
-#: ../src/gtkconv.c:876 ../src/gtksavedstatuses.c:1111
-#: ../src/gtksavedstatuses.c:1447
+#: ../gtk/gtkconv.c:882 ../gtk/gtksavedstatuses.c:1111
+#: ../gtk/gtksavedstatuses.c:1447
 msgid "_Message:"
 msgstr "_Message :"
 
-#: ../src/gtkconv.c:933 ../src/gtkconv.c:2360 ../src/gtkdebug.c:217
-#: ../src/gtkft.c:490
+#: ../gtk/gtkconv.c:939 ../gtk/gtkconv.c:2392 ../gtk/gtkdebug.c:218
+#: ../gtk/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Impossible d'ouvrir le fichier"
 
-#: ../src/gtkconv.c:939
+#: ../gtk/gtkconv.c:945
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversation avec %s</h1>\n"
 
-#: ../src/gtkconv.c:963
+#: ../gtk/gtkconv.c:969
 msgid "Save Conversation"
 msgstr "Sauver la conversation"
 
-#: ../src/gtkconv.c:1084 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
+#: ../gtk/gtkconv.c:1116 ../gtk/gtkdebug.c:166 ../gtk/gtkdebug.c:756
 msgid "Find"
 msgstr "Chercher"
 
-#: ../src/gtkconv.c:1110 ../src/gtkdebug.c:193
+#: ../gtk/gtkconv.c:1142 ../gtk/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "_Chercher : "
 
-#: ../src/gtkconv.c:1281
+#: ../gtk/gtkconv.c:1313
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Archives démarrées. Les nouveaux messages de cette conversation seront "
 "archivés."
 
-#: ../src/gtkconv.c:1289
+#: ../gtk/gtkconv.c:1321
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "Archives arrêtées. Les nouveaux messages de cette conversation ne seront pas "
 "archivés."
 
-#: ../src/gtkconv.c:1554
-msgid "IM"
-msgstr "Message"
-
-#: ../src/gtkconv.c:1565 ../src/protocols/oscar/oscar.c:640
-msgid "Send File"
-msgstr "Envoyer un fichier"
-
-#: ../src/gtkconv.c:1580
+#: ../gtk/gtkconv.c:1589
 msgid "Un-Ignore"
 msgstr "Ne plus ignorer"
 
-#: ../src/gtkconv.c:1583
+#: ../gtk/gtkconv.c:1592
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: ../src/gtkconv.c:1593
-msgid "Info"
-msgstr "Info"
-
-#: ../src/gtkconv.c:1603
+#: ../gtk/gtkconv.c:1612
 msgid "Get Away Message"
 msgstr "Récupérer le message d'absence"
 
-#: ../src/gtkconv.c:1626
+#: ../gtk/gtkconv.c:1635
 msgid "Last said"
 msgstr "Dernières paroles"
 
-#: ../src/gtkconv.c:2368
+#: ../gtk/gtkconv.c:2400
 msgid "Unable to save icon file to disk."
 msgstr "Impossible de sauver l'icĂ´ne sur le disque"
 
-#: ../src/gtkconv.c:2392
+#: ../gtk/gtkconv.c:2424
 msgid "Save Icon"
 msgstr "Enregistrer l'icĂ´ne"
 
-#: ../src/gtkconv.c:2441
+#: ../gtk/gtkconv.c:2473
 msgid "Animate"
 msgstr "Animer"
 
-#: ../src/gtkconv.c:2446
+#: ../gtk/gtkconv.c:2478
 msgid "Hide Icon"
 msgstr "Cacher l'icĂ´ne"
 
-#: ../src/gtkconv.c:2452
+#: ../gtk/gtkconv.c:2484
 msgid "Save Icon As..."
 msgstr "Enregistrer l'icĂ´ne sous..."
 
 #. Conversation menu
-#: ../src/gtkconv.c:2592
+#: ../gtk/gtkconv.c:2624
 msgid "/_Conversation"
 msgstr "/_Conversation"
 
-#: ../src/gtkconv.c:2594
+#: ../gtk/gtkconv.c:2626
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversation/Envoyer un _message..."
 
-#: ../src/gtkconv.c:2599
+#: ../gtk/gtkconv.c:2631
 msgid "/Conversation/_Find..."
 msgstr "/Conversation/_Chercher..."
 
-#: ../src/gtkconv.c:2601
+#: ../gtk/gtkconv.c:2633
 msgid "/Conversation/View _Log"
 msgstr "/Conversation/Voir les _archives"
 
-#: ../src/gtkconv.c:2602
+#: ../gtk/gtkconv.c:2634
 msgid "/Conversation/_Save As..."
 msgstr "/Conversation/Enregistrer _sous..."
 
-#: ../src/gtkconv.c:2604
+#: ../gtk/gtkconv.c:2636
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversation/_Effacer la conversation"
 
-#: ../src/gtkconv.c:2608
+#: ../gtk/gtkconv.c:2640
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversation/Envoyer un _fichier..."
 
-#: ../src/gtkconv.c:2609
+#: ../gtk/gtkconv.c:2641
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversation/Ajouter une alerte..."
 
-#: ../src/gtkconv.c:2611
+#: ../gtk/gtkconv.c:2643
 msgid "/Conversation/_Get Info"
 msgstr "/Conversation/Voir les _informations"
 
-#: ../src/gtkconv.c:2613
+#: ../gtk/gtkconv.c:2645
 msgid "/Conversation/In_vite..."
 msgstr "/Conversation/In_viter..."
 
-#: ../src/gtkconv.c:2615
+#: ../gtk/gtkconv.c:2647
 msgid "/Conversation/M_ore"
 msgstr "/Conversation/_Plus"
 
-#: ../src/gtkconv.c:2619
+#: ../gtk/gtkconv.c:2651
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversation/_Donner un alias..."
 
-#: ../src/gtkconv.c:2621
+#: ../gtk/gtkconv.c:2653
 msgid "/Conversation/_Block..."
 msgstr "/Conversation/_Bloquer..."
 
-#: ../src/gtkconv.c:2623
+#: ../gtk/gtkconv.c:2655
 msgid "/Conversation/_Add..."
 msgstr "/Conversation/_Ajouter..."
 
-#: ../src/gtkconv.c:2625
+#: ../gtk/gtkconv.c:2657
 msgid "/Conversation/_Remove..."
 msgstr "/Conversation/_Supprimer..."
 
-#: ../src/gtkconv.c:2630
+#: ../gtk/gtkconv.c:2662
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversation/Insérer un _lien..."
 
-#: ../src/gtkconv.c:2632
+#: ../gtk/gtkconv.c:2664
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversation/Insérer une _image..."
 
-#: ../src/gtkconv.c:2637
+#: ../gtk/gtkconv.c:2669
 msgid "/Conversation/_Close"
 msgstr "/Conversation/_Fermer"
 
 #. Options
-#: ../src/gtkconv.c:2641
+#: ../gtk/gtkconv.c:2673
 msgid "/_Options"
 msgstr "/_Options"
 
-#: ../src/gtkconv.c:2642
+#: ../gtk/gtkconv.c:2674
 msgid "/Options/Enable _Logging"
 msgstr "/Options/Activer l'_archivage"
 
-#: ../src/gtkconv.c:2643
+#: ../gtk/gtkconv.c:2675
 msgid "/Options/Enable _Sounds"
 msgstr "/Options/Activer les _sons"
 
-#: ../src/gtkconv.c:2644
+#: ../gtk/gtkconv.c:2676
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Options/Afficher les _icĂ´nes des contacts"
 
-#: ../src/gtkconv.c:2646
+#: ../gtk/gtkconv.c:2678
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Options/Afficher la _barre de style"
 
-#: ../src/gtkconv.c:2647
+#: ../gtk/gtkconv.c:2679
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Options/Afficher l'_horodatage"
 
-#: ../src/gtkconv.c:2722
+#: ../gtk/gtkconv.c:2754
 msgid "/Conversation/More"
 msgstr "/Conversation/Plus"
 
-#: ../src/gtkconv.c:2760 ../src/gtkconv.c:2787
+#: ../gtk/gtkconv.c:2792 ../gtk/gtkconv.c:2819
 msgid "/Conversation"
 msgstr "/Conversation"
 
-#: ../src/gtkconv.c:2797
+#: ../gtk/gtkconv.c:2829
 msgid "/Conversation/View Log"
 msgstr "/Conversation/Voir les _archives"
 
-#: ../src/gtkconv.c:2803
+#: ../gtk/gtkconv.c:2835
 msgid "/Conversation/Send File..."
 msgstr "/Conversation/Envoyer un fichier..."
 
-#: ../src/gtkconv.c:2807
+#: ../gtk/gtkconv.c:2839
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversation/Ajouter une alerte..."
 
-#: ../src/gtkconv.c:2813
+#: ../gtk/gtkconv.c:2845
 msgid "/Conversation/Get Info"
 msgstr "/Conversation/Voir les informations"
 
-#: ../src/gtkconv.c:2817
+#: ../gtk/gtkconv.c:2849
 msgid "/Conversation/Invite..."
 msgstr "/Conversation/Inviter..."
 
-#: ../src/gtkconv.c:2823
+#: ../gtk/gtkconv.c:2855
 msgid "/Conversation/Alias..."
 msgstr "/Conversation/Donner un alias..."
 
-#: ../src/gtkconv.c:2827
+#: ../gtk/gtkconv.c:2859
 msgid "/Conversation/Block..."
 msgstr "/Conversation/Bloquer..."
 
-#: ../src/gtkconv.c:2831
+#: ../gtk/gtkconv.c:2863
 msgid "/Conversation/Add..."
 msgstr "/Conversation/Ajouter..."
 
-#: ../src/gtkconv.c:2835
+#: ../gtk/gtkconv.c:2867
 msgid "/Conversation/Remove..."
 msgstr "/Conversation/Supprimer..."
 
-#: ../src/gtkconv.c:2841
+#: ../gtk/gtkconv.c:2873
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversation/Insérer un _lien..."
 
-#: ../src/gtkconv.c:2845
+#: ../gtk/gtkconv.c:2877
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversation/Insérer une _image..."
 
-#: ../src/gtkconv.c:2851
+#: ../gtk/gtkconv.c:2883
 msgid "/Options/Enable Logging"
 msgstr "/Options/Activer l'_archivage"
 
-#: ../src/gtkconv.c:2854
+#: ../gtk/gtkconv.c:2886
 msgid "/Options/Enable Sounds"
 msgstr "/Options/Activer les _sons"
 
-#: ../src/gtkconv.c:2867
+#: ../gtk/gtkconv.c:2899
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Options/Afficher la barre de style"
 
-#: ../src/gtkconv.c:2870
+#: ../gtk/gtkconv.c:2902
 msgid "/Options/Show Timestamps"
 msgstr "/Options/Afficher l'horodatage"
 
-#: ../src/gtkconv.c:2873
+#: ../gtk/gtkconv.c:2905
 msgid "/Options/Show Buddy Icon"
 msgstr "/Options/Afficher les icĂ´nes des contacts"
 
-#: ../src/gtkconv.c:2949
+#: ../gtk/gtkconv.c:2981
 msgid "User is typing..."
 msgstr "L'utilisateur est en train d'Ă©crire..."
 
-#: ../src/gtkconv.c:2952
+#: ../gtk/gtkconv.c:2984
 msgid "User has typed something and stopped"
 msgstr "L'utilisateur a écrit quelque chose et s'est arrêté"
 
 #. Build the Send To menu
-#: ../src/gtkconv.c:3135
+#: ../gtk/gtkconv.c:3167
 msgid "_Send To"
 msgstr "_Envoyer vers"
 
-#: ../src/gtkconv.c:3841
+#: ../gtk/gtkconv.c:3869
 msgid "_Send"
 msgstr "_Envoyer"
 
-#: ../src/gtkconv.c:3895 ../src/protocols/sametime/sametime.c:3564
+#: ../gtk/gtkconv.c:3923 ../libgaim/protocols/sametime/sametime.c:3560
 msgid "Topic:"
 msgstr "Sujet :"
 
 #. Setup the label telling how many people are in the room.
-#: ../src/gtkconv.c:3947
+#: ../gtk/gtkconv.c:3975
 msgid "0 people in room"
 msgstr "Personne dans ce salon"
 
-#: ../src/gtkconv.c:4996 ../src/gtkconv.c:5115
+#: ../gtk/gtkconv.c:5022 ../gtk/gtkconv.c:5143
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d personne dans le salon"
 msgstr[1] "%d personnes dans le salon"
 
-#: ../src/gtkconv.c:5661 ../src/gtkstatusbox.c:366
+#: ../gtk/gtkconv.c:5696 ../gtk/gtkstatusbox.c:548
 msgid "Typing"
 msgstr "En train d'Ă©crire"
 
-#: ../src/gtkconv.c:5667
+#: ../gtk/gtkconv.c:5702
 msgid "Stopped Typing"
 msgstr "S'arrĂŞte d'Ă©crire"
 
-#: ../src/gtkconv.c:5672
+#: ../gtk/gtkconv.c:5707
 msgid "Nick Said"
 msgstr "Votre pseudonyme apparaît"
 
-#: ../src/gtkconv.c:5682
+#: ../gtk/gtkconv.c:5712 ../gtk/plugins/docklet/docklet.c:489
+msgid "Unread Messages"
+msgstr "Messages non lus"
+
+#: ../gtk/gtkconv.c:5717
 msgid "New Event"
 msgstr "Nouvel événement"
 
-#: ../src/gtkconv.c:6584
-msgid ""
-"say &lt;message&gt;:  Send a message normally as if you weren't using a "
-"command."
-msgstr ""
-"say &lt;message&gt; : Envoyer un message comme si les commandes étaient "
-"désactivées."
-
-#: ../src/gtkconv.c:6587
-msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr ""
-"me &lt;action&gt; : Envoyer une action à la IRC à un contact ou discussion."
-
-#: ../src/gtkconv.c:6590
-msgid ""
-"debug &lt;option&gt;:  Send various debug information to the current "
-"conversation."
-msgstr ""
-"debug &lt;option&gt; : Mettre en place des options de debogage dans la "
-"conversation courante."
-
-#: ../src/gtkconv.c:6593
-msgid "clear: Clears the conversation scrollback."
-msgstr "clear : Efface le contenu de la fenêtre de dialogue."
-
-#: ../src/gtkconv.c:6596
-msgid "help &lt;command&gt;:  Help on a specific command."
-msgstr ""
-"help &lt;commande&gt; : Demander de l'aide sur une commande particulière."
-
-#: ../src/gtkconv.c:6755
+#: ../gtk/gtkconv.c:6812
 msgid "Confirm close"
 msgstr "Confirmer la fermeture"
 
-#: ../src/gtkconv.c:6787
+#: ../gtk/gtkconv.c:6844
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr ""
 "Vous n'avez pas lu certains messages. Êtes-vous sûr de vouloir fermer la "
 "fenêtre ?"
 
-#: ../src/gtkconv.c:7309
+#: ../gtk/gtkconv.c:7366
 msgid "Close other tabs"
 msgstr "Fermer les autres onglets"
 
-#: ../src/gtkconv.c:7315
+#: ../gtk/gtkconv.c:7372
 msgid "Close all tabs"
 msgstr "Fermer tous les onglets"
 
-#: ../src/gtkconv.c:7323
+#: ../gtk/gtkconv.c:7380
 msgid "Detach this tab"
 msgstr "DĂ©tacher cet onglet"
 
-#: ../src/gtkconv.c:7329
+#: ../gtk/gtkconv.c:7386
 msgid "Close this tab"
 msgstr "Fermer cet onglet"
 
-#: ../src/gtkconv.c:7589
+#: ../gtk/gtkconv.c:7651
 msgid "Close conversation"
 msgstr "Fermer la conversation"
 
-#: ../src/gtkconv.c:8053
+#: ../gtk/gtkconv.c:8115
 msgid "Last created window"
 msgstr "Dernière fenêtre ouverte"
 
-#: ../src/gtkconv.c:8055
+#: ../gtk/gtkconv.c:8117
 msgid "Separate IM and Chat windows"
 msgstr "SĂ©parer les messages et les discussions"
 
-#: ../src/gtkconv.c:8057 ../src/gtkprefs.c:1258
+#: ../gtk/gtkconv.c:8119 ../gtk/gtkprefs.c:1263
 msgid "New window"
 msgstr "Nouvelle fenĂŞtre"
 
-#: ../src/gtkconv.c:8059
+#: ../gtk/gtkconv.c:8121
 msgid "By group"
 msgstr "Par groupe"
 
-#: ../src/gtkconv.c:8061
+#: ../gtk/gtkconv.c:8123
 msgid "By account"
 msgstr "Par compte"
 
-#: ../src/gtkdebug.c:232
+#: ../gtk/gtkdebug.c:233
 msgid "Save Debug Log"
 msgstr "Enregistrer les archives de debogage"
 
-#: ../src/gtkdebug.c:586
+#: ../gtk/gtkdebug.c:594
 msgid "Invert"
 msgstr "Inverser"
 
-#: ../src/gtkdebug.c:589
+#: ../gtk/gtkdebug.c:597
 msgid "Highlight matches"
 msgstr "Surligner les occurrences"
 
-#: ../src/gtkdebug.c:636
-msgid "Debug Window"
-msgstr "FenĂŞtre de debug"
-
-#: ../src/gtkdebug.c:689
+#: ../gtk/gtkdebug.c:664
+msgid "_Icon Only"
+msgstr "_IcĂ´ne seulement"
+
+#: ../gtk/gtkdebug.c:665
+msgid "_Text Only"
+msgstr "_Texte seulement"
+
+#: ../gtk/gtkdebug.c:666
+msgid "_Both Icon & Text"
+msgstr "_A la fois texte et icĂ´ne"
+
+#: ../gtk/gtkdebug.c:767
 msgid "Clear"
 msgstr "Effacer"
 
-#: ../src/gtkdebug.c:698
+#: ../gtk/gtkdebug.c:776
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/gtkdebug.c:705 ../src/gtkdebug.c:706
+#: ../gtk/gtkdebug.c:783 ../gtk/gtkdebug.c:784
 msgid "Timestamps"
 msgstr "Horodatage"
 
-#: ../src/gtkdebug.c:724
+#: ../gtk/gtkdebug.c:802
 msgid "Filter"
 msgstr "Filtre"
 
-#: ../src/gtkdebug.c:743
+#: ../gtk/gtkdebug.c:821
 msgid "Right click for more options."
 msgstr "Clic droit pour afficher plus d'options."
 
-#: ../src/gtkdialogs.c:61 ../src/gtkdialogs.c:104
+#: ../gtk/gtkdebug.c:851
+msgid "Level "
+msgstr "Niveau "
+
+#: ../gtk/gtkdebug.c:852 ../gtk/gtkdebug.c:858
+msgid "Select the debug filter level."
+msgstr "Choisissez le niveau de filtre de debuggage."
+
+#: ../gtk/gtkdebug.c:860
+msgid "All"
+msgstr "Tout"
+
+#: ../gtk/gtkdebug.c:861
+msgid "Misc"
+msgstr "Divers"
+
+#: ../gtk/gtkdebug.c:863
+msgid "Warning"
+msgstr "Avertissement"
+
+#: ../gtk/gtkdebug.c:864
+msgid "Error "
+msgstr "Erreur"
+
+#: ../gtk/gtkdebug.c:865
+msgid "Fatal Error"
+msgstr "Erreur critique"
+
+#: ../gtk/gtkdialogs.c:66 ../gtk/gtkdialogs.c:109
 msgid "lead developer"
 msgstr "codeur principal"
 
-#: ../src/gtkdialogs.c:62 ../src/gtkdialogs.c:63 ../src/gtkdialogs.c:65
-#: ../src/gtkdialogs.c:66 ../src/gtkdialogs.c:68 ../src/gtkdialogs.c:69
-#: ../src/gtkdialogs.c:70 ../src/gtkdialogs.c:71 ../src/gtkdialogs.c:72
-#: ../src/gtkdialogs.c:73 ../src/gtkdialogs.c:75 ../src/gtkdialogs.c:76
-#: ../src/gtkdialogs.c:77
+#: ../gtk/gtkdialogs.c:67 ../gtk/gtkdialogs.c:68 ../gtk/gtkdialogs.c:69
+#: ../gtk/gtkdialogs.c:70 ../gtk/gtkdialogs.c:72 ../gtk/gtkdialogs.c:73
+#: ../gtk/gtkdialogs.c:74 ../gtk/gtkdialogs.c:75 ../gtk/gtkdialogs.c:76
+#: ../gtk/gtkdialogs.c:77 ../gtk/gtkdialogs.c:79 ../gtk/gtkdialogs.c:80
+#: ../gtk/gtkdialogs.c:81
 msgid "developer"
 msgstr "codeur"
 
-#: ../src/gtkdialogs.c:64
+#: ../gtk/gtkdialogs.c:71
+msgid "developer & webmaster"
+msgstr "codeur et webmestre"
+
+#: ../gtk/gtkdialogs.c:78
+msgid "support"
+msgstr "support"
+
+#: ../gtk/gtkdialogs.c:101
 msgid "win32 port"
 msgstr "portage win32"
 
-#: ../src/gtkdialogs.c:67
-msgid "developer & webmaster"
-msgstr "codeur et webmestre"
-
-#: ../src/gtkdialogs.c:74
-msgid "support"
-msgstr "support"
-
-#: ../src/gtkdialogs.c:97 ../src/gtkdialogs.c:98
+#: ../gtk/gtkdialogs.c:102 ../gtk/gtkdialogs.c:103
 msgid "maintainer"
 msgstr "mainteneur"
 
-#: ../src/gtkdialogs.c:99
+#: ../gtk/gtkdialogs.c:104
 msgid "libfaim maintainer"
 msgstr "mainteneur de libfaim"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../src/gtkdialogs.c:101
+#: ../gtk/gtkdialogs.c:106
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker et conducteur désigné [feignasse]"
 
-#: ../src/gtkdialogs.c:102
+#: ../gtk/gtkdialogs.c:107
 msgid "Jabber developer"
 msgstr "codeur Jabber"
 
-#: ../src/gtkdialogs.c:103
+#: ../gtk/gtkdialogs.c:108
 msgid "original author"
 msgstr "auteur original"
 
-#: ../src/gtkdialogs.c:110 ../src/gtkdialogs.c:111 ../src/gtkdialogs.c:176
+#: ../gtk/gtkdialogs.c:115
+msgid "Arabic"
+msgstr "Arabe"
+
+#: ../gtk/gtkdialogs.c:116 ../gtk/gtkdialogs.c:117 ../gtk/gtkdialogs.c:183
 msgid "Bulgarian"
 msgstr "Bulgare"
 
-#: ../src/gtkdialogs.c:112 ../src/gtkdialogs.c:113
+#: ../gtk/gtkdialogs.c:118 ../gtk/gtkdialogs.c:119
 msgid "Bengali"
 msgstr "BengalĂ®"
 
-#: ../src/gtkdialogs.c:114
+#: ../gtk/gtkdialogs.c:120
 msgid "Bosnian"
 msgstr "Bosnien"
 
-#: ../src/gtkdialogs.c:115 ../src/gtkdialogs.c:177 ../src/gtkdialogs.c:178
+#: ../gtk/gtkdialogs.c:121 ../gtk/gtkdialogs.c:184 ../gtk/gtkdialogs.c:185
 msgid "Catalan"
 msgstr "Catalan"
 
-#: ../src/gtkdialogs.c:116 ../src/gtkdialogs.c:117
+#: ../gtk/gtkdialogs.c:122 ../gtk/gtkdialogs.c:123
 msgid "Valencian-Catalan"
 msgstr "Valencien-Catalan"
 
-#: ../src/gtkdialogs.c:118 ../src/gtkdialogs.c:179
+#: ../gtk/gtkdialogs.c:124 ../gtk/gtkdialogs.c:186
 msgid "Czech"
 msgstr "Tchèque"
 
-#: ../src/gtkdialogs.c:119
+#: ../gtk/gtkdialogs.c:125
 msgid "Danish"
 msgstr "Danois"
 
-#: ../src/gtkdialogs.c:120 ../src/gtkdialogs.c:121 ../src/gtkdialogs.c:180
+#: ../gtk/gtkdialogs.c:126 ../gtk/gtkdialogs.c:127 ../gtk/gtkdialogs.c:187
 msgid "German"
 msgstr "Allemand"
 
-#: ../src/gtkdialogs.c:122 ../src/gtkdialogs.c:123
+#: ../gtk/gtkdialogs.c:128 ../gtk/gtkdialogs.c:129
 msgid "Greek"
 msgstr "Grec"
 
-#: ../src/gtkdialogs.c:124
+#: ../gtk/gtkdialogs.c:130
 msgid "Australian English"
 msgstr "Anglais australien"
 
-#: ../src/gtkdialogs.c:125
+#: ../gtk/gtkdialogs.c:131
 msgid "Canadian English"
 msgstr "Anglais canadien"
 
-#: ../src/gtkdialogs.c:126
+#: ../gtk/gtkdialogs.c:132
 msgid "British English"
 msgstr "Anglais britannique"
 
-#: ../src/gtkdialogs.c:127 ../src/gtkdialogs.c:181 ../src/gtkdialogs.c:182
-#: ../src/gtkdialogs.c:183 ../src/gtkdialogs.c:184
+#: ../gtk/gtkdialogs.c:133 ../gtk/gtkdialogs.c:188 ../gtk/gtkdialogs.c:189
+#: ../gtk/gtkdialogs.c:190 ../gtk/gtkdialogs.c:191
 msgid "Spanish"
 msgstr "Espagnol"
 
-#: ../src/gtkdialogs.c:128 ../src/gtkdialogs.c:129
+#: ../gtk/gtkdialogs.c:134 ../gtk/gtkdialogs.c:135
 msgid "Euskera(Basque)"
 msgstr "Basque"
 
-#: ../src/gtkdialogs.c:130 ../src/gtkdialogs.c:131
+#: ../gtk/gtkdialogs.c:136 ../gtk/gtkdialogs.c:137
 msgid "Persian"
 msgstr "Persan"
 
-#: ../src/gtkdialogs.c:132 ../src/gtkdialogs.c:185 ../src/gtkdialogs.c:186
+#: ../gtk/gtkdialogs.c:138 ../gtk/gtkdialogs.c:192 ../gtk/gtkdialogs.c:193
 msgid "Finnish"
 msgstr "Finnois"
 
-#: ../src/gtkdialogs.c:133 ../src/gtkdialogs.c:187 ../src/gtkdialogs.c:188
-#: ../src/gtkdialogs.c:189 ../src/gtkdialogs.c:190
+#: ../gtk/gtkdialogs.c:139 ../gtk/gtkdialogs.c:194 ../gtk/gtkdialogs.c:195
+#: ../gtk/gtkdialogs.c:196 ../gtk/gtkdialogs.c:197
 msgid "French"
 msgstr "Français"
 
-#: ../src/gtkdialogs.c:134
+#: ../gtk/gtkdialogs.c:140
 msgid "Galician"
 msgstr "Galicien"
 
-#: ../src/gtkdialogs.c:135
+#: ../gtk/gtkdialogs.c:141 ../gtk/gtkdialogs.c:142
 msgid "Gujarati"
 msgstr "Gujarâtî"
 
-#: ../src/gtkdialogs.c:136 ../src/gtkdialogs.c:191
+#: ../gtk/gtkdialogs.c:143 ../gtk/gtkdialogs.c:198
 msgid "Hebrew"
 msgstr "HĂ©breu"
 
-#: ../src/gtkdialogs.c:137
+#: ../gtk/gtkdialogs.c:144
 msgid "Hindi"
 msgstr "Hindi"
 
-#: ../src/gtkdialogs.c:138
+#: ../gtk/gtkdialogs.c:145
 msgid "Hungarian"
 msgstr "Hongrois"
 
-#: ../src/gtkdialogs.c:139 ../src/gtkdialogs.c:192
+#: ../gtk/gtkdialogs.c:146 ../gtk/gtkdialogs.c:199
 msgid "Italian"
 msgstr "Italien"
 
-#: ../src/gtkdialogs.c:140 ../src/gtkdialogs.c:193 ../src/gtkdialogs.c:194
-#: ../src/gtkdialogs.c:195
+#: ../gtk/gtkdialogs.c:147 ../gtk/gtkdialogs.c:200 ../gtk/gtkdialogs.c:201
+#: ../gtk/gtkdialogs.c:202
 msgid "Japanese"
 msgstr "Japonais"
 
-#: ../src/gtkdialogs.c:141 ../src/gtkdialogs.c:196
+#: ../gtk/gtkdialogs.c:148 ../gtk/gtkdialogs.c:203
 msgid "Georgian"
 msgstr "GĂ©orgien"
 
-#: ../src/gtkdialogs.c:142 ../src/gtkdialogs.c:197
+#: ../gtk/gtkdialogs.c:149 ../gtk/gtkdialogs.c:204
 msgid "Korean"
 msgstr "Coréen"
 
-#: ../src/gtkdialogs.c:143 ../src/gtkdialogs.c:144 ../src/gtkdialogs.c:145
+#: ../gtk/gtkdialogs.c:150 ../gtk/gtkdialogs.c:151 ../gtk/gtkdialogs.c:152
 msgid "Kurdish"
 msgstr "Kurde"
 
-#: ../src/gtkdialogs.c:146 ../src/gtkdialogs.c:198 ../src/gtkdialogs.c:199
+#: ../gtk/gtkdialogs.c:153 ../gtk/gtkdialogs.c:205 ../gtk/gtkdialogs.c:206
 msgid "Lithuanian"
 msgstr "Lituanien"
 
-#: ../src/gtkdialogs.c:147
+#: ../gtk/gtkdialogs.c:154
 msgid "Macedonian"
 msgstr "Macédonien"
 
-#: ../src/gtkdialogs.c:148
+#: ../gtk/gtkdialogs.c:155
 msgid "Nepali"
 msgstr "NĂ©palais"
 
-#: ../src/gtkdialogs.c:149
+#: ../gtk/gtkdialogs.c:156
 msgid "Dutch, Flemish"
 msgstr "Hollandais, flamand"
 
-#: ../src/gtkdialogs.c:150
+#: ../gtk/gtkdialogs.c:157
 msgid "Norwegian"
 msgstr "Norvégien"
 
-#: ../src/gtkdialogs.c:151 ../src/gtkdialogs.c:152 ../src/gtkdialogs.c:200
+#: ../gtk/gtkdialogs.c:158 ../gtk/gtkdialogs.c:159 ../gtk/gtkdialogs.c:207
 msgid "Polish"
 msgstr "Polonais"
 
-#: ../src/gtkdialogs.c:153
+#: ../gtk/gtkdialogs.c:160
 msgid "Portuguese"
 msgstr "Portugais"
 
-#: ../src/gtkdialogs.c:154
+#: ../gtk/gtkdialogs.c:161
 msgid "Portuguese-Brazil"
 msgstr "Portugais brésilien"
 
-#: ../src/gtkdialogs.c:155
+#: ../gtk/gtkdialogs.c:162
 msgid "Romanian"
 msgstr "Roumain"
 
-#: ../src/gtkdialogs.c:156 ../src/gtkdialogs.c:201 ../src/gtkdialogs.c:202
+#: ../gtk/gtkdialogs.c:163 ../gtk/gtkdialogs.c:208 ../gtk/gtkdialogs.c:209
 msgid "Russian"
 msgstr "Russe"
 
-#: ../src/gtkdialogs.c:157 ../src/gtkdialogs.c:158
+#: ../gtk/gtkdialogs.c:164 ../gtk/gtkdialogs.c:165
 msgid "Serbian"
 msgstr "Serbe"
 
-#: ../src/gtkdialogs.c:159 ../src/gtkdialogs.c:203
+#: ../gtk/gtkdialogs.c:166 ../gtk/gtkdialogs.c:210
 msgid "Slovak"
 msgstr "Slovaque"
 
-#: ../src/gtkdialogs.c:160
+#: ../gtk/gtkdialogs.c:167
 msgid "Slovenian"
 msgstr "Slovène"
 
-#: ../src/gtkdialogs.c:161 ../src/gtkdialogs.c:204
+#: ../gtk/gtkdialogs.c:168 ../gtk/gtkdialogs.c:211
 msgid "Swedish"
 msgstr "Suédois"
 
-#: ../src/gtkdialogs.c:162
+#: ../gtk/gtkdialogs.c:169
 msgid "Tamil"
 msgstr "Tamoul"
 
-#: ../src/gtkdialogs.c:163
+#: ../gtk/gtkdialogs.c:170
 msgid "Telugu"
 msgstr "TĂ©lougou"
 
-#: ../src/gtkdialogs.c:164
+#: ../gtk/gtkdialogs.c:171
 msgid "Thai"
 msgstr "ThaĂŻ"
 
-#: ../src/gtkdialogs.c:165
+#: ../gtk/gtkdialogs.c:172
 msgid "Turkish"
 msgstr "Turc"
 
-#: ../src/gtkdialogs.c:166
+#: ../gtk/gtkdialogs.c:173
 msgid "Vietnamese"
 msgstr "Vietnamien"
 
-#: ../src/gtkdialogs.c:166
+#: ../gtk/gtkdialogs.c:173
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh et l'Ă©quipe Gnome-Vi"
 
-#: ../src/gtkdialogs.c:167 ../src/gtkdialogs.c:205
+#: ../gtk/gtkdialogs.c:174 ../gtk/gtkdialogs.c:212
 msgid "Simplified Chinese"
 msgstr "Chinois simplifié"
 
-#: ../src/gtkdialogs.c:168 ../src/gtkdialogs.c:169 ../src/gtkdialogs.c:206
+#: ../gtk/gtkdialogs.c:175 ../gtk/gtkdialogs.c:176 ../gtk/gtkdialogs.c:213
 msgid "Traditional Chinese"
 msgstr "Chinois traditionnel"
 
-#: ../src/gtkdialogs.c:175
+#: ../gtk/gtkdialogs.c:182
 msgid "Amharic"
 msgstr "Amharique"
 
-#: ../src/gtkdialogs.c:247
+#: ../gtk/gtkdialogs.c:294
 msgid "About Gaim"
 msgstr "Ă€ propos de Gaim"
 
-#: ../src/gtkdialogs.c:271
+#: ../gtk/gtkdialogs.c:328
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Zephyr, and Gadu-"
-"Gadu all at once.  It is written using GTK+.<BR><BR>You may modify and "
+"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Zephyr, Gadu-Gadu, "
+"and QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
 "redistribute the program under the terms of the GPL (version 2 or later).  A "
 "copy of the GPL is contained in the 'COPYING' file distributed with Gaim.  "
 "Gaim is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
@@ -3646,68 +2422,68 @@
 "<BR><BR>"
 msgstr ""
 "Gaim est un client de messagerie modulaire compatible avec AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Zephyr et "
-"Gadu-Gadu. Il est Ă©crit avec Gtk+.<BR><BR>Vous pouvez modifier et "
-"redistribuer ce programme sous les conditions énoncées par la licence GNU "
-"GPL (version 2 ou ultérieure). Une copie de la licence GPL est dans le "
-"fichier « COPYING » fourni avec Gaim. Consultez le fichier « COPYRIGHT » "
-"pour avoir la liste complète de ses collaborateurs. Aucune garantie n'est "
-"fournie pour l'utilisation de ce programme.<BR><BR>"
-
-#: ../src/gtkdialogs.c:285
+"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Zephyr, Gadu-Gadu "
+"et QQ. Il est Ă©crit avec Gtk+.<BR><BR>Vous pouvez modifier et redistribuer "
+"ce programme sous les conditions énoncées par la licence GNU GPL (version 2 "
+"ou ultérieure). Une copie de la licence GPL est dans le fichier « COPYING » "
+"fourni avec Gaim. Consultez le fichier « COPYRIGHT » pour avoir la liste "
+"complète de ses collaborateurs. Aucune garantie n'est fournie pour "
+"l'utilisation de ce programme.<BR><BR>"
+
+#: ../gtk/gtkdialogs.c:342
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC :</FONT> #wingaim sur irc.freenode.net<BR><BR>"
 
-#: ../src/gtkdialogs.c:288
+#: ../gtk/gtkdialogs.c:345
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC :</FONT> #gaim sur irc.freenode.net<BR><BR>"
 
-#: ../src/gtkdialogs.c:294
+#: ../gtk/gtkdialogs.c:351
 msgid "Current Developers"
 msgstr "Codeurs"
 
-#: ../src/gtkdialogs.c:309
+#: ../gtk/gtkdialogs.c:366
 msgid "Crazy Patch Writers"
 msgstr "Patcheurs fous"
 
-#: ../src/gtkdialogs.c:324
+#: ../gtk/gtkdialogs.c:381
 msgid "Retired Developers"
 msgstr "Codeurs retraités"
 
-#: ../src/gtkdialogs.c:339
+#: ../gtk/gtkdialogs.c:396
 msgid "Current Translators"
 msgstr "Traducteurs"
 
-#: ../src/gtkdialogs.c:359
+#: ../gtk/gtkdialogs.c:416
 msgid "Past Translators"
 msgstr "Anciens traducteurs"
 
-#: ../src/gtkdialogs.c:377
+#: ../gtk/gtkdialogs.c:434
 msgid "Debugging Information"
 msgstr "Informations de debug"
 
-#: ../src/gtkdialogs.c:597 ../src/gtkdialogs.c:734 ../src/gtkdialogs.c:797
+#: ../gtk/gtkdialogs.c:648 ../gtk/gtkdialogs.c:785 ../gtk/gtkdialogs.c:865
 msgid "_Name"
 msgstr "_Nom"
 
-#: ../src/gtkdialogs.c:602 ../src/gtkdialogs.c:739 ../src/gtkdialogs.c:802
+#: ../gtk/gtkdialogs.c:653 ../gtk/gtkdialogs.c:790 ../gtk/gtkdialogs.c:870
 msgid "_Account"
 msgstr "_Compte"
 
-#: ../src/gtkdialogs.c:610
+#: ../gtk/gtkdialogs.c:661
 msgid "New Instant Message"
 msgstr "Nouveau message"
 
-#: ../src/gtkdialogs.c:612
+#: ../gtk/gtkdialogs.c:663
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr "Saisissez le pseudonyme ou l'alias du destinataire pour le message."
 
-#: ../src/gtkdialogs.c:747
+#: ../gtk/gtkdialogs.c:798
 msgid "Get User Info"
 msgstr "Informations utilisateur"
 
-#: ../src/gtkdialogs.c:749
+#: ../gtk/gtkdialogs.c:800
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -3715,11 +2491,11 @@
 "Saisissez le pseudonyme ou l'alias de l'utilisateur dont vous voulez les "
 "informations."
 
-#: ../src/gtkdialogs.c:821
+#: ../gtk/gtkdialogs.c:889
 msgid "View User Log"
 msgstr "Voir les archives d'un contact"
 
-#: ../src/gtkdialogs.c:823
+#: ../gtk/gtkdialogs.c:891
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -3727,37 +2503,32 @@
 "Saisissez le pseudonyme ou l'alias de l'utilisateur dont vous voulez les "
 "archives."
 
-#: ../src/gtkdialogs.c:842
+#: ../gtk/gtkdialogs.c:910
 msgid "Alias Contact"
 msgstr "Donner un alias Ă  un contact"
 
-#: ../src/gtkdialogs.c:843
+#: ../gtk/gtkdialogs.c:911
 msgid "Enter an alias for this contact."
 msgstr "Saisissez un alias pour ce contact"
 
-#: ../src/gtkdialogs.c:845 ../src/gtkdialogs.c:867 ../src/gtkdialogs.c:887
-#: ../src/gtkrequest.c:277 ../src/protocols/silc/chat.c:587
-msgid "Alias"
-msgstr "Alias"
-
-#: ../src/gtkdialogs.c:863
+#: ../gtk/gtkdialogs.c:931
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Saisissez un alias pour %s"
 
-#: ../src/gtkdialogs.c:865
+#: ../gtk/gtkdialogs.c:933
 msgid "Alias Buddy"
 msgstr "Donner un alias"
 
-#: ../src/gtkdialogs.c:884
+#: ../gtk/gtkdialogs.c:952
 msgid "Alias Chat"
 msgstr "Donner un alias Ă  un groupe de discussion"
 
-#: ../src/gtkdialogs.c:885
+#: ../gtk/gtkdialogs.c:953
 msgid "Enter an alias for this chat."
 msgstr "Saisissez un alias pour cette discussion"
 
-#: ../src/gtkdialogs.c:922
+#: ../gtk/gtkdialogs.c:990
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -3772,15 +2543,31 @@
 "Vous allez supprimer le contact contenant %s et %d autres identifiants de "
 "votre liste de contacts. Voulez-vous continuer ?"
 
-#: ../src/gtkdialogs.c:930
+#: ../gtk/gtkdialogs.c:998
 msgid "Remove Contact"
 msgstr "Supprimer contact"
 
-#: ../src/gtkdialogs.c:931
+#: ../gtk/gtkdialogs.c:999
 msgid "_Remove Contact"
 msgstr "_Supprimer contact"
 
-#: ../src/gtkdialogs.c:982
+#: ../gtk/gtkdialogs.c:1029
+#, c-format
+msgid ""
+"You are about to merge the group called %s into the group called %s. Do you "
+"want to continue?"
+msgstr ""
+"Vous allez fusionner le groupe %s au groupe %s. Voulez-vous continuer ?"
+
+#: ../gtk/gtkdialogs.c:1036
+msgid "Merge Groups"
+msgstr "Fusionner les groupes"
+
+#: ../gtk/gtkdialogs.c:1037
+msgid "_Merge Groups"
+msgstr "_Fusionner les groupes"
+
+#: ../gtk/gtkdialogs.c:1087
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -3789,30 +2576,30 @@
 "Vous allez supprimer le groupe %s et tous ses membres de votre liste de "
 "contacts. Voulez-vous continuer ?"
 
-#: ../src/gtkdialogs.c:985
+#: ../gtk/gtkdialogs.c:1090
 msgid "Remove Group"
 msgstr "Supprimer un groupe"
 
-#: ../src/gtkdialogs.c:986
+#: ../gtk/gtkdialogs.c:1091
 msgid "_Remove Group"
 msgstr "_Supprimer un groupe"
 
-#: ../src/gtkdialogs.c:1019
+#: ../gtk/gtkdialogs.c:1124
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 "Vous allez supprimer %s de votre liste de contacts. Voulez-vous continuer ?"
 
-#: ../src/gtkdialogs.c:1022
+#: ../gtk/gtkdialogs.c:1127
 msgid "Remove Buddy"
 msgstr "Supprimer ce contact"
 
-#: ../src/gtkdialogs.c:1023
+#: ../gtk/gtkdialogs.c:1128
 msgid "_Remove Buddy"
 msgstr "_Supprimer"
 
-#: ../src/gtkdialogs.c:1044
+#: ../gtk/gtkdialogs.c:1149
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -3821,183 +2608,187 @@
 "Vous allez supprimer le groupe de discussion %s de votre liste de contacts. "
 "Voulez-vous continuer ?"
 
-#: ../src/gtkdialogs.c:1047
+#: ../gtk/gtkdialogs.c:1152
 msgid "Remove Chat"
 msgstr "Enlever discussion"
 
-#: ../src/gtkdialogs.c:1048
+#: ../gtk/gtkdialogs.c:1153
 msgid "_Remove Chat"
 msgstr "_Supprimer un salon de discussions"
 
-#: ../src/gtkft.c:133
+#: ../gtk/gtkft.c:133
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f Ko/s"
 
-#: ../src/gtkft.c:153
+#: ../gtk/gtkft.c:153
 msgid "Not started"
 msgstr "Pas commencé"
 
-#: ../src/gtkft.c:162 ../src/gtkft.c:1063
+#: ../gtk/gtkft.c:159 ../libgaim/account.c:1661
+#: ../libgaim/protocols/gg/gg.c:1002 ../libgaim/protocols/jabber/buddy.c:630
+#: ../libgaim/protocols/jabber/buddy.c:1361
+#: ../libgaim/protocols/jabber/buddy.c:1378
+#: ../libgaim/protocols/novell/novell.c:2868
+msgid "Unknown"
+msgstr "Inconnu"
+
+#: ../gtk/gtkft.c:162 ../gtk/gtkft.c:1114
 msgid "Finished"
 msgstr "Fini"
 
-#: ../src/gtkft.c:165 ../src/gtkft.c:1003
+#: ../gtk/gtkft.c:165 ../gtk/gtkft.c:1054
 msgid "Canceled"
 msgstr "Annulé"
 
-#: ../src/gtkft.c:168 ../src/gtkft.c:922
+#: ../gtk/gtkft.c:168 ../gtk/gtkft.c:970
 msgid "Waiting for transfer to begin"
 msgstr "En attente de début de transfert"
 
-#: ../src/gtkft.c:221
+#: ../gtk/gtkft.c:228
+#, c-format
+msgid "File Transfers - %d%% of %d files"
+msgstr "Transfert - %d%% de %d fichiers."
+
+#: ../gtk/gtkft.c:233 ../gtk/gtkft.c:763
+msgid "File Transfers"
+msgstr "Transferts de fichier"
+
+#: ../gtk/gtkft.c:273
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Réception vers :</b>"
 
-#: ../src/gtkft.c:223
+#: ../gtk/gtkft.c:275
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Réception depuis :</b>"
 
-#: ../src/gtkft.c:227
+#: ../gtk/gtkft.c:279
 msgid "<b>Sending To:</b>"
 msgstr "<b>Envoi vers :</b>"
 
-#: ../src/gtkft.c:229
+#: ../gtk/gtkft.c:281
 msgid "<b>Sending As:</b>"
 msgstr "<b>Envoi depuis :</b>"
 
-#: ../src/gtkft.c:445
+#: ../gtk/gtkft.c:497
 msgid "There is no application configured to open this type of file."
 msgstr "Aucune application n'est configurée pour ouvrir ce type de fichier"
 
-#: ../src/gtkft.c:450
+#: ../gtk/gtkft.c:502
 msgid "An error occurred while opening the file."
 msgstr "Erreur lors de l'ouverture du fichier"
 
-#: ../src/gtkft.c:487
+#: ../gtk/gtkft.c:539
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "Erreur au lancement de %s : %s"
 
-#: ../src/gtkft.c:496
+#: ../gtk/gtkft.c:548
 #, c-format
 msgid "Error running %s"
 msgstr "Erreur à l'exécution de %s"
 
-#: ../src/gtkft.c:497
+#: ../gtk/gtkft.c:549
 #, c-format
 msgid "Process returned error code %d"
 msgstr "Le processus a renvoyé le code d'erreur %d"
 
-#: ../src/gtkft.c:591
+#: ../gtk/gtkft.c:644
 msgid "Progress"
 msgstr "État"
 
-#: ../src/gtkft.c:598
+#: ../gtk/gtkft.c:651
 msgid "Filename"
 msgstr "Fichier"
 
-#: ../src/gtkft.c:605
+#: ../gtk/gtkft.c:658
 msgid "Size"
 msgstr "Taille"
 
-#: ../src/gtkft.c:612
+#: ../gtk/gtkft.c:665
 msgid "Remaining"
 msgstr "Reste"
 
-#: ../src/gtkft.c:643
+#: ../gtk/gtkft.c:696
 msgid "Filename:"
 msgstr "Fichier :"
 
-#: ../src/gtkft.c:644
+#: ../gtk/gtkft.c:697
 msgid "Local File:"
 msgstr "Fichier local :"
 
-#: ../src/gtkft.c:645
-msgid "Status:"
-msgstr "État :"
-
-#: ../src/gtkft.c:646
+#: ../gtk/gtkft.c:699
 msgid "Speed:"
 msgstr "Vitesse :"
 
-#: ../src/gtkft.c:647
+#: ../gtk/gtkft.c:700
 msgid "Time Elapsed:"
 msgstr "Temps écoulé :"
 
-#: ../src/gtkft.c:648
+#: ../gtk/gtkft.c:701
 msgid "Time Remaining:"
 msgstr "Temps restant :"
 
-#: ../src/gtkft.c:710
-msgid "File Transfers"
-msgstr "Transferts de fichier"
-
-#: ../src/gtkft.c:733
+#: ../gtk/gtkft.c:786
 msgid "Close this window when all transfers _finish"
 msgstr "Fermer cette fenêtre quand tous les transferts sont _terminés."
 
-#: ../src/gtkft.c:743
+#: ../gtk/gtkft.c:796
 msgid "C_lear finished transfers"
 msgstr "_Effacer les transferts terminés"
 
 #. "Download Details" arrow
-#: ../src/gtkft.c:752
+#: ../gtk/gtkft.c:805
 msgid "File transfer _details"
 msgstr "_DĂ©tails du transfert"
 
-#. Pause button
-#: ../src/gtkft.c:782 ../src/gtkstock.c:146
-msgid "_Pause"
-msgstr "_Pause"
-
 #. Resume button
-#: ../src/gtkft.c:792
+#: ../gtk/gtkft.c:845
 msgid "_Resume"
 msgstr "_Reprise"
 
-#: ../src/gtkft.c:1005
+#: ../gtk/gtkft.c:1056
 msgid "Failed"
 msgstr "Échec"
 
-#: ../src/gtkimhtml.c:814
+#: ../gtk/gtkimhtml.c:814
 msgid "Paste as Plain _Text"
 msgstr "Coller comme _texte seulement"
 
-#: ../src/gtkimhtml.c:826
+#: ../gtk/gtkimhtml.c:826
 msgid "_Reset formatting"
 msgstr "_Effacer le style"
 
-#: ../src/gtkimhtml.c:1318
+#: ../gtk/gtkimhtml.c:1318
 msgid "Hyperlink color"
 msgstr "Couleur des liens hypertextes"
 
-#: ../src/gtkimhtml.c:1319
+#: ../gtk/gtkimhtml.c:1319
 msgid "Color to draw hyperlinks."
 msgstr "Couleur pour afficher les liens hypertextes"
 
-#: ../src/gtkimhtml.c:1322
+#: ../gtk/gtkimhtml.c:1322
 msgid "Hyperlink prelight color"
 msgstr "Couleur de surlignage des liens hypertextes"
 
-#: ../src/gtkimhtml.c:1323
+#: ../gtk/gtkimhtml.c:1323
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr ""
 "Couleur pour afficher les liens hypertextes quand la souris les survole."
 
-#: ../src/gtkimhtml.c:1544
+#: ../gtk/gtkimhtml.c:1544
 msgid "_Copy E-Mail Address"
 msgstr "_Copier l'adresse Ă©lectronique"
 
-#: ../src/gtkimhtml.c:1556
+#: ../gtk/gtkimhtml.c:1556
 msgid "_Open Link in Browser"
 msgstr "_Ouvrir le lien"
 
-#: ../src/gtkimhtml.c:1566
+#: ../gtk/gtkimhtml.c:1566
 msgid "_Copy Link Location"
 msgstr "_Copier l'adresse du lien"
 
-#: ../src/gtkimhtml.c:3257
+#: ../gtk/gtkimhtml.c:3291
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -4007,7 +2798,7 @@
 "\n"
 "PNG choisi par défaut"
 
-#: ../src/gtkimhtml.c:3260
+#: ../gtk/gtkimhtml.c:3294
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -4017,7 +2808,7 @@
 "\n"
 "Le type PNG est utilisé par défaut."
 
-#: ../src/gtkimhtml.c:3273
+#: ../gtk/gtkimhtml.c:3307
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -4028,7 +2819,7 @@
 "\n"
 "%s"
 
-#: ../src/gtkimhtml.c:3276
+#: ../gtk/gtkimhtml.c:3310
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -4039,35 +2830,35 @@
 "\n"
 "%s"
 
-#: ../src/gtkimhtml.c:3356 ../src/gtkimhtml.c:3368
+#: ../gtk/gtkimhtml.c:3390 ../gtk/gtkimhtml.c:3402
 msgid "Save Image"
 msgstr "Enregistrer l'image"
 
-#: ../src/gtkimhtml.c:3396
+#: ../gtk/gtkimhtml.c:3430
 msgid "_Save Image..."
 msgstr "Enregi_strer l'image..."
 
-#: ../src/gtkimhtmltoolbar.c:147
+#: ../gtk/gtkimhtmltoolbar.c:147
 msgid "Select Font"
 msgstr "Changer la police"
 
-#: ../src/gtkimhtmltoolbar.c:226
+#: ../gtk/gtkimhtmltoolbar.c:226
 msgid "Select Text Color"
 msgstr "Changer la couleur du texte"
 
-#: ../src/gtkimhtmltoolbar.c:305
+#: ../gtk/gtkimhtmltoolbar.c:305
 msgid "Select Background Color"
 msgstr "Changer la couleur du fond"
 
-#: ../src/gtkimhtmltoolbar.c:394
+#: ../gtk/gtkimhtmltoolbar.c:394
 msgid "_URL"
 msgstr "_URL"
 
-#: ../src/gtkimhtmltoolbar.c:402
+#: ../gtk/gtkimhtmltoolbar.c:402
 msgid "_Description"
 msgstr "_Description"
 
-#: ../src/gtkimhtmltoolbar.c:405
+#: ../gtk/gtkimhtmltoolbar.c:405
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -4075,99 +2866,99 @@
 "Saisissez l'URL et la description du lien Ă  inclure. La description est "
 "facultative."
 
-#: ../src/gtkimhtmltoolbar.c:409
+#: ../gtk/gtkimhtmltoolbar.c:409
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Saisissez l'URL du lien Ă  inclure."
 
-#: ../src/gtkimhtmltoolbar.c:414
+#: ../gtk/gtkimhtmltoolbar.c:414
 msgid "Insert Link"
 msgstr "Insérer un lien"
 
-#: ../src/gtkimhtmltoolbar.c:418
+#: ../gtk/gtkimhtmltoolbar.c:418
 msgid "_Insert"
 msgstr "_Insérer"
 
-#: ../src/gtkimhtmltoolbar.c:487
+#: ../gtk/gtkimhtmltoolbar.c:487
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Impossible de sauver l'image : %s\n"
 
-#: ../src/gtkimhtmltoolbar.c:513 ../src/gtkimhtmltoolbar.c:523
+#: ../gtk/gtkimhtmltoolbar.c:513 ../gtk/gtkimhtmltoolbar.c:523
 msgid "Insert Image"
 msgstr "Insérer une image"
 
-#: ../src/gtkimhtmltoolbar.c:721
+#: ../gtk/gtkimhtmltoolbar.c:721
 msgid "This theme has no available smileys."
 msgstr "Ce thème n'a pas de frimousses"
 
 #. show everything
-#: ../src/gtkimhtmltoolbar.c:735
+#: ../gtk/gtkimhtmltoolbar.c:735
 msgid "Smile!"
 msgstr "Souriez !"
 
-#: ../src/gtkimhtmltoolbar.c:922
+#: ../gtk/gtkimhtmltoolbar.c:922
 msgid "Bold"
 msgstr "Gras"
 
-#: ../src/gtkimhtmltoolbar.c:933
+#: ../gtk/gtkimhtmltoolbar.c:933
 msgid "Italic"
 msgstr "Italique"
 
-#: ../src/gtkimhtmltoolbar.c:944
+#: ../gtk/gtkimhtmltoolbar.c:944
 msgid "Underline"
 msgstr "Souligné"
 
-#: ../src/gtkimhtmltoolbar.c:960
+#: ../gtk/gtkimhtmltoolbar.c:960
 msgid "Larger font size"
 msgstr "Police plus grande"
 
-#: ../src/gtkimhtmltoolbar.c:972
+#: ../gtk/gtkimhtmltoolbar.c:972
 msgid "Smaller font size"
 msgstr "Police plus petite"
 
-#: ../src/gtkimhtmltoolbar.c:989
-msgid "Font Face"
+#: ../gtk/gtkimhtmltoolbar.c:989
+msgid "Font face"
 msgstr "Police"
 
-#: ../src/gtkimhtmltoolbar.c:1001
+#: ../gtk/gtkimhtmltoolbar.c:1001
 msgid "Foreground font color"
 msgstr "Couleur du texte"
 
-#: ../src/gtkimhtmltoolbar.c:1013
+#: ../gtk/gtkimhtmltoolbar.c:1013
 msgid "Background color"
 msgstr "Couleur de fond"
 
-#: ../src/gtkimhtmltoolbar.c:1029
+#: ../gtk/gtkimhtmltoolbar.c:1029
 msgid "Reset formatting"
 msgstr "Effacer le style"
 
-#: ../src/gtkimhtmltoolbar.c:1044
+#: ../gtk/gtkimhtmltoolbar.c:1044
 msgid "Insert link"
 msgstr "Insérer un lien"
 
-#: ../src/gtkimhtmltoolbar.c:1054
+#: ../gtk/gtkimhtmltoolbar.c:1054
 msgid "Insert image"
 msgstr "Insérer une image"
 
-#: ../src/gtkimhtmltoolbar.c:1065
+#: ../gtk/gtkimhtmltoolbar.c:1065
 msgid "Insert smiley"
 msgstr "Insérer une frimousse"
 
-#: ../src/gtklog.c:203
+#: ../gtk/gtklog.c:238
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Conversation dans %s le %s</span>"
 
-#: ../src/gtklog.c:208
+#: ../gtk/gtklog.c:243
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Conversation avec %s le %s</span>"
 
-#: ../src/gtklog.c:257
+#: ../gtk/gtklog.c:292
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../src/gtklog.c:304
+#: ../gtk/gtklog.c:339
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
@@ -4175,7 +2966,7 @@
 "Les évènements système ne seront archivés que si l'option « Archiver tous "
 "les changements d'état dans les archives système » est activée."
 
-#: ../src/gtklog.c:308
+#: ../gtk/gtklog.c:343
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
@@ -4183,41 +2974,41 @@
 "Les messages individuels ne seront archivés que si l'option « Archiver tous "
 "les messages » est activée."
 
-#: ../src/gtklog.c:311
+#: ../gtk/gtklog.c:346
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
 "Les discussions en salon ne seront archivées que si l'option « Archiver "
 "toutes les discussions » est activée."
 
-#: ../src/gtklog.c:315
+#: ../gtk/gtklog.c:350
 msgid "No logs were found"
 msgstr "Aucune archive n'a été trouvée."
 
-#: ../src/gtklog.c:394
+#: ../gtk/gtklog.c:429
 msgid "Total log size:"
 msgstr "Taille totale des archives :"
 
-#: ../src/gtklog.c:460
+#: ../gtk/gtklog.c:495
 #, c-format
 msgid "Conversations in %s"
 msgstr "Conversations dans %s"
 
-#: ../src/gtklog.c:468 ../src/gtklog.c:519
+#: ../gtk/gtklog.c:503 ../gtk/gtklog.c:554
 #, c-format
 msgid "Conversations with %s"
 msgstr "Conversations avec %s"
 
-#: ../src/gtklog.c:544
+#: ../gtk/gtklog.c:579
 msgid "System Log"
 msgstr "Archives des messages système"
 
-#: ../src/gtkmain.c:307
+#: ../gtk/gtkmain.c:342
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. « %s -h » pour plus d'informations.\n"
 
-#: ../src/gtkmain.c:309
+#: ../gtk/gtkmain.c:344
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4245,7 +3036,7 @@
 "                      des virgules)\n"
 "  -v, --version       affiche le numéro de la version actuelle\n"
 
-#: ../src/gtkmain.c:493
+#: ../gtk/gtkmain.c:526
 #, c-format
 msgid ""
 "Gaim has segfaulted and attempted to dump a core file.\n"
@@ -4285,34 +3076,22 @@
 "disponibles sur\n"
 "%scontactinfo.php\n"
 
-#: ../src/gtknotify.c:332
-msgid "New Mail"
-msgstr "Nouveau courriel"
-
-#: ../src/gtknotify.c:348
+#: ../gtk/gtknotify.c:348
 msgid "Open All Messages"
 msgstr "Ouvrir tous les messages"
 
-#: ../src/gtknotify.c:414 ../src/protocols/jabber/jabber.c:1135
-msgid "From"
-msgstr "Source"
-
-#: ../src/gtknotify.c:423
-msgid "Subject"
-msgstr "Sujet"
-
-#: ../src/gtknotify.c:432
+#: ../gtk/gtknotify.c:432
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Vous avez du courrier !</span>"
 
-#: ../src/gtknotify.c:498
+#: ../gtk/gtknotify.c:498
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s a reçu %d nouveau message."
 msgstr[1] "%s a reçu %d nouveaux messages."
 
-#: ../src/gtknotify.c:503
+#: ../gtk/gtknotify.c:503
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -4323,54 +3102,45 @@
 "\n"
 "%s"
 
-#: ../src/gtknotify.c:692 ../src/protocols/sametime/sametime.c:5456
+#: ../gtk/gtknotify.c:692 ../libgaim/protocols/sametime/sametime.c:5459
 msgid "Search Results"
 msgstr "RĂ©sultats de la recherche"
 
-#: ../src/gtknotify.c:849 ../src/protocols/oscar/oscar.c:2635
-#, c-format
-msgid "Info for %s"
-msgstr "Informations pour %s"
-
-#: ../src/gtknotify.c:850 ../src/protocols/toc/toc.c:470
-msgid "Buddy Information"
-msgstr "Informations sur le contact"
-
-#: ../src/gtknotify.c:890
+#: ../gtk/gtknotify.c:890
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "La commande « %s » pour le navigateur est non valide."
 
-#: ../src/gtknotify.c:892 ../src/gtknotify.c:904 ../src/gtknotify.c:917
-#: ../src/gtknotify.c:1040
+#: ../gtk/gtknotify.c:892 ../gtk/gtknotify.c:904 ../gtk/gtknotify.c:917
+#: ../gtk/gtknotify.c:1041
 msgid "Unable to open URL"
 msgstr "Impossible d'ouvrir l'URL"
 
-#: ../src/gtknotify.c:902 ../src/gtknotify.c:915
+#: ../gtk/gtknotify.c:902 ../gtk/gtknotify.c:915
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Erreur au lancement de « %s » : %s"
 
-#: ../src/gtknotify.c:1041
+#: ../gtk/gtknotify.c:1042
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 "Un navigateur « Manuel » a été choisi choisi mais la ligne de commande est "
 "vide."
 
-#: ../src/gtkplugin.c:274
+#: ../gtk/gtkplugin.c:274
 msgid "The following plugins will be unloaded."
 msgstr "Les plugins suivants vont être déchargés."
 
-#: ../src/gtkplugin.c:293
+#: ../gtk/gtkplugin.c:293
 msgid "Multiple plugins will be unloaded."
 msgstr "Plusieurs plugins vont être déchargés."
 
-#: ../src/gtkplugin.c:295
+#: ../gtk/gtkplugin.c:295
 msgid "Unload Plugins"
 msgstr "DĂ©chargement de plugins"
 
-#: ../src/gtkplugin.c:407
+#: ../gtk/gtkplugin.c:407
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -4381,7 +3151,7 @@
 "<span weight=\"bold\">Page web :</span> %s\n"
 "<span weight=\"bold\">Fichier :</span> %s"
 
-#: ../src/gtkplugin.c:417
+#: ../gtk/gtkplugin.c:417
 #, c-format
 msgid ""
 "%s\n"
@@ -4392,210 +3162,210 @@
 "<span foreground=\"#ff0000\" weight=\"bold\">Erreur : %s\n"
 "Consultez le site web du plugin pour une mise Ă  jour Ă©ventuelle.</span>"
 
-#: ../src/gtkplugin.c:543
+#: ../gtk/gtkplugin.c:543
 msgid "Configure Pl_ugin"
 msgstr "Configurer le _plugin"
 
-#: ../src/gtkplugin.c:601
+#: ../gtk/gtkplugin.c:603
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Informations sur le plugin</b>"
 
-#: ../src/gtkpounce.c:155
+#: ../gtk/gtkpounce.c:155
 msgid "Select a file"
 msgstr "Choisissez un fichier"
 
-#: ../src/gtkpounce.c:252
+#: ../gtk/gtkpounce.c:252
 msgid "Please enter a buddy to pounce."
 msgstr "Choisissez un contact pour la création d'une alerte"
 
-#: ../src/gtkpounce.c:499
+#: ../gtk/gtkpounce.c:499
 msgid "New Buddy Pounce"
 msgstr "Nouvelle alerte"
 
-#: ../src/gtkpounce.c:499
+#: ../gtk/gtkpounce.c:499
 msgid "Edit Buddy Pounce"
 msgstr "Éditer une alerte"
 
 #. Create the "Pounce on Whom" frame.
-#: ../src/gtkpounce.c:516
+#: ../gtk/gtkpounce.c:516
 msgid "Pounce on Whom"
 msgstr "Alerte sur"
 
-#: ../src/gtkpounce.c:543
+#: ../gtk/gtkpounce.c:543
 msgid "_Buddy name:"
 msgstr "_Contact :"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../src/gtkpounce.c:569
+#: ../gtk/gtkpounce.c:569
 msgid "Pounce When Buddy..."
 msgstr "DĂ©clenchement quand le contact..."
 
-#: ../src/gtkpounce.c:577
+#: ../gtk/gtkpounce.c:577
 msgid "Si_gns on"
 msgstr "Se _connecte"
 
-#: ../src/gtkpounce.c:579
+#: ../gtk/gtkpounce.c:579
 msgid "Signs o_ff"
 msgstr "Se _déconnecte"
 
-#: ../src/gtkpounce.c:581
+#: ../gtk/gtkpounce.c:581
 msgid "Goes a_way"
 msgstr "S'_absente"
 
-#: ../src/gtkpounce.c:583
+#: ../gtk/gtkpounce.c:583
 msgid "Ret_urns from away"
 msgstr "_Revient d'absence"
 
-#: ../src/gtkpounce.c:585
+#: ../gtk/gtkpounce.c:585
 msgid "Becomes _idle"
 msgstr "Devient _inactif"
 
-#: ../src/gtkpounce.c:587
+#: ../gtk/gtkpounce.c:587
 msgid "Is no longer i_dle"
 msgstr "N'est plus i_nactif"
 
-#: ../src/gtkpounce.c:589
+#: ../gtk/gtkpounce.c:589
 msgid "Starts _typing"
 msgstr "C_ommence Ă  Ă©crire"
 
-#: ../src/gtkpounce.c:591
+#: ../gtk/gtkpounce.c:591
 msgid "P_auses while typing"
 msgstr "_Pause pendant la saisie"
 
-#: ../src/gtkpounce.c:593
+#: ../gtk/gtkpounce.c:593
 msgid "Stops t_yping"
 msgstr "_S'arrĂŞte d'Ă©crire"
 
-#: ../src/gtkpounce.c:595
+#: ../gtk/gtkpounce.c:595
 msgid "Sends a _message"
 msgstr "Envoi d'un _message"
 
 #. Create the "Action" frame.
-#: ../src/gtkpounce.c:630
+#: ../gtk/gtkpounce.c:630
 msgid "Action"
 msgstr "Action"
 
-#: ../src/gtkpounce.c:638
+#: ../gtk/gtkpounce.c:638
 msgid "Ope_n an IM window"
 msgstr "Ouvrir une _fenĂŞtre de conversation"
 
-#: ../src/gtkpounce.c:640
+#: ../gtk/gtkpounce.c:640
 msgid "_Pop up a notification"
 msgstr "Ouvrir une fenĂŞtre de _notification"
 
-#: ../src/gtkpounce.c:642
+#: ../gtk/gtkpounce.c:642
 msgid "Send a _message"
 msgstr "Envoyer un _message"
 
-#: ../src/gtkpounce.c:644
+#: ../gtk/gtkpounce.c:644
 msgid "E_xecute a command"
 msgstr "Exécuter une c_ommande"
 
-#: ../src/gtkpounce.c:646
+#: ../gtk/gtkpounce.c:646
 msgid "P_lay a sound"
 msgstr "_Jouer un son"
 
-#: ../src/gtkpounce.c:651
+#: ../gtk/gtkpounce.c:651
 msgid "Brows_e..."
 msgstr "Choisir..."
 
-#: ../src/gtkpounce.c:653
+#: ../gtk/gtkpounce.c:653
 msgid "Br_owse..."
 msgstr "Choisir..."
 
-#: ../src/gtkpounce.c:654
+#: ../gtk/gtkpounce.c:654
 msgid "Pre_view"
 msgstr "Pré_visualisation"
 
 #. Create the "Options" frame.
-#: ../src/gtkpounce.c:766
+#: ../gtk/gtkpounce.c:766
 msgid "Options"
 msgstr "Options"
 
-#: ../src/gtkpounce.c:774
+#: ../gtk/gtkpounce.c:774
 msgid "P_ounce only when my status is not available"
 msgstr "Alerter _uniquement quand mon Ă©tat est non disponible"
 
-#: ../src/gtkpounce.c:779
+#: ../gtk/gtkpounce.c:779
 msgid "_Recurring"
 msgstr "_RĂ©currente"
 
-#: ../src/gtkpounce.c:1085
+#: ../gtk/gtkpounce.c:1085
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Êtes-vous sûr de vouloir supprimer l'alerte sur %s pour %s ?"
 
-#: ../src/gtkpounce.c:1233
+#: ../gtk/gtkpounce.c:1233
 msgid "Pounce Target"
 msgstr "Cible de l'alerte"
 
-#: ../src/gtkpounce.c:1268
+#: ../gtk/gtkpounce.c:1268
 msgid "Recurring"
 msgstr "RĂ©currente"
 
-#: ../src/gtkpounce.c:1315
+#: ../gtk/gtkpounce.c:1315
 msgid "Buddy Pounces"
 msgstr "Alertes"
 
-#: ../src/gtkpounce.c:1442
+#: ../gtk/gtkpounce.c:1442
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s est en train de vous Ă©crire (%s)"
 
-#: ../src/gtkpounce.c:1444
+#: ../gtk/gtkpounce.c:1444
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s a fait une pause dans la saisie de votre message (%s)"
 
-#: ../src/gtkpounce.c:1446
+#: ../gtk/gtkpounce.c:1446
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s vient de se connecter (%s)"
 
-#: ../src/gtkpounce.c:1448
+#: ../gtk/gtkpounce.c:1448
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s n'est plus inactif (%s)"
 
-#: ../src/gtkpounce.c:1450
+#: ../gtk/gtkpounce.c:1450
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s n'est plus absent (%s)"
 
-#: ../src/gtkpounce.c:1452
+#: ../gtk/gtkpounce.c:1452
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s a arrêté de vous écrire (%s)"
 
-#: ../src/gtkpounce.c:1454
+#: ../gtk/gtkpounce.c:1454
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s vient de se déconnecter (%s)"
 
-#: ../src/gtkpounce.c:1456
+#: ../gtk/gtkpounce.c:1456
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s est devenu inactif (%s)"
 
-#: ../src/gtkpounce.c:1458
+#: ../gtk/gtkpounce.c:1458
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s est passé absent (%s)"
 
-#: ../src/gtkpounce.c:1460
+#: ../gtk/gtkpounce.c:1460
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s vous a envoyé un message. (%s)"
 
-#: ../src/gtkpounce.c:1461
+#: ../gtk/gtkpounce.c:1461
 msgid "Unknown pounce event. Please report this!"
 msgstr "Événement d'alerte inconnu. Veuillez reporter cette erreur."
 
-#: ../src/gtkprefs.c:512
+#: ../gtk/gtkprefs.c:512
 msgid "Smiley theme failed to unpack."
 msgstr "Le thème de frimousses n'a pas pu être déballé."
 
-#: ../src/gtkprefs.c:638
+#: ../gtk/gtkprefs.c:641
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -4604,52 +3374,66 @@
 "dessous.  De nouveau thèmes peuvent être installés en les faisant glisser "
 "dans la liste des thèmes."
 
-#: ../src/gtkprefs.c:673
+#: ../gtk/gtkprefs.c:676
 msgid "Icon"
 msgstr "IcĂ´ne"
 
-#: ../src/gtkprefs.c:680 ../src/protocols/jabber/buddy.c:286
-#: ../src/protocols/jabber/buddy.c:926 ../src/protocols/jabber/chat.c:767
+#: ../gtk/gtkprefs.c:683 ../libgaim/protocols/jabber/buddy.c:286
+#: ../libgaim/protocols/jabber/buddy.c:923
+#: ../libgaim/protocols/jabber/chat.c:769
 msgid "Description"
 msgstr "Description"
 
-#: ../src/gtkprefs.c:821
+#: ../gtk/gtkprefs.c:824
 msgid "_Hide new IM conversations"
 msgstr "_Cacher les nouvelles conversations"
 
-#: ../src/gtkprefs.c:824 ../src/gtkprefs.c:1779
+#: ../gtk/gtkprefs.c:826 ../gtk/gtkprefs.c:1769 ../gtk/gtkprefs.c:1783
+#: ../gtk/plugins/docklet/docklet.c:684 ../gtk/plugins/docklet/docklet.c:692
+#: ../gtk/plugins/win32/winprefs/winprefs.c:458
+msgid "Never"
+msgstr "Jamais"
+
+#: ../gtk/gtkprefs.c:827 ../gtk/gtkprefs.c:1784
 msgid "When away"
 msgstr "Lorsque absent"
 
-#: ../src/gtkprefs.c:828
+#: ../gtk/gtkprefs.c:828 ../gtk/plugins/docklet/docklet.c:686
+#: ../gtk/plugins/docklet/docklet.c:694 ../gtk/plugins/timestamp_format.c:39
+#: ../gtk/plugins/timestamp_format.c:48
+#: ../gtk/plugins/win32/winprefs/winprefs.c:459
+msgid "Always"
+msgstr "Toujours"
+
+#: ../gtk/gtkprefs.c:831
 msgid "Send unknown \"_slash\" commands as messages"
 msgstr "Envoyer les commandes « _barre » inconnues en message"
 
-#: ../src/gtkprefs.c:830
+#: ../gtk/gtkprefs.c:833
 msgid "Show _formatting on incoming messages"
 msgstr "Afficher le _style des nouveaux messages"
 
-#: ../src/gtkprefs.c:833
+#: ../gtk/gtkprefs.c:836
 msgid "Show buddy _icons"
 msgstr "Afficher les _icĂ´nes des contacts"
 
-#: ../src/gtkprefs.c:835
+#: ../gtk/gtkprefs.c:838
 msgid "Enable buddy ic_on animation"
 msgstr "Activer l'anima_tion de l'icĂ´ne des contacts"
 
-#: ../src/gtkprefs.c:842
+#: ../gtk/gtkprefs.c:845
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Notifier les contacts que vous ĂŞtes en train de leur Ă©crire"
 
-#: ../src/gtkprefs.c:845
+#: ../gtk/gtkprefs.c:848
 msgid "Highlight _misspelled words"
 msgstr "Surligner les mots mal _orthographiés"
 
-#: ../src/gtkprefs.c:849
+#: ../gtk/gtkprefs.c:852
 msgid "Use smooth-scrolling"
 msgstr "Utiliser le défilement progressif"
 
-#: ../src/gtkprefs.c:865
+#: ../gtk/gtkprefs.c:868
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -4658,164 +3442,168 @@
 "supportant l'ajout du style. :)"
 
 #. All the tab options!
-#: ../src/gtkprefs.c:887
+#: ../gtk/gtkprefs.c:890
 msgid "Tab Options"
 msgstr "Options des onglets"
 
-#: ../src/gtkprefs.c:889
+#: ../gtk/gtkprefs.c:892
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Afficher les messages et les discussions dans des fenĂŞtres Ă  _onglets"
 
-#: ../src/gtkprefs.c:903
+#: ../gtk/gtkprefs.c:906
 msgid "Show close b_utton on tabs"
 msgstr "Afficher le bouton de fermeture (_X) sur les onglets"
 
-#: ../src/gtkprefs.c:909
+#: ../gtk/gtkprefs.c:912
 msgid "_Placement:"
 msgstr "_Position :"
 
-#: ../src/gtkprefs.c:911
+#: ../gtk/gtkprefs.c:914
 msgid "Top"
 msgstr "Haut"
 
-#: ../src/gtkprefs.c:912
+#: ../gtk/gtkprefs.c:915
 msgid "Bottom"
 msgstr "Bas"
 
-#: ../src/gtkprefs.c:913
+#: ../gtk/gtkprefs.c:916
 msgid "Left"
 msgstr "Gauche"
 
-#: ../src/gtkprefs.c:914
+#: ../gtk/gtkprefs.c:917
 msgid "Right"
 msgstr "Droite"
 
-#: ../src/gtkprefs.c:916
+#: ../gtk/gtkprefs.c:919
 msgid "Left Vertical"
 msgstr "Verticalement Ă  gauche"
 
-#: ../src/gtkprefs.c:917
+#: ../gtk/gtkprefs.c:920
 msgid "Right Vertical"
 msgstr "Verticalement Ă  droite"
 
-#: ../src/gtkprefs.c:922
+#: ../gtk/gtkprefs.c:925
 msgid "N_ew conversations:"
 msgstr "Nouvelles conversations :"
 
-#: ../src/gtkprefs.c:973 ../src/protocols/oscar/oscar.c:804
-#: ../src/protocols/oscar/oscar.c:3652
+#: ../gtk/gtkprefs.c:976 ../libgaim/protocols/oscar/oscar.c:779
+#: ../libgaim/protocols/oscar/oscar.c:3627
 msgid "IP Address"
 msgstr "Adresse IP"
 
-#: ../src/gtkprefs.c:975
+#: ../gtk/gtkprefs.c:978
 msgid "ST_UN server:"
 msgstr "Serveur ST_UN :"
 
-#: ../src/gtkprefs.c:987
+#: ../gtk/gtkprefs.c:990
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exemple : stunserver.org</span>"
 
-#: ../src/gtkprefs.c:991
+#: ../gtk/gtkprefs.c:994
 msgid "_Autodetect IP address"
 msgstr "_DĂ©tection auto de l'adresse IP"
 
-#: ../src/gtkprefs.c:1000
+#: ../gtk/gtkprefs.c:1003
 msgid "Public _IP:"
 msgstr "Adresse _IP publique :"
 
-#: ../src/gtkprefs.c:1029
+#: ../gtk/gtkprefs.c:1032
 msgid "Ports"
 msgstr "Ports"
 
-#: ../src/gtkprefs.c:1032
+#: ../gtk/gtkprefs.c:1035
 msgid "_Manually specify range of ports to listen on"
 msgstr "Spécifier _manuellement la plage de ports à écouter"
 
-#: ../src/gtkprefs.c:1035
+#: ../gtk/gtkprefs.c:1038
 msgid "_Start port:"
 msgstr "_Premier port : "
 
-#: ../src/gtkprefs.c:1042
+#: ../gtk/gtkprefs.c:1045
 msgid "_End port:"
 msgstr "_Dernier port :"
 
-#: ../src/gtkprefs.c:1050
+#: ../gtk/gtkprefs.c:1053
 msgid "Proxy Server"
 msgstr "Serveur mandataire"
 
-#: ../src/gtkprefs.c:1054
+#: ../gtk/gtkprefs.c:1057
 msgid "No proxy"
 msgstr "Aucun"
 
-#: ../src/gtkprefs.c:1110
+#: ../gtk/gtkprefs.c:1113
 msgid "_User:"
 msgstr "_Utilisateur :"
 
-#: ../src/gtkprefs.c:1172
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: ../src/gtkprefs.c:1173
-msgid "Firebird"
-msgstr "Firebird"
-
-#: ../src/gtkprefs.c:1174
-msgid "Firefox"
-msgstr "Firefox"
-
-#: ../src/gtkprefs.c:1175
-msgid "Galeon"
-msgstr "Galeon"
-
-#: ../src/gtkprefs.c:1176
-msgid "GNOME Default"
-msgstr "Navigateur de Gnome"
-
-#: ../src/gtkprefs.c:1177
+#: ../gtk/gtkprefs.c:1176
+msgid "Seamonkey"
+msgstr "Seamonkey"
+
+#: ../gtk/gtkprefs.c:1177
+msgid "Opera"
+msgstr "Opera"
+
+#: ../gtk/gtkprefs.c:1178
+msgid "Netscape"
+msgstr "Netscape"
+
+#: ../gtk/gtkprefs.c:1179
+msgid "Mozilla"
+msgstr "Mozilla"
+
+#: ../gtk/gtkprefs.c:1180
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../src/gtkprefs.c:1178
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: ../src/gtkprefs.c:1179
-msgid "Netscape"
-msgstr "Netscape"
-
-#: ../src/gtkprefs.c:1180
-msgid "Opera"
-msgstr "Opera"
-
-#: ../src/gtkprefs.c:1189
+#: ../gtk/gtkprefs.c:1181
+msgid "GNOME Default"
+msgstr "Navigateur de Gnome"
+
+#: ../gtk/gtkprefs.c:1182
+msgid "Galeon"
+msgstr "Galeon"
+
+#: ../gtk/gtkprefs.c:1183
+msgid "Firefox"
+msgstr "Firefox"
+
+#: ../gtk/gtkprefs.c:1184
+msgid "Firebird"
+msgstr "Firebird"
+
+#: ../gtk/gtkprefs.c:1185
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: ../gtk/gtkprefs.c:1194
 msgid "Manual"
 msgstr "Manuel"
 
-#: ../src/gtkprefs.c:1242
+#: ../gtk/gtkprefs.c:1247
 msgid "Browser Selection"
 msgstr "Choix du navigateur"
 
-#: ../src/gtkprefs.c:1246
+#: ../gtk/gtkprefs.c:1251
 msgid "_Browser:"
 msgstr "_Navigateur :"
 
-#: ../src/gtkprefs.c:1254
+#: ../gtk/gtkprefs.c:1259
 msgid "_Open link in:"
 msgstr "_Ouvrir le lien :"
 
-#: ../src/gtkprefs.c:1256
+#: ../gtk/gtkprefs.c:1261
 msgid "Browser default"
 msgstr "Laisser le navigateur choisir"
 
-#: ../src/gtkprefs.c:1257
+#: ../gtk/gtkprefs.c:1262
 msgid "Existing window"
 msgstr "Dans une fenĂŞtre ouverte"
 
-#: ../src/gtkprefs.c:1259
+#: ../gtk/gtkprefs.c:1264
 msgid "New tab"
 msgstr "Dans un nouvel onglet"
 
-#: ../src/gtkprefs.c:1273
+#: ../gtk/gtkprefs.c:1278
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -4824,83 +3612,79 @@
 "_Manuel :\n"
 "(%s pour l'URL)"
 
-#: ../src/gtkprefs.c:1309 ../src/gtkprefs.c:1890
-msgid "Logging"
-msgstr "Enregistrement"
-
-#: ../src/gtkprefs.c:1312
+#: ../gtk/gtkprefs.c:1317
 msgid "Log _format:"
-msgstr "_Format des archive :"
-
-#: ../src/gtkprefs.c:1317
+msgstr "_Format des archives :"
+
+#: ../gtk/gtkprefs.c:1322
 msgid "Log all _instant messages"
 msgstr "Archiver tous les _messages"
 
-#: ../src/gtkprefs.c:1319
+#: ../gtk/gtkprefs.c:1324
 msgid "Log all c_hats"
 msgstr "Archiver toutes les _discussions"
 
-#: ../src/gtkprefs.c:1321
+#: ../gtk/gtkprefs.c:1326
 msgid "Log all _status changes to system log"
 msgstr "Archiver tous les _changements d'état dans les archives système"
 
-#: ../src/gtkprefs.c:1469
+#: ../gtk/gtkprefs.c:1474
 msgid "Sound Selection"
 msgstr "Charger un son"
 
-#: ../src/gtkprefs.c:1477
+#: ../gtk/gtkprefs.c:1482
 msgid "Quietest"
 msgstr "Le plus silencieux"
 
-#: ../src/gtkprefs.c:1479
+#: ../gtk/gtkprefs.c:1484
 msgid "Quieter"
 msgstr "Très silencieux"
 
-#: ../src/gtkprefs.c:1481
+#: ../gtk/gtkprefs.c:1486
 msgid "Quiet"
 msgstr "Silencieux"
 
-#: ../src/gtkprefs.c:1483 ../src/protocols/silc/silc.c:672
+#: ../gtk/gtkprefs.c:1488 ../libgaim/protocols/silc/silc.c:670
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/gtkprefs.c:1485
+#: ../gtk/gtkprefs.c:1490
 msgid "Loud"
 msgstr "Fort"
 
-#: ../src/gtkprefs.c:1487
+#: ../gtk/gtkprefs.c:1492
 msgid "Louder"
 msgstr "Très fort"
 
-#: ../src/gtkprefs.c:1489
+#: ../gtk/gtkprefs.c:1494
 msgid "Loudest"
 msgstr "Le plus fort"
 
-#: ../src/gtkprefs.c:1552
+#: ../gtk/gtkprefs.c:1557
 msgid "Sound Method"
 msgstr "Sortie sonore"
 
-#: ../src/gtkprefs.c:1553
+#: ../gtk/gtkprefs.c:1558
 msgid "_Method:"
 msgstr "_Méthode :"
 
-#: ../src/gtkprefs.c:1555
+#: ../gtk/gtkprefs.c:1560
 msgid "Console beep"
 msgstr "Bip de console"
 
-#: ../src/gtkprefs.c:1557
+#: ../gtk/gtkprefs.c:1562
 msgid "Automatic"
 msgstr "Automatique"
 
-#: ../src/gtkprefs.c:1562
+#: ../gtk/gtkprefs.c:1567
 msgid "Command"
 msgstr "Commande"
 
-#: ../src/gtkprefs.c:1563
+#: ../gtk/gtkprefs.c:1568
 msgid "No sounds"
 msgstr "Pas de sons"
 
-#: ../src/gtkprefs.c:1571
+#: ../gtk/gtkprefs.c:1576
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4909,197 +3693,214 @@
 "_Commande à utiliser :\n"
 "(%s pour le nom de fichier)"
 
-#: ../src/gtkprefs.c:1597
+#: ../gtk/gtkprefs.c:1602
 msgid "Sound Options"
 msgstr "Options sonores"
 
-#: ../src/gtkprefs.c:1598
+#: ../gtk/gtkprefs.c:1603
 msgid "Sounds when conversation has _focus"
 msgstr "Jouer les sons mĂŞme quand la _fenĂŞtre est active"
 
-#: ../src/gtkprefs.c:1600
+#: ../gtk/gtkprefs.c:1605
 msgid "_Sounds while away"
 msgstr "Jouer les sons mĂŞme lorsque vous ĂŞtes _absent"
 
-#: ../src/gtkprefs.c:1607
+#: ../gtk/gtkprefs.c:1612
 msgid "Volume:"
 msgstr "Volume :"
 
-#: ../src/gtkprefs.c:1635
+#: ../gtk/gtkprefs.c:1640
 msgid "Sound Events"
 msgstr "Événements sonores"
 
-#: ../src/gtkprefs.c:1686
+#: ../gtk/gtkprefs.c:1691
 msgid "Play"
 msgstr "Jouer"
 
-#: ../src/gtkprefs.c:1693
+#: ../gtk/gtkprefs.c:1698
 msgid "Event"
 msgstr "Événement"
 
-#: ../src/gtkprefs.c:1712
+#: ../gtk/gtkprefs.c:1717
 msgid "Test"
 msgstr "Tester"
 
-#: ../src/gtkprefs.c:1716
+#: ../gtk/gtkprefs.c:1721
 msgid "Reset"
 msgstr "Remise à zéro"
 
-#: ../src/gtkprefs.c:1720
+#: ../gtk/gtkprefs.c:1725
 msgid "Choose..."
 msgstr "Choisir..."
 
-#: ../src/gtkprefs.c:1762
+#: ../gtk/gtkprefs.c:1767
 msgid "_Report idle time:"
 msgstr "_Rapporter le temps d'inactivité :"
 
-#: ../src/gtkprefs.c:1765
+#: ../gtk/gtkprefs.c:1770
 msgid "From last sent message"
 msgstr "Depuis le dernier message envoyé"
 
-#: ../src/gtkprefs.c:1767
+#: ../gtk/gtkprefs.c:1772
 msgid "Based on keyboard or mouse use"
 msgstr "Selon l'activité du clavier ou de la souris"
 
-#: ../src/gtkprefs.c:1776
+#. Away stuff
+#. get_yahoo_status_from_gaim_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#: ../gtk/gtkprefs.c:1779 ../gtk/gtkstatusbox.c:939
+#: ../gtk/plugins/docklet/docklet.c:439 ../libgaim/protocols/gg/gg.c:999
+#: ../libgaim/protocols/irc/irc.c:530 ../libgaim/protocols/irc/msgs.c:223
+#: ../libgaim/protocols/jabber/buddy.c:1371
+#: ../libgaim/protocols/novell/novell.c:2856
+#: ../libgaim/protocols/oscar/oscar.c:694
+#: ../libgaim/protocols/oscar/oscar.c:4406
+#: ../libgaim/protocols/oscar/oscar.c:5473
+#: ../libgaim/protocols/silc/buddy.c:1469
+#: ../libgaim/protocols/yahoo/yahoo.c:3359
+#: ../libgaim/protocols/yahoo/yahoo.c:3432 ../libgaim/status.c:158
+msgid "Away"
+msgstr "Absent"
+
+#: ../gtk/gtkprefs.c:1781
 msgid "_Auto-reply:"
 msgstr "_Réponse automatique :"
 
-#: ../src/gtkprefs.c:1780
+#: ../gtk/gtkprefs.c:1785
 msgid "When both away and idle"
 msgstr "Lorsque absent et inactif"
 
 #. Auto-away stuff
-#: ../src/gtkprefs.c:1786
+#: ../gtk/gtkprefs.c:1791
 msgid "Auto-away"
 msgstr "Absence automatique"
 
-#: ../src/gtkprefs.c:1788
+#: ../gtk/gtkprefs.c:1793
 msgid "Change status when _idle"
 msgstr "Changer d'Ă©tat lorsque _inactif"
 
-#: ../src/gtkprefs.c:1792
+#: ../gtk/gtkprefs.c:1797
 msgid "_Minutes before changing status:"
 msgstr "_Minutes avant de changer d'état :"
 
-#: ../src/gtkprefs.c:1800
+#: ../gtk/gtkprefs.c:1805
 msgid "Change _status to:"
 msgstr "_Changer l'état en :"
 
 #. Signon status stuff
-#: ../src/gtkprefs.c:1821
+#: ../gtk/gtkprefs.c:1826
 msgid "Status at Startup"
 msgstr "État au démarrage"
 
-#: ../src/gtkprefs.c:1823
+#: ../gtk/gtkprefs.c:1828
 msgid "Use status from last _exit at startup"
 msgstr "Utiliser l'Ă©tat Ă  la _fermeture"
 
-#: ../src/gtkprefs.c:1829
+#: ../gtk/gtkprefs.c:1834
 msgid "Status to a_pply at startup:"
 msgstr "État _utilisé au démarrage :"
 
-#: ../src/gtkprefs.c:1880
+#: ../gtk/gtkprefs.c:1885
 msgid "Smiley Themes"
 msgstr "Thèmes des frimousses"
 
-#: ../src/gtkprefs.c:1881
+#: ../gtk/gtkprefs.c:1886
 msgid "Sounds"
 msgstr "Sons"
 
-#: ../src/gtkprefs.c:1882 ../src/protocols/silc/silc.c:1852
+#: ../gtk/gtkprefs.c:1887 ../libgaim/protocols/silc/silc.c:1851
 msgid "Network"
 msgstr "RĂ©seau"
 
-#: ../src/gtkprefs.c:1887
+#: ../gtk/gtkprefs.c:1892
 msgid "Browser"
 msgstr "Navigateur"
 
-#: ../src/gtkprefs.c:1891
+#: ../gtk/gtkprefs.c:1896
 msgid "Away / Idle"
 msgstr "Absence/inactivité"
 
-#: ../src/gtkprivacy.c:79
+#: ../gtk/gtkprivacy.c:79
 msgid "Allow all users to contact me"
 msgstr "Permettre Ă  tous les utilisateurs de me contacter"
 
-#: ../src/gtkprivacy.c:80
+#: ../gtk/gtkprivacy.c:80
 msgid "Allow only the users on my buddy list"
 msgstr "Autoriser uniquement les utilisateurs de ma liste de contacts"
 
-#: ../src/gtkprivacy.c:81
+#: ../gtk/gtkprivacy.c:81
 msgid "Allow only the users below"
 msgstr "Autoriser les utilisateurs ci-dessous"
 
-#: ../src/gtkprivacy.c:82
+#: ../gtk/gtkprivacy.c:82
 msgid "Block all users"
 msgstr "Bloquer tous les utilisateurs"
 
-#: ../src/gtkprivacy.c:83
+#: ../gtk/gtkprivacy.c:83
 msgid "Block only the users below"
 msgstr "Bloquer les utilisateurs ci-dessous"
 
-#: ../src/gtkprivacy.c:372
+#: ../gtk/gtkprivacy.c:372
 msgid "Privacy"
 msgstr "Filtres"
 
-#: ../src/gtkprivacy.c:385
+#: ../gtk/gtkprivacy.c:385
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Les changements prennent effet immédiatement."
 
 #. "Set privacy for:" label
-#: ../src/gtkprivacy.c:397
+#: ../gtk/gtkprivacy.c:397
 msgid "Set privacy for:"
 msgstr "Gérer les filtres pour :"
 
-#: ../src/gtkprivacy.c:560 ../src/gtkprivacy.c:576
+#: ../gtk/gtkprivacy.c:560 ../gtk/gtkprivacy.c:576
 msgid "Permit User"
 msgstr "Autoriser un utilisateur"
 
-#: ../src/gtkprivacy.c:561
+#: ../gtk/gtkprivacy.c:561
 msgid "Type a user you permit to contact you."
 msgstr "Personne Ă  autoriser"
 
-#: ../src/gtkprivacy.c:562
+#: ../gtk/gtkprivacy.c:562
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "Saisissez le nom de l'utilisateur que vous autorisez Ă  vous contacter"
 
-#: ../src/gtkprivacy.c:565 ../src/gtkprivacy.c:578
+#: ../gtk/gtkprivacy.c:565 ../gtk/gtkprivacy.c:578
 msgid "_Permit"
 msgstr "_Autoriser"
 
-#: ../src/gtkprivacy.c:570
+#: ../gtk/gtkprivacy.c:570
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Permettre à %s de vous contacter ?"
 
-#: ../src/gtkprivacy.c:572
+#: ../gtk/gtkprivacy.c:572
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Êtes-vous sûr de vouloir autoriser %s à vous contacter ?"
 
-#: ../src/gtkprivacy.c:599 ../src/gtkprivacy.c:612
+#: ../gtk/gtkprivacy.c:599 ../gtk/gtkprivacy.c:612
 msgid "Block User"
 msgstr "Bloquer un utilisateur"
 
-#: ../src/gtkprivacy.c:600
+#: ../gtk/gtkprivacy.c:600
 msgid "Type a user to block."
 msgstr "Personne Ă  bloquer"
 
-#: ../src/gtkprivacy.c:601
+#: ../gtk/gtkprivacy.c:601
 msgid "Please enter the name of the user you wish to block."
 msgstr "Saisissez le nom de l'utilisateur que vous désirez bloquer"
 
-#: ../src/gtkprivacy.c:603 ../src/gtkprivacy.c:614
+#: ../gtk/gtkprivacy.c:603 ../gtk/gtkprivacy.c:614
 msgid "_Block"
 msgstr "_Bloquer"
 
-#: ../src/gtkprivacy.c:608
+#: ../gtk/gtkprivacy.c:608
 #, c-format
 msgid "Block %s?"
 msgstr "Bloquer %s ?"
 
-#: ../src/gtkprivacy.c:610
+#: ../gtk/gtkprivacy.c:610
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Êtes-vous sûr de vouloir bloquer %s ?"
@@ -5107,249 +3908,199 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../src/gtkrequest.c:267 ../src/protocols/msn/dialog.c:132
-#: ../src/protocols/msn/msn.c:555 ../src/protocols/msn/msn.c:564
-#: ../src/protocols/novell/novell.c:1919 ../src/protocols/silc/buddy.c:313
-#: ../src/protocols/silc/pk.c:117 ../src/protocols/silc/wb.c:303
-#: ../src/request.h:1335
+#: ../gtk/gtkrequest.c:267 ../libgaim/protocols/msn/dialog.c:132
+#: ../libgaim/protocols/msn/msn.c:555 ../libgaim/protocols/msn/msn.c:564
+#: ../libgaim/protocols/novell/novell.c:1920
+#: ../libgaim/protocols/silc/buddy.c:313 ../libgaim/protocols/silc/pk.c:117
+#: ../libgaim/protocols/silc/wb.c:303 ../libgaim/request.h:1335
 msgid "Yes"
 msgstr "Oui"
 
-#: ../src/gtkrequest.c:268 ../src/protocols/msn/dialog.c:133
-#: ../src/protocols/msn/msn.c:555 ../src/protocols/msn/msn.c:564
-#: ../src/protocols/novell/novell.c:1920 ../src/protocols/silc/buddy.c:314
-#: ../src/protocols/silc/pk.c:118 ../src/protocols/silc/wb.c:304
-#: ../src/request.h:1335
+#: ../gtk/gtkrequest.c:268 ../libgaim/protocols/msn/dialog.c:133
+#: ../libgaim/protocols/msn/msn.c:555 ../libgaim/protocols/msn/msn.c:564
+#: ../libgaim/protocols/novell/novell.c:1921
+#: ../libgaim/protocols/silc/buddy.c:314 ../libgaim/protocols/silc/pk.c:118
+#: ../libgaim/protocols/silc/wb.c:304 ../libgaim/request.h:1335
 msgid "No"
 msgstr "Non"
 
-#: ../src/gtkrequest.c:271
+#: ../gtk/gtkrequest.c:271
 msgid "Apply"
 msgstr "Appliquer"
 
-#: ../src/gtkrequest.c:272 ../src/protocols/msn/msn.c:357
-#: ../src/protocols/silc/util.c:350
-msgid "Close"
-msgstr "Fermer"
-
-#: ../src/gtkrequest.c:1467
+#: ../gtk/gtkrequest.c:1467
 msgid "That file already exists"
 msgstr "Ce fichier existe déjà"
 
-#: ../src/gtkrequest.c:1468
+#: ../gtk/gtkrequest.c:1468
 msgid "Would you like to overwrite it?"
 msgstr "Voulez-vous l'écraser ?"
 
-#: ../src/gtkrequest.c:1469
+#: ../gtk/gtkrequest.c:1469
 msgid "Overwrite"
 msgstr "Écraser"
 
-#: ../src/gtkrequest.c:1470
+#: ../gtk/gtkrequest.c:1470
 msgid "Choose New Name"
 msgstr "Choisir un nouveau nom"
 
-#: ../src/gtkrequest.c:1512 ../src/gtkrequest.c:1553
+#: ../gtk/gtkrequest.c:1512 ../gtk/gtkrequest.c:1553
 msgid "Save File..."
 msgstr "Sauver le fichier..."
 
-#: ../src/gtkrequest.c:1513 ../src/gtkrequest.c:1554
+#: ../gtk/gtkrequest.c:1513 ../gtk/gtkrequest.c:1554
 msgid "Open File..."
 msgstr "Ouvrir un fichier..."
 
-#: ../src/gtkrequest.c:1601 ../src/gtkrequest.c:1615
+#: ../gtk/gtkrequest.c:1601 ../gtk/gtkrequest.c:1615
 msgid "Select Folder..."
 msgstr "Choisir un dossier..."
 
-#: ../src/gtkroomlist.c:287
+#: ../gtk/gtkroomlist.c:287
 msgid "_Add"
 msgstr "_Ajouter"
 
-#: ../src/gtkroomlist.c:354
+#: ../gtk/gtkroomlist.c:355
 msgid "Room List"
 msgstr "Liste des salons de discussion"
 
 #. list button
-#: ../src/gtkroomlist.c:424
+#: ../gtk/gtkroomlist.c:425
 msgid "_Get List"
 msgstr "Récupérer la _liste"
 
 #. add button
-#: ../src/gtkroomlist.c:432
+#: ../gtk/gtkroomlist.c:433
 msgid "_Add Chat"
 msgstr "_Ajouter une discussion"
 
-#: ../src/gtksavedstatuses.c:433 ../src/protocols/jabber/buddy.c:283
-#: ../src/protocols/jabber/buddy.c:920 ../src/protocols/novell/novell.c:1484
-msgid "Title"
-msgstr "Titre"
-
-#: ../src/gtksavedstatuses.c:448
-msgid "Type"
-msgstr "Type"
-
-#: ../src/gtksavedstatuses.c:459 ../src/gtksavedstatuses.c:923
-#: ../src/protocols/bonjour/bonjour.c:256
-#: ../src/protocols/bonjour/bonjour.c:263 ../src/protocols/gg/gg.c:1590
-#: ../src/protocols/gg/gg.c:1600 ../src/protocols/gg/gg.c:1606
-#: ../src/protocols/gg/gg.c:1615 ../src/protocols/gg/gg.c:1620
-#: ../src/protocols/irc/irc.c:227 ../src/protocols/jabber/jabber.c:1202
-#: ../src/protocols/jabber/jabber.c:1212 ../src/protocols/jabber/jabber.c:1222
-#: ../src/protocols/jabber/jabber.c:1232 ../src/protocols/jabber/jabber.c:1242
-#: ../src/protocols/jabber/jabber.c:1254 ../src/protocols/novell/novell.c:2866
-#: ../src/protocols/novell/novell.c:2972 ../src/protocols/novell/novell.c:2978
-#: ../src/protocols/novell/novell.c:2984 ../src/protocols/oscar/oscar.c:5409
-#: ../src/protocols/oscar/oscar.c:5424 ../src/protocols/oscar/oscar.c:5429
-#: ../src/protocols/oscar/oscar.c:5637 ../src/protocols/oscar/oscar.c:5649
-#: ../src/protocols/sametime/sametime.c:3266
-#: ../src/protocols/sametime/sametime.c:3272
-#: ../src/protocols/sametime/sametime.c:3278
-#: ../src/protocols/sametime/sametime.c:3357
-#: ../src/protocols/silc/buddy.c:1544 ../src/protocols/simple/simple.c:242
-#: ../src/protocols/yahoo/yahoo.c:3315 ../src/protocols/yahoo/yahoo.c:3321
-#: ../src/protocols/zephyr/zephyr.c:2281
-msgid "Message"
-msgstr "Message"
-
-#: ../src/gtksavedstatuses.c:526
-msgid "Saved Statuses"
-msgstr "États prédéfinis"
-
 #. Use button
-#: ../src/gtksavedstatuses.c:549 ../src/gtksavedstatuses.c:1183
+#: ../gtk/gtksavedstatuses.c:549 ../gtk/gtksavedstatuses.c:1183
 msgid "_Use"
 msgstr "_Utiliser"
 
-#: ../src/gtksavedstatuses.c:695
+#: ../gtk/gtksavedstatuses.c:695
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Ce titre est déjà utilisé. Vous devez saisir un titre unique."
 
-#: ../src/gtksavedstatuses.c:883
+#: ../gtk/gtksavedstatuses.c:883
 msgid "Different"
 msgstr "Différent"
 
-#: ../src/gtksavedstatuses.c:912 ../src/gtksavedstatuses.c:1059
-#: ../src/protocols/gg/gg.c:1024 ../src/protocols/gg/gg.c:1573
-#: ../src/protocols/gg/gg.c:1577 ../src/protocols/jabber/buddy.c:629
-#: ../src/protocols/jabber/buddy.c:636 ../src/protocols/jabber/buddy.c:662
-#: ../src/protocols/jabber/jabber.c:1173 ../src/protocols/msn/msn.c:546
-#: ../src/protocols/novell/novell.c:2865 ../src/protocols/novell/novell.c:2869
-#: ../src/protocols/oscar/oscar.c:784 ../src/protocols/oscar/oscar.c:790
-#: ../src/protocols/oscar/oscar.c:793 ../src/protocols/yahoo/yahoo.c:2895
-msgid "Status"
-msgstr "État"
-
-#: ../src/gtksavedstatuses.c:1076
+#: ../gtk/gtksavedstatuses.c:1076
 msgid "_Title:"
 msgstr "_Titre :"
 
-#: ../src/gtksavedstatuses.c:1095 ../src/gtksavedstatuses.c:1416
+#: ../gtk/gtksavedstatuses.c:1095 ../gtk/gtksavedstatuses.c:1416
 msgid "_Status:"
 msgstr "É_tat :"
 
 #. Different status message expander
-#: ../src/gtksavedstatuses.c:1127
+#: ../gtk/gtksavedstatuses.c:1127
 msgid "Use a _different status for some accounts"
 msgstr "Utiliser un état _différent pour certains comptes"
 
 #. Save & Use button
-#: ../src/gtksavedstatuses.c:1191
+#: ../gtk/gtksavedstatuses.c:1191
 msgid "Sa_ve & Use"
 msgstr "Enregistrer _et utiliser"
 
-#: ../src/gtksavedstatuses.c:1397
+#: ../gtk/gtksavedstatuses.c:1397
 #, c-format
 msgid "Status for %s"
 msgstr "État pour %s"
 
-#: ../src/gtksound.c:59
+#: ../gtk/gtksound.c:63
 msgid "Buddy logs in"
 msgstr "Connexion d'un contact"
 
-#: ../src/gtksound.c:60
+#: ../gtk/gtksound.c:64
 msgid "Buddy logs out"
 msgstr "DĂ©connexion d'un contact"
 
-#: ../src/gtksound.c:61
+#: ../gtk/gtksound.c:65
 msgid "Message received"
 msgstr "RĂ©ception d'un message"
 
-#: ../src/gtksound.c:62
+#: ../gtk/gtksound.c:66
 msgid "Message received begins conversation"
 msgstr "DĂ©but d'une conversation"
 
-#: ../src/gtksound.c:63
+#: ../gtk/gtksound.c:67
 msgid "Message sent"
 msgstr "Envoi d'un message"
 
-#: ../src/gtksound.c:64
+#: ../gtk/gtksound.c:68
 msgid "Person enters chat"
 msgstr "Quelqu'un entre dans la discussion"
 
-#: ../src/gtksound.c:65
+#: ../gtk/gtksound.c:69
 msgid "Person leaves chat"
 msgstr "Quelqu'un quitte la discussion"
 
-#: ../src/gtksound.c:66
+#: ../gtk/gtksound.c:70
 msgid "You talk in chat"
 msgstr "Vous parlez dans la discussion"
 
-#: ../src/gtksound.c:67
+#: ../gtk/gtksound.c:71
 msgid "Others talk in chat"
 msgstr "Quelqu'un parle dans la discussion"
 
-#: ../src/gtksound.c:70
+#: ../gtk/gtksound.c:74
 msgid "Someone says your screen name in chat"
 msgstr "Quelqu'un dit votre pseudonyme dans la discussion"
 
+#: ../gtk/gtksound.c:310
+msgid "GStreamer Failure"
+msgstr "Erreur GStreamer"
+
+#: ../gtk/gtksound.c:311
+msgid "GStreamer failed to initialize."
+msgstr "GStreamer n'a pas pu être initialisé."
+
 #. connect to the server
-#: ../src/gtkstatusbox.c:368 ../src/protocols/irc/irc.c:313
-#: ../src/protocols/jabber/jabber.c:995 ../src/protocols/msn/session.c:344
-#: ../src/protocols/novell/novell.c:2181 ../src/protocols/oscar/oscar.c:1259
-#: ../src/protocols/sametime/sametime.c:3685
-#: ../src/protocols/simple/simple.c:1615 ../src/protocols/yahoo/yahoo.c:2587
-#: ../src/protocols/zephyr/zephyr.c:1565
+#: ../gtk/gtkstatusbox.c:550 ../libgaim/protocols/irc/irc.c:329
+#: ../libgaim/protocols/jabber/jabber.c:1009
+#: ../libgaim/protocols/msn/session.c:344
+#: ../libgaim/protocols/novell/novell.c:2185
+#: ../libgaim/protocols/oscar/oscar.c:1224 ../libgaim/protocols/qq/qq.c:134
+#: ../libgaim/protocols/sametime/sametime.c:3681
+#: ../libgaim/protocols/simple/simple.c:1673
+#: ../libgaim/protocols/yahoo/yahoo.c:2715
+#: ../libgaim/protocols/zephyr/zephyr.c:1617
 msgid "Connecting"
 msgstr "Connexion en cours"
 
-#: ../src/gtkstock.c:138
-msgid "_Alias"
-msgstr "_Alias"
-
-#: ../src/gtkstock.c:140
-msgid "Close _tabs"
-msgstr "Fermer les _onglets"
-
-#: ../src/gtkstock.c:142
-msgid "_Get Info"
-msgstr "_Récupérer les infos"
-
-#: ../src/gtkstock.c:143
-msgid "_Invite"
-msgstr "_Inviter"
-
-#: ../src/gtkstock.c:144
-msgid "_Modify"
-msgstr "_Modifier"
-
-#: ../src/gtkstock.c:145
-msgid "_Open Mail"
-msgstr "_Ouvrir le courrier"
-
-#: ../src/gtkutils.c:1306 ../src/gtkutils.c:1331
+#: ../gtk/gtkstatusbox.c:938 ../gtk/plugins/docklet/docklet.c:435
+#: ../libgaim/protocols/gg/gg.c:996 ../libgaim/protocols/jabber/buddy.c:1367
+#: ../libgaim/protocols/msn/state.c:29 ../libgaim/protocols/msn/state.c:30
+#: ../libgaim/protocols/msn/state.c:37 ../libgaim/protocols/msn/state.c:38
+#: ../libgaim/protocols/novell/novell.c:2853
+#: ../libgaim/protocols/yahoo/yahoo.c:2885 ../libgaim/status.c:155
+msgid "Available"
+msgstr "Disponible"
+
+#: ../gtk/gtkstatusbox.c:940 ../gtk/plugins/docklet/docklet.c:443
+#: ../libgaim/protocols/oscar/oscar.c:698
+#: ../libgaim/protocols/yahoo/yahoo.c:2879 ../libgaim/status.c:157
+msgid "Invisible"
+msgstr "Invisible"
+
+#: ../gtk/gtkutils.c:1308 ../gtk/gtkutils.c:1333
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "L'erreur suivante est survenue au chargement de %s : %s"
 
-#: ../src/gtkutils.c:1308 ../src/gtkutils.c:1333
+#: ../gtk/gtkutils.c:1310 ../gtk/gtkutils.c:1335
 msgid "Failed to load image"
 msgstr "Impossible de charger l'image."
 
-#: ../src/gtkutils.c:1408
+#: ../gtk/gtkutils.c:1410
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Impossible d'envoyer le dossier %s."
 
-#: ../src/gtkutils.c:1410
+#: ../gtk/gtkutils.c:1412
 msgid ""
 "Gaim cannot transfer a folder. You will need to send the files within "
 "individually"
@@ -5357,11 +4108,11 @@
 "Gaim ne peut pas transférer de dossier. Vous devez envoyer les fichiers du "
 "dossier individuellement."
 
-#: ../src/gtkutils.c:1438 ../src/gtkutils.c:1447 ../src/gtkutils.c:1452
+#: ../gtk/gtkutils.c:1440 ../gtk/gtkutils.c:1449 ../gtk/gtkutils.c:1454
 msgid "You have dragged an image"
 msgstr "Vous avez déposé une image."
 
-#: ../src/gtkutils.c:1439
+#: ../gtk/gtkutils.c:1441
 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."
@@ -5369,23 +4120,23 @@
 "Vous pouvez envoyer cette image Ă  votre correspondant, l'incorporer dans ce "
 "message ou l'utiliser en tant qu'icĂ´ne pour cet utilisateur."
 
-#: ../src/gtkutils.c:1443 ../src/gtkutils.c:1458
+#: ../gtk/gtkutils.c:1445 ../gtk/gtkutils.c:1460
 msgid "Set as buddy icon"
 msgstr "Utiliser comme icĂ´ne"
 
-#: ../src/gtkutils.c:1444 ../src/gtkutils.c:1459
+#: ../gtk/gtkutils.c:1446 ../gtk/gtkutils.c:1461
 msgid "Send image file"
 msgstr "Envoyer l'image"
 
-#: ../src/gtkutils.c:1445 ../src/gtkutils.c:1459
+#: ../gtk/gtkutils.c:1447 ../gtk/gtkutils.c:1461
 msgid "Insert in message"
 msgstr "Insérer dans un message"
 
-#: ../src/gtkutils.c:1448
+#: ../gtk/gtkutils.c:1450
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Voulez-vous l'utiliser en tant qu'icône pour cette utilisateur ?"
 
-#: ../src/gtkutils.c:1453
+#: ../gtk/gtkutils.c:1455
 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."
@@ -5393,7 +4144,7 @@
 "Vous pouvez envoyer cette image Ă  votre correspondant ou l'utiliser en tant "
 "qu'icĂ´ne pour cet utilisateur."
 
-#: ../src/gtkutils.c:1455
+#: ../gtk/gtkutils.c:1457
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -5406,11 +4157,11 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../src/gtkutils.c:1509
+#: ../gtk/gtkutils.c:1511
 msgid "Cannot send launcher"
 msgstr "Impossible d'envoyer ce lien."
 
-#: ../src/gtkutils.c:1509
+#: ../gtk/gtkutils.c:1511
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -5418,40 +4169,1631 @@
 "Vous avez déposé un lien du bureau. Vous vouliez probablement envoyer le "
 "fichier vers lequel pointe ce lien au lieu du lien."
 
-#: ../src/gtkwhiteboard.c:756 ../src/gtkwhiteboard.c:775
+#: ../gtk/gtkutils.c:2340
+#, c-format
+msgid ""
+"<b>File:</b> %s\n"
+"<b>File size:</b> %s\n"
+"<b>Image size:</b> %dx%d"
+msgstr ""
+"<b>Fichier :</b> %s\n"
+"<b>Taille du fichier :</b> %s\n"
+"<b>Taille de l'image :</b> %dx%d"
+
+#. Label
+#: ../gtk/gtkutils.c:2384 ../gtk/gtkutils.c:2406
+#: ../gtk/plugins/gevolution/new_person_dialog.c:338
+#: ../libgaim/protocols/oscar/oscar.c:600
+msgid "Buddy Icon"
+msgstr "IcĂ´ne du contact"
+
+#: ../gtk/gtkutils.c:2726
+#, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "Impossible d'ouvrir le fichier « %s » : %s"
+
+#: ../gtk/gtkutils.c:2775
+#, c-format
+msgid ""
+"Failed to load image '%s': reason not known, probably a corrupt image file"
+msgstr ""
+"Impossible de charger l'image « %s » : la raison est inconnue, le fichier "
+"est peut-être endommagé."
+
+#: ../gtk/gtkwhiteboard.c:756 ../gtk/gtkwhiteboard.c:775
 msgid "Save File"
 msgstr "Sauver le fichier"
 
-#: ../src/gtkwhiteboard.c:863
+#: ../gtk/gtkwhiteboard.c:863
 msgid "Select color"
 msgstr "Choisir la couleur"
 
-#: ../src/log.c:181
+#: ../gtk/plugins/cap/cap.c:428
+msgid "Display Statistics"
+msgstr "Afficher les statistiques"
+
+#: ../gtk/plugins/cap/cap.c:440 ../gtk/plugins/cap/cap.c:443
+msgid "Response Probability:"
+msgstr "Probabilité de réponse :"
+
+#: ../gtk/plugins/cap/cap.c:789
+msgid "Statistics Configuration"
+msgstr "Configuration des statistiques"
+
+#. msg_difference spinner
+#: ../gtk/plugins/cap/cap.c:792
+msgid "Maximum response timeout:"
+msgstr "Temps d'attente de réponse maximum :"
+
+#: ../gtk/plugins/cap/cap.c:795 ../gtk/plugins/cap/cap.c:802
+#: ../gtk/plugins/cap/cap.c:809
+msgid "minutes"
+msgstr "minutes"
+
+#. last_seen spinner
+#: ../gtk/plugins/cap/cap.c:799
+msgid "Maximum last-seen difference:"
+msgstr "Différence maximale entre rencontres :"
+
+#. threshold spinner
+#: ../gtk/plugins/cap/cap.c:806
+msgid "Threshold:"
+msgstr "Seuil :"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../gtk/plugins/cap/cap.c:915
+msgid "Contact Availability Prediction plugin."
+msgstr "Plugin de prédiction de disponibilité des contacts."
+
+#. *  summary
+#: ../gtk/plugins/cap/cap.c:916
+msgid ""
+"The contact availability plugin (cap) is used to display statistical "
+"information about buddies in a users contact list."
+msgstr ""
+"Ce plugin est utilisé pour afficher des informations statistiques à propos "
+"des contacts de l'utilisateur."
+
+#: ../gtk/plugins/contact_priority.c:61
+msgid "Buddy is idle"
+msgstr "L'utilisateur est inactif"
+
+#: ../gtk/plugins/contact_priority.c:62
+msgid "Buddy is away"
+msgstr "L'utilisateur est absent"
+
+#: ../gtk/plugins/contact_priority.c:63
+msgid "Buddy is \"extended\" away"
+msgstr "L'utilisateur est en absence prolongée"
+
+#. Not used yet.
+#: ../gtk/plugins/contact_priority.c:66
+msgid "Buddy is mobile"
+msgstr "L'utilisateur est sur téléphone portable"
+
+#: ../gtk/plugins/contact_priority.c:68
+msgid "Buddy is offline"
+msgstr "L'utilisateur est déconnecté"
+
+#: ../gtk/plugins/contact_priority.c:90
+msgid "Point values to use when..."
+msgstr "Choisissez les valeurs Ă  utiliser quand..."
+
+#: ../gtk/plugins/contact_priority.c:118
+msgid ""
+"The buddy with the <i>largest score</i> is the buddy who will have priority "
+"in the contact.\n"
+msgstr ""
+"Le nom d'utilisateur avec le score <i>le plus grand</i> sera l'entrée "
+"utilisée pour le contact>\n"
+
+#: ../gtk/plugins/contact_priority.c:125
+msgid "Use last buddy when scores are equal"
+msgstr "Utiliser l'utilisateur précédent tant que les scores sont égaux"
+
+#: ../gtk/plugins/contact_priority.c:130
+msgid "Point values to use for account..."
+msgstr "Choisissez les valeurs Ă  utiliser pour chaque compte..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/contact_priority.c:182
+msgid "Contact Priority"
+msgstr "Priorité du contact"
+
+#. *< name
+#. *< version
+#. *< summary
+#: ../gtk/plugins/contact_priority.c:185
+msgid ""
+"Allows for controlling the values associated with different buddy states."
+msgstr ""
+"Permet de changer les valeurs associés aux différents états des utilisateurs "
+"dans un contact."
+
+#. *< description
+#: ../gtk/plugins/contact_priority.c:187
+msgid ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
+msgstr ""
+"Permet de changer les valeurs attribuées aux états inactif, absent et "
+"déconnecté pour le calcul de la priorité des utilisateurs d'un contact."
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:146
+msgid "Crazychat"
+msgstr "Crazychat"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:149
+msgid "Plugin to establish a Crazychat session."
+msgstr "Plugin pour Ă©tablir une session de Crazychat"
+
+#. *  description
+#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:151
+msgid "Uses Gaim to obtain buddy ips to connect for a Crazychat session"
+msgstr ""
+"Utilise Gaim pour récupérer les adresses IP des contacts avec lesquels se "
+"connecter pour une session de Crazychat."
+
+#. make the network configuration frame
+#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:295
+msgid "Network Configuration"
+msgstr "Configuration du réseau"
+
+#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:307
+msgid "TCP port"
+msgstr "Port TCP"
+
+#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:317
+msgid "UDP port"
+msgstr "Port UDP"
+
+#. make the feature configuration frame
+#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:329
+msgid "Feature Calibration"
+msgstr "Étalonnage facial"
+
+#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:350
+msgid "Disabled"
+msgstr "Désactivé"
+
+#: ../gtk/plugins/docklet/docklet.c:154
+msgid "Right-click for more unread messages...\n"
+msgstr "Clic droit pour plus de messages non lus...\n"
+
+#: ../gtk/plugins/docklet/docklet.c:432
+msgid "Change Status"
+msgstr "Changer d'Ă©tat"
+
+#: ../gtk/plugins/docklet/docklet.c:484
+msgid "Show Buddy List"
+msgstr "Afficher la liste de contacts"
+
+#: ../gtk/plugins/docklet/docklet.c:510
+msgid "New Message..."
+msgstr "Nouveau message..."
+
+#: ../gtk/plugins/docklet/docklet.c:525
+msgid "Mute Sounds"
+msgstr "Silencieux"
+
+#. TODO: need a submenu to change status, this needs to "link"
+#. * to the status in the buddy list gtkstatusbox
+#.
+#: ../gtk/plugins/docklet/docklet.c:538
+msgid "Quit"
+msgstr "Quitter"
+
+#: ../gtk/plugins/docklet/docklet.c:679
+msgid "Blink tray icon for unread..."
+msgstr "Faire clignoter l'icĂ´ne de notification pour les messages non lus..."
+
+#: ../gtk/plugins/docklet/docklet.c:682
+msgid "_Instant Messages:"
+msgstr "Messages _instantanés :"
+
+#: ../gtk/plugins/docklet/docklet.c:685
+msgid "In hidden conversations"
+msgstr "Pour les conversations cachées"
+
+#: ../gtk/plugins/docklet/docklet.c:690
+msgid "C_hat Messages:"
+msgstr "Discussions :"
+
+#: ../gtk/plugins/docklet/docklet.c:693
+msgid "When my nick is said"
+msgstr "Quand mon pseudo apparaît"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/docklet/docklet.c:720
+msgid "System Tray Icon"
+msgstr "IcĂ´ne de notification"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/docklet/docklet.c:723
+msgid "Displays an icon for Gaim in the system tray."
+msgstr "Affiche une icĂ´ne pour Gaim dans la zone de notification."
+
+#. *  description
+#: ../gtk/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 ""
+"Ajoute une icĂ´ne de notification (pour Gnome, KDE ou Windows par exemple) "
+"pour afficher l'état de Gaim, permettre un accès rapide aux fonctions "
+"usuelles et cacher ou non la liste de contacts. Il permet aussi de prévenir "
+"quand il reste des messages non lus."
+
+#: ../gtk/plugins/docklet/eggtrayicon.c:129
+msgid "Orientation"
+msgstr "Disposition"
+
+#: ../gtk/plugins/docklet/eggtrayicon.c:130
+msgid "The orientation of the tray."
+msgstr "Orientation de l'espace de notification"
+
+#: ../gtk/plugins/extplacement.c:80
+msgid "By conversation count"
+msgstr "Par nombre de conversations"
+
+#: ../gtk/plugins/extplacement.c:101
+msgid "Conversation Placement"
+msgstr "Emplacement des conversations"
+
+#: ../gtk/plugins/extplacement.c:106
+msgid "Number of conversations per window"
+msgstr "Nombre de conversations par fenĂŞtre"
+
+#: ../gtk/plugins/extplacement.c:112
+msgid "Separate IM and Chat windows when placing by number"
+msgstr ""
+"SĂ©parer les messages et les discussions quand leur nombre par fenĂŞtre est "
+"limité"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/extplacement.c:135
+msgid "ExtPlacement"
+msgstr "ExtEmplacement"
+
+#. *< name
+#. *< version
+#: ../gtk/plugins/extplacement.c:137
+msgid "Extra conversation placement options."
+msgstr "Options supplémentaires d'emplacement des conversations"
+
+#. *< summary
+#. *  description
+#: ../gtk/plugins/extplacement.c:139
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr ""
+"Limite le nombre de conversation par fenĂŞtre ou permet d'utiliser des "
+"fenêtres différentes pour les messages et les discussions."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gaiminc.c:91
+msgid "Gaim Demonstration Plugin"
+msgstr "Plugin de démonstration"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/gaiminc.c:94
+msgid "An example plugin that does stuff - see the description."
+msgstr "Un exemple de plugin -- cf. description."
+
+#. *  description
+#: ../gtk/plugins/gaiminc.c:96
+msgid ""
+"This is a really cool plugin that does a lot of stuff:\n"
+"- It tells you who wrote the program when you log in\n"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
+msgstr ""
+"Ce plugin vraiment cool fait plein de choses :\n"
+"- il annonce qui a Ă©crit le programme Ă  la connexion\n"
+"- il écrit à l'envers tous les messages reçus\n"
+"- il envoie automatiquement un message Ă  tous les contacts qui se connectent"
+
+#: ../gtk/plugins/gaimrc.c:41
+msgid "Cursor Color"
+msgstr "Couleur du curseur"
+
+#: ../gtk/plugins/gaimrc.c:42
+msgid "Secondary Cursor Color"
+msgstr "Deuxième couleur du curseur"
+
+#: ../gtk/plugins/gaimrc.c:43
+msgid "Hyperlink Color"
+msgstr "Couleur des liens hypertextes"
+
+#: ../gtk/plugins/gaimrc.c:56
+msgid "GtkTreeView Expander Size"
+msgstr "Taille de l'Ă©tendeur GtkTreeView"
+
+#: ../gtk/plugins/gaimrc.c:57
+msgid "GtkTreeView Horizontal Separation"
+msgstr "SĂ©paration horizontale GtkTreeView"
+
+#: ../gtk/plugins/gaimrc.c:76
+msgid "Conversation Entry"
+msgstr "Ligne de conversation"
+
+#: ../gtk/plugins/gaimrc.c:77
+msgid "Conversation History"
+msgstr "Archive de conversation"
+
+#: ../gtk/plugins/gaimrc.c:78
+msgid "Log Viewer"
+msgstr "Afficheur d'archives"
+
+#: ../gtk/plugins/gaimrc.c:79
+msgid "Request Dialog"
+msgstr "Boite de message pour requĂŞte"
+
+#: ../gtk/plugins/gaimrc.c:80
+msgid "Notify Dialog"
+msgstr "Boite de message de notification"
+
+#: ../gtk/plugins/gaimrc.c:91
+msgid "GtkTreeView Indent Expanders"
+msgstr "Indentation des Ă©tendeurs GtkTreeView"
+
+#: ../gtk/plugins/gaimrc.c:320
+#, c-format
+msgid "Select Color for %s"
+msgstr "Choisissez la couleur pour %s"
+
+#: ../gtk/plugins/gaimrc.c:322
+msgid "Select Color"
+msgstr "Choisissez la couleur"
+
+#: ../gtk/plugins/gaimrc.c:361
+#, c-format
+msgid "Select Font for %s"
+msgstr "Choisissez la police pour %s"
+
+#: ../gtk/plugins/gaimrc.c:398
+msgid "Select Interface Font"
+msgstr "Choisissez la police"
+
+#: ../gtk/plugins/gaimrc.c:448
+msgid "General"
+msgstr "Général"
+
+#: ../gtk/plugins/gaimrc.c:453
+msgid "GTK+ Interface Font"
+msgstr "Police de l'interface GTK+"
+
+#: ../gtk/plugins/gaimrc.c:473
+msgid "GTK+ Text Shortcut Theme"
+msgstr "Raccourci du thème GTK+"
+
+#: ../gtk/plugins/gaimrc.c:508
+msgid "Interface colors"
+msgstr "Couleurs de l'interface"
+
+#: ../gtk/plugins/gaimrc.c:532
+msgid "Widget Sizes"
+msgstr "Tailles des éléments"
+
+#: ../gtk/plugins/gaimrc.c:553
+msgid "Fonts"
+msgstr "Polices"
+
+#: ../gtk/plugins/gaimrc.c:576
+msgid "Tools"
+msgstr "Outils"
+
+#: ../gtk/plugins/gaimrc.c:581
+#, c-format
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr "Écrire les préférences dans %s%sgtkrc-2.0"
+
+#: ../gtk/plugins/gaimrc.c:589
+msgid "Re-read gtkrc files"
+msgstr "Relire les fichiers gtkrc"
+
+#: ../gtk/plugins/gaimrc.c:616
+msgid "Gaim GTK+ Theme Control"
+msgstr "Contrôle du thème GTK+ Gaim"
+
+#: ../gtk/plugins/gaimrc.c:618 ../gtk/plugins/gaimrc.c:619
+msgid "Provides access to commonly used gtkrc settings."
+msgstr "Fournit un accès aux préférences couramment utilisés du fichier gtkrc."
+
+#. Configuration frame
+#: ../gtk/plugins/gestures/gestures.c:235
+msgid "Mouse Gestures Configuration"
+msgstr "Configuration des mouvements de souris"
+
+#: ../gtk/plugins/gestures/gestures.c:242
+msgid "Middle mouse button"
+msgstr "Bouton du milieu"
+
+#: ../gtk/plugins/gestures/gestures.c:247
+msgid "Right mouse button"
+msgstr "Bouton de droite"
+
+#. "Visual gesture display" checkbox
+#: ../gtk/plugins/gestures/gestures.c:259
+msgid "_Visual gesture display"
+msgstr "Montrer _visuellement le mouvement"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gestures/gestures.c:289
+msgid "Mouse Gestures"
+msgstr "Mouvements de souris"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/gestures/gestures.c:292
+msgid "Provides support for mouse gestures"
+msgstr "Fournit le support pour les mouvements de souris."
+
+#. *  description
+#: ../gtk/plugins/gestures/gestures.c:294
+msgid ""
+"Allows support for mouse gestures in conversation windows.\n"
+"Drag the middle mouse button to perform certain actions:\n"
+"\n"
+"Drag down and then to the right to close a conversation.\n"
+"Drag up and then to the left to switch to the previous conversation.\n"
+"Drag up and then to the right to switch to the next conversation."
+msgstr ""
+"Permet d'utiliser les mouvements de souris dans les fenĂŞtres de "
+"conversation.\n"
+"Utilisez le bouton du milieu pour effectuer diverses actions :\n"
+"\n"
+"Glissez vers le bas puis la droite pour fermer une conversation.\n"
+"Glissez vers le haut puis la gauche pour passer Ă  la conversation "
+"précédente.\n"
+"Glissez vers le haut puis la droite pour passer Ă  la conversation suivante."
+
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:142
+msgid "Instant Messaging"
+msgstr "Messagerie instantanée"
+
+#. Add the label.
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:455
+msgid "Select a person from your address book below, or add a new person."
+msgstr ""
+"Choisissez une personne dans votre carnet d'adresses ou créez une nouvelle "
+"personne."
+
+#. "Search"
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:468
+#: ../gtk/plugins/gevolution/assoc-buddy.c:353
+#: ../libgaim/protocols/jabber/buddy.c:1724
+#: ../libgaim/protocols/oscar/oscar.c:6085 ../libgaim/protocols/qq/group.c:121
+#: ../libgaim/protocols/qq/group_im.c:137
+#: ../libgaim/protocols/qq/sys_msg.c:160 ../libgaim/protocols/qq/sys_msg.c:230
+#: ../libgaim/protocols/qq/sys_msg.c:248
+#: ../libgaim/protocols/sametime/sametime.c:5532
+msgid "Search"
+msgstr "Recherche"
+
+#. "New Person" button
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:575
+#: ../gtk/plugins/gevolution/assoc-buddy.c:464
+#: ../gtk/plugins/gevolution/new_person_dialog.c:251
+msgid "New Person"
+msgstr "Nouvelle personne"
+
+#. "Select Buddy" button
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:592
+msgid "Select Buddy"
+msgstr "Choisir contact"
+
+#. Add the label.
+#: ../gtk/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 ""
+"Choisissez une personne dans votre carnet d'adresses pour ajouter ce contact "
+"ou créez une nouvelle personne."
+
+#. Add the expander
+#: ../gtk/plugins/gevolution/assoc-buddy.c:428
+msgid "User _details"
+msgstr "_DĂ©tails du contact"
+
+#. "Associate Buddy" button
+#: ../gtk/plugins/gevolution/assoc-buddy.c:481
+msgid "_Associate Buddy"
+msgstr "_Associer un contact"
+
+#: ../gtk/plugins/gevolution/eds-utils.c:73
+#: ../gtk/plugins/gevolution/eds-utils.c:86
+#: ../libgaim/protocols/jabber/jabber.c:1154
+msgid "None"
+msgstr "Aucun"
+
+#: ../gtk/plugins/gevolution/gevolution.c:262
+#: ../gtk/plugins/gevolution/gevolution.c:268
+msgid "Unable to send e-mail"
+msgstr "Impossible d'envoyer un courrier Ă©lectronique"
+
+#: ../gtk/plugins/gevolution/gevolution.c:263
+msgid "The evolution executable was not found in the PATH."
+msgstr ""
+"Le binaire « evolution » n'a pas été trouvé dans les dossiers par défaut du "
+"PATH."
+
+#: ../gtk/plugins/gevolution/gevolution.c:269
+msgid "The specified buddy was not found in the Evolution Contacts."
+msgstr "Le contact choisi n'a pas été trouvé dans les contacts d'Evolution."
+
+#: ../gtk/plugins/gevolution/gevolution.c:286
+msgid "Add to Address Book"
+msgstr "Ajouter au carnet d'adresses"
+
+#: ../gtk/plugins/gevolution/gevolution.c:290
+msgid "Send E-Mail"
+msgstr "Envoyer un courriel"
+
+#. Configuration frame
+#: ../gtk/plugins/gevolution/gevolution.c:417
+msgid "Evolution Integration Configuration"
+msgstr "Configuration de l'intégration avec Evolution"
+
+#. Label
+#: ../gtk/plugins/gevolution/gevolution.c:420
+msgid "Select all accounts that buddies should be auto-added to."
+msgstr ""
+"Choisissez tous les comptes dont les contacts seront automatiquement ajoutés."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gevolution/gevolution.c:527
+msgid "Evolution Integration"
+msgstr "Intégration avec Evolution"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/gevolution/gevolution.c:530
+#: ../gtk/plugins/gevolution/gevolution.c:532
+msgid "Provides integration with Evolution."
+msgstr "Fournit une intégration avec Evolution."
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:267
+msgid "Please enter the person's information below."
+msgstr "Veuillez saisir les informations de la personne"
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:271
+msgid "Please enter the buddy's screen name and account type below."
+msgstr "Veuillez saisir le pseudo et le type de compte du contact"
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:291
+msgid "Account type:"
+msgstr "Type de compte :"
+
+#. Optional Information section
+#: ../gtk/plugins/gevolution/new_person_dialog.c:315
+msgid "Optional information:"
+msgstr "Informations facultatives :"
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:350
+msgid "First name:"
+msgstr "Prénom :"
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:362
+msgid "Last name:"
+msgstr "Nom :"
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:382
+msgid "E-mail:"
+msgstr "Adresse électronique :"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gtk-signals-test.c:160
+msgid "GTK Signals Test"
+msgstr "Test des signaux GTK"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/gtk-signals-test.c:163 ../gtk/plugins/gtk-signals-test.c:165
+msgid "Test to see that all ui signals are working properly."
+msgstr ""
+"VĂ©rifie que tous les signaux de l'interface graphique fonctionnent "
+"correctement."
+
+#: ../gtk/plugins/history.c:188
+msgid "History"
+msgstr "Historique"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/iconaway.c:82
+msgid "Iconify on Away"
+msgstr "IcĂ´nifier lors des absences"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/iconaway.c:85 ../gtk/plugins/iconaway.c:87
+msgid "Iconifies the buddy list and your conversations when you go away."
+msgstr ""
+"Met en icĂ´ne la liste de contacts et les conversations lors des absences."
+
+#: ../gtk/plugins/mailchk.c:160
+msgid "Mail Checker"
+msgstr "Nouveaux courriers"
+
+#: ../gtk/plugins/mailchk.c:162
+msgid "Checks for new local mail."
+msgstr ""
+"Vérifie le contenu de la boîte au lettres locale pour des nouveaux courriers."
+
+#: ../gtk/plugins/mailchk.c:163
+msgid "Adds a small box to the buddy list that shows if you have new mail."
+msgstr ""
+"Ajoute une petite zone de notification dans la liste de contacts pour "
+"indiquer l'arrivée de nouveaux courriers."
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:44
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr ""
+"Une partie de messagerie musicale a été demandée. Veuillez cliquer sur "
+"l'icĂ´ne MM pour l'accepter."
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:45
+msgid "Music messaging session confirmed."
+msgstr "Partie de messagerie musicale confirmée."
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:416
+msgid "Music Messaging"
+msgstr "Messagerie musicale"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:417
+msgid "There was a conflict in running the command:"
+msgstr "Un conflit a eu lieu en exécutant la commande :"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:525
+msgid "Error Running Editor"
+msgstr "Erreur à l'exécution de l'éditeur"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:526
+msgid "The following error has occured:"
+msgstr "L'erreur suivante est survenue :"
+
+#. Configuration frame
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:625
+msgid "Music Messaging Configuration"
+msgstr "Configuration de messagerie musicale"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:629
+msgid "Score Editor Path"
+msgstr "Chemin de l'Ă©diteur de partitions"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:630
+msgid "_Apply"
+msgstr "_Appliquer"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:665
+msgid "Music Messaging Plugin for collaborative composition."
+msgstr "Plugin de messagerie musicale pour la composition collaborative."
+
+#. *  summary
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:667
+msgid ""
+"The Music Messaging Plugin allows a number of users to simultaneously work "
+"on a piece of music by editting a common score in real-time."
+msgstr ""
+"Permet à plusieurs utilisateurs de travailler simultanément sur un morceau "
+"de musique en modifiant une partition commune en temps réel."
+
+#. ---------- "Notify For" ----------
+#: ../gtk/plugins/notify.c:687
+msgid "Notify For"
+msgstr "Notification pour"
+
+#: ../gtk/plugins/notify.c:691
+msgid "_IM windows"
+msgstr "FenĂŞtres de _message"
+
+#: ../gtk/plugins/notify.c:698
+msgid "C_hat windows"
+msgstr "FenĂŞtres de _discussions"
+
+#: ../gtk/plugins/notify.c:706
+msgid "\t_Only when someone says your screen name"
+msgstr "\t_Seulement quand on dit votre pseudonyme"
+
+#: ../gtk/plugins/notify.c:716
+msgid "_Focused windows"
+msgstr "_FenĂŞtres actives"
+
+#. ---------- "Notification Methods" ----------
+#: ../gtk/plugins/notify.c:724
+msgid "Notification Methods"
+msgstr "MĂ©thode de notification"
+
+#: ../gtk/plugins/notify.c:731
+msgid "Prepend _string into window title:"
+msgstr "Préfixer un _texte au titre de la fenêtre :"
+
+#. Count method button
+#: ../gtk/plugins/notify.c:750
+msgid "Insert c_ount of new messages into window title"
+msgstr "Mettre le n_ombre de nouveaux messages dans le titre de la fenĂŞtre"
+
+#. Count xprop method button
+#: ../gtk/plugins/notify.c:759
+msgid "Insert count of new message into _X property"
+msgstr "Mettre le nombre de nouveaux messages dans une propriété _X"
+
+#. Urgent method button
+#: ../gtk/plugins/notify.c:767
+msgid "Set window manager \"_URGENT\" hint"
+msgstr "Envoyer le message « _URGENT » au gestionnaire de fenêtres"
+
+#. Raise window method button
+#: ../gtk/plugins/notify.c:776
+msgid "R_aise conversation window"
+msgstr "Passer la conversation en _avant plan"
+
+#. ---------- "Notification Removals" ----------
+#: ../gtk/plugins/notify.c:784
+msgid "Notification Removal"
+msgstr "Suppression de la notification"
+
+#. Remove on focus button
+#: ../gtk/plugins/notify.c:789
+msgid "Remove when conversation window _gains focus"
+msgstr "Supprimer quand la _fenĂŞtre devient active"
+
+#. Remove on click button
+#: ../gtk/plugins/notify.c:796
+msgid "Remove when conversation window _receives click"
+msgstr "Supprimer quand la fenêtre est _cliquée"
+
+#. Remove on type button
+#: ../gtk/plugins/notify.c:804
+msgid "Remove when _typing in conversation window"
+msgstr "Supprimer lors de l'Ă©c_riture dans la fenĂŞtre"
+
+#. Remove on message send button
+#: ../gtk/plugins/notify.c:812
+msgid "Remove when a _message gets sent"
+msgstr "Enlever sur envoi d'un _message"
+
+#. Remove on conversation switch button
+#: ../gtk/plugins/notify.c:821
+msgid "Remove on switch to conversation ta_b"
+msgstr "Supprimer lors du changement d'_onglet"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/notify.c:910
+msgid "Message Notification"
+msgstr "Notification de message"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/notify.c:913 ../gtk/plugins/notify.c:915
+msgid "Provides a variety of ways of notifying you of unread messages."
+msgstr "Fournit différents moyens d'avertissement de messages non lus."
+
+#: ../gtk/plugins/raw.c:175
+msgid "Raw"
+msgstr "Brut"
+
+#: ../gtk/plugins/raw.c:177
+msgid "Lets you send raw input to text-based protocols."
+msgstr "Permet d'envoyer des données brutes à un protocole en mode texte."
+
+#: ../gtk/plugins/raw.c:178
+msgid ""
+"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"'Enter' in the entry box to send. Watch the debug window."
+msgstr ""
+"Permet d'envoyer des données bruts aux protocoles en mode texte (Jabber, "
+"MSN, IRC, TOC). Tapez « Entrée » dans la boîte de saisie pour envoyer. "
+"Observez le résultat dans la fenêtre de debug."
+
+#: ../gtk/plugins/relnot.c:69
+#, c-format
+msgid "You are using Gaim version %s.  The current version is %s.<hr>"
+msgstr "Vous utilisez Gaim version %s. La dernière version est %s.<hr>"
+
+#: ../gtk/plugins/relnot.c:75
+#, c-format
+msgid ""
+"<b>ChangeLog:</b>\n"
+"%s<br><br>"
+msgstr ""
+"<b>Nouveautés :</b>\n"
+"%s<br><br>"
+
+#: ../gtk/plugins/relnot.c:80
+#, c-format
+msgid ""
+"You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
+"\">http://gaim.sourceforge.net</a>."
+msgstr ""
+"Vous pouvez télécharger la version %s sur :<br><a href=\"http://gaim."
+"sourceforge.net/\">http://gaim.sourceforge.net</a>."
+
+#: ../gtk/plugins/relnot.c:84 ../gtk/plugins/relnot.c:85
+msgid "New Version Available"
+msgstr "Nouvelle version disponible"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/relnot.c:143
+msgid "Release Notification"
+msgstr "Notification de nouvelle version"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/relnot.c:146
+msgid "Checks periodically for new releases."
+msgstr "Vérifie périodiquement pour de nouvelles mises à jour."
+
+#. *  description
+#: ../gtk/plugins/relnot.c:148
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+msgstr ""
+"Vérifie périodiquement pour de nouvelles versions et les annonce ainsi que "
+"les nouveauté dans ces mises à jour."
+
+#: ../gtk/plugins/spellchk.c:1947
+msgid "Duplicate Correction"
+msgstr "Correction en double"
+
+#: ../gtk/plugins/spellchk.c:1948
+msgid "The specified word already exists in the correction list."
+msgstr "Le mot existe déjà dans la liste de corrections."
+
+#: ../gtk/plugins/spellchk.c:2156
+msgid "Text Replacements"
+msgstr "Substitutions de texte"
+
+#: ../gtk/plugins/spellchk.c:2179
+msgid "You type"
+msgstr "Vous saisissez"
+
+#: ../gtk/plugins/spellchk.c:2193
+msgid "You send"
+msgstr "Vous envoyez"
+
+#: ../gtk/plugins/spellchk.c:2207
+msgid "Whole words only"
+msgstr "Mots entiers uniquement"
+
+#: ../gtk/plugins/spellchk.c:2219
+msgid "Case sensitive"
+msgstr "Sensible Ă  la casse"
+
+#: ../gtk/plugins/spellchk.c:2245
+msgid "Add a new text replacement"
+msgstr "Ajouter une nouvelle substitution"
+
+#: ../gtk/plugins/spellchk.c:2261
+msgid "You _type:"
+msgstr "Vous _saisissez :"
+
+#: ../gtk/plugins/spellchk.c:2278
+msgid "You _send:"
+msgstr "Vous _envoyez :"
+
+#. Created here so it can be passed to whole_words_button_toggled.
+#: ../gtk/plugins/spellchk.c:2290
+msgid "_Exact case match (uncheck for automatic case handling)"
+msgstr "Correspondance _parfaite uniquement (décoche la gestion automatique)"
+
+#: ../gtk/plugins/spellchk.c:2292
+msgid "Only replace _whole words"
+msgstr "Remplace uniquement les mots _complets"
+
+#: ../gtk/plugins/spellchk.c:2317
+msgid "General Text Replacement Options"
+msgstr "Options de substitutions globales de texte"
+
+#: ../gtk/plugins/spellchk.c:2318
+msgid "Enable replacement of last word on send"
+msgstr "Permet la substitution des mots Ă  l'envoi"
+
+#: ../gtk/plugins/spellchk.c:2343
+msgid "Text replacement"
+msgstr "Substitutions de texte"
+
+#: ../gtk/plugins/spellchk.c:2345 ../gtk/plugins/spellchk.c:2346
+msgid "Replaces text in outgoing messages according to user-defined rules."
+msgstr ""
+"Remplace le texte dans les messages envoyés grâce à des règles de "
+"substitution."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/ticker/ticker.c:77 ../gtk/plugins/ticker/ticker.c:355
+msgid "Buddy Ticker"
+msgstr "DĂ©filement des contacts"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/ticker/ticker.c:358 ../gtk/plugins/ticker/ticker.c:360
+msgid "A horizontal scrolling version of the buddy list."
+msgstr "Une version horizontale avec défilement de la liste de contacts."
+
+#: ../gtk/plugins/timestamp.c:186
+msgid "iChat Timestamp"
+msgstr "Horodatage iChat"
+
+#: ../gtk/plugins/timestamp.c:193
+msgid "Delay"
+msgstr "Intervalle"
+
+#: ../gtk/plugins/timestamp.c:200
+msgid "minutes."
+msgstr "minutes"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/timestamp.c:256
+msgid "Timestamp"
+msgstr "Horodatage"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/timestamp.c:259 ../gtk/plugins/timestamp.c:261
+msgid "Adds iChat-style timestamps to conversations every N minutes."
+msgstr "Ajoute l'heure dans la conversation à intervalle régulier."
+
+#: ../gtk/plugins/timestamp_format.c:22
+msgid "Timestamp Format Options"
+msgstr "Options du formatage de l'horodatage"
+
+#: ../gtk/plugins/timestamp_format.c:27
+msgid "_Force (traditional Gaim) 24-hour time format"
+msgstr "_Forcer au format 24 heures (traditionnel Ă  Gaim)"
+
+#: ../gtk/plugins/timestamp_format.c:30
+msgid "Show dates in..."
+msgstr "Afficher les dates dans..."
+
+#: ../gtk/plugins/timestamp_format.c:35
+msgid "Co_nversations:"
+msgstr "Les con-versations :"
+
+#: ../gtk/plugins/timestamp_format.c:37 ../gtk/plugins/timestamp_format.c:46
+msgid "For delayed messages"
+msgstr "Pour les messages retardés"
+
+#: ../gtk/plugins/timestamp_format.c:38 ../gtk/plugins/timestamp_format.c:47
+msgid "For delayed messages and in chats"
+msgstr "Pour les messages retardés et dans les salons de discussion"
+
+#: ../gtk/plugins/timestamp_format.c:44
+msgid "_Message Logs:"
+msgstr "Les _archives :"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/timestamp_format.c:149
+msgid "Message Timestamp Formats"
+msgstr "Formatage de l'horodatage des messages."
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/timestamp_format.c:152
+msgid "Customizes the message timestamp formats."
+msgstr "Personnaliser l'affichage de l'horodatage des messages."
+
+#. *  description
+#: ../gtk/plugins/timestamp_format.c:154
+msgid ""
+"This plugin allows the user to customize conversation and logging message "
+"timestamp formats."
+msgstr ""
+"Permet Ă  l'utilisateur de personnaliser dans les conversions et les archives "
+"la manière dont est affiché l'horodatage."
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:183
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:569
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:616
+msgid "Opacity:"
+msgstr "Opacité :"
+
+#. IM Convo trans options
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:533
+msgid "IM Conversation Windows"
+msgstr "FenĂŞtres de messages"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:534
+msgid "_IM window transparency"
+msgstr "FenĂŞtre de _messages transparente"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:548
+msgid "_Show slider bar in IM window"
+msgstr "Afficher la barre de défilement dans la fenêtre"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:555
+msgid "Remove IM window transparency on focus"
+msgstr "Supprimer la transparence pour les fenĂŞtres de messages actives"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:558
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:606
+msgid "Always on top"
+msgstr "Toujours en avant plan"
+
+#. Buddy List trans options
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:590
+msgid "Buddy List Window"
+msgstr "FenĂŞtre de la liste de contacts"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:591
+msgid "_Buddy List window transparency"
+msgstr "FenĂŞtre de la liste de _contacts transparente"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:604
+msgid "Remove Buddy List window transparency on focus"
+msgstr "Supprimer la transparence quand la liste des contacts est active"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:658
+msgid "Transparency"
+msgstr "Transparence"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:661
+msgid "Variable Transparency for the buddy list and conversations."
+msgstr "Transparence variable pour la liste de contacts et les conversations."
+
+#. *  description
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:663
+msgid ""
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
+"\n"
+"* Note: This plugin requires Win2000 or greater."
+msgstr ""
+"Active la transparence des fenĂŞtres de conversation et de la liste de "
+"contacts.\n"
+"\n"
+"Note : Ce plugin nécessite Windows 2000 ou plus récent."
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:430
+msgid "GTK+ Runtime Version"
+msgstr "Version des bibliothèques GTK+"
+
+#. Autostart
+#: ../gtk/plugins/win32/winprefs/winprefs.c:438
+msgid "Startup"
+msgstr "DĂ©marrage"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:439
+msgid "_Start Gaim on Windows startup"
+msgstr "_DĂ©marrer Gaim au lancement de Windows"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:452
+msgid "_Dockable Buddy List"
+msgstr "Liste de contacts _accrochable"
+
+#. Blist On Top
+#: ../gtk/plugins/win32/winprefs/winprefs.c:456
+msgid "_Keep Buddy List window on top:"
+msgstr "Liste de contacts toujours _visible :"
+
+#. XXX: Did this ever work?
+#: ../gtk/plugins/win32/winprefs/winprefs.c:461
+msgid "Only when docked"
+msgstr "Seulement quand la fenêtre est accrochée"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:466
+msgid "_Flash window when IMs are received"
+msgstr "_Faire clignoter la fenêtre sur la réception de messages"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:468
+msgid "_Flash window when chat messages are received"
+msgstr "_Faire clignoter la fenĂŞtre dans les discussions actives"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:492
+msgid "WinGaim Options"
+msgstr "Préférences de WinGaim"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:494
+msgid "Options specific to Windows Gaim."
+msgstr "Options spécifiques à Gaim Windows"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:495
+msgid ""
+"Provides options specific to Windows Gaim, such as buddy list docking and "
+"conversation flashing."
+msgstr ""
+"Fournit des options spécifiques à Gaim Windows, tels que l'accrochage de la "
+"liste de contacts et le clignotement des fenĂŞtres de conversation."
+
+#: ../libgaim/account.c:773
+msgid "accounts"
+msgstr "Comptes"
+
+#: ../libgaim/account.c:917
+msgid "Password is required to sign on."
+msgstr "Un mot de passe est nécessaire pour la connexion."
+
+#: ../libgaim/account.c:942
+#, c-format
+msgid "Enter password for %s (%s)"
+msgstr "Saisissez le mot de passe pour %s (%s)"
+
+#: ../libgaim/account.c:949
+msgid "Enter Password"
+msgstr "Saisissez le mot de passe"
+
+#: ../libgaim/account.c:954
+msgid "Save password"
+msgstr "MĂ©moriser le mot de passe"
+
+#: ../libgaim/account.c:988 ../libgaim/connection.c:103
+#, c-format
+msgid "Missing protocol plugin for %s"
+msgstr "Plugin pour le protocole %s manquant"
+
+#: ../libgaim/account.c:1070 ../libgaim/protocols/gg/gg.c:696
+#: ../libgaim/protocols/jabber/jabber.c:1304
+msgid "New passwords do not match."
+msgstr "Les nouveaux mots de passe diffèrent"
+
+#: ../libgaim/account.c:1079
+msgid "Fill out all fields completely."
+msgstr "Veuillez renseigner toutes les rubriques."
+
+#: ../libgaim/account.c:1102
+msgid "Original password"
+msgstr "Mot de passe courant"
+
+#: ../libgaim/account.c:1109
+msgid "New password"
+msgstr "Nouveau mot de passe"
+
+#: ../libgaim/account.c:1116
+msgid "New password (again)"
+msgstr "Nouveau mot de passe (confirmation)"
+
+#: ../libgaim/account.c:1122
+#, c-format
+msgid "Change password for %s"
+msgstr "Changer le mot de passe pour %s"
+
+#: ../libgaim/account.c:1130
+msgid "Please enter your current password and your new password."
+msgstr "Saisissez votre mot de passe et un nouveau mot de passe"
+
+#: ../libgaim/account.c:1160
+#, c-format
+msgid "Change user information for %s"
+msgstr "Changer les informations pour %s"
+
+#: ../libgaim/account.c:1163 ../libgaim/protocols/toc/toc.c:1690
+msgid "Set User Info"
+msgstr "Éditer les informations"
+
+#: ../libgaim/blist.c:543
+msgid "buddy list"
+msgstr "Liste de contacts"
+
+#: ../libgaim/blist.c:1904
+#, c-format
+msgid ""
+"%d buddy from group %s was not removed because it belongs to an account "
+"which is disabled or offline.  This buddy and the group were not removed.\n"
+msgid_plural ""
+"%d buddies from group %s were not removed because they belong to accounts "
+"which are currently disabled or offline.  These buddies and the group were "
+"not removed.\n"
+msgstr[0] ""
+"%d contact du groupe %s n'a pas été supprimé parce qu'il est lié à un compte "
+"désactivé ou déconnecté. Ce contact et le groupe n'ont pas été supprimés.\n"
+msgstr[1] ""
+"%d contacts du groupe %s n'ont pas été supprimés parce qu'ils sont liés à "
+"des comptes désactivés ou déconnectés. Ces contacts et le groupe n'ont pas "
+"été supprimés.\n"
+
+#: ../libgaim/blist.c:1914
+msgid "Group not removed"
+msgstr "Groupe non supprimé"
+
+#: ../libgaim/connection.c:105
+msgid "Registration Error"
+msgstr "Erreur d'enregistrement"
+
+#: ../libgaim/connection.c:284
+#, c-format
+msgid "+++ %s signed on"
+msgstr "+++ %s vient de se connecter"
+
+#: ../libgaim/connection.c:317
+#, c-format
+msgid "+++ %s signed off"
+msgstr "+++ %s a quitté"
+
+#: ../libgaim/conversation.c:165
+msgid "Unable to send message: The message is too large."
+msgstr "Impossible d'envoyer le message : trop gros"
+
+#: ../libgaim/conversation.c:168 ../libgaim/conversation.c:181
+#, c-format
+msgid "Unable to send message to %s."
+msgstr "Impossible d'envoyer le message vers %s."
+
+#: ../libgaim/conversation.c:169
+msgid "The message is too large."
+msgstr "Message trop long"
+
+#: ../libgaim/conversation.c:178
+msgid "Unable to send message."
+msgstr "Impossible d'envoyer le message"
+
+#: ../libgaim/conversation.c:1162
+msgid "Send Message"
+msgstr "Envoyer un message"
+
+#: ../libgaim/conversation.c:1163
+msgid "_Send Message"
+msgstr "Envoyer un _message"
+
+#: ../libgaim/conversation.c:1566
+#, c-format
+msgid "%s entered the room."
+msgstr "%s est entré dans le salon"
+
+#: ../libgaim/conversation.c:1569
+#, c-format
+msgid "%s [<I>%s</I>] entered the room."
+msgstr "%s [<I>%s</I>] est entré dans le salon"
+
+#: ../libgaim/conversation.c:1674
+#, c-format
+msgid "You are now known as %s"
+msgstr "Vous êtes désormais connu sous le nom de %s"
+
+#: ../libgaim/conversation.c:1694
+#, c-format
+msgid "%s is now known as %s"
+msgstr "%s est désormais connu sous le nom de %s"
+
+#: ../libgaim/conversation.c:1767
+#, c-format
+msgid "%s left the room."
+msgstr "%s a quitté le salon"
+
+#: ../libgaim/conversation.c:1770
+#, c-format
+msgid "%s left the room (%s)."
+msgstr "%s a quitté le salon (%s)"
+
+#: ../libgaim/desktopitem.c:286 ../libgaim/desktopitem.c:877
+msgid "No name"
+msgstr "Anonyme"
+
+#: ../libgaim/dbus-server.c:577
+#, c-format
+msgid "Failed to get connection: %s"
+msgstr "Impossible de récupérer une connexion : %s"
+
+#: ../libgaim/dbus-server.c:585
+#, c-format
+msgid "Failed to get name: %s"
+msgstr "Impossible de récupérer le nom : %s"
+
+#: ../libgaim/dbus-server.c:598
+#, c-format
+msgid "Failed to get serv name: %s"
+msgstr "Impossible de récupérer le nom de serveur : %s"
+
+#: ../libgaim/dnsquery.c:489
+msgid "Unable to create new resolver process\n"
+msgstr "Impossible de créer un nouveau processus de résolution de noms.\n"
+
+#: ../libgaim/dnsquery.c:494
+msgid "Unable to send request to resolver process\n"
+msgstr "Impossible d'envoyer la demande au processus de résolution de noms.\n"
+
+#: ../libgaim/dnsquery.c:527 ../libgaim/dnsquery.c:677
+#, c-format
+msgid ""
+"Error resolving %s:\n"
+"%s"
+msgstr ""
+"Erreur à la résolution du nom %s :\n"
+"%s"
+
+#: ../libgaim/dnsquery.c:530 ../libgaim/dnsquery.c:691
+#: ../libgaim/dnsquery.c:799
+#, c-format
+msgid "Error resolving %s: %d"
+msgstr "Erreur à la résolution du nom %s : %d"
+
+#: ../libgaim/dnsquery.c:552
+#, c-format
+msgid ""
+"Error reading from resolver process:\n"
+"%s"
+msgstr ""
+"Erreur à la réception des données du processus de résolution des noms :\n"
+"%s"
+
+#: ../libgaim/dnsquery.c:556
+msgid "EOF while reading from resolver process"
+msgstr "Fin de fichier à la lecture du processus de résolution de noms."
+
+#: ../libgaim/dnsquery.c:735
+#, c-format
+msgid "Thread creation failure: %s"
+msgstr "Échec de la création de processus :%s"
+
+#: ../libgaim/dnsquery.c:736
+msgid "Unknown reason"
+msgstr "Raison inconnue"
+
+#: ../libgaim/ft.c:189 ../libgaim/protocols/msn/msn.c:410
+#, c-format
+msgid ""
+"Error reading %s: \n"
+"%s.\n"
+msgstr ""
+"Erreur à la lecture de « %s » :\n"
+"%s\n"
+
+#: ../libgaim/ft.c:193
+#, c-format
+msgid ""
+"Error writing %s: \n"
+"%s.\n"
+msgstr ""
+"Erreur à l'écriture de « %s » :\n"
+"%s\n"
+
+#: ../libgaim/ft.c:197
+#, c-format
+msgid ""
+"Error accessing %s: \n"
+"%s.\n"
+msgstr ""
+"Erreur lors de l'accès à « %s » :\n"
+"%s\n"
+
+#: ../libgaim/ft.c:230
+msgid "Cannot send a file of 0 bytes."
+msgstr "Impossible d'envoyer un fichier de taille nulle"
+
+#: ../libgaim/ft.c:240
+msgid "Cannot send a directory."
+msgstr "Impossible d'envoyer un dossier"
+
+#: ../libgaim/ft.c:249
+#, c-format
+msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
+msgstr ""
+"« %s » n'est pas un fichier régulier. Gaim refuse lâchement d'écraser ce "
+"fichier.\n"
+
+#: ../libgaim/ft.c:307
+#, c-format
+msgid "%s wants to send you %s (%s)"
+msgstr "%s veut vous envoyer %s (%s)"
+
+#: ../libgaim/ft.c:314
+#, c-format
+msgid "%s wants to send you a file"
+msgstr "%s veut vous envoyer un fichier"
+
+#: ../libgaim/ft.c:355
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr "Accepter la demande de transfert de %s ?"
+
+#: ../libgaim/ft.c:359
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"Un fichier est disponible pour le téléchargement depuis :\n"
+"Hôte distant : %s\n"
+"Port distant : %d"
+
+#: ../libgaim/ft.c:392
+#, c-format
+msgid "%s is offering to send file %s"
+msgstr "%s propose de vous envoyer le fichier %s"
+
+#: ../libgaim/ft.c:444
+#, c-format
+msgid "%s is not a valid filename.\n"
+msgstr "%s n'est pas un nom de fichier valide\n"
+
+#: ../libgaim/ft.c:465
+#, c-format
+msgid "Offering to send %s to %s"
+msgstr "Proposition d'envoyer « %s » à %s"
+
+#: ../libgaim/ft.c:477
+#, c-format
+msgid "Starting transfer of %s from %s"
+msgstr "DĂ©marrage du transfert de %s depuis %s."
+
+#: ../libgaim/ft.c:631
+#, c-format
+msgid "Transfer of file %s complete"
+msgstr "Transfert du fichier « %s » terminé"
+
+#: ../libgaim/ft.c:634
+msgid "File transfer complete"
+msgstr "Transfert de fichier terminé"
+
+#: ../libgaim/ft.c:1023
+#, c-format
+msgid "You canceled the transfer of %s"
+msgstr "Vous avez a annulé le transfert de « %s »"
+
+#: ../libgaim/ft.c:1028
+msgid "File transfer cancelled"
+msgstr "Transfert de fichier annulé"
+
+#: ../libgaim/ft.c:1086
+#, c-format
+msgid "%s canceled the transfer of %s"
+msgstr "%s a annulé le transfert de « %s »"
+
+#: ../libgaim/ft.c:1091
+#, c-format
+msgid "%s canceled the file transfer"
+msgstr "%s a annulé le transfert du fichier"
+
+#: ../libgaim/ft.c:1148
+#, c-format
+msgid "File transfer to %s failed."
+msgstr "Échec du transfert vers %s."
+
+#: ../libgaim/ft.c:1150
+#, c-format
+msgid "File transfer from %s failed."
+msgstr "Échec du transfert depuis %s."
+
+#: ../libgaim/log.c:181
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
 "<b><font color\"=red\">L'archiveur n'a pas de fonction de lecture</font></b>"
 
-#: ../src/log.c:562
+#: ../libgaim/log.c:562
 msgid "HTML"
 msgstr "HTML"
 
-#: ../src/log.c:573
+#: ../libgaim/log.c:573
 msgid "Plain text"
 msgstr "Texte en clair"
 
-#: ../src/log.c:584
+#: ../libgaim/log.c:584
 msgid "Old Gaim"
 msgstr "Ancien Gaim"
 
-#: ../src/log.c:691
+#: ../libgaim/log.c:691
 msgid "Logging of this conversation failed."
 msgstr "Échec de l'archivage de cette conversation."
 
-#: ../src/log.c:1041
+#: ../libgaim/log.c:1041
 msgid "XML"
 msgstr "XML"
 
-#: ../src/log.c:1115
+#: ../libgaim/log.c:1115
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -5460,7 +5802,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;RĂ©ponse "
 "automatique&gt;&nbsp;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:1117
+#: ../libgaim/log.c:1117
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -5469,43 +5811,44 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;RĂ©ponse "
 "automatique&gt;&nbsp;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:1175 ../src/log.c:1306
+#: ../libgaim/log.c:1175 ../libgaim/log.c:1306
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
 "<font color=\"red\"><b>Impossible de trouver le dossier des archives</b></"
 "font>"
 
-#: ../src/log.c:1187 ../src/log.c:1320
+#: ../libgaim/log.c:1187 ../libgaim/log.c:1320
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Impossible de lire le fichier %s</b></font>"
 
-#: ../src/log.c:1249
+#: ../libgaim/log.c:1249
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <Réponse automatique> : %s\n"
 
-#: ../src/plugin.c:281 ../src/protocols/jabber/buddy.c:1645
-#: ../src/protocols/msn/servconn.c:139 ../src/protocols/msn/session.c:321
-#: ../src/protocols/oscar/oscar.c:2702
+#: ../libgaim/plugin.c:281 ../libgaim/protocols/jabber/buddy.c:1649
+#: ../libgaim/protocols/msn/servconn.c:139
+#: ../libgaim/protocols/msn/session.c:321
+#: ../libgaim/protocols/oscar/oscar.c:2677
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
-#: ../src/plugin.c:424
+#: ../libgaim/plugin.c:424
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr "Le numéro magique du plugin diffère : %d (%d attendu)."
 
-#: ../src/plugin.c:441
+#: ../libgaim/plugin.c:441
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "La version de l'ABI diffère : %d.%d.x (%d.%d.x attendue)."
 
-#: ../src/plugin.c:458
+#: ../libgaim/plugin.c:458
 msgid "Plugin does not implement all required functions"
 msgstr "Le plugin ne possède pas toutes les fonctions attendues."
 
-#: ../src/plugin.c:523
+#: ../libgaim/plugin.c:523
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -5514,42 +5857,546 @@
 "Le plugin dépendant %s est introuvable. Veuillez installer ce plugin et "
 "recommencer."
 
-#: ../src/plugin.c:528
+#: ../libgaim/plugin.c:528
 msgid "Gaim encountered errors loading the plugin."
 msgstr "Erreur au chargement du plugin."
 
-#: ../src/plugin.c:550
+#: ../libgaim/plugin.c:550
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Le plugin dépendant %s n'a pas pu être chargé."
 
-#: ../src/plugin.c:554
+#: ../libgaim/plugin.c:554
 msgid "Gaim was unable to load your plugin."
 msgstr "Impossible de charger le plugin"
 
-#: ../src/plugin.c:654
+#: ../libgaim/plugin.c:654
 #, c-format
 msgid "The dependent plugin %s failed to unload."
 msgstr "Le plugin dépendant %s n'a pas pu être déchargé."
 
-#: ../src/plugin.c:659
+#: ../libgaim/plugin.c:659
 msgid "Gaim encountered errors unloading the plugin."
 msgstr "Erreur au déchargement du plugin."
 
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ciphertest.c:264
+msgid "Cipher Test"
+msgstr "Test de chiffre"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/ciphertest.c:267 ../libgaim/plugins/ciphertest.c:269
+msgid "Tests the ciphers that ship with gaim."
+msgstr "Teste le système de chiffrement intégré à Gaim."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/dbus-example.c:155
+msgid "DBus Example"
+msgstr "Exemple DBus"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/dbus-example.c:158 ../libgaim/plugins/dbus-example.c:160
+msgid "DBus Plugin Example"
+msgstr "Exemple de plugin DBus"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/filectl.c:248
+msgid "Gaim File Control"
+msgstr "ContrĂ´le de Gaim par fichier"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/filectl.c:251 ../libgaim/plugins/filectl.c:253
+msgid "Allows you to control Gaim by entering commands in a file."
+msgstr "Permet de contrĂ´ler Gaim en entrant des commandes dans un fichier."
+
+#: ../libgaim/plugins/idle.c:158 ../libgaim/plugins/idle.c:216
+msgid "Minutes"
+msgstr "Minutes"
+
+#. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
+#. If that doesn't translate well into your language, drop the 's before translating.
+#: ../libgaim/plugins/idle.c:165 ../libgaim/plugins/idle.c:198
+#: ../libgaim/plugins/idle.c:223 ../libgaim/plugins/idle.c:315
+msgid "I'dle Mak'er"
+msgstr "I'nactivat'eur"
+
+#: ../libgaim/plugins/idle.c:166 ../libgaim/plugins/idle.c:255
+msgid "Set Account Idle Time"
+msgstr "Durée d'inactivité pour le compte"
+
+#: ../libgaim/plugins/idle.c:169 ../libgaim/plugins/idle.c:227
+msgid "_Set"
+msgstr "_Changer"
+
+#: ../libgaim/plugins/idle.c:170 ../libgaim/plugins/idle.c:203
+#: ../libgaim/plugins/idle.c:228
+msgid "_Cancel"
+msgstr "_Annuler"
+
+#: ../libgaim/plugins/idle.c:183
+msgid "None of your accounts are idle."
+msgstr "Aucun de vos comptes n'est inactif."
+
+#: ../libgaim/plugins/idle.c:199 ../libgaim/plugins/idle.c:259
+msgid "Unset Account Idle Time"
+msgstr "Désactiver le temps d'inactivité pour le compte"
+
+#: ../libgaim/plugins/idle.c:202
+msgid "_Unset"
+msgstr "_DĂ©sactiver"
+
+#: ../libgaim/plugins/idle.c:224 ../libgaim/plugins/idle.c:263
+msgid "Set Idle Time for All Accounts"
+msgstr "Changer le temps d'inactivité pour tous les comptes"
+
+#: ../libgaim/plugins/idle.c:268
+msgid "Unset Idle Time for All Idled Accounts"
+msgstr "Désactiver le temps d'inactivité pour tous les comptes inactifs"
+
+#: ../libgaim/plugins/idle.c:317 ../libgaim/plugins/idle.c:318
+msgid "Allows you to hand-configure how long you've been idle"
+msgstr "Permet de changer manuellement le temps d'inactivité."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ipc-test-client.c:87
+msgid "IPC Test Client"
+msgstr "Test pour le client IPC"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../libgaim/plugins/ipc-test-client.c:90
+msgid "Test plugin IPC support, as a client."
+msgstr "Plugin de test du support d'IPC en tant que client"
+
+#. *  description
+#: ../libgaim/plugins/ipc-test-client.c:92
+msgid ""
+"Test plugin IPC support, as a client. This locates the server plugin and "
+"calls the commands registered."
+msgstr ""
+"Teste le support du client IPC. Recherche le plugin serveur et appelle les "
+"commandes existantes."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ipc-test-server.c:74
+msgid "IPC Test Server"
+msgstr "Test pour le serveur IPC"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../libgaim/plugins/ipc-test-server.c:77
+msgid "Test plugin IPC support, as a server."
+msgstr "Plugin de test du support d'IPC en tant que serveur"
+
+#. *  description
+#: ../libgaim/plugins/ipc-test-server.c:79
+msgid "Test plugin IPC support, as a server. This registers the IPC commands."
+msgstr "Teste le support du serveur IPC. Enregistre les commandes IPC."
+
+#: ../libgaim/plugins/log_reader.c:1412
+msgid "User is offline."
+msgstr "L'utilisateur est déconnecté."
+
+#: ../libgaim/plugins/log_reader.c:1418
+msgid "Auto-response sent:"
+msgstr "Réponse automatique envoyée :"
+
+#: ../libgaim/plugins/log_reader.c:1428 ../libgaim/plugins/log_reader.c:1431
+#: ../libgaim/plugins/statenotify.c:80
+#, c-format
+msgid "%s has signed off."
+msgstr "%s vient de se déconnecter ."
+
+#: ../libgaim/plugins/log_reader.c:1445
+msgid "One or more messages may have been undeliverable."
+msgstr "Un ou plusieurs messages ne sont peut-être pas arrivés à destination."
+
+#: ../libgaim/plugins/log_reader.c:1455
+msgid "You were disconnected from the server."
+msgstr "Vous avez été déconnecté du serveur"
+
+#: ../libgaim/plugins/log_reader.c:1463
+msgid ""
+"You are currently disconnected. Messages will not be received unless you are "
+"logged in."
+msgstr ""
+"Vous êtes actuellement déconnecté. Vous ne pouvez pas recevoir de messages à "
+"moins de vous connecter."
+
+#: ../libgaim/plugins/log_reader.c:1478
+msgid "Message could not be sent because the maximum length was exceeded."
+msgstr ""
+"Le message n'a pas pu être envoyé car la taille maximale a été dépassée."
+
+#: ../libgaim/plugins/log_reader.c:1483
+msgid "Message could not be sent."
+msgstr "Le message n'a pas pu être envoyé."
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libgaim/plugins/log_reader.c:1831 ../libgaim/plugins/log_reader.c:1940
+msgid "Adium"
+msgstr "Adium"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libgaim/plugins/log_reader.c:1844 ../libgaim/plugins/log_reader.c:1945
+msgid "Fire"
+msgstr "Fire"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libgaim/plugins/log_reader.c:1856 ../libgaim/plugins/log_reader.c:1949
+msgid "Messenger Plus!"
+msgstr "Messenger Plus!"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libgaim/plugins/log_reader.c:1869 ../libgaim/plugins/log_reader.c:1954
+msgid "MSN Messenger"
+msgstr "MSN Messenger"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libgaim/plugins/log_reader.c:1881 ../libgaim/plugins/log_reader.c:1958
+msgid "Trillian"
+msgstr "Trillian"
+
+#. Add general preferences.
+#: ../libgaim/plugins/log_reader.c:1922
+msgid "General Log Reading Configuration"
+msgstr "Configuration général du lecteur d'archives."
+
+#: ../libgaim/plugins/log_reader.c:1926
+msgid "Fast size calculations"
+msgstr "Calcul rapide de la taille"
+
+#: ../libgaim/plugins/log_reader.c:1930
+msgid "Use name heuristics"
+msgstr "Utiliser une heuristique sur les noms"
+
+#. Add Log Directory preferences.
+#: ../libgaim/plugins/log_reader.c:1936
+msgid "Log Directory"
+msgstr "Dossier des archives"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/log_reader.c:1981
+msgid "Log Reader"
+msgstr "Lecteur d'archives"
+
+#. *< name
+#. *< version
+#. * summary
+#: ../libgaim/plugins/log_reader.c:1985
+msgid "Includes other IM clients' logs in the log viewer."
+msgstr ""
+"Inclut les archives d'autres clients de messagerie dans le lecteur "
+"d'archives."
+
+#. * description
+#: ../libgaim/plugins/log_reader.c:1989
+msgid ""
+"When viewing logs, this plugin will include logs from other IM clients. "
+"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"\n"
+"WARNING: This plugin is still alpha code and may crash frequently.  Use it "
+"at your own risk!"
+msgstr ""
+"Quand les archives sont consultés, ce plugin ajoute les archives d'autres "
+"clients de messagerie instantanée. Cela inclut actuellement Adium, MSN "
+"Messenger et Trillian.\n"
+"\n"
+"ATTENTION : ce plugin est encore en phase de développement précoce et peut "
+"planter fréquemment. Utilisez-le à vos risques et périls !"
+
+#: ../libgaim/plugins/mono/loader/mono.c:213
+msgid "Mono Plugin Loader"
+msgstr "Chargeur de plugins Mono"
+
+#: ../libgaim/plugins/mono/loader/mono.c:215
+#: ../libgaim/plugins/mono/loader/mono.c:216
+msgid "Loads .NET plugins with Mono."
+msgstr "Charge les plugins .NET Ă  l'aide de Mono."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/perl/perl.c:591
+msgid "Perl Plugin Loader"
+msgstr "Chargeur de plugins Perl"
+
+#. *< name
+#. *< version
+#. *< summary
+#: ../libgaim/plugins/perl/perl.c:593 ../libgaim/plugins/perl/perl.c:594
+msgid "Provides support for loading perl plugins."
+msgstr "Fournit le support pour charger des plugins Perl"
+
+#: ../libgaim/plugins/psychic.c:19
+msgid "Psychic Mode"
+msgstr "Mode psychique"
+
+#: ../libgaim/plugins/psychic.c:20
+msgid "Psychic mode for incoming conversation"
+msgstr "Mode psychique pour le début des nouvelles conversations."
+
+#: ../libgaim/plugins/psychic.c:21
+msgid ""
+"Causes conversation windows to appear as other users begin to message you.  "
+"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+msgstr ""
+"Ouvre les fenêtres des nouvelles conversations dès qu'un utilisateur "
+"commence Ă  vous Ă©crire un message. Celq fonctionne pour AIM, ICQ, Jabber, "
+"Sametime et Yahoo."
+
+#. This is a quote from Star Wars.  You should
+#. probably not translate it literally.  If
+#. you can't find a fitting cultural reference
+#. in your language, consider translating
+#. something like this instead:
+#. "You feel a new message coming."
+#: ../libgaim/plugins/psychic.c:63
+msgid "You feel a disturbance in the force..."
+msgstr "Vous sentez une perturbation dans la force..."
+
+#: ../libgaim/plugins/psychic.c:82
+msgid "Only enable for users on the buddy list"
+msgstr "Activer uniquement pour les utilisateurs dans ma liste de contacts"
+
+#: ../libgaim/plugins/psychic.c:87
+msgid "Disable when away"
+msgstr "DĂ©sactiver pendant les absences"
+
+#: ../libgaim/plugins/psychic.c:91
+msgid "Display notification message in conversations"
+msgstr "Afficher un message de notification dans les conversations"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/signals-test.c:684
+msgid "Signals Test"
+msgstr "Test des événements"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/signals-test.c:687 ../libgaim/plugins/signals-test.c:689
+msgid "Test to see that all signals are working properly."
+msgstr "Vérifie que tous les événements fonctionnent correctement."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/simple.c:37
+msgid "Simple Plugin"
+msgstr "Plugin simple"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/simple.c:40 ../libgaim/plugins/simple.c:42
+msgid "Tests to see that most things are working."
+msgstr "VĂ©rifie que la plupart des choses fonctionne correctement."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ssl/ssl.c:94
+msgid "SSL"
+msgstr "SSL"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/ssl/ssl.c:97 ../libgaim/plugins/ssl/ssl.c:99
+msgid "Provides a wrapper around SSL support libraries."
+msgstr "Fournit une interface pour les bibliothèques SSL"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ssl/ssl-gnutls.c:240
+msgid "GNUTLS"
+msgstr "GNUTLS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/ssl/ssl-gnutls.c:243
+#: ../libgaim/plugins/ssl/ssl-gnutls.c:245
+msgid "Provides SSL support through GNUTLS."
+msgstr "Fournit le support SSL grâce à la bibliothèque GNUTLS"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ssl/ssl-nss.c:409
+msgid "NSS"
+msgstr "NSS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/ssl/ssl-nss.c:412 ../libgaim/plugins/ssl/ssl-nss.c:414
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "Fournit le support SSL grâce à la bibliothèque NSS"
+
+#: ../libgaim/plugins/statenotify.c:50
+#, c-format
+msgid "%s is no longer away."
+msgstr "%s n'est plus absent"
+
+#: ../libgaim/plugins/statenotify.c:52
+#, c-format
+msgid "%s has gone away."
+msgstr "%s est passé absent"
+
+#: ../libgaim/plugins/statenotify.c:62
+#, c-format
+msgid "%s has become idle."
+msgstr "%s est devenu inactif"
+
+#: ../libgaim/plugins/statenotify.c:64
+#, c-format
+msgid "%s is no longer idle."
+msgstr "%s n'est plus inactif"
+
+#: ../libgaim/plugins/statenotify.c:73
+#, c-format
+msgid "%s has signed on."
+msgstr "%s vient de se connecter."
+
+#: ../libgaim/plugins/statenotify.c:91
+msgid "Notify When"
+msgstr "Notification quand"
+
+#: ../libgaim/plugins/statenotify.c:94
+msgid "Buddy Goes _Away"
+msgstr "L'utilisateur s'absente"
+
+#: ../libgaim/plugins/statenotify.c:97
+msgid "Buddy Goes _Idle"
+msgstr "L'utilisateur passe inactif"
+
+#: ../libgaim/plugins/statenotify.c:100
+msgid "Buddy _Signs On/Off"
+msgstr "_Connexion/déconnexion d'un contact"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/statenotify.c:142
+msgid "Buddy State Notification"
+msgstr "Notification de changement d'Ă©tat"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/statenotify.c:145 ../libgaim/plugins/statenotify.c:148
+msgid ""
+"Notifies in a conversation window when a buddy goes or returns from away or "
+"idle."
+msgstr ""
+"Indique dans la fenĂŞtre de conversation quand un contact part ou revient "
+"d'une absence ou d'une inactivité."
+
+#: ../libgaim/plugins/tcl/tcl.c:413
+msgid "Tcl Plugin Loader"
+msgstr "Chargeur de plugins Tcl"
+
+#: ../libgaim/plugins/tcl/tcl.c:415 ../libgaim/plugins/tcl/tcl.c:416
+msgid "Provides support for loading Tcl plugins"
+msgstr "Fournit le support pour charger des plugins Tcl"
+
 #. Send a message about the connection error
-#: ../src/protocols/bonjour/bonjour.c:111
+#: ../libgaim/protocols/bonjour/bonjour.c:111
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Impossible d'attendre des connexions rentrantes de messages.\n"
 
-#: ../src/protocols/bonjour/bonjour.c:146
+#: ../libgaim/protocols/bonjour/bonjour.c:146
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 "Impossible d'Ă©tablir une connexion vers le serveur local mDNS. Fonctionne-t-"
 "il ?"
 
-#: ../src/protocols/bonjour/bonjour.c:337
-#: ../src/protocols/sametime/sametime.c:3243
+#: ../libgaim/protocols/bonjour/bonjour.c:337
+#: ../libgaim/protocols/sametime/sametime.c:3239
 #, c-format
 msgid ""
 "\n"
@@ -5558,7 +6405,7 @@
 "\n"
 "<b>État :</b> %s"
 
-#: ../src/protocols/bonjour/bonjour.c:339
+#: ../libgaim/protocols/bonjour/bonjour.c:339
 #, c-format
 msgid ""
 "\n"
@@ -5577,386 +6424,399 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/bonjour/bonjour.c:434
-#: ../src/protocols/bonjour/bonjour.c:436
+#: ../libgaim/protocols/bonjour/bonjour.c:435
+#: ../libgaim/protocols/bonjour/bonjour.c:437
 msgid "Bonjour Protocol Plugin"
 msgstr "Plugin pour le protocole Bonjour"
 
-#: ../src/protocols/bonjour/bonjour.c:472
-#: ../src/protocols/bonjour/bonjour.c:480
-#: ../src/protocols/bonjour/bonjour.c:538 ../src/protocols/silc/silc.c:307
+#: ../libgaim/protocols/bonjour/bonjour.c:473
+#: ../libgaim/protocols/bonjour/bonjour.c:481
+#: ../libgaim/protocols/bonjour/bonjour.c:539
+#: ../libgaim/protocols/silc/silc.c:301
 msgid "Gaim User"
 msgstr "Utilisateur de Gaim"
 
 #. Creating the user splits
-#: ../src/protocols/bonjour/bonjour.c:576 ../src/protocols/silc/silc.c:937
+#: ../libgaim/protocols/bonjour/bonjour.c:577
+#: ../libgaim/protocols/silc/silc.c:935
 msgid "Hostname"
 msgstr "Nom d'hôte :"
 
 #. Creating the options for the protocol
-#: ../src/protocols/bonjour/bonjour.c:580 ../src/protocols/gg/gg.c:622
-#: ../src/protocols/jabber/jabber.c:789
+#: ../libgaim/protocols/bonjour/bonjour.c:581 ../libgaim/protocols/gg/gg.c:622
+#: ../libgaim/protocols/jabber/jabber.c:800
 msgid "First name"
 msgstr "Prénom :"
 
-#: ../src/protocols/bonjour/bonjour.c:583 ../src/protocols/gg/gg.c:617
-#: ../src/protocols/jabber/jabber.c:794
+#: ../libgaim/protocols/bonjour/bonjour.c:584 ../libgaim/protocols/gg/gg.c:617
+#: ../libgaim/protocols/jabber/jabber.c:805
 msgid "Last name"
 msgstr "Nom :"
 
-#: ../src/protocols/bonjour/bonjour.c:586 ../src/protocols/gg/gg.c:468
-#: ../src/protocols/jabber/jabber.c:779 ../src/protocols/silc/silc.c:701
-#: ../src/protocols/silc/silc.c:941
+#: ../libgaim/protocols/bonjour/bonjour.c:587 ../libgaim/protocols/gg/gg.c:468
+#: ../libgaim/protocols/jabber/jabber.c:790
+#: ../libgaim/protocols/silc/silc.c:699 ../libgaim/protocols/silc/silc.c:939
 msgid "E-mail"
 msgstr "Adresse Ă©lectronique"
 
-#: ../src/protocols/bonjour/bonjour.c:589
+#: ../libgaim/protocols/bonjour/bonjour.c:590
 msgid "AIM Account"
 msgstr "Compte AIM"
 
-#: ../src/protocols/bonjour/bonjour.c:592
+#: ../libgaim/protocols/bonjour/bonjour.c:593
 msgid "Jabber Account"
 msgstr "Compte Jabber"
 
-#: ../src/protocols/bonjour/bonjour.h:35
+#: ../libgaim/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../src/protocols/bonjour/jabber.c:374
+#: ../libgaim/protocols/bonjour/jabber.c:374
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s a fermé la conversation."
 
-#: ../src/protocols/bonjour/jabber.c:461
+#: ../libgaim/protocols/bonjour/jabber.c:461
 msgid "Cannot open socket"
 msgstr "Impossible d'ouvrir la connexion."
 
-#: ../src/protocols/bonjour/jabber.c:469
+#: ../libgaim/protocols/bonjour/jabber.c:469
 msgid "Error setting socket options"
 msgstr "Erreur à la mise en place des paramètres de la connexion."
 
-#: ../src/protocols/bonjour/jabber.c:493
+#: ../libgaim/protocols/bonjour/jabber.c:493
 msgid "Could not bind socket to port"
 msgstr "Impossible d'affecter un port Ă  la connexion."
 
-#: ../src/protocols/bonjour/jabber.c:501
+#: ../libgaim/protocols/bonjour/jabber.c:501
 msgid "Could not listen on socket"
 msgstr "Impossible de se mettre en Ă©coute sur la connexion."
 
-#: ../src/protocols/bonjour/jabber.c:594
+#: ../libgaim/protocols/bonjour/jabber.c:594
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 "Impossible d'envoyer le message, la conversation n'a pas pu être commencée."
 
-#: ../src/protocols/gg/gg.c:76 ../src/proxy.c:2347
+#: ../libgaim/protocols/gg/gg.c:76 ../libgaim/proxy.c:1776
 msgid "Invalid proxy settings"
 msgstr "Paramètres du serveur mandataire incorrects"
 
-#: ../src/protocols/gg/gg.c:77 ../src/proxy.c:2347
+#: ../libgaim/protocols/gg/gg.c:77 ../libgaim/proxy.c:1776
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr "Le nom d'hĂ´te ou le port pour le serveur mandataire est incorrect."
 
-#: ../src/protocols/gg/gg.c:115 ../src/protocols/gg/gg.c:137
-#: ../src/protocols/gg/gg.c:180
+#: ../libgaim/protocols/gg/gg.c:115 ../libgaim/protocols/gg/gg.c:137
+#: ../libgaim/protocols/gg/gg.c:180
 msgid "Token Error"
 msgstr "Erreur de jeton"
 
-#: ../src/protocols/gg/gg.c:116 ../src/protocols/gg/gg.c:138
-#: ../src/protocols/gg/gg.c:181
+#: ../libgaim/protocols/gg/gg.c:116 ../libgaim/protocols/gg/gg.c:138
+#: ../libgaim/protocols/gg/gg.c:181
 msgid "Unable to fetch the token.\n"
 msgstr "Impossible de récupérer le jeton.\n"
 
-#: ../src/protocols/gg/gg.c:269 ../src/protocols/gg/gg.c:288
+#: ../libgaim/protocols/gg/gg.c:269 ../libgaim/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
 msgstr "Sauver la liste de contacts..."
 
-#: ../src/protocols/gg/gg.c:270
+#: ../libgaim/protocols/gg/gg.c:270
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "Votre liste de contacts est vide, rien n'a été sauvé."
 
-#: ../src/protocols/gg/gg.c:276 ../src/protocols/gg/gg.c:278
+#: ../libgaim/protocols/gg/gg.c:276 ../libgaim/protocols/gg/gg.c:278
 msgid "Couldn't open file"
 msgstr "Impossible d'ouvrir le fichier"
 
-#: ../src/protocols/gg/gg.c:289
+#: ../libgaim/protocols/gg/gg.c:289
 msgid "Buddylist saved successfully!"
 msgstr "Sauvegarde de la liste de contacts effectuée."
 
-#: ../src/protocols/gg/gg.c:307 ../src/protocols/gg/gg.c:308
+#: ../libgaim/protocols/gg/gg.c:307 ../libgaim/protocols/gg/gg.c:308
 msgid "Couldn't load buddylist"
 msgstr "Impossible de charger la liste de contacts."
 
-#: ../src/protocols/gg/gg.c:324
+#: ../libgaim/protocols/gg/gg.c:324
 msgid "Load Buddylist..."
 msgstr "Charger une liste de contacts..."
 
-#: ../src/protocols/gg/gg.c:325
+#: ../libgaim/protocols/gg/gg.c:325
 msgid "Buddylist loaded successfully!"
 msgstr "Chargement de liste de contacts effectué."
 
-#: ../src/protocols/gg/gg.c:336
+#: ../libgaim/protocols/gg/gg.c:336
 msgid "Save buddylist..."
 msgstr "Sauver la liste de contacts..."
 
-#: ../src/protocols/gg/gg.c:380
+#: ../libgaim/protocols/gg/gg.c:380
 msgid "Fill in the registration fields."
 msgstr "Renseignez les rubriques d'inscription."
 
-#: ../src/protocols/gg/gg.c:385
+#: ../libgaim/protocols/gg/gg.c:385
 msgid "Passwords do not match."
 msgstr "Les mots de passe diffèrent."
 
-#: ../src/protocols/gg/gg.c:394
+#: ../libgaim/protocols/gg/gg.c:394
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "Une erreur est survenue. Impossible d'inscrire un nouveau compte.\n"
 
-#: ../src/protocols/gg/gg.c:407
+#: ../libgaim/protocols/gg/gg.c:407
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Nouveau compte Gadu-Gadu créé."
 
-#: ../src/protocols/gg/gg.c:408
+#: ../libgaim/protocols/gg/gg.c:408
 msgid "Registration completed successfully!"
 msgstr "Inscription effectuée."
 
-#: ../src/protocols/gg/gg.c:473 ../src/protocols/gg/gg.c:764
-#: ../src/protocols/jabber/jabber.c:768 ../src/protocols/jabber/jabber.c:1327
+#: ../libgaim/protocols/gg/gg.c:473 ../libgaim/protocols/gg/gg.c:764
+#: ../libgaim/protocols/jabber/jabber.c:779
+#: ../libgaim/protocols/jabber/jabber.c:1339
 msgid "Password"
 msgstr "Mot de passe"
 
-#: ../src/protocols/gg/gg.c:478 ../src/protocols/gg/gg.c:769
+#: ../libgaim/protocols/gg/gg.c:478 ../libgaim/protocols/gg/gg.c:769
 msgid "Password (retype)"
 msgstr "Mot de passe (pour vérification)"
 
-#: ../src/protocols/gg/gg.c:483 ../src/protocols/gg/gg.c:774
+#: ../libgaim/protocols/gg/gg.c:483 ../libgaim/protocols/gg/gg.c:774
 msgid "Enter current token"
 msgstr "Saisissez le jeton actuel"
 
-#: ../src/protocols/gg/gg.c:489 ../src/protocols/gg/gg.c:780
+#: ../libgaim/protocols/gg/gg.c:489 ../libgaim/protocols/gg/gg.c:780
 msgid "Current token"
 msgstr "Jeton actuel"
 
-#: ../src/protocols/gg/gg.c:493 ../src/protocols/gg/gg.c:494
+#: ../libgaim/protocols/gg/gg.c:493 ../libgaim/protocols/gg/gg.c:494
 msgid "Register New Gadu-Gadu Account"
 msgstr "Créer un nouveau compte Gadu-Gadu"
 
-#: ../src/protocols/gg/gg.c:495
+#: ../libgaim/protocols/gg/gg.c:495
 msgid "Please, fill in the following fields"
 msgstr "Veuillez renseigner les rubriques suivantes."
 
 #. General
-#: ../src/protocols/gg/gg.c:627 ../src/protocols/gg/gg.c:1038
-#: ../src/protocols/gg/gg.c:1104 ../src/protocols/gg/gg.c:2179
-#: ../src/protocols/jabber/buddy.c:271 ../src/protocols/jabber/buddy.c:803
-#: ../src/protocols/jabber/buddy.c:1522 ../src/protocols/jabber/buddy.c:1704
-#: ../src/protocols/jabber/jabber.c:784 ../src/protocols/msn/msn.c:1370
-#: ../src/protocols/msn/msn.c:1532 ../src/protocols/silc/buddy.c:1528
-#: ../src/protocols/silc/ops.c:1036 ../src/protocols/silc/ops.c:1179
-#: ../src/protocols/silc/ops.c:1328
-#: ../src/protocols/yahoo/yahoo_profile.c:1041
+#: ../libgaim/protocols/gg/gg.c:627 ../libgaim/protocols/gg/gg.c:1038
+#: ../libgaim/protocols/gg/gg.c:1104 ../libgaim/protocols/gg/gg.c:2182
+#: ../libgaim/protocols/jabber/buddy.c:271
+#: ../libgaim/protocols/jabber/buddy.c:800
+#: ../libgaim/protocols/jabber/buddy.c:1526
+#: ../libgaim/protocols/jabber/buddy.c:1708
+#: ../libgaim/protocols/jabber/jabber.c:795
+#: ../libgaim/protocols/msn/msn.c:1370 ../libgaim/protocols/msn/msn.c:1536
+#: ../libgaim/protocols/qq/buddy_info.c:41
+#: ../libgaim/protocols/silc/buddy.c:1528 ../libgaim/protocols/silc/ops.c:1035
+#: ../libgaim/protocols/silc/ops.c:1178 ../libgaim/protocols/silc/ops.c:1327
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1055
 msgid "Nickname"
 msgstr "Pseudonyme"
 
-#: ../src/protocols/gg/gg.c:632 ../src/protocols/gg/gg.c:1043
-#: ../src/protocols/gg/gg.c:1107 ../src/protocols/jabber/jabber.c:804
-#: ../src/protocols/oscar/oscar.c:3708 ../src/protocols/oscar/oscar.c:3716
+#: ../libgaim/protocols/gg/gg.c:632 ../libgaim/protocols/gg/gg.c:1043
+#: ../libgaim/protocols/gg/gg.c:1107 ../libgaim/protocols/jabber/jabber.c:815
+#: ../libgaim/protocols/oscar/oscar.c:3683
+#: ../libgaim/protocols/oscar/oscar.c:3691
+#: ../libgaim/protocols/qq/buddy_info.c:47
 msgid "City"
 msgstr "Localité"
 
-#: ../src/protocols/gg/gg.c:637
+#: ../libgaim/protocols/gg/gg.c:637
 msgid "Year of birth"
 msgstr "Année de naissance"
 
-#: ../src/protocols/gg/gg.c:640 ../src/protocols/msn/msn.c:1534
-#: ../src/protocols/oscar/oscar.c:3672
-#: ../src/protocols/yahoo/yahoo_profile.c:1066
+#: ../libgaim/protocols/gg/gg.c:640 ../libgaim/protocols/msn/msn.c:1538
+#: ../libgaim/protocols/oscar/oscar.c:3647
+#: ../libgaim/protocols/qq/buddy_info.c:44
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1080
 msgid "Gender"
 msgstr "Genre"
 
-#: ../src/protocols/gg/gg.c:641
+#: ../libgaim/protocols/gg/gg.c:641
 msgid "Male or female"
 msgstr "Homme ou femme"
 
-#: ../src/protocols/gg/gg.c:642 ../src/protocols/oscar/oscar.c:3672
+#: ../libgaim/protocols/gg/gg.c:642 ../libgaim/protocols/oscar/oscar.c:3647
+#: ../libgaim/protocols/qq/buddy_info.c:81
 msgid "Male"
 msgstr "Homme"
 
-#: ../src/protocols/gg/gg.c:643 ../src/protocols/oscar/oscar.c:3672
+#: ../libgaim/protocols/gg/gg.c:643 ../libgaim/protocols/oscar/oscar.c:3647
+#: ../libgaim/protocols/qq/buddy_info.c:82
 msgid "Female"
 msgstr "Femme"
 
-#: ../src/protocols/gg/gg.c:647
+#: ../libgaim/protocols/gg/gg.c:647
 msgid "Only online"
 msgstr "En ligne seulement"
 
-#: ../src/protocols/gg/gg.c:651 ../src/protocols/gg/gg.c:652
+#: ../libgaim/protocols/gg/gg.c:651 ../libgaim/protocols/gg/gg.c:652
 msgid "Find buddies"
 msgstr "Trouver des contacts"
 
-#: ../src/protocols/gg/gg.c:653
+#: ../libgaim/protocols/gg/gg.c:653
 msgid "Please, enter your search criteria below"
 msgstr "Saisissez votre critère de recherche ci-dessous."
 
-#: ../src/protocols/gg/gg.c:690
+#: ../libgaim/protocols/gg/gg.c:690
 msgid "Fill in the fields."
 msgstr "Renseignez les rubriques."
 
-#: ../src/protocols/gg/gg.c:702
+#: ../libgaim/protocols/gg/gg.c:702
 msgid "Your current password is different from the one that you specified."
 msgstr "Votre mot de passe actuel diffère de celui que vous venez de saisir."
 
-#: ../src/protocols/gg/gg.c:716
+#: ../libgaim/protocols/gg/gg.c:716
 msgid "Unable to change password. Error occured.\n"
 msgstr "Une erreur est survenue. Impossible de changer le mot de passe.\n"
 
-#: ../src/protocols/gg/gg.c:725
+#: ../libgaim/protocols/gg/gg.c:725
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Changer le mot de passe du compte Gadu-Gadu"
 
-#: ../src/protocols/gg/gg.c:726
+#: ../libgaim/protocols/gg/gg.c:726
 msgid "Password was changed successfully!"
 msgstr "Changement de mot de passe effectué."
 
-#: ../src/protocols/gg/gg.c:759
+#: ../libgaim/protocols/gg/gg.c:759
 msgid "Current password"
 msgstr "Mot de passe actuel"
 
-#: ../src/protocols/gg/gg.c:784
+#: ../libgaim/protocols/gg/gg.c:784
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 "Saisissez votre mot de passe et un nouveau mot de passe pour ;'identifiant : "
 
-#: ../src/protocols/gg/gg.c:788 ../src/protocols/gg/gg.c:789
+#: ../libgaim/protocols/gg/gg.c:788 ../libgaim/protocols/gg/gg.c:789
 msgid "Change Gadu-Gadu Password"
 msgstr "Changer le le mot de passe Gadu-Gadu"
 
-#: ../src/protocols/gg/gg.c:863
+#: ../libgaim/protocols/gg/gg.c:863
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Choisissez un salon de discussion pour le contact : %s"
 
-#: ../src/protocols/gg/gg.c:866 ../src/protocols/gg/gg.c:867
+#: ../libgaim/protocols/gg/gg.c:866 ../libgaim/protocols/gg/gg.c:867
 msgid "Add to chat..."
 msgstr "Ajouter Ă  la discussion..."
 
-#: ../src/protocols/gg/gg.c:1029 ../src/protocols/gg/gg.c:1098
-#: ../src/protocols/oscar/oscar.c:3644
+#: ../libgaim/protocols/gg/gg.c:1029 ../libgaim/protocols/gg/gg.c:1098
+#: ../libgaim/protocols/oscar/oscar.c:3619
 msgid "UIN"
 msgstr "UIN"
 
-#: ../src/protocols/gg/gg.c:1033 ../src/protocols/gg/gg.c:1101
-#: ../src/protocols/jabber/buddy.c:1518 ../src/protocols/jabber/buddy.c:1694
-#: ../src/protocols/oscar/oscar.c:3655 ../src/protocols/silc/ops.c:1024
+#: ../libgaim/protocols/gg/gg.c:1033 ../libgaim/protocols/gg/gg.c:1101
+#: ../libgaim/protocols/jabber/buddy.c:1522
+#: ../libgaim/protocols/jabber/buddy.c:1698
+#: ../libgaim/protocols/oscar/oscar.c:3630
+#: ../libgaim/protocols/silc/ops.c:1023
 msgid "First Name"
 msgstr "Prénom"
 
-#: ../src/protocols/gg/gg.c:1052 ../src/protocols/gg/gg.c:1110
+#: ../libgaim/protocols/gg/gg.c:1052 ../libgaim/protocols/gg/gg.c:1110
 msgid "Birth Year"
 msgstr "Année de naissance"
 
-#: ../src/protocols/gg/gg.c:1092 ../src/protocols/gg/gg.c:1161
-#: ../src/protocols/oscar/oscar.c:3819
+#: ../libgaim/protocols/gg/gg.c:1092 ../libgaim/protocols/gg/gg.c:1161
+#: ../libgaim/protocols/oscar/oscar.c:3794
 msgid "Unable to display the search results."
 msgstr "Impossible d'afficher les résultats de la recherche."
 
-#: ../src/protocols/gg/gg.c:1152
+#: ../libgaim/protocols/gg/gg.c:1152
 msgid "Gadu-Gadu Public Directory"
 msgstr "Annuaire public Gadu-Gadu"
 
-#: ../src/protocols/gg/gg.c:1153
+#: ../libgaim/protocols/gg/gg.c:1153
 msgid "Search results"
 msgstr "RĂ©sultats de la recherche"
 
-#: ../src/protocols/gg/gg.c:1196
+#: ../libgaim/protocols/gg/gg.c:1196
 msgid "No matching users found"
 msgstr "Aucun utilisateur correspondant trouvé."
 
-#: ../src/protocols/gg/gg.c:1197
+#: ../libgaim/protocols/gg/gg.c:1197
 msgid "There are no users matching your search criteria."
 msgstr "Il n'y a pas d'utilisateurs qui vérifient votre critère de recherche."
 
-#: ../src/protocols/gg/gg.c:1291 ../src/protocols/gg/gg.c:1438
+#: ../libgaim/protocols/gg/gg.c:1291 ../libgaim/protocols/gg/gg.c:1440
 msgid "Unable to read socket"
 msgstr "Impossible de lire le socket"
 
-#: ../src/protocols/gg/gg.c:1374
+#: ../libgaim/protocols/gg/gg.c:1376
 msgid "Buddy list downloaded"
 msgstr "Liste de contacts téléchargée"
 
-#: ../src/protocols/gg/gg.c:1375
+#: ../libgaim/protocols/gg/gg.c:1377
 msgid "Your buddy list was downloaded from the server."
 msgstr "Votre liste de contacts à été récupérée depuis le serveur."
 
-#: ../src/protocols/gg/gg.c:1382
+#: ../libgaim/protocols/gg/gg.c:1384
 msgid "Buddy list uploaded"
 msgstr "Liste des contacts envoyée"
 
-#: ../src/protocols/gg/gg.c:1383
+#: ../libgaim/protocols/gg/gg.c:1385
 msgid "Your buddy list was stored on the server."
 msgstr "Votre liste de contacts à été stockée sur le serveur."
 
-#: ../src/protocols/gg/gg.c:1484 ../src/protocols/gg/gg.c:1708
+#: ../libgaim/protocols/gg/gg.c:1486 ../libgaim/protocols/gg/gg.c:1710
 msgid "Connection failed."
 msgstr "Échec de la connexion"
 
-#: ../src/protocols/gg/gg.c:1614 ../src/protocols/msn/msn.c:562
+#: ../libgaim/protocols/gg/gg.c:1616 ../libgaim/protocols/msn/msn.c:562
 msgid "Blocked"
 msgstr "Bloqué"
 
-#: ../src/protocols/gg/gg.c:1637
+#: ../libgaim/protocols/gg/gg.c:1639
 msgid "Add to chat"
 msgstr "Ajouter Ă  la discussion"
 
-#: ../src/protocols/gg/gg.c:1646
+#: ../libgaim/protocols/gg/gg.c:1648
 msgid "Unblock"
 msgstr "DĂ©bloquer"
 
-#: ../src/protocols/gg/gg.c:1650
+#: ../libgaim/protocols/gg/gg.c:1652
 msgid "Block"
 msgstr "Bloquer"
 
-#: ../src/protocols/gg/gg.c:1667
+#: ../libgaim/protocols/gg/gg.c:1669
 msgid "Chat _name:"
 msgstr "_Nom de la discussion :"
 
-#: ../src/protocols/gg/gg.c:1900
+#: ../libgaim/protocols/gg/gg.c:1902
 msgid "Chat error"
 msgstr "Erreur de discussion"
 
-#: ../src/protocols/gg/gg.c:1901
+#: ../libgaim/protocols/gg/gg.c:1903
 msgid "This chat name is already in use"
 msgstr "Ce nom de discussion est déjà utilisé."
 
-#: ../src/protocols/gg/gg.c:1984
+#: ../libgaim/protocols/gg/gg.c:1986
 msgid "Not connected to the server."
 msgstr "Vous n'êtes pas connecté au serveur"
 
-#: ../src/protocols/gg/gg.c:2007
+#: ../libgaim/protocols/gg/gg.c:2009
 msgid "Find buddies..."
 msgstr "Trouver des contacts..."
 
-#: ../src/protocols/gg/gg.c:2013
+#: ../libgaim/protocols/gg/gg.c:2015
 msgid "Change password..."
 msgstr "Changer de mot de passe..."
 
-#: ../src/protocols/gg/gg.c:2019
+#: ../libgaim/protocols/gg/gg.c:2021
 msgid "Upload buddylist to Server"
 msgstr "Envoyer la liste de contacts sur le serveur"
 
-#: ../src/protocols/gg/gg.c:2023
+#: ../libgaim/protocols/gg/gg.c:2025
 msgid "Download buddylist from Server"
 msgstr "Récupérer la liste de contacts du serveur"
 
-#: ../src/protocols/gg/gg.c:2027
+#: ../libgaim/protocols/gg/gg.c:2029
 msgid "Delete buddylist from Server"
 msgstr "Effacer la liste de contacts du serveur"
 
-#: ../src/protocols/gg/gg.c:2031
+#: ../libgaim/protocols/gg/gg.c:2033
 msgid "Save buddylist to file..."
 msgstr "Sauver la liste de contacts dans un fichier..."
 
-#: ../src/protocols/gg/gg.c:2035
+#: ../libgaim/protocols/gg/gg.c:2037
 msgid "Load buddylist from file..."
 msgstr "Charger la liste de contacts depuis un fichier..."
 
@@ -5971,119 +6831,122 @@
 #. id
 #. name
 #. version
-#: ../src/protocols/gg/gg.c:2131
+#: ../libgaim/protocols/gg/gg.c:2134
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Plugin pour le protocole Gadu-Gadu"
 
 #. summary
-#: ../src/protocols/gg/gg.c:2132
+#: ../libgaim/protocols/gg/gg.c:2135
 msgid "Polish popular IM"
 msgstr "Messagerie polonaise populaire"
 
-#: ../src/protocols/gg/gg.c:2180
+#: ../libgaim/protocols/gg/gg.c:2183
 msgid "Gadu-Gadu User"
 msgstr "Utilisateur Gadu-Gadu"
 
-#: ../src/protocols/irc/cmds.c:43 ../src/protocols/silc/silc.c:1587
+#: ../libgaim/protocols/irc/cmds.c:43 ../libgaim/protocols/silc/silc.c:1585
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Commande inconnue : %s"
 
-#: ../src/protocols/irc/cmds.c:501 ../src/protocols/jabber/chat.c:590
-#: ../src/protocols/silc/silc.c:1295
+#: ../libgaim/protocols/irc/cmds.c:505 ../libgaim/protocols/jabber/chat.c:591
+#: ../libgaim/protocols/silc/silc.c:1293
 #, c-format
 msgid "current topic is: %s"
 msgstr "Le sujet courant est : %s"
 
-#: ../src/protocols/irc/cmds.c:505 ../src/protocols/jabber/chat.c:594
-#: ../src/protocols/silc/silc.c:1299
+#: ../libgaim/protocols/irc/cmds.c:509 ../libgaim/protocols/jabber/chat.c:595
+#: ../libgaim/protocols/silc/silc.c:1297
 msgid "No topic is set"
 msgstr "Pas de sujet"
 
-#: ../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
+#: ../libgaim/protocols/irc/dcc_send.c:293
+#: ../libgaim/protocols/irc/dcc_send.c:334
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:268
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:277
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:290
 msgid "File Transfer Failed"
 msgstr "Échec du transfert de fichier"
 
-#: ../src/protocols/irc/dcc_send.c:288 ../src/protocols/irc/dcc_send.c:327
+#: ../libgaim/protocols/irc/dcc_send.c:294
+#: ../libgaim/protocols/irc/dcc_send.c:335
 msgid "Gaim could not open a listening port."
 msgstr "Impossible d'ouvrir un port en Ă©coute"
 
-#: ../src/protocols/irc/irc.c:78
+#: ../libgaim/protocols/irc/irc.c:80
 msgid "Error displaying MOTD"
 msgstr "Erreur Ă  l'affichage du message du jour"
 
-#: ../src/protocols/irc/irc.c:78
+#: ../libgaim/protocols/irc/irc.c:80
 msgid "No MOTD available"
 msgstr "Message du jour non disponible"
 
-#: ../src/protocols/irc/irc.c:79
+#: ../libgaim/protocols/irc/irc.c:81
 msgid "There is no MOTD associated with this connection."
 msgstr "Il n'y a pas de message du jour associé à cette connexion"
 
-#: ../src/protocols/irc/irc.c:82
+#: ../libgaim/protocols/irc/irc.c:84
 #, c-format
 msgid "MOTD for %s"
 msgstr "Message du jour pour %s"
 
-#: ../src/protocols/irc/irc.c:119 ../src/protocols/irc/irc.c:149
-#: ../src/protocols/irc/irc.c:604 ../src/protocols/irc/irc.c:629
+#: ../libgaim/protocols/irc/irc.c:128 ../libgaim/protocols/irc/irc.c:166
+#: ../libgaim/protocols/irc/irc.c:614 ../libgaim/protocols/irc/irc.c:639
 msgid "Server has disconnected"
 msgstr "DĂ©connexion par le serveur"
 
-#: ../src/protocols/irc/irc.c:242
+#: ../libgaim/protocols/irc/irc.c:259
 msgid "View MOTD"
 msgstr "Voir le message du jour"
 
-#: ../src/protocols/irc/irc.c:254 ../src/protocols/silc/chat.c:33
+#: ../libgaim/protocols/irc/irc.c:271 ../libgaim/protocols/silc/chat.c:33
 msgid "_Channel:"
 msgstr "_Salon :"
 
-#: ../src/protocols/irc/irc.c:260 ../src/protocols/jabber/chat.c:59
+#: ../libgaim/protocols/irc/irc.c:277 ../libgaim/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "Mot de _passe :"
 
-#: ../src/protocols/irc/irc.c:292
+#: ../libgaim/protocols/irc/irc.c:308
 msgid "IRC nicks may not contain whitespace"
 msgstr "Les surnoms IRC ne peuvent pas avoir d'espace"
 
-#: ../src/protocols/irc/irc.c:321 ../src/protocols/jabber/jabber.c:569
-#: ../src/protocols/jabber/jabber.c:908
+#: ../libgaim/protocols/irc/irc.c:337 ../libgaim/protocols/jabber/jabber.c:575
+#: ../libgaim/protocols/jabber/jabber.c:920
 msgid "SSL support unavailable"
 msgstr "Support SSL non disponible"
 
-#: ../src/protocols/irc/irc.c:333 ../src/protocols/simple/simple.c:452
-#: ../src/protocols/simple/simple.c:1527
+#: ../libgaim/protocols/irc/irc.c:349 ../libgaim/protocols/simple/simple.c:466
+#: ../libgaim/protocols/simple/simple.c:1588
 msgid "Couldn't create socket"
 msgstr "Impossible de créer le socket"
 
-#: ../src/protocols/irc/irc.c:404 ../src/protocols/jabber/jabber.c:430
-#: ../src/protocols/oscar/oscar.c:1255
+#: ../libgaim/protocols/irc/irc.c:415 ../libgaim/protocols/jabber/jabber.c:451
+#: ../libgaim/protocols/oscar/oscar.c:1220
 msgid "Couldn't connect to host"
 msgstr "Impossible de se connecter Ă  l'hĂ´te"
 
-#: ../src/protocols/irc/irc.c:429 ../src/protocols/jabber/jabber.c:457
+#: ../libgaim/protocols/irc/irc.c:437 ../libgaim/protocols/jabber/jabber.c:475
 msgid "Connection Failed"
 msgstr "Échec de la connexion"
 
-#: ../src/protocols/irc/irc.c:432 ../src/protocols/jabber/jabber.c:460
+#: ../libgaim/protocols/irc/irc.c:440 ../libgaim/protocols/jabber/jabber.c:478
 msgid "SSL Handshake Failed"
 msgstr "Échec de la poignée de main SSL"
 
-#: ../src/protocols/irc/irc.c:601 ../src/protocols/irc/irc.c:626
+#: ../libgaim/protocols/irc/irc.c:611 ../libgaim/protocols/irc/irc.c:636
 msgid "Read error"
 msgstr "Erreur de lecture"
 
-#: ../src/protocols/irc/irc.c:765 ../src/protocols/silc/chat.c:1421
-#: ../src/protocols/yahoo/yahoochat.c:1431
+#: ../libgaim/protocols/irc/irc.c:775 ../libgaim/protocols/silc/chat.c:1421
+#: ../libgaim/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: ../src/protocols/irc/irc.c:768 ../src/protocols/sametime/sametime.c:3354
-#: ../src/protocols/silc/chat.c:1424 ../src/protocols/silc/ops.c:1380
-#: ../src/protocols/yahoo/yahoochat.c:1440
+#: ../libgaim/protocols/irc/irc.c:778
+#: ../libgaim/protocols/sametime/sametime.c:3350
+#: ../libgaim/protocols/silc/chat.c:1424 ../libgaim/protocols/silc/ops.c:1379
+#: ../libgaim/protocols/yahoo/yahoochat.c:1447
 msgid "Topic"
 msgstr "Sujet"
 
@@ -6095,47 +6958,48 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../src/protocols/irc/irc.c:877
+#: ../libgaim/protocols/irc/irc.c:908
 msgid "IRC Protocol Plugin"
 msgstr "Plugin pour le protocole IRC"
 
 #. *  summary
-#: ../src/protocols/irc/irc.c:878
+#: ../libgaim/protocols/irc/irc.c:909
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Plugin qui pue moins pour le protocole IRC"
 
 #. host to connect to
-#: ../src/protocols/irc/irc.c:897 ../src/protocols/irc/msgs.c:235
-#: ../src/protocols/jabber/jabber.c:1925 ../src/protocols/msn/msn.c:2046
-#: ../src/protocols/oscar/oscar.c:6532
-#: ../src/protocols/sametime/sametime.c:5635 ../src/protocols/silc/ops.c:1242
-#: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1775
-#: ../src/protocols/toc/toc.c:2340
+#: ../libgaim/protocols/irc/irc.c:928 ../libgaim/protocols/irc/msgs.c:235
+#: ../libgaim/protocols/jabber/jabber.c:1970
+#: ../libgaim/protocols/msn/msn.c:2054 ../libgaim/protocols/oscar/oscar.c:6531
+#: ../libgaim/protocols/sametime/sametime.c:5638
+#: ../libgaim/protocols/silc/ops.c:1241 ../libgaim/protocols/silc/ops.c:1343
+#: ../libgaim/protocols/simple/simple.c:1839
+#: ../libgaim/protocols/toc/toc.c:2347
 msgid "Server"
 msgstr "Serveur"
 
 #. port to connect to
-#: ../src/protocols/irc/irc.c:900 ../src/protocols/msn/msn.c:2051
-#: ../src/protocols/oscar/oscar.c:6535
-#: ../src/protocols/sametime/sametime.c:5640 ../src/protocols/silc/silc.c:1860
-#: ../src/protocols/toc/toc.c:2344
+#: ../libgaim/protocols/irc/irc.c:931 ../libgaim/protocols/msn/msn.c:2059
+#: ../libgaim/protocols/oscar/oscar.c:6534
+#: ../libgaim/protocols/sametime/sametime.c:5643
+#: ../libgaim/protocols/silc/silc.c:1859 ../libgaim/protocols/toc/toc.c:2351
 msgid "Port"
 msgstr "Port"
 
-#: ../src/protocols/irc/irc.c:903
+#: ../libgaim/protocols/irc/irc.c:934
 msgid "Encodings"
 msgstr "Codages"
 
-#: ../src/protocols/irc/irc.c:906 ../src/protocols/irc/msgs.c:229
-#: ../src/protocols/jabber/jabber.c:764 ../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:935
+#: ../libgaim/protocols/irc/irc.c:937 ../libgaim/protocols/irc/msgs.c:229
+#: ../libgaim/protocols/jabber/jabber.c:775
+#: ../libgaim/protocols/silc/buddy.c:1531 ../libgaim/protocols/silc/ops.c:1188
+#: ../libgaim/protocols/silc/ops.c:1190 ../libgaim/protocols/silc/ops.c:1337
+#: ../libgaim/protocols/silc/ops.c:1339 ../libgaim/protocols/silc/silc.c:933
 msgid "Username"
 msgstr "Utilisateur"
 
-#: ../src/protocols/irc/irc.c:909 ../src/protocols/irc/msgs.c:230
-#: ../src/protocols/silc/silc.c:939
+#: ../libgaim/protocols/irc/irc.c:940 ../libgaim/protocols/irc/msgs.c:230
+#: ../libgaim/protocols/silc/silc.c:937
 msgid "Real name"
 msgstr "Nom réel"
 
@@ -6143,163 +7007,163 @@
 #. option = gaim_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../src/protocols/irc/irc.c:917
+#: ../libgaim/protocols/irc/irc.c:948
 msgid "Use SSL"
 msgstr "Utiliser SSL"
 
-#: ../src/protocols/irc/msgs.c:107
+#: ../libgaim/protocols/irc/msgs.c:107
 msgid "Bad mode"
 msgstr "Mauvais mode"
 
-#: ../src/protocols/irc/msgs.c:118
+#: ../libgaim/protocols/irc/msgs.c:118
 #, c-format
 msgid "You are banned from %s."
 msgstr "Vous avez été banni de %s"
 
-#: ../src/protocols/irc/msgs.c:119
+#: ../libgaim/protocols/irc/msgs.c:119
 msgid "Banned"
 msgstr "Banni"
 
-#: ../src/protocols/irc/msgs.c:136
+#: ../libgaim/protocols/irc/msgs.c:136
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "Impossible de bannir %s : la liste des bannis est pleine"
 
-#: ../src/protocols/irc/msgs.c:215 ../src/protocols/irc/msgs.c:235
-#: ../src/protocols/irc/msgs.c:248
+#: ../libgaim/protocols/irc/msgs.c:215 ../libgaim/protocols/irc/msgs.c:235
+#: ../libgaim/protocols/irc/msgs.c:248
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s :</b> %s"
 
-#: ../src/protocols/irc/msgs.c:215 ../src/protocols/oscar/oscar.c:3645
-#: ../src/protocols/silc/ops.c:1412
+#: ../libgaim/protocols/irc/msgs.c:215 ../libgaim/protocols/oscar/oscar.c:3620
+#: ../libgaim/protocols/silc/ops.c:1411
 msgid "Nick"
 msgstr "Pseudonyme"
 
-#: ../src/protocols/irc/msgs.c:218
+#: ../libgaim/protocols/irc/msgs.c:218
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../src/protocols/irc/msgs.c:219
+#: ../libgaim/protocols/irc/msgs.c:219
 msgid " <i>(identified)</i>"
 msgstr " <i>(identifié)</i>"
 
-#: ../src/protocols/irc/msgs.c:223 ../src/protocols/irc/msgs.c:229
-#: ../src/protocols/irc/msgs.c:230 ../src/protocols/irc/msgs.c:241
-#: ../src/protocols/yahoo/yahoo_profile.c:691
+#: ../libgaim/protocols/irc/msgs.c:223 ../libgaim/protocols/irc/msgs.c:229
+#: ../libgaim/protocols/irc/msgs.c:230 ../libgaim/protocols/irc/msgs.c:241
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:691
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s :</b> %s<br>"
 
-#: ../src/protocols/irc/msgs.c:241 ../src/protocols/silc/ops.c:1255
+#: ../libgaim/protocols/irc/msgs.c:241 ../libgaim/protocols/silc/ops.c:1254
 msgid "Currently on"
 msgstr "Actuellement dans"
 
-#: ../src/protocols/irc/msgs.c:246
+#: ../libgaim/protocols/irc/msgs.c:246
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>Inactif depuis :</b> %s<br>"
 
-#: ../src/protocols/irc/msgs.c:248
+#: ../libgaim/protocols/irc/msgs.c:248
 msgid "Online since"
 msgstr "En ligne depuis"
 
-#: ../src/protocols/irc/msgs.c:252
+#: ../libgaim/protocols/irc/msgs.c:252
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>Qualificatif :</b> Glorieux<br>"
 
-#: ../src/protocols/irc/msgs.c:329
+#: ../libgaim/protocols/irc/msgs.c:329
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s a changé le sujet en : %s"
 
-#: ../src/protocols/irc/msgs.c:331
+#: ../libgaim/protocols/irc/msgs.c:331
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s a effacé le sujet."
 
-#: ../src/protocols/irc/msgs.c:339
+#: ../libgaim/protocols/irc/msgs.c:339
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Le sujet de %s est : %s"
 
-#: ../src/protocols/irc/msgs.c:357
+#: ../libgaim/protocols/irc/msgs.c:357
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Message inconnu '%s'"
 
-#: ../src/protocols/irc/msgs.c:358
+#: ../libgaim/protocols/irc/msgs.c:358
 msgid "Unknown message"
 msgstr "Message inconnu"
 
-#: ../src/protocols/irc/msgs.c:358
+#: ../libgaim/protocols/irc/msgs.c:358
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim a envoyé un message que le serveur IRC ne comprend pas"
 
-#: ../src/protocols/irc/msgs.c:381
+#: ../libgaim/protocols/irc/msgs.c:381
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Utilisateurs dans %s : %s"
 
-#: ../src/protocols/irc/msgs.c:509
+#: ../libgaim/protocols/irc/msgs.c:509
 msgid "Time Response"
 msgstr "Temps de réponse"
 
-#: ../src/protocols/irc/msgs.c:510
+#: ../libgaim/protocols/irc/msgs.c:510
 msgid "The IRC server's local time is:"
 msgstr "L'heure locale du serveur IRC est :"
 
-#: ../src/protocols/irc/msgs.c:521
+#: ../libgaim/protocols/irc/msgs.c:521
 msgid "No such channel"
 msgstr "Ce salon n'existe pas"
 
 #. does this happen?
-#: ../src/protocols/irc/msgs.c:532
+#: ../libgaim/protocols/irc/msgs.c:532
 msgid "no such channel"
 msgstr "Ce salon n'existe pas"
 
-#: ../src/protocols/irc/msgs.c:535
+#: ../libgaim/protocols/irc/msgs.c:535
 msgid "User is not logged in"
 msgstr "Utilisateur non connecté"
 
-#: ../src/protocols/irc/msgs.c:540
+#: ../libgaim/protocols/irc/msgs.c:540
 msgid "No such nick or channel"
 msgstr "Ce pseudo ou salon n'existe pas"
 
-#: ../src/protocols/irc/msgs.c:560
+#: ../libgaim/protocols/irc/msgs.c:560
 msgid "Could not send"
 msgstr "Impossible d'envoyer"
 
-#: ../src/protocols/irc/msgs.c:616
+#: ../libgaim/protocols/irc/msgs.c:616
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Joindre %s nécessite une invitation"
 
-#: ../src/protocols/irc/msgs.c:617
+#: ../libgaim/protocols/irc/msgs.c:617
 msgid "Invitation only"
 msgstr "Sur invitation seulement"
 
-#: ../src/protocols/irc/msgs.c:726
+#: ../libgaim/protocols/irc/msgs.c:726
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Vous avez été expulsé par %s (%s)"
 
 #. Remove user from channel
-#: ../src/protocols/irc/msgs.c:731 ../src/protocols/silc/ops.c:721
+#: ../libgaim/protocols/irc/msgs.c:731 ../libgaim/protocols/silc/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Expulsé par %s (%s)"
 
-#: ../src/protocols/irc/msgs.c:754
+#: ../libgaim/protocols/irc/msgs.c:754
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mode (%s %s) par %s"
 
-#: ../src/protocols/irc/msgs.c:839 ../src/protocols/irc/msgs.c:840
+#: ../libgaim/protocols/irc/msgs.c:839 ../libgaim/protocols/irc/msgs.c:840
 msgid "Invalid nickname"
 msgstr "Pseudonyme non valide"
 
-#: ../src/protocols/irc/msgs.c:841
+#: ../libgaim/protocols/irc/msgs.c:841
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -6307,7 +7171,7 @@
 "Le pseudonyme choisi a été rejeté par le serveur. Il contenait probablement "
 "des caractères non valides."
 
-#: ../src/protocols/irc/msgs.c:845
+#: ../libgaim/protocols/irc/msgs.c:845
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -6315,51 +7179,51 @@
 "Le nom de compte choisi a été rejeté par le serveur. Le nom contenait "
 "probablement des caractères non valides."
 
-#: ../src/protocols/irc/msgs.c:884
+#: ../libgaim/protocols/irc/msgs.c:884
 msgid "Cannot change nick"
 msgstr "Impossible de changer de surnom"
 
-#: ../src/protocols/irc/msgs.c:884
+#: ../libgaim/protocols/irc/msgs.c:884
 msgid "Could not change nick"
 msgstr "Impossible de changer de surnom"
 
-#: ../src/protocols/irc/msgs.c:905
+#: ../libgaim/protocols/irc/msgs.c:905
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Vous avez quitté le salon %s%s"
 
-#: ../src/protocols/irc/msgs.c:947
+#: ../libgaim/protocols/irc/msgs.c:947
 msgid "Error: invalid PONG from server"
 msgstr "PONG non valide du serveur"
 
-#: ../src/protocols/irc/msgs.c:949
+#: ../libgaim/protocols/irc/msgs.c:949
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Réponse au PING -- Lag : %lu secondes"
 
-#: ../src/protocols/irc/msgs.c:1030
+#: ../libgaim/protocols/irc/msgs.c:1030
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Impossible de joindre le salon %s :"
 
-#: ../src/protocols/irc/msgs.c:1031 ../src/protocols/silc/ops.c:1128
+#: ../libgaim/protocols/irc/msgs.c:1031 ../libgaim/protocols/silc/ops.c:1127
 msgid "Cannot join channel"
 msgstr "Impossible d'entrer dans le salon"
 
-#: ../src/protocols/irc/msgs.c:1065
+#: ../libgaim/protocols/irc/msgs.c:1065
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Le pseudonyme ou le service est temporairement indisponible."
 
-#: ../src/protocols/irc/msgs.c:1077
+#: ../libgaim/protocols/irc/msgs.c:1077
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops de %s"
 
-#: ../src/protocols/irc/parse.c:114
+#: ../libgaim/protocols/irc/parse.c:116
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;action à faire&gt; : Réaliser une action."
 
-#: ../src/protocols/irc/parse.c:115
+#: ../libgaim/protocols/irc/parse.c:117
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -6367,11 +7231,11 @@
 "away [message] : Mettre un message d'absence. Sans message, cela enlève "
 "l'Ă©tat d'absence."
 
-#: ../src/protocols/irc/parse.c:116
+#: ../libgaim/protocols/irc/parse.c:118
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv : Envoyer une commande au service des salons."
 
-#: ../src/protocols/irc/parse.c:117
+#: ../libgaim/protocols/irc/parse.c:119
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -6379,7 +7243,7 @@
 "deop &lt;pseudo1&gt; [pseudo2] ... : Enlever le pouvoir d'opérateur. Vous "
 "devez être un opérateur du salon pour utiliser cette commande."
 
-#: ../src/protocols/irc/parse.c:118
+#: ../libgaim/protocols/irc/parse.c:120
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -6389,7 +7253,7 @@
 "modéré (+m). Vous devez être un opérateur du salon pour utiliser cette "
 "commande."
 
-#: ../src/protocols/irc/parse.c:119
+#: ../libgaim/protocols/irc/parse.c:121
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -6397,7 +7261,7 @@
 "invite &lt;pseudo&gt; [salon] : Inviter une personne dans un salon. Vous "
 "devez être un opérateur du salon pour utiliser cette commande."
 
-#: ../src/protocols/irc/parse.c:120
+#: ../libgaim/protocols/irc/parse.c:122
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -6405,7 +7269,7 @@
 "j &lt;salon1&gt;[,salon2][,...] [clé1[,clé2][,...]] : Joindre un ou "
 "plusieurs salons, en indiquant le mot de passe de chaque salon si nécessaire."
 
-#: ../src/protocols/irc/parse.c:121
+#: ../libgaim/protocols/irc/parse.c:123
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -6413,7 +7277,7 @@
 "join &lt;salon1&gt;[,salon2][,...] [clé1[,clé2][,...]] : Joindre un ou "
 "plusieurs salons, en indiquant le mot de passe de chaque salon si nécessaire."
 
-#: ../src/protocols/irc/parse.c:122
+#: ../libgaim/protocols/irc/parse.c:124
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -6421,7 +7285,7 @@
 "kick &lt;pseudo1&gt; [message] : Expulser une personne du salon. Vous devez "
 "être un opérateur du salon pour utiliser cette commande."
 
-#: ../src/protocols/irc/parse.c:123
+#: ../libgaim/protocols/irc/parse.c:125
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -6429,15 +7293,15 @@
 "list : Afficher la liste des salons sur le réseaux. <i>Attention, certains "
 "serveurs peuvent vous déconnecter à ce moment-là.</i>"
 
-#: ../src/protocols/irc/parse.c:124
+#: ../libgaim/protocols/irc/parse.c:126
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;action à faire&gt; : Réaliser une action."
 
-#: ../src/protocols/irc/parse.c:125
+#: ../libgaim/protocols/irc/parse.c:127
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv : Envoyer une commande au service des messages."
 
-#: ../src/protocols/irc/parse.c:126
+#: ../libgaim/protocols/irc/parse.c:128
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
@@ -6445,26 +7309,27 @@
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;pseudo|salon&gt; : Changer le mode d'un "
 "salon ou d'une personne."
 
-#: ../src/protocols/irc/parse.c:127
+#: ../libgaim/protocols/irc/parse.c:129
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
 "msg &lt;pseudo&gt; &lt;message&gt; : Envoyer un message privé à une personne."
 
-#: ../src/protocols/irc/parse.c:128
+#: ../libgaim/protocols/irc/parse.c:130
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [salon] : Récupérer la liste des personnes dans un salon."
 
-#: ../src/protocols/irc/parse.c:129 ../src/protocols/jabber/jabber.c:1763
+#: ../libgaim/protocols/irc/parse.c:131
+#: ../libgaim/protocols/jabber/jabber.c:1775
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nouveau pseudo&gt; : Changer de pseudonyme"
 
-#: ../src/protocols/irc/parse.c:130
+#: ../libgaim/protocols/irc/parse.c:132
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv : Envoyer une commande au service des pseudonymes."
 
-#: ../src/protocols/irc/parse.c:131
+#: ../libgaim/protocols/irc/parse.c:133
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -6472,7 +7337,7 @@
 "op &lt;pseudo1&gt; [pseudo2] ... : Donner le pouvoir d'opérateur. Vous devez "
 "être un opérateur du salon pour utiliser cette commande."
 
-#: ../src/protocols/irc/parse.c:132
+#: ../libgaim/protocols/irc/parse.c:134
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -6480,11 +7345,11 @@
 "operwall &lt;message&gt; : Si vous ne connaissez pas cette commande, c'est "
 "que vous ne pouvez probablement pas l'utiliser. "
 
-#: ../src/protocols/irc/parse.c:133
+#: ../libgaim/protocols/irc/parse.c:135
 msgid "operserv: Send a command to operserv"
 msgstr "operserv : Envoyer une commande au service des opérateurs."
 
-#: ../src/protocols/irc/parse.c:134
+#: ../libgaim/protocols/irc/parse.c:136
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -6492,7 +7357,7 @@
 "part [salon] [message] : Quitter un salon avec un message de départ "
 "facultatif."
 
-#: ../src/protocols/irc/parse.c:135
+#: ../libgaim/protocols/irc/parse.c:137
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -6500,7 +7365,7 @@
 "ping [pseudo] : Demander la latence d'une personne (ou du serveur s'il n'y a "
 "pas de pseudo)."
 
-#: ../src/protocols/irc/parse.c:136
+#: ../libgaim/protocols/irc/parse.c:138
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -6508,17 +7373,17 @@
 "query &lt;pseudo&gt; &lt;message&gt; : Envoyer un message privé à une "
 "personne."
 
-#: ../src/protocols/irc/parse.c:137
+#: ../libgaim/protocols/irc/parse.c:139
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr ""
 "quit [message] : Se déconnecter du serveur avec un message de départ "
 "facultatif."
 
-#: ../src/protocols/irc/parse.c:138
+#: ../libgaim/protocols/irc/parse.c:140
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...] : Envoyer une commande directe au serveur."
 
-#: ../src/protocols/irc/parse.c:139
+#: ../libgaim/protocols/irc/parse.c:141
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -6526,23 +7391,23 @@
 "remove &lt;pseudo1&gt; [message] : Expulser une personne du salon. Vous "
 "devez être un opérateur du salon pour utiliser cette commande."
 
-#: ../src/protocols/irc/parse.c:140
+#: ../libgaim/protocols/irc/parse.c:142
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time : Afficher l'heure locale du serveur irc."
 
-#: ../src/protocols/irc/parse.c:141
+#: ../libgaim/protocols/irc/parse.c:143
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [nouveau sujet] : Voir ou changer le sujet du salon"
 
-#: ../src/protocols/irc/parse.c:142
+#: ../libgaim/protocols/irc/parse.c:144
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt; : Changer le mode d'une personne."
 
-#: ../src/protocols/irc/parse.c:143
+#: ../libgaim/protocols/irc/parse.c:145
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [pseudo] : Envoie une requête CTCP VERSION à une personne."
 
-#: ../src/protocols/irc/parse.c:144
+#: ../libgaim/protocols/irc/parse.c:146
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -6550,7 +7415,7 @@
 "voice &lt;pseudo1&gt; [pseudo2] ... : Donner la parole dans un salon modéré "
 "(+m). Vous devez être un opérateur du salon pour utiliser cette commande."
 
-#: ../src/protocols/irc/parse.c:145
+#: ../libgaim/protocols/irc/parse.c:147
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -6558,62 +7423,58 @@
 "wallops &lt;message&gt; : Si vous ne connaissez pas cette commande, c'est "
 "que vous ne pouvez probablement pas l'utiliser. "
 
-#: ../src/protocols/irc/parse.c:146
+#: ../libgaim/protocols/irc/parse.c:148
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr ""
 "whois [serveur] &lt;pseudo&gt; : Récupérer des informations sur une personne."
 
-#: ../src/protocols/irc/parse.c:440
+#: ../libgaim/protocols/irc/parse.c:442
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Temps de réponse de %s : %lu secondes"
 
-#: ../src/protocols/irc/parse.c:441
+#: ../libgaim/protocols/irc/parse.c:443
 msgid "PONG"
 msgstr "PONG"
 
-#: ../src/protocols/irc/parse.c:441
+#: ../libgaim/protocols/irc/parse.c:443
 msgid "CTCP PING reply"
 msgstr "RĂ©ponse au CTCP PING"
 
-#: ../src/protocols/irc/parse.c:543 ../src/protocols/irc/parse.c:547
-#: ../src/protocols/toc/toc.c:190 ../src/protocols/toc/toc.c:688
-#: ../src/protocols/toc/toc.c:704 ../src/protocols/toc/toc.c:780
+#: ../libgaim/protocols/irc/parse.c:548 ../libgaim/protocols/irc/parse.c:552
+#: ../libgaim/protocols/toc/toc.c:191 ../libgaim/protocols/toc/toc.c:694
+#: ../libgaim/protocols/toc/toc.c:710 ../libgaim/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "Déconnecté"
 
-#: ../src/protocols/jabber/auth.c:51
-msgid ""
-"Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
-"account properties"
-msgstr ""
-"TLS/SSL est nécessaire pour la connexion au serveur. Choisissez « Utiliser "
-"TLS si possible » dans les préférences du compte."
-
-#: ../src/protocols/jabber/auth.c:53
+#: ../libgaim/protocols/jabber/auth.c:49
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr ""
 "TLS/SSL est nécessaire pour la connexion au serveur. Aucun support de TLS/"
 "SSL n'a pu être trouvé."
 
-#: ../src/protocols/jabber/auth.c:114
+#: ../libgaim/protocols/jabber/auth.c:109
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "Le serveur demande une authentification en texte non chiffré au travers d'un "
 "flux crypté."
 
-#: ../src/protocols/jabber/auth.c:234
+#: ../libgaim/protocols/jabber/auth.c:229
 msgid "Server couldn't authenticate you without a password"
 msgstr "Le serveur ne peut pas vous identifier sans mot de passe."
 
-#: ../src/protocols/jabber/auth.c:237 ../src/protocols/jabber/auth.c:238
-#: ../src/protocols/jabber/auth.c:398 ../src/protocols/jabber/auth.c:399
-#: ../src/protocols/jabber/auth.c:480 ../src/protocols/jabber/auth.c:481
+#: ../libgaim/protocols/jabber/auth.c:232
+#: ../libgaim/protocols/jabber/auth.c:233
+#: ../libgaim/protocols/jabber/auth.c:401
+#: ../libgaim/protocols/jabber/auth.c:402
+#: ../libgaim/protocols/jabber/auth.c:483
+#: ../libgaim/protocols/jabber/auth.c:484
 msgid "Plaintext Authentication"
 msgstr "Authentification en texte non chiffré"
 
-#: ../src/protocols/jabber/auth.c:239 ../src/protocols/jabber/auth.c:400
-#: ../src/protocols/jabber/auth.c:482
+#: ../libgaim/protocols/jabber/auth.c:234
+#: ../libgaim/protocols/jabber/auth.c:403
+#: ../libgaim/protocols/jabber/auth.c:485
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -6622,104 +7483,126 @@
 "connexion non cryptée. Voulez-vous autoriser ceci et continuer "
 "l'authentification ?"
 
-#: ../src/protocols/jabber/auth.c:245 ../src/protocols/jabber/auth.c:408
-#: ../src/protocols/jabber/auth.c:490
+#: ../libgaim/protocols/jabber/auth.c:240
+#: ../libgaim/protocols/jabber/auth.c:411
+#: ../libgaim/protocols/jabber/auth.c:493
 msgid "Server does not use any supported authentication method"
 msgstr "Le serveur utilise une méthode d'authentification non supportée"
 
 #. 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:111
+#: ../libgaim/protocols/jabber/auth.c:324
+#: ../libgaim/protocols/jabber/auth.c:446
+#: ../libgaim/protocols/jabber/auth.c:614
+#: ../libgaim/protocols/jabber/auth.c:747
+#: ../libgaim/protocols/jabber/auth.c:759
+#: ../libgaim/protocols/jabber/auth.c:778
+#: ../libgaim/protocols/jabber/jabber.c:112
 msgid "Invalid response from server."
 msgstr "RĂ©ponse non valide du serveur"
 
-#: ../src/protocols/jabber/auth.c:632
+#: ../libgaim/protocols/jabber/auth.c:635
 msgid "Invalid challenge from server"
 msgstr "Demande d'accès non valide du serveur"
 
-#: ../src/protocols/jabber/auth.c:719
+#: ../libgaim/protocols/jabber/auth.c:722
 msgid "SASL error"
 msgstr "Erreur SASL"
 
-#: ../src/protocols/jabber/buddy.c:268 ../src/protocols/jabber/buddy.c:772
-#: ../src/protocols/silc/ops.c:1020
+#: ../libgaim/protocols/jabber/buddy.c:268
+#: ../libgaim/protocols/jabber/buddy.c:769
+#: ../libgaim/protocols/silc/ops.c:1019
 msgid "Full Name"
 msgstr "Nom complet"
 
-#: ../src/protocols/jabber/buddy.c:269 ../src/protocols/jabber/buddy.c:785
-#: ../src/protocols/silc/ops.c:1032
+#: ../libgaim/protocols/jabber/buddy.c:269
+#: ../libgaim/protocols/jabber/buddy.c:782
+#: ../libgaim/protocols/silc/ops.c:1031
 msgid "Family Name"
 msgstr "Nom de famille"
 
-#: ../src/protocols/jabber/buddy.c:270 ../src/protocols/jabber/buddy.c:789
+#: ../libgaim/protocols/jabber/buddy.c:270
+#: ../libgaim/protocols/jabber/buddy.c:786
 msgid "Given Name"
 msgstr "Nom usuel"
 
-#: ../src/protocols/jabber/buddy.c:272 ../src/protocols/jabber/jabber.c:824
+#: ../libgaim/protocols/jabber/buddy.c:272
+#: ../libgaim/protocols/jabber/jabber.c:835
 msgid "URL"
 msgstr "URL"
 
-#: ../src/protocols/jabber/buddy.c:273 ../src/protocols/jabber/buddy.c:841
+#: ../libgaim/protocols/jabber/buddy.c:273
+#: ../libgaim/protocols/jabber/buddy.c:838
 msgid "Street Address"
 msgstr "Adresse"
 
-#: ../src/protocols/jabber/buddy.c:274 ../src/protocols/jabber/buddy.c:837
+#: ../libgaim/protocols/jabber/buddy.c:274
+#: ../libgaim/protocols/jabber/buddy.c:834
 msgid "Extended Address"
 msgstr "Adresse (suite)"
 
-#: ../src/protocols/jabber/buddy.c:275 ../src/protocols/jabber/buddy.c:845
+#: ../libgaim/protocols/jabber/buddy.c:275
+#: ../libgaim/protocols/jabber/buddy.c:842
 msgid "Locality"
 msgstr "Localité"
 
-#: ../src/protocols/jabber/buddy.c:276 ../src/protocols/jabber/buddy.c:849
+#: ../libgaim/protocols/jabber/buddy.c:276
+#: ../libgaim/protocols/jabber/buddy.c:846
 msgid "Region"
 msgstr "RĂ©gion"
 
-#: ../src/protocols/jabber/buddy.c:277 ../src/protocols/jabber/buddy.c:853
+#: ../libgaim/protocols/jabber/buddy.c:277
+#: ../libgaim/protocols/jabber/buddy.c:850
 msgid "Postal Code"
 msgstr "Code postal"
 
-#: ../src/protocols/jabber/buddy.c:278 ../src/protocols/jabber/buddy.c:858
-#: ../src/protocols/silc/silc.c:945
+#: ../libgaim/protocols/jabber/buddy.c:278
+#: ../libgaim/protocols/jabber/buddy.c:855
+#: ../libgaim/protocols/silc/silc.c:943
 msgid "Country"
 msgstr "Pays"
 
-#: ../src/protocols/jabber/buddy.c:279 ../src/protocols/jabber/buddy.c:869
-#: ../src/protocols/jabber/buddy.c:876
+#: ../libgaim/protocols/jabber/buddy.c:279
+#: ../libgaim/protocols/jabber/buddy.c:866
+#: ../libgaim/protocols/jabber/buddy.c:873
 msgid "Telephone"
 msgstr "Téléphone"
 
-#: ../src/protocols/jabber/buddy.c:280 ../src/protocols/jabber/buddy.c:887
-#: ../src/protocols/jabber/buddy.c:895 ../src/protocols/jabber/buddy.c:1524
-#: ../src/protocols/silc/ops.c:1075 ../src/protocols/silc/util.c:526
-#: ../src/protocols/yahoo/yahoo_profile.c:1036
+#: ../libgaim/protocols/jabber/buddy.c:280
+#: ../libgaim/protocols/jabber/buddy.c:884
+#: ../libgaim/protocols/jabber/buddy.c:892
+#: ../libgaim/protocols/jabber/buddy.c:1528
+#: ../libgaim/protocols/silc/ops.c:1074 ../libgaim/protocols/silc/util.c:553
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1050
 msgid "E-Mail"
 msgstr "Courriel"
 
-#: ../src/protocols/jabber/buddy.c:281 ../src/protocols/jabber/buddy.c:910
+#: ../libgaim/protocols/jabber/buddy.c:281
+#: ../libgaim/protocols/jabber/buddy.c:907
 msgid "Organization Name"
 msgstr "Organisation"
 
-#: ../src/protocols/jabber/buddy.c:282 ../src/protocols/jabber/buddy.c:914
+#: ../libgaim/protocols/jabber/buddy.c:282
+#: ../libgaim/protocols/jabber/buddy.c:911
 msgid "Organization Unit"
 msgstr "Service"
 
-#: ../src/protocols/jabber/buddy.c:284 ../src/protocols/jabber/buddy.c:923
+#: ../libgaim/protocols/jabber/buddy.c:284
+#: ../libgaim/protocols/jabber/buddy.c:920
 msgid "Role"
 msgstr "RĂ´le"
 
-#: ../src/protocols/jabber/buddy.c:285 ../src/protocols/jabber/buddy.c:806
-#: ../src/protocols/msn/msn.c:1591 ../src/protocols/oscar/oscar.c:3688
+#: ../libgaim/protocols/jabber/buddy.c:285
+#: ../libgaim/protocols/jabber/buddy.c:803 ../libgaim/protocols/msn/msn.c:1595
+#: ../libgaim/protocols/oscar/oscar.c:3663
 msgid "Birthday"
 msgstr "Date de naissance"
 
-#: ../src/protocols/jabber/buddy.c:588 ../src/protocols/jabber/buddy.c:589
+#: ../libgaim/protocols/jabber/buddy.c:582
+#: ../libgaim/protocols/jabber/buddy.c:583
 msgid "Edit Jabber vCard"
 msgstr "Éditer la carte de visite Jabber"
 
-#: ../src/protocols/jabber/buddy.c:590
+#: ../libgaim/protocols/jabber/buddy.c:584
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -6727,100 +7610,117 @@
 "Toutes les rubriques ci-dessous sont facultatives. Saisissez uniquement les "
 "informations que vous désirez rendre publiques."
 
-#: ../src/protocols/jabber/buddy.c:646 ../src/protocols/jabber/buddy.c:677
+#: ../libgaim/protocols/jabber/buddy.c:640
 msgid "Client:"
 msgstr "CLient :"
 
-#: ../src/protocols/jabber/buddy.c:650 ../src/protocols/jabber/buddy.c:681
+#: ../libgaim/protocols/jabber/buddy.c:644
+#: ../libgaim/protocols/jabber/buddy.c:677
 msgid "Operating System"
 msgstr "Système d'exploitation"
 
-#: ../src/protocols/jabber/buddy.c:660 ../src/protocols/jabber/jabber.c:1928
+#: ../libgaim/protocols/jabber/buddy.c:654
+#: ../libgaim/protocols/jabber/jabber.c:1973
 msgid "Resource"
 msgstr "Ressource"
 
-#: ../src/protocols/jabber/buddy.c:793 ../src/protocols/silc/ops.c:1028
+#: ../libgaim/protocols/jabber/buddy.c:656
+#: ../libgaim/protocols/jabber/jabber.c:1213
+#: ../libgaim/protocols/jabber/jabber.c:1223
+#: ../libgaim/protocols/jabber/jabber.c:1233
+#: ../libgaim/protocols/jabber/jabber.c:1243
+#: ../libgaim/protocols/jabber/jabber.c:1253
+msgid "Priority"
+msgstr "Priorité"
+
+#: ../libgaim/protocols/jabber/buddy.c:673
+msgid "Client"
+msgstr "Client"
+
+#: ../libgaim/protocols/jabber/buddy.c:790
+#: ../libgaim/protocols/silc/ops.c:1027
 msgid "Middle Name"
 msgstr "Deuxième prénom"
 
-#: ../src/protocols/jabber/buddy.c:826 ../src/protocols/jabber/jabber.c:799
-#: ../src/protocols/oscar/oscar.c:3707 ../src/protocols/oscar/oscar.c:3715
-#: ../src/protocols/silc/ops.c:1064
+#: ../libgaim/protocols/jabber/buddy.c:823
+#: ../libgaim/protocols/jabber/jabber.c:810
+#: ../libgaim/protocols/oscar/oscar.c:3682
+#: ../libgaim/protocols/oscar/oscar.c:3690
+#: ../libgaim/protocols/qq/buddy_info.c:54
+#: ../libgaim/protocols/silc/ops.c:1063
 msgid "Address"
 msgstr "Adresse"
 
-#: ../src/protocols/jabber/buddy.c:833
+#: ../libgaim/protocols/jabber/buddy.c:830
 msgid "P.O. Box"
 msgstr "Boîte postale"
 
-#: ../src/protocols/jabber/buddy.c:947
+#: ../libgaim/protocols/jabber/buddy.c:944
 msgid "Photo"
 msgstr "Photo"
 
-#: ../src/protocols/jabber/buddy.c:947
+#: ../libgaim/protocols/jabber/buddy.c:944
 msgid "Logo"
 msgstr "Logo"
 
-#: ../src/protocols/jabber/buddy.c:1304
+#: ../libgaim/protocols/jabber/buddy.c:1308
 msgid "Un-hide From"
 msgstr "Se montrer Ă "
 
-#: ../src/protocols/jabber/buddy.c:1308
+#: ../libgaim/protocols/jabber/buddy.c:1312
 msgid "Temporarily Hide From"
 msgstr "Se cacher de"
 
 #. && NOT ME
-#: ../src/protocols/jabber/buddy.c:1316
+#: ../libgaim/protocols/jabber/buddy.c:1320
 msgid "Cancel Presence Notification"
 msgstr "Annuler la notification de présence"
 
-#: ../src/protocols/jabber/buddy.c:1323
+#: ../libgaim/protocols/jabber/buddy.c:1327
 msgid "(Re-)Request authorization"
 msgstr "(Re-)Demander autorisation"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../src/protocols/jabber/buddy.c:1332
+#: ../libgaim/protocols/jabber/buddy.c:1336
 msgid "Unsubscribe"
 msgstr "DĂ©sinscription"
 
-#: ../src/protocols/jabber/buddy.c:1359 ../src/protocols/jabber/chat.c:675
-#: ../src/protocols/jabber/chat.c:686 ../src/protocols/jabber/jabber.c:1185
-#: ../src/protocols/silc/ops.c:1449
-msgid "Error"
-msgstr "Erreur"
-
 # Repris du fr.po de gabber
-#: ../src/protocols/jabber/buddy.c:1365 ../src/protocols/jabber/jabber.c:1210
+#: ../libgaim/protocols/jabber/buddy.c:1369
+#: ../libgaim/protocols/jabber/jabber.c:1222
 msgid "Chatty"
 msgstr "Bavard"
 
-#: ../src/protocols/jabber/buddy.c:1369 ../src/status.c:159
+#: ../libgaim/protocols/jabber/buddy.c:1373 ../libgaim/status.c:159
 msgid "Extended Away"
 msgstr "Longue absence"
 
-#: ../src/protocols/jabber/buddy.c:1371 ../src/protocols/jabber/jabber.c:1240
-#: ../src/protocols/oscar/oscar.c:713 ../src/protocols/oscar/oscar.c:5666
-#: ../src/protocols/sametime/sametime.c:3277
+#: ../libgaim/protocols/jabber/buddy.c:1375
+#: ../libgaim/protocols/jabber/jabber.c:1252
+#: ../libgaim/protocols/oscar/oscar.c:688
+#: ../libgaim/protocols/oscar/oscar.c:5654
+#: ../libgaim/protocols/sametime/sametime.c:3273
 msgid "Do Not Disturb"
 msgstr "Ne pas déranger"
 
-#: ../src/protocols/jabber/buddy.c:1516
+#: ../libgaim/protocols/jabber/buddy.c:1520
 msgid "JID"
 msgstr "JID"
 
-#: ../src/protocols/jabber/buddy.c:1520 ../src/protocols/jabber/buddy.c:1699
-#: ../src/protocols/oscar/oscar.c:3656
+#: ../libgaim/protocols/jabber/buddy.c:1524
+#: ../libgaim/protocols/jabber/buddy.c:1703
+#: ../libgaim/protocols/oscar/oscar.c:3631
 msgid "Last Name"
 msgstr "Nom"
 
-#: ../src/protocols/jabber/buddy.c:1552
+#: ../libgaim/protocols/jabber/buddy.c:1556
 msgid "The following are the results of your search"
 msgstr "Voici les résultats de votre recherche."
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../src/protocols/jabber/buddy.c:1627
+#: ../libgaim/protocols/jabber/buddy.c:1631
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -6828,542 +7728,565 @@
 "Recherchez un utilisateur en renseignant les rubriques ci-dessous. Note : on "
 "peut utiliser % comme joker dans chaque rubrique."
 
-#: ../src/protocols/jabber/buddy.c:1647
+#: ../libgaim/protocols/jabber/buddy.c:1651
 msgid "Directory Query Failed"
 msgstr "Échec de la recherche dans l'annuaire"
 
-#: ../src/protocols/jabber/buddy.c:1648
+#: ../libgaim/protocols/jabber/buddy.c:1652
 msgid "Could not query the directory server."
 msgstr "Impossible de parler au serveur annuaire."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../src/protocols/jabber/buddy.c:1682
+#: ../libgaim/protocols/jabber/buddy.c:1686
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Instructions du serveur : %s"
 
-#: ../src/protocols/jabber/buddy.c:1689
+#: ../libgaim/protocols/jabber/buddy.c:1693
 msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr "Saisissez un ou plusieurs critères de recherche d'utilisateurs Jabber."
 
-#: ../src/protocols/jabber/buddy.c:1709 ../src/protocols/novell/novell.c:1488
-#: ../src/protocols/oscar/oscar.c:3658 ../src/protocols/oscar/oscar.c:3665
+#: ../libgaim/protocols/jabber/buddy.c:1713
+#: ../libgaim/protocols/novell/novell.c:1488
+#: ../libgaim/protocols/oscar/oscar.c:3633
+#: ../libgaim/protocols/oscar/oscar.c:3640
 msgid "E-Mail Address"
 msgstr "Adresse Ă©lectronique"
 
-#: ../src/protocols/jabber/buddy.c:1718 ../src/protocols/jabber/buddy.c:1719
+#: ../libgaim/protocols/jabber/buddy.c:1722
+#: ../libgaim/protocols/jabber/buddy.c:1723
 msgid "Search for Jabber users"
 msgstr "Rechercher des utilisateurs Jabber"
 
-#: ../src/protocols/jabber/buddy.c:1733
+#: ../libgaim/protocols/jabber/buddy.c:1737
 msgid "Invalid Directory"
 msgstr "Annuaire non valide"
 
-#: ../src/protocols/jabber/buddy.c:1750
+#: ../libgaim/protocols/jabber/buddy.c:1754
 msgid "Enter a User Directory"
 msgstr "Saisissez un annuaire d'utilisateurs"
 
-#: ../src/protocols/jabber/buddy.c:1751
+#: ../libgaim/protocols/jabber/buddy.c:1755
 msgid "Select a user directory to search"
 msgstr "Choisissez un annuaire d'utilisateurs pour la recherche"
 
-#: ../src/protocols/jabber/buddy.c:1754
+#: ../libgaim/protocols/jabber/buddy.c:1758
 msgid "Search Directory"
 msgstr "Annuaire de recherche"
 
-#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:5151
-#: ../src/protocols/yahoo/yahoochat.c:999
+#: ../libgaim/protocols/jabber/chat.c:41
+#: ../libgaim/protocols/oscar/oscar.c:5137
+#: ../libgaim/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "_Salon :"
 
-#: ../src/protocols/jabber/chat.c:47
+#: ../libgaim/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "_Serveur :"
 
-#: ../src/protocols/jabber/chat.c:53
+#: ../libgaim/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "_Pseudonyme :"
 
-#: ../src/protocols/jabber/chat.c:223
+#: ../libgaim/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s n'est pas un nom de salon de discussion valide"
 
-#: ../src/protocols/jabber/chat.c:224
+#: ../libgaim/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "Nom de salon non valide"
 
-#: ../src/protocols/jabber/chat.c:229
+#: ../libgaim/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s n'est pas un nom de serveur valide"
 
-#: ../src/protocols/jabber/chat.c:230 ../src/protocols/jabber/chat.c:231
+#: ../libgaim/protocols/jabber/chat.c:230
+#: ../libgaim/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "Nom de serveur non valide"
 
-#: ../src/protocols/jabber/chat.c:235
+#: ../libgaim/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s n'est pas un identifiant de salon de discussion valide"
 
-#: ../src/protocols/jabber/chat.c:236 ../src/protocols/jabber/chat.c:237
+#: ../libgaim/protocols/jabber/chat.c:236
+#: ../libgaim/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "Identifiant de salon non valide"
 
-#: ../src/protocols/jabber/chat.c:395
+#: ../libgaim/protocols/jabber/chat.c:396
 msgid "Configuration error"
 msgstr "Erreur de configuration"
 
-#: ../src/protocols/jabber/chat.c:404 ../src/protocols/jabber/chat.c:547
+#: ../libgaim/protocols/jabber/chat.c:405
+#: ../libgaim/protocols/jabber/chat.c:548
 msgid "Unable to configure"
 msgstr "Impossible de configurer"
 
-#: ../src/protocols/jabber/chat.c:419
+#: ../libgaim/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "Erreur de configuration du salon de discussion"
 
-#: ../src/protocols/jabber/chat.c:420
+#: ../libgaim/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "Ce salon de discussion ne peut pas être configuré"
 
-#: ../src/protocols/jabber/chat.c:469 ../src/protocols/jabber/chat.c:538
+#: ../libgaim/protocols/jabber/chat.c:470
+#: ../libgaim/protocols/jabber/chat.c:539
 msgid "Registration error"
 msgstr "Erreur d'enregistrement"
 
-#: ../src/protocols/jabber/chat.c:626
+#: ../libgaim/protocols/jabber/chat.c:627
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr ""
 "Le changement de pseudo n'est pas supporté dans les salons de discussion non "
 "MUC"
 
-#: ../src/protocols/jabber/chat.c:676 ../src/protocols/jabber/chat.c:687
-#: ../src/protocols/silc/ops.c:1449
+#: ../libgaim/protocols/jabber/chat.c:678
+#: ../libgaim/protocols/jabber/chat.c:689 ../libgaim/protocols/silc/ops.c:1448
 msgid "Error retrieving room list"
 msgstr "Erreur à la récupération de la liste des salons de discussion"
 
-#: ../src/protocols/jabber/chat.c:735
+#: ../libgaim/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "Serveur non valide"
 
-#: ../src/protocols/jabber/chat.c:773
+#: ../libgaim/protocols/jabber/chat.c:775
 msgid "Enter a Conference Server"
 msgstr "Entrer dans un serveur de conférences"
 
-#: ../src/protocols/jabber/chat.c:774
+#: ../libgaim/protocols/jabber/chat.c:776
 msgid "Select a conference server to query"
 msgstr "Choisissez un serveur de conférences"
 
-#: ../src/protocols/jabber/chat.c:777
+#: ../libgaim/protocols/jabber/chat.c:779
 msgid "Find Rooms"
 msgstr "Chercher un salon de discussion"
 
-#: ../src/protocols/jabber/jabber.c:80
+#: ../libgaim/protocols/jabber/jabber.c:81
 msgid "Error initializing session"
 msgstr "Erreur Ă  l'initialisation de la session"
 
-#: ../src/protocols/jabber/jabber.c:233 ../src/protocols/jabber/jabber.c:282
-#: ../src/protocols/jabber/jabber.c:310
+#: ../libgaim/protocols/jabber/jabber.c:240
+#: ../libgaim/protocols/jabber/jabber.c:291
+#: ../libgaim/protocols/jabber/jabber.c:319
 msgid "Write error"
 msgstr "Erreur d'Ă©criture"
 
-#: ../src/protocols/jabber/jabber.c:365 ../src/protocols/jabber/jabber.c:398
+#: ../libgaim/protocols/jabber/jabber.c:387
+#: ../libgaim/protocols/jabber/jabber.c:424
 msgid "Read Error"
 msgstr "Erreur de lecture"
 
-#: ../src/protocols/jabber/jabber.c:483 ../src/protocols/jabber/jabber.c:918
+#: ../libgaim/protocols/jabber/jabber.c:497
+#: ../libgaim/protocols/jabber/jabber.c:930
 msgid "Unable to create socket"
 msgstr "Impossible de créer le socket"
 
-#: ../src/protocols/jabber/jabber.c:539 ../src/protocols/jabber/jabber.c:876
+#: ../libgaim/protocols/jabber/jabber.c:545
+#: ../libgaim/protocols/jabber/jabber.c:888
 msgid "Invalid Jabber ID"
 msgstr "Identifiant Jabber non valide"
 
-#: ../src/protocols/jabber/jabber.c:609
+#: ../libgaim/protocols/jabber/jabber.c:616
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Enregistrement de %s@%s réussi"
 
-#: ../src/protocols/jabber/jabber.c:611 ../src/protocols/jabber/jabber.c:612
+#: ../libgaim/protocols/jabber/jabber.c:618
+#: ../libgaim/protocols/jabber/jabber.c:619
 msgid "Registration Successful"
 msgstr "Enregistrement auprès du serveur réussi"
 
-#: ../src/protocols/jabber/jabber.c:618 ../src/protocols/jabber/jabber.c:1476
+#: ../libgaim/protocols/jabber/jabber.c:625
+#: ../libgaim/protocols/jabber/jabber.c:1488
 msgid "Unknown Error"
 msgstr "Erreur inconnue"
 
-#: ../src/protocols/jabber/jabber.c:620 ../src/protocols/jabber/jabber.c:621
+#: ../libgaim/protocols/jabber/jabber.c:627
+#: ../libgaim/protocols/jabber/jabber.c:628
 msgid "Registration Failed"
 msgstr "Erreur d'enregistrement"
 
-#: ../src/protocols/jabber/jabber.c:732 ../src/protocols/jabber/jabber.c:733
+#: ../libgaim/protocols/jabber/jabber.c:743
+#: ../libgaim/protocols/jabber/jabber.c:744
 msgid "Already Registered"
 msgstr "Déjà enregistré"
 
-#: ../src/protocols/jabber/jabber.c:809 ../src/protocols/oscar/oscar.c:3709
-#: ../src/protocols/oscar/oscar.c:3717
+#: ../libgaim/protocols/jabber/jabber.c:820
+#: ../libgaim/protocols/oscar/oscar.c:3684
+#: ../libgaim/protocols/oscar/oscar.c:3692
 msgid "State"
 msgstr "État"
 
-#: ../src/protocols/jabber/jabber.c:814
+#: ../libgaim/protocols/jabber/jabber.c:825
 msgid "Postal code"
 msgstr "Code postal"
 
-#: ../src/protocols/jabber/jabber.c:819 ../src/protocols/silc/ops.c:1069
-#: ../src/protocols/silc/silc.c:703 ../src/protocols/silc/util.c:528
+#: ../libgaim/protocols/jabber/jabber.c:830
+#: ../libgaim/protocols/silc/ops.c:1068 ../libgaim/protocols/silc/silc.c:701
+#: ../libgaim/protocols/silc/util.c:555
 msgid "Phone"
 msgstr "Téléphone"
 
-#: ../src/protocols/jabber/jabber.c:829
+#: ../libgaim/protocols/jabber/jabber.c:840
 msgid "Date"
 msgstr "Date"
 
-#: ../src/protocols/jabber/jabber.c:837
+#: ../libgaim/protocols/jabber/jabber.c:848
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 "Veuillez remplir les information ci-dessous pour l'enregistrement du nouveau "
 "compte"
 
-#: ../src/protocols/jabber/jabber.c:840 ../src/protocols/jabber/jabber.c:841
+#: ../libgaim/protocols/jabber/jabber.c:851
+#: ../libgaim/protocols/jabber/jabber.c:852
 msgid "Register New Jabber Account"
 msgstr "Enregistrer un nouveau compte Jabber"
 
-#: ../src/protocols/jabber/jabber.c:999
+#: ../libgaim/protocols/jabber/jabber.c:1013
 msgid "Initializing Stream"
 msgstr "Initialisation du flux"
 
-#: ../src/protocols/jabber/jabber.c:1004 ../src/protocols/msn/session.c:350
+#: ../libgaim/protocols/jabber/jabber.c:1018
+#: ../libgaim/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "Authentification"
 
-#: ../src/protocols/jabber/jabber.c:1013
+#: ../libgaim/protocols/jabber/jabber.c:1027
 msgid "Re-initializing Stream"
 msgstr "RĂ©initialisation du flux"
 
-#: ../src/protocols/jabber/jabber.c:1089 ../src/protocols/jabber/jabber.c:1454
-#: ../src/protocols/jabber/jabber.c:1495 ../src/protocols/jabber/jabber.c:1529
-#: ../src/protocols/oscar/oscar.c:791 ../src/protocols/oscar/oscar.c:5457
+#: ../libgaim/protocols/jabber/jabber.c:1101
+#: ../libgaim/protocols/jabber/jabber.c:1466
+#: ../libgaim/protocols/jabber/jabber.c:1507
+#: ../libgaim/protocols/jabber/jabber.c:1541
+#: ../libgaim/protocols/oscar/oscar.c:766
+#: ../libgaim/protocols/oscar/oscar.c:5443
 msgid "Not Authorized"
 msgstr "Non autorisé"
 
-#: ../src/protocols/jabber/jabber.c:1131
+#: ../libgaim/protocols/jabber/jabber.c:1143
 msgid "Both"
 msgstr "Bidirectionnelle"
 
-#: ../src/protocols/jabber/jabber.c:1133
+#: ../libgaim/protocols/jabber/jabber.c:1145
 msgid "From (To pending)"
 msgstr "Source (Destination en attente)"
 
-#: ../src/protocols/jabber/jabber.c:1138
+#: ../libgaim/protocols/jabber/jabber.c:1150
 msgid "To"
 msgstr "Destination"
 
-#: ../src/protocols/jabber/jabber.c:1140
+#: ../libgaim/protocols/jabber/jabber.c:1152
 msgid "None (To pending)"
 msgstr "Aucune (Destination en attente)"
 
-#: ../src/protocols/jabber/jabber.c:1144
+#: ../libgaim/protocols/jabber/jabber.c:1156
 msgid "Subscription"
 msgstr "Inscription"
 
-#: ../src/protocols/jabber/jabber.c:1201 ../src/protocols/jabber/jabber.c:1211
-#: ../src/protocols/jabber/jabber.c:1221 ../src/protocols/jabber/jabber.c:1231
-#: ../src/protocols/jabber/jabber.c:1241
-msgid "Priority"
-msgstr "Priorité"
-
-#: ../src/protocols/jabber/jabber.c:1270
+#: ../libgaim/protocols/jabber/jabber.c:1282
 msgid "Password Changed"
 msgstr "Mot de passe changé"
 
-#: ../src/protocols/jabber/jabber.c:1271
+#: ../libgaim/protocols/jabber/jabber.c:1283
 msgid "Your password has been changed."
 msgstr "Le mot de passe a été modifié"
 
-#: ../src/protocols/jabber/jabber.c:1275 ../src/protocols/jabber/jabber.c:1276
+#: ../libgaim/protocols/jabber/jabber.c:1287
+#: ../libgaim/protocols/jabber/jabber.c:1288
 msgid "Error changing password"
 msgstr "Erreur lors du changement du mot de passe"
 
-#: ../src/protocols/jabber/jabber.c:1332
+#: ../libgaim/protocols/jabber/jabber.c:1344
 msgid "Password (again)"
 msgstr "Nouveau mot de passe (confirmation)"
 
-#: ../src/protocols/jabber/jabber.c:1337 ../src/protocols/jabber/jabber.c:1338
+#: ../libgaim/protocols/jabber/jabber.c:1349
+#: ../libgaim/protocols/jabber/jabber.c:1350
 msgid "Change Jabber Password"
 msgstr "Changer de mot de passe Jabber"
 
-#: ../src/protocols/jabber/jabber.c:1338
+#: ../libgaim/protocols/jabber/jabber.c:1350
 msgid "Please enter your new password"
 msgstr "Saisissez votre nouveau mot de passe"
 
-#: ../src/protocols/jabber/jabber.c:1348 ../src/protocols/oscar/oscar.c:6249
-#: ../src/protocols/silc/silc.c:1025
+#: ../libgaim/protocols/jabber/jabber.c:1360
+#: ../libgaim/protocols/oscar/oscar.c:6245
+#: ../libgaim/protocols/silc/silc.c:1023
 msgid "Set User Info..."
 msgstr "Éditer les informations..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../src/protocols/jabber/jabber.c:1353 ../src/protocols/oscar/oscar.c:6260
-#: ../src/protocols/silc/silc.c:1021
+#: ../libgaim/protocols/jabber/jabber.c:1365
+#: ../libgaim/protocols/oscar/oscar.c:6256
+#: ../libgaim/protocols/silc/silc.c:1019
 msgid "Change Password..."
 msgstr "Changer de mot de passe..."
 
 #. }
-#: ../src/protocols/jabber/jabber.c:1358
+#: ../libgaim/protocols/jabber/jabber.c:1370
 msgid "Search for Users..."
 msgstr "Chercher des contacts..."
 
-#: ../src/protocols/jabber/jabber.c:1434
+#: ../libgaim/protocols/jabber/jabber.c:1446
 msgid "Bad Request"
 msgstr "Mauvaise requĂŞte"
 
-#: ../src/protocols/jabber/jabber.c:1436
+#: ../libgaim/protocols/jabber/jabber.c:1448
 msgid "Conflict"
 msgstr "Conflit"
 
-#: ../src/protocols/jabber/jabber.c:1438
+#: ../libgaim/protocols/jabber/jabber.c:1450
 msgid "Feature Not Implemented"
 msgstr "Fonction non implémentée"
 
-#: ../src/protocols/jabber/jabber.c:1440
+#: ../libgaim/protocols/jabber/jabber.c:1452
 msgid "Forbidden"
 msgstr "Interdit"
 
-#: ../src/protocols/jabber/jabber.c:1442
+#: ../libgaim/protocols/jabber/jabber.c:1454
 msgid "Gone"
 msgstr "Parti"
 
-#: ../src/protocols/jabber/jabber.c:1444 ../src/protocols/jabber/jabber.c:1519
+#: ../libgaim/protocols/jabber/jabber.c:1456
+#: ../libgaim/protocols/jabber/jabber.c:1531
 msgid "Internal Server Error"
 msgstr "Erreur interne du serveur"
 
-#: ../src/protocols/jabber/jabber.c:1446
+#: ../libgaim/protocols/jabber/jabber.c:1458
 msgid "Item Not Found"
 msgstr "Item non trouvé"
 
-#: ../src/protocols/jabber/jabber.c:1448
+#: ../libgaim/protocols/jabber/jabber.c:1460
 msgid "Malformed Jabber ID"
 msgstr "Identifiant Jabber non valide."
 
-#: ../src/protocols/jabber/jabber.c:1450
+#: ../libgaim/protocols/jabber/jabber.c:1462
 msgid "Not Acceptable"
 msgstr "Non acceptable"
 
-#: ../src/protocols/jabber/jabber.c:1452
+#: ../libgaim/protocols/jabber/jabber.c:1464
 msgid "Not Allowed"
 msgstr "Non autorisé"
 
-#: ../src/protocols/jabber/jabber.c:1456
+#: ../libgaim/protocols/jabber/jabber.c:1468
 msgid "Payment Required"
 msgstr "Paiement nécessaire"
 
-#: ../src/protocols/jabber/jabber.c:1458
+#: ../libgaim/protocols/jabber/jabber.c:1470
 msgid "Recipient Unavailable"
 msgstr "Destinataire non disponible"
 
-#: ../src/protocols/jabber/jabber.c:1462
+#: ../libgaim/protocols/jabber/jabber.c:1474
 msgid "Registration Required"
 msgstr "Erreur d'enregistrement"
 
-#: ../src/protocols/jabber/jabber.c:1464
+#: ../libgaim/protocols/jabber/jabber.c:1476
 msgid "Remote Server Not Found"
 msgstr "Serveur distant non trouvé"
 
-#: ../src/protocols/jabber/jabber.c:1466
+#: ../libgaim/protocols/jabber/jabber.c:1478
 msgid "Remote Server Timeout"
 msgstr "Pas de réponse du serveur distant"
 
-#: ../src/protocols/jabber/jabber.c:1468
+#: ../libgaim/protocols/jabber/jabber.c:1480
 msgid "Server Overloaded"
 msgstr "Serveur surchargé"
 
-#: ../src/protocols/jabber/jabber.c:1470
+#: ../libgaim/protocols/jabber/jabber.c:1482
 msgid "Service Unavailable"
 msgstr "Service non disponible"
 
-#: ../src/protocols/jabber/jabber.c:1472
+#: ../libgaim/protocols/jabber/jabber.c:1484
 msgid "Subscription Required"
 msgstr "Inscription nécessaire"
 
-#: ../src/protocols/jabber/jabber.c:1474
+#: ../libgaim/protocols/jabber/jabber.c:1486
 msgid "Unexpected Request"
 msgstr "RequĂŞte non attendue"
 
-#: ../src/protocols/jabber/jabber.c:1481
+#: ../libgaim/protocols/jabber/jabber.c:1493
 msgid "Authorization Aborted"
 msgstr "Autorisation annulée"
 
-#: ../src/protocols/jabber/jabber.c:1483
+#: ../libgaim/protocols/jabber/jabber.c:1495
 msgid "Incorrect encoding in authorization"
 msgstr "Encodage incorrect de l'autorisation"
 
-#: ../src/protocols/jabber/jabber.c:1486
+#: ../libgaim/protocols/jabber/jabber.c:1498
 msgid "Invalid authzid"
 msgstr "Identifiant d'authentification non valide (authzid)"
 
-#: ../src/protocols/jabber/jabber.c:1489
+#: ../libgaim/protocols/jabber/jabber.c:1501
 msgid "Invalid Authorization Mechanism"
 msgstr "MĂ©canisme d'autorisation non valide"
 
-#: ../src/protocols/jabber/jabber.c:1492
+#: ../libgaim/protocols/jabber/jabber.c:1504
 msgid "Authorization mechanism too weak"
 msgstr "MĂ©canisme d'autorisation trop faible"
 
-#: ../src/protocols/jabber/jabber.c:1497
+#: ../libgaim/protocols/jabber/jabber.c:1509
 msgid "Temporary Authentication Failure"
 msgstr "Échec temporaire de l'authentification"
 
-#: ../src/protocols/jabber/jabber.c:1500
+#: ../libgaim/protocols/jabber/jabber.c:1512
 msgid "Authentication Failure"
 msgstr "Échec de l'authentification"
 
-#: ../src/protocols/jabber/jabber.c:1504
+#: ../libgaim/protocols/jabber/jabber.c:1516
 msgid "Bad Format"
 msgstr "Mauvais format"
 
-#: ../src/protocols/jabber/jabber.c:1506
+#: ../libgaim/protocols/jabber/jabber.c:1518
 msgid "Bad Namespace Prefix"
 msgstr "Mauvais préfixe de nom de domaine"
 
-#: ../src/protocols/jabber/jabber.c:1509
+#: ../libgaim/protocols/jabber/jabber.c:1521
 msgid "Resource Conflict"
 msgstr "Conflit de ressource"
 
-#: ../src/protocols/jabber/jabber.c:1511 ../src/protocols/silc/ops.c:1728
+#: ../libgaim/protocols/jabber/jabber.c:1523
+#: ../libgaim/protocols/silc/ops.c:1726
 msgid "Connection Timeout"
 msgstr "Connexion morte"
 
-#: ../src/protocols/jabber/jabber.c:1513
+#: ../libgaim/protocols/jabber/jabber.c:1525
 msgid "Host Gone"
 msgstr "HĂ´te perdu"
 
-#: ../src/protocols/jabber/jabber.c:1515
+#: ../libgaim/protocols/jabber/jabber.c:1527
 msgid "Host Unknown"
 msgstr "HĂ´te inconnu"
 
-#: ../src/protocols/jabber/jabber.c:1517
+#: ../libgaim/protocols/jabber/jabber.c:1529
 msgid "Improper Addressing"
 msgstr "Adresse non valide"
 
-#: ../src/protocols/jabber/jabber.c:1521
+#: ../libgaim/protocols/jabber/jabber.c:1533
 msgid "Invalid ID"
 msgstr "Identifiant non valide"
 
-#: ../src/protocols/jabber/jabber.c:1523
+#: ../libgaim/protocols/jabber/jabber.c:1535
 msgid "Invalid Namespace"
 msgstr "Nom de domaine non valide"
 
-#: ../src/protocols/jabber/jabber.c:1525
+#: ../libgaim/protocols/jabber/jabber.c:1537
 msgid "Invalid XML"
 msgstr "XML non valide"
 
-#: ../src/protocols/jabber/jabber.c:1527
+#: ../libgaim/protocols/jabber/jabber.c:1539
 msgid "Non-matching Hosts"
 msgstr "HĂ´tes non correspondants"
 
-#: ../src/protocols/jabber/jabber.c:1531
+#: ../libgaim/protocols/jabber/jabber.c:1543
 msgid "Policy Violation"
 msgstr "Violation des règles"
 
-#: ../src/protocols/jabber/jabber.c:1533
+#: ../libgaim/protocols/jabber/jabber.c:1545
 msgid "Remote Connection Failed"
 msgstr "Échec de la connexion à distance"
 
-#: ../src/protocols/jabber/jabber.c:1535
+#: ../libgaim/protocols/jabber/jabber.c:1547
 msgid "Resource Constraint"
 msgstr "Limitation sur la ressource"
 
-#: ../src/protocols/jabber/jabber.c:1537
+#: ../libgaim/protocols/jabber/jabber.c:1549
 msgid "Restricted XML"
 msgstr "XML restreint"
 
-#: ../src/protocols/jabber/jabber.c:1539
+#: ../libgaim/protocols/jabber/jabber.c:1551
 msgid "See Other Host"
 msgstr "Voir l'autre hĂ´te"
 
-#: ../src/protocols/jabber/jabber.c:1541
+#: ../libgaim/protocols/jabber/jabber.c:1553
 msgid "System Shutdown"
 msgstr "Arrêt du système"
 
-#: ../src/protocols/jabber/jabber.c:1543
+#: ../libgaim/protocols/jabber/jabber.c:1555
 msgid "Undefined Condition"
 msgstr "Condition non définie"
 
-#: ../src/protocols/jabber/jabber.c:1545
+#: ../libgaim/protocols/jabber/jabber.c:1557
 msgid "Unsupported Encoding"
 msgstr "Codage de caractère non supporté"
 
-#: ../src/protocols/jabber/jabber.c:1547
+#: ../libgaim/protocols/jabber/jabber.c:1559
 msgid "Unsupported Stanza Type"
 msgstr "Type de strophe non supporté"
 
-#: ../src/protocols/jabber/jabber.c:1549
+#: ../libgaim/protocols/jabber/jabber.c:1561
 msgid "Unsupported Version"
 msgstr "Version non supportée"
 
-#: ../src/protocols/jabber/jabber.c:1551
+#: ../libgaim/protocols/jabber/jabber.c:1563
 msgid "XML Not Well Formed"
 msgstr "XML mal formé"
 
-#: ../src/protocols/jabber/jabber.c:1553
+#: ../libgaim/protocols/jabber/jabber.c:1565
 msgid "Stream Error"
 msgstr "Erreur dans le flux"
 
-#: ../src/protocols/jabber/jabber.c:1620
+#: ../libgaim/protocols/jabber/jabber.c:1632
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Impossible de bannir l'utilisateur %s"
 
-#: ../src/protocols/jabber/jabber.c:1640
+#: ../libgaim/protocols/jabber/jabber.c:1652
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Affiliation inconnue : « %s »"
 
-#: ../src/protocols/jabber/jabber.c:1645
+#: ../libgaim/protocols/jabber/jabber.c:1657
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Impossible d'affilier l'utilisateur %s à « %s »"
 
-#: ../src/protocols/jabber/jabber.c:1664
+#: ../libgaim/protocols/jabber/jabber.c:1676
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Rôle inconnu : « %s »"
 
-#: ../src/protocols/jabber/jabber.c:1671
+#: ../libgaim/protocols/jabber/jabber.c:1683
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Impossible d'assigner le rôle « %s » pour l'utilisateur : %s"
 
-#: ../src/protocols/jabber/jabber.c:1724
+#: ../libgaim/protocols/jabber/jabber.c:1736
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Impossible d'expulser l'utilisateur %s"
 
-#: ../src/protocols/jabber/jabber.c:1755
+#: ../libgaim/protocols/jabber/jabber.c:1767
 msgid "config:  Configure a chat room."
 msgstr "config : Configurer un salon de discussion"
 
-#: ../src/protocols/jabber/jabber.c:1759
+#: ../libgaim/protocols/jabber/jabber.c:1771
 msgid "configure:  Configure a chat room."
 msgstr "configure : Configurer un salon de discussion"
 
-#: ../src/protocols/jabber/jabber.c:1768
+#: ../libgaim/protocols/jabber/jabber.c:1780
 msgid "part [room]:  Leave the room."
 msgstr "part [salon] : Quitter le salon"
 
-#: ../src/protocols/jabber/jabber.c:1773
+#: ../libgaim/protocols/jabber/jabber.c:1785
 msgid "register:  Register with a chat room."
 msgstr "register : S'enregistrer dans un salon"
 
-#: ../src/protocols/jabber/jabber.c:1779
+#: ../libgaim/protocols/jabber/jabber.c:1791
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nouveau sujet] : Voir ou changer le sujet du salon"
 
-#: ../src/protocols/jabber/jabber.c:1785
+#: ../libgaim/protocols/jabber/jabber.c:1797
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;utilisateur&gt; [salon] : Bannir un utilisateur d'un salon"
 
-#: ../src/protocols/jabber/jabber.c:1791
+#: ../libgaim/protocols/jabber/jabber.c:1803
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -7371,7 +8294,7 @@
 "affiliate &lt;utilisateur&gt; &lt;owner|admin|member|outcast|none&gt; : "
 "Change l'affiliation d'un utilisateur dans le salon."
 
-#: ../src/protocols/jabber/jabber.c:1797
+#: ../libgaim/protocols/jabber/jabber.c:1809
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -7379,20 +8302,20 @@
 "role &lt;utilisateur&gt; &lt;moderator|participant|visitor|none&gt; : "
 "Assigne Ă  un utilisateur un rĂ´le dans le salon."
 
-#: ../src/protocols/jabber/jabber.c:1803
+#: ../libgaim/protocols/jabber/jabber.c:1815
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
 "invite &lt;utilisateur&gt; [message] : Inviter un utilisateur dans le salon"
 
-#: ../src/protocols/jabber/jabber.c:1809
+#: ../libgaim/protocols/jabber/jabber.c:1821
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join &lt;room&gt; [serveur] : Joindre une discussion sur le serveur"
 
-#: ../src/protocols/jabber/jabber.c:1815
+#: ../libgaim/protocols/jabber/jabber.c:1827
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;utilisateur&gt; [salon] : Expulser un utilisateur du salon"
 
-#: ../src/protocols/jabber/jabber.c:1820
+#: ../libgaim/protocols/jabber/jabber.c:1832
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
@@ -7409,93 +8332,91 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/jabber/jabber.c:1903 ../src/protocols/jabber/jabber.c:1905
+#: ../libgaim/protocols/jabber/jabber.c:1948
+#: ../libgaim/protocols/jabber/jabber.c:1950
 msgid "Jabber Protocol Plugin"
 msgstr "Plugin pour le protocole Jabber"
 
-#: ../src/protocols/jabber/jabber.c:1931
-msgid "Use TLS if available"
-msgstr "Utiliser TLS si possible"
-
-#: ../src/protocols/jabber/jabber.c:1936
-msgid "Require TLS"
-msgstr "NĂ©cessite TLS"
-
-#: ../src/protocols/jabber/jabber.c:1939
+#: ../libgaim/protocols/jabber/jabber.c:1976
 msgid "Force old (port 5223) SSL"
 msgstr "Forcer l'ancien SSL (port 5223)"
 
-#: ../src/protocols/jabber/jabber.c:1944
+#: ../libgaim/protocols/jabber/jabber.c:1981
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Autoriser l'authentification en clair pour les flux cryptés"
 
-#: ../src/protocols/jabber/jabber.c:1949 ../src/protocols/simple/simple.c:1781
+#: ../libgaim/protocols/jabber/jabber.c:1986
+#: ../libgaim/protocols/simple/simple.c:1845
 msgid "Connect port"
 msgstr "Port de connexion"
 
 #. Account options
-#: ../src/protocols/jabber/jabber.c:1953 ../src/protocols/silc/silc.c:1856
+#: ../libgaim/protocols/jabber/jabber.c:1990
+#: ../libgaim/protocols/silc/silc.c:1855
 msgid "Connect server"
 msgstr "Connexion au serveur"
 
-#: ../src/protocols/jabber/message.c:117
+#: ../libgaim/protocols/jabber/message.c:117
 #, c-format
 msgid "Message from %s"
 msgstr "Message de %s"
 
-#: ../src/protocols/jabber/message.c:181
+#: ../libgaim/protocols/jabber/message.c:181
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s a changé le sujet en : %s"
 
-#: ../src/protocols/jabber/message.c:183
+#: ../libgaim/protocols/jabber/message.c:183
 #, c-format
 msgid "The topic is: %s"
 msgstr "Le sujet est : %s"
 
-#: ../src/protocols/jabber/message.c:233
+#: ../libgaim/protocols/jabber/message.c:233
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Échec de la livraison du message pour %s : %s"
 
-#: ../src/protocols/jabber/message.c:236
+#: ../libgaim/protocols/jabber/message.c:236
 msgid "Jabber Message Error"
 msgstr "Erreur message Jabber"
 
-#: ../src/protocols/jabber/message.c:316
+#: ../libgaim/protocols/jabber/message.c:316
 #, c-format
 msgid " (Code %s)"
 msgstr " (Code %s)"
 
-#: ../src/protocols/jabber/parser.c:279 ../src/protocols/jabber/parser.c:288
+#: ../libgaim/protocols/jabber/parser.c:179
 msgid "XML Parse error"
 msgstr "Erreur de lecture du XML"
 
-#: ../src/protocols/jabber/presence.c:305
+#: ../libgaim/protocols/jabber/presence.c:304
 msgid "Unknown Error in presence"
 msgstr "Erreur inconnue"
 
-#: ../src/protocols/jabber/presence.c:310 ../src/protocols/msn/userlist.c:98
+#: ../libgaim/protocols/jabber/presence.c:309
+#: ../libgaim/protocols/msn/userlist.c:98
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list."
 msgstr "L'utilisateur %s veut ajouter %s Ă  sa liste de contacts"
 
-#: ../src/protocols/jabber/presence.c:319 ../src/protocols/oscar/oscar.c:2382
-#: ../src/protocols/oscar/oscar.c:5082
+#: ../libgaim/protocols/jabber/presence.c:318
+#: ../libgaim/protocols/oscar/oscar.c:2357
+#: ../libgaim/protocols/oscar/oscar.c:5068
 msgid "_Authorize"
 msgstr "_Autoriser"
 
-#: ../src/protocols/jabber/presence.c:320 ../src/protocols/oscar/oscar.c:2384
-#: ../src/protocols/oscar/oscar.c:5083
+#: ../libgaim/protocols/jabber/presence.c:319
+#: ../libgaim/protocols/oscar/oscar.c:2359
+#: ../libgaim/protocols/oscar/oscar.c:5069
 msgid "_Deny"
 msgstr "_Refuser"
 
-#: ../src/protocols/jabber/presence.c:377
-#: ../src/protocols/jabber/presence.c:378
+#: ../libgaim/protocols/jabber/presence.c:376
+#: ../libgaim/protocols/jabber/presence.c:377
 msgid "Create New Room"
 msgstr "Créer un nouveau salon"
 
-#: ../src/protocols/jabber/presence.c:379
+#: ../libgaim/protocols/jabber/presence.c:378
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -7503,41 +8424,41 @@
 "Vous créez un nouveau salon. Voulez-vous choisir ses paramètres ou utiliser "
 "ceux par défaut ?"
 
-#: ../src/protocols/jabber/presence.c:382
+#: ../libgaim/protocols/jabber/presence.c:381
 msgid "_Configure Room"
 msgstr "_Configurer le salon"
 
-#: ../src/protocols/jabber/presence.c:384
+#: ../libgaim/protocols/jabber/presence.c:383
 msgid "_Accept Defaults"
 msgstr "_Accepter les paramètres par défaut"
 
-#: ../src/protocols/jabber/presence.c:422
+#: ../libgaim/protocols/jabber/presence.c:421
 #, c-format
 msgid "Error in chat %s"
 msgstr "Erreur dans la discussion %s"
 
-#: ../src/protocols/jabber/presence.c:425
+#: ../libgaim/protocols/jabber/presence.c:424
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Erreur lors de l'arrivée dans la discussion %s"
 
-#: ../src/protocols/jabber/si.c:728
+#: ../libgaim/protocols/jabber/si.c:765
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "Impossible d'envoyer le fichier Ă  %s, cet utilisateur ne supporte pas les "
 "transferts de fichiers"
 
-#: ../src/protocols/jabber/si.c:729 ../src/protocols/jabber/si.c:730
+#: ../libgaim/protocols/jabber/si.c:766 ../libgaim/protocols/jabber/si.c:767
 msgid "File Send Failed"
 msgstr "Échec d'envoi de fichier"
 
-#: ../src/protocols/msn/dialog.c:110
+#: ../libgaim/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Problème de synchronisation de la liste de contact avec %s (%s)"
 
-#: ../src/protocols/msn/dialog.c:116
+#: ../libgaim/protocols/msn/dialog.c:116
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
@@ -7546,7 +8467,7 @@
 "%s est dans le groupe « %s » sur la liste locale mais pas pas sur le "
 "serveur. Voulez-vous ajouter ce contact ?"
 
-#: ../src/protocols/msn/dialog.c:124
+#: ../libgaim/protocols/msn/dialog.c:124
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
@@ -7555,263 +8476,266 @@
 "%s est sur la liste locale mais pas pas sur le serveur. Voulez-vous ajouter "
 "ce contact ?"
 
-#: ../src/protocols/msn/error.c:35
+#: ../libgaim/protocols/msn/error.c:35
 msgid "Unable to parse message"
 msgstr "Impossible d'interpréter le message"
 
-#: ../src/protocols/msn/error.c:38
+#: ../libgaim/protocols/msn/error.c:38
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "Erreur de syntaxe (probablement un bug de Gaim)"
 
-#: ../src/protocols/msn/error.c:42
+#: ../libgaim/protocols/msn/error.c:42
 msgid "Invalid e-mail address"
 msgstr "Adresse de courrier Ă©lectronique non valide"
 
-#: ../src/protocols/msn/error.c:45
+#: ../libgaim/protocols/msn/error.c:45
 msgid "User does not exist"
 msgstr "Cet utilisateur n'existe pas"
 
-#: ../src/protocols/msn/error.c:49
+#: ../libgaim/protocols/msn/error.c:49
 msgid "Fully Qualified Domain Name missing"
 msgstr "Adresse internet incomplète"
 
-#: ../src/protocols/msn/error.c:52
+#: ../libgaim/protocols/msn/error.c:52
 msgid "Already Logged In"
 msgstr "Déjà connecté"
 
-#: ../src/protocols/msn/error.c:55
+#: ../libgaim/protocols/msn/error.c:55
 msgid "Invalid Username"
 msgstr "Nom d'utilisateur non valide"
 
-#: ../src/protocols/msn/error.c:58
+#: ../libgaim/protocols/msn/error.c:58
 msgid "Invalid Friendly Name"
 msgstr "Alias non valide"
 
-#: ../src/protocols/msn/error.c:61
+#: ../libgaim/protocols/msn/error.c:61
 msgid "List Full"
 msgstr "Liste pleine"
 
-#: ../src/protocols/msn/error.c:64
+#: ../libgaim/protocols/msn/error.c:64
 msgid "Already there"
 msgstr "DĂ©jĂ  dans la liste"
 
-#: ../src/protocols/msn/error.c:67
+#: ../libgaim/protocols/msn/error.c:67
 msgid "Not on list"
 msgstr "Pas dans la liste"
 
-#: ../src/protocols/msn/error.c:70 ../src/protocols/zephyr/zephyr.c:705
+#: ../libgaim/protocols/msn/error.c:70
+#: ../libgaim/protocols/zephyr/zephyr.c:757
 msgid "User is offline"
 msgstr "L'utilisateur est déconnecté"
 
-#: ../src/protocols/msn/error.c:73
+#: ../libgaim/protocols/msn/error.c:73
 msgid "Already in the mode"
 msgstr "DĂ©jĂ  dans ce mode"
 
-#: ../src/protocols/msn/error.c:76
+#: ../libgaim/protocols/msn/error.c:76
 msgid "Already in opposite list"
 msgstr "Déjà dans la liste opposée"
 
-#: ../src/protocols/msn/error.c:79
+#: ../libgaim/protocols/msn/error.c:79
 msgid "Too many groups"
 msgstr "Trop de groupes"
 
-#: ../src/protocols/msn/error.c:82
+#: ../libgaim/protocols/msn/error.c:82
 msgid "Invalid group"
 msgstr "Groupe non valide"
 
-#: ../src/protocols/msn/error.c:85
+#: ../libgaim/protocols/msn/error.c:85
 msgid "User not in group"
 msgstr "Utilisateur inconnu dans ce groupe"
 
-#: ../src/protocols/msn/error.c:88
+#: ../libgaim/protocols/msn/error.c:88
 msgid "Group name too long"
 msgstr "Nom du groupe trop long"
 
-#: ../src/protocols/msn/error.c:91
+#: ../libgaim/protocols/msn/error.c:91
 msgid "Cannot remove group zero"
 msgstr "Impossible de supprimer le groupe zéro"
 
-#: ../src/protocols/msn/error.c:95
+#: ../libgaim/protocols/msn/error.c:95
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Impossible d'ajouter un contact Ă  un groupe inexistant"
 
-#: ../src/protocols/msn/error.c:99
+#: ../libgaim/protocols/msn/error.c:99
 msgid "Switchboard failed"
 msgstr "Échec du standardiste"
 
-#: ../src/protocols/msn/error.c:102
+#: ../libgaim/protocols/msn/error.c:102
 msgid "Notify Transfer failed"
 msgstr "Notification de transfert échoué"
 
-#: ../src/protocols/msn/error.c:106
+#: ../libgaim/protocols/msn/error.c:106
 msgid "Required fields missing"
 msgstr "Renseignez les rubriques manquantes"
 
-#: ../src/protocols/msn/error.c:109
+#: ../libgaim/protocols/msn/error.c:109
 msgid "Too many hits to a FND"
 msgstr "Trop de réponses sur un FND"
 
-#: ../src/protocols/msn/error.c:112 ../src/protocols/oscar/oscar.c:148
+#: ../libgaim/protocols/msn/error.c:112 ../libgaim/protocols/oscar/oscar.c:123
 msgid "Not logged in"
 msgstr "Non connecté"
 
-#: ../src/protocols/msn/error.c:116
+#: ../libgaim/protocols/msn/error.c:116
 msgid "Service Temporarily Unavailable"
 msgstr "Service temporairement indisponible"
 
-#: ../src/protocols/msn/error.c:119
+#: ../libgaim/protocols/msn/error.c:119
 msgid "Database server error"
 msgstr "Erreur de base de données du serveur"
 
-#: ../src/protocols/msn/error.c:122
+#: ../libgaim/protocols/msn/error.c:122
 msgid "Command disabled"
 msgstr "Commande désactivée"
 
-#: ../src/protocols/msn/error.c:125
+#: ../libgaim/protocols/msn/error.c:125
 msgid "File operation error"
 msgstr "Erreur de manipulation de fichier"
 
-#: ../src/protocols/msn/error.c:128
+#: ../libgaim/protocols/msn/error.c:128
 msgid "Memory allocation error"
 msgstr "Erreur d'allocation mémoire"
 
-#: ../src/protocols/msn/error.c:131
+#: ../libgaim/protocols/msn/error.c:131
 msgid "Wrong CHL value sent to server"
 msgstr "Valeur CHL envoyée au serveur incorrecte"
 
-#: ../src/protocols/msn/error.c:135
+#: ../libgaim/protocols/msn/error.c:135
 msgid "Server busy"
 msgstr "Serveur occupé"
 
-#: ../src/protocols/msn/error.c:138 ../src/protocols/msn/error.c:151
-#: ../src/protocols/msn/error.c:206
+#: ../libgaim/protocols/msn/error.c:138 ../libgaim/protocols/msn/error.c:151
+#: ../libgaim/protocols/msn/error.c:206
 msgid "Server unavailable"
 msgstr "Serveur non disponible"
 
-#: ../src/protocols/msn/error.c:141
+#: ../libgaim/protocols/msn/error.c:141
 msgid "Peer Notification server down"
 msgstr "Notification du serveur distant est coupé"
 
-#: ../src/protocols/msn/error.c:144
+#: ../libgaim/protocols/msn/error.c:144
 msgid "Database connect error"
 msgstr "Erreur de connexion à la base de données"
 
-#: ../src/protocols/msn/error.c:148
+#: ../libgaim/protocols/msn/error.c:148
 msgid "Server is going down (abandon ship)"
 msgstr "Le serveur va être coupé (abandonnez le navire)"
 
-#: ../src/protocols/msn/error.c:155
+#: ../libgaim/protocols/msn/error.c:155
 msgid "Error creating connection"
 msgstr "Erreur Ă  l'ouverture de la connexion"
 
-#: ../src/protocols/msn/error.c:159
+#: ../libgaim/protocols/msn/error.c:159
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "Les paramètres CVR sont inconnus ou interdits"
 
-#: ../src/protocols/msn/error.c:162
+#: ../libgaim/protocols/msn/error.c:162
 msgid "Unable to write"
 msgstr "Impossible d'Ă©crire"
 
-#: ../src/protocols/msn/error.c:165
+#: ../libgaim/protocols/msn/error.c:165
 msgid "Session overload"
 msgstr "Surcharge de session"
 
-#: ../src/protocols/msn/error.c:168
+#: ../libgaim/protocols/msn/error.c:168
 msgid "User is too active"
 msgstr "L'utilisateur est trop actif"
 
-#: ../src/protocols/msn/error.c:171
+#: ../libgaim/protocols/msn/error.c:171
 msgid "Too many sessions"
 msgstr "Trop de sessions"
 
-#: ../src/protocols/msn/error.c:174
+#: ../libgaim/protocols/msn/error.c:174
 msgid "Passport not verified"
 msgstr "Compte Passeport non vérifié"
 
-#: ../src/protocols/msn/error.c:177
+#: ../libgaim/protocols/msn/error.c:177
 msgid "Bad friend file"
 msgstr "Mauvais fichier d'ami"
 
-#: ../src/protocols/msn/error.c:180
+#: ../libgaim/protocols/msn/error.c:180
 msgid "Not expected"
 msgstr "Non attendu"
 
-#: ../src/protocols/msn/error.c:185
+#: ../libgaim/protocols/msn/error.c:185
 msgid "Friendly name changes too rapidly"
 msgstr "Le pseudonyme change trop rapidement"
 
-#: ../src/protocols/msn/error.c:194
+#: ../libgaim/protocols/msn/error.c:194
 msgid "Server too busy"
 msgstr "Serveur occupé"
 
-#: ../src/protocols/msn/error.c:198 ../src/protocols/oscar/oscar.c:1340
-#: ../src/protocols/silc/ops.c:1717 ../src/protocols/toc/toc.c:722
+#: ../libgaim/protocols/msn/error.c:198
+#: ../libgaim/protocols/oscar/oscar.c:1310
+#: ../libgaim/protocols/silc/ops.c:1715 ../libgaim/protocols/toc/toc.c:728
+#: ../libgaim/proxy.c:1344
 msgid "Authentication failed"
 msgstr "Échec de l'authentification"
 
-#: ../src/protocols/msn/error.c:201
+#: ../libgaim/protocols/msn/error.c:201
 msgid "Not allowed when offline"
 msgstr "Interdit en dehors de la connexion"
 
-#: ../src/protocols/msn/error.c:209
+#: ../libgaim/protocols/msn/error.c:209
 msgid "Not accepting new users"
 msgstr "N'accepte plus de nouveaux utilisateurs"
 
-#: ../src/protocols/msn/error.c:213
+#: ../libgaim/protocols/msn/error.c:213
 msgid "Kids Passport without parental consent"
 msgstr "Passeport pour enfant sans accord parental"
 
-#: ../src/protocols/msn/error.c:217
+#: ../libgaim/protocols/msn/error.c:217
 msgid "Passport account not yet verified"
 msgstr "Le compte Passeport n'est pas encore validé"
 
-#: ../src/protocols/msn/error.c:220
+#: ../libgaim/protocols/msn/error.c:220
 msgid "Bad ticket"
 msgstr "Mauvais ticket"
 
-#: ../src/protocols/msn/error.c:224
+#: ../libgaim/protocols/msn/error.c:224
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Code d'erreur inconnu %d"
 
-#: ../src/protocols/msn/error.c:236
+#: ../libgaim/protocols/msn/error.c:236
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "Erreur MSN : %s\n"
 
-#: ../src/protocols/msn/msn.c:113
+#: ../libgaim/protocols/msn/msn.c:113
 msgid "You have just sent a Nudge!"
 msgstr "Vous venez d'envoyer un « Nudge. »"
 
-#: ../src/protocols/msn/msn.c:138
+#: ../libgaim/protocols/msn/msn.c:138
 msgid "Your new MSN friendly name is too long."
 msgstr "Le nouvel alias MSN est trop long"
 
-#: ../src/protocols/msn/msn.c:246
+#: ../libgaim/protocols/msn/msn.c:246
 msgid "Set your friendly name."
 msgstr "Changer l'alias"
 
-#: ../src/protocols/msn/msn.c:247
+#: ../libgaim/protocols/msn/msn.c:247
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Nom sous lequel les utilisateurs MSN vous verront."
 
-#: ../src/protocols/msn/msn.c:263
+#: ../libgaim/protocols/msn/msn.c:263
 msgid "Set your home phone number."
 msgstr "Numéro de téléphone"
 
-#: ../src/protocols/msn/msn.c:278
+#: ../libgaim/protocols/msn/msn.c:278
 msgid "Set your work phone number."
 msgstr "Numéro de téléphone au travail"
 
-#: ../src/protocols/msn/msn.c:293
+#: ../libgaim/protocols/msn/msn.c:293
 msgid "Set your mobile phone number."
 msgstr "Numéro de téléphone portable"
 
-#: ../src/protocols/msn/msn.c:306
+#: ../libgaim/protocols/msn/msn.c:306
 msgid "Allow MSN Mobile pages?"
 msgstr "Autoriser les messages MSN vers votre téléphone portable ?"
 
-#: ../src/protocols/msn/msn.c:307
+#: ../libgaim/protocols/msn/msn.c:307
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -7819,29 +8743,31 @@
 "Voulez-vous autorisez les contacts de votre liste Ă  vous envoyer des "
 "messages MSN sur votre téléphone portable ?"
 
-#: ../src/protocols/msn/msn.c:311
+#: ../libgaim/protocols/msn/msn.c:311
 msgid "Allow"
 msgstr "Autoriser"
 
-#: ../src/protocols/msn/msn.c:312
+#: ../libgaim/protocols/msn/msn.c:312
 msgid "Disallow"
 msgstr "Interdire"
 
-#: ../src/protocols/msn/msn.c:328
+#: ../libgaim/protocols/msn/msn.c:328
 msgid "This Hotmail account may not be active."
 msgstr "Ce compte Hotmail ne semble pas ĂŞtre actif."
 
-#: ../src/protocols/msn/msn.c:354
+#: ../libgaim/protocols/msn/msn.c:354
 msgid "Send a mobile message."
 msgstr "Envoyer un message vers un téléphone portable"
 
-#: ../src/protocols/msn/msn.c:356
+#: ../libgaim/protocols/msn/msn.c:356
 msgid "Page"
 msgstr "Bipper"
 
-#: ../src/protocols/msn/msn.c:546 ../src/protocols/msn/msn.c:553
-#: ../src/protocols/msn/msn.c:562 ../src/protocols/sametime/sametime.c:3239
-#: ../src/protocols/yahoo/yahoo.c:2895 ../src/protocols/yahoo/yahoo.c:2901
+#: ../libgaim/protocols/msn/msn.c:546 ../libgaim/protocols/msn/msn.c:553
+#: ../libgaim/protocols/msn/msn.c:562
+#: ../libgaim/protocols/sametime/sametime.c:3235
+#: ../libgaim/protocols/yahoo/yahoo.c:3032
+#: ../libgaim/protocols/yahoo/yahoo.c:3038
 #, c-format
 msgid ""
 "\n"
@@ -7850,69 +8776,73 @@
 "\n"
 "<b>%s :</b> %s"
 
-#: ../src/protocols/msn/msn.c:553
+#: ../libgaim/protocols/msn/msn.c:553
 msgid "Has you"
 msgstr "Vous ĂŞtes dans sa liste"
 
-#: ../src/protocols/msn/msn.c:583 ../src/protocols/msn/state.c:33
-#: ../src/protocols/yahoo/yahoo.c:2724 ../src/protocols/yahoo/yahoo.c:3325
+#: ../libgaim/protocols/msn/msn.c:583 ../libgaim/protocols/msn/state.c:33
+#: ../libgaim/protocols/yahoo/yahoo.c:2861
+#: ../libgaim/protocols/yahoo/yahoo.c:3466
 msgid "Be Right Back"
 msgstr "Revient de suite"
 
-#: ../src/protocols/msn/msn.c:587 ../src/protocols/msn/state.c:31
-#: ../src/protocols/novell/novell.c:2849 ../src/protocols/novell/novell.c:2983
-#: ../src/protocols/silc/buddy.c:1473 ../src/protocols/silc/silc.c:53
-#: ../src/protocols/yahoo/yahoo.c:2726 ../src/protocols/yahoo/yahoo.c:3328
+#: ../libgaim/protocols/msn/msn.c:587 ../libgaim/protocols/msn/state.c:31
+#: ../libgaim/protocols/novell/novell.c:2859
+#: ../libgaim/protocols/novell/novell.c:2993
+#: ../libgaim/protocols/silc/buddy.c:1473 ../libgaim/protocols/silc/silc.c:53
+#: ../libgaim/protocols/yahoo/yahoo.c:2863
+#: ../libgaim/protocols/yahoo/yahoo.c:3469
 msgid "Busy"
 msgstr "Occupé"
 
-#: ../src/protocols/msn/msn.c:591 ../src/protocols/yahoo/yahoo.c:2734
-#: ../src/protocols/yahoo/yahoo.c:3340
+#: ../libgaim/protocols/msn/msn.c:591 ../libgaim/protocols/yahoo/yahoo.c:2871
+#: ../libgaim/protocols/yahoo/yahoo.c:3481
 msgid "On the Phone"
 msgstr "Au téléphone"
 
-#: ../src/protocols/msn/msn.c:595 ../src/protocols/yahoo/yahoo.c:2738
-#: ../src/protocols/yahoo/yahoo.c:3346
+#: ../libgaim/protocols/msn/msn.c:595 ../libgaim/protocols/yahoo/yahoo.c:2875
+#: ../libgaim/protocols/yahoo/yahoo.c:3487
 msgid "Out to Lunch"
 msgstr "Parti manger"
 
-#: ../src/protocols/msn/msn.c:619
+#: ../libgaim/protocols/msn/msn.c:619
 msgid "Set Friendly Name..."
 msgstr "Changer l'alias..."
 
-#: ../src/protocols/msn/msn.c:624
+#: ../libgaim/protocols/msn/msn.c:624
 msgid "Set Home Phone Number..."
 msgstr "Changer le numéro de téléphone..."
 
-#: ../src/protocols/msn/msn.c:628
+#: ../libgaim/protocols/msn/msn.c:628
 msgid "Set Work Phone Number..."
 msgstr "Changer le numéro au travail..."
 
-#: ../src/protocols/msn/msn.c:632
+#: ../libgaim/protocols/msn/msn.c:632
 msgid "Set Mobile Phone Number..."
 msgstr "Changer le numéro de téléphone portable..."
 
-#: ../src/protocols/msn/msn.c:638
+#: ../libgaim/protocols/msn/msn.c:638
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Activer le service pour téléphones portables..."
 
-#: ../src/protocols/msn/msn.c:643
+#: ../libgaim/protocols/msn/msn.c:643
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Autoriser les messages sur téléphones portables..."
 
-#: ../src/protocols/msn/msn.c:653
+#: ../libgaim/protocols/msn/msn.c:653
 msgid "Open Hotmail Inbox"
 msgstr "Ouvrir la boîte au lettre Hotmail"
 
-#: ../src/protocols/msn/msn.c:677
+#: ../libgaim/protocols/msn/msn.c:677
 msgid "Send to Mobile"
 msgstr "Envoyer vers un téléphone portable"
 
-#: ../src/protocols/msn/msn.c:687 ../src/protocols/novell/novell.c:3439
+#: ../libgaim/protocols/msn/msn.c:687
+#: ../libgaim/protocols/novell/novell.c:3449
 msgid "Initiate _Chat"
 msgstr "Lancer une _discussion"
 
-#: ../src/protocols/msn/msn.c:725
+#: ../libgaim/protocols/msn/msn.c:725
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -7921,230 +8851,239 @@
 "bibliothèque SSL. Visitez http://gaim.sf.net/faq-ssl.php pour plus "
 "d'informations."
 
-#: ../src/protocols/msn/msn.c:752
+#: ../libgaim/protocols/msn/msn.c:752
 msgid "Failed to connect to server."
 msgstr "Impossible de se connecter au serveur"
 
-#: ../src/protocols/msn/msn.c:1363 ../src/protocols/yahoo/yahoo_profile.c:685
-#: ../src/protocols/zephyr/zephyr.c:736 ../src/protocols/zephyr/zephyr.c:1153
+#: ../libgaim/protocols/msn/msn.c:1363
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:685
+#: ../libgaim/protocols/zephyr/zephyr.c:788
+#: ../libgaim/protocols/zephyr/zephyr.c:1205
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Alias :</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: ../src/protocols/msn/msn.c:1370 ../src/protocols/yahoo/yahoo_profile.c:1208
-#: ../src/util.c:1059
+#: ../libgaim/protocols/msn/msn.c:1370
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1221 ../libgaim/util.c:1109
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s :</b> "
 
-#: ../src/protocols/msn/msn.c:1460
+#: ../libgaim/protocols/msn/msn.c:1462
 msgid "MSN Profile"
 msgstr "Profil MSN"
 
-#: ../src/protocols/msn/msn.c:1465 ../src/protocols/msn/msn.c:1791
-#: ../src/protocols/yahoo/yahoo_profile.c:795
+#: ../libgaim/protocols/msn/msn.c:1467 ../libgaim/protocols/msn/msn.c:1796
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:794
 msgid "Error retrieving profile"
 msgstr "Erreur à la récupération du profil"
 
-#: ../src/protocols/msn/msn.c:1533 ../src/protocols/oscar/oscar.c:3694
-#: ../src/protocols/yahoo/yahoo_profile.c:1056
+#: ../libgaim/protocols/msn/msn.c:1537 ../libgaim/protocols/oscar/oscar.c:3669
+#: ../libgaim/protocols/qq/buddy_info.c:43
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1070
 msgid "Age"
 msgstr "Ă‚ge"
 
-#: ../src/protocols/msn/msn.c:1535 ../src/protocols/yahoo/yahoo_profile.c:1071
+#: ../libgaim/protocols/msn/msn.c:1539 ../libgaim/protocols/qq/buddy_info.c:49
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1085
 msgid "Occupation"
 msgstr "Occupation"
 
-#: ../src/protocols/msn/msn.c:1536 ../src/protocols/novell/novell.c:1478
-#: ../src/protocols/yahoo/yahoo_profile.c:1051
+#: ../libgaim/protocols/msn/msn.c:1540
+#: ../libgaim/protocols/novell/novell.c:1478
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1065
 msgid "Location"
 msgstr "Localisation"
 
-#: ../src/protocols/msn/msn.c:1541 ../src/protocols/msn/msn.c:1720
-#: ../src/protocols/msn/msn.c:1726 ../src/protocols/msn/msn.c:1733
+#: ../libgaim/protocols/msn/msn.c:1545 ../libgaim/protocols/msn/msn.c:1725
+#: ../libgaim/protocols/msn/msn.c:1731 ../libgaim/protocols/msn/msn.c:1738
 msgid "Hobbies and Interests"
 msgstr "Passe-temps et intérêts"
 
-#: ../src/protocols/msn/msn.c:1547 ../src/protocols/msn/msn.c:1654
-#: ../src/protocols/msn/msn.c:1660 ../src/protocols/msn/msn.c:1667
-#: ../src/protocols/msn/msn.c:1675 ../src/protocols/msn/msn.c:1682
+#: ../libgaim/protocols/msn/msn.c:1551 ../libgaim/protocols/msn/msn.c:1659
+#: ../libgaim/protocols/msn/msn.c:1665 ../libgaim/protocols/msn/msn.c:1672
+#: ../libgaim/protocols/msn/msn.c:1680 ../libgaim/protocols/msn/msn.c:1687
 msgid "A Little About Me"
 msgstr "Ă€ propos de moi"
 
-#: ../src/protocols/msn/msn.c:1553
+#: ../libgaim/protocols/msn/msn.c:1557
 #, c-format
 msgid "%s<b>General</b><br>%s"
 msgstr "%s<b>Général</b><br>%s"
 
 #. Social
-#: ../src/protocols/msn/msn.c:1562 ../src/protocols/yahoo/yahoo_profile.c:1061
+#: ../libgaim/protocols/msn/msn.c:1566
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1075
 msgid "Marital Status"
 msgstr "État matrimonial"
 
-#: ../src/protocols/msn/msn.c:1563
+#: ../libgaim/protocols/msn/msn.c:1567
 msgid "Interests"
 msgstr "Intérêts"
 
-#: ../src/protocols/msn/msn.c:1564
+#: ../libgaim/protocols/msn/msn.c:1568
 msgid "Pets"
 msgstr "Animaux"
 
-#: ../src/protocols/msn/msn.c:1565
+#: ../libgaim/protocols/msn/msn.c:1569
 msgid "Hometown"
 msgstr "Ville d'origine"
 
-#: ../src/protocols/msn/msn.c:1566
+#: ../libgaim/protocols/msn/msn.c:1570
 msgid "Places Lived"
 msgstr "Précédents lieux de résidence"
 
-#: ../src/protocols/msn/msn.c:1567
+#: ../libgaim/protocols/msn/msn.c:1571
 msgid "Fashion"
 msgstr "Mode"
 
-#: ../src/protocols/msn/msn.c:1568
+#: ../libgaim/protocols/msn/msn.c:1572
 msgid "Humor"
 msgstr "Humour"
 
-#: ../src/protocols/msn/msn.c:1569
+#: ../libgaim/protocols/msn/msn.c:1573
 msgid "Music"
 msgstr "Musique"
 
-#: ../src/protocols/msn/msn.c:1570 ../src/protocols/msn/msn.c:1742
-#: ../src/protocols/msn/msn.c:1748 ../src/protocols/yahoo/yahoo_profile.c:1113
+#: ../libgaim/protocols/msn/msn.c:1574 ../libgaim/protocols/msn/msn.c:1747
+#: ../libgaim/protocols/msn/msn.c:1753
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1127
 msgid "Favorite Quote"
 msgstr "Citation préférée"
 
-#: ../src/protocols/msn/msn.c:1574
+#: ../libgaim/protocols/msn/msn.c:1578
 #, c-format
 msgid "%s<b>Social</b><br>%s"
 msgstr "%s<b>Social</b><br>%s"
 
-#: ../src/protocols/msn/msn.c:1583
+#: ../libgaim/protocols/msn/msn.c:1587
 msgid "Significant Other"
 msgstr "Compagnon/Compagne"
 
-#: ../src/protocols/msn/msn.c:1584
+#: ../libgaim/protocols/msn/msn.c:1588
 msgid "Home Phone"
 msgstr "Téléphone personnel"
 
-#: ../src/protocols/msn/msn.c:1585
+#: ../libgaim/protocols/msn/msn.c:1589
 msgid "Home Phone 2"
 msgstr "Téléphone personnel 2"
 
-#: ../src/protocols/msn/msn.c:1586 ../src/protocols/oscar/oscar.c:3706
+#: ../libgaim/protocols/msn/msn.c:1590 ../libgaim/protocols/oscar/oscar.c:3681
 msgid "Home Address"
 msgstr "Adresse personnelle"
 
-#: ../src/protocols/msn/msn.c:1587
+#: ../libgaim/protocols/msn/msn.c:1591
 msgid "Personal Mobile"
 msgstr "Téléphone portable personnel"
 
-#: ../src/protocols/msn/msn.c:1588
+#: ../libgaim/protocols/msn/msn.c:1592
 msgid "Home Fax"
 msgstr "Télécopie personnelle"
 
-#: ../src/protocols/msn/msn.c:1589
+#: ../libgaim/protocols/msn/msn.c:1593
 msgid "Personal E-Mail"
 msgstr "Adresse Ă©lectronique personnelle"
 
-#: ../src/protocols/msn/msn.c:1590
+#: ../libgaim/protocols/msn/msn.c:1594
 msgid "Personal IM"
 msgstr "Messagerie instantanée"
 
-#: ../src/protocols/msn/msn.c:1592
+#: ../libgaim/protocols/msn/msn.c:1596
 msgid "Anniversary"
 msgstr "Anniversaire"
 
-#: ../src/protocols/msn/msn.c:1593 ../src/protocols/msn/msn.c:1617
+#: ../libgaim/protocols/msn/msn.c:1597 ../libgaim/protocols/msn/msn.c:1622
 msgid "Notes"
 msgstr "Notes"
 
-#: ../src/protocols/msn/msn.c:1597
+#: ../libgaim/protocols/msn/msn.c:1601
 #, c-format
 msgid "<br><b>Personal</b><br>%s"
 msgstr "<br><b>Personnel</b><br>%s"
 
-#: ../src/protocols/msn/msn.c:1604 ../src/protocols/silc/ops.c:1044
+#: ../libgaim/protocols/msn/msn.c:1609 ../libgaim/protocols/silc/ops.c:1043
 msgid "Job Title"
 msgstr "Position"
 
-#: ../src/protocols/msn/msn.c:1605 ../src/protocols/oscar/oscar.c:3723
+#: ../libgaim/protocols/msn/msn.c:1610 ../libgaim/protocols/oscar/oscar.c:3698
 msgid "Company"
 msgstr "Société"
 
-#: ../src/protocols/msn/msn.c:1606 ../src/protocols/novell/novell.c:1480
+#: ../libgaim/protocols/msn/msn.c:1611
+#: ../libgaim/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Service"
 
-#: ../src/protocols/msn/msn.c:1607
+#: ../libgaim/protocols/msn/msn.c:1612
 msgid "Profession"
 msgstr "Profession"
 
-#: ../src/protocols/msn/msn.c:1608
+#: ../libgaim/protocols/msn/msn.c:1613
 msgid "Work Phone"
 msgstr "Téléphone professionnel"
 
-#: ../src/protocols/msn/msn.c:1609
+#: ../libgaim/protocols/msn/msn.c:1614
 msgid "Work Phone 2"
 msgstr "Téléphone professionnel 2"
 
-#: ../src/protocols/msn/msn.c:1610 ../src/protocols/oscar/oscar.c:3714
+#: ../libgaim/protocols/msn/msn.c:1615 ../libgaim/protocols/oscar/oscar.c:3689
 msgid "Work Address"
 msgstr "Adresse professionnelle"
 
-#: ../src/protocols/msn/msn.c:1611
+#: ../libgaim/protocols/msn/msn.c:1616
 msgid "Work Mobile"
 msgstr "Téléphone portable professionnel"
 
-#: ../src/protocols/msn/msn.c:1612
+#: ../libgaim/protocols/msn/msn.c:1617
 msgid "Work Pager"
 msgstr "Bippeur professionnel"
 
-#: ../src/protocols/msn/msn.c:1613
+#: ../libgaim/protocols/msn/msn.c:1618
 msgid "Work Fax"
 msgstr "Télécopie professionnelle"
 
-#: ../src/protocols/msn/msn.c:1614
+#: ../libgaim/protocols/msn/msn.c:1619
 msgid "Work E-Mail"
 msgstr "Adresse Ă©lectronique professionnelle"
 
-#: ../src/protocols/msn/msn.c:1615
+#: ../libgaim/protocols/msn/msn.c:1620
 msgid "Work IM"
 msgstr "Messagerie instantanée"
 
-#: ../src/protocols/msn/msn.c:1616
+#: ../libgaim/protocols/msn/msn.c:1621
 msgid "Start Date"
 msgstr "Date d'embauche"
 
-#: ../src/protocols/msn/msn.c:1621
+#: ../libgaim/protocols/msn/msn.c:1626
 #, c-format
 msgid "<br><b>Business</b><br>%s"
 msgstr "<br><b>Emploi</b><br>%s"
 
-#: ../src/protocols/msn/msn.c:1632
+#: ../libgaim/protocols/msn/msn.c:1637
 #, c-format
 msgid "<hr><b>Contact Info</b>%s%s"
 msgstr "<hr><b>Coordonnées</b>%s%s"
 
-#: ../src/protocols/msn/msn.c:1691 ../src/protocols/msn/msn.c:1697
-#: ../src/protocols/msn/msn.c:1704 ../src/protocols/msn/msn.c:1711
+#: ../libgaim/protocols/msn/msn.c:1696 ../libgaim/protocols/msn/msn.c:1702
+#: ../libgaim/protocols/msn/msn.c:1709 ../libgaim/protocols/msn/msn.c:1716
 msgid "Favorite Things"
 msgstr "Choses préférées"
 
-#: ../src/protocols/msn/msn.c:1756
+#: ../libgaim/protocols/msn/msn.c:1761
 msgid "Last Updated"
 msgstr "Dernière mise à jour"
 
-#: ../src/protocols/msn/msn.c:1768 ../src/protocols/silc/ops.c:1060
+#: ../libgaim/protocols/msn/msn.c:1773 ../libgaim/protocols/qq/buddy_info.c:58
+#: ../libgaim/protocols/silc/ops.c:1059
 msgid "Homepage"
 msgstr "Page web"
 
-#: ../src/protocols/msn/msn.c:1793
+#: ../libgaim/protocols/msn/msn.c:1798
 msgid "The user has not created a public profile."
 msgstr "L'utilisateur n'a pas créé de profil public"
 
-#: ../src/protocols/msn/msn.c:1794
+#: ../libgaim/protocols/msn/msn.c:1799
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -8153,7 +9092,7 @@
 "Impossible de récupérer le profil de l'utilisateur par MSN. Soit "
 "l'utilisateur n'existe pas, soit il n'a pas créé de profil public."
 
-#: ../src/protocols/msn/msn.c:1798
+#: ../libgaim/protocols/msn/msn.c:1803
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
@@ -8162,12 +9101,13 @@
 "est possible que cet utilisateur n'existe pas."
 
 #. put a link to the actual profile URL
-#: ../src/protocols/msn/msn.c:1803
+#: ../libgaim/protocols/msn/msn.c:1808
 #, c-format
 msgid "<hr><b>%s:</b> "
 msgstr "<hr><b>%s :</b> "
 
-#: ../src/protocols/msn/msn.c:1803 ../src/protocols/yahoo/yahoo_profile.c:1208
+#: ../libgaim/protocols/msn/msn.c:1808
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1221
 msgid "Profile URL"
 msgstr "Lien du profil"
 
@@ -8181,81 +9121,96 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/msn/msn.c:2025 ../src/protocols/msn/msn.c:2027
+#: ../libgaim/protocols/msn/msn.c:2033 ../libgaim/protocols/msn/msn.c:2035
 msgid "MSN Protocol Plugin"
 msgstr "Plugin pour le protocole MSN"
 
-#: ../src/protocols/msn/msn.c:2055
+#: ../libgaim/protocols/msn/msn.c:2063
 msgid "Use HTTP Method"
 msgstr "Utiliser le protocole HTTP"
 
-#: ../src/protocols/msn/msn.c:2060
+#: ../libgaim/protocols/msn/msn.c:2068
 msgid "Show custom smileys"
 msgstr "Afficher les frimousses personnalisées"
 
-#: ../src/protocols/msn/msn.c:2068
+#: ../libgaim/protocols/msn/msn.c:2076
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge : donner un « Nudge » à un contact pour attirer son attention."
 
-#: ../src/protocols/msn/nexus.c:141 ../src/protocols/msn/servconn.c:133
-#: ../src/protocols/yahoo/yahoochat.c:1346
-#: ../src/protocols/yahoo/yahoochat.c:1373
+#: ../libgaim/protocols/msn/nexus.c:146
+#: ../libgaim/protocols/msn/servconn.c:133
+#: ../libgaim/protocols/qq/qq_proxy.c:242
+#: ../libgaim/protocols/qq/qq_proxy.c:321
+#: ../libgaim/protocols/qq/qq_proxy.c:366
+#: ../libgaim/protocols/qq/qq_proxy.c:399
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:62
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:162
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:186
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:199
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:228
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:242
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:267
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:301
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:331
+#: ../libgaim/protocols/yahoo/yahoochat.c:1357
+#: ../libgaim/protocols/yahoo/yahoochat.c:1383
 msgid "Unable to connect"
 msgstr "Impossible de se connecter"
 
-#: ../src/protocols/msn/notification.c:178
+#: ../libgaim/protocols/msn/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s n'est pas un nom de groupe valide"
 
-#: ../src/protocols/msn/notification.c:184
-#: ../src/protocols/msn/notification.c:532 ../src/protocols/msn/session.c:329
+#: ../libgaim/protocols/msn/notification.c:184
+#: ../libgaim/protocols/msn/notification.c:532
+#: ../libgaim/protocols/msn/session.c:329
 msgid "Unknown error."
 msgstr "Erreur inconnue"
 
-#: ../src/protocols/msn/notification.c:187
+#: ../libgaim/protocols/msn/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s pour %s (%s)"
 
-#: ../src/protocols/msn/notification.c:498
+#: ../libgaim/protocols/msn/notification.c:498
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Impossible d'ajouter l'utilisateur Ă  la liste de %s (%s)"
 
-#: ../src/protocols/msn/notification.c:502
+#: ../libgaim/protocols/msn/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "Impossible de bloquer l'utilisateur pour %s (%s)"
 
-#: ../src/protocols/msn/notification.c:506
+#: ../libgaim/protocols/msn/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Impossible d'autoriser l'utilisateur pour %s (%s)"
 
-#: ../src/protocols/msn/notification.c:514
+#: ../libgaim/protocols/msn/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "Liste de contacts pleine. Impossible d'ajouter %s."
 
-#: ../src/protocols/msn/notification.c:523
+#: ../libgaim/protocols/msn/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s n'est pas un compte passeport valide."
 
-#: ../src/protocols/msn/notification.c:528
+#: ../libgaim/protocols/msn/notification.c:528
 msgid "Service Temporarily Unavailable."
 msgstr "Service temporairement indisponible."
 
-#: ../src/protocols/msn/notification.c:820
+#: ../libgaim/protocols/msn/notification.c:823
 msgid "Unable to rename group"
 msgstr "Impossible de renommer le groupe"
 
-#: ../src/protocols/msn/notification.c:875
+#: ../libgaim/protocols/msn/notification.c:878
 msgid "Unable to delete group"
 msgstr "Impossible de supprimer le groupe"
 
-#: ../src/protocols/msn/notification.c:1308
+#: ../libgaim/protocols/msn/notification.c:1314
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -8284,15 +9239,15 @@
 "\n"
 "Une fois la maintenance effectuée, vous pourrez vous reconnecter."
 
-#: ../src/protocols/msn/servconn.c:135
+#: ../libgaim/protocols/msn/servconn.c:135
 msgid "Writing error"
 msgstr "Erreur d'Ă©criture"
 
-#: ../src/protocols/msn/servconn.c:137
+#: ../libgaim/protocols/msn/servconn.c:137
 msgid "Reading error"
 msgstr "Erreur de lecture"
 
-#: ../src/protocols/msn/servconn.c:144
+#: ../libgaim/protocols/msn/servconn.c:144
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -8301,227 +9256,231 @@
 "Erreur de connexion du serveur %s :\n"
 "%s"
 
-#: ../src/protocols/msn/session.c:299
+#: ../libgaim/protocols/msn/session.c:299
 msgid "Our protocol is not supported by the server."
 msgstr "Notre protocole n'est pas supportés par le serveur."
 
-#: ../src/protocols/msn/session.c:303
+#: ../libgaim/protocols/msn/session.c:303
 msgid "Error parsing HTTP."
 msgstr "Erreur Ă  l'analyse du HTTP"
 
-#: ../src/protocols/msn/session.c:307 ../src/protocols/oscar/oscar.c:3431
-#: ../src/protocols/yahoo/yahoo.c:191
+#: ../libgaim/protocols/msn/session.c:307
+#: ../libgaim/protocols/oscar/oscar.c:3409
+#: ../libgaim/protocols/yahoo/yahoo.c:191
 msgid "You have signed on from another location."
 msgstr "Vous venez de vous connecter depuis un autre endroit."
 
-#: ../src/protocols/msn/session.c:310
+#: ../libgaim/protocols/msn/session.c:310
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Les serveurs MSN ne sont pas disponibles pour l'instant. Veuillez attendre "
 "un peu puis réessayer."
 
-#: ../src/protocols/msn/session.c:315
+#: ../libgaim/protocols/msn/session.c:315
 msgid "The MSN servers are going down temporarily."
 msgstr "Les serveurs MSN sont coupés temporairement."
 
-#: ../src/protocols/msn/session.c:319
+#: ../libgaim/protocols/msn/session.c:319
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Impossible de s'authentifier : %s"
 
-#: ../src/protocols/msn/session.c:324
+#: ../libgaim/protocols/msn/session.c:324
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "Votre liste de contacts MSN n'est pas disponible pour l'instant. Veuillez "
 "attendre un peu puis réessayer."
 
-#: ../src/protocols/msn/session.c:345 ../src/protocols/msn/session.c:347
+#: ../libgaim/protocols/msn/session.c:345
+#: ../libgaim/protocols/msn/session.c:347
 msgid "Handshaking"
 msgstr "Poignée de main"
 
-#: ../src/protocols/msn/session.c:346
+#: ../libgaim/protocols/msn/session.c:346
 msgid "Transferring"
 msgstr "Transfert"
 
-#: ../src/protocols/msn/session.c:348
+#: ../libgaim/protocols/msn/session.c:348
 msgid "Starting authentication"
 msgstr "DĂ©but d'authentification"
 
-#: ../src/protocols/msn/session.c:349
+#: ../libgaim/protocols/msn/session.c:349
 msgid "Getting cookie"
 msgstr "Récupération du cookie"
 
-#: ../src/protocols/msn/session.c:351
+#: ../libgaim/protocols/msn/session.c:351
 msgid "Sending cookie"
 msgstr "Envoi du cookie"
 
-#: ../src/protocols/msn/session.c:352
+#: ../libgaim/protocols/msn/session.c:352
 msgid "Retrieving buddy list"
 msgstr "Récupération de la liste de contacts"
 
-#: ../src/protocols/msn/state.c:34
+#: ../libgaim/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "Absent"
 
-#: ../src/protocols/msn/state.c:35
+#: ../libgaim/protocols/msn/state.c:35
 msgid "On The Phone"
 msgstr "Au téléphone"
 
-#: ../src/protocols/msn/state.c:36
+#: ../libgaim/protocols/msn/state.c:36
 msgid "Out To Lunch"
 msgstr "Parti manger"
 
-#: ../src/protocols/msn/switchboard.c:401
+#: ../libgaim/protocols/msn/switchboard.c:400
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "Le message peut ne pas avoir été envoyé à cause d'un temps mort :"
 
-#: ../src/protocols/msn/switchboard.c:409
+#: ../libgaim/protocols/msn/switchboard.c:408
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "Impossible d'envoyer un message en étant invisible :"
 
-#: ../src/protocols/msn/switchboard.c:413
+#: ../libgaim/protocols/msn/switchboard.c:412
 msgid "Message could not be sent because the user is offline:"
 msgstr "Impossible d'envoyer le message à un utilisateur déconnecté :"
 
-#: ../src/protocols/msn/switchboard.c:417
+#: ../libgaim/protocols/msn/switchboard.c:416
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Impossible d'envoyer le message à cause d'un problème de connexion :"
 
-#: ../src/protocols/msn/switchboard.c:421
+#: ../libgaim/protocols/msn/switchboard.c:420
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr ""
 "Impossible d'envoyer le message parce que la vitesse maximale est dépassée :"
 
-#: ../src/protocols/msn/switchboard.c:425
+#: ../libgaim/protocols/msn/switchboard.c:424
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
 "Impossible d'envoyer le message Ă  cause d'une erreur du serveur "
 "standardiste :"
 
-#: ../src/protocols/msn/switchboard.c:433
+#: ../libgaim/protocols/msn/switchboard.c:432
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Impossible d'envoyer le message à cause d'une erreur inconnue :"
 
-#: ../src/protocols/msn/switchboard.c:953
+#: ../libgaim/protocols/msn/switchboard.c:952
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s vient de vous envoyer un « Nudge. »"
 
-#: ../src/protocols/msn/userlist.c:90
+#: ../libgaim/protocols/msn/userlist.c:90
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "L'utilisateur %s (%s) veut ajouter %s Ă  sa liste de contacts"
 
-#: ../src/protocols/msn/userlist.c:105 ../src/protocols/yahoo/yahoo.c:920
+#: ../libgaim/protocols/msn/userlist.c:105
+#: ../libgaim/protocols/yahoo/yahoo.c:1002
 msgid "Authorize"
 msgstr "Autoriser"
 
-#: ../src/protocols/msn/userlist.c:106 ../src/protocols/yahoo/yahoo.c:922
+#: ../libgaim/protocols/msn/userlist.c:106
+#: ../libgaim/protocols/yahoo/yahoo.c:1004
 msgid "Deny"
 msgstr "Refuser"
 
-#: ../src/protocols/msn/userlist.c:280
+#: ../libgaim/protocols/msn/userlist.c:280
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "L'utilisateur %s vous à ajouté à sa liste de contacts."
 
-#: ../src/protocols/msn/userlist.c:349
+#: ../libgaim/protocols/msn/userlist.c:349
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "L'utilisateur %s vous à enlevé de sa liste de contacts."
 
-#: ../src/protocols/msn/userlist.c:671
+#: ../libgaim/protocols/msn/userlist.c:671
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Impossible d'ajouter « %s »"
 
-#: ../src/protocols/msn/userlist.c:673
+#: ../libgaim/protocols/msn/userlist.c:673
 msgid "The screen name specified is invalid."
 msgstr "Le nom d'utilisateur fourni est non valide."
 
-#: ../src/protocols/novell/nmuser.c:1868
+#: ../libgaim/protocols/novell/nmuser.c:1869
 msgid "Required parameters not passed in"
 msgstr "Les paramètres nécessaires n'ont pas été passés"
 
-#: ../src/protocols/novell/nmuser.c:1871
+#: ../libgaim/protocols/novell/nmuser.c:1872
 msgid "Unable to write to network"
 msgstr "Impossible d'écrire sur le réseau"
 
-#: ../src/protocols/novell/nmuser.c:1874
+#: ../libgaim/protocols/novell/nmuser.c:1875
 msgid "Unable to read from network"
 msgstr "Impossible de lire depuis le réseau"
 
-#: ../src/protocols/novell/nmuser.c:1877
+#: ../libgaim/protocols/novell/nmuser.c:1878
 msgid "Error communicating with server"
 msgstr "Erreur de communication avec le serveur"
 
-#: ../src/protocols/novell/nmuser.c:1881
+#: ../libgaim/protocols/novell/nmuser.c:1882
 msgid "Conference not found"
 msgstr "Conférence non trouvée"
 
-#: ../src/protocols/novell/nmuser.c:1884
+#: ../libgaim/protocols/novell/nmuser.c:1885
 msgid "Conference does not exist"
 msgstr "Cette conférence n'existe pas"
 
-#: ../src/protocols/novell/nmuser.c:1888
+#: ../libgaim/protocols/novell/nmuser.c:1889
 msgid "A folder with that name already exists"
 msgstr "Un dossier avec ce nom existe déjà"
 
-#: ../src/protocols/novell/nmuser.c:1891
+#: ../libgaim/protocols/novell/nmuser.c:1892
 msgid "Not supported"
 msgstr "Non supporté"
 
-#: ../src/protocols/novell/nmuser.c:1895
+#: ../libgaim/protocols/novell/nmuser.c:1896
 msgid "Password has expired"
 msgstr "Le mot de passe a expiré"
 
-#: ../src/protocols/novell/nmuser.c:1898
+#: ../libgaim/protocols/novell/nmuser.c:1899
 msgid "Invalid password"
 msgstr "Mot de passe non valide"
 
-#: ../src/protocols/novell/nmuser.c:1901
+#: ../libgaim/protocols/novell/nmuser.c:1902
 msgid "User not found"
 msgstr "Utilisateur non trouvé"
 
-#: ../src/protocols/novell/nmuser.c:1904
+#: ../libgaim/protocols/novell/nmuser.c:1905
 msgid "Account has been disabled"
 msgstr "Le compté a été désactivé"
 
-#: ../src/protocols/novell/nmuser.c:1907
+#: ../libgaim/protocols/novell/nmuser.c:1908
 msgid "The server could not access the directory"
 msgstr "Le serveur ne peut pas accéder à l'annuaire"
 
-#: ../src/protocols/novell/nmuser.c:1910
+#: ../libgaim/protocols/novell/nmuser.c:1911
 msgid "Your system administrator has disabled this operation"
 msgstr "Votre administrateur a désactivé cette commande"
 
-#: ../src/protocols/novell/nmuser.c:1913
+#: ../libgaim/protocols/novell/nmuser.c:1914
 msgid "The server is unavailable; try again later"
 msgstr "Le serveur est non disponible. Veuillez réessayer plus tard."
 
-#: ../src/protocols/novell/nmuser.c:1916
+#: ../libgaim/protocols/novell/nmuser.c:1917
 msgid "Cannot add a contact to the same folder twice"
 msgstr "Impossible d'ajouter un contact deux fois dans le mĂŞme dossier"
 
-#: ../src/protocols/novell/nmuser.c:1919
+#: ../libgaim/protocols/novell/nmuser.c:1920
 msgid "Cannot add yourself"
 msgstr "Impossible de s'ajouter en tant que contact"
 
-#: ../src/protocols/novell/nmuser.c:1922
+#: ../libgaim/protocols/novell/nmuser.c:1923
 msgid "Master archive is misconfigured"
 msgstr "L'archive principale est mal configurée"
 
-#: ../src/protocols/novell/nmuser.c:1926
+#: ../libgaim/protocols/novell/nmuser.c:1927
 msgid "Invalid username or password"
 msgstr "Nom d'utilisateur ou mot de passe non valide"
 
-#: ../src/protocols/novell/nmuser.c:1929
+#: ../libgaim/protocols/novell/nmuser.c:1930
 msgid "Could not recognize the host of the username you entered"
 msgstr "Impossible de reconnaître le nom d'hôte ou d'utilisateur saisi"
 
-#: ../src/protocols/novell/nmuser.c:1932
+#: ../libgaim/protocols/novell/nmuser.c:1933
 msgid ""
 "Your account has been disabled because too many invalid passwords were "
 "entered"
@@ -8529,31 +9488,31 @@
 "Votre compte a été désactivé à cause d'un trop grand nombre de mots de passe "
 "saisis incorrects."
 
-#: ../src/protocols/novell/nmuser.c:1935
+#: ../libgaim/protocols/novell/nmuser.c:1936
 msgid "You cannot add the same person twice to a conversation"
 msgstr "Impossible d'ajouter deux fois la mĂŞme personne dans une conversation"
 
-#: ../src/protocols/novell/nmuser.c:1939
+#: ../libgaim/protocols/novell/nmuser.c:1940
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "Nombre maximum de contacts dans la liste atteint"
 
-#: ../src/protocols/novell/nmuser.c:1942
+#: ../libgaim/protocols/novell/nmuser.c:1943
 msgid "You have entered an invalid username"
 msgstr "Nom d'utilisateur saisi non valide"
 
-#: ../src/protocols/novell/nmuser.c:1945
+#: ../libgaim/protocols/novell/nmuser.c:1946
 msgid "An error occurred while updating the directory"
 msgstr "Erreur lors de la mise Ă  jour de l'annuaire"
 
-#: ../src/protocols/novell/nmuser.c:1948
+#: ../libgaim/protocols/novell/nmuser.c:1949
 msgid "Incompatible protocol version"
 msgstr "Version du protocole incompatible"
 
-#: ../src/protocols/novell/nmuser.c:1951
+#: ../libgaim/protocols/novell/nmuser.c:1952
 msgid "The user has blocked you"
 msgstr "L'utilisateur vous a bloqué"
 
-#: ../src/protocols/novell/nmuser.c:1954
+#: ../libgaim/protocols/novell/nmuser.c:1955
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
@@ -8561,56 +9520,57 @@
 "Cette version d'évaluation n'autorise pas plus de dix utilisateurs connectés "
 "Ă  un instant."
 
-#: ../src/protocols/novell/nmuser.c:1957
+#: ../libgaim/protocols/novell/nmuser.c:1958
 msgid "The user is either offline or you are blocked"
 msgstr "L'utilisateur est déconnecté ou vous bloque"
 
-#: ../src/protocols/novell/nmuser.c:1960
+#: ../libgaim/protocols/novell/nmuser.c:1961
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Erreur inconnue :0x%X"
 
-#: ../src/protocols/novell/novell.c:124
+#: ../libgaim/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr "Échec à la connexion (%s)"
 
-#: ../src/protocols/novell/novell.c:247
+#: ../libgaim/protocols/novell/novell.c:247
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
 "Impossible d'envoyer le message. Impossible de récupérer des informations "
 "sur l'utilisateur (%s)."
 
-#: ../src/protocols/novell/novell.c:396
+#: ../libgaim/protocols/novell/novell.c:396
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "Impossible d'ajouter %s Ă  la liste de contacts (%s)"
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../src/protocols/novell/novell.c:422
+#: ../libgaim/protocols/novell/novell.c:422
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Impossible d'envoyer le message (%s)"
 
-#: ../src/protocols/novell/novell.c:493 ../src/protocols/novell/novell.c:985
+#: ../libgaim/protocols/novell/novell.c:493
+#: ../libgaim/protocols/novell/novell.c:985
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Impossible d'inviter l'utilisateur (%s)"
 
-#: ../src/protocols/novell/novell.c:532
+#: ../libgaim/protocols/novell/novell.c:532
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
 "Impossible d'envoyer le message à %s. Impossible de créer la conférence (%s)"
 
-#: ../src/protocols/novell/novell.c:537
+#: ../libgaim/protocols/novell/novell.c:537
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr ""
 "Impossible d'envoyer le message. Impossible de créer la conférence (%s)"
 
-#: ../src/protocols/novell/novell.c:584
+#: ../libgaim/protocols/novell/novell.c:584
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -8619,7 +9579,7 @@
 "Impossible de déplacer l'utilisateur %s vers le dossier %s sur la liste du "
 "serveur. Erreur lors de la création du dossier (%s)"
 
-#: ../src/protocols/novell/novell.c:632
+#: ../libgaim/protocols/novell/novell.c:632
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -8628,58 +9588,61 @@
 "Impossible d'ajouter %s à la liste de contacts. Erreur lors de la création "
 "du dossier sur la liste du serveur (%s)."
 
-#: ../src/protocols/novell/novell.c:705
+#: ../libgaim/protocols/novell/novell.c:705
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Impossible de récupérer des informations sur l'utilisateur %s (%s)"
 
-#: ../src/protocols/novell/novell.c:751 ../src/protocols/novell/novell.c:897
+#: ../libgaim/protocols/novell/novell.c:751
+#: ../libgaim/protocols/novell/novell.c:897
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Impossible d'ajouter l'utilisateur Ă  la liste de filtre (%s)"
 
-#: ../src/protocols/novell/novell.c:798
+#: ../libgaim/protocols/novell/novell.c:798
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "Impossible d'ajouter %s Ă  la liste d'interdiction (%s)"
 
-#: ../src/protocols/novell/novell.c:851
+#: ../libgaim/protocols/novell/novell.c:851
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "Impossible d'ajouter %s Ă  la liste d'autorisation (%s)"
 
-#: ../src/protocols/novell/novell.c:919
+#: ../libgaim/protocols/novell/novell.c:919
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Impossible de supprimer %s de la liste de filtre (%s)"
 
-#: ../src/protocols/novell/novell.c:942 ../src/protocols/novell/novell.c:1652
+#: ../libgaim/protocols/novell/novell.c:942
+#: ../libgaim/protocols/novell/novell.c:1652
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Impossible de changer la configuration du filtre sur le serveur (%s)"
 
-#: ../src/protocols/novell/novell.c:1012
+#: ../libgaim/protocols/novell/novell.c:1012
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Impossible de créer la conférence (%s)"
 
-#: ../src/protocols/novell/novell.c:1121 ../src/protocols/novell/novell.c:1691
+#: ../libgaim/protocols/novell/novell.c:1121
+#: ../libgaim/protocols/novell/novell.c:1697
 msgid "Error communicating with server. Closing connection."
 msgstr "Erreur de communication avec le serveur. Fermeture de la connexion."
 
-#: ../src/protocols/novell/novell.c:1476
+#: ../libgaim/protocols/novell/novell.c:1476
 msgid "Telephone Number"
 msgstr "Téléphone"
 
-#: ../src/protocols/novell/novell.c:1482
+#: ../libgaim/protocols/novell/novell.c:1482
 msgid "Personal Title"
 msgstr "Titre"
 
-#: ../src/protocols/novell/novell.c:1486
+#: ../libgaim/protocols/novell/novell.c:1486
 msgid "Mailstop"
 msgstr "Boîte aux lettres"
 
-#: ../src/protocols/novell/novell.c:1504
+#: ../libgaim/protocols/novell/novell.c:1504
 msgid "User ID"
 msgstr "ID Utilisateur"
 
@@ -8690,41 +9653,41 @@
 #. tag, value);
 #. }
 #.
-#: ../src/protocols/novell/novell.c:1518
+#: ../libgaim/protocols/novell/novell.c:1518
 msgid "Full name"
 msgstr "Nom complet"
 
-#: ../src/protocols/novell/novell.c:1642
+#: ../libgaim/protocols/novell/novell.c:1642
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Conférence GroupWise %d"
 
-#: ../src/protocols/novell/novell.c:1667
+#: ../libgaim/protocols/novell/novell.c:1673
 msgid "Unable to make SSL connection to server."
 msgstr "Impossible de créer une connexion SSL vers le serveur"
 
-#: ../src/protocols/novell/novell.c:1724
+#: ../libgaim/protocols/novell/novell.c:1725
 msgid "Authenticating..."
 msgstr "Authentification en cours..."
 
-#: ../src/protocols/novell/novell.c:1736
+#: ../libgaim/protocols/novell/novell.c:1737
 msgid "Unable to connect to server."
 msgstr "Impossible de se connecter au serveur"
 
-#: ../src/protocols/novell/novell.c:1739
+#: ../libgaim/protocols/novell/novell.c:1740
 msgid "Waiting for response..."
 msgstr "En attente de réponse..."
 
-#: ../src/protocols/novell/novell.c:1874
+#: ../libgaim/protocols/novell/novell.c:1875
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s a reçu une invitation pour cette conversation."
 
-#: ../src/protocols/novell/novell.c:1902
+#: ../libgaim/protocols/novell/novell.c:1903
 msgid "Invitation to Conversation"
 msgstr "Invitation Ă  la conversation"
 
-#: ../src/protocols/novell/novell.c:1903
+#: ../libgaim/protocols/novell/novell.c:1904
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8735,17 +9698,18 @@
 "\n"
 "Envoyé : %s"
 
-#: ../src/protocols/novell/novell.c:1905
+#: ../libgaim/protocols/novell/novell.c:1906
 msgid "Would you like to join the conversation?"
 msgstr "Voulez-vous joindre la conversation ?"
 
-#: ../src/protocols/novell/novell.c:2012
+#. we don't want to reconnect in this case
+#: ../libgaim/protocols/novell/novell.c:2015
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 "Vous venez d'être déconnecté à la suite d'une connexion depuis un autre "
 "endroit."
 
-#: ../src/protocols/novell/novell.c:2068
+#: ../libgaim/protocols/novell/novell.c:2072
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -8755,7 +9719,7 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../src/protocols/novell/novell.c:2166
+#: ../libgaim/protocols/novell/novell.c:2170
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -8763,11 +9727,11 @@
 "Impossible de se connecter au serveur. Veuillez entrer l'adresse du serveur "
 "sur lequel vous voulez vous connecter."
 
-#: ../src/protocols/novell/novell.c:2188
+#: ../libgaim/protocols/novell/novell.c:2198
 msgid "Error. SSL support is not installed."
 msgstr "Support SSL non installé"
 
-#: ../src/protocols/novell/novell.c:2497
+#: ../libgaim/protocols/novell/novell.c:2507
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Cette conférence est fermée. Aucun message ne peut être envoyé."
 
@@ -8781,155 +9745,184 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/novell/novell.c:3541 ../src/protocols/novell/novell.c:3543
+#: ../libgaim/protocols/novell/novell.c:3552
+#: ../libgaim/protocols/novell/novell.c:3554
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Plugin pour le protocole Novell GroupWise"
 
-#: ../src/protocols/novell/novell.c:3562
+#: ../libgaim/protocols/novell/novell.c:3573
 msgid "Server address"
 msgstr "HĂ´te du serveur"
 
-#: ../src/protocols/novell/novell.c:3566
+#: ../libgaim/protocols/novell/novell.c:3577
 msgid "Server port"
 msgstr "Port du serveur"
 
-#: ../src/protocols/oscar/flap_connection.c:221
+#: ../libgaim/protocols/oscar/flap_connection.c:237
+#: ../libgaim/protocols/yahoo/yahoo.c:2268
+#: ../libgaim/protocols/yahoo/yahoo.c:2426
+#: ../libgaim/protocols/yahoo/ycht.c:481 ../libgaim/proxy.c:570
+#: ../libgaim/proxy.c:1078 ../libgaim/proxy.c:1189 ../libgaim/proxy.c:1289
+#: ../libgaim/proxy.c:1417
 msgid "Server closed the connection."
 msgstr "Le serveur a fermé la connexion."
 
-#: ../src/protocols/oscar/flap_connection.c:223
-msgid "Lost connection with server for an unknown reason."
-msgstr "Connexion perdue avec le serveur pour une raison inconnue."
-
-#: ../src/protocols/oscar/flap_connection.c:225
+#: ../libgaim/protocols/oscar/flap_connection.c:239
+#: ../libgaim/protocols/yahoo/yahoo.c:2262
+#: ../libgaim/protocols/yahoo/yahoo.c:2420 ../libgaim/proxy.c:582
+#: ../libgaim/proxy.c:1090 ../libgaim/proxy.c:1201 ../libgaim/proxy.c:1301
+#: ../libgaim/proxy.c:1429
+#, c-format
+msgid ""
+"Lost connection with server:\n"
+"%s"
+msgstr ""
+"Connexion perdue avec le serveur :\n"
+"%s"
+
+#: ../libgaim/protocols/oscar/flap_connection.c:242 ../libgaim/proxy.c:1107
+#: ../libgaim/proxy.c:1214 ../libgaim/proxy.c:1313 ../libgaim/proxy.c:1385
+#: ../libgaim/proxy.c:1442
 msgid "Received invalid data on connection with server."
 msgstr "Données non valides reçues sur la connexion du serveur."
 
-#: ../src/protocols/oscar/flap_connection.c:227
-msgid "Could not establish a connection with the server."
-msgstr "Impossible de se connecter au serveur."
-
-#: ../src/protocols/oscar/odc.c:40
+#: ../libgaim/protocols/oscar/flap_connection.c:244
+#, c-format
+msgid ""
+"Could not establish a connection with the server:\n"
+"%s"
+msgstr ""
+"Impossible de se connecter au serveur :\n"
+"%s"
+
+#: ../libgaim/protocols/oscar/odc.c:40
 msgid "The remote user has closed the connection."
 msgstr "L'interlocuteur a fermé la connexion."
 
-#: ../src/protocols/oscar/odc.c:42
+#: ../libgaim/protocols/oscar/odc.c:42
 msgid "The remote user has declined your request."
-msgstr "L'interlocuteur a refusé votre requête."
-
-#: ../src/protocols/oscar/odc.c:44
-msgid "Lost connection with the remote user for an unknown reason."
-msgstr "Connexion perdue avec l'interlocuteur pour une raison inconnue."
-
-#: ../src/protocols/oscar/odc.c:46
+msgstr "L'interlocuteur a refusé votre demande."
+
+#: ../libgaim/protocols/oscar/odc.c:44
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr "Connexion perdue avec l'interlocuteur :<br>%s"
+
+#: ../libgaim/protocols/oscar/odc.c:47
 msgid "Received invalid data on connection with remote user."
 msgstr "Données non valides reçues sur la connexion avec l'interlocuteur."
 
-#: ../src/protocols/oscar/odc.c:48
+#: ../libgaim/protocols/oscar/odc.c:49
 msgid "Could not establish a connection with the remote user."
 msgstr "Impossible de se connecter Ă  l'interlocuteur."
 
-#: ../src/protocols/oscar/odc.c:557
+#: ../libgaim/protocols/oscar/odc.c:561
 msgid "Direct IM established"
 msgstr "Connexion directe Ă©tablie."
 
-#: ../src/protocols/oscar/oscar.c:144
+#: ../libgaim/protocols/oscar/oft.c:457
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr ""
+"Le fichier %s fait %s, ce qui est plus gros que la taille maximale de %s."
+
+#: ../libgaim/protocols/oscar/oscar.c:119
 msgid "Invalid error"
 msgstr "Erreur non valide"
 
-#: ../src/protocols/oscar/oscar.c:145
+#: ../libgaim/protocols/oscar/oscar.c:120
 msgid "Invalid SNAC"
 msgstr "SNAC non valide"
 
-#: ../src/protocols/oscar/oscar.c:146
+#: ../libgaim/protocols/oscar/oscar.c:121
 msgid "Rate to host"
 msgstr "Fréquence vers l'hôte"
 
-#: ../src/protocols/oscar/oscar.c:147
+#: ../libgaim/protocols/oscar/oscar.c:122
 msgid "Rate to client"
 msgstr "Fréquence vers le client"
 
-#: ../src/protocols/oscar/oscar.c:149
+#: ../libgaim/protocols/oscar/oscar.c:124
 msgid "Service unavailable"
 msgstr "Service non disponible"
 
-#: ../src/protocols/oscar/oscar.c:150
+#: ../libgaim/protocols/oscar/oscar.c:125
 msgid "Service not defined"
 msgstr "Service non défini"
 
-#: ../src/protocols/oscar/oscar.c:151
+#: ../libgaim/protocols/oscar/oscar.c:126
 msgid "Obsolete SNAC"
 msgstr "SNAC obsolète"
 
-#: ../src/protocols/oscar/oscar.c:152
+#: ../libgaim/protocols/oscar/oscar.c:127
 msgid "Not supported by host"
 msgstr "Non supporté par l'hôte"
 
-#: ../src/protocols/oscar/oscar.c:153
+#: ../libgaim/protocols/oscar/oscar.c:128
 msgid "Not supported by client"
 msgstr "Non supporté par le client"
 
-#: ../src/protocols/oscar/oscar.c:154
+#: ../libgaim/protocols/oscar/oscar.c:129
 msgid "Refused by client"
 msgstr "Refusé par le client"
 
-#: ../src/protocols/oscar/oscar.c:155
+#: ../libgaim/protocols/oscar/oscar.c:130
 msgid "Reply too big"
 msgstr "RĂ©ponse trop grosse"
 
-#: ../src/protocols/oscar/oscar.c:156
+#: ../libgaim/protocols/oscar/oscar.c:131
 msgid "Responses lost"
 msgstr "RĂ©ponses perdues"
 
-#: ../src/protocols/oscar/oscar.c:157
+#: ../libgaim/protocols/oscar/oscar.c:132
 msgid "Request denied"
 msgstr "Requête refusée"
 
-#: ../src/protocols/oscar/oscar.c:158
+#: ../libgaim/protocols/oscar/oscar.c:133
 msgid "Busted SNAC payload"
 msgstr "Charge SNAC incorrecte"
 
-#: ../src/protocols/oscar/oscar.c:159
+#: ../libgaim/protocols/oscar/oscar.c:134
 msgid "Insufficient rights"
 msgstr "Droits insuffisants"
 
-#: ../src/protocols/oscar/oscar.c:160
+#: ../libgaim/protocols/oscar/oscar.c:135
 msgid "In local permit/deny"
 msgstr "Dans l'autorisation/interdiction locale"
 
-#: ../src/protocols/oscar/oscar.c:161
+#: ../libgaim/protocols/oscar/oscar.c:136
 msgid "Too evil (sender)"
 msgstr "Trop méchant (envoyeur)"
 
-#: ../src/protocols/oscar/oscar.c:162
+#: ../libgaim/protocols/oscar/oscar.c:137
 msgid "Too evil (receiver)"
 msgstr "Trop méchant (destinataire)"
 
-#: ../src/protocols/oscar/oscar.c:163
+#: ../libgaim/protocols/oscar/oscar.c:138
 msgid "User temporarily unavailable"
 msgstr "L'utilisateur est temporairement indisponible."
 
-#: ../src/protocols/oscar/oscar.c:164
+#: ../libgaim/protocols/oscar/oscar.c:139
 msgid "No match"
 msgstr "Aucun résultat"
 
-#: ../src/protocols/oscar/oscar.c:165
+#: ../libgaim/protocols/oscar/oscar.c:140
 msgid "List overflow"
 msgstr "DĂ©passement de liste"
 
-#: ../src/protocols/oscar/oscar.c:166
+#: ../libgaim/protocols/oscar/oscar.c:141
 msgid "Request ambiguous"
 msgstr "Requête ambiguë"
 
-#: ../src/protocols/oscar/oscar.c:167
+#: ../libgaim/protocols/oscar/oscar.c:142
 msgid "Queue full"
 msgstr "File d'attente pleine"
 
-#: ../src/protocols/oscar/oscar.c:168
+#: ../libgaim/protocols/oscar/oscar.c:143
 msgid "Not while on AOL"
 msgstr "Impossible sur AOL"
 
-#: ../src/protocols/oscar/oscar.c:346
+#: ../libgaim/protocols/oscar/oscar.c:321
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
 "is probably using a different encoding than expected.  If you know what "
@@ -8941,7 +9934,7 @@
 "utilise, vous pouvez le renseigner dans les options avancées de votre compte "
 "AIM/ICQ.)"
 
-#: ../src/protocols/oscar/oscar.c:449
+#: ../libgaim/protocols/oscar/oscar.c:424
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
@@ -8949,141 +9942,156 @@
 "(Une erreur s'est produite à la réception de ce message. Votre interlocuteur "
 "utilise probablement un client défectueux.)"
 
-#: ../src/protocols/oscar/oscar.c:628
+#: ../libgaim/protocols/oscar/oscar.c:603
 msgid "Voice"
 msgstr "Voix"
 
-#: ../src/protocols/oscar/oscar.c:631
+#: ../libgaim/protocols/oscar/oscar.c:606
 msgid "AIM Direct IM"
 msgstr "Connexion directe AIM"
 
-#: ../src/protocols/oscar/oscar.c:634 ../src/protocols/silc/silc.c:699
-#: ../src/protocols/silc/util.c:524
+#: ../libgaim/protocols/oscar/oscar.c:609 ../libgaim/protocols/silc/silc.c:697
+#: ../libgaim/protocols/silc/util.c:551
 msgid "Chat"
 msgstr "Discussion"
 
-#: ../src/protocols/oscar/oscar.c:637 ../src/protocols/oscar/oscar.c:5858
+#: ../libgaim/protocols/oscar/oscar.c:612
+#: ../libgaim/protocols/oscar/oscar.c:5852
 msgid "Get File"
 msgstr "Recevoir un fichier"
 
-#: ../src/protocols/oscar/oscar.c:644
+#: ../libgaim/protocols/oscar/oscar.c:619
 msgid "Games"
 msgstr "Jeux"
 
-#: ../src/protocols/oscar/oscar.c:647
+#: ../libgaim/protocols/oscar/oscar.c:622
 msgid "Add-Ins"
 msgstr "Modules"
 
-#: ../src/protocols/oscar/oscar.c:650
+#: ../libgaim/protocols/oscar/oscar.c:625
 msgid "Send Buddy List"
 msgstr "Envoyer sa liste de contacts"
 
-#: ../src/protocols/oscar/oscar.c:653
+#: ../libgaim/protocols/oscar/oscar.c:628
 msgid "ICQ Direct Connect"
 msgstr "Connexion directe ICQ"
 
-#: ../src/protocols/oscar/oscar.c:656
+#: ../libgaim/protocols/oscar/oscar.c:631
 msgid "AP User"
 msgstr "Utilisateur AP"
 
-#: ../src/protocols/oscar/oscar.c:659
+#: ../libgaim/protocols/oscar/oscar.c:634
 msgid "ICQ RTF"
 msgstr "RTF ICQ"
 
-#: ../src/protocols/oscar/oscar.c:662
+#: ../libgaim/protocols/oscar/oscar.c:637
 msgid "Nihilist"
 msgstr "Nihiliste"
 
-#: ../src/protocols/oscar/oscar.c:665
+#: ../libgaim/protocols/oscar/oscar.c:640
 msgid "ICQ Server Relay"
 msgstr "Relais de serveur ICQ"
 
-#: ../src/protocols/oscar/oscar.c:668
+#: ../libgaim/protocols/oscar/oscar.c:643
 msgid "Old ICQ UTF8"
 msgstr "Ancien ICQ UTF8"
 
-#: ../src/protocols/oscar/oscar.c:671
+#: ../libgaim/protocols/oscar/oscar.c:646
 msgid "Trillian Encryption"
 msgstr "Chiffrement Trillian"
 
-#: ../src/protocols/oscar/oscar.c:674
+#: ../libgaim/protocols/oscar/oscar.c:649
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../src/protocols/oscar/oscar.c:677
+#: ../libgaim/protocols/oscar/oscar.c:652
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../src/protocols/oscar/oscar.c:680
+#: ../libgaim/protocols/oscar/oscar.c:655
 msgid "Security Enabled"
 msgstr "Sécurité activée"
 
-#: ../src/protocols/oscar/oscar.c:683
+#: ../libgaim/protocols/oscar/oscar.c:658
 msgid "Video Chat"
 msgstr "Visioconférence"
 
-#: ../src/protocols/oscar/oscar.c:687
+#: ../libgaim/protocols/oscar/oscar.c:662
 msgid "iChat AV"
 msgstr "Vidéo iChat"
 
-#: ../src/protocols/oscar/oscar.c:690
+#: ../libgaim/protocols/oscar/oscar.c:665
 msgid "Live Video"
 msgstr "Live Video"
 
-#: ../src/protocols/oscar/oscar.c:693
+#: ../libgaim/protocols/oscar/oscar.c:668
 msgid "Camera"
 msgstr "Caméra"
 
-#: ../src/protocols/oscar/oscar.c:711 ../src/protocols/oscar/oscar.c:5643
+#: ../libgaim/protocols/oscar/oscar.c:686
+#: ../libgaim/protocols/oscar/oscar.c:5629
 msgid "Free For Chat"
 msgstr "Libre pour discuter"
 
-#: ../src/protocols/oscar/oscar.c:715 ../src/protocols/oscar/oscar.c:5671
+#: ../libgaim/protocols/oscar/oscar.c:690
+#: ../libgaim/protocols/oscar/oscar.c:5661
 msgid "Not Available"
 msgstr "Non disponible"
 
-#: ../src/protocols/oscar/oscar.c:717 ../src/protocols/oscar/oscar.c:5661
+#: ../libgaim/protocols/oscar/oscar.c:692
+#: ../libgaim/protocols/oscar/oscar.c:5647
 msgid "Occupied"
 msgstr "Occupé"
 
-#: ../src/protocols/oscar/oscar.c:721
+#: ../libgaim/protocols/oscar/oscar.c:696
 msgid "Web Aware"
 msgstr "Sur internet"
 
-#: ../src/protocols/oscar/oscar.c:725
+#: ../libgaim/protocols/oscar/oscar.c:700
 msgid "Online"
 msgstr "En ligne"
 
-#: ../src/protocols/oscar/oscar.c:811 ../src/protocols/oscar/oscar.c:2829
+#: ../libgaim/protocols/oscar/oscar.c:786
+#: ../libgaim/protocols/oscar/oscar.c:2804
 msgid "Warning Level"
 msgstr "Niveau d'avertissement"
 
-#: ../src/protocols/oscar/oscar.c:820
+#: ../libgaim/protocols/oscar/oscar.c:795
 msgid "Buddy Comment"
 msgstr "Commentaire"
 
-#: ../src/protocols/oscar/oscar.c:975
-msgid "Could not connect to authentication server"
-msgstr "Impossible de se connecter au serveur d'authentification"
-
-#: ../src/protocols/oscar/oscar.c:977
-msgid "Could not connect to BOS server"
-msgstr "Impossible de se connecter au serveur BOS"
-
-#: ../src/protocols/oscar/oscar.c:1007
+#: ../libgaim/protocols/oscar/oscar.c:931
+#, c-format
+msgid ""
+"Could not connect to authentication server:\n"
+"%s"
+msgstr ""
+"Impossible de se connecter au serveur d'authentification :\n"
+"%s"
+
+#: ../libgaim/protocols/oscar/oscar.c:939
+#, c-format
+msgid ""
+"Could not connect to BOS server:\n"
+"%s"
+msgstr ""
+"Impossible de se connecter au serveur BOS :\n"
+"%s"
+
+#: ../libgaim/protocols/oscar/oscar.c:979
 msgid "Screen name sent"
 msgstr "Pseudo envoyé"
 
-#: ../src/protocols/oscar/oscar.c:1012
+#: ../libgaim/protocols/oscar/oscar.c:984
 msgid "Connection established, cookie sent"
 msgstr "Connexion établie, cookie envoyé"
 
 #. TODO: Don't call this with ssi
-#: ../src/protocols/oscar/oscar.c:1043
+#: ../libgaim/protocols/oscar/oscar.c:1013
 msgid "Finalizing connection"
 msgstr "Finalisation de la connexion"
 
-#: ../src/protocols/oscar/oscar.c:1227
+#: ../libgaim/protocols/oscar/oscar.c:1197
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -9094,20 +10102,25 @@
 "pseudos doivent soit commencer par une lettre et contenir uniquement des "
 "lettres, des chiffres et des espaces, soit contenir uniquement des chiffres."
 
-#: ../src/protocols/oscar/oscar.c:1317 ../src/protocols/toc/toc.c:543
-msgid "Incorrect nickname or password."
-msgstr "Pseudonyme ou mot de passe incorrect."
-
-#: ../src/protocols/oscar/oscar.c:1322
+#: ../libgaim/protocols/oscar/oscar.c:1282
+msgid "Invalid screen name."
+msgstr "Nom d'utilisateur non valide."
+
+#: ../libgaim/protocols/oscar/oscar.c:1287
+#: ../libgaim/protocols/yahoo/yahoo.c:1928
+msgid "Incorrect password."
+msgstr "Mot de passe incorrect."
+
+#: ../libgaim/protocols/oscar/oscar.c:1292
 msgid "Your account is currently suspended."
 msgstr "Votre compte est actuellement suspendu."
 
 #. service temporarily unavailable
-#: ../src/protocols/oscar/oscar.c:1326
+#: ../libgaim/protocols/oscar/oscar.c:1296
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Le service est temporairement indisponible."
 
-#: ../src/protocols/oscar/oscar.c:1331
+#: ../libgaim/protocols/oscar/oscar.c:1301
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -9116,34 +10129,35 @@
 "réessayez. Si vous persistez maintenant, il vous faudra attendre encore plus "
 "longtemps."
 
-#: ../src/protocols/oscar/oscar.c:1336
+#: ../libgaim/protocols/oscar/oscar.c:1306
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "La version du client que vous utilisez est trop ancienne. Veuillez la mettre "
-"Ă  jour sur %s"
-
-#: ../src/protocols/oscar/oscar.c:1372
+"Ă  jour sur %s."
+
+#: ../libgaim/protocols/oscar/oscar.c:1341
 msgid "Could Not Connect"
-msgstr "Impossible de se connecter"
-
-#: ../src/protocols/oscar/oscar.c:1377
+msgstr "Impossible de se connecter."
+
+#: ../libgaim/protocols/oscar/oscar.c:1346
 msgid "Received authorization"
-msgstr "Autorisation reçue"
-
-#: ../src/protocols/oscar/oscar.c:1400
+msgstr "Autorisation reçue."
+
+#: ../libgaim/protocols/oscar/oscar.c:1369
 msgid "The SecurID key entered is invalid."
 msgstr "La clé SecurID saisie est non valide."
 
-#: ../src/protocols/oscar/oscar.c:1414
+#: ../libgaim/protocols/oscar/oscar.c:1383
 msgid "Enter SecurID"
 msgstr "Saisissez votre SecurID"
 
-#: ../src/protocols/oscar/oscar.c:1415
+#: ../libgaim/protocols/oscar/oscar.c:1384
 msgid "Enter the 6 digit number from the digital display."
-msgstr "Saisissez les 6 chiffres de l'affichage numérique"
-
-#: ../src/protocols/oscar/oscar.c:1455 ../src/protocols/oscar/oscar.c:1489
+msgstr "Saisissez les 6 chiffres de l'affichage numérique."
+
+#: ../libgaim/protocols/oscar/oscar.c:1424
+#: ../libgaim/protocols/oscar/oscar.c:1467
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -9152,37 +10166,42 @@
 "Vous risquez être déconnecté sous peu. Essayer d'utiliser TOC en attendant. "
 "Regardez %s pour plus d'informations."
 
-#: ../src/protocols/oscar/oscar.c:1458 ../src/protocols/oscar/oscar.c:1492
+#: ../libgaim/protocols/oscar/oscar.c:1427
+#: ../libgaim/protocols/oscar/oscar.c:1470
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Impossible de récupérer un code de connexion AIM."
 
-#: ../src/protocols/oscar/oscar.c:1578
+#: ../libgaim/protocols/oscar/oscar.c:1556
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr ""
 "Vous risquez être déconnecté sous peu. Consultez %s pour plus d'informations."
 
-#: ../src/protocols/oscar/oscar.c:1581
+#: ../libgaim/protocols/oscar/oscar.c:1559
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Impossible de récupérer un code de connexion valide."
 
-#: ../src/protocols/oscar/oscar.c:1607
+#: ../libgaim/protocols/oscar/oscar.c:1585
 msgid "Password sent"
 msgstr "Mot de passe envoyé"
 
-#: ../src/protocols/oscar/oscar.c:2165
+#: ../libgaim/protocols/oscar/oscar.c:1641
+msgid "gaim_proxy_connect() failed"
+msgstr "L'appel gaim_proxy_connect() a échoué."
+
+#: ../libgaim/protocols/oscar/oscar.c:2139
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Autorise-moi pour que je t'ajoute Ă  ma liste de contacts."
 
-#: ../src/protocols/oscar/oscar.c:2174
+#: ../libgaim/protocols/oscar/oscar.c:2148
 msgid "Authorization Request Message:"
 msgstr "Message pour la demande d'autorisation :"
 
-#: ../src/protocols/oscar/oscar.c:2175
+#: ../libgaim/protocols/oscar/oscar.c:2149
 msgid "Please authorize me!"
 msgstr "Autorise-moi, s'il te plaît !"
 
-#: ../src/protocols/oscar/oscar.c:2207
+#: ../libgaim/protocols/oscar/oscar.c:2181
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -9191,25 +10210,28 @@
 "L'ajout de l'utilisateur %s à votre liste de contacts nécessite une "
 "autorisation. Voulez-vous envoyer une demande d'autorisation ?"
 
-#: ../src/protocols/oscar/oscar.c:2212
+#: ../libgaim/protocols/oscar/oscar.c:2186
 msgid "Request Authorization"
 msgstr "Demande d'autorisation"
 
-#: ../src/protocols/oscar/oscar.c:2214
+#: ../libgaim/protocols/oscar/oscar.c:2188
 msgid "_Request Authorization"
 msgstr "_Demande d'autorisation"
 
-#: ../src/protocols/oscar/oscar.c:2255 ../src/protocols/oscar/oscar.c:2262
-#: ../src/protocols/oscar/oscar.c:2368 ../src/protocols/oscar/oscar.c:2392
-#: ../src/protocols/oscar/oscar.c:5068 ../src/protocols/oscar/oscar.c:5120
+#: ../libgaim/protocols/oscar/oscar.c:2229
+#: ../libgaim/protocols/oscar/oscar.c:2236
+#: ../libgaim/protocols/oscar/oscar.c:2343
+#: ../libgaim/protocols/oscar/oscar.c:2367
+#: ../libgaim/protocols/oscar/oscar.c:5054
+#: ../libgaim/protocols/oscar/oscar.c:5106
 msgid "No reason given."
 msgstr "Pas de raison"
 
-#: ../src/protocols/oscar/oscar.c:2261
+#: ../libgaim/protocols/oscar/oscar.c:2235
 msgid "Authorization Denied Message:"
 msgstr "Message de refus d'autorisation :"
 
-#: ../src/protocols/oscar/oscar.c:2370
+#: ../libgaim/protocols/oscar/oscar.c:2345
 #, c-format
 msgid ""
 "The user %u wants to add %s to their buddy list for the following reason:\n"
@@ -9219,34 +10241,35 @@
 "suivante :\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:2380 ../src/protocols/oscar/oscar.c:5080
+#: ../libgaim/protocols/oscar/oscar.c:2355
+#: ../libgaim/protocols/oscar/oscar.c:5066
 msgid "Authorization Request"
 msgstr "Demande d'autorisation"
 
-#: ../src/protocols/oscar/oscar.c:2392
+#: ../libgaim/protocols/oscar/oscar.c:2367
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
 "following reason:\n"
 "%s"
 msgstr ""
-"L'utilisateur %u a refusé votre requête de s'ajouter à votre liste de "
+"L'utilisateur %u a refusé votre demande de s'ajouter à votre liste de "
 "contacts pour la raison suivante :\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:2393
+#: ../libgaim/protocols/oscar/oscar.c:2368
 msgid "ICQ authorization denied."
 msgstr "Autorisation ICQ refusée"
 
 #. Someone has granted you authorization
-#: ../src/protocols/oscar/oscar.c:2400
+#: ../libgaim/protocols/oscar/oscar.c:2375
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
-"L'utilisateur %u a accepté votre requête de le rajouter à votre liste de "
+"L'utilisateur %u a accepté votre demande de le rajouter à votre liste de "
 "contacts."
 
-#: ../src/protocols/oscar/oscar.c:2408
+#: ../libgaim/protocols/oscar/oscar.c:2383
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -9259,7 +10282,7 @@
 "De : %s [%s]\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:2416
+#: ../libgaim/protocols/oscar/oscar.c:2391
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -9272,7 +10295,7 @@
 "De : %s [%s]\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:2424
+#: ../libgaim/protocols/oscar/oscar.c:2399
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -9285,20 +10308,20 @@
 "Le message est :\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:2445
+#: ../libgaim/protocols/oscar/oscar.c:2420
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "L'utilisateur ICQ %u vous a envoyé un contact : %s (%s)"
 
-#: ../src/protocols/oscar/oscar.c:2451
+#: ../libgaim/protocols/oscar/oscar.c:2426
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Voulez-vous l'ajouter à votre liste de contacts ?"
 
-#: ../src/protocols/oscar/oscar.c:2455
+#: ../libgaim/protocols/oscar/oscar.c:2430
 msgid "_Decline"
 msgstr "_DĂ©cliner"
 
-#: ../src/protocols/oscar/oscar.c:2539
+#: ../libgaim/protocols/oscar/oscar.c:2514
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
@@ -9306,7 +10329,7 @@
 msgstr[1] ""
 "Vous avez raté %hu messages de %s car les messages étaient non valides."
 
-#: ../src/protocols/oscar/oscar.c:2548
+#: ../libgaim/protocols/oscar/oscar.c:2523
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
@@ -9314,7 +10337,7 @@
 msgstr[1] ""
 "Vous avez raté %hu messages de %s car les messages étaient trop gros."
 
-#: ../src/protocols/oscar/oscar.c:2557
+#: ../libgaim/protocols/oscar/oscar.c:2532
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -9324,87 +10347,89 @@
 msgstr[1] ""
 "Vous avez raté %hu messages de %s car le quota limite a été dépassé."
 
-#: ../src/protocols/oscar/oscar.c:2566
+#: ../libgaim/protocols/oscar/oscar.c:2541
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "Vous avez raté %hu message de %s car l'envoyeur est trop méchant."
 msgstr[1] "Vous avez raté %hu messages de %s car l'envoyeur est trop méchant."
 
-#: ../src/protocols/oscar/oscar.c:2575
+#: ../libgaim/protocols/oscar/oscar.c:2550
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "Vous avez raté %hu message de %s car vous êtes trop méchant."
 msgstr[1] "Vous avez raté %hu messages de %s car vous êtes trop méchant."
 
-#: ../src/protocols/oscar/oscar.c:2584
+#: ../libgaim/protocols/oscar/oscar.c:2559
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Vous avez raté %hu message de %s pour des raisons inconnues."
 msgstr[1] "Vous avez raté %hu messages de %s pour des raisons inconnues."
 
-#: ../src/protocols/oscar/oscar.c:2640
+#: ../libgaim/protocols/oscar/oscar.c:2615
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN :</B> %s<BR><B>État :</B> %s<HR>%s"
 
-#: ../src/protocols/oscar/oscar.c:2701
+#: ../libgaim/protocols/oscar/oscar.c:2676
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC a envoyé l'erreur : %s\n"
 
 #. Data is assumed to be the destination sn
-#: ../src/protocols/oscar/oscar.c:2737
+#: ../libgaim/protocols/oscar/oscar.c:2712
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Impossible d'envoyer le message : %s"
 
-#: ../src/protocols/oscar/oscar.c:2737 ../src/protocols/oscar/oscar.c:2742
-#: ../src/protocols/oscar/oscar.c:2804 ../src/protocols/oscar/oscar.c:2808
+#: ../libgaim/protocols/oscar/oscar.c:2712
+#: ../libgaim/protocols/oscar/oscar.c:2717
+#: ../libgaim/protocols/oscar/oscar.c:2779
+#: ../libgaim/protocols/oscar/oscar.c:2783
 msgid "Unknown reason."
 msgstr "Erreur inconnue"
 
-#: ../src/protocols/oscar/oscar.c:2740
-#: ../src/protocols/sametime/sametime.c:2367
+#: ../libgaim/protocols/oscar/oscar.c:2715
+#: ../libgaim/protocols/sametime/sametime.c:2363
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Impossible d'envoyer le message vers %s :"
 
-#: ../src/protocols/oscar/oscar.c:2804
+#: ../libgaim/protocols/oscar/oscar.c:2779
 #, c-format
 msgid "User information not available: %s"
 msgstr "Les informations ne sont pas disponibles : %s"
 
-#: ../src/protocols/oscar/oscar.c:2807
+#: ../libgaim/protocols/oscar/oscar.c:2782
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Les informations de %s ne sont pas disponibles :"
 
-#: ../src/protocols/oscar/oscar.c:2833
+#: ../libgaim/protocols/oscar/oscar.c:2808
 msgid "Online Since"
 msgstr "En ligne depuis"
 
-#: ../src/protocols/oscar/oscar.c:2838
-#: ../src/protocols/yahoo/yahoo_profile.c:1159
+#: ../libgaim/protocols/oscar/oscar.c:2813
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1173
 msgid "Member Since"
 msgstr "Inscrit depuis"
 
-#: ../src/protocols/oscar/oscar.c:2843
+#: ../libgaim/protocols/oscar/oscar.c:2818
 msgid "Capabilities"
 msgstr "Possibilités"
 
-#: ../src/protocols/oscar/oscar.c:2861
+#: ../libgaim/protocols/oscar/oscar.c:2836
 msgid "Available Message"
 msgstr "Message de disponibilité"
 
-#: ../src/protocols/oscar/oscar.c:2958
+#: ../libgaim/protocols/oscar/oscar.c:2936
 msgid "Your AIM connection may be lost."
 msgstr "Votre connexion AIM risque d'être coupée"
 
 #. The conversion failed!
-#: ../src/protocols/oscar/oscar.c:3139
+#: ../libgaim/protocols/oscar/oscar.c:3117
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -9412,11 +10437,11 @@
 "[Impossible d'afficher un message de cet utilisateur car il contient des "
 "caractères non valides.]"
 
-#: ../src/protocols/oscar/oscar.c:3360
+#: ../libgaim/protocols/oscar/oscar.c:3338
 msgid "Rate limiting error."
 msgstr "Erreur de limite de quota"
 
-#: ../src/protocols/oscar/oscar.c:3361
+#: ../libgaim/protocols/oscar/oscar.c:3339
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -9424,81 +10449,84 @@
 "La dernière action n'a pas pu être effectuée car vous avez dépassé le quota "
 "limite. Veuillez attendre 10 secondes et réessayer."
 
-#: ../src/protocols/oscar/oscar.c:3433
+#: ../libgaim/protocols/oscar/oscar.c:3411
 msgid "You have been signed off for an unknown reason."
 msgstr "Vous avez été déconnecté pour une raison inconnue."
 
-#: ../src/protocols/oscar/oscar.c:3446 ../src/protocols/toc/toc.c:971
+#: ../libgaim/protocols/oscar/oscar.c:3424 ../libgaim/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Vous avez été déconnecté du salon %s"
 
-#: ../src/protocols/oscar/oscar.c:3670 ../src/protocols/silc/util.c:556
+#: ../libgaim/protocols/oscar/oscar.c:3645
+#: ../libgaim/protocols/silc/util.c:583
 msgid "Mobile Phone"
 msgstr "Numéro de téléphone portable"
 
-#: ../src/protocols/oscar/oscar.c:3697
+#: ../libgaim/protocols/oscar/oscar.c:3672
 msgid "Personal Web Page"
 msgstr "Page web perso"
 
-#: ../src/protocols/oscar/oscar.c:3701
+#: ../libgaim/protocols/oscar/oscar.c:3676
+#: ../libgaim/protocols/qq/buddy_info.c:38
 msgid "Additional Information"
 msgstr "Informations supplémentaires"
 
-#: ../src/protocols/oscar/oscar.c:3710 ../src/protocols/oscar/oscar.c:3718
+#: ../libgaim/protocols/oscar/oscar.c:3685
+#: ../libgaim/protocols/oscar/oscar.c:3693
 msgid "Zip Code"
 msgstr "Code postal"
 
-#: ../src/protocols/oscar/oscar.c:3722
+#: ../libgaim/protocols/oscar/oscar.c:3697
 msgid "Work Information"
 msgstr "Informations professionnelles"
 
-#: ../src/protocols/oscar/oscar.c:3724
+#: ../libgaim/protocols/oscar/oscar.c:3699
 msgid "Division"
 msgstr "Division"
 
-#: ../src/protocols/oscar/oscar.c:3725
+#: ../libgaim/protocols/oscar/oscar.c:3700
 msgid "Position"
 msgstr "Poste"
 
-#: ../src/protocols/oscar/oscar.c:3727
+#: ../libgaim/protocols/oscar/oscar.c:3702
 msgid "Web Page"
 msgstr "Page web"
 
-#: ../src/protocols/oscar/oscar.c:3785
+#: ../libgaim/protocols/oscar/oscar.c:3760
 msgid "Pop-Up Message"
 msgstr "Message en fenĂŞtre"
 
-#: ../src/protocols/oscar/oscar.c:3825
+#: ../libgaim/protocols/oscar/oscar.c:3800
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "Le pseudonyme suivant est associé a %s"
 msgstr[1] "Les pseudonymes suivants sont associés a %s"
 
-#: ../src/protocols/oscar/oscar.c:3830
+#: ../libgaim/protocols/oscar/oscar.c:3805
 msgid "Screen name"
 msgstr "Nom d'utilisateur"
 
-#: ../src/protocols/oscar/oscar.c:3856
+#: ../libgaim/protocols/oscar/oscar.c:3831
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Aucun résultat pour l'adresse électronique %s"
 
-#: ../src/protocols/oscar/oscar.c:3877
+#: ../libgaim/protocols/oscar/oscar.c:3852
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Vous devriez recevoir un courrier Ă©lectronique pour confirmer %s"
 
-#: ../src/protocols/oscar/oscar.c:3879
+#: ../libgaim/protocols/oscar/oscar.c:3854
 msgid "Account Confirmation Requested"
 msgstr "Confirmation de compte demandée"
 
-#: ../src/protocols/oscar/oscar.c:3910
+#: ../libgaim/protocols/oscar/oscar.c:3885
 msgid "Error Changing Account Info"
 msgstr "Erreur en changeant les informations du compte"
 
-#: ../src/protocols/oscar/oscar.c:3913
+#: ../libgaim/protocols/oscar/oscar.c:3888
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -9507,14 +10535,14 @@
 "Erreur 0x%04x : Impossible d'afficher le pseudo parce que la version "
 "demandée diffère de l'originale."
 
-#: ../src/protocols/oscar/oscar.c:3916
+#: ../libgaim/protocols/oscar/oscar.c:3891
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Erreur 0x%04x : Impossible d'afficher le pseudonyme parce qu'il est non "
 "valide."
 
-#: ../src/protocols/oscar/oscar.c:3919
+#: ../libgaim/protocols/oscar/oscar.c:3894
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -9523,7 +10551,7 @@
 "Erreur 0x%04x : Impossible d'afficher le pseudo parce que la version "
 "demandée est trop longue"
 
-#: ../src/protocols/oscar/oscar.c:3922
+#: ../libgaim/protocols/oscar/oscar.c:3897
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -9532,7 +10560,7 @@
 "Erreur 0x%04x : Impossible de changer l'adresse électronique parce qu'il y a "
 "une requĂŞte en attente pour cet identifiant."
 
-#: ../src/protocols/oscar/oscar.c:3925
+#: ../libgaim/protocols/oscar/oscar.c:3900
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -9541,7 +10569,7 @@
 "Erreur 0x%04x : Impossible de changer l'adresse électronique parce qu'il y a "
 "trop d'identifiants associés à cette adresse."
 
-#: ../src/protocols/oscar/oscar.c:3928
+#: ../libgaim/protocols/oscar/oscar.c:3903
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -9550,12 +10578,12 @@
 "Erreur 0x%04x : Impossible de changer l'adresse électronique parce qu'elle "
 "est non valide."
 
-#: ../src/protocols/oscar/oscar.c:3931
+#: ../libgaim/protocols/oscar/oscar.c:3906
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Erreur 0x%04x : Erreur inconnue."
 
-#: ../src/protocols/oscar/oscar.c:3941
+#: ../libgaim/protocols/oscar/oscar.c:3916
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -9564,27 +10592,28 @@
 "Votre pseudo est actuellement affiché comme cela :\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:3942 ../src/protocols/oscar/oscar.c:3949
+#: ../libgaim/protocols/oscar/oscar.c:3917
+#: ../libgaim/protocols/oscar/oscar.c:3924
 msgid "Account Info"
 msgstr "Infos du compte"
 
-#: ../src/protocols/oscar/oscar.c:3947
+#: ../libgaim/protocols/oscar/oscar.c:3922
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "L'adresse Ă©lectronique de %s est %s"
 
-#: ../src/protocols/oscar/oscar.c:4122
+#: ../libgaim/protocols/oscar/oscar.c:4097
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Votre image instantanée n'a pas été envoyée. Vous devez utiliser une "
 "connexion directe pour envoyer des images."
 
-#: ../src/protocols/oscar/oscar.c:4367
+#: ../libgaim/protocols/oscar/oscar.c:4349
 msgid "Unable to set AIM profile."
 msgstr "Impossible d'envoyer le profil AIM"
 
-#: ../src/protocols/oscar/oscar.c:4368
+#: ../libgaim/protocols/oscar/oscar.c:4350
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -9594,7 +10623,7 @@
 "connexion. Le profil n'a pas été changé. Réessayez une fois la connexion "
 "complète."
 
-#: ../src/protocols/oscar/oscar.c:4382
+#: ../libgaim/protocols/oscar/oscar.c:4364
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -9609,11 +10638,11 @@
 "La taille maximale de %d caractères du profil a été dépassée. Gaim l'a "
 "tronqué lors de la mise à jour."
 
-#: ../src/protocols/oscar/oscar.c:4387
+#: ../libgaim/protocols/oscar/oscar.c:4369
 msgid "Profile too long."
 msgstr "Profil trop long"
 
-#: ../src/protocols/oscar/oscar.c:4430
+#: ../libgaim/protocols/oscar/oscar.c:4413
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -9628,11 +10657,11 @@
 "La taille maximale de %d caractères pour le message d'absence a été "
 "dépassée. Gaim l'a tronqué lors de la mise à jour."
 
-#: ../src/protocols/oscar/oscar.c:4435
+#: ../libgaim/protocols/oscar/oscar.c:4418
 msgid "Away message too long."
 msgstr "Message d'absence trop long"
 
-#: ../src/protocols/oscar/oscar.c:4504
+#: ../libgaim/protocols/oscar/oscar.c:4487
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -9644,16 +10673,17 @@
 "uniquement des lettres, des chiffres et des espaces, soit contenir "
 "uniquement des chiffres."
 
-#: ../src/protocols/oscar/oscar.c:4506 ../src/protocols/oscar/oscar.c:4916
-#: ../src/protocols/oscar/oscar.c:4930
+#: ../libgaim/protocols/oscar/oscar.c:4489
+#: ../libgaim/protocols/oscar/oscar.c:4902
+#: ../libgaim/protocols/oscar/oscar.c:4916
 msgid "Unable To Add"
 msgstr "Impossible d'ajouter"
 
-#: ../src/protocols/oscar/oscar.c:4610
+#: ../libgaim/protocols/oscar/oscar.c:4593
 msgid "Unable To Retrieve Buddy List"
 msgstr "Impossible de récupérer la liste de contacts"
 
-#: ../src/protocols/oscar/oscar.c:4611
+#: ../libgaim/protocols/oscar/oscar.c:4594
 msgid ""
 "Gaim was temporarily unable to retrieve your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
@@ -9662,13 +10692,16 @@
 "Gaim n'a pas pu récupérer la liste de contacts des serveurs AIM. La liste de "
 "contacts n'est pas perdue et sera de nouveau disponible dans quelques temps."
 
-#: ../src/protocols/oscar/oscar.c:4814 ../src/protocols/oscar/oscar.c:4815
-#: ../src/protocols/oscar/oscar.c:4820 ../src/protocols/oscar/oscar.c:4984
-#: ../src/protocols/oscar/oscar.c:4985 ../src/protocols/oscar/oscar.c:4990
+#: ../libgaim/protocols/oscar/oscar.c:4797
+#: ../libgaim/protocols/oscar/oscar.c:4798
+#: ../libgaim/protocols/oscar/oscar.c:4803
+#: ../libgaim/protocols/oscar/oscar.c:4970
+#: ../libgaim/protocols/oscar/oscar.c:4971
+#: ../libgaim/protocols/oscar/oscar.c:4976
 msgid "Orphans"
 msgstr "Orphelins"
 
-#: ../src/protocols/oscar/oscar.c:4914
+#: ../libgaim/protocols/oscar/oscar.c:4900
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9677,11 +10710,12 @@
 "Impossible de rajouter le contact %s parce qu'il y a trop de contacts dans "
 "la liste. Supprimez un contact et réessayez."
 
-#: ../src/protocols/oscar/oscar.c:4914 ../src/protocols/oscar/oscar.c:4928
+#: ../libgaim/protocols/oscar/oscar.c:4900
+#: ../libgaim/protocols/oscar/oscar.c:4914
 msgid "(no name)"
 msgstr "(pas de nom)"
 
-#: ../src/protocols/oscar/oscar.c:4928
+#: ../libgaim/protocols/oscar/oscar.c:4914
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -9692,7 +10726,7 @@
 "plus probable est que le nombre maximum de contact a été atteint dans votre "
 "liste de contacts."
 
-#: ../src/protocols/oscar/oscar.c:5021
+#: ../libgaim/protocols/oscar/oscar.c:5007
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -9701,11 +10735,11 @@
 "L'utilisateur %s vous a autorisé à l'ajouter à votre liste de contacts. "
 "Voulez-vous le faire ?"
 
-#: ../src/protocols/oscar/oscar.c:5027
+#: ../libgaim/protocols/oscar/oscar.c:5013
 msgid "Authorization Given"
 msgstr "Autorisation donnée"
 
-#: ../src/protocols/oscar/oscar.c:5071
+#: ../libgaim/protocols/oscar/oscar.c:5057
 #, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
@@ -9716,19 +10750,19 @@
 "%s"
 
 #. Granted
-#: ../src/protocols/oscar/oscar.c:5116
+#: ../libgaim/protocols/oscar/oscar.c:5102
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "L'utilisateur %s a accepté votre demande de le rajouter à votre liste de "
 "contacts."
 
-#: ../src/protocols/oscar/oscar.c:5117
+#: ../libgaim/protocols/oscar/oscar.c:5103
 msgid "Authorization Granted"
 msgstr "Autorisation accordée"
 
 #. Denied
-#: ../src/protocols/oscar/oscar.c:5120
+#: ../libgaim/protocols/oscar/oscar.c:5106
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9739,43 +10773,43 @@
 "contacts pour la raison suivante :\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:5121
+#: ../libgaim/protocols/oscar/oscar.c:5107
 msgid "Authorization Denied"
 msgstr "Autorisation refusée"
 
-#: ../src/protocols/oscar/oscar.c:5157 ../src/protocols/toc/toc.c:1372
+#: ../libgaim/protocols/oscar/oscar.c:5143 ../libgaim/protocols/toc/toc.c:1378
 msgid "_Exchange:"
 msgstr "_Echange :"
 
-#: ../src/protocols/oscar/oscar.c:5197
+#: ../libgaim/protocols/oscar/oscar.c:5183
 msgid "Invalid chat name specified."
 msgstr "Nom du salon de discussion non valide"
 
-#: ../src/protocols/oscar/oscar.c:5267
+#: ../libgaim/protocols/oscar/oscar.c:5253
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Votre image instantanée n'a pas été envoyée. Vous ne pouvez pas envoyer "
 "d'images dans les discussions AIM."
 
-#: ../src/protocols/oscar/oscar.c:5429
+#: ../libgaim/protocols/oscar/oscar.c:5415
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(en cours de récupération)</i>"
 
-#: ../src/protocols/oscar/oscar.c:5734
+#: ../libgaim/protocols/oscar/oscar.c:5728
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Commentaire pour %s"
 
-#: ../src/protocols/oscar/oscar.c:5735
+#: ../libgaim/protocols/oscar/oscar.c:5729
 msgid "Buddy Comment:"
 msgstr "Commentaire :"
 
-#: ../src/protocols/oscar/oscar.c:5781
+#: ../libgaim/protocols/oscar/oscar.c:5775
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Connexion directe avec %s"
 
-#: ../src/protocols/oscar/oscar.c:5785
+#: ../libgaim/protocols/oscar/oscar.c:5779
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -9783,69 +10817,70 @@
 "Cela révèle votre adresse IP et peut être considéré comme une faille de "
 "sécurité. Voulez-vous continuer ?"
 
-#: ../src/protocols/oscar/oscar.c:5789 ../src/protocols/oscar/peer.c:941
+#: ../libgaim/protocols/oscar/oscar.c:5783
+#: ../libgaim/protocols/oscar/peer.c:990
 msgid "_Connect"
 msgstr "_Connecter"
 
-#: ../src/protocols/oscar/oscar.c:5823
+#: ../libgaim/protocols/oscar/oscar.c:5817
 msgid "Get AIM Info"
 msgstr "Récupérer les infos AIM"
 
-#: ../src/protocols/oscar/oscar.c:5829
+#: ../libgaim/protocols/oscar/oscar.c:5823
 msgid "Edit Buddy Comment"
 msgstr "Éditer le commentaire"
 
-#: ../src/protocols/oscar/oscar.c:5837
+#: ../libgaim/protocols/oscar/oscar.c:5831
 msgid "Get Status Msg"
 msgstr "Obtenir le message d'Ă©tat"
 
-#: ../src/protocols/oscar/oscar.c:5850
+#: ../libgaim/protocols/oscar/oscar.c:5844
 msgid "Direct IM"
 msgstr "Connexion directe"
 
-#: ../src/protocols/oscar/oscar.c:5872
+#: ../libgaim/protocols/oscar/oscar.c:5866
 msgid "Re-request Authorization"
 msgstr "Redemander autorisation"
 
-#: ../src/protocols/oscar/oscar.c:5929
+#: ../libgaim/protocols/oscar/oscar.c:5925
 msgid "Require authorization"
 msgstr "Demande d'autorisation"
 
-#: ../src/protocols/oscar/oscar.c:5932
+#: ../libgaim/protocols/oscar/oscar.c:5928
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Sur le web (activer ceci vous fera recevoir du pourriel !)"
 
-#: ../src/protocols/oscar/oscar.c:5937
+#: ../libgaim/protocols/oscar/oscar.c:5933
 msgid "ICQ Privacy Options"
 msgstr "Options de confidentialité ICQ"
 
-#: ../src/protocols/oscar/oscar.c:5954
+#: ../libgaim/protocols/oscar/oscar.c:5950
 msgid "The new formatting is invalid."
 msgstr "Le nouvel affichage est non valide"
 
-#: ../src/protocols/oscar/oscar.c:5955
+#: ../libgaim/protocols/oscar/oscar.c:5951
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "Le format d'affichage du pseudo permet uniquement de changer les majuscules "
 "et les espaces."
 
-#: ../src/protocols/oscar/oscar.c:5962
+#: ../libgaim/protocols/oscar/oscar.c:5958
 msgid "New screen name formatting:"
 msgstr "Nouvel affichage pour le pseudo :"
 
-#: ../src/protocols/oscar/oscar.c:6018
+#: ../libgaim/protocols/oscar/oscar.c:6014
 msgid "Change Address To:"
 msgstr "Nouvelle adresse :"
 
-#: ../src/protocols/oscar/oscar.c:6063
+#: ../libgaim/protocols/oscar/oscar.c:6059
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>Vous n'attendez aucune autorisation</i>"
 
-#: ../src/protocols/oscar/oscar.c:6066
+#: ../libgaim/protocols/oscar/oscar.c:6062
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Vous attendez une autorisation des contacts suivants"
 
-#: ../src/protocols/oscar/oscar.c:6067
+#: ../libgaim/protocols/oscar/oscar.c:6063
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9853,69 +10888,69 @@
 "Vous pouvez redemander une autorisation de ces contacts en choisissant "
 "« Redemander autorisation » sur un clic-droit du contact."
 
-#: ../src/protocols/oscar/oscar.c:6084
+#: ../libgaim/protocols/oscar/oscar.c:6080
 msgid "Find Buddy by E-Mail"
 msgstr "Chercher un contact par adresse Ă©lectronique"
 
-#: ../src/protocols/oscar/oscar.c:6085
+#: ../libgaim/protocols/oscar/oscar.c:6081
 msgid "Search for a buddy by e-mail address"
 msgstr "Rechercher par adresse Ă©lectronique"
 
-#: ../src/protocols/oscar/oscar.c:6086
+#: ../libgaim/protocols/oscar/oscar.c:6082
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Saisissez l'adresse Ă©lectronique du contact que vous cherchez"
 
-#: ../src/protocols/oscar/oscar.c:6255
+#: ../libgaim/protocols/oscar/oscar.c:6251
 msgid "Set User Info (URL)..."
 msgstr "Éditer les informations (URL)..."
 
-#: ../src/protocols/oscar/oscar.c:6266
+#: ../libgaim/protocols/oscar/oscar.c:6262
 msgid "Change Password (URL)"
 msgstr "Changer de mot de passe (URL)"
 
-#: ../src/protocols/oscar/oscar.c:6270
+#: ../libgaim/protocols/oscar/oscar.c:6266
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configurer le transfert de message (URL)"
 
 #. ICQ actions
-#: ../src/protocols/oscar/oscar.c:6280
+#: ../libgaim/protocols/oscar/oscar.c:6276
 msgid "Set Privacy Options..."
 msgstr "Changer les options de confidentialité..."
 
 #. AIM actions
-#: ../src/protocols/oscar/oscar.c:6287
+#: ../libgaim/protocols/oscar/oscar.c:6283
 msgid "Format Screen Name..."
 msgstr "Changer l'affichage du pseudo..."
 
-#: ../src/protocols/oscar/oscar.c:6291
+#: ../libgaim/protocols/oscar/oscar.c:6287
 msgid "Confirm Account"
 msgstr "Confirmer le compte"
 
-#: ../src/protocols/oscar/oscar.c:6295
+#: ../libgaim/protocols/oscar/oscar.c:6291
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Afficher l'adresse courante enregistrée"
 
-#: ../src/protocols/oscar/oscar.c:6299
+#: ../libgaim/protocols/oscar/oscar.c:6295
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Changer l'adresse courante enregistrée..."
 
-#: ../src/protocols/oscar/oscar.c:6306
+#: ../libgaim/protocols/oscar/oscar.c:6302
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Afficher les demandes d'autorisation"
 
-#: ../src/protocols/oscar/oscar.c:6312
+#: ../libgaim/protocols/oscar/oscar.c:6308
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Chercher un contact par adresse Ă©lectronique..."
 
-#: ../src/protocols/oscar/oscar.c:6317
+#: ../libgaim/protocols/oscar/oscar.c:6313
 msgid "Search for Buddy by Information"
 msgstr "Chercher d'après les informations..."
 
-#: ../src/protocols/oscar/oscar.c:6383
+#: ../libgaim/protocols/oscar/oscar.c:6381
 msgid "Use recent buddies group"
 msgstr "Utiliser le groupe de contacts récents"
 
-#: ../src/protocols/oscar/oscar.c:6386
+#: ../libgaim/protocols/oscar/oscar.c:6384
 msgid "Show how long you have been idle"
 msgstr "Afficher temps d'inactivité"
 
@@ -9929,42 +10964,46 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/oscar/oscar.c:6511 ../src/protocols/oscar/oscar.c:6513
+#: ../libgaim/protocols/oscar/oscar.c:6510
+#: ../libgaim/protocols/oscar/oscar.c:6512
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "Plugin pour le protocole AIM/ICQ"
 
-#: ../src/protocols/oscar/oscar.c:6538 ../src/protocols/zephyr/zephyr.c:2927
+#: ../libgaim/protocols/oscar/oscar.c:6537
+#: ../libgaim/protocols/yahoo/yahoo.c:3950
+#: ../libgaim/protocols/zephyr/zephyr.c:2980
 msgid "Encoding"
 msgstr "Codage"
 
-#: ../src/protocols/oscar/oscar.c:6542
-msgid ""
-"Always use AIM/ICQ proxy server\n"
+#: ../libgaim/protocols/oscar/oscar.c:6541
+msgid ""
+"Always use AIM/ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
 msgstr ""
-"Toujours utiliser le serveur mandataire AIM/ICQ\n"
+"Toujours utiliser le serveur mandataire AIM/ICQ pour le transfert de "
+"fichiers\n"
 "(plus lent, mais ne révèle pas votre adresse IP)"
 
-#: ../src/protocols/oscar/peer.c:613
+#: ../libgaim/protocols/oscar/peer.c:623
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Demande Ă  %s de se connecter directement Ă  %s:%hu pour le message"
 
-#: ../src/protocols/oscar/peer.c:662 ../src/protocols/oscar/peer.c:693
+#: ../libgaim/protocols/oscar/peer.c:703 ../libgaim/protocols/oscar/peer.c:738
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Tentative de connexion vers %s:%hu."
 
-#: ../src/protocols/oscar/peer.c:753
+#: ../libgaim/protocols/oscar/peer.c:803
 msgid "Attempting to connect via proxy server."
 msgstr "Tentative de connexion au travers d'un serveur mandataire."
 
-#: ../src/protocols/oscar/peer.c:931
+#: ../libgaim/protocols/oscar/peer.c:980
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s demande une connexion directe avec %s"
 
-#: ../src/protocols/oscar/peer.c:935
+#: ../libgaim/protocols/oscar/peer.c:984
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -9974,133 +11013,845 @@
 "d'images. Votre adresse IP sera révélée et ceci peut être considéré comme "
 "une faille de sécurité."
 
-#: ../src/protocols/sametime/sametime.c:415
+#: ../libgaim/protocols/qq/buddy_info.c:37
+msgid "Primary Information"
+msgstr "Informations principales"
+
+#: ../libgaim/protocols/qq/buddy_info.c:39
+msgid "Personal Introduction"
+msgstr "Informations personnelles"
+
+#: ../libgaim/protocols/qq/buddy_info.c:40
+msgid "QQ Number"
+msgstr "Numéro QQ"
+
+#: ../libgaim/protocols/qq/buddy_info.c:45
+msgid "Country/Region"
+msgstr "Pays/région"
+
+#: ../libgaim/protocols/qq/buddy_info.c:46
+msgid "Province/State"
+msgstr "Province/État"
+
+#: ../libgaim/protocols/qq/buddy_info.c:48
+msgid "Horoscope Symbol"
+msgstr "Signe du zodiaque"
+
+#: ../libgaim/protocols/qq/buddy_info.c:50
+msgid "Zodiac Sign"
+msgstr "Signe du zodiaque chinois"
+
+#: ../libgaim/protocols/qq/buddy_info.c:51
+msgid "Blood Type"
+msgstr "Groupe sanguin"
+
+#: ../libgaim/protocols/qq/buddy_info.c:52
+msgid "College"
+msgstr "Éducation"
+
+#: ../libgaim/protocols/qq/buddy_info.c:53
+msgid "Email"
+msgstr "Courrier Ă©lectronique"
+
+#: ../libgaim/protocols/qq/buddy_info.c:55
+msgid "Zipcode"
+msgstr "Code postal"
+
+#: ../libgaim/protocols/qq/buddy_info.c:56
+msgid "Cellphone Number"
+msgstr "Téléphone portable"
+
+#: ../libgaim/protocols/qq/buddy_info.c:57
+msgid "Phone Number"
+msgstr "Téléphone fixe"
+
+#: ../libgaim/protocols/qq/buddy_info.c:62
+msgid "Aquarius"
+msgstr "Verseau"
+
+#: ../libgaim/protocols/qq/buddy_info.c:62
+msgid "Pisces"
+msgstr "Poissons"
+
+#: ../libgaim/protocols/qq/buddy_info.c:62
+msgid "Aries"
+msgstr "BĂ©lier"
+
+#: ../libgaim/protocols/qq/buddy_info.c:62
+msgid "Taurus"
+msgstr "Taureau"
+
+#: ../libgaim/protocols/qq/buddy_info.c:63
+msgid "Gemini"
+msgstr "GĂ©meaux"
+
+#: ../libgaim/protocols/qq/buddy_info.c:63
+msgid "Cancer"
+msgstr "Cancer"
+
+#: ../libgaim/protocols/qq/buddy_info.c:63
+msgid "Leo"
+msgstr "Lion"
+
+#: ../libgaim/protocols/qq/buddy_info.c:63
+msgid "Virgo"
+msgstr "Vierge"
+
+#: ../libgaim/protocols/qq/buddy_info.c:63
+msgid "Libra"
+msgstr "Balance"
+
+#: ../libgaim/protocols/qq/buddy_info.c:64
+msgid "Scorpio"
+msgstr "Scorpion"
+
+#: ../libgaim/protocols/qq/buddy_info.c:64
+msgid "Sagittarius"
+msgstr "Sagittaire"
+
+#: ../libgaim/protocols/qq/buddy_info.c:64
+msgid "Capricorn"
+msgstr "Capricorne"
+
+#: ../libgaim/protocols/qq/buddy_info.c:69
+msgid "Rat"
+msgstr "Rat"
+
+#: ../libgaim/protocols/qq/buddy_info.c:69
+msgid "Ox"
+msgstr "BĹ“uf"
+
+#: ../libgaim/protocols/qq/buddy_info.c:69
+msgid "Tiger"
+msgstr "Tigre"
+
+#: ../libgaim/protocols/qq/buddy_info.c:69
+msgid "Rabbit"
+msgstr "Lièvre"
+
+#: ../libgaim/protocols/qq/buddy_info.c:70
+msgid "Dragon"
+msgstr "Dragon"
+
+#: ../libgaim/protocols/qq/buddy_info.c:70
+msgid "Snake"
+msgstr "Serpent"
+
+#: ../libgaim/protocols/qq/buddy_info.c:70
+msgid "Horse"
+msgstr "Cheval"
+
+#: ../libgaim/protocols/qq/buddy_info.c:70
+msgid "Goat"
+msgstr "Chèvre"
+
+#: ../libgaim/protocols/qq/buddy_info.c:70
+msgid "Monkey"
+msgstr "Singe"
+
+#: ../libgaim/protocols/qq/buddy_info.c:71
+msgid "Rooster"
+msgstr "Coq"
+
+#: ../libgaim/protocols/qq/buddy_info.c:71
+msgid "Dog"
+msgstr "Chien"
+
+#: ../libgaim/protocols/qq/buddy_info.c:71
+msgid "Pig"
+msgstr "Cochon"
+
+#: ../libgaim/protocols/qq/buddy_info.c:76
+msgid "Other"
+msgstr "Autre"
+
+#: ../libgaim/protocols/qq/buddy_info.c:477
+#: ../libgaim/protocols/qq/buddy_info.c:478
+msgid "Modify my information"
+msgstr "Modifier mes informations"
+
+#: ../libgaim/protocols/qq/buddy_info.c:479
+msgid "Update my information"
+msgstr "Mettre Ă  jour mes informations"
+
+#: ../libgaim/protocols/qq/buddy_info.c:502
+msgid "Your information has been updated"
+msgstr "Vos informations ont été mises à jour."
+
+#: ../libgaim/protocols/qq/buddy_opt.c:205
+#: ../libgaim/protocols/qq/group_opt.c:133
+#, c-format
+msgid "You rejected %d's request"
+msgstr "Vous avez rejeté la demande de %d."
+
+#: ../libgaim/protocols/qq/buddy_opt.c:206
+#: ../libgaim/protocols/qq/group_opt.c:134
+msgid "Input your reason:"
+msgstr "Saisissez votre raison :"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:208
+msgid "Reject request"
+msgstr "Refus de demande"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:209
+#: ../libgaim/protocols/qq/group_opt.c:137
+msgid "Sorry, you are not my type..."
+msgstr "Désolé, tu n'es pas mon genre..."
+
+#: ../libgaim/protocols/qq/buddy_opt.c:210
+#: ../libgaim/protocols/qq/group_im.c:134
+#: ../libgaim/protocols/qq/group_opt.c:123
+#: ../libgaim/protocols/qq/sys_msg.c:83 ../libgaim/protocols/qq/sys_msg.c:226
+msgid "Reject"
+msgstr "Refus"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:270
+msgid "Add buddy with auth request fails"
+msgstr "Ajout d'un contact avec Ă©chec d'authentification"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:301
+msgid "You have successfully removed a buddy"
+msgstr "Vous avez supprimé un contact."
+
+#: ../libgaim/protocols/qq/buddy_opt.c:329
+msgid "You have successfully removed yourself from a buddy"
+msgstr "Vous avez été supprimé d'un contact."
+
+#: ../libgaim/protocols/qq/buddy_opt.c:393
+#, c-format
+msgid "User %d needs authentication"
+msgstr "L'utilisateur %d demande une authentification."
+
+#: ../libgaim/protocols/qq/buddy_opt.c:395
+#: ../libgaim/protocols/qq/group_join.c:132
+msgid "Input request here"
+msgstr "Saisissez votre demande"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:396
+#: ../libgaim/protocols/qq/group_join.c:133
+msgid "Would you be my friend?"
+msgstr "Veux-tu être mon ami ?"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:397
+#: ../libgaim/protocols/qq/group_join.c:134
+#: ../libgaim/protocols/qq/group_opt.c:138
+#: ../libgaim/protocols/qq/sendqueue.c:198
+msgid "Send"
+msgstr "Envoyer"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:404
+#, c-format
+msgid "You have added %d in buddy list"
+msgstr "Vous avez ajouté l'utilisateur %d à votre liste de contacts."
+
+#: ../libgaim/protocols/qq/buddy_opt.c:501
+msgid "QQid Error"
+msgstr "Erreur QQid"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:502
+msgid "Invalid QQid"
+msgstr "QQid non valide"
+
+#: ../libgaim/protocols/qq/group.c:63
+msgid "ID: "
+msgstr "ID : "
+
+#: ../libgaim/protocols/qq/group.c:96
+msgid "Group ID"
+msgstr "ID du groupe"
+
+#: ../libgaim/protocols/qq/group.c:98
+msgid "Creator"
+msgstr "Créateur"
+
+#: ../libgaim/protocols/qq/group.c:101
+msgid "Group Description"
+msgstr "Description du groupe"
+
+#: ../libgaim/protocols/qq/group.c:107
+msgid "Auth"
+msgstr "Authentification"
+
+#: ../libgaim/protocols/qq/group.c:117
+msgid "QQ Qun"
+msgstr "QQ Qun"
+
+#: ../libgaim/protocols/qq/group.c:118
+msgid "Please input external group ID"
+msgstr "Veuillez saisir un ID de groupe externe."
+
+#: ../libgaim/protocols/qq/group.c:119
+msgid "You can only search for permanent QQ groups\n"
+msgstr "Vous ne pouvez cherche que les groupes QQ permanents.\n"
+
+#: ../libgaim/protocols/qq/group_im.c:120
+#, c-format
+msgid "User %d applied to join group %d"
+msgstr "L'utilisateur %d demande Ă  joindre le groupe %d."
+
+#: ../libgaim/protocols/qq/group_im.c:121
+#: ../libgaim/protocols/qq/group_im.c:170
+#: ../libgaim/protocols/qq/sys_msg.c:178
+#, c-format
+msgid "Reason: %s"
+msgstr "Raison : %s"
+
+#: ../libgaim/protocols/qq/group_im.c:128
+#: ../libgaim/protocols/qq/group_im.c:172
+#: ../libgaim/protocols/qq/group_im.c:212
+#: ../libgaim/protocols/qq/group_im.c:247
+#: ../libgaim/protocols/qq/group_im.c:281
+#: ../libgaim/protocols/qq/group_join.c:227
+#: ../libgaim/protocols/qq/group_join.c:353
+#: ../libgaim/protocols/qq/group_opt.c:228
+#: ../libgaim/protocols/qq/group_opt.c:298
+#: ../libgaim/protocols/qq/group_opt.c:384
+msgid "QQ Qun Operation"
+msgstr "Opération QQ Qun"
+
+#: ../libgaim/protocols/qq/group_im.c:131
+#: ../libgaim/protocols/qq/group_opt.c:125
+#: ../libgaim/protocols/qq/sys_msg.c:85 ../libgaim/protocols/qq/sys_msg.c:228
+msgid "Approve"
+msgstr "Approuver"
+
+#: ../libgaim/protocols/qq/group_im.c:169
+#, c-format
+msgid "You request to join group %d has been rejected by admin %d"
+msgstr ""
+"Votre demande pour joindre le groupe %d a été refusée par l'administrateur %"
+"d."
+
+#: ../libgaim/protocols/qq/group_im.c:210
+#, c-format
+msgid "You request to join group %d has been approved by admin %d"
+msgstr ""
+"Votre demande pour joindre le groupe %d a été acceptée par l'administrateur %"
+"d."
+
+#: ../libgaim/protocols/qq/group_im.c:246
+#, c-format
+msgid "You [%d] has exit group \"%d\""
+msgstr "Vous (%d) avez quitté le groupe %d."
+
+#: ../libgaim/protocols/qq/group_im.c:280
+#, c-format
+msgid "You [%d] has been added by group \"%d\""
+msgstr "Vous (%d) avez rejoint le groupe %d."
+
+#: ../libgaim/protocols/qq/group_im.c:281
+msgid "This group has been added to your buddy list"
+msgstr "Ce groupe a été ajouté à votre liste de contacts."
+
+#: ../libgaim/protocols/qq/group_internal.c:39
+msgid "I am not member"
+msgstr "Je n'en suis pas membre."
+
+#: ../libgaim/protocols/qq/group_internal.c:42
+msgid "I am a member"
+msgstr "J'en suis membre."
+
+#: ../libgaim/protocols/qq/group_internal.c:45
+msgid "I am applying to join"
+msgstr "Je demande Ă  ĂŞtre membre."
+
+#: ../libgaim/protocols/qq/group_internal.c:48
+msgid "I am the admin"
+msgstr "J'en suis administrateur."
+
+#: ../libgaim/protocols/qq/group_internal.c:51
+msgid "Unknown status"
+msgstr "État inconnu."
+
+#: ../libgaim/protocols/qq/group_join.c:78
+msgid "This group does not allow others to join"
+msgstr "Ce groupe est fermé aux inscriptions."
+
+#: ../libgaim/protocols/qq/group_join.c:227
+msgid "You have successfully exited the group"
+msgstr "Vous avez quitté ce groupe."
+
+#: ../libgaim/protocols/qq/group_join.c:251
+msgid "QQ Group Auth"
+msgstr "Authentification QQ du groupe"
+
+#: ../libgaim/protocols/qq/group_join.c:252
+msgid "Your authorization operation has been accepted by the QQ server"
+msgstr "Votre opération d'authentification a été acceptée par le serveur QQ."
+
+#: ../libgaim/protocols/qq/group_join.c:323
+msgid "You inputted a group id outside the acceptable range"
+msgstr "Vous avez saisi un ID de groupe hors de l'intervalle autorisé."
+
+#: ../libgaim/protocols/qq/group_join.c:354
+msgid "Are you sure to exit this Qun?"
+msgstr "Êtes-vous sûr de vouloir quitter ce Qun ?"
+
+#: ../libgaim/protocols/qq/group_join.c:356
+msgid ""
+"Note, if you are the creator, \n"
+"this operation will eventually remove this Qun."
+msgstr ""
+"Note : si vous en ête le créateur, \n"
+"cette opération peut supprimer ce Qun."
+
+#: ../libgaim/protocols/qq/group_join.c:359
+msgid "Go ahead"
+msgstr "En avant"
+
+#: ../libgaim/protocols/qq/group_network.c:88
+#, c-format
+msgid "Code [0x%02X]: %s"
+msgstr "Code [0x%02X] : %s"
+
+#: ../libgaim/protocols/qq/group_network.c:89
+msgid "Group Operation Error"
+msgstr "Erreur sur une opération du groupe."
+
+#: ../libgaim/protocols/qq/group_opt.c:122
+#: ../libgaim/protocols/qq/sys_msg.c:82
+msgid "Do you wanna approve the request?"
+msgstr "Voulez-vous accepter cette demande ?"
+
+#: ../libgaim/protocols/qq/group_opt.c:228
+msgid "You have successfully modify Qun member"
+msgstr "Vous avez modifié la liste des membres du Qun."
+
+#: ../libgaim/protocols/qq/group_opt.c:298
+msgid "You have successfully modify Qun information"
+msgstr "Vous avez modifié les informations du Qun."
+
+#: ../libgaim/protocols/qq/group_opt.c:385
+msgid "You have successfully created a Qun"
+msgstr "Vous avez créé un Qun."
+
+#: ../libgaim/protocols/qq/group_opt.c:387
+msgid "Would you like to set up the Qun details now?"
+msgstr "Voulez-vous modifier les paramètres du Qun maintenant ?"
+
+#: ../libgaim/protocols/qq/group_opt.c:388
+msgid "Setup"
+msgstr "Options"
+
+#: ../libgaim/protocols/qq/im.c:421
+msgid "System Message"
+msgstr "Message système"
+
+#: ../libgaim/protocols/qq/im.c:565
+msgid "Server ACK"
+msgstr "Serveur ACK"
+
+#: ../libgaim/protocols/qq/im.c:565
+msgid "Send IM fail\n"
+msgstr "Échec à l'envoi d'un message.\n"
+
+#: ../libgaim/protocols/qq/keep_alive.c:81
+msgid "Keep alive error, seems connection lost!"
+msgstr "Erreur de connexion."
+
+#: ../libgaim/protocols/qq/login_logout.c:401
+msgid "Request login token error!"
+msgstr "Erreur de connexion."
+
+#: ../libgaim/protocols/qq/login_logout.c:472
+msgid "Wrong password!"
+msgstr "Mauvais mot de passe."
+
+#: ../libgaim/protocols/qq/login_logout.c:475
+msgid "Unable to login, check debug log"
+msgstr ""
+"Impossible de se connecter, veuillez vérifier les messages de debuggage."
+
+#. we didn't successfully connect. tdt->toc_fd is valid here
+#: ../libgaim/protocols/qq/qq.c:137 ../libgaim/protocols/toc/toc.c:173
+#: ../libgaim/protocols/yahoo/yahoo.c:2356
+#: ../libgaim/protocols/yahoo/yahoo.c:2383
+#: ../libgaim/protocols/yahoo/yahoo.c:2490
+#: ../libgaim/protocols/yahoo/yahoo.c:2511
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:108
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:188
+#: ../libgaim/protocols/yahoo/ycht.c:549
+msgid "Unable to connect."
+msgstr "Impossible de se connecter"
+
+#: ../libgaim/protocols/qq/qq.c:283
+msgid "QQ: Available"
+msgstr "QQ : Disponible"
+
+#: ../libgaim/protocols/qq/qq.c:287
+msgid "QQ: Away"
+msgstr "QQ : Absent"
+
+#: ../libgaim/protocols/qq/qq.c:291
+msgid "QQ: Invisible"
+msgstr "QQ : Invisible"
+
+#: ../libgaim/protocols/qq/qq.c:295
+msgid "QQ: Offline"
+msgstr "QQ : Déconnecté"
+
+#: ../libgaim/protocols/qq/qq.c:372
+msgid "Invalid name"
+msgstr "Nom d'utilisateur non valide"
+
+#: ../libgaim/protocols/qq/qq.c:442
+msgid "Selection"
+msgstr "Choix"
+
+#: ../libgaim/protocols/qq/qq.c:445
+msgid "Select a number"
+msgstr "Choisissez un numéro"
+
+#: ../libgaim/protocols/qq/qq.c:451
+msgid "Faces"
+msgstr "Figure"
+
+#: ../libgaim/protocols/qq/qq.c:456
+msgid "Change Your QQ Face"
+msgstr "Modifier votre figure QQ"
+
+#: ../libgaim/protocols/qq/qq.c:457
+msgid "Change Face"
+msgstr "Changer de figure"
+
+#: ../libgaim/protocols/qq/qq.c:458
+msgid "Update"
+msgstr "Mettre Ă  jour"
+
+#: ../libgaim/protocols/qq/qq.c:512
+#, c-format
+msgid "<b>Current Online</b>: %d<br>\n"
+msgstr "<b>Connectés :</b> %d<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:513
+#, c-format
+msgid "<b>Last Refresh</b>: %s<br>\n"
+msgstr "<b>Dernière mise à jour :</b> %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:517
+#, c-format
+msgid "<b>Connection Mode</b>: %s<br>\n"
+msgstr "<b>Type de connexion :</b> %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:518
+#, c-format
+msgid "<b>Server IP</b>: %s: %d<br>\n"
+msgstr "<b>Adresse IP du serveur :</b> %s: %d<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:519
+#, c-format
+msgid "<b>My Public IP</b>: %s<br>\n"
+msgstr "<b>Adresse IP publiée :</b> %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:524
+#, c-format
+msgid "<b>Login Time</b>: %s<br>\n"
+msgstr "<b>Heure de connexion :</b> %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:525
+#, c-format
+msgid "<b>Last Login IP</b>: %s<br>\n"
+msgstr "<b>Adresse IP à la dernière connexion :</b> %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:526
+#, c-format
+msgid "<b>Last Login Time</b>: %s\n"
+msgstr "<b>Temps de connexion la dernière fois :</b> %s\n"
+
+#: ../libgaim/protocols/qq/qq.c:530
+msgid "Login Information"
+msgstr "Informations de connexion"
+
+#: ../libgaim/protocols/qq/qq.c:802
+msgid "Modify My Information"
+msgstr "Modifier mes informations"
+
+#: ../libgaim/protocols/qq/qq.c:805
+msgid "Change My Face"
+msgstr "Changer de figure"
+
+#: ../libgaim/protocols/qq/qq.c:808 ../libgaim/protocols/toc/toc.c:1700
+msgid "Change Password"
+msgstr "Changer de mot de passe"
+
+#: ../libgaim/protocols/qq/qq.c:811
+msgid "Show Login Information"
+msgstr "Afficher les informations de connexion"
+
+#: ../libgaim/protocols/qq/qq.c:837
+msgid "Exit this QQ Qun"
+msgstr "Quitter ce QQ Qun"
+
+#: ../libgaim/protocols/qq/qq.c:922
+msgid "This function has not be implemented yet"
+msgstr "Cette fonctionnalité n'existe pas encore."
+
+#: ../libgaim/protocols/qq/qq.c:922
+msgid "Please wait for new version"
+msgstr "Veuillez attendre une version ultérieure."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/protocols/qq/qq.c:1004 ../libgaim/protocols/qq/qq.c:1006
+msgid "QQ Protocol\tPlugin"
+msgstr "Plugin pour le protocole QQ"
+
+#: ../libgaim/protocols/qq/qq.c:1025
+msgid "Login in TCP"
+msgstr "Connexion en TCP"
+
+#: ../libgaim/protocols/qq/qq.c:1028
+msgid "Login Hidden"
+msgstr "Masquer la connexion"
+
+#: ../libgaim/protocols/qq/qq.c:1031
+msgid "QQ Server"
+msgstr "Serveur QQ"
+
+#: ../libgaim/protocols/qq/qq.c:1034
+msgid "QQ Port"
+msgstr "Port QQ"
+
+#: ../libgaim/protocols/qq/qq_proxy.c:493
+msgid "Socket send error"
+msgstr "Erreur Ă  l'envoi sur le socket."
+
+#: ../libgaim/protocols/qq/qq_proxy.c:496
+msgid "Connection refused"
+msgstr "Connexion refusée."
+
+#: ../libgaim/protocols/qq/recv_core.c:298
+msgid "Socket error"
+msgstr "Erreur de socket."
+
+#: ../libgaim/protocols/qq/recv_core.c:308
+msgid "Unable to read from socket"
+msgstr "Impossible de lire le socket."
+
+#: ../libgaim/protocols/qq/send_file.c:708
+#, c-format
+msgid "Your request to send file[%s] has been rejected by buddy[%d]"
+msgstr ""
+"Votre demande d'envoi du fichier (%s) a été refusée par le contact (%d)."
+
+#: ../libgaim/protocols/qq/send_file.c:711
+#: ../libgaim/protocols/qq/send_file.c:740
+msgid "File Send"
+msgstr "Envoi de fichier"
+
+#: ../libgaim/protocols/qq/send_file.c:737
+#, c-format
+msgid "The sending process of file[%s] has been cancaled by buddy[%d]"
+msgstr "L'encoi du fichier (%s) a été annulé par le contact (%d)."
+
+#: ../libgaim/protocols/qq/sendqueue.c:167
+msgid "Connection lost!"
+msgstr "Connexion perdue."
+
+#. cancel logging progress
+#: ../libgaim/protocols/qq/sendqueue.c:174
+msgid "Login failed, no reply!"
+msgstr "Échec à la connexion, aucune réponse."
+
+#: ../libgaim/protocols/qq/sendqueue.c:179
+msgid "Connection timeout!"
+msgstr "Connexion morte."
+
+#: ../libgaim/protocols/qq/sendqueue.c:179
+msgid "User info is not updated"
+msgstr "Les informations n'ont pas été mises à jour."
+
+#: ../libgaim/protocols/qq/sendqueue.c:194
+msgid "Send packet"
+msgstr "Envoi de paquets"
+
+#: ../libgaim/protocols/qq/sendqueue.c:196
+msgid "Packets lost, send again?"
+msgstr "Des paquets ont été perdus, les réexpédier ?"
+
+#: ../libgaim/protocols/qq/sys_msg.c:101
+msgid "Do you wanna add this buddy?"
+msgstr "Voulez-vous l'ajouter à votre liste de contacts ?"
+
+#. only need to get value
+#: ../libgaim/protocols/qq/sys_msg.c:153
+#, c-format
+msgid "You have been added by %s"
+msgstr "Vous avez été ajouté par %s."
+
+#: ../libgaim/protocols/qq/sys_msg.c:156
+msgid "Would like to add him?"
+msgstr "Voulez-vous l'ajouter ?"
+
+#: ../libgaim/protocols/qq/sys_msg.c:162
+#, c-format
+msgid "%s has added you [%s]"
+msgstr "%s vient de vous ajouter (%s)."
+
+#: ../libgaim/protocols/qq/sys_msg.c:177
+#, c-format
+msgid "User %s rejected your request"
+msgstr "L'utilisateur %s a refusé votre demande."
+
+#: ../libgaim/protocols/qq/sys_msg.c:197
+#, c-format
+msgid "User %s has approved your request"
+msgstr "L'utilisateur %s a refusé votre demande."
+
+#: ../libgaim/protocols/qq/sys_msg.c:220
+#, c-format
+msgid "%s wanna add you [%s] as friends"
+msgstr "%s veut vous (%s) ajouter en tant que contact."
+
+#: ../libgaim/protocols/qq/sys_msg.c:221
+#, c-format
+msgid "Message: %s"
+msgstr "Message : %s"
+
+#: ../libgaim/protocols/qq/sys_msg.c:242
+#, c-format
+msgid "%s is not in your buddy list"
+msgstr "L'utilisateur %s n'est pas dans votre liste de contacts."
+
+#: ../libgaim/protocols/qq/sys_msg.c:244
+msgid "Would you like to add him?"
+msgstr "Voulez-vous l'ajouter ?"
+
+#: ../libgaim/protocols/sametime/sametime.c:415
 msgid "Connection closed (writing)"
 msgstr "Connexion terminée (en écriture)"
 
-#: ../src/protocols/sametime/sametime.c:1261
+#: ../libgaim/protocols/sametime/sametime.c:1261
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Titre du groupe :</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:1262
+#: ../libgaim/protocols/sametime/sametime.c:1262
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>Id Notes du groupe :</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:1264
+#: ../libgaim/protocols/sametime/sametime.c:1264
 #, c-format
 msgid "Info for Group %s"
 msgstr "Informations pour le groupe %s"
 
-#: ../src/protocols/sametime/sametime.c:1266
+#: ../libgaim/protocols/sametime/sametime.c:1266
 msgid "Notes Address Book Information"
 msgstr "Informations du carnet d'adresses Notes"
 
-#: ../src/protocols/sametime/sametime.c:1298
+#: ../libgaim/protocols/sametime/sametime.c:1298
 msgid "Invite Group to Conference..."
 msgstr "Inviter le groupe à une conférence..."
 
-#: ../src/protocols/sametime/sametime.c:1308
+#: ../libgaim/protocols/sametime/sametime.c:1308
 msgid "Get Notes Address Book Info"
 msgstr "Récupérer les informations du carnet d'adresses Notes"
 
-#: ../src/protocols/sametime/sametime.c:1461
+#: ../libgaim/protocols/sametime/sametime.c:1461
 msgid "Sending Handshake"
 msgstr "Envoi de la poignée de main"
 
-#: ../src/protocols/sametime/sametime.c:1466
+#: ../libgaim/protocols/sametime/sametime.c:1466
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "En attente de réception de la poignée de main"
 
-#: ../src/protocols/sametime/sametime.c:1471
+#: ../libgaim/protocols/sametime/sametime.c:1471
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Poignée de main acceptée. Envoi du nom d'utilisateur."
 
-#: ../src/protocols/sametime/sametime.c:1476
+#: ../libgaim/protocols/sametime/sametime.c:1476
 msgid "Waiting for Login Acknowledgement"
 msgstr "En attente de réception des informations utilisateurs."
 
-#: ../src/protocols/sametime/sametime.c:1481
+#: ../libgaim/protocols/sametime/sametime.c:1481
 msgid "Login Redirected"
 msgstr "Connexion redirigée"
 
-#: ../src/protocols/sametime/sametime.c:1487
+#: ../libgaim/protocols/sametime/sametime.c:1487
 msgid "Forcing Login"
 msgstr "Connexion"
 
-#: ../src/protocols/sametime/sametime.c:1491
+#: ../libgaim/protocols/sametime/sametime.c:1491
 msgid "Login Acknowledged"
 msgstr "Connexion reçue"
 
-#: ../src/protocols/sametime/sametime.c:1496
+#: ../libgaim/protocols/sametime/sametime.c:1496
 msgid "Starting Services"
 msgstr "DĂ©marrage des services"
 
-#: ../src/protocols/sametime/sametime.c:1501
+#: ../libgaim/protocols/sametime/sametime.c:1501
 msgid "Connected"
 msgstr "Connecté"
 
-#: ../src/protocols/sametime/sametime.c:1599
+#: ../libgaim/protocols/sametime/sametime.c:1599
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr ""
 "Un administrateur Sametime a lancé l'annonce suivante sur le serveur %s."
 
-#: ../src/protocols/sametime/sametime.c:1604
+#: ../libgaim/protocols/sametime/sametime.c:1604
 msgid "Sametime Administrator Announcement"
 msgstr "Annonce d'un administrateur Sametime"
 
-#: ../src/protocols/sametime/sametime.c:1656
+#: ../libgaim/protocols/sametime/sametime.c:1656
 msgid "Connection reset"
 msgstr "Connexion remise à zéro"
 
-#: ../src/protocols/sametime/sametime.c:1663
+#: ../libgaim/protocols/sametime/sametime.c:1663
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Erreur à la lecture du socket : %s"
 
 #. this is a regular connect, error out
-#: ../src/protocols/sametime/sametime.c:1692
-#: ../src/protocols/sametime/sametime.c:3688
+#: ../libgaim/protocols/sametime/sametime.c:1688
+#: ../libgaim/protocols/sametime/sametime.c:3685
 msgid "Unable to connect to host"
 msgstr "Impossible de se connecter Ă  l'hĂ´te"
 
-#: ../src/protocols/sametime/sametime.c:1730
+#: ../libgaim/protocols/sametime/sametime.c:1726
 #, c-format
 msgid "Announcement from %s"
 msgstr "Annonce de %s"
 
-#: ../src/protocols/sametime/sametime.c:1904
+#: ../libgaim/protocols/sametime/sametime.c:1900
 msgid "Conference Closed"
 msgstr "Conférence fermée"
 
-#: ../src/protocols/sametime/sametime.c:2361
+#: ../libgaim/protocols/sametime/sametime.c:2357
 msgid "Unable to send message: "
 msgstr "Impossible d'envoyer le message : "
 
-#: ../src/protocols/sametime/sametime.c:2918
+#: ../libgaim/protocols/sametime/sametime.c:2914
 msgid "Place Closed"
 msgstr "Endroit fermé"
 
-#: ../src/protocols/sametime/sametime.c:3209
+#: ../libgaim/protocols/sametime/sametime.c:3205
 msgid "Microphone"
 msgstr "Microphone"
 
-#: ../src/protocols/sametime/sametime.c:3210
+#: ../libgaim/protocols/sametime/sametime.c:3206
 msgid "Speakers"
 msgstr "Haut-parleurs"
 
-#: ../src/protocols/sametime/sametime.c:3211
+#: ../libgaim/protocols/sametime/sametime.c:3207
 msgid "Video Camera"
 msgstr "Caméra vidéo"
 
-#: ../src/protocols/sametime/sametime.c:3215
+#: ../libgaim/protocols/sametime/sametime.c:3211
 msgid "File Transfer"
 msgstr "Transfert de fichier"
 
-#: ../src/protocols/sametime/sametime.c:3249
+#: ../libgaim/protocols/sametime/sametime.c:3245
 #, c-format
 msgid ""
 "\n"
@@ -10109,7 +11860,7 @@
 "\n"
 "<b>Supporte :</b> %s"
 
-#: ../src/protocols/sametime/sametime.c:3254
+#: ../libgaim/protocols/sametime/sametime.c:3250
 msgid ""
 "\n"
 "<b>External User</b>"
@@ -10117,11 +11868,11 @@
 "\n"
 "<b>Utilisateur extérieur</b>"
 
-#: ../src/protocols/sametime/sametime.c:3360
+#: ../libgaim/protocols/sametime/sametime.c:3356
 msgid "Create conference with user"
 msgstr "Créer une conférence avec l'utilisateur"
 
-#: ../src/protocols/sametime/sametime.c:3361
+#: ../libgaim/protocols/sametime/sametime.c:3357
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -10130,27 +11881,27 @@
 "Saisissez un sujet pour la nouvelle conférence, ainsi qu'un message "
 "d'invitation Ă  envoyer Ă  %s"
 
-#: ../src/protocols/sametime/sametime.c:3365
+#: ../libgaim/protocols/sametime/sametime.c:3361
 msgid "New Conference"
 msgstr "Nouvelle conférence"
 
-#: ../src/protocols/sametime/sametime.c:3367
+#: ../libgaim/protocols/sametime/sametime.c:3363
 msgid "Create"
 msgstr "Créer"
 
-#: ../src/protocols/sametime/sametime.c:3431
+#: ../libgaim/protocols/sametime/sametime.c:3427
 msgid "Available Conferences"
 msgstr "Conférences disponibles"
 
-#: ../src/protocols/sametime/sametime.c:3437
+#: ../libgaim/protocols/sametime/sametime.c:3433
 msgid "Create New Conference..."
 msgstr "Créer une nouvelle conférence..."
 
-#: ../src/protocols/sametime/sametime.c:3444
+#: ../libgaim/protocols/sametime/sametime.c:3440
 msgid "Invite user to a conference"
 msgstr "Inviter l'utilisateur à une conférence"
 
-#: ../src/protocols/sametime/sametime.c:3445
+#: ../libgaim/protocols/sametime/sametime.c:3441
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -10161,27 +11912,23 @@
 "l'utilisateur %s. Choisissez « Créer une nouvelle conférence » si vous "
 "désirer créer une nouvelle conférence afin d'y inviter cet utilisateur."
 
-#: ../src/protocols/sametime/sametime.c:3450
+#: ../libgaim/protocols/sametime/sametime.c:3446
 msgid "Invite to Conference"
 msgstr "Inviter à une conférence"
 
-#: ../src/protocols/sametime/sametime.c:3452
-msgid "Invite"
-msgstr "Inviter"
-
-#: ../src/protocols/sametime/sametime.c:3540
+#: ../libgaim/protocols/sametime/sametime.c:3536
 msgid "Invite to Conference..."
 msgstr "Inviter à une conférence..."
 
-#: ../src/protocols/sametime/sametime.c:3545
+#: ../libgaim/protocols/sametime/sametime.c:3541
 msgid "Send TEST Announcement"
 msgstr "Envoyer une proclamation TEST"
 
-#: ../src/protocols/sametime/sametime.c:3592
+#: ../libgaim/protocols/sametime/sametime.c:3588
 msgid "No Sametime Community Server specified"
 msgstr "Aucun serveur communautaire Sametime n'a été spécifié."
 
-#: ../src/protocols/sametime/sametime.c:3614
+#: ../libgaim/protocols/sametime/sametime.c:3610
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -10190,62 +11937,62 @@
 "Aucun hôte ou adresse IP n'a été configurée pour le compte Meanwhile %s. "
 "Veuillez en saisir un ci-dessous pour continuer la connexion."
 
-#: ../src/protocols/sametime/sametime.c:3619
+#: ../libgaim/protocols/sametime/sametime.c:3615
 msgid "Meanwhile Connection Setup"
 msgstr "Configuration de la connexion Meanwhile"
 
-#: ../src/protocols/sametime/sametime.c:3620
+#: ../libgaim/protocols/sametime/sametime.c:3616
 msgid "No Sametime Community Server Specified"
 msgstr "Aucun serveur communautaire Sametime n'a été spécifié."
 
-#: ../src/protocols/sametime/sametime.c:4082
+#: ../libgaim/protocols/sametime/sametime.c:4084
 msgid "<b>External User</b><br>"
 msgstr "<b>Utilisateur extérieur</b><br>"
 
-#: ../src/protocols/sametime/sametime.c:4085
+#: ../libgaim/protocols/sametime/sametime.c:4087
 #, c-format
 msgid "<b>User ID:</b> %s<br>"
 msgstr "<b>Identifiant de l'utilisateur :</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4091
+#: ../libgaim/protocols/sametime/sametime.c:4093
 #, c-format
 msgid "<b>Full Name:</b> %s<br>"
 msgstr "<b>Nom complet :</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4097
+#: ../libgaim/protocols/sametime/sametime.c:4099
 msgid "<b>Last Known Client:</b> "
 msgstr "<b>Dernier client connu :</b> "
 
-#: ../src/protocols/sametime/sametime.c:4105
+#: ../libgaim/protocols/sametime/sametime.c:4107
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Inconnu (0x%04x)<br>"
 
-#: ../src/protocols/sametime/sametime.c:4112
+#: ../libgaim/protocols/sametime/sametime.c:4114
 #, c-format
 msgid "<b>Supports:</b> %s<br>"
 msgstr "<b>Supporte :</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4118
+#: ../libgaim/protocols/sametime/sametime.c:4120
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>État :</b> %s"
 
-#: ../src/protocols/sametime/sametime.c:4261
-#: ../src/protocols/sametime/sametime.c:5424
+#: ../libgaim/protocols/sametime/sametime.c:4263
+#: ../libgaim/protocols/sametime/sametime.c:5427
 msgid "User Name"
 msgstr "Nom d'utilisateur"
 
-#: ../src/protocols/sametime/sametime.c:4264
-#: ../src/protocols/sametime/sametime.c:5427
+#: ../libgaim/protocols/sametime/sametime.c:4266
+#: ../libgaim/protocols/sametime/sametime.c:5430
 msgid "Sametime ID"
 msgstr "Identifiant Sametime"
 
-#: ../src/protocols/sametime/sametime.c:4288
+#: ../libgaim/protocols/sametime/sametime.c:4290
 msgid "An ambiguous user ID was entered"
 msgstr "Un identifiant d'utilisateur ambigu a été saisi."
 
-#: ../src/protocols/sametime/sametime.c:4289
+#: ../libgaim/protocols/sametime/sametime.c:4291
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -10255,15 +12002,15 @@
 "Veuillez choisir dans cette liste l'utilisateur que vous voulez ajouter Ă  "
 "votre liste de contacts."
 
-#: ../src/protocols/sametime/sametime.c:4294
+#: ../libgaim/protocols/sametime/sametime.c:4296
 msgid "Select User"
 msgstr "Choisir l'utilisateur"
 
-#: ../src/protocols/sametime/sametime.c:4364
+#: ../libgaim/protocols/sametime/sametime.c:4366
 msgid "Unable to add user: user not found"
 msgstr "Impossible d'ajouter cet utilisateur parce qu'il est introuvable."
 
-#: ../src/protocols/sametime/sametime.c:4366
+#: ../libgaim/protocols/sametime/sametime.c:4368
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -10272,11 +12019,11 @@
 "L'identifiant « %s » ne correspond à aucun utilisateur dans la communauté "
 "Sametime. Cette entrée a été retirée de votre liste de contacts."
 
-#: ../src/protocols/sametime/sametime.c:4371
+#: ../libgaim/protocols/sametime/sametime.c:4373
 msgid "Unable to add user"
 msgstr "Impossible d'ajouter un utilisateur"
 
-#: ../src/protocols/sametime/sametime.c:4943
+#: ../libgaim/protocols/sametime/sametime.c:4945
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10285,63 +12032,63 @@
 "Erreur à la lecture du fichier « %s » :\n"
 "%s\n"
 
-#: ../src/protocols/sametime/sametime.c:5074
+#: ../libgaim/protocols/sametime/sametime.c:5077
 msgid "Remotely Stored Buddy List"
 msgstr "Liste de contacts stockée sur le serveur"
 
-#: ../src/protocols/sametime/sametime.c:5079
+#: ../libgaim/protocols/sametime/sametime.c:5082
 msgid "Buddy List Storage Mode"
 msgstr "Mode de stockage de la liste de contacts"
 
-#: ../src/protocols/sametime/sametime.c:5082
+#: ../libgaim/protocols/sametime/sametime.c:5085
 msgid "Local Buddy List Only"
 msgstr "Liste de contacts en local uniquement"
 
-#: ../src/protocols/sametime/sametime.c:5084
+#: ../libgaim/protocols/sametime/sametime.c:5087
 msgid "Merge List from Server"
 msgstr "Fusionner avec la liste du serveur"
 
-#: ../src/protocols/sametime/sametime.c:5086
+#: ../libgaim/protocols/sametime/sametime.c:5089
 msgid "Merge and Save List to Server"
 msgstr "Fusionner et envoyer la liste sur le serveur"
 
-#: ../src/protocols/sametime/sametime.c:5088
+#: ../libgaim/protocols/sametime/sametime.c:5091
 msgid "Synchronize List with Server"
 msgstr "Synchroniser la liste avec le serveur"
 
-#: ../src/protocols/sametime/sametime.c:5137
+#: ../libgaim/protocols/sametime/sametime.c:5140
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Importer la liste Sametime du compte %s"
 
-#: ../src/protocols/sametime/sametime.c:5176
+#: ../libgaim/protocols/sametime/sametime.c:5179
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Exporter la liste Sametime du compte %s"
 
-#: ../src/protocols/sametime/sametime.c:5229
+#: ../libgaim/protocols/sametime/sametime.c:5232
 msgid "Unable to add group: group exists"
 msgstr "Impossible d'ajouter ce groupe parce qu'il existe déjà."
 
-#: ../src/protocols/sametime/sametime.c:5230
+#: ../libgaim/protocols/sametime/sametime.c:5233
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Un group nommé « %s » existe déjà dans votre liste de contacts."
 
-#: ../src/protocols/sametime/sametime.c:5233
-#: ../src/protocols/sametime/sametime.c:5362
+#: ../libgaim/protocols/sametime/sametime.c:5236
+#: ../libgaim/protocols/sametime/sametime.c:5365
 msgid "Unable to add group"
 msgstr "Impossible d'ajouter le groupe"
 
-#: ../src/protocols/sametime/sametime.c:5292
+#: ../libgaim/protocols/sametime/sametime.c:5295
 msgid "Possible Matches"
 msgstr "Correspondances possibles"
 
-#: ../src/protocols/sametime/sametime.c:5308
+#: ../libgaim/protocols/sametime/sametime.c:5311
 msgid "Notes Address Book group results"
 msgstr "Correspondances des groupes dans le carnet d'adresses Notes"
 
-#: ../src/protocols/sametime/sametime.c:5309
+#: ../libgaim/protocols/sametime/sametime.c:5312
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -10352,15 +12099,15 @@
 "d'adresses Notes suivants. Veuillez choisir dans cette liste le groupe que "
 "vous voulez ajouter Ă  votre liste de contacts."
 
-#: ../src/protocols/sametime/sametime.c:5314
+#: ../libgaim/protocols/sametime/sametime.c:5317
 msgid "Select Notes Address Book"
 msgstr "Choisissez le carnet d'adresses Notes"
 
-#: ../src/protocols/sametime/sametime.c:5356
+#: ../libgaim/protocols/sametime/sametime.c:5359
 msgid "Unable to add group: group not found"
 msgstr "Impossible d'ajouter ce groupe parce qu'il n'existe pas."
 
-#: ../src/protocols/sametime/sametime.c:5358
+#: ../libgaim/protocols/sametime/sametime.c:5361
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -10368,11 +12115,11 @@
 msgstr ""
 "L'identifiant « %s » ne correspond à aucun groupe du carnet d'adresses Notes."
 
-#: ../src/protocols/sametime/sametime.c:5399
+#: ../libgaim/protocols/sametime/sametime.c:5402
 msgid "Notes Address Book Group"
 msgstr "Groupe du carnet d'adresses Notes"
 
-#: ../src/protocols/sametime/sametime.c:5400
+#: ../libgaim/protocols/sametime/sametime.c:5403
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
@@ -10380,12 +12127,12 @@
 "Saisissez le nom d'un groupe de carnet d'adresses Notes dans la rubrique ci-"
 "dessous pour ajouter le groupe et ses membres dans votre liste de contacts."
 
-#: ../src/protocols/sametime/sametime.c:5448
+#: ../libgaim/protocols/sametime/sametime.c:5451
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Résultats de la recherche sur « %s »"
 
-#: ../src/protocols/sametime/sametime.c:5449
+#: ../libgaim/protocols/sametime/sametime.c:5452
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -10396,26 +12143,26 @@
 "Vous pouvez ajouter ces utilisateurs Ă  votre liste de contacts ou leur "
 "envoyer un message avec les boutons ci-dessous."
 
-#: ../src/protocols/sametime/sametime.c:5481
+#: ../libgaim/protocols/sametime/sametime.c:5484
 msgid "No matches"
 msgstr "Aucun résultat"
 
-#: ../src/protocols/sametime/sametime.c:5482
+#: ../libgaim/protocols/sametime/sametime.c:5485
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 "L'identifiant « %s » ne correspond à aucun utilisateur de la communauté "
 "Sametime."
 
-#: ../src/protocols/sametime/sametime.c:5486
+#: ../libgaim/protocols/sametime/sametime.c:5489
 msgid "No Matches"
 msgstr "Aucun résultat"
 
-#: ../src/protocols/sametime/sametime.c:5523
+#: ../libgaim/protocols/sametime/sametime.c:5526
 msgid "Search for a user"
 msgstr "Rechercher un utilisateur"
 
-#: ../src/protocols/sametime/sametime.c:5524
+#: ../libgaim/protocols/sametime/sametime.c:5527
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -10423,90 +12170,90 @@
 "Saisissez un nom ou un identifiant partiel ci-dessous pour rechercher des "
 "utilisateurs correspondants dans la communauté Sametime."
 
-#: ../src/protocols/sametime/sametime.c:5527
+#: ../libgaim/protocols/sametime/sametime.c:5530
 msgid "User Search"
 msgstr "Recherche d'utilisateurs"
 
-#: ../src/protocols/sametime/sametime.c:5539
+#: ../libgaim/protocols/sametime/sametime.c:5542
 msgid "Import Sametime List..."
 msgstr "Importer une liste Sametime..."
 
-#: ../src/protocols/sametime/sametime.c:5543
+#: ../libgaim/protocols/sametime/sametime.c:5546
 msgid "Export Sametime List..."
 msgstr "Exporter une liste Sametime..."
 
-#: ../src/protocols/sametime/sametime.c:5547
+#: ../libgaim/protocols/sametime/sametime.c:5550
 msgid "Add Notes Address Book Group..."
 msgstr "Ajouter un groupe de carnet d'adresses Notes..."
 
-#: ../src/protocols/sametime/sametime.c:5551
+#: ../libgaim/protocols/sametime/sametime.c:5554
 msgid "User Search..."
 msgstr "Recherche d'utilisateurs..."
 
-#: ../src/protocols/sametime/sametime.c:5648
+#: ../libgaim/protocols/sametime/sametime.c:5651
 msgid "Force login (ignore server redirects)"
 msgstr "Forcer la connexion (ignorer les redirections du serveur)"
 
 #. pretend to be Sametime Connect
-#: ../src/protocols/sametime/sametime.c:5658
+#: ../libgaim/protocols/sametime/sametime.c:5661
 msgid "Hide client identity"
 msgstr "Cacher l'identité du client"
 
-#: ../src/protocols/silc/buddy.c:52 ../src/protocols/silc/buddy.c:420
-#: ../src/protocols/silc/buddy.c:545 ../src/protocols/silc/buddy.c:711
-#: ../src/protocols/silc/ft.c:338
+#: ../libgaim/protocols/silc/buddy.c:52 ../libgaim/protocols/silc/buddy.c:420
+#: ../libgaim/protocols/silc/buddy.c:545 ../libgaim/protocols/silc/buddy.c:711
+#: ../libgaim/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "L'utilisateur %s n'est pas sur le réseau"
 
-#: ../src/protocols/silc/buddy.c:53 ../src/protocols/silc/buddy.c:115
-#: ../src/protocols/silc/buddy.c:120 ../src/protocols/silc/buddy.c:124
-#: ../src/protocols/silc/buddy.c:129 ../src/protocols/silc/buddy.c:134
-#: ../src/protocols/silc/buddy.c:139 ../src/protocols/silc/buddy.c:257
+#: ../libgaim/protocols/silc/buddy.c:53 ../libgaim/protocols/silc/buddy.c:115
+#: ../libgaim/protocols/silc/buddy.c:120 ../libgaim/protocols/silc/buddy.c:124
+#: ../libgaim/protocols/silc/buddy.c:129 ../libgaim/protocols/silc/buddy.c:134
+#: ../libgaim/protocols/silc/buddy.c:139 ../libgaim/protocols/silc/buddy.c:257
 msgid "Key Agreement"
 msgstr "Accord de clé"
 
-#: ../src/protocols/silc/buddy.c:54
+#: ../libgaim/protocols/silc/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "Impossible d'effectuer l'accord de clé"
 
-#: ../src/protocols/silc/buddy.c:116
+#: ../libgaim/protocols/silc/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "Erreur pendant l'accord de clé"
 
-#: ../src/protocols/silc/buddy.c:120
+#: ../libgaim/protocols/silc/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "Échec de l'accord de clé"
 
-#: ../src/protocols/silc/buddy.c:125
+#: ../libgaim/protocols/silc/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "Connexion morte pendant l'accord de clé"
 
-#: ../src/protocols/silc/buddy.c:130
+#: ../libgaim/protocols/silc/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "Annulation de l'accord de clé"
 
-#: ../src/protocols/silc/buddy.c:135
+#: ../libgaim/protocols/silc/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "Accord de clé déjà commencé"
 
-#: ../src/protocols/silc/buddy.c:140
+#: ../libgaim/protocols/silc/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "L'accord de clé ne peut pas se faire sur soi-même"
 
-#: ../src/protocols/silc/buddy.c:258 ../src/protocols/silc/buddy.c:388
-#: ../src/protocols/silc/buddy.c:513
+#: ../libgaim/protocols/silc/buddy.c:258 ../libgaim/protocols/silc/buddy.c:388
+#: ../libgaim/protocols/silc/buddy.c:513
 msgid "The remote user is not present in the network any more"
 msgstr "Le correspondant n'est plus présent sur le réseau"
 
-#: ../src/protocols/silc/buddy.c:294
+#: ../libgaim/protocols/silc/buddy.c:294
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
 msgstr "Accord de clé demandé par %s. Voulez-vous établir cet accord ?"
 
-#: ../src/protocols/silc/buddy.c:298
+#: ../libgaim/protocols/silc/buddy.c:298
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -10517,59 +12264,60 @@
 "Hôte distant : %s\n"
 "Port distant : %d"
 
-#: ../src/protocols/silc/buddy.c:311
+#: ../libgaim/protocols/silc/buddy.c:311
 msgid "Key Agreement Request"
 msgstr "Requête d'accord de clé"
 
-#: ../src/protocols/silc/buddy.c:387 ../src/protocols/silc/buddy.c:422
-#: ../src/protocols/silc/buddy.c:464
+#: ../libgaim/protocols/silc/buddy.c:387 ../libgaim/protocols/silc/buddy.c:422
+#: ../libgaim/protocols/silc/buddy.c:464
 msgid "IM With Password"
 msgstr "Message avec mot de passe"
 
-#: ../src/protocols/silc/buddy.c:423
+#: ../libgaim/protocols/silc/buddy.c:423
 msgid "Cannot set IM key"
 msgstr "Impossible de choisir la clé du message"
 
-#: ../src/protocols/silc/buddy.c:465
+#: ../libgaim/protocols/silc/buddy.c:465
 msgid "Set IM Password"
 msgstr "Mot de passe du message"
 
-#: ../src/protocols/silc/buddy.c:512 ../src/protocols/silc/buddy.c:547
-#: ../src/protocols/silc/ops.c:1492 ../src/protocols/silc/ops.c:1503
+#: ../libgaim/protocols/silc/buddy.c:512 ../libgaim/protocols/silc/buddy.c:547
+#: ../libgaim/protocols/silc/ops.c:1491 ../libgaim/protocols/silc/ops.c:1502
 msgid "Get Public Key"
 msgstr "Récupérer la clé publique"
 
-#: ../src/protocols/silc/buddy.c:548 ../src/protocols/silc/ops.c:1493
-#: ../src/protocols/silc/ops.c:1504
+#: ../libgaim/protocols/silc/buddy.c:548 ../libgaim/protocols/silc/ops.c:1492
+#: ../libgaim/protocols/silc/ops.c:1503
 msgid "Cannot fetch the public key"
 msgstr "Impossible de récupérer la clé publique"
 
-#: ../src/protocols/silc/buddy.c:634 ../src/protocols/silc/buddy.c:1647
+#: ../libgaim/protocols/silc/buddy.c:634
+#: ../libgaim/protocols/silc/buddy.c:1647
 msgid "Show Public Key"
 msgstr "Afficher la clé publique"
 
-#: ../src/protocols/silc/buddy.c:635 ../src/protocols/silc/buddy.c:1030
-#: ../src/protocols/silc/chat.c:237
+#: ../libgaim/protocols/silc/buddy.c:635
+#: ../libgaim/protocols/silc/buddy.c:1030 ../libgaim/protocols/silc/chat.c:237
 msgid "Could not load public key"
 msgstr "Impossible de charger la clé publique"
 
-#: ../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
+#: ../libgaim/protocols/silc/buddy.c:712 ../libgaim/protocols/silc/ops.c:1086
+#: ../libgaim/protocols/silc/ops.c:1158 ../libgaim/protocols/silc/ops.c:1293
+#: ../libgaim/protocols/silc/ops.c:1294 ../libgaim/protocols/silc/ops.c:1312
 msgid "User Information"
 msgstr "Informations"
 
-#: ../src/protocols/silc/buddy.c:713 ../src/protocols/silc/ops.c:1160
-#: ../src/protocols/silc/ops.c:1314
+#: ../libgaim/protocols/silc/buddy.c:713 ../libgaim/protocols/silc/ops.c:1159
+#: ../libgaim/protocols/silc/ops.c:1313
 msgid "Cannot get user information"
 msgstr "Impossible de récupérer les informations"
 
-#: ../src/protocols/silc/buddy.c:734
+#: ../libgaim/protocols/silc/buddy.c:734
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "%s n'est pas un contact de confiance"
 
-#: ../src/protocols/silc/buddy.c:737
+#: ../libgaim/protocols/silc/buddy.c:737
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
@@ -10578,16 +12326,16 @@
 "clé publique. Utilisez « Récupérer clé publique » pour l'importer."
 
 #. Open file selector to select the public key.
-#: ../src/protocols/silc/buddy.c:1064
+#: ../libgaim/protocols/silc/buddy.c:1064
 msgid "Open..."
 msgstr "Ouvrir..."
 
-#: ../src/protocols/silc/buddy.c:1073
+#: ../libgaim/protocols/silc/buddy.c:1073
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "Le contact %s n'est pas présent sur le réseau"
 
-#: ../src/protocols/silc/buddy.c:1076
+#: ../libgaim/protocols/silc/buddy.c:1076
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -10595,15 +12343,15 @@
 "Vous devez importer la clé publique d'un contact pour pouvoir l'ajouter à la "
 "liste de contacts. Choisissez « Importer » pour ce faire."
 
-#: ../src/protocols/silc/buddy.c:1079
+#: ../libgaim/protocols/silc/buddy.c:1079
 msgid "_Import..."
 msgstr "_Importer..."
 
-#: ../src/protocols/silc/buddy.c:1175
+#: ../libgaim/protocols/silc/buddy.c:1175
 msgid "Select correct user"
 msgstr "Choisissez un des utilisateurs"
 
-#: ../src/protocols/silc/buddy.c:1177
+#: ../libgaim/protocols/silc/buddy.c:1177
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
@@ -10611,7 +12359,7 @@
 "Plusieurs utilisateurs ont la même clé publique. Choisissez l'utilisateur "
 "que vous voulez ajouter Ă  la liste de contacts."
 
-#: ../src/protocols/silc/buddy.c:1179
+#: ../libgaim/protocols/silc/buddy.c:1179
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -10619,213 +12367,213 @@
 "Plusieurs utilisateurs ont le mĂŞme nom. Choisissez l'utilisateur que vous "
 "voulez ajouter Ă  la liste de contacts."
 
-#: ../src/protocols/silc/buddy.c:1467
+#: ../libgaim/protocols/silc/buddy.c:1467
 msgid "Detached"
 msgstr "Détaché"
 
-#: ../src/protocols/silc/buddy.c:1471 ../src/protocols/silc/silc.c:55
+#: ../libgaim/protocols/silc/buddy.c:1471 ../libgaim/protocols/silc/silc.c:55
 msgid "Indisposed"
 msgstr "Indisposé"
 
-#: ../src/protocols/silc/buddy.c:1475 ../src/protocols/silc/silc.c:57
+#: ../libgaim/protocols/silc/buddy.c:1475 ../libgaim/protocols/silc/silc.c:57
 msgid "Wake Me Up"
 msgstr "RĂ©veillez-moi"
 
-#: ../src/protocols/silc/buddy.c:1477 ../src/protocols/silc/silc.c:49
+#: ../libgaim/protocols/silc/buddy.c:1477 ../libgaim/protocols/silc/silc.c:49
 msgid "Hyper Active"
 msgstr "Hyperactif"
 
-#: ../src/protocols/silc/buddy.c:1479
+#: ../libgaim/protocols/silc/buddy.c:1479
 msgid "Robot"
 msgstr "Robot"
 
-#: ../src/protocols/silc/buddy.c:1486 ../src/protocols/silc/silc.c:674
-#: ../src/protocols/silc/util.c:487
+#: ../libgaim/protocols/silc/buddy.c:1486 ../libgaim/protocols/silc/silc.c:672
+#: ../libgaim/protocols/silc/util.c:514
 msgid "Happy"
 msgstr "Heureux"
 
-#: ../src/protocols/silc/buddy.c:1488 ../src/protocols/silc/silc.c:676
-#: ../src/protocols/silc/util.c:489
+#: ../libgaim/protocols/silc/buddy.c:1488 ../libgaim/protocols/silc/silc.c:674
+#: ../libgaim/protocols/silc/util.c:516
 msgid "Sad"
 msgstr "Triste"
 
-#: ../src/protocols/silc/buddy.c:1490 ../src/protocols/silc/silc.c:678
-#: ../src/protocols/silc/util.c:491
+#: ../libgaim/protocols/silc/buddy.c:1490 ../libgaim/protocols/silc/silc.c:676
+#: ../libgaim/protocols/silc/util.c:518
 msgid "Angry"
 msgstr "En colère"
 
-#: ../src/protocols/silc/buddy.c:1492 ../src/protocols/silc/silc.c:680
-#: ../src/protocols/silc/util.c:493
+#: ../libgaim/protocols/silc/buddy.c:1492 ../libgaim/protocols/silc/silc.c:678
+#: ../libgaim/protocols/silc/util.c:520
 msgid "Jealous"
 msgstr "Jaloux"
 
-#: ../src/protocols/silc/buddy.c:1494 ../src/protocols/silc/silc.c:682
-#: ../src/protocols/silc/util.c:495
+#: ../libgaim/protocols/silc/buddy.c:1494 ../libgaim/protocols/silc/silc.c:680
+#: ../libgaim/protocols/silc/util.c:522
 msgid "Ashamed"
 msgstr "Honteux"
 
-#: ../src/protocols/silc/buddy.c:1496 ../src/protocols/silc/silc.c:684
-#: ../src/protocols/silc/util.c:497
+#: ../libgaim/protocols/silc/buddy.c:1496 ../libgaim/protocols/silc/silc.c:682
+#: ../libgaim/protocols/silc/util.c:524
 msgid "Invincible"
 msgstr "Invincible"
 
-#: ../src/protocols/silc/buddy.c:1498 ../src/protocols/silc/util.c:499
+#: ../libgaim/protocols/silc/buddy.c:1498 ../libgaim/protocols/silc/util.c:526
 msgid "In Love"
 msgstr "Amoureux"
 
-#: ../src/protocols/silc/buddy.c:1500 ../src/protocols/silc/silc.c:688
-#: ../src/protocols/silc/util.c:501
+#: ../libgaim/protocols/silc/buddy.c:1500 ../libgaim/protocols/silc/silc.c:686
+#: ../libgaim/protocols/silc/util.c:528
 msgid "Sleepy"
 msgstr "Somnolant"
 
-#: ../src/protocols/silc/buddy.c:1502 ../src/protocols/silc/silc.c:690
-#: ../src/protocols/silc/util.c:503
+#: ../libgaim/protocols/silc/buddy.c:1502 ../libgaim/protocols/silc/silc.c:688
+#: ../libgaim/protocols/silc/util.c:530
 msgid "Bored"
 msgstr "Ennuyé"
 
-#: ../src/protocols/silc/buddy.c:1504 ../src/protocols/silc/silc.c:692
-#: ../src/protocols/silc/util.c:505
+#: ../libgaim/protocols/silc/buddy.c:1504 ../libgaim/protocols/silc/silc.c:690
+#: ../libgaim/protocols/silc/util.c:532
 msgid "Excited"
 msgstr "Excité"
 
-#: ../src/protocols/silc/buddy.c:1506 ../src/protocols/silc/silc.c:694
-#: ../src/protocols/silc/util.c:507
+#: ../libgaim/protocols/silc/buddy.c:1506 ../libgaim/protocols/silc/silc.c:692
+#: ../libgaim/protocols/silc/util.c:534
 msgid "Anxious"
 msgstr "Anxieux"
 
-#: ../src/protocols/silc/buddy.c:1534 ../src/protocols/silc/ops.c:1196
+#: ../libgaim/protocols/silc/buddy.c:1534 ../libgaim/protocols/silc/ops.c:1195
 msgid "User Modes"
 msgstr "Mode utilisateur"
 
-#: ../src/protocols/silc/buddy.c:1550 ../src/protocols/silc/ops.c:1205
+#: ../libgaim/protocols/silc/buddy.c:1550 ../libgaim/protocols/silc/ops.c:1204
 msgid "Mood"
 msgstr "Humeur"
 
-#: ../src/protocols/silc/buddy.c:1555 ../src/protocols/silc/ops.c:1217
+#: ../libgaim/protocols/silc/buddy.c:1555 ../libgaim/protocols/silc/ops.c:1216
 msgid "Preferred Contact"
 msgstr "Méthodes de contact préférées"
 
-#: ../src/protocols/silc/buddy.c:1560 ../src/protocols/silc/ops.c:1222
+#: ../libgaim/protocols/silc/buddy.c:1560 ../libgaim/protocols/silc/ops.c:1221
 msgid "Preferred Language"
 msgstr "Langue préférée"
 
-#: ../src/protocols/silc/buddy.c:1565 ../src/protocols/silc/ops.c:1227
+#: ../libgaim/protocols/silc/buddy.c:1565 ../libgaim/protocols/silc/ops.c:1226
 msgid "Device"
 msgstr "Appareil"
 
-#: ../src/protocols/silc/buddy.c:1570 ../src/protocols/silc/ops.c:1232
-#: ../src/protocols/silc/silc.c:742 ../src/protocols/silc/silc.c:744
+#: ../libgaim/protocols/silc/buddy.c:1570 ../libgaim/protocols/silc/ops.c:1231
+#: ../libgaim/protocols/silc/silc.c:740 ../libgaim/protocols/silc/silc.c:742
 msgid "Timezone"
 msgstr "Fuseau horaire"
 
-#: ../src/protocols/silc/buddy.c:1575 ../src/protocols/silc/ops.c:1237
+#: ../libgaim/protocols/silc/buddy.c:1575 ../libgaim/protocols/silc/ops.c:1236
 msgid "Geolocation"
 msgstr "Localisation"
 
-#: ../src/protocols/silc/buddy.c:1629
+#: ../libgaim/protocols/silc/buddy.c:1629
 msgid "Reset IM Key"
 msgstr "Remise à zéro de la clé de message"
 
-#: ../src/protocols/silc/buddy.c:1635
+#: ../libgaim/protocols/silc/buddy.c:1635
 msgid "IM with Key Exchange"
 msgstr "Message avec échange de clé"
 
-#: ../src/protocols/silc/buddy.c:1640
+#: ../libgaim/protocols/silc/buddy.c:1640
 msgid "IM with Password"
 msgstr "Message avec mot de passe"
 
-#: ../src/protocols/silc/buddy.c:1653
+#: ../libgaim/protocols/silc/buddy.c:1653
 msgid "Get Public Key..."
 msgstr "Récupérer la clé publique..."
 
-#: ../src/protocols/silc/buddy.c:1660 ../src/protocols/silc/ops.c:1623
+#: ../libgaim/protocols/silc/buddy.c:1660 ../libgaim/protocols/silc/ops.c:1621
 msgid "Kill User"
 msgstr "Tuer l'utilisateur"
 
-#: ../src/protocols/silc/buddy.c:1670 ../src/protocols/silc/chat.c:972
+#: ../libgaim/protocols/silc/buddy.c:1670 ../libgaim/protocols/silc/chat.c:972
 msgid "Draw On Whiteboard"
 msgstr "Dessiner sur le tableau"
 
-#: ../src/protocols/silc/chat.c:39
+#: ../libgaim/protocols/silc/chat.c:39
 msgid "_Passphrase:"
 msgstr "_Phrase clé :"
 
-#: ../src/protocols/silc/chat.c:80
+#: ../libgaim/protocols/silc/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "Le salon %s n'existe pas sur le réseau"
 
-#: ../src/protocols/silc/chat.c:81 ../src/protocols/silc/chat.c:174
+#: ../libgaim/protocols/silc/chat.c:81 ../libgaim/protocols/silc/chat.c:174
 msgid "Channel Information"
 msgstr "Informations du salon"
 
-#: ../src/protocols/silc/chat.c:82
+#: ../libgaim/protocols/silc/chat.c:82
 msgid "Cannot get channel information"
 msgstr "Impossible de récupérer les informations du salon"
 
-#: ../src/protocols/silc/chat.c:119
+#: ../libgaim/protocols/silc/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Nom du salon :</b> %s"
 
-#: ../src/protocols/silc/chat.c:122
+#: ../libgaim/protocols/silc/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Nombre d'utilisateurs :</b> %d"
 
-#: ../src/protocols/silc/chat.c:129
+#: ../libgaim/protocols/silc/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Fondateur du salon :</b> %s"
 
-#: ../src/protocols/silc/chat.c:138
+#: ../libgaim/protocols/silc/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Phrase clé du salon :</b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../src/protocols/silc/chat.c:142
+#: ../libgaim/protocols/silc/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>Clé HMAC du salon :</b> %s"
 
-#: ../src/protocols/silc/chat.c:147
+#: ../libgaim/protocols/silc/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Sujet :</b><br>%s"
 
-#: ../src/protocols/silc/chat.c:152
+#: ../libgaim/protocols/silc/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Mode du salon :</b> "
 
-#: ../src/protocols/silc/chat.c:165
+#: ../libgaim/protocols/silc/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Empreinte de clé publique du fondateur :</b><br>%s"
 
-#: ../src/protocols/silc/chat.c:166
+#: ../libgaim/protocols/silc/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Babillage de clé publique du fondateur :</b><br>%s"
 
-#: ../src/protocols/silc/chat.c:236
+#: ../libgaim/protocols/silc/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Ajouter une clé publique au salon"
 
 #. Add new public key
-#: ../src/protocols/silc/chat.c:291
+#: ../libgaim/protocols/silc/chat.c:291
 msgid "Open Public Key..."
 msgstr "Ouvrir clé publique..."
 
-#: ../src/protocols/silc/chat.c:400
+#: ../libgaim/protocols/silc/chat.c:400
 msgid "Channel Passphrase"
 msgstr "Phrase clé du salon"
 
-#: ../src/protocols/silc/chat.c:407
+#: ../libgaim/protocols/silc/chat.c:407
 msgid "Channel Public Keys List"
 msgstr "Clés publiques du salon"
 
-#: ../src/protocols/silc/chat.c:412
+#: ../libgaim/protocols/silc/chat.c:412
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -10839,324 +12587,320 @@
 "pour joindre le salon. Si des clés publiques sont utilisées, seuls les "
 "utilisateurs de ces clés peuvent joindre le salon."
 
-#: ../src/protocols/silc/chat.c:421 ../src/protocols/silc/chat.c:422
-#: ../src/protocols/silc/chat.c:459 ../src/protocols/silc/chat.c:460
-#: ../src/protocols/silc/chat.c:906
+#: ../libgaim/protocols/silc/chat.c:421 ../libgaim/protocols/silc/chat.c:422
+#: ../libgaim/protocols/silc/chat.c:459 ../libgaim/protocols/silc/chat.c:460
+#: ../libgaim/protocols/silc/chat.c:906
 msgid "Channel Authentication"
 msgstr "Authentification du salon"
 
-#: ../src/protocols/silc/chat.c:423 ../src/protocols/silc/chat.c:461
+#: ../libgaim/protocols/silc/chat.c:423 ../libgaim/protocols/silc/chat.c:461
 msgid "Add / Remove"
 msgstr "Ajouter/Supprimer"
 
-#: ../src/protocols/silc/chat.c:578
+#: ../libgaim/protocols/silc/chat.c:578
 msgid "Group Name"
 msgstr "Nom du groupe"
 
-#: ../src/protocols/silc/chat.c:582 ../src/protocols/silc/ops.c:1908
-#: ../src/protocols/silc/silc.c:950
+#: ../libgaim/protocols/silc/chat.c:582 ../libgaim/protocols/silc/ops.c:1906
+#: ../libgaim/protocols/silc/silc.c:948
 msgid "Passphrase"
 msgstr "Phrase clé"
 
-#: ../src/protocols/silc/chat.c:593
+#: ../libgaim/protocols/silc/chat.c:593
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Saisissez le groupe privé et la phrase clé du salon %s"
 
-#: ../src/protocols/silc/chat.c:595
+#: ../libgaim/protocols/silc/chat.c:595
 msgid "Add Channel Private Group"
 msgstr "Ajouter un groupe privé au salon"
 
-#: ../src/protocols/silc/chat.c:722
+#: ../libgaim/protocols/silc/chat.c:722
 msgid "User Limit"
 msgstr "Limite d'utilisateurs"
 
-#: ../src/protocols/silc/chat.c:723
+#: ../libgaim/protocols/silc/chat.c:723
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Nombre d'utilisateurs maximum du salon. ZĂ©ro pour ne pas mettre de limite."
 
-#: ../src/protocols/silc/chat.c:878
-msgid "Get Info"
-msgstr "Infos"
-
-#: ../src/protocols/silc/chat.c:886
+#: ../libgaim/protocols/silc/chat.c:886
 msgid "Invite List"
 msgstr "Liste d'invitations"
 
-#: ../src/protocols/silc/chat.c:891
+#: ../libgaim/protocols/silc/chat.c:891
 msgid "Ban List"
 msgstr "Liste des bannissements"
 
-#: ../src/protocols/silc/chat.c:899
+#: ../libgaim/protocols/silc/chat.c:899
 msgid "Add Private Group"
 msgstr "Nouveau groupe privé"
 
-#: ../src/protocols/silc/chat.c:912
+#: ../libgaim/protocols/silc/chat.c:912
 msgid "Reset Permanent"
 msgstr "Enlever le mode permanent"
 
-#: ../src/protocols/silc/chat.c:917
+#: ../libgaim/protocols/silc/chat.c:917
 msgid "Set Permanent"
 msgstr "Mettre le mode permanent"
 
-#: ../src/protocols/silc/chat.c:925
+#: ../libgaim/protocols/silc/chat.c:925
 msgid "Set User Limit"
 msgstr "Choisir la limite d'utilisateurs"
 
-#: ../src/protocols/silc/chat.c:931
+#: ../libgaim/protocols/silc/chat.c:931
 msgid "Reset Topic Restriction"
 msgstr "Enlever le mode sujet restreint"
 
-#: ../src/protocols/silc/chat.c:936
+#: ../libgaim/protocols/silc/chat.c:936
 msgid "Set Topic Restriction"
 msgstr "Mettre le mode sujet restreint"
 
-#: ../src/protocols/silc/chat.c:943
+#: ../libgaim/protocols/silc/chat.c:943
 msgid "Reset Private Channel"
 msgstr "Enlever le mode privé"
 
-#: ../src/protocols/silc/chat.c:948
+#: ../libgaim/protocols/silc/chat.c:948
 msgid "Set Private Channel"
 msgstr "Mettre le mode privé"
 
-#: ../src/protocols/silc/chat.c:955
+#: ../libgaim/protocols/silc/chat.c:955
 msgid "Reset Secret Channel"
 msgstr "Enlever le mode secret"
 
-#: ../src/protocols/silc/chat.c:960
+#: ../libgaim/protocols/silc/chat.c:960
 msgid "Set Secret Channel"
 msgstr "Mettre le mode secret"
 
-#: ../src/protocols/silc/chat.c:1034
+#: ../libgaim/protocols/silc/chat.c:1034
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Vous avez fondé le salon sur <I>%s</I>"
 
-#: ../src/protocols/silc/chat.c:1038
+#: ../libgaim/protocols/silc/chat.c:1038
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "<I>%2$s</I> a fondé le salon sur <I>%1$s</I>"
 
-#: ../src/protocols/silc/chat.c:1097
+#: ../libgaim/protocols/silc/chat.c:1097
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr ""
 "Vous devez entrer dans le salon %s avant de pouvoir intégrer le groupe privé"
 
-#: ../src/protocols/silc/chat.c:1099
+#: ../libgaim/protocols/silc/chat.c:1099
 msgid "Join Private Group"
 msgstr "Joindre un groupe privé"
 
-#: ../src/protocols/silc/chat.c:1100
+#: ../libgaim/protocols/silc/chat.c:1100
 msgid "Cannot join private group"
 msgstr "Impossible de joindre le groupe privé"
 
-#: ../src/protocols/silc/chat.c:1294 ../src/protocols/silc/silc.c:1158
+#: ../libgaim/protocols/silc/chat.c:1294 ../libgaim/protocols/silc/silc.c:1156
 msgid "Call Command"
 msgstr "Commande d'appel"
 
-#: ../src/protocols/silc/chat.c:1294 ../src/protocols/silc/silc.c:1158
+#: ../libgaim/protocols/silc/chat.c:1294 ../libgaim/protocols/silc/silc.c:1156
 msgid "Cannot call command"
 msgstr "Impossible de lancer la commande"
 
-#: ../src/protocols/silc/chat.c:1295 ../src/protocols/silc/silc.c:1159
+#: ../libgaim/protocols/silc/chat.c:1295 ../libgaim/protocols/silc/silc.c:1157
 msgid "Unknown command"
 msgstr "Commande inconnue"
 
-#: ../src/protocols/silc/ft.c:89 ../src/protocols/silc/ft.c:92
-#: ../src/protocols/silc/ft.c:96 ../src/protocols/silc/ft.c:100
-#: ../src/protocols/silc/ft.c:104 ../src/protocols/silc/ft.c:205
-#: ../src/protocols/silc/ft.c:210 ../src/protocols/silc/ft.c:215
-#: ../src/protocols/silc/ft.c:221 ../src/protocols/silc/ft.c:340
+#: ../libgaim/protocols/silc/ft.c:89 ../libgaim/protocols/silc/ft.c:92
+#: ../libgaim/protocols/silc/ft.c:96 ../libgaim/protocols/silc/ft.c:100
+#: ../libgaim/protocols/silc/ft.c:104 ../libgaim/protocols/silc/ft.c:205
+#: ../libgaim/protocols/silc/ft.c:210 ../libgaim/protocols/silc/ft.c:215
+#: ../libgaim/protocols/silc/ft.c:221 ../libgaim/protocols/silc/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Transfert de fichier sécurisé"
 
-#: ../src/protocols/silc/ft.c:90 ../src/protocols/silc/ft.c:93
-#: ../src/protocols/silc/ft.c:97 ../src/protocols/silc/ft.c:101
-#: ../src/protocols/silc/ft.c:105
+#: ../libgaim/protocols/silc/ft.c:90 ../libgaim/protocols/silc/ft.c:93
+#: ../libgaim/protocols/silc/ft.c:97 ../libgaim/protocols/silc/ft.c:101
+#: ../libgaim/protocols/silc/ft.c:105
 msgid "Error during file transfer"
 msgstr "Erreur pendant le transfert de fichier"
 
-#: ../src/protocols/silc/ft.c:94
+#: ../libgaim/protocols/silc/ft.c:94
 msgid "Permission denied"
 msgstr "Permission refusée"
 
-#: ../src/protocols/silc/ft.c:98
+#: ../libgaim/protocols/silc/ft.c:98
 msgid "Key agreement failed"
 msgstr "Échec de l'accord de clé"
 
-#: ../src/protocols/silc/ft.c:102
+#: ../libgaim/protocols/silc/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "Session de transfert de fichier inexistante."
 
-#: ../src/protocols/silc/ft.c:206
+#: ../libgaim/protocols/silc/ft.c:206
 msgid "No file transfer session active"
 msgstr "Aucune session de transfert de fichier active"
 
-#: ../src/protocols/silc/ft.c:211
+#: ../libgaim/protocols/silc/ft.c:211
 msgid "File transfer already started"
 msgstr "Transfert de fichier déjà commencé"
 
-#: ../src/protocols/silc/ft.c:216
+#: ../libgaim/protocols/silc/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "Impossible de faire l'accord de clé pour le transfert de fichier"
 
-#: ../src/protocols/silc/ft.c:222
+#: ../libgaim/protocols/silc/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "Impossible de commencer le transfert de fichier"
 
-#: ../src/protocols/silc/ft.c:341
+#: ../libgaim/protocols/silc/ft.c:341
 msgid "Cannot send file"
 msgstr "Impossible d'envoyer le fichier"
 
 # c-format
-#: ../src/protocols/silc/ops.c:555 ../src/protocols/silc/ops.c:564
-#: ../src/protocols/silc/ops.c:573
+#: ../libgaim/protocols/silc/ops.c:554 ../libgaim/protocols/silc/ops.c:563
+#: ../libgaim/protocols/silc/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s a changé le sujet de <I>%s</I> en : %s"
 
-#: ../src/protocols/silc/ops.c:639
+#: ../libgaim/protocols/silc/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> change le mode de <I>%s</I> en : %s"
 
-#: ../src/protocols/silc/ops.c:643
+#: ../libgaim/protocols/silc/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> a supprimé tous les modes de <I>%s</I>"
 
-#: ../src/protocols/silc/ops.c:676
+#: ../libgaim/protocols/silc/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> change le mode de <I>%s</I> en : %s"
 
-#: ../src/protocols/silc/ops.c:684
+#: ../libgaim/protocols/silc/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> a supprimé tous les modes de <I>%s</I>"
 
-#: ../src/protocols/silc/ops.c:713
+#: ../libgaim/protocols/silc/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Vous avez été expulsé de <I>%s</I> par <I>%s</I> (%s)"
 
-#: ../src/protocols/silc/ops.c:743 ../src/protocols/silc/ops.c:748
-#: ../src/protocols/silc/ops.c:753
+#: ../libgaim/protocols/silc/ops.c:742 ../libgaim/protocols/silc/ops.c:747
+#: ../libgaim/protocols/silc/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Vous avez été tué par %s (%s)"
 
-#: ../src/protocols/silc/ops.c:774 ../src/protocols/silc/ops.c:779
-#: ../src/protocols/silc/ops.c:784
+#: ../libgaim/protocols/silc/ops.c:773 ../libgaim/protocols/silc/ops.c:778
+#: ../libgaim/protocols/silc/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Tué par %s (%s)"
 
-#: ../src/protocols/silc/ops.c:830
+#: ../libgaim/protocols/silc/ops.c:829
 msgid "Server signoff"
 msgstr "DĂ©connexion du serveur"
 
-#: ../src/protocols/silc/ops.c:1017
+#: ../libgaim/protocols/silc/ops.c:1016
 msgid "Personal Information"
 msgstr "Informations personnelles"
 
-#: ../src/protocols/silc/ops.c:1040
+#: ../libgaim/protocols/silc/ops.c:1039
 msgid "Birth Day"
 msgstr "Date de naissance"
 
-#: ../src/protocols/silc/ops.c:1048
+#: ../libgaim/protocols/silc/ops.c:1047
 msgid "Job Role"
 msgstr "RĂ´le"
 
-#: ../src/protocols/silc/ops.c:1052 ../src/protocols/silc/silc.c:943
+#: ../libgaim/protocols/silc/ops.c:1051 ../libgaim/protocols/silc/silc.c:941
 msgid "Organization"
 msgstr "Organisation"
 
-#: ../src/protocols/silc/ops.c:1056
+#: ../libgaim/protocols/silc/ops.c:1055
 msgid "Unit"
 msgstr "Groupe"
 
-#: ../src/protocols/silc/ops.c:1080
+#: ../libgaim/protocols/silc/ops.c:1079
 msgid "Note"
 msgstr "Commentaire"
 
-#: ../src/protocols/silc/ops.c:1128
+#: ../libgaim/protocols/silc/ops.c:1127
 msgid "Join Chat"
 msgstr "Joindre une discussion"
 
-#: ../src/protocols/silc/ops.c:1183 ../src/protocols/silc/ops.c:1332
-#: ../src/protocols/yahoo/yahoo_profile.c:1046
+#: ../libgaim/protocols/silc/ops.c:1182 ../libgaim/protocols/silc/ops.c:1331
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1060
 msgid "Real Name"
 msgstr "Nom réel"
 
-#: ../src/protocols/silc/ops.c:1211
+#: ../libgaim/protocols/silc/ops.c:1210
 msgid "Status Text"
 msgstr "Texte d'Ă©tat"
 
-#: ../src/protocols/silc/ops.c:1284 ../src/protocols/silc/ops.c:1354
+#: ../libgaim/protocols/silc/ops.c:1283 ../libgaim/protocols/silc/ops.c:1353
 msgid "Public Key Fingerprint"
 msgstr "Empreinte de clé publique"
 
-#: ../src/protocols/silc/ops.c:1285 ../src/protocols/silc/ops.c:1355
+#: ../libgaim/protocols/silc/ops.c:1284 ../libgaim/protocols/silc/ops.c:1354
 msgid "Public Key Babbleprint"
 msgstr "Babillage de clé publique"
 
-#: ../src/protocols/silc/ops.c:1298
+#: ../libgaim/protocols/silc/ops.c:1297
 msgid "_More..."
 msgstr "_Plus..."
 
-#: ../src/protocols/silc/ops.c:1369 ../src/protocols/silc/silc.c:1009
+#: ../libgaim/protocols/silc/ops.c:1368 ../libgaim/protocols/silc/silc.c:1007
 msgid "Detach From Server"
 msgstr "Se détacher du serveur"
 
-#: ../src/protocols/silc/ops.c:1369
+#: ../libgaim/protocols/silc/ops.c:1368
 msgid "Cannot detach"
 msgstr "Impossible de se détacher"
 
-#: ../src/protocols/silc/ops.c:1380
+#: ../libgaim/protocols/silc/ops.c:1379
 msgid "Cannot set topic"
 msgstr "Impossible de changer le sujet"
 
-#: ../src/protocols/silc/ops.c:1412
+#: ../libgaim/protocols/silc/ops.c:1411
 msgid "Failed to change nickname"
 msgstr "Impossible de changer de pseudo"
 
-#: ../src/protocols/silc/ops.c:1460
+#: ../libgaim/protocols/silc/ops.c:1459
 msgid "Roomlist"
 msgstr "Liste des salons"
 
-#: ../src/protocols/silc/ops.c:1460
+#: ../libgaim/protocols/silc/ops.c:1459
 msgid "Cannot get room list"
 msgstr "Impossible de récupérer la liste des salons"
 
-#: ../src/protocols/silc/ops.c:1505
+#: ../libgaim/protocols/silc/ops.c:1504
 msgid "No public key was received"
 msgstr "Aucune clé publique reçue"
 
-#: ../src/protocols/silc/ops.c:1518 ../src/protocols/silc/ops.c:1531
+#: ../libgaim/protocols/silc/ops.c:1516 ../libgaim/protocols/silc/ops.c:1529
 msgid "Server Information"
 msgstr "Informations du serveur"
 
-#: ../src/protocols/silc/ops.c:1519
+#: ../libgaim/protocols/silc/ops.c:1517
 msgid "Cannot get server information"
 msgstr "Impossible de récupérer les informations du serveur"
 
-#: ../src/protocols/silc/ops.c:1548 ../src/protocols/silc/ops.c:1557
+#: ../libgaim/protocols/silc/ops.c:1546 ../libgaim/protocols/silc/ops.c:1555
 msgid "Server Statistics"
 msgstr "Statistiques du serveur"
 
-#: ../src/protocols/silc/ops.c:1549
+#: ../libgaim/protocols/silc/ops.c:1547
 msgid "Cannot get server statistics"
 msgstr "Impossible de récupérer les statistiques du serveur"
 
-#: ../src/protocols/silc/ops.c:1558
+#: ../libgaim/protocols/silc/ops.c:1556
 msgid "No server statistics available"
 msgstr "Aucune statistique du serveur disponible"
 
-#: ../src/protocols/silc/ops.c:1580
+#: ../libgaim/protocols/silc/ops.c:1578
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -11191,107 +12935,107 @@
 "Nombre total d'opérateurs de serveurs: %d\n"
 "Nombre total d'opérateurs de routeurs: %d\n"
 
-#: ../src/protocols/silc/ops.c:1603
+#: ../libgaim/protocols/silc/ops.c:1601
 msgid "Network Statistics"
 msgstr "Statistiques du réseau"
 
-#: ../src/protocols/silc/ops.c:1611 ../src/protocols/silc/ops.c:1616
+#: ../libgaim/protocols/silc/ops.c:1609 ../libgaim/protocols/silc/ops.c:1614
 msgid "Ping"
 msgstr "Ping"
 
-#: ../src/protocols/silc/ops.c:1611
+#: ../libgaim/protocols/silc/ops.c:1609
 msgid "Ping failed"
 msgstr "Échec du ping"
 
-#: ../src/protocols/silc/ops.c:1616
+#: ../libgaim/protocols/silc/ops.c:1614
 msgid "Ping reply received from server"
 msgstr "RĂ©ponse du ping par le serveur"
 
-#: ../src/protocols/silc/ops.c:1624
+#: ../libgaim/protocols/silc/ops.c:1622
 msgid "Could not kill user"
 msgstr "Impossible de tuer l'utilisateur"
 
-#: ../src/protocols/silc/ops.c:1708
+#: ../libgaim/protocols/silc/ops.c:1706
 msgid "Error during connecting to SILC Server"
 msgstr "Erreur Ă  la connexion au serveur SILC"
 
-#: ../src/protocols/silc/ops.c:1713
+#: ../libgaim/protocols/silc/ops.c:1711
 msgid "Key Exchange failed"
 msgstr "Échec de l'échange de clé"
 
-#: ../src/protocols/silc/ops.c:1722
+#: ../libgaim/protocols/silc/ops.c:1720
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "Échec de la reprise de session détachée. Choisissez « Reconnexion » pour "
 "créer une nouvelle connexion."
 
-#: ../src/protocols/silc/ops.c:1757
+#: ../libgaim/protocols/silc/ops.c:1755
 msgid "Disconnected by server"
 msgstr "DĂ©connexion par le serveur"
 
-#: ../src/protocols/silc/ops.c:1819 ../src/protocols/silc/ops.c:1866
-#: ../src/protocols/silc/silc.c:195
+#: ../libgaim/protocols/silc/ops.c:1817 ../libgaim/protocols/silc/ops.c:1864
+#: ../libgaim/protocols/silc/silc.c:189
 msgid "Resuming session"
 msgstr "Reprise de la session"
 
-#: ../src/protocols/silc/ops.c:1821
+#: ../libgaim/protocols/silc/ops.c:1819
 msgid "Authenticating connection"
 msgstr "Authentification de la connexion"
 
-#: ../src/protocols/silc/ops.c:1868
+#: ../libgaim/protocols/silc/ops.c:1866
 msgid "Verifying server public key"
 msgstr "Vérification de la clé publique du serveur"
 
-#: ../src/protocols/silc/ops.c:1909
+#: ../libgaim/protocols/silc/ops.c:1907
 msgid "Passphrase required"
 msgstr "Phrase clé nécessaire"
 
-#: ../src/protocols/silc/ops.c:1938
+#: ../libgaim/protocols/silc/ops.c:1936
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Échec : version incompatible, veuillez mettre à jour votre client"
 
-#: ../src/protocols/silc/ops.c:1941
+#: ../libgaim/protocols/silc/ops.c:1939
 msgid "Failure: Remote does not trust/support your public key"
 msgstr ""
 "Échec : le correspondant ne reconnaît pas ou ne fait pas confiance a votre "
 "clé publique"
 
-#: ../src/protocols/silc/ops.c:1944
+#: ../libgaim/protocols/silc/ops.c:1942
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Échec : le correspondant ne supporte pas le groupe KE proposé"
 
-#: ../src/protocols/silc/ops.c:1947
+#: ../libgaim/protocols/silc/ops.c:1945
 msgid "Failure: Remote does not support proposed cipher"
 msgstr ""
 "Échec : le correspondant ne supporte pas la méthode de chiffrement proposée"
 
-#: ../src/protocols/silc/ops.c:1950
+#: ../libgaim/protocols/silc/ops.c:1948
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Échec : le correspondant ne supporte pas le PKCS proposé"
 
-#: ../src/protocols/silc/ops.c:1953
+#: ../libgaim/protocols/silc/ops.c:1951
 msgid "Failure: Remote does not support proposed hash function"
 msgstr ""
 "Échec : le correspondant ne supporte pas la fonction de hachage proposée"
 
-#: ../src/protocols/silc/ops.c:1956
+#: ../libgaim/protocols/silc/ops.c:1954
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Échec : le correspondant ne supporte pas le HMAC proposé"
 
-#: ../src/protocols/silc/ops.c:1958
+#: ../libgaim/protocols/silc/ops.c:1956
 msgid "Failure: Incorrect signature"
 msgstr "Échec : signature incorrecte"
 
-#: ../src/protocols/silc/ops.c:1960
+#: ../libgaim/protocols/silc/ops.c:1958
 msgid "Failure: Invalid cookie"
 msgstr "Échec : cookie invalide"
 
-#: ../src/protocols/silc/ops.c:1971
+#: ../libgaim/protocols/silc/ops.c:1969
 msgid "Failure: Authentication failed"
 msgstr "Échec de l'authentification"
 
-#: ../src/protocols/silc/pk.c:103
+#: ../libgaim/protocols/silc/pk.c:103
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
@@ -11300,12 +13044,12 @@
 "La clé reçue de %s ne correspond pas à votre copie locale de cette clé "
 "publique. Voulez-vous néanmoins accepter cette clé publique ?"
 
-#: ../src/protocols/silc/pk.c:108
+#: ../libgaim/protocols/silc/pk.c:108
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "Voulez-vous acceptez la clé publique reçue de %s ?"
 
-#: ../src/protocols/silc/pk.c:112
+#: ../libgaim/protocols/silc/pk.c:112
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -11318,65 +13062,65 @@
 "%s\n"
 "%s\n"
 
-#: ../src/protocols/silc/pk.c:115 ../src/protocols/silc/pk.c:140
+#: ../libgaim/protocols/silc/pk.c:115 ../libgaim/protocols/silc/pk.c:140
 msgid "Verify Public Key"
 msgstr "Vérifier la clé publique"
 
-#: ../src/protocols/silc/pk.c:119
+#: ../libgaim/protocols/silc/pk.c:119
 msgid "_View..."
 msgstr "_Voir..."
 
-#: ../src/protocols/silc/pk.c:141
+#: ../libgaim/protocols/silc/pk.c:141
 msgid "Unsupported public key type"
 msgstr "Type de clé publique non supporté"
 
-#: ../src/protocols/silc/silc.c:162
+#: ../libgaim/protocols/silc/silc.c:160
 msgid "Connection failed"
 msgstr "Échec de la connexion"
 
-#: ../src/protocols/silc/silc.c:187
+#: ../libgaim/protocols/silc/silc.c:181
 msgid "Cannot initialize SILC Client connection"
 msgstr "Impossible d'initialiser la connexion client SILC"
 
-#: ../src/protocols/silc/silc.c:198
+#: ../libgaim/protocols/silc/silc.c:192
 msgid "Performing key exchange"
 msgstr "Échange de clé en cours"
 
-#: ../src/protocols/silc/silc.c:284
+#: ../libgaim/protocols/silc/silc.c:278
 msgid "Out of memory"
 msgstr "Pas assez de mémoire"
 
-#: ../src/protocols/silc/silc.c:330
+#: ../libgaim/protocols/silc/silc.c:324
 msgid "Cannot initialize SILC protocol"
 msgstr "Impossible d'initialiser le protocole SILC."
 
-#: ../src/protocols/silc/silc.c:337
+#: ../libgaim/protocols/silc/silc.c:331
 msgid "Cannot find/access ~/.silc directory"
 msgstr "Impossible de trouver ou d'accéder au dossier ~/.silc"
 
 #. Progress
-#: ../src/protocols/silc/silc.c:342
+#: ../libgaim/protocols/silc/silc.c:336
 msgid "Connecting to SILC Server"
 msgstr "Connexion au serveur SILC"
 
-#: ../src/protocols/silc/silc.c:351
+#: ../libgaim/protocols/silc/silc.c:345
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr "Impossible de charger la paire de clés SILC : %s"
 
-#: ../src/protocols/silc/silc.c:371
+#: ../libgaim/protocols/silc/silc.c:367
 msgid "Unable to create connection"
 msgstr "Impossible de créer une connexion."
 
-#: ../src/protocols/silc/silc.c:670
+#: ../libgaim/protocols/silc/silc.c:668
 msgid "Your Current Mood"
 msgstr "Votre humeur actuelle"
 
-#: ../src/protocols/silc/silc.c:686
+#: ../libgaim/protocols/silc/silc.c:684
 msgid "In love"
 msgstr "Amoureux"
 
-#: ../src/protocols/silc/silc.c:697
+#: ../libgaim/protocols/silc/silc.c:695
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -11384,43 +13128,43 @@
 "\n"
 "Vos méthodes de contact préférées"
 
-#: ../src/protocols/silc/silc.c:705 ../src/protocols/silc/util.c:532
+#: ../libgaim/protocols/silc/silc.c:703 ../libgaim/protocols/silc/util.c:559
 msgid "SMS"
 msgstr "SMS"
 
-#: ../src/protocols/silc/silc.c:707 ../src/protocols/silc/util.c:534
+#: ../libgaim/protocols/silc/silc.c:705 ../libgaim/protocols/silc/util.c:561
 msgid "MMS"
 msgstr "MMS"
 
-#: ../src/protocols/silc/silc.c:709
+#: ../libgaim/protocols/silc/silc.c:707
 msgid "Video conferencing"
 msgstr "Visioconférence"
 
-#: ../src/protocols/silc/silc.c:714
+#: ../libgaim/protocols/silc/silc.c:712
 msgid "Your Current Status"
 msgstr "Votre Ă©tat actuel"
 
-#: ../src/protocols/silc/silc.c:721
+#: ../libgaim/protocols/silc/silc.c:719
 msgid "Online Services"
 msgstr "Services en ligne"
 
-#: ../src/protocols/silc/silc.c:724
+#: ../libgaim/protocols/silc/silc.c:722
 msgid "Let others see what services you are using"
 msgstr "Publier les services utilisés"
 
-#: ../src/protocols/silc/silc.c:730
+#: ../libgaim/protocols/silc/silc.c:728
 msgid "Let others see what computer you are using"
 msgstr "Publier l'ordinateur utilisé"
 
-#: ../src/protocols/silc/silc.c:737
+#: ../libgaim/protocols/silc/silc.c:735
 msgid "Your VCard File"
 msgstr "Votre carte de visite VCard"
 
-#: ../src/protocols/silc/silc.c:749 ../src/protocols/silc/silc.c:750
+#: ../libgaim/protocols/silc/silc.c:747 ../libgaim/protocols/silc/silc.c:748
 msgid "User Online Status Attributes"
 msgstr "Attributs d'Ă©tat utilisateur"
 
-#: ../src/protocols/silc/silc.c:751
+#: ../libgaim/protocols/silc/silc.c:749
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -11430,168 +13174,169 @@
 "vos informations personnelles. Veuillez saisir les informations que vous "
 "voulez publier."
 
-#: ../src/protocols/silc/silc.c:791 ../src/protocols/silc/silc.c:797
-#: ../src/protocols/silc/silc.c:1436
+#: ../libgaim/protocols/silc/silc.c:789 ../libgaim/protocols/silc/silc.c:795
+#: ../libgaim/protocols/silc/silc.c:1434
 msgid "Message of the Day"
 msgstr "Message du jour"
 
-#: ../src/protocols/silc/silc.c:791
+#: ../libgaim/protocols/silc/silc.c:789
 msgid "No Message of the Day available"
 msgstr "Message du jour non disponible"
 
-#: ../src/protocols/silc/silc.c:792 ../src/protocols/silc/silc.c:1431
+#: ../libgaim/protocols/silc/silc.c:790 ../libgaim/protocols/silc/silc.c:1429
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Il n'y a pas de message du jour associé à cette connexion"
 
-#: ../src/protocols/silc/silc.c:843 ../src/protocols/silc/silc.c:887
-#: ../src/protocols/silc/silc.c:958 ../src/protocols/silc/silc.c:959
+#: ../libgaim/protocols/silc/silc.c:841 ../libgaim/protocols/silc/silc.c:885
+#: ../libgaim/protocols/silc/silc.c:956 ../libgaim/protocols/silc/silc.c:957
 msgid "Create New SILC Key Pair"
 msgstr "Créer une nouvelle paire de clés SILC"
 
-#: ../src/protocols/silc/silc.c:843
+#: ../libgaim/protocols/silc/silc.c:841
 msgid "Passphrases do not match"
 msgstr "Les phrases de passe diffèrent"
 
-#: ../src/protocols/silc/silc.c:887
+#: ../libgaim/protocols/silc/silc.c:885
 msgid "Key Pair Generation failed"
 msgstr "Échec de génération de la paire de clés"
 
-#: ../src/protocols/silc/silc.c:926
+#: ../libgaim/protocols/silc/silc.c:924
 msgid "Key length"
 msgstr "Longueur de clé"
 
-#: ../src/protocols/silc/silc.c:928
+#: ../libgaim/protocols/silc/silc.c:926
 msgid "Public key file"
 msgstr "Fichier de clé publique"
 
-#: ../src/protocols/silc/silc.c:930
+#: ../libgaim/protocols/silc/silc.c:928
 msgid "Private key file"
 msgstr "Fichier de clé privée"
 
-#: ../src/protocols/silc/silc.c:953
+#: ../libgaim/protocols/silc/silc.c:951
 msgid "Passphrase (retype)"
 msgstr "Mot de passe (pour vérification)"
 
-#: ../src/protocols/silc/silc.c:960
+#: ../libgaim/protocols/silc/silc.c:958
 msgid "Generate Key Pair"
 msgstr "Générer une paire de clés"
 
-#: ../src/protocols/silc/silc.c:1004
+#: ../libgaim/protocols/silc/silc.c:1002
 msgid "Online Status"
 msgstr "État en ligne"
 
-#: ../src/protocols/silc/silc.c:1013
+#: ../libgaim/protocols/silc/silc.c:1011
 msgid "View Message of the Day"
 msgstr "Voir le message du jour"
 
-#: ../src/protocols/silc/silc.c:1017
+#: ../libgaim/protocols/silc/silc.c:1015
 msgid "Create SILC Key Pair..."
 msgstr "Créer une paire de clés SILC..."
 
-#: ../src/protocols/silc/silc.c:1116
+#: ../libgaim/protocols/silc/silc.c:1114
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "<I>%s</I> n'est pas présent sur le réseau"
 
-#: ../src/protocols/silc/silc.c:1307
+#: ../libgaim/protocols/silc/silc.c:1305
 msgid "Topic too long"
 msgstr "Sujet trop long"
 
-#: ../src/protocols/silc/silc.c:1388
+#: ../libgaim/protocols/silc/silc.c:1386
 msgid "You must specify a nick"
 msgstr "Vous devez choisir un pseudo"
 
-#: ../src/protocols/silc/silc.c:1490
+#: ../libgaim/protocols/silc/silc.c:1488
 #, c-format
 msgid "channel %s not found"
 msgstr "Salon %s non trouvée"
 
-#: ../src/protocols/silc/silc.c:1495
+#: ../libgaim/protocols/silc/silc.c:1493
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "Le mode du salon %s est : %s"
 
-#: ../src/protocols/silc/silc.c:1497
+#: ../libgaim/protocols/silc/silc.c:1495
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "Le salon %s n'a pas de mode spécifique."
 
-#: ../src/protocols/silc/silc.c:1510
+#: ../libgaim/protocols/silc/silc.c:1508
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Impossible de changer le cmode de %s"
 
-#: ../src/protocols/silc/silc.c:1540
+#: ../libgaim/protocols/silc/silc.c:1538
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "Commande inconnue : %s (cela peut être un bug de Gaim)"
 
-#: ../src/protocols/silc/silc.c:1603
+#: ../libgaim/protocols/silc/silc.c:1601
 msgid "part [channel]:  Leave the chat"
 msgstr "part [salon] : Quitter le salon."
 
-#: ../src/protocols/silc/silc.c:1607
+#: ../libgaim/protocols/silc/silc.c:1605
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [salon] : Quitter le salon."
 
-#: ../src/protocols/silc/silc.c:1611
+#: ../libgaim/protocols/silc/silc.c:1609
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [nouveau sujet] : Voir ou changer le sujet du salon."
 
-#: ../src/protocols/silc/silc.c:1616
+#: ../libgaim/protocols/silc/silc.c:1614
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
 "join &lt;salon&gt; [mot de passe] : Joindre une discussion sur ce réseau."
 
-#: ../src/protocols/silc/silc.c:1620
+#: ../libgaim/protocols/silc/silc.c:1618
 msgid "list:  List channels on this network"
 msgstr "list : Récupérer la liste des salons du réseau."
 
-#: ../src/protocols/silc/silc.c:1624
+#: ../libgaim/protocols/silc/silc.c:1622
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;pseudo&gt; : Récupérer des informations sur une personne."
 
-#: ../src/protocols/silc/silc.c:1628 ../src/protocols/zephyr/zephyr.c:2629
+#: ../libgaim/protocols/silc/silc.c:1626
+#: ../libgaim/protocols/zephyr/zephyr.c:2681
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;pseudo&gt; &lt;message&gt; : Envoyer un message privé à une personne."
 
-#: ../src/protocols/silc/silc.c:1632
+#: ../libgaim/protocols/silc/silc.c:1630
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "msg &lt;pseudo&gt; &lt;message&gt; : Envoyer un message privé à une personne."
 
-#: ../src/protocols/silc/silc.c:1636
+#: ../libgaim/protocols/silc/silc.c:1634
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd : Voir le message du jour du serveur."
 
-#: ../src/protocols/silc/silc.c:1640
+#: ../libgaim/protocols/silc/silc.c:1638
 msgid "detach:  Detach this session"
 msgstr "detach : Détacher la session en cours."
 
-#: ../src/protocols/silc/silc.c:1644
+#: ../libgaim/protocols/silc/silc.c:1642
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr ""
 "quit [message] : Se déconnecter du serveur avec un message de départ "
 "facultatif."
 
-#: ../src/protocols/silc/silc.c:1648
+#: ../libgaim/protocols/silc/silc.c:1646
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;commande&gt; : Appeler une commande du client silc."
 
-#: ../src/protocols/silc/silc.c:1654
+#: ../libgaim/protocols/silc/silc.c:1652
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;pseudo&gt; [-clépub|&lt;raison&gt;] : Tuer le pseudo."
 
-#: ../src/protocols/silc/silc.c:1658
+#: ../libgaim/protocols/silc/silc.c:1656
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;nouveau pseudo&gt; : Changer de pseudonyme."
 
-#: ../src/protocols/silc/silc.c:1662
+#: ../libgaim/protocols/silc/silc.c:1660
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;pseudo&gt; : Récupérer des informations sur une personne."
 
-#: ../src/protocols/silc/silc.c:1666
+#: ../libgaim/protocols/silc/silc.c:1664
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -11599,7 +13344,7 @@
 "cmode &lt;salon&gt; [+|-&lt;modes&gt;] [arguments] : Changer ou afficher le "
 "mode d'un salon."
 
-#: ../src/protocols/silc/silc.c:1670
+#: ../libgaim/protocols/silc/silc.c:1668
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -11607,17 +13352,17 @@
 "cumode &lt;salon&gt; +|-&lt;modes&gt; &lt;pseudo&gt; : Changer le mode d'une "
 "personne sur un salon."
 
-#: ../src/protocols/silc/silc.c:1674
+#: ../libgaim/protocols/silc/silc.c:1672
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;modes utilisateur&gt; : Changer vos paramètres utilisateur."
 
-#: ../src/protocols/silc/silc.c:1678
+#: ../libgaim/protocols/silc/silc.c:1676
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr ""
 "oper &lt;pseudo&gt; [-clépub] : Obtenir le pouvoir d'opérateur sur le "
 "serveur."
 
-#: ../src/protocols/silc/silc.c:1682
+#: ../libgaim/protocols/silc/silc.c:1680
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -11625,38 +13370,38 @@
 "invite &lt;salon&gt; [-|+]&lt;pseudo&gt; : Inviter une personne, l'ajouter "
 "ou la supprimer de la liste d'invitations du salon."
 
-#: ../src/protocols/silc/silc.c:1686
+#: ../libgaim/protocols/silc/silc.c:1684
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;salon&gt; &lt;pseudo&gt; [raison] : Expulser une personne du salon."
 
-#: ../src/protocols/silc/silc.c:1690
+#: ../libgaim/protocols/silc/silc.c:1688
 msgid "info [server]:  View server administrative details"
 msgstr "info [serveur] : Voir les informations sur le serveur."
 
-#: ../src/protocols/silc/silc.c:1694
+#: ../libgaim/protocols/silc/silc.c:1692
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;salon&gt; +|-&lt;pseudo&gt;] : Bannir une personne du salon."
 
-#: ../src/protocols/silc/silc.c:1698
+#: ../libgaim/protocols/silc/silc.c:1696
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;pseudo|serveur&gt; : Récupérer la clé publique d'une personne ou "
 "du serveur."
 
-#: ../src/protocols/silc/silc.c:1702
+#: ../libgaim/protocols/silc/silc.c:1700
 msgid "stats:  View server and network statistics"
 msgstr "stats : Voir les statistiques du serveur et du réseau."
 
-#: ../src/protocols/silc/silc.c:1706
+#: ../libgaim/protocols/silc/silc.c:1704
 msgid "ping:  Send PING to the connected server"
 msgstr "ping : Envoyer un PING au serveur."
 
-#: ../src/protocols/silc/silc.c:1711
+#: ../libgaim/protocols/silc/silc.c:1709
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;salon&gt; : Récupérer la liste des personnes dans un salon."
 
-#: ../src/protocols/silc/silc.c:1715
+#: ../libgaim/protocols/silc/silc.c:1713
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -11673,111 +13418,111 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../src/protocols/silc/silc.c:1824
+#: ../libgaim/protocols/silc/silc.c:1823
 msgid "SILC Protocol Plugin"
 msgstr "Plugin pour le protocole SILC"
 
 #. *  description
-#: ../src/protocols/silc/silc.c:1826
+#: ../libgaim/protocols/silc/silc.c:1825
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Protocole de conférences instantanées sécurisées"
 
-#: ../src/protocols/silc/silc.c:1863
+#: ../libgaim/protocols/silc/silc.c:1862
 msgid "Public Key file"
 msgstr "Fichier de clé publique"
 
-#: ../src/protocols/silc/silc.c:1867
+#: ../libgaim/protocols/silc/silc.c:1866
 msgid "Private Key file"
 msgstr "Fichier de clé privée"
 
-#: ../src/protocols/silc/silc.c:1877
+#: ../libgaim/protocols/silc/silc.c:1876
 msgid "Cipher"
 msgstr "Chiffre"
 
-#: ../src/protocols/silc/silc.c:1887
+#: ../libgaim/protocols/silc/silc.c:1886
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../src/protocols/silc/silc.c:1890
+#: ../libgaim/protocols/silc/silc.c:1889
 msgid "Public key authentication"
 msgstr "Authentification par clé publique"
 
-#: ../src/protocols/silc/silc.c:1893
+#: ../libgaim/protocols/silc/silc.c:1892
 msgid "Reject watching by other users"
 msgstr "EmpĂŞcher l'observation par les autres utilisateurs"
 
-#: ../src/protocols/silc/silc.c:1896
+#: ../libgaim/protocols/silc/silc.c:1895
 msgid "Block invites"
 msgstr "Bloquer les invitations"
 
-#: ../src/protocols/silc/silc.c:1899
+#: ../libgaim/protocols/silc/silc.c:1898
 msgid "Block IMs without Key Exchange"
 msgstr "Bloquer les messages sans échange de clé"
 
-#: ../src/protocols/silc/silc.c:1902
+#: ../libgaim/protocols/silc/silc.c:1901
 msgid "Reject online status attribute requests"
-msgstr "EmpĂŞcher les requĂŞtes d'attributs d'Ă©tat"
-
-#: ../src/protocols/silc/silc.c:1905
+msgstr "EmpĂŞcher les demandes d'attributs d'Ă©tat"
+
+#: ../libgaim/protocols/silc/silc.c:1904
 msgid "Block messages to whiteboard"
 msgstr "Bloquer les messages au tableau"
 
-#: ../src/protocols/silc/silc.c:1908
+#: ../libgaim/protocols/silc/silc.c:1907
 msgid "Automatically open whiteboard"
 msgstr "Ouvrir automatiquement le tableau"
 
-#: ../src/protocols/silc/silc.c:1911
+#: ../libgaim/protocols/silc/silc.c:1910
 msgid "Digitally sign and verify all messages"
 msgstr "Signer numériquement et vérifier tous les messages"
 
-#: ../src/protocols/silc/util.c:207 ../src/protocols/silc/util.c:233
+#: ../libgaim/protocols/silc/util.c:207 ../libgaim/protocols/silc/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "Création de la paire de clés 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:328
+#: ../libgaim/protocols/silc/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Nom réel : %s\n"
 
-#: ../src/protocols/silc/util.c:330
+#: ../libgaim/protocols/silc/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Nom d'utilisateur : %s\n"
 
-#: ../src/protocols/silc/util.c:332
+#: ../libgaim/protocols/silc/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "Adresse électronique : %s\n"
 
-#: ../src/protocols/silc/util.c:334
+#: ../libgaim/protocols/silc/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Nom d'hôte : %s\n"
 
-#: ../src/protocols/silc/util.c:336
+#: ../libgaim/protocols/silc/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organisation : %s\n"
 
-#: ../src/protocols/silc/util.c:338
+#: ../libgaim/protocols/silc/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Pays : %s\n"
 
-#: ../src/protocols/silc/util.c:339
+#: ../libgaim/protocols/silc/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algorithme : %s\n"
 
-#: ../src/protocols/silc/util.c:340
+#: ../libgaim/protocols/silc/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Longueur de clé : %d bits\n"
 
-#: ../src/protocols/silc/util.c:342
+#: ../libgaim/protocols/silc/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -11788,7 +13533,7 @@
 "%s\n"
 "\n"
 
-#: ../src/protocols/silc/util.c:343
+#: ../libgaim/protocols/silc/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -11797,36 +13542,36 @@
 "Babillage de clé publique :\n"
 "%s"
 
-#: ../src/protocols/silc/util.c:347 ../src/protocols/silc/util.c:348
+#: ../libgaim/protocols/silc/util.c:374 ../libgaim/protocols/silc/util.c:375
 msgid "Public Key Information"
 msgstr "Informations sur la clé publique"
 
-#: ../src/protocols/silc/util.c:530
+#: ../libgaim/protocols/silc/util.c:557
 msgid "Paging"
 msgstr "Bipeur"
 
-#: ../src/protocols/silc/util.c:536
+#: ../libgaim/protocols/silc/util.c:563
 msgid "Video Conferencing"
 msgstr "Visioconférence"
 
-#: ../src/protocols/silc/util.c:554
+#: ../libgaim/protocols/silc/util.c:581
 msgid "Computer"
 msgstr "Ordinateur"
 
-#: ../src/protocols/silc/util.c:558
+#: ../libgaim/protocols/silc/util.c:585
 msgid "PDA"
 msgstr "PDA"
 
-#: ../src/protocols/silc/util.c:560
+#: ../libgaim/protocols/silc/util.c:587
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../src/protocols/silc/wb.c:284
+#: ../libgaim/protocols/silc/wb.c:284
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr "%s a envoyé un message sur le tableau. Voulez-vous ouvrir le tableau ?"
 
-#: ../src/protocols/silc/wb.c:288
+#: ../libgaim/protocols/silc/wb.c:288
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
@@ -11835,33 +13580,40 @@
 "%s a envoyé un message sur le tableau du salon %s. Voulez-vous ouvrir le "
 "tableau ?"
 
-#: ../src/protocols/silc/wb.c:302
+#: ../libgaim/protocols/silc/wb.c:302
 msgid "Whiteboard"
 msgstr "Tableau"
 
 #. TODO: do we really want to disconnect on a failure to write?
-#: ../src/protocols/simple/simple.c:411
+#: ../libgaim/protocols/simple/simple.c:416
 msgid "Could not write"
-msgstr "Impossible d'envoyer"
-
-#: ../src/protocols/simple/simple.c:426 ../src/protocols/simple/simple.c:1431
+msgstr "Impossible d'envoyer."
+
+#: ../libgaim/protocols/simple/simple.c:438
+#: ../libgaim/protocols/simple/simple.c:1484
 msgid "Could not connect"
-msgstr "Impossible de se connecter"
-
-#: ../src/protocols/simple/simple.c:997
+msgstr "Impossible de se connecter."
+
+#: ../libgaim/protocols/simple/simple.c:1037
 msgid "Wrong Password"
-msgstr "Mauvais mot de passe"
-
-#: ../src/protocols/simple/simple.c:1462 ../src/protocols/simple/simple.c:1501
-#: ../src/protocols/simple/simple.c:1513 ../src/protocols/simple/simple.c:1571
+msgstr "Mauvais mot de passe."
+
+#: ../libgaim/protocols/simple/simple.c:1518
+#: ../libgaim/protocols/simple/simple.c:1560
+#: ../libgaim/protocols/simple/simple.c:1574
+#: ../libgaim/protocols/simple/simple.c:1626
 msgid "Could not create listen socket"
-msgstr "Impossible de créer le socket d'écoute"
-
-#: ../src/protocols/simple/simple.c:1483
+msgstr "Impossible de créer le socket d'écoute."
+
+#: ../libgaim/protocols/simple/simple.c:1541
 msgid "Couldn't resolve host"
-msgstr "Impossible de trouver l'adresse de l'hĂ´te"
-
-#: ../src/protocols/simple/simple.c:1593
+msgstr "Impossible de trouver l'adresse de l'hĂ´te."
+
+#: ../libgaim/protocols/simple/simple.c:1634
+msgid "Could not resolve hostname"
+msgstr "Impossible de résoudre le nom de l'hôte."
+
+#: ../libgaim/protocols/simple/simple.c:1651
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Les identifiants SIP ne peuvent pas avoir d'espace ou de symbole @."
 
@@ -11873,165 +13625,159 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../src/protocols/simple/simple.c:1755
+#: ../libgaim/protocols/simple/simple.c:1819
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Plugin pour le protocole SIP/SIMPLE"
 
 #. *  summary
-#: ../src/protocols/simple/simple.c:1756
+#: ../libgaim/protocols/simple/simple.c:1820
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "Plugin pour le protocole SILC"
 
-#: ../src/protocols/simple/simple.c:1778
+#: ../libgaim/protocols/simple/simple.c:1842
 msgid "Publish status (note: everyone may watch you)"
 msgstr "État de publication (note : tout le mode peut vous regarder)"
 
-#: ../src/protocols/simple/simple.c:1784
+#: ../libgaim/protocols/simple/simple.c:1848
 msgid "Use UDP"
 msgstr "Utiliser UDP"
 
-#: ../src/protocols/simple/simple.c:1786
+#: ../libgaim/protocols/simple/simple.c:1850
 msgid "Use proxy"
 msgstr "Utiliser un serveur mandataire"
 
-#: ../src/protocols/simple/simple.c:1788
+#: ../libgaim/protocols/simple/simple.c:1852
 msgid "Proxy"
 msgstr "Serveur mandataire"
 
-#: ../src/protocols/simple/simple.c:1790
+#: ../libgaim/protocols/simple/simple.c:1854
 msgid "Auth User"
 msgstr "Utilisateur d'authentification"
 
-#: ../src/protocols/simple/simple.c:1792
+#: ../libgaim/protocols/simple/simple.c:1856
 msgid "Auth Domain"
 msgstr "Domaine d'authentification"
 
-#: ../src/protocols/toc/toc.c:139
+#: ../libgaim/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr "Recherche de %s"
 
-#: ../src/protocols/toc/toc.c:148
+#: ../libgaim/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Connexion à %s échouée"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../src/protocols/toc/toc.c:172 ../src/protocols/yahoo/yahoo.c:2254
-#: ../src/protocols/yahoo/yahoo.c:2281 ../src/protocols/yahoo/yahoo.c:2364
-#: ../src/protocols/yahoo/yahoo.c:2379
-#: ../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 "Impossible de se connecter"
-
-#: ../src/protocols/toc/toc.c:200
+#: ../libgaim/protocols/toc/toc.c:201
 #, c-format
 msgid "Signon: %s"
 msgstr "Connexion : %s"
 
-#: ../src/protocols/toc/toc.c:482
+#: ../libgaim/protocols/toc/toc.c:488
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Impossible d'Ă©crire dans le fichier %s"
 
-#: ../src/protocols/toc/toc.c:485
+#: ../libgaim/protocols/toc/toc.c:491
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Impossible de lire le fichier %s"
 
-#: ../src/protocols/toc/toc.c:488
+#: ../libgaim/protocols/toc/toc.c:494
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Message trop long, les %s derniers caractères sont perdus."
 
-#: ../src/protocols/toc/toc.c:491
+#: ../libgaim/protocols/toc/toc.c:497
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s n'est pas en ligne"
 
-#: ../src/protocols/toc/toc.c:494
+#: ../libgaim/protocols/toc/toc.c:500
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Les avertissements de %s ne sont pas autorisés."
 
-#: ../src/protocols/toc/toc.c:497
+#: ../libgaim/protocols/toc/toc.c:503
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "Un message a été perdu, vous dépassez la vitesse limite du serveur."
 
-#: ../src/protocols/toc/toc.c:500
+#: ../libgaim/protocols/toc/toc.c:506
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "La discussion %s est inaccessible."
 
-#: ../src/protocols/toc/toc.c:503
+#: ../libgaim/protocols/toc/toc.c:509
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Vous envoyez vos messages trop vite Ă  %s."
 
-#: ../src/protocols/toc/toc.c:506
+#: ../libgaim/protocols/toc/toc.c:512
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Vous avez raté un message de %s parce que le message était trop gros,"
 
-#: ../src/protocols/toc/toc.c:509
+#: ../libgaim/protocols/toc/toc.c:515
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "Vous avez raté un message de %s parce qu'il a été envoyé trop vite."
 
-#: ../src/protocols/toc/toc.c:512
+#: ../libgaim/protocols/toc/toc.c:518
 msgid "Failure."
 msgstr "Échec"
 
-#: ../src/protocols/toc/toc.c:515
+#: ../libgaim/protocols/toc/toc.c:521
 msgid "Too many matches."
 msgstr "Trop de réponses"
 
-#: ../src/protocols/toc/toc.c:518
+#: ../libgaim/protocols/toc/toc.c:524
 msgid "Need more qualifiers."
 msgstr "Besoin de plus de critères."
 
-#: ../src/protocols/toc/toc.c:521
+#: ../libgaim/protocols/toc/toc.c:527
 msgid "Dir service temporarily unavailable."
 msgstr "L'annuaire est temporairement indisponible."
 
-#: ../src/protocols/toc/toc.c:524
+#: ../libgaim/protocols/toc/toc.c:530
 msgid "E-mail lookup restricted."
 msgstr "La recherche par adresse Ă©lectronique est restreinte."
 
-#: ../src/protocols/toc/toc.c:527
+#: ../libgaim/protocols/toc/toc.c:533
 msgid "Keyword ignored."
 msgstr "Mot clé ignoré"
 
-#: ../src/protocols/toc/toc.c:530
+#: ../libgaim/protocols/toc/toc.c:536
 msgid "No keywords."
 msgstr "Pas de mot-clé"
 
-#: ../src/protocols/toc/toc.c:533
+#: ../libgaim/protocols/toc/toc.c:539
 msgid "User has no directory information."
 msgstr "L'utilisateur n'a pas d'informations personnelles."
 
-#: ../src/protocols/toc/toc.c:537
+#: ../libgaim/protocols/toc/toc.c:543
 msgid "Country not supported."
 msgstr "Pays non supporté"
 
-#: ../src/protocols/toc/toc.c:540
+#: ../libgaim/protocols/toc/toc.c:546
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Échec inconnu : %s"
 
-#: ../src/protocols/toc/toc.c:546
+#: ../libgaim/protocols/toc/toc.c:549
+msgid "Incorrect nickname or password."
+msgstr "Pseudonyme ou mot de passe incorrect."
+
+#: ../libgaim/protocols/toc/toc.c:552
 msgid "The service is temporarily unavailable."
 msgstr "Le service est temporairement indisponible."
 
-#: ../src/protocols/toc/toc.c:549
+#: ../libgaim/protocols/toc/toc.c:555
 msgid "Your warning level is currently too high to log in."
 msgstr ""
 "Votre niveau d'avertissement est actuellement trop élevé pour que vous "
 "puissiez vous connecter."
 
-#: ../src/protocols/toc/toc.c:552
+#: ../libgaim/protocols/toc/toc.c:558
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
@@ -12040,43 +13786,43 @@
 "et réessayez. Si vous persistez maintenant, il vous faudra attendre encore "
 "plus longtemps."
 
-#: ../src/protocols/toc/toc.c:554
+#: ../libgaim/protocols/toc/toc.c:560
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Une erreur inconnue est survenue à la connexion : %s"
 
-#: ../src/protocols/toc/toc.c:557
+#: ../libgaim/protocols/toc/toc.c:563
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Une erreur inconnue (%d) s'est produite : %s"
 
-#: ../src/protocols/toc/toc.c:584
+#: ../libgaim/protocols/toc/toc.c:590
 msgid "Invalid Groupname"
 msgstr "Nom de groupe non valide."
 
-#: ../src/protocols/toc/toc.c:668
+#: ../libgaim/protocols/toc/toc.c:674
 msgid "Connection Closed"
 msgstr "Connexion terminée"
 
-#: ../src/protocols/toc/toc.c:708
+#: ../libgaim/protocols/toc/toc.c:714
 msgid "Waiting for reply..."
 msgstr "En attente de réponse..."
 
-#: ../src/protocols/toc/toc.c:786
+#: ../libgaim/protocols/toc/toc.c:792
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr ""
 "TOC est revenu de sa pause. Vous pouvez désormais envoyer des messages à "
 "nouveau."
 
-#: ../src/protocols/toc/toc.c:989
+#: ../libgaim/protocols/toc/toc.c:995
 msgid "Password Change Successful"
 msgstr "Changement de mot de passe effectué."
 
-#: ../src/protocols/toc/toc.c:993
+#: ../libgaim/protocols/toc/toc.c:999
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC a envoyé une commande PAUSE."
 
-#: ../src/protocols/toc/toc.c:994
+#: ../libgaim/protocols/toc/toc.c:1000
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
 "if you send a message. Gaim will prevent anything from going through. This "
@@ -12086,53 +13832,49 @@
 "déconnecter si vous en envoyez un. Gaim empêchera ceci. Ce n'est que "
 "temporaire, soyez patient."
 
-#: ../src/protocols/toc/toc.c:1367
+#: ../libgaim/protocols/toc/toc.c:1373
 msgid "_Group:"
 msgstr "_Groupe :"
 
-#: ../src/protocols/toc/toc.c:1549
+#: ../libgaim/protocols/toc/toc.c:1555
 msgid "Get Dir Info"
 msgstr "Chercher dans l'annuaire"
 
-#: ../src/protocols/toc/toc.c:1689
+#: ../libgaim/protocols/toc/toc.c:1695
 msgid "Set Dir Info"
 msgstr "Changer les informations"
 
-#: ../src/protocols/toc/toc.c:1694
-msgid "Change Password"
-msgstr "Changer de mot de passe"
-
-#: ../src/protocols/toc/toc.c:1811
+#: ../libgaim/protocols/toc/toc.c:1817
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "Impossible d'ouvrir %s pour l'Ă©criture"
 
-#: ../src/protocols/toc/toc.c:1847
+#: ../libgaim/protocols/toc/toc.c:1853
 msgid "File transfer failed; other side probably canceled."
 msgstr "Échec du transfert de fichier. Annulation probable du correspondant."
 
-#: ../src/protocols/toc/toc.c:1892 ../src/protocols/toc/toc.c:1932
-#: ../src/protocols/toc/toc.c:2056 ../src/protocols/toc/toc.c:2144
+#: ../libgaim/protocols/toc/toc.c:1898 ../libgaim/protocols/toc/toc.c:1938
+#: ../libgaim/protocols/toc/toc.c:2062 ../libgaim/protocols/toc/toc.c:2150
 msgid "Could not connect for transfer."
 msgstr "Impossible de se connecter pour le transfert"
 
-#: ../src/protocols/toc/toc.c:2089
+#: ../libgaim/protocols/toc/toc.c:2095
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
 "Impossible d'Ă©crire l'entĂŞte de fichier. Le fichier n'est pas transmis."
 
-#: ../src/protocols/toc/toc.c:2189
+#: ../libgaim/protocols/toc/toc.c:2195
 msgid "Gaim - Save As..."
 msgstr "Gaim - Enregistrer sous..."
 
-#: ../src/protocols/toc/toc.c:2223
+#: ../libgaim/protocols/toc/toc.c:2229
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s demande à %s d'accepter %d fichier : %s (%.2f %s)%s%s"
 msgstr[1] "%s demande à %s d'accepter %d fichiers : %s (%.2f %s)%s%s"
 
-#: ../src/protocols/toc/toc.c:2230
+#: ../libgaim/protocols/toc/toc.c:2236
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s vous demande de leur envoyer un fichier"
@@ -12147,19 +13889,20 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/toc/toc.c:2319 ../src/protocols/toc/toc.c:2321
+#: ../libgaim/protocols/toc/toc.c:2326 ../libgaim/protocols/toc/toc.c:2328
 msgid "TOC Protocol Plugin"
 msgstr "Plugin pour le protocole TOC"
 
-#: ../src/protocols/yahoo/yahoo.c:711
+#: ../libgaim/protocols/yahoo/yahoo.c:793
 msgid "Your Yahoo! message did not get sent."
 msgstr "Votre message Yahoo! n'a pas été envoyé"
 
-#: ../src/protocols/yahoo/yahoo.c:770 ../src/protocols/yahoo/yahoo.c:3597
+#: ../libgaim/protocols/yahoo/yahoo.c:852
+#: ../libgaim/protocols/yahoo/yahoo.c:3738
 msgid "Buzz!!"
 msgstr "Dring !"
 
-#: ../src/protocols/yahoo/yahoo.c:816
+#: ../libgaim/protocols/yahoo/yahoo.c:898
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Message système Yahoo! pour %s :"
@@ -12167,23 +13910,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:912
+#: ../libgaim/protocols/yahoo/yahoo.c:994
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list%s%s."
 msgstr "L'utilisateur %s veut ajouter %s à sa liste de contacts %s%s"
 
-#: ../src/protocols/yahoo/yahoo.c:918
+#: ../libgaim/protocols/yahoo/yahoo.c:1000
 msgid "Message (optional) :"
 msgstr "Message (facultatif) :"
 
-#: ../src/protocols/yahoo/yahoo.c:960
+#: ../libgaim/protocols/yahoo/yahoo.c:1042
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "L'utilisateur %s a (rétroactivement) refusé votre demande de le rajouter à "
 "votre liste de contacts."
 
-#: ../src/protocols/yahoo/yahoo.c:963
+#: ../libgaim/protocols/yahoo/yahoo.c:1045
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -12192,11 +13935,11 @@
 "L'utilisateur %s a (rétroactivement) refusé votre demande de l'ajouter à "
 "votre liste de contacts pour la raison suivante : %s"
 
-#: ../src/protocols/yahoo/yahoo.c:966
+#: ../libgaim/protocols/yahoo/yahoo.c:1048
 msgid "Add buddy rejected"
 msgstr "Ajout du contact refusé"
 
-#: ../src/protocols/yahoo/yahoo.c:1716
+#: ../libgaim/protocols/yahoo/yahoo.c:1799
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -12207,11 +13950,11 @@
 "Cette version de Gaim n'arrivera probablement pas Ă  se connecter au service "
 "Yahoo!. Vous pouvez vérifier qu'une mise à jour est disponible sur %s."
 
-#: ../src/protocols/yahoo/yahoo.c:1719
+#: ../libgaim/protocols/yahoo/yahoo.c:1802
 msgid "Failed Yahoo! Authentication"
 msgstr "Échec de l'authentification Yahoo!"
 
-#: ../src/protocols/yahoo/yahoo.c:1785
+#: ../libgaim/protocols/yahoo/yahoo.c:1868
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -12220,19 +13963,19 @@
 "Vous voulez ignorer %s, mais cet utilisateur est dans votre liste de "
 "contacts. En choisissant « Oui » cela supprimera le contact et l'ignorera."
 
-#: ../src/protocols/yahoo/yahoo.c:1788
+#: ../libgaim/protocols/yahoo/yahoo.c:1871
 msgid "Ignore buddy?"
 msgstr "Ignorer ce contact ?"
 
-#: ../src/protocols/yahoo/yahoo.c:1822
+#: ../libgaim/protocols/yahoo/yahoo.c:1905
 msgid "Invalid username."
 msgstr "Nom d'utilisateur non valide"
 
-#: ../src/protocols/yahoo/yahoo.c:1833
+#: ../libgaim/protocols/yahoo/yahoo.c:1919
 msgid "Normal authentication failed!"
 msgstr "Échec de l'authentification standard"
 
-#: ../src/protocols/yahoo/yahoo.c:1834
+#: ../libgaim/protocols/yahoo/yahoo.c:1920
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -12244,141 +13987,147 @@
 "authentification. Gaim va essayer de se connecter en utilisant "
 "l'authentification par le Web, au détriment de certaines fonctionnalités."
 
-#: ../src/protocols/yahoo/yahoo.c:1842
-msgid "Incorrect password."
-msgstr "Mot de passe incorrect"
-
-#: ../src/protocols/yahoo/yahoo.c:1845
+#: ../libgaim/protocols/yahoo/yahoo.c:1931
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr ""
 "Votre compte est bloqué. Veuillez vous connecter par le site web Yahoo!."
 
-#: ../src/protocols/yahoo/yahoo.c:1848
+#: ../libgaim/protocols/yahoo/yahoo.c:1934
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Erreur inconnue n°%d. Se connecter sur le site web Yahoo! peut corriger le "
 "problème."
 
-#: ../src/protocols/yahoo/yahoo.c:1902
+#: ../libgaim/protocols/yahoo/yahoo.c:1988
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Impossible d'ajouter le contact %s au groupe %s sur la liste du serveur pour "
-"le compte %s"
-
-#: ../src/protocols/yahoo/yahoo.c:1905
+"le compte %s."
+
+#: ../libgaim/protocols/yahoo/yahoo.c:1991
 msgid "Could not add buddy to server list"
-msgstr "Impossible d'ajouter le contact sur la liste du serveur"
-
-#: ../src/protocols/yahoo/yahoo.c:2024
+msgstr "Impossible d'ajouter le contact sur la liste du serveur."
+
+#: ../libgaim/protocols/yahoo/yahoo.c:2110
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-#: ../src/protocols/yahoo/yahoo.c:2166 ../src/protocols/yahoo/yahoo.c:2313
-#: ../src/protocols/yahoo/yahoo.c:2328 ../src/protocols/yahoo/ycht.c:472
-msgid "Unable to read"
-msgstr "Impossible de lire"
-
-#: ../src/protocols/yahoo/yahoo.c:2352 ../src/protocols/yahoo/yahoo.c:2509
-#: ../src/protocols/yahoo/yahoo.c:2612 ../src/protocols/yahoo/yahoo.c:2622
-#: ../src/protocols/yahoo/yahoochat.c:1448
-#: ../src/protocols/yahoo/yahoochat.c:1518 ../src/protocols/yahoo/ycht.c:576
+#: ../libgaim/protocols/yahoo/yahoo.c:2441
+msgid "Received unexpected HTTP response from server."
+msgstr "RĂ©ception d'un message HTTP non attendu du serveur."
+
+#: ../libgaim/protocols/yahoo/yahoo.c:2465
+#: ../libgaim/protocols/yahoo/yahoo.c:2637
+#: ../libgaim/protocols/yahoo/yahoo.c:2740
+#: ../libgaim/protocols/yahoo/yahoo.c:2750
+#: ../libgaim/protocols/yahoo/yahoochat.c:1455
+#: ../libgaim/protocols/yahoo/yahoochat.c:1525
+#: ../libgaim/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Problème de connexion"
 
-#: ../src/protocols/yahoo/yahoo.c:2728 ../src/protocols/yahoo/yahoo.c:3331
+#: ../libgaim/protocols/yahoo/yahoo.c:2865
+#: ../libgaim/protocols/yahoo/yahoo.c:3472
 msgid "Not at Home"
 msgstr "Pas Ă  la maison"
 
-#: ../src/protocols/yahoo/yahoo.c:2730 ../src/protocols/yahoo/yahoo.c:3334
+#: ../libgaim/protocols/yahoo/yahoo.c:2867
+#: ../libgaim/protocols/yahoo/yahoo.c:3475
 msgid "Not at Desk"
 msgstr "Pas au bureau"
 
-#: ../src/protocols/yahoo/yahoo.c:2732 ../src/protocols/yahoo/yahoo.c:3337
+#: ../libgaim/protocols/yahoo/yahoo.c:2869
+#: ../libgaim/protocols/yahoo/yahoo.c:3478
 msgid "Not in Office"
 msgstr "Pas au travail"
 
-#: ../src/protocols/yahoo/yahoo.c:2736 ../src/protocols/yahoo/yahoo.c:3343
+#: ../libgaim/protocols/yahoo/yahoo.c:2873
+#: ../libgaim/protocols/yahoo/yahoo.c:3484
 msgid "On Vacation"
 msgstr "En vacances"
 
-#: ../src/protocols/yahoo/yahoo.c:2740 ../src/protocols/yahoo/yahoo.c:3349
+#: ../libgaim/protocols/yahoo/yahoo.c:2877
+#: ../libgaim/protocols/yahoo/yahoo.c:3490
 msgid "Stepped Out"
 msgstr "De sortie"
 
-#: ../src/protocols/yahoo/yahoo.c:2833 ../src/protocols/yahoo/yahoo.c:2863
+#: ../libgaim/protocols/yahoo/yahoo.c:2970
+#: ../libgaim/protocols/yahoo/yahoo.c:3000
 msgid "Not on server list"
 msgstr "Pas dans la liste du serveur"
 
-#: ../src/protocols/yahoo/yahoo.c:2880 ../src/protocols/yahoo/yahoo.c:2939
+#: ../libgaim/protocols/yahoo/yahoo.c:3017
+#: ../libgaim/protocols/yahoo/yahoo.c:3076
 msgid "Appear Online"
 msgstr "Apparaître connecté"
 
-#: ../src/protocols/yahoo/yahoo.c:2883 ../src/protocols/yahoo/yahoo.c:2960
+#: ../libgaim/protocols/yahoo/yahoo.c:3020
+#: ../libgaim/protocols/yahoo/yahoo.c:3097
 msgid "Appear Permanently Offline"
 msgstr "Apparaître toujours déconnecté"
 
-#: ../src/protocols/yahoo/yahoo.c:2902
+#: ../libgaim/protocols/yahoo/yahoo.c:3039
 msgid "Presence"
 msgstr "Présence"
 
-#: ../src/protocols/yahoo/yahoo.c:2945
+#: ../libgaim/protocols/yahoo/yahoo.c:3082
 msgid "Appear Offline"
 msgstr "Invisible"
 
-#: ../src/protocols/yahoo/yahoo.c:2954
+#: ../libgaim/protocols/yahoo/yahoo.c:3091
 msgid "Don't Appear Permanently Offline"
 msgstr "Ne pas apparaître toujours déconnecté"
 
-#: ../src/protocols/yahoo/yahoo.c:3002
+#: ../libgaim/protocols/yahoo/yahoo.c:3139
 msgid "Join in Chat"
 msgstr "Joindre dans une discussion"
 
-#: ../src/protocols/yahoo/yahoo.c:3008
+#: ../libgaim/protocols/yahoo/yahoo.c:3145
 msgid "Initiate Conference"
 msgstr "Lancer une conférence"
 
-#: ../src/protocols/yahoo/yahoo.c:3036
+#: ../libgaim/protocols/yahoo/yahoo.c:3173
 msgid "Presence Settings"
 msgstr "Paramètres de présence"
 
-#: ../src/protocols/yahoo/yahoo.c:3042
+#: ../libgaim/protocols/yahoo/yahoo.c:3179
 msgid "Start Doodling"
 msgstr "Commencer Ă  griffonner"
 
-#: ../src/protocols/yahoo/yahoo.c:3074
+#: ../libgaim/protocols/yahoo/yahoo.c:3211
 msgid "Active which ID?"
 msgstr "Activer quelle identité ?"
 
-#: ../src/protocols/yahoo/yahoo.c:3083
+#: ../libgaim/protocols/yahoo/yahoo.c:3220
 msgid "Join who in chat?"
 msgstr "Qui joindre dans une discussion ?"
 
-#: ../src/protocols/yahoo/yahoo.c:3093
+#: ../libgaim/protocols/yahoo/yahoo.c:3230
 msgid "Activate ID..."
 msgstr "Activer ID..."
 
-#: ../src/protocols/yahoo/yahoo.c:3097
+#: ../libgaim/protocols/yahoo/yahoo.c:3234
 msgid "Join User in Chat..."
 msgstr "Joindre l'utilisateur dans une discussion..."
 
-#: ../src/protocols/yahoo/yahoo.c:3656
+#: ../libgaim/protocols/yahoo/yahoo.c:3797
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;room&gt; : Joindre une discussion sur le réseau Yahoo"
 
-#: ../src/protocols/yahoo/yahoo.c:3661
+#: ../libgaim/protocols/yahoo/yahoo.c:3802
 msgid "list: List rooms on the Yahoo network"
 msgstr "list : Récupérer la liste des salons du réseau Yahoo."
 
-#: ../src/protocols/yahoo/yahoo.c:3665
+#: ../libgaim/protocols/yahoo/yahoo.c:3806
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz : Faire sonner chez un contact pour attirer son attention."
 
-#: ../src/protocols/yahoo/yahoo.c:3669
+#: ../libgaim/protocols/yahoo/yahoo.c:3810
 msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle : Envoie une requête pour un séance de griffonnage."
+msgstr "doodle : Envoie une demande pour un séance de griffonnage."
 
 #. *< type
 #. *< ui_requirement
@@ -12390,90 +14139,163 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/yahoo/yahoo.c:3762 ../src/protocols/yahoo/yahoo.c:3764
+#: ../libgaim/protocols/yahoo/yahoo.c:3904
+#: ../libgaim/protocols/yahoo/yahoo.c:3906
 msgid "Yahoo Protocol Plugin"
 msgstr "Plugin pour le protocole Yahoo"
 
-#: ../src/protocols/yahoo/yahoo.c:3781
+#: ../libgaim/protocols/yahoo/yahoo.c:3923
 msgid "Yahoo Japan"
 msgstr "Yahoo Japon"
 
-#: ../src/protocols/yahoo/yahoo.c:3784
+#: ../libgaim/protocols/yahoo/yahoo.c:3926
 msgid "Pager server"
 msgstr "Serveur de texto"
 
-#: ../src/protocols/yahoo/yahoo.c:3787
+#: ../libgaim/protocols/yahoo/yahoo.c:3929
 msgid "Japan Pager server"
 msgstr "Serveure japonais de texto"
 
-#: ../src/protocols/yahoo/yahoo.c:3790
+#: ../libgaim/protocols/yahoo/yahoo.c:3932
 msgid "Pager port"
 msgstr "Port du pager"
 
-#: ../src/protocols/yahoo/yahoo.c:3793
+#: ../libgaim/protocols/yahoo/yahoo.c:3935
 msgid "File transfer server"
 msgstr "Server de transfert de fichiers"
 
-#: ../src/protocols/yahoo/yahoo.c:3796
+#: ../libgaim/protocols/yahoo/yahoo.c:3938
 msgid "Japan file transfer server"
 msgstr "Server japonais de transfert de fichiers"
 
-#: ../src/protocols/yahoo/yahoo.c:3799
+#: ../libgaim/protocols/yahoo/yahoo.c:3941
 msgid "File transfer port"
 msgstr "Port de transfert de fichiers"
 
-#: ../src/protocols/yahoo/yahoo.c:3802
+#: ../libgaim/protocols/yahoo/yahoo.c:3944
 msgid "Chat room locale"
 msgstr "Langue du salon de discussion"
 
-#: ../src/protocols/yahoo/yahoo.c:3805
+#: ../libgaim/protocols/yahoo/yahoo.c:3947
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorer les invitations aux conférences et salons de discussion"
 
-#: ../src/protocols/yahoo/yahoo.c:3809
+#: ../libgaim/protocols/yahoo/yahoo.c:3955
 msgid "Chat room list URL"
 msgstr "URL de liste des salons de discussion"
 
-#: ../src/protocols/yahoo/yahoo.c:3812
+#: ../libgaim/protocols/yahoo/yahoo.c:3958
 msgid "Yahoo Chat server"
 msgstr "Serveur Yahoo Chat"
 
-#: ../src/protocols/yahoo/yahoo.c:3815
+#: ../libgaim/protocols/yahoo/yahoo.c:3961
 msgid "Yahoo Chat port"
 msgstr "Port Yahoo Chat"
 
+#: ../libgaim/protocols/yahoo/yahoochat.c:203
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgstr ""
+"%s a décliné votre invitation à la conférence « %s » pour la raison : %s"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:205
+msgid "Invitation Rejected"
+msgstr "Invitation refusée"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:361
+msgid "Failed to join chat"
+msgstr "Impossible de joindre la discussion"
+
+#. -6
+#: ../libgaim/protocols/yahoo/yahoochat.c:364
+msgid "Unknown room"
+msgstr "Salon de discussion inconnu"
+
+#. -15
+#: ../libgaim/protocols/yahoo/yahoochat.c:367
+msgid "Maybe the room is full"
+msgstr "Le salon de discussion est peut-ĂŞtre plein"
+
+#. -35
+#: ../libgaim/protocols/yahoo/yahoochat.c:370
+msgid "Not available"
+msgstr "Non disponible"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:374
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+msgstr ""
+"Erreur inconnue. Il vous faudra peut-être vous déconnecter et attendre cinq "
+"minutes avant de pouvoir retourner dans un salon de discussion."
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:452
+#, c-format
+msgid "You are now chatting in %s."
+msgstr "Vous discutez dans %s"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:627
+msgid "Failed to join buddy in chat"
+msgstr "Impossible de joindre le contact dans la discussion"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:628
+msgid "Maybe they're not in a chat?"
+msgstr "Le contact n'est peut-ĂŞtre pas dans une discussion"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1357
+#: ../libgaim/protocols/yahoo/yahoochat.c:1383
+msgid "Fetching the room list failed."
+msgstr "Échec de récupération de la liste des salons de discussion"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1441
+msgid "Voices"
+msgstr "Voix"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1444
+msgid "Webcams"
+msgstr "Webcams"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1455
+#: ../libgaim/protocols/yahoo/yahoochat.c:1525
+msgid "Unable to fetch room list."
+msgstr "Impossible de récupérer la liste des salons"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1518
+msgid "User Rooms"
+msgstr "Salon de discussion utilisateur"
+
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
-#: ../src/protocols/yahoo/yahoo_doodle.c:96
+#: ../libgaim/protocols/yahoo/yahoo_doodle.c:96
 msgid "Sent Doodle request."
-msgstr "Envoyer une requĂŞte Doodle."
-
-#: ../src/protocols/yahoo/yahoo_filexfer.c:253
-#: ../src/protocols/yahoo/yahoo_filexfer.c:262
-#: ../src/protocols/yahoo/yahoo_filexfer.c:271
+msgstr "Envoyer une demande Doodle."
+
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:269
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:278
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:291
 msgid "Unable to establish file descriptor."
 msgstr "Impossible de créer un descripteur de fichier"
 
 #. TODO: what to do here - do we really have to disconnect?
-#: ../src/protocols/yahoo/yahoo_packet.c:279
+#: ../libgaim/protocols/yahoo/yahoo_packet.c:288
 msgid "Write Error"
 msgstr "Erreur d'Ă©criture"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:707
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:707
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
 msgstr "<b>Adresse IP :</b> %s<br>"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:783
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:782
 msgid "Yahoo! Japan Profile"
 msgstr "Profil Yahoo! Japon"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:784
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:783
 msgid "Yahoo! Profile"
 msgstr "Profil Yahoo!"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:828
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:827
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
@@ -12481,7 +14303,7 @@
 "Désolé, les profils marqués pour adultes ne sont pas supportés pour "
 "l'instant."
 
-#: ../src/protocols/yahoo/yahoo_profile.c:830
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:829
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
@@ -12489,47 +14311,47 @@
 "Si vous voulez voir ce profil, vous devez ouvrir ce lien dans votre "
 "navigateur."
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1012
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1026
 msgid "Yahoo! ID"
 msgstr "ID Yahoo!"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1084
-#: ../src/protocols/yahoo/yahoo_profile.c:1088
-#: ../src/protocols/yahoo/yahoo_profile.c:1092
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1098
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1102
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1106
 msgid "Hobbies"
 msgstr "Passe-temps"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1102
-#: ../src/protocols/yahoo/yahoo_profile.c:1106
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1116
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1120
 msgid "Latest News"
 msgstr "Dernières nouvelles"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1127
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1141
 msgid "Home Page"
 msgstr "Page web"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1142
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1156
 msgid "Cool Link 1"
 msgstr "Lien sympa 1"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1147
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1161
 msgid "Cool Link 2"
 msgstr "Lien sympa 2"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1151
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1165
 msgid "Cool Link 3"
 msgstr "Lien sympa 3"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1164
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1178
 msgid "Last Update"
 msgstr "Dernière mise à jour"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1170
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1184
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Les informations sur %s ne sont pas disponibles"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1176
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1190
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
@@ -12537,7 +14359,7 @@
 "Désolé, ce profil a l'air d'être dans une langue ou un format non supporté "
 "pour l'instant."
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1192
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1206
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -12546,7 +14368,7 @@
 "probablement d'un problème temporaire sur le serveur. Veuillez réessayez "
 "plus tard."
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1195
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1209
 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 "
@@ -12557,87 +14379,24 @@
 "certains profils. Si vous savez que l'utilisateur existe, veuillez réessayez "
 "plus tard."
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1203
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1216
 msgid "The user's profile is empty."
 msgstr "Le profil de l'utilisateur est vide"
 
-#: ../src/protocols/yahoo/yahoochat.c:203
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-"%s a décliné votre invitation à la conférence « %s » pour la raison : %s"
-
-#: ../src/protocols/yahoo/yahoochat.c:205
-msgid "Invitation Rejected"
-msgstr "Invitation refusée"
-
-#: ../src/protocols/yahoo/yahoochat.c:361
-msgid "Failed to join chat"
-msgstr "Impossible de joindre la discussion"
-
-#. -6
-#: ../src/protocols/yahoo/yahoochat.c:364
-msgid "Unknown room"
-msgstr "Salon de discussion inconnu"
-
-#. -15
-#: ../src/protocols/yahoo/yahoochat.c:367
-msgid "Maybe the room is full"
-msgstr "Le salon de discussion est peut-ĂŞtre plein"
-
-#. -35
-#: ../src/protocols/yahoo/yahoochat.c:370
-msgid "Not available"
-msgstr "Non 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 ""
-"Erreur inconnue. Il vous faudra peut-être vous déconnecter et attendre cinq "
-"minutes avant de pouvoir retourner dans un salon de discussion."
-
-#: ../src/protocols/yahoo/yahoochat.c:452
-#, c-format
-msgid "You are now chatting in %s."
-msgstr "Vous discutez dans %s"
-
-#: ../src/protocols/yahoo/yahoochat.c:627
-msgid "Failed to join buddy in chat"
-msgstr "Impossible de joindre le contact dans la discussion"
-
-#: ../src/protocols/yahoo/yahoochat.c:628
-msgid "Maybe they're not in a chat?"
-msgstr "Le contact n'est peut-ĂŞtre pas dans une discussion"
-
-#: ../src/protocols/yahoo/yahoochat.c:1346
-#: ../src/protocols/yahoo/yahoochat.c:1373
-msgid "Fetching the room list failed."
-msgstr "Échec de récupération de la liste des salons de discussion"
-
-#: ../src/protocols/yahoo/yahoochat.c:1434
-msgid "Voices"
-msgstr "Voix"
-
-#: ../src/protocols/yahoo/yahoochat.c:1437
-msgid "Webcams"
-msgstr "Webcams"
-
-#: ../src/protocols/yahoo/yahoochat.c:1448
-#: ../src/protocols/yahoo/yahoochat.c:1518
-msgid "Unable to fetch room list."
-msgstr "Impossible de récupérer la liste des salons"
-
-#: ../src/protocols/yahoo/yahoochat.c:1511
-msgid "User Rooms"
-msgstr "Salon de discussion utilisateur"
-
-#: ../src/protocols/yahoo/ycht.c:456
+#: ../libgaim/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr "Problème de connexion avec le serveur YCHT"
 
-#: ../src/protocols/zephyr/zephyr.c:346
+#: ../libgaim/protocols/yahoo/ycht.c:475
+#, c-format
+msgid ""
+"Lost connection with server\n"
+"%s"
+msgstr ""
+"Connexion perdue avec le serveur :\n"
+"%s"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:355
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -12645,82 +14404,86 @@
 "(Erreur de conversion du message. Vérifiez l'option « Codage » dans les "
 "options du compte)"
 
-#: ../src/protocols/zephyr/zephyr.c:701
+#: ../libgaim/protocols/zephyr/zephyr.c:753
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Impossible d'Ă©crire dans le salon %s,%s,%s"
 
-#: ../src/protocols/zephyr/zephyr.c:734 ../src/protocols/zephyr/zephyr.c:1151
+#: ../libgaim/protocols/zephyr/zephyr.c:786
+#: ../libgaim/protocols/zephyr/zephyr.c:1203
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Utilisateur :</b> %s<br>"
 
-#: ../src/protocols/zephyr/zephyr.c:738 ../src/protocols/zephyr/zephyr.c:1156
+#: ../libgaim/protocols/zephyr/zephyr.c:790
+#: ../libgaim/protocols/zephyr/zephyr.c:1208
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Invisible ou déconnecté"
 
-#: ../src/protocols/zephyr/zephyr.c:743 ../src/protocols/zephyr/zephyr.c:1158
+#: ../libgaim/protocols/zephyr/zephyr.c:795
+#: ../libgaim/protocols/zephyr/zephyr.c:1210
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>Ă€ %s depuis %s"
 
-#: ../src/protocols/zephyr/zephyr.c:1490 ../src/protocols/zephyr/zephyr.c:1491
+#: ../libgaim/protocols/zephyr/zephyr.c:1542
+#: ../libgaim/protocols/zephyr/zephyr.c:1543
 msgid "Anyone"
 msgstr "Tout le monde"
 
-#: ../src/protocols/zephyr/zephyr.c:2298
+#: ../libgaim/protocols/zephyr/zephyr.c:2350
 msgid "_Class:"
 msgstr "_Classe :"
 
-#: ../src/protocols/zephyr/zephyr.c:2304
+#: ../libgaim/protocols/zephyr/zephyr.c:2356
 msgid "_Instance:"
 msgstr "_Instance :"
 
-#: ../src/protocols/zephyr/zephyr.c:2310
+#: ../libgaim/protocols/zephyr/zephyr.c:2362
 msgid "_Recipient:"
 msgstr "_Destinataire :"
 
-#: ../src/protocols/zephyr/zephyr.c:2321
+#: ../libgaim/protocols/zephyr/zephyr.c:2373
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Échec de l'inscription à %s,%s,%s"
 
-#: ../src/protocols/zephyr/zephyr.c:2634
+#: ../libgaim/protocols/zephyr/zephyr.c:2686
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;pseudo&gt; : Localiser d'une personne."
 
-#: ../src/protocols/zephyr/zephyr.c:2639
+#: ../libgaim/protocols/zephyr/zephyr.c:2691
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;pseudo&gt; : Localiser d'une personne."
 
-#: ../src/protocols/zephyr/zephyr.c:2644
+#: ../libgaim/protocols/zephyr/zephyr.c:2696
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "instance &lt;instance&gt; : Choisir l'instance à utiliser pour cette classe."
 
-#: ../src/protocols/zephyr/zephyr.c:2649
+#: ../libgaim/protocols/zephyr/zephyr.c:2701
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "inst &lt;instance&gt; : Choisir l'instance à utiliser pour cette classe."
 
-#: ../src/protocols/zephyr/zephyr.c:2654
+#: ../libgaim/protocols/zephyr/zephyr.c:2706
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "topic &lt;instance&gt; : Choisir l'instance à utiliser pour cette classe."
 
-#: ../src/protocols/zephyr/zephyr.c:2660
+#: ../libgaim/protocols/zephyr/zephyr.c:2712
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 "sub &lt;classs&gt; &lt;instance&gt; &lt;destinataire&gt; : Joindre une "
 "nouvelle discussion."
 
-#: ../src/protocols/zephyr/zephyr.c:2665
+#: ../libgaim/protocols/zephyr/zephyr.c:2717
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;instance&gt; : Envoyer un message à &lt;message,<i>instance</i>,*&gt;."
 
-#: ../src/protocols/zephyr/zephyr.c:2671
+#: ../libgaim/protocols/zephyr/zephyr.c:2723
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -12728,7 +14491,7 @@
 "zci &lt;classe&gt; &lt;instance&gt; : Envoyer un message à &lt;<i>classe</i>,"
 "<i>instance</i>,*&gt;."
 
-#: ../src/protocols/zephyr/zephyr.c:2677
+#: ../libgaim/protocols/zephyr/zephyr.c:2729
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -12736,7 +14499,7 @@
 "zcir &lt;classe&gt; &lt;instance&gt; &lt;destinataire&gt; : Envoyer un "
 "message Ă  &lt;<i>classe</i>,<i>instance</i>,<i>destinataire</i>&gt;."
 
-#: ../src/protocols/zephyr/zephyr.c:2683
+#: ../libgaim/protocols/zephyr/zephyr.c:2735
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -12744,16 +14507,16 @@
 "zir &lt;instance&gt; &lt;destinataire&gt; : Envoyer un message à &lt;message,"
 "<i>instance</i>,<i>destinataire</i>&gt;."
 
-#: ../src/protocols/zephyr/zephyr.c:2688
+#: ../libgaim/protocols/zephyr/zephyr.c:2740
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
 "zc &lt;classe&gt; : Envoyer un message à &lt;<i>classe</i>,personal,*&gt;."
 
-#: ../src/protocols/zephyr/zephyr.c:2794
+#: ../libgaim/protocols/zephyr/zephyr.c:2846
 msgid "Resubscribe"
 msgstr "RĂ©inscription"
 
-#: ../src/protocols/zephyr/zephyr.c:2797
+#: ../libgaim/protocols/zephyr/zephyr.c:2849
 msgid "Retrieve subscriptions from server"
 msgstr "Récupérer les abonnements du serveur"
 
@@ -12767,80 +14530,104 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/zephyr/zephyr.c:2882 ../src/protocols/zephyr/zephyr.c:2884
+#: ../libgaim/protocols/zephyr/zephyr.c:2935
+#: ../libgaim/protocols/zephyr/zephyr.c:2937
 msgid "Zephyr Protocol Plugin"
 msgstr "Plugin pour le protocole Zephyr"
 
-#: ../src/protocols/zephyr/zephyr.c:2903
+#: ../libgaim/protocols/zephyr/zephyr.c:2956
 msgid "Use tzc"
 msgstr "Utiliser tzc"
 
-#: ../src/protocols/zephyr/zephyr.c:2906
+#: ../libgaim/protocols/zephyr/zephyr.c:2959
 msgid "tzc command"
 msgstr "Commande tzc"
 
-#: ../src/protocols/zephyr/zephyr.c:2909
+#: ../libgaim/protocols/zephyr/zephyr.c:2962
 msgid "Export to .anyone"
 msgstr "Exporter vers .anyone"
 
-#: ../src/protocols/zephyr/zephyr.c:2912
+#: ../libgaim/protocols/zephyr/zephyr.c:2965
 msgid "Export to .zephyr.subs"
 msgstr "Exporter vers .zephyr.subs"
 
-#: ../src/protocols/zephyr/zephyr.c:2915
+#: ../libgaim/protocols/zephyr/zephyr.c:2968
 msgid "Import from .anyone"
 msgstr "Importer depuis .anyone"
 
-#: ../src/protocols/zephyr/zephyr.c:2918
+#: ../libgaim/protocols/zephyr/zephyr.c:2971
 msgid "Import from .zephyr.subs"
 msgstr "Importer depuis .zephyr.subs"
 
-#: ../src/protocols/zephyr/zephyr.c:2921
+#: ../libgaim/protocols/zephyr/zephyr.c:2974
 msgid "Realm"
 msgstr "Domaine"
 
-#: ../src/protocols/zephyr/zephyr.c:2924
+#: ../libgaim/protocols/zephyr/zephyr.c:2977
 msgid "Exposure"
 msgstr "Exposition"
 
-#: ../src/proxy.c:1212 ../src/proxy.c:1268 ../src/proxy.c:1316
-#: ../src/proxy.c:1343
-#, c-format
-msgid "Proxy connection error %d"
-msgstr "Erreur de connexion mandataire %d"
-
-#. Forbidden
-#: ../src/proxy.c:1332
-#, c-format
-msgid "Access denied: proxy server forbids port %d tunnelling."
+#: ../libgaim/proxy.c:446 ../libgaim/proxy.c:868 ../libgaim/proxy.c:1025
+#: ../libgaim/proxy.c:1583
+#, c-format
+msgid ""
+"Unable to create socket:\n"
+"%s"
+msgstr ""
+"Impossible de créer le socket :\n"
+"%s"
+
+#: ../libgaim/proxy.c:648
+#, c-format
+msgid "Unable to parse response from HTTP proxy: %s\n"
+msgstr "Impossible de reconnaître la réponse du serveur mandataire HTTP : %s\n"
+
+#: ../libgaim/proxy.c:676 ../libgaim/proxy.c:722 ../libgaim/proxy.c:760
+#: ../libgaim/proxy.c:772
+#, c-format
+msgid "HTTP proxy connection error %d"
+msgstr "Erreur de connexion au serveur mandataire HTTP %d."
+
+#: ../libgaim/proxy.c:768
+#, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr ""
 "Accès interdit : le serveur mandataire n'autorise pas le passage par le port "
-"%d"
+"%d."
+
+#: ../libgaim/proxy.c:988
+#, c-format
+msgid "Error resolving %s"
+msgstr "Erreur à la résolution du nom %s."
+
+#: ../libgaim/proxy.c:1677
+msgid "Could not resolve host name"
+msgstr "Impossible de résoudre le nom de l'hôte."
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../src/request.h:1354
+#: ../libgaim/request.h:1354
 msgid "_Accept"
 msgstr "_Accepter"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../src/savedstatuses.c:45
+#: ../libgaim/savedstatuses.c:46
 msgid "I'm not here right now"
 msgstr "Je ne suis pas lĂ  pour l'instant."
 
-#: ../src/savedstatuses.c:524
+#: ../libgaim/savedstatuses.c:525
 msgid "saved statuses"
 msgstr "saved statuses"
 
-#: ../src/server.c:225
+#: ../libgaim/server.c:228
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s est désormais connu sous le nom de %s\n"
 
-#: ../src/server.c:686
+#: ../libgaim/server.c:686
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -12849,73 +14636,73 @@
 "%s a invité %s dans le salon de discussions %s :\n"
 "%s"
 
-#: ../src/server.c:691
+#: ../libgaim/server.c:691
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s a invité %s dans le salon de discussions %s\n"
 
-#: ../src/server.c:695
+#: ../libgaim/server.c:695
 msgid "Accept chat invitation?"
 msgstr "Accepter l'invitation à la discussion ?"
 
-#: ../src/status.c:153
+#: ../libgaim/status.c:153
 msgid "Unset"
 msgstr "Enlever"
 
-#: ../src/status.c:156
+#: ../libgaim/status.c:156
 msgid "Unavailable"
 msgstr "Non disponible"
 
-#: ../src/status.c:160
+#: ../libgaim/status.c:160
 msgid "Mobile"
 msgstr "Téléphone portable"
 
-#: ../src/status.c:611
+#: ../libgaim/status.c:611
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s a changé son état de %s en %s."
 
-#: ../src/status.c:621
+#: ../libgaim/status.c:621
 #, c-format
 msgid "%s is now %s"
 msgstr "%s est désormais %s."
 
-#: ../src/status.c:626
+#: ../libgaim/status.c:626
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s n'est plus %s."
 
-#: ../src/status.c:1296
+#: ../libgaim/status.c:1293
 #, c-format
 msgid "%s became idle"
 msgstr "%s est devenu inactif."
 
-#: ../src/status.c:1313
+#: ../libgaim/status.c:1310
 #, c-format
 msgid "%s became unidle"
 msgstr "%s n'est plus inactif."
 
-#: ../src/status.c:1379
+#: ../libgaim/status.c:1376
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s devient inactif."
 
-#: ../src/status.c:1381
+#: ../libgaim/status.c:1378
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s devient actif."
 
-#: ../src/util.c:679
+#: ../libgaim/util.c:680
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../src/util.c:2449
+#: ../libgaim/util.c:2429
 #, c-format
 msgid "Error Reading %s"
 msgstr "Erreur à la lecture de « %s »."
 
-#: ../src/util.c:2450
+#: ../libgaim/util.c:2430
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -12924,59 +14711,109 @@
 "Une erreur est survenue à la lecture de « %s ». Ils n'ont pas été changés, "
 "et l'ancien fichier a été renommé « %s~ »."
 
-#: ../src/util.c:2903
+#: ../libgaim/util.c:2883
 msgid "Calculating..."
 msgstr "Calcul en cours"
 
-#: ../src/util.c:2906
+#: ../libgaim/util.c:2886
 msgid "Unknown."
 msgstr "Inconnu"
 
-#: ../src/util.c:2932
+#: ../libgaim/util.c:2912
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d seconde"
 msgstr[1] "%d secondes"
 
-#: ../src/util.c:2944
+#: ../libgaim/util.c:2924
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d jour"
 msgstr[1] "%d jours"
 
-#: ../src/util.c:2952
+#: ../libgaim/util.c:2932
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d heure"
 msgstr[1] "%s, %d heures"
 
-#: ../src/util.c:2958
+#: ../libgaim/util.c:2938
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d heure"
 msgstr[1] "%d heures"
 
-#: ../src/util.c:2966
+#: ../libgaim/util.c:2946
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minute"
 msgstr[1] "%s, %d minutes"
 
-#: ../src/util.c:2972
+#: ../libgaim/util.c:2952
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
-#: ../src/util.c:3441
-msgid "g003: Error opening connection.\n"
-msgstr "g003 : Erreur à l'ouverture de la connexion\n"
+#: ../libgaim/util.c:3151 ../libgaim/util.c:3450
+#, c-format
+msgid "Unable to connect to %s"
+msgstr "Impossible de se connecter Ă  %s."
+
+#: ../libgaim/util.c:3277
+#, c-format
+msgid ""
+"Unable to allocate enough memory to hold the contents from %s.  The web "
+"server may be trying something malicious."
+msgstr ""
+"Impossible de réserver suffisamment de mémoire pour le contenu de %s. Il "
+"s'agit peut-ĂŞtre d'une attaque du serveur web."
+
+#: ../libgaim/util.c:3314
+#, c-format
+msgid "Error reading from %s: %s"
+msgstr "Erreur à la lecture depuis %s : %s"
+
+#: ../libgaim/util.c:3345
+#, c-format
+msgid "Error writing to %s: %s"
+msgstr "Erreur à l'écriture vers %s : %s"
+
+#: ../libgaim/util.c:3370
+#, c-format
+msgid "Unable to connect to %s: %s"
+msgstr "Impossible de se connecter à %s : %s"
+
+#~ msgid "Buddy icon:"
+#~ msgstr "Icône :"
+
+#~ msgid ""
+#~ "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
+#~ "account properties"
+#~ msgstr ""
+#~ "TLS/SSL est nécessaire pour la connexion au serveur. Choisissez "
+#~ "« Utiliser TLS si possible » dans les préférences du compte."
+
+#~ msgid "Use TLS if available"
+#~ msgstr "Utiliser TLS si possible"
+
+#~ msgid "Require TLS"
+#~ msgstr "NĂ©cessite TLS"
+
+#~ msgid "Lost connection with server for an unknown reason."
+#~ msgstr "Connexion perdue avec le serveur pour une raison inconnue."
+
+#~ msgid "Unable to read"
+#~ msgstr "Impossible de lire"
+
+#~ msgid "g003: Error opening connection.\n"
+#~ msgstr "g003 : Erreur à l'ouverture de la connexion\n"
 
 #~ msgid "IM the user"
 #~ msgstr "Envoyer un message Ă  cet utilisateur"
@@ -13027,18 +14864,12 @@
 #~ "Impossible d'ouvrir le socket en attente de connexions ou pas de "
 #~ "connexion mandataire AOL."
 
-#~ msgid "Internal Error"
-#~ msgstr "Erreur interne"
-
 #~ msgid "Screen Name:"
 #~ msgstr "Utilisateur :"
 
 #~ msgid "Error launching <b>%s</b>: %s"
 #~ msgstr "Erreur au lancement de <b>%s</b> : %s"
 
-#~ msgid "Email"
-#~ msgstr "Courrier Ă©lectronique"
-
 #~ msgid "Realname"
 #~ msgstr "Nom réel"
 
@@ -13057,15 +14888,9 @@
 #~ msgid "Re-type Passphrase"
 #~ msgstr "Ressaisissez la phrase de passe"
 
-#~ msgid "%s signed on"
-#~ msgstr "%s vient de se connecter."
-
 #~ msgid "%s came back"
 #~ msgstr "%s est de retour."
 
-#~ msgid "%s signed off"
-#~ msgstr "%s vient de partir."
-
 #~ msgid "%s went away"
 #~ msgstr "%s vient de passer absent."
 
@@ -13190,9 +15015,6 @@
 #~ msgid "Jabber ID"
 #~ msgstr "Identifiant Jabber"
 
-#~ msgid "Away Message"
-#~ msgstr "Message d'absence"
-
 #~ msgid "Use last matching buddy"
 #~ msgstr "À valeur égale, choisir le dernier trouvé"
 
--- a/po/hu.po	Mon Oct 16 20:15:30 2006 +0000
+++ b/po/hu.po	Mon Oct 16 20:20:14 2006 +0000
@@ -2,22 +2,22 @@
 # Copyright (C) 2003, 2005, 2006 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gaim package.
 # The Hungarian translation of Gaim was sponsored by Novell Hungary, many thanks for it!
+#
 # Zoltan Sutto <suttozoltan@chello.hu>, 2003.
 # Gabor Kelemen <kelemeng@gnome.hu>, 2005, 2006.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gaim3\n"
+msgid ""
+msgstr ""
+"Project-Id-Version: gaim 2.0-beta\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-03-05 00:00-0500\n"
-"PO-Revision-Date: 2006-03-13 23:51+0100\n"
+"PO-Revision-Date: 2006-10-15 01:16+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <gnome@gnome.hu>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: KBabel 1.10.2\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.2\n"
 
 #: ../gaim.desktop.in.h:1
 msgid "Gaim Internet Messenger"
@@ -39,14 +39,13 @@
 #. *< id
 #: ../plugins/ciphertest.c:264
 msgid "Cipher Test"
-msgstr "Kódolásteszt"
+msgstr "TitkosĂ­tĂłteszt"
 
 #. *< name
 #. *< 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 "A gaimmal érkező kódolók tesztelése."
 
@@ -76,8 +75,12 @@
 msgstr "Pontértékek használata, ha..."
 
 #: ../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 "A <i>legnagyobb pontszámmal</i> rendelkező partner prioritással fog rendelkezni a kapcsolatban.\n"
+msgid ""
+"The buddy with the <i>largest score</i> is the buddy who will have priority "
+"in the contact.\n"
+msgstr ""
+"A <i>legnagyobb pontszámmal</i> rendelkező partner prioritással fog "
+"rendelkezni a kapcsolatban.\n"
 
 #: ../plugins/contact_priority.c:125
 msgid "Use last buddy when scores are equal"
@@ -102,12 +105,18 @@
 #. *< summary
 #: ../plugins/contact_priority.c:185
 msgid "Allows for controlling the values associated with different buddy states."
-msgstr "Lehetővé teszi a partnerek különböző állapotaihoz rendelt értékek beállítását."
+msgstr ""
+"Lehetővé teszi a partnerek különböző állapotaihoz rendelt értékek "
+"beállítását."
 
 #. *< description
 #: ../plugins/contact_priority.c:187
-msgid "Allows for changing the point values of idle/away/offline states for buddies in contact priority computations."
-msgstr "Lehetővé teszi a partnerek inaktív/távol/kilépett állapotaihoz tartozó pontértékek megváltoztatását a kapcsolatok prioritásainak számításakor."
+msgid ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
+msgstr ""
+"Lehetővé teszi a partnerek inaktív/távol/kilépett állapotaihoz tartozó "
+"pontértékek megváltoztatását a kapcsolatok prioritásainak számításakor."
 
 #. *< api_version
 #. *< type
@@ -130,16 +139,18 @@
 #. *  description
 #: ../plugins/crazychat/cc_gaim_plugin.c:151
 msgid "Uses Gaim to obtain buddy ips to connect for a Crazychat session"
-msgstr "A Gaimot használja a Crazychat környezethez csatlakoztatandó partnerek IP címeinek lekéréséhez"
+msgstr ""
+"A Gaimot használja a Crazychat környezethez csatlakoztatandó partnerek IP "
+"címeinek lekéréséhez"
 
 #. make the network configuration frame
 #: ../plugins/crazychat/cc_gaim_plugin.c:295
 msgid "Network Configuration"
-msgstr "Hálózat beállítása"
+msgstr "Hálózatbeállítás"
 
 #: ../plugins/crazychat/cc_gaim_plugin.c:307
 msgid "TCP port"
-msgstr "TOC port"
+msgstr "TCP port"
 
 #: ../plugins/crazychat/cc_gaim_plugin.c:317
 msgid "UDP port"
@@ -148,11 +159,10 @@
 #. make the feature configuration frame
 #: ../plugins/crazychat/cc_gaim_plugin.c:329
 msgid "Feature Calibration"
-msgstr "Szolgáltatás beállítása"
+msgstr "Szolgáltatásbeállítás"
 
 #. add enabled / disabled
-#: ../plugins/crazychat/cc_gaim_plugin.c:345
-#: ../src/gtkaccount.c:2251
+#: ../plugins/crazychat/cc_gaim_plugin.c:345 ../src/gtkaccount.c:2251
 #: ../src/gtkplugin.c:577
 msgid "Enabled"
 msgstr "Engedélyezve"
@@ -175,8 +185,7 @@
 #. *< 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 "DBus példabővítmény"
 
@@ -184,75 +193,55 @@
 msgid "Right-click for more unread messages...\n"
 msgstr "További olvasatlan üzenetekért kattintson a jobb egérgombbal...\n"
 
-#: ../plugins/docklet/docklet.c:157
-#: ../src/gtkblist.c:3274
+#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3274
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
-msgstr[0] "%d olvasatlan üzenet, összesen %s\n"
-msgstr[1] "%d olvasatlan üzenet, összesen %s\n"
+msgstr[0] "%d olvasatlan üzenet %s partnertől\n"
+msgstr[1] "%d olvasatlan üzenet %s partnertől\n"
 
 #: ../plugins/docklet/docklet.c:432
 msgid "Change Status"
 msgstr "Ăllapot megváltoztatása"
 
-#: ../plugins/docklet/docklet.c:435
-#: ../src/gtkstatusbox.c:673
-#: ../src/protocols/jabber/buddy.c:1101
-#: ../src/protocols/msn/state.c:29
-#: ../src/protocols/msn/state.c:30
-#: ../src/protocols/msn/state.c:37
-#: ../src/protocols/msn/state.c:38
-#: ../src/protocols/novell/novell.c:2845
-#: ../src/protocols/yahoo/yahoo.c:2734
-#: ../src/status.c:155
+#: ../plugins/docklet/docklet.c:435 ../src/gtkstatusbox.c:673
+#: ../src/protocols/jabber/buddy.c:1101 ../src/protocols/msn/state.c:29
+#: ../src/protocols/msn/state.c:30 ../src/protocols/msn/state.c:37
+#: ../src/protocols/msn/state.c:38 ../src/protocols/novell/novell.c:2845
+#: ../src/protocols/yahoo/yahoo.c:2734 ../src/status.c:155
 msgid "Available"
 msgstr "Elérhető"
 
 #. Away stuff
-#: ../plugins/docklet/docklet.c:439
-#: ../src/gtkprefs.c:1759
-#: ../src/gtkstatusbox.c:674
-#: ../src/protocols/irc/irc.c:520
-#: ../src/protocols/irc/msgs.c:219
-#: ../src/protocols/jabber/buddy.c:1105
-#: ../src/protocols/novell/novell.c:2848
-#: ../src/protocols/oscar/oscar.c:793
-#: ../src/protocols/oscar/oscar.c:6830
-#: ../src/protocols/oscar/oscar.c:7871
-#: ../src/protocols/silc/buddy.c:1469
-#: ../src/protocols/yahoo/yahoo.c:3188
+#: ../plugins/docklet/docklet.c:439 ../src/gtkprefs.c:1759
+#: ../src/gtkstatusbox.c:674 ../src/protocols/irc/irc.c:520
+#: ../src/protocols/irc/msgs.c:219 ../src/protocols/jabber/buddy.c:1105
+#: ../src/protocols/novell/novell.c:2848 ../src/protocols/oscar/oscar.c:793
+#: ../src/protocols/oscar/oscar.c:6830 ../src/protocols/oscar/oscar.c:7871
+#: ../src/protocols/silc/buddy.c:1469 ../src/protocols/yahoo/yahoo.c:3188
 #: ../src/status.c:158
 msgid "Away"
 msgstr "Távol"
 
-#: ../plugins/docklet/docklet.c:443
-#: ../src/gtkstatusbox.c:675
-#: ../src/protocols/oscar/oscar.c:797
-#: ../src/protocols/yahoo/yahoo.c:2728
+#: ../plugins/docklet/docklet.c:443 ../src/gtkstatusbox.c:675
+#: ../src/protocols/oscar/oscar.c:797 ../src/protocols/yahoo/yahoo.c:2728
 #: ../src/status.c:157
 msgid "Invisible"
 msgstr "Láthatatlan"
 
-#: ../plugins/docklet/docklet.c:447
-#: ../src/gtkblist.c:3004
-#: ../src/gtkstatusbox.c:676
-#: ../src/protocols/jabber/buddy.c:1099
-#: ../src/protocols/novell/novell.c:2857
-#: ../src/protocols/oscar/oscar.c:859
-#: ../src/protocols/oscar/oscar.c:7843
-#: ../src/protocols/yahoo/yahoo.c:2732
+#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:3004
+#: ../src/gtkstatusbox.c:676 ../src/protocols/jabber/buddy.c:1099
+#: ../src/protocols/novell/novell.c:2857 ../src/protocols/oscar/oscar.c:859
+#: ../src/protocols/oscar/oscar.c:7843 ../src/protocols/yahoo/yahoo.c:2732
 #: ../src/status.c:154
 msgid "Offline"
 msgstr "Kilépett"
 
-#: ../plugins/docklet/docklet.c:467
-#: ../src/gtkstatusbox.c:681
+#: ../plugins/docklet/docklet.c:467 ../src/gtkstatusbox.c:681
 msgid "New..."
 msgstr "Ăšj..."
 
-#: ../plugins/docklet/docklet.c:468
-#: ../src/gtkstatusbox.c:682
+#: ../plugins/docklet/docklet.c:468 ../src/gtkstatusbox.c:682
 msgid "Saved..."
 msgstr "Mentve..."
 
@@ -268,18 +257,15 @@
 msgid "New Message..."
 msgstr "Ăšj ĂĽzenet..."
 
-#: ../plugins/docklet/docklet.c:519
-#: ../src/gtkaccount.c:2467
+#: ../plugins/docklet/docklet.c:519 ../src/gtkaccount.c:2467
 msgid "Accounts"
 msgstr "FiĂłkok"
 
-#: ../plugins/docklet/docklet.c:520
-#: ../src/gtkplugin.c:541
+#: ../plugins/docklet/docklet.c:520 ../src/gtkplugin.c:541
 msgid "Plugins"
 msgstr "Bővítmények"
 
-#: ../plugins/docklet/docklet.c:521
-#: ../src/gtkprefs.c:1900
+#: ../plugins/docklet/docklet.c:521 ../src/gtkprefs.c:1900
 msgid "Preferences"
 msgstr "Beállítások"
 
@@ -302,12 +288,9 @@
 msgid "_Instant Messages:"
 msgstr "_Azonnali ĂĽzenetekhez:"
 
-#: ../plugins/docklet/docklet.c:684
-#: ../plugins/docklet/docklet.c:692
-#: ../plugins/win32/winprefs/winprefs.c:424
-#: ../src/gtkprefs.c:823
-#: ../src/gtkprefs.c:1749
-#: ../src/gtkprefs.c:1763
+#: ../plugins/docklet/docklet.c:684 ../plugins/docklet/docklet.c:692
+#: ../plugins/win32/winprefs/winprefs.c:424 ../src/gtkprefs.c:823
+#: ../src/gtkprefs.c:1749 ../src/gtkprefs.c:1763
 msgid "Never"
 msgstr "Soha"
 
@@ -315,12 +298,9 @@
 msgid "In hidden conversations"
 msgstr "Rejtett társalgásokban"
 
-#: ../plugins/docklet/docklet.c:686
-#: ../plugins/docklet/docklet.c:694
-#: ../plugins/timestamp_format.c:39
-#: ../plugins/timestamp_format.c:48
-#: ../plugins/win32/winprefs/winprefs.c:425
-#: ../src/gtkprefs.c:825
+#: ../plugins/docklet/docklet.c:686 ../plugins/docklet/docklet.c:694
+#: ../plugins/timestamp_format.c:39 ../plugins/timestamp_format.c:48
+#: ../plugins/win32/winprefs/winprefs.c:425 ../src/gtkprefs.c:825
 msgid "Always"
 msgstr "Mindig"
 
@@ -351,8 +331,17 @@
 
 #. *  description
 #: ../plugins/docklet/docklet.c:725
-msgid "Displays a system tray icon (in GNOME, KDE, or Windows for example) to show the current status of Gaim, allow fast access to commonly used functions, and to toggle display of the buddy list. Also provides options to blink for unread messages."
-msgstr "A rendszertálcán (például GNOME, KDE vagy Windows alatt) elhelyezett ikon segítségével megjeleníti a Gaim állapotát, gyors hozzáférést biztosít a gyakrabban használt funkciók eléréséhez és kezeli a partnerlista megjelenítését is. Továbbá lehetőséget biztosít olvasatlan üzenetek esetén a villogtatásra."
+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 ""
+"A rendszertálcán (például GNOME, KDE vagy Windows alatt) elhelyezett ikon "
+"segítségével megjeleníti a Gaim állapotát, gyors hozzáférést biztosít a "
+"gyakrabban használt funkciók eléréséhez és kezeli a partnerlista "
+"megjelenítését is. Továbbá lehetőséget biztosít olvasatlan üzenetek esetén a "
+"villogtatásra."
 
 #: ../plugins/docklet/eggtrayicon.c:123
 msgid "Orientation"
@@ -397,8 +386,12 @@
 #. *< summary
 #. *  description
 #: ../plugins/extplacement.c:139
-msgid "Restrict the number of conversations per windows, optionally separating IMs and Chats"
-msgstr "Ablakonkénti társalgások számának korlátozása, opcionálisan az azonnaliüzenetek és csevegés elkülönítése"
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr ""
+"Ablakonkénti társalgások számának korlátozása, opcionálisan az "
+"azonnali üzenetek és csevegés elkülönítése"
 
 #. *< type
 #. *< ui_requirement
@@ -414,8 +407,7 @@
 #. *< 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 "Lehetőséget nyújt a Gaim irányítására fájlban megadott parancsokkal."
 
@@ -552,8 +544,7 @@
 msgid "Gaim GTK+ Theme Control"
 msgstr "Gaim GTK+ témavezérlés"
 
-#: ../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 "Hozzáférést biztosít az általánosan használt gtkrc beállításokhoz."
 
@@ -611,10 +602,8 @@
 
 #. Extract their Name and put it in
 #: ../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
+#: ../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:1525
 msgid "Name"
 msgstr "NĂ©v"
@@ -631,15 +620,13 @@
 #. "Search"
 #: ../plugins/gevolution/add_buddy_dialog.c:467
 #: ../plugins/gevolution/assoc-buddy.c:353
-#: ../src/protocols/jabber/buddy.c:1418
-#: ../src/protocols/oscar/oscar.c:8391
+#: ../src/protocols/jabber/buddy.c:1418 ../src/protocols/oscar/oscar.c:8391
 #: ../src/protocols/sametime/sametime.c:5532
 msgid "Search"
 msgstr "Keresés"
 
 #: ../plugins/gevolution/add_buddy_dialog.c:548
-#: ../plugins/gevolution/new_person_dialog.c:306
-#: ../src/gtkblist.c:4570
+#: ../plugins/gevolution/new_person_dialog.c:306 ../src/gtkblist.c:4570
 #: ../src/gtkblist.c:4934
 msgid "Group:"
 msgstr "Csoport:"
@@ -657,8 +644,12 @@
 
 #. Add the label.
 #: ../plugins/gevolution/assoc-buddy.c:340
-msgid "Select a person from your address book to add this buddy to, or create a new person."
-msgstr "Válassza ki címjegyzékéből azt a személyt, aki megfelel ennek a partnernek vagy hozzon létre egy újat."
+msgid ""
+"Select a person from your address book to add this buddy to, or create a new "
+"person."
+msgstr ""
+"Válassza ki címjegyzékéből azt a személyt, aki megfelel ennek a partnernek "
+"vagy hozzon létre egy újat."
 
 #. Add the expander
 #: ../plugins/gevolution/assoc-buddy.c:428
@@ -670,19 +661,14 @@
 msgid "_Associate Buddy"
 msgstr "_Partner összerendelése"
 
-#: ../plugins/gevolution/eds-utils.c:73
-#: ../plugins/gevolution/eds-utils.c:86
+#: ../plugins/gevolution/eds-utils.c:73 ../plugins/gevolution/eds-utils.c:86
 #: ../src/protocols/jabber/jabber.c:1121
 msgid "None"
 msgstr "Nincs"
 
-#: ../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:4379
-#: ../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:4379 ../src/protocols/jabber/roster.c:65
 msgid "Buddies"
 msgstr "Partnerek"
 
@@ -693,7 +679,9 @@
 
 #: ../plugins/gevolution/gevolution.c:263
 msgid "The evolution executable was not found in the PATH."
-msgstr "Az evolution végrehajtható állomány nem található a PATH változóban megadott útvonalon."
+msgstr ""
+"Az evolution végrehajtható állomány nem található a PATH változóban megadott "
+"Ăştvonalon."
 
 #: ../plugins/gevolution/gevolution.c:269
 msgid "The specified buddy was not found in the Evolution Contacts."
@@ -715,13 +703,12 @@
 #. Label
 #: ../plugins/gevolution/gevolution.c:420
 msgid "Select all accounts that buddies should be auto-added to."
-msgstr "Jelölje ki az összes fiókot, amelyekhez a partnereket automatikusan hozzá kell rendelni."
-
-#: ../plugins/gevolution/gevolution.c:450
-#: ../plugins/idle.c:147
-#: ../plugins/idle.c:183
-#: ../src/gtknotify.c:371
-#: ../src/gtkpounce.c:1262
+msgstr ""
+"Jelölje ki az összes fiókot, amelyekhez a partnereket automatikusan hozzá "
+"kell rendelni."
+
+#: ../plugins/gevolution/gevolution.c:450 ../plugins/idle.c:147
+#: ../plugins/idle.c:183 ../src/gtknotify.c:371 ../src/gtkpounce.c:1262
 msgid "Account"
 msgstr "FiĂłk"
 
@@ -756,8 +743,7 @@
 msgid "Account type:"
 msgstr "FiĂłk tĂ­pusa:"
 
-#: ../plugins/gevolution/new_person_dialog.c:294
-#: ../src/gtkaccount.c:784
+#: ../plugins/gevolution/new_person_dialog.c:294 ../src/gtkaccount.c:784
 msgid "Screen name:"
 msgstr "Felhasználónév:"
 
@@ -767,10 +753,8 @@
 msgstr "Opcionális információk:"
 
 #. Label
-#: ../plugins/gevolution/new_person_dialog.c:337
-#: ../src/gtkaccount.c:424
-#: ../src/gtkaccount.c:446
-#: ../src/protocols/oscar/oscar.c:699
+#: ../plugins/gevolution/new_person_dialog.c:337 ../src/gtkaccount.c:424
+#: ../src/gtkaccount.c:446 ../src/protocols/oscar/oscar.c:699
 msgid "Buddy Icon"
 msgstr "Partnerikon"
 
@@ -800,8 +784,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/gtk-signals-test.c:163
-#: ../plugins/gtk-signals-test.c:165
+#: ../plugins/gtk-signals-test.c:163 ../plugins/gtk-signals-test.c:165
 msgid "Test to see that all ui signals are working properly."
 msgstr "Ellenőrzés, hogy minden felületi szignál megfelelően működik-e."
 
@@ -818,11 +801,13 @@
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
-"Enabling logs for instant messages and/or chats will activate history for the same conversation type(s)."
+"Enabling logs for instant messages and/or chats will activate history for "
+"the same conversation type(s)."
 msgstr ""
 "A naplózás engedélyezhető az Eszközök -> Beállítások -> Naplózás alatt.\n"
 "\n"
-"Az azonnali üzenetek naplózásának engedélyezése a megfelelő társalgástípusok előzményeit is aktiválja."
+"Az azonnali üzenetek naplózásának engedélyezése a megfelelő társalgástípusok "
+"előzményeit is aktiválja."
 
 #: ../plugins/history.c:188
 msgid "History"
@@ -833,8 +818,12 @@
 msgstr "Legutóbb naplózott társalgások mutatása új társalgáskor."
 
 #: ../plugins/history.c:191
-msgid "When a new conversation is opened this plugin will insert the last conversation into the current conversation."
-msgstr "Ez a bővítmény új társalgás megnyitásakor beszúrja az utolsó társalgást az aktuális társalgásba."
+msgid ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
+msgstr ""
+"Ez a bővítmény új társalgás megnyitásakor beszúrja az utolsó társalgást az "
+"aktuális társalgásba."
 
 #. *< type
 #. *< ui_requirement
@@ -850,36 +839,28 @@
 #. *< 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 "Ikonállapotba helyezi a partnerlistát és a társalgásokat, amikor távol van."
 
-#: ../plugins/idle.c:152
-#: ../plugins/idle.c:210
+#: ../plugins/idle.c:152 ../plugins/idle.c:210
 msgid "Minutes"
 msgstr "Perc"
 
-#: ../plugins/idle.c:159
-#: ../plugins/idle.c:192
-#: ../plugins/idle.c:217
+#: ../plugins/idle.c:159 ../plugins/idle.c:192 ../plugins/idle.c:217
 #: ../plugins/idle.c:306
 msgid "I'dle Mak'er"
 msgstr "Inaktív idő szerkesztése"
 
-#: ../plugins/idle.c:160
-#: ../plugins/idle.c:249
+#: ../plugins/idle.c:160 ../plugins/idle.c:249
 msgid "Set Account Idle Time"
 msgstr "Fiók inaktivitási idejének beállítása"
 
-#: ../plugins/idle.c:163
-#: ../plugins/idle.c:221
+#: ../plugins/idle.c:163 ../plugins/idle.c:221
 msgid "_Set"
 msgstr "_Beállítás"
 
-#: ../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 "MĂ©_gsem"
 
@@ -887,8 +868,7 @@
 msgid "None of your accounts are idle."
 msgstr "Egyik fiĂłkja sem inaktĂ­v."
 
-#: ../plugins/idle.c:193
-#: ../plugins/idle.c:253
+#: ../plugins/idle.c:193 ../plugins/idle.c:253
 msgid "Unset Account Idle Time"
 msgstr "Fiók inaktivitási idejének visszaállítása"
 
@@ -896,8 +876,7 @@
 msgid "_Unset"
 msgstr "_Visszaállítás"
 
-#: ../plugins/idle.c:218
-#: ../plugins/idle.c:257
+#: ../plugins/idle.c:218 ../plugins/idle.c:257
 msgid "Set Idle Time for All Accounts"
 msgstr "Inaktivitási idő beállítása minden fiókhoz"
 
@@ -905,8 +884,7 @@
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Inaktivitási idő törlése az összes inaktív fiókhoz"
 
-#: ../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 "Saját kezűleg állíthatja be, meddig volt inaktív az állapota"
 
@@ -929,8 +907,12 @@
 
 #. *  description
 #: ../plugins/ipc-test-client.c:92
-msgid "Test plugin IPC support, as a client. This locates the server plugin and calls the commands registered."
-msgstr "Bővítmények IPC támogatásának tesztelése kliensként. Ez megkeresi a kiszolgálóbővítményt és meghívja a regisztrált parancsokat."
+msgid ""
+"Test plugin IPC support, as a client. This locates the server plugin and "
+"calls the commands registered."
+msgstr ""
+"Bővítmények IPC támogatásának tesztelése kliensként. Ez megkeresi a "
+"kiszolgálóbővítményt és meghívja a regisztrált parancsokat."
 
 #. *< type
 #. *< ui_requirement
@@ -952,7 +934,9 @@
 #. *  description
 #: ../plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
-msgstr "Bővítmények IPC támogatásának tesztelése kiszolgálóként. Ez regisztrálja az IPC parancsokat."
+msgstr ""
+"Bővítmények IPC támogatásának tesztelése kiszolgálóként. Ez regisztrálja az "
+"IPC parancsokat."
 
 #: ../plugins/log_reader.c:1407
 msgid "User is offline."
@@ -960,10 +944,9 @@
 
 #: ../plugins/log_reader.c:1413
 msgid "Auto-response sent:"
-msgstr "Automatikus válasz küldve:"
-
-#: ../plugins/log_reader.c:1423
-#: ../plugins/log_reader.c:1426
+msgstr "Automatikus válasz elküldve:"
+
+#: ../plugins/log_reader.c:1423 ../plugins/log_reader.c:1426
 #: ../plugins/statenotify.c:79
 #, c-format
 msgid "%s has signed off."
@@ -975,52 +958,48 @@
 
 #. MSG_SERVER_DISCONNECTING
 #. we have been kicked off =^(
-#: ../plugins/log_reader.c:1450
-#: ../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 "Megszakadt a kapcsolat a kiszolgálóval."
 
 #: ../plugins/log_reader.c:1458
-msgid "You are currently disconnected. Messages will not be received unless you are logged in."
+msgid ""
+"You are currently disconnected. Messages will not be received unless you are "
+"logged in."
 msgstr "Jelenleg nincs csatlakozva. Nem fogadhat ĂĽzeneteket, amĂ­g nem jelentkezik be."
 
 #: ../plugins/log_reader.c:1473
 msgid "Message could not be sent because the maximum length was exceeded."
-msgstr "Az üzenet nem küldhető el, mivel túllépte a maximális hosszt."
+msgstr "Az üzenet nem küldhető el, mivel a maximális hossz el lett érve."
 
 #: ../plugins/log_reader.c:1478
 msgid "Message could not be sent."
 msgstr "Az üzenet nem küldhető el."
 
-#: ../plugins/log_reader.c:1837
-#: ../plugins/log_reader.c:1930
+#: ../plugins/log_reader.c:1837 ../plugins/log_reader.c:1930
 msgid "Adium"
 msgstr "Adium"
 
-#: ../plugins/log_reader.c:1846
-#: ../plugins/log_reader.c:1934
+#: ../plugins/log_reader.c:1846 ../plugins/log_reader.c:1934
 msgid "Fire"
-msgstr "Fire"
-
-#: ../plugins/log_reader.c:1855
-#: ../plugins/log_reader.c:1938
+msgstr "Tűz"
+
+#: ../plugins/log_reader.c:1855 ../plugins/log_reader.c:1938
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
-#: ../plugins/log_reader.c:1864
-#: ../plugins/log_reader.c:1942
+#: ../plugins/log_reader.c:1864 ../plugins/log_reader.c:1942
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: ../plugins/log_reader.c:1873
-#: ../plugins/log_reader.c:1946
+#: ../plugins/log_reader.c:1873 ../plugins/log_reader.c:1946
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
 #: ../plugins/log_reader.c:1912
 msgid "General Log Reading Configuration"
-msgstr "Ăltalános naplĂłolvasási beállĂ­tások"
+msgstr "Ăltalános naplĂłolvasás beállĂ­tása"
 
 #: ../plugins/log_reader.c:1916
 msgid "Fast size calculations"
@@ -1043,7 +1022,7 @@
 #. *< id
 #: ../plugins/log_reader.c:1969
 msgid "Log Reader"
-msgstr "NaplĂłolvasĂł"
+msgstr "Naplómegjelenítő"
 
 #. *< name
 #. *< version
@@ -1054,8 +1033,14 @@
 
 #. * description
 #: ../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 "Naplók megjelenítésekor ez a bővítmény felveszi más azonnali üzenők naplóit. Jelenleg a következők támogatottak: Adium, Fire, Messenger Plus!, MSN Messenger és Trillian."
+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 ""
+"Naplók megjelenítésekor ez a bővítmény felveszi más azonnali üzenők naplóit. "
+"Jelenleg a következők támogatottak: Adium, Fire, Messenger Plus!, MSN "
+"Messenger Ă©s Trillian."
 
 #: ../plugins/mailchk.c:160
 msgid "Mail Checker"
@@ -1073,14 +1058,17 @@
 msgid "Mono Plugin Loader"
 msgstr "Mono bővítménybetöltő"
 
-#: ../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 ".NET bővítményeket tölt be a Mono segítségével."
 
 #: ../plugins/musicmessaging/musicmessaging.c:44
-msgid "A music messaging session has been requested. Please click the MM icon to accept."
-msgstr "Valaki egy zenei üzenetküldő munkamenetet kért. Az elfogadáshoz kattintson az MM ikonra."
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr ""
+"Valaki egy zenei üzenetküldő munkamenetet kért. Az elfogadáshoz kattintson "
+"az MM ikonra."
 
 #: ../plugins/musicmessaging/musicmessaging.c:45
 msgid "Music messaging session confirmed."
@@ -1129,8 +1117,12 @@
 
 #. *  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 "A zenei üzenetküldő bővítmény lehetővé teszi a párhuzamos munkát több felhasználó számára ugyanazon kotta valós idejű szerkesztésével."
+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 ""
+"A zenei üzenetküldő bővítmény lehetővé teszi a párhuzamos munkát több "
+"felhasználó számára ugyanazon kotta valós idejű szerkesztésével."
 
 #. ---------- "Notify For" ----------
 #: ../plugins/notify.c:638
@@ -1147,7 +1139,7 @@
 
 #: ../plugins/notify.c:657
 msgid "\t_Only when someone says your nick"
-msgstr "\tCsak ha _valaki leírja az Ön becenevét"
+msgstr "\t_Csak ha valaki kimondja az Ön becenevét"
 
 #: ../plugins/notify.c:667
 msgid "_Focused windows"
@@ -1221,8 +1213,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/notify.c:856
-#: ../plugins/notify.c:858
+#: ../plugins/notify.c:856 ../plugins/notify.c:858
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Különböző lehetőségeket nyújt az olvasatlan üzenetekre figyelmeztetésre."
 
@@ -1239,8 +1230,7 @@
 #. *< 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 "Perl bővítmények betöltését támogatja."
 
@@ -1253,8 +1243,13 @@
 msgstr "Szellemmód bejövő kapcsolathoz"
 
 #: ../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 "Hatására a társalgási ablakok megjelennek, amint más felhasználók elkezdik üzenetüket írni.  Ez az AIM, ICQ, Jabber, Sametime és Yahoo! protokollokkal működik."
+msgid ""
+"Causes conversation windows to appear as other users begin to message you.  "
+"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+msgstr ""
+"Hatására a társalgási ablakok megjelennek, amint más felhasználók elkezdik "
+"ĂĽzenetĂĽket Ă­rni.  Ez az AIM, ICQ, Jabber, Sametime Ă©s Yahoo! protokollokkal "
+"működik."
 
 #: ../plugins/psychic.c:60
 msgid "You feel a disturbance in the force..."
@@ -1281,8 +1276,13 @@
 msgstr "Nyers adatküldésre ad lehetőséget szövegalapú protokollok számára."
 
 #: ../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 "Nyers adatküldésre ad lehetőséget szövegalapú protokollok számára (Jabber, MSN, IRC, TOC). Nyomja meg az \"Enter\" billentyűt a küldéshez. Figyelje a hibakereső ablakot."
+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 ""
+"Nyers adatküldésre ad lehetőséget szövegalapú protokollok számára (Jabber, "
+"MSN, IRC, TOC). Nyomja meg az \"Enter\" billentyűt a küldéshez. Figyelje a "
+"hibakereső ablakot."
 
 #: ../plugins/relnot.c:63
 #, c-format
@@ -1300,11 +1300,14 @@
 
 #: ../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 "A(z) %s verzióhoz hozzájuthat a:<br><a href=\"http://gaim.sourceforge.net/\">http://gaim.sourceforge.net</a> címről."
-
-#: ../plugins/relnot.c:78
-#: ../plugins/relnot.c:79
+msgid ""
+"You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
+"\">http://gaim.sourceforge.net</a>."
+msgstr ""
+"A(z) %s verzióhoz hozzájuthat a:<br><a href=\"http://gaim.sourceforge.net/"
+"\">http://gaim.sourceforge.net</a> címről."
+
+#: ../plugins/relnot.c:78 ../plugins/relnot.c:79
 msgid "New Version Available"
 msgstr "Új verzió érhető el"
 
@@ -1327,8 +1330,12 @@
 
 #. *  description
 #: ../plugins/relnot.c:142
-msgid "Checks periodically for new releases and notifies the user with the ChangeLog."
-msgstr "Rendszeresen ellenőrzi az új verziók megjelenését és a változások naplójának segítségével értesíti a felhasználót."
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+msgstr ""
+"Rendszeresen ellenőrzi az új verziók megjelenését és a változások naplójának "
+"segítségével értesíti a felhasználót."
 
 #. *< type
 #. *< ui_requirement
@@ -1344,8 +1351,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/signals-test.c:687
-#: ../plugins/signals-test.c:689
+#: ../plugins/signals-test.c:687 ../plugins/signals-test.c:689
 msgid "Test to see that all signals are working properly."
 msgstr "Ellenőrzi, hogy minden szignál megfelelően működik-e."
 
@@ -1363,8 +1369,7 @@
 #. *< 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 "Tesztek, hogy a legtöbb dolog működik-e."
 
@@ -1411,7 +1416,9 @@
 #. Created here so it can be passed to whole_words_button_toggled.
 #: ../plugins/spellchk.c:2261
 msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr "Kis- és nagybetűk _pontos egyezése (ne jelölje be azok automatikus kezeléséhez)"
+msgstr ""
+"Kis- és nagybetűk _pontos egyezése (ne jelölje be azok automatikus "
+"kezeléséhez)"
 
 #: ../plugins/spellchk.c:2263
 msgid "Only replace _whole words"
@@ -1429,10 +1436,11 @@
 msgid "Text replacement"
 msgstr "Szöveg cseréje"
 
-#: ../plugins/spellchk.c:2316
-#: ../plugins/spellchk.c:2317
+#: ../plugins/spellchk.c:2316 ../plugins/spellchk.c:2317
 msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr "A felhasználó által megadott szabályoknak megfelelően cseréli a szöveget a kimenő üzenetekben."
+msgstr ""
+"A felhasználó által megadott szabályoknak megfelelően cseréli a szöveget a "
+"kimenő üzenetekben."
 
 #. *< type
 #. *< ui_requirement
@@ -1448,8 +1456,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/ssl/ssl-gnutls.c:254
-#: ../plugins/ssl/ssl-gnutls.c:256
+#: ../plugins/ssl/ssl-gnutls.c:254 ../plugins/ssl/ssl-gnutls.c:256
 msgid "Provides SSL support through GNUTLS."
 msgstr "SSL támogatást biztosít a GNUTLS-en keresztül."
 
@@ -1467,8 +1474,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/ssl/ssl-nss.c:415
-#: ../plugins/ssl/ssl-nss.c:417
+#: ../plugins/ssl/ssl-nss.c:415 ../plugins/ssl/ssl-nss.c:417
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "SSL támogatást biztosít a Mozilla NSS-en keresztül."
 
@@ -1486,8 +1492,7 @@
 #. *< 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 "Burkot biztosít az SSL-t támogató könyvtárakhoz."
 
@@ -1546,17 +1551,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../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 "Figyelmeztet egy társalgás ablakában amikor a partner távol van, inaktív, visszaérkezik vagy az inaktív állapota megszűnik."
+#: ../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 ""
+"Figyelmeztet egy társalgás ablakában amikor a partner távol van, inaktív, "
+"visszaérkezik vagy az inaktív állapota megszűnik."
 
 #: ../plugins/tcl/tcl.c:369
 msgid "Tcl Plugin Loader"
 msgstr "Tcl bővítménybetöltő"
 
-#: ../plugins/tcl/tcl.c:371
-#: ../plugins/tcl/tcl.c:372
+#: ../plugins/tcl/tcl.c:371 ../plugins/tcl/tcl.c:372
 msgid "Provides support for loading Tcl plugins"
 msgstr "Tcl bővítmények betöltését támogatja"
 
@@ -1566,8 +1573,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/ticker/ticker.c:77
-#: ../plugins/ticker/ticker.c:355
+#: ../plugins/ticker/ticker.c:77 ../plugins/ticker/ticker.c:355
 msgid "Buddy Ticker"
 msgstr "Partnerfigyelő"
 
@@ -1575,8 +1581,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/ticker/ticker.c:358
-#: ../plugins/ticker/ticker.c:360
+#: ../plugins/ticker/ticker.c:358 ../plugins/ticker/ticker.c:360
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Vízszintesen gördülő partnerlista."
 
@@ -1606,8 +1611,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/timestamp.c:265
-#: ../plugins/timestamp.c:267
+#: ../plugins/timestamp.c:265 ../plugins/timestamp.c:267
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "iChat stílusú időbélyegek hozzáadása a társalgáshoz minden N percben."
 
@@ -1627,13 +1631,11 @@
 msgid "Co_nversations:"
 msgstr "_Társalgások:"
 
-#: ../plugins/timestamp_format.c:37
-#: ../plugins/timestamp_format.c:46
+#: ../plugins/timestamp_format.c:37 ../plugins/timestamp_format.c:46
 msgid "For delayed messages"
 msgstr "KĂ©sleltetett ĂĽzenetekhez"
 
-#: ../plugins/timestamp_format.c:38
-#: ../plugins/timestamp_format.c:47
+#: ../plugins/timestamp_format.c:38 ../plugins/timestamp_format.c:47
 msgid "For delayed messages and in chats"
 msgstr "Késleltetett üzenetekhez és csevegésekhez"
 
@@ -1660,8 +1662,12 @@
 
 #. *  description
 #: ../plugins/timestamp_format.c:155
-msgid "This plugin allows the user to customize conversation and logging message timestamp formats."
-msgstr "Ez a bővítmény lehetővé teszi a felhasználó számára a társalgási és naplóüzenetek időpecsét-formátumainak testreszabását."
+msgid ""
+"This plugin allows the user to customize conversation and logging message "
+"timestamp formats."
+msgstr ""
+"Ez a bővítmény lehetővé teszi a felhasználó számára a társalgási és "
+"naplóüzenetek időpecsét-formátumainak testreszabását."
 
 #: ../plugins/win32/transparency/win2ktrans.c:183
 #: ../plugins/win32/transparency/win2ktrans.c:569
@@ -1724,11 +1730,13 @@
 #. *  description
 #: ../plugins/win32/transparency/win2ktrans.c:662
 msgid ""
-"This plugin enables variable alpha transparency on conversation windows and the buddy list.\n"
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
 "\n"
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
-"Ez a bővítmény lehetővé teszi változó alfa átlátszóság beállítását a társalgás és a partnerlista ablakában.\n"
+"Ez a bővítmény lehetővé teszi változó alfa átlátszóság beállítását a "
+"társalgás és a partnerlista ablakában.\n"
 "\n"
 "* Megjegyzés: A bővítményhez Win2000 vagy újabb szükséges."
 
@@ -1746,8 +1754,7 @@
 msgstr "A Gaim indítá_sa a Windows indulásakor"
 
 #. Buddy List
-#: ../plugins/win32/winprefs/winprefs.c:417
-#: ../src/gtkblist.c:3623
+#: ../plugins/win32/winprefs/winprefs.c:417 ../src/gtkblist.c:3623
 msgid "Buddy List"
 msgstr "Partnerlista"
 
@@ -1766,8 +1773,7 @@
 msgstr "Csak ha dokkolt"
 
 #. Conversations
-#: ../plugins/win32/winprefs/winprefs.c:431
-#: ../src/gtkprefs.c:819
+#: ../plugins/win32/winprefs/winprefs.c:431 ../src/gtkprefs.c:819
 #: ../src/gtkprefs.c:1864
 msgid "Conversations"
 msgstr "Társalgások"
@@ -1785,8 +1791,12 @@
 msgstr "A Windowsos Gaimra jellemző opciók."
 
 #: ../plugins/win32/winprefs/winprefs.c:459
-msgid "Provides options specific to Windows Gaim, such as buddy list docking and conversation flashing."
-msgstr "A Windows Gaimra jellemző beállításokat biztosít, mint például a partnerlista dokkolása és a társalgás villogtatása."
+msgid ""
+"Provides options specific to Windows Gaim, such as buddy list docking and "
+"conversation flashing."
+msgstr ""
+"A Windows Gaimra jellemző beállításokat biztosít, mint például a "
+"partnerlista dokkolása és a társalgás villogtatása."
 
 #: ../src/account.c:773
 msgid "accounts"
@@ -1809,128 +1819,73 @@
 msgid "Save password"
 msgstr "Jelszó mentése"
 
-#: ../src/account.c:968
-#: ../src/account.c:1139
-#: ../src/gtkblist.c:3507
-#: ../src/gtkdialogs.c:584
-#: ../src/gtkdialogs.c:721
-#: ../src/gtkdialogs.c:789
-#: ../src/gtkrequest.c:275
-#: ../src/protocols/gg/gg.c:454
-#: ../src/protocols/gg/gg.c:595
-#: ../src/protocols/gg/gg.c:731
-#: ../src/protocols/jabber/jabber.c:1318
-#: ../src/protocols/jabber/xdata.c:337
-#: ../src/protocols/msn/msn.c:250
-#: ../src/protocols/msn/msn.c:265
-#: ../src/protocols/msn/msn.c:280
-#: ../src/protocols/msn/msn.c:295
-#: ../src/protocols/oscar/oscar.c:3064
-#: ../src/protocols/oscar/oscar.c:4607
-#: ../src/protocols/oscar/oscar.c:4688
-#: ../src/protocols/oscar/oscar.c:8122
-#: ../src/protocols/oscar/oscar.c:8245
-#: ../src/protocols/oscar/oscar.c:8270
-#: ../src/protocols/oscar/oscar.c:8322
-#: ../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:3062
+#: ../src/account.c:968 ../src/account.c:1139 ../src/gtkblist.c:3507
+#: ../src/gtkdialogs.c:584 ../src/gtkdialogs.c:721 ../src/gtkdialogs.c:789
+#: ../src/gtkrequest.c:275 ../src/protocols/gg/gg.c:454
+#: ../src/protocols/gg/gg.c:595 ../src/protocols/gg/gg.c:731
+#: ../src/protocols/jabber/jabber.c:1318 ../src/protocols/jabber/xdata.c:337
+#: ../src/protocols/msn/msn.c:250 ../src/protocols/msn/msn.c:265
+#: ../src/protocols/msn/msn.c:280 ../src/protocols/msn/msn.c:295
+#: ../src/protocols/oscar/oscar.c:3064 ../src/protocols/oscar/oscar.c:4607
+#: ../src/protocols/oscar/oscar.c:4688 ../src/protocols/oscar/oscar.c:8122
+#: ../src/protocols/oscar/oscar.c:8245 ../src/protocols/oscar/oscar.c:8270
+#: ../src/protocols/oscar/oscar.c:8322 ../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:3062
 #: ../src/protocols/yahoo/yahoo.c:3071
 msgid "OK"
 msgstr "Rendben"
 
-#: ../src/account.c:969
-#: ../src/account.c:1140
-#: ../src/account.c:1177
-#: ../src/gtkaccount.c:2171
-#: ../src/gtkaccount.c:2638
-#: ../src/gtkblist.c:4975
-#: ../src/gtkdialogs.c:585
-#: ../src/gtkdialogs.c:722
-#: ../src/gtkdialogs.c:790
-#: ../src/gtkdialogs.c:809
-#: ../src/gtkdialogs.c:831
-#: ../src/gtkdialogs.c:851
-#: ../src/gtkdialogs.c:895
-#: ../src/gtkdialogs.c:950
-#: ../src/gtkdialogs.c:987
-#: ../src/gtkdialogs.c:1012
-#: ../src/gtkimhtmltoolbar.c:419
-#: ../src/gtkplugin.c:297
-#: ../src/gtkpounce.c:1095
-#: ../src/gtkprivacy.c:568
-#: ../src/gtkprivacy.c:581
-#: ../src/gtkprivacy.c:606
-#: ../src/gtkprivacy.c:617
-#: ../src/gtkrequest.c:276
-#: ../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:1419
-#: ../src/protocols/jabber/buddy.c:1453
-#: ../src/protocols/jabber/chat.c:780
-#: ../src/protocols/jabber/jabber.c:824
-#: ../src/protocols/jabber/jabber.c:1319
-#: ../src/protocols/jabber/xdata.c:338
-#: ../src/protocols/msn/msn.c:251
-#: ../src/protocols/msn/msn.c:266
-#: ../src/protocols/msn/msn.c:281
-#: ../src/protocols/msn/msn.c:296
-#: ../src/protocols/msn/msn.c:313
-#: ../src/protocols/oscar/oscar.c:1705
-#: ../src/protocols/oscar/oscar.c:3065
-#: ../src/protocols/oscar/oscar.c:4565
-#: ../src/protocols/oscar/oscar.c:4608
-#: ../src/protocols/oscar/oscar.c:4645
-#: ../src/protocols/oscar/oscar.c:4689
-#: ../src/protocols/oscar/oscar.c:8123
-#: ../src/protocols/oscar/oscar.c:8246
-#: ../src/protocols/oscar/oscar.c:8271
-#: ../src/protocols/oscar/oscar.c:8323
+#: ../src/account.c:969 ../src/account.c:1140 ../src/account.c:1177
+#: ../src/gtkaccount.c:2171 ../src/gtkaccount.c:2638 ../src/gtkblist.c:4975
+#: ../src/gtkdialogs.c:585 ../src/gtkdialogs.c:722 ../src/gtkdialogs.c:790
+#: ../src/gtkdialogs.c:809 ../src/gtkdialogs.c:831 ../src/gtkdialogs.c:851
+#: ../src/gtkdialogs.c:895 ../src/gtkdialogs.c:950 ../src/gtkdialogs.c:987
+#: ../src/gtkdialogs.c:1012 ../src/gtkimhtmltoolbar.c:419
+#: ../src/gtkplugin.c:297 ../src/gtkpounce.c:1095 ../src/gtkprivacy.c:568
+#: ../src/gtkprivacy.c:581 ../src/gtkprivacy.c:606 ../src/gtkprivacy.c:617
+#: ../src/gtkrequest.c:276 ../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:1419
+#: ../src/protocols/jabber/buddy.c:1453 ../src/protocols/jabber/chat.c:780
+#: ../src/protocols/jabber/jabber.c:824 ../src/protocols/jabber/jabber.c:1319
+#: ../src/protocols/jabber/xdata.c:338 ../src/protocols/msn/msn.c:251
+#: ../src/protocols/msn/msn.c:266 ../src/protocols/msn/msn.c:281
+#: ../src/protocols/msn/msn.c:296 ../src/protocols/msn/msn.c:313
+#: ../src/protocols/oscar/oscar.c:1705 ../src/protocols/oscar/oscar.c:3065
+#: ../src/protocols/oscar/oscar.c:4565 ../src/protocols/oscar/oscar.c:4608
+#: ../src/protocols/oscar/oscar.c:4645 ../src/protocols/oscar/oscar.c:4689
+#: ../src/protocols/oscar/oscar.c:8123 ../src/protocols/oscar/oscar.c:8246
+#: ../src/protocols/oscar/oscar.c:8271 ../src/protocols/oscar/oscar.c:8323
 #: ../src/protocols/oscar/oscar.c:8392
 #: ../src/protocols/sametime/sametime.c:3376
 #: ../src/protocols/sametime/sametime.c:3461
 #: ../src/protocols/sametime/sametime.c:3631
 #: ../src/protocols/sametime/sametime.c:5320
 #: ../src/protocols/sametime/sametime.c:5409
-#: ../src/protocols/sametime/sametime.c:5533
-#: ../src/protocols/silc/buddy.c:467
-#: ../src/protocols/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:3063
+#: ../src/protocols/sametime/sametime.c:5533 ../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:3063
 #: ../src/protocols/yahoo/yahoo.c:3072
 msgid "Cancel"
 msgstr "MĂ©gsem"
 
-#: ../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 "Hiányzó protokollbővítmény a következőhöz: %s"
 
-#: ../src/account.c:996
-#: ../src/connection.c:99
-#: ../src/gtkblist.c:3499
+#: ../src/account.c:996 ../src/connection.c:99 ../src/gtkblist.c:3499
 #: ../src/gtkblist.c:3505
 msgid "Connection Error"
 msgstr "Kapcsolódási hiba"
 
-#: ../src/account.c:1076
-#: ../src/protocols/gg/gg.c:636
+#: ../src/account.c:1076 ../src/protocols/gg/gg.c:636
 #: ../src/protocols/jabber/jabber.c:1271
 msgid "New passwords do not match."
 msgstr "Az Ăşj jelszavak nem egyeznek."
@@ -1965,19 +1920,14 @@
 msgid "Change user information for %s"
 msgstr "Felhasználó-információk megváltoztatása %s számára"
 
-#: ../src/account.c:1176
-#: ../src/gtkdebug.c:684
-#: ../src/gtkrequest.c:282
+#: ../src/account.c:1176 ../src/gtkdebug.c:684 ../src/gtkrequest.c:282
 #: ../src/protocols/jabber/buddy.c:572
 msgid "Save"
 msgstr "Mentés"
 
-#: ../src/account.c:1679
-#: ../src/gtkft.c:157
-#: ../src/protocols/jabber/buddy.c:630
-#: ../src/protocols/jabber/buddy.c:1095
-#: ../src/protocols/jabber/buddy.c:1112
-#: ../src/protocols/novell/novell.c:2860
+#: ../src/account.c: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 "Ismeretlen"
 
@@ -1991,10 +1941,21 @@
 
 #: ../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"
-msgstr[0] "%d partner nem lett eltávolítva a(z) %s csoportból, mert fiókja le van tiltva vagy nem jelentkezett be. Ez a partner és a csoport nem lettek eltávolítva.\n"
-msgstr[1] "%d partner nem lett eltávolítva a(z) %s csoportból, mert fiókjaik le vannak tiltva vagy nem jelentkeztek be. Ezek a partnerek és a csoport nem lettek eltávolítva.\n"
+msgid ""
+"%d buddy from group %s was not removed because it belongs to an account "
+"which is disabled or offline.  This buddy and the group were not removed.\n"
+msgid_plural ""
+"%d buddies from group %s were not removed because they belong to accounts "
+"which are currently disabled or offline.  These buddies and the group were "
+"not removed.\n"
+msgstr[0] ""
+"%d partner nem lett eltávolítva a(z) %s csoportból, mert fiókja le van "
+"tiltva vagy nem jelentkezett be. Ez a partner Ă©s a csoport nem lettek "
+"eltávolítva.\n"
+msgstr[1] ""
+"%d partner nem lett eltávolítva a(z) %s csoportból, mert fiókja le van "
+"tiltva vagy nem jelentkezett be. Ez a partner Ă©s a csoport nem lettek "
+"eltávolítva.\n"
 
 #: ../src/blist.c:1896
 msgid "Group not removed"
@@ -2018,8 +1979,7 @@
 msgid "Unable to send message: The message is too large."
 msgstr "Nem küldhető üzenet: az üzenet túl nagy."
 
-#: ../src/conversation.c:166
-#: ../src/conversation.c:179
+#: ../src/conversation.c:166 ../src/conversation.c:179
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Nem küldhető üzenet a következőnek: %s."
@@ -2062,13 +2022,11 @@
 msgid "%s left the room (%s)."
 msgstr "%s elhagyta a szobát (%s)."
 
-#: ../src/desktopitem.c:286
-#: ../src/desktopitem.c:875
+#: ../src/desktopitem.c:286 ../src/desktopitem.c:875
 msgid "No name"
 msgstr "NĂ©vtelen"
 
-#: ../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"
@@ -2208,8 +2166,7 @@
 msgid "Login Options"
 msgstr "Bejelentkezés beállításai"
 
-#: ../src/gtkaccount.c:779
-#: ../src/gtkft.c:640
+#: ../src/gtkaccount.c:779 ../src/gtkft.c:640
 msgid "Protocol:"
 msgstr "Protokoll:"
 
@@ -2217,9 +2174,7 @@
 msgid "Password:"
 msgstr "JelszĂł:"
 
-#: ../src/gtkaccount.c:863
-#: ../src/gtkblist.c:4553
-#: ../src/gtkblist.c:4919
+#: ../src/gtkaccount.c:863 ../src/gtkblist.c:4553 ../src/gtkblist.c:4919
 msgid "Alias:"
 msgstr "ĂlnĂ©v:"
 
@@ -2266,8 +2221,7 @@
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../src/gtkaccount.c:1263
-#: ../src/gtkprefs.c:1043
+#: ../src/gtkaccount.c:1263 ../src/gtkprefs.c:1043
 msgid "Use Environmental Settings"
 msgstr "Környezeti beállítások használata"
 
@@ -2283,18 +2237,15 @@
 msgid "Proxy Options"
 msgstr "Proxy beállításai"
 
-#: ../src/gtkaccount.c:1331
-#: ../src/gtkprefs.c:1037
+#: ../src/gtkaccount.c:1331 ../src/gtkprefs.c:1037
 msgid "Proxy _type:"
 msgstr "Proxy _tĂ­pusa:"
 
-#: ../src/gtkaccount.c:1340
-#: ../src/gtkprefs.c:1058
+#: ../src/gtkaccount.c:1340 ../src/gtkprefs.c:1058
 msgid "_Host:"
 msgstr "_Gépnév:"
 
-#: ../src/gtkaccount.c:1344
-#: ../src/gtkprefs.c:1076
+#: ../src/gtkaccount.c:1344 ../src/gtkprefs.c:1076
 msgid "_Port:"
 msgstr "_Port:"
 
@@ -2302,8 +2253,7 @@
 msgid "_Username:"
 msgstr "_Felhasználó:"
 
-#: ../src/gtkaccount.c:1358
-#: ../src/gtkprefs.c:1113
+#: ../src/gtkaccount.c:1358 ../src/gtkprefs.c:1113
 msgid "Pa_ssword:"
 msgstr "Jel_szĂł:"
 
@@ -2311,8 +2261,7 @@
 msgid "Add Account"
 msgstr "Fiók hozzáadása"
 
-#: ../src/gtkaccount.c:1738
-#: ../src/gtkblist.c:3508
+#: ../src/gtkaccount.c:1738 ../src/gtkblist.c:3508
 msgid "Modify Account"
 msgstr "Fiók módosítása"
 
@@ -2325,26 +2274,21 @@
 msgstr "_HaladĂł"
 
 #. Register button
-#: ../src/gtkaccount.c:1786
-#: ../src/protocols/jabber/jabber.c:823
+#: ../src/gtkaccount.c:1786 ../src/protocols/jabber/jabber.c:823
 msgid "Register"
 msgstr "Regisztráció"
 
-#: ../src/gtkaccount.c:2165
-#: ../src/gtksavedstatuses.c:293
+#: ../src/gtkaccount.c:2165 ../src/gtksavedstatuses.c:293
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Biztos, hogy törölni akarja %s fiókot?"
 
-#: ../src/gtkaccount.c:2170
-#: ../src/gtkpounce.c:1094
-#: ../src/gtkrequest.c:279
+#: ../src/gtkaccount.c:2170 ../src/gtkpounce.c:1094 ../src/gtkrequest.c:279
 #: ../src/gtksavedstatuses.c:295
 msgid "Delete"
 msgstr "Törlés"
 
-#: ../src/gtkaccount.c:2228
-#: ../src/gtksavedstatuses.c:890
+#: ../src/gtkaccount.c:2228 ../src/gtksavedstatuses.c:890
 #: ../src/protocols/oscar/oscar.c:5252
 msgid "Screen Name"
 msgstr "Felhasználónév"
@@ -2362,14 +2306,10 @@
 msgid "Add buddy to your list?"
 msgstr "Felveszi a partnert a partnerlistájára?"
 
-#: ../src/gtkaccount.c:2637
-#: ../src/gtkblist.c:4974
-#: ../src/gtkconv.c:1594
-#: ../src/gtkrequest.c:280
-#: ../src/protocols/gg/gg.c:811
+#: ../src/gtkaccount.c:2637 ../src/gtkblist.c:4974 ../src/gtkconv.c:1594
+#: ../src/gtkrequest.c:280 ../src/protocols/gg/gg.c:811
 #: ../src/protocols/oscar/oscar.c:4877
-#: ../src/protocols/sametime/sametime.c:5408
-#: ../src/protocols/silc/chat.c:595
+#: ../src/protocols/sametime/sametime.c:5408 ../src/protocols/silc/chat.c:595
 msgid "Add"
 msgstr "Hozzáadás"
 
@@ -2378,12 +2318,14 @@
 msgstr "Csatlakozás egy csevegéshez"
 
 #: ../src/gtkblist.c:694
-msgid "Please enter the appropriate information about the chat you would like to join.\n"
-msgstr "Kérem adja meg a megfelelő információt arról a csevegésről, amelyhez csatlakozni kíván.\n"
-
-#: ../src/gtkblist.c:705
-#: ../src/gtkpounce.c:527
-#: ../src/gtkroomlist.c:377
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+msgstr ""
+"Kérem adja meg a megfelelő információt arról a csevegésről, amelyhez "
+"csatlakozni kíván.\n"
+
+#: ../src/gtkblist.c:705 ../src/gtkpounce.c:527 ../src/gtkroomlist.c:377
 msgid "_Account:"
 msgstr "F_iĂłk:"
 
@@ -2391,8 +2333,7 @@
 msgid "Get _Info"
 msgstr "_Info"
 
-#: ../src/gtkblist.c:952
-#: ../src/gtkstock.c:141
+#: ../src/gtkblist.c:952 ../src/gtkstock.c:141
 msgid "I_M"
 msgstr "Ăś_zenet"
 
@@ -2404,9 +2345,7 @@
 msgid "Add Buddy _Pounce"
 msgstr "_Partnerfigyelő felvétele"
 
-#: ../src/gtkblist.c:969
-#: ../src/gtkblist.c:973
-#: ../src/gtkblist.c:1072
+#: ../src/gtkblist.c:969 ../src/gtkblist.c:973 ../src/gtkblist.c:1072
 #: ../src/gtkblist.c:1095
 msgid "View _Log"
 msgstr "Nap_ló megtekintése"
@@ -2415,21 +2354,15 @@
 msgid "Alias..."
 msgstr "ĂlnĂ©v..."
 
-#: ../src/gtkblist.c:987
-#: ../src/gtkconv.c:1591
-#: ../src/gtkrequest.c:281
+#: ../src/gtkblist.c:987 ../src/gtkconv.c:1591 ../src/gtkrequest.c:281
 msgid "Remove"
 msgstr "Eltávolítás"
 
-#: ../src/gtkblist.c:993
-#: ../src/gtkblist.c:1080
-#: ../src/gtkblist.c:1101
+#: ../src/gtkblist.c:993 ../src/gtkblist.c:1080 ../src/gtkblist.c:1101
 msgid "_Alias..."
 msgstr "Ăl_nĂ©v..."
 
-#: ../src/gtkblist.c:995
-#: ../src/gtkblist.c:1082
-#: ../src/gtkblist.c:1103
+#: ../src/gtkblist.c:995 ../src/gtkblist.c:1082 ../src/gtkblist.c:1103
 msgid "_Remove"
 msgstr "_Eltávolítás"
 
@@ -2450,9 +2383,7 @@
 msgstr "Ă_tnevezĂ©s"
 
 #. join button
-#: ../src/gtkblist.c:1068
-#: ../src/gtkroomlist.c:285
-#: ../src/gtkroomlist.c:441
+#: ../src/gtkblist.c:1068 ../src/gtkroomlist.c:285 ../src/gtkroomlist.c:441
 #: ../src/gtkstock.c:139
 msgid "_Join"
 msgstr "_Csatlakozás"
@@ -2461,8 +2392,7 @@
 msgid "Auto-Join"
 msgstr "Automatikus csatlakozás"
 
-#: ../src/gtkblist.c:1108
-#: ../src/gtkblist.c:1131
+#: ../src/gtkblist.c:1108 ../src/gtkblist.c:1131
 msgid "_Collapse"
 msgstr "Összecs_ukás"
 
@@ -2470,18 +2400,16 @@
 msgid "_Expand"
 msgstr "_Kibontás"
 
-#: ../src/gtkblist.c:1414
-#: ../src/gtkblist.c:1426
-#: ../src/gtkblist.c:3768
+#: ../src/gtkblist.c:1414 ../src/gtkblist.c:1426 ../src/gtkblist.c:3768
 #: ../src/gtkblist.c:3778
 msgid "/Tools/Mute Sounds"
 msgstr "/Eszközök/Hangok némítása"
 
-#: ../src/gtkblist.c:1889
-#: ../src/gtkconv.c:4193
-#: ../src/gtkpounce.c:426
+#: ../src/gtkblist.c:1889 ../src/gtkconv.c:4193 ../src/gtkpounce.c:426
 msgid "You are not currently signed on with an account that can add that buddy."
-msgstr "Jelenleg nincs bejelentkezve olyan hálózatra, amelyen felvehetné ezt a partnert."
+msgstr ""
+"Jelenleg nincs bejelentkezve olyan hálózatra, amelyen felvehetné ezt a "
+"partnert."
 
 #. Buddies menu
 #: ../src/gtkblist.c:2463
@@ -2545,8 +2473,7 @@
 msgid "/_Accounts"
 msgstr "/_FiĂłkok"
 
-#: ../src/gtkblist.c:2483
-#: ../src/gtkblist.c:5553
+#: ../src/gtkblist.c:2483 ../src/gtkblist.c:5553
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Fiókok/Hozzáadás\\/Szerkesztés"
 
@@ -2604,8 +2531,7 @@
 msgid "/Help/_About"
 msgstr "/SĂşgĂł/_NĂ©vjegy"
 
-#: ../src/gtkblist.c:2534
-#: ../src/gtkblist.c:2603
+#: ../src/gtkblist.c:2534 ../src/gtkblist.c:2603
 #, c-format
 msgid ""
 "\n"
@@ -2650,7 +2576,6 @@
 "\n"
 "<b>InaktĂ­v:</b> %s"
 
-# fixme
 #: ../src/gtkblist.c:2682
 #, c-format
 msgid ""
@@ -2703,14 +2628,10 @@
 msgstr "InaktĂ­v (%d p)"
 
 #. Idle stuff
-#: ../src/gtkblist.c:3000
-#: ../src/gtkprefs.c:1745
-#: ../src/protocols/bonjour/bonjour.c:333
-#: ../src/protocols/msn/msn.c:552
-#: ../src/protocols/msn/state.c:32
-#: ../src/protocols/novell/novell.c:2854
-#: ../src/protocols/oscar/oscar.c:5273
-#: ../src/protocols/yahoo/yahoo.c:2730
+#: ../src/gtkblist.c:3000 ../src/gtkprefs.c:1745
+#: ../src/protocols/bonjour/bonjour.c:333 ../src/protocols/msn/msn.c:552
+#: ../src/protocols/msn/state.c:32 ../src/protocols/novell/novell.c:2854
+#: ../src/protocols/oscar/oscar.c:5273 ../src/protocols/yahoo/yahoo.c:2730
 #: ../src/protocols/yahoo/yahoo_profile.c:691
 msgid "Idle"
 msgstr "InaktĂ­v"
@@ -2719,8 +2640,7 @@
 msgid "/Buddies/New Instant Message..."
 msgstr "/Partnerek/Ăšj azonnali ĂĽzenet..."
 
-#: ../src/gtkblist.c:3133
-#: ../src/gtkblist.c:3166
+#: ../src/gtkblist.c:3133 ../src/gtkblist.c:3166
 msgid "/Buddies/Join a Chat..."
 msgstr "/Partnerek/Csatlakozás csevegéshez..."
 
@@ -2732,8 +2652,7 @@
 msgid "/Buddies/Add Buddy..."
 msgstr "/Partnerek/Partner felvétele..."
 
-#: ../src/gtkblist.c:3136
-#: ../src/gtkblist.c:3169
+#: ../src/gtkblist.c:3136 ../src/gtkblist.c:3169
 msgid "/Buddies/Add Chat..."
 msgstr "/Partnerek/Csevegés felvétele..."
 
@@ -2769,19 +2688,16 @@
 msgid "By log size"
 msgstr "Napló mérete szerint"
 
-#: ../src/gtkblist.c:3493
-#: ../src/gtkconn.c:196
+#: ../src/gtkblist.c:3493 ../src/gtkconn.c:196
 #, c-format
 msgid "%s disconnected"
 msgstr "%s bontotta a kapcsolatot"
 
-#: ../src/gtkblist.c:3509
-#: ../src/protocols/sametime/sametime.c:3630
+#: ../src/gtkblist.c:3509 ../src/protocols/sametime/sametime.c:3630
 msgid "Connect"
 msgstr "Kapcsolódás"
 
-#: ../src/gtkblist.c:3509
-#: ../src/gtkblist.c:5652
+#: ../src/gtkblist.c:3509 ../src/gtkblist.c:5652
 msgid "Enable Account"
 msgstr "Fiók engedélyezése"
 
@@ -2813,26 +2729,28 @@
 msgid "/Buddies/Show Idle Times"
 msgstr "/Partnerek/Inaktivitási idők megjelenítése"
 
-#: ../src/gtkblist.c:4486
-#: ../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:2977
+#: ../src/gtkblist.c:4486 ../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:2977
 msgid "Add Buddy"
 msgstr "Partner felvétele"
 
 #: ../src/gtkblist.c:4510
-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 "Adja meg a felvenni kívánt partner felhasználónevét. Opcionálisan megadhat egy álnevet vagy becenevet a partnerhez. Az álnév a felhasználónév helyett kerül megjelenítésre, amennyiben az lehetséges.\n"
+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 ""
+"Adja meg a felvenni kívánt partner felhasználónevét. Opcionálisan megadhat "
+"egy álnevet vagy becenevet a partnerhez. Az álnév a felhasználónév helyett "
+"kerül megjelenítésre, amennyiben az lehetséges.\n"
 
 #: ../src/gtkblist.c:4532
 msgid "Screen Name:"
 msgstr "Felhasználónév:"
 
 #. Set up stuff for the account box
-#: ../src/gtkblist.c:4580
-#: ../src/gtkblist.c:4899
+#: ../src/gtkblist.c:4580 ../src/gtkblist.c:4899
 msgid "Account:"
 msgstr "FiĂłk:"
 
@@ -2841,19 +2759,26 @@
 msgstr "Ez a protokoll nem támogatja a csevegőszobákat."
 
 #: ../src/gtkblist.c:4848
-msgid "You are not currently signed on with any protocols that have the ability to chat."
-msgstr "Jelenleg nincs bejelentkezve olyan protokollal, ami csevegésre alkalmas lenne."
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr ""
+"Jelenleg nincs bejelentkezve olyan protokollal, ami csevegésre alkalmas "
+"lenne."
 
 #: ../src/gtkblist.c:4865
 msgid "Add Chat"
 msgstr "Csevegés hozzáadása"
 
 #: ../src/gtkblist.c:4889
-msgid "Please enter an alias, and the appropriate information about the chat you would like to add to your buddy list.\n"
-msgstr "Adjon meg egy álnevet és a megfelelő információt a partnerlistára felvenni kívánt csevegésről.\n"
-
-#: ../src/gtkblist.c:4971
-#: ../src/protocols/sametime/sametime.c:5319
+msgid ""
+"Please enter an alias, and the appropriate information about the chat you "
+"would like to add to your buddy list.\n"
+msgstr ""
+"Adjon meg egy álnevet és a megfelelő információt a partnerlistára felvenni "
+"kívánt csevegésről.\n"
+
+#: ../src/gtkblist.c:4971 ../src/protocols/sametime/sametime.c:5319
 #: ../src/protocols/sametime/sametime.c:5406
 msgid "Add Group"
 msgstr "Csoport felvétele"
@@ -2866,8 +2791,7 @@
 msgid "_Edit Account"
 msgstr "_Fiók szerkesztése"
 
-#: ../src/gtkblist.c:5626
-#: ../src/gtkblist.c:5632
+#: ../src/gtkblist.c:5626 ../src/gtkblist.c:5632
 msgid "No actions available"
 msgstr "Nem állnak rendelkezésre műveletek"
 
@@ -2887,10 +2811,12 @@
 #, 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 re-enable the account."
+"Gaim will not attempt to reconnect the account until you correct the error "
+"and re-enable the account."
 msgstr ""
 "%s kapcsolata bontva a következő hiba miatt: %s\n"
-"A Gaim nem próbálja meg újra csatlakoztatni a fiókot, amíg nem javítja a hibát és nem engedélyezi újra a fiókot."
+"A Gaim nem próbálja meg újra csatlakoztatni a fiókot, amíg nem javítja a "
+"hibát és nem engedélyezi újra a fiókot."
 
 #: ../src/gtkconv.c:373
 msgid "Supported debug options are:  version"
@@ -2905,7 +2831,8 @@
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 msgstr ""
-"Használja a \"&lt;help parancs&gt;\" utasítást egy adott parancs súgójának megtekintéséhez.\n"
+"Használja a \"&lt;help parancs&gt;\" utasítást egy adott parancs súgójának "
+"megtekintéséhez.\n"
 "Ebben a kontextusban a következő parancsok állnak rendelkezésre:\n"
 
 #: ../src/gtkconv.c:484
@@ -2914,7 +2841,9 @@
 
 #: ../src/gtkconv.c:491
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
-msgstr "Szintaktikai hiba:  Nem megfelelő számú paramétert adott meg ennek a parancsnak."
+msgstr ""
+"Szintaktikai hiba:  Nem megfelelő számú paramétert adott meg ennek a "
+"parancsnak."
 
 #: ../src/gtkconv.c:496
 msgid "Your command failed for an unknown reason."
@@ -2932,14 +2861,15 @@
 msgid "That command doesn't work on this protocol."
 msgstr "Ez a parancs nem működik ezzel a protokollal."
 
-#: ../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 "A partner nem ugyanazt a protokollt használja, mint ez a csevegés"
 
 #: ../src/gtkconv.c:764
 msgid "You are not currently signed on with an account that can invite that buddy."
-msgstr "Jelenleg nincs bejelentkezve olyan fiókkal, mellyel meghívhatná ezt a partnert."
+msgstr ""
+"Jelenleg nincs bejelentkezve olyan fiókkal, mellyel meghívhatná ezt a "
+"partnert."
 
 #: ../src/gtkconv.c:817
 msgid "Invite Buddy Into Chat Room"
@@ -2947,22 +2877,23 @@
 
 #. Put our happy label in it.
 #: ../src/gtkconv.c:847
-msgid "Please enter the name of the user you wish to invite, along with an optional invite message."
-msgstr "Adja meg annak a partnernek a nevét, akit meg szeretne hívni, egy tetszőleges meghívóüzenettel együtt."
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Adja meg annak a partnernek a nevét, akit meg szeretne hívni, egy "
+"tetszőleges meghívóüzenettel együtt."
 
 #: ../src/gtkconv.c:868
 msgid "_Buddy:"
 msgstr "_Partner:"
 
-#: ../src/gtkconv.c:888
-#: ../src/gtksavedstatuses.c:1108
+#: ../src/gtkconv.c:888 ../src/gtksavedstatuses.c:1108
 #: ../src/gtksavedstatuses.c:1444
 msgid "_Message:"
 msgstr "Ăś_zenet:"
 
-#: ../src/gtkconv.c:945
-#: ../src/gtkconv.c:2377
-#: ../src/gtkdebug.c:217
+#: ../src/gtkconv.c:945 ../src/gtkconv.c:2377 ../src/gtkdebug.c:217
 #: ../src/gtkft.c:488
 msgid "Unable to open file."
 msgstr "Nem lehet megnyitni a fájlt."
@@ -2976,14 +2907,11 @@
 msgid "Save Conversation"
 msgstr "Társalgás mentése"
 
-#: ../src/gtkconv.c:1093
-#: ../src/gtkdebug.c:165
-#: ../src/gtkdebug.c:678
+#: ../src/gtkconv.c:1093 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
 msgid "Find"
 msgstr "Keresés"
 
-#: ../src/gtkconv.c:1119
-#: ../src/gtkdebug.c:193
+#: ../src/gtkconv.c:1119 ../src/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "Kere_sés:"
 
@@ -2999,8 +2927,7 @@
 msgid "IM"
 msgstr "Azonnali ĂĽzenet"
 
-#: ../src/gtkconv.c:1562
-#: ../src/protocols/oscar/oscar.c:714
+#: ../src/gtkconv.c:1562 ../src/protocols/oscar/oscar.c:714
 msgid "Send File"
 msgstr "Fájl küldése"
 
@@ -3020,7 +2947,6 @@
 msgid "Get Away Message"
 msgstr "Távollét üzenet lekérdezése"
 
-# fixme
 #: ../src/gtkconv.c:1599
 msgid "Last said"
 msgstr "Utoljára ezt mondta"
@@ -3220,8 +3146,7 @@
 msgid "_Send"
 msgstr "_Küldés"
 
-#: ../src/gtkconv.c:3804
-#: ../src/protocols/sametime/sametime.c:3572
+#: ../src/gtkconv.c:3804 ../src/protocols/sametime/sametime.c:3572
 msgid "Topic:"
 msgstr "TĂ©ma:"
 
@@ -3242,8 +3167,7 @@
 msgid "Get the user's information"
 msgstr "A felhasználó adatainak lekérése"
 
-#: ../src/gtkconv.c:4933
-#: ../src/gtkconv.c:5042
+#: ../src/gtkconv.c:4933 ../src/gtkconv.c:5042
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -3251,16 +3175,24 @@
 msgstr[1] "%d személy van a szobában"
 
 #: ../src/gtkconv.c:6515
-msgid "say &lt;message&gt;:  Send a message normally as if you weren't using a command."
+msgid ""
+"say &lt;message&gt;:  Send a message normally as if you weren't using a "
+"command."
 msgstr "say &lt;üzenet&gt;: Üzenet küldése, mintha nem használná a parancsot."
 
 #: ../src/gtkconv.c:6518
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr "me &lt;művelet&gt;: IRC stílusú művelet küldése egy partnernak vagy csevegésnek."
+msgstr ""
+"me &lt;művelet&gt;: IRC stílusú művelet küldése egy partnernak vagy "
+"csevegésnek."
 
 #: ../src/gtkconv.c:6521
-msgid "debug &lt;option&gt;:  Send various debug information to the current conversation."
-msgstr "debug &lt;opció&gt;: Különböző hibakereső információk küldése a jelenlegi társalgásba."
+msgid ""
+"debug &lt;option&gt;:  Send various debug information to the current "
+"conversation."
+msgstr ""
+"debug &lt;opció&gt;: Különböző hibakereső információk küldése a jelenlegi "
+"társalgásba."
 
 #: ../src/gtkconv.c:6524
 msgid "clear: Clears the conversation scrollback."
@@ -3306,8 +3238,7 @@
 msgid "Separate IM and Chat windows"
 msgstr "Üzenő- és csevegőablakok elkülönítése"
 
-#: ../src/gtkconv.c:7990
-#: ../src/gtkprefs.c:1243
+#: ../src/gtkconv.c:7990 ../src/gtkprefs.c:1243
 msgid "New window"
 msgstr "Ăšj ablak"
 
@@ -3343,8 +3274,7 @@
 msgid "Pause"
 msgstr "SzĂĽnet"
 
-#: ../src/gtkdebug.c:705
-#: ../src/gtkdebug.c:706
+#: ../src/gtkdebug.c:705 ../src/gtkdebug.c:706
 msgid "Timestamps"
 msgstr "Időbélyegek"
 
@@ -3356,20 +3286,13 @@
 msgid "Right click for more options."
 msgstr "Kattintson a jobb egérgombbal további beállításokért."
 
-#: ../src/gtkdialogs.c:61
-#: ../src/gtkdialogs.c:100
+#: ../src/gtkdialogs.c:61 ../src/gtkdialogs.c:100
 msgid "lead developer"
 msgstr "vezető fejlesztő"
 
-#: ../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: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 "fejlesztő"
@@ -3386,8 +3309,7 @@
 msgid "support"
 msgstr "támogató"
 
-#: ../src/gtkdialogs.c:94
-#: ../src/gtkdialogs.c:95
+#: ../src/gtkdialogs.c:94 ../src/gtkdialogs.c:95
 msgid "maintainer"
 msgstr "karbantartĂł"
 
@@ -3407,14 +3329,11 @@
 msgid "original author"
 msgstr "eredeti szerző"
 
-#: ../src/gtkdialogs.c:106
-#: ../src/gtkdialogs.c:107
-#: ../src/gtkdialogs.c:160
+#: ../src/gtkdialogs.c:106 ../src/gtkdialogs.c:107 ../src/gtkdialogs.c:160
 msgid "Bulgarian"
 msgstr "Bolgár"
 
-#: ../src/gtkdialogs.c:108
-#: ../src/gtkdialogs.c:109
+#: ../src/gtkdialogs.c:108 ../src/gtkdialogs.c:109
 msgid "Bengali"
 msgstr "Bengáli"
 
@@ -3422,14 +3341,11 @@
 msgid "Bosnian"
 msgstr "Bosnyák"
 
-#: ../src/gtkdialogs.c:111
-#: ../src/gtkdialogs.c:161
-#: ../src/gtkdialogs.c:162
+#: ../src/gtkdialogs.c:111 ../src/gtkdialogs.c:161 ../src/gtkdialogs.c:162
 msgid "Catalan"
 msgstr "Katalán"
 
-#: ../src/gtkdialogs.c:112
-#: ../src/gtkdialogs.c:163
+#: ../src/gtkdialogs.c:112 ../src/gtkdialogs.c:163
 msgid "Czech"
 msgstr "Cseh"
 
@@ -3437,13 +3353,11 @@
 msgid "Danish"
 msgstr "Dán"
 
-#: ../src/gtkdialogs.c:114
-#: ../src/gtkdialogs.c:164
+#: ../src/gtkdialogs.c:114 ../src/gtkdialogs.c:164
 msgid "German"
 msgstr "NĂ©met"
 
-#: ../src/gtkdialogs.c:115
-#: ../src/gtkdialogs.c:116
+#: ../src/gtkdialogs.c:115 ../src/gtkdialogs.c:116
 msgid "Greek"
 msgstr "Görög"
 
@@ -3459,30 +3373,21 @@
 msgid "British English"
 msgstr "Brit angol"
 
-#: ../src/gtkdialogs.c:120
-#: ../src/gtkdialogs.c:165
-#: ../src/gtkdialogs.c:166
-#: ../src/gtkdialogs.c:167
-#: ../src/gtkdialogs.c:168
+#: ../src/gtkdialogs.c:120 ../src/gtkdialogs.c:165 ../src/gtkdialogs.c:166
+#: ../src/gtkdialogs.c:167 ../src/gtkdialogs.c:168
 msgid "Spanish"
 msgstr "Spanyol"
 
-#: ../src/gtkdialogs.c:121
-#: ../src/gtkdialogs.c:122
+#: ../src/gtkdialogs.c:121 ../src/gtkdialogs.c:122
 msgid "Persian"
 msgstr "Perzsa"
 
-#: ../src/gtkdialogs.c:123
-#: ../src/gtkdialogs.c:169
-#: ../src/gtkdialogs.c:170
+#: ../src/gtkdialogs.c:123 ../src/gtkdialogs.c:169 ../src/gtkdialogs.c:170
 msgid "Finnish"
 msgstr "Finn"
 
-#: ../src/gtkdialogs.c:124
-#: ../src/gtkdialogs.c:171
-#: ../src/gtkdialogs.c:172
-#: ../src/gtkdialogs.c:173
-#: ../src/gtkdialogs.c:174
+#: ../src/gtkdialogs.c:124 ../src/gtkdialogs.c:171 ../src/gtkdialogs.c:172
+#: ../src/gtkdialogs.c:173 ../src/gtkdialogs.c:174
 msgid "French"
 msgstr "Francia"
 
@@ -3498,25 +3403,20 @@
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ../src/gtkdialogs.c:128
-#: ../src/gtkdialogs.c:175
+#: ../src/gtkdialogs.c:128 ../src/gtkdialogs.c:175
 msgid "Italian"
 msgstr "Olasz"
 
-#: ../src/gtkdialogs.c:129
-#: ../src/gtkdialogs.c:176
-#: ../src/gtkdialogs.c:177
+#: ../src/gtkdialogs.c:129 ../src/gtkdialogs.c:176 ../src/gtkdialogs.c:177
 #: ../src/gtkdialogs.c:178
 msgid "Japanese"
 msgstr "Japán"
 
-#: ../src/gtkdialogs.c:130
-#: ../src/gtkdialogs.c:179
+#: ../src/gtkdialogs.c:130 ../src/gtkdialogs.c:179
 msgid "Georgian"
 msgstr "GrĂşz"
 
-#: ../src/gtkdialogs.c:131
-#: ../src/gtkdialogs.c:180
+#: ../src/gtkdialogs.c:131 ../src/gtkdialogs.c:180
 msgid "Korean"
 msgstr "Koreai"
 
@@ -3524,9 +3424,7 @@
 msgid "Kurdish"
 msgstr "Kurd"
 
-#: ../src/gtkdialogs.c:133
-#: ../src/gtkdialogs.c:181
-#: ../src/gtkdialogs.c:182
+#: ../src/gtkdialogs.c:133 ../src/gtkdialogs.c:181 ../src/gtkdialogs.c:182
 msgid "Lithuanian"
 msgstr "Litván"
 
@@ -3542,9 +3440,7 @@
 msgid "Norwegian"
 msgstr "Norvég"
 
-#: ../src/gtkdialogs.c:137
-#: ../src/gtkdialogs.c:138
-#: ../src/gtkdialogs.c:183
+#: ../src/gtkdialogs.c:137 ../src/gtkdialogs.c:138 ../src/gtkdialogs.c:183
 msgid "Polish"
 msgstr "Lengyel"
 
@@ -3560,14 +3456,11 @@
 msgid "Romanian"
 msgstr "Román"
 
-#: ../src/gtkdialogs.c:142
-#: ../src/gtkdialogs.c:184
-#: ../src/gtkdialogs.c:185
+#: ../src/gtkdialogs.c:142 ../src/gtkdialogs.c:184 ../src/gtkdialogs.c:185
 msgid "Russian"
 msgstr "Orosz"
 
-#: ../src/gtkdialogs.c:143
-#: ../src/gtkdialogs.c:144
+#: ../src/gtkdialogs.c:143 ../src/gtkdialogs.c:144
 msgid "Serbian"
 msgstr "Szerb"
 
@@ -3575,8 +3468,7 @@
 msgid "Slovenian"
 msgstr "Szlovén"
 
-#: ../src/gtkdialogs.c:146
-#: ../src/gtkdialogs.c:187
+#: ../src/gtkdialogs.c:146 ../src/gtkdialogs.c:187
 msgid "Swedish"
 msgstr "Svéd"
 
@@ -3600,14 +3492,11 @@
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh Ă©s a Gnome-Vi csapat"
 
-#: ../src/gtkdialogs.c:151
-#: ../src/gtkdialogs.c:188
+#: ../src/gtkdialogs.c:151 ../src/gtkdialogs.c:188
 msgid "Simplified Chinese"
 msgstr "Egyszerűsített kínai"
 
-#: ../src/gtkdialogs.c:152
-#: ../src/gtkdialogs.c:153
-#: ../src/gtkdialogs.c:189
+#: ../src/gtkdialogs.c:152 ../src/gtkdialogs.c:153 ../src/gtkdialogs.c:189
 msgid "Traditional Chinese"
 msgstr "Hagyományos kínai"
 
@@ -3624,8 +3513,25 @@
 msgstr "A Gaim névjegye"
 
 #: ../src/gtkdialogs.c:254
-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 "A Gaim egy moduláris üzenetküldő kliens AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr és Gadu-Gadu protokollok egyidejű használatának képességével. A Gtk+ használatával készül és GPL licenc alatt terjeszthető.<BR><BR>A programot terjesztheti és/vagy módosíthatja a GPL második (vagy későbbi) változatában foglaltak alapján. A GPL egy példánya megtalálható a Gaimmal terjesztett \"COPYING\" fájlban. A Gaim szerzői jogait a közreműködők birtokolják, ezek teljes listája megtalálható a COPYRIGHT fájlban. A programra nem biztosítunk garanciát.<BR><BR>"
+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 ""
+"A Gaim egy moduláris üzenetküldő kliens AIM, MSN, Yahoo!, Jabber, ICQ, IRC, "
+"SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr Ă©s Gadu-Gadu "
+"protokollok egyidejű használatának képességével. A Gtk+ használatával készül "
+"és GPL licenc alatt terjeszthető.<BR><BR>A programot terjesztheti és/vagy "
+"módosíthatja a GPL második (vagy későbbi) változatában foglaltak alapján. A "
+"GPL egy példánya megtalálható a Gaimmal terjesztett \"COPYING\" fájlban. A "
+"Gaim szerzői jogait a közreműködők birtokolják, ezek teljes listája "
+"megtalálható a COPYRIGHT fájlban. A programra nem biztosítunk garanciát."
+"<BR><BR>"
 
 #: ../src/gtkdialogs.c:268
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
@@ -3659,15 +3565,11 @@
 msgid "Debugging Information"
 msgstr "Hibakeresési információk"
 
-#: ../src/gtkdialogs.c:566
-#: ../src/gtkdialogs.c:703
-#: ../src/gtkdialogs.c:770
+#: ../src/gtkdialogs.c:566 ../src/gtkdialogs.c:703 ../src/gtkdialogs.c:770
 msgid "_Name"
 msgstr "_NĂ©v"
 
-#: ../src/gtkdialogs.c:571
-#: ../src/gtkdialogs.c:708
-#: ../src/gtkdialogs.c:775
+#: ../src/gtkdialogs.c:571 ../src/gtkdialogs.c:708 ../src/gtkdialogs.c:775
 msgid "_Account"
 msgstr "_FiĂłk"
 
@@ -3684,16 +3586,24 @@
 msgstr "Felhasználó adatainak lekérése"
 
 #: ../src/gtkdialogs.c:718
-msgid "Please enter the screen name or alias of the person whose info you would like to view."
-msgstr "Adja meg azon partner felhasználónevét vagy álnevét, akinek az adatait meg szeretné tekinteni."
+msgid ""
+"Please enter the screen name or alias of the person whose info you would "
+"like to view."
+msgstr ""
+"Adja meg azon partner felhasználónevét vagy álnevét, akinek az adatait meg "
+"szeretné tekinteni."
 
 #: ../src/gtkdialogs.c:784
 msgid "View User Log"
 msgstr "Felhasználó naplójának lekérése"
 
 #: ../src/gtkdialogs.c:786
-msgid "Please enter the screen name or alias of the person whose log you would like to view."
-msgstr "Adja meg azon partner felhasználónevét vagy álnevét, akinek a naplóját meg szeretné tekinteni."
+msgid ""
+"Please enter the screen name or alias of the person whose log you would like "
+"to view."
+msgstr ""
+"Adja meg azon partner felhasználónevét vagy álnevét, akinek a naplóját meg "
+"szeretné tekinteni."
 
 #: ../src/gtkdialogs.c:805
 msgid "Alias Contact"
@@ -3703,11 +3613,8 @@
 msgid "Enter an alias for this contact."
 msgstr "Adjon meg egy álnevet ehhez a kapcsolathoz."
 
-#: ../src/gtkdialogs.c:808
-#: ../src/gtkdialogs.c:830
-#: ../src/gtkdialogs.c:850
-#: ../src/gtkrequest.c:283
-#: ../src/protocols/silc/chat.c:586
+#: ../src/gtkdialogs.c:808 ../src/gtkdialogs.c:830 ../src/gtkdialogs.c:850
+#: ../src/gtkrequest.c:283 ../src/protocols/silc/chat.c:586
 msgid "Alias"
 msgstr "ĂlnĂ©v"
 
@@ -3730,10 +3637,18 @@
 
 #: ../src/gtkdialogs.c:885
 #, 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?"
-msgstr[0] "%s-t és %d más partnert tartalmazó kapcsolat eltávolítására készül a partnerlistájáról. Folytatni akarja?"
-msgstr[1] "%s-t és %d más partnert tartalmazó kapcsolat eltávolítására készül a partnerlistájáról. Folytatni akarja?"
+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?"
+msgstr[0] ""
+"%s-t és %d más partnert tartalmazó kapcsolat eltávolítására készül a "
+"partnerlistájáról. Folytatni akarja?"
+msgstr[1] ""
+"%s-t és %d más partnert tartalmazó kapcsolat eltávolítására készül a "
+"partnerlistájáról. Folytatni akarja?"
 
 #: ../src/gtkdialogs.c:893
 msgid "Remove Contact"
@@ -3745,8 +3660,12 @@
 
 #: ../src/gtkdialogs.c:945
 #, 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 "A(z) %s csoport és annak összes tagjának eltávolítására készül a partnerlistájáról. Folytatni akarja?"
+msgid ""
+"You are about to remove the group %s and all its members from your buddy "
+"list.  Do you want to continue?"
+msgstr ""
+"A(z) %s csoport és annak összes tagjának eltávolítására készül a "
+"partnerlistájáról. Folytatni akarja?"
 
 #: ../src/gtkdialogs.c:948
 msgid "Remove Group"
@@ -3771,7 +3690,9 @@
 
 #: ../src/gtkdialogs.c:1007
 #, c-format
-msgid "You are about to remove the chat %s from your buddy list.  Do you want to continue?"
+msgid ""
+"You are about to remove the chat %s from your buddy list.  Do you want to "
+"continue?"
 msgstr "%s csevegés eltávolítására készül a partnerlistájáról. Folytatni akarja?"
 
 #: ../src/gtkdialogs.c:1010
@@ -3787,18 +3708,15 @@
 msgid "%.2f KB/s"
 msgstr "%.2f KB/mp"
 
-#: ../src/gtkft.c:160
-#: ../src/gtkft.c:1063
+#: ../src/gtkft.c:160 ../src/gtkft.c:1063
 msgid "Finished"
 msgstr "Befejeződött"
 
-#: ../src/gtkft.c:163
-#: ../src/gtkft.c:1003
+#: ../src/gtkft.c:163 ../src/gtkft.c:1003
 msgid "Canceled"
 msgstr "MegszakĂ­tva"
 
-#: ../src/gtkft.c:166
-#: ../src/gtkft.c:922
+#: ../src/gtkft.c:166 ../src/gtkft.c:922
 msgid "Waiting for transfer to begin"
 msgstr "Várakozás az átvitel indulására"
 
@@ -3899,8 +3817,7 @@
 msgstr "Fájlát_vitel részletei"
 
 #. Pause button
-#: ../src/gtkft.c:780
-#: ../src/gtkstock.c:146
+#: ../src/gtkft.c:780 ../src/gtkstock.c:146
 msgid "_Pause"
 msgstr "_SzĂĽnet"
 
@@ -3918,8 +3835,7 @@
 msgstr "Beillesztés egyszerű szö_vegként"
 
 #. XXX: make this new with mnemonic, and HIG-happy after string thaw
-#: ../src/gtkimhtml.c:834
-#: ../src/gtkimhtmltoolbar.c:1030
+#: ../src/gtkimhtml.c:834 ../src/gtkimhtmltoolbar.c:1030
 msgid "Clear formatting"
 msgstr "Formázás törlése"
 
@@ -3931,7 +3847,6 @@
 msgid "Color to draw hyperlinks."
 msgstr "Hiperhivatkozások rajzolásához használt szín."
 
-# fixme
 #: ../src/gtkimhtml.c:1332
 msgid "Hyperlink prelight color"
 msgstr "Hiperhivatkozás előfényszíne"
@@ -3994,8 +3909,7 @@
 "\n"
 "%s"
 
-#: ../src/gtkimhtml.c:3372
-#: ../src/gtkimhtml.c:3384
+#: ../src/gtkimhtml.c:3372 ../src/gtkimhtml.c:3384
 msgid "Save Image"
 msgstr "Kép mentése"
 
@@ -4024,8 +3938,12 @@
 msgstr "_Leírás"
 
 #: ../src/gtkimhtmltoolbar.c:405
-msgid "Please enter the URL and description of the link that you want to insert. The description is optional."
-msgstr "Kérem adja meg a beszúrandó hivatkozás URL-jét és leírását. A leírás opcionális."
+msgid ""
+"Please enter the URL and description of the link that you want to insert. "
+"The description is optional."
+msgstr ""
+"Kérem adja meg a beszúrandó hivatkozás URL-jét és leírását. A leírás "
+"opcionális."
 
 #: ../src/gtkimhtmltoolbar.c:409
 msgid "Please enter the URL of the link that you want to insert."
@@ -4044,8 +3962,7 @@
 msgid "Failed to store image: %s\n"
 msgstr "A kép tárolása nem sikerült: %s\n"
 
-#: ../src/gtkimhtmltoolbar.c:513
-#: ../src/gtkimhtmltoolbar.c:523
+#: ../src/gtkimhtmltoolbar.c:513 ../src/gtkimhtmltoolbar.c:523
 msgid "Insert Image"
 msgstr "Kép beszúrása"
 
@@ -4102,7 +4019,6 @@
 msgid "Insert smiley"
 msgstr "Hangulatjel beszúrása"
 
-# fixme
 #: ../src/gtklog.c:202
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
@@ -4111,23 +4027,35 @@
 #: ../src/gtklog.c:207
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
-msgstr "<span size='larger' weight='bold'>Társalgás ezzel: %s, a következőn: %s</span>"
+msgstr ""
+"<span size='larger' weight='bold'>Társalgás ezzel: %s, a következőn: %s</"
+"span>"
 
 #: ../src/gtklog.c:258
 msgid "%B %Y"
 msgstr "%Y %B"
 
 #: ../src/gtklog.c:311
-msgid "System events will only be logged if the \"Log all status changes to system log\" preference is enabled."
-msgstr "A rendszeresemények csak akkor lesznek naplózva, ha az \"Összes állapotváltozás naplózása a rendszernaplóba\" tulajdonság be van állítva."
+msgid ""
+"System events will only be logged if the \"Log all status changes to system "
+"log\" preference is enabled."
+msgstr ""
+"A rendszeresemények csak akkor lesznek naplózva, ha az \"Összes "
+"állapotváltozás naplózása a rendszernaplóba\" tulajdonság be van állítva."
 
 #: ../src/gtklog.c:315
-msgid "Instant messages will only be logged if the \"Log all instant messages\" preference is enabled."
-msgstr "Az azonnali üzenetek csak akkor lesznek naplózva, ha az \"Összes azonnali üzenet naplózása\" tulajdonság be van állítva."
+msgid ""
+"Instant messages will only be logged if the \"Log all instant messages\" "
+"preference is enabled."
+msgstr ""
+"Az azonnali ĂĽzenetek csak akkor lesznek naplĂłzva, ha az \"Ă–sszes azonnali "
+"üzenet naplózása\" tulajdonság be van állítva."
 
 #: ../src/gtklog.c:318
 msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr "A csevegések csak akkor lesznek naplózva, ha az \"Összes csevegés naplózása\" tulajdonság be van állítva."
+msgstr ""
+"A csevegések csak akkor lesznek naplózva, ha az \"Összes csevegés naplózása"
+"\" tulajdonság be van állítva."
 
 #: ../src/gtklog.c:322
 msgid "No logs were found"
@@ -4142,8 +4070,7 @@
 msgid "Conversations in %s"
 msgstr "Társalgások itt: %s"
 
-#: ../src/gtklog.c:482
-#: ../src/gtklog.c:533
+#: ../src/gtklog.c:482 ../src/gtklog.c:533
 #, c-format
 msgid "Conversations with %s"
 msgstr "Társalgások a következővel: %s"
@@ -4229,8 +4156,7 @@
 msgid "Open All Messages"
 msgstr "Összes üzenet megnyitása"
 
-#: ../src/gtknotify.c:382
-#: ../src/protocols/jabber/jabber.c:1114
+#: ../src/gtknotify.c:382 ../src/protocols/jabber/jabber.c:1114
 msgid "From"
 msgstr "FeladĂł"
 
@@ -4260,19 +4186,16 @@
 "\n"
 "%s"
 
-#: ../src/gtknotify.c:643
-#: ../src/protocols/sametime/sametime.c:5459
+#: ../src/gtknotify.c:643 ../src/protocols/sametime/sametime.c:5459
 msgid "Search Results"
 msgstr "A keresés eredménye"
 
-#: ../src/gtknotify.c:799
-#: ../src/protocols/oscar/oscar.c:5061
+#: ../src/gtknotify.c:799 ../src/protocols/oscar/oscar.c:5061
 #, c-format
 msgid "Info for %s"
 msgstr "%s információi"
 
-#: ../src/gtknotify.c:800
-#: ../src/protocols/toc/toc.c:470
+#: ../src/gtknotify.c:800 ../src/protocols/toc/toc.c:470
 msgid "Buddy Information"
 msgstr "Partnerinformáció"
 
@@ -4281,18 +4204,15 @@
 msgid "The browser command <b>%s</b> is invalid."
 msgstr "A(z) <b>%s</b> böngészőparancs érvénytelen."
 
-#: ../src/gtknotify.c:842
-#: ../src/gtknotify.c:854
-#: ../src/gtknotify.c:867
+#: ../src/gtknotify.c:842 ../src/gtknotify.c:854 ../src/gtknotify.c:867
 #: ../src/gtknotify.c:992
 msgid "Unable to open URL"
 msgstr "Az URL megnyitása sikertelen"
 
-#: ../src/gtknotify.c:852
-#: ../src/gtknotify.c:865
+#: ../src/gtknotify.c:852 ../src/gtknotify.c:865
 #, c-format
 msgid "Error launching <b>%s</b>: %s"
-msgstr "Hiba <b>%s</b> indításakor: %s"
+msgstr "Hiba a(z) <b>%s</b> indításakor: %s"
 
 #: ../src/gtknotify.c:993
 msgid "The 'Manual' browser command has been chosen, but no command has been set."
@@ -4527,17 +4447,19 @@
 msgstr "A hangulatjel-téma kicsomagolása meghiúsult."
 
 #: ../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 "Válassza ki a használni kívánt hangulatjel-témát az alábbi listából. Új témák a témalistába dobással telepíthetők."
+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 ""
+"Válassza ki a használni kívánt hangulatjel-témát az alábbi listából. Új "
+"témák a témalistába dobással telepíthetők."
 
 #: ../src/gtkprefs.c:673
 msgid "Icon"
 msgstr "Ikon"
 
-#: ../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:680 ../src/protocols/jabber/buddy.c:267
+#: ../src/protocols/jabber/buddy.c:818 ../src/protocols/jabber/chat.c:769
 msgid "Description"
 msgstr "Leírás"
 
@@ -4545,8 +4467,7 @@
 msgid "_Hide new IM conversations"
 msgstr "Új társal_gások elrejtése"
 
-#: ../src/gtkprefs.c:824
-#: ../src/gtkprefs.c:1764
+#: ../src/gtkprefs.c:824 ../src/gtkprefs.c:1764
 msgid "When away"
 msgstr "Ha távol vagyok"
 
@@ -4579,8 +4500,12 @@
 msgstr "Finom görgetés használata"
 
 #: ../src/gtkprefs.c:865
-msgid "This is how your outgoing message text will appear when you use protocols that support formatting. :)"
-msgstr "Így fog kinézni a kimenő üzenet szövege, ha olyan protokollokat használ, amelyek támogatják a formázást. :)"
+msgid ""
+"This is how your outgoing message text will appear when you use protocols "
+"that support formatting. :)"
+msgstr ""
+"Így fog kinézni a kimenő üzenet szövege, ha olyan protokollokat használ, "
+"amelyek támogatják a formázást. :)"
 
 #. All the tab options!
 #: ../src/gtkprefs.c:887
@@ -4627,8 +4552,7 @@
 msgid "N_ew conversations:"
 msgstr "Új _társalgások:"
 
-#: ../src/gtkprefs.c:973
-#: ../src/protocols/oscar/oscar.c:869
+#: ../src/gtkprefs.c:973 ../src/protocols/oscar/oscar.c:869
 #: ../src/protocols/oscar/oscar.c:6172
 msgid "IP Address"
 msgstr "IP cĂ­m"
@@ -4746,8 +4670,7 @@
 "_KĂ©zi:\n"
 "(%s az URL-hez)"
 
-#: ../src/gtkprefs.c:1294
-#: ../src/gtkprefs.c:1875
+#: ../src/gtkprefs.c:1294 ../src/gtkprefs.c:1875
 msgid "Logging"
 msgstr "Naplózás"
 
@@ -4783,8 +4706,7 @@
 msgid "Quiet"
 msgstr "Halk"
 
-#: ../src/gtkprefs.c:1468
-#: ../src/protocols/silc/silc.c:666
+#: ../src/gtkprefs.c:1468 ../src/protocols/silc/silc.c:666
 msgid "Normal"
 msgstr "Normál"
 
@@ -4931,8 +4853,7 @@
 msgid "Sounds"
 msgstr "Hangok"
 
-#: ../src/gtkprefs.c:1867
-#: ../src/protocols/silc/silc.c:1847
+#: ../src/gtkprefs.c:1867 ../src/protocols/silc/silc.c:1847
 msgid "Network"
 msgstr "Hálózat"
 
@@ -4977,8 +4898,7 @@
 msgid "Set privacy for:"
 msgstr "Magánszféra beállításai ehhez:"
 
-#: ../src/gtkprivacy.c:562
-#: ../src/gtkprivacy.c:578
+#: ../src/gtkprivacy.c:562 ../src/gtkprivacy.c:578
 msgid "Permit User"
 msgstr "Felhasználó engedélyezése"
 
@@ -4988,10 +4908,11 @@
 
 #: ../src/gtkprivacy.c:564
 msgid "Please enter the name of the user you wish to be able to contact you."
-msgstr "Adja meg egy felhasználó nevét, akinek meg szeretné engedni, hogy kapcsolatba lépjen Önnel."
-
-#: ../src/gtkprivacy.c:567
-#: ../src/gtkprivacy.c:580
+msgstr ""
+"Adja meg egy felhasználó nevét, akinek meg szeretné engedni, hogy "
+"kapcsolatba lépjen Önnel."
+
+#: ../src/gtkprivacy.c:567 ../src/gtkprivacy.c:580
 msgid "_Permit"
 msgstr "_Engedélyezés"
 
@@ -5005,8 +4926,7 @@
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Biztosan megengedi, hogy %s kapcsolatba lépjen Önnel?"
 
-#: ../src/gtkprivacy.c:601
-#: ../src/gtkprivacy.c:614
+#: ../src/gtkprivacy.c:601 ../src/gtkprivacy.c:614
 msgid "Block User"
 msgstr "Felhasználó tiltása"
 
@@ -5018,8 +4938,7 @@
 msgid "Please enter the name of the user you wish to block."
 msgstr "Adja meg a letiltani kívánt felhasználó nevét."
 
-#: ../src/gtkprivacy.c:605
-#: ../src/gtkprivacy.c:616
+#: ../src/gtkprivacy.c:605 ../src/gtkprivacy.c:616
 msgid "_Block"
 msgstr "Blo_kkolás"
 
@@ -5033,25 +4952,17 @@
 msgid "Are you sure you want to block %s?"
 msgstr "Biztosan le akarja tiltani %s-t?"
 
-#: ../src/gtkrequest.c:273
-#: ../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:273 ../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 "Igen"
 
-#: ../src/gtkrequest.c:274
-#: ../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:274 ../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 "Nem"
 
@@ -5059,8 +4970,7 @@
 msgid "Apply"
 msgstr "Alkalmazás"
 
-#: ../src/gtkrequest.c:278
-#: ../src/protocols/msn/msn.c:357
+#: ../src/gtkrequest.c:278 ../src/protocols/msn/msn.c:357
 #: ../src/protocols/silc/util.c:336
 msgid "Close"
 msgstr "Bezárás"
@@ -5073,13 +4983,11 @@
 msgid "Would you like to overwrite it?"
 msgstr "Szeretné felülírni?"
 
-#: ../src/gtkrequest.c:1518
-#: ../src/gtkrequest.c:1559
+#: ../src/gtkrequest.c:1518 ../src/gtkrequest.c:1559
 msgid "Save File..."
 msgstr "Fájl mentése..."
 
-#: ../src/gtkrequest.c:1519
-#: ../src/gtkrequest.c:1560
+#: ../src/gtkrequest.c:1519 ../src/gtkrequest.c:1560
 msgid "Open File..."
 msgstr "Fájl megnyitása..."
 
@@ -5101,10 +5009,8 @@
 msgid "_Add Chat"
 msgstr "Cse_vegés hozzáadása"
 
-#: ../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:433 ../src/protocols/jabber/buddy.c:264
+#: ../src/protocols/jabber/buddy.c:812 ../src/protocols/novell/novell.c:1486
 msgid "Title"
 msgstr "Beosztás"
 
@@ -5113,39 +5019,25 @@
 msgstr "TĂ­pus"
 
 #. Available status messages are plain text
-#: ../src/gtksavedstatuses.c:459
-#: ../src/gtksavedstatuses.c:920
+#: ../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:1181
-#: ../src/protocols/jabber/jabber.c:1191
-#: ../src/protocols/jabber/jabber.c:1201
-#: ../src/protocols/jabber/jabber.c:1211
-#: ../src/protocols/jabber/jabber.c:1221
-#: ../src/protocols/jabber/jabber.c:1233
-#: ../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:7794
-#: ../src/protocols/oscar/oscar.c:7808
-#: ../src/protocols/oscar/oscar.c:7813
-#: ../src/protocols/oscar/oscar.c:8022
-#: ../src/protocols/oscar/oscar.c:8034
+#: ../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:1181
+#: ../src/protocols/jabber/jabber.c:1191 ../src/protocols/jabber/jabber.c:1201
+#: ../src/protocols/jabber/jabber.c:1211 ../src/protocols/jabber/jabber.c:1221
+#: ../src/protocols/jabber/jabber.c:1233 ../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:7794
+#: ../src/protocols/oscar/oscar.c:7808 ../src/protocols/oscar/oscar.c:7813
+#: ../src/protocols/oscar/oscar.c:8022 ../src/protocols/oscar/oscar.c:8034
 #: ../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:3279
-#: ../src/protocols/yahoo/yahoo.c:3285
+#: ../src/protocols/silc/buddy.c:1544 ../src/protocols/simple/simple.c:242
+#: ../src/protocols/yahoo/yahoo.c:3279 ../src/protocols/yahoo/yahoo.c:3285
 #: ../src/protocols/zephyr/zephyr.c:2261
 msgid "Message"
 msgstr "Ăśzenet"
@@ -5155,8 +5047,7 @@
 msgstr "Mentett állapotok"
 
 #. Use button
-#: ../src/gtksavedstatuses.c:549
-#: ../src/gtksavedstatuses.c:1180
+#: ../src/gtksavedstatuses.c:549 ../src/gtksavedstatuses.c:1180
 msgid "_Use"
 msgstr "_Használat"
 
@@ -5168,20 +5059,13 @@
 msgid "Different"
 msgstr "Eltérő"
 
-#: ../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:1152
-#: ../src/protocols/msn/msn.c:550
-#: ../src/protocols/novell/novell.c:2867
-#: ../src/protocols/novell/novell.c:2871
-#: ../src/protocols/oscar/oscar.c:849
-#: ../src/protocols/oscar/oscar.c:855
-#: ../src/protocols/oscar/oscar.c:858
+#: ../src/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:1152
+#: ../src/protocols/msn/msn.c:550 ../src/protocols/novell/novell.c:2867
+#: ../src/protocols/novell/novell.c:2871 ../src/protocols/oscar/oscar.c:849
+#: ../src/protocols/oscar/oscar.c:855 ../src/protocols/oscar/oscar.c:858
 #: ../src/protocols/yahoo/yahoo.c:2881
 msgid "Status"
 msgstr "Ăllapot"
@@ -5190,8 +5074,7 @@
 msgid "_Title:"
 msgstr "_Megszólítás:"
 
-#: ../src/gtksavedstatuses.c:1092
-#: ../src/gtksavedstatuses.c:1413
+#: ../src/gtksavedstatuses.c:1092 ../src/gtksavedstatuses.c:1413
 msgid "_Status:"
 msgstr "Ăll_apot:"
 
@@ -5248,7 +5131,7 @@
 
 #: ../src/gtksound.c:72
 msgid "Someone says your name in chat"
-msgstr "Valaki leírja az Ön nevét csevegés közben"
+msgstr "Valaki csevegés közben leírja az Ön nevét"
 
 #: ../src/gtksound.c:488
 #, c-format
@@ -5256,12 +5139,18 @@
 msgstr "Hang lejátszása sikertelen, mert a megadott fájl (%s) nem létezik."
 
 #: ../src/gtksound.c:504
-msgid "Unable to play sound because the 'Command' sound method has been chosen, but no command has been set."
-msgstr "Hang lejátszása sikertelen, mert a lejátszáshoz a \"Parancs\" eljárás van kiválasztva, de nincs megadva a külső program."
+msgid ""
+"Unable to play sound because the 'Command' sound method has been chosen, but "
+"no command has been set."
+msgstr ""
+"Hang lejátszása sikertelen, mert a lejátszáshoz a \"Parancs\" eljárás van "
+"kiválasztva, de nincs megadva a külső program."
 
 #: ../src/gtksound.c:516
 #, c-format
-msgid "Unable to play sound because the configured sound command could not be launched: %s"
+msgid ""
+"Unable to play sound because the configured sound command could not be "
+"launched: %s"
 msgstr "Hang lejátszása sikertelen, mert a megadott program nem indítható: %s"
 
 #: ../src/gtkstatusbox.c:366
@@ -5269,16 +5158,12 @@
 msgstr "GĂ©pel"
 
 #. connect to the server
-#: ../src/gtkstatusbox.c:368
-#: ../src/protocols/irc/irc.c:313
-#: ../src/protocols/jabber/jabber.c:979
-#: ../src/protocols/msn/session.c:349
+#: ../src/gtkstatusbox.c:368 ../src/protocols/irc/irc.c:313
+#: ../src/protocols/jabber/jabber.c:979 ../src/protocols/msn/session.c:349
 #: ../src/protocols/napster/napster.c:536
-#: ../src/protocols/novell/novell.c:2183
-#: ../src/protocols/oscar/oscar.c:1938
+#: ../src/protocols/novell/novell.c:2183 ../src/protocols/oscar/oscar.c:1938
 #: ../src/protocols/sametime/sametime.c:3693
-#: ../src/protocols/simple/simple.c:1594
-#: ../src/protocols/yahoo/yahoo.c:2571
+#: ../src/protocols/simple/simple.c:1594 ../src/protocols/yahoo/yahoo.c:2571
 #: ../src/protocols/zephyr/zephyr.c:1547
 msgid "Connecting"
 msgstr "Kapcsolódás"
@@ -5307,14 +5192,12 @@
 msgid "_Open Mail"
 msgstr "_Levél megnyitása"
 
-#: ../src/gtkutils.c:1306
-#: ../src/gtkutils.c:1331
+#: ../src/gtkutils.c:1306 ../src/gtkutils.c:1331
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "A következő hiba történt %s betöltése közben: %s"
 
-#: ../src/gtkutils.c:1308
-#: ../src/gtkutils.c:1333
+#: ../src/gtkutils.c:1308 ../src/gtkutils.c:1333
 msgid "Failed to load image"
 msgstr "A kép betöltése meghiúsult"
 
@@ -5324,31 +5207,34 @@
 msgstr "A(z) %s mappa nem küldhető el."
 
 #: ../src/gtkutils.c:1410
-msgid "Gaim cannot transfer a folder. You will need to send the files within individually"
-msgstr "A Gaim nem képes egy mappát átvinni. Az általa tartalmazott fájlokat egyenként kell elküldenie."
-
-#: ../src/gtkutils.c:1438
-#: ../src/gtkutils.c:1447
-#: ../src/gtkutils.c:1452
+msgid ""
+"Gaim cannot transfer a folder. You will need to send the files within "
+"individually"
+msgstr ""
+"A Gaim nem képes egy mappát átvinni. Az általa tartalmazott fájlokat "
+"egyenként kell elküldenie."
+
+#: ../src/gtkutils.c:1438 ../src/gtkutils.c:1447 ../src/gtkutils.c:1452
 msgid "You have dragged an image"
 msgstr "Egy képet húzott be"
 
 #: ../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 "Elküldheti ezt a képet fájlátvitelként, beágyazhatja az üzenetbe, vagy használhatja ezen felhasználó partnerikonjaként."
-
-#: ../src/gtkutils.c:1443
-#: ../src/gtkutils.c:1458
+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 ""
+"Elküldheti ezt a képet fájlátvitelként, beágyazhatja az üzenetbe, vagy "
+"használhatja ezen felhasználó partnerikonjaként."
+
+#: ../src/gtkutils.c:1443 ../src/gtkutils.c:1458
 msgid "Set as buddy icon"
 msgstr "Beállítás partnerikonként"
 
-#: ../src/gtkutils.c:1444
-#: ../src/gtkutils.c:1459
+#: ../src/gtkutils.c:1444 ../src/gtkutils.c:1459
 msgid "Send image file"
 msgstr "Képfájl küldése"
 
-#: ../src/gtkutils.c:1445
-#: ../src/gtkutils.c:1459
+#: ../src/gtkutils.c:1445 ../src/gtkutils.c:1459
 msgid "Insert in message"
 msgstr "Beszúrás az üzenetbe"
 
@@ -5357,12 +5243,20 @@
 msgstr "Be kívánja állítani partnerikonként ehhez a felhasználóhoz?"
 
 #: ../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 "Elküldheti ezt a képet fájlátvitelként, vagy beágyazhatja az üzenetbe, vagy használhatja ezen felhasználó partnerikonjaként."
+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 ""
+"Elküldheti ezt a képet fájlátvitelként, vagy beágyazhatja az üzenetbe, vagy "
+"használhatja ezen felhasználó partnerikonjaként."
 
 #: ../src/gtkutils.c:1455
-msgid "You can insert this image into this message, or use it as the buddy icon for this user"
-msgstr "Elküldheti ezt a képet fájlátvitelként, vagy használhatja ezen felhasználó partnerikonjaként."
+msgid ""
+"You can insert this image into this message, or use it as the buddy icon for "
+"this user"
+msgstr ""
+"Elküldheti ezt a képet fájlátvitelként, vagy használhatja ezen felhasználó "
+"partnerikonjaként."
 
 #. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
 #. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
@@ -5374,14 +5268,17 @@
 msgstr "Az indítóikon nem küldhető el"
 
 #: ../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 "Egy asztali indítóikont húzott be. Valószínűleg az indítóikon által mutatott objektumot akarta elküldeni az indítóikon helyett."
+msgid ""
+"You dragged a desktop launcher. Most likely you wanted to send whatever this "
+"launcher points to instead of this launcher itself."
+msgstr ""
+"Egy asztali indítóikont húzott be. Valószínűleg az indítóikon által mutatott "
+"objektumot akarta elkĂĽldeni az indĂ­tĂłikon helyett."
 
 #. 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 "Firkálási kérés elküldve."
 
@@ -5411,21 +5308,27 @@
 
 #: ../src/log.c:1077
 #, 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;AUTOMATIKUS VĂLASZ&gt;:</b></font> %s<br/>\n"
+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;AUTOMATIKUS "
+"VĂLASZ&gt;:</b></font> %s<br/>\n"
 
 #: ../src/log.c:1079
 #, 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;AUTOMATIKUS VĂLASZ&gt;:</b></font> %s<br/>\n"
-
-#: ../src/log.c:1136
-#: ../src/log.c:1262
+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;AUTOMATIKUS "
+"VĂLASZ&gt;:</b></font> %s<br/>\n"
+
+#: ../src/log.c:1136 ../src/log.c:1262
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>A naplófájl útvonala nem található!</b></font>"
 
-#: ../src/log.c:1148
-#: ../src/log.c:1276
+#: ../src/log.c:1148 ../src/log.c:1276
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>A fájl olvasása sikertelen: %s</b></font>"
@@ -5435,10 +5338,8 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTOMATIKUS VĂLASZ>: %s\n"
 
-#: ../src/plugin.c:281
-#: ../src/protocols/msn/servconn.c:139
-#: ../src/protocols/msn/session.c:326
-#: ../src/protocols/oscar/oscar.c:5128
+#: ../src/plugin.c:281 ../src/protocols/msn/servconn.c:139
+#: ../src/protocols/msn/session.c:326 ../src/protocols/oscar/oscar.c:5128
 msgid "Unknown error"
 msgstr "Ismeretlen hiba"
 
@@ -5458,7 +5359,9 @@
 
 #: ../src/plugin.c:523
 #, c-format
-msgid "The required plugin %s was not found. Please install this plugin and try again."
+msgid ""
+"The required plugin %s was not found. Please install this plugin and try "
+"again."
 msgstr "A szükséges %s bővítmény nem található. Kérem telepítse, majd próbálja újra."
 
 #: ../src/plugin.c:528
@@ -5533,39 +5436,30 @@
 msgstr "Gaim felhasználó"
 
 #. Creating the user splits
-#: ../src/protocols/bonjour/bonjour.c:575
-#: ../src/protocols/silc/silc.c:931
+#: ../src/protocols/bonjour/bonjour.c:575 ../src/protocols/silc/silc.c:931
 msgid "Hostname"
 msgstr "Gépnév"
 
 #. Creating the options for the protocol
 #. port to connect to
-#: ../src/protocols/bonjour/bonjour.c:579
-#: ../src/protocols/irc/irc.c:900
-#: ../src/protocols/msn/msn.c:2048
-#: ../src/protocols/napster/napster.c:724
-#: ../src/protocols/sametime/sametime.c:5643
-#: ../src/protocols/silc/silc.c:1855
+#: ../src/protocols/bonjour/bonjour.c:579 ../src/protocols/irc/irc.c:900
+#: ../src/protocols/msn/msn.c:2048 ../src/protocols/napster/napster.c:724
+#: ../src/protocols/sametime/sametime.c:5643 ../src/protocols/silc/silc.c:1855
 msgid "Port"
 msgstr "Port"
 
-#: ../src/protocols/bonjour/bonjour.c:582
-#: ../src/protocols/gg/gg.c:562
+#: ../src/protocols/bonjour/bonjour.c:582 ../src/protocols/gg/gg.c:562
 #: ../src/protocols/gg/gg.c:971
 msgid "First name"
 msgstr "Utónév"
 
-#: ../src/protocols/bonjour/bonjour.c:585
-#: ../src/protocols/gg/gg.c:557
+#: ../src/protocols/bonjour/bonjour.c:585 ../src/protocols/gg/gg.c:557
 msgid "Last name"
 msgstr "Vezetéknév"
 
-#: ../src/protocols/bonjour/bonjour.c:588
-#: ../src/protocols/jabber/buddy.c:261
-#: ../src/protocols/jabber/buddy.c:779
-#: ../src/protocols/jabber/buddy.c:787
-#: ../src/protocols/silc/silc.c:695
-#: ../src/protocols/silc/silc.c:935
+#: ../src/protocols/bonjour/bonjour.c:588 ../src/protocols/jabber/buddy.c:261
+#: ../src/protocols/jabber/buddy.c:779 ../src/protocols/jabber/buddy.c:787
+#: ../src/protocols/silc/silc.c:695 ../src/protocols/silc/silc.c:935
 #: ../src/protocols/silc/util.c:512
 #: ../src/protocols/yahoo/yahoo_profile.c:1030
 msgid "Email"
@@ -5582,7 +5476,7 @@
 
 #: ../src/protocols/bonjour/jabber.c:447
 msgid "Error setting socket options"
-msgstr "Hiba a fogalat tulajdonságainak beállításakor"
+msgstr "Hiba a foglalat tulajdonságainak beállításakor"
 
 #: ../src/protocols/bonjour/jabber.c:458
 msgid "Cannot bind socket to port"
@@ -5596,20 +5490,17 @@
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Nem küldhető el az üzenet, a társalgás nem kezdhető el."
 
-#: ../src/protocols/gg/gg.c:80
-#: ../src/protocols/gg/gg.c:102
+#: ../src/protocols/gg/gg.c:80 ../src/protocols/gg/gg.c:102
 #: ../src/protocols/gg/gg.c:137
 msgid "Token Error"
 msgstr "Jelsor hiba"
 
-#: ../src/protocols/gg/gg.c:81
-#: ../src/protocols/gg/gg.c:103
+#: ../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 "Nem tölthető le a jelsor.\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 "Partnerlista mentése..."
 
@@ -5617,8 +5508,7 @@
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "A partnerlistája üres, semmi nem került a fájlba."
 
-#: ../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 "A fájl nem nyitható meg"
 
@@ -5626,8 +5516,7 @@
 msgid "Buddylist saved successfully!"
 msgstr "A partnerlista mentése sikeres!"
 
-#: ../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 "Nem tölthető be a partnerlista"
 
@@ -5663,35 +5552,28 @@
 msgid "Registration completed successfully!"
 msgstr "A regisztráció sikeresen befejeződött!"
 
-#: ../src/protocols/gg/gg.c:425
-#: ../src/protocols/jabber/jabber.c:760
+#: ../src/protocols/gg/gg.c:425 ../src/protocols/jabber/jabber.c:760
 msgid "E-Mail"
 msgstr "E-mail"
 
-#: ../src/protocols/gg/gg.c:430
-#: ../src/protocols/gg/gg.c:704
-#: ../src/protocols/jabber/jabber.c:749
-#: ../src/protocols/jabber/jabber.c:1306
+#: ../src/protocols/gg/gg.c:430 ../src/protocols/gg/gg.c:704
+#: ../src/protocols/jabber/jabber.c:749 ../src/protocols/jabber/jabber.c:1306
 msgid "Password"
 msgstr "JelszĂł"
 
-#: ../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 "Jelszó (megerősítés)"
 
-#: ../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 "Adja meg az aktuális jelsort"
 
-#: ../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 "Aktuális jelsor"
 
-#: ../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 "Új Gadu-Gadu fiók regisztrálása"
 
@@ -5699,36 +5581,26 @@
 msgid "Please, fill in the following fields"
 msgstr "Töltse ki az alábbi mezőket"
 
-#: ../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 "Nem kezdeményezhető új keresés"
 
-#: ../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 "Egy keresés függőben van. Várja meg, amíg befejeződik."
 
-#: ../src/protocols/gg/gg.c:567
-#: ../src/protocols/gg/gg.c:974
-#: ../src/protocols/gg/gg.c:2003
-#: ../src/protocols/jabber/buddy.c:252
-#: ../src/protocols/jabber/buddy.c:695
-#: ../src/protocols/jabber/buddy.c:1402
-#: ../src/protocols/jabber/jabber.c:765
-#: ../src/protocols/msn/msn.c:1373
-#: ../src/protocols/silc/buddy.c:1528
-#: ../src/protocols/silc/ops.c:1036
-#: ../src/protocols/silc/ops.c:1179
-#: ../src/protocols/silc/ops.c:1328
+#: ../src/protocols/gg/gg.c:567 ../src/protocols/gg/gg.c:974
+#: ../src/protocols/gg/gg.c:2003 ../src/protocols/jabber/buddy.c:252
+#: ../src/protocols/jabber/buddy.c:695 ../src/protocols/jabber/buddy.c:1402
+#: ../src/protocols/jabber/jabber.c:765 ../src/protocols/msn/msn.c:1373
+#: ../src/protocols/silc/buddy.c:1528 ../src/protocols/silc/ops.c:1036
+#: ../src/protocols/silc/ops.c:1179 ../src/protocols/silc/ops.c:1328
 #: ../src/protocols/yahoo/yahoo_profile.c:1035
 msgid "Nickname"
 msgstr "Becenév"
 
-#: ../src/protocols/gg/gg.c:572
-#: ../src/protocols/gg/gg.c:977
-#: ../src/protocols/jabber/jabber.c:785
-#: ../src/protocols/oscar/oscar.c:6218
+#: ../src/protocols/gg/gg.c:572 ../src/protocols/gg/gg.c:977
+#: ../src/protocols/jabber/jabber.c:785 ../src/protocols/oscar/oscar.c:6218
 #: ../src/protocols/oscar/oscar.c:6226
 msgid "City"
 msgstr "Város"
@@ -5737,8 +5609,7 @@
 msgid "Year of birth"
 msgstr "Születési év"
 
-#: ../src/protocols/gg/gg.c:580
-#: ../src/protocols/msn/msn.c:1532
+#: ../src/protocols/gg/gg.c:580 ../src/protocols/msn/msn.c:1532
 #: ../src/protocols/oscar/oscar.c:6192
 #: ../src/protocols/yahoo/yahoo_profile.c:1060
 msgid "Gender"
@@ -5748,13 +5619,11 @@
 msgid "Male or female"
 msgstr "Férfi vagy nő"
 
-#: ../src/protocols/gg/gg.c:582
-#: ../src/protocols/oscar/oscar.c:6192
+#: ../src/protocols/gg/gg.c:582 ../src/protocols/oscar/oscar.c:6192
 msgid "Male"
 msgstr "FĂ©rfi"
 
-#: ../src/protocols/gg/gg.c:583
-#: ../src/protocols/oscar/oscar.c:6192
+#: ../src/protocols/gg/gg.c:583 ../src/protocols/oscar/oscar.c:6192
 msgid "Female"
 msgstr "NĹ‘"
 
@@ -5762,8 +5631,7 @@
 msgid "Only online"
 msgstr "Csak elérhetők"
 
-#: ../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 "Partnerek keresése"
 
@@ -5799,8 +5667,7 @@
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Adja meg a jelenlegi jelszavát és az új jelszót az UIM-hez: "
 
-#: ../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 "A Gadu-Gadu jelszó megváltoztatása"
 
@@ -5810,8 +5677,7 @@
 msgid "Select a chat for buddy: %s"
 msgstr "Válasszon egy csevegést a következő partnerhez: %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 "Felvétel csevegéshez..."
 
@@ -5823,14 +5689,12 @@
 msgid "There are no users matching your search criteria."
 msgstr "Nincsenek a keresési feltételnek megfelelő felhasználók."
 
-#: ../src/protocols/gg/gg.c:962
-#: ../src/protocols/gg/gg.c:1029
+#: ../src/protocols/gg/gg.c:962 ../src/protocols/gg/gg.c:1029
 #: ../src/protocols/oscar/oscar.c:6329
 msgid "Unable to display the search results."
 msgstr "A keresés eredményei nem jeleníthetők meg."
 
-#: ../src/protocols/gg/gg.c:968
-#: ../src/protocols/oscar/oscar.c:6164
+#: ../src/protocols/gg/gg.c:968 ../src/protocols/oscar/oscar.c:6164
 msgid "UIN"
 msgstr "UIN"
 
@@ -5846,8 +5710,7 @@
 msgid "Search results"
 msgstr "Keresési eredmények"
 
-#: ../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 "A foglalatot nem lehet olvasni"
 
@@ -5867,13 +5730,11 @@
 msgid "Your buddy list was stored on the server."
 msgstr "A partnerlista tárolva a kiszolgálón."
 
-#: ../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 "A kapcsolódás meghiúsult."
 
-#: ../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 "Blokkolt"
 
@@ -5957,35 +5818,30 @@
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu felhasználó"
 
-#: ../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 "Ismeretlen parancs: %s"
 
-#: ../src/protocols/irc/cmds.c:482
-#: ../src/protocols/jabber/chat.c:592
+#: ../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 "a jelenlegi téma: %s"
 
-#: ../src/protocols/irc/cmds.c:486
-#: ../src/protocols/jabber/chat.c:596
+#: ../src/protocols/irc/cmds.c:486 ../src/protocols/jabber/chat.c:596
 #: ../src/protocols/silc/silc.c:1294
 msgid "No topic is set"
 msgstr "Nincs beállítva téma"
 
-#: ../src/protocols/irc/dcc_send.c:287
-#: ../src/protocols/irc/dcc_send.c:326
+#: ../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 "A fájlátvitel meghiúsult"
 
-#: ../src/protocols/irc/dcc_send.c:288
-#: ../src/protocols/irc/dcc_send.c:327
+#: ../src/protocols/irc/dcc_send.c:288 ../src/protocols/irc/dcc_send.c:327
 msgid "Gaim could not open a listening port."
 msgstr "A Gaim nem tudott megnyitni egy szabad  portot."
 
@@ -6006,10 +5862,8 @@
 msgid "MOTD for %s"
 msgstr "MOTD a következőhöz: %s"
 
-#: ../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:119 ../src/protocols/irc/irc.c:149
+#: ../src/protocols/irc/irc.c:604 ../src/protocols/irc/irc.c:629
 msgid "Server has disconnected"
 msgstr "A kiszolgáló bontotta a kapcsolatot"
 
@@ -6017,13 +5871,11 @@
 msgid "View MOTD"
 msgstr "MOTD megjelenítése"
 
-#: ../src/protocols/irc/irc.c:254
-#: ../src/protocols/silc/chat.c:33
+#: ../src/protocols/irc/irc.c:254 ../src/protocols/silc/chat.c:33
 msgid "_Channel:"
 msgstr "Cs_atorna:"
 
-#: ../src/protocols/irc/irc.c:260
-#: ../src/protocols/jabber/chat.c:59
+#: ../src/protocols/irc/irc.c:260 ../src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "_JelszĂł:"
 
@@ -6031,50 +5883,40 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "Az IRC becenevek nem tartalmazhatnak szóközt"
 
-#: ../src/protocols/irc/irc.c:321
-#: ../src/protocols/jabber/jabber.c:550
+#: ../src/protocols/irc/irc.c:321 ../src/protocols/jabber/jabber.c:550
 #: ../src/protocols/jabber/jabber.c:890
 msgid "SSL support unavailable"
 msgstr "Az SSL támogatás nem érhető el"
 
-#: ../src/protocols/irc/irc.c:333
-#: ../src/protocols/simple/simple.c:450
+#: ../src/protocols/irc/irc.c:333 ../src/protocols/simple/simple.c:450
 #: ../src/protocols/simple/simple.c:1518
 msgid "Couldn't create socket"
 msgstr "Nem sikerült létrehozni a foglalatot"
 
-#: ../src/protocols/irc/irc.c:404
-#: ../src/protocols/jabber/jabber.c:421
-#: ../src/protocols/oscar/oscar.c:1867
-#: ../src/protocols/oscar/oscar.c:1934
+#: ../src/protocols/irc/irc.c:404 ../src/protocols/jabber/jabber.c:421
+#: ../src/protocols/oscar/oscar.c:1867 ../src/protocols/oscar/oscar.c:1934
 msgid "Couldn't connect to host"
 msgstr "Nem sikerült kapcsolódni a kiszolgálóhoz"
 
-#: ../src/protocols/irc/irc.c:429
-#: ../src/protocols/jabber/jabber.c:448
+#: ../src/protocols/irc/irc.c:429 ../src/protocols/jabber/jabber.c:448
 msgid "Connection Failed"
 msgstr "A kapcsolódás sikertelen"
 
-#: ../src/protocols/irc/irc.c:432
-#: ../src/protocols/jabber/jabber.c:451
+#: ../src/protocols/irc/irc.c:432 ../src/protocols/jabber/jabber.c:451
 msgid "SSL Handshake Failed"
 msgstr "Az SSL kézfogás sikertelen"
 
-#: ../src/protocols/irc/irc.c:601
-#: ../src/protocols/irc/irc.c:626
+#: ../src/protocols/irc/irc.c:601 ../src/protocols/irc/irc.c:626
 msgid "Read error"
 msgstr "Olvasási hiba"
 
-#: ../src/protocols/irc/irc.c:765
-#: ../src/protocols/silc/chat.c:1420
+#: ../src/protocols/irc/irc.c:765 ../src/protocols/silc/chat.c:1420
 #: ../src/protocols/yahoo/yahoochat.c:1430
 msgid "Users"
 msgstr "Felhasználók"
 
-#: ../src/protocols/irc/irc.c:768
-#: ../src/protocols/sametime/sametime.c:3362
-#: ../src/protocols/silc/chat.c:1423
-#: ../src/protocols/silc/ops.c:1380
+#: ../src/protocols/irc/irc.c:768 ../src/protocols/sametime/sametime.c:3362
+#: ../src/protocols/silc/chat.c:1423 ../src/protocols/silc/ops.c:1380
 #: ../src/protocols/yahoo/yahoochat.c:1439
 msgid "Topic"
 msgstr "TĂ©ma"
@@ -6097,14 +5939,11 @@
 msgstr "Az IRC protokollbővítmény, amely kevésbé rossz"
 
 #. host to connect to
-#: ../src/protocols/irc/irc.c:897
-#: ../src/protocols/irc/msgs.c:231
+#: ../src/protocols/irc/irc.c:897 ../src/protocols/irc/msgs.c:231
 #: ../src/protocols/jabber/jabber.c:1904
 #: ../src/protocols/napster/napster.c:719
-#: ../src/protocols/sametime/sametime.c:5638
-#: ../src/protocols/silc/ops.c:1242
-#: ../src/protocols/silc/ops.c:1344
-#: ../src/protocols/simple/simple.c:1753
+#: ../src/protocols/sametime/sametime.c:5638 ../src/protocols/silc/ops.c:1242
+#: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1753
 msgid "Server"
 msgstr "Kiszolgáló"
 
@@ -6112,14 +5951,10 @@
 msgid "Encodings"
 msgstr "Kódolások"
 
-#: ../src/protocols/irc/irc.c:906
-#: ../src/protocols/irc/msgs.c:225
-#: ../src/protocols/jabber/jabber.c:745
-#: ../src/protocols/silc/buddy.c:1531
-#: ../src/protocols/silc/ops.c:1189
-#: ../src/protocols/silc/ops.c:1191
-#: ../src/protocols/silc/ops.c:1338
-#: ../src/protocols/silc/ops.c:1340
+#: ../src/protocols/irc/irc.c:906 ../src/protocols/irc/msgs.c:225
+#: ../src/protocols/jabber/jabber.c:745 ../src/protocols/silc/buddy.c:1531
+#: ../src/protocols/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 "Felhasználónév"
@@ -6154,15 +5989,13 @@
 msgid "Cannot ban %s: banlist is full"
 msgstr "Nem lehet kitiltani a következőt: %s: a kitiltottak listája tele van"
 
-#: ../src/protocols/irc/msgs.c:211
-#: ../src/protocols/irc/msgs.c:231
+#: ../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:6165
+#: ../src/protocols/irc/msgs.c:211 ../src/protocols/oscar/oscar.c:6165
 #: ../src/protocols/silc/ops.c:1412
 msgid "Nick"
 msgstr "Becenév"
@@ -6175,24 +6008,20 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(azonosĂ­tva)</i>"
 
-#: ../src/protocols/irc/msgs.c:219
-#: ../src/protocols/irc/msgs.c:225
-#: ../src/protocols/irc/msgs.c:226
-#: ../src/protocols/irc/msgs.c:237
+#: ../src/protocols/irc/msgs.c: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/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 "Valódi név"
 
-#: ../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 "Jelenleg a következőn"
 
@@ -6281,8 +6110,7 @@
 msgstr "%s kirĂşgta Ă–nt: (%s)"
 
 #. Remove user from channel
-#: ../src/protocols/irc/msgs.c:704
-#: ../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 "%s kizárta (%s)"
@@ -6292,18 +6120,25 @@
 msgid "mode (%s %s) by %s"
 msgstr "mód (%s %s) %s által"
 
-#: ../src/protocols/irc/msgs.c:812
-#: ../src/protocols/irc/msgs.c:813
+#: ../src/protocols/irc/msgs.c:812 ../src/protocols/irc/msgs.c:813
 msgid "Invalid nickname"
 msgstr "Érvénytelen becenév"
 
 #: ../src/protocols/irc/msgs.c:814
-msgid "Your selected nickname was rejected by the server.  It probably contains invalid characters."
-msgstr "Az Ön által választott becenevet a kiszolgáló visszautasította. Valószínűleg érvénytelen karaktereket tartalmaz."
+msgid ""
+"Your selected nickname was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr ""
+"Az Ön által választott becenevet a kiszolgáló visszautasította. Valószínűleg "
+"érvénytelen karaktereket tartalmaz."
 
 #: ../src/protocols/irc/msgs.c:818
-msgid "Your selected account name was rejected by the server.  It probably contains invalid characters."
-msgstr "Az Ön által választott fióknevet a kiszolgáló visszautasította. Valószínűleg érvénytelen karaktereket tartalmaz."
+msgid ""
+"Your selected account name was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr ""
+"Az Ön által választott fióknevet a kiszolgáló visszautasította. Valószínűleg "
+"érvénytelen karaktereket tartalmaz."
 
 #: ../src/protocols/irc/msgs.c:858
 msgid "Cannot change nick"
@@ -6332,8 +6167,7 @@
 msgid "Cannot join %s:"
 msgstr "Nem lehet csatlakozni ehhez: %s:"
 
-#: ../src/protocols/irc/msgs.c:999
-#: ../src/protocols/silc/ops.c:1128
+#: ../src/protocols/irc/msgs.c:999 ../src/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Nem lehet csatlakozni a csatornához"
 
@@ -6351,41 +6185,76 @@
 msgstr "action &lt;elvégzendő művelet&gt;:  Egy művelet elvégzése."
 
 #: ../src/protocols/irc/parse.c:115
-msgid "away [message]:  Set an away message, or use no message to return from being away."
-msgstr "away [üzenet]:  Beállít egy távollét-üzenetet, vagy üzenet nélkül használva visszatér a távollétből."
+msgid ""
+"away [message]:  Set an away message, or use no message to return from being "
+"away."
+msgstr ""
+"away [üzenet]:  Beállít egy távollét-üzenetet, vagy üzenet nélkül használva "
+"visszatér a távollétből."
 
 #: ../src/protocols/irc/parse.c:116
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: parancs küldése a chanserv kiszolgálónak."
 
 #: ../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;becenév1&gt; [becenév2] ...:  A csatorna-operátor állapot elvétele valakitől. Csatornaoperátornak kell lennie, hogy ezt megtehesse."
+msgid ""
+"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
+"someone. You must be a channel operator to do this."
+msgstr ""
+"deop &lt;becenév1&gt; [becenév2] ...:  A csatorna-operátor állapot elvétele "
+"valakitől. Csatornaoperátornak kell lennie, hogy ezt megtehesse."
 
 #: ../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;becenév1&gt; [becenév2] ...:  A csatorna hang állapot elvétele valakitől, így nem beszélhet, ha a csatorna moderált (+m). Csatornaoperátornak kell lennie, hogy ezt megtehesse."
+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;becenév1&gt; [becenév2] ...:  A csatorna hang állapot elvétele "
+"valakitől, így nem beszélhet, ha a csatorna moderált (+m). "
+"Csatornaoperátornak kell lennie, hogy ezt megtehesse."
 
 #: ../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;becenév&gt; [szoba]:  Meghív valakit, hogy csatlakozzon Önhöz a megadott vagy a jelenlegi csatornán."
+msgid ""
+"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
+"channel, or the current channel."
+msgstr ""
+"invite &lt;becenév&gt; [szoba]:  Meghív valakit, hogy csatlakozzon Önhöz a "
+"megadott vagy a jelenlegi csatornán."
 
 #: ../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;szoba1&gt;[,szoba2][,...] [kulcs1[,kulcs2][,...]]:  Belépés egy vagy több csatornára, opcionálisan kulcs megadásával mindegyikhez, ha szükséges."
+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;szoba1&gt;[,szoba2][,...] [kulcs1[,kulcs2][,...]]:  Belépés egy vagy "
+"több csatornára, opcionálisan kulcs megadásával mindegyikhez, ha szükséges."
 
 #: ../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;szoba1&gt;[,szoba2][,...] [kulcs1[,kulcs2][,...]]:  Belépés egy vagy több csatornára, opcionálisan kulcs megadásával mindegyikhez, ha szükséges."
+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;szoba1&gt;[,szoba2][,...] [kulcs1[,kulcs2][,...]]:  Belépés egy "
+"vagy több csatornára, opcionálisan kulcs megadásával mindegyikhez, ha "
+"szükséges."
 
 #: ../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;becenév&gt; [üzenet]:  Egy személy eltávolítása a csatornáról. Csatornaoperátornak kell lennie, hogy ezt megtehesse."
-
-# konyvjelzo
+msgid ""
+"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
+"channel operator to do this."
+msgstr ""
+"kick &lt;becenév&gt; [üzenet]:  Egy személy eltávolítása a csatornáról. "
+"Csatornaoperátornak kell lennie, hogy ezt megtehesse."
+
 #: ../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:   Megjeleníti az egy hálózaton belül elérhető csevegőszobák listáját. <i>Figyelmeztetés: néhány kiszolgáló bontja a kapcsolatot, ha Ön kiadja ezt a parancsot.</i>"
+msgid ""
+"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
+"may disconnect you upon doing this.</i>"
+msgstr ""
+"list:   Megjeleníti az egy hálózaton belül elérhető csevegőszobák listáját. "
+"<i>Figyelmeztetés: néhány kiszolgáló bontja a kapcsolatot, ha Ön kiadja ezt "
+"a parancsot.</i>"
 
 #: ../src/protocols/irc/parse.c:124
 msgid "me &lt;action to perform&gt;:  Perform an action."
@@ -6396,19 +6265,26 @@
 msgstr "memoserv: parancs küldése a memoserv kiszolgálónak."
 
 #: ../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;becenév|csatorna|&gt;:  Csatorna- vagy felhasználómód beállítása vagy visszavonása."
+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;becenév|csatorna|&gt;:  Csatorna- vagy "
+"felhasználómód beállítása vagy visszavonása."
 
 #: ../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;becenév&gt; &lt;üzenet&gt;:  Magánüzenetet küld a felhasználónak (nem pedig a csatornának)."
+msgid ""
+"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+"msg &lt;becenév&gt; &lt;üzenet&gt;:  Magánüzenetet küld a felhasználónak "
+"(nem pedig a csatornának)."
 
 #: ../src/protocols/irc/parse.c:128
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [csatorna]:  Kilistázza a csatornán jelenlévő felhasználókat."
 
-#: ../src/protocols/irc/parse.c:129
-#: ../src/protocols/jabber/jabber.c:1742
+#: ../src/protocols/irc/parse.c:129 ../src/protocols/jabber/jabber.c:1742
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;új becenév&gt;:  Megváltoztatja a becenevét."
 
@@ -6417,40 +6293,66 @@
 msgstr "nickserv: parancs küldése a nickserv kiszolgálónak."
 
 #: ../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;becenév1&gt; [becenév2] ...:  Csatornaoperátori jogok adása valakinek. Csatornaoperátornak kell lennie, hogy ezt megtehesse."
+msgid ""
+"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+"op &lt;becenév1&gt; [becenév2] ...:  Csatornaoperátori jogok adása "
+"valakinek. Csatornaoperátornak kell lennie, hogy ezt megtehesse."
 
 #: ../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;üzenet&gt;:  Ha nem tudja, mi ez, valószínűleg használni sem tudja."
+msgid ""
+"operwall &lt;message&gt;:  If you don't know what this is, you probably "
+"can't use it."
+msgstr ""
+"operwall &lt;üzenet&gt;:  Ha nem tudja, mi ez, valószínűleg használni sem "
+"tudja."
 
 #: ../src/protocols/irc/parse.c:133
 msgid "operserv: Send a command to operserv"
 msgstr "openserv: parancs küldése az openserv kiszolgálónak."
 
 #: ../src/protocols/irc/parse.c:134
-msgid "part [room] [message]:  Leave the current channel, or a specified channel, with an optional message."
-msgstr "part [szoba] [üzenet]:  Elhagyja a jelenlegi vagy egy megadott csatornát, egy opcionális üzenettel."
+msgid ""
+"part [room] [message]:  Leave the current channel, or a specified channel, "
+"with an optional message."
+msgstr ""
+"part [szoba] [üzenet]:  Elhagyja a jelenlegi vagy egy megadott csatornát, "
+"egy opcionális üzenettel."
 
 #: ../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 [becenév]:  Megkérdezi, mennyi egy felhasználó (vagy a kiszolgáló, ha nincs megadva) késése."
+msgid ""
+"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
+"has."
+msgstr ""
+"ping [becenév]:  Megkérdezi, mennyi egy felhasználó (vagy a kiszolgáló, ha "
+"nincs megadva) késése."
 
 #: ../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;becenév&gt; &lt;üzenet&gt;:  Magánüzenetet küld a felhasználónak (nem pedig a csatornának)."
+msgid ""
+"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+"query &lt;becenév&gt; &lt;üzenet&gt;:  Magánüzenetet küld a felhasználónak "
+"(nem pedig a csatornának)."
 
 #: ../src/protocols/irc/parse.c:137
 msgid "quit [message]:  Disconnect from the server, with an optional message."
-msgstr "quit [üzenet]:  Bontja a kapcsolatot a kiszolgálóval, egy opcionális üzenettel."
+msgstr ""
+"quit [üzenet]:  Bontja a kapcsolatot a kiszolgálóval, egy opcionális "
+"ĂĽzenettel."
 
 #: ../src/protocols/irc/parse.c:138
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Nyers parancs küldése a kiszolgálónak."
 
 #: ../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;becenév&gt; [üzenet]:  Egy személy eltávolítása a szobából. Csatornaoperátornak kell lennie, hogy ezt megtehesse."
+msgid ""
+"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
+"channel operator to do this."
+msgstr ""
+"remove &lt;becenév&gt; [üzenet]:  Egy személy eltávolítása a szobából. "
+"Csatornaoperátornak kell lennie, hogy ezt megtehesse."
 
 #: ../src/protocols/irc/parse.c:140
 msgid "time: Displays the current local time at the IRC server."
@@ -6462,15 +6364,25 @@
 
 #: ../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;:  Felhasználói mód beállítása vagy visszavonása."
+msgstr ""
+"umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Felhasználói mód beállítása vagy "
+"visszavonása."
 
 #: ../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;becenév1&gt; [becenév2] ...:  Csatorna hang állapot megadása valakinek. Csatornaoperátornak kell lennie, hogy ezt megtehesse."
+msgid ""
+"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+"voice &lt;becenév1&gt; [becenév2] ...:  Csatorna hang állapot megadása "
+"valakinek. Csatornaoperátornak kell lennie, hogy ezt megtehesse."
 
 #: ../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;üzenet&gt;:  Ha nem tudja, mi ez, valószínűleg használni sem tudja."
+msgid ""
+"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
+"use it."
+msgstr ""
+"wallops &lt;üzenet&gt;:  Ha nem tudja, mi ez, valószínűleg használni sem "
+"tudja."
 
 #: ../src/protocols/irc/parse.c:145
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
@@ -6489,23 +6401,26 @@
 msgid "CTCP PING reply"
 msgstr "CTCP PING válasz"
 
-#: ../src/protocols/irc/parse.c:542
-#: ../src/protocols/irc/parse.c:546
-#: ../src/protocols/oscar/oscar.c:1774
-#: ../src/protocols/toc/toc.c:190
-#: ../src/protocols/toc/toc.c:688
-#: ../src/protocols/toc/toc.c:704
+#: ../src/protocols/irc/parse.c:542 ../src/protocols/irc/parse.c:546
+#: ../src/protocols/oscar/oscar.c:1774 ../src/protocols/toc/toc.c:190
+#: ../src/protocols/toc/toc.c:688 ../src/protocols/toc/toc.c:704
 #: ../src/protocols/toc/toc.c:780
 msgid "Disconnected."
 msgstr "Kapcsolat bontva."
 
 #: ../src/protocols/jabber/auth.c:51
-msgid "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in account properties"
-msgstr "A kiszolgáló megköveteli a TLS/SSL használatát a bejelentkezéshez. Válassza a \"TLS használata, ha elérhető\" pontot a fiók tulajdonságainál"
+msgid ""
+"Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
+"account properties"
+msgstr ""
+"A kiszolgáló megköveteli a TLS/SSL használatát a bejelentkezéshez. Válassza "
+"a \"TLS használata, ha elérhető\" pontot a fiók tulajdonságainál"
 
 #: ../src/protocols/jabber/auth.c:53
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr "A kiszolgáló megköveteli a TLS/SSL használatát a bejelentkezéshez, de ezek támogatása nem található."
+msgstr ""
+"A kiszolgáló megköveteli a TLS/SSL használatát a bejelentkezéshez, de ezek "
+"támogatása nem található."
 
 #: ../src/protocols/jabber/auth.c:114
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -6515,34 +6430,30 @@
 msgid "Server couldn't authenticate you without a password"
 msgstr "A kiszolgáló jelszó nélkül nem képes hitelesíteni Önt"
 
-#: ../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: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 "Egyszerű szöveges hitelesítés"
 
-#: ../src/protocols/jabber/auth.c:239
-#: ../src/protocols/jabber/auth.c:400
+#: ../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 "Ez a kiszolgáló szöveges hitelesítést követel meg egy nem titkosított csatornán. Engedélyezi ezt és folytatja a hitelesítést?"
-
-#: ../src/protocols/jabber/auth.c:245
-#: ../src/protocols/jabber/auth.c:408
+msgid ""
+"This server requires plaintext authentication over an unencrypted "
+"connection.  Allow this and continue authentication?"
+msgstr ""
+"Ez a kiszolgáló szöveges hitelesítést követel meg egy nem titkosított "
+"csatornán. Engedélyezi ezt és folytatja a hitelesítést?"
+
+#: ../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 "A kiszolgáló nem használ egyetlen támogatott hitelesítési eljárást sem"
 
 #. 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/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 "Érvénytelen válasz a kiszolgálótól."
@@ -6555,110 +6466,94 @@
 msgid "SASL error"
 msgstr "SASL hiba"
 
-#: ../src/protocols/jabber/buddy.c:249
-#: ../src/protocols/jabber/buddy.c:664
+#: ../src/protocols/jabber/buddy.c:249 ../src/protocols/jabber/buddy.c:664
 #: ../src/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "Teljes név"
 
-#: ../src/protocols/jabber/buddy.c:250
-#: ../src/protocols/jabber/buddy.c:677
+#: ../src/protocols/jabber/buddy.c:250 ../src/protocols/jabber/buddy.c:677
 #: ../src/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "Utónév"
 
-#: ../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 "Keresztnév"
 
-#: ../src/protocols/jabber/buddy.c:253
-#: ../src/protocols/jabber/jabber.c:805
+#: ../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 "Utca"
 
-#: ../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 "További cím"
 
-#: ../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 "Helység"
 
-#: ../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 "RĂ©giĂł"
 
-#: ../src/protocols/jabber/buddy.c:258
-#: ../src/protocols/jabber/buddy.c:745
+#: ../src/protocols/jabber/buddy.c:258 ../src/protocols/jabber/buddy.c:745
 #: ../src/protocols/jabber/jabber.c:795
 msgid "Postal Code"
 msgstr "Irányítószám"
 
-#: ../src/protocols/jabber/buddy.c:259
-#: ../src/protocols/jabber/buddy.c:750
+#: ../src/protocols/jabber/buddy.c:259 ../src/protocols/jabber/buddy.c:750
 #: ../src/protocols/silc/silc.c:939
 msgid "Country"
 msgstr "Ország"
 
-#: ../src/protocols/jabber/buddy.c:260
-#: ../src/protocols/jabber/buddy.c:761
+#: ../src/protocols/jabber/buddy.c:260 ../src/protocols/jabber/buddy.c:761
 #: ../src/protocols/jabber/buddy.c:768
 msgid "Telephone"
 msgstr "Telefonszám"
 
-#: ../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 "Szervezet neve"
 
-#: ../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 "Szervezeti egység"
 
-#: ../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 "FunkciĂł"
 
-#: ../src/protocols/jabber/buddy.c:266
-#: ../src/protocols/jabber/buddy.c:698
+#: ../src/protocols/jabber/buddy.c:266 ../src/protocols/jabber/buddy.c:698
 #: ../src/protocols/oscar/oscar.c:6198
 msgid "Birthday"
 msgstr "Születésnap"
 
-#: ../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 "Jabber vCard szerkesztése"
 
 #: ../src/protocols/jabber/buddy.c:569
-msgid "All items below are optional. Enter only the information with which you feel comfortable."
-msgstr "Az alábbi elemek opcionálisak. Csak azokat az információkat adja meg, amelyek nem okoznak kényelmetlenséget."
-
-#: ../src/protocols/jabber/buddy.c:639
-#: ../src/protocols/jabber/jabber.c:1907
+msgid ""
+"All items below are optional. Enter only the information with which you feel "
+"comfortable."
+msgstr ""
+"Az alábbi elemek opcionálisak. Csak azokat az információkat adja meg, "
+"amelyek nem okoznak kényelmetlenséget."
+
+#: ../src/protocols/jabber/buddy.c:639 ../src/protocols/jabber/jabber.c:1907
 msgid "Resource"
 msgstr "Erőforrás"
 
-#: ../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 "Középső név"
 
-#: ../src/protocols/jabber/buddy.c:718
-#: ../src/protocols/jabber/jabber.c:780
-#: ../src/protocols/oscar/oscar.c:6217
-#: ../src/protocols/oscar/oscar.c:6225
+#: ../src/protocols/jabber/buddy.c:718 ../src/protocols/jabber/jabber.c:780
+#: ../src/protocols/oscar/oscar.c:6217 ../src/protocols/oscar/oscar.c:6225
 #: ../src/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "CĂ­m"
@@ -6699,28 +6594,22 @@
 msgid "Unsubscribe"
 msgstr "Leiratkozás"
 
-#: ../src/protocols/jabber/buddy.c:1097
-#: ../src/protocols/jabber/chat.c:677
-#: ../src/protocols/jabber/chat.c:688
-#: ../src/protocols/jabber/jabber.c:1164
+#: ../src/protocols/jabber/buddy.c:1097 ../src/protocols/jabber/chat.c:677
+#: ../src/protocols/jabber/chat.c:688 ../src/protocols/jabber/jabber.c:1164
 #: ../src/protocols/silc/ops.c:1449
 msgid "Error"
 msgstr "Hiba"
 
-#: ../src/protocols/jabber/buddy.c:1103
-#: ../src/protocols/jabber/jabber.c:1189
+#: ../src/protocols/jabber/buddy.c:1103 ../src/protocols/jabber/jabber.c:1189
 msgid "Chatty"
 msgstr "Beszédes"
 
-#: ../src/protocols/jabber/buddy.c:1107
-#: ../src/status.c:159
+#: ../src/protocols/jabber/buddy.c:1107 ../src/status.c:159
 msgid "Extended Away"
 msgstr "Nem vagyok a gépnél"
 
-#: ../src/protocols/jabber/buddy.c:1109
-#: ../src/protocols/jabber/jabber.c:1219
-#: ../src/protocols/oscar/oscar.c:787
-#: ../src/protocols/oscar/oscar.c:8051
+#: ../src/protocols/jabber/buddy.c:1109 ../src/protocols/jabber/jabber.c:1219
+#: ../src/protocols/oscar/oscar.c:787 ../src/protocols/oscar/oscar.c:8051
 #: ../src/protocols/sametime/sametime.c:3285
 msgid "Do Not Disturb"
 msgstr "Ne zavarjanak"
@@ -6733,15 +6622,12 @@
 msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr "Töltsön ki legalább egy mezőt a megfelelő Jabber felhasználók kereséséhez."
 
-#: ../src/protocols/jabber/buddy.c:1392
-#: ../src/protocols/jabber/jabber.c:770
-#: ../src/protocols/oscar/oscar.c:6175
-#: ../src/protocols/silc/ops.c:1024
+#: ../src/protocols/jabber/buddy.c:1392 ../src/protocols/jabber/jabber.c:770
+#: ../src/protocols/oscar/oscar.c:6175 ../src/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "Utónév"
 
-#: ../src/protocols/jabber/buddy.c:1397
-#: ../src/protocols/jabber/jabber.c:775
+#: ../src/protocols/jabber/buddy.c:1397 ../src/protocols/jabber/jabber.c:775
 #: ../src/protocols/oscar/oscar.c:6176
 msgid "Last Name"
 msgstr "Vezetéknév"
@@ -6750,8 +6636,7 @@
 msgid "E-Mail Address"
 msgstr "E-mail cĂ­m"
 
-#: ../src/protocols/jabber/buddy.c:1416
-#: ../src/protocols/jabber/buddy.c:1417
+#: ../src/protocols/jabber/buddy.c:1416 ../src/protocols/jabber/buddy.c:1417
 msgid "Search for Jabber users"
 msgstr "Jabber felhasználók keresése"
 
@@ -6771,8 +6656,7 @@
 msgid "Search Directory"
 msgstr "Keresési könyvtár"
 
-#: ../src/protocols/jabber/chat.c:41
-#: ../src/protocols/oscar/oscar.c:7546
+#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:7546
 #: ../src/protocols/yahoo/yahoochat.c:998
 msgid "_Room:"
 msgstr "Sz_oba:"
@@ -6799,8 +6683,7 @@
 msgid "%s is not a valid server name"
 msgstr "%s érvénytelen kiszolgálónév"
 
-#: ../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 "Érvénytelen kiszolgálónév"
 
@@ -6809,8 +6692,7 @@
 msgid "%s is not a valid room handle"
 msgstr "%s érvénytelen szobaazonosító"
 
-#: ../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 "Érvénytelen szobaazonosító"
 
@@ -6818,8 +6700,7 @@
 msgid "Configuration error"
 msgstr "Beállítási hiba"
 
-#: ../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 "A beállítás sikertelen"
 
@@ -6831,8 +6712,7 @@
 msgid "This room is not capable of being configured"
 msgstr "Ezt a szobát nem lehet beállítani"
 
-#: ../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 "Regisztrációs hiba"
 
@@ -6840,8 +6720,7 @@
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "A nem-MUC csevegőszobákban nem támogatott a becenév megváltoztatása"
 
-#: ../src/protocols/jabber/chat.c:678
-#: ../src/protocols/jabber/chat.c:689
+#: ../src/protocols/jabber/chat.c:678 ../src/protocols/jabber/chat.c:689
 #: ../src/protocols/silc/ops.c:1449
 msgid "Error retrieving room list"
 msgstr "Hiba szobalista letöltése közben"
@@ -6866,24 +6745,20 @@
 msgid "Error initializing session"
 msgstr "Hiba a folyamat inicializálásánál"
 
-#: ../src/protocols/jabber/jabber.c:226
-#: ../src/protocols/jabber/jabber.c:275
+#: ../src/protocols/jabber/jabber.c:226 ../src/protocols/jabber/jabber.c:275
 #: ../src/protocols/jabber/jabber.c:303
 msgid "Write error"
 msgstr "Írási hiba"
 
-#: ../src/protocols/jabber/jabber.c:355
-#: ../src/protocols/jabber/jabber.c:388
+#: ../src/protocols/jabber/jabber.c:355 ../src/protocols/jabber/jabber.c:388
 msgid "Read Error"
 msgstr "Olvasási hiba"
 
-#: ../src/protocols/jabber/jabber.c:474
-#: ../src/protocols/jabber/jabber.c:900
+#: ../src/protocols/jabber/jabber.c:474 ../src/protocols/jabber/jabber.c:900
 msgid "Unable to create socket"
 msgstr "Nem lehet létrehozni foglalatot"
 
-#: ../src/protocols/jabber/jabber.c:520
-#: ../src/protocols/jabber/jabber.c:857
+#: ../src/protocols/jabber/jabber.c:520 ../src/protocols/jabber/jabber.c:857
 msgid "Invalid Jabber ID"
 msgstr "Érvénytelen Jabber azonosító"
 
@@ -6892,36 +6767,29 @@
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s regisztrációja sikeres"
 
-#: ../src/protocols/jabber/jabber.c:592
-#: ../src/protocols/jabber/jabber.c:593
+#: ../src/protocols/jabber/jabber.c:592 ../src/protocols/jabber/jabber.c:593
 msgid "Registration Successful"
 msgstr "A regisztráció sikeres"
 
-#: ../src/protocols/jabber/jabber.c:599
-#: ../src/protocols/jabber/jabber.c:1455
+#: ../src/protocols/jabber/jabber.c:599 ../src/protocols/jabber/jabber.c:1455
 msgid "Unknown Error"
 msgstr "Ismeretlen hiba"
 
-#: ../src/protocols/jabber/jabber.c:601
-#: ../src/protocols/jabber/jabber.c:602
+#: ../src/protocols/jabber/jabber.c:601 ../src/protocols/jabber/jabber.c:602
 msgid "Registration Failed"
 msgstr "A regisztráció sikertelen"
 
-#: ../src/protocols/jabber/jabber.c:713
-#: ../src/protocols/jabber/jabber.c:714
+#: ../src/protocols/jabber/jabber.c:713 ../src/protocols/jabber/jabber.c:714
 msgid "Already Registered"
 msgstr "Már regisztrálva van"
 
-#: ../src/protocols/jabber/jabber.c:790
-#: ../src/protocols/oscar/oscar.c:6219
+#: ../src/protocols/jabber/jabber.c:790 ../src/protocols/oscar/oscar.c:6219
 #: ../src/protocols/oscar/oscar.c:6227
 msgid "State"
 msgstr "Ăllam"
 
-#: ../src/protocols/jabber/jabber.c:800
-#: ../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"
 
@@ -6933,8 +6801,7 @@
 msgid "Please fill out the information below to register your new account."
 msgstr "Kérem adja meg a következő információkat az új fiók regisztrálásához."
 
-#: ../src/protocols/jabber/jabber.c:821
-#: ../src/protocols/jabber/jabber.c:822
+#: ../src/protocols/jabber/jabber.c:821 ../src/protocols/jabber/jabber.c:822
 msgid "Register New Jabber Account"
 msgstr "Új Jabber fiók regisztrálása"
 
@@ -6942,8 +6809,7 @@
 msgid "Initializing Stream"
 msgstr "Folyam inicializálása"
 
-#: ../src/protocols/jabber/jabber.c:989
-#: ../src/protocols/msn/session.c:355
+#: ../src/protocols/jabber/jabber.c:989 ../src/protocols/msn/session.c:355
 msgid "Authenticating"
 msgstr "Hitelesítés"
 
@@ -6951,12 +6817,9 @@
 msgid "Re-initializing Stream"
 msgstr "A folyam újrainicializálása"
 
-#: ../src/protocols/jabber/jabber.c:1068
-#: ../src/protocols/jabber/jabber.c:1433
-#: ../src/protocols/jabber/jabber.c:1474
-#: ../src/protocols/jabber/jabber.c:1508
-#: ../src/protocols/oscar/oscar.c:856
-#: ../src/protocols/oscar/oscar.c:7841
+#: ../src/protocols/jabber/jabber.c:1068 ../src/protocols/jabber/jabber.c:1433
+#: ../src/protocols/jabber/jabber.c:1474 ../src/protocols/jabber/jabber.c:1508
+#: ../src/protocols/oscar/oscar.c:856 ../src/protocols/oscar/oscar.c:7841
 msgid "Not Authorized"
 msgstr "Nem engedélyezett"
 
@@ -6980,10 +6843,8 @@
 msgid "Subscription"
 msgstr "Feliratkozás"
 
-#: ../src/protocols/jabber/jabber.c:1180
-#: ../src/protocols/jabber/jabber.c:1190
-#: ../src/protocols/jabber/jabber.c:1200
-#: ../src/protocols/jabber/jabber.c:1210
+#: ../src/protocols/jabber/jabber.c:1180 ../src/protocols/jabber/jabber.c:1190
+#: ../src/protocols/jabber/jabber.c:1200 ../src/protocols/jabber/jabber.c:1210
 #: ../src/protocols/jabber/jabber.c:1220
 msgid "Priority"
 msgstr "Prioritás"
@@ -6996,8 +6857,7 @@
 msgid "Your password has been changed."
 msgstr "A jelszava meg lett változtatva."
 
-#: ../src/protocols/jabber/jabber.c:1254
-#: ../src/protocols/jabber/jabber.c:1255
+#: ../src/protocols/jabber/jabber.c:1254 ../src/protocols/jabber/jabber.c:1255
 msgid "Error changing password"
 msgstr "Hiba a jelszó megváltoztatásakor"
 
@@ -7005,8 +6865,7 @@
 msgid "Password (again)"
 msgstr "Jelszó (még egyszer)"
 
-#: ../src/protocols/jabber/jabber.c:1316
-#: ../src/protocols/jabber/jabber.c:1317
+#: ../src/protocols/jabber/jabber.c:1316 ../src/protocols/jabber/jabber.c:1317
 msgid "Change Jabber Password"
 msgstr "Jabber jelszó megváltoztatása"
 
@@ -7014,15 +6873,13 @@
 msgid "Please enter your new password"
 msgstr "Kérem adja meg az új jelszavát"
 
-#: ../src/protocols/jabber/jabber.c:1327
-#: ../src/protocols/oscar/oscar.c:8475
+#: ../src/protocols/jabber/jabber.c:1327 ../src/protocols/oscar/oscar.c:8475
 #: ../src/protocols/silc/silc.c:1019
 msgid "Set User Info..."
 msgstr "Felhasználói információk beállítása..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../src/protocols/jabber/jabber.c:1332
-#: ../src/protocols/oscar/oscar.c:8486
+#: ../src/protocols/jabber/jabber.c:1332 ../src/protocols/oscar/oscar.c:8486
 #: ../src/protocols/silc/silc.c:1015
 msgid "Change Password..."
 msgstr "Jelszó megváltoztatása..."
@@ -7052,8 +6909,7 @@
 msgid "Gone"
 msgstr "Elment"
 
-#: ../src/protocols/jabber/jabber.c:1423
-#: ../src/protocols/jabber/jabber.c:1498
+#: ../src/protocols/jabber/jabber.c:1423 ../src/protocols/jabber/jabber.c:1498
 msgid "Internal Server Error"
 msgstr "Belső kiszolgálóhiba"
 
@@ -7149,8 +7005,7 @@
 msgid "Resource Conflict"
 msgstr "Erőforrásütközés"
 
-#: ../src/protocols/jabber/jabber.c:1490
-#: ../src/protocols/silc/ops.c:1728
+#: ../src/protocols/jabber/jabber.c:1490 ../src/protocols/silc/ops.c:1728
 msgid "Connection Timeout"
 msgstr "Időtúllépés miatt a kapcsolat megszakadt"
 
@@ -7285,12 +7140,20 @@
 msgstr "ban &lt;felhasználó&gt; [szoba]:  Felhasználó kitiltása a szobából."
 
 #: ../src/protocols/jabber/jabber.c:1770
-msgid "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's affiliation with the room."
-msgstr "affiliate &lt;felhasználó&gt; &lt;owner|admin|member|outcast|none&gt;: Egy felhasználó a szobával fennálló kapcsolatának beállítása."
+msgid ""
+"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
+"affiliation with the room."
+msgstr ""
+"affiliate &lt;felhasználó&gt; &lt;owner|admin|member|outcast|none&gt;: Egy "
+"felhasználó a szobával fennálló kapcsolatának beállítása."
 
 #: ../src/protocols/jabber/jabber.c:1776
-msgid "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's role in the room."
-msgstr "role &lt;felhasználó&gt; &lt;moderator|participant|visitor|none&gt;: Beállítja a felhasználó szerepét a szobában."
+msgid ""
+"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
+"role in the room."
+msgstr ""
+"role &lt;felhasználó&gt; &lt;moderator|participant|visitor|none&gt;: "
+"Beállítja a felhasználó szerepét a szobában."
 
 #: ../src/protocols/jabber/jabber.c:1782
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
@@ -7298,7 +7161,9 @@
 
 #: ../src/protocols/jabber/jabber.c:1788
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
-msgstr "join: &lt;szoba&gt; [kiszolgáló]:  Csatlakozás csevegéshez a megadott kiszolgálón."
+msgstr ""
+"join: &lt;szoba&gt; [kiszolgáló]:  Csatlakozás csevegéshez a megadott "
+"kiszolgálón."
 
 #: ../src/protocols/jabber/jabber.c:1794
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
@@ -7306,7 +7171,9 @@
 
 #: ../src/protocols/jabber/jabber.c:1799
 msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
-msgstr "msg &lt;felhasználó&gt; &lt;üzenet&gt;:  Magánüzenet küldése másik felhasználónak."
+msgstr ""
+"msg &lt;felhasználó&gt; &lt;üzenet&gt;:  Magánüzenet küldése másik "
+"felhasználónak."
 
 #. *< type
 #. *< ui_requirement
@@ -7318,8 +7185,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/jabber/jabber.c:1882
-#: ../src/protocols/jabber/jabber.c:1884
+#: ../src/protocols/jabber/jabber.c:1882 ../src/protocols/jabber/jabber.c:1884
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber protokollbővítmény"
 
@@ -7339,14 +7205,12 @@
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Egyszerű szöveges hitelesítés engedélyezése nem titkosított folyamokon"
 
-#: ../src/protocols/jabber/jabber.c:1928
-#: ../src/protocols/simple/simple.c:1759
+#: ../src/protocols/jabber/jabber.c:1928 ../src/protocols/simple/simple.c:1759
 msgid "Connect port"
 msgstr "Kapcsolódási port"
 
 #. Account options
-#: ../src/protocols/jabber/jabber.c:1932
-#: ../src/protocols/silc/silc.c:1851
+#: ../src/protocols/jabber/jabber.c:1932 ../src/protocols/silc/silc.c:1851
 msgid "Connect server"
 msgstr "Kapcsolatkiszolgáló"
 
@@ -7387,20 +7251,17 @@
 msgid "Unknown Error in presence"
 msgstr "Ismeretlen hiba a jelenlétben"
 
-#: ../src/protocols/jabber/presence.c:314
-#: ../src/protocols/msn/userlist.c:104
+#: ../src/protocols/jabber/presence.c:314 ../src/protocols/msn/userlist.c:104
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list."
 msgstr "%s partner szeretné %s-t a partnerei közé felvenni."
 
-#: ../src/protocols/jabber/presence.c:323
-#: ../src/protocols/oscar/oscar.c:4805
+#: ../src/protocols/jabber/presence.c:323 ../src/protocols/oscar/oscar.c:4805
 #: ../src/protocols/oscar/oscar.c:7476
 msgid "_Authorize"
 msgstr "_Felhatalmazás"
 
-#: ../src/protocols/jabber/presence.c:324
-#: ../src/protocols/oscar/oscar.c:4807
+#: ../src/protocols/jabber/presence.c:324 ../src/protocols/oscar/oscar.c:4807
 #: ../src/protocols/oscar/oscar.c:7477
 msgid "_Deny"
 msgstr "_Megtagadás"
@@ -7411,8 +7272,12 @@
 msgstr "Új szoba létrehozása"
 
 #: ../src/protocols/jabber/presence.c:382
-msgid "You are creating a new room.  Would you like to configure it, or accept the default settings?"
-msgstr "Új szobát hoz létre. Szeretné beállítani, vagy elfogadja az alapbeállításokat?"
+msgid ""
+"You are creating a new room.  Would you like to configure it, or accept the "
+"default settings?"
+msgstr ""
+"Új szobát hoz létre. Szeretné beállítani, vagy elfogadja az "
+"alapbeállításokat?"
 
 #: ../src/protocols/jabber/presence.c:384
 msgid "_Configure Room"
@@ -7435,10 +7300,11 @@
 #: ../src/protocols/jabber/si.c:726
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
-msgstr "Nem lehet fájlt küldeni a következőnek: %s, mert a felhasználó nem támogatja fájlok átvitelét"
-
-#: ../src/protocols/jabber/si.c:727
-#: ../src/protocols/jabber/si.c:728
+msgstr ""
+"Nem lehet fájlt küldeni a következőnek: %s, mert a felhasználó nem támogatja "
+"fájlok átvitelét"
+
+#: ../src/protocols/jabber/si.c:727 ../src/protocols/jabber/si.c:728
 msgid "File Send Failed"
 msgstr "Fájl küldése sikertelen"
 
@@ -7449,13 +7315,21 @@
 
 #: ../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 a helyi listán a(z) %s csoport tagja, de a kiszolgáló listáján nem az. Szeretné ezt a partnert felvenni?"
+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 a helyi listán a(z) %s csoport tagja, de a kiszolgáló listáján nem az. "
+"Szeretné ezt a partnert felvenni?"
 
 #: ../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 rajta van a helyi listán, de a kiszolgáló listáján nincs. Szeretné ezt a partnert felvenni?"
+msgid ""
+"%s is on the local list but not on the server list. Do you want this buddy "
+"to be added?"
+msgstr ""
+"%s rajta van a helyi listán, de a kiszolgáló listáján nincs. Szeretné ezt a "
+"partnert felvenni?"
 
 #: ../src/protocols/msn/error.c:35
 msgid "Unable to parse message"
@@ -7501,8 +7375,7 @@
 msgid "Not on list"
 msgstr "Nincs a listán"
 
-#: ../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 "A felhasználó nem érhető el"
 
@@ -7554,8 +7427,7 @@
 msgid "Too many hits to a FND"
 msgstr "Túl sok találat az FND-hez"
 
-#: ../src/protocols/msn/error.c:112
-#: ../src/protocols/oscar/oscar.c:207
+#: ../src/protocols/msn/error.c:112 ../src/protocols/oscar/oscar.c:207
 msgid "Not logged in"
 msgstr "Nincs bejelentkezve"
 
@@ -7587,8 +7459,7 @@
 msgid "Server busy"
 msgstr "A kiszolgáló foglalt"
 
-#: ../src/protocols/msn/error.c:138
-#: ../src/protocols/msn/error.c:151
+#: ../src/protocols/msn/error.c:138 ../src/protocols/msn/error.c:151
 #: ../src/protocols/msn/error.c:206
 msgid "Server unavailable"
 msgstr "A kiszolgáló nem érhető el"
@@ -7649,10 +7520,8 @@
 msgid "Server too busy"
 msgstr "A kiszolgáló túl elfoglalt"
 
-#: ../src/protocols/msn/error.c:198
-#: ../src/protocols/oscar/oscar.c:2929
-#: ../src/protocols/silc/ops.c:1717
-#: ../src/protocols/toc/toc.c:722
+#: ../src/protocols/msn/error.c:198 ../src/protocols/oscar/oscar.c:2929
+#: ../src/protocols/silc/ops.c:1717 ../src/protocols/toc/toc.c:722
 msgid "Authentication failed"
 msgstr "Hitelesítés sikertelen"
 
@@ -7719,8 +7588,12 @@
 msgstr "Engedélyezi az MSN mobil oldalakat?"
 
 #: ../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 "Engedélyezi vagy megtiltja a listán szereplő partnereinek, hogy mobil oldalakat küldjenek a mobiltelefonjára vagy más mobil eszközre?"
+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 ""
+"Engedélyezi vagy megtiltja a listán szereplő partnereinek, hogy mobil "
+"oldalakat küldjenek a mobiltelefonjára vagy más mobil eszközre?"
 
 #: ../src/protocols/msn/msn.c:311
 msgid "Allow"
@@ -7742,12 +7615,9 @@
 msgid "Page"
 msgstr "Oldal"
 
-#: ../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:2881
-#: ../src/protocols/yahoo/yahoo.c:2887
+#: ../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:2881 ../src/protocols/yahoo/yahoo.c:2887
 #, c-format
 msgid ""
 "\n"
@@ -7760,32 +7630,24 @@
 msgid "Has you"
 msgstr "Szerepel-e a listáján"
 
-#: ../src/protocols/msn/msn.c:587
-#: ../src/protocols/msn/state.c:33
-#: ../src/protocols/yahoo/yahoo.c:2710
-#: ../src/protocols/yahoo/yahoo.c:3289
+#: ../src/protocols/msn/msn.c:587 ../src/protocols/msn/state.c:33
+#: ../src/protocols/yahoo/yahoo.c:2710 ../src/protocols/yahoo/yahoo.c:3289
 msgid "Be Right Back"
 msgstr "Rögtön jövök"
 
-#: ../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:2712
-#: ../src/protocols/yahoo/yahoo.c:3292
+#: ../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:2712 ../src/protocols/yahoo/yahoo.c:3292
 msgid "Busy"
 msgstr "Elfoglalt vagyok"
 
-#: ../src/protocols/msn/msn.c:595
-#: ../src/protocols/yahoo/yahoo.c:2720
+#: ../src/protocols/msn/msn.c:595 ../src/protocols/yahoo/yahoo.c:2720
 #: ../src/protocols/yahoo/yahoo.c:3304
 msgid "On the Phone"
 msgstr "Telefonálok"
 
-#: ../src/protocols/msn/msn.c:599
-#: ../src/protocols/yahoo/yahoo.c:2724
+#: ../src/protocols/msn/msn.c:599 ../src/protocols/yahoo/yahoo.c:2724
 #: ../src/protocols/yahoo/yahoo.c:3310
 msgid "Out to Lunch"
 msgstr "Ebédelni mentem"
@@ -7822,32 +7684,32 @@
 msgid "Send to Mobile"
 msgstr "Küldés mobiltelefonra"
 
-#: ../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 "Csevegés ke_zdeményezése"
 
 #: ../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 "Az MSN igénybevételéhez SSL támogatás szükséges. Kérem telepítsen egy támogatott SSL könyvtárat. További információkért keresse fel a következő címet: http://gaim.sf.net/faq-ssl.php."
+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 ""
+"Az MSN igénybevételéhez SSL támogatás szükséges. Kérem telepítsen egy "
+"támogatott SSL könyvtárat. További információkért keresse fel a következő "
+"cĂ­met: http://gaim.sf.net/faq-ssl.php."
 
 #: ../src/protocols/msn/msn.c:757
 msgid "Failed to connect to server."
 msgstr "Nem sikerült a kiszolgálóhoz kapcsolódni."
 
-#: ../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: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>ĂlnĂ©v:</b> %s <br>"
 
 #. put a link to the actual profile URL
-#: ../src/protocols/msn/msn.c:1373
-#: ../src/protocols/msn/msn.c:1816
-#: ../src/protocols/yahoo/yahoo_profile.c:1202
-#: ../src/util.c:1056
+#: ../src/protocols/msn/msn.c:1373 ../src/protocols/msn/msn.c:1816
+#: ../src/protocols/yahoo/yahoo_profile.c:1202 ../src/util.c:1056
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b> "
@@ -7856,62 +7718,48 @@
 msgid "MSN Profile"
 msgstr "MSN profil"
 
-#: ../src/protocols/msn/msn.c:1461
-#: ../src/protocols/msn/msn.c:1800
+#: ../src/protocols/msn/msn.c:1461 ../src/protocols/msn/msn.c:1800
 #: ../src/protocols/yahoo/yahoo_profile.c:795
 msgid "Error retrieving profile"
 msgstr "Hiba a profil letöltése közben"
 
-#: ../src/protocols/msn/msn.c:1531
-#: ../src/protocols/oscar/oscar.c:6204
+#: ../src/protocols/msn/msn.c:1531 ../src/protocols/oscar/oscar.c:6204
 #: ../src/protocols/yahoo/yahoo_profile.c:1050
 msgid "Age"
 msgstr "Kor"
 
-#: ../src/protocols/msn/msn.c:1533
-#: ../src/protocols/yahoo/yahoo_profile.c:1065
+#: ../src/protocols/msn/msn.c:1533 ../src/protocols/yahoo/yahoo_profile.c:1065
 msgid "Occupation"
 msgstr "Foglalkozás"
 
-#: ../src/protocols/msn/msn.c:1534
-#: ../src/protocols/novell/novell.c:1480
+#: ../src/protocols/msn/msn.c:1534 ../src/protocols/novell/novell.c:1480
 #: ../src/protocols/yahoo/yahoo_profile.c:1045
 msgid "Location"
 msgstr "Hely"
 
-#: ../src/protocols/msn/msn.c:1539
-#: ../src/protocols/msn/msn.c:1729
-#: ../src/protocols/msn/msn.c:1735
-#: ../src/protocols/msn/msn.c:1742
+#: ../src/protocols/msn/msn.c:1539 ../src/protocols/msn/msn.c:1729
+#: ../src/protocols/msn/msn.c:1735 ../src/protocols/msn/msn.c:1742
 msgid "Hobbies and Interests"
 msgstr "Hobbik és érdeklődési kör"
 
-#: ../src/protocols/msn/msn.c:1545
-#: ../src/protocols/msn/msn.c:1663
-#: ../src/protocols/msn/msn.c:1669
-#: ../src/protocols/msn/msn.c:1676
-#: ../src/protocols/msn/msn.c:1684
-#: ../src/protocols/msn/msn.c:1691
+#: ../src/protocols/msn/msn.c:1545 ../src/protocols/msn/msn.c:1663
+#: ../src/protocols/msn/msn.c:1669 ../src/protocols/msn/msn.c:1676
+#: ../src/protocols/msn/msn.c:1684 ../src/protocols/msn/msn.c:1691
 msgid "A Little About Me"
 msgstr "Magamról röviden"
 
 #. Social
-#: ../src/protocols/msn/msn.c:1563
-#: ../src/protocols/yahoo/yahoo_profile.c:1055
+#: ../src/protocols/msn/msn.c:1563 ../src/protocols/yahoo/yahoo_profile.c:1055
 msgid "Marital Status"
 msgstr "Családi állapot"
 
-#: ../src/protocols/msn/msn.c:1573
-#: ../src/protocols/msn/msn.c:1751
-#: ../src/protocols/msn/msn.c:1757
-#: ../src/protocols/yahoo/yahoo_profile.c:1107
+#: ../src/protocols/msn/msn.c:1573 ../src/protocols/msn/msn.c:1751
+#: ../src/protocols/msn/msn.c:1757 ../src/protocols/yahoo/yahoo_profile.c:1107
 msgid "Favorite Quote"
 msgstr "Kedvenc idézet"
 
-#: ../src/protocols/msn/msn.c:1700
-#: ../src/protocols/msn/msn.c:1706
-#: ../src/protocols/msn/msn.c:1713
-#: ../src/protocols/msn/msn.c:1720
+#: ../src/protocols/msn/msn.c:1700 ../src/protocols/msn/msn.c:1706
+#: ../src/protocols/msn/msn.c:1713 ../src/protocols/msn/msn.c:1720
 msgid "Favorite Things"
 msgstr "Kedvenc dolgok"
 
@@ -7919,8 +7767,7 @@
 msgid "Last Updated"
 msgstr "Utoljára frissítve"
 
-#: ../src/protocols/msn/msn.c:1777
-#: ../src/protocols/silc/ops.c:1060
+#: ../src/protocols/msn/msn.c:1777 ../src/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "Honlap"
 
@@ -7929,15 +7776,24 @@
 msgstr "A felhasználó nem hozott létre nyilvános profilt."
 
 #: ../src/protocols/msn/msn.c:1803
-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 "Az MSN nem találta meg a felhasználó profilját. Ez vagy azt jelenti, hogy a felhasználó nem létezik, vagy azt, hogy bár létezik, még nem hozott létre nyilvános profilt."
+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 ""
+"Az MSN nem találta meg a felhasználó profilját. Ez vagy azt jelenti, hogy a "
+"felhasználó nem létezik, vagy azt, hogy bár létezik, még nem hozott létre "
+"nyilvános profilt."
 
 #: ../src/protocols/msn/msn.c:1807
-msgid "Gaim could not find any information in the user's profile. The user most likely does not exist."
-msgstr "A Gaim nem talált információkat a felhasználó profiljában. A felhasználó valószínűleg nem létezik."
-
-#: ../src/protocols/msn/msn.c:1813
-#: ../src/protocols/msn/msn.c:1816
+msgid ""
+"Gaim could not find any information in the user's profile. The user most "
+"likely does not exist."
+msgstr ""
+"A Gaim nem talált információkat a felhasználó profiljában. A felhasználó "
+"valószínűleg nem létezik."
+
+#: ../src/protocols/msn/msn.c:1813 ../src/protocols/msn/msn.c:1816
 #: ../src/protocols/yahoo/yahoo_profile.c:1202
 msgid "Profile URL"
 msgstr "Profil URL-je"
@@ -7952,8 +7808,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/msn/msn.c:2022
-#: ../src/protocols/msn/msn.c:2024
+#: ../src/protocols/msn/msn.c:2022 ../src/protocols/msn/msn.c:2024
 msgid "MSN Protocol Plugin"
 msgstr "MSN protokollbővítmény"
 
@@ -7973,8 +7828,7 @@
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: felhasználó megbökése figyelemfelhívási céllal"
 
-#: ../src/protocols/msn/nexus.c:141
-#: ../src/protocols/msn/servconn.c:133
+#: ../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"
@@ -7986,8 +7840,7 @@
 msgstr "%s érvénytelen csoport."
 
 #: ../src/protocols/msn/notification.c:184
-#: ../src/protocols/msn/notification.c:532
-#: ../src/protocols/msn/session.c:334
+#: ../src/protocols/msn/notification.c:532 ../src/protocols/msn/session.c:334
 msgid "Unknown error."
 msgstr "Ismeretlen hiba."
 
@@ -8036,19 +7889,29 @@
 #: ../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"
+"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"
 "\n"
-"After the maintenance has been completed, you will be able to successfully sign in."
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
 msgid_plural ""
-"The MSN server will shut down for maintenance in %d minutes. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
+"The MSN server will shut down for maintenance in %d minutes. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully sign in."
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
 msgstr[0] ""
-"Az MSN kiszolgáló karbantartás miatt le fog állni %d percben belül. Ekkor automatikusan ki lesz jelentkeztetve, Kérjük fejezze be a folyamatban lévő társalgásait.\n"
+"Az MSN kiszolgáló karbantartás miatt le fog állni %d percben belül. Ekkor "
+"automatikusan ki lesz jelentkeztetve, Kérjük fejezze be a folyamatban lévő "
+"társalgásait.\n"
 "\n"
 "A karbantartás befejeződése után sikeresen be tud majd jelentkezni."
 msgstr[1] ""
-"Az MSN kiszolgáló karbantartás miatt le fog állni %d percben belül. Ekkor automatikusan ki lesz jelentkeztetve, Kérjük fejezze be a folyamatban lévő társalgásait.\n"
+"Az MSN kiszolgáló karbantartás miatt le fog állni %d percben belül. Ekkor "
+"automatikusan ki lesz jelentkeztetve, Kérjük fejezze be a folyamatban lévő "
+"társalgásait.\n"
 "\n"
 "A karbantartás befejeződése után sikeresen be tud majd jelentkezni."
 
@@ -8079,16 +7942,16 @@
 
 #. MSG_SERVER_GHOST
 #. Looks like someone logged in as us! =-O
-#: ../src/protocols/msn/session.c:312
-#: ../src/protocols/napster/napster.c:456
-#: ../src/protocols/oscar/oscar.c:5881
-#: ../src/protocols/yahoo/yahoo.c:193
+#: ../src/protocols/msn/session.c:312 ../src/protocols/napster/napster.c:456
+#: ../src/protocols/oscar/oscar.c:5881 ../src/protocols/yahoo/yahoo.c:193
 msgid "You have signed on from another location."
 msgstr "Bejelentkezett egy másik helyről."
 
 #: ../src/protocols/msn/session.c:315
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
-msgstr "Az MSN kiszolgálók átmenetileg nem érhetőek el. Kérem várjon és próbálja újra később."
+msgstr ""
+"Az MSN kiszolgálók átmenetileg nem érhetőek el. Kérem várjon és próbálja "
+"újra később."
 
 #: ../src/protocols/msn/session.c:320
 msgid "The MSN servers are going down temporarily."
@@ -8101,10 +7964,11 @@
 
 #: ../src/protocols/msn/session.c:329
 msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
-msgstr "Az Ön MSN partnerlistája átmenetileg nem érhető el. Kérem várjon és próbálja újra később."
-
-#: ../src/protocols/msn/session.c:350
-#: ../src/protocols/msn/session.c:352
+msgstr ""
+"Az Ön MSN partnerlistája átmenetileg nem érhető el. Kérem várjon és próbálja "
+"újra később."
+
+#: ../src/protocols/msn/session.c:350 ../src/protocols/msn/session.c:352
 msgid "Handshaking"
 msgstr "Kézfogás"
 
@@ -8178,13 +8042,11 @@
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "%s (%s) partner szeretné %s-t a partnerei közé felvenni."
 
-#: ../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 "Engedélyezés"
 
-#: ../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 "Elutasítás"
 
@@ -8245,20 +8107,16 @@
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: ../src/protocols/napster/napster.c:507
-#: ../src/protocols/napster/napster.c:543
-#: ../src/protocols/toc/toc.c:172
-#: ../src/protocols/yahoo/yahoo.c:2238
-#: ../src/protocols/yahoo/yahoo.c:2265
-#: ../src/protocols/yahoo/yahoo.c:2348
-#: ../src/protocols/yahoo/yahoo.c:2363
+#: ../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 "Nem lehet kapcsolĂłdni."
 
-#: ../src/protocols/napster/napster.c:599
-#: ../src/protocols/toc/toc.c:1367
+#: ../src/protocols/napster/napster.c:599 ../src/protocols/toc/toc.c:1367
 msgid "_Group:"
 msgstr "_Csoport:"
 
@@ -8358,7 +8216,9 @@
 msgstr "A megadott felhasználónévhez tartozó kiszolgáló nem ismerhető fel"
 
 #: ../src/protocols/novell/nmuser.c:1932
-msgid "Your account has been disabled because too many invalid passwords were entered"
+msgid ""
+"Your account has been disabled because too many invalid passwords were "
+"entered"
 msgstr "A fiókja le lett tiltva, mivel túl sok érvénytelen jelszót adott meg"
 
 #: ../src/protocols/novell/nmuser.c:1935
@@ -8386,7 +8246,9 @@
 msgstr "A felhasználó blokkolta Önt"
 
 #: ../src/protocols/novell/nmuser.c:1954
-msgid "This evaluation version does not allow more than ten users to log in at one time"
+msgid ""
+"This evaluation version does not allow more than ten users to log in at one "
+"time"
 msgstr "Ez a próbaverzió nem engedélyezi tíznél több felhasználó egyidejű belépését"
 
 #: ../src/protocols/novell/nmuser.c:1957
@@ -8406,7 +8268,9 @@
 #: ../src/protocols/novell/novell.c:247
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
-msgstr "Az üzenetet nem lehet elküldeni. A felhasználó részletei nem kérhetőek le (%s)."
+msgstr ""
+"Az üzenetet nem lehet elküldeni. A felhasználó részletei nem kérhetőek le (%"
+"s)."
 
 #: ../src/protocols/novell/novell.c:396
 #, c-format
@@ -8419,8 +8283,7 @@
 msgid "Unable to send message (%s)."
 msgstr "Az ĂĽzenetet nem lehet elkĂĽldeni (%s)."
 
-#: ../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 "Nem lehet meghívni a felhasználót (%s)."
@@ -8428,7 +8291,9 @@
 #: ../src/protocols/novell/novell.c:532
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
-msgstr "Az üzenetet nem lehet elküldeni a következőnek: %s. Nem sikerült létrehozni a konferenciát (%s)."
+msgstr ""
+"Az üzenetet nem lehet elküldeni a következőnek: %s. Nem sikerült létrehozni "
+"a konferenciát (%s)."
 
 #: ../src/protocols/novell/novell.c:537
 #, c-format
@@ -8437,21 +8302,28 @@
 
 #: ../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 "Nem lehet %s felhasználót a(z) %s mappába mozgatni a kiszolgálóoldali listán. Hiba a mappa létrehozása közben (%s)."
+msgid ""
+"Unable to move user %s to folder %s in the server side list. Error while "
+"creating folder (%s)."
+msgstr ""
+"Nem lehet %s felhasználót a(z) %s mappába mozgatni a kiszolgálóoldali "
+"listán. Hiba a mappa létrehozása közben (%s)."
 
 #: ../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 "Nem lehet %s-t felvenni a partnerlistára. Hiba a mappa létrehozása közben a kiszolgálóoldali listában (%s)."
+msgid ""
+"Unable to add %s to your buddy list. Error creating folder in server side "
+"list (%s)."
+msgstr ""
+"Nem lehet %s-t felvenni a partnerlistára. Hiba a mappa létrehozása közben a "
+"kiszolgálóoldali listában (%s)."
 
 #: ../src/protocols/novell/novell.c:705
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Nem sikerült %s felhasználó részleteit lekérni (%s)."
 
-#: ../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 "Nem lehet a felhasználót felvenni a magánszféra-listára (%s)."
@@ -8471,8 +8343,7 @@
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Nem lehet %s-t eltávolítani a magánszféra-listáról (%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 "Nem lehet megváltoztatni a kiszolgálóoldali magánszféra-beállításokat (%s)."
@@ -8482,8 +8353,7 @@
 msgid "Unable to create conference (%s)."
 msgstr "Nem lehet konferenciát létrehozni (%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 "Hiba a kiszolgálóval végzett kommunikációban, a kapcsolat lezárása."
 
@@ -8503,8 +8373,7 @@
 msgid "Mailstop"
 msgstr "PostacĂ­m"
 
-#: ../src/protocols/novell/novell.c:1490
-#: ../src/protocols/oscar/oscar.c:6178
+#: ../src/protocols/novell/novell.c:1490 ../src/protocols/oscar/oscar.c:6178
 #: ../src/protocols/oscar/oscar.c:6185
 msgid "Email Address"
 msgstr "E-mail cĂ­m"
@@ -8583,8 +8452,12 @@
 #.
 #. ...but for now just error out with a nice message.
 #: ../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 "Nem lehet kapcsolódni a kiszolgálóhoz. Kérem adja meg a kiszolgáló címét, amelyikhez kapcsolódni szeretne."
+msgid ""
+"Unable to connect to server. Please enter the address of the server you wish "
+"to connect to."
+msgstr ""
+"Nem lehet kapcsolódni a kiszolgálóhoz. Kérem adja meg a kiszolgáló címét, "
+"amelyikhez kapcsolĂłdni szeretne."
 
 #: ../src/protocols/novell/novell.c:2190
 msgid "Error. SSL support is not installed."
@@ -8604,8 +8477,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/novell/novell.c:3543
-#: ../src/protocols/novell/novell.c:3545
+#: ../src/protocols/novell/novell.c:3543 ../src/protocols/novell/novell.c:3545
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger protokollbővítmény"
 
@@ -8713,10 +8585,13 @@
 msgid "Not while on AOL"
 msgstr "Nem, amĂ­g az AOL-on tartĂłzkodik"
 
-#: ../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 "(Hiba az üzenet fogadása közben. A partner, akihez beszél, valószínűleg hibás klienst használ.)"
+#: ../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 ""
+"(Hiba az üzenet fogadása közben. A partner, akihez beszél, valószínűleg "
+"hibás klienst használ.)"
 
 #: ../src/protocols/oscar/oscar.c:702
 msgid "Voice"
@@ -8726,14 +8601,12 @@
 msgid "AIM Direct IM"
 msgstr "AIM közvetlen azonnali üzenetek"
 
-#: ../src/protocols/oscar/oscar.c:708
-#: ../src/protocols/silc/silc.c:693
+#: ../src/protocols/oscar/oscar.c:708 ../src/protocols/silc/silc.c:693
 #: ../src/protocols/silc/util.c:510
 msgid "Chat"
 msgstr "Csevegés"
 
-#: ../src/protocols/oscar/oscar.c:711
-#: ../src/protocols/oscar/oscar.c:8166
+#: ../src/protocols/oscar/oscar.c:711 ../src/protocols/oscar/oscar.c:8166
 msgid "Get File"
 msgstr "Fájl letöltése"
 
@@ -8805,18 +8678,15 @@
 msgid "Camera"
 msgstr "Fényképezőgép"
 
-#: ../src/protocols/oscar/oscar.c:785
-#: ../src/protocols/oscar/oscar.c:8028
+#: ../src/protocols/oscar/oscar.c:785 ../src/protocols/oscar/oscar.c:8028
 msgid "Free For Chat"
 msgstr "Ráérek csevegni"
 
-#: ../src/protocols/oscar/oscar.c:789
-#: ../src/protocols/oscar/oscar.c:8056
+#: ../src/protocols/oscar/oscar.c:789 ../src/protocols/oscar/oscar.c:8056
 msgid "Not Available"
 msgstr "Nem érhető el"
 
-#: ../src/protocols/oscar/oscar.c:791
-#: ../src/protocols/oscar/oscar.c:8046
+#: ../src/protocols/oscar/oscar.c:791 ../src/protocols/oscar/oscar.c:8046
 msgid "Occupied"
 msgstr "Elfoglalt"
 
@@ -8828,8 +8698,7 @@
 msgid "Online"
 msgstr "Elérhető"
 
-#: ../src/protocols/oscar/oscar.c:876
-#: ../src/protocols/oscar/oscar.c:5253
+#: ../src/protocols/oscar/oscar.c:876 ../src/protocols/oscar/oscar.c:5253
 msgid "Warning Level"
 msgstr "Figyelmeztetési szint"
 
@@ -8851,8 +8720,7 @@
 msgid "Direct Connect failed"
 msgstr "A közvetlen kapcsolat sikertelen"
 
-#: ../src/protocols/oscar/oscar.c:1124
-#: ../src/protocols/oscar/oscar.c:1253
+#: ../src/protocols/oscar/oscar.c:1124 ../src/protocols/oscar/oscar.c:1253
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "A közvetlen kapcsolat létrejött a következővel: %s"
@@ -8860,15 +8728,16 @@
 #: ../src/protocols/oscar/oscar.c:1205
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
-msgstr "Kísérlet kapcsolódásra a következőhöz: %s ezen: %s:%hu közvetlen kapcsolat létrehozására."
+msgstr ""
+"Kísérlet kapcsolódásra a következőhöz: %s ezen: %s:%hu közvetlen kapcsolat "
+"létrehozására."
 
 #: ../src/protocols/oscar/oscar.c:1608
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "%s felkérése, hogy kapcsolódjon hozzánk ezen: %s:%hu közvetlen kapcsolattal."
 
-#: ../src/protocols/oscar/oscar.c:1613
-#: ../src/protocols/oscar/oscar.c:1660
+#: ../src/protocols/oscar/oscar.c:1613 ../src/protocols/oscar/oscar.c:1660
 msgid "Unable to open Direct IM"
 msgstr "Nem lehet megnyitni a közvetlen kapcsolatot"
 
@@ -8878,11 +8747,14 @@
 msgstr "Közvetlen kapcsolat nyitását választotta %s partnerrel."
 
 #: ../src/protocols/oscar/oscar.c:1700
-msgid "Because this reveals your IP address, it may be considered a privacy risk.  Do you wish to continue?"
-msgstr "Ezzel láthatóvá válik a IP címe, ami veszélyeztetheti a magánszférája biztonságát. Folytatni kívánja?"
-
-#: ../src/protocols/oscar/oscar.c:1704
-#: ../src/protocols/oscar/oscar.c:4564
+msgid ""
+"Because this reveals your IP address, it may be considered a privacy risk.  "
+"Do you wish to continue?"
+msgstr ""
+"Ezzel láthatóvá válik a IP címe, ami veszélyeztetheti a magánszférája "
+"biztonságát. Folytatni kívánja?"
+
+#: ../src/protocols/oscar/oscar.c:1704 ../src/protocols/oscar/oscar.c:4564
 msgid "_Connect"
 msgstr "Kapcs_olódás"
 
@@ -8901,15 +8773,20 @@
 
 #: ../src/protocols/oscar/oscar.c:1893
 #, 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 "Nem lehet belépni: Sikertelen a belépés %s néven, mert a felhasználónév érvénytelen. A felhasználónévnek vagy betűvel kell kezdődnie és betűket, számokat, szóközöket tartalmazhat, vagy csak számokat tartalmazhat."
+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 ""
+"Nem lehet belépni: Sikertelen a belépés %s néven, mert a felhasználónév "
+"érvénytelen. A felhasználónévnek vagy betűvel kell kezdődnie és betűket, "
+"számokat, szóközöket tartalmazhat, vagy csak számokat tartalmazhat."
 
 #: ../src/protocols/oscar/oscar.c:1921
 msgid "Unable to login to AIM"
 msgstr "Nem sikerĂĽlt az AIM-re bejelentkezni"
 
-#: ../src/protocols/oscar/oscar.c:2024
-#: ../src/protocols/oscar/oscar.c:3016
+#: ../src/protocols/oscar/oscar.c:2024 ../src/protocols/oscar/oscar.c:3016
 msgid "Could Not Connect"
 msgstr "Nem sikerĂĽlt kapcsolĂłdni"
 
@@ -8936,10 +8813,11 @@
 #, c-format
 msgid ""
 "Transfer of file %s timed out.\n"
-" Try enabling proxy servers for file transfers in Accounts->%s->Edit Account->Advanced."
-msgstr ""
-"%s fájl átvitele túllépte az időkorlátot.\n"
-" Próbálja meg engedélyezni a proxy kiszolgálókat a fájlátvitelekhez a Fiókok->%s->Fiók szerkesztése->Haladó alatt."
+" Try enabling proxy servers for file transfers in Accounts->%s->Edit Account-"
+">Advanced."
+msgstr ""
+"A(z) %s fájl átvitele túllépte az időkorlátot.\n"
+" Próbálja engedélyezni a proxykiszolgálókat a fájlátvitelekhez a Fiókok -> %s -> Fiók szerkesztése -> Haladó pont alatt."
 
 #: ../src/protocols/oscar/oscar.c:2338
 #: ../src/protocols/yahoo/yahoo_filexfer.c:253
@@ -8952,19 +8830,18 @@
 msgid "Unable to create new connection."
 msgstr "Nem lehet új kapcsolatot létrehozni."
 
-#: ../src/protocols/oscar/oscar.c:2581
-#: ../src/protocols/oscar/oscar.c:2590
-#: ../src/protocols/oscar/oscar.c:2604
-#: ../src/protocols/oscar/oscar.c:2614
+#: ../src/protocols/oscar/oscar.c:2581 ../src/protocols/oscar/oscar.c:2590
+#: ../src/protocols/oscar/oscar.c:2604 ../src/protocols/oscar/oscar.c:2614
 msgid "Unable to log into file transfer proxy."
 msgstr "Nem lehet bejelentkezni a fájlátviteli proxyra."
 
 #: ../src/protocols/oscar/oscar.c:2668
 msgid "Unable to establish listener socket or no AOL proxy connection present."
-msgstr "Nem lehet létrehozni a figyelő foglalatot, vagy nincs jelen AOL proxykapcsolat."
-
-#: ../src/protocols/oscar/oscar.c:2906
-#: ../src/protocols/toc/toc.c:543
+msgstr ""
+"Nem lehet létrehozni a figyelő foglalatot, vagy nincs jelen AOL "
+"proxykapcsolat."
+
+#: ../src/protocols/oscar/oscar.c:2906 ../src/protocols/toc/toc.c:543
 msgid "Incorrect nickname or password."
 msgstr "Hibás becenév vagy jelszó."
 
@@ -8978,13 +8855,19 @@
 msgstr "Az AOL azonnali üzenő szolgáltatás átmenetileg nem érhető el."
 
 #: ../src/protocols/oscar/oscar.c:2920
-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 "Ön túl gyakran jelentkezik ki/be. Várjon tíz percet és próbálja meg újra. Ha tovább folytatja, még többet kell majd várnia."
+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 ""
+"Ön túl gyakran jelentkezik ki/be. Várjon tíz percet és próbálja meg újra. Ha "
+"tovább folytatja, még többet kell majd várnia."
 
 #: ../src/protocols/oscar/oscar.c:2925
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "Az ügyfél program verziója túl régi. Kérem töltse le a frissítést a következő helyről: %s"
+msgstr ""
+"Az ügyfél program verziója túl régi. Kérem töltse le a frissítést a "
+"következő helyről: %s"
 
 #: ../src/protocols/oscar/oscar.c:2953
 msgid "Internal Error"
@@ -9006,15 +8889,17 @@
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Írja be a hatjegyű számot a digitális képernyőről."
 
-#: ../src/protocols/oscar/oscar.c:3102
-#: ../src/protocols/oscar/oscar.c:3132
+#: ../src/protocols/oscar/oscar.c:3102 ../src/protocols/oscar/oscar.c:3132
 #: ../src/protocols/oscar/oscar.c:3223
 #, c-format
-msgid "You may be disconnected shortly.  You may want to use TOC until this is fixed.  Check %s for updates."
-msgstr "Hamarosan megszakad a kapcsolat. A helyreállításig használja a TOC-ot. Frissítésekért keresse fel a következő címet: %s."
-
-#: ../src/protocols/oscar/oscar.c:3105
-#: ../src/protocols/oscar/oscar.c:3135
+msgid ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check %s for updates."
+msgstr ""
+"Hamarosan megszakad a kapcsolat. A helyreállításig használja a TOC-ot. "
+"Frissítésekért keresse fel a következő címet: %s."
+
+#: ../src/protocols/oscar/oscar.c:3105 ../src/protocols/oscar/oscar.c:3135
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "A Gaim nem tudott lekérni egy érvényes AIM belépő hasht."
 
@@ -9032,8 +8917,14 @@
 msgstr "%s felkérte a közvetlen kapcsolatra a következőhöz: %s"
 
 #: ../src/protocols/oscar/oscar.c:4558
-msgid "This requires a direct connection between the two computers and is necessary for IM Images.  Because your IP address will be revealed, this may be considered a privacy risk."
-msgstr "Ez közvetlen kapcsolatot igényel a két számítógép között és szükséges az IM képekhez. Ezzel láthatóvá válik az IP címe, ami veszélyeztetheti a magánszférája biztonságát."
+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 ""
+"Ez közvetlen kapcsolatot igényel a két számítógép között és szükséges az IM "
+"képekhez. Ezzel láthatóvá válik az IP címe, ami veszélyeztetheti a "
+"magánszférája biztonságát."
 
 #: ../src/protocols/oscar/oscar.c:4597
 msgid "Please authorize me so I can add you to my buddy list."
@@ -9049,8 +8940,12 @@
 
 #: ../src/protocols/oscar/oscar.c:4636
 #, c-format
-msgid "The user %s requires authorization before being added to a buddy list.  Do you want to send an authorization request?"
-msgstr "%s engedélye szükséges a listára történő felvételéhez. Akar küldeni egy engedélyezési kérelmet?"
+msgid ""
+"The user %s requires authorization before being added to a buddy list.  Do "
+"you want to send an authorization request?"
+msgstr ""
+"%s engedélye szükséges a listára történő felvételéhez. Akar küldeni egy "
+"engedélyezési kérelmet?"
 
 #: ../src/protocols/oscar/oscar.c:4641
 msgid "Request Authorization"
@@ -9060,12 +8955,9 @@
 msgid "_Request Authorization"
 msgstr "_Engedélyezés kérése"
 
-#: ../src/protocols/oscar/oscar.c:4681
-#: ../src/protocols/oscar/oscar.c:4687
-#: ../src/protocols/oscar/oscar.c:4791
-#: ../src/protocols/oscar/oscar.c:4815
-#: ../src/protocols/oscar/oscar.c:7462
-#: ../src/protocols/oscar/oscar.c:7514
+#: ../src/protocols/oscar/oscar.c:4681 ../src/protocols/oscar/oscar.c:4687
+#: ../src/protocols/oscar/oscar.c:4791 ../src/protocols/oscar/oscar.c:4815
+#: ../src/protocols/oscar/oscar.c:7462 ../src/protocols/oscar/oscar.c:7514
 msgid "No reason given."
 msgstr "Nincs ok megadva."
 
@@ -9079,21 +8971,23 @@
 "The user %u wants to add %s to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"%u felhasználó szeretné a partnerei közé felvenni %s-t a következő indoklással:\n"
+"%u felhasználó szeretné a partnerei közé felvenni %s-t a következő "
+"indoklással:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4803
-#: ../src/protocols/oscar/oscar.c:7474
+#: ../src/protocols/oscar/oscar.c:4803 ../src/protocols/oscar/oscar.c:7474
 msgid "Authorization Request"
 msgstr "Engedélyezési kérelem"
 
 #: ../src/protocols/oscar/oscar.c:4815
 #, c-format
 msgid ""
-"The user %u has denied your request to add them to your buddy list for the following reason:\n"
+"The user %u has denied your request to add them to your buddy list for the "
+"following reason:\n"
 "%s"
 msgstr ""
-"%u felhasználó elutasította a kérését, hogy felvehesse a partnerlistájára, a következő indoklással:\n"
+"%u felhasználó elutasította a kérését, hogy felvehesse a partnerlistájára, a "
+"következő indoklással:\n"
 "%s"
 
 #: ../src/protocols/oscar/oscar.c:4816
@@ -9163,39 +9057,50 @@
 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] "Nem kapott meg %hu üzenetet a következőtől: %s, mert az érvénytelen volt."
-msgstr[1] "Nem kapott meg %hu üzenetet a következőtől: %s, mert azok érvénytelenek voltak."
+msgstr[1] "Nem kapott meg %hu üzenetet a következőtől: %s, mert az érvénytelen volt."
 
 #: ../src/protocols/oscar/oscar.c:4971
 #, 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] "Nem kapott meg %hu üzenetet a következőtől: %s, mert az túl nagy volt."
-msgstr[1] "Nem kapott meg %hu üzenetet a következőtől: %s, mert azok túl nagyok voltak."
+msgstr[1] "Nem kapott meg %hu üzenetet a következőtől: %s, mert az túl nagy volt."
 
 # #: ../src/protocols/oscar/oscar.c:1605
 # #, c-format
 # msgid "You missed %d message from %s because the rate limit has been exceeded."
-# msgstr "Néhány %d üzenet nem érkezett meg mivel a korlátot meghaladta."
 #: ../src/protocols/oscar/oscar.c:4980
 #, 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."
-msgstr[0] "Nem kapott meg %hu üzenetet a következőtől: %s, mert túllépte a küldés gyakoriságának a korlátját."
-msgstr[1] "Nem kapott meg %hu üzenetet a következőtől: %s, mert túllépte a küldés gyakoriságának a korlátját."
+msgstr[0] ""
+"Nem kapott meg %hu üzenetet a következőtől: %s, mert túllépte a küldés "
+"gyakoriságának a korlátját."
+msgstr[1] ""
+"Nem kapott meg %hu üzenetet a következőtől: %s, mert túllépte a küldés "
+"gyakoriságának a korlátját."
 
 #: ../src/protocols/oscar/oscar.c:4989
 #, 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] "Nem kapott meg %hu üzenetet a következőtől: %s, mert a feladó túl rosszindulatú volt."
-msgstr[1] "Nem kapott meg %hu üzenetet a következőtől: %s, mert a feladó túl rosszindulatú volt."
+msgstr[0] ""
+"Nem kapott meg %hu üzenetet a következőtől: %s, mert a feladó túl "
+"rosszindulatĂş volt."
+msgstr[1] ""
+"Nem kapott meg %hu üzenetet a következőtől: %s, mert a feladó túl "
+"rosszindulatĂş volt."
 
 #: ../src/protocols/oscar/oscar.c:4998
 #, 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] "Nem kapott meg %hu üzenetet a következőtől: %s, mert Ön túl rosszindulatú volt."
-msgstr[1] "Nem kapott meg %hu üzenetet a következőtől: %s, mert Ön túl rosszindulatú volt."
+msgstr[0] ""
+"Nem kapott meg %hu üzenetet a következőtől: %s, mert Ön túl rosszindulatú "
+"volt."
+msgstr[1] ""
+"Nem kapott meg %hu üzenetet a következőtől: %s, mert Ön túl rosszindulatú "
+"volt."
 
 #: ../src/protocols/oscar/oscar.c:5007
 #, c-format
@@ -9220,10 +9125,8 @@
 msgid "Unable to send message: %s"
 msgstr "Az ĂĽzenetet nem lehet elkĂĽldeni: %s"
 
-#: ../src/protocols/oscar/oscar.c:5164
-#: ../src/protocols/oscar/oscar.c:5169
-#: ../src/protocols/oscar/oscar.c:5227
-#: ../src/protocols/oscar/oscar.c:5231
+#: ../src/protocols/oscar/oscar.c:5164 ../src/protocols/oscar/oscar.c:5169
+#: ../src/protocols/oscar/oscar.c:5227 ../src/protocols/oscar/oscar.c:5231
 msgid "Unknown reason."
 msgstr "Ismeretlen ok."
 
@@ -9266,23 +9169,30 @@
 
 #. The conversion failed!
 #: ../src/protocols/oscar/oscar.c:5588
-msgid "[Unable to display a message from this user because it contained invalid characters.]"
-msgstr "[Nem lehet megjeleníteni az üzenetet ettől a felhasználótól, mert az érvénytelen karaktereket tartalmazott.]"
+msgid ""
+"[Unable to display a message from this user because it contained invalid "
+"characters.]"
+msgstr ""
+"[Nem lehet megjeleníteni az üzenetet ettől a felhasználótól, mert az "
+"érvénytelen karaktereket tartalmazott.]"
 
 #: ../src/protocols/oscar/oscar.c:5809
 msgid "Rate limiting error."
 msgstr "Sebességkorlátozási hiba."
 
 #: ../src/protocols/oscar/oscar.c:5810
-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 "Az utolsó művelet nem hajtható végre, mert a túllépte a sebességkorlátot. Kérem várjon 10 másodpercet és próbálja meg újra."
+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 ""
+"Az utolsó művelet nem hajtható végre, mert a túllépte a sebességkorlátot. "
+"Kérem várjon 10 másodpercet és próbálja meg újra."
 
 #: ../src/protocols/oscar/oscar.c:5883
 msgid "You have been signed off for an unknown reason."
 msgstr "Ismeretlen okbĂłl ki lett jelentkeztetve."
 
-#: ../src/protocols/oscar/oscar.c:5896
-#: ../src/protocols/toc/toc.c:971
+#: ../src/protocols/oscar/oscar.c:5896 ../src/protocols/toc/toc.c:971
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Kilépett a(z) %s csevegőszobából."
@@ -9292,8 +9202,7 @@
 msgid "Finalizing connection"
 msgstr "Kapcsolódás befejezése"
 
-#: ../src/protocols/oscar/oscar.c:6190
-#: ../src/protocols/silc/util.c:542
+#: ../src/protocols/oscar/oscar.c:6190 ../src/protocols/silc/util.c:542
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
@@ -9309,8 +9218,7 @@
 msgid "Home Address"
 msgstr "Otthoni cĂ­m"
 
-#: ../src/protocols/oscar/oscar.c:6220
-#: ../src/protocols/oscar/oscar.c:6228
+#: ../src/protocols/oscar/oscar.c:6220 ../src/protocols/oscar/oscar.c:6228
 msgid "Zip Code"
 msgstr "Irányítószám"
 
@@ -9347,7 +9255,7 @@
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "A következő felhasználónév a következőhöz van rendelve: %s"
-msgstr[1] "A következő felhasználónevek a következőhöz vannak rendelve: %s"
+msgstr[1] "A következő felhasználónév a következőhöz van rendelve: %s"
 
 #: ../src/protocols/oscar/oscar.c:6366
 #, c-format
@@ -9369,33 +9277,55 @@
 
 #: ../src/protocols/oscar/oscar.c:6423
 #, c-format
-msgid "Error 0x%04x: Unable to format screen name because the requested screen name differs from the original."
-msgstr "Hiba 0x%04x: Nem sikerült a felhasználóazonosítót megformázni, mert a kért felhasználóazonosító eltér az eredetitől."
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"differs from the original."
+msgstr ""
+"Hiba 0x%04x: Nem sikerült a felhasználóazonosítót megformázni, mert a kért "
+"felhasználóazonosító eltér az eredetitől."
 
 #: ../src/protocols/oscar/oscar.c:6426
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
-msgstr "Hiba 0x%04x: Nem sikerült a felhasználónevet megformázni, mivel az érvénytelen."
+msgstr ""
+"Hiba 0x%04x: Nem sikerült a felhasználónevet megformázni, mivel az "
+"érvénytelen."
 
 #: ../src/protocols/oscar/oscar.c:6429
 #, c-format
-msgid "Error 0x%04x: Unable to format screen name because the requested screen name is too long."
-msgstr "Hiba 0x%04x: Nem sikerült a felhasználóazonosítót megformázni, mert a kért felhasználóazonosító túl hosszú."
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"is too long."
+msgstr ""
+"Hiba 0x%04x: Nem sikerült a felhasználóazonosítót megformázni, mert a kért "
+"felhasználóazonosító túl hosszú."
 
 #: ../src/protocols/oscar/oscar.c:6432
 #, c-format
-msgid "Error 0x%04x: Unable to change e-mail address because there is already a request pending for this screen name."
-msgstr "Hiba 0x%04x: Nem sikerült a fiók azonosítót megformázni, mert egy kérés már függőben van erre a felhasználóazonosítóra."
+msgid ""
+"Error 0x%04x: Unable to change e-mail address because there is already a "
+"request pending for this screen name."
+msgstr ""
+"Hiba 0x%04x: Nem sikerült a fiók azonosítót megformázni, mert egy kérés már "
+"függőben van erre a felhasználóazonosítóra."
 
 #: ../src/protocols/oscar/oscar.c:6435
 #, c-format
-msgid "Error 0x%04x: Unable to change e-mail address because the given address has too many screen names associated with it."
-msgstr "Hiba 0x%04x: Nem sikerült megváltoztatni az e-mail címet, mert a megadott cím túl sok felhasználóazonosítóval van társítva."
+msgid ""
+"Error 0x%04x: Unable to change e-mail address because the given address has "
+"too many screen names associated with it."
+msgstr ""
+"Hiba 0x%04x: Nem sikerült megváltoztatni az e-mail címet, mert a megadott "
+"cím túl sok felhasználóazonosítóval van társítva."
 
 #: ../src/protocols/oscar/oscar.c:6438
 #, c-format
-msgid "Error 0x%04x: Unable to change e-mail address because the given address is invalid."
-msgstr "Hiba 0x%04x: Nem sikerült megváltoztatni az e-mail címet, mert a megadott cím érvénytelen."
+msgid ""
+"Error 0x%04x: Unable to change e-mail address because the given address is "
+"invalid."
+msgstr ""
+"Hiba 0x%04x: Nem sikerült megváltoztatni az e-mail címet, mert a megadott "
+"cím érvénytelen."
 
 #: ../src/protocols/oscar/oscar.c:6441
 #, c-format
@@ -9411,8 +9341,7 @@
 "A felhasználóazonosítója a következőképpen van formázva:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:6452
-#: ../src/protocols/oscar/oscar.c:6459
+#: ../src/protocols/oscar/oscar.c:6452 ../src/protocols/oscar/oscar.c:6459
 msgid "Account Info"
 msgstr "Fiókinformációk"
 
@@ -9423,22 +9352,34 @@
 
 #: ../src/protocols/oscar/oscar.c:6535
 msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
-msgstr "Az Ön IM képe nem lett elküldve. IM képek küldéséhez közvetlen kapcsolatban kell lennie."
+msgstr ""
+"Az Ön IM képe nem lett elküldve. IM képek küldéséhez közvetlen kapcsolatban "
+"kell lennie."
 
 #: ../src/protocols/oscar/oscar.c:6775
 msgid "Unable to set AIM profile."
 msgstr "Nem lehet beállítani az AIM profilt."
 
 #: ../src/protocols/oscar/oscar.c:6776
-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 "Valószínűleg a bejelentkezési folyamat vége előtt előtt próbálta meg beállítani a profilt. Próbálja újra beállítani, ha a bejelentkezés már megtörtént."
+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 ""
+"Valószínűleg a bejelentkezési folyamat vége előtt előtt próbálta meg "
+"beállítani a profilt. Próbálja újra beállítani, ha a bejelentkezés már "
+"megtörtént."
 
 #: ../src/protocols/oscar/oscar.c:6790
 #, 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."
-msgstr[0] "A profil méret túllépte a maximális %d bájtot. A Gaim csonkította."
-msgstr[1] "A profil méret túllépte a maximális %d bájtot. A Gaim csonkította."
+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."
+msgstr[0] "A profil mérete túllépte a maximális %d bájtot. A Gaim csonkította."
+msgstr[1] "A profil mérete túllépte a maximális %d bájtot. A Gaim csonkította."
 
 #: ../src/protocols/oscar/oscar.c:6795
 msgid "Profile too long."
@@ -9446,8 +9387,12 @@
 
 #: ../src/protocols/oscar/oscar.c:6837
 #, 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."
+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."
 msgstr[0] "A távollét üzenet hossza túllépte a maximális %d bájtot. A Gaim csonkította."
 msgstr[1] "A távollét üzenet hossza túllépte a maximális %d bájtot. A Gaim csonkította."
 
@@ -9457,11 +9402,16 @@
 
 #: ../src/protocols/oscar/oscar.c:6911
 #, 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 "Nem sikerült %s partner hozzáadása, mert a felhasználónév érvénytelen. A felhasználóneveknek vagy betűvel kell kezdődniük, és betűket, számokat és szóközöket tartalmazhatnak, vagy csak számokból állhatnak."
-
-#: ../src/protocols/oscar/oscar.c:6913
-#: ../src/protocols/oscar/oscar.c:7320
+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 ""
+"Nem sikerült %s partner hozzáadása, mert a felhasználónév érvénytelen. A "
+"felhasználóneveknek vagy betűvel kell kezdődniük, és betűket, számokat és "
+"szóközöket tartalmazhatnak, vagy csak számokból állhatnak."
+
+#: ../src/protocols/oscar/oscar.c:6913 ../src/protocols/oscar/oscar.c:7320
 #: ../src/protocols/oscar/oscar.c:7334
 msgid "Unable To Add"
 msgstr "Nem sikerĂĽlt felvenni"
@@ -9471,37 +9421,52 @@
 msgstr "Nem lehet lekérni a partnerek listáját"
 
 #: ../src/protocols/oscar/oscar.c:7021
-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 "A Gaim ideiglenesen nem tudta a partnerek listáját lekérni az AIM kiszolgálóról. A partnerlistája nem veszett el, és néhány órán belül valószínűleg elérhetővé válik."
-
-#: ../src/protocols/oscar/oscar.c:7218
-#: ../src/protocols/oscar/oscar.c:7219
-#: ../src/protocols/oscar/oscar.c:7224
-#: ../src/protocols/oscar/oscar.c:7378
-#: ../src/protocols/oscar/oscar.c:7379
-#: ../src/protocols/oscar/oscar.c:7384
+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 ""
+"A Gaim ideiglenesen nem tudta a partnerek listáját lekérni az AIM "
+"kiszolgálóról. A partnerlistája nem veszett el, és néhány órán belül "
+"valószínűleg elérhetővé válik."
+
+#: ../src/protocols/oscar/oscar.c:7218 ../src/protocols/oscar/oscar.c:7219
+#: ../src/protocols/oscar/oscar.c:7224 ../src/protocols/oscar/oscar.c:7378
+#: ../src/protocols/oscar/oscar.c:7379 ../src/protocols/oscar/oscar.c:7384
 msgid "Orphans"
 msgstr "Ărvák"
 
 #: ../src/protocols/oscar/oscar.c:7318
 #, 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 "%s partnert nem lehet felvenni, mert túl sok partner van a partnerlistáján. Kérem töröljön egyet közülük és próbálja meg újra."
-
-#: ../src/protocols/oscar/oscar.c:7318
-#: ../src/protocols/oscar/oscar.c:7332
+msgid ""
+"Could not add the buddy %s because you have too many buddies in your buddy "
+"list.  Please remove one and try again."
+msgstr ""
+"%s partnert nem lehet felvenni, mert túl sok partner van a partnerlistáján. "
+"Kérem töröljön egyet közülük és próbálja meg újra."
+
+#: ../src/protocols/oscar/oscar.c:7318 ../src/protocols/oscar/oscar.c:7332
 msgid "(no name)"
 msgstr "(nincs név)"
 
 #: ../src/protocols/oscar/oscar.c:7332
 #, 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 "Ismeretlen ok miatt nem sikerült %s partnert felvenni. A leggyakoribb ok, hogy a partnerlistája elérte a maximálisan felvehető partnerek számát."
+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 ""
+"Ismeretlen ok miatt nem sikerĂĽlt %s partnert felvenni. A leggyakoribb ok, "
+"hogy a partnerlistája elérte a maximálisan felvehető partnerek számát."
 
 #: ../src/protocols/oscar/oscar.c:7415
 #, c-format
-msgid "The user %s has given you permission to add you to their buddy list.  Do you want to add them?"
-msgstr "%s felhasználó megadta az engedélyt, hogy felvegye őt a partnerei közé. Fel akarja venni őt?"
+msgid ""
+"The user %s has given you permission to add you to their buddy list.  Do you "
+"want to add them?"
+msgstr ""
+"%s felhasználó megadta az engedélyt, hogy felvegye őt a partnerei közé. Fel "
+"akarja venni Ĺ‘t?"
 
 #: ../src/protocols/oscar/oscar.c:7421
 msgid "Authorization Given"
@@ -9513,7 +9478,8 @@
 "The user %s wants to add %s to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"%s felhasználó szeretné felvenni %s-t a partnerei közé a következő indoklással:\n"
+"%s felhasználó szeretné felvenni %s-t a partnerei közé a következő "
+"indoklással:\n"
 "%s"
 
 #. Granted
@@ -9530,18 +9496,19 @@
 #: ../src/protocols/oscar/oscar.c:7514
 #, c-format
 msgid ""
-"The user %s has denied your request to add them to your buddy list for the following reason:\n"
+"The user %s has denied your request to add them to your buddy list for the "
+"following reason:\n"
 "%s"
 msgstr ""
-"%s felhasználó elutasította a kérését, hogy felvehesse a partnerlistájára, a következő indoklással:\n"
+"%s felhasználó elutasította a kérését, hogy felvehesse a partnerlistájára, a "
+"következő indoklással:\n"
 "%s"
 
 #: ../src/protocols/oscar/oscar.c:7515
 msgid "Authorization Denied"
 msgstr "Engedély elutasítva"
 
-#: ../src/protocols/oscar/oscar.c:7552
-#: ../src/protocols/toc/toc.c:1372
+#: ../src/protocols/oscar/oscar.c:7552 ../src/protocols/toc/toc.c:1372
 msgid "_Exchange:"
 msgstr "_Váltás:"
 
@@ -9555,7 +9522,7 @@
 
 #: ../src/protocols/oscar/oscar.c:7813
 msgid "<i>(retrieving)</i>"
-msgstr " <i>(lekérés)</i>"
+msgstr "<i>(lekérés)</i>"
 
 #: ../src/protocols/oscar/oscar.c:8119
 #, c-format
@@ -9600,7 +9567,9 @@
 
 #: ../src/protocols/oscar/oscar.c:8261
 msgid "Screen name formatting can change only capitalization and whitespace."
-msgstr "A felhasználónév formázása csak a kis/nagybetűsséget és az üreshely karaktereket változtathatja meg."
+msgstr ""
+"A felhasználónév formázása csak a kis/nagybetűsséget és az üreshely "
+"karaktereket változtathatja meg."
 
 #: ../src/protocols/oscar/oscar.c:8268
 msgid "New screen name formatting:"
@@ -9619,8 +9588,12 @@
 msgstr "A következő partnerektől vár engedélyezésre"
 
 #: ../src/protocols/oscar/oscar.c:8369
-msgid "You can re-request authorization from these buddies by right-clicking on them and selecting \"Re-request Authorization.\""
-msgstr "Újra kérheti engedélyezést ezektől a partnerektől a jobb egérgombbal kattintva a nevükön, és az \"Engedélyezés újra kérése\" választásával"
+msgid ""
+"You can re-request authorization from these buddies by right-clicking on "
+"them and selecting \"Re-request Authorization.\""
+msgstr ""
+"Újra kérheti engedélyezést ezektől a partnerektől a jobb egérgombbal "
+"kattintva a nevükön, és az \"Engedélyezés újra kérése\" választásával"
 
 #: ../src/protocols/oscar/oscar.c:8386
 msgid "Find Buddy by E-Mail"
@@ -9690,8 +9663,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/oscar/oscar.c:8721
-#: ../src/protocols/oscar/oscar.c:8723
+#: ../src/protocols/oscar/oscar.c:8721 ../src/protocols/oscar/oscar.c:8723
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ protokollbővítmény"
 
@@ -9703,8 +9675,7 @@
 msgid "Auth port"
 msgstr "Hitelesítési port"
 
-#: ../src/protocols/oscar/oscar.c:8748
-#: ../src/protocols/zephyr/zephyr.c:2900
+#: ../src/protocols/oscar/oscar.c:8748 ../src/protocols/zephyr/zephyr.c:2900
 msgid "Encoding"
 msgstr "Kódolás"
 
@@ -9786,7 +9757,9 @@
 #: ../src/protocols/sametime/sametime.c:1605
 #, c-format
 msgid "A Sametime administrator has issued the following announcement on server %s"
-msgstr "Egy Sametime adminisztrátor a következő bejelentést adta ki a(z) %s kiszolgálón"
+msgstr ""
+"Egy Sametime adminisztrátor a következő bejelentést adta ki a(z) %s "
+"kiszolgálón"
 
 #: ../src/protocols/sametime/sametime.c:1610
 msgid "Sametime Administrator Announcement"
@@ -9863,8 +9836,12 @@
 
 #: ../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 "Adja meg az új konferencia témáját és a(z) %s számára elküldendő meghívóüzenetet."
+msgid ""
+"Please enter a topic for the new conference, and an invitation message to be "
+"sent to %s"
+msgstr ""
+"Adja meg az új konferencia témáját és a(z) %s számára elküldendő "
+"meghívóüzenetet."
 
 #: ../src/protocols/sametime/sametime.c:3373
 msgid "New Conference"
@@ -9888,8 +9865,14 @@
 
 #: ../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 "Válasszon egy konferenciát az alábbi listából, amelyre meghívót küld %s felhasználónak. Válassza az \"Új konferencia létrehozása\" gombot, ha új konferenciát kíván létrehozni, amelyre meghívja a felhasználót."
+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 ""
+"Válasszon egy konferenciát az alábbi listából, amelyre meghívót küld %s "
+"felhasználónak. Válassza az \"Új konferencia létrehozása\" gombot, ha új "
+"konferenciát kíván létrehozni, amelyre meghívja a felhasználót."
 
 #: ../src/protocols/sametime/sametime.c:3458
 msgid "Invite to Conference"
@@ -9913,8 +9896,12 @@
 
 #: ../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 "Nincs gép vagy IP cím megadva a(z) %s Meanwhile fiókhoz. A bejelentkezés folytatásához adjon meg egyet alább."
+msgid ""
+"No host or IP address has been configured for the Meanwhile account %s. "
+"Please enter one below to continue logging in."
+msgstr ""
+"Nincs gép vagy IP cím megadva a(z) %s Meanwhile fiókhoz. A bejelentkezés "
+"folytatásához adjon meg egyet alább."
 
 #: ../src/protocols/sametime/sametime.c:3627
 msgid "Meanwhile Connection Setup"
@@ -9973,8 +9960,12 @@
 
 #: ../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 "A(z) %s azonosító az alábbi felhasználók bármelyikére hivatkozhat. Válassza ki a partnerlistához adandó megfelelő felhasználót az alábbi listából."
+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 ""
+"A(z) %s azonosító az alábbi felhasználók bármelyikére hivatkozhat. Válassza "
+"ki a partnerlistához adandó megfelelő felhasználót az alábbi listából."
 
 #: ../src/protocols/sametime/sametime.c:4297
 msgid "Select User"
@@ -9986,8 +9977,12 @@
 
 #: ../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 "A(z) \"%s\" azonosító nem található meg a Sametime közösségben. Ez a bejegyzés eltávolításra került a partnerlistájából."
+msgid ""
+"The identifier '%s' did not match any users in your Sametime community. This "
+"entry has been removed from your buddy list."
+msgstr ""
+"A(z) \"%s\" azonosító nem található meg a Sametime közösségben. Ez a "
+"bejegyzés eltávolításra került a partnerlistájából."
 
 #: ../src/protocols/sametime/sametime.c:4374
 msgid "Unable to add user"
@@ -10060,8 +10055,14 @@
 
 #: ../src/protocols/sametime/sametime.c:5312
 #, 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 "A(z) \"%s\" azonosító az alábbi Notes címjegyzék-csoportok bármelyikére hivatkozhat. Válassza ki a partnerlistához adandó megfelelő csoportot az alábbi listából."
+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 ""
+"A(z) \"%s\" azonosító az alábbi Notes címjegyzék-csoportok bármelyikére "
+"hivatkozhat. Válassza ki a partnerlistához adandó megfelelő csoportot az "
+"alábbi listából."
 
 #: ../src/protocols/sametime/sametime.c:5317
 msgid "Select Notes Address Book"
@@ -10073,16 +10074,24 @@
 
 #: ../src/protocols/sametime/sametime.c:5361
 #, c-format
-msgid "The identifier '%s' did not match any Notes Address Book groups in your Sametime community."
-msgstr "A(z) \"%s\" azonosító a Sametime közösség egyetlen Notes címjegyzékcsoportjának sem felelt meg."
+msgid ""
+"The identifier '%s' did not match any Notes Address Book groups in your "
+"Sametime community."
+msgstr ""
+"A(z) \"%s\" azonosító a Sametime közösség egyetlen Notes "
+"címjegyzékcsoportjának sem felelt meg."
 
 #: ../src/protocols/sametime/sametime.c:5402
 msgid "Notes Address Book Group"
 msgstr "Notes címjegyzékcsoport"
 
 #: ../src/protocols/sametime/sametime.c:5403
-msgid "Enter the name of a Notes Address Book group in the field below to add the group and its members to your buddy list."
-msgstr "Az alábbi mezőben adja meg a Notes címjegyzékcsoport nevét, amelyet tagjaival együtt fel kíván venni a partnerlistájára."
+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 ""
+"Az alábbi mezőben adja meg a Notes címjegyzékcsoport nevét, amelyet "
+"tagjaival együtt fel kíván venni a partnerlistájára."
 
 #: ../src/protocols/sametime/sametime.c:5451
 #, c-format
@@ -10091,8 +10100,14 @@
 
 #: ../src/protocols/sametime/sametime.c:5452
 #, 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 "A(z) %s azonosító az alábbi felhasználók bármelyikére hivatkozhat. Felveheti partnerlistájára ezeket felhasználókat, vagy üzeneteket küldhet nekik az alábbi műveletgombokkal."
+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 ""
+"A(z) %s azonosító az alábbi felhasználók bármelyikére hivatkozhat. Felveheti "
+"partnerlistájára ezeket felhasználókat, vagy üzeneteket küldhet nekik az "
+"alábbi műveletgombokkal."
 
 #: ../src/protocols/sametime/sametime.c:5484
 msgid "No matches"
@@ -10101,7 +10116,9 @@
 #: ../src/protocols/sametime/sametime.c:5485
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
-msgstr "Nem található a(z) \"%s\" azonosítónak megfelelő felhasználó a Sametime közösségben."
+msgstr ""
+"Nem található a(z) \"%s\" azonosítónak megfelelő felhasználó a Sametime "
+"közösségben."
 
 #: ../src/protocols/sametime/sametime.c:5489
 msgid "No Matches"
@@ -10112,8 +10129,12 @@
 msgstr "Felhasználó keresése"
 
 #: ../src/protocols/sametime/sametime.c:5527
-msgid "Enter a name or partial ID in the field below to search for matching users in your Sametime community."
-msgstr "Az alábbi mezőben adjon meg egy nevet vagy részleges azonosítót, amelyhez felhasználókat keres a Sametime közösségben."
+msgid ""
+"Enter a name or partial ID in the field below to search for matching users "
+"in your Sametime community."
+msgstr ""
+"Az alábbi mezőben adjon meg egy nevet vagy részleges azonosítót, amelyhez "
+"felhasználókat keres a Sametime közösségben."
 
 #: ../src/protocols/sametime/sametime.c:5530
 msgid "User Search"
@@ -10144,23 +10165,17 @@
 msgid "Hide client identity"
 msgstr "Ügyfél azonosságának elrejtése"
 
-#: ../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/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 "%s felhasználó nincs jelen a hálózatban"
 
-#: ../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 "Kulcscsere"
 
@@ -10192,16 +10207,19 @@
 msgid "Key agreement cannot be started with yourself"
 msgstr "Nem indíthat kulcscserét önmagával"
 
-#: ../src/protocols/silc/buddy.c:258
-#: ../src/protocols/silc/buddy.c:388
+#: ../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 "A távoli felhasználó már nincs jelen a hálózatban"
 
 #: ../src/protocols/silc/buddy.c:294
 #, c-format
-msgid "Key agreement request received from %s. Would you like to perform the key agreement?"
-msgstr "Kulcscsere-kérés érkezett a következőtől: %s. El szeretné végezni a kulcscserét?"
+msgid ""
+"Key agreement request received from %s. Would you like to perform the key "
+"agreement?"
+msgstr ""
+"Kulcscsere-kérés érkezett a következőtől: %s. El szeretné végezni a "
+"kulcscserét?"
 
 #: ../src/protocols/silc/buddy.c:298
 #, c-format
@@ -10218,8 +10236,7 @@
 msgid "Key Agreement Request"
 msgstr "Kulcscsere-kérés"
 
-#: ../src/protocols/silc/buddy.c:387
-#: ../src/protocols/silc/buddy.c:422
+#: ../src/protocols/silc/buddy.c:387 ../src/protocols/silc/buddy.c:422
 #: ../src/protocols/silc/buddy.c:464
 msgid "IM With Password"
 msgstr "Azonnali üzenetváltás jelszóval"
@@ -10232,41 +10249,32 @@
 msgid "Set IM Password"
 msgstr "Azonnaliüzenő-jelszó beállítása"
 
-#: ../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 "Nyilvános kulcs lekérése"
 
-#: ../src/protocols/silc/buddy.c:548
-#: ../src/protocols/silc/ops.c:1493
+#: ../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 "A nyilvános kulcs nem tölthető le"
 
-#: ../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 "Nyilvános kulcs megjelenítése"
 
-#: ../src/protocols/silc/buddy.c:635
-#: ../src/protocols/silc/buddy.c:1030
+#: ../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 "Nem sikerült a nyilvános kulcsot betölteni "
-
-#: ../src/protocols/silc/buddy.c:712
-#: ../src/protocols/silc/ops.c:1087
-#: ../src/protocols/silc/ops.c:1159
-#: ../src/protocols/silc/ops.c:1294
-#: ../src/protocols/silc/ops.c:1295
-#: ../src/protocols/silc/ops.c:1313
+msgstr "Nem sikerült a nyilvános kulcsot betölteni"
+
+#: ../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 "Felhasználói információk"
 
-#: ../src/protocols/silc/buddy.c:713
-#: ../src/protocols/silc/ops.c:1160
+#: ../src/protocols/silc/buddy.c:713 ../src/protocols/silc/ops.c:1160
 #: ../src/protocols/silc/ops.c:1314
 msgid "Cannot get user information"
 msgstr "A felhasználói információk lekérése sikertelen"
@@ -10277,8 +10285,13 @@
 msgstr "%s partner nem megbĂ­zhatĂł"
 
 #: ../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 "Nem fogadhat partnerfigyelmeztetéseket, amíg nem importálja a partner nyilvános kulcsát. A nyilvános kulcsot a \"Nyilvános kulcs letöltése\" paranccsal töltheti le."
+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 ""
+"Nem fogadhat partnerfigyelmeztetéseket, amíg nem importálja a partner "
+"nyilvános kulcsát. A nyilvános kulcsot a \"Nyilvános kulcs letöltése\" "
+"paranccsal töltheti le."
 
 #. Open file selector to select the public key.
 #: ../src/protocols/silc/buddy.c:1064
@@ -10291,8 +10304,12 @@
 msgstr "%s partner nincs jelen a hálózatban"
 
 #: ../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 "Partner hozzáadásához importálnia kell a nyilvános kulcsát, ehhez kattintson az Importálásra."
+msgid ""
+"To add the buddy you must import his/her public key. Press Import to import "
+"a public key."
+msgstr ""
+"Partner hozzáadásához importálnia kell a nyilvános kulcsát, ehhez kattintson "
+"az Importálásra."
 
 #: ../src/protocols/silc/buddy.c:1079
 msgid "_Import..."
@@ -10303,29 +10320,34 @@
 msgstr "Megfelelő felhasználó kiválasztása"
 
 #: ../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 "Több felhasználó található ugyanazzal a nyilvános kulccsal. Válassza ki a partnerlistához adandó megfelelő felhasználót a listából."
+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 ""
+"Több felhasználó található ugyanazzal a nyilvános kulccsal. Válassza ki a "
+"partnerlistához adandó megfelelő felhasználót a listából."
 
 #: ../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 "Több felhasználó található ugyanazzal a névvel. Válassza ki a partnerlistához adandó megfelelő felhasználót a listából."
+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 ""
+"Több felhasználó található ugyanazzal a névvel. Válassza ki a "
+"partnerlistához adandó megfelelő felhasználót a listából."
 
 #: ../src/protocols/silc/buddy.c:1467
 msgid "Detached"
 msgstr "Leválasztott"
 
-#: ../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 "Gyengélkedik"
 
-#: ../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 "Ébresszen fel"
 
-#: ../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 "HiperaktĂ­v"
 
@@ -10333,106 +10355,87 @@
 msgid "Robot"
 msgstr "Robot"
 
-#: ../src/protocols/silc/buddy.c:1486
-#: ../src/protocols/silc/silc.c:668
+#: ../src/protocols/silc/buddy.c:1486 ../src/protocols/silc/silc.c:668
 #: ../src/protocols/silc/util.c:473
 msgid "Happy"
 msgstr "Boldog"
 
-#: ../src/protocols/silc/buddy.c:1488
-#: ../src/protocols/silc/silc.c:670
+#: ../src/protocols/silc/buddy.c:1488 ../src/protocols/silc/silc.c:670
 #: ../src/protocols/silc/util.c:475
 msgid "Sad"
 msgstr "SzomorĂş"
 
-#: ../src/protocols/silc/buddy.c:1490
-#: ../src/protocols/silc/silc.c:672
+#: ../src/protocols/silc/buddy.c:1490 ../src/protocols/silc/silc.c:672
 #: ../src/protocols/silc/util.c:477
 msgid "Angry"
 msgstr "Dühös"
 
-#: ../src/protocols/silc/buddy.c:1492
-#: ../src/protocols/silc/silc.c:674
+#: ../src/protocols/silc/buddy.c:1492 ../src/protocols/silc/silc.c:674
 #: ../src/protocols/silc/util.c:479
 msgid "Jealous"
 msgstr "Féltékeny"
 
-#: ../src/protocols/silc/buddy.c:1494
-#: ../src/protocols/silc/silc.c:676
+#: ../src/protocols/silc/buddy.c:1494 ../src/protocols/silc/silc.c:676
 #: ../src/protocols/silc/util.c:481
 msgid "Ashamed"
 msgstr "Megszégyenült"
 
-#: ../src/protocols/silc/buddy.c:1496
-#: ../src/protocols/silc/silc.c:678
+#: ../src/protocols/silc/buddy.c:1496 ../src/protocols/silc/silc.c:678
 #: ../src/protocols/silc/util.c:483
 msgid "Invincible"
 msgstr "Legyőzhetetlen"
 
-#: ../src/protocols/silc/buddy.c:1498
-#: ../src/protocols/silc/silc.c:680
+#: ../src/protocols/silc/buddy.c:1498 ../src/protocols/silc/silc.c:680
 #: ../src/protocols/silc/util.c:485
 msgid "In Love"
 msgstr "Szerelmes"
 
-#: ../src/protocols/silc/buddy.c:1500
-#: ../src/protocols/silc/silc.c:682
+#: ../src/protocols/silc/buddy.c:1500 ../src/protocols/silc/silc.c:682
 #: ../src/protocols/silc/util.c:487
 msgid "Sleepy"
 msgstr "Ălmos"
 
-#: ../src/protocols/silc/buddy.c:1502
-#: ../src/protocols/silc/silc.c:684
+#: ../src/protocols/silc/buddy.c:1502 ../src/protocols/silc/silc.c:684
 #: ../src/protocols/silc/util.c:489
 msgid "Bored"
 msgstr "Unott"
 
-#: ../src/protocols/silc/buddy.c:1504
-#: ../src/protocols/silc/silc.c:686
+#: ../src/protocols/silc/buddy.c:1504 ../src/protocols/silc/silc.c:686
 #: ../src/protocols/silc/util.c:491
 msgid "Excited"
 msgstr "Érdeklődő"
 
-#: ../src/protocols/silc/buddy.c:1506
-#: ../src/protocols/silc/silc.c:688
+#: ../src/protocols/silc/buddy.c:1506 ../src/protocols/silc/silc.c:688
 #: ../src/protocols/silc/util.c:493
 msgid "Anxious"
 msgstr "Nyugtalan"
 
-#: ../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 "Felhasználói módok"
 
-#: ../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 "Hangulat"
 
-#: ../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 "Előnyben részesített kapcsolat"
 
-#: ../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 "Előnyben részesített nyelv"
 
-#: ../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 "Eszköz"
 
-#: ../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 "Időzóna"
 
-#: ../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 "Földrajzi hely"
 
@@ -10452,13 +10455,11 @@
 msgid "Get Public Key..."
 msgstr "Nyilvános kulcs letöltése..."
 
-#: ../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 "Felhasználó kidobása"
 
-#: ../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 "Rajzolás a rajzlapra"
 
@@ -10471,8 +10472,7 @@
 msgid "Channel %s does not exist in the network"
 msgstr "A(z) %s csatorna nem létezik a hálózatban"
 
-#: ../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 "Csatornainformációk"
 
@@ -10542,19 +10542,26 @@
 msgstr "Csatorna nyilvános kulcsainak listája"
 
 #: ../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 "A csatornahitelesítés a csatorna illetéktelen hozzáféréssel szembeni védelmére szolgál. A hitelesítés jelmondatokon és digitális aláírásokon alapulhat. Ha jelmondat van beállítva, akkor a csatlakozáshoz annak ismerete szükséges. Ha a csatorna nyilvános kulcsai vannak beállítva, akkor csak azok a felhasználók csatlakozhatnak, akiknek a nyilvános kulcsa fel van sorolva."
-
-#: ../src/protocols/silc/chat.c:420
-#: ../src/protocols/silc/chat.c:421
-#: ../src/protocols/silc/chat.c:458
-#: ../src/protocols/silc/chat.c:459
+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 ""
+"A csatornahitelesítés a csatorna illetéktelen hozzáféréssel szembeni "
+"védelmére szolgál. A hitelesítés jelmondatokon és digitális aláírásokon "
+"alapulhat. Ha jelmondat van beállítva, akkor a csatlakozáshoz annak ismerete "
+"szükséges. Ha a csatorna nyilvános kulcsai vannak beállítva, akkor csak azok "
+"a felhasználók csatlakozhatnak, akiknek a nyilvános kulcsa fel van sorolva."
+
+#: ../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 "Csatornahitelesítés"
 
-#: ../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 "Hozzáadás / Eltávolítás"
 
@@ -10562,8 +10569,7 @@
 msgid "Group Name"
 msgstr "Csoportnév"
 
-#: ../src/protocols/silc/chat.c:581
-#: ../src/protocols/silc/ops.c:1908
+#: ../src/protocols/silc/chat.c:581 ../src/protocols/silc/ops.c:1908
 #: ../src/protocols/silc/silc.c:944
 msgid "Passphrase"
 msgstr "Jelmondat"
@@ -10571,7 +10577,9 @@
 #: ../src/protocols/silc/chat.c:592
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
-msgstr "Adja meg a(z) %s csatornához felvenni kívánt magáncsoport nevét és jelmondatát."
+msgstr ""
+"Adja meg a(z) %s csatornához felvenni kívánt magáncsoport nevét és "
+"jelmondatát."
 
 #: ../src/protocols/silc/chat.c:594
 msgid "Add Channel Private Group"
@@ -10583,7 +10591,9 @@
 
 #: ../src/protocols/silc/chat.c:722
 msgid "Set user limit on channel. Set to zero to reset user limit."
-msgstr "A csatorna legnagyobb felhasználószámának beállítása. A felhasználószám-korlátozás megszüntetéséhez állítsa nullára."
+msgstr ""
+"A csatorna legnagyobb felhasználószámának beállítása. A felhasználószám-"
+"korlátozás megszüntetéséhez állítsa nullára."
 
 #: ../src/protocols/silc/chat.c:877
 msgid "Get Info"
@@ -10650,7 +10660,9 @@
 #: ../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 "Mielőtt csatlakozhatna a magáncsoporthoz, csatlakoznia kell a(z) %s csatornához"
+msgstr ""
+"Mielőtt csatlakozhatna a magáncsoporthoz, csatlakoznia kell a(z) %s "
+"csatornához"
 
 #: ../src/protocols/silc/chat.c:1098
 msgid "Join Private Group"
@@ -10660,38 +10672,28 @@
 msgid "Cannot join private group"
 msgstr "Nem lehet kapcsolódni a magáncsoporthoz"
 
-#: ../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 "Hívás parancsa"
 
-#: ../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 "Nem lehet meghĂ­vni a parancsot"
 
-#: ../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 "Ismeretlen parancs"
 
-#: ../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 "Biztonságos fájlátvitel"
 
-#: ../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: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 "Hiba a fájlátvitel közben"
@@ -10728,8 +10730,7 @@
 msgid "Cannot send file"
 msgstr "A fájl nem küldhető el"
 
-#: ../src/protocols/silc/ops.c:555
-#: ../src/protocols/silc/ops.c:564
+#: ../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"
@@ -10760,15 +10761,13 @@
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Önt a következőről: <I>%s</I> kirúgta <I>%s</I> (%s)"
 
-#: ../src/protocols/silc/ops.c:743
-#: ../src/protocols/silc/ops.c:748
+#: ../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 "Önt kidobta a következő: %s (%s)"
 
-#: ../src/protocols/silc/ops.c:774
-#: ../src/protocols/silc/ops.c:779
+#: ../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)"
@@ -10794,8 +10793,7 @@
 msgid "Job Role"
 msgstr "PozĂ­ciĂł"
 
-#: ../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 "Szervezet"
 
@@ -10819,13 +10817,11 @@
 msgid "Status Text"
 msgstr "Ăllapotszöveg"
 
-#: ../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 "Nyilvános kulcs ujjlenyomata"
 
-#: ../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 "Nyilvános kulcs blablakódja"
 
@@ -10833,8 +10829,7 @@
 msgid "_More..."
 msgstr "_Több..."
 
-#: ../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 "Leválás a kiszolgálóról"
 
@@ -10862,8 +10857,7 @@
 msgid "No public key was received"
 msgstr "Nem érkezett nyilvános kulcs"
 
-#: ../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 "Kiszolgálóinformációk"
 
@@ -10871,8 +10865,7 @@
 msgid "Cannot get server information"
 msgstr "Nem lehet lekérni a kiszolgálóinformációkat"
 
-#: ../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 "Kiszolgálóstatisztikák"
 
@@ -10923,8 +10916,7 @@
 msgid "Network Statistics"
 msgstr "Hálózati statisztika"
 
-#: ../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"
 
@@ -10950,14 +10942,15 @@
 
 #: ../src/protocols/silc/ops.c:1722
 msgid "Resuming detached session failed. Press Reconnect to create new connection."
-msgstr "A leválasztott folyamat folytatása sikertelen. Kattintson az Újrakapcsolódás gombra egy új kapcsolat létrehozásához."
+msgstr ""
+"A leválasztott folyamat folytatása sikertelen. Kattintson az Újrakapcsolódás "
+"gombra egy új kapcsolat létrehozásához."
 
 #: ../src/protocols/silc/ops.c:1757
 msgid "Disconnected by server"
 msgstr "A kiszolgáló bontotta a kapcsolatot"
 
-#: ../src/protocols/silc/ops.c:1819
-#: ../src/protocols/silc/ops.c:1866
+#: ../src/protocols/silc/ops.c:1819 ../src/protocols/silc/ops.c:1866
 #: ../src/protocols/silc/silc.c:195
 msgid "Resuming session"
 msgstr "Folyamat folytatása"
@@ -11016,8 +11009,12 @@
 
 #: ../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 "%s nyilvános kulcsa megérkezett. Az Ön helyi másolata nem egyezik meg ezzel a kulccsal. Még mindig el kívánja fogadni ezt a nyilvános kulcsot?"
+msgid ""
+"Received %s's public key. Your local copy does not match this key. Would you "
+"still like to accept this public key?"
+msgstr ""
+"%s nyilvános kulcsa megérkezett. Az Ön helyi másolata nem egyezik meg ezzel "
+"a kulccsal. Még mindig el kívánja fogadni ezt a nyilvános kulcsot?"
 
 #: ../src/protocols/silc/pk.c:108
 #, c-format
@@ -11037,8 +11034,7 @@
 "%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 "Nyilvános kulcs ellenőrzése"
 
@@ -11100,18 +11096,15 @@
 "\n"
 "Az előnyben részesített kapcsolatfelvételi módszerek"
 
-#: ../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 "Videokonferencia"
 
@@ -11135,17 +11128,21 @@
 msgid "Your VCard File"
 msgstr "Az Ön VCard fájlja"
 
-#: ../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 "Felhasználó online állapotattribútumai"
 
 #: ../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 "Megengedheti, hogy más felhasználók lássák az Ön elérhető állapotát és személyes információit. Kérem töltse ki azokat az információkat, amelyeket más felhasználók láthatnak Önről."
-
-#: ../src/protocols/silc/silc.c:785
-#: ../src/protocols/silc/silc.c:791
+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 ""
+"Megengedheti, hogy más felhasználók lássák az Ön elérhető állapotát és "
+"személyes információit. Kérem töltse ki azokat az információkat, amelyeket "
+"más felhasználók láthatnak Önről."
+
+#: ../src/protocols/silc/silc.c:785 ../src/protocols/silc/silc.c:791
 #: ../src/protocols/silc/silc.c:1431
 msgid "Message of the Day"
 msgstr "A nap ĂĽzenete"
@@ -11154,15 +11151,12 @@
 msgid "No Message of the Day available"
 msgstr "Nem érhető el a nap üzenete"
 
-#: ../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 "Nincs \"nap üzenete\" hozzárendelve ehhez a kapcsolathoz"
 
-#: ../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 "Új SILC kulcspár létrehozása"
 
@@ -11192,7 +11186,7 @@
 
 #: ../src/protocols/silc/silc.c:947
 msgid "Re-type Passphrase"
-msgstr "Jelmondat megerősítése"
+msgstr "Jelmondat még egyszer"
 
 #: ../src/protocols/silc/silc.c:954
 msgid "Generate Key Pair"
@@ -11262,7 +11256,9 @@
 
 #: ../src/protocols/silc/silc.c:1611
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
-msgstr "join &lt;csatorna&gt; [&lt;jelszó&gt;]:  Csatlakozás csatornához ezen a hálózaton"
+msgstr ""
+"join &lt;csatorna&gt; [&lt;jelszó&gt;]:  Csatlakozás csatornához ezen a "
+"hálózaton"
 
 #: ../src/protocols/silc/silc.c:1615
 msgid "list:  List channels on this network"
@@ -11272,14 +11268,15 @@
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;becenév&gt;:  A becenévhez tartozó információk megjelenítése"
 
-#: ../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;becenév&gt; &lt;message&gt;:  Magánüzenet küldése a felhasználónak"
 
 #: ../src/protocols/silc/silc.c:1627
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
-msgstr "query &lt;becenév&gt; [&lt;message&gt;]:  Magánüzenet küldése a felhasználónak"
+msgstr ""
+"query &lt;becenév&gt; [&lt;message&gt;]:  Magánüzenet küldése a "
+"felhasználónak"
 
 #: ../src/protocols/silc/silc.c:1631
 msgid "motd:  View the server's Message Of The Day"
@@ -11291,7 +11288,9 @@
 
 #: ../src/protocols/silc/silc.c:1639
 msgid "quit [message]:  Disconnect from the server, with an optional message"
-msgstr "quit [message]:  Kapcsolat bontása a kiszolgálóval, egy opcionális üzenet kíséretében"
+msgstr ""
+"quit [message]:  Kapcsolat bontása a kiszolgálóval, egy opcionális üzenet "
+"kíséretében"
 
 #: ../src/protocols/silc/silc.c:1643
 msgid "call &lt;command&gt;:  Call any silc client command"
@@ -11299,7 +11298,9 @@
 
 #: ../src/protocols/silc/silc.c:1649
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
-msgstr "kill &lt;becenév&gt; [-pubkey|&lt;ok&gt;]:  A \"becenév\" nevű felhasználó kidobása"
+msgstr ""
+"kill &lt;becenév&gt; [-pubkey|&lt;ok&gt;]:  A \"becenév\" nevű felhasználó "
+"kidobása"
 
 #: ../src/protocols/silc/silc.c:1653
 msgid "nick &lt;newnick&gt;:  Change your nickname"
@@ -11307,31 +11308,49 @@
 
 #: ../src/protocols/silc/silc.c:1657
 msgid "whowas &lt;nick&gt;:  View nick's information"
-msgstr "whowas &lt;becenév&gt;:  A becenév nevű felhasználó információinak megjelenítése"
+msgstr ""
+"whowas &lt;becenév&gt;:  A becenév nevű felhasználó információinak "
+"megjelenítése"
 
 #: ../src/protocols/silc/silc.c:1661
-msgid "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display channel modes"
-msgstr "cmode &lt;csatorna&gt; [+|-&lt;módok&gt;] [paraméterek]:  Csatorna üzemmódjainak megjelenítése vagy megváltoztatása"
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
+"channel modes"
+msgstr ""
+"cmode &lt;csatorna&gt; [+|-&lt;módok&gt;] [paraméterek]:  Csatorna "
+"üzemmódjainak megjelenítése vagy megváltoztatása"
 
 #: ../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;csatorna&gt; +|-&lt;modes&gt; &lt;becenév&gt;:  A becenév módjainak megváltoztatása a csatornán"
+msgid ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
+"on channel"
+msgstr ""
+"cumode &lt;csatorna&gt; +|-&lt;modes&gt; &lt;becenév&gt;:  A becenév "
+"módjainak megváltoztatása a csatornán"
 
 #: ../src/protocols/silc/silc.c:1669
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
-msgstr "umode &lt;felhasználói módok&gt;:  A felhasználói módjainak beállítása a hálózaton"
+msgstr ""
+"umode &lt;felhasználói módok&gt;:  A felhasználói módjainak beállítása a "
+"hálózaton"
 
 #: ../src/protocols/silc/silc.c:1673
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;becenév&gt; [-pubkey]:  Kiszolgáló-operátori jogok kérése"
 
 #: ../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;csatorna&gt; [-|+]&lt;becenév&gt;:  A becenév nevű felhasználó meghívása vagy a csatorna meghívási listájához/ról hozzáadása/eltávolítása"
+msgid ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
+"channel invite list"
+msgstr ""
+"invite &lt;csatorna&gt; [-|+]&lt;becenév&gt;:  A becenév nevű felhasználó "
+"meghívása vagy a csatorna meghívási listájához/ról hozzáadása/eltávolítása"
 
 #: ../src/protocols/silc/silc.c:1681
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
-msgstr "kick &lt;csatorna&gt; &lt;becenév&gt; [megjegyzés]:  Kliens kirúgása a csatornáról"
+msgstr ""
+"kick &lt;csatorna&gt; &lt;becenév&gt; [megjegyzés]:  Kliens kirúgása a "
+"csatornáról"
 
 #: ../src/protocols/silc/silc.c:1685
 msgid "info [server]:  View server administrative details"
@@ -11343,7 +11362,9 @@
 
 #: ../src/protocols/silc/silc.c:1693
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
-msgstr "getkey &lt;becenév|kiszolgáló&gt;:  A kliens vagy a kiszolgáló nyilvános kulcsának letöltése"
+msgstr ""
+"getkey &lt;becenév|kiszolgáló&gt;:  A kliens vagy a kiszolgáló nyilvános "
+"kulcsának letöltése"
 
 #: ../src/protocols/silc/silc.c:1697
 msgid "stats:  View server and network statistics"
@@ -11358,8 +11379,12 @@
 msgstr "users &lt;csatorna&gt;:  Egy csatorna felhasználóit listázza ki"
 
 #: ../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 [-count|-ops|-halfops|-voices|-normal] &lt;csatorna/csatornák&gt;:  A csatorna/csatornák bizonyos felhasználóinak listázása"
+msgid ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
+"specific users in channel(s)"
+msgstr ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;csatorna/csatornák&gt;:  A "
+"csatorna/csatornák bizonyos felhasználóinak listázása"
 
 #. *< type
 #. *< ui_requirement
@@ -11427,8 +11452,7 @@
 msgid "Digitally sign and verify all messages"
 msgstr "Minden üzenet digitális aláírása és ellenőrzése"
 
-#: ../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 "SILC kulcspár létrehozása..."
 
@@ -11495,8 +11519,7 @@
 "Nyilvános kulcs blablakódja:\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 "Nyilvános kulcs információi"
 
@@ -11523,8 +11546,12 @@
 
 #: ../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 üzenetet küldött a rajzlapra a(z) %s csatornán. Meg kívánja nyitni a rajzlapot?"
+msgid ""
+"%s sent message to whiteboard on %s channel. Would you like to open the "
+"whiteboard?"
+msgstr ""
+"%s üzenetet küldött a rajzlapra a(z) %s csatornán. Meg kívánja nyitni a "
+"rajzlapot?"
 
 #: ../src/protocols/silc/wb.c:302
 msgid "Whiteboard"
@@ -11535,8 +11562,7 @@
 msgid "Could not write"
 msgstr "Nem sikerült az írás"
 
-#: ../src/protocols/simple/simple.c:424
-#: ../src/protocols/simple/simple.c:1422
+#: ../src/protocols/simple/simple.c:424 ../src/protocols/simple/simple.c:1422
 msgid "Could not connect"
 msgstr "Nem sikerĂĽlt kapcsolĂłdni"
 
@@ -11544,10 +11570,8 @@
 msgid "Wrong Password"
 msgstr "Hibás jelszó"
 
-#: ../src/protocols/simple/simple.c:1453
-#: ../src/protocols/simple/simple.c:1492
-#: ../src/protocols/simple/simple.c:1504
-#: ../src/protocols/simple/simple.c:1551
+#: ../src/protocols/simple/simple.c:1453 ../src/protocols/simple/simple.c:1492
+#: ../src/protocols/simple/simple.c:1504 ../src/protocols/simple/simple.c:1551
 msgid "Could not create listen socket"
 msgstr "Nem sikerült létrehozni a figyelő foglalatot"
 
@@ -11662,7 +11686,9 @@
 #: ../src/protocols/toc/toc.c:509
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
-msgstr "Nem kapott meg egy üzenetet a következőtől: %s, mert a feladó túl gyorsan küldte."
+msgstr ""
+"Nem kapott meg egy üzenetet a következőtől: %s, mert a feladó túl gyorsan "
+"kĂĽldte."
 
 #: ../src/protocols/toc/toc.c:512
 msgid "Failure."
@@ -11714,8 +11740,12 @@
 msgstr "A figyelmeztetési szintje jelenleg túl magas a bejelentkezéshez."
 
 #: ../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 "Túl gyakran jelentkezik be/ki. Várjon tíz percet, és próbálja meg újra. Ha tovább folytatja, akkor még tovább kell majd várnia."
+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 ""
+"Túl gyakran jelentkezik be/ki. Várjon tíz percet, és próbálja meg újra. Ha "
+"tovább folytatja, akkor még tovább kell majd várnia."
 
 #: ../src/protocols/toc/toc.c:554
 #, c-format
@@ -11752,8 +11782,14 @@
 msgstr "A TOC egy PAUSE parancsot küldött."
 
 #: ../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 "Ilyen estben a TOC nem veszi figyelembe a felé küldött üzeneteket, és kirúghatja, ha újabb üzenetet küld. A Gaim megakadályozza hogy bármi is átjusson. Ez csak ideiglenes, kérem legyen türelemmel."
+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 ""
+"Ilyen estben a TOC nem veszi figyelembe a felé küldött üzeneteket, és "
+"kirúghatja, ha újabb üzenetet küld. A Gaim megakadályozza hogy bármi is "
+"átjusson. Ez csak ideiglenes, kérem legyen türelemmel."
 
 #: ../src/protocols/toc/toc.c:1549
 msgid "Get Dir Info"
@@ -11780,10 +11816,8 @@
 msgid "File transfer failed; other side probably canceled."
 msgstr "A fájlátvitel sikertelen; valószínűleg a másik oldal megszakította."
 
-#: ../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 "Az átvitelhez nem sikerült a kapcsolatot létrehozni."
 
@@ -11817,8 +11851,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/toc/toc.c:2319
-#: ../src/protocols/toc/toc.c:2321
+#: ../src/protocols/toc/toc.c:2319 ../src/protocols/toc/toc.c:2321
 msgid "TOC Protocol Plugin"
 msgstr "TOC protokollbővítmény"
 
@@ -11834,8 +11867,7 @@
 msgid "Your Yahoo! message did not get sent."
 msgstr "Az Ă–n Yahoo! ĂĽzenete nem lett elkĂĽldve."
 
-#: ../src/protocols/yahoo/yahoo.c:765
-#: ../src/protocols/yahoo/yahoo.c:3562
+#: ../src/protocols/yahoo/yahoo.c:765 ../src/protocols/yahoo/yahoo.c:3562
 msgid "Buzz!!"
 msgstr "Csiling!!"
 
@@ -11859,12 +11891,18 @@
 #: ../src/protocols/yahoo/yahoo.c:954
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr "%s visszamenőlegesen megtagadta az engedélyt, hogy felvegye őt a partnerei közé."
+msgstr ""
+"%s visszamenőlegesen megtagadta az engedélyt, hogy felvegye őt a partnerei "
+"közé."
 
 #: ../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 visszamenőlegesen megtagadta az engedélyt, hogy felvegye őt a partnerei közé, a következő magyarázattal: %s."
+msgid ""
+"%s has (retroactively) denied your request to add them to your list for the "
+"following reason: %s."
+msgstr ""
+"%s visszamenőlegesen megtagadta az engedélyt, hogy felvegye őt a partnerei "
+"közé, a következő magyarázattal: %s."
 
 #: ../src/protocols/yahoo/yahoo.c:960
 msgid "Add buddy rejected"
@@ -11872,8 +11910,14 @@
 
 #: ../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 "A Yahoo kiszolgáló ismeretlen hitelesítési eljárás használatát kérte. A Gaim ezen verziója valószínűleg nem fog tudni sikeresen bejelentkezni. Ellenőrizze az esetleges frissítéseket itt: %s."
+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 ""
+"A Yahoo kiszolgáló ismeretlen hitelesítési eljárás használatát kérte. A Gaim "
+"ezen verziója valószínűleg nem fog tudni sikeresen bejelentkezni. "
+"Ellenőrizze az esetleges frissítéseket itt: %s."
 
 #: ../src/protocols/yahoo/yahoo.c:1706
 msgid "Failed Yahoo! Authentication"
@@ -11881,8 +11925,12 @@
 
 #: ../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 "Megpróbálta mellőzni %s-t, de a felhasználó a partnerlistáján van. Ha az \"Igen\"-re kattint, eltávolítja a listáról és mellőzni fogja a felhasználót."
+msgid ""
+"You have tried to ignore %s, but the user is on your buddy list.  Clicking "
+"\"Yes\" will remove and ignore the buddy."
+msgstr ""
+"Megpróbálta mellőzni %s-t, de a felhasználó a partnerlistáján van. Ha az "
+"\"Igen\"-re kattint, eltávolítja a listáról és mellőzni fogja a felhasználót."
 
 #: ../src/protocols/yahoo/yahoo.c:1775
 msgid "Ignore buddy?"
@@ -11897,8 +11945,17 @@
 msgstr "A normális hitelesítés sikertelen!"
 
 #: ../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 "A normális hitelesítési eljárás sikertelen volt. Ez vagy azt jelenti, hogy a jelszava helytelen, vagy azt, hogy a Yahoo! hitelesítési sémája megváltozott. A Gaim most megpróbál bejelentkezni a Web Messenger hitelesítés használatával, ami csökkentett funkcionalitást és kevesebb szolgáltatást fog eredményezni."
+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 ""
+"A normális hitelesítési eljárás sikertelen volt. Ez vagy azt jelenti, hogy a "
+"jelszava helytelen, vagy azt, hogy a Yahoo! hitelesítési sémája "
+"megváltozott. A Gaim most megpróbál bejelentkezni a Web Messenger "
+"hitelesítés használatával, ami csökkentett funkcionalitást és kevesebb "
+"szolgáltatást fog eredményezni."
 
 #: ../src/protocols/yahoo/yahoo.c:1829
 msgid "Incorrect password."
@@ -11911,12 +11968,16 @@
 #: ../src/protocols/yahoo/yahoo.c:1835
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
-msgstr "Ismeretlen hibaszám: %d. A Yahoo! weboldalára bejelentkezve talán megoldhatja ezt a problémát."
+msgstr ""
+"Ismeretlen hibaszám: %d. A Yahoo! weboldalára bejelentkezve talán "
+"megoldhatja ezt a problémát."
 
 #: ../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 "Nem sikerült a(z) %s partner hozzáadása a(z) %s csoporthoz, a(z) %s fiókhoz tartozó kiszolgálóoldali listán."
+msgstr ""
+"Nem sikerült a(z) %s partner hozzáadása a(z) %s csoporthoz, a(z) %s fiókhoz "
+"tartozó kiszolgálóoldali listán."
 
 #: ../src/protocols/yahoo/yahoo.c:1892
 msgid "Could not add buddy to server list"
@@ -11927,60 +11988,47 @@
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ HallhatĂł %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:2150 ../src/protocols/yahoo/yahoo.c:2297
+#: ../src/protocols/yahoo/yahoo.c:2312 ../src/protocols/yahoo/ycht.c:472
 msgid "Unable to read"
 msgstr "Nem lehet olvasni"
 
-#: ../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/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/yahoochat.c:1517 ../src/protocols/yahoo/ycht.c:576
 msgid "Connection problem"
 msgstr "Kapcsolathiba"
 
-#: ../src/protocols/yahoo/yahoo.c:2714
-#: ../src/protocols/yahoo/yahoo.c:3295
+#: ../src/protocols/yahoo/yahoo.c:2714 ../src/protocols/yahoo/yahoo.c:3295
 msgid "Not at Home"
 msgstr "Nem vagyok itthon"
 
-#: ../src/protocols/yahoo/yahoo.c:2716
-#: ../src/protocols/yahoo/yahoo.c:3298
+#: ../src/protocols/yahoo/yahoo.c:2716 ../src/protocols/yahoo/yahoo.c:3298
 msgid "Not at Desk"
 msgstr "Nem vagyok az asztalnál"
 
-#: ../src/protocols/yahoo/yahoo.c:2718
-#: ../src/protocols/yahoo/yahoo.c:3301
+#: ../src/protocols/yahoo/yahoo.c:2718 ../src/protocols/yahoo/yahoo.c:3301
 msgid "Not in Office"
 msgstr "Nem vagyok a munkahelyemen"
 
-#: ../src/protocols/yahoo/yahoo.c:2722
-#: ../src/protocols/yahoo/yahoo.c:3307
+#: ../src/protocols/yahoo/yahoo.c:2722 ../src/protocols/yahoo/yahoo.c:3307
 msgid "On Vacation"
 msgstr "Nyaralok"
 
-#: ../src/protocols/yahoo/yahoo.c:2726
-#: ../src/protocols/yahoo/yahoo.c:3313
+#: ../src/protocols/yahoo/yahoo.c:2726 ../src/protocols/yahoo/yahoo.c:3313
 msgid "Stepped Out"
 msgstr "Kilépett"
 
-#: ../src/protocols/yahoo/yahoo.c:2819
-#: ../src/protocols/yahoo/yahoo.c:2849
+#: ../src/protocols/yahoo/yahoo.c:2819 ../src/protocols/yahoo/yahoo.c:2849
 msgid "Not on server list"
 msgstr "Nincs a szerverlistán"
 
-#: ../src/protocols/yahoo/yahoo.c:2866
-#: ../src/protocols/yahoo/yahoo.c:2925
+#: ../src/protocols/yahoo/yahoo.c:2866 ../src/protocols/yahoo/yahoo.c:2925
 msgid "Appear Online"
 msgstr "Belépettként látszik"
 
-#: ../src/protocols/yahoo/yahoo.c:2869
-#: ../src/protocols/yahoo/yahoo.c:2946
+#: ../src/protocols/yahoo/yahoo.c:2869 ../src/protocols/yahoo/yahoo.c:2946
 msgid "Appear Permanently Offline"
 msgstr "Tartósan kilépettként látszik"
 
@@ -12054,8 +12102,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/yahoo/yahoo.c:3727
-#: ../src/protocols/yahoo/yahoo.c:3729
+#: ../src/protocols/yahoo/yahoo.c:3727 ../src/protocols/yahoo/yahoo.c:3729
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo protokollbővítmény"
 
@@ -12126,12 +12173,20 @@
 msgstr "Yahoo! profil"
 
 #: ../src/protocols/yahoo/yahoo_profile.c:828
-msgid "Sorry, profiles marked as containing adult content are not supported at this time."
-msgstr "Sajnáljuk, a \"csak felnőtteknek szóló\" tartalmat tartalmazónak jelölt profilok jelenleg nem támogatottak."
+msgid ""
+"Sorry, profiles marked as containing adult content are not supported at this "
+"time."
+msgstr ""
+"Sajnáljuk, a \"csak felnőtteknek szóló\" tartalmat tartalmazónak jelölt "
+"profilok jelenleg nem támogatottak."
 
 #: ../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 "Ha meg szeretné nézni ezt a profilt, a következő hivatkozást kell meglátogatnia a böngészőjében"
+msgid ""
+"If you wish to view this profile, you will need to visit this link in your "
+"web browser"
+msgstr ""
+"Ha meg szeretné nézni ezt a profilt, a következő hivatkozást kell "
+"meglátogatnia a böngészőjében"
 
 #: ../src/protocols/yahoo/yahoo_profile.c:1006
 msgid "Yahoo! ID"
@@ -12174,16 +12229,31 @@
 msgstr "%s felhasználói információi nem érhetőek el"
 
 #: ../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 "Elnézést, ez a profil olyan nyelvűnek vagy formátumúnak tűnik, ami jelenleg nem támogatott."
+msgid ""
+"Sorry, this profile seems to be in a language or format that is not "
+"supported at this time."
+msgstr ""
+"Elnézést, ez a profil olyan nyelvűnek vagy formátumúnak tűnik, ami jelenleg "
+"nem támogatott."
 
 #: ../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 "A felhasználó profiljának letöltése sikertelen. Ez valószínűleg átmeneti kiszolgálóoldali hiba, kérem próbálja újra később."
+msgid ""
+"Could not retrieve the user's profile. This most likely is a temporary "
+"server-side problem. Please try again later."
+msgstr ""
+"A felhasználó profiljának letöltése sikertelen. Ez valószínűleg átmeneti "
+"kiszolgálóoldali hiba, kérem próbálja újra később."
 
 #: ../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 "Nem sikerült letölteni a felhasználó profilját. Ez valószínűleg azt jelenti, hogy a felhasználó nem létezik, azonban néha a Yahoo! nem találja a felhasználó profilját. Ha tudja, hogy a felhasználó létezik, akkor kérem próbálkozzon újra később."
+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 ""
+"Nem sikerült letölteni a felhasználó profilját. Ez valószínűleg azt jelenti, "
+"hogy a felhasználó nem létezik, azonban néha a Yahoo! nem találja a "
+"felhasználó profilját. Ha tudja, hogy a felhasználó létezik, akkor kérem "
+"próbálkozzon újra később."
 
 #: ../src/protocols/yahoo/yahoo_profile.c:1197
 msgid "The user's profile is empty."
@@ -12192,7 +12262,9 @@
 #: ../src/protocols/yahoo/yahoochat.c:203
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s visszalépett az Ön meghívásától a(z) \"%s\" konferenciaszobába, mert \"%s\"."
+msgstr ""
+"%s visszalépett az Ön meghívásától a(z) \"%s\" konferenciaszobába, mert \"%s"
+"\"."
 
 #: ../src/protocols/yahoo/yahoochat.c:205
 msgid "Invitation Rejected"
@@ -12218,8 +12290,12 @@
 msgstr "Nem érhető el"
 
 #: ../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 "Ismeretlen hiba. Lehetséges, hogy ki kell lépnie és várnia kell öt percet, mielőtt újra csatlakozhatna a csevegőszobához"
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+msgstr ""
+"Ismeretlen hiba. Lehetséges, hogy ki kell lépnie és várnia kell öt percet, "
+"mielőtt újra csatlakozhatna a csevegőszobához"
 
 #: ../src/protocols/yahoo/yahoochat.c:452
 #, c-format
@@ -12261,33 +12337,33 @@
 msgstr "Kapcsolathiba a YCHT kiszolgálóval."
 
 #: ../src/protocols/zephyr/zephyr.c:331
-msgid "(There was an error converting this message.\t Check the 'Encoding' option in the Account Editor)"
-msgstr "(Hiba történt az üzenet konvertálása közben. \t Ellenőrizze a \"Kódolás\" beállításait a Fiókszerkesztőben)"
+msgid ""
+"(There was an error converting this message.\t Check the 'Encoding' option "
+"in the Account Editor)"
+msgstr ""
+"(Hiba történt az üzenet konvertálása közben. \t Ellenőrizze a \"Kódolás\" "
+"beállításait a Fiókszerkesztőben)"
 
 #: ../src/protocols/zephyr/zephyr.c:686
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Nem lehet a(z) %s,%s,%s csevegésbe küldeni"
 
-#: ../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>Felhasználó:</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>Láthatatlan vagy nincs bejelentkezve"
 
-#: ../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>Ennél: %s %s óta"
 
-#: ../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 "Bárki"
 
@@ -12330,27 +12406,45 @@
 
 #: ../src/protocols/zephyr/zephyr.c:2633
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
-msgstr "sub &lt;osztály&gt; &lt;példány&gt; &lt;címzett&gt;: Csatlakozás új csevegéshez"
+msgstr ""
+"sub &lt;osztály&gt; &lt;példány&gt; &lt;címzett&gt;: Csatlakozás új "
+"csevegéshez"
 
 #: ../src/protocols/zephyr/zephyr.c:2638
 msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
-msgstr "zi &lt;példány&gt;: Üzenet küldése a következőnek: &lt;üzenet,<i>példány</i>,*&gt;"
+msgstr ""
+"zi &lt;példány&gt;: Üzenet küldése a következőnek: &lt;üzenet,<i>példány</i>,"
+"*&gt;"
 
 #: ../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;osztály&gt; &lt;példány&gt;: Üzenet küldése a következőnek: &lt;<i>osztály</i>,<i>példány</i>,*&gt;"
+msgid ""
+"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
+"<i>instance</i>,*&gt;"
+msgstr ""
+"zci &lt;osztály&gt; &lt;példány&gt;: Üzenet küldése a következőnek: &lt;"
+"<i>osztály</i>,<i>példány</i>,*&gt;"
 
 #: ../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;osztály&gt; &lt;példány&gt; &lt;címzett&gt;: Üzenet küldése a következőnek: &lt;<i>osztály</i>,<i>példány</i>,<i>címzett</i>&gt;"
+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;osztály&gt; &lt;példány&gt; &lt;címzett&gt;: Üzenet küldése a "
+"következőnek: &lt;<i>osztály</i>,<i>példány</i>,<i>címzett</i>&gt;"
 
 #: ../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;példány&gt; &lt;címzett&gt;: Üzenet küldése a következőnek: &lt;ÜZENET,<i>példány</i>,<i>címzett</i>&gt;"
+msgid ""
+"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
+"<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+"zir &lt;példány&gt; &lt;címzett&gt;: Üzenet küldése a következőnek: &lt;"
+"ÜZENET,<i>példány</i>,<i>címzett</i>&gt;"
 
 #: ../src/protocols/zephyr/zephyr.c:2661
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
-msgstr "zc &lt;osztály&gt;: Üzenet küldése a következőnek: &lt;<i>osztály</i>,SZEMÉLY,*&gt;"
+msgstr ""
+"zc &lt;osztály&gt;: Üzenet küldése a következőnek: &lt;<i>osztály</i>,"
+"SZEMÉLY,*&gt;"
 
 #: ../src/protocols/zephyr/zephyr.c:2767
 msgid "Resubscribe"
@@ -12370,8 +12464,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/zephyr/zephyr.c:2855
-#: ../src/protocols/zephyr/zephyr.c:2857
+#: ../src/protocols/zephyr/zephyr.c:2855 ../src/protocols/zephyr/zephyr.c:2857
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr protokollbővítmény"
 
@@ -12399,9 +12492,7 @@
 msgid "Exposure"
 msgstr "Exportálás"
 
-#: ../src/proxy.c:1205
-#: ../src/proxy.c:1261
-#: ../src/proxy.c:1309
+#: ../src/proxy.c:1205 ../src/proxy.c:1261 ../src/proxy.c:1309
 #: ../src/proxy.c:1336
 #, c-format
 msgid "Proxy connection error %d"
@@ -12411,15 +12502,21 @@
 #: ../src/proxy.c:1325
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
-msgstr "Hozzáférés megtagadva: a proxy-kiszolgáló tiltja az alagutazást a(z) %d. porton."
+msgstr ""
+"Hozzáférés megtagadva: a proxy-kiszolgáló tiltja az alagutazást a(z) %d. "
+"porton."
 
 #: ../src/proxy.c:2325
 msgid "Invalid proxy settings"
 msgstr "Érvénytelen proxy-beállítások"
 
 #: ../src/proxy.c:2325
-msgid "Either the host name or port number specified for your given proxy type is invalid."
-msgstr "A megadott kiszolgálónév vagy portszám érvénytelen a megadott proxy típusához."
+msgid ""
+"Either the host name or port number specified for your given proxy type is "
+"invalid."
+msgstr ""
+"A megadott kiszolgálónév vagy portszám érvénytelen a megadott proxy "
+"típusához."
 
 #: ../src/savedstatuses.c:514
 msgid "saved statuses"
@@ -12482,7 +12579,7 @@
 #: ../src/status.c:638
 #, c-format
 msgid "%s went away"
-msgstr "%s elment"
+msgstr "%s távol van"
 
 #: ../src/status.c:1317
 #, c-format
@@ -12516,8 +12613,12 @@
 
 #: ../src/util.c:2461
 #, 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 "Hiba lépett fel a(z) %s feldolgozása közben. Ezek nem lettek betöltve, a régi fájl %s~ néven lett elmentve."
+msgid ""
+"An error was encountered reading your %s.  They have not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"Hiba lépett fel a(z) %s feldolgozása közben. Ezek nem lettek betöltve, a "
+"régi fájl %s~ néven lett elmentve."
 
 #: ../src/util.c:2900
 msgid "Calculating..."