- Updated dutch translation.

diff --git a/po/es.po b/po/es.po
index 23883ee..87cd1ae 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tinc 1.0pre3\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: tinc 1.0pre3\n"

-"POT-Creation-Date: 2000-11-26 14:51+0000\n"
+"POT-Creation-Date: 2001-01-06 17:41+0100\n"

 "PO-Revision-Date: 2000-11-26 15:20+0000\n"
 "Last-Translator: Enrique Zanardi <ezanardi@id-agora.com>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
 "PO-Revision-Date: 2000-11-26 15:20+0000\n"
 "Last-Translator: Enrique Zanardi <ezanardi@id-agora.com>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"


@@ -13,706 +13,748 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: lib/getopt.c:681
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: la opción `%s' es ambigua\n"
-
-#: lib/getopt.c:705
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: la opción `--%s' no lleva parámetros\n"
+#: src/conf.c:238
+#, fuzzy, c-format
+msgid "Cannot open config file %s: %m"
+msgstr "¡No puedo abrir el fichero de configuración de `host' para mí!"

 
 

-#: lib/getopt.c:710
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: la opción `%c%s' no lleva parámetros\n"
+#: src/conf.c:274
+#, fuzzy, c-format
+msgid "Invalid variable name `%s' on line %d while reading config file %s"
+msgstr ""
+"Nombre de variable no válido en la linea %d del fichero de configuración %s"

 
 

-#: lib/getopt.c:727 lib/getopt.c:900
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: la opción `%s' requiere un parámetro\n"
+#: src/conf.c:281
+#, fuzzy, c-format
+msgid "No value for variable `%s' on line %d while reading config file %s"
+msgstr ""
+"No hay valor para la variable en la linea %d del fichero de configuración %s"

 
 

-#. --option
-#: lib/getopt.c:756
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: opción desconocida `--%s'\n"
+#: src/conf.c:289
+#, fuzzy, c-format
+msgid "Invalid value for variable `%s' on line %d while reading config file %s"
+msgstr ""
+"Valor no válido para la variable en la linea %d del fichero de configuración "
+"%s"

 
 

-#. +option or -option
-#: lib/getopt.c:760
+#: src/conf.c:314

 #, c-format
 #, c-format

-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: opción desconocida `%c%s'\n"
+msgid "Failed to read `%s': %m"
+msgstr ""

 
 

-#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:786
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: opción ilegal -- %c\n"
+#: src/conf.c:361 src/conf.c:384 src/conf.c:404
+#, fuzzy, c-format
+msgid "Couldn't stat `%s': %m"
+msgstr "No pude abrir %s: %m"

 
 

-#: lib/getopt.c:789
+#: src/conf.c:376

 #, c-format
 #, c-format

-msgid "%s: invalid option -- %c\n"
-msgstr "%s: opción no válida --%c\n"
+msgid "`%s' is not an absolute path"
+msgstr ""

 
 

-#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:819 lib/getopt.c:949
+#: src/conf.c:390 src/conf.c:412

 #, c-format
 #, c-format

-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: la opción requiere un parámetro -- %c\n"
+msgid "`%s' is owned by UID %d instead of %d"
+msgstr ""

 
 

-#: lib/getopt.c:866
+#: src/conf.c:396 src/conf.c:418

 #, c-format
 #, c-format

-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: la opción `-W %s' es ambigua\n"
+msgid "Warning: `%s' is a symlink"
+msgstr ""

 
 

-#: lib/getopt.c:884
+#. Accessible by others
+#: src/conf.c:425

 #, c-format
 #, c-format

-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: la opción `-W %s' no lleva parámetros\n"
+msgid "`%s' has unsecure permissions"
+msgstr ""

 
 

-#: lib/list.c:62
+#. Ask for a file and/or directory name.
+#: src/conf.c:451

 #, c-format
 #, c-format

-msgid "List callback[delete] failed for %08lx - freeing anyway"
+msgid "Please enter a file to save %s to [%s]: "

 msgstr ""
 msgstr ""

-"El callback[delete] de la lista falló para %08lx - liberándolo de todos modos"

 
 

-#. FIXME: describe
-#: lib/xmalloc.c:69
-msgid "Memory exhausted"
-msgstr "Memoria agotada"
+#: src/conf.c:457
+#, fuzzy, c-format
+msgid "Error while reading stdin: %m\n"
+msgstr "Error leyendo del dispositivo tap: %m"

 
 

-#: src/conf.c:164
-#, c-format
-msgid "Line %d too long while reading config file %s"
-msgstr "La línea %d es demasiado larga en el fichero de configuración %s"
+#: src/conf.c:496
+#, fuzzy, c-format
+msgid "Error opening file `%s': %m\n"
+msgstr "Error buscando `%s': %m"

 
 

-#: src/conf.c:180
+#: src/conf.c:506

 #, c-format
 #, c-format

-msgid "Invalid variable name on line %d while reading config file %s"
+msgid ""
+"The file `%s' (or any of the leading directories) has unsafe permissions.\n"
+"I will not create or overwrite this file.\n"

 msgstr ""
 msgstr ""

-"Nombre de variable no válido en la linea %d del fichero de configuración %s"

 
 

-#: src/conf.c:187
-#, c-format
-msgid "No value for variable on line %d while reading config file %s"
-msgstr ""
-"No hay valor para la variable en la linea %d del fichero de configuración %s"
+#: src/connection.c:191
+#, fuzzy
+msgid "Connection list:"
+msgstr "Conexión desde %s puerto %d"

 
 

-#: src/conf.c:195
+#: src/connection.c:193 src/connection.c:200

 #, c-format
 #, c-format

-msgid "Invalid value for variable on line %d while reading config file %s"
+msgid " %s at %s port %hd flags %d sockets %d, %d status %04x"

 msgstr ""
 msgstr ""

-"Valor no válido para la variable en la linea %d del fichero de configuración "
-"%s"

 
 

-#: src/encr.c:111 src/net.c:352
-#, c-format
-msgid "Could not open %s: %m"
-msgstr "No pude abrir %s: %m"
-
-#: src/encr.c:118
-#, c-format
-msgid "Illegal passphrase in %s; size would be %d"
-msgstr "Frase ilegal en %s; el tamaño debe ser %d"
-
-#: src/encr.c:155
-#, c-format
-msgid "Generating %d bits keys"
-msgstr "Generando claves de %d bits"
+#: src/connection.c:205
+#, fuzzy
+msgid "End of connection list."
+msgstr "Intentando conectar con %s"

 
 

-#: src/encr.c:159
-#, c-format
-msgid "Opening /dev/urandom failed: %m"
-msgstr "Fallo al abrir /dev/urandom: %m"
+#: src/meta.c:53
+#, fuzzy, c-format
+msgid "Sending %d bytes of metadata to %s (%s): %s"
+msgstr "Enviando paquete de %d bytes a %s (%s)"

 
 

-#: src/encr.c:224
-#, c-format
-msgid "Encryption key set to %s"
-msgstr "Clave de cifrado definida como %s"
+#: src/meta.c:69
+#, fuzzy, c-format
+msgid "Sending meta data to %s (%s) failed: %m"
+msgstr "Error enviando paquete a %s (%s): %m"

 
 

-#: src/genauth.c:78
+#: src/meta.c:100 src/net.c:1101

 #, c-format
 #, c-format

-msgid "Usage: %s bits\n"
-msgstr "Modo de empleo: %s bits\n"
+msgid "This is a bug: %s:%d: %d:%m %s (%s)"
+msgstr "Esto es un `bug': %s:%d: %d:%m %s (%s)"

 
 

-#: src/genauth.c:89
-#, c-format
-msgid "Illegal number: %s\n"
-msgstr "Número ilegal: %s\n"
+#: src/meta.c:106
+#, fuzzy, c-format
+msgid "Metadata socket error for %s (%s): %s"
+msgstr "Error en el `socket' de datos salientes para %s (%s): %s"

 
 

-#. Align to bytes for easy mallocing and reading
-#: src/genauth.c:95
-#, c-format
-msgid "Generating %d bits keys:\n"
-msgstr "Generando claves de %d bits:\n"
+#: src/meta.c:125
+#, fuzzy, c-format
+msgid "Connection closed by %s (%s)"
+msgstr "Cerrando conexión con %s (%s)"

 
 

-#: src/genauth.c:99
-msgid "Done.\n"
-msgstr "Hecho.\n"
+#: src/meta.c:129
+#, fuzzy, c-format
+msgid "Metadata socket read error for %s (%s): %m"
+msgstr "Error en el `socket' de datos salientes para %s (%s): %s"

 
 

-#: src/genauth.c:101
-#, c-format
-msgid "Public key:  %s\n"
-msgstr "Clave pública: %s\n"
+#: src/meta.c:159
+#, fuzzy, c-format
+msgid "Got request from %s (%s): %s"
+msgstr "Petición desconocida desde %s (%s)"

 
 

-#: src/genauth.c:102
-#, c-format
-msgid "Private key: %s\n"
-msgstr "Clave privada: %s\n"
+#: src/meta.c:177
+#, fuzzy, c-format
+msgid "Metadata read buffer overflow for %s (%s)"
+msgstr "Desbordamiento del bufer de salida mientras enviaba %s a %s (%s)"

 
 

-#: src/net.c:107
+#: src/net.c:128

 #, c-format
 msgid "Sending packet of %d bytes to %s (%s)"
 msgstr "Enviando paquete de %d bytes a %s (%s)"
 
 #, c-format
 msgid "Sending packet of %d bytes to %s (%s)"
 msgstr "Enviando paquete de %d bytes a %s (%s)"
 

-#: src/net.c:116
+#: src/net.c:139

 #, c-format
 msgid "Error sending packet to %s (%s): %m"
 msgstr "Error enviando paquete a %s (%s): %m"
 
 #, c-format
 msgid "Error sending packet to %s (%s): %m"
 msgstr "Error enviando paquete a %s (%s): %m"
 

-#: src/net.c:130
-#, c-format
-msgid "Receiving packet of %d bytes"
-msgstr "Recibido paquete de %d bytes"
+#: src/net.c:168
+#, fuzzy, c-format
+msgid "Writing packet of %d bytes to tap device"
+msgstr "Enviando paquete de %d bytes a %s (%s)"

 
 

-#: src/net.c:143
-#, c-format
-msgid "Can't write to tap device: %m"
+#: src/net.c:178
+#, fuzzy, c-format
+msgid "Can't write to tun/tap device: %m"

 msgstr "No puedo escribir en el dispositivo tap: %m"
 
 msgstr "No puedo escribir en el dispositivo tap: %m"
 

-#: src/net.c:243
+#: src/net.c:185
+#, fuzzy, c-format
+msgid "Can't write to ethertap device: %m"
+msgstr "No puedo escribir en el dispositivo tap: %m"
+
+#: src/net.c:286

 msgid "Queue flushed"
 msgstr "Cola vaciada"
 
 msgid "Queue flushed"
 msgstr "Cola vaciada"
 

-#: src/net.c:258
+#: src/net.c:301

 #, c-format
 msgid "Flushing send queue for %s (%s)"
 msgstr "Vaciando la cola de envíos para %s (%s)"
 
 #, c-format
 msgid "Flushing send queue for %s (%s)"
 msgstr "Vaciando la cola de envíos para %s (%s)"
 

-#: src/net.c:266
+#: src/net.c:309

 #, c-format
 msgid "Flushing receive queue for %s (%s)"
 msgstr "Vaciando la cola de recepción para %s (%s)"
 
 #, c-format
 msgid "Flushing receive queue for %s (%s)"
 msgstr "Vaciando la cola de recepción para %s (%s)"
 

-#: src/net.c:284
+#: src/net.c:328

 #, c-format
 msgid "Trying to look up %d.%d.%d.%d in connection list failed!"
 msgstr "¡Error intentando buscar %d.%d.%d.%d en la lista de conexiones!"
 
 #, c-format
 msgid "Trying to look up %d.%d.%d.%d in connection list failed!"
 msgstr "¡Error intentando buscar %d.%d.%d.%d en la lista de conexiones!"
 

-#: src/net.c:298
-#, c-format
-msgid "Could not open UDP connection to %s (%s)"
-msgstr "No pude abrir una conexión UDP a %s (%s)"
-
-#: src/net.c:306
+#: src/net.c:341

 #, c-format
 #, c-format

-msgid "No valid key known yet for %s (%s), queueing packet"
+msgid "Packet with destination %d.%d.%d.%d is looping back to us!"

 msgstr ""
 msgstr ""

-"No conozco ninguna clave válida para %s (%s) aún, pongo el paquete en cola"

 
 

-#: src/net.c:317
+#: src/net.c:417

 #, c-format
 #, c-format

-msgid "%s (%s) is not ready, queueing packet"
-msgstr "%s (%s) no está listo, poniendo el paquete en cola"
+msgid "Could not open %s: %m"
+msgstr "No pude abrir %s: %m"

 
 

-#: src/net.c:370
+#: src/net.c:446

 #, c-format
 msgid "%s is a new style tun/tap device"
 msgstr "%s es un dispositivo tun/tap del nuevo estilo"
 
 #, c-format
 msgid "%s is a new style tun/tap device"
 msgstr "%s es un dispositivo tun/tap del nuevo estilo"
 

-#: src/net.c:373
-msgid "tun/tap device will be left unconfigured"
-msgstr "el dispositivo tun/tap se dejará sin configurar"
-
-#: src/net.c:396
+#: src/net.c:471

 #, c-format
 msgid "Creating metasocket failed: %m"
 msgstr "Fallo al crear el metasocket: %m"
 
 #, c-format
 msgid "Creating metasocket failed: %m"
 msgstr "Fallo al crear el metasocket: %m"
 

-#: src/net.c:402 src/net.c:408 src/net.c:470
-#, c-format
-msgid "setsockopt: %m"
-msgstr "setsockopt(): %m"
-
-#: src/net.c:415 src/net.c:477
+#: src/net.c:478 src/net.c:486 src/net.c:495 src/net.c:529 src/net.c:557
+#: src/net.c:566 src/net.c:620 src/net.c:1059 src/net.c:1068 src/net.c:1126

 #, c-format
 #, c-format

-msgid "fcntl: %m"
-msgstr "fcntl(): %m"
+msgid "System call `%s' failed: %m"
+msgstr ""

 
 

-#: src/net.c:423
+#: src/net.c:505

 #, c-format
 msgid "Unable to bind listen socket to interface %s: %m"
 msgstr "No puedo enlazar (bind) el `socket' de escucha a la interfaz %s: %m"
 
 #, c-format
 msgid "Unable to bind listen socket to interface %s: %m"
 msgstr "No puedo enlazar (bind) el `socket' de escucha a la interfaz %s: %m"
 

-#: src/net.c:439
+#: src/net.c:522

 #, c-format
 msgid "Can't bind to port %hd/tcp: %m"
 msgstr "No puedo enlazar (bind) al puerto %hd/tcp: %m"
 
 #, c-format
 msgid "Can't bind to port %hd/tcp: %m"
 msgstr "No puedo enlazar (bind) al puerto %hd/tcp: %m"
 

-#: src/net.c:445
-#, c-format
-msgid "listen: %m"
-msgstr "listen(): %m"
-
-#: src/net.c:464
+#: src/net.c:550

 #, c-format
 msgid "Creating socket failed: %m"
 msgstr "Error al crear el `socket': %m"
 
 #, c-format
 msgid "Creating socket failed: %m"
 msgstr "Error al crear el `socket': %m"
 

-#: src/net.c:488
+#: src/net.c:579 src/net.c:1081

 #, c-format
 msgid "Can't bind to port %hd/udp: %m"
 msgstr "No puedo enlazar (bind) al puerto %hd/udp: %m"
 
 #, c-format
 msgid "Can't bind to port %hd/udp: %m"
 msgstr "No puedo enlazar (bind) al puerto %hd/udp: %m"
 

-#: src/net.c:505
+#: src/net.c:596

 #, c-format
 msgid "Trying to connect to %s"
 msgstr "Intentando conectar con %s"
 
 #, c-format
 msgid "Trying to connect to %s"
 msgstr "Intentando conectar con %s"
 

-#: src/net.c:515
+#: src/net.c:606

 #, c-format
 msgid "Creating socket for %s port %d failed: %m"
 msgstr "Error al crear el `socket' para %s puerto %d: %m"
 
 #, c-format
 msgid "Creating socket for %s port %d failed: %m"
 msgstr "Error al crear el `socket' para %s puerto %d: %m"
 

-#: src/net.c:526
+#: src/net.c:631

 #, c-format
 msgid "%s port %hd: %m"
 msgstr "%s puerto %hd: %m"
 
 #, c-format
 msgid "%s port %hd: %m"
 msgstr "%s puerto %hd: %m"
 

-#: src/net.c:533
+#: src/net.c:639

 #, c-format
 msgid "fcntl for %s port %d: %m"
 msgstr "fcntl() para %s puerto %d: %m"
 
 #, c-format
 msgid "fcntl for %s port %d: %m"
 msgstr "fcntl() para %s puerto %d: %m"
 

-#: src/net.c:539
+#: src/net.c:645

 #, c-format
 msgid "Connected to %s port %hd"
 msgstr "Conectado a %s puerto %hd"
 
 #, c-format
 msgid "Connected to %s port %hd"
 msgstr "Conectado a %s puerto %hd"
 

-#: src/net.c:562
+#: src/net.c:664

 msgid "Invalid name for outgoing connection"
 msgstr "Nombre no válido para conexión saliente"
 
 msgid "Invalid name for outgoing connection"
 msgstr "Nombre no válido para conexión saliente"
 

-#: src/net.c:571
+#: src/net.c:673

 #, c-format
 msgid "Error reading host configuration file for %s"
 msgstr "Error leyendo el fichero de configuración del `host' para %s"
 
 #, c-format
 msgid "Error reading host configuration file for %s"
 msgstr "Error leyendo el fichero de configuración del `host' para %s"
 

-#: src/net.c:578
+#: src/net.c:680

 #, c-format
 msgid "No address specified for %s"
 msgstr "No se especificó dirección para %s"
 
 #, c-format
 msgid "No address specified for %s"
 msgstr "No se especificó dirección para %s"
 

-#: src/net.c:585
+#: src/net.c:687

 #, c-format
 msgid "Error looking up `%s': %m"
 msgstr "Error buscando `%s': %m"
 
 #, c-format
 msgid "Error looking up `%s': %m"
 msgstr "Error buscando `%s': %m"
 

-#: src/net.c:595
+#: src/net.c:697

 #, c-format
 msgid "Could not set up a meta connection to %s"
 msgstr "No he podido configurar una meta conexión a %s"
 
 #, c-format
 msgid "Could not set up a meta connection to %s"
 msgstr "No he podido configurar una meta conexión a %s"
 

-#: src/net.c:629
+#: src/net.c:735
+#, fuzzy, c-format
+msgid "Error reading RSA public key file `%s': %m"
+msgstr "Error enviando paquete a %s (%s): %m"
+
+#: src/net.c:743
+#, fuzzy, c-format
+msgid "Reading RSA public key file `%s' failed: %m"
+msgstr "Error recibiendo paquete: %m"
+
+#: src/net.c:753
+#, c-format
+msgid "No public key for %s specified!"
+msgstr ""
+
+#: src/net.c:778
+#, fuzzy, c-format
+msgid "Error reading RSA private key file `%s': %m"
+msgstr "Error enviando paquete a %s (%s): %m"
+
+#: src/net.c:786
+#, c-format
+msgid "Reading RSA private key file `%s' failed: %m"
+msgstr ""
+
+#: src/net.c:793
+#, fuzzy
+msgid "No private key for tinc daemon specified!"
+msgstr "¡Se requiere un nombre para el demonio tinc!"
+
+#: src/net.c:817

 msgid "Name for tinc daemon required!"
 msgstr "¡Se requiere un nombre para el demonio tinc!"
 
 msgid "Name for tinc daemon required!"
 msgstr "¡Se requiere un nombre para el demonio tinc!"
 

-#: src/net.c:637
+#: src/net.c:825

 msgid "Invalid name for myself!"
 msgstr "¡Nombre no válido para mí!"
 
 msgid "Invalid name for myself!"
 msgstr "¡Nombre no válido para mí!"
 

-#: src/net.c:643
+#: src/net.c:834

 msgid "Cannot open host configuration file for myself!"
 msgstr "¡No puedo abrir el fichero de configuración de `host' para mí!"
 
 msgid "Cannot open host configuration file for myself!"
 msgstr "¡No puedo abrir el fichero de configuración de `host' para mí!"
 

-#: src/net.c:662
-msgid "Unable to set up a listening socket!"
+#: src/net.c:875
+msgid "Network address and subnet mask do not match!"
+msgstr ""
+
+#: src/net.c:884
+#, fuzzy
+msgid "Unable to set up a listening TCP socket!"

 msgstr "¡No puedo configurar un `socket' a la escucha!"
 
 msgstr "¡No puedo configurar un `socket' a la escucha!"
 

-#: src/net.c:668
-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:890
+#, fuzzy
+msgid "Unable to set up a listening UDP socket!"
+msgstr "¡No puedo configurar un `socket' a la escucha!"

 
 

-#: src/net.c:675
+#: src/net.c:914

 #, c-format
 msgid "Ready: listening on port %hd"
 msgstr "Listo: escuchando en el puerto %hd"
 
 #, c-format
 msgid "Ready: listening on port %hd"
 msgstr "Listo: escuchando en el puerto %hd"
 

-#: src/net.c:706
+#: src/net.c:946

 #, c-format
 msgid "Still failed to connect to other, will retry in %d seconds"
 msgstr "Sigo sin poder conectar con el otro, lo reintentaré en %d segundos."
 
 #, c-format
 msgid "Still failed to connect to other, will retry in %d seconds"
 msgstr "Sigo sin poder conectar con el otro, lo reintentaré en %d segundos."
 

-#: src/net.c:744
+#: src/net.c:997

 #, c-format
 msgid "Trying to re-establish outgoing connection in %d seconds"
 msgstr "Intento re-establecer la conexión saliente en %d segundos"
 
 #, c-format
 msgid "Trying to re-establish outgoing connection in %d seconds"
 msgstr "Intento re-establecer la conexión saliente en %d segundos"
 

-#: src/net.c:782
-msgid "Terminating"
-msgstr "Terminando"
-
-#: src/net.c:796
+#: src/net.c:1047

 #, c-format
 msgid "Opening UDP socket to %s"
 msgstr "Abriendo `socket' UDP a %s"
 
 #, c-format
 msgid "Opening UDP socket to %s"
 msgstr "Abriendo `socket' UDP a %s"
 

-#: src/net.c:801
+#: src/net.c:1052

 #, c-format
 msgid "Creating UDP socket failed: %m"
 msgstr "Error al crear el `socket' UDP: %m"
 
 #, c-format
 msgid "Creating UDP socket failed: %m"
 msgstr "Error al crear el `socket' UDP: %m"
 

-#: src/net.c:811
+#: src/net.c:1092

 #, c-format
 msgid "Connecting to %s port %d failed: %m"
 msgstr "Error al conectar a %s puerto %d: %m"
 
 #, c-format
 msgid "Connecting to %s port %d failed: %m"
 msgstr "Error al conectar a %s puerto %d: %m"
 

-#: src/net.c:819
-#, c-format
-msgid "This is a bug: %s:%d: %d:%m %s (%s)"
-msgstr "Esto es un `bug': %s:%d: %d:%m %s (%s)"
-
-#: src/net.c:844
-#, c-format
-msgid "Error: getpeername: %m"
-msgstr "Error: getpeername(): %m"
-
-#: src/net.c:859
+#: src/net.c:1142

 #, c-format
 msgid "Connection from %s port %d"
 msgstr "Conexión desde %s puerto %d"
 
 #, c-format
 msgid "Connection from %s port %d"
 msgstr "Conexión desde %s puerto %d"
 

-#: src/net.c:903
+#: src/net.c:1190

 #, c-format
 msgid "This is a bug: %s:%d: %d:%m"
 msgstr "Esto es un `bug': %s:%d: %d:%m"
 
 #, c-format
 msgid "This is a bug: %s:%d: %d:%m"
 msgstr "Esto es un `bug': %s:%d: %d:%m"
 

-#: src/net.c:909
+#: src/net.c:1196

 #, c-format
 msgid "Incoming data socket error: %s"
 msgstr "Error en el `socket' de recepción de datos: %s"
 
 #, c-format
 msgid "Incoming data socket error: %s"
 msgstr "Error en el `socket' de recepción de datos: %s"
 

-#: src/net.c:915
+#: src/net.c:1202

 #, c-format
 msgid "Receiving packet failed: %m"
 msgstr "Error recibiendo paquete: %m"
 
 #, c-format
 msgid "Receiving packet failed: %m"
 msgstr "Error recibiendo paquete: %m"
 

-#: src/net.c:936
+#: src/net.c:1210
+#, c-format
+msgid "Received UDP packets on port %hd from unknown source %x:%hd"
+msgstr ""
+
+#: src/net.c:1216
+#, fuzzy, c-format
+msgid "Received packet of %d bytes from %s (%s)"
+msgstr "Enviando paquete de %d bytes a %s (%s)"
+
+#: src/net.c:1240

 #, c-format
 msgid "Closing connection with %s (%s)"
 msgstr "Cerrando conexión con %s (%s)"
 
 #, c-format
 msgid "Closing connection with %s (%s)"
 msgstr "Cerrando conexión con %s (%s)"
 

-#: src/net.c:979
+#: src/net.c:1285

 msgid "Trying to re-establish outgoing connection in 5 seconds"
 msgstr "Intento re-establecer la conexión saliente en 5 segundos."
 
 msgid "Trying to re-establish outgoing connection in 5 seconds"
 msgstr "Intento re-establecer la conexión saliente en 5 segundos."
 

-#: src/net.c:1009
+#: src/net.c:1320

 #, c-format
 msgid "%s (%s) didn't respond to PING"
 msgstr "%s (%s) no respondió al PING"
 
 #, c-format
 msgid "%s (%s) didn't respond to PING"
 msgstr "%s (%s) no respondió al PING"
 

-#: src/net.c:1040
+#: src/net.c:1347

 #, c-format
 msgid "Accepting a new connection failed: %m"
 msgstr "Error al aceptar una nueva conexión: %m"
 
 #, c-format
 msgid "Accepting a new connection failed: %m"
 msgstr "Error al aceptar una nueva conexión: %m"
 

-#: src/net.c:1048
+#: src/net.c:1355

 msgid "Closed attempted connection"
 msgstr "Se ha cerrado la conexión que se intentaba realizar."
 
 msgid "Closed attempted connection"
 msgstr "Se ha cerrado la conexión que se intentaba realizar."
 

-#: src/net.c:1083
-#, c-format
-msgid "Outgoing data socket error for %s (%s): %s"
-msgstr "Error en el `socket' de datos salientes para %s (%s): %s"
+#: src/net.c:1410
+#, fuzzy, c-format
+msgid "Error while reading from tun/tap device: %m"
+msgstr "Error leyendo del dispositivo tap: %m"

 
 

-#: src/net.c:1122 src/net.c:1131
-#, c-format
-msgid "Error while reading from tapdevice: %m"
+#: src/net.c:1419
+#, fuzzy, c-format
+msgid "Error while reading from ethertap device: %m"

 msgstr "Error leyendo del dispositivo tap: %m"
 
 msgstr "Error leyendo del dispositivo tap: %m"
 

-#: src/net.c:1143
-#, c-format
-msgid "Non-IP ethernet frame %04x from %02x:%02x:%02x:%02x:%02x:%02x"
-msgstr "Trama ethernet no-IP %04x desde %02x:%02x:%02x:%02x:%02x:%02x"
+#: src/net.c:1430
+msgid "Received short packet from tap device"
+msgstr ""

 
 

-#: src/net.c:1150
+#: src/net.c:1436

 #, c-format
 #, c-format

-msgid "Dropping short packet from %02x:%02x:%02x:%02x:%02x:%02x"
-msgstr "Ignorando paquete corto desde %02x:%02x:%02x:%02x:%02x:%02x"
+msgid "Read packet of length %d from tap device"
+msgstr ""

 
 

-#: src/net.c:1185
+#: src/net.c:1468

 #, c-format
 msgid "Error while waiting for input: %m"
 msgstr "Error esperando entrada: %m"
 
 #, c-format
 msgid "Error while waiting for input: %m"
 msgstr "Error esperando entrada: %m"
 

+#: src/net.c:1475
+#, fuzzy
+msgid "Rereading configuration file and restarting in 5 seconds"
+msgstr "Recibí la señal HUP, voy a releer la configuración y reiniciaré."
+
+#: src/net.c:1482
+#, fuzzy
+msgid "Unable to reread configuration file, exiting"
+msgstr "Recibí la señal HUP, voy a releer la configuración y reiniciaré."
+
+#: src/net.c:1508
+#, fuzzy
+msgid "Regenerating symmetric key"
+msgstr "Generando claves de %d bits"
+

 #: src/netutl.c:115
 #, c-format
 msgid "Error looking up `%s': %s\n"
 msgstr "Error buscando `%s': %s\n"
 
 #: src/netutl.c:115
 #, c-format
 msgid "Error looking up `%s': %s\n"
 msgstr "Error buscando `%s': %s\n"
 

-#: src/protocol.c:80
+#: src/protocol.c:101

 #, c-format
 msgid "Output buffer overflow while sending %s to %s (%s)"
 msgstr "Desbordamiento del bufer de salida mientras enviaba %s a %s (%s)"
 
 #, c-format
 msgid "Output buffer overflow while sending %s to %s (%s)"
 msgstr "Desbordamiento del bufer de salida mientras enviaba %s a %s (%s)"
 

-#: src/protocol.c:87
+#: src/protocol.c:108

 #, c-format
 msgid "Sending %s to %s (%s)"
 msgstr "Enviando %s a %s (%s)"
 
 #, c-format
 msgid "Sending %s to %s (%s)"
 msgstr "Enviando %s a %s (%s)"
 

-#: src/protocol.c:101
+#: src/protocol.c:122

 #, c-format
 msgid "Unknown request from %s (%s)"
 msgstr "Petición desconocida desde %s (%s)"
 
 #, c-format
 msgid "Unknown request from %s (%s)"
 msgstr "Petición desconocida desde %s (%s)"
 

-#: src/protocol.c:108
+#: src/protocol.c:129

 #, c-format
 msgid "Got %s from %s (%s)"
 msgstr "He recibido %s desde %s (%s)"
 
 #, c-format
 msgid "Got %s from %s (%s)"
 msgstr "He recibido %s desde %s (%s)"
 

-#: src/protocol.c:114
+#: src/protocol.c:135
+#, fuzzy, c-format
+msgid "Unauthorized request from %s (%s)"
+msgstr "Petición desconocida desde %s (%s)"
+
+#: src/protocol.c:142

 #, c-format
 msgid "Error while processing %s from %s (%s)"
 msgstr "Error al procesar %s desde %s (%s)"
 
 #, c-format
 msgid "Error while processing %s from %s (%s)"
 msgstr "Error al procesar %s desde %s (%s)"
 

-#: src/protocol.c:121
+#: src/protocol.c:149

 #, c-format
 msgid "Bogus data received from %s (%s)"
 msgstr "Se han recibido datos sin sentido desde %s (%s)."
 
 #, c-format
 msgid "Bogus data received from %s (%s)"
 msgstr "Se han recibido datos sin sentido desde %s (%s)."
 

-#: src/protocol.c:169
+#: src/protocol.c:203

 #, c-format
 msgid "Got bad ID from %s"
 msgstr "Recibí una ID incorrecta desde %s"
 
 #, c-format
 msgid "Got bad ID from %s"
 msgstr "Recibí una ID incorrecta desde %s"
 

-#: src/protocol.c:177
+#: src/protocol.c:211

 #, c-format
 msgid "Peer %s (%s) uses incompatible version %d"
 msgstr "La máquina remota %s (%s) usa una versión (%d) incompatible."
 
 #, c-format
 msgid "Peer %s (%s) uses incompatible version %d"
 msgstr "La máquina remota %s (%s) usa una versión (%d) incompatible."
 

-#: src/protocol.c:186
+#: src/protocol.c:220

 #, c-format
 msgid "Peer %s uses invalid identity name"
 msgstr "La máquina remota %s usa un nombre de identidad no válido"
 
 #, c-format
 msgid "Peer %s uses invalid identity name"
 msgstr "La máquina remota %s usa un nombre de identidad no válido"
 

-#: src/protocol.c:194
+#: src/protocol.c:232

 #, c-format
 msgid "Peer %s had unknown identity (%s)"
 msgstr "La máquina remota %s tiene una identidad desconocida (%s)"
 
 #, c-format
 msgid "Peer %s had unknown identity (%s)"
 msgstr "La máquina remota %s tiene una identidad desconocida (%s)"
 

-#: src/protocol.c:209
+#: src/protocol.c:246

 #, c-format
 msgid "Uplink %s (%s) is already in our connection list"
 msgstr "El enlace %s (%s) ya está en nuestra lista de conexiones."
 
 #, c-format
 msgid "Uplink %s (%s) is already in our connection list"
 msgstr "El enlace %s (%s) ya está en nuestra lista de conexiones."
 

-#: src/protocol.c:251
+#: src/protocol.c:299
+#, c-format
+msgid "Generated random challenge (unencrypted): %s"
+msgstr ""
+
+#: src/protocol.c:306 src/protocol.c:359
+#, fuzzy, c-format
+msgid "Error during encryption of challenge for %s (%s)"
+msgstr "Error leyendo el fichero de configuración del `host' para %s"
+
+#: src/protocol.c:332

 #, c-format
 msgid "Got bad CHALLENGE from %s (%s)"
 msgstr "Recibí CHALLENGE incorrecta desde %s (%s)"
 
 #, c-format
 msgid "Got bad CHALLENGE from %s (%s)"
 msgstr "Recibí CHALLENGE incorrecta desde %s (%s)"
 

-#: src/protocol.c:259
+#: src/protocol.c:342

 #, c-format
 msgid "Intruder: wrong challenge length from %s (%s)"
 msgstr "Intruso: longitud de desafío incorrecta desde %s (%s)"
 
 #, c-format
 msgid "Intruder: wrong challenge length from %s (%s)"
 msgstr "Intruso: longitud de desafío incorrecta desde %s (%s)"
 

-#: src/protocol.c:285
+#: src/protocol.c:367
+#, c-format
+msgid "Received random challenge (unencrypted): %s"
+msgstr ""
+
+#: src/protocol.c:381

 #, c-format
 msgid "Trying to send CHAL_REPLY to %s (%s) without a valid CHALLENGE"
 msgstr "Intento enviar CHAL_REPLY a %s (%s) sin un CHALLENGE válido"
 
 #, c-format
 msgid "Trying to send CHAL_REPLY to %s (%s) without a valid CHALLENGE"
 msgstr "Intento enviar CHAL_REPLY a %s (%s) sin un CHALLENGE válido"
 

-#: src/protocol.c:316
+#: src/protocol.c:412

 #, c-format
 msgid "Got bad CHAL_REPLY from %s (%s)"
 msgstr "Recibí CHAL_REPLY incorrecta desde %s (%s)"
 
 #, c-format
 msgid "Got bad CHAL_REPLY from %s (%s)"
 msgstr "Recibí CHAL_REPLY incorrecta desde %s (%s)"
 

-#: src/protocol.c:325
+#: src/protocol.c:420

 #, c-format
 msgid "Intruder: wrong challenge reply length from %s (%s)"
 msgstr "Intruso: longitud de respuesta de desafío incorrecta desde %s (%s)"
 
 #, c-format
 msgid "Intruder: wrong challenge reply length from %s (%s)"
 msgstr "Intruso: longitud de respuesta de desafío incorrecta desde %s (%s)"
 

-#: src/protocol.c:342
+#: src/protocol.c:436

 #, c-format
 msgid "Intruder: wrong challenge reply from %s (%s)"
 msgstr "Intruso: respuesta de desafío incorrecta desde %s (%s)"
 
 #, c-format
 msgid "Intruder: wrong challenge reply from %s (%s)"
 msgstr "Intruso: respuesta de desafío incorrecta desde %s (%s)"
 

-#: src/protocol.c:380
+#: src/protocol.c:441
+#, c-format
+msgid "Expected challenge reply: %s"
+msgstr ""
+
+#: src/protocol.c:485
+#, c-format
+msgid "Generated random meta key (unencrypted): %s"
+msgstr ""
+
+#: src/protocol.c:492 src/protocol.c:554
+#, fuzzy, c-format
+msgid "Error during encryption of meta key for %s (%s)"
+msgstr "Error enviando paquete a %s (%s): %m"
+
+#: src/protocol.c:524
+#, fuzzy, c-format
+msgid "Got bad METAKEY from %s (%s)"
+msgstr "Recibí REQ_KEY incorrecta desde %s (%s)"
+
+#: src/protocol.c:534
+#, fuzzy, c-format
+msgid "Intruder: wrong meta key length from %s (%s)"
+msgstr "Intruso: longitud de desafío incorrecta desde %s (%s)"
+
+#: src/protocol.c:562
+#, c-format
+msgid "Received random meta key (unencrypted): %s"
+msgstr ""
+
+#: src/protocol.c:601

 #, c-format
 msgid "Removing old entry for %s at %s in favour of new connection from %s"
 msgstr ""
 "Eliminando el registro viejo para %s en %s en favor de la nueva conexión "
 "desde %s"
 
 #, c-format
 msgid "Removing old entry for %s at %s in favour of new connection from %s"
 msgstr ""
 "Eliminando el registro viejo para %s en %s en favor de la nueva conexión "
 "desde %s"
 

-#: src/protocol.c:392
+#: src/protocol.c:617

 #, c-format
 msgid "Connection with %s (%s) activated"
 msgstr "Activada la conexión con %s (%s)."
 
 #, c-format
 msgid "Connection with %s (%s) activated"
 msgstr "Activada la conexión con %s (%s)."
 

-#: src/protocol.c:432
+#: src/protocol.c:682

 #, c-format
 msgid "Got bad ADD_SUBNET from %s (%s)"
 msgstr "Recibí ADD_SUBNET incorrecta desde %s (%s)"
 
 #, c-format
 msgid "Got bad ADD_SUBNET from %s (%s)"
 msgstr "Recibí ADD_SUBNET incorrecta desde %s (%s)"
 

-#: src/protocol.c:441
+#: src/protocol.c:690

 #, c-format
 msgid "Got bad ADD_SUBNET from %s (%s): invalid identity name"
 msgstr ""
 "Recibí ADD_SUBNET incorrecta desde %s (%s): nombre de identidad no válido"
 
 #, c-format
 msgid "Got bad ADD_SUBNET from %s (%s): invalid identity name"
 msgstr ""
 "Recibí ADD_SUBNET incorrecta desde %s (%s): nombre de identidad no válido"
 

-#: src/protocol.c:450
+#: src/protocol.c:698

 #, c-format
 msgid "Got bad ADD_SUBNET from %s (%s): invalid subnet string"
 msgstr "Recibí ADD_SUBNET incorrecta desde %s (%s): cadena de subred no válida"
 
 #, c-format
 msgid "Got bad ADD_SUBNET from %s (%s): invalid subnet string"
 msgstr "Recibí ADD_SUBNET incorrecta desde %s (%s): cadena de subred no válida"
 

-#: src/protocol.c:461
+#: src/protocol.c:706

 #, c-format
 msgid "Warning: got ADD_SUBNET from %s (%s) for ourself, restarting"
 msgstr ""
 "Aviso: recibí ADD_SUBNET desde %s (%s) para nosotros mismos, reiniciando"
 
 #, c-format
 msgid "Warning: got ADD_SUBNET from %s (%s) for ourself, restarting"
 msgstr ""
 "Aviso: recibí ADD_SUBNET desde %s (%s) para nosotros mismos, reiniciando"
 

-#: src/protocol.c:472
+#: src/protocol.c:716

 #, c-format
 msgid "Got ADD_SUBNET for %s from %s (%s) which is not in our connection list"
 msgstr ""
 "Recibí ADD_SUBNET para %s desde %s (%s) que no está en nuestra lista de "
 "conexiones"
 
 #, c-format
 msgid "Got ADD_SUBNET for %s from %s (%s) which is not in our connection list"
 msgstr ""
 "Recibí ADD_SUBNET para %s desde %s (%s) que no está en nuestra lista de "
 "conexiones"
 

-#: src/protocol.c:500
+#: src/protocol.c:759

 #, c-format
 msgid "Got bad DEL_SUBNET from %s (%s)"
 msgstr "Recibí DEL_SUBNET incorrecta desde %s (%s)"
 
 #, c-format
 msgid "Got bad DEL_SUBNET from %s (%s)"
 msgstr "Recibí DEL_SUBNET incorrecta desde %s (%s)"
 

-#: src/protocol.c:509
+#: src/protocol.c:767

 #, c-format
 msgid "Got bad DEL_SUBNET from %s (%s): invalid identity name"
 msgstr ""
 "Recibí DEL_SUBNET incorrecta desde %s (%s): nombre de identidad no válido"
 
 #, c-format
 msgid "Got bad DEL_SUBNET from %s (%s): invalid identity name"
 msgstr ""
 "Recibí DEL_SUBNET incorrecta desde %s (%s): nombre de identidad no válido"
 

-#: src/protocol.c:518
+#: src/protocol.c:775

 #, c-format
 msgid "Got bad DEL_SUBNET from %s (%s): invalid subnet string"
 msgstr "Recibí DEL_SUBNET incorrecta desde %s (%s): cadena de subred no válida"
 
 #, c-format
 msgid "Got bad DEL_SUBNET from %s (%s): invalid subnet string"
 msgstr "Recibí DEL_SUBNET incorrecta desde %s (%s): cadena de subred no válida"
 

-#: src/protocol.c:529
+#: src/protocol.c:785

 #, c-format
 msgid "Warning: got DEL_SUBNET from %s (%s) for ourself, restarting"
 msgstr ""
 "Aviso: recibí DEL_SUBNET desde %s (%s) para nosotros mismos, reiniciando"
 
 #, c-format
 msgid "Warning: got DEL_SUBNET from %s (%s) for ourself, restarting"
 msgstr ""
 "Aviso: recibí DEL_SUBNET desde %s (%s) para nosotros mismos, reiniciando"
 

-#: src/protocol.c:540
+#: src/protocol.c:795

 #, c-format
 msgid "Got DEL_SUBNET for %s from %s (%s) which is not in our connection list"
 msgstr ""
 "Recibí DEL_SUBNET para %s desde %s (%s) que no está en nuestra lista de "
 "conexiones"
 
 #, c-format
 msgid "Got DEL_SUBNET for %s from %s (%s) which is not in our connection list"
 msgstr ""
 "Recibí DEL_SUBNET para %s desde %s (%s) que no está en nuestra lista de "
 "conexiones"
 

-#: src/protocol.c:571
+#: src/protocol.c:835

 #, c-format
 msgid "Got bad ADD_HOST from %s (%s)"
 msgstr "Recibí ADD_HOST incorrecta desde %s (%s)"
 
 #, c-format
 msgid "Got bad ADD_HOST from %s (%s)"
 msgstr "Recibí ADD_HOST incorrecta desde %s (%s)"
 

-#: src/protocol.c:579
+#: src/protocol.c:843

 #, c-format
 msgid "Got bad ADD_HOST from %s (%s): invalid identity name"
 msgstr ""
 "Recibí ADD_HOST incorrecta desde %s (%s): nombre de identidad no válido"
 
 #, c-format
 msgid "Got bad ADD_HOST from %s (%s): invalid identity name"
 msgstr ""
 "Recibí ADD_HOST incorrecta desde %s (%s): nombre de identidad no válido"
 

-#: src/protocol.c:588
+#: src/protocol.c:852

 #, c-format
 msgid "Warning: got ADD_HOST from %s (%s) for ourself, restarting"
 msgstr "Aviso: recibí ADD_HOST desde %s (%s) para nosotros mismos, reiniciando"
 
 #, c-format
 msgid "Warning: got ADD_HOST from %s (%s) for ourself, restarting"
 msgstr "Aviso: recibí ADD_HOST desde %s (%s) para nosotros mismos, reiniciando"
 

-#: src/protocol.c:598
-#, c-format
-msgid "Warning: got ADD_HOST from %s (%s) from ourself, restarting"
-msgstr "Aviso: recibí ADD_HOST desde %s (%s) de nosotros mismos, reiniciando"
-
-#: src/protocol.c:608
-#, c-format
-msgid ""
-"Got ADD_HOST from %s (%s) with origin %s which is not in our connection list"
-msgstr ""
-"Recibí ADD_HOST desde %s (%s) con origen %s que no está en nuestra lista de "
-"conexiones"
-
-#: src/protocol.c:627
+#: src/protocol.c:869

 #, c-format
 msgid "Got duplicate ADD_HOST for %s (%s) from %s (%s)"
 msgstr "Recibí un ADD_HOST duplicado desde %s (%s) para %s (%s)"
 
 #, c-format
 msgid "Got duplicate ADD_HOST for %s (%s) from %s (%s)"
 msgstr "Recibí un ADD_HOST duplicado desde %s (%s) para %s (%s)"
 

-#: src/protocol.c:634
-#, c-format
-msgid "Removing old entry for %s (%s)"
-msgstr "Eliminando el registro viejo para %s (%s)"
+#: src/protocol.c:877
+#, fuzzy, c-format
+msgid "Removing old entry for %s (%s) in favour of new connection"
+msgstr ""
+"Eliminando el registro viejo para %s en %s en favor de la nueva conexión "
+"desde %s"

 
 

-#: src/protocol.c:677
+#: src/protocol.c:927

 #, c-format
 msgid "Got bad DEL_HOST from %s (%s)"
 msgstr "Recibí DEL_HOST incorrecta desde %s (%s)"
 
 #, c-format
 msgid "Got bad DEL_HOST from %s (%s)"
 msgstr "Recibí DEL_HOST incorrecta desde %s (%s)"
 

-#: src/protocol.c:686
+#: src/protocol.c:936

 #, c-format
 msgid "Got bad DEL_HOST from %s (%s): invalid identity name"
 msgstr ""
 "Recibí DEL_HOST incorrecta desde %s (%s): nombre de identidad no válido"
 
 #, c-format
 msgid "Got bad DEL_HOST from %s (%s): invalid identity name"
 msgstr ""
 "Recibí DEL_HOST incorrecta desde %s (%s): nombre de identidad no válido"
 

-#: src/protocol.c:695
+#: src/protocol.c:944

 #, c-format
 msgid "Warning: got DEL_HOST from %s (%s) for ourself, restarting"
 msgstr "Aviso: recibí DEL_HOST desde %s (%s) para nosotros mismos, reiniciando"
 
 #, c-format
 msgid "Warning: got DEL_HOST from %s (%s) for ourself, restarting"
 msgstr "Aviso: recibí DEL_HOST desde %s (%s) para nosotros mismos, reiniciando"
 

-#: src/protocol.c:706
-#, c-format
-msgid "Warning: got DEL_HOST from %s (%s) from ourself, restarting"
-msgstr "Aviso: recibí DEL_HOST desde %s (%s) de nosotros mismos, reiniciando"
-
-#: src/protocol.c:716
-#, c-format
-msgid ""
-"Got DEL_HOST from %s (%s) with origin %s which is not in our connection list"
-msgstr ""
-"Recibí DEL_HOST desde %s (%s) con origen %s que no está en nuestra lista de "
-"conexiones"
-
-#: src/protocol.c:728
+#: src/protocol.c:954

 #, c-format
 msgid "Got DEL_HOST from %s (%s) for %s which is not in our connection list"
 msgstr ""
 "Recibí DEL_HOST desde %s (%s) para %s que no está en nuestra lista de "
 "conexiones"
 
 #, c-format
 msgid "Got DEL_HOST from %s (%s) for %s which is not in our connection list"
 msgstr ""
 "Recibí DEL_HOST desde %s (%s) para %s que no está en nuestra lista de "
 "conexiones"
 

-#: src/protocol.c:738
+#: src/protocol.c:963

 #, c-format
 msgid "Got DEL_HOST from %s (%s) for %s which doesn't match"
 msgstr "Recibí DEL_HOST desde %s (%s) para %s que no concuerda"
 
 #, c-format
 msgid "Got DEL_HOST from %s (%s) for %s which doesn't match"
 msgstr "Recibí DEL_HOST desde %s (%s) para %s que no concuerda"
 

-#: src/protocol.c:770
+#: src/protocol.c:1002

 #, c-format
 msgid "Got bad STATUS from %s (%s)"
 msgstr "Recibí STATUS incorrecta desde %s (%s)"
 
 #, c-format
 msgid "Got bad STATUS from %s (%s)"
 msgstr "Recibí STATUS incorrecta desde %s (%s)"
 

-#: src/protocol.c:777
+#: src/protocol.c:1009

 #, c-format
 msgid "Status message from %s (%s): %s: %s"
 msgstr "Mensaje de status desde %s (%s): %s: %s"
 
 #, c-format
 msgid "Status message from %s (%s): %s: %s"
 msgstr "Mensaje de status desde %s (%s): %s: %s"
 

-#: src/protocol.c:801
+#: src/protocol.c:1032

 #, c-format
 msgid "Got bad ERROR from %s (%s)"
 msgstr "Recibí ERROR incorrecta desde %s (%s)"
 
 #, c-format
 msgid "Got bad ERROR from %s (%s)"
 msgstr "Recibí ERROR incorrecta desde %s (%s)"
 

-#: src/protocol.c:808
+#: src/protocol.c:1039

 #, c-format
 msgid "Error message from %s (%s): %s: %s"
 msgstr "Mensaje de error desde %s (%s): %s: %s"
 
 #, c-format
 msgid "Error message from %s (%s): %s: %s"
 msgstr "Mensaje de error desde %s (%s): %s: %s"
 

-#: src/protocol.c:886
+#: src/protocol.c:1117

 #, c-format
 msgid "Got bad KEY_CHANGED from %s (%s)"
 msgstr "Recibí KEY_CHANGED incorrecto desde %s (%s)"
 
 #, c-format
 msgid "Got bad KEY_CHANGED from %s (%s)"
 msgstr "Recibí KEY_CHANGED incorrecto desde %s (%s)"
 

-#: src/protocol.c:893
+#: src/protocol.c:1124

 #, c-format
 msgid ""
 "Got KEY_CHANGED from %s (%s) origin %s which does not exist in our "
 #, c-format
 msgid ""
 "Got KEY_CHANGED from %s (%s) origin %s which does not exist in our "


@@ -721,12 +763,12 @@ msgstr ""
 "Recibí KEY_CHANGED desde %s (%s) origen %s que no está en nuestra lista de "
 "conexiones"
 
 "Recibí KEY_CHANGED desde %s (%s) origen %s que no está en nuestra lista de "
 "conexiones"
 

-#: src/protocol.c:923
+#: src/protocol.c:1153

 #, c-format
 msgid "Got bad REQ_KEY from %s (%s)"
 msgstr "Recibí REQ_KEY incorrecta desde %s (%s)"
 
 #, c-format
 msgid "Got bad REQ_KEY from %s (%s)"
 msgstr "Recibí REQ_KEY incorrecta desde %s (%s)"
 

-#: src/protocol.c:930
+#: src/protocol.c:1160

 #, c-format
 msgid ""
 "Got REQ_KEY from %s (%s) origin %s which does not exist in our connection "
 #, c-format
 msgid ""
 "Got REQ_KEY from %s (%s) origin %s which does not exist in our connection "


@@ -735,7 +777,7 @@ msgstr ""
 "Recibí REQ_KEY desde %s (%s) origen %s que no está en nuestra lista de "
 "conexiones"
 
 "Recibí REQ_KEY desde %s (%s) origen %s que no está en nuestra lista de "
 "conexiones"
 

-#: src/protocol.c:946
+#: src/protocol.c:1177

 #, c-format
 msgid ""
 "Got REQ_KEY from %s (%s) destination %s which does not exist in our "
 #, c-format
 msgid ""
 "Got REQ_KEY from %s (%s) destination %s which does not exist in our "


@@ -744,12 +786,12 @@ msgstr ""
 "Recibí REQ_KEY desde %s (%s) destino %s que no está en nuestra lista de "
 "conexiones"
 
 "Recibí REQ_KEY desde %s (%s) destino %s que no está en nuestra lista de "
 "conexiones"
 

-#: src/protocol.c:974
+#: src/protocol.c:1213

 #, c-format
 msgid "Got bad ANS_KEY from %s (%s)"
 msgstr "Recibí ANS_KEY incorrecta desde %s (%s)"
 
 #, c-format
 msgid "Got bad ANS_KEY from %s (%s)"
 msgstr "Recibí ANS_KEY incorrecta desde %s (%s)"
 

-#: src/protocol.c:981
+#: src/protocol.c:1220

 #, c-format
 msgid ""
 "Got ANS_KEY from %s (%s) origin %s which does not exist in our connection "
 #, c-format
 msgid ""
 "Got ANS_KEY from %s (%s) origin %s which does not exist in our connection "


@@ -758,12 +800,12 @@ msgstr ""
 "Recibí ANS_KEY desde %s (%s) origen %s que no está en nuestra lista de "
 "conexiones"
 
 "Recibí ANS_KEY desde %s (%s) origen %s que no está en nuestra lista de "
 "conexiones"
 

-#: src/protocol.c:997
-#, c-format
-msgid "Got bad ANS_KEY from %s (%s) origin %s: invalid key"
+#: src/protocol.c:1231
+#, fuzzy, c-format
+msgid "Got bad ANS_KEY from %s (%s) origin %s: invalid key length"

 msgstr "Recibí ANS_KEY incorrecta desde %s (%s) origen %s: clave no válida"
 
 msgstr "Recibí ANS_KEY incorrecta desde %s (%s) origen %s: clave no válida"
 

-#: src/protocol.c:1010
+#: src/protocol.c:1242

 #, c-format
 msgid ""
 "Got ANS_KEY from %s (%s) destination %s which does not exist in our "
 #, c-format
 msgid ""
 "Got ANS_KEY from %s (%s) destination %s which does not exist in our "


@@ -772,12 +814,30 @@ msgstr ""
 "Recibí ANS_KEY desde %s (%s) destino %s que no está en nuestra lista de "
 "conexiones"
 
 "Recibí ANS_KEY desde %s (%s) destino %s que no está en nuestra lista de "
 "conexiones"
 

-#: src/tincd.c:94
+#: src/subnet.c:108
+#, c-format
+msgid "subnet_compare() was called with unknown subnet type %d, restarting!"
+msgstr ""
+
+#. Do some intl stuff right now
+#: src/subnet.c:251 src/tincd.c:296
+msgid "unknown"
+msgstr "desconocido"
+
+#: src/subnet.c:308
+msgid "Subnet list:"
+msgstr ""
+
+#: src/subnet.c:316
+msgid "End of subnet list."
+msgstr ""
+
+#: src/tincd.c:119

 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Pruebe `%s --help' para más información.\n"
 
 #, 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:122

 #, c-format
 msgid ""
 "Usage: %s [option]...\n"
 #, c-format
 msgid ""
 "Usage: %s [option]...\n"


@@ -786,14 +846,14 @@ msgstr ""
 "Modo de empleo: %s [opción]...\n"
 "\n"
 
 "Modo de empleo: %s [opción]...\n"
 "\n"
 

-#: src/tincd.c:98
+#: src/tincd.c:123
+#, fuzzy

 msgid ""
 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"
-"  -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=DIR      Lee opciones de configuración del directorio DIR.\n"
 "  -D, --no-detach       No hagas fork() y liberes la terminal.\n"
 msgstr ""
 "  -c, --config=DIR      Lee opciones de configuración del directorio DIR.\n"
 "  -D, --no-detach       No hagas fork() y liberes la terminal.\n"


@@ -802,82 +862,61 @@ msgstr ""
 "  -n, --net=NOMBREDERED Conecta a la red NOMBREDERED.\n"
 "  -t, --timeout=TIMEOUT Segundos a esperar antes de dar un timeout.\n"
 
 "  -n, --net=NOMBREDERED Conecta a la red NOMBREDERED.\n"
 "  -t, --timeout=TIMEOUT Segundos a esperar antes de dar un timeout.\n"
 

-#: src/tincd.c:104
+#: src/tincd.c:128
+#, fuzzy

 msgid ""
 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"
 
 "\n"
 msgstr ""
 "      --help            Muestra esta ayuda y termina.\n"
 "      --version         Muestra información de la versión y termina.\n"
 "\n"
 

-#: src/tincd.c:106
+#: src/tincd.c:131

 msgid "Report bugs to tinc@nl.linux.org.\n"
 msgstr "Comunicar `bugs' a tinc@nl.linux.org.\n"
 
 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 `%s' no válido.\n"
-
-#: src/tincd.c:158
+#: src/tincd.c:174

 #, c-format
 #, c-format

-msgid "Memory exhausted (last is %s:%d) (couldn't allocate %d bytes), exiting."
+msgid ""
+"Invalid argument `%s'; BITS must be a number equal to or greater than 512.\n"

 msgstr ""
 msgstr ""

-"Memoria agotada (la última es %s:%d) (no pude asignar %d bytes), terminando."
-
-#: src/tincd.c:213
-#, 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:233

 #, c-format
 #, c-format

-msgid "tincd %s starting"
-msgstr "tincd %s comenzando"
-
-#: src/tincd.c:231
-#, 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."
+msgid "Generating %d bits keys:\n"
+msgstr "Generando claves de %d bits:\n"

 
 

-#: src/tincd.c:249
-#, c-format
-msgid "A tincd is already running for net `%s' with pid %d.\n"
+#: src/tincd.c:237
+msgid "Error during key generation!"

 msgstr ""
 msgstr ""

-"Un tincd está actualmente en ejecución para la red `%s' con el pid %d.\n"
-
-#: src/tincd.c:252
-#, 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
-#, 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:241
+msgid "Done.\n"
+msgstr "Hecho.\n"

 
 

-#: src/tincd.c:275
-msgid "No other tincd is running.\n"
-msgstr "No hay ningún otro tincd en ejecución.\n"
+#: src/tincd.c:243
+#, fuzzy
+msgid "public RSA key"
+msgstr "Clave pública: %s\n"

 
 

-#: src/tincd.c:282
-msgid "Removing stale lock file.\n"
-msgstr "Borrando fichero de bloqueo en desuso.\n"
+#: src/tincd.c:248
+#, fuzzy
+msgid "private RSA key"
+msgstr "Clave privada: %s\n"

 
 

-#. Do some intl stuff right now
-#: src/tincd.c:325
-msgid "unknown"
-msgstr "desconocido"
+#: src/tincd.c:268
+msgid "Both netname and configuration directory given, using the latter...\n"
+msgstr ""

 
 

-#: src/tincd.c:331
+#: src/tincd.c:303

 #, c-format
 msgid "%s version %s (built %s %s, protocol %d)\n"
 msgstr "%s versión %s (compilado %s %s, protocolo %d)\n"
 
 #, c-format
 msgid "%s version %s (built %s %s, protocol %d)\n"
 msgstr "%s versión %s (compilado %s %s, protocolo %d)\n"
 

-#: src/tincd.c:332
+#: src/tincd.c:304

 msgid ""
 "Copyright (C) 1998,1999,2000 Ivo Timmermans, Guus Sliepen and others.\n"
 "See the AUTHORS file for a complete list.\n"
 msgid ""
 "Copyright (C) 1998,1999,2000 Ivo Timmermans, Guus Sliepen and others.\n"
 "See the AUTHORS file for a complete list.\n"


@@ -893,57 +932,201 @@ msgstr ""
 "y puede ser redistribuido bajo ciertas condiciones;\n"
 "vea el fichero COPYING para los detalles.\n"
 
 "y puede ser redistribuido bajo ciertas condiciones;\n"
 "vea el fichero COPYING para los detalles.\n"
 

-#: src/tincd.c:346
+#: src/tincd.c:318

 msgid "You must be root to run this program. Sorry.\n"
 msgstr ""
 "Usted debe ser el superusuario para ejecutar este programa. Lo siento.\n"
 
 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:353

 msgid "Unrecoverable error"
 msgstr "Error irrecuperable"
 
 msgid "Unrecoverable error"
 msgstr "Error irrecuperable"
 

-#: src/tincd.c:382
+#: src/tincd.c:358

 #, c-format
 msgid "Restarting in %d seconds!"
 msgstr "¡Reiniciando en %d segundos!"
 
 #, c-format
 msgid "Restarting in %d seconds!"
 msgstr "¡Reiniciando en %d segundos!"
 

-#: src/tincd.c:387 src/tincd.c:433
-msgid "Aieee! Not restarting."
+#: src/tincd.c:363
+#, fuzzy
+msgid "Not restarting."

 msgstr "¡Aayyy! No reinicio."
 
 msgstr "¡Aayyy! No reinicio."
 

-#: src/tincd.c:397
-msgid "Got TERM signal"
-msgstr "Recibí la señal TERM"
+#~ msgid "%s: option `%s' is ambiguous\n"
+#~ msgstr "%s: la opción `%s' es ambigua\n"

 
 

-#: src/tincd.c:405
-msgid "Got QUIT signal"
-msgstr "Recibí la señal QUIT"
+#~ msgid "%s: option `--%s' doesn't allow an argument\n"
+#~ msgstr "%s: la opción `--%s' no lleva parámetros\n"

 
 

-#: src/tincd.c:412
-msgid "Got another SEGV signal: not restarting"
-msgstr "Recibí otra señal SEGV: no reinicio"
+#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
+#~ msgstr "%s: la opción `%c%s' no lleva parámetros\n"

 
 

-#: src/tincd.c:419
-msgid "Got SEGV signal"
-msgstr "Recibí la señal SEGV"
+#~ msgid "%s: option `%s' requires an argument\n"
+#~ msgstr "%s: la opción `%s' requiere un parámetro\n"

 
 

-#: src/tincd.c:424
-msgid "Trying to re-execute in 5 seconds..."
-msgstr "Intento re-ejecutar en 5 segundos."
+#~ msgid "%s: unrecognized option `--%s'\n"
+#~ msgstr "%s: opción desconocida `--%s'\n"

 
 

-#: src/tincd.c:442
-msgid "Got HUP signal, rereading configuration and restarting"
-msgstr "Recibí la señal HUP, voy a releer la configuración y reiniciaré."
+#~ msgid "%s: unrecognized option `%c%s'\n"
+#~ msgstr "%s: opción desconocida `%c%s'\n"

 
 

-#: src/tincd.c:450
-msgid "Got INT signal, exiting"
-msgstr "Recibí la señal INT, saliendo"
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: opción ilegal -- %c\n"

 
 

-#: src/tincd.c:464
-msgid "Got USR2 signal, forcing new key generation"
-msgstr "Recibí la señal USR2, forzando generación de nueva clave"
+#~ msgid "%s: invalid option -- %c\n"
+#~ msgstr "%s: opción no válida --%c\n"

 
 

-#: src/tincd.c:473
-#, c-format
-msgid "Got unexpected signal %d (%s)"
-msgstr "Recibí una señal inesperada %d (%s)."
+#~ msgid "%s: option requires an argument -- %c\n"
+#~ msgstr "%s: la opción requiere un parámetro -- %c\n"
+
+#~ msgid "%s: option `-W %s' is ambiguous\n"
+#~ msgstr "%s: la opción `-W %s' es ambigua\n"
+
+#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: la opción `-W %s' no lleva parámetros\n"
+
+#~ msgid "List callback[delete] failed for %08lx - freeing anyway"
+#~ msgstr ""
+#~ "El callback[delete] de la lista falló para %08lx - liberándolo de todos modos"
+
+#~ msgid "Memory exhausted"
+#~ msgstr "Memoria agotada"
+
+#~ msgid "Line %d too long while reading config file %s"
+#~ msgstr "La línea %d es demasiado larga en el fichero de configuración %s"
+
+#~ msgid "Illegal passphrase in %s; size would be %d"
+#~ msgstr "Frase ilegal en %s; el tamaño debe ser %d"
+
+#~ msgid "Opening /dev/urandom failed: %m"
+#~ msgstr "Fallo al abrir /dev/urandom: %m"
+
+#~ msgid "Encryption key set to %s"
+#~ msgstr "Clave de cifrado definida como %s"
+
+#~ msgid "Usage: %s bits\n"
+#~ msgstr "Modo de empleo: %s bits\n"
+
+#~ msgid "Illegal number: %s\n"
+#~ msgstr "Número ilegal: %s\n"
+
+#~ msgid "Receiving packet of %d bytes"
+#~ msgstr "Recibido paquete de %d bytes"
+
+#~ msgid "Could not open UDP connection to %s (%s)"
+#~ msgstr "No pude abrir una conexión UDP a %s (%s)"
+
+#~ msgid "No valid key known yet for %s (%s), queueing packet"
+#~ msgstr ""
+#~ "No conozco ninguna clave válida para %s (%s) aún, pongo el paquete en cola"
+
+#~ msgid "%s (%s) is not ready, queueing packet"
+#~ msgstr "%s (%s) no está listo, poniendo el paquete en cola"
+
+#~ msgid "tun/tap device will be left unconfigured"
+#~ msgstr "el dispositivo tun/tap se dejará sin configurar"
+
+#~ msgid "setsockopt: %m"
+#~ msgstr "setsockopt(): %m"
+
+#~ msgid "fcntl: %m"
+#~ msgstr "fcntl(): %m"
+
+#~ msgid "listen: %m"
+#~ msgstr "listen(): %m"
+
+#~ msgid "Unable to set up an incoming vpn data socket!"
+#~ msgstr "¡No puedo configurar un `socket' para recibir datos de la vpn!"
+
+#~ msgid "Terminating"
+#~ msgstr "Terminando"
+
+#~ msgid "Error: getpeername: %m"
+#~ msgstr "Error: getpeername(): %m"
+
+#~ msgid "Non-IP ethernet frame %04x from %02x:%02x:%02x:%02x:%02x:%02x"
+#~ msgstr "Trama ethernet no-IP %04x desde %02x:%02x:%02x:%02x:%02x:%02x"
+
+#~ msgid "Dropping short packet from %02x:%02x:%02x:%02x:%02x:%02x"
+#~ msgstr "Ignorando paquete corto desde %02x:%02x:%02x:%02x:%02x:%02x"
+
+#~ msgid "Warning: got ADD_HOST from %s (%s) from ourself, restarting"
+#~ msgstr ""
+#~ "Aviso: recibí ADD_HOST desde %s (%s) de nosotros mismos, reiniciando"
+
+#~ msgid ""
+#~ "Got ADD_HOST from %s (%s) with origin %s which is not in our connection list"
+#~ msgstr ""
+#~ "Recibí ADD_HOST desde %s (%s) con origen %s que no está en nuestra lista de "
+#~ "conexiones"
+
+#~ msgid "Removing old entry for %s (%s)"
+#~ msgstr "Eliminando el registro viejo para %s (%s)"
+
+#~ msgid "Warning: got DEL_HOST from %s (%s) from ourself, restarting"
+#~ msgstr ""
+#~ "Aviso: recibí DEL_HOST desde %s (%s) de nosotros mismos, reiniciando"
+
+#~ msgid ""
+#~ "Got DEL_HOST from %s (%s) with origin %s which is not in our connection list"
+#~ msgstr ""
+#~ "Recibí DEL_HOST desde %s (%s) con origen %s que no está en nuestra lista de "
+#~ "conexiones"
+
+#~ msgid "Invalid timeout value `%s'.\n"
+#~ msgstr "Valor de timeout `%s' no válido.\n"
+
+#~ 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."
+
+#~ msgid "tincd %s (%s %s) starting, debug level %d"
+#~ msgstr "tincd %s (%s %s) comenzando, nivel de depuración %d."
+
+#~ msgid "tincd %s starting"
+#~ msgstr "tincd %s comenzando"
+
+#~ 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."
+
+#~ 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"
+
+#~ msgid "A tincd is already running with pid %d.\n"
+#~ msgstr "Un tincd está actualmente en ejecución con el pid %d.\n"
+
+#~ 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"
+
+#~ msgid "No other tincd is running.\n"
+#~ msgstr "No hay ningún otro tincd en ejecución.\n"
+
+#~ msgid "Removing stale lock file.\n"
+#~ msgstr "Borrando fichero de bloqueo en desuso.\n"
+
+#~ msgid "Got TERM signal"
+#~ msgstr "Recibí la señal TERM"
+
+#~ msgid "Got QUIT signal"
+#~ msgstr "Recibí la señal QUIT"
+
+#~ msgid "Got another SEGV signal: not restarting"
+#~ msgstr "Recibí otra señal SEGV: no reinicio"
+
+#~ msgid "Got SEGV signal"
+#~ msgstr "Recibí la señal SEGV"
+
+#~ msgid "Trying to re-execute in 5 seconds..."
+#~ msgstr "Intento re-ejecutar en 5 segundos."
+
+#~ msgid "Got INT signal, exiting"
+#~ msgstr "Recibí la señal INT, saliendo"
+
+#~ msgid "Got USR2 signal, forcing new key generation"
+#~ msgstr "Recibí la señal USR2, forzando generación de nueva clave"
+
+#~ msgid "Got unexpected signal %d (%s)"
+#~ msgstr "Recibí una señal inesperada %d (%s)."

diff --git a/po/nl.po b/po/nl.po
index 23610fc..1b4de07 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tinc 1.0pre4\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: tinc 1.0pre4\n"

-"POT-Creation-Date: 2000-11-29 16:17+0100\n"
+"POT-Creation-Date: 2001-01-06 17:41+0100\n"

 "PO-Revision-Date: 2000-05-31 20:14+02:00\n"
 "Last-Translator: Ivo Timmermans <itimmermans@bigfoot.com>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"
 "PO-Revision-Date: 2000-05-31 20:14+02:00\n"
 "Last-Translator: Ivo Timmermans <itimmermans@bigfoot.com>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"


@@ -13,397 +13,451 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: src/conf.c:230
+#: src/conf.c:238

 #, c-format
 #, c-format

-msgid "Invalid variable name on line %d while reading config file %s"
+msgid "Cannot open config file %s: %m"
+msgstr "Kan configuratie bestand %s niet openen: %m"
+
+#: src/conf.c:274
+#, c-format
+msgid "Invalid variable name `%s' on line %d while reading config file %s"

 msgstr ""
 msgstr ""

-"Ongeldige naam voor variabele op regel %d tijdens het lezen van configuratie "
-"bestand %s"
+"Ongeldige variabelenaam `%s' op regel %d tijdens lezen configuratie bestand "
+"%s"

 
 

-#: src/conf.c:237
+#: src/conf.c:281

 #, c-format
 #, c-format

-msgid "No value for variable on line %d while reading config file %s"
+msgid "No value for variable `%s' on line %d while reading config file %s"

 msgstr ""
 msgstr ""

-"Geen waarde voor variabele op regel %d  tijdens het lezen van configuratie "
-"bestand %s"
+"Geen waarde voor variabele `%s' op regel %d tijdens het lezen van "
+"configuratie bestand %s"

 
 

-#: src/conf.c:245
+#: src/conf.c:289

 #, c-format
 #, c-format

-msgid "Invalid value for variable on line %d while reading config file %s"
+msgid "Invalid value for variable `%s' on line %d while reading config file %s"

 msgstr ""
 msgstr ""

-"Ongeldige waarde voor variabele op regel %d  tijdens het lezen van "
+"Ongeldige waarde voor variabele `%s' op regel %d tijdens lezen van "

 "configuratie bestand %s"
 
 "configuratie bestand %s"
 

-#: src/conf.c:271
+#: src/conf.c:314
+#, c-format
+msgid "Failed to read `%s': %m"
+msgstr "Lezen van `%s' mislukte: %m"
+
+#: src/conf.c:361 src/conf.c:384 src/conf.c:404
+#, c-format
+msgid "Couldn't stat `%s': %m"
+msgstr "Kon `%s' niet statten: %m"
+
+#: src/conf.c:376
+#, c-format
+msgid "`%s' is not an absolute path"
+msgstr "`%s' is geen absoluut pad"
+
+#: src/conf.c:390 src/conf.c:412
+#, c-format
+msgid "`%s' is owned by UID %d instead of %d"
+msgstr "`%s' is eigendom van UID %d in plaats van %d"
+
+#: src/conf.c:396 src/conf.c:418
+#, c-format
+msgid "Warning: `%s' is a symlink"
+msgstr "Waarschuwing: `%s' is een symbolische link"
+
+#. Accessible by others
+#: src/conf.c:425

 #, c-format
 #, c-format

-msgid "Failed to read `%s': %m\n"
-msgstr "`%s' lezen mislukte: %m\n"
+msgid "`%s' has unsecure permissions"
+msgstr "`%s' heeft onveilige permissies"

 
 #. Ask for a file and/or directory name.
 
 #. Ask for a file and/or directory name.

-#: src/conf.c:332
+#: src/conf.c:451

 #, c-format
 msgid "Please enter a file to save %s to [%s]: "
 msgstr "Geef een bestand om de %s naar de schrijven [%s]: "
 
 #, c-format
 msgid "Please enter a file to save %s to [%s]: "
 msgstr "Geef een bestand om de %s naar de schrijven [%s]: "
 

-#: src/conf.c:337
+#: src/conf.c:457

 #, c-format
 msgid "Error while reading stdin: %m\n"
 msgstr "Fout tijdens lezen van standaardinvoer: %m\n"
 
 #, c-format
 msgid "Error while reading stdin: %m\n"
 msgstr "Fout tijdens lezen van standaardinvoer: %m\n"
 

-#: src/conf.c:360
+#: src/conf.c:496
+#, c-format
+msgid "Error opening file `%s': %m\n"
+msgstr "Fout bij het openen van het bestand `%s': %m\n"
+
+#: src/conf.c:506

 #, c-format
 msgid ""
 "The file `%s' (or any of the leading directories) has unsafe permissions.\n"
 "I will not create or overwrite this file.\n"
 msgstr ""
 #, c-format
 msgid ""
 "The file `%s' (or any of the leading directories) has unsafe permissions.\n"
 "I will not create or overwrite this file.\n"
 msgstr ""

-"Het bestand `%s' (of een van de voorgaande mappen) heeft onvoldoende bescherming.\n"
+"Het bestand `%s' (of een van de voorgaande mappen) heeft onvoldoende "
+"bescherming.\n"

 "Ik maak of overschrijf dit bestand niet.\n"
 
 "Ik maak of overschrijf dit bestand niet.\n"
 

-#: src/conf.c:368
-#, c-format
-msgid "Error opening file `%s': %m\n"
-msgstr "Fout bij het openen van het bestand `%s': %m\n"
-
-#: src/connection.c:187
+#: src/connection.c:191

 msgid "Connection list:"
 msgstr "Verbindingslijst:"
 
 msgid "Connection list:"
 msgstr "Verbindingslijst:"
 

-#: src/connection.c:189 src/connection.c:196
+#: src/connection.c:193 src/connection.c:200

 #, c-format
 msgid " %s at %s port %hd flags %d sockets %d, %d status %04x"
 msgstr " %s op %s poort %hd vlaggen %d sockets %d, %d status %04x"
 
 #, c-format
 msgid " %s at %s port %hd flags %d sockets %d, %d status %04x"
 msgstr " %s op %s poort %hd vlaggen %d sockets %d, %d status %04x"
 

-#: src/connection.c:201
+#: src/connection.c:205

 msgid "End of connection list."
 msgstr "Einde van verbindingslijst."
 
 msgid "End of connection list."
 msgstr "Einde van verbindingslijst."
 

-#: src/meta.c:52
+#: src/meta.c:53

 #, c-format
 msgid "Sending %d bytes of metadata to %s (%s): %s"
 msgstr "Verzenden van %d bytes metadata naar %s (%s): %s"
 
 #, c-format
 msgid "Sending %d bytes of metadata to %s (%s): %s"
 msgstr "Verzenden van %d bytes metadata naar %s (%s): %s"
 

-#: src/meta.c:68
+#: src/meta.c:69

 #, c-format
 msgid "Sending meta data to %s (%s) failed: %m"
 msgstr "Fout tijdens verzenden metadata naar %s (%s): %m"
 
 #, c-format
 msgid "Sending meta data to %s (%s) failed: %m"
 msgstr "Fout tijdens verzenden metadata naar %s (%s): %m"
 

-#: src/meta.c:99 src/net.c:1010
+#: src/meta.c:100 src/net.c:1101

 #, c-format
 msgid "This is a bug: %s:%d: %d:%m %s (%s)"
 msgstr "Dit is een programmeerfout: %s:%d: %d:%m %s (%s)"
 
 #, c-format
 msgid "This is a bug: %s:%d: %d:%m %s (%s)"
 msgstr "Dit is een programmeerfout: %s:%d: %d:%m %s (%s)"
 

-#: src/meta.c:105
+#: src/meta.c:106

 #, c-format
 msgid "Metadata socket error for %s (%s): %s"
 msgstr "Fout op metadata socket voor %s (%s): %s"
 
 #, c-format
 msgid "Metadata socket error for %s (%s): %s"
 msgstr "Fout op metadata socket voor %s (%s): %s"
 

-#: src/meta.c:124
+#: src/meta.c:125

 #, c-format
 msgid "Connection closed by %s (%s)"
 msgstr "Verbinding beëindigd door %s (%s)"
 
 #, c-format
 msgid "Connection closed by %s (%s)"
 msgstr "Verbinding beëindigd door %s (%s)"
 

-#: src/meta.c:128
+#: src/meta.c:129

 #, c-format
 msgid "Metadata socket read error for %s (%s): %m"
 msgstr "Fout op metadata socket voor %s (%s) tijdens lezen: %m"
 
 #, c-format
 msgid "Metadata socket read error for %s (%s): %m"
 msgstr "Fout op metadata socket voor %s (%s) tijdens lezen: %m"
 

-#: src/meta.c:158
+#: src/meta.c:159

 #, c-format
 msgid "Got request from %s (%s): %s"
 msgstr "Kreeg verzoek van %s (%s): %s"
 
 #, c-format
 msgid "Got request from %s (%s): %s"
 msgstr "Kreeg verzoek van %s (%s): %s"
 

-#: src/meta.c:176
+#: src/meta.c:177

 #, c-format
 msgid "Metadata read buffer overflow for %s (%s)"
 msgstr "Metadata leesbuffer overloop voor %s (%s)"
 
 #, c-format
 msgid "Metadata read buffer overflow for %s (%s)"
 msgstr "Metadata leesbuffer overloop voor %s (%s)"
 

-#: src/net.c:121
+#: src/net.c:128

 #, c-format
 msgid "Sending packet of %d bytes to %s (%s)"
 msgstr "Verzending pakket van %d bytes naar %s (%s)"
 
 #, c-format
 msgid "Sending packet of %d bytes to %s (%s)"
 msgstr "Verzending pakket van %d bytes naar %s (%s)"
 

-#: src/net.c:132
+#: src/net.c:139

 #, c-format
 msgid "Error sending packet to %s (%s): %m"
 msgstr "Fout tijdens verzenden pakket naar %s (%s): %m"
 
 #, c-format
 msgid "Error sending packet to %s (%s): %m"
 msgstr "Fout tijdens verzenden pakket naar %s (%s): %m"
 

-#: src/net.c:161
+#: src/net.c:168

 #, c-format
 msgid "Writing packet of %d bytes to tap device"
 msgstr "Verzending pakket van %d bytes naar tap-apparaat"
 
 #, c-format
 msgid "Writing packet of %d bytes to tap device"
 msgstr "Verzending pakket van %d bytes naar tap-apparaat"
 

-#: src/net.c:171
+#: src/net.c:178

 #, c-format
 msgid "Can't write to tun/tap device: %m"
 msgstr "Kan niet naar tun/tap apparaat schrijven: %m"
 
 #, c-format
 msgid "Can't write to tun/tap device: %m"
 msgstr "Kan niet naar tun/tap apparaat schrijven: %m"
 

-#: src/net.c:178
+#: src/net.c:185

 #, c-format
 msgid "Can't write to ethertap device: %m"
 msgstr "Kan niet naar ethertap apparaat schrijven: %m"
 
 #, c-format
 msgid "Can't write to ethertap device: %m"
 msgstr "Kan niet naar ethertap apparaat schrijven: %m"
 

-#: src/net.c:279
+#: src/net.c:286

 msgid "Queue flushed"
 msgstr "Wachtrij leeggemaakt"
 
 msgid "Queue flushed"
 msgstr "Wachtrij leeggemaakt"
 

-#: src/net.c:294
+#: src/net.c:301

 #, c-format
 msgid "Flushing send queue for %s (%s)"
 msgstr "Legen van verzend-wachtrij voor %s (%s)"
 
 #, c-format
 msgid "Flushing send queue for %s (%s)"
 msgstr "Legen van verzend-wachtrij voor %s (%s)"
 

-#: src/net.c:302
+#: src/net.c:309

 #, c-format
 msgid "Flushing receive queue for %s (%s)"
 msgstr "Legen van de ontvangst-wachtrij voor %s (%s)"
 
 #, c-format
 msgid "Flushing receive queue for %s (%s)"
 msgstr "Legen van de ontvangst-wachtrij voor %s (%s)"
 

-#: src/net.c:321
+#: src/net.c:328

 #, c-format
 msgid "Trying to look up %d.%d.%d.%d in connection list failed!"
 msgstr "Poging tot opzoeken %d.%d.%d.%d in verbindingslijst mislukte!"
 
 #, c-format
 msgid "Trying to look up %d.%d.%d.%d in connection list failed!"
 msgstr "Poging tot opzoeken %d.%d.%d.%d in verbindingslijst mislukte!"
 

-#: src/net.c:334
+#: src/net.c:341

 #, c-format
 msgid "Packet with destination %d.%d.%d.%d is looping back to us!"
 msgstr "Pakket met doeladres %d.%d.%d.%d komt terug naar ons!"
 
 #, c-format
 msgid "Packet with destination %d.%d.%d.%d is looping back to us!"
 msgstr "Pakket met doeladres %d.%d.%d.%d komt terug naar ons!"
 

-#: src/net.c:410
+#: src/net.c:417

 #, c-format
 msgid "Could not open %s: %m"
 msgstr "Kon %s niet openen: %m"
 
 #, c-format
 msgid "Could not open %s: %m"
 msgstr "Kon %s niet openen: %m"
 

-#: src/net.c:439
+#: src/net.c:446

 #, c-format
 msgid "%s is a new style tun/tap device"
 msgstr "%s is een nieuwe stijl tun/tap apparaat"
 
 #, c-format
 msgid "%s is a new style tun/tap device"
 msgstr "%s is een nieuwe stijl tun/tap apparaat"
 

-#: src/net.c:464
+#: src/net.c:471

 #, c-format
 msgid "Creating metasocket failed: %m"
 msgstr "Aanmaak van metasocket mislukt: %m"
 
 #, c-format
 msgid "Creating metasocket failed: %m"
 msgstr "Aanmaak van metasocket mislukt: %m"
 

-#: src/net.c:471 src/net.c:479 src/net.c:488 src/net.c:522 src/net.c:550
-#: src/net.c:559 src/net.c:968 src/net.c:977 src/net.c:1035
+#: src/net.c:478 src/net.c:486 src/net.c:495 src/net.c:529 src/net.c:557
+#: src/net.c:566 src/net.c:620 src/net.c:1059 src/net.c:1068 src/net.c:1126

 #, c-format
 msgid "System call `%s' failed: %m"
 msgstr "Systeemaanroep `%s' mislukte: %m"
 
 #, c-format
 msgid "System call `%s' failed: %m"
 msgstr "Systeemaanroep `%s' mislukte: %m"
 

-#: src/net.c:498
+#: src/net.c:505

 #, c-format
 msgid "Unable to bind listen socket to interface %s: %m"
 msgstr "Kon luistersocket niet binden aan interface %s: %m"
 
 #, c-format
 msgid "Unable to bind listen socket to interface %s: %m"
 msgstr "Kon luistersocket niet binden aan interface %s: %m"
 

-#: src/net.c:515
+#: src/net.c:522

 #, c-format
 msgid "Can't bind to port %hd/tcp: %m"
 msgstr "Kan niet aan poort %hd/tcp binden: %m"
 
 #, c-format
 msgid "Can't bind to port %hd/tcp: %m"
 msgstr "Kan niet aan poort %hd/tcp binden: %m"
 

-#: src/net.c:543
+#: src/net.c:550

 #, c-format
 msgid "Creating socket failed: %m"
 msgstr "Aanmaak socket mislukte: %m"
 
 #, c-format
 msgid "Creating socket failed: %m"
 msgstr "Aanmaak socket mislukte: %m"
 

-#: src/net.c:572 src/net.c:990
+#: src/net.c:579 src/net.c:1081

 #, c-format
 msgid "Can't bind to port %hd/udp: %m"
 msgstr "Kan niet aan poort %hd/udp binden: %m"
 
 #, c-format
 msgid "Can't bind to port %hd/udp: %m"
 msgstr "Kan niet aan poort %hd/udp binden: %m"
 

-#: src/net.c:589
+#: src/net.c:596

 #, c-format
 msgid "Trying to connect to %s"
 msgstr "Poging tot verbinding met %s"
 
 #, c-format
 msgid "Trying to connect to %s"
 msgstr "Poging tot verbinding met %s"
 

-#: src/net.c:599
+#: src/net.c:606

 #, c-format
 msgid "Creating socket for %s port %d failed: %m"
 msgstr "Aanmaken socket voor %s poort %d mislukt: %m"
 
 #, c-format
 msgid "Creating socket for %s port %d failed: %m"
 msgstr "Aanmaken socket voor %s poort %d mislukt: %m"
 

-#: src/net.c:611
+#: src/net.c:631

 #, c-format
 msgid "%s port %hd: %m"
 msgstr "%s poort %hd: %m"
 
 #, c-format
 msgid "%s port %hd: %m"
 msgstr "%s poort %hd: %m"
 

-#: src/net.c:619
+#: src/net.c:639

 #, c-format
 msgid "fcntl for %s port %d: %m"
 msgstr "fcntl voor %s poort %d: %m"
 
 #, c-format
 msgid "fcntl for %s port %d: %m"
 msgstr "fcntl voor %s poort %d: %m"
 

-#: src/net.c:625
+#: src/net.c:645

 #, c-format
 msgid "Connected to %s port %hd"
 msgstr "Verbonden met %s poort %hd"
 
 #, c-format
 msgid "Connected to %s port %hd"
 msgstr "Verbonden met %s poort %hd"
 

-#: src/net.c:644
+#: src/net.c:664

 msgid "Invalid name for outgoing connection"
 msgstr "Ongelige naam voor uitgaande verbinding"
 
 msgid "Invalid name for outgoing connection"
 msgstr "Ongelige naam voor uitgaande verbinding"
 

-#: src/net.c:653
+#: src/net.c:673

 #, c-format
 msgid "Error reading host configuration file for %s"
 msgstr "Fout tijdens lezen host configuratie bestand voor %s"
 
 #, c-format
 msgid "Error reading host configuration file for %s"
 msgstr "Fout tijdens lezen host configuratie bestand voor %s"
 

-#: src/net.c:660
+#: src/net.c:680

 #, c-format
 msgid "No address specified for %s"
 msgstr "Geen adres gespecificeerd voor %s"
 
 #, c-format
 msgid "No address specified for %s"
 msgstr "Geen adres gespecificeerd voor %s"
 

-#: src/net.c:667
+#: src/net.c:687

 #, c-format
 msgid "Error looking up `%s': %m"
 msgstr "Fout bij het opzoeken van `%s': %m"
 
 #, c-format
 msgid "Error looking up `%s': %m"
 msgstr "Fout bij het opzoeken van `%s': %m"
 

-#: src/net.c:677
+#: src/net.c:697

 #, c-format
 msgid "Could not set up a meta connection to %s"
 msgstr "Kon geen metaverbinding aangaan met %s"
 
 #, c-format
 msgid "Could not set up a meta connection to %s"
 msgstr "Kon geen metaverbinding aangaan met %s"
 

-#: src/net.c:712
+#: src/net.c:735
+#, c-format
+msgid "Error reading RSA public key file `%s': %m"
+msgstr "Fout tijdens lezen RSA publieke sleutel bestand `%s': %m"
+
+#: src/net.c:743
+#, c-format
+msgid "Reading RSA public key file `%s' failed: %m"
+msgstr "Lezen RSA publieke sleutel bestand `%s' mislukt: %m"
+
+#: src/net.c:753
+#, c-format
+msgid "No public key for %s specified!"
+msgstr "Geen publieke sleutel bekend voor %s gespecificeerd!"
+
+#: src/net.c:778
+#, c-format
+msgid "Error reading RSA private key file `%s': %m"
+msgstr "Fout tijdens lezen RSA privé sleutel bestand `%s': %m"
+
+#: src/net.c:786
+#, c-format
+msgid "Reading RSA private key file `%s' failed: %m"
+msgstr "Fout tijdens lezen RSA privé sleutel bestand `%s': %m"
+
+#
+#: src/net.c:793
+msgid "No private key for tinc daemon specified!"
+msgstr "Geen privé sleutel voor tinc daemon gespecificeerd!"
+
+#: src/net.c:817

 msgid "Name for tinc daemon required!"
 msgstr "Naam voor tinc daemon verplicht!"
 
 msgid "Name for tinc daemon required!"
 msgstr "Naam voor tinc daemon verplicht!"
 

-#: src/net.c:720
+#: src/net.c:825

 msgid "Invalid name for myself!"
 msgstr "Ongelige naam voor mijzelf!"
 
 msgid "Invalid name for myself!"
 msgstr "Ongelige naam voor mijzelf!"
 

-#: src/net.c:726
-msgid "Private key for tinc daemon required!"
-msgstr "Privé sleutel voor tinc daemon verplicht!"
-
-#: src/net.c:738
+#: src/net.c:834

 msgid "Cannot open host configuration file for myself!"
 msgstr "Kan host configuratie bestand voor mijzelf niet openen!"
 
 msgid "Cannot open host configuration file for myself!"
 msgstr "Kan host configuratie bestand voor mijzelf niet openen!"
 

-#: src/net.c:744
-msgid "Public key for tinc daemon required!"
-msgstr "Publieke sleutel voor tinc daemon verplicht!"
-
-#: src/net.c:784
+#: src/net.c:875

 msgid "Network address and subnet mask do not match!"
 msgstr "Netwerk adres en subnet masker komen niet overeen!"
 
 msgid "Network address and subnet mask do not match!"
 msgstr "Netwerk adres en subnet masker komen niet overeen!"
 

-#: src/net.c:793
+#: src/net.c:884

 msgid "Unable to set up a listening TCP socket!"
 msgstr "Kon geen TCP luistersocket aanmaken!"
 
 msgid "Unable to set up a listening TCP socket!"
 msgstr "Kon geen TCP luistersocket aanmaken!"
 

-#: src/net.c:799
+#: src/net.c:890

 msgid "Unable to set up a listening UDP socket!"
 msgstr "Kon geen UDP luistersocket aanmaken!"
 
 msgid "Unable to set up a listening UDP socket!"
 msgstr "Kon geen UDP luistersocket aanmaken!"
 

-#: src/net.c:823
+#: src/net.c:914

 #, c-format
 msgid "Ready: listening on port %hd"
 msgstr "Gereed: luisterend op poort %hd"
 
 #, c-format
 msgid "Ready: listening on port %hd"
 msgstr "Gereed: luisterend op poort %hd"
 

-#: src/net.c:855
+#: src/net.c:946

 #, c-format
 msgid "Still failed to connect to other, will retry in %d seconds"
 msgstr "Wederom niet verbonden met de ander, nieuwe poging over %d seconden"
 
 #, c-format
 msgid "Still failed to connect to other, will retry in %d seconds"
 msgstr "Wederom niet verbonden met de ander, nieuwe poging over %d seconden"
 

-#: src/net.c:906
+#: src/net.c:997

 #, c-format
 msgid "Trying to re-establish outgoing connection in %d seconds"
 msgstr "Poging tot herstellen van uitgaande verbinding over %d seconden"
 
 #, c-format
 msgid "Trying to re-establish outgoing connection in %d seconds"
 msgstr "Poging tot herstellen van uitgaande verbinding over %d seconden"
 

-#: src/net.c:956
+#: src/net.c:1047

 #, c-format
 msgid "Opening UDP socket to %s"
 msgstr "Bezig met openen UDP socket naar %s"
 
 #, c-format
 msgid "Opening UDP socket to %s"
 msgstr "Bezig met openen UDP socket naar %s"
 

-#: src/net.c:961
+#: src/net.c:1052

 #, c-format
 msgid "Creating UDP socket failed: %m"
 msgstr "Aanmaak UDP socket mislukte: %m"
 
 #, c-format
 msgid "Creating UDP socket failed: %m"
 msgstr "Aanmaak UDP socket mislukte: %m"
 

-#: src/net.c:1001
+#: src/net.c:1092

 #, c-format
 msgid "Connecting to %s port %d failed: %m"
 msgstr "Verbinding naar %s poort %d mislukt: %m"
 
 #, c-format
 msgid "Connecting to %s port %d failed: %m"
 msgstr "Verbinding naar %s poort %d mislukt: %m"
 

-#: src/net.c:1050
+#: src/net.c:1142

 #, c-format
 msgid "Connection from %s port %d"
 msgstr "Verbinding van %s poort %d"
 
 #, c-format
 msgid "Connection from %s port %d"
 msgstr "Verbinding van %s poort %d"
 

-#: src/net.c:1098
+#: src/net.c:1190

 #, c-format
 msgid "This is a bug: %s:%d: %d:%m"
 msgstr "Dit is een programmeerfout: %s:%d: %d:%m"
 
 #, c-format
 msgid "This is a bug: %s:%d: %d:%m"
 msgstr "Dit is een programmeerfout: %s:%d: %d:%m"
 

-#: src/net.c:1104
+#: src/net.c:1196

 #, c-format
 msgid "Incoming data socket error: %s"
 msgstr "Fout op socket voor inkomend verkeer: %s"
 
 #, c-format
 msgid "Incoming data socket error: %s"
 msgstr "Fout op socket voor inkomend verkeer: %s"
 

-#: src/net.c:1110
+#: src/net.c:1202

 #, c-format
 msgid "Receiving packet failed: %m"
 msgstr "Ontvangst pakket mislukt: %m"
 
 #, c-format
 msgid "Receiving packet failed: %m"
 msgstr "Ontvangst pakket mislukt: %m"
 

-#: src/net.c:1118
+#: src/net.c:1210

 #, c-format
 #, c-format

-msgid "Received UDP packets on port %d from unknown source %lx:%d"
-msgstr "UDP pakket op poort %d ontvangen met onbekende oorsprong %lx:%d"
+msgid "Received UDP packets on port %hd from unknown source %x:%hd"
+msgstr "Ontvangst UDP pakket op poort %hd van onbekende oorsprong %x:%hd"

 
 

-#: src/net.c:1124
+#: src/net.c:1216

 #, c-format
 msgid "Received packet of %d bytes from %s (%s)"
 msgstr "Ontvangst pakket van %d bytes van %s (%s)"
 
 #, c-format
 msgid "Received packet of %d bytes from %s (%s)"
 msgstr "Ontvangst pakket van %d bytes van %s (%s)"
 

-#: src/net.c:1148
+#: src/net.c:1240

 #, c-format
 msgid "Closing connection with %s (%s)"
 msgstr "Beëindigen verbinding met %s (%s)"
 
 #, c-format
 msgid "Closing connection with %s (%s)"
 msgstr "Beëindigen verbinding met %s (%s)"
 

-#: src/net.c:1192
+#: src/net.c:1285

 msgid "Trying to re-establish outgoing connection in 5 seconds"
 msgstr "Poging tot herstellen van uitgaande verbinding over 5 seconden"
 
 msgid "Trying to re-establish outgoing connection in 5 seconds"
 msgstr "Poging tot herstellen van uitgaande verbinding over 5 seconden"
 

-#: src/net.c:1227
+#: src/net.c:1320

 #, c-format
 msgid "%s (%s) didn't respond to PING"
 msgstr "%s (%s) antwoordde niet op ping"
 
 #, c-format
 msgid "%s (%s) didn't respond to PING"
 msgstr "%s (%s) antwoordde niet op ping"
 

-#: src/net.c:1254
+#: src/net.c:1347

 #, c-format
 msgid "Accepting a new connection failed: %m"
 msgstr "Aanname van nieuwe verbinding is mislukt: %m"
 
 #, c-format
 msgid "Accepting a new connection failed: %m"
 msgstr "Aanname van nieuwe verbinding is mislukt: %m"
 

-#: src/net.c:1262
+#: src/net.c:1355

 msgid "Closed attempted connection"
 msgstr "Aangenomen verbinding verbroken"
 
 msgid "Closed attempted connection"
 msgstr "Aangenomen verbinding verbroken"
 

-#: src/net.c:1317
+#: src/net.c:1410

 #, c-format
 msgid "Error while reading from tun/tap device: %m"
 msgstr "Fout tijdens lezen van tun/tap apparaat: %m"
 
 #, c-format
 msgid "Error while reading from tun/tap device: %m"
 msgstr "Fout tijdens lezen van tun/tap apparaat: %m"
 

-#: src/net.c:1326
+#: src/net.c:1419

 #, c-format
 msgid "Error while reading from ethertap device: %m"
 msgstr "Fout tijdens lezen van ethertap apparaat: %m"
 
 #, c-format
 msgid "Error while reading from ethertap device: %m"
 msgstr "Fout tijdens lezen van ethertap apparaat: %m"
 

-#: src/net.c:1337
+#: src/net.c:1430

 msgid "Received short packet from tap device"
 msgstr "Kort pakket ontvangen van tap apparaat"
 
 msgid "Received short packet from tap device"
 msgstr "Kort pakket ontvangen van tap apparaat"
 

-#: src/net.c:1343
+#: src/net.c:1436

 #, c-format
 msgid "Read packet of length %d from tap device"
 msgstr "Pakket gelezen van lengte %d van tap apparaat"
 
 #, c-format
 msgid "Read packet of length %d from tap device"
 msgstr "Pakket gelezen van lengte %d van tap apparaat"
 

-#: src/net.c:1375
+#: src/net.c:1468

 #, c-format
 msgid "Error while waiting for input: %m"
 msgstr "Fout tijdens wachten op invoer: %m"
 
 #, c-format
 msgid "Error while waiting for input: %m"
 msgstr "Fout tijdens wachten op invoer: %m"
 

-#: src/net.c:1382
+#: src/net.c:1475

 msgid "Rereading configuration file and restarting in 5 seconds"
 msgstr "Herlezen configuratiebestand en herstart in 5 seconden"
 
 msgid "Rereading configuration file and restarting in 5 seconds"
 msgstr "Herlezen configuratiebestand en herstart in 5 seconden"
 

-#: src/net.c:1389
+#: src/net.c:1482

 msgid "Unable to reread configuration file, exiting"
 msgstr "Kan configuratiebestand niet herlezen, beëindigen"
 
 msgid "Unable to reread configuration file, exiting"
 msgstr "Kan configuratiebestand niet herlezen, beëindigen"
 

-#: src/net.c:1415
+#: src/net.c:1508

 msgid "Regenerating symmetric key"
 msgstr "Hergenereren symmetrische sleutel"
 
 msgid "Regenerating symmetric key"
 msgstr "Hergenereren symmetrische sleutel"
 


@@ -412,290 +466,285 @@ msgstr "Hergenereren symmetrische sleutel"
 msgid "Error looking up `%s': %s\n"
 msgstr "Fout bij het opzoeken van `%s': %s\n"
 
 msgid "Error looking up `%s': %s\n"
 msgstr "Fout bij het opzoeken van `%s': %s\n"
 

-#: src/protocol.c:98
+#: src/protocol.c:101

 #, c-format
 msgid "Output buffer overflow while sending %s to %s (%s)"
 msgstr "Uitvoer buffer overvol tijdens zenden %s naar %s (%s)"
 
 #, c-format
 msgid "Output buffer overflow while sending %s to %s (%s)"
 msgstr "Uitvoer buffer overvol tijdens zenden %s naar %s (%s)"
 

-#: src/protocol.c:105
+#: src/protocol.c:108

 #, c-format
 msgid "Sending %s to %s (%s)"
 msgstr "Verzending %s naar %s (%s)"
 
 #, c-format
 msgid "Sending %s to %s (%s)"
 msgstr "Verzending %s naar %s (%s)"
 

-#: src/protocol.c:119
+#: src/protocol.c:122

 #, c-format
 msgid "Unknown request from %s (%s)"
 msgstr "Onbekend verzoek van %s (%s)"
 
 #, c-format
 msgid "Unknown request from %s (%s)"
 msgstr "Onbekend verzoek van %s (%s)"
 

-#: src/protocol.c:126
+#: src/protocol.c:129

 #, c-format
 msgid "Got %s from %s (%s)"
 msgstr "Kreeg %s van %s (%s)"
 
 #, c-format
 msgid "Got %s from %s (%s)"
 msgstr "Kreeg %s van %s (%s)"
 

-#: src/protocol.c:132
+#: src/protocol.c:135

 #, c-format
 msgid "Unauthorized request from %s (%s)"
 msgstr "Niet toegestaan verzoek van %s (%s)"
 
 #, c-format
 msgid "Unauthorized request from %s (%s)"
 msgstr "Niet toegestaan verzoek van %s (%s)"
 

-#: src/protocol.c:139
+#: src/protocol.c:142

 #, c-format
 msgid "Error while processing %s from %s (%s)"
 msgstr "Fout tijdens afhandelen %s van %s (%s)"
 
 #, c-format
 msgid "Error while processing %s from %s (%s)"
 msgstr "Fout tijdens afhandelen %s van %s (%s)"
 

-#: src/protocol.c:146
+#: src/protocol.c:149

 #, c-format
 msgid "Bogus data received from %s (%s)"
 msgstr "Onzinnige data ontvangen van %s (%s)"
 
 #, c-format
 msgid "Bogus data received from %s (%s)"
 msgstr "Onzinnige data ontvangen van %s (%s)"
 

-#: src/protocol.c:198
+#: src/protocol.c:203

 #, c-format
 msgid "Got bad ID from %s"
 msgstr "Kreeg ongeldige ID van %s"
 
 #, c-format
 msgid "Got bad ID from %s"
 msgstr "Kreeg ongeldige ID van %s"
 

-#: src/protocol.c:206
+#: src/protocol.c:211

 #, c-format
 msgid "Peer %s (%s) uses incompatible version %d"
 msgstr "Ander %s (%s) gebruikt een niet-compatibel protocol versie %d"
 
 #, c-format
 msgid "Peer %s (%s) uses incompatible version %d"
 msgstr "Ander %s (%s) gebruikt een niet-compatibel protocol versie %d"
 

-#: src/protocol.c:215
+#: src/protocol.c:220

 #, c-format
 msgid "Peer %s uses invalid identity name"
 msgstr "Ander %s gebruikt een ongeldige identiteitsnaam"
 
 #, c-format
 msgid "Peer %s uses invalid identity name"
 msgstr "Ander %s gebruikt een ongeldige identiteitsnaam"
 

-#: src/protocol.c:227
+#: src/protocol.c:232

 #, c-format
 msgid "Peer %s had unknown identity (%s)"
 msgstr "Ander %s heeft een onbekende identiteit (%s)"
 
 #, c-format
 msgid "Peer %s had unknown identity (%s)"
 msgstr "Ander %s heeft een onbekende identiteit (%s)"
 

-#: src/protocol.c:241
+#: src/protocol.c:246

 #, c-format
 msgid "Uplink %s (%s) is already in our connection list"
 msgstr "%s (%s) staat al in onze verbindingslijst"
 
 #, c-format
 msgid "Uplink %s (%s) is already in our connection list"
 msgstr "%s (%s) staat al in onze verbindingslijst"
 

-#: src/protocol.c:263
-#, c-format
-msgid "No public key known for %s (%s)"
-msgstr "Geen publieke sleutel bekend voor %s (%s)"
-
-#: src/protocol.c:296
+#: src/protocol.c:299

 #, c-format
 msgid "Generated random challenge (unencrypted): %s"
 msgstr "Uitdaging gegenereerd (niet versleuteld): %s"
 
 #, c-format
 msgid "Generated random challenge (unencrypted): %s"
 msgstr "Uitdaging gegenereerd (niet versleuteld): %s"
 

-#: src/protocol.c:303 src/protocol.c:356
+#: src/protocol.c:306 src/protocol.c:359

 #, c-format
 msgid "Error during encryption of challenge for %s (%s)"
 msgstr "Fout tijdens versleuteling van uitdaging voor %s (%s)"
 
 #, c-format
 msgid "Error during encryption of challenge for %s (%s)"
 msgstr "Fout tijdens versleuteling van uitdaging voor %s (%s)"
 

-#: src/protocol.c:329
+#: src/protocol.c:332

 #, c-format
 msgid "Got bad CHALLENGE from %s (%s)"
 msgstr "Kreeg ongeldige CHALLENGE van %s (%s)"
 
 #, c-format
 msgid "Got bad CHALLENGE from %s (%s)"
 msgstr "Kreeg ongeldige CHALLENGE van %s (%s)"
 

-#: src/protocol.c:339
+#: src/protocol.c:342

 #, c-format
 msgid "Intruder: wrong challenge length from %s (%s)"
 msgstr "Indringer: verkeerde lengte voor uitdaging van %s (%s)"
 
 #, c-format
 msgid "Intruder: wrong challenge length from %s (%s)"
 msgstr "Indringer: verkeerde lengte voor uitdaging van %s (%s)"
 

-#: src/protocol.c:364
+#: src/protocol.c:367

 #, c-format
 msgid "Received random challenge (unencrypted): %s"
 msgstr "Uitdaging ontvangen (niet versleuteld): %s"
 
 #, c-format
 msgid "Received random challenge (unencrypted): %s"
 msgstr "Uitdaging ontvangen (niet versleuteld): %s"
 

-#: src/protocol.c:378
+#: src/protocol.c:381

 #, c-format
 msgid "Trying to send CHAL_REPLY to %s (%s) without a valid CHALLENGE"
 msgstr "Poging tot zenden CHAL_REPLY naar %s (%s) zonder een geldige CHALLENGE"
 
 #, c-format
 msgid "Trying to send CHAL_REPLY to %s (%s) without a valid CHALLENGE"
 msgstr "Poging tot zenden CHAL_REPLY naar %s (%s) zonder een geldige CHALLENGE"
 

-#: src/protocol.c:409
+#: src/protocol.c:412

 #, c-format
 msgid "Got bad CHAL_REPLY from %s (%s)"
 msgstr "Kreeg ongeldige CHAL_REPLY van %s (%s)"
 
 #, c-format
 msgid "Got bad CHAL_REPLY from %s (%s)"
 msgstr "Kreeg ongeldige CHAL_REPLY van %s (%s)"
 

-#: src/protocol.c:417
+#: src/protocol.c:420

 #, c-format
 msgid "Intruder: wrong challenge reply length from %s (%s)"
 msgstr "Indringer: verkeerde lengte van antwoord op uitdaging van %s (%s)"
 
 #, c-format
 msgid "Intruder: wrong challenge reply length from %s (%s)"
 msgstr "Indringer: verkeerde lengte van antwoord op uitdaging van %s (%s)"
 

-#: src/protocol.c:433
+#: src/protocol.c:436

 #, c-format
 msgid "Intruder: wrong challenge reply from %s (%s)"
 msgstr "Indringer: verkeerd antwoord op de uitdaging van %s (%s)"
 
 #, c-format
 msgid "Intruder: wrong challenge reply from %s (%s)"
 msgstr "Indringer: verkeerd antwoord op de uitdaging van %s (%s)"
 

-#: src/protocol.c:438
+#: src/protocol.c:441

 #, c-format
 msgid "Expected challenge reply: %s"
 msgstr "Verwacht antwoord op uitdaging: %s"
 
 #, c-format
 msgid "Expected challenge reply: %s"
 msgstr "Verwacht antwoord op uitdaging: %s"
 

-#: src/protocol.c:482
+#: src/protocol.c:485

 #, c-format
 msgid "Generated random meta key (unencrypted): %s"
 msgstr "Meta sleutel gegenereerd (niet versleuteld): %s"
 
 #, c-format
 msgid "Generated random meta key (unencrypted): %s"
 msgstr "Meta sleutel gegenereerd (niet versleuteld): %s"
 

-#: src/protocol.c:489 src/protocol.c:551
+#: src/protocol.c:492 src/protocol.c:554

 #, c-format
 msgid "Error during encryption of meta key for %s (%s)"
 msgstr "Fout tijdens versleuteling van meta sleutel voor %s (%s)"
 
 #, c-format
 msgid "Error during encryption of meta key for %s (%s)"
 msgstr "Fout tijdens versleuteling van meta sleutel voor %s (%s)"
 

-#: src/protocol.c:521
+#: src/protocol.c:524

 #, c-format
 msgid "Got bad METAKEY from %s (%s)"
 msgstr "Kreeg ongeldige METAKEY van %s (%s)"
 
 #, c-format
 msgid "Got bad METAKEY from %s (%s)"
 msgstr "Kreeg ongeldige METAKEY van %s (%s)"
 

-#: src/protocol.c:531
+#: src/protocol.c:534

 #, c-format
 msgid "Intruder: wrong meta key length from %s (%s)"
 msgstr "Indringer: verkeerde lengte voor meta sleutel van %s (%s)"
 
 #, c-format
 msgid "Intruder: wrong meta key length from %s (%s)"
 msgstr "Indringer: verkeerde lengte voor meta sleutel van %s (%s)"
 

-#: src/protocol.c:559
+#: src/protocol.c:562

 #, c-format
 msgid "Received random meta key (unencrypted): %s"
 msgstr "Meta sleutel ontvangen (niet versleuteld): %s"
 
 #, c-format
 msgid "Received random meta key (unencrypted): %s"
 msgstr "Meta sleutel ontvangen (niet versleuteld): %s"
 

-#: src/protocol.c:598
+#: src/protocol.c:601

 #, c-format
 msgid "Removing old entry for %s at %s in favour of new connection from %s"
 msgstr ""
 "Verwijdering oude verbinding voor %s op %s in voordeel van nieuwe verbinding "
 "van %s"
 
 #, c-format
 msgid "Removing old entry for %s at %s in favour of new connection from %s"
 msgstr ""
 "Verwijdering oude verbinding voor %s op %s in voordeel van nieuwe verbinding "
 "van %s"
 

-#: src/protocol.c:614
+#: src/protocol.c:617

 #, c-format
 msgid "Connection with %s (%s) activated"
 msgstr "Verbinding met %s (%s) geactiveerd"
 
 #, c-format
 msgid "Connection with %s (%s) activated"
 msgstr "Verbinding met %s (%s) geactiveerd"
 

-#: src/protocol.c:679
+#: src/protocol.c:682

 #, c-format
 msgid "Got bad ADD_SUBNET from %s (%s)"
 msgstr "Kreeg ongeldige ADD_SUBNET van %s (%s)"
 
 #, c-format
 msgid "Got bad ADD_SUBNET from %s (%s)"
 msgstr "Kreeg ongeldige ADD_SUBNET van %s (%s)"
 

-#: src/protocol.c:687
+#: src/protocol.c:690

 #, c-format
 msgid "Got bad ADD_SUBNET from %s (%s): invalid identity name"
 msgstr "Kreeg ongeldige ADD_SUBNET van %s (%s): ongeldige identiteitsnaam"
 
 #, c-format
 msgid "Got bad ADD_SUBNET from %s (%s): invalid identity name"
 msgstr "Kreeg ongeldige ADD_SUBNET van %s (%s): ongeldige identiteitsnaam"
 

-#: src/protocol.c:695
+#: src/protocol.c:698

 #, c-format
 msgid "Got bad ADD_SUBNET from %s (%s): invalid subnet string"
 msgstr "Kreeg ongeldige ADD_SUBNET van %s (%s): ongeldig subnet"
 
 #, c-format
 msgid "Got bad ADD_SUBNET from %s (%s): invalid subnet string"
 msgstr "Kreeg ongeldige ADD_SUBNET van %s (%s): ongeldig subnet"
 

-#: src/protocol.c:703
+#: src/protocol.c:706

 #, c-format
 msgid "Warning: got ADD_SUBNET from %s (%s) for ourself, restarting"
 msgstr "Waarschuwing: kreeg ADD_SUBNET van %s (%s) voor onszelf, herstart"
 
 #, c-format
 msgid "Warning: got ADD_SUBNET from %s (%s) for ourself, restarting"
 msgstr "Waarschuwing: kreeg ADD_SUBNET van %s (%s) voor onszelf, herstart"
 

-#: src/protocol.c:713
+#: src/protocol.c:716

 #, c-format
 msgid "Got ADD_SUBNET for %s from %s (%s) which is not in our connection list"
 msgstr ""
 "Kreeg ADD_SUBNET voor %s van %s (%s) die niet voorkomt in onze "
 "verbindingslijst"
 
 #, c-format
 msgid "Got ADD_SUBNET for %s from %s (%s) which is not in our connection list"
 msgstr ""
 "Kreeg ADD_SUBNET voor %s van %s (%s) die niet voorkomt in onze "
 "verbindingslijst"
 

-#: src/protocol.c:756
+#: src/protocol.c:759

 #, c-format
 msgid "Got bad DEL_SUBNET from %s (%s)"
 msgstr "Kreeg ongeldige DEL_SUBNET van %s (%s)"
 
 #, c-format
 msgid "Got bad DEL_SUBNET from %s (%s)"
 msgstr "Kreeg ongeldige DEL_SUBNET van %s (%s)"
 

-#: src/protocol.c:764
+#: src/protocol.c:767

 #, c-format
 msgid "Got bad DEL_SUBNET from %s (%s): invalid identity name"
 msgstr "Kreeg ongeldige DEL_SUBNET van %s (%s): ongeldige identiteitsnaam"
 
 #, c-format
 msgid "Got bad DEL_SUBNET from %s (%s): invalid identity name"
 msgstr "Kreeg ongeldige DEL_SUBNET van %s (%s): ongeldige identiteitsnaam"
 

-#: src/protocol.c:772
+#: src/protocol.c:775

 #, c-format
 msgid "Got bad DEL_SUBNET from %s (%s): invalid subnet string"
 msgstr "Kreeg ongeldige DEL_SUBNET van %s (%s): ongeldige identiteitsnaam"
 
 #, c-format
 msgid "Got bad DEL_SUBNET from %s (%s): invalid subnet string"
 msgstr "Kreeg ongeldige DEL_SUBNET van %s (%s): ongeldige identiteitsnaam"
 

-#: src/protocol.c:782
+#: src/protocol.c:785

 #, c-format
 msgid "Warning: got DEL_SUBNET from %s (%s) for ourself, restarting"
 msgstr "Waarschuwing: kreeg DEL_SUBNET van %s (%s) voor onszelf, herstart"
 
 #, c-format
 msgid "Warning: got DEL_SUBNET from %s (%s) for ourself, restarting"
 msgstr "Waarschuwing: kreeg DEL_SUBNET van %s (%s) voor onszelf, herstart"
 

-#: src/protocol.c:792
+#: src/protocol.c:795

 #, c-format
 msgid "Got DEL_SUBNET for %s from %s (%s) which is not in our connection list"
 msgstr ""
 "Kreeg DEL_SUBNET voor %s van %s (%s) die niet voorkomt in onze "
 "verbindingslijst"
 
 #, c-format
 msgid "Got DEL_SUBNET for %s from %s (%s) which is not in our connection list"
 msgstr ""
 "Kreeg DEL_SUBNET voor %s van %s (%s) die niet voorkomt in onze "
 "verbindingslijst"
 

-#: src/protocol.c:832
+#: src/protocol.c:835

 #, c-format
 msgid "Got bad ADD_HOST from %s (%s)"
 msgstr "Kreeg ongeldige ADD_HOST van %s (%s)"
 
 #, c-format
 msgid "Got bad ADD_HOST from %s (%s)"
 msgstr "Kreeg ongeldige ADD_HOST van %s (%s)"
 

-#: src/protocol.c:840
+#: src/protocol.c:843

 #, c-format
 msgid "Got bad ADD_HOST from %s (%s): invalid identity name"
 msgstr "Kreeg ongeldige ADD_HOST van %s (%s): ongeldige identiteitsnaam"
 
 #, c-format
 msgid "Got bad ADD_HOST from %s (%s): invalid identity name"
 msgstr "Kreeg ongeldige ADD_HOST van %s (%s): ongeldige identiteitsnaam"
 

-#: src/protocol.c:849
+#: src/protocol.c:852

 #, c-format
 msgid "Warning: got ADD_HOST from %s (%s) for ourself, restarting"
 msgstr "Waarschuwing: kreeg ADD_HOST van %s (%s) voor onszelf, herstart"
 
 #, c-format
 msgid "Warning: got ADD_HOST from %s (%s) for ourself, restarting"
 msgstr "Waarschuwing: kreeg ADD_HOST van %s (%s) voor onszelf, herstart"
 

-#: src/protocol.c:866
+#: src/protocol.c:869

 #, c-format
 msgid "Got duplicate ADD_HOST for %s (%s) from %s (%s)"
 msgstr "Kreeg een tweede ADD_HOST voor %s (%s) van %s (%s)"
 
 #, c-format
 msgid "Got duplicate ADD_HOST for %s (%s) from %s (%s)"
 msgstr "Kreeg een tweede ADD_HOST voor %s (%s) van %s (%s)"
 

-#: src/protocol.c:874
+#: src/protocol.c:877

 #, c-format
 msgid "Removing old entry for %s (%s) in favour of new connection"
 msgstr ""
 "Verwijdering oude verbinding voor %s (%s) in voordeel van nieuwe verbinding"
 
 #, c-format
 msgid "Removing old entry for %s (%s) in favour of new connection"
 msgstr ""
 "Verwijdering oude verbinding voor %s (%s) in voordeel van nieuwe verbinding"
 

-#: src/protocol.c:924
+#: src/protocol.c:927

 #, c-format
 msgid "Got bad DEL_HOST from %s (%s)"
 msgstr "Kreeg ongeldige DEL_HOST van %s (%s)"
 
 #, c-format
 msgid "Got bad DEL_HOST from %s (%s)"
 msgstr "Kreeg ongeldige DEL_HOST van %s (%s)"
 

-#: src/protocol.c:933
+#: src/protocol.c:936

 #, c-format
 msgid "Got bad DEL_HOST from %s (%s): invalid identity name"
 msgstr "Kreeg ongeldige DEL_HOST van %s (%s): ongeldige identiteitsnaam"
 
 #, c-format
 msgid "Got bad DEL_HOST from %s (%s): invalid identity name"
 msgstr "Kreeg ongeldige DEL_HOST van %s (%s): ongeldige identiteitsnaam"
 

-#: src/protocol.c:941
+#: src/protocol.c:944

 #, c-format
 msgid "Warning: got DEL_HOST from %s (%s) for ourself, restarting"
 msgstr "Waarschuwing: kreeg DEL_HOST van %s (%s) voor onszelf, herstart"
 
 #, c-format
 msgid "Warning: got DEL_HOST from %s (%s) for ourself, restarting"
 msgstr "Waarschuwing: kreeg DEL_HOST van %s (%s) voor onszelf, herstart"
 

-#: src/protocol.c:951
+#: src/protocol.c:954

 #, c-format
 msgid "Got DEL_HOST from %s (%s) for %s which is not in our connection list"
 msgstr ""
 "Kreeg DEL_HOST van %s (%s) voor %s die niet in onze verbindingslijst voorkomt"
 
 #, c-format
 msgid "Got DEL_HOST from %s (%s) for %s which is not in our connection list"
 msgstr ""
 "Kreeg DEL_HOST van %s (%s) voor %s die niet in onze verbindingslijst voorkomt"
 

-#: src/protocol.c:960
+#: src/protocol.c:963

 #, c-format
 msgid "Got DEL_HOST from %s (%s) for %s which doesn't match"
 msgstr "Kreeg DEL_HOST van %s (%s) voor %s wat niet overeenkomt"
 
 #, c-format
 msgid "Got DEL_HOST from %s (%s) for %s which doesn't match"
 msgstr "Kreeg DEL_HOST van %s (%s) voor %s wat niet overeenkomt"
 

-#: src/protocol.c:999
+#: src/protocol.c:1002

 #, c-format
 msgid "Got bad STATUS from %s (%s)"
 msgstr "Kreeg ongeldige STATUS van %s (%s)"
 
 #, c-format
 msgid "Got bad STATUS from %s (%s)"
 msgstr "Kreeg ongeldige STATUS van %s (%s)"
 

-#: src/protocol.c:1006
+#: src/protocol.c:1009

 #, c-format
 msgid "Status message from %s (%s): %s: %s"
 msgstr "Ontving statusbericht van %s (%s): %s: %s"
 
 #, c-format
 msgid "Status message from %s (%s): %s: %s"
 msgstr "Ontving statusbericht van %s (%s): %s: %s"
 

-#: src/protocol.c:1029
+#: src/protocol.c:1032

 #, c-format
 msgid "Got bad ERROR from %s (%s)"
 msgstr "Kreeg ongeldige ERROR van %s (%s)"
 
 #, c-format
 msgid "Got bad ERROR from %s (%s)"
 msgstr "Kreeg ongeldige ERROR van %s (%s)"
 

-#: src/protocol.c:1036
+#: src/protocol.c:1039

 #, c-format
 msgid "Error message from %s (%s): %s: %s"
 msgstr "Ontving foutmelding van %s (%s): %s: %s"
 
 #, c-format
 msgid "Error message from %s (%s): %s: %s"
 msgstr "Ontving foutmelding van %s (%s): %s: %s"
 

-#: src/protocol.c:1114
+#: src/protocol.c:1117

 #, c-format
 msgid "Got bad KEY_CHANGED from %s (%s)"
 msgstr "Kreeg ongeldige KEY_CHANGED van %s (%s)"
 
 #, c-format
 msgid "Got bad KEY_CHANGED from %s (%s)"
 msgstr "Kreeg ongeldige KEY_CHANGED van %s (%s)"
 

-#: src/protocol.c:1121
+#: src/protocol.c:1124

 #, c-format
 msgid ""
 "Got KEY_CHANGED from %s (%s) origin %s which does not exist in our "
 #, c-format
 msgid ""
 "Got KEY_CHANGED from %s (%s) origin %s which does not exist in our "


@@ -704,12 +753,12 @@ msgstr ""
 "Kreeg KEY_CHANGED van %s (%s) herkomst %s die niet in onze verbindingslijst "
 "voorkomt"
 
 "Kreeg KEY_CHANGED van %s (%s) herkomst %s die niet in onze verbindingslijst "
 "voorkomt"
 

-#: src/protocol.c:1150
+#: src/protocol.c:1153

 #, c-format
 msgid "Got bad REQ_KEY from %s (%s)"
 msgstr "Kreeg ongeldige REQ_KEY van %s (%s)"
 
 #, c-format
 msgid "Got bad REQ_KEY from %s (%s)"
 msgstr "Kreeg ongeldige REQ_KEY van %s (%s)"
 

-#: src/protocol.c:1157
+#: src/protocol.c:1160

 #, c-format
 msgid ""
 "Got REQ_KEY from %s (%s) origin %s which does not exist in our connection "
 #, c-format
 msgid ""
 "Got REQ_KEY from %s (%s) origin %s which does not exist in our connection "


@@ -718,7 +767,7 @@ msgstr ""
 "Kreeg REQ_KEY van %s (%s) herkomst %s die niet in onze verbindingslijst "
 "voorkomt"
 
 "Kreeg REQ_KEY van %s (%s) herkomst %s die niet in onze verbindingslijst "
 "voorkomt"
 

-#: src/protocol.c:1174
+#: src/protocol.c:1177

 #, c-format
 msgid ""
 "Got REQ_KEY from %s (%s) destination %s which does not exist in our "
 #, c-format
 msgid ""
 "Got REQ_KEY from %s (%s) destination %s which does not exist in our "


@@ -726,12 +775,12 @@ msgid ""
 msgstr ""
 "Kreeg REQ_KEY van %s (%s) doel %s die niet in onze verbindingslijst voorkomt"
 
 msgstr ""
 "Kreeg REQ_KEY van %s (%s) doel %s die niet in onze verbindingslijst voorkomt"
 

-#: src/protocol.c:1210
+#: src/protocol.c:1213

 #, c-format
 msgid "Got bad ANS_KEY from %s (%s)"
 msgstr "Kreeg ongeldige ANS_KEY van %s (%s)"
 
 #, c-format
 msgid "Got bad ANS_KEY from %s (%s)"
 msgstr "Kreeg ongeldige ANS_KEY van %s (%s)"
 

-#: src/protocol.c:1217
+#: src/protocol.c:1220

 #, c-format
 msgid ""
 "Got ANS_KEY from %s (%s) origin %s which does not exist in our connection "
 #, c-format
 msgid ""
 "Got ANS_KEY from %s (%s) origin %s which does not exist in our connection "


@@ -740,13 +789,13 @@ msgstr ""
 "Kreeg ANS_KEY van %s (%s) herkomst %s die niet in onze verbindingslijst "
 "voorkomt"
 
 "Kreeg ANS_KEY van %s (%s) herkomst %s die niet in onze verbindingslijst "
 "voorkomt"
 

-#: src/protocol.c:1228
+#: src/protocol.c:1231

 #, c-format
 msgid "Got bad ANS_KEY from %s (%s) origin %s: invalid key length"
 msgstr ""
 "Kreeg ongeldige ADD_KEY van %s (%s) herkomst %s: ongeldige sleutellengte"
 
 #, c-format
 msgid "Got bad ANS_KEY from %s (%s) origin %s: invalid key length"
 msgstr ""
 "Kreeg ongeldige ADD_KEY van %s (%s) herkomst %s: ongeldige sleutellengte"
 

-#: src/protocol.c:1239
+#: src/protocol.c:1242

 #, c-format
 msgid ""
 "Got ANS_KEY from %s (%s) destination %s which does not exist in our "
 #, c-format
 msgid ""
 "Got ANS_KEY from %s (%s) destination %s which does not exist in our "


@@ -754,25 +803,6 @@ msgid ""
 msgstr ""
 "Kreeg ANS_KEY van %s (%s) doel %s die niet in onze verbindingslijst voorkomt"
 
 msgstr ""
 "Kreeg ANS_KEY van %s (%s) doel %s die niet in onze verbindingslijst voorkomt"
 

-#: src/route.c:61
-#, c-format
-msgid "Cannot route packet: unknown type %hx"
-msgstr "Kan pakket niet routeren: onbekend type %hx"
-
-#: src/route.c:75
-#, c-format
-msgid "Cannot route packet: unknown destination address %x:%x:%x:%x:%x:%x"
-msgstr "Kan pakket niet routeren: onbekend doeladres %x:%x:%x:%x:%x:%x"
-
-#: src/route.c:99
-#, c-format
-msgid "Cannot route packet: unknown destination address %d.%d.%d.%d"
-msgstr "Kan pakket niet routeren: onbekend doeladres %d.%d.%d.%d"
-
-#: src/route.c:109
-msgid "Cannot route packet: IPv6 routing not implemented yet"
-msgstr "Kan pakket niet routeren: IPv6 routering nog niet ingebouwd"
-

 #: src/subnet.c:108
 #, c-format
 msgid "subnet_compare() was called with unknown subnet type %d, restarting!"
 #: src/subnet.c:108
 #, c-format
 msgid "subnet_compare() was called with unknown subnet type %d, restarting!"


@@ -781,15 +811,15 @@ msgstr ""
 "starten"
 
 #. Do some intl stuff right now
 "starten"
 
 #. Do some intl stuff right now

-#: src/subnet.c:251 src/tincd.c:290
+#: src/subnet.c:251 src/tincd.c:296

 msgid "unknown"
 msgstr "onbekend"
 
 msgid "unknown"
 msgstr "onbekend"
 

-#: src/subnet.c:311
+#: src/subnet.c:308

 msgid "Subnet list:"
 msgstr "Subnet lijst:"
 
 msgid "Subnet list:"
 msgstr "Subnet lijst:"
 

-#: src/subnet.c:319
+#: src/subnet.c:316

 msgid "End of subnet list."
 msgstr "Einde van subnet lijst."
 
 msgid "End of subnet list."
 msgstr "Einde van subnet lijst."
 


@@ -840,43 +870,46 @@ msgstr ""
 "Meld fouten in het programma aan tinc@nl.linux.org;\n"
 "Meld fouten in de vertaling aan vertaling@nl.linux.org.\n"
 
 "Meld fouten in het programma aan tinc@nl.linux.org;\n"
 "Meld fouten in de vertaling aan vertaling@nl.linux.org.\n"
 

-#: src/tincd.c:171
-msgid "Invalid argument! BITS must be a number equal to or greater than 512.\n"
+#: src/tincd.c:174
+#, c-format
+msgid ""
+"Invalid argument `%s'; BITS must be a number equal to or greater than 512.\n"

 msgstr ""
 msgstr ""

-"Ongeldig argument! BITS moet een nummer zijn gelijk aan of groter dan 512.\n"
+"Ongeldig argument `%s'; BITS moet een nummer zijn gelijk aan of groter dan "
+"512.\n"

 
 

-#: src/tincd.c:229
+#: src/tincd.c:233

 #, c-format
 msgid "Generating %d bits keys:\n"
 msgstr "Bezig met genereren van een %d bits sleutel:\n"
 
 #, c-format
 msgid "Generating %d bits keys:\n"
 msgstr "Bezig met genereren van een %d bits sleutel:\n"
 

-#: src/tincd.c:233
+#: src/tincd.c:237

 msgid "Error during key generation!"
 msgstr "Fout tijdens genereren sleutel!"
 
 msgid "Error during key generation!"
 msgstr "Fout tijdens genereren sleutel!"
 

-#: src/tincd.c:237
+#: src/tincd.c:241

 msgid "Done.\n"
 msgstr "Klaar.\n"
 
 msgid "Done.\n"
 msgstr "Klaar.\n"
 

-#: src/tincd.c:239
+#: src/tincd.c:243

 msgid "public RSA key"
 msgstr "openbare RSA sleutel"
 
 msgid "public RSA key"
 msgstr "openbare RSA sleutel"
 

-#: src/tincd.c:244
+#: src/tincd.c:248

 msgid "private RSA key"
 msgstr "geheime RSA sleutel"
 
 msgid "private RSA key"
 msgstr "geheime RSA sleutel"
 

-#: src/tincd.c:264
+#: src/tincd.c:268

 msgid "Both netname and configuration directory given, using the latter...\n"
 msgstr ""
 "Zowel netnaam als configuratiemap zijn gegeven, laatste wordt gebruikt...\n"
 
 msgid "Both netname and configuration directory given, using the latter...\n"
 msgstr ""
 "Zowel netnaam als configuratiemap zijn gegeven, laatste wordt gebruikt...\n"
 

-#: src/tincd.c:297
+#: src/tincd.c:303

 #, c-format
 msgid "%s version %s (built %s %s, protocol %d)\n"
 msgstr "%s versie %s (gemaakt %s %s, protocol %d)\n"
 
 #, c-format
 msgid "%s version %s (built %s %s, protocol %d)\n"
 msgstr "%s versie %s (gemaakt %s %s, protocol %d)\n"
 

-#: src/tincd.c:298
+#: src/tincd.c:304

 msgid ""
 "Copyright (C) 1998,1999,2000 Ivo Timmermans, Guus Sliepen and others.\n"
 "See the AUTHORS file for a complete list.\n"
 msgid ""
 "Copyright (C) 1998,1999,2000 Ivo Timmermans, Guus Sliepen and others.\n"
 "See the AUTHORS file for a complete list.\n"


@@ -893,103 +926,20 @@ msgstr ""
 "en je bent welkom om het te distribueren onder bepaalde voorwaarden;\n"
 "zie het bestand COPYING voor details.\n"
 
 "en je bent welkom om het te distribueren onder bepaalde voorwaarden;\n"
 "zie het bestand COPYING voor details.\n"
 

-#: src/tincd.c:312
+#: src/tincd.c:318

 msgid "You must be root to run this program. Sorry.\n"
 msgstr ""
 "Je moet systeembeheerder zijn om dit programma te kunnen draaien. Sorry.\n"
 
 msgid "You must be root to run this program. Sorry.\n"
 msgstr ""
 "Je moet systeembeheerder zijn om dit programma te kunnen draaien. Sorry.\n"
 

-#: src/tincd.c:347
+#: src/tincd.c:353

 msgid "Unrecoverable error"
 msgstr "Onherstelbare fout"
 
 msgid "Unrecoverable error"
 msgstr "Onherstelbare fout"
 

-#: src/tincd.c:352
+#: src/tincd.c:358

 #, c-format
 msgid "Restarting in %d seconds!"
 msgstr "Herstart in %d seconden!"
 
 #, c-format
 msgid "Restarting in %d seconds!"
 msgstr "Herstart in %d seconden!"
 

-#: src/tincd.c:357
+#: src/tincd.c:363

 msgid "Not restarting."
 msgstr "Geen herstart."
 msgid "Not restarting."
 msgstr "Geen herstart."

-
-#~ msgid "Line %d too long while reading config file %s"
-#~ msgstr "Regel %d te lang tijdens het lezen van configuratie bestand %s"
-
-#~ msgid "Terminating"
-#~ msgstr "Beëindigen"
-
-#~ msgid ""
-#~ "Please copy the private key to tinc.conf and the\n"
-#~ "public key to your host configuration file:\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Copiëer de privé sleutel naar tinc.conf en de\n"
-#~ "publieke sleutel naar het host configuratie bestand:\n"
-#~ "\n"
-
-#~ msgid "Couldn't chdir to `%s': %m"
-#~ msgstr "Kon map niet veranderen naar `%s': %m"
-
-#~ msgid "Error executing `%s': %m"
-#~ msgstr "Fout tijdens uitvoeren `%s': %m"
-
-#~ msgid "Could not open UDP connection to %s (%s)"
-#~ msgstr "Kon geen UDP verbinding openen naar %s (%s)"
-
-#~ msgid "Unable to set up an incoming vpn data socket!"
-#~ msgstr "Kon geen socket maken voor inkomend vpn verkeer!"
-
-#~ msgid "Outgoing data socket error for %s (%s): %s"
-#~ msgstr "Fout op socket voor uitgaand verkeer voor %s (%s): %s"
-
-#~ msgid ""
-#~ "Memory exhausted (last is %s:%d) (couldn't allocate %d bytes), exiting."
-#~ msgstr ""
-#~ "Geheugen is vol (laatste %s:%d) (kon geen %d bytes vrijmaken), beëindigen."
-
-#~ msgid "tincd %s (%s %s) starting, debug level %d"
-#~ msgstr "tincd %s (%s %s) gestart, debugniveau %d"
-
-#~ msgid "tincd %s starting"
-#~ msgstr "tincd %s gestart"
-
-#~ msgid ""
-#~ "Total bytes written: tap %d, socket %d; bytes read: tap %d, socket %d"
-#~ msgstr ""
-#~ "Totaal aantal bytes geschreven: tap %d, socket %d; bytes gelezen: top %d, "
-#~ "socket %d."
-
-#~ msgid "A tincd is already running for net `%s' with pid %d.\n"
-#~ msgstr "Een tincd voor net `%s' draait al met procesnummer %d.\n"
-
-#~ msgid "A tincd is already running with pid %d.\n"
-#~ msgstr "Een tincd draait al met procesnummer %d.\n"
-
-#~ msgid "No other tincd is running for net `%s'.\n"
-#~ msgstr "Geen andere tincd gevonden voor net `%s'.\n"
-
-#~ msgid "No other tincd is running.\n"
-#~ msgstr "Geen andere tincd gevonden.\n"
-
-#~ msgid "Removing stale lock file.\n"
-#~ msgstr "Ongebruikt vergrendelingsbestand verwijderd.\n"
-
-#~ msgid "Got TERM signal"
-#~ msgstr "Kreeg TERM signaal"
-
-#~ msgid "Got another SEGV signal: not restarting"
-#~ msgstr "Kreeg nog een SEGV signaal: niet herstarten"
-
-#~ msgid "Got SEGV signal"
-#~ msgstr "Kreeg SEGV signaal"
-
-#~ msgid "Trying to re-execute in 5 seconds..."
-#~ msgstr "Poging tot herstaren over 5 seconden..."
-
-#~ msgid "Got HUP signal"
-#~ msgstr "Kreeg HUP signaal"
-
-#~ msgid "Got INT signal, exiting"
-#~ msgstr "Kreeg INT signaal, beëindigen"
-
-#~ msgid "Got unexpected signal %d (%s)"
-#~ msgstr "Kreeg onverwacht signaal %d (%s)"