X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=po%2Fes.po;h=7755e87ce7aa2c87daa3156517646943c619dbb0;hp=b54fbd9863a361c8cb613c16bd498769d90376e9;hb=4811afa073c871f2a52dfd5139bd0171046365eb;hpb=b7d4d4c17712e0bb9ee8bd497a2f525b79d5f40d

diff --git a/po/es.po b/po/es.po
index b54fbd98..7755e87c 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-10-29 02:49+0100\n"
+"POT-Creation-Date: 2000-10-30 01:16+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"
@@ -48,7 +48,7 @@ msgstr "Enviados %d bytes a %lx"
 msgid "Sending meta data to %s (%s) failed: %m"
 msgstr "Error enviando datos: %m"
 
-#: src/meta.c:89 src/net.c:940
+#: src/meta.c:89 src/net.c:974
 #, fuzzy, c-format
 msgid "This is a bug: %s:%d: %d:%m %s (%s)"
 msgstr "Esto es un `bug': %s:%d: %d:%m"
@@ -58,332 +58,347 @@ msgstr "Esto es un `bug': %s:%d: %d:%m"
 msgid "Metadata socket error for %s (%s): %s"
 msgstr "Error en el `socket' de metadatos: %s"
 
-#: src/meta.c:115
+#: src/meta.c:114
 #, fuzzy, c-format
 msgid "Connection closed by %s (%s)"
 msgstr "Conexión desde %s:%d"
 
-#: src/meta.c:119
+#: 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/meta.c:149
+#: src/meta.c:148
 #, fuzzy, c-format
 msgid "Got request from %s (%s): %s"
 msgstr "Petición desconocida: %s"
 
-#: src/meta.c:167
+#: 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/net.c:119
+#: src/net.c:127
 #, fuzzy, c-format
 msgid "Sending packet of %d bytes to %s (%s)"
 msgstr "Enviados %d bytes a %lx"
 
-#: src/net.c:128
+#: src/net.c:136
 #, fuzzy, c-format
 msgid "Error sending packet to %s (%s): %m"
 msgstr "Error enviando datos: %m"
 
-#: src/net.c:160
+#: src/net.c:165
+#, fuzzy, c-format
+msgid "Writing packet of %d bytes to tap device"
+msgstr "Enviados %d bytes a %lx"
+
+#: src/net.c:175
 #, fuzzy, c-format
 msgid "Can't write to tun/tap device: %m"
 msgstr "No puedo escribir en el dispositivo tap: %m"
 
-#: src/net.c:167
+#: src/net.c:182
 #, fuzzy, c-format
 msgid "Can't write to ethertap device: %m"
 msgstr "No puedo escribir en el dispositivo tap: %m"
 
-#: src/net.c:268
+#: src/net.c:283
 #, fuzzy
 msgid "Queue flushed"
 msgstr "cola vaciada"
 
-#: src/net.c:283
+#: src/net.c:298
 #, fuzzy, c-format
 msgid "Flushing send queue for %s (%s)"
 msgstr "Vaciando la cola de envíos para "
 
-#: src/net.c:291
+#: src/net.c:306
 #, fuzzy, c-format
 msgid "Flushing receive queue for %s (%s)"
 msgstr "Vaciando la cola de recepción para "
 
-#: src/net.c:310
+#: src/net.c:325
 #, c-format
 msgid "Trying to look up %d.%d.%d.%d in connection list failed!"
 msgstr ""
 
-#: src/net.c:326
+#: src/net.c:341
 #, fuzzy, c-format
 msgid "Could not open UDP connection to %s (%s)"
 msgstr "No pude abrir %s: %s\n"
 
-#: src/net.c:383
+#: src/net.c:398
 #, c-format
 msgid "Could not open %s: %m"
 msgstr "No pude abrir %s: %m"
 
-#: src/net.c:410
+#: src/net.c:425
 #, c-format
 msgid "%s is a new style tun/tap device"
 msgstr ""
 
-#: src/net.c:439
+#: src/net.c:454
 #, c-format
 msgid "Creating metasocket failed: %m"
 msgstr "Fallo al crear el metasocket: %m"
 
-#: src/net.c:445 src/net.c:451 src/net.c:513
+#: src/net.c:460 src/net.c:466 src/net.c:528
 #, c-format
 msgid "setsockopt: %m"
 msgstr "setsockopt(): %m"
 
-#: src/net.c:458 src/net.c:520
+#: src/net.c:473 src/net.c:535
 #, c-format
 msgid "fcntl: %m"
 msgstr "fcntl(): %m"
 
-#: src/net.c:466
+#: src/net.c:481
 #, c-format
 msgid "Unable to bind listen socket to interface %s: %m"
 msgstr ""
 
-#: src/net.c:482
+#: src/net.c:497
 #, 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:488
+#: src/net.c:503
 #, c-format
 msgid "listen: %m"
 msgstr "listen(): %m"
 
-#: src/net.c:507
+#: src/net.c:522
 #, c-format
 msgid "Creating socket failed: %m"
 msgstr "Error al crear el `socket': %m"
 
-#: src/net.c:531
+#: src/net.c:546
 #, 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:548
+#: src/net.c:563
 #, fuzzy, c-format
 msgid "Trying to connect to %s"
 msgstr "Cerrando conexión con %s."
 
-#: src/net.c:558
+#: src/net.c:573
 #, fuzzy, c-format
 msgid "Creating socket for %s port %d failed: %m"
 msgstr "Error al crear el `socket': %m"
 
-#: src/net.c:569
+#: src/net.c:584
 #, c-format
 msgid "%s port %hd: %m"
 msgstr ""
 
-#: src/net.c:576
+#: src/net.c:591
 #, c-format
 msgid "fcntl for %s port %d: %m"
 msgstr ""
 
-#: src/net.c:582
+#: src/net.c:597
 #, fuzzy, c-format
 msgid "Connected to %s port %hd"
 msgstr "Conectado a %s:%hd"
 
-#: src/net.c:605
+#: src/net.c:620
 msgid "Invalid name for outgoing connection"
 msgstr ""
 
-#: src/net.c:614
+#: src/net.c:629
 #, c-format
 msgid "Error reading host configuration file for %s"
 msgstr ""
 
-#: src/net.c:621
+#: src/net.c:636
 #, c-format
 msgid "No address specified for %s"
 msgstr ""
 
-#: src/net.c:628
+#: src/net.c:643
 #, fuzzy, c-format
 msgid "Error looking up `%s': %m"
 msgstr "Error buscando `%s': %s\n"
 
-#: src/net.c:638
+#: src/net.c:653
 #, 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:673
+#: src/net.c:688
 msgid "Name for tinc daemon required!"
 msgstr ""
 
-#: src/net.c:681
+#: src/net.c:696
 msgid "Invalid name for myself!"
 msgstr ""
 
-#: src/net.c:687
+#: src/net.c:702
 msgid "Private key for tinc daemon required!"
 msgstr ""
 
-#: src/net.c:699
+#: src/net.c:714
 msgid "Cannot open host configuration file for myself!"
 msgstr ""
 
-#: src/net.c:705
+#: src/net.c:720
 msgid "Public key for tinc daemon required!"
 msgstr ""
 
-#: src/net.c:745
+#: src/net.c:760
 msgid "Network address and subnet mask do not match!"
 msgstr ""
 
-#: src/net.c:754
+#: src/net.c:769
 #, fuzzy
 msgid "Unable to set up a listening socket!"
 msgstr "No puedo configurar un `socket' a la escucha"
 
-#: src/net.c:760
+#: src/net.c:775
 #, 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:767
+#: src/net.c:800
 #, fuzzy, c-format
 msgid "Ready: listening on port %hd"
 msgstr "Listo: escuchando en el puerto %d."
 
-#: src/net.c:799
+#: src/net.c:832
 #, 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:834 src/net.c:893
+#: src/net.c:867 src/net.c:927
 #, fuzzy, c-format
 msgid "Error while executing %s: %m"
 msgstr "Error esperando entrada: %m"
 
-#: src/net.c:856
+#: src/net.c:889
 #, 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:903
+#: src/net.c:937
 #, fuzzy
 msgid "Terminating"
 msgstr "Terminando."
 
-#: src/net.c:917
+#: src/net.c:951
 #, fuzzy, c-format
 msgid "Opening UDP socket to %s"
 msgstr "Abriendo `socket' UDP a "
 
-#: src/net.c:922
+#: src/net.c:956
 #, fuzzy, c-format
 msgid "Creating UDP socket failed: %m"
 msgstr "Error al crear el `socket': %m"
 
-#: src/net.c:932
+#: src/net.c:966
 #, fuzzy, c-format
 msgid "Connecting to %s port %d failed: %m"
 msgstr "Error al crear `socket' de datos: %m"
 
-#: src/net.c:965
+#: src/net.c:999
 #, c-format
 msgid "Error: getpeername: %m"
 msgstr "Error: getpeername(): %m"
 
-#: src/net.c:980
+#: src/net.c:1014
 #, fuzzy, c-format
 msgid "Connection from %s port %d"
 msgstr "Conexión desde %s:%d"
 
-#: src/net.c:1025
+#: src/net.c:1060
 #, fuzzy, c-format
 msgid "This is a bug: %s:%d: %d:%m"
 msgstr "Esto es un `bug': %s:%d: %d:%m"
 
-#: src/net.c:1031
+#: src/net.c:1066
 #, fuzzy, c-format
 msgid "Incoming data socket error: %s"
 msgstr "Error en el `socket' de recepción de datos: %s"
 
-#: src/net.c:1037
+#: src/net.c:1072
 #, fuzzy, c-format
 msgid "Receiving packet failed: %m"
 msgstr "Error recibiendo datos: %m"
 
-#: src/net.c:1068
+#: src/net.c:1078
+#, fuzzy, c-format
+msgid "Received packet of %d bytes"
+msgstr "Recibiendo clave de "
+
+#: src/net.c:1100
 #, fuzzy, c-format
 msgid "Closing connection with %s (%s)"
 msgstr "Cerrando conexión con %s."
 
-#: src/net.c:1108
+#: src/net.c:1136
 #, 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:1136
+#: src/net.c:1168
 #, c-format
 msgid "%s (%s) didn't respond to PING"
 msgstr ""
 
-#: src/net.c:1167
+#: src/net.c:1199
 #, c-format
 msgid "Accepting a new connection failed: %m"
 msgstr "Error al aceptar una nueva conexión: %m"
 
-#: src/net.c:1175
+#: src/net.c:1207
 #, fuzzy
 msgid "Closed attempted connection"
 msgstr "Se ha cerrado la conexión que se intentaba realizar."
 
-#: src/net.c:1208
+#: src/net.c:1240
 #, fuzzy, c-format
 msgid "Outgoing data socket error for %s (%s): %s"
 msgstr "Error en el `socket' de datos salientes: %s"
 
-#: src/net.c:1244
+#: src/net.c:1276
 #, fuzzy, c-format
 msgid "Error while reading from tun/tap device: %m"
 msgstr "Error leyendo del dispositivo tap: %m"
 
-#: src/net.c:1253
+#: src/net.c:1285
 #, fuzzy, c-format
 msgid "Error while reading from ethertap device: %m"
 msgstr "Error leyendo del dispositivo tap: %m"
 
-#: src/net.c:1264
+#: src/net.c:1296
 msgid "Received short packet from tap device"
 msgstr ""
 
-#: src/net.c:1270
+#: src/net.c:1302
 #, c-format
 msgid "Read packet of length %d from tap device"
 msgstr ""
 
-#: src/net.c:1301
+#: src/net.c:1334
 #, c-format
 msgid "Error while waiting for input: %m"
 msgstr "Error esperando entrada: %m"
 
-#: src/net.c:1308
+#: src/net.c:1341
 msgid "Rereading configuration file and restarting in 5 seconds"
 msgstr ""
 
-#: src/net.c:1315
+#: src/net.c:1348
 msgid "Unable to reread configuration file, exiting"
 msgstr ""
 
-#: src/netutl.c:115
+#: src/net.c:1374
+#, 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"
@@ -454,230 +469,260 @@ msgstr ""
 msgid "No public key known for %s (%s)"
 msgstr ""
 
-#: src/protocol.c:273
+#: src/protocol.c:269
 #, c-format
 msgid "Generated random challenge (unencrypted): %s"
 msgstr ""
 
-#: src/protocol.c:280 src/protocol.c:334
+#: src/protocol.c:276 src/protocol.c:330
 #, c-format
 msgid "Error during encryption of challenge for %s (%s)"
 msgstr ""
 
-#: src/protocol.c:306
+#: src/protocol.c:302
 #, fuzzy, c-format
 msgid "Got bad CHALLENGE from %s (%s)"
 msgstr "recibí KEY_CHANGED de "
 
-#: src/protocol.c:316
+#: src/protocol.c:312
 #, c-format
 msgid "Intruder: wrong challenge length from %s (%s)"
 msgstr ""
 
-#: src/protocol.c:343
+#: src/protocol.c:339
 #, c-format
 msgid "Received random challenge (unencrypted): %s"
 msgstr ""
 
-#: src/protocol.c:359
+#: src/protocol.c:355
 #, c-format
 msgid "Trying to send CHAL_REPLY to %s (%s) without a valid CHALLENGE"
 msgstr ""
 
-#: src/protocol.c:390
+#: src/protocol.c:386
 #, fuzzy, c-format
 msgid "Got bad CHAL_REPLY from %s (%s)"
 msgstr "recibí una petición ANS_KEY incorrecta: %s"
 
-#: src/protocol.c:399
+#: src/protocol.c:395
 #, c-format
 msgid "Intruder: wrong challenge reply length from %s (%s)"
 msgstr ""
 
-#: src/protocol.c:416
+#: src/protocol.c:412
 #, c-format
 msgid "Intruder: wrong challenge reply from %s (%s)"
 msgstr ""
 
-#: src/protocol.c:421
+#: src/protocol.c:417
 #, c-format
 msgid "Expected challenge reply: %s"
 msgstr ""
 
-#: src/protocol.c:463
+#: src/protocol.c:464
+#, c-format
+msgid "Generated random meta key (unencrypted): %s"
+msgstr ""
+
+#: src/protocol.c:471 src/protocol.c:534
+#, fuzzy, c-format
+msgid "Error during encryption of meta key for %s (%s)"
+msgstr "Error enviando datos: %m"
+
+#: src/protocol.c:503
+#, fuzzy, c-format
+msgid "Got bad METAKEY from %s (%s)"
+msgstr "recibí REQ_KEY de "
+
+#: src/protocol.c:513
+#, c-format
+msgid "Intruder: wrong meta key length from %s (%s)"
+msgstr ""
+
+#: src/protocol.c:543
+#, c-format
+msgid "Received random meta key (unencrypted): %s"
+msgstr ""
+
+#: 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:476
+#: src/protocol.c:599
 #, fuzzy, c-format
 msgid "Connection with %s (%s) activated"
 msgstr "Activada la conexión con %s."
 
-#: src/protocol.c:531
+#: 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:540
+#: 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:549
+#: 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:560
+#: src/protocol.c:683
 #, c-format
 msgid "Warning: got ADD_SUBNET from %s (%s) for ourself, restarting"
 msgstr ""
 
-#: src/protocol.c:571
+#: src/protocol.c:694
 #, c-format
 msgid "Got ADD_SUBNET for %s from %s (%s) which is not in our connection list"
 msgstr ""
 
-#: src/protocol.c:611
+#: src/protocol.c:734
 #, fuzzy, c-format
 msgid "Got bad DEL_SUBNET from %s (%s)"
 msgstr "recibí una petición DEL_HOST incorrecta: %s"
 
-#: src/protocol.c:620
+#: src/protocol.c:743
 #, fuzzy, c-format
 msgid "Got bad DEL_SUBNET from %s (%s): invalid identity name"
 msgstr "recibí una petición DEL_HOST incorrecta: %s"
 
-#: src/protocol.c:629
+#: 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:640
+#: src/protocol.c:763
 #, c-format
 msgid "Warning: got DEL_SUBNET from %s (%s) for ourself, restarting"
 msgstr ""
 
-#: src/protocol.c:651
+#: src/protocol.c:774
 #, c-format
 msgid "Got DEL_SUBNET for %s from %s (%s) which is not in our connection list"
 msgstr ""
 
-#: src/protocol.c:688
+#: src/protocol.c:811
 #, fuzzy, c-format
 msgid "Got bad ADD_HOST from %s (%s)"
 msgstr "recibí una petición ADD_HOST incorrecta: %s"
 
-#: src/protocol.c:696
+#: src/protocol.c:819
 #, 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:705
+#: src/protocol.c:828
 #, c-format
 msgid "Warning: got ADD_HOST from %s (%s) for ourself, restarting"
 msgstr ""
 
-#: src/protocol.c:722
+#: src/protocol.c:845
 #, c-format
 msgid "Got duplicate ADD_HOST for %s (%s) from %s (%s)"
 msgstr ""
 
-#: src/protocol.c:730
+#: src/protocol.c:853
 #, c-format
 msgid "Removing old entry for %s (%s) in favour of new connection"
 msgstr ""
 
-#: src/protocol.c:773
+#: src/protocol.c:896
 #, fuzzy, c-format
 msgid "Got bad DEL_HOST from %s (%s)"
 msgstr "recibí una petición DEL_HOST incorrecta: %s"
 
-#: src/protocol.c:782
+#: src/protocol.c:905
 #, 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:791
+#: src/protocol.c:914
 #, c-format
 msgid "Warning: got DEL_HOST from %s (%s) for ourself, restarting"
 msgstr ""
 
-#: src/protocol.c:802
+#: src/protocol.c:925
 #, c-format
 msgid "Got DEL_HOST from %s (%s) for %s which is not in our connection list"
 msgstr ""
 
-#: src/protocol.c:812
+#: src/protocol.c:935
 #, fuzzy, c-format
 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:848
+#: src/protocol.c:971
 #, fuzzy, c-format
 msgid "Got bad STATUS from %s (%s)"
 msgstr "recibí una petición ANS_KEY incorrecta: %s"
 
-#: src/protocol.c:855
+#: src/protocol.c:978
 #, fuzzy, c-format
 msgid "Status message from %s (%s): %s: %s"
 msgstr "He recibido una petición: %s"
 
-#: src/protocol.c:879
+#: src/protocol.c:1002
 #, fuzzy, c-format
 msgid "Got bad ERROR from %s (%s)"
 msgstr "recibí una petición DEL_HOST incorrecta: %s"
 
-#: src/protocol.c:886
+#: src/protocol.c:1009
 #, fuzzy, c-format
 msgid "Error message from %s (%s): %s: %s"
 msgstr "He recibido una petición: %s"
 
-#: src/protocol.c:962
+#: src/protocol.c:1085
 #, fuzzy, c-format
 msgid "Got bad KEY_CHANGED from %s (%s)"
 msgstr "recibí KEY_CHANGED de "
 
-#: src/protocol.c:969
+#: src/protocol.c:1092
 #, c-format
 msgid ""
 "Got KEY_CHANGED from %s (%s) origin %s which does not exist in our "
 "connection list"
 msgstr ""
 
-#: src/protocol.c:999
+#: src/protocol.c:1123
 #, fuzzy, c-format
 msgid "Got bad REQ_KEY from %s (%s)"
 msgstr "recibí REQ_KEY de "
 
-#: src/protocol.c:1006
+#: src/protocol.c:1130
 #, c-format
 msgid ""
 "Got REQ_KEY from %s (%s) origin %s which does not exist in our connection "
 "list"
 msgstr ""
 
-#: src/protocol.c:1022
+#: src/protocol.c:1148
 #, c-format
 msgid ""
 "Got REQ_KEY from %s (%s) destination %s which does not exist in our "
 "connection list"
 msgstr ""
 
-#: src/protocol.c:1050
+#: src/protocol.c:1184
 #, fuzzy, c-format
 msgid "Got bad ANS_KEY from %s (%s)"
 msgstr "recibí una petición ANS_KEY incorrecta: %s"
 
-#: src/protocol.c:1057
+#: src/protocol.c:1191
 #, c-format
 msgid ""
 "Got ANS_KEY from %s (%s) origin %s which does not exist in our connection "
 "list"
 msgstr ""
 
-#: src/protocol.c:1091
+#: src/protocol.c:1203
+#, 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:1224
 #, c-format
 msgid ""
 "Got ANS_KEY from %s (%s) destination %s which does not exist in our "
@@ -685,7 +730,7 @@ msgid ""
 msgstr ""
 
 #. Do some intl stuff right now
-#: src/subnet.c:242 src/tincd.c:397
+#: src/subnet.c:242 src/tincd.c:394
 msgid "unknown"
 msgstr ""
 
@@ -715,11 +760,11 @@ msgstr ""
 #: src/tincd.c:105
 #, fuzzy
 msgid ""
-"  -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"
+"  -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"
@@ -732,9 +777,9 @@ msgstr ""
 #: src/tincd.c:110
 #, fuzzy
 msgid ""
-"  -K, --keygen[=BITS]   Generate public/private RSA keypair.\n"
-"      --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"
@@ -750,85 +795,78 @@ msgid "Invalid argument! BITS must be a number equal to or greater than 512.\n"
 msgstr ""
 
 #: src/tincd.c:208
-msgid ""
-"Seeding the PRNG: please press some keys or move\n"
-"the mouse if this program seems to have halted...\n"
-msgstr ""
-
-#. OpenSSL PRNG state apparently uses 1024 bytes, but it seems pretty sufficient anyway :)
-#: src/tincd.c:211
 #, fuzzy, c-format
 msgid "Generating %d bits keys:\n"
 msgstr "Generando claves de %d bits."
 
-#: src/tincd.c:215
+#: src/tincd.c:212
 msgid "Error during key generation!"
 msgstr ""
 
-#: src/tincd.c:219
+#: src/tincd.c:216
 #, fuzzy
 msgid "Done.\n"
 msgstr ": hecho.\n"
 
-#: src/tincd.c:221
+#: src/tincd.c:218
 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:231
+#: src/tincd.c:228
 #, 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:286
+#: src/tincd.c:283
 #, 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:289
+#: src/tincd.c:286
 #, fuzzy, c-format
 msgid "tincd %s starting"
 msgstr "tincd %s comenzando, nivel de depuración %d."
 
-#: src/tincd.c:304
+#: src/tincd.c:301
 #, 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:322
+#: src/tincd.c:319
 #, 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:325
+#: src/tincd.c:322
 #, 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:346
+#: src/tincd.c:343
 #, 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:348
+#: src/tincd.c:345
 msgid "No other tincd is running.\n"
 msgstr "No hay ningún otro tincd en ejecución.\n"
 
-#: src/tincd.c:355
+#: src/tincd.c:352
 msgid "Removing stale lock file.\n"
 msgstr "Borrando fichero de bloqueo en desuso.\n"
 
-#: src/tincd.c:403
+#: src/tincd.c:400
 #, c-format
 msgid "%s version %s (built %s %s, protocol %d)\n"
 msgstr ""
 
-#: src/tincd.c:404
+#: src/tincd.c:401
 #, fuzzy
 msgid ""
 "Copyright (C) 1998,1999,2000 Ivo Timmermans, Guus Sliepen and others.\n"
@@ -845,7 +883,7 @@ msgstr ""
 "y puede ser redistribuido bajo ciertas condiciones;\n"
 "vea el fichero COPYING para los detalles.\n"
 
-#: src/tincd.c:418
+#: src/tincd.c:415
 #, fuzzy
 msgid "You must be root to run this program. Sorry.\n"
 msgstr ""
@@ -860,7 +898,7 @@ msgstr ""
 msgid "Restarting in %d seconds!"
 msgstr ""
 
-#: src/tincd.c:462 src/tincd.c:508
+#: src/tincd.c:462 src/tincd.c:509
 #, fuzzy
 msgid "Not restarting."
 msgstr "tincd %s comenzando, nivel de depuración %d."
@@ -869,50 +907,42 @@ msgstr "tincd %s comenzando, nivel de depuraci
 msgid "Got TERM signal"
 msgstr "Recibí la señal TERM"
 
-#: src/tincd.c:480
+#: src/tincd.c:481
 msgid "Got QUIT signal"
 msgstr "Recibí la señal QUIT"
 
-#: src/tincd.c:487
+#: src/tincd.c:488
 msgid "Got another SEGV signal: not restarting"
 msgstr "Recibí otra señal SEGV: no reinicio"
 
-#: src/tincd.c:494
+#: src/tincd.c:495
 #, fuzzy
 msgid "Got SEGV signal"
 msgstr "Recibí la señal TERM"
 
-#: src/tincd.c:499
+#: src/tincd.c:500
 #, fuzzy
 msgid "Trying to re-execute in 5 seconds..."
 msgstr "Intento re-establecer la conexión saliente en 5 segundos."
 
-#: src/tincd.c:517
+#: src/tincd.c:518
 msgid "Got HUP signal"
 msgstr "Recibí la señal HUP"
 
-#: src/tincd.c:525
+#: src/tincd.c:526
 #, fuzzy
 msgid "Got INT signal, exiting"
 msgstr "Recibí la señal INT"
 
-#: src/tincd.c:549
+#: src/tincd.c:545
 #, fuzzy, c-format
 msgid "Got unexpected signal %d (%s)"
 msgstr "Recibí una señal inesperada (%d)."
 
-#, fuzzy
-#~ msgid "Receiving packet of %d bytes"
-#~ msgstr "Recibiendo clave de "
-
 #, fuzzy
 #~ msgid "Non-IP ethernet frame %04x from %02x:%02x:%02x:%02x:%02x:%02x"
 #~ msgstr "Trama ethernet no-IP %04x de "
 
-#, fuzzy
-#~ msgid "Got bad ANS_KEY from %s (%s) origin %s: invalid key"
-#~ msgstr "recibí una petición ANS_KEY incorrecta: %s"
-
 #, fuzzy
 #~ msgid "Got USR2 signal, forcing new key generation"
 #~ msgstr "Forzando generación de una nueva clave"
@@ -929,10 +959,6 @@ msgstr "Recib
 #~ msgid "Illegal passphrase in %s; size would be %d"
 #~ msgstr "Frase de paso ilegal en %s; el tamaño debe ser %d"
 
-#, fuzzy
-#~ msgid "Generating %d bits keys"
-#~ msgstr "Generando claves de %d bits."
-
 #~ msgid "Opening /dev/urandom failed: %m"
 #~ msgstr "Fallo abriendo /dev/urandom : %m"