X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=po%2Fes.po;h=594043836cf0e7d62a89a18a645673dc06c08ea6;hp=6076a85dc3017341d724dacd723adcdfdf2687c5;hb=fba19c30c92d39e74f5fd5594053793b036f30f4;hpb=9f64499e40a95a8c05c82924219517aa017fc411

diff --git a/po/es.po b/po/es.po
index 6076a85d..59404383 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-15 02:53+0200\n"
+"POT-Creation-Date: 2000-10-20 18:35+0200\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"
@@ -33,37 +33,6 @@ msgstr ""
 msgid "Invalid value for variable on line %d while reading config file %s"
 msgstr ""
 
-#: src/genauth.c:78
-#, c-format
-msgid "Usage: %s bits\n"
-msgstr "Uso: %s bits\n"
-
-#: src/genauth.c:89
-#, c-format
-msgid "Illegal number: %s\n"
-msgstr "Número ilegal: %s\n"
-
-#. Align to bytes for easy mallocing and reading
-#: src/genauth.c:95
-#, fuzzy, c-format
-msgid "Generating %d bits keys:\n"
-msgstr "Generando claves de %d bits."
-
-#: src/genauth.c:99
-#, fuzzy
-msgid "Done.\n"
-msgstr ": hecho.\n"
-
-#: src/genauth.c:101
-#, c-format
-msgid "Public key:\t%s\n"
-msgstr ""
-
-#: src/genauth.c:102
-#, c-format
-msgid "Private key:\t%s\n"
-msgstr ""
-
 #: src/meta.c:42
 #, fuzzy, c-format
 msgid "Sending %d bytes of metadata to %s (%s): %s"
@@ -74,7 +43,7 @@ msgstr "Enviados %d bytes a %lx"
 msgid "Sending meta data to %s (%s) failed: %m"
 msgstr "Error enviando datos: %m"
 
-#: src/meta.c:85 src/net.c:773
+#: src/meta.c:85 src/net.c:847
 #, fuzzy, c-format
 msgid "This is a bug: %s:%d: %d:%m %s (%s)"
 msgstr "Esto es un `bug': %s:%d: %d:%m"
@@ -104,278 +73,300 @@ msgstr "Petici
 msgid "Metadata read buffer overflow for %s (%s)"
 msgstr "Desbordamiento del búfer de lectura de metadatos"
 
-#: src/net.c:106
+#: src/net.c:107
 #, fuzzy, c-format
 msgid "Sending packet of %d bytes to %s (%s)"
 msgstr "Enviados %d bytes a %lx"
 
-#: src/net.c:115
+#: src/net.c:116
 #, fuzzy, c-format
 msgid "Error sending packet to %s (%s): %m"
 msgstr "Error enviando datos: %m"
 
-#: src/net.c:129
+#: src/net.c:130
 #, fuzzy, c-format
 msgid "Receiving packet of %d bytes"
 msgstr "Recibiendo clave de "
 
-#: src/net.c:142
+#: src/net.c:143
 #, c-format
 msgid "Can't write to tap device: %m"
 msgstr "No puedo escribir en el dispositivo tap: %m"
 
-#: src/net.c:242
+#: src/net.c:243
 #, fuzzy
 msgid "Queue flushed"
 msgstr "cola vaciada"
 
-#: src/net.c:257
+#: src/net.c:258
 #, fuzzy, c-format
 msgid "Flushing send queue for %s (%s)"
 msgstr "Vaciando la cola de envíos para "
 
-#: src/net.c:265
+#: src/net.c:266
 #, fuzzy, c-format
 msgid "Flushing receive queue for %s (%s)"
 msgstr "Vaciando la cola de recepción para "
 
-#: src/net.c:283
+#: src/net.c:284
 #, c-format
 msgid "Trying to look up %d.%d.%d.%d in connection list failed!"
 msgstr ""
 
-#: src/net.c:297
+#: src/net.c:298
 #, fuzzy, c-format
 msgid "Could not open UDP connection to %s (%s)"
 msgstr "No pude abrir %s: %s\n"
 
-#: src/net.c:305
+#: src/net.c:306
 #, c-format
 msgid "No valid key known yet for %s (%s), queueing packet"
 msgstr ""
 
-#: src/net.c:316
+#: src/net.c:317
 #, c-format
 msgid "%s (%s) is not ready, queueing packet"
 msgstr ""
 
-#: src/net.c:344
+#: src/net.c:352
 #, c-format
 msgid "Could not open %s: %m"
 msgstr "No pude abrir %s: %m"
 
-#: src/net.c:360
+#: src/net.c:370
 #, c-format
 msgid "%s is a new style tun/tap device"
 msgstr ""
 
-#: src/net.c:362
+#: src/net.c:373
 msgid "tun/tap device will be left unconfigured"
 msgstr ""
 
-#: src/net.c:384
+#: src/net.c:396
 #, c-format
 msgid "Creating metasocket failed: %m"
 msgstr "Fallo al crear el metasocket: %m"
 
-#: src/net.c:390 src/net.c:396 src/net.c:458
+#: src/net.c:402 src/net.c:408 src/net.c:470
 #, c-format
 msgid "setsockopt: %m"
 msgstr "setsockopt(): %m"
 
-#: src/net.c:403 src/net.c:465
+#: src/net.c:415 src/net.c:477
 #, c-format
 msgid "fcntl: %m"
 msgstr "fcntl(): %m"
 
-#: src/net.c:411
+#: src/net.c:423
 #, c-format
 msgid "Unable to bind listen socket to interface %s: %m"
 msgstr ""
 
-#: src/net.c:427
+#: src/net.c:439
 #, 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:433
+#: src/net.c:445
 #, c-format
 msgid "listen: %m"
 msgstr "listen(): %m"
 
-#: src/net.c:452
+#: src/net.c:464
 #, c-format
 msgid "Creating socket failed: %m"
 msgstr "Error al crear el `socket': %m"
 
-#: src/net.c:476
+#: src/net.c:488
 #, 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:493
+#: src/net.c:505
 #, fuzzy, c-format
 msgid "Trying to connect to %s"
 msgstr "Cerrando conexión con %s."
 
-#: src/net.c:503
+#: src/net.c:515
 #, fuzzy, c-format
 msgid "Creating socket for %s port %d failed: %m"
 msgstr "Error al crear el `socket': %m"
 
-#: src/net.c:514
+#: src/net.c:526
 #, c-format
 msgid "%s port %hd: %m"
 msgstr ""
 
-#: src/net.c:521
+#: src/net.c:533
 #, c-format
 msgid "fcntl for %s port %d: %m"
 msgstr ""
 
-#: src/net.c:527
+#: src/net.c:539
 #, fuzzy, c-format
 msgid "Connected to %s port %hd"
 msgstr "Conectado a %s:%hd"
 
-#: src/net.c:547
+#: src/net.c:562
+msgid "Invalid name for outgoing connection"
+msgstr ""
+
+#: src/net.c:571
+#, c-format
+msgid "Error reading host configuration file for %s"
+msgstr ""
+
+#: src/net.c:578
+#, c-format
+msgid "No address specified for %s"
+msgstr ""
+
+#: src/net.c:585
 #, fuzzy, c-format
 msgid "Error looking up `%s': %m"
 msgstr "Error buscando `%s': %s\n"
 
-#: src/net.c:557
+#: src/net.c:595
 #, 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:586
+#: src/net.c:629
 msgid "Name for tinc daemon required!"
 msgstr ""
 
-#: src/net.c:594
+#: src/net.c:637
 msgid "Invalid name for myself!"
 msgstr ""
 
-#: src/net.c:600
+#: src/net.c:643
+msgid "Private key for tinc daemon required!"
+msgstr ""
+
+#: src/net.c:655
 msgid "Cannot open host configuration file for myself!"
 msgstr ""
 
-#: src/net.c:619
+#: src/net.c:661
+msgid "Public key for tinc daemon required!"
+msgstr ""
+
+#: src/net.c:690
 #, fuzzy
 msgid "Unable to set up a listening socket!"
 msgstr "No puedo configurar un `socket' a la escucha"
 
-#: src/net.c:625
+#: src/net.c:696
 #, 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:632
+#: src/net.c:703
 #, fuzzy, c-format
 msgid "Ready: listening on port %hd"
 msgstr "Listo: escuchando en el puerto %d."
 
-#: src/net.c:660
+#: src/net.c:734
 #, 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:698
+#: src/net.c:772
 #, 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:736
+#: src/net.c:810
 #, fuzzy
 msgid "Terminating"
 msgstr "Terminando."
 
-#: src/net.c:750
+#: src/net.c:824
 #, fuzzy, c-format
 msgid "Opening UDP socket to %s"
 msgstr "Abriendo `socket' UDP a "
 
-#: src/net.c:755
+#: src/net.c:829
 #, fuzzy, c-format
 msgid "Creating UDP socket failed: %m"
 msgstr "Error al crear el `socket': %m"
 
-#: src/net.c:765
+#: src/net.c:839
 #, fuzzy, c-format
 msgid "Connecting to %s port %d failed: %m"
 msgstr "Error al crear `socket' de datos: %m"
 
-#: src/net.c:798
+#: src/net.c:872
 #, c-format
 msgid "Error: getpeername: %m"
 msgstr "Error: getpeername(): %m"
 
-#: src/net.c:813
+#: src/net.c:887
 #, fuzzy, c-format
 msgid "Connection from %s port %d"
 msgstr "Conexión desde %s:%d"
 
-#: src/net.c:861
+#: src/net.c:931
 #, fuzzy, c-format
 msgid "This is a bug: %s:%d: %d:%m"
 msgstr "Esto es un `bug': %s:%d: %d:%m"
 
-#: src/net.c:867
+#: src/net.c:937
 #, fuzzy, c-format
 msgid "Incoming data socket error: %s"
 msgstr "Error en el `socket' de recepción de datos: %s"
 
-#: src/net.c:873
+#: src/net.c:943
 #, fuzzy, c-format
 msgid "Receiving packet failed: %m"
 msgstr "Error recibiendo datos: %m"
 
-#: src/net.c:894
+#: src/net.c:964
 #, fuzzy, c-format
 msgid "Closing connection with %s (%s)"
 msgstr "Cerrando conexión con %s."
 
-#: src/net.c:937
+#: src/net.c:1007
 #, 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:967
+#: src/net.c:1037
 #, c-format
 msgid "%s (%s) didn't respond to PING"
 msgstr ""
 
-#: src/net.c:998
+#: src/net.c:1068
 #, c-format
 msgid "Accepting a new connection failed: %m"
 msgstr "Error al aceptar una nueva conexión: %m"
 
-#: src/net.c:1006
+#: src/net.c:1076
 #, fuzzy
 msgid "Closed attempted connection"
 msgstr "Se ha cerrado la conexión que se intentaba realizar."
 
-#: src/net.c:1041
+#: src/net.c:1111
 #, fuzzy, c-format
 msgid "Outgoing data socket error for %s (%s): %s"
 msgstr "Error en el `socket' de datos salientes: %s"
 
-#: src/net.c:1077
+#: src/net.c:1150 src/net.c:1159
 #, c-format
 msgid "Error while reading from tapdevice: %m"
 msgstr "Error leyendo del dispositivo tap: %m"
 
-#: src/net.c:1087
+#: src/net.c:1171
 #, fuzzy, c-format
 msgid "Non-IP ethernet frame %04x from %02x:%02x:%02x:%02x:%02x:%02x"
 msgstr "Trama ethernet no-IP %04x de "
 
-#: src/net.c:1094
+#: src/net.c:1178
 #, c-format
 msgid "Dropping short packet from %02x:%02x:%02x:%02x:%02x:%02x"
 msgstr ""
 
-#: src/net.c:1133
+#: src/net.c:1213
 #, c-format
 msgid "Error while waiting for input: %m"
 msgstr "Error esperando entrada: %m"
@@ -415,275 +406,285 @@ msgstr "Error al procesar la petici
 msgid "Bogus data received from %s (%s)"
 msgstr "Se han recibido datos sin sentido."
 
-#: src/protocol.c:167
+#: src/protocol.c:170
 #, fuzzy, c-format
 msgid "Got bad ID from %s"
 msgstr "recibí una petición BASIC_INFO incorrecta: %s"
 
-#: src/protocol.c:175
+#: src/protocol.c:178
 #, fuzzy, c-format
 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:184
+#: src/protocol.c:187
 #, c-format
 msgid "Peer %s uses invalid identity name"
 msgstr ""
 
-#: src/protocol.c:192
+#: src/protocol.c:195
 #, c-format
 msgid "Peer %s had unknown identity (%s)"
 msgstr ""
 
-#: src/protocol.c:207
+#: src/protocol.c:209
 #, c-format
 msgid "Uplink %s (%s) is already in our connection list"
 msgstr ""
 
-#: src/protocol.c:253
+#: src/protocol.c:219
+#, c-format
+msgid "No public key known for %s (%s)"
+msgstr ""
+
+#: src/protocol.c:258 src/protocol.c:312
+#, c-format
+msgid "Error during encryption of challenge for %s (%s)"
+msgstr ""
+
+#: src/protocol.c:284
 #, fuzzy, c-format
 msgid "Got bad CHALLENGE from %s (%s)"
 msgstr "recibí KEY_CHANGED de "
 
-#: src/protocol.c:261
+#: src/protocol.c:294
 #, c-format
 msgid "Intruder: wrong challenge length from %s (%s)"
 msgstr ""
 
-#: src/protocol.c:287
+#: src/protocol.c:330
 #, c-format
 msgid "Trying to send CHAL_REPLY to %s (%s) without a valid CHALLENGE"
 msgstr ""
 
-#: src/protocol.c:318
+#: src/protocol.c:361
 #, fuzzy, c-format
 msgid "Got bad CHAL_REPLY from %s (%s)"
 msgstr "recibí una petición ANS_KEY incorrecta: %s"
 
-#: src/protocol.c:327
+#: src/protocol.c:370
 #, c-format
 msgid "Intruder: wrong challenge reply length from %s (%s)"
 msgstr ""
 
-#: src/protocol.c:344
+#: src/protocol.c:387
 #, c-format
 msgid "Intruder: wrong challenge reply from %s (%s)"
 msgstr ""
 
-#: src/protocol.c:386
+#: src/protocol.c:425
 #, c-format
 msgid "Removing old entry for %s at %s in favour of new connection from %s"
 msgstr ""
 
-#: src/protocol.c:398
+#: src/protocol.c:437
 #, fuzzy, c-format
 msgid "Connection with %s (%s) activated"
 msgstr "Activada la conexión con %s."
 
-#: src/protocol.c:438
+#: src/protocol.c:477
 #, fuzzy, c-format
 msgid "Got bad ADD_SUBNET from %s (%s)"
 msgstr "recibí una petición ADD_HOST incorrecta: %s"
 
-#: src/protocol.c:447
+#: src/protocol.c:486
 #, 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:456
+#: src/protocol.c:495
 #, 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:467
+#: src/protocol.c:506
 #, c-format
 msgid "Warning: got ADD_SUBNET from %s (%s) for ourself, restarting"
 msgstr ""
 
-#: src/protocol.c:478
+#: src/protocol.c:517
 #, c-format
 msgid "Got ADD_SUBNET for %s from %s (%s) which is not in our connection list"
 msgstr ""
 
-#: src/protocol.c:506
+#: src/protocol.c:545
 #, fuzzy, c-format
 msgid "Got bad DEL_SUBNET from %s (%s)"
 msgstr "recibí una petición DEL_HOST incorrecta: %s"
 
-#: src/protocol.c:515
+#: src/protocol.c:554
 #, 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:524
+#: src/protocol.c:563
 #, 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:535
+#: src/protocol.c:574
 #, c-format
 msgid "Warning: got DEL_SUBNET from %s (%s) for ourself, restarting"
 msgstr ""
 
-#: src/protocol.c:546
+#: src/protocol.c:585
 #, c-format
 msgid "Got DEL_SUBNET for %s from %s (%s) which is not in our connection list"
 msgstr ""
 
-#: src/protocol.c:577
+#: src/protocol.c:616
 #, fuzzy, c-format
 msgid "Got bad ADD_HOST from %s (%s)"
 msgstr "recibí una petición ADD_HOST incorrecta: %s"
 
-#: src/protocol.c:585
+#: src/protocol.c:624
 #, 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:594
+#: src/protocol.c:633
 #, c-format
 msgid "Warning: got ADD_HOST from %s (%s) for ourself, restarting"
 msgstr ""
 
-#: src/protocol.c:604
+#: src/protocol.c:643
 #, c-format
 msgid "Warning: got ADD_HOST from %s (%s) from ourself, restarting"
 msgstr ""
 
-#: src/protocol.c:614
+#: src/protocol.c:653
 #, c-format
 msgid ""
 "Got ADD_HOST from %s (%s) with origin %s which is not in our connection list"
 msgstr ""
 
-#: src/protocol.c:633
+#: src/protocol.c:672
 #, c-format
 msgid "Got duplicate ADD_HOST for %s (%s) from %s (%s)"
 msgstr ""
 
-#: src/protocol.c:640
+#: src/protocol.c:679
 #, c-format
 msgid "Removing old entry for %s (%s)"
 msgstr ""
 
-#: src/protocol.c:683
+#: src/protocol.c:722
 #, fuzzy, c-format
 msgid "Got bad DEL_HOST from %s (%s)"
 msgstr "recibí una petición DEL_HOST incorrecta: %s"
 
-#: src/protocol.c:692
+#: src/protocol.c:731
 #, 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:701
+#: src/protocol.c:740
 #, c-format
 msgid "Warning: got DEL_HOST from %s (%s) for ourself, restarting"
 msgstr ""
 
-#: src/protocol.c:712
+#: src/protocol.c:751
 #, c-format
 msgid "Warning: got DEL_HOST from %s (%s) from ourself, restarting"
 msgstr ""
 
-#: src/protocol.c:722
+#: src/protocol.c:761
 #, c-format
 msgid ""
 "Got DEL_HOST from %s (%s) with origin %s which is not in our connection list"
 msgstr ""
 
-#: src/protocol.c:734
+#: src/protocol.c:773
 #, c-format
 msgid "Got DEL_HOST from %s (%s) for %s which is not in our connection list"
 msgstr ""
 
-#: src/protocol.c:744
+#: src/protocol.c:783
 #, 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:776
+#: src/protocol.c:815
 #, fuzzy, c-format
 msgid "Got bad STATUS from %s (%s)"
 msgstr "recibí una petición ANS_KEY incorrecta: %s"
 
-#: src/protocol.c:783
+#: src/protocol.c:822
 #, fuzzy, c-format
 msgid "Status message from %s (%s): %s: %s"
 msgstr "He recibido una petición: %s"
 
-#: src/protocol.c:807
+#: src/protocol.c:846
 #, fuzzy, c-format
 msgid "Got bad ERROR from %s (%s)"
 msgstr "recibí una petición DEL_HOST incorrecta: %s"
 
-#: src/protocol.c:814
+#: src/protocol.c:853
 #, fuzzy, c-format
 msgid "Error message from %s (%s): %s: %s"
 msgstr "He recibido una petición: %s"
 
-#: src/protocol.c:892
+#: src/protocol.c:931
 #, fuzzy, c-format
 msgid "Got bad KEY_CHANGED from %s (%s)"
 msgstr "recibí KEY_CHANGED de "
 
-#: src/protocol.c:899
+#: src/protocol.c:938
 #, c-format
 msgid ""
 "Got KEY_CHANGED from %s (%s) origin %s which does not exist in our "
 "connection list"
 msgstr ""
 
-#: src/protocol.c:929
+#: src/protocol.c:968
 #, fuzzy, c-format
 msgid "Got bad REQ_KEY from %s (%s)"
 msgstr "recibí REQ_KEY de "
 
-#: src/protocol.c:936
+#: src/protocol.c:975
 #, c-format
 msgid ""
 "Got REQ_KEY from %s (%s) origin %s which does not exist in our connection "
 "list"
 msgstr ""
 
-#: src/protocol.c:952
+#: src/protocol.c:991
 #, c-format
 msgid ""
 "Got REQ_KEY from %s (%s) destination %s which does not exist in our "
 "connection list"
 msgstr ""
 
-#: src/protocol.c:980
+#: src/protocol.c:1019
 #, fuzzy, c-format
 msgid "Got bad ANS_KEY from %s (%s)"
 msgstr "recibí una petición ANS_KEY incorrecta: %s"
 
-#: src/protocol.c:987
+#: src/protocol.c:1026
 #, c-format
 msgid ""
 "Got ANS_KEY from %s (%s) origin %s which does not exist in our connection "
 "list"
 msgstr ""
 
-#: src/protocol.c:1003
+#: src/protocol.c:1042
 #, fuzzy, c-format
 msgid "Got bad ANS_KEY from %s (%s) origin %s: invalid key"
 msgstr "recibí una petición ANS_KEY incorrecta: %s"
 
-#: src/protocol.c:1016
+#: src/protocol.c:1055
 #, c-format
 msgid ""
 "Got ANS_KEY from %s (%s) destination %s which does not exist in our "
 "connection list"
 msgstr ""
 
-#: src/tincd.c:94
+#: src/tincd.c:99
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Pruebe `%s --help' para más información.\n"
 
-#: src/tincd.c:97
+#: src/tincd.c:102
 #, c-format
 msgid ""
 "Usage: %s [option]...\n"
@@ -692,7 +693,7 @@ msgstr ""
 "Modo de empleo: %s [opción]...\n"
 "\n"
 
-#: src/tincd.c:98
+#: src/tincd.c:103
 #, fuzzy
 msgid ""
 "  -c, --config=DIR      Read configuration options from DIR.\n"
@@ -700,7 +701,6 @@ msgid ""
 "  -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"
 msgstr ""
 "  -c, --config=FICHERO  Lee opciones de configuración del FICHERO.\n"
 "  -D, --no-detach       No hagas fork() y liberes la terminal.\n"
@@ -710,8 +710,10 @@ msgstr ""
 "  -t, --timeout=TIEMPO  Segundos a esperar antes de cancelar una "
 "trasmisión.\n"
 
-#: src/tincd.c:104
+#: src/tincd.c:108
+#, 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"
 "\n"
@@ -720,72 +722,99 @@ msgstr ""
 "      --version         Muestra información de la versión y termina.\n"
 "\n"
 
-#: src/tincd.c:106
+#: src/tincd.c:111
 msgid "Report bugs to tinc@nl.linux.org.\n"
 msgstr "Comunicar `bugs' a tinc@nl.linux.org.\n"
 
-#: src/tincd.c:144
-#, c-format
-msgid "Invalid timeout value `%s'.\n"
-msgstr "Valor de `timeout' no válido `%s'.\n"
+#: src/tincd.c:152
+msgid "Invalid argument! BITS must be a number equal to or greater than 512.\n"
+msgstr ""
+
+#: src/tincd.c:207
+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: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:158
+#: 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: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:213
+#: 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:216
+#: src/tincd.c:288
 #, fuzzy, c-format
 msgid "tincd %s starting"
 msgstr "tincd %s comenzando, nivel de depuración %d."
 
-#: src/tincd.c:231
+#: 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:249
+#: 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:252
+#: 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:273
+#: 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:275
+#: 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:282
+#: src/tincd.c:354
 msgid "Removing stale lock file.\n"
 msgstr "Borrando fichero de bloqueo en desuso.\n"
 
 #. Do some intl stuff right now
-#: src/tincd.c:325
+#: src/tincd.c:397
 msgid "unknown"
 msgstr ""
 
-#: src/tincd.c:331
+#: src/tincd.c:403
 #, c-format
 msgid "%s version %s (built %s %s, protocol %d)\n"
 msgstr ""
 
-#: src/tincd.c:332
+#: src/tincd.c:404
 #, fuzzy
 msgid ""
 "Copyright (C) 1998,1999,2000 Ivo Timmermans, Guus Sliepen and others.\n"
@@ -802,66 +831,75 @@ msgstr ""
 "y puede ser redistribuido bajo ciertas condiciones;\n"
 "vea el fichero COPYING para los detalles.\n"
 
-#: src/tincd.c:346
+#: 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:377
+#: src/tincd.c:452
 msgid "Unrecoverable error"
 msgstr ""
 
-#: src/tincd.c:382
+#: src/tincd.c:457
 #, c-format
 msgid "Restarting in %d seconds!"
 msgstr ""
 
-#: src/tincd.c:387 src/tincd.c:433
+#: src/tincd.c:462 src/tincd.c:508
 msgid "Aieee! Not restarting."
 msgstr ""
 
-#: src/tincd.c:397
+#: src/tincd.c:472
 msgid "Got TERM signal"
 msgstr "Recibí la señal TERM"
 
-#: src/tincd.c:405
+#: src/tincd.c:480
 msgid "Got QUIT signal"
 msgstr "Recibí la señal QUIT"
 
-#: src/tincd.c:412
+#: src/tincd.c:487
 msgid "Got another SEGV signal: not restarting"
 msgstr "Recibí otra señal SEGV: no reinicio"
 
-#: src/tincd.c:419
+#: src/tincd.c:494
 #, fuzzy
 msgid "Got SEGV signal"
 msgstr "Recibí la señal TERM"
 
-#: src/tincd.c:424
+#: src/tincd.c:499
 #, fuzzy
 msgid "Trying to re-execute in 5 seconds..."
 msgstr "Intento re-establecer la conexión saliente en 5 segundos."
 
-#: src/tincd.c:442
+#: src/tincd.c:517
 msgid "Got HUP signal, rereading configuration and restarting"
 msgstr ""
 
-#: src/tincd.c:450
+#: src/tincd.c:525
 #, fuzzy
 msgid "Got INT signal, exiting"
 msgstr "Recibí la señal INT"
 
-#: src/tincd.c:464
+#: src/tincd.c:539
 #, fuzzy
 msgid "Got USR2 signal, forcing new key generation"
 msgstr "Forzando generación de una nueva clave"
 
-#: src/tincd.c:473
+#: src/tincd.c:548
 #, fuzzy, c-format
 msgid "Got unexpected signal %d (%s)"
 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"