X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=po%2Fes.po;h=a040e0ddcc344c2b048f7ba78d7cd58ee8f4177e;hp=b4c8fc938336a6ebc39b468b68ebcd16a3bade01;hb=74157d3f4501f4d1ec913a986b7167d2b847e41e;hpb=721d85f77277813345bdb63a610e984cec996613

diff --git a/po/es.po b/po/es.po
index b4c8fc93..a040e0dd 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tinc 1.0pre2\n"
-"POT-Creation-Date: 2000-07-02 12:47+0100\n"
+"POT-Creation-Date: 2000-08-17 18:13+0100\n"
 "PO-Revision-Date: 2000-07-02 12:49+01:00\n"
 "Last-Translator: Enrique Zanardi <ezanardi@id-agora.com>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -13,39 +13,39 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/conf.c:158
+#: src/conf.c:178
 #, c-format
 msgid "%s: %d: Invalid variable name `%s'.\n"
 msgstr "%s: %d: Nombre de variable `%s' no válido.\n"
 
-#: src/conf.c:165
+#: src/conf.c:185
 #, c-format
 msgid "%s: %d: No value given for `%s'.\n"
 msgstr "%s: %d: No se ha definido un valor para `%s'.\n"
 
-#: src/conf.c:173
+#: src/conf.c:193
 #, c-format
 msgid "%s: %d: Invalid value `%s' for variable `%s'.\n"
 msgstr "%s: %d: Valor `%s' para la variable `%s' no válido.\n"
 
-#: src/conf.c:194
+#: src/conf.c:217
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "No pude abrir %s: %s\n"
 
-#: src/encr.c:112 src/net.c:333
+#: src/encr.c:111 src/net.c:445
 #, c-format
 msgid "Could not open %s: %m"
 msgstr "No pude abrir %s: %m"
 
-#: src/encr.c:119
+#: src/encr.c:118
 #, c-format
 msgid "Illegal passphrase in %s; size would be %d"
 msgstr "Frase de paso ilegal en %s; el tamaño debe ser %d"
 
 #: src/encr.c:153
-#, c-format
-msgid "Generating %d bits keys."
+#, fuzzy, c-format
+msgid "Generating %d bits keys"
 msgstr "Generando claves de %d bits."
 
 #: src/encr.c:157
@@ -94,486 +94,692 @@ msgid ": done.\n"
 msgstr ": hecho.\n"
 
 #: src/net.c:106
-#, c-format
-msgid "Sent %d bytes to %lx"
+#, fuzzy, c-format
+msgid "Sending packet of %d bytes to %s (%s)"
 msgstr "Enviados %d bytes a %lx"
 
-#: src/net.c:110
-#, c-format
-msgid "Error sending data: %m"
+#: src/net.c:118
+#, fuzzy, c-format
+msgid "Error sending packet to %s (%s): %m"
 msgstr "Error enviando datos: %m"
 
-#: src/net.c:130
+#: src/net.c:135 src/net.c:177
+#, fuzzy, c-format
+msgid "Receiving packet of %d bytes from %s (%s)"
+msgstr "Recibiendo clave de "
+
+#: src/net.c:139 src/net.c:181
 #, c-format
 msgid "Can't write to tap device: %m"
 msgstr "No puedo escribir en el dispositivo tap: %m"
 
-#: src/net.c:149
-#, c-format
-msgid "packet to queue: %d"
-msgstr "paquete a poner en cola: %d"
+#: src/net.c:166 src/net.c:959
+#, fuzzy, c-format
+msgid "Got packet from %s (%s) with unknown origin %d.%d.%d.%d?"
+msgstr "He recibido un paquete desde un origen desconocido "
 
-#: src/net.c:236
-msgid "queue flushed"
+#: src/net.c:295
+#, fuzzy
+msgid "Queue flushed"
 msgstr "cola vaciada"
 
-#: src/net.c:251
-msgid "Flushing send queue for "
+#: src/net.c:310
+#, fuzzy, c-format
+msgid "Flushing send queue for %s (%s)"
 msgstr "Vaciando la cola de envíos para "
 
-#: src/net.c:259
-msgid "Flushing receive queue for "
+#: src/net.c:318
+#, fuzzy, c-format
+msgid "Flushing receive queue for %s (%s)"
 msgstr "Vaciando la cola de recepción para "
 
-#: src/net.c:277
-msgid "trying to look up "
-msgstr "intentando buscar "
+#: src/net.c:336
+#, c-format
+msgid "Trying to look up %d.%d.%d.%d in connection list failed!"
+msgstr ""
 
-#: src/net.c:284
-msgid "There is no remote host I can send this packet to."
+#: src/net.c:348 src/net.c:361
+#, fuzzy
+msgid "There is no remote host I can send this packet to!"
 msgstr "No hay máquina remota a la que pueda enviar este paquete."
 
-#: src/net.c:354
+#: src/net.c:375
+#, c-format
+msgid "Indirect packet to %s via %s"
+msgstr ""
+
+#: src/net.c:380
+#, c-format
+msgid "Indirect look up %d.%d.%d.%d in connection list failed!"
+msgstr ""
+
+#: src/net.c:390
+#, c-format
+msgid "Double indirection for %d.%d.%d.%d"
+msgstr ""
+
+#: src/net.c:402
+#, fuzzy, c-format
+msgid "Could not open UDP connection to %s (%s)"
+msgstr "No pude abrir %s: %s\n"
+
+#: src/net.c:409
+#, c-format
+msgid "%s (%s) has no valid key, queueing packet"
+msgstr ""
+
+#: src/net.c:419
+#, c-format
+msgid "%s (%s) is not ready, queueing packet"
+msgstr ""
+
+#: src/net.c:467
 #, c-format
 msgid "Creating metasocket failed: %m"
 msgstr "Fallo al crear el metasocket: %m"
 
-#: src/net.c:360 src/net.c:409
+#: src/net.c:473 src/net.c:479 src/net.c:541
 #, c-format
 msgid "setsockopt: %m"
 msgstr "setsockopt(): %m"
 
-#: src/net.c:367 src/net.c:416 src/net.c:468
+#: src/net.c:486 src/net.c:548
 #, c-format
 msgid "fcntl: %m"
 msgstr "fcntl(): %m"
 
-#: src/net.c:378
+#: src/net.c:494
+#, c-format
+msgid "Unable to bind listen socket to interface %s: %m"
+msgstr ""
+
+#: src/net.c:510
 #, c-format
 msgid "Can't bind to port %hd/tcp: %m"
 msgstr "Ha fallado la llamada a bind() con el puerto %hd/tcp: %m"
 
-#: src/net.c:384
+#: src/net.c:516
 #, c-format
 msgid "listen: %m"
 msgstr "listen(): %m"
 
-#: src/net.c:403 src/net.c:451
+#: src/net.c:535
 #, c-format
 msgid "Creating socket failed: %m"
 msgstr "Error al crear el `socket': %m"
 
-#: src/net.c:427
+#: src/net.c:559
 #, c-format
 msgid "Can't bind to port %hd/udp: %m"
 msgstr "Ha fallado la llamada a bind() con el puerto %hd/udp: %m"
 
-#: src/net.c:474
+#: src/net.c:576
+#, fuzzy, c-format
+msgid "Trying to connect to %s"
+msgstr "Cerrando conexión con %s."
+
+#: src/net.c:586
+#, fuzzy, c-format
+msgid "Creating socket for %s port %d failed: %m"
+msgstr "Error al crear el `socket': %m"
+
+#: src/net.c:597
+#, c-format
+msgid "%s port %hd: %m"
+msgstr ""
+
+#: src/net.c:604
 #, c-format
-msgid "Connected to %s:%hd"
+msgid "fcntl for %s port %d: %m"
+msgstr ""
+
+#: src/net.c:610
+#, fuzzy, c-format
+msgid "Connected to %s port %hd"
 msgstr "Conectado a %s:%hd"
 
-#: src/net.c:495
-msgid "Could not set up a meta connection."
+#: src/net.c:630
+#, fuzzy, c-format
+msgid "Error looking up `%s': %m"
+msgstr "Error buscando `%s': %s\n"
+
+#: src/net.c:640
+#, fuzzy, c-format
+msgid "Could not set up a meta connection to %s"
 msgstr "No he podido configurar una meta conexión."
 
-#: src/net.c:519
+#: src/net.c:665
 msgid "No value for my VPN IP given"
 msgstr "No se ha definido un valor para mi VPN IP"
 
-#: src/net.c:533
+#: src/net.c:690
 msgid "Unable to set up a listening socket"
 msgstr "No puedo configurar un `socket' a la escucha"
 
-#: src/net.c:539
+#: src/net.c:696
 msgid "Unable to set up an incoming vpn data socket"
 msgstr "No puedo configurar un `socket' para recibir datos de la vpn"
 
-#: src/net.c:546
-#, c-format
-msgid "Ready: listening on port %d."
+#: src/net.c:703
+#, fuzzy, c-format
+msgid "Ready: listening on port %hd"
 msgstr "Listo: escuchando en el puerto %d."
 
-#: src/net.c:569
-#, c-format
-msgid "Still failed to connect to other. Will retry in %d seconds."
+#: src/net.c:730
+#, fuzzy, c-format
+msgid "Still failed to connect to other, will retry in %d seconds"
 msgstr "Siguo sin poder conectar con el otro. Lo reintentaré en %d segundos."
 
-#: src/net.c:602
-msgid "Try to re-establish outgoing connection in 5 minutes."
-msgstr "Intento reestablecer la conexión saliente en 5 minutos."
+#: src/net.c:768
+#, fuzzy, c-format
+msgid "Trying to re-establish outgoing connection in %d seconds"
+msgstr "Intento re-establecer la conexión saliente en 5 segundos."
 
-#: src/net.c:640
-msgid "Terminating."
+#: src/net.c:806
+#, fuzzy
+msgid "Terminating"
 msgstr "Terminando."
 
-#: src/net.c:654
-msgid "Opening UDP socket to "
+#: src/net.c:820
+#, fuzzy, c-format
+msgid "Opening UDP socket to %s"
 msgstr "Abriendo `socket' UDP a "
 
-#: src/net.c:659
-#, c-format
-msgid "Creating data socket failed: %m"
-msgstr "Error al crear `socket' de datos: %m"
+#: src/net.c:825
+#, fuzzy, c-format
+msgid "Creating UDP socket failed: %m"
+msgstr "Error al crear el `socket': %m"
 
-#: src/net.c:669
-msgid "Connecting to "
-msgstr "Conectando a "
+#: src/net.c:835
+#, fuzzy, c-format
+msgid "Connecting to %s port %d failed: %m"
+msgstr "Error al crear `socket' de datos: %m"
 
-#: src/net.c:677 src/net.c:761 src/net.c:954
-#, c-format
-msgid "This is a bug: %s:%d: %d:%m"
+#: src/net.c:843 src/net.c:930 src/net.c:1128
+#, fuzzy, c-format
+msgid "This is a bug: %s:%d: %d:%m %s (%s)"
 msgstr "Esto es un `bug': %s:%d: %d:%m"
 
-#: src/net.c:701
+#: src/net.c:868
 #, c-format
 msgid "Error: getpeername: %m"
 msgstr "Error: getpeername(): %m"
 
-#: src/net.c:713
-#, c-format
-msgid "Connection from %s:%d"
+#: src/net.c:881
+#, fuzzy, c-format
+msgid "Connection from %s port %d"
 msgstr "Conexión desde %s:%d"
 
-#: src/net.c:766
-#, c-format
-msgid "Incoming data socket error: %s"
+#: src/net.c:936
+#, fuzzy, c-format
+msgid "Incoming data socket error for %s (%s): %s"
 msgstr "Error en el `socket' de recepción de datos: %s"
 
-#: src/net.c:774
-#, c-format
-msgid "Receiving data failed: %m"
+#: src/net.c:945
+#, fuzzy, c-format
+msgid "Receiving packet from %s (%s) failed: %m"
 msgstr "Error recibiendo datos: %m"
 
-#: src/net.c:787
-msgid "packet from "
-msgstr "paquete desde "
-
-#: src/net.c:791
-msgid "Got packet from unknown source "
-msgstr "He recibido un paquete desde un origen desconocido "
-
-#: src/net.c:825
-#, c-format
-msgid "Closing connection with %s."
+#: src/net.c:993
+#, fuzzy, c-format
+msgid "Closing connection with %s (%s)"
 msgstr "Cerrando conexión con %s."
 
-#: src/net.c:841
-msgid "Try to re-establish outgoing connection in 5 seconds."
+#: src/net.c:1037
+#, fuzzy
+msgid "Trying to re-establish outgoing connection in 5 seconds"
 msgstr "Intento re-establecer la conexión saliente en 5 segundos."
 
-#: src/net.c:893
+#: src/net.c:1067
 #, c-format
-msgid "%s ("
-msgstr "%s ("
+msgid "%s (%s) didn't respond to PING"
+msgstr ""
 
-#: src/net.c:924
+#: src/net.c:1098
 #, c-format
 msgid "Accepting a new connection failed: %m"
 msgstr "Error al aceptar una nueva conexión: %m"
 
-#: src/net.c:932
-msgid "Closed attempted connection."
+#: src/net.c:1106
+#, fuzzy
+msgid "Closed attempted connection"
 msgstr "Se ha cerrado la conexión que se intentaba realizar."
 
-#: src/net.c:959
-#, c-format
-msgid "Metadata socket error: %s"
+#: src/net.c:1134
+#, fuzzy, c-format
+msgid "Metadata socket error for %s (%s): %s"
 msgstr "Error en el `socket' de metadatos: %s"
 
-#: src/net.c:965
-msgid "Metadata read buffer overflow."
+#: src/net.c:1141
+#, fuzzy
+msgid "Metadata read buffer overflow!"
 msgstr "Desbordamiento del búfer de lectura de metadatos"
 
-#: src/net.c:973
-#, c-format
-msgid "Metadata socket read error: %m"
-msgstr "Error de lectura del `socket' de metadatos: %m"
+#: src/net.c:1154
+#, fuzzy, c-format
+msgid "Connection closed by %s (%s)"
+msgstr "Conexión desde %s:%d"
 
-#: src/net.c:1000
-#, c-format
-msgid "Unknown request: %s"
-msgstr "Petición desconocida: %s"
+#: src/net.c:1158
+#, fuzzy, c-format
+msgid "Metadata socket read error for %s (%s): %m"
+msgstr "Error de lectura del `socket' de metadatos: %m"
 
-#: src/net.c:1005
-#, c-format
-msgid "Got request: %s"
+#: src/net.c:1200
+#, fuzzy, c-format
+msgid "Got request from %s (%s): %s"
 msgstr "He recibido una petición: %s"
 
-#: src/net.c:1009
-msgid "Error while processing request from "
+#: src/net.c:1206
+#, fuzzy, c-format
+msgid "Unknown request from %s (%s)"
+msgstr "Petición desconocida: %s"
+
+#: src/net.c:1213
+#, fuzzy, c-format
+msgid "Error while processing request from %s (%s)"
 msgstr "Error al procesar la petición de "
 
-#: src/net.c:1015
-msgid "Bogus data received."
+#: src/net.c:1220
+#, fuzzy, c-format
+msgid "Bogus data received from %s (%s)"
 msgstr "Se han recibido datos sin sentido."
 
-#: src/net.c:1059
-#, c-format
-msgid "Outgoing data socket error: %s"
+#: src/net.c:1266
+#, fuzzy, c-format
+msgid "Outgoing data socket error for %s (%s): %s"
 msgstr "Error en el `socket' de datos salientes: %s"
 
-#: src/net.c:1094
+#: src/net.c:1302
 #, c-format
 msgid "Error while reading from tapdevice: %m"
 msgstr "Error leyendo del dispositivo tap: %m"
 
-#: src/net.c:1104
+#: src/net.c:1312
 #, c-format
 msgid "Non-IP ethernet frame %04x from "
 msgstr "Trama ethernet no-IP %04x de "
 
-#: src/net.c:1112
+#: src/net.c:1320
 msgid "Dropping short packet"
 msgstr "Descartando paquete corto"
 
-#: src/net.c:1120
-#, c-format
-msgid "An IP packet (%04x) for "
-msgstr "Un paquete IP (%04x) para "
-
-#: src/net.c:1158
+#: src/net.c:1359
 #, c-format
 msgid "Error while waiting for input: %m"
 msgstr "Error esperando entrada: %m"
 
-#: src/netutl.c:219
+#: src/net.c:1371
+msgid "Unable to reread configuration file, exiting"
+msgstr ""
+
+#: src/netutl.c:220
 #, c-format
 msgid "Error looking up `%s': %s\n"
 msgstr "Error buscando `%s': %s\n"
 
-#: src/netutl.c:243
+#: src/netutl.c:244
 msgid "Connection list:"
 msgstr "Lista de conexiones:"
 
-#: src/protocol.c:54
+#: src/netutl.c:248
 #, c-format
-msgid "Send ACK to %s"
+msgid ""
+"%s netmask %d.%d.%d.%d at %s port %hd flags %d sockets %d, %d status %04x"
+msgstr ""
+
+#: src/protocol.c:56
+#, fuzzy, c-format
+msgid "Sending ACK to %s (%s)"
 msgstr "Envio ACK a %s"
 
-#: src/protocol.c:60
-#, c-format
-msgid "send failed: %d:%d: %m"
+#: src/protocol.c:63
+#, fuzzy, c-format
+msgid "Send failed: %d:%d: %m"
 msgstr "Error enviando: %d:%d: %m"
 
-#: src/protocol.c:64 src/protocol.c:480
-#, c-format
-msgid "Connection with %s activated."
-msgstr "Activada la conexión con %s."
-
-#: src/protocol.c:73
-msgid "Send TERMREQ to "
+#: src/protocol.c:74
+#, fuzzy, c-format
+msgid "Sending TERMREQ to %s (%s)"
 msgstr "Envío TERMREQ a "
 
-#: src/protocol.c:81 src/protocol.c:99 src/protocol.c:117 src/protocol.c:134
-#: src/protocol.c:148 src/protocol.c:166 src/protocol.c:184 src/protocol.c:212
-#: src/protocol.c:233 src/protocol.c:251 src/protocol.c:265 src/protocol.c:292
-#: src/protocol.c:322 src/protocol.c:656 src/protocol.c:754
-#, c-format
-msgid "send failed: %s:%d: %m"
+#: src/protocol.c:82 src/protocol.c:100 src/protocol.c:118 src/protocol.c:137
+#: src/protocol.c:143 src/protocol.c:161 src/protocol.c:179 src/protocol.c:218
+#: src/protocol.c:236 src/protocol.c:264 src/protocol.c:285 src/protocol.c:303
+#: src/protocol.c:346 src/protocol.c:376 src/protocol.c:866 src/protocol.c:969
+#, fuzzy, c-format
+msgid "Send failed: %s:%d: %m"
 msgstr "Error enviando: %s:%d: %m"
 
-#: src/protocol.c:92
-msgid "Send TIMEOUT to "
+#: src/protocol.c:93
+#, fuzzy, c-format
+msgid "Sending TIMEOUT to %s (%s)"
 msgstr "Envío TIMEOUT a "
 
-#: src/protocol.c:110
-msgid "Sending delete host "
-msgstr "Enviando borra `host' "
+#: src/protocol.c:111
+#, c-format
+msgid "Sending DEL_HOST for %s (%s) to %s (%s)"
+msgstr ""
 
-#: src/protocol.c:128
-msgid "pinging "
-msgstr "pinging "
+#: src/protocol.c:130
+#, fuzzy, c-format
+msgid "Sending PACKET to %s (%s)"
+msgstr "Envio ACK a %s"
+
+#: src/protocol.c:154
+#, fuzzy, c-format
+msgid "Sending PING to %s (%s)"
+msgstr "Enviando KEY_CHANGED to "
 
-#: src/protocol.c:159
-msgid "Sending add host to "
-msgstr "Enviando añade `host' a "
+#: src/protocol.c:172
+#, fuzzy, c-format
+msgid "Sending PONG to %s (%s)"
+msgstr "Enviando KEY_CHANGED to "
+
+#: src/protocol.c:211
+#, c-format
+msgid "Sending ADD_HOST for %s (%s) to %s (%s)"
+msgstr ""
 
-#: src/protocol.c:177
-msgid "Sending KEY_CHANGED to "
+#: src/protocol.c:229
+#, fuzzy, c-format
+msgid "Sending KEY_CHANGED origin %s to %s (%s)"
 msgstr "Enviando KEY_CHANGED to "
 
-#: src/protocol.c:205
-msgid "Send BASIC_INFO to "
+#: src/protocol.c:257
+#, fuzzy, c-format
+msgid "Sending BASIC_INFO to %s"
 msgstr "Enviando BASIC_INFO a "
 
-#: src/protocol.c:226
-#, c-format
-msgid "Send PASSPHRASE %s to "
+#: src/protocol.c:278
+#, fuzzy, c-format
+msgid "Sending PASSPHRASE to %s (%s)"
 msgstr "Enviando PASSPHRASE %s a "
 
-#: src/protocol.c:244
-#, c-format
-msgid "Send PUBLIC_KEY %s to "
+#: src/protocol.c:296
+#, fuzzy, c-format
+msgid "Sending PUBLIC_KEY to %s (%s)"
 msgstr "Enviando PUBLIC_KEY %s a "
 
-#: src/protocol.c:279
-msgid "Attempting to send key request to "
-msgstr "Intentando enviar petición de clave a "
+#: src/protocol.c:333
+#, c-format
+msgid "Attempting to send REQ_KEY to %d.%d.%d.%d, which does not exist?"
+msgstr ""
+
+#: src/protocol.c:339
+#, fuzzy, c-format
+msgid "Sending REQ_KEY to %s (%s)"
+msgstr "Enviando KEY_CHANGED to "
 
-#: src/protocol.c:285
-msgid "Sending out request for public key to "
-msgstr "Enviando petición de clave pública a "
+#: src/protocol.c:363
+#, c-format
+msgid "Attempting to send ANS_KEY to %d.%d.%d.%d, which does not exist?"
+msgstr ""
 
-#: src/protocol.c:309
-msgid "Attempting to send key answer to "
-msgstr "Intentando enviar respuesta de la clave a "
+#: src/protocol.c:369
+#, fuzzy, c-format
+msgid "Sending ANS_KEY to %s (%s)"
+msgstr "Envio ACK a %s"
 
-#: src/protocol.c:315
-msgid "Sending public key to "
-msgstr "Enviando clave pública a "
+#: src/protocol.c:424
+#, fuzzy, c-format
+msgid "Got BASIC_INFO from %s"
+msgstr "recibí una petición BASIC_INFO incorrecta: %s"
 
-#: src/protocol.c:370
-#, c-format
-msgid "got bad BASIC_INFO request: %s"
+#: src/protocol.c:428
+#, fuzzy, c-format
+msgid "Got bad BASIC_INFO from %s"
 msgstr "recibí una petición BASIC_INFO incorrecta: %s"
 
-#: src/protocol.c:376
-#, c-format
-msgid "Peer uses incompatible protocol version %d."
+#: src/protocol.c:437
+#, fuzzy, c-format
+msgid "Peer uses incompatible protocol version %d"
 msgstr ""
 "La máquina remota usa una versión incompatible del protocolo (versión %d)."
 
-#: src/protocol.c:382
+#: src/protocol.c:452
 #, c-format
-msgid "got BASIC_INFO(%hd,"
-msgstr "recibí BASIC_INFO(%hd,"
-
-#: src/protocol.c:385
-#, c-format
-msgid "Peer uses protocol version %d"
-msgstr "La máquina remota usa la versión %d del protocolo"
+msgid "Uplink %s (%s) is already in our connection list"
+msgstr ""
 
-#: src/protocol.c:411
-#, c-format
-msgid "got bad PASSPHRASE request: %s"
+#: src/protocol.c:482
+#, fuzzy, c-format
+msgid "Got bad PASSPHRASE from %s (%s)"
 msgstr "recibí una petición PASSPHRASE incorrecta: %s"
 
-#: src/protocol.c:417
-msgid "got PASSPHRASE"
-msgstr "recibí PASSPHRASE"
+#: src/protocol.c:489
+#, fuzzy, c-format
+msgid "Got PASSPHRASE from %s (%s)"
+msgstr "recibí una petición PASSPHRASE incorrecta: %s"
 
-#: src/protocol.c:434
-#, c-format
-msgid "got bad PUBLIC_KEY request: %s"
+#: src/protocol.c:507
+#, fuzzy, c-format
+msgid "Got bad PUBLIC_KEY from %s (%s)"
 msgstr "recibí una petición PUBLIC_KEY incorrecta: %s"
 
-#: src/protocol.c:439
-#, c-format
-msgid "got PUBLIC_KEY %s"
+#: src/protocol.c:513
+#, fuzzy, c-format
+msgid "Got PUBLIC_KEY from %s (%s)"
 msgstr "recibí PUBLIC_KEY %s"
 
 #. intruder!
-#: src/protocol.c:444
-msgid "Intruder: passphrase does not match."
+#: src/protocol.c:519
+#, fuzzy, c-format
+msgid "Intruder from %s: passphrase for %s does not match!"
 msgstr "Intruso: la frase de paso no concuerda."
 
-#: src/protocol.c:449
-msgid "Passphrase OK"
-msgstr "Frase de paso OK"
+#: src/protocol.c:538
+#, c-format
+msgid "Removing old entry for %s at %s in favour of new connection from %s"
+msgstr ""
+
+#: src/protocol.c:547 src/protocol.c:567
+#, fuzzy, c-format
+msgid "Connection with %s (%s) activated"
+msgstr "Activada la conexión con %s."
+
+#: src/protocol.c:561
+#, c-format
+msgid "Got ACK from %s (%s)"
+msgstr ""
+
+#: src/protocol.c:583
+#, c-format
+msgid "Got unauthorized TERMREQ from %s (%s)"
+msgstr ""
+
+#: src/protocol.c:589
+#, c-format
+msgid "Got TERMREQ from %s (%s)"
+msgstr ""
 
-#: src/protocol.c:477
-msgid "got ACK"
-msgstr "recibí ACK"
+#: src/protocol.c:604
+#, c-format
+msgid "Got unauthorized TIMEOUT from %s (%s)"
+msgstr ""
 
-#: src/protocol.c:517
+#: src/protocol.c:610
 #, c-format
-msgid "got bad DEL_HOST request: %s"
+msgid "Got TIMEOUT from %s (%s)"
+msgstr ""
+
+#: src/protocol.c:626
+#, fuzzy, c-format
+msgid "Got unauthorized DEL_HOST from %s (%s)"
+msgstr "recibí una petición DEL_HOST incorrecta: %s"
+
+#: src/protocol.c:633
+#, fuzzy, c-format
+msgid "Got bad DEL_HOST from %s (%s)"
 msgstr "recibí una petición DEL_HOST incorrecta: %s"
 
-#: src/protocol.c:522
-msgid "got DEL_HOST for "
-msgstr "recibí DEL_HOST para "
+#: src/protocol.c:640
+#, c-format
+msgid "Got DEL_HOST for %d.%d.%d.%d from %s (%s) which does not exist?"
+msgstr ""
+
+#: src/protocol.c:648
+#, c-format
+msgid "Warning: got DEL_HOST from %s (%s) for ourself, restarting"
+msgstr ""
+
+#: src/protocol.c:655
+#, c-format
+msgid "Got DEL_HOST for %s (%s) from %s (%s)"
+msgstr ""
+
+#: src/protocol.c:674
+#, c-format
+msgid "Got unauthorized PACKET from %s (%s)"
+msgstr ""
+
+#: src/protocol.c:681
+#, c-format
+msgid "Got bad PACKET from %s (%s)"
+msgstr ""
+
+#: src/protocol.c:688
+#, c-format
+msgid "Got too big PACKET from %s (%s)"
+msgstr ""
 
-#: src/protocol.c:527
-msgid "Somebody wanted to delete "
-msgstr "Alguien quería borrar "
+#: src/protocol.c:694
+#, c-format
+msgid "Got PACKET length %d from %s (%s)"
+msgstr ""
 
-#: src/protocol.c:545
-msgid "responding to ping from "
-msgstr "respondiendo al `ping' de "
+#: src/protocol.c:708
+#, c-format
+msgid "Got unauthorized PING from %s (%s)"
+msgstr ""
 
-#: src/protocol.c:559
-msgid "ok, got pong from "
-msgstr "ok, recibí `pong' de "
+#: src/protocol.c:714
+#, c-format
+msgid "Got PING from %s (%s)"
+msgstr ""
 
-#: src/protocol.c:577
+#: src/protocol.c:730
 #, c-format
-msgid "got bad ADD_HOST request: %s"
+msgid "Got unauthorized PONG from %s (%s)"
+msgstr ""
+
+#: src/protocol.c:736
+#, c-format
+msgid "Got PONG from %s (%s)"
+msgstr ""
+
+#: src/protocol.c:755
+#, fuzzy, c-format
+msgid "Got unauthorized ADD_HOST from %s (%s)"
 msgstr "recibí una petición ADD_HOST incorrecta: %s"
 
-#: src/protocol.c:582
-msgid "Add host request from "
-msgstr "Añado petición de `host' de "
+#: src/protocol.c:762
+#, fuzzy, c-format
+msgid "Got bad ADD_HOST from %s (%s)"
+msgstr "recibí una petición ADD_HOST incorrecta: %s"
+
+#: src/protocol.c:772
+#, c-format
+msgid "Got duplicate ADD_HOST for %s (%s) from %s (%s)"
+msgstr ""
+
+#: src/protocol.c:779
+#, c-format
+msgid "Removing old entry for %s (%s)"
+msgstr ""
 
-#: src/protocol.c:584
-msgid "got ADD_HOST("
-msgstr "recibí ADD_HOST("
+#: src/protocol.c:789
+#, c-format
+msgid "Warning: got ADD_HOST from %s (%s) for ourself, restarting"
+msgstr ""
 
-#: src/protocol.c:596
-msgid "Invalid add_host request from "
-msgstr "Petición add_host no válida de "
+#: src/protocol.c:809
+#, c-format
+msgid "Got ADD_HOST for %s (%s) from %s (%s)"
+msgstr ""
 
-#: src/protocol.c:625
+#: src/protocol.c:827
 #, c-format
-msgid "got bad request: %s"
-msgstr "recibí una petición incorrecta: %s"
+msgid "Got unauthorized REQ_KEY from %s (%s)"
+msgstr ""
 
-#: src/protocol.c:630
-msgid "got REQ_KEY from "
+#: src/protocol.c:834
+#, fuzzy, c-format
+msgid "Got bad REQ_KEY from %s (%s)"
 msgstr "recibí REQ_KEY de "
 
-#: src/protocol.c:643
-msgid "Attempting to forward key request to "
-msgstr "Intentando redirigir petición de clave a "
+#: src/protocol.c:840
+#, c-format
+msgid "Got REQ_KEY origin %d.%d.%d.%d destination %d.%d.%d.%d from %s (%s)"
+msgstr ""
+
+#: src/protocol.c:853
+#, c-format
+msgid "Attempting to forward REQ_KEY to %d.%d.%d.%d, which does not exist?"
+msgstr ""
 
-#: src/protocol.c:649
-msgid "Forwarding request for public key to "
-msgstr "Reenviando petición de clave pública a "
+#: src/protocol.c:859
+#, c-format
+msgid "Forwarding REQ_KEY to %s (%s)"
+msgstr ""
 
-#: src/protocol.c:709 src/protocol.c:769
+#: src/protocol.c:918
 #, c-format
-msgid "got bad ANS_KEY request: %s"
+msgid "Got unauthorized ANS_KEY from %s (%s)"
+msgstr ""
+
+#: src/protocol.c:925
+#, fuzzy, c-format
+msgid "Got bad ANS_KEY from %s (%s)"
 msgstr "recibí una petición ANS_KEY incorrecta: %s"
 
-#: src/protocol.c:714
-msgid "got ANS_KEY from "
-msgstr "recibí ANS_KEY de "
+#: src/protocol.c:931
+#, c-format
+msgid "Got ANS_KEY origin %d.%d.%d.%d destination %d.%d.%d.%d from %s (%s)"
+msgstr ""
 
-#: src/protocol.c:720
-msgid "Yeah! key arrived. Now do something with it."
-msgstr "¡Sí! ha llegado una clave. Ahora a hacer algo con ella."
+#: src/protocol.c:940
+#, c-format
+msgid ""
+"Receiving ANS_KEY origin %d.%d.%d.%d from %s (%s), which does not exist?"
+msgstr ""
 
-#: src/protocol.c:725
-msgid "Receiving key from "
-msgstr "Recibiendo clave de "
+#: src/protocol.c:956
+#, c-format
+msgid "Attempting to forward ANS_KEY to %d.%d.%d.%d, which does not exist?"
+msgstr ""
 
-#: src/protocol.c:741
-msgid "Attempting to forward key to "
-msgstr "Intentando redirigir la clave a "
+#: src/protocol.c:962
+#, c-format
+msgid "Forwarding ANS_KEY to %s (%s)"
+msgstr ""
 
-#: src/protocol.c:747
-msgid "Forwarding public key to "
-msgstr "Redirigiendo clave pública a "
+#: src/protocol.c:983
+#, fuzzy, c-format
+msgid "Got unauthorized KEY_CHANGED from %s (%s)"
+msgstr "recibí KEY_CHANGED de "
 
-#: src/protocol.c:774
-msgid "got KEY_CHANGED from "
+#: src/protocol.c:990
+#, fuzzy, c-format
+msgid "Got bad KEY_CHANGED from %s (%s)"
 msgstr "recibí KEY_CHANGED de "
 
-#: src/protocol.c:781
-msgid "Got changed key from "
-msgstr "Recibí clave modificada de "
+#: src/protocol.c:999
+#, c-format
+msgid "Got KEY_CHANGED origin %d.%d.%d.%d from %s (%s), which does not exist?"
+msgstr ""
 
-#: src/protocol.c:790
-msgid "Forwarding key invalidation request"
-msgstr "Redirigiendo petición de invalidación de clave"
+#: src/protocol.c:1005
+#, fuzzy, c-format
+msgid "Got KEY_CHANGED origin %s from %s (%s)"
+msgstr "recibí KEY_CHANGED de "
 
-#: src/tincd.c:95
+#: src/tincd.c:96
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Pruebe `%s --help' para más información.\n"
 
-#: src/tincd.c:98
+#: src/tincd.c:99
 #, c-format
 msgid ""
 "Usage: %s [option]...\n"
@@ -582,7 +788,7 @@ msgstr ""
 "Modo de empleo: %s [opción]...\n"
 "\n"
 
-#: src/tincd.c:99
+#: src/tincd.c:100
 msgid ""
 "  -c, --config=FILE     Read configuration options from FILE.\n"
 "  -D, --no-detach       Don't fork and detach.\n"
@@ -599,7 +805,7 @@ msgstr ""
 "  -t, --timeout=TIEMPO  Segundos a esperar antes de cancelar una "
 "trasmisión.\n"
 
-#: src/tincd.c:105
+#: src/tincd.c:106
 msgid ""
 "      --help            Display this help and exit.\n"
 "      --version         Output version information and exit.\n"
@@ -609,67 +815,67 @@ msgstr ""
 "      --version         Muestra información de la versión y termina.\n"
 "\n"
 
-#: src/tincd.c:107
+#: src/tincd.c:108
 msgid "Report bugs to tinc@nl.linux.org.\n"
 msgstr "Comunicar `bugs' a tinc@nl.linux.org.\n"
 
-#: src/tincd.c:145
+#: src/tincd.c:146
 #, c-format
 msgid "Invalid timeout value `%s'.\n"
 msgstr "Valor de `timeout' no válido `%s'.\n"
 
-#: src/tincd.c:159
-#, c-format
-msgid "Memory exhausted (last is %s:%d) (couldn't allocate %d bytes); exiting."
+#: src/tincd.c:160
+#, fuzzy, c-format
+msgid "Memory exhausted (last is %s:%d) (couldn't allocate %d bytes), exiting."
 msgstr ""
 "Memoria agotada (la última es %s:%d) (no pude asignar %d bytes); terminando."
 
-#: src/tincd.c:214
-#, c-format
-msgid "tincd %s (%s %s) starting, debug level %d."
+#: src/tincd.c:215
+#, fuzzy, c-format
+msgid "tincd %s (%s %s) starting, debug level %d"
 msgstr "tincd %s (%s %s) comenzando, nivel de depuración %d."
 
-#: src/tincd.c:217
-#, c-format
-msgid "tincd %s starting, debug level %d."
+#: src/tincd.c:218
+#, fuzzy, c-format
+msgid "tincd %s starting"
 msgstr "tincd %s comenzando, nivel de depuración %d."
 
-#: src/tincd.c:232
-#, c-format
-msgid "Total bytes written: tap %d, socket %d; bytes read: tap %d, socket %d."
+#: src/tincd.c:233
+#, fuzzy, c-format
+msgid "Total bytes written: tap %d, socket %d; bytes read: tap %d, socket %d"
 msgstr ""
 "Total de bytes escritos: tap %d, socket %d; bytes leidos: tap %d, socket %d."
 
-#: src/tincd.c:250
+#: src/tincd.c:251
 #, c-format
 msgid "A tincd is already running for net `%s' with pid %d.\n"
 msgstr ""
 "Un tincd está actualmente en ejecución para la red `%s' con el pid %d.\n"
 
-#: src/tincd.c:253
+#: src/tincd.c:254
 #, c-format
 msgid "A tincd is already running with pid %d.\n"
 msgstr "Un tincd está actualmente en ejecución con el pid %d.\n"
 
-#: src/tincd.c:274
+#: src/tincd.c:275
 #, c-format
 msgid "No other tincd is running for net `%s'.\n"
 msgstr "No hay ningún otro tincd en ejecución para la red `%s'.\n"
 
-#: src/tincd.c:276
+#: src/tincd.c:277
 msgid "No other tincd is running.\n"
 msgstr "No hay ningún otro tincd en ejecución.\n"
 
-#: src/tincd.c:283
+#: src/tincd.c:284
 msgid "Removing stale lock file.\n"
 msgstr "Borrando fichero de bloqueo en desuso.\n"
 
-#: src/tincd.c:339
+#: src/tincd.c:334
 #, c-format
-msgid "%s version %s\n"
-msgstr "%s versión %s\n"
+msgid "%s version %s (built %s %s, protocol %d)\n"
+msgstr ""
 
-#: src/tincd.c:340
+#: src/tincd.c:335
 msgid ""
 "Copyright (C) 1998,1999,2000 Ivo Timmermans and others,\n"
 "see the AUTHORS file for a complete list.\n"
@@ -686,57 +892,177 @@ msgstr ""
 "y puede ser redistribuido bajo ciertas condiciones;\n"
 "vea el fichero COPYING para los detalles.\n"
 
-#: src/tincd.c:345
+#: src/tincd.c:340
 msgid ""
 "This product includes software developed by Eric Young (eay@mincom.oz.au)\n"
 msgstr ""
 "Este producto incluye software desarrollado por Eric Young "
 "(eay@mincom.oz.au)\n"
 
-#: src/tincd.c:355
-msgid "You must be root to run this program. sorry.\n"
+#: src/tincd.c:350
+#, fuzzy
+msgid "You must be root to run this program. Sorry.\n"
 msgstr ""
 "Usted debe ser el superusuario para ejecutar este programa. Lo siento.\n"
 
-#: src/tincd.c:390
+#: src/tincd.c:380
+#, c-format
+msgid "Unrecoverable error, restarting in %d seconds!"
+msgstr ""
+
+#: src/tincd.c:389
 msgid "Got TERM signal"
 msgstr "Recibí la señal TERM"
 
-#: src/tincd.c:398
+#: src/tincd.c:397
 msgid "Got QUIT signal"
 msgstr "Recibí la señal QUIT"
 
-#: src/tincd.c:405
+#: src/tincd.c:404
 msgid "Got another SEGV signal: not restarting"
 msgstr "Recibí otra señal SEGV: no reinicio"
 
-#: src/tincd.c:413
-#, c-format
-msgid "Got SEGV signal after %s line %d. Trying to re-execute."
+#: src/tincd.c:412
+#, fuzzy, c-format
+msgid "Got SEGV signal after %s line %d, trying to re-execute"
 msgstr "Recibí la señal SEGV después de %s línea %d. Intento reiniciar."
 
-#: src/tincd.c:416
-msgid "Got SEGV signal; trying to re-execute."
+#: src/tincd.c:415
+#, fuzzy
+msgid "Got SEGV signal, trying to re-execute"
 msgstr "Recibí la señal SEGV; intento reiniciar."
 
-#: src/tincd.c:429
-msgid "Got HUP signal"
-msgstr "Recibí la señal HUP"
+#: src/tincd.c:427
+msgid "Got HUP signal, rereading configuration and restarting"
+msgstr ""
 
-#: src/tincd.c:439
-msgid "Got INT signal"
+#: src/tincd.c:435
+#, fuzzy
+msgid "Got INT signal, exiting"
 msgstr "Recibí la señal INT"
 
-#: src/tincd.c:453
-msgid "Forcing new key generation"
+#: src/tincd.c:449
+#, fuzzy
+msgid "Got USR2 signal, forcing new key generation"
 msgstr "Forzando generación de una nueva clave"
 
-#: src/tincd.c:461
-#, c-format
-msgid "Got unexpected signal (%d) after %s line %d."
+#: src/tincd.c:457
+#, fuzzy, c-format
+msgid "Got unexpected signal %d after %s line %d"
 msgstr "Recibí una señal inesperada (%d) después de %s línea %d."
 
-#: src/tincd.c:464
-#, c-format
-msgid "Got unexpected signal (%d)."
+#: src/tincd.c:460
+#, fuzzy, c-format
+msgid "Got unexpected signal %d"
 msgstr "Recibí una señal inesperada (%d)."
+
+#~ msgid "packet to queue: %d"
+#~ msgstr "paquete a poner en cola: %d"
+
+#~ msgid "trying to look up "
+#~ msgstr "intentando buscar "
+
+#~ msgid "Try to re-establish outgoing connection in 5 minutes."
+#~ msgstr "Intento reestablecer la conexión saliente en 5 minutos."
+
+#~ msgid "Connecting to "
+#~ msgstr "Conectando a "
+
+#~ msgid "packet from "
+#~ msgstr "paquete desde "
+
+#~ msgid "%s ("
+#~ msgstr "%s ("
+
+#~ msgid "An IP packet (%04x) for "
+#~ msgstr "Un paquete IP (%04x) para "
+
+#~ msgid "Sending delete host "
+#~ msgstr "Enviando borra `host' "
+
+#~ msgid "pinging "
+#~ msgstr "pinging "
+
+#~ msgid "Sending add host to "
+#~ msgstr "Enviando añade `host' a "
+
+#~ msgid "Attempting to send key request to "
+#~ msgstr "Intentando enviar petición de clave a "
+
+#~ msgid "Sending out request for public key to "
+#~ msgstr "Enviando petición de clave pública a "
+
+#~ msgid "Attempting to send key answer to "
+#~ msgstr "Intentando enviar respuesta de la clave a "
+
+#~ msgid "Sending public key to "
+#~ msgstr "Enviando clave pública a "
+
+#~ msgid "got BASIC_INFO(%hd,"
+#~ msgstr "recibí BASIC_INFO(%hd,"
+
+#~ msgid "Peer uses protocol version %d"
+#~ msgstr "La máquina remota usa la versión %d del protocolo"
+
+#~ msgid "got PASSPHRASE"
+#~ msgstr "recibí PASSPHRASE"
+
+#~ msgid "Passphrase OK"
+#~ msgstr "Frase de paso OK"
+
+#~ msgid "got ACK"
+#~ msgstr "recibí ACK"
+
+#~ msgid "got DEL_HOST for "
+#~ msgstr "recibí DEL_HOST para "
+
+#~ msgid "Somebody wanted to delete "
+#~ msgstr "Alguien quería borrar "
+
+#~ msgid "responding to ping from "
+#~ msgstr "respondiendo al `ping' de "
+
+#~ msgid "ok, got pong from "
+#~ msgstr "ok, recibí `pong' de "
+
+#~ msgid "Add host request from "
+#~ msgstr "Añado petición de `host' de "
+
+#~ msgid "got ADD_HOST("
+#~ msgstr "recibí ADD_HOST("
+
+#~ msgid "Invalid add_host request from "
+#~ msgstr "Petición add_host no válida de "
+
+#~ msgid "got bad request: %s"
+#~ msgstr "recibí una petición incorrecta: %s"
+
+#~ msgid "Attempting to forward key request to "
+#~ msgstr "Intentando redirigir petición de clave a "
+
+#~ msgid "Forwarding request for public key to "
+#~ msgstr "Reenviando petición de clave pública a "
+
+#~ msgid "got ANS_KEY from "
+#~ msgstr "recibí ANS_KEY de "
+
+#~ msgid "Yeah! key arrived. Now do something with it."
+#~ msgstr "¡Sí! ha llegado una clave. Ahora a hacer algo con ella."
+
+#~ msgid "Attempting to forward key to "
+#~ msgstr "Intentando redirigir la clave a "
+
+#~ msgid "Forwarding public key to "
+#~ msgstr "Redirigiendo clave pública a "
+
+#~ msgid "Got changed key from "
+#~ msgstr "Recibí clave modificada de "
+
+#~ msgid "Forwarding key invalidation request"
+#~ msgstr "Redirigiendo petición de invalidación de clave"
+
+#~ msgid "%s version %s\n"
+#~ msgstr "%s versión %s\n"
+
+#~ msgid "Got HUP signal"
+#~ msgstr "Recibí la señal HUP"