From d3f889c8076dff9c00ebfe1459cb36425f8da41d Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Sun, 7 Jan 2001 17:09:07 +0000 Subject: [PATCH] - It's 2001, all copyright notices are updated. --- README | 12 +- THANKS | 4 +- TODO | 10 +- doc/tinc.texi | 10 +- lib/avl_tree.c | 8 +- lib/avl_tree.h | 8 +- lib/dropin.c | 6 +- lib/dropin.h | 6 +- lib/list.c | 6 +- lib/list.h | 6 +- lib/utils.c | 4 +- lib/utils.h | 4 +- po/es.po | 352 ++++++++++++++++++++++++----------------------- po/nl.po | 350 +++++++++++++++++++++++----------------------- src/conf.c | 8 +- src/conf.h | 6 +- src/connection.c | 6 +- src/connection.h | 6 +- src/meta.c | 6 +- src/meta.h | 6 +- src/net.c | 6 +- src/net.h | 5 +- src/netutl.c | 6 +- src/netutl.h | 7 +- src/process.c | 6 +- src/process.h | 6 +- src/protocol.c | 6 +- src/protocol.h | 6 +- src/route.c | 6 +- src/route.h | 6 +- src/subnet.c | 6 +- src/subnet.h | 6 +- src/tincd.c | 8 +- 33 files changed, 461 insertions(+), 443 deletions(-) diff --git a/README b/README index 195946b9..70d76f54 100644 --- a/README +++ b/README @@ -1,9 +1,13 @@ -This is the README file for tinc version 1.0pre3. Installation +This is the README file for tinc version 1.0pre4. Installation instructions may be found in the INSTALL file. -tinc is Copyright (C) 1998,1999,2000 Ivo Timmermans -, Guus Sliepen and -others. For a complete list of authors see the AUTHORS file. +tinc is Copyright (C) 1998-2001 by: + +Ivo Timmermans , +Guus Sliepen , +and others. + +For a complete list of authors see the AUTHORS file. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/THANKS b/THANKS index 10b7e025..ed275bfc 100644 --- a/THANKS +++ b/THANKS @@ -19,5 +19,5 @@ We would like to thank for their help, support and ideas. Thank you guys! -And especially Guus Sliepen, for starting this whole project... - +Ivo Timmermans +Guus Sliepen diff --git a/TODO b/TODO index 7d3669d3..6800c038 100644 --- a/TODO +++ b/TODO @@ -3,18 +3,18 @@ TODO LIST Goals for 1.0 release: * Check Solaris port -* Check different linux architectures (x86, alpha done) +* Check different linux architectures (x86, alpha and sparc32 done) * Store private key in a separate file (done, 1 dec 2000) -* Sanity checks on configuration directory -* Use efficient tree algorithms instead of linked lists (largely done) -* Reenable queues for delayed packets +* Sanity checks on configuration directory (mostly done) +* Use efficient tree algorithms instead of linked lists (done) +* Reenable queues for delayed packets (done) * Merge documentation files (SECURITY, INSTALL, PROTOCOL) into tinc.texi Goals for future releases: * Compression -* Routing by MAC (allows for more than only IPv4) +* Routing by MAC/switching (allows for more than only IPv4) * Broadcast/multicast * Windowing, chaffing, scattering, background noise * ABC protocol (superscalabilty) diff --git a/doc/tinc.texi b/doc/tinc.texi index 7fdf1de9..32ebec3e 100644 --- a/doc/tinc.texi +++ b/doc/tinc.texi @@ -1,5 +1,5 @@ \input texinfo @c -*-texinfo-*- -@c $Id: tinc.texi,v 1.8.4.11 2001/01/06 20:02:21 guus Exp $ +@c $Id: tinc.texi,v 1.8.4.12 2001/01/07 17:08:47 guus Exp $ @c %**start of header @setfilename tinc.info @settitle tinc Manual @@ -13,11 +13,11 @@ This is the info manual for tinc, a Virtual Private Network daemon. -Copyright @copyright{} 1998,199,2000 Ivo Timmermans +Copyright @copyright{} 1998-2001 Ivo Timmermans , Guus Sliepen and Wessel Dankers . -$Id: tinc.texi,v 1.8.4.11 2001/01/06 20:02:21 guus Exp $ +$Id: tinc.texi,v 1.8.4.12 2001/01/07 17:08:47 guus Exp $ Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice are @@ -38,11 +38,11 @@ permission notice identical to this one. @page @vskip 0pt plus 1filll @cindex copyright -Copyright @copyright{} 1998,1999,2000 Ivo Timmermans +Copyright @copyright{} 1998-2001 Ivo Timmermans , Guus Sliepen and Wessel Dankers . -$Id: tinc.texi,v 1.8.4.11 2001/01/06 20:02:21 guus Exp $ +$Id: tinc.texi,v 1.8.4.12 2001/01/07 17:08:47 guus Exp $ Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice are diff --git a/lib/avl_tree.c b/lib/avl_tree.c index 79bf2dc0..34ce2a33 100644 --- a/lib/avl_tree.c +++ b/lib/avl_tree.c @@ -1,9 +1,9 @@ /* avl_tree.c -- avl_ tree and linked list convenience Copyright (C) 1998 Michael H. Buselli - 2000 Ivo Timmermans , - 2000 Guus Sliepen - 2000 Wessel Dankers + 2000,2001 Ivo Timmermans , + 2000,2001 Guus Sliepen + 2000,2001 Wessel Dankers This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -29,7 +29,7 @@ library for inclusion into tinc (http://tinc.nl.linux.org) by Guus Sliepen . - $Id: avl_tree.c,v 1.1.2.2 2001/01/06 18:21:17 guus Exp $ + $Id: avl_tree.c,v 1.1.2.3 2001/01/07 17:08:49 guus Exp $ */ #include diff --git a/lib/avl_tree.h b/lib/avl_tree.h index 430eeb51..49bca181 100644 --- a/lib/avl_tree.h +++ b/lib/avl_tree.h @@ -1,9 +1,9 @@ /* avl_tree.h -- header file for avl_tree.c Copyright (C) 1998 Michael H. Buselli - 2000 Ivo Timmermans , - 2000 Guus Sliepen - 2000 Wessel Dankers + 2000,2001 Ivo Timmermans , + 2000,2001 Guus Sliepen + 2000,2001 Wessel Dankers This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -29,7 +29,7 @@ library for inclusion into tinc (http://tinc.nl.linux.org) by Guus Sliepen . - $Id: avl_tree.h,v 1.1.2.2 2001/01/06 18:21:17 guus Exp $ + $Id: avl_tree.h,v 1.1.2.3 2001/01/07 17:08:49 guus Exp $ */ diff --git a/lib/dropin.c b/lib/dropin.c index 5f4fcebd..518a175d 100644 --- a/lib/dropin.c +++ b/lib/dropin.c @@ -1,7 +1,7 @@ /* dropin.c -- a set of drop-in replacements for libc functions - Copyright (C) 2000 Ivo Timmermans , - 2000 Guus Sliepen + Copyright (C) 2000,2001 Ivo Timmermans , + 2000,2001 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: dropin.c,v 1.1.2.2 2000/11/29 00:33:15 zarq Exp $ + $Id: dropin.c,v 1.1.2.3 2001/01/07 17:08:49 guus Exp $ */ #include "config.h" diff --git a/lib/dropin.h b/lib/dropin.h index 90b24714..9874ca6d 100644 --- a/lib/dropin.h +++ b/lib/dropin.h @@ -1,7 +1,7 @@ /* dropin.h -- header file for dropin.c - Copyright (C) 2000 Ivo Timmermans , - 2000 Guus Sliepen + Copyright (C) 2000,2001 Ivo Timmermans , + 2000,2001 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: dropin.h,v 1.1.2.2 2000/11/29 00:33:15 zarq Exp $ + $Id: dropin.h,v 1.1.2.3 2001/01/07 17:08:49 guus Exp $ */ #ifndef __DROPIN_H__ diff --git a/lib/list.c b/lib/list.c index d317622d..bcee3858 100644 --- a/lib/list.c +++ b/lib/list.c @@ -1,7 +1,7 @@ /* list.c -- functions to deal with double linked lists - Copyright (C) 2000 Ivo Timmermans - 2000 Guus Sliepen + Copyright (C) 2000,2001 Ivo Timmermans + 2000,2001 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: list.c,v 1.1.2.7 2001/01/07 15:24:52 guus Exp $ + $Id: list.c,v 1.1.2.8 2001/01/07 17:08:49 guus Exp $ */ #include "config.h" diff --git a/lib/list.h b/lib/list.h index 960a9091..b62ab992 100644 --- a/lib/list.h +++ b/lib/list.h @@ -1,7 +1,7 @@ /* list.h -- header file for list.c - Copyright (C) 2000 Ivo Timmermans - 2000 Guus Sliepen + Copyright (C) 2000,2001 Ivo Timmermans + 2000,2001 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: list.h,v 1.1.2.3 2001/01/07 15:24:52 guus Exp $ + $Id: list.h,v 1.1.2.4 2001/01/07 17:08:50 guus Exp $ */ #ifndef __TINC_LIST_H__ diff --git a/lib/utils.c b/lib/utils.c index be3126dc..26d3b498 100644 --- a/lib/utils.c +++ b/lib/utils.c @@ -1,7 +1,7 @@ /* utils.c -- gathering of some stupid small functions - Copyright (C) 1999,2000 Ivo Timmermans - 2000 Guus Sliepen + Copyright (C) 1999-2001 Ivo Timmermans + 2000,2001 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/utils.h b/lib/utils.h index 2507e7d3..0b79bfae 100644 --- a/lib/utils.h +++ b/lib/utils.h @@ -1,7 +1,7 @@ /* utils.h -- header file for utils.c - Copyright (C) 1999,2000 Ivo Timmermans - 2000 Guus Sliepen + Copyright (C) 1999-2001 Ivo Timmermans + 2000,2001 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/po/es.po b/po/es.po index 87cd1ae1..43ef2b61 100644 --- a/po/es.po +++ b/po/es.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: tinc 1.0pre3\n" -"POT-Creation-Date: 2001-01-06 17:41+0100\n" +"POT-Creation-Date: 2001-01-07 18:02+0100\n" "PO-Revision-Date: 2000-11-26 15:20+0000\n" "Last-Translator: Enrique Zanardi \n" "Language-Team: Spanish \n" @@ -42,49 +42,54 @@ msgstr "" msgid "Failed to read `%s': %m" msgstr "" -#: src/conf.c:361 src/conf.c:384 src/conf.c:404 +#: src/conf.c:375 +#, c-format +msgid "`%s' is not an absolute path" +msgstr "" + +#: src/conf.c:391 src/conf.c:424 #, fuzzy, c-format msgid "Couldn't stat `%s': %m" msgstr "No pude abrir %s: %m" -#: src/conf.c:376 +#: src/conf.c:398 src/conf.c:434 #, c-format -msgid "`%s' is not an absolute path" +msgid "`%s' is owned by UID %d instead of %d" msgstr "" -#: src/conf.c:390 src/conf.c:412 +#: src/conf.c:405 src/conf.c:441 #, c-format -msgid "`%s' is owned by UID %d instead of %d" +msgid "Warning: `%s' is a symlink" msgstr "" -#: src/conf.c:396 src/conf.c:418 +#: src/conf.c:410 src/conf.c:446 #, c-format -msgid "Warning: `%s' is a symlink" +msgid "Unable to read symbolic link `%s': %m" msgstr "" #. Accessible by others -#: src/conf.c:425 +#: src/conf.c:457 #, c-format msgid "`%s' has unsecure permissions" msgstr "" #. Ask for a file and/or directory name. -#: src/conf.c:451 +#: src/conf.c:482 #, c-format msgid "Please enter a file to save %s to [%s]: " msgstr "" -#: src/conf.c:457 +#: src/conf.c:488 #, fuzzy, c-format msgid "Error while reading stdin: %m\n" msgstr "Error leyendo del dispositivo tap: %m" -#: src/conf.c:496 +#: src/conf.c:514 #, fuzzy, c-format msgid "Error opening file `%s': %m\n" msgstr "Error buscando `%s': %m" -#: src/conf.c:506 +#: src/conf.c:524 #, c-format msgid "" "The file `%s' (or any of the leading directories) has unsafe permissions.\n" @@ -116,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" -#: src/meta.c:100 src/net.c:1101 +#: src/meta.c:100 src/net.c:991 #, c-format msgid "This is a bug: %s:%d: %d:%m %s (%s)" msgstr "Esto es un `bug': %s:%d: %d:%m %s (%s)" @@ -171,590 +176,592 @@ msgstr "No puedo escribir en el dispositivo tap: %m" 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" - -#: src/net.c:301 -#, c-format -msgid "Flushing send queue for %s (%s)" -msgstr "Vaciando la cola de envíos para %s (%s)" - -#: src/net.c:309 -#, c-format -msgid "Flushing receive queue for %s (%s)" -msgstr "Vaciando la cola de recepción para %s (%s)" - -#: src/net.c:328 +#: src/net.c:205 #, 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:341 +#: src/net.c:218 #, c-format msgid "Packet with destination %d.%d.%d.%d is looping back to us!" msgstr "" -#: src/net.c:417 +#: src/net.c:228 +#, 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:241 +#, 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:261 +#, fuzzy, c-format +msgid "Flushing queue for %s (%s)" +msgstr "Vaciando la cola de envíos para %s (%s)" + +#: src/net.c:307 #, c-format msgid "Could not open %s: %m" msgstr "No pude abrir %s: %m" -#: src/net.c:446 +#: src/net.c:336 #, c-format msgid "%s is a new style tun/tap device" msgstr "%s es un dispositivo tun/tap del nuevo estilo" -#: src/net.c:471 +#: src/net.c:361 #, c-format msgid "Creating metasocket failed: %m" msgstr "Fallo al crear el metasocket: %m" -#: 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 +#: src/net.c:368 src/net.c:376 src/net.c:385 src/net.c:419 src/net.c:447 +#: src/net.c:456 src/net.c:510 src/net.c:949 src/net.c:958 src/net.c:1016 #, c-format msgid "System call `%s' failed: %m" msgstr "" -#: src/net.c:505 +#: src/net.c:395 #, 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:522 +#: src/net.c:412 #, c-format msgid "Can't bind to port %hd/tcp: %m" msgstr "No puedo enlazar (bind) al puerto %hd/tcp: %m" -#: src/net.c:550 +#: src/net.c:440 #, c-format msgid "Creating socket failed: %m" msgstr "Error al crear el `socket': %m" -#: src/net.c:579 src/net.c:1081 +#: src/net.c:469 src/net.c:971 #, c-format msgid "Can't bind to port %hd/udp: %m" msgstr "No puedo enlazar (bind) al puerto %hd/udp: %m" -#: src/net.c:596 +#: src/net.c:486 #, c-format msgid "Trying to connect to %s" msgstr "Intentando conectar con %s" -#: src/net.c:606 +#: src/net.c:496 #, 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:631 +#: src/net.c:521 #, c-format msgid "%s port %hd: %m" msgstr "%s puerto %hd: %m" -#: src/net.c:639 +#: src/net.c:529 #, c-format msgid "fcntl for %s port %d: %m" msgstr "fcntl() para %s puerto %d: %m" -#: src/net.c:645 +#: src/net.c:535 #, c-format msgid "Connected to %s port %hd" msgstr "Conectado a %s puerto %hd" -#: src/net.c:664 +#: src/net.c:554 msgid "Invalid name for outgoing connection" msgstr "Nombre no válido para conexión saliente" -#: src/net.c:673 +#: src/net.c:563 #, 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:680 +#: src/net.c:570 #, c-format msgid "No address specified for %s" msgstr "No se especificó dirección para %s" -#: src/net.c:687 +#: src/net.c:577 #, c-format msgid "Error looking up `%s': %m" msgstr "Error buscando `%s': %m" -#: src/net.c:697 +#: src/net.c:587 #, 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:735 +#: src/net.c:625 #, fuzzy, c-format msgid "Error reading RSA public key file `%s': %m" msgstr "Error enviando paquete a %s (%s): %m" -#: src/net.c:743 +#: src/net.c:633 #, fuzzy, c-format msgid "Reading RSA public key file `%s' failed: %m" msgstr "Error recibiendo paquete: %m" -#: src/net.c:753 +#: src/net.c:643 #, c-format msgid "No public key for %s specified!" msgstr "" -#: src/net.c:778 +#: src/net.c:668 #, fuzzy, c-format msgid "Error reading RSA private key file `%s': %m" msgstr "Error enviando paquete a %s (%s): %m" -#: src/net.c:786 +#: src/net.c:676 #, c-format msgid "Reading RSA private key file `%s' failed: %m" msgstr "" -#: src/net.c:793 +#: src/net.c:683 #, fuzzy msgid "No private key for tinc daemon specified!" msgstr "¡Se requiere un nombre para el demonio tinc!" -#: src/net.c:817 +#: src/net.c:707 msgid "Name for tinc daemon required!" msgstr "¡Se requiere un nombre para el demonio tinc!" -#: src/net.c:825 +#: src/net.c:715 msgid "Invalid name for myself!" msgstr "¡Nombre no válido para mí!" -#: src/net.c:834 +#: src/net.c:724 msgid "Cannot open host configuration file for myself!" msgstr "¡No puedo abrir el fichero de configuración de `host' para mí!" -#: src/net.c:875 +#: src/net.c:765 msgid "Network address and subnet mask do not match!" msgstr "" -#: src/net.c:884 +#: src/net.c:774 #, fuzzy msgid "Unable to set up a listening TCP socket!" msgstr "¡No puedo configurar un `socket' a la escucha!" -#: src/net.c:890 +#: src/net.c:780 #, fuzzy msgid "Unable to set up a listening UDP socket!" msgstr "¡No puedo configurar un `socket' a la escucha!" -#: src/net.c:914 +#: src/net.c:804 #, c-format msgid "Ready: listening on port %hd" msgstr "Listo: escuchando en el puerto %hd" -#: src/net.c:946 +#: src/net.c:836 #, 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:997 +#: src/net.c:887 #, 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:1047 +#: src/net.c:937 #, c-format msgid "Opening UDP socket to %s" msgstr "Abriendo `socket' UDP a %s" -#: src/net.c:1052 +#: src/net.c:942 #, c-format msgid "Creating UDP socket failed: %m" msgstr "Error al crear el `socket' UDP: %m" -#: src/net.c:1092 +#: src/net.c:982 #, c-format msgid "Connecting to %s port %d failed: %m" msgstr "Error al conectar a %s puerto %d: %m" -#: src/net.c:1142 +#: src/net.c:1032 #, c-format msgid "Connection from %s port %d" msgstr "Conexión desde %s puerto %d" -#: src/net.c:1190 +#: src/net.c:1080 #, c-format msgid "This is a bug: %s:%d: %d:%m" msgstr "Esto es un `bug': %s:%d: %d:%m" -#: src/net.c:1196 +#: src/net.c:1086 #, c-format msgid "Incoming data socket error: %s" msgstr "Error en el `socket' de recepción de datos: %s" -#: src/net.c:1202 +#: src/net.c:1092 #, c-format msgid "Receiving packet failed: %m" msgstr "Error recibiendo paquete: %m" -#: src/net.c:1210 +#: src/net.c:1100 #, c-format msgid "Received UDP packets on port %hd from unknown source %x:%hd" msgstr "" -#: src/net.c:1216 +#: src/net.c:1106 #, 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 +#: src/net.c:1130 #, c-format msgid "Closing connection with %s (%s)" msgstr "Cerrando conexión con %s (%s)" -#: src/net.c:1285 +#: src/net.c:1175 msgid "Trying to re-establish outgoing connection in 5 seconds" msgstr "Intento re-establecer la conexión saliente en 5 segundos." -#: src/net.c:1320 +#: src/net.c:1210 #, c-format msgid "%s (%s) didn't respond to PING" msgstr "%s (%s) no respondió al PING" -#: src/net.c:1347 +#: src/net.c:1237 #, c-format msgid "Accepting a new connection failed: %m" msgstr "Error al aceptar una nueva conexión: %m" -#: src/net.c:1355 +#: src/net.c:1245 msgid "Closed attempted connection" msgstr "Se ha cerrado la conexión que se intentaba realizar." -#: src/net.c:1410 +#: src/net.c:1300 #, fuzzy, c-format msgid "Error while reading from tun/tap device: %m" msgstr "Error leyendo del dispositivo tap: %m" -#: src/net.c:1419 +#: src/net.c:1309 #, fuzzy, c-format msgid "Error while reading from ethertap device: %m" msgstr "Error leyendo del dispositivo tap: %m" -#: src/net.c:1430 +#: src/net.c:1320 msgid "Received short packet from tap device" msgstr "" -#: src/net.c:1436 +#: src/net.c:1326 #, c-format msgid "Read packet of length %d from tap device" msgstr "" -#: src/net.c:1468 +#: src/net.c:1358 #, c-format msgid "Error while waiting for input: %m" msgstr "Error esperando entrada: %m" -#: src/net.c:1475 +#: src/net.c:1365 #, 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 +#: src/net.c:1372 #, 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 +#: src/net.c:1398 #, fuzzy msgid "Regenerating symmetric key" msgstr "Generando claves de %d bits" -#: src/netutl.c:115 +#: src/netutl.c:95 #, c-format msgid "Error looking up `%s': %s\n" msgstr "Error buscando `%s': %s\n" -#: src/protocol.c:101 +#: src/protocol.c:102 #, 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:108 +#: src/protocol.c:109 #, c-format msgid "Sending %s to %s (%s)" msgstr "Enviando %s a %s (%s)" -#: src/protocol.c:122 +#: src/protocol.c:123 #, c-format msgid "Unknown request from %s (%s)" msgstr "Petición desconocida desde %s (%s)" -#: src/protocol.c:129 +#: src/protocol.c:130 #, c-format msgid "Got %s from %s (%s)" msgstr "He recibido %s desde %s (%s)" -#: src/protocol.c:135 +#: src/protocol.c:136 #, fuzzy, c-format msgid "Unauthorized request from %s (%s)" msgstr "Petición desconocida desde %s (%s)" -#: src/protocol.c:142 +#: src/protocol.c:143 #, c-format msgid "Error while processing %s from %s (%s)" msgstr "Error al procesar %s desde %s (%s)" -#: src/protocol.c:149 +#: src/protocol.c:150 #, c-format msgid "Bogus data received from %s (%s)" msgstr "Se han recibido datos sin sentido desde %s (%s)." -#: src/protocol.c:203 +#: src/protocol.c:204 #, c-format msgid "Got bad ID from %s" msgstr "Recibí una ID incorrecta desde %s" -#: src/protocol.c:211 +#: src/protocol.c:212 #, 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:220 +#: src/protocol.c:221 #, 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:232 +#: src/protocol.c:233 #, c-format msgid "Peer %s had unknown identity (%s)" msgstr "La máquina remota %s tiene una identidad desconocida (%s)" -#: src/protocol.c:246 +#: src/protocol.c:247 #, 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:299 +#: src/protocol.c:300 #, c-format msgid "Generated random challenge (unencrypted): %s" msgstr "" -#: src/protocol.c:306 src/protocol.c:359 +#: src/protocol.c:307 src/protocol.c:360 #, 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 +#: src/protocol.c:333 #, c-format msgid "Got bad CHALLENGE from %s (%s)" msgstr "Recibí CHALLENGE incorrecta desde %s (%s)" -#: src/protocol.c:342 +#: src/protocol.c:343 #, c-format msgid "Intruder: wrong challenge length from %s (%s)" msgstr "Intruso: longitud de desafío incorrecta desde %s (%s)" -#: src/protocol.c:367 +#: src/protocol.c:368 #, c-format msgid "Received random challenge (unencrypted): %s" msgstr "" -#: src/protocol.c:381 +#: src/protocol.c:382 #, 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:412 +#: src/protocol.c:413 #, c-format msgid "Got bad CHAL_REPLY from %s (%s)" msgstr "Recibí CHAL_REPLY incorrecta desde %s (%s)" -#: src/protocol.c:420 +#: src/protocol.c:421 #, 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:436 +#: src/protocol.c:437 #, c-format msgid "Intruder: wrong challenge reply from %s (%s)" msgstr "Intruso: respuesta de desafío incorrecta desde %s (%s)" -#: src/protocol.c:441 +#: src/protocol.c:442 #, c-format msgid "Expected challenge reply: %s" msgstr "" -#: src/protocol.c:485 +#: src/protocol.c:486 #, c-format msgid "Generated random meta key (unencrypted): %s" msgstr "" -#: src/protocol.c:492 src/protocol.c:554 +#: src/protocol.c:493 src/protocol.c:555 #, 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 +#: src/protocol.c:525 #, fuzzy, c-format msgid "Got bad METAKEY from %s (%s)" msgstr "Recibí REQ_KEY incorrecta desde %s (%s)" -#: src/protocol.c:534 +#: src/protocol.c:535 #, 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 +#: src/protocol.c:563 #, c-format msgid "Received random meta key (unencrypted): %s" msgstr "" -#: src/protocol.c:601 +#: src/protocol.c:602 #, 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:617 +#: src/protocol.c:618 #, c-format msgid "Connection with %s (%s) activated" msgstr "Activada la conexión con %s (%s)." -#: src/protocol.c:682 +#: src/protocol.c:683 #, c-format msgid "Got bad ADD_SUBNET from %s (%s)" msgstr "Recibí ADD_SUBNET incorrecta desde %s (%s)" -#: src/protocol.c:690 +#: src/protocol.c:691 #, 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:698 +#: src/protocol.c:699 #, 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:706 +#: src/protocol.c:707 #, 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:716 +#: src/protocol.c:717 #, 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:759 +#: src/protocol.c:760 #, c-format msgid "Got bad DEL_SUBNET from %s (%s)" msgstr "Recibí DEL_SUBNET incorrecta desde %s (%s)" -#: src/protocol.c:767 +#: src/protocol.c:768 #, 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:775 +#: src/protocol.c:776 #, 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:785 +#: src/protocol.c:786 #, 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:795 +#: src/protocol.c:796 #, 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:835 +#: src/protocol.c:836 #, c-format msgid "Got bad ADD_HOST from %s (%s)" msgstr "Recibí ADD_HOST incorrecta desde %s (%s)" -#: src/protocol.c:843 +#: src/protocol.c:844 #, 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:852 +#: src/protocol.c:853 #, 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:869 +#: src/protocol.c:870 #, 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:877 +#: src/protocol.c:878 #, 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:927 +#: src/protocol.c:928 #, c-format msgid "Got bad DEL_HOST from %s (%s)" msgstr "Recibí DEL_HOST incorrecta desde %s (%s)" -#: src/protocol.c:936 +#: src/protocol.c:937 #, 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:944 +#: src/protocol.c:945 #, 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:954 +#: src/protocol.c:955 #, 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:963 +#: src/protocol.c:964 #, 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:1002 +#: src/protocol.c:1003 #, c-format msgid "Got bad STATUS from %s (%s)" msgstr "Recibí STATUS incorrecta desde %s (%s)" -#: src/protocol.c:1009 +#: src/protocol.c:1010 #, c-format msgid "Status message from %s (%s): %s: %s" msgstr "Mensaje de status desde %s (%s): %s: %s" -#: src/protocol.c:1032 +#: src/protocol.c:1033 #, c-format msgid "Got bad ERROR from %s (%s)" msgstr "Recibí ERROR incorrecta desde %s (%s)" -#: src/protocol.c:1039 +#: src/protocol.c:1040 #, c-format msgid "Error message from %s (%s): %s: %s" msgstr "Mensaje de error desde %s (%s): %s: %s" -#: src/protocol.c:1117 +#: src/protocol.c:1118 #, c-format msgid "Got bad KEY_CHANGED from %s (%s)" msgstr "Recibí KEY_CHANGED incorrecto desde %s (%s)" -#: src/protocol.c:1124 +#: src/protocol.c:1125 #, c-format msgid "" "Got KEY_CHANGED from %s (%s) origin %s which does not exist in our " @@ -763,12 +770,12 @@ msgstr "" "Recibí KEY_CHANGED desde %s (%s) origen %s que no está en nuestra lista de " "conexiones" -#: src/protocol.c:1153 +#: src/protocol.c:1154 #, c-format msgid "Got bad REQ_KEY from %s (%s)" msgstr "Recibí REQ_KEY incorrecta desde %s (%s)" -#: src/protocol.c:1160 +#: src/protocol.c:1161 #, c-format msgid "" "Got REQ_KEY from %s (%s) origin %s which does not exist in our connection " @@ -777,7 +784,7 @@ msgstr "" "Recibí REQ_KEY desde %s (%s) origen %s que no está en nuestra lista de " "conexiones" -#: src/protocol.c:1177 +#: src/protocol.c:1178 #, c-format msgid "" "Got REQ_KEY from %s (%s) destination %s which does not exist in our " @@ -786,12 +793,12 @@ msgstr "" "Recibí REQ_KEY desde %s (%s) destino %s que no está en nuestra lista de " "conexiones" -#: src/protocol.c:1213 +#: src/protocol.c:1214 #, c-format msgid "Got bad ANS_KEY from %s (%s)" msgstr "Recibí ANS_KEY incorrecta desde %s (%s)" -#: src/protocol.c:1220 +#: src/protocol.c:1221 #, c-format msgid "" "Got ANS_KEY from %s (%s) origin %s which does not exist in our connection " @@ -800,12 +807,12 @@ msgstr "" "Recibí ANS_KEY desde %s (%s) origen %s que no está en nuestra lista de " "conexiones" -#: src/protocol.c:1231 +#: src/protocol.c:1232 #, 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:1242 +#: src/protocol.c:1243 #, c-format msgid "" "Got ANS_KEY from %s (%s) destination %s which does not exist in our " @@ -820,7 +827,7 @@ 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 +#: src/subnet.c:251 src/tincd.c:300 msgid "unknown" msgstr "desconocido" @@ -884,41 +891,42 @@ msgid "" "Invalid argument `%s'; BITS must be a number equal to or greater than 512.\n" msgstr "" -#: src/tincd.c:233 +#: src/tincd.c:234 #, c-format msgid "Generating %d bits keys:\n" msgstr "Generando claves de %d bits:\n" -#: src/tincd.c:237 +#: src/tincd.c:239 msgid "Error during key generation!" msgstr "" -#: src/tincd.c:241 +#: src/tincd.c:243 msgid "Done.\n" msgstr "Hecho.\n" -#: src/tincd.c:243 +#: src/tincd.c:246 #, fuzzy msgid "public RSA key" msgstr "Clave pública: %s\n" -#: src/tincd.c:248 +#: src/tincd.c:253 #, fuzzy msgid "private RSA key" msgstr "Clave privada: %s\n" -#: src/tincd.c:268 -msgid "Both netname and configuration directory given, using the latter...\n" +#: src/tincd.c:274 +msgid "Both netname and configuration directory given, using the latter..." msgstr "" -#: src/tincd.c:303 +#: src/tincd.c:307 #, 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:304 +#: src/tincd.c:308 +#, fuzzy msgid "" -"Copyright (C) 1998,1999,2000 Ivo Timmermans, Guus Sliepen and others.\n" +"Copyright (C) 1998-2001 Ivo Timmermans, Guus Sliepen and others.\n" "See the AUTHORS file for a complete list.\n" "\n" "tinc comes with ABSOLUTELY NO WARRANTY. This is free software,\n" @@ -932,25 +940,32 @@ msgstr "" "y puede ser redistribuido bajo ciertas condiciones;\n" "vea el fichero COPYING para los detalles.\n" -#: src/tincd.c:318 -msgid "You must be root to run this program. Sorry.\n" +#: src/tincd.c:322 +#, 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:353 +#: src/tincd.c:359 msgid "Unrecoverable error" msgstr "Error irrecuperable" -#: src/tincd.c:358 +#: src/tincd.c:364 #, c-format msgid "Restarting in %d seconds!" msgstr "¡Reiniciando en %d segundos!" -#: src/tincd.c:363 +#: src/tincd.c:369 #, fuzzy msgid "Not restarting." msgstr "¡Aayyy! No reinicio." +#~ msgid "Queue flushed" +#~ msgstr "Cola vaciada" + +#~ msgid "Flushing receive queue for %s (%s)" +#~ msgstr "Vaciando la cola de recepción para %s (%s)" + #~ msgid "%s: option `%s' is ambiguous\n" #~ msgstr "%s: la opción `%s' es ambigua\n" @@ -1015,13 +1030,6 @@ msgstr " #~ 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" diff --git a/po/nl.po b/po/nl.po index 1b4de07b..cdede32b 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,11 +1,11 @@ # Dutch messages for tinc -# Copyright (C) 1999, 2000 Ivo Timmermans, Guus Sliepen. -# Ivo Timmermans , 1999, 2000. -# Guus Sliepen , 2000. +# Copyright (C) 1999-2001 Ivo Timmermans, Guus Sliepen. +# Ivo Timmermans , 1999-2001. +# Guus Sliepen , 2000,2001. msgid "" msgstr "" "Project-Id-Version: tinc 1.0pre4\n" -"POT-Creation-Date: 2001-01-06 17:41+0100\n" +"POT-Creation-Date: 2001-01-07 18:02+0100\n" "PO-Revision-Date: 2000-05-31 20:14+02:00\n" "Last-Translator: Ivo Timmermans \n" "Language-Team: Dutch \n" @@ -44,49 +44,54 @@ msgstr "" 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 +#: src/conf.c:375 #, c-format msgid "`%s' is not an absolute path" msgstr "`%s' is geen absoluut pad" -#: src/conf.c:390 src/conf.c:412 +#: src/conf.c:391 src/conf.c:424 +#, c-format +msgid "Couldn't stat `%s': %m" +msgstr "Kon `%s' niet statten: %m" + +#: src/conf.c:398 src/conf.c:434 #, 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 +#: src/conf.c:405 src/conf.c:441 #, c-format msgid "Warning: `%s' is a symlink" msgstr "Waarschuwing: `%s' is een symbolische link" +#: src/conf.c:410 src/conf.c:446 +#, c-format +msgid "Unable to read symbolic link `%s': %m" +msgstr "Kan symbolische link `%s' niet lezen: %m" + #. Accessible by others -#: src/conf.c:425 +#: src/conf.c:457 #, c-format msgid "`%s' has unsecure permissions" msgstr "`%s' heeft onveilige permissies" #. Ask for a file and/or directory name. -#: src/conf.c:451 +#: src/conf.c:482 #, 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:457 +#: src/conf.c:488 #, c-format msgid "Error while reading stdin: %m\n" msgstr "Fout tijdens lezen van standaardinvoer: %m\n" -#: src/conf.c:496 +#: src/conf.c:514 #, c-format msgid "Error opening file `%s': %m\n" msgstr "Fout bij het openen van het bestand `%s': %m\n" -#: src/conf.c:506 +#: src/conf.c:524 #, c-format msgid "" "The file `%s' (or any of the leading directories) has unsafe permissions.\n" @@ -119,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" -#: src/meta.c:100 src/net.c:1101 +#: src/meta.c:100 src/net.c:991 #, c-format msgid "This is a bug: %s:%d: %d:%m %s (%s)" msgstr "Dit is een programmeerfout: %s:%d: %d:%m %s (%s)" @@ -174,577 +179,579 @@ msgstr "Kan niet naar tun/tap apparaat schrijven: %m" msgid "Can't write to ethertap device: %m" msgstr "Kan niet naar ethertap apparaat schrijven: %m" -#: src/net.c:286 -msgid "Queue flushed" -msgstr "Wachtrij leeggemaakt" +#: src/net.c:205 +#, 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:301 +#: src/net.c:218 #, c-format -msgid "Flushing send queue for %s (%s)" -msgstr "Legen van verzend-wachtrij voor %s (%s)" +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:309 +#: src/net.c:228 #, c-format -msgid "Flushing receive queue for %s (%s)" -msgstr "Legen van de ontvangst-wachtrij voor %s (%s)" +msgid "%s (%s) is not active, dropping packet" +msgstr "%s (%s) is niet actief, pakket wordt genegeerd" -#: src/net.c:328 +#: src/net.c:241 #, 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 "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:341 +#: src/net.c:261 #, 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!" +msgid "Flushing queue for %s (%s)" +msgstr "Legen van wachtrij voor %s (%s)" -#: src/net.c:417 +#: src/net.c:307 #, c-format msgid "Could not open %s: %m" msgstr "Kon %s niet openen: %m" -#: src/net.c:446 +#: src/net.c:336 #, c-format msgid "%s is a new style tun/tap device" msgstr "%s is een nieuwe stijl tun/tap apparaat" -#: src/net.c:471 +#: src/net.c:361 #, c-format msgid "Creating metasocket failed: %m" msgstr "Aanmaak van metasocket mislukt: %m" -#: 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 +#: src/net.c:368 src/net.c:376 src/net.c:385 src/net.c:419 src/net.c:447 +#: src/net.c:456 src/net.c:510 src/net.c:949 src/net.c:958 src/net.c:1016 #, c-format msgid "System call `%s' failed: %m" msgstr "Systeemaanroep `%s' mislukte: %m" -#: src/net.c:505 +#: src/net.c:395 #, c-format msgid "Unable to bind listen socket to interface %s: %m" msgstr "Kon luistersocket niet binden aan interface %s: %m" -#: src/net.c:522 +#: src/net.c:412 #, c-format msgid "Can't bind to port %hd/tcp: %m" msgstr "Kan niet aan poort %hd/tcp binden: %m" -#: src/net.c:550 +#: src/net.c:440 #, c-format msgid "Creating socket failed: %m" msgstr "Aanmaak socket mislukte: %m" -#: src/net.c:579 src/net.c:1081 +#: src/net.c:469 src/net.c:971 #, c-format msgid "Can't bind to port %hd/udp: %m" msgstr "Kan niet aan poort %hd/udp binden: %m" -#: src/net.c:596 +#: src/net.c:486 #, c-format msgid "Trying to connect to %s" msgstr "Poging tot verbinding met %s" -#: src/net.c:606 +#: src/net.c:496 #, c-format msgid "Creating socket for %s port %d failed: %m" msgstr "Aanmaken socket voor %s poort %d mislukt: %m" -#: src/net.c:631 +#: src/net.c:521 #, c-format msgid "%s port %hd: %m" msgstr "%s poort %hd: %m" -#: src/net.c:639 +#: src/net.c:529 #, c-format msgid "fcntl for %s port %d: %m" msgstr "fcntl voor %s poort %d: %m" -#: src/net.c:645 +#: src/net.c:535 #, c-format msgid "Connected to %s port %hd" msgstr "Verbonden met %s poort %hd" -#: src/net.c:664 +#: src/net.c:554 msgid "Invalid name for outgoing connection" msgstr "Ongelige naam voor uitgaande verbinding" -#: src/net.c:673 +#: src/net.c:563 #, c-format msgid "Error reading host configuration file for %s" msgstr "Fout tijdens lezen host configuratie bestand voor %s" -#: src/net.c:680 +#: src/net.c:570 #, c-format msgid "No address specified for %s" msgstr "Geen adres gespecificeerd voor %s" -#: src/net.c:687 +#: src/net.c:577 #, c-format msgid "Error looking up `%s': %m" msgstr "Fout bij het opzoeken van `%s': %m" -#: src/net.c:697 +#: src/net.c:587 #, c-format msgid "Could not set up a meta connection to %s" msgstr "Kon geen metaverbinding aangaan met %s" -#: src/net.c:735 +#: src/net.c:625 #, 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 +#: src/net.c:633 #, c-format msgid "Reading RSA public key file `%s' failed: %m" msgstr "Lezen RSA publieke sleutel bestand `%s' mislukt: %m" -#: src/net.c:753 +#: src/net.c:643 #, c-format msgid "No public key for %s specified!" msgstr "Geen publieke sleutel bekend voor %s gespecificeerd!" -#: src/net.c:778 +#: src/net.c:668 #, 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 +#: src/net.c:676 #, 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 +#: src/net.c:683 msgid "No private key for tinc daemon specified!" msgstr "Geen privé sleutel voor tinc daemon gespecificeerd!" -#: src/net.c:817 +#: src/net.c:707 msgid "Name for tinc daemon required!" msgstr "Naam voor tinc daemon verplicht!" -#: src/net.c:825 +#: src/net.c:715 msgid "Invalid name for myself!" msgstr "Ongelige naam voor mijzelf!" -#: src/net.c:834 +#: src/net.c:724 msgid "Cannot open host configuration file for myself!" msgstr "Kan host configuratie bestand voor mijzelf niet openen!" -#: src/net.c:875 +#: src/net.c:765 msgid "Network address and subnet mask do not match!" msgstr "Netwerk adres en subnet masker komen niet overeen!" -#: src/net.c:884 +#: src/net.c:774 msgid "Unable to set up a listening TCP socket!" msgstr "Kon geen TCP luistersocket aanmaken!" -#: src/net.c:890 +#: src/net.c:780 msgid "Unable to set up a listening UDP socket!" msgstr "Kon geen UDP luistersocket aanmaken!" -#: src/net.c:914 +#: src/net.c:804 #, c-format msgid "Ready: listening on port %hd" msgstr "Gereed: luisterend op poort %hd" -#: src/net.c:946 +#: src/net.c:836 #, 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:997 +#: src/net.c:887 #, 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:1047 +#: src/net.c:937 #, c-format msgid "Opening UDP socket to %s" msgstr "Bezig met openen UDP socket naar %s" -#: src/net.c:1052 +#: src/net.c:942 #, c-format msgid "Creating UDP socket failed: %m" msgstr "Aanmaak UDP socket mislukte: %m" -#: src/net.c:1092 +#: src/net.c:982 #, c-format msgid "Connecting to %s port %d failed: %m" msgstr "Verbinding naar %s poort %d mislukt: %m" -#: src/net.c:1142 +#: src/net.c:1032 #, c-format msgid "Connection from %s port %d" msgstr "Verbinding van %s poort %d" -#: src/net.c:1190 +#: src/net.c:1080 #, c-format msgid "This is a bug: %s:%d: %d:%m" msgstr "Dit is een programmeerfout: %s:%d: %d:%m" -#: src/net.c:1196 +#: src/net.c:1086 #, c-format msgid "Incoming data socket error: %s" msgstr "Fout op socket voor inkomend verkeer: %s" -#: src/net.c:1202 +#: src/net.c:1092 #, c-format msgid "Receiving packet failed: %m" msgstr "Ontvangst pakket mislukt: %m" -#: src/net.c:1210 +#: src/net.c:1100 #, 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:1216 +#: src/net.c:1106 #, c-format msgid "Received packet of %d bytes from %s (%s)" msgstr "Ontvangst pakket van %d bytes van %s (%s)" -#: src/net.c:1240 +#: src/net.c:1130 #, c-format msgid "Closing connection with %s (%s)" msgstr "Beëindigen verbinding met %s (%s)" -#: src/net.c:1285 +#: src/net.c:1175 msgid "Trying to re-establish outgoing connection in 5 seconds" msgstr "Poging tot herstellen van uitgaande verbinding over 5 seconden" -#: src/net.c:1320 +#: src/net.c:1210 #, c-format msgid "%s (%s) didn't respond to PING" msgstr "%s (%s) antwoordde niet op ping" -#: src/net.c:1347 +#: src/net.c:1237 #, c-format msgid "Accepting a new connection failed: %m" msgstr "Aanname van nieuwe verbinding is mislukt: %m" -#: src/net.c:1355 +#: src/net.c:1245 msgid "Closed attempted connection" msgstr "Aangenomen verbinding verbroken" -#: src/net.c:1410 +#: src/net.c:1300 #, c-format msgid "Error while reading from tun/tap device: %m" msgstr "Fout tijdens lezen van tun/tap apparaat: %m" -#: src/net.c:1419 +#: src/net.c:1309 #, c-format msgid "Error while reading from ethertap device: %m" msgstr "Fout tijdens lezen van ethertap apparaat: %m" -#: src/net.c:1430 +#: src/net.c:1320 msgid "Received short packet from tap device" msgstr "Kort pakket ontvangen van tap apparaat" -#: src/net.c:1436 +#: src/net.c:1326 #, c-format msgid "Read packet of length %d from tap device" msgstr "Pakket gelezen van lengte %d van tap apparaat" -#: src/net.c:1468 +#: src/net.c:1358 #, c-format msgid "Error while waiting for input: %m" msgstr "Fout tijdens wachten op invoer: %m" -#: src/net.c:1475 +#: src/net.c:1365 msgid "Rereading configuration file and restarting in 5 seconds" msgstr "Herlezen configuratiebestand en herstart in 5 seconden" -#: src/net.c:1482 +#: src/net.c:1372 msgid "Unable to reread configuration file, exiting" msgstr "Kan configuratiebestand niet herlezen, beëindigen" -#: src/net.c:1508 +#: src/net.c:1398 msgid "Regenerating symmetric key" msgstr "Hergenereren symmetrische sleutel" -#: src/netutl.c:115 +#: src/netutl.c:95 #, c-format msgid "Error looking up `%s': %s\n" msgstr "Fout bij het opzoeken van `%s': %s\n" -#: src/protocol.c:101 +#: src/protocol.c:102 #, 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:108 +#: src/protocol.c:109 #, c-format msgid "Sending %s to %s (%s)" msgstr "Verzending %s naar %s (%s)" -#: src/protocol.c:122 +#: src/protocol.c:123 #, c-format msgid "Unknown request from %s (%s)" msgstr "Onbekend verzoek van %s (%s)" -#: src/protocol.c:129 +#: src/protocol.c:130 #, c-format msgid "Got %s from %s (%s)" msgstr "Kreeg %s van %s (%s)" -#: src/protocol.c:135 +#: src/protocol.c:136 #, c-format msgid "Unauthorized request from %s (%s)" msgstr "Niet toegestaan verzoek van %s (%s)" -#: src/protocol.c:142 +#: src/protocol.c:143 #, c-format msgid "Error while processing %s from %s (%s)" msgstr "Fout tijdens afhandelen %s van %s (%s)" -#: src/protocol.c:149 +#: src/protocol.c:150 #, c-format msgid "Bogus data received from %s (%s)" msgstr "Onzinnige data ontvangen van %s (%s)" -#: src/protocol.c:203 +#: src/protocol.c:204 #, c-format msgid "Got bad ID from %s" msgstr "Kreeg ongeldige ID van %s" -#: src/protocol.c:211 +#: src/protocol.c:212 #, c-format msgid "Peer %s (%s) uses incompatible version %d" msgstr "Ander %s (%s) gebruikt een niet-compatibel protocol versie %d" -#: src/protocol.c:220 +#: src/protocol.c:221 #, c-format msgid "Peer %s uses invalid identity name" msgstr "Ander %s gebruikt een ongeldige identiteitsnaam" -#: src/protocol.c:232 +#: src/protocol.c:233 #, c-format msgid "Peer %s had unknown identity (%s)" msgstr "Ander %s heeft een onbekende identiteit (%s)" -#: src/protocol.c:246 +#: src/protocol.c:247 #, c-format msgid "Uplink %s (%s) is already in our connection list" msgstr "%s (%s) staat al in onze verbindingslijst" -#: src/protocol.c:299 +#: src/protocol.c:300 #, c-format msgid "Generated random challenge (unencrypted): %s" msgstr "Uitdaging gegenereerd (niet versleuteld): %s" -#: src/protocol.c:306 src/protocol.c:359 +#: src/protocol.c:307 src/protocol.c:360 #, c-format msgid "Error during encryption of challenge for %s (%s)" msgstr "Fout tijdens versleuteling van uitdaging voor %s (%s)" -#: src/protocol.c:332 +#: src/protocol.c:333 #, c-format msgid "Got bad CHALLENGE from %s (%s)" msgstr "Kreeg ongeldige CHALLENGE van %s (%s)" -#: src/protocol.c:342 +#: src/protocol.c:343 #, c-format msgid "Intruder: wrong challenge length from %s (%s)" msgstr "Indringer: verkeerde lengte voor uitdaging van %s (%s)" -#: src/protocol.c:367 +#: src/protocol.c:368 #, c-format msgid "Received random challenge (unencrypted): %s" msgstr "Uitdaging ontvangen (niet versleuteld): %s" -#: src/protocol.c:381 +#: src/protocol.c:382 #, 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:412 +#: src/protocol.c:413 #, c-format msgid "Got bad CHAL_REPLY from %s (%s)" msgstr "Kreeg ongeldige CHAL_REPLY van %s (%s)" -#: src/protocol.c:420 +#: src/protocol.c:421 #, 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:436 +#: src/protocol.c:437 #, c-format msgid "Intruder: wrong challenge reply from %s (%s)" msgstr "Indringer: verkeerd antwoord op de uitdaging van %s (%s)" -#: src/protocol.c:441 +#: src/protocol.c:442 #, c-format msgid "Expected challenge reply: %s" msgstr "Verwacht antwoord op uitdaging: %s" -#: src/protocol.c:485 +#: src/protocol.c:486 #, c-format msgid "Generated random meta key (unencrypted): %s" msgstr "Meta sleutel gegenereerd (niet versleuteld): %s" -#: src/protocol.c:492 src/protocol.c:554 +#: src/protocol.c:493 src/protocol.c:555 #, 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:524 +#: src/protocol.c:525 #, c-format msgid "Got bad METAKEY from %s (%s)" msgstr "Kreeg ongeldige METAKEY van %s (%s)" -#: src/protocol.c:534 +#: src/protocol.c:535 #, c-format msgid "Intruder: wrong meta key length from %s (%s)" msgstr "Indringer: verkeerde lengte voor meta sleutel van %s (%s)" -#: src/protocol.c:562 +#: src/protocol.c:563 #, c-format msgid "Received random meta key (unencrypted): %s" msgstr "Meta sleutel ontvangen (niet versleuteld): %s" -#: src/protocol.c:601 +#: src/protocol.c:602 #, 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:617 +#: src/protocol.c:618 #, c-format msgid "Connection with %s (%s) activated" msgstr "Verbinding met %s (%s) geactiveerd" -#: src/protocol.c:682 +#: src/protocol.c:683 #, c-format msgid "Got bad ADD_SUBNET from %s (%s)" msgstr "Kreeg ongeldige ADD_SUBNET van %s (%s)" -#: src/protocol.c:690 +#: src/protocol.c:691 #, 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:698 +#: src/protocol.c:699 #, 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:706 +#: src/protocol.c:707 #, 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:716 +#: src/protocol.c:717 #, 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:759 +#: src/protocol.c:760 #, c-format msgid "Got bad DEL_SUBNET from %s (%s)" msgstr "Kreeg ongeldige DEL_SUBNET van %s (%s)" -#: src/protocol.c:767 +#: src/protocol.c:768 #, 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:775 +#: src/protocol.c:776 #, 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:785 +#: src/protocol.c:786 #, 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:795 +#: src/protocol.c:796 #, 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:835 +#: src/protocol.c:836 #, c-format msgid "Got bad ADD_HOST from %s (%s)" msgstr "Kreeg ongeldige ADD_HOST van %s (%s)" -#: src/protocol.c:843 +#: src/protocol.c:844 #, 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:852 +#: src/protocol.c:853 #, 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:869 +#: src/protocol.c:870 #, 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:877 +#: src/protocol.c:878 #, 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:927 +#: src/protocol.c:928 #, c-format msgid "Got bad DEL_HOST from %s (%s)" msgstr "Kreeg ongeldige DEL_HOST van %s (%s)" -#: src/protocol.c:936 +#: src/protocol.c:937 #, 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:944 +#: src/protocol.c:945 #, 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:954 +#: src/protocol.c:955 #, 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:963 +#: src/protocol.c:964 #, 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:1002 +#: src/protocol.c:1003 #, c-format msgid "Got bad STATUS from %s (%s)" msgstr "Kreeg ongeldige STATUS van %s (%s)" -#: src/protocol.c:1009 +#: src/protocol.c:1010 #, c-format msgid "Status message from %s (%s): %s: %s" msgstr "Ontving statusbericht van %s (%s): %s: %s" -#: src/protocol.c:1032 +#: src/protocol.c:1033 #, c-format msgid "Got bad ERROR from %s (%s)" msgstr "Kreeg ongeldige ERROR van %s (%s)" -#: src/protocol.c:1039 +#: src/protocol.c:1040 #, c-format msgid "Error message from %s (%s): %s: %s" msgstr "Ontving foutmelding van %s (%s): %s: %s" -#: src/protocol.c:1117 +#: src/protocol.c:1118 #, c-format msgid "Got bad KEY_CHANGED from %s (%s)" msgstr "Kreeg ongeldige KEY_CHANGED van %s (%s)" -#: src/protocol.c:1124 +#: src/protocol.c:1125 #, c-format msgid "" "Got KEY_CHANGED from %s (%s) origin %s which does not exist in our " @@ -753,12 +760,12 @@ msgstr "" "Kreeg KEY_CHANGED van %s (%s) herkomst %s die niet in onze verbindingslijst " "voorkomt" -#: src/protocol.c:1153 +#: src/protocol.c:1154 #, c-format msgid "Got bad REQ_KEY from %s (%s)" msgstr "Kreeg ongeldige REQ_KEY van %s (%s)" -#: src/protocol.c:1160 +#: src/protocol.c:1161 #, c-format msgid "" "Got REQ_KEY from %s (%s) origin %s which does not exist in our connection " @@ -767,7 +774,7 @@ msgstr "" "Kreeg REQ_KEY van %s (%s) herkomst %s die niet in onze verbindingslijst " "voorkomt" -#: src/protocol.c:1177 +#: src/protocol.c:1178 #, c-format msgid "" "Got REQ_KEY from %s (%s) destination %s which does not exist in our " @@ -775,12 +782,12 @@ msgid "" msgstr "" "Kreeg REQ_KEY van %s (%s) doel %s die niet in onze verbindingslijst voorkomt" -#: src/protocol.c:1213 +#: src/protocol.c:1214 #, c-format msgid "Got bad ANS_KEY from %s (%s)" msgstr "Kreeg ongeldige ANS_KEY van %s (%s)" -#: src/protocol.c:1220 +#: src/protocol.c:1221 #, c-format msgid "" "Got ANS_KEY from %s (%s) origin %s which does not exist in our connection " @@ -789,13 +796,13 @@ msgstr "" "Kreeg ANS_KEY van %s (%s) herkomst %s die niet in onze verbindingslijst " "voorkomt" -#: src/protocol.c:1231 +#: src/protocol.c:1232 #, 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:1242 +#: src/protocol.c:1243 #, c-format msgid "" "Got ANS_KEY from %s (%s) destination %s which does not exist in our " @@ -811,7 +818,7 @@ msgstr "" "starten" #. Do some intl stuff right now -#: src/subnet.c:251 src/tincd.c:296 +#: src/subnet.c:251 src/tincd.c:300 msgid "unknown" msgstr "onbekend" @@ -878,47 +885,47 @@ msgstr "" "Ongeldig argument `%s'; BITS moet een nummer zijn gelijk aan of groter dan " "512.\n" -#: src/tincd.c:233 +#: src/tincd.c:234 #, c-format msgid "Generating %d bits keys:\n" msgstr "Bezig met genereren van een %d bits sleutel:\n" -#: src/tincd.c:237 +#: src/tincd.c:239 msgid "Error during key generation!" msgstr "Fout tijdens genereren sleutel!" -#: src/tincd.c:241 +#: src/tincd.c:243 msgid "Done.\n" msgstr "Klaar.\n" -#: src/tincd.c:243 +#: src/tincd.c:246 msgid "public RSA key" msgstr "openbare RSA sleutel" -#: src/tincd.c:248 +#: src/tincd.c:253 msgid "private RSA key" msgstr "geheime RSA sleutel" -#: src/tincd.c:268 -msgid "Both netname and configuration directory given, using the latter...\n" +#: src/tincd.c:274 +msgid "Both netname and configuration directory given, using the latter..." msgstr "" -"Zowel netnaam als configuratiemap zijn gegeven, laatste wordt gebruikt...\n" +"Zowel netnaam als configuratiemap zijn gegeven, laatste wordt gebruikt..." -#: src/tincd.c:303 +#: src/tincd.c:307 #, 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:304 +#: src/tincd.c:308 msgid "" -"Copyright (C) 1998,1999,2000 Ivo Timmermans, Guus Sliepen and others.\n" +"Copyright (C) 1998-2001 Ivo Timmermans, Guus Sliepen and others.\n" "See the AUTHORS file for a complete list.\n" "\n" "tinc comes with ABSOLUTELY NO WARRANTY. This is free software,\n" "and you are welcome to redistribute it under certain conditions;\n" "see the file COPYING for details.\n" msgstr "" -"Copyright (C) 1998,1999,2000 Ivo Timmermans, Guus Sliepen en anderen.\n" +"Copyright (C) 1998-2001 Ivo Timmermans, Guus Sliepen en anderen.\n" "Zie het bestand AUTHORS voor een volledige lijst.\n" "\n" "tinc wordt gedistribueerd ZONDER ENIGE GARANTIE. Dit is vrije " @@ -926,20 +933,19 @@ msgstr "" "en je bent welkom om het te distribueren onder bepaalde voorwaarden;\n" "zie het bestand COPYING voor details.\n" -#: 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" +#: src/tincd.c:322 +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:353 +#: src/tincd.c:359 msgid "Unrecoverable error" msgstr "Onherstelbare fout" -#: src/tincd.c:358 +#: src/tincd.c:364 #, c-format msgid "Restarting in %d seconds!" msgstr "Herstart in %d seconden!" -#: src/tincd.c:363 +#: src/tincd.c:369 msgid "Not restarting." msgstr "Geen herstart." diff --git a/src/conf.c b/src/conf.c index 61f0cf0e..2643785c 100644 --- a/src/conf.c +++ b/src/conf.c @@ -1,9 +1,9 @@ /* conf.c -- configuration code Copyright (C) 1998 Robert van der Meulen - Copyright (C) 1998,1999,2000 Ivo Timmermans - 2000 Guus Sliepen - 2000 Cris van Pelt + 1998-2001 Ivo Timmermans + 2000,2001 Guus Sliepen + 2000 Cris van Pelt This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: conf.c,v 1.9.4.37 2001/01/06 18:03:39 guus Exp $ + $Id: conf.c,v 1.9.4.38 2001/01/07 17:08:55 guus Exp $ */ #include "config.h" diff --git a/src/conf.h b/src/conf.h index 00fbcb19..dce3802f 100644 --- a/src/conf.h +++ b/src/conf.h @@ -1,7 +1,7 @@ /* conf.h -- header for conf.c - Copyright (C) 1998,1999,2000 Ivo Timmermans - 2000 Guus Sliepen + Copyright (C) 1998-2001 Ivo Timmermans + 2000,2001 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: conf.h,v 1.6.4.20 2001/01/05 23:53:49 guus Exp $ + $Id: conf.h,v 1.6.4.21 2001/01/07 17:08:56 guus Exp $ */ #ifndef __TINC_CONF_H__ diff --git a/src/connection.c b/src/connection.c index 08c165e5..1e34329c 100644 --- a/src/connection.c +++ b/src/connection.c @@ -1,7 +1,7 @@ /* connection.c -- connection list management - Copyright (C) 2000 Guus Sliepen , - 2000 Ivo Timmermans + Copyright (C) 2000,2001 Guus Sliepen , + 2000,2001 Ivo Timmermans This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: connection.c,v 1.1.2.8 2001/01/07 15:25:40 guus Exp $ + $Id: connection.c,v 1.1.2.9 2001/01/07 17:08:56 guus Exp $ */ #include "config.h" diff --git a/src/connection.h b/src/connection.h index 7f742e18..06e08ef1 100644 --- a/src/connection.h +++ b/src/connection.h @@ -1,7 +1,7 @@ /* connection.h -- header for connection.c - Copyright (C) 2000 Guus Sliepen , - 2000 Ivo Timmermans + Copyright (C) 2000,2001 Guus Sliepen , + 2000,2001 Ivo Timmermans This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: connection.h,v 1.1.2.5 2001/01/07 15:25:41 guus Exp $ + $Id: connection.h,v 1.1.2.6 2001/01/07 17:08:57 guus Exp $ */ #ifndef __TINC_CONNECTION_H__ diff --git a/src/meta.c b/src/meta.c index 14a3c1d0..fa32b896 100644 --- a/src/meta.c +++ b/src/meta.c @@ -1,7 +1,7 @@ /* meta.c -- handle the meta communication - Copyright (C) 2000 Guus Sliepen , - 2000 Ivo Timmermans + Copyright (C) 2000,2001 Guus Sliepen , + 2000,2001 Ivo Timmermans This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: meta.c,v 1.1.2.13 2001/01/05 23:53:49 guus Exp $ + $Id: meta.c,v 1.1.2.14 2001/01/07 17:08:57 guus Exp $ */ #include "config.h" diff --git a/src/meta.h b/src/meta.h index 09df9028..e0823a82 100644 --- a/src/meta.h +++ b/src/meta.h @@ -1,7 +1,7 @@ /* meta.h -- header for meta.c - Copyright (C) 2000 Guus Sliepen , - 2000 Ivo Timmermans + Copyright (C) 2000,2001 Guus Sliepen , + 2000,2001 Ivo Timmermans This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: meta.h,v 1.1.2.4 2000/11/20 19:12:12 guus Exp $ + $Id: meta.h,v 1.1.2.5 2001/01/07 17:08:58 guus Exp $ */ #ifndef __TINC_META_H__ diff --git a/src/net.c b/src/net.c index f22fd728..54e91391 100644 --- a/src/net.c +++ b/src/net.c @@ -1,7 +1,7 @@ /* net.c -- most of the network code - Copyright (C) 1998,1999,2000 Ivo Timmermans , - 2000 Guus Sliepen + Copyright (C) 1998-2001 Ivo Timmermans , + 2000,2001 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: net.c,v 1.35.4.90 2001/01/07 15:25:41 guus Exp $ + $Id: net.c,v 1.35.4.91 2001/01/07 17:08:58 guus Exp $ */ #include "config.h" diff --git a/src/net.h b/src/net.h index 5a1609cb..ddbd84df 100644 --- a/src/net.h +++ b/src/net.h @@ -1,6 +1,7 @@ /* net.h -- header for net.c - Copyright (C) 1998,1999,2000 Ivo Timmermans + Copyright (C) 1998-2001 Ivo Timmermans + 2000,2001 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: net.h,v 1.9.4.25 2001/01/07 15:25:44 guus Exp $ + $Id: net.h,v 1.9.4.26 2001/01/07 17:09:01 guus Exp $ */ #ifndef __TINC_NET_H__ diff --git a/src/netutl.c b/src/netutl.c index 200f7768..e9f74d08 100644 --- a/src/netutl.c +++ b/src/netutl.c @@ -1,7 +1,7 @@ /* netutl.c -- some supporting network utility code - Copyright (C) 1998,1999,2000 Ivo Timmermans - 2000 Guus Sliepen + Copyright (C) 1998-2001 Ivo Timmermans + 2000,2001 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: netutl.c,v 1.12.4.17 2001/01/07 15:25:44 guus Exp $ + $Id: netutl.c,v 1.12.4.18 2001/01/07 17:09:02 guus Exp $ */ #include "config.h" diff --git a/src/netutl.h b/src/netutl.h index e542792c..bcc84c88 100644 --- a/src/netutl.h +++ b/src/netutl.h @@ -1,6 +1,7 @@ /* netutl.h -- header file for netutl.c - Copyright (C) 1998,1999,2000 Ivo Timmermans + Copyright (C) 1998-2001 Ivo Timmermans + 2000,2001 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: netutl.h,v 1.2.4.5 2000/11/09 21:33:18 zarq Exp $ + $Id: netutl.h,v 1.2.4.6 2001/01/07 17:09:02 guus Exp $ */ #ifndef __TINC_NETUTL_H__ @@ -25,9 +26,7 @@ #include "net.h" #include "conf.h" -extern void destroy_queue(packet_queue_t *); extern char *hostlookup(unsigned long); extern ip_mask_t *strtoip(char*); -extern void destroy_queue(packet_queue_t *); #endif /* __TINC_NETUTL_H__ */ diff --git a/src/process.c b/src/process.c index 22943c22..6158fbab 100644 --- a/src/process.c +++ b/src/process.c @@ -1,7 +1,7 @@ /* process.c -- process management functions - Copyright (C) 1999,2000 Ivo Timmermans , - 2000 Guus Sliepen + Copyright (C) 1999-2001 Ivo Timmermans , + 2000,2001 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: process.c,v 1.1.2.19 2001/01/07 15:25:45 guus Exp $ + $Id: process.c,v 1.1.2.20 2001/01/07 17:09:02 guus Exp $ */ #include "config.h" diff --git a/src/process.h b/src/process.h index 1f3675d6..ed834f0c 100644 --- a/src/process.h +++ b/src/process.h @@ -1,7 +1,7 @@ /* process.h -- header file for process.c - Copyright (C) 1999,2000 Ivo Timmermans , - 2000 Guus Sliepen + Copyright (C) 1999-2001 Ivo Timmermans , + 2000,2001 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: process.h,v 1.1.2.6 2001/01/07 15:25:45 guus Exp $ + $Id: process.h,v 1.1.2.7 2001/01/07 17:09:02 guus Exp $ */ #ifndef __TINC_PROCESS_H__ diff --git a/src/protocol.c b/src/protocol.c index 12d279a4..46c4c7b8 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -1,7 +1,7 @@ /* protocol.c -- handle the meta-protocol - Copyright (C) 1999,2000 Ivo Timmermans , - 2000 Guus Sliepen + Copyright (C) 1999-2001 Ivo Timmermans , + 2000,2001 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: protocol.c,v 1.28.4.73 2001/01/07 15:25:45 guus Exp $ + $Id: protocol.c,v 1.28.4.74 2001/01/07 17:09:02 guus Exp $ */ #include "config.h" diff --git a/src/protocol.h b/src/protocol.h index 3789d804..437f1e29 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -1,7 +1,7 @@ /* protocol.h -- header for protocol.c - Copyright (C) 1999,2000 Ivo Timmermans , - 2000 Guus Sliepen + Copyright (C) 1999-2001 Ivo Timmermans , + 2000,2001 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: protocol.h,v 1.5.4.17 2000/11/22 19:55:53 guus Exp $ + $Id: protocol.h,v 1.5.4.18 2001/01/07 17:09:06 guus Exp $ */ #ifndef __TINC_PROTOCOL_H__ diff --git a/src/route.c b/src/route.c index a11c55ae..43fe523c 100644 --- a/src/route.c +++ b/src/route.c @@ -1,7 +1,7 @@ /* route.c -- routing - Copyright (C) 2000 Ivo Timmermans , - 2000 Guus Sliepen + Copyright (C) 2000,2001 Ivo Timmermans , + 2000,2001 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: route.c,v 1.1.2.5 2001/01/07 15:25:49 guus Exp $ + $Id: route.c,v 1.1.2.6 2001/01/07 17:09:06 guus Exp $ */ #include "config.h" diff --git a/src/route.h b/src/route.h index 0c708ac4..e7316cb1 100644 --- a/src/route.h +++ b/src/route.h @@ -1,7 +1,7 @@ /* route.h -- header file for route.c - Copyright (C) 2000 Ivo Timmermans - 2000 Guus Sliepen + Copyright (C) 2000,2001 Ivo Timmermans + 2000,2001 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: route.h,v 1.1.2.1 2001/01/07 15:27:30 guus Exp $ + $Id: route.h,v 1.1.2.2 2001/01/07 17:09:06 guus Exp $ */ #ifndef __TINC_ROUTE_H__ diff --git a/src/subnet.c b/src/subnet.c index 28a203dc..ab881f47 100644 --- a/src/subnet.c +++ b/src/subnet.c @@ -1,7 +1,7 @@ /* subnet.c -- handle subnet lookups and lists - Copyright (C) 2000 Guus Sliepen , - 2000 Ivo Timmermans + Copyright (C) 2000,2001 Guus Sliepen , + 2000,2001 Ivo Timmermans This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: subnet.c,v 1.1.2.16 2001/01/05 23:53:53 guus Exp $ + $Id: subnet.c,v 1.1.2.17 2001/01/07 17:09:06 guus Exp $ */ #include "config.h" diff --git a/src/subnet.h b/src/subnet.h index a572953c..21b2a1e5 100644 --- a/src/subnet.h +++ b/src/subnet.h @@ -1,7 +1,7 @@ /* subnet.h -- header for subnet.c - Copyright (C) 2000 Guus Sliepen , - 2000 Ivo Timmermans + Copyright (C) 2000,2001 Guus Sliepen , + 2000,2001 Ivo Timmermans This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: subnet.h,v 1.1.2.8 2001/01/05 23:53:53 guus Exp $ + $Id: subnet.h,v 1.1.2.9 2001/01/07 17:09:07 guus Exp $ */ #ifndef __TINC_SUBNET_H__ diff --git a/src/tincd.c b/src/tincd.c index 3e02e699..8eb0be5e 100644 --- a/src/tincd.c +++ b/src/tincd.c @@ -1,7 +1,7 @@ /* tincd.c -- the main file for tincd - Copyright (C) 1998,1999,2000 Ivo Timmermans - 2000 Guus Sliepen + Copyright (C) 1998-2001 Ivo Timmermans + 2000,2001 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: tincd.c,v 1.10.4.40 2001/01/06 18:03:41 guus Exp $ + $Id: tincd.c,v 1.10.4.41 2001/01/07 17:09:07 guus Exp $ */ #include "config.h" @@ -305,7 +305,7 @@ main(int argc, char **argv, char **envp) if(show_version) { printf(_("%s version %s (built %s %s, protocol %d)\n"), PACKAGE, VERSION, __DATE__, __TIME__, PROT_CURRENT); - printf(_("Copyright (C) 1998,1999,2000 Ivo Timmermans, Guus Sliepen and others.\n" + printf(_("Copyright (C) 1998-2001 Ivo Timmermans, Guus Sliepen and others.\n" "See the AUTHORS file for a complete list.\n\n" "tinc comes with ABSOLUTELY NO WARRANTY. This is free software,\n" "and you are welcome to redistribute it under certain conditions;\n" -- 2.20.1