X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=po%2Fes.po;h=d619e13ce68e38a2946a5a182662b38e8c6e04ca;hp=a040e0ddcc344c2b048f7ba78d7cd58ee8f4177e;hb=785684f0ec5c9250788b4b32c0eab3f358c9db61;hpb=d2c062a0a440d2871939b4ffdc2dbb137a4d45e7

diff --git a/po/es.po b/po/es.po
index a040e0dd..d619e13c 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-08-17 18:13+0100\n"
+"POT-Creation-Date: 2000-11-04 16:32+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,110 +13,123 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/conf.c:178
+#: src/conf.c:164
 #, c-format
-msgid "%s: %d: Invalid variable name `%s'.\n"
-msgstr "%s: %d: Nombre de variable `%s' no válido.\n"
+msgid "Line %d too long while reading config file %s"
+msgstr ""
 
-#: src/conf.c:185
+#: src/conf.c:180
 #, c-format
-msgid "%s: %d: No value given for `%s'.\n"
-msgstr "%s: %d: No se ha definido un valor para `%s'.\n"
+msgid "Invalid variable name on line %d while reading config file %s"
+msgstr ""
 
-#: src/conf.c:193
+#: src/conf.c:187
 #, 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"
+msgid "No value for variable on line %d while reading config file %s"
+msgstr ""
 
-#: src/conf.c:217
+#: src/conf.c:195
 #, c-format
-msgid "Could not open %s: %s\n"
-msgstr "No pude abrir %s: %s\n"
+msgid "Invalid value for variable on line %d while reading config file %s"
+msgstr ""
 
-#: src/encr.c:111 src/net.c:445
+#: src/conf.c:219
 #, c-format
-msgid "Could not open %s: %m"
-msgstr "No pude abrir %s: %m"
+msgid "Failed to read `%s': %m\n"
+msgstr ""
+
+#: src/connlist.c:168
+#, fuzzy
+msgid "Connection list:"
+msgstr "Conectando a "
 
-#: src/encr.c:118
+#: src/connlist.c:170 src/connlist.c:183
 #, c-format
-msgid "Illegal passphrase in %s; size would be %d"
-msgstr "Frase de paso ilegal en %s; el tamaño debe ser %d"
+msgid " %s at %s port %hd flags %d sockets %d, %d status %04x"
+msgstr ""
+
+#: src/connlist.c:195
+#, fuzzy
+msgid "End of connection list."
+msgstr "Cerrando conexión con %s."
 
-#: src/encr.c:153
+#: src/meta.c:45
 #, fuzzy, c-format
-msgid "Generating %d bits keys"
-msgstr "Generando claves de %d bits."
+msgid "Sending %d bytes of metadata to %s (%s): %s"
+msgstr "Enviados %d bytes a %lx"
 
-#: src/encr.c:157
-#, c-format
-msgid "Opening /dev/urandom failed: %m"
-msgstr "Fallo abriendo /dev/urandom : %m"
+#: src/meta.c:61
+#, fuzzy, c-format
+msgid "Sending meta data to %s (%s) failed: %m"
+msgstr "Error enviando datos: %m"
 
-#: src/encr.c:222
-#, c-format
-msgid "Encryption key set to %s"
-msgstr "Clave de cifrado definida como %s"
+#: src/meta.c:89 src/net.c:962
+#, fuzzy, c-format
+msgid "This is a bug: %s:%d: %d:%m %s (%s)"
+msgstr "Esto es un `bug': %s:%d: %d:%m"
 
-#: src/genauth.c:48
-#, c-format
-msgid "Usage: %s bits\n"
-msgstr "Uso: %s bits\n"
+#: src/meta.c:95
+#, fuzzy, c-format
+msgid "Metadata socket error for %s (%s): %s"
+msgstr "Error en el `socket' de metadatos: %s"
 
-#: src/genauth.c:57
-#, c-format
-msgid "Illegal number: %s\n"
-msgstr "Número ilegal: %s\n"
+#: src/meta.c:114
+#, fuzzy, c-format
+msgid "Connection closed by %s (%s)"
+msgstr "Conexión desde %s:%d"
 
-#: src/genauth.c:62
-#, c-format
-msgid "Generating %d bits number"
-msgstr "Generando número de %d bits"
+#: src/meta.c:118
+#, fuzzy, c-format
+msgid "Metadata socket read error for %s (%s): %m"
+msgstr "Error de lectura del `socket' de metadatos: %m"
 
-#: src/genauth.c:67
-msgid "Opening /dev/urandom"
-msgstr "Abriendo /dev/urandom"
+#: src/meta.c:148
+#, fuzzy, c-format
+msgid "Got request from %s (%s): %s"
+msgstr "Petición desconocida: %s"
 
-#: src/genauth.c:80
-msgid "File was empty!\n"
-msgstr "¡El fichero estaba vacío!\n"
+#: src/meta.c:166
+#, fuzzy, c-format
+msgid "Metadata read buffer overflow for %s (%s)"
+msgstr "Desbordamiento del búfer de lectura de metadatos"
 
-#: src/genauth.c:88
-msgid ""
-": done.\n"
-"The following line should be ENTIRELY copied into a passphrase file:\n"
+#: src/net.c:93 src/net.c:470 src/net.c:477 src/net.c:485 src/net.c:516
+#: src/net.c:542 src/net.c:550 src/net.c:987
+#, c-format
+msgid "System call `%s' failed: %m"
 msgstr ""
-": hecho.\n"
-"La siguiente línea debe ser copiada ENTERA a un fichero de frase de paso:\n"
 
-#: src/genauth.c:100
-msgid ": done.\n"
-msgstr ": hecho.\n"
+#. No return on success
+#. Ignore if the file does not exist
+#: src/net.c:112
+#, fuzzy, c-format
+msgid "Error executing `%s': %m"
+msgstr "Error esperando entrada: %m"
 
-#: src/net.c:106
+#: src/net.c:139
 #, fuzzy, c-format
 msgid "Sending packet of %d bytes to %s (%s)"
 msgstr "Enviados %d bytes a %lx"
 
-#: src/net.c:118
+#: src/net.c:148
 #, fuzzy, c-format
 msgid "Error sending packet to %s (%s): %m"
 msgstr "Error enviando datos: %m"
 
-#: src/net.c:135 src/net.c:177
+#: src/net.c:177
 #, fuzzy, c-format
-msgid "Receiving packet of %d bytes from %s (%s)"
-msgstr "Recibiendo clave de "
+msgid "Writing packet of %d bytes to tap device"
+msgstr "Enviados %d bytes a %lx"
 
-#: src/net.c:139 src/net.c:181
-#, c-format
-msgid "Can't write to tap device: %m"
+#: src/net.c:187
+#, fuzzy, c-format
+msgid "Can't write to tun/tap device: %m"
 msgstr "No puedo escribir en el dispositivo tap: %m"
 
-#: src/net.c:166 src/net.c:959
+#: src/net.c:194
 #, 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 "
+msgid "Can't write to ethertap device: %m"
+msgstr "No puedo escribir en el dispositivo tap: %m"
 
 #: src/net.c:295
 #, fuzzy
@@ -133,61 +146,31 @@ msgstr "Vaciando la cola de env
 msgid "Flushing receive queue for %s (%s)"
 msgstr "Vaciando la cola de recepción para "
 
-#: src/net.c:336
+#: src/net.c:337
 #, c-format
 msgid "Trying to look up %d.%d.%d.%d in connection list failed!"
 msgstr ""
 
-#: 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: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
+#: src/net.c:353
 #, 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 ""
+msgid "Could not open %s: %m"
+msgstr "No pude abrir %s: %m"
 
-#: src/net.c:419
+#: src/net.c:436
 #, c-format
-msgid "%s (%s) is not ready, queueing packet"
+msgid "%s is a new style tun/tap device"
 msgstr ""
 
-#: src/net.c:467
+#: src/net.c:464
 #, c-format
 msgid "Creating metasocket failed: %m"
 msgstr "Fallo al crear el metasocket: %m"
 
-#: src/net.c:473 src/net.c:479 src/net.c:541
-#, c-format
-msgid "setsockopt: %m"
-msgstr "setsockopt(): %m"
-
-#: src/net.c:486 src/net.c:548
-#, c-format
-msgid "fcntl: %m"
-msgstr "fcntl(): %m"
-
 #: src/net.c:494
 #, c-format
 msgid "Unable to bind listen socket to interface %s: %m"
@@ -198,588 +181,577 @@ msgstr ""
 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:516
-#, c-format
-msgid "listen: %m"
-msgstr "listen(): %m"
-
-#: src/net.c:535
+#: src/net.c:536
 #, c-format
 msgid "Creating socket failed: %m"
 msgstr "Error al crear el `socket': %m"
 
-#: src/net.c:559
+#: src/net.c:562
 #, 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:576
+#: src/net.c:579
 #, fuzzy, c-format
 msgid "Trying to connect to %s"
 msgstr "Cerrando conexión con %s."
 
-#: src/net.c:586
+#: src/net.c:589
 #, fuzzy, c-format
 msgid "Creating socket for %s port %d failed: %m"
 msgstr "Error al crear el `socket': %m"
 
-#: src/net.c:597
+#: src/net.c:600
 #, c-format
 msgid "%s port %hd: %m"
 msgstr ""
 
-#: src/net.c:604
+#: src/net.c:607
 #, c-format
 msgid "fcntl for %s port %d: %m"
 msgstr ""
 
-#: src/net.c:610
+#: src/net.c:613
 #, fuzzy, c-format
 msgid "Connected to %s port %hd"
 msgstr "Conectado a %s:%hd"
 
-#: src/net.c:630
+#: src/net.c:636
+msgid "Invalid name for outgoing connection"
+msgstr ""
+
+#: src/net.c:645
+#, c-format
+msgid "Error reading host configuration file for %s"
+msgstr ""
+
+#: src/net.c:652
+#, c-format
+msgid "No address specified for %s"
+msgstr ""
+
+#: src/net.c:659
 #, fuzzy, c-format
 msgid "Error looking up `%s': %m"
 msgstr "Error buscando `%s': %s\n"
 
-#: src/net.c:640
+#: src/net.c:669
 #, 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:665
-msgid "No value for my VPN IP given"
-msgstr "No se ha definido un valor para mi VPN IP"
+#: src/net.c:704
+msgid "Name for tinc daemon required!"
+msgstr ""
+
+#: src/net.c:712
+msgid "Invalid name for myself!"
+msgstr ""
+
+#: src/net.c:718
+msgid "Private key for tinc daemon required!"
+msgstr ""
+
+#: src/net.c:730
+msgid "Cannot open host configuration file for myself!"
+msgstr ""
+
+#: src/net.c:736
+msgid "Public key for tinc daemon required!"
+msgstr ""
+
+#: src/net.c:776
+msgid "Network address and subnet mask do not match!"
+msgstr ""
 
-#: src/net.c:690
-msgid "Unable to set up a listening socket"
+#: src/net.c:785
+#, fuzzy
+msgid "Unable to set up a listening socket!"
 msgstr "No puedo configurar un `socket' a la escucha"
 
-#: src/net.c:696
-msgid "Unable to set up an incoming vpn data socket"
+#: src/net.c:791
+#, fuzzy
+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:703
+#: src/net.c:816
 #, fuzzy, c-format
 msgid "Ready: listening on port %hd"
 msgstr "Listo: escuchando en el puerto %d."
 
-#: src/net.c:730
+#: src/net.c:848
 #, 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:768
+#: src/net.c:890
 #, 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:806
+#: src/net.c:925
 #, fuzzy
 msgid "Terminating"
 msgstr "Terminando."
 
-#: src/net.c:820
+#: src/net.c:939
 #, fuzzy, c-format
 msgid "Opening UDP socket to %s"
 msgstr "Abriendo `socket' UDP a "
 
-#: src/net.c:825
+#: src/net.c:944
 #, fuzzy, c-format
 msgid "Creating UDP socket failed: %m"
 msgstr "Error al crear el `socket': %m"
 
-#: src/net.c:835
+#: src/net.c:954
 #, fuzzy, c-format
 msgid "Connecting to %s port %d failed: %m"
 msgstr "Error al crear `socket' de datos: %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:868
-#, c-format
-msgid "Error: getpeername: %m"
-msgstr "Error: getpeername(): %m"
-
-#: src/net.c:881
+#: src/net.c:1003
 #, fuzzy, c-format
 msgid "Connection from %s port %d"
 msgstr "Conexión desde %s:%d"
 
-#: src/net.c:936
+#: src/net.c:1049
+#, fuzzy, c-format
+msgid "This is a bug: %s:%d: %d:%m"
+msgstr "Esto es un `bug': %s:%d: %d:%m"
+
+#: src/net.c:1055
 #, fuzzy, c-format
-msgid "Incoming data socket error for %s (%s): %s"
+msgid "Incoming data socket error: %s"
 msgstr "Error en el `socket' de recepción de datos: %s"
 
-#: src/net.c:945
+#: src/net.c:1061
 #, fuzzy, c-format
-msgid "Receiving packet from %s (%s) failed: %m"
+msgid "Receiving packet failed: %m"
 msgstr "Error recibiendo datos: %m"
 
-#: src/net.c:993
+#: src/net.c:1067
+#, fuzzy, c-format
+msgid "Received packet of %d bytes"
+msgstr "Recibiendo clave de "
+
+#: src/net.c:1089
 #, fuzzy, c-format
 msgid "Closing connection with %s (%s)"
 msgstr "Cerrando conexión con %s."
 
-#: src/net.c:1037
+#: src/net.c:1125
 #, 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:1067
+#: src/net.c:1157
 #, c-format
 msgid "%s (%s) didn't respond to PING"
 msgstr ""
 
-#: src/net.c:1098
+#: src/net.c:1188
 #, c-format
 msgid "Accepting a new connection failed: %m"
 msgstr "Error al aceptar una nueva conexión: %m"
 
-#: src/net.c:1106
+#: src/net.c:1196
 #, fuzzy
 msgid "Closed attempted connection"
 msgstr "Se ha cerrado la conexión que se intentaba realizar."
 
-#: src/net.c:1134
+#: src/net.c:1229
 #, fuzzy, c-format
-msgid "Metadata socket error for %s (%s): %s"
-msgstr "Error en el `socket' de metadatos: %s"
-
-#: src/net.c:1141
-#, fuzzy
-msgid "Metadata read buffer overflow!"
-msgstr "Desbordamiento del búfer de lectura de metadatos"
-
-#: src/net.c:1154
-#, fuzzy, c-format
-msgid "Connection closed by %s (%s)"
-msgstr "Conexión desde %s:%d"
-
-#: 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:1200
-#, fuzzy, c-format
-msgid "Got request from %s (%s): %s"
-msgstr "He recibido una petición: %s"
-
-#: 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 "
+msgid "Outgoing data socket error for %s (%s): %s"
+msgstr "Error en el `socket' de datos salientes: %s"
 
-#: src/net.c:1220
+#: src/net.c:1265
 #, fuzzy, c-format
-msgid "Bogus data received from %s (%s)"
-msgstr "Se han recibido datos sin sentido."
+msgid "Error while reading from tun/tap device: %m"
+msgstr "Error leyendo del dispositivo tap: %m"
 
-#: src/net.c:1266
+#: src/net.c:1274
 #, fuzzy, c-format
-msgid "Outgoing data socket error for %s (%s): %s"
-msgstr "Error en el `socket' de datos salientes: %s"
-
-#: src/net.c:1302
-#, c-format
-msgid "Error while reading from tapdevice: %m"
+msgid "Error while reading from ethertap device: %m"
 msgstr "Error leyendo del dispositivo tap: %m"
 
-#: src/net.c:1312
-#, c-format
-msgid "Non-IP ethernet frame %04x from "
-msgstr "Trama ethernet no-IP %04x de "
+#: src/net.c:1285
+msgid "Received short packet from tap device"
+msgstr ""
 
-#: src/net.c:1320
-msgid "Dropping short packet"
-msgstr "Descartando paquete corto"
+#: src/net.c:1291
+#, c-format
+msgid "Read packet of length %d from tap device"
+msgstr ""
 
-#: src/net.c:1359
+#: src/net.c:1323
 #, c-format
 msgid "Error while waiting for input: %m"
 msgstr "Error esperando entrada: %m"
 
-#: src/net.c:1371
+#: src/net.c:1330
+msgid "Rereading configuration file and restarting in 5 seconds"
+msgstr ""
+
+#: src/net.c:1337
 msgid "Unable to reread configuration file, exiting"
 msgstr ""
 
-#: src/netutl.c:220
+#: src/net.c:1363
+#, fuzzy
+msgid "Regenerating symmetric key"
+msgstr "Generando claves de %d bits."
+
+#: src/netutl.c:114
 #, c-format
 msgid "Error looking up `%s': %s\n"
 msgstr "Error buscando `%s': %s\n"
 
-#: src/netutl.c:244
-msgid "Connection list:"
-msgstr "Lista de conexiones:"
-
-#: src/netutl.c:248
+#: src/protocol.c:82
 #, c-format
-msgid ""
-"%s netmask %d.%d.%d.%d at %s port %hd flags %d sockets %d, %d status %04x"
+msgid "Output buffer overflow while sending %s to %s (%s)"
 msgstr ""
 
-#: src/protocol.c:56
+#: src/protocol.c:89
 #, fuzzy, c-format
-msgid "Sending ACK to %s (%s)"
+msgid "Sending %s to %s (%s)"
 msgstr "Envio ACK a %s"
 
-#: src/protocol.c:63
+#: src/protocol.c:103
 #, fuzzy, c-format
-msgid "Send failed: %d:%d: %m"
-msgstr "Error enviando: %d:%d: %m"
+msgid "Unknown request from %s (%s)"
+msgstr "Petición desconocida: %s"
 
-#: src/protocol.c:74
+#: src/protocol.c:110
 #, fuzzy, c-format
-msgid "Sending TERMREQ to %s (%s)"
-msgstr "Envío TERMREQ a "
+msgid "Got %s from %s (%s)"
+msgstr "He recibido una petición: %s"
 
-#: 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
+#: src/protocol.c:116
 #, fuzzy, c-format
-msgid "Send failed: %s:%d: %m"
-msgstr "Error enviando: %s:%d: %m"
+msgid "Unauthorized request from %s (%s)"
+msgstr "Petición desconocida: %s"
 
-#: src/protocol.c:93
+#: src/protocol.c:123
 #, fuzzy, c-format
-msgid "Sending TIMEOUT to %s (%s)"
-msgstr "Envío TIMEOUT a "
-
-#: src/protocol.c:111
-#, c-format
-msgid "Sending DEL_HOST for %s (%s) to %s (%s)"
-msgstr ""
+msgid "Error while processing %s from %s (%s)"
+msgstr "Error al procesar la petición de "
 
 #: src/protocol.c:130
 #, fuzzy, c-format
-msgid "Sending PACKET to %s (%s)"
-msgstr "Envio ACK a %s"
+msgid "Bogus data received from %s (%s)"
+msgstr "Se han recibido datos sin sentido."
 
-#: src/protocol.c:154
+#: src/protocol.c:181
 #, fuzzy, c-format
-msgid "Sending PING to %s (%s)"
-msgstr "Enviando KEY_CHANGED to "
+msgid "Got bad ID from %s"
+msgstr "recibí una petición BASIC_INFO incorrecta: %s"
 
-#: src/protocol.c:172
+#: src/protocol.c:189
 #, fuzzy, c-format
-msgid "Sending PONG to %s (%s)"
-msgstr "Enviando KEY_CHANGED to "
+msgid "Peer %s (%s) uses incompatible version %d"
+msgstr ""
+"La máquina remota usa una versión incompatible del protocolo (versión %d)."
 
-#: src/protocol.c:211
+#: src/protocol.c:198
 #, c-format
-msgid "Sending ADD_HOST for %s (%s) to %s (%s)"
+msgid "Peer %s uses invalid identity name"
 msgstr ""
 
-#: src/protocol.c:229
-#, fuzzy, c-format
-msgid "Sending KEY_CHANGED origin %s to %s (%s)"
-msgstr "Enviando KEY_CHANGED to "
+#: src/protocol.c:206
+#, c-format
+msgid "Peer %s had unknown identity (%s)"
+msgstr ""
 
-#: src/protocol.c:257
-#, fuzzy, c-format
-msgid "Sending BASIC_INFO to %s"
-msgstr "Enviando BASIC_INFO a "
+#: src/protocol.c:220
+#, c-format
+msgid "Uplink %s (%s) is already in our connection list"
+msgstr ""
 
-#: src/protocol.c:278
-#, fuzzy, c-format
-msgid "Sending PASSPHRASE to %s (%s)"
-msgstr "Enviando PASSPHRASE %s a "
+#: src/protocol.c:236
+#, c-format
+msgid "No public key known for %s (%s)"
+msgstr ""
 
-#: src/protocol.c:296
-#, fuzzy, c-format
-msgid "Sending PUBLIC_KEY to %s (%s)"
-msgstr "Enviando PUBLIC_KEY %s a "
+#: src/protocol.c:269
+#, c-format
+msgid "Generated random challenge (unencrypted): %s"
+msgstr ""
 
-#: src/protocol.c:333
+#: src/protocol.c:276 src/protocol.c:330
 #, c-format
-msgid "Attempting to send REQ_KEY to %d.%d.%d.%d, which does not exist?"
+msgid "Error during encryption of challenge for %s (%s)"
 msgstr ""
 
-#: src/protocol.c:339
+#: src/protocol.c:302
 #, fuzzy, c-format
-msgid "Sending REQ_KEY to %s (%s)"
-msgstr "Enviando KEY_CHANGED to "
+msgid "Got bad CHALLENGE from %s (%s)"
+msgstr "recibí KEY_CHANGED de "
 
-#: src/protocol.c:363
+#: src/protocol.c:312
 #, c-format
-msgid "Attempting to send ANS_KEY to %d.%d.%d.%d, which does not exist?"
+msgid "Intruder: wrong challenge length from %s (%s)"
 msgstr ""
 
-#: src/protocol.c:369
-#, fuzzy, c-format
-msgid "Sending ANS_KEY to %s (%s)"
-msgstr "Envio ACK a %s"
+#: src/protocol.c:339
+#, c-format
+msgid "Received random challenge (unencrypted): %s"
+msgstr ""
 
-#: 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:355
+#, c-format
+msgid "Trying to send CHAL_REPLY to %s (%s) without a valid CHALLENGE"
+msgstr ""
 
-#: src/protocol.c:428
+#: src/protocol.c:386
 #, fuzzy, c-format
-msgid "Got bad BASIC_INFO from %s"
-msgstr "recibí una petición BASIC_INFO incorrecta: %s"
+msgid "Got bad CHAL_REPLY from %s (%s)"
+msgstr "recibí una petición ANS_KEY incorrecta: %s"
 
-#: src/protocol.c:437
-#, fuzzy, c-format
-msgid "Peer uses incompatible protocol version %d"
+#: src/protocol.c:395
+#, c-format
+msgid "Intruder: wrong challenge reply length from %s (%s)"
 msgstr ""
-"La máquina remota usa una versión incompatible del protocolo (versión %d)."
 
-#: src/protocol.c:452
+#: src/protocol.c:412
 #, c-format
-msgid "Uplink %s (%s) is already in our connection list"
+msgid "Intruder: wrong challenge reply from %s (%s)"
 msgstr ""
 
-#: 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
+#, c-format
+msgid "Expected challenge reply: %s"
+msgstr ""
+
+#: src/protocol.c:464
+#, c-format
+msgid "Generated random meta key (unencrypted): %s"
+msgstr ""
 
-#: src/protocol.c:489
+#: src/protocol.c:471 src/protocol.c:534
 #, fuzzy, c-format
-msgid "Got PASSPHRASE from %s (%s)"
-msgstr "recibí una petición PASSPHRASE incorrecta: %s"
+msgid "Error during encryption of meta key for %s (%s)"
+msgstr "Error enviando datos: %m"
 
-#: src/protocol.c:507
+#: src/protocol.c:503
 #, fuzzy, c-format
-msgid "Got bad PUBLIC_KEY from %s (%s)"
-msgstr "recibí una petición PUBLIC_KEY incorrecta: %s"
+msgid "Got bad METAKEY from %s (%s)"
+msgstr "recibí REQ_KEY de "
 
 #: src/protocol.c:513
-#, fuzzy, c-format
-msgid "Got PUBLIC_KEY from %s (%s)"
-msgstr "recibí PUBLIC_KEY %s"
+#, c-format
+msgid "Intruder: wrong meta key length from %s (%s)"
+msgstr ""
 
-#. intruder!
-#: 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:543
+#, c-format
+msgid "Received random meta key (unencrypted): %s"
+msgstr ""
 
-#: src/protocol.c:538
+#: src/protocol.c:583
 #, 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
+#: src/protocol.c:599
 #, 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:654
+#, fuzzy, c-format
+msgid "Got bad ADD_SUBNET from %s (%s)"
+msgstr "recibí una petición ADD_HOST incorrecta: %s"
 
-#: src/protocol.c:583
-#, c-format
-msgid "Got unauthorized TERMREQ from %s (%s)"
-msgstr ""
+#: src/protocol.c:663
+#, fuzzy, c-format
+msgid "Got bad ADD_SUBNET from %s (%s): invalid identity name"
+msgstr "recibí una petición ADD_HOST incorrecta: %s"
 
-#: src/protocol.c:589
-#, c-format
-msgid "Got TERMREQ from %s (%s)"
-msgstr ""
+#: src/protocol.c:672
+#, fuzzy, c-format
+msgid "Got bad ADD_SUBNET from %s (%s): invalid subnet string"
+msgstr "recibí una petición ADD_HOST incorrecta: %s"
 
-#: src/protocol.c:604
+#: src/protocol.c:683
 #, c-format
-msgid "Got unauthorized TIMEOUT from %s (%s)"
+msgid "Warning: got ADD_SUBNET from %s (%s) for ourself, restarting"
 msgstr ""
 
-#: src/protocol.c:610
+#: src/protocol.c:694
 #, c-format
-msgid "Got TIMEOUT from %s (%s)"
+msgid "Got ADD_SUBNET for %s from %s (%s) which is not in our connection list"
 msgstr ""
 
-#: src/protocol.c:626
+#: src/protocol.c:734
 #, fuzzy, c-format
-msgid "Got unauthorized DEL_HOST from %s (%s)"
+msgid "Got bad DEL_SUBNET from %s (%s)"
 msgstr "recibí una petición DEL_HOST incorrecta: %s"
 
-#: src/protocol.c:633
+#: src/protocol.c:743
 #, fuzzy, c-format
-msgid "Got bad DEL_HOST from %s (%s)"
+msgid "Got bad DEL_SUBNET from %s (%s): invalid identity name"
 msgstr "recibí una petición DEL_HOST incorrecta: %s"
 
-#: 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:752
+#, fuzzy, c-format
+msgid "Got bad DEL_SUBNET from %s (%s): invalid subnet string"
+msgstr "recibí una petición DEL_HOST incorrecta: %s"
 
-#: src/protocol.c:648
+#: src/protocol.c:763
 #, c-format
-msgid "Warning: got DEL_HOST from %s (%s) for ourself, restarting"
+msgid "Warning: got DEL_SUBNET from %s (%s) for ourself, restarting"
 msgstr ""
 
-#: src/protocol.c:655
+#: src/protocol.c:774
 #, c-format
-msgid "Got DEL_HOST for %s (%s) from %s (%s)"
+msgid "Got DEL_SUBNET for %s from %s (%s) which is not in our connection list"
 msgstr ""
 
-#: src/protocol.c:674
-#, c-format
-msgid "Got unauthorized PACKET from %s (%s)"
-msgstr ""
+#: src/protocol.c:812
+#, fuzzy, c-format
+msgid "Got bad ADD_HOST from %s (%s)"
+msgstr "recibí una petición ADD_HOST incorrecta: %s"
 
-#: src/protocol.c:681
-#, c-format
-msgid "Got bad PACKET from %s (%s)"
-msgstr ""
+#: src/protocol.c:820
+#, fuzzy, c-format
+msgid "Got bad ADD_HOST from %s (%s): invalid identity name"
+msgstr "recibí una petición ADD_HOST incorrecta: %s"
 
-#: src/protocol.c:688
+#: src/protocol.c:829
 #, c-format
-msgid "Got too big PACKET from %s (%s)"
+msgid "Warning: got ADD_HOST from %s (%s) for ourself, restarting"
 msgstr ""
 
-#: src/protocol.c:694
+#: src/protocol.c:846
 #, c-format
-msgid "Got PACKET length %d from %s (%s)"
+msgid "Got duplicate ADD_HOST for %s (%s) from %s (%s)"
 msgstr ""
 
-#: src/protocol.c:708
+#: src/protocol.c:854
 #, c-format
-msgid "Got unauthorized PING from %s (%s)"
+msgid "Removing old entry for %s (%s) in favour of new connection"
 msgstr ""
 
-#: src/protocol.c:714
-#, c-format
-msgid "Got PING from %s (%s)"
-msgstr ""
+#: src/protocol.c:897
+#, fuzzy, c-format
+msgid "Got bad DEL_HOST from %s (%s)"
+msgstr "recibí una petición DEL_HOST incorrecta: %s"
+
+#: src/protocol.c:906
+#, fuzzy, c-format
+msgid "Got bad DEL_HOST from %s (%s): invalid identity name"
+msgstr "recibí una petición DEL_HOST incorrecta: %s"
 
-#: src/protocol.c:730
+#: src/protocol.c:915
 #, c-format
-msgid "Got unauthorized PONG from %s (%s)"
+msgid "Warning: got DEL_HOST from %s (%s) for ourself, restarting"
 msgstr ""
 
-#: src/protocol.c:736
+#: src/protocol.c:926
 #, c-format
-msgid "Got PONG from %s (%s)"
+msgid "Got DEL_HOST from %s (%s) for %s which is not in our connection list"
 msgstr ""
 
-#: src/protocol.c:755
+#: src/protocol.c:936
 #, fuzzy, c-format
-msgid "Got unauthorized ADD_HOST from %s (%s)"
-msgstr "recibí una petición ADD_HOST incorrecta: %s"
+msgid "Got DEL_HOST from %s (%s) for %s which doesn't match"
+msgstr "recibí una petición DEL_HOST incorrecta: %s"
 
-#: src/protocol.c:762
+#: src/protocol.c:972
 #, fuzzy, c-format
-msgid "Got bad ADD_HOST from %s (%s)"
-msgstr "recibí una petición ADD_HOST incorrecta: %s"
+msgid "Got bad STATUS from %s (%s)"
+msgstr "recibí una petición ANS_KEY incorrecta: %s"
 
-#: src/protocol.c:772
-#, c-format
-msgid "Got duplicate ADD_HOST for %s (%s) from %s (%s)"
-msgstr ""
+#: src/protocol.c:979
+#, fuzzy, c-format
+msgid "Status message from %s (%s): %s: %s"
+msgstr "He recibido una petición: %s"
 
-#: src/protocol.c:779
-#, c-format
-msgid "Removing old entry for %s (%s)"
-msgstr ""
+#: src/protocol.c:1003
+#, fuzzy, c-format
+msgid "Got bad ERROR from %s (%s)"
+msgstr "recibí una petición DEL_HOST incorrecta: %s"
 
-#: src/protocol.c:789
-#, c-format
-msgid "Warning: got ADD_HOST from %s (%s) for ourself, restarting"
-msgstr ""
+#: src/protocol.c:1010
+#, fuzzy, c-format
+msgid "Error message from %s (%s): %s: %s"
+msgstr "He recibido una petición: %s"
 
-#: src/protocol.c:809
-#, c-format
-msgid "Got ADD_HOST for %s (%s) from %s (%s)"
-msgstr ""
+#: src/protocol.c:1086
+#, fuzzy, c-format
+msgid "Got bad KEY_CHANGED from %s (%s)"
+msgstr "recibí KEY_CHANGED de "
 
-#: src/protocol.c:827
+#: src/protocol.c:1093
 #, c-format
-msgid "Got unauthorized REQ_KEY from %s (%s)"
+msgid ""
+"Got KEY_CHANGED from %s (%s) origin %s which does not exist in our "
+"connection list"
 msgstr ""
 
-#: src/protocol.c:834
+#: src/protocol.c:1124
 #, fuzzy, c-format
 msgid "Got bad REQ_KEY from %s (%s)"
 msgstr "recibí REQ_KEY de "
 
-#: 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:859
+#: src/protocol.c:1131
 #, c-format
-msgid "Forwarding REQ_KEY to %s (%s)"
+msgid ""
+"Got REQ_KEY from %s (%s) origin %s which does not exist in our connection "
+"list"
 msgstr ""
 
-#: src/protocol.c:918
+#: src/protocol.c:1149
 #, c-format
-msgid "Got unauthorized ANS_KEY from %s (%s)"
+msgid ""
+"Got REQ_KEY from %s (%s) destination %s which does not exist in our "
+"connection list"
 msgstr ""
 
-#: src/protocol.c:925
+#: src/protocol.c:1185
 #, fuzzy, c-format
 msgid "Got bad ANS_KEY from %s (%s)"
 msgstr "recibí una petición ANS_KEY incorrecta: %s"
 
-#: 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:940
+#: src/protocol.c:1192
 #, c-format
 msgid ""
-"Receiving ANS_KEY origin %d.%d.%d.%d from %s (%s), which does not exist?"
+"Got ANS_KEY from %s (%s) origin %s which does not exist in our connection "
+"list"
 msgstr ""
 
-#: 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:1204
+#, fuzzy, c-format
+msgid "Got bad ANS_KEY from %s (%s) origin %s: invalid key length"
+msgstr "recibí una petición ANS_KEY incorrecta: %s"
 
-#: src/protocol.c:962
+#: src/protocol.c:1225
 #, c-format
-msgid "Forwarding ANS_KEY to %s (%s)"
+msgid ""
+"Got ANS_KEY from %s (%s) destination %s which does not exist in our "
+"connection list"
 msgstr ""
 
-#: src/protocol.c:983
-#, fuzzy, c-format
-msgid "Got unauthorized KEY_CHANGED from %s (%s)"
-msgstr "recibí KEY_CHANGED de "
+#. Do some intl stuff right now
+#: src/subnet.c:243 src/tincd.c:396
+msgid "unknown"
+msgstr ""
 
-#: src/protocol.c:990
-#, fuzzy, c-format
-msgid "Got bad KEY_CHANGED from %s (%s)"
-msgstr "recibí KEY_CHANGED de "
+#: src/subnet.c:299
+#, fuzzy
+msgid "Subnet list:"
+msgstr "Lista de conexiones:"
 
-#: src/protocol.c:999
-#, c-format
-msgid "Got KEY_CHANGED origin %d.%d.%d.%d from %s (%s), which does not exist?"
+#: src/subnet.c:308
+msgid "End of subnet list."
 msgstr ""
 
-#: src/protocol.c:1005
-#, fuzzy, c-format
-msgid "Got KEY_CHANGED origin %s from %s (%s)"
-msgstr "recibí KEY_CHANGED de "
-
-#: src/tincd.c:96
+#: src/tincd.c:103
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Pruebe `%s --help' para más información.\n"
 
-#: src/tincd.c:99
+#: src/tincd.c:106
 #, c-format
 msgid ""
 "Usage: %s [option]...\n"
@@ -788,14 +760,14 @@ msgstr ""
 "Modo de empleo: %s [opción]...\n"
 "\n"
 
-#: src/tincd.c:100
+#: src/tincd.c:107
+#, fuzzy
 msgid ""
-"  -c, --config=FILE     Read configuration options from FILE.\n"
-"  -D, --no-detach       Don't fork and detach.\n"
-"  -d                    Increase debug level.\n"
-"  -k, --kill            Attempt to kill a running tincd and exit.\n"
-"  -n, --net=NETNAME     Connect to net NETNAME.\n"
-"  -t, --timeout=TIMEOUT Seconds to wait before giving a timeout.\n"
+"  -c, --config=DIR           Read configuration options from DIR.\n"
+"  -D, --no-detach            Don't fork and detach.\n"
+"  -d                         Increase debug level.\n"
+"  -k, --kill                 Attempt to kill a running tincd and exit.\n"
+"  -n, --net=NETNAME          Connect to net NETNAME.\n"
 msgstr ""
 "  -c, --config=FICHERO  Lee opciones de configuración del FICHERO.\n"
 "  -D, --no-detach       No hagas fork() y liberes la terminal.\n"
@@ -805,85 +777,107 @@ msgstr ""
 "  -t, --timeout=TIEMPO  Segundos a esperar antes de cancelar una "
 "trasmisión.\n"
 
-#: src/tincd.c:106
+#: src/tincd.c:112
+#, fuzzy
 msgid ""
-"      --help            Display this help and exit.\n"
-"      --version         Output version information and exit.\n"
+"  -K, --generate-keys[=BITS] Generate public/private RSA keypair.\n"
+"      --help                 Display this help and exit.\n"
+"      --version              Output version information and exit.\n"
 "\n"
 msgstr ""
 "      --help            Muestra esta ayuda y termina.\n"
 "      --version         Muestra información de la versión y termina.\n"
 "\n"
 
-#: src/tincd.c:108
+#: src/tincd.c:115
 msgid "Report bugs to tinc@nl.linux.org.\n"
 msgstr "Comunicar `bugs' a tinc@nl.linux.org.\n"
 
-#: src/tincd.c:146
-#, c-format
-msgid "Invalid timeout value `%s'.\n"
-msgstr "Valor de `timeout' no válido `%s'.\n"
+#: src/tincd.c:155
+msgid "Invalid argument! BITS must be a number equal to or greater than 512.\n"
+msgstr ""
+
+#: src/tincd.c:210
+#, fuzzy, c-format
+msgid "Generating %d bits keys:\n"
+msgstr "Generando claves de %d bits."
+
+#: src/tincd.c:214
+msgid "Error during key generation!"
+msgstr ""
+
+#: src/tincd.c:218
+#, fuzzy
+msgid "Done.\n"
+msgstr ": hecho.\n"
+
+#: src/tincd.c:220
+msgid ""
+"Please copy the private key to tinc.conf and the\n"
+"public key to your host configuration file:\n"
+"\n"
+msgstr ""
 
-#: src/tincd.c:160
+#: src/tincd.c:230
 #, 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:215
+#: src/tincd.c:285
 #, 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:218
+#: src/tincd.c:288
 #, fuzzy, c-format
 msgid "tincd %s starting"
 msgstr "tincd %s comenzando, nivel de depuración %d."
 
-#: src/tincd.c:233
+#: src/tincd.c:303
 #, 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:251
+#: src/tincd.c:321
 #, 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:254
+#: src/tincd.c:324
 #, 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:275
+#: src/tincd.c:345
 #, 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:277
+#: src/tincd.c:347
 msgid "No other tincd is running.\n"
 msgstr "No hay ningún otro tincd en ejecución.\n"
 
-#: src/tincd.c:284
+#: src/tincd.c:354
 msgid "Removing stale lock file.\n"
 msgstr "Borrando fichero de bloqueo en desuso.\n"
 
-#: src/tincd.c:334
+#: src/tincd.c:403
 #, c-format
 msgid "%s version %s (built %s %s, protocol %d)\n"
 msgstr ""
 
-#: src/tincd.c:335
+#: src/tincd.c:404
+#, fuzzy
 msgid ""
-"Copyright (C) 1998,1999,2000 Ivo Timmermans and others,\n"
-"see the AUTHORS file for a complete list.\n"
+"Copyright (C) 1998,1999,2000 Ivo Timmermans, Guus Sliepen and others.\n"
+"See the AUTHORS file for a complete list.\n"
 "\n"
 "tinc comes with ABSOLUTELY NO WARRANTY.  This is free software,\n"
 "and you are welcome to redistribute it under certain conditions;\n"
 "see the file COPYING for details.\n"
-"\n"
 msgstr ""
 "Copyright (C) 1998,1999,2000 Ivo Timmermans y otros,\n"
 "vea el fichero AUTHORS para una lista completa.\n"
@@ -892,69 +886,255 @@ msgstr ""
 "y puede ser redistribuido bajo ciertas condiciones;\n"
 "vea el fichero COPYING para los detalles.\n"
 
-#: 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:350
+#: src/tincd.c:418
 #, 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:380
+#: src/tincd.c:455
+msgid "Unrecoverable error"
+msgstr ""
+
+#: src/tincd.c:460
 #, c-format
-msgid "Unrecoverable error, restarting in %d seconds!"
+msgid "Restarting in %d seconds!"
 msgstr ""
 
-#: src/tincd.c:389
+#: src/tincd.c:465 src/tincd.c:512
+#, fuzzy
+msgid "Not restarting."
+msgstr "tincd %s comenzando, nivel de depuración %d."
+
+#: src/tincd.c:475
 msgid "Got TERM signal"
 msgstr "Recibí la señal TERM"
 
-#: src/tincd.c:397
+#: src/tincd.c:484
 msgid "Got QUIT signal"
 msgstr "Recibí la señal QUIT"
 
-#: src/tincd.c:404
+#: src/tincd.c:491
 msgid "Got another SEGV signal: not restarting"
 msgstr "Recibí otra señal SEGV: no reinicio"
 
-#: 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:498
+#, fuzzy
+msgid "Got SEGV signal"
+msgstr "Recibí la señal TERM"
 
-#: src/tincd.c:415
+#: src/tincd.c:503
 #, fuzzy
-msgid "Got SEGV signal, trying to re-execute"
-msgstr "Recibí la señal SEGV; intento reiniciar."
+msgid "Trying to re-execute in 5 seconds..."
+msgstr "Intento re-establecer la conexión saliente en 5 segundos."
 
-#: src/tincd.c:427
-msgid "Got HUP signal, rereading configuration and restarting"
-msgstr ""
+#: src/tincd.c:521
+msgid "Got HUP signal"
+msgstr "Recibí la señal HUP"
 
-#: src/tincd.c:435
+#: src/tincd.c:529
 #, fuzzy
 msgid "Got INT signal, exiting"
 msgstr "Recibí la señal INT"
 
-#: src/tincd.c:449
+#: src/tincd.c:548
+#, fuzzy, c-format
+msgid "Got unexpected signal %d (%s)"
+msgstr "Recibí una señal inesperada (%d)."
+
+#~ msgid "setsockopt: %m"
+#~ msgstr "setsockopt(): %m"
+
+#~ msgid "fcntl: %m"
+#~ msgstr "fcntl(): %m"
+
+#~ msgid "listen: %m"
+#~ msgstr "listen(): %m"
+
+#~ msgid "Error: getpeername: %m"
+#~ msgstr "Error: getpeername(): %m"
+
 #, fuzzy
-msgid "Got USR2 signal, forcing new key generation"
-msgstr "Forzando generación de una nueva clave"
+#~ msgid "Non-IP ethernet frame %04x from %02x:%02x:%02x:%02x:%02x:%02x"
+#~ msgstr "Trama ethernet no-IP %04x de "
 
-#: 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."
+#, fuzzy
+#~ msgid "Got USR2 signal, forcing new key generation"
+#~ msgstr "Forzando generación de una nueva clave"
 
-#: src/tincd.c:460
-#, fuzzy, c-format
-msgid "Got unexpected signal %d"
-msgstr "Recibí una señal inesperada (%d)."
+#~ msgid "Usage: %s bits\n"
+#~ msgstr "Uso: %s bits\n"
+
+#~ msgid "Illegal number: %s\n"
+#~ msgstr "Número ilegal: %s\n"
+
+#~ msgid "Invalid timeout value `%s'.\n"
+#~ msgstr "Valor de `timeout' no válido `%s'.\n"
+
+#~ msgid "Illegal passphrase in %s; size would be %d"
+#~ msgstr "Frase de paso ilegal en %s; el tamaño debe ser %d"
+
+#~ msgid "Opening /dev/urandom failed: %m"
+#~ msgstr "Fallo abriendo /dev/urandom : %m"
+
+#~ msgid "Encryption key set to %s"
+#~ msgstr "Clave de cifrado definida como %s"
+
+#, fuzzy
+#~ msgid "Got bad error from %s (%s)"
+#~ msgstr "recibí REQ_KEY de "
+
+#~ msgid "%s: %d: Invalid variable name `%s'.\n"
+#~ msgstr "%s: %d: Nombre de variable `%s' no válido.\n"
+
+#~ msgid "%s: %d: No value given for `%s'.\n"
+#~ msgstr "%s: %d: No se ha definido un valor para `%s'.\n"
+
+#~ msgid "%s: %d: Invalid value `%s' for variable `%s'.\n"
+#~ msgstr "%s: %d: Valor `%s' para la variable `%s' no válido.\n"
+
+#~ msgid "Could not open %s: %s\n"
+#~ msgstr "No pude abrir %s: %s\n"
+
+#~ msgid "Generating %d bits number"
+#~ msgstr "Generando número de %d bits"
+
+#~ msgid "Opening /dev/urandom"
+#~ msgstr "Abriendo /dev/urandom"
+
+#~ msgid "File was empty!\n"
+#~ msgstr "¡El fichero estaba vacío!\n"
+
+#~ msgid ""
+#~ ": done.\n"
+#~ "The following line should be ENTIRELY copied into a passphrase file:\n"
+#~ msgstr ""
+#~ ": hecho.\n"
+#~ "La siguiente línea debe ser copiada ENTERA a un fichero de frase de paso:\n"
+
+#, fuzzy
+#~ msgid "Got packet from %s (%s) with unknown origin %d.%d.%d.%d?"
+#~ msgstr "He recibido un paquete desde un origen desconocido "
+
+#, 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."
+
+#~ msgid "No value for my VPN IP given"
+#~ msgstr "No se ha definido un valor para mi VPN IP"
+
+#~ msgid "Dropping short packet"
+#~ msgstr "Descartando paquete corto"
+
+#, fuzzy
+#~ msgid "Send failed: %d:%d: %m"
+#~ msgstr "Error enviando: %d:%d: %m"
+
+#, fuzzy
+#~ msgid "Sending TERMREQ to %s (%s)"
+#~ msgstr "Envío TERMREQ a "
+
+#, fuzzy
+#~ msgid "Send failed: %s:%d: %m"
+#~ msgstr "Error enviando: %s:%d: %m"
+
+#, fuzzy
+#~ msgid "Sending TIMEOUT to %s (%s)"
+#~ msgstr "Envío TIMEOUT a "
+
+#, fuzzy
+#~ msgid "Sending PACKET to %s (%s)"
+#~ msgstr "Envio ACK a %s"
+
+#, fuzzy
+#~ msgid "Sending PING to %s (%s)"
+#~ msgstr "Enviando KEY_CHANGED to "
+
+#, fuzzy
+#~ msgid "Sending PONG to %s (%s)"
+#~ msgstr "Enviando KEY_CHANGED to "
+
+#, fuzzy
+#~ msgid "Sending KEY_CHANGED origin %s to %s (%s)"
+#~ msgstr "Enviando KEY_CHANGED to "
+
+#, fuzzy
+#~ msgid "Sending BASIC_INFO to %s"
+#~ msgstr "Enviando BASIC_INFO a "
+
+#, fuzzy
+#~ msgid "Sending PASSPHRASE to %s (%s)"
+#~ msgstr "Enviando PASSPHRASE %s a "
+
+#, fuzzy
+#~ msgid "Sending PUBLIC_KEY to %s (%s)"
+#~ msgstr "Enviando PUBLIC_KEY %s a "
+
+#, fuzzy
+#~ msgid "Sending REQ_KEY to %s (%s)"
+#~ msgstr "Enviando KEY_CHANGED to "
+
+#, fuzzy
+#~ msgid "Sending ANS_KEY to %s (%s)"
+#~ msgstr "Envio ACK a %s"
+
+#, fuzzy
+#~ msgid "Got BASIC_INFO from %s"
+#~ msgstr "recibí una petición BASIC_INFO incorrecta: %s"
+
+#, fuzzy
+#~ msgid "Got bad PASSPHRASE from %s (%s)"
+#~ msgstr "recibí una petición PASSPHRASE incorrecta: %s"
+
+#, fuzzy
+#~ msgid "Got PASSPHRASE from %s (%s)"
+#~ msgstr "recibí una petición PASSPHRASE incorrecta: %s"
+
+#, fuzzy
+#~ msgid "Got bad PUBLIC_KEY from %s (%s)"
+#~ msgstr "recibí una petición PUBLIC_KEY incorrecta: %s"
+
+#, fuzzy
+#~ msgid "Got PUBLIC_KEY from %s (%s)"
+#~ msgstr "recibí PUBLIC_KEY %s"
+
+#, fuzzy
+#~ msgid "Intruder from %s: passphrase for %s does not match!"
+#~ msgstr "Intruso: la frase de paso no concuerda."
+
+#, fuzzy
+#~ msgid "Got unauthorized DEL_HOST from %s (%s)"
+#~ msgstr "recibí una petición DEL_HOST incorrecta: %s"
+
+#, fuzzy
+#~ msgid "Got unauthorized ADD_HOST from %s (%s)"
+#~ msgstr "recibí una petición ADD_HOST incorrecta: %s"
+
+#, fuzzy
+#~ msgid "Got unauthorized KEY_CHANGED from %s (%s)"
+#~ msgstr "recibí KEY_CHANGED de "
+
+#, fuzzy
+#~ msgid "Got KEY_CHANGED origin %s from %s (%s)"
+#~ msgstr "recibí KEY_CHANGED de "
+
+#~ 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"
+
+#, fuzzy
+#~ 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."
+
+#, fuzzy
+#~ msgid "Got SEGV signal, trying to re-execute"
+#~ msgstr "Recibí la señal SEGV; intento reiniciar."
+
+#, fuzzy
+#~ msgid "Got unexpected signal %d after %s line %d"
+#~ msgstr "Recibí una señal inesperada (%d) después de %s línea %d."
 
 #~ msgid "packet to queue: %d"
 #~ msgstr "paquete a poner en cola: %d"
@@ -965,9 +1145,6 @@ msgstr "Recib
 #~ 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 "
 
@@ -1063,6 +1240,3 @@ msgstr "Recib
 
 #~ msgid "%s version %s\n"
 #~ msgstr "%s versión %s\n"
-
-#~ msgid "Got HUP signal"
-#~ msgstr "Recibí la señal HUP"