Updated translation.

diff --git a/po/POTFILES.in b/po/POTFILES.in
index a60c42c..75d43e6 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -14,3 +14,4 @@ src/protocol.c
 src/subnet.c
 src/tincd.c
 src/process.c
 src/subnet.c
 src/tincd.c
 src/process.c

+src/route.c

diff --git a/po/es.po b/po/es.po
index 83b6619..ac66469 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: 2001-02-25 20:22+0100\n"
+"POT-Creation-Date: 2001-03-04 14:33+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"


@@ -103,7 +103,7 @@ msgstr "Conexi
 
 #: src/connection.c:193 src/connection.c:200
 #, c-format
 
 #: src/connection.c:193 src/connection.c:200
 #, c-format

-msgid " %s at %s port %hd flags %d sockets %d, %d status %04x"
+msgid " %s at %s port %hd options %ld sockets %d, %d status %04x"

 msgstr ""
 
 #: src/connection.c:205
 msgstr ""
 
 #: src/connection.c:205


@@ -121,7 +121,7 @@ msgstr "Enviando paquete de %d bytes a %s (%s)"
 msgid "Sending meta data to %s (%s) failed: %m"
 msgstr "Error enviando paquete a %s (%s): %m"
 
 msgid "Sending meta data to %s (%s) failed: %m"
 msgstr "Error enviando paquete a %s (%s): %m"
 

-#: src/meta.c:100 src/net.c:1037
+#: src/meta.c:100

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


@@ -131,7 +131,7 @@ msgstr "Esto es un `bug': %s:%d: %d:%m %s (%s)"
 msgid "Metadata socket error for %s (%s): %s"
 msgstr "Error en el `socket' de datos salientes para %s (%s): %s"
 
 msgid "Metadata socket error for %s (%s): %s"
 msgstr "Error en el `socket' de datos salientes para %s (%s): %s"
 

-#: src/meta.c:123 src/protocol.c:1277
+#: src/meta.c:123 src/protocol.c:1300

 #, fuzzy, c-format
 msgid "Connection closed by %s (%s)"
 msgstr "Cerrando conexión con %s (%s)"
 #, fuzzy, c-format
 msgid "Connection closed by %s (%s)"
 msgstr "Cerrando conexión con %s (%s)"


@@ -151,323 +151,301 @@ msgstr "Petici
 msgid "Metadata read buffer overflow for %s (%s)"
 msgstr "Desbordamiento del bufer de salida mientras enviaba %s a %s (%s)"
 
 msgid "Metadata read buffer overflow for %s (%s)"
 msgstr "Desbordamiento del bufer de salida mientras enviaba %s a %s (%s)"
 

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

 #, c-format
 #, c-format

-msgid "Sending packet of %d bytes to %s (%s)"
-msgstr "Enviando paquete de %d bytes 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"

 
 

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

 #, 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:173
+#: src/net.c:163
+#, fuzzy, c-format
+msgid "Received packet of %d bytes from %s (%s)"
+msgstr "Enviando paquete de %d bytes a %s (%s)"
+
+#: src/net.c:192

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

-#: src/net.c:183
+#: src/net.c:198

 #, fuzzy, c-format
 msgid "Can't write to tun/tap device: %m"
 msgstr "No puedo escribir en el dispositivo tap: %m"
 
 #, fuzzy, c-format
 msgid "Can't write to tun/tap device: %m"
 msgstr "No puedo escribir en el dispositivo tap: %m"
 

-#: src/net.c:190
+#: src/net.c:205

 #, fuzzy, c-format
 msgid "Can't write to ethertap device: %m"
 msgstr "No puedo escribir en el dispositivo tap: %m"
 
 #, fuzzy, c-format
 msgid "Can't write to ethertap device: %m"
 msgstr "No puedo escribir en el dispositivo tap: %m"
 

-#: src/net.c:211
+#: src/net.c:219

 #, c-format
 #, 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!"
+msgid "Sending packet of %d bytes to %s (%s)"
+msgstr "Enviando paquete de %d bytes a %s (%s)"

 
 

-#: src/net.c:224
-#, c-format
-msgid "Packet with destination %d.%d.%d.%d is looping back to us!"
+#: src/net.c:226
+msgid "Packet is looping back to us!"

 msgstr ""
 
 msgstr ""
 

-#: src/net.c:234
+#: src/net.c:235

 #, fuzzy, c-format
 msgid "%s (%s) is not active, dropping packet"
 msgstr "%s (%s) no está listo, poniendo el paquete en cola"
 
 #, fuzzy, c-format
 msgid "%s (%s) is not active, dropping packet"
 msgstr "%s (%s) no está listo, poniendo el paquete en cola"
 

-#: src/net.c:243
-#, c-format
-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"
-
-#: src/net.c:272
+#: src/net.c:257

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

-#: src/net.c:319
+#: src/net.c:304

 #, c-format
 msgid "Could not open %s: %m"
 msgstr "No pude abrir %s: %m"
 
 #, c-format
 msgid "Could not open %s: %m"
 msgstr "No pude abrir %s: %m"
 

-#: src/net.c:348
+#: src/net.c:333

 #, 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
+#: src/net.c:358

 #, 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:380 src/net.c:388 src/net.c:397 src/net.c:431 src/net.c:459
-#: src/net.c:468 src/net.c:522 src/net.c:995 src/net.c:1004 src/net.c:1062
+#: src/net.c:366 src/net.c:410 src/net.c:441 src/net.c:496 src/net.c:982

 #: src/process.c:239 src/process.c:275
 #, c-format
 msgid "System call `%s' failed: %m"
 msgstr ""
 
 #: src/process.c:239 src/process.c:275
 #, c-format
 msgid "System call `%s' failed: %m"
 msgstr ""
 

-#: src/net.c:407
+#: src/net.c:386

 #, 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:424
+#: src/net.c:403

 #, 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:452
+#: src/net.c:431

 #, 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:481 src/net.c:1017
+#: src/net.c:454

 #, 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:498
+#: src/net.c:472

 #, 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:508
+#: src/net.c:482

 #, 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:533
+#: src/net.c:518

 #, 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:541
+#: src/net.c:526

 #, 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:547
+#: src/net.c:532

 #, 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:566
+#: src/net.c:551

 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:575
+#: src/net.c:560

 #, 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:582
+#: src/net.c:567

 #, 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:589
+#: src/net.c:574

 #, 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:599
+#: src/net.c:584

 #, 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:644
+#: src/net.c:629

 #, fuzzy, c-format
 msgid "Error reading RSA public key file `%s': %m"
 msgstr "Error enviando paquete a %s (%s): %m"
 
 #, fuzzy, c-format
 msgid "Error reading RSA public key file `%s': %m"
 msgstr "Error enviando paquete a %s (%s): %m"
 

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

 #, fuzzy, c-format
 msgid "Reading RSA public key file `%s' failed: %m"
 msgstr "Error recibiendo paquete: %m"
 
 #. Nothing worked.
 #, fuzzy, c-format
 msgid "Reading RSA public key file `%s' failed: %m"
 msgstr "Error recibiendo paquete: %m"
 
 #. Nothing worked.

-#: src/net.c:678
+#: src/net.c:663

 #, c-format
 msgid "No public key for %s specified!"
 msgstr ""
 
 #, c-format
 msgid "No public key for %s specified!"
 msgstr ""
 

-#: src/net.c:701
+#: src/net.c:686

 #, fuzzy, c-format
 msgid "Error reading RSA private key file `%s': %m"
 msgstr "Error enviando paquete a %s (%s): %m"
 
 #, fuzzy, c-format
 msgid "Error reading RSA private key file `%s': %m"
 msgstr "Error enviando paquete a %s (%s): %m"
 

-#: src/net.c:709
+#: src/net.c:694

 #, c-format
 msgid "Reading RSA private key file `%s' failed: %m"
 msgstr ""
 
 #, c-format
 msgid "Reading RSA private key file `%s' failed: %m"
 msgstr ""
 

-#: src/net.c:716
+#: src/net.c:701

 #, fuzzy
 msgid "No private key for tinc daemon specified!"
 msgstr "¡Se requiere un nombre para el demonio tinc!"
 
 #, fuzzy
 msgid "No private key for tinc daemon specified!"
 msgstr "¡Se requiere un nombre para el demonio tinc!"
 

-#: src/net.c:740
+#: src/net.c:725

 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:748
+#: src/net.c:733

 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:757
+#: src/net.c:742

 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:798
+#: src/net.c:783

 msgid "Network address and subnet mask do not match!"
 msgstr ""
 
 msgid "Network address and subnet mask do not match!"
 msgstr ""
 

-#: src/net.c:807
+#: src/net.c:792

 #, fuzzy
 msgid "Unable to set up a listening TCP socket!"
 msgstr "¡No puedo configurar un `socket' a la escucha!"
 
 #, fuzzy
 msgid "Unable to set up a listening TCP socket!"
 msgstr "¡No puedo configurar un `socket' a la escucha!"
 

-#: src/net.c:813
+#: src/net.c:798

 #, fuzzy
 msgid "Unable to set up a listening UDP socket!"
 msgstr "¡No puedo configurar un `socket' a la escucha!"
 
 #, fuzzy
 msgid "Unable to set up a listening UDP socket!"
 msgstr "¡No puedo configurar un `socket' a la escucha!"
 

-#: src/net.c:850
+#: src/net.c:839

 #, 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:882
+#: src/net.c:871

 #, 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:933
+#: src/net.c:924

 #, 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:983
-#, c-format
-msgid "Opening UDP socket to %s"
-msgstr "Abriendo `socket' UDP a %s"
-
-#: src/net.c:988
-#, c-format
-msgid "Creating UDP socket failed: %m"
-msgstr "Error al crear el `socket' UDP: %m"
-
-#: src/net.c:1028
-#, c-format
-msgid "Connecting to %s port %d failed: %m"
-msgstr "Error al conectar a %s puerto %d: %m"
-
-#: src/net.c:1079
+#: src/net.c:999

 #, 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:1127
+#: src/net.c:1047

 #, 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:1133
+#: src/net.c:1053

 #, 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:1139
+#: src/net.c:1059

 #, 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:1147
+#: src/net.c:1067

 #, c-format
 msgid "Received UDP packets on port %hd from unknown source %x:%hd"
 msgstr ""
 
 #, c-format
 msgid "Received UDP packets on port %hd from unknown source %x:%hd"
 msgstr ""
 

-#: src/net.c:1153
-#, fuzzy, c-format
-msgid "Received packet of %d bytes from %s (%s)"
-msgstr "Enviando paquete de %d bytes a %s (%s)"
-
-#: src/net.c:1175
+#: src/net.c:1089

 #, 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:1225
+#: src/net.c:1140

 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:1260
+#: src/net.c:1175

 #, 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:1287
+#: src/net.c:1202

 #, 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:1295
+#: src/net.c:1210

 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:1352
+#: src/net.c:1267

 #, fuzzy, c-format
 msgid "Error while reading from tun/tap device: %m"
 msgstr "Error leyendo del dispositivo tap: %m"
 
 #, fuzzy, c-format
 msgid "Error while reading from tun/tap device: %m"
 msgstr "Error leyendo del dispositivo tap: %m"
 

-#: src/net.c:1361
+#: src/net.c:1276

 #, fuzzy, c-format
 msgid "Error while reading from ethertap device: %m"
 msgstr "Error leyendo del dispositivo tap: %m"
 
 #, fuzzy, c-format
 msgid "Error while reading from ethertap device: %m"
 msgstr "Error leyendo del dispositivo tap: %m"
 

-#: src/net.c:1372
+#: src/net.c:1287

 msgid "Received short packet from tap device"
 msgstr ""
 
 msgid "Received short packet from tap device"
 msgstr ""
 

-#: src/net.c:1378
+#: src/net.c:1293

 #, c-format
 msgid "Read packet of length %d from tap device"
 msgstr ""
 
 #, c-format
 msgid "Read packet of length %d from tap device"
 msgstr ""
 

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

 #, 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:1417
+#: src/net.c:1332

 #, fuzzy
 msgid "Rereading configuration file and restarting in 5 seconds"
 msgstr "Recibí la señal HUP, voy a releer la configuración y reiniciaré."
 
 #, 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:1424
+#: src/net.c:1339

 #, fuzzy
 msgid "Unable to reread configuration file, exiting"
 msgstr "Recibí la señal HUP, voy a releer la configuración y reiniciaré."
 
 #, 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:1450
+#: src/net.c:1365

 #, fuzzy
 msgid "Regenerating symmetric key"
 msgstr "Generando claves de %d bits"
 #, fuzzy
 msgid "Regenerating symmetric key"
 msgstr "Generando claves de %d bits"


@@ -537,218 +515,218 @@ msgstr "La m
 msgid "Uplink %s (%s) is already in our connection list"
 msgstr "El enlace %s (%s) ya está en nuestra lista de conexiones."
 
 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:318
+#: src/protocol.c:289
+#, 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:304
+#, c-format
+msgid "Connection with %s (%s) activated"
+msgstr "Activada la conexión con %s (%s)."
+
+#: src/protocol.c:400

 #, 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:328
+#: src/protocol.c:410

 #, 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:354
+#: src/protocol.c:436

 #, 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:380
+#: src/protocol.c:462

 #, 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:388
+#: src/protocol.c:470

 #, 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:404
+#: src/protocol.c:486

 #, 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:409
+#: src/protocol.c:491

 #, c-format
 msgid "Expected challenge reply: %s"
 msgstr ""
 
 #, c-format
 msgid "Expected challenge reply: %s"
 msgstr ""
 

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

 #, c-format
 msgid "Generated random meta key (unencrypted): %s"
 msgstr ""
 
 #, c-format
 msgid "Generated random meta key (unencrypted): %s"
 msgstr ""
 

-#: src/protocol.c:455 src/protocol.c:516
+#: src/protocol.c:552 src/protocol.c:615

 #, fuzzy, c-format
 msgid "Error during encryption of meta key for %s (%s)"
 msgstr "Error enviando paquete a %s (%s): %m"
 
 #, fuzzy, c-format
 msgid "Error during encryption of meta key for %s (%s)"
 msgstr "Error enviando paquete a %s (%s): %m"
 

-#: src/protocol.c:486
+#: src/protocol.c:585

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

-#: src/protocol.c:496
+#: src/protocol.c:595

 #, fuzzy, c-format
 msgid "Intruder: wrong meta key length from %s (%s)"
 msgstr "Intruso: longitud de desafío incorrecta desde %s (%s)"
 
 #, 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:524
+#: src/protocol.c:623

 #, c-format
 msgid "Received random meta key (unencrypted): %s"
 msgstr ""
 
 #, c-format
 msgid "Received random meta key (unencrypted): %s"
 msgstr ""
 

-#: src/protocol.c:553
-#, 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:568
-#, c-format
-msgid "Connection with %s (%s) activated"
-msgstr "Activada la conexión con %s (%s)."
-
-#: src/protocol.c:650
+#: src/protocol.c:669

 #, 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:658
+#: src/protocol.c:677

 #, 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:666
+#: src/protocol.c:685

 #, 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:674
+#: src/protocol.c:693

 #, 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:684
+#: src/protocol.c:703

 #, 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:732
+#: src/protocol.c:751

 #, 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:740
+#: src/protocol.c:759

 #, 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:748
+#: src/protocol.c:767

 #, 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:758
+#: src/protocol.c:777

 #, 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:768
+#: src/protocol.c:787

 #, 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:809
+#: src/protocol.c:830

 #, 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:817
+#: src/protocol.c:838

 #, 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:826
+#: src/protocol.c:847

 #, 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:843
+#: src/protocol.c:864

 #, 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:851
+#: src/protocol.c:872

 #, 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"
 
 #, 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:902
+#: src/protocol.c:925

 #, 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:911
+#: src/protocol.c:934

 #, 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:919
+#: src/protocol.c:942

 #, 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:929
+#: src/protocol.c:952

 #, 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:938
+#: src/protocol.c:961

 #, 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:977
+#: src/protocol.c:1000

 #, 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:984
+#: src/protocol.c:1007

 #, 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:1007
+#: src/protocol.c:1030

 #, 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:1014
+#: src/protocol.c:1037

 #, 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:1091
+#: src/protocol.c:1114

 #, 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:1098
+#: src/protocol.c:1121

 #, 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 "


@@ -757,12 +735,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:1127
+#: src/protocol.c:1150

 #, 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:1134
+#: src/protocol.c:1157

 #, 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 "


@@ -771,7 +749,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:1151
+#: src/protocol.c:1174

 #, 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 "


@@ -780,12 +758,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:1187
+#: src/protocol.c:1210

 #, 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:1194
+#: src/protocol.c:1217

 #, 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 "


@@ -794,12 +772,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:1205
+#: src/protocol.c:1228

 #, 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"
 
 #, 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"
 

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

 #, 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 "


@@ -808,12 +786,12 @@ 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/protocol.c:1261
+#: src/protocol.c:1284

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

-#: src/protocol.c:1282
+#: src/protocol.c:1305

 #, fuzzy, c-format
 msgid "Error during reception of PACKET from %s (%s): %m"
 msgstr "Error enviando paquete a %s (%s): %m"
 #, fuzzy, c-format
 msgid "Error during reception of PACKET from %s (%s): %m"
 msgstr "Error enviando paquete a %s (%s): %m"


@@ -824,7 +802,7 @@ msgid "subnet_compare() was called with unknown subnet type %d, restarting!"
 msgstr ""
 
 #. Do some intl stuff right now
 msgstr ""
 
 #. Do some intl stuff right now

-#: src/subnet.c:251 src/tincd.c:313
+#: src/subnet.c:251 src/tincd.c:310

 msgid "unknown"
 msgstr "desconocido"
 
 msgid "unknown"
 msgstr "desconocido"
 


@@ -836,12 +814,12 @@ msgstr ""
 msgid "End of subnet list."
 msgstr ""
 
 msgid "End of subnet list."
 msgstr ""
 

-#: src/tincd.c:119
+#: src/tincd.c:116

 #, 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:122
+#: src/tincd.c:119

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


@@ -850,7 +828,7 @@ msgstr ""
 "Modo de empleo: %s [opción]...\n"
 "\n"
 
 "Modo de empleo: %s [opción]...\n"
 "\n"
 

-#: src/tincd.c:123
+#: src/tincd.c:120

 #, fuzzy
 msgid ""
 "  -c, --config=DIR           Read configuration options from DIR.\n"
 #, fuzzy
 msgid ""
 "  -c, --config=DIR           Read configuration options from DIR.\n"


@@ -866,7 +844,7 @@ 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:128
+#: src/tincd.c:125

 #, fuzzy
 msgid ""
 "  -K, --generate-keys[=BITS] Generate public/private RSA keypair.\n"
 #, fuzzy
 msgid ""
 "  -K, --generate-keys[=BITS] Generate public/private RSA keypair.\n"


@@ -878,55 +856,55 @@ msgstr ""
 "      --version         Muestra información de la versión y termina.\n"
 "\n"
 
 "      --version         Muestra información de la versión y termina.\n"
 "\n"
 

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

 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:174
+#: src/tincd.c:171

 #, c-format
 msgid ""
 "Invalid argument `%s'; BITS must be a number equal to or greater than 512.\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Invalid argument `%s'; BITS must be a number equal to or greater than 512.\n"
 msgstr ""
 

-#: src/tincd.c:235
+#: src/tincd.c:232

 #, c-format
 msgid "Generating %d bits keys:\n"
 msgstr "Generando claves de %d bits:\n"
 
 #, c-format
 msgid "Generating %d bits keys:\n"
 msgstr "Generando claves de %d bits:\n"
 

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

 msgid "Error during key generation!"
 msgstr ""
 
 msgid "Error during key generation!"
 msgstr ""
 

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

 msgid "Done.\n"
 msgstr "Hecho.\n"
 
 msgid "Done.\n"
 msgstr "Hecho.\n"
 

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

 #, fuzzy
 msgid "public RSA key"
 msgstr "Clave pública: %s\n"
 
 #, fuzzy
 msgid "public RSA key"
 msgstr "Clave pública: %s\n"
 

-#: src/tincd.c:255 src/tincd.c:266
+#: src/tincd.c:252 src/tincd.c:263

 msgid ""
 "Appending key to existing contents.\n"
 "Make sure only one key is stored in the file.\n"
 msgstr ""
 
 msgid ""
 "Appending key to existing contents.\n"
 "Make sure only one key is stored in the file.\n"
 msgstr ""
 

-#: src/tincd.c:262
+#: src/tincd.c:259

 #, fuzzy
 msgid "private RSA key"
 msgstr "Clave privada: %s\n"
 
 #, fuzzy
 msgid "private RSA key"
 msgstr "Clave privada: %s\n"
 

-#: src/tincd.c:287
+#: src/tincd.c:284

 msgid "Both netname and configuration directory given, using the latter..."
 msgstr ""
 
 msgid "Both netname and configuration directory given, using the latter..."
 msgstr ""
 

-#: src/tincd.c:320
+#: src/tincd.c:317

 #, 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:321
+#: src/tincd.c:318

 #, fuzzy
 msgid ""
 "Copyright (C) 1998-2001 Ivo Timmermans, Guus Sliepen and others.\n"
 #, fuzzy
 msgid ""
 "Copyright (C) 1998-2001 Ivo Timmermans, Guus Sliepen and others.\n"


@@ -943,22 +921,22 @@ 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:335
+#: src/tincd.c:332

 #, fuzzy
 msgid "You must be root to run this program.\n"
 msgstr ""
 "Usted debe ser el superusuario para ejecutar este programa. Lo siento.\n"
 
 #, fuzzy
 msgid "You must be root to run this program.\n"
 msgstr ""
 "Usted debe ser el superusuario para ejecutar este programa. Lo siento.\n"
 

-#: src/tincd.c:375
+#: src/tincd.c:372

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

-#: src/tincd.c:380
+#: src/tincd.c:377

 #, 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/process.c:338 src/tincd.c:385
+#: src/process.c:338 src/tincd.c:382

 #, fuzzy
 msgid "Not restarting."
 msgstr "¡Aayyy! No reinicio."
 #, fuzzy
 msgid "Not restarting."
 msgstr "¡Aayyy! No reinicio."


@@ -1077,6 +1055,46 @@ msgstr "Recib
 msgid "Installing signal handler for signal %d (%s) failed: %m\n"
 msgstr ""
 
 msgid "Installing signal handler for signal %d (%s) failed: %m\n"
 msgstr ""
 

+#: src/route.c:56
+#, c-format
+msgid "Learned new MAC address %x:%x:%x:%x:%x:%x from %s (%s)"
+msgstr ""
+
+#: src/route.c:84
+#, c-format
+msgid "Cannot route packet: unknown destination address %x:%x:%x:%x:%x:%x"
+msgstr ""
+
+#: src/route.c:111
+#, c-format
+msgid "Cannot route packet: unknown destination address %d.%d.%d.%d"
+msgstr ""
+
+#: src/route.c:126
+msgid "Cannot route packet: IPv6 routing not yet implemented"
+msgstr ""
+
+#: src/route.c:155
+#, c-format
+msgid "Cannot route packet: unknown type %hx"
+msgstr ""
+
+#, fuzzy
+#~ msgid "Got packet of %d bytes from %s (%s)"
+#~ msgstr "Enviando paquete de %d bytes a %s (%s)"
+
+#~ 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!"
+
+#~ msgid "Opening UDP socket to %s"
+#~ msgstr "Abriendo `socket' UDP a %s"
+
+#~ msgid "Creating UDP socket failed: %m"
+#~ msgstr "Error al crear el `socket' UDP: %m"
+
+#~ msgid "Connecting to %s port %d failed: %m"
+#~ msgstr "Error al conectar a %s puerto %d: %m"
+

 #, fuzzy
 #~ msgid "Error during encryption of challenge for %s (%s)"
 #~ msgstr "Error leyendo el fichero de configuración del `host' para %s"
 #, fuzzy
 #~ msgid "Error during encryption of challenge for %s (%s)"
 #~ msgstr "Error leyendo el fichero de configuración del `host' para %s"

diff --git a/po/nl.po b/po/nl.po
index 5addbdb..614cc98 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: 2001-02-25 20:22+0100\n"
+"POT-Creation-Date: 2001-03-04 14:33+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"


@@ -107,8 +107,8 @@ msgstr "Verbindingslijst:"
 
 #: src/connection.c:193 src/connection.c:200
 #, c-format
 
 #: 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"
+msgid " %s at %s port %hd options %ld sockets %d, %d status %04x"
+msgstr " %s op %s poort %hd opties %d sockets %d, %d status %04x"

 
 #: src/connection.c:205
 msgid "End of connection list."
 
 #: src/connection.c:205
 msgid "End of connection list."


@@ -124,7 +124,7 @@ msgstr "Verzenden van %d bytes metadata naar %s (%s): %s"
 msgid "Sending meta data to %s (%s) failed: %m"
 msgstr "Fout tijdens verzenden metadata naar %s (%s): %m"
 
 msgid "Sending meta data to %s (%s) failed: %m"
 msgstr "Fout tijdens verzenden metadata naar %s (%s): %m"
 

-#: src/meta.c:100 src/net.c:1037
+#: src/meta.c:100

 #, 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)"


@@ -134,7 +134,7 @@ msgstr "Dit is een programmeerfout: %s:%d: %d:%m %s (%s)"
 msgid "Metadata socket error for %s (%s): %s"
 msgstr "Fout op metadata socket voor %s (%s): %s"
 
 msgid "Metadata socket error for %s (%s): %s"
 msgstr "Fout op metadata socket voor %s (%s): %s"
 

-#: src/meta.c:123 src/protocol.c:1277
+#: src/meta.c:123 src/protocol.c:1300

 #, 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)"


@@ -154,319 +154,297 @@ msgstr "Kreeg verzoek van %s (%s): %s"
 msgid "Metadata read buffer overflow for %s (%s)"
 msgstr "Metadata leesbuffer overloop voor %s (%s)"
 
 msgid "Metadata read buffer overflow for %s (%s)"
 msgstr "Metadata leesbuffer overloop voor %s (%s)"
 

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

 #, c-format
 #, c-format

-msgid "Sending packet of %d bytes to %s (%s)"
-msgstr "Verzending pakket van %d bytes naar %s (%s)"
+msgid "No valid key known yet for %s (%s), queueing packet"
+msgstr ""
+"Nog geen geldige sleutel bekend voor %s (%s), pakket wordt in wachtrij gezet"

 
 

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

 #, 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:173
+#: src/net.c:163
+#, c-format
+msgid "Received packet of %d bytes from %s (%s)"
+msgstr "Ontvangst pakket van %d bytes van %s (%s)"
+
+#: src/net.c:192

 #, 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:183
+#: src/net.c:198

 #, 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:190
+#: src/net.c:205

 #, 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:211
+#: src/net.c:219

 #, c-format
 #, 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!"
+msgid "Sending packet of %d bytes to %s (%s)"
+msgstr "Verzending pakket van %d bytes naar %s (%s)"

 
 

-#: src/net.c:224
-#, 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:226
+msgid "Packet is looping back to us!"
+msgstr "Pakket komt terug naar ons!"

 
 

-#: src/net.c:234
+#: src/net.c:235

 #, c-format
 msgid "%s (%s) is not active, dropping packet"
 msgstr "%s (%s) is niet actief, pakket wordt genegeerd"
 
 #, c-format
 msgid "%s (%s) is not active, dropping packet"
 msgstr "%s (%s) is niet actief, pakket wordt genegeerd"
 

-#: src/net.c:243
-#, c-format
-msgid "No valid key known yet for %s (%s), queueing packet"
-msgstr ""
-"Nog geen geldige sleutel bekend voor %s (%s), pakket wordt in wachtrij gezet"
-
-#: src/net.c:272
+#: src/net.c:257

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

-#: src/net.c:319
+#: src/net.c:304

 #, 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:348
+#: src/net.c:333

 #, 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:373
+#: src/net.c:358

 #, 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:380 src/net.c:388 src/net.c:397 src/net.c:431 src/net.c:459
-#: src/net.c:468 src/net.c:522 src/net.c:995 src/net.c:1004 src/net.c:1062
+#: src/net.c:366 src/net.c:410 src/net.c:441 src/net.c:496 src/net.c:982

 #: src/process.c:239 src/process.c:275
 #, c-format
 msgid "System call `%s' failed: %m"
 msgstr "Systeemaanroep `%s' mislukte: %m"
 
 #: src/process.c:239 src/process.c:275
 #, c-format
 msgid "System call `%s' failed: %m"
 msgstr "Systeemaanroep `%s' mislukte: %m"
 

-#: src/net.c:407
+#: src/net.c:386

 #, 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:424
+#: src/net.c:403

 #, 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:452
+#: src/net.c:431

 #, 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:481 src/net.c:1017
+#: src/net.c:454

 #, 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:498
+#: src/net.c:472

 #, 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:508
+#: src/net.c:482

 #, 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:533
+#: src/net.c:518

 #, 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:541
+#: src/net.c:526

 #, 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:547
+#: src/net.c:532

 #, 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:566
+#: src/net.c:551

 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:575
+#: src/net.c:560

 #, 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:582
+#: src/net.c:567

 #, 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:589
+#: src/net.c:574

 #, 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:599
+#: src/net.c:584

 #, 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:644
+#: src/net.c:629

 #, c-format
 msgid "Error reading RSA public key file `%s': %m"
 msgstr "Fout tijdens lezen RSA publieke sleutel bestand `%s': %m"
 
 #, c-format
 msgid "Error reading RSA public key file `%s': %m"
 msgstr "Fout tijdens lezen RSA publieke sleutel bestand `%s': %m"
 

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

 #, c-format
 msgid "Reading RSA public key file `%s' failed: %m"
 msgstr "Lezen RSA publieke sleutel bestand `%s' mislukt: %m"
 
 #. Nothing worked.
 #, c-format
 msgid "Reading RSA public key file `%s' failed: %m"
 msgstr "Lezen RSA publieke sleutel bestand `%s' mislukt: %m"
 
 #. Nothing worked.

-#: src/net.c:678
+#: src/net.c:663

 #, c-format
 msgid "No public key for %s specified!"
 msgstr "Geen publieke sleutel bekend voor %s gespecificeerd!"
 
 #, c-format
 msgid "No public key for %s specified!"
 msgstr "Geen publieke sleutel bekend voor %s gespecificeerd!"
 

-#: src/net.c:701
+#: src/net.c:686

 #, c-format
 msgid "Error reading RSA private key file `%s': %m"
 msgstr "Fout tijdens lezen RSA privé sleutel bestand `%s': %m"
 
 #, c-format
 msgid "Error reading RSA private key file `%s': %m"
 msgstr "Fout tijdens lezen RSA privé sleutel bestand `%s': %m"
 

-#: src/net.c:709
+#: src/net.c:694

 #, c-format
 msgid "Reading RSA private key file `%s' failed: %m"
 msgstr "Fout tijdens lezen RSA privé sleutel bestand `%s': %m"
 
 #
 #, c-format
 msgid "Reading RSA private key file `%s' failed: %m"
 msgstr "Fout tijdens lezen RSA privé sleutel bestand `%s': %m"
 
 #

-#: src/net.c:716
+#: src/net.c:701

 msgid "No private key for tinc daemon specified!"
 msgstr "Geen privé sleutel voor tinc daemon gespecificeerd!"
 
 msgid "No private key for tinc daemon specified!"
 msgstr "Geen privé sleutel voor tinc daemon gespecificeerd!"
 

-#: src/net.c:740
+#: src/net.c:725

 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:748
+#: src/net.c:733

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

-#: src/net.c:757
+#: src/net.c:742

 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:798
+#: src/net.c:783

 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:807
+#: src/net.c:792

 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:813
+#: src/net.c:798

 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:850
+#: src/net.c:839

 #, 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:882
+#: src/net.c:871

 #, 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:933
+#: src/net.c:924

 #, 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:983
-#, c-format
-msgid "Opening UDP socket to %s"
-msgstr "Bezig met openen UDP socket naar %s"
-
-#: src/net.c:988
-#, c-format
-msgid "Creating UDP socket failed: %m"
-msgstr "Aanmaak UDP socket mislukte: %m"
-
-#: src/net.c:1028
-#, c-format
-msgid "Connecting to %s port %d failed: %m"
-msgstr "Verbinding naar %s poort %d mislukt: %m"
-
-#: src/net.c:1079
+#: src/net.c:999

 #, 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:1127
+#: src/net.c:1047

 #, 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:1133
+#: src/net.c:1053

 #, 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:1139
+#: src/net.c:1059

 #, 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:1147
+#: src/net.c:1067

 #, c-format
 msgid "Received UDP packets on port %hd from unknown source %x:%hd"
 msgstr "Ontvangst UDP pakket op poort %hd van onbekende oorsprong %x:%hd"
 
 #, c-format
 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:1153
-#, c-format
-msgid "Received packet of %d bytes from %s (%s)"
-msgstr "Ontvangst pakket van %d bytes van %s (%s)"
-
-#: src/net.c:1175
+#: src/net.c:1089

 #, 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:1225
+#: src/net.c:1140

 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:1260
+#: src/net.c:1175

 #, 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:1287
+#: src/net.c:1202

 #, 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:1295
+#: src/net.c:1210

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

-#: src/net.c:1352
+#: src/net.c:1267

 #, 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:1361
+#: src/net.c:1276

 #, 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:1372
+#: src/net.c:1287

 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:1378
+#: src/net.c:1293

 #, 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:1410
+#: src/net.c:1325

 #, 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:1417
+#: src/net.c:1332

 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:1424
+#: src/net.c:1339

 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:1450
+#: src/net.c:1365

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


@@ -535,210 +513,210 @@ msgstr "Ander %s heeft een onbekende identiteit (%s)"
 msgid "Uplink %s (%s) is already in our connection list"
 msgstr "%s (%s) staat al in onze verbindingslijst"
 
 msgid "Uplink %s (%s) is already in our connection list"
 msgstr "%s (%s) staat al in onze verbindingslijst"
 

-#: src/protocol.c:318
+#: src/protocol.c:289
+#, 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:304
+#, c-format
+msgid "Connection with %s (%s) activated"
+msgstr "Verbinding met %s (%s) geactiveerd"
+
+#: src/protocol.c:400

 #, 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:328
+#: src/protocol.c:410

 #, 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:354
+#: src/protocol.c:436

 #, 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:380
+#: src/protocol.c:462

 #, 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:388
+#: src/protocol.c:470

 #, 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:404
+#: src/protocol.c:486

 #, 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:409
+#: src/protocol.c:491

 #, 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:448
+#: src/protocol.c:540

 #, 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:455 src/protocol.c:516
+#: src/protocol.c:552 src/protocol.c:615

 #, 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:486
+#: src/protocol.c:585

 #, 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:496
+#: src/protocol.c:595

 #, 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:524
+#: src/protocol.c:623

 #, 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:553
-#, 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:568
-#, c-format
-msgid "Connection with %s (%s) activated"
-msgstr "Verbinding met %s (%s) geactiveerd"
-
-#: src/protocol.c:650
+#: src/protocol.c:669

 #, 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:658
+#: src/protocol.c:677

 #, 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:666
+#: src/protocol.c:685

 #, 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:674
+#: src/protocol.c:693

 #, 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:684
+#: src/protocol.c:703

 #, 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:732
+#: src/protocol.c:751

 #, 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:740
+#: src/protocol.c:759

 #, 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:748
+#: src/protocol.c:767

 #, 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:758
+#: src/protocol.c:777

 #, 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:768
+#: src/protocol.c:787

 #, 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:809
+#: src/protocol.c:830

 #, 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:817
+#: src/protocol.c:838

 #, 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:826
+#: src/protocol.c:847

 #, 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:843
+#: src/protocol.c:864

 #, 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:851
+#: src/protocol.c:872

 #, 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:902
+#: src/protocol.c:925

 #, 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:911
+#: src/protocol.c:934

 #, 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:919
+#: src/protocol.c:942

 #, 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:929
+#: src/protocol.c:952

 #, 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:938
+#: src/protocol.c:961

 #, 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:977
+#: src/protocol.c:1000

 #, 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:984
+#: src/protocol.c:1007

 #, 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:1007
+#: src/protocol.c:1030

 #, 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:1014
+#: src/protocol.c:1037

 #, 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:1091
+#: src/protocol.c:1114

 #, 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:1098
+#: src/protocol.c:1121

 #, 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 "


@@ -747,12 +725,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:1127
+#: src/protocol.c:1150

 #, 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:1134
+#: src/protocol.c:1157

 #, 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 "


@@ -761,7 +739,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:1151
+#: src/protocol.c:1174

 #, 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 "


@@ -769,12 +747,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:1187
+#: src/protocol.c:1210

 #, 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:1194
+#: src/protocol.c:1217

 #, 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 "


@@ -783,13 +761,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:1205
+#: src/protocol.c:1228

 #, 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:1216
+#: src/protocol.c:1239

 #, 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 "


@@ -797,12 +775,12 @@ 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/protocol.c:1261
+#: src/protocol.c:1284

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

-#: src/protocol.c:1282
+#: src/protocol.c:1305

 #, c-format
 msgid "Error during reception of PACKET from %s (%s): %m"
 msgstr "Fout bij het ontvangen van PAKKET van %s (%s)"
 #, c-format
 msgid "Error during reception of PACKET from %s (%s): %m"
 msgstr "Fout bij het ontvangen van PAKKET van %s (%s)"


@@ -815,7 +793,7 @@ msgstr ""
 "starten"
 
 #. Do some intl stuff right now
 "starten"
 
 #. Do some intl stuff right now

-#: src/subnet.c:251 src/tincd.c:313
+#: src/subnet.c:251 src/tincd.c:310

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


@@ -827,12 +805,12 @@ msgstr "Subnet lijst:"
 msgid "End of subnet list."
 msgstr "Einde van subnet lijst."
 
 msgid "End of subnet list."
 msgstr "Einde van subnet lijst."
 

-#: src/tincd.c:119
+#: src/tincd.c:116

 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Probeer `%s --help' voor meer informatie.\n"
 
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Probeer `%s --help' voor meer informatie.\n"
 

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

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


@@ -841,7 +819,7 @@ msgstr ""
 "Gebruik: %s [optie]...\n"
 "\n"
 
 "Gebruik: %s [optie]...\n"
 "\n"
 

-#: src/tincd.c:123
+#: src/tincd.c:120

 msgid ""
 "  -c, --config=DIR           Read configuration options from DIR.\n"
 "  -D, --no-detach            Don't fork and detach.\n"
 msgid ""
 "  -c, --config=DIR           Read configuration options from DIR.\n"
 "  -D, --no-detach            Don't fork and detach.\n"


@@ -856,7 +834,7 @@ msgstr ""
 "beëindig.\n"
 "  -n, --net=NETNAAM          Verbind met net NETNAAM.\n"
 
 "beëindig.\n"
 "  -n, --net=NETNAAM          Verbind met net NETNAAM.\n"
 

-#: src/tincd.c:128
+#: src/tincd.c:125

 msgid ""
 "  -K, --generate-keys[=BITS] Generate public/private RSA keypair.\n"
 "      --help                 Display this help and exit.\n"
 msgid ""
 "  -K, --generate-keys[=BITS] Generate public/private RSA keypair.\n"
 "      --help                 Display this help and exit.\n"


@@ -868,13 +846,13 @@ msgstr ""
 "      --version              Geef versie informatie en beëindig.\n"
 "\n"
 
 "      --version              Geef versie informatie en beëindig.\n"
 "\n"
 

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

 msgid "Report bugs to tinc@nl.linux.org.\n"
 msgstr ""
 "Meld fouten in het programma aan tinc@nl.linux.org;\n"
 "Meld fouten in de vertaling aan vertaling@nl.linux.org.\n"
 
 msgid "Report bugs to tinc@nl.linux.org.\n"
 msgstr ""
 "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:174
+#: src/tincd.c:171

 #, c-format
 msgid ""
 "Invalid argument `%s'; BITS must be a number equal to or greater than 512.\n"
 #, c-format
 msgid ""
 "Invalid argument `%s'; BITS must be a number equal to or greater than 512.\n"


@@ -882,24 +860,24 @@ msgstr ""
 "Ongeldig argument `%s'; 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:235
+#: src/tincd.c:232

 #, 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:240
+#: 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:244
+#: src/tincd.c:241

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

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

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

-#: src/tincd.c:255 src/tincd.c:266
+#: src/tincd.c:252 src/tincd.c:263

 msgid ""
 "Appending key to existing contents.\n"
 "Make sure only one key is stored in the file.\n"
 msgid ""
 "Appending key to existing contents.\n"
 "Make sure only one key is stored in the file.\n"


@@ -907,21 +885,21 @@ msgstr ""
 "Sleutel wordt toegevoegd aan bestaande inhoud.\n"
 "Let er op dat er slechts één sleutel in het bestand is.\n"
 
 "Sleutel wordt toegevoegd aan bestaande inhoud.\n"
 "Let er op dat er slechts één sleutel in het bestand is.\n"
 

-#: src/tincd.c:262
+#: src/tincd.c:259

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

-#: src/tincd.c:287
+#: src/tincd.c:284

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

-#: src/tincd.c:320
+#: src/tincd.c:317

 #, 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:321
+#: src/tincd.c:318

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


@@ -938,20 +916,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:335
+#: src/tincd.c:332

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

-#: src/tincd.c:375
+#: src/tincd.c:372

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

-#: src/tincd.c:380
+#: src/tincd.c:377

 #, 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/process.c:338 src/tincd.c:385
+#: src/process.c:338 src/tincd.c:382

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


@@ -1066,3 +1044,27 @@ msgstr "Kreeg onverwacht signaal %d (%s)"
 #, c-format
 msgid "Installing signal handler for signal %d (%s) failed: %m\n"
 msgstr "Installeren van signaal afhandelaar voor signaal %d (%s) faalde: %m\n"
 #, c-format
 msgid "Installing signal handler for signal %d (%s) failed: %m\n"
 msgstr "Installeren van signaal afhandelaar voor signaal %d (%s) faalde: %m\n"

+
+#: src/route.c:56
+#, c-format
+msgid "Learned new MAC address %x:%x:%x:%x:%x:%x from %s (%s)"
+msgstr "Nieuw MAC address %x:%x:%x:%x:%x:%x geleerd van %s (%s)"
+
+#: src/route.c:84
+#, 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:111
+#, 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:126
+msgid "Cannot route packet: IPv6 routing not yet implemented"
+msgstr "Kan pakket niet routeren: IPv6 routering nog niet geïmplementeerd"
+
+#: src/route.c:155
+#, c-format
+msgid "Cannot route packet: unknown type %hx"
+msgstr "Kan pakket niet routeren: onbekend type %hx"