- Fixed some spelling errors.

- Paar zpelvautjes gerepareerd, en de Nederlandse vertaling weer bij de
  tijd gebracht.

diff --git a/po/nl.po b/po/nl.po
index 8849299b6806d175421c0d18dffc279fb0884928..b94a45066ed9c75418287fe781388eb790eff39b 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: tinc 1.0pre2\n"
-"POT-Creation-Date: 2000-05-31 20:02+0200\n"
+"Project-Id-Version: tinc 1.0pre3\n"
+"POT-Creation-Date: 2000-06-28 13:12+0200\n"
 "PO-Revision-Date: 2000-05-31 20:14+02:00\n"
 "Last-Translator: Ivo Timmermans <itimmermans@bigfoot.com>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"
@@ -13,27 +13,27 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/conf.c:158
+#: src/conf.c:167
 #, c-format
 msgid "%s: %d: Invalid variable name `%s'.\n"
 msgstr "%s: %d: Ongeldige variabelenaam `%s'.\n"
 
-#: src/conf.c:165
+#: src/conf.c:174
 #, c-format
 msgid "%s: %d: No value given for `%s'.\n"
 msgstr "%s: %d: Geen waarde gegeven voor `%s'.\n"
 
-#: src/conf.c:173
+#: src/conf.c:182
 #, c-format
 msgid "%s: %d: Invalid value `%s' for variable `%s'.\n"
 msgstr "%s: %d: Ongeldige waarde `%s' voor variabele `%s'.\n"
 
-#: src/conf.c:194
+#: src/conf.c:203
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Kon %s niet openen: %s\n"
 
-#: src/encr.c:112 src/net.c:333
+#: src/encr.c:112 src/net.c:390
 #, c-format
 msgid "Could not open %s: %m"
 msgstr "Kon %s niet openen: %m"
@@ -44,8 +44,8 @@ msgid "Illegal passphrase in %s; size would be %d"
 msgstr "Ongeldig wachtwoord in %s; grootte zou %d zijn"
 
 #: src/encr.c:153
-#, c-format
-msgid "Generating %d bits keys."
+#, fuzzy, c-format
+msgid "Generating %d bits keys"
 msgstr "%d bits sleutel genereren."
 
 #: src/encr.c:157
@@ -58,30 +58,30 @@ msgstr "Openen van /dev/urandom mislukt: %m"
 msgid "Encryption key set to %s"
 msgstr "Sleutel ingesteld op %s"
 
-#: src/genauth.c:46
+#: src/genauth.c:48
 #, c-format
 msgid "Usage: %s bits\n"
 msgstr "Gebruik: %s bits\n"
 
-#: src/genauth.c:55
+#: src/genauth.c:57
 #, c-format
 msgid "Illegal number: %s\n"
 msgstr "Ongeldig nummer: %s\n"
 
-#: src/genauth.c:60
+#: src/genauth.c:62
 #, c-format
 msgid "Generating %d bits number"
 msgstr "Genereren van %d bits nummer"
 
-#: src/genauth.c:65
+#: src/genauth.c:67
 msgid "Opening /dev/urandom"
 msgstr "Openen van /dev/urandom"
 
-#: src/genauth.c:78
+#: src/genauth.c:80
 msgid "File was empty!\n"
 msgstr "Bestand was leeg!\n"
 
-#: src/genauth.c:86
+#: src/genauth.c:88
 msgid ""
 ": done.\n"
 "The following line should be ENTIRELY copied into a passphrase file:\n"
@@ -90,552 +90,687 @@ msgstr ""
 "De volgende regel dient in zijn GEHEEL naar een wachtwoordbestand worden "
 "gekopieerd:\n"
 
-#: src/genauth.c:98
+#: src/genauth.c:100
 msgid ": done.\n"
 msgstr ": klaar.\n"
 
-#: src/net.c:106
-#, c-format
-msgid "Sent %d bytes to %lx"
+#: src/net.c:107
+#, fuzzy, c-format
+msgid "Sending packet of %d bytes to "
 msgstr "%d bytes verzonden naar %lx"
 
-#: src/net.c:110
-#, c-format
-msgid "Error sending data: %m"
+#: src/net.c:107 src/net.c:133 src/net.c:347 src/net.c:900 src/net.c:1088
+#: src/net.c:1095 src/net.c:1102 src/protocol.c:54 src/protocol.c:76
+#: src/protocol.c:95 src/protocol.c:113 src/protocol.c:131 src/protocol.c:149
+#: src/protocol.c:188 src/protocol.c:206 src/protocol.c:255 src/protocol.c:273
+#: src/protocol.c:316 src/protocol.c:346 src/protocol.c:439 src/protocol.c:446
+#: src/protocol.c:464 src/protocol.c:470 src/protocol.c:506 src/protocol.c:522
+#: src/protocol.c:528 src/protocol.c:548 src/protocol.c:554 src/protocol.c:570
+#: src/protocol.c:577 src/protocol.c:590 src/protocol.c:608 src/protocol.c:614
+#: src/protocol.c:630 src/protocol.c:636 src/protocol.c:655 src/protocol.c:662
+#: src/protocol.c:683 src/protocol.c:699 src/protocol.c:706 src/protocol.c:712
+#: src/protocol.c:731 src/protocol.c:790 src/protocol.c:797 src/protocol.c:803
+#: src/protocol.c:834 src/protocol.c:855 src/protocol.c:862 src/protocol.c:868
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#: src/net.c:112
+#, fuzzy
+msgid "Error sending packet to "
 msgstr "Fout bij verzenden van gegevens: %m"
 
-#: src/net.c:130
+#: src/net.c:112
+#, fuzzy, c-format
+msgid " (%s): %m"
+msgstr ":%d: %m"
+
+#: src/net.c:133
+#, fuzzy, c-format
+msgid "Receiving packet of %d bytes from "
+msgstr "Sleutel ontvangen van "
+
+#: src/net.c:137
 #, c-format
 msgid "Can't write to tap device: %m"
 msgstr "Kan niet naar tap apparaat schrijven: %m"
 
-#: src/net.c:149
-#, c-format
-msgid "packet to queue: %d"
-msgstr "pakket naar wachtrij: %d"
-
-#: src/net.c:236
-msgid "queue flushed"
+#: src/net.c:240
+#, fuzzy
+msgid "Queue flushed"
 msgstr "wachtrij leeggemaakt"
 
-#: src/net.c:251
+#: src/net.c:255
 msgid "Flushing send queue for "
 msgstr "Legen van verzend-wachtrij naar "
 
-#: src/net.c:259
+#: src/net.c:263
 msgid "Flushing receive queue for "
 msgstr "Legen van de ontvangst-wachtrij voor "
 
-#: src/net.c:277
-msgid "trying to look up "
-msgstr "proberen op te zoeken van "
+#: src/net.c:281
+#, fuzzy
+msgid "Trying to look up "
+msgstr "Proberen op te zoeken van "
 
-#: src/net.c:277
-msgid " in connection list failed."
-msgstr " in verbindingslijst mislukte."
+#: src/net.c:281 src/net.c:325
+#, fuzzy
+msgid " in connection list failed!"
+msgstr " in verbindingslijst mislukte!"
 
-#: src/net.c:284
-msgid "There is no remote host I can send this packet to."
-msgstr "Er is geen partner waar ik dit pakket naar kan sturen."
+#: src/net.c:293 src/net.c:306
+#, fuzzy
+msgid "There is no remote host I can send this packet to!"
+msgstr "Er is geen partner waar ik dit pakket naar kan sturen!"
 
-#: src/net.c:308
-msgid " is not ready, queueing packet."
-msgstr " is niet gereed, pakket wordt in de wachtrij gezet."
+#: src/net.c:320
+msgid "Indirect packet to "
+msgstr "Indirect pakket naar "
+
+#: src/net.c:320
+msgid " via "
+msgstr " via "
+
+#: src/net.c:325
+#, fuzzy
+msgid "Indirect look up "
+msgstr "Indirect opzoeken van "
+
+#: src/net.c:335
+msgid "Double indirection for "
+msgstr "Dubbele indirectie voor "
+
+#: src/net.c:347
+#, fuzzy
+msgid "Could not open UDP connection to "
+msgstr "Kon geen UDP verbinding openen naar "
 
 #: src/net.c:354
+#, fuzzy, c-format
+msgid " (%s) has no valid key, queueing packet"
+msgstr " is niet gereed, pakket wordt in de wachtrij gezet."
+
+#: src/net.c:364
+#, fuzzy, c-format
+msgid " (%s) is not ready, queueing packet"
+msgstr " is niet gereed, pakket wordt in de wachtrij gezet."
+
+#: src/net.c:411
 #, c-format
 msgid "Creating metasocket failed: %m"
 msgstr "Aanmaak van metasocket mislukt: %m"
 
-#: src/net.c:360 src/net.c:409
+#: src/net.c:417 src/net.c:466
 #, c-format
 msgid "setsockopt: %m"
 msgstr "setsockopt: %m"
 
-#: src/net.c:367 src/net.c:416 src/net.c:468
+#: src/net.c:424 src/net.c:473 src/net.c:528
 #, c-format
 msgid "fcntl: %m"
 msgstr "fcntl: %m"
 
-#: src/net.c:378
+#: src/net.c:435
 #, c-format
 msgid "Can't bind to port %hd/tcp: %m"
 msgstr "Kan niet aan poort %hd/tcp binden: %m"
 
-#: src/net.c:384
+#: src/net.c:441
 #, c-format
 msgid "listen: %m"
 msgstr "listen: %m"
 
-#: src/net.c:403 src/net.c:451
+#: src/net.c:460 src/net.c:511
 #, c-format
 msgid "Creating socket failed: %m"
 msgstr "Aanmaak socket mislukte: %m"
 
-#: src/net.c:427
+#: src/net.c:484
 #, c-format
 msgid "Can't bind to port %hd/udp: %m"
 msgstr "Kan niet aan poort %hd/udp binden: %m"
 
-#: src/net.c:461
+#: src/net.c:501
+#, fuzzy, c-format
+msgid "Trying to connect to %s"
+msgstr "Beëindigen verbinding met %s."
+
+#: src/net.c:521
 #, c-format
 msgid ":%d: %m"
 msgstr ":%d: %m"
 
-#: src/net.c:474
-#, c-format
-msgid "Connected to %s:%hd"
-msgstr "Verbonden met %s:%hd"
+#: src/net.c:532
+#, fuzzy
+msgid "Connected to "
+msgstr "Verbinden naar "
+
+#: src/net.c:532
+#, fuzzy, c-format
+msgid ":%hd"
+msgstr ",%hd) ontvangen"
 
-#: src/net.c:495
-msgid "Could not set up a meta connection."
+#: src/net.c:555
+#, fuzzy, c-format
+msgid "Could not set up a meta connection to %s"
 msgstr "Kon geen metaverbinding aangaan."
 
-#: src/net.c:519
+#: src/net.c:580
 msgid "No value for my VPN IP given"
 msgstr "Geen waarde gegeven voor mijn VPN IP adres"
 
-#: src/net.c:533
+#: src/net.c:600
 msgid "Unable to set up a listening socket"
 msgstr "Kon geen luistersocket aanmaken"
 
-#: src/net.c:539
+#: src/net.c:606
 msgid "Unable to set up an incoming vpn data socket"
 msgstr "Kon geen socket maken voor inkomend vpn verkeer"
 
-#: src/net.c:546
-#, c-format
-msgid "Ready: listening on port %d."
+#: src/net.c:613
+#, fuzzy, c-format
+msgid "Ready: listening on port %d"
 msgstr "Gereed: luister op poort %d."
 
-#: src/net.c:569
-#, c-format
-msgid "Still failed to connect to other. Will retry in %d seconds."
+#: src/net.c:641
+#, fuzzy, 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:602
-msgid "Try to re-establish outgoing connection in 5 minutes."
+#: src/net.c:679
+#, fuzzy
+msgid "Trying to re-establish outgoing connection in 5 minutes"
 msgstr "Poging tot herstellen van uitgaande verbinding over 5 minuten."
 
-#: src/net.c:640
-msgid "Terminating."
+#: src/net.c:716
+#, fuzzy
+msgid "Terminating"
 msgstr "Beëindigen."
 
-#: src/net.c:654
-msgid "Opening UDP socket to "
+#: src/net.c:730
+#, fuzzy, c-format
+msgid "Opening UDP socket to %s"
 msgstr "Tijdens openen van UDP socket naar "
 
-#: src/net.c:659
-#, c-format
-msgid "Creating data socket failed: %m"
-msgstr "Aanmaak datasocket mislukt: %m"
-
-#: src/net.c:669
-msgid "Connecting to "
-msgstr "Verbinden naar "
+#: src/net.c:735
+#, fuzzy, c-format
+msgid "Creating UDP socket failed: %m"
+msgstr "Aanmaak socket mislukte: %m"
 
-#: src/net.c:669
-#, c-format
-msgid ":%d failed: %m"
-msgstr ":%d mislukt: %m"
+#: src/net.c:745
+#, fuzzy, c-format
+msgid "Connecting to %s port %d failed: %m"
+msgstr "Aanmaak datasocket mislukt: %m"
 
-#: src/net.c:677 src/net.c:761 src/net.c:954
+#: src/net.c:753 src/net.c:839 src/net.c:1037
 #, c-format
 msgid "This is a bug: %s:%d: %d:%m"
 msgstr "Dit is een programmeerfout: %s:%d: %d:%m"
 
-#: src/net.c:701
+#: src/net.c:777
 #, c-format
 msgid "Error: getpeername: %m"
 msgstr "Fout: getpeername: %m"
 
-#: src/net.c:713
-#, c-format
-msgid "Connection from %s:%d"
+#: src/net.c:790
+#, fuzzy, c-format
+msgid "Connection from %s port %d"
 msgstr "Verbinding van %s:%d"
 
-#: src/net.c:766
+#: src/net.c:844
 #, c-format
 msgid "Incoming data socket error: %s"
 msgstr "Fout op socket voor inkomend verkeer: %s"
 
-#: src/net.c:774
-#, c-format
-msgid "Receiving data failed: %m"
+#: src/net.c:852
+#, fuzzy, c-format
+msgid "Receiving packet from %s failed: %m"
 msgstr "Ontvangen van data mislukt: %m"
 
-#: src/net.c:787
-msgid "packet from "
-msgstr "pakket van "
+#: src/net.c:866
+#, fuzzy
+msgid "Got packet from "
+msgstr "Kreeg pakket van "
 
-#: src/net.c:787
+#: src/net.c:866
 #, c-format
-msgid " (len %d)"
-msgstr " (lengte %d)"
+msgid " (%s) with unknown origin "
+msgstr " (%s) met onbekende herkomst "
 
-#: src/net.c:791
-msgid "Got packet from unknown source "
-msgstr "Pakket ontvangen met onbekende afzender "
+#: src/net.c:866
+msgid "?"
+msgstr "?"
 
-#: src/net.c:825
-#, c-format
-msgid "Closing connection with %s."
-msgstr "Beëindigen verbinding met %s."
+#: src/net.c:900
+#, fuzzy
+msgid "Closing connection with "
+msgstr "Beëindigen verbinding met "
 
-#: src/net.c:841
-msgid "Try to re-establish outgoing connection in 5 seconds."
-msgstr "Poging tot herstellen van uitgaande verbinding over 5 seconden."
-
-#: src/net.c:893
-#, c-format
-msgid "%s ("
-msgstr "%s ("
+#: src/net.c:917
+#, fuzzy
+msgid "Trying to re-establish outgoing connection in 5 seconds"
+msgstr "Poging tot herstellen van uitgaande verbinding over 5 seconden"
 
-#: src/net.c:893
-msgid ") didn't respond to ping"
-msgstr ") antwoordde niet op verzoeken"
+#: src/net.c:976
+#, fuzzy, c-format
+msgid " (%s) didn't respond to ping"
+msgstr " (%s) antwoordde niet op ping"
 
-#: src/net.c:924
+#: src/net.c:1007
 #, c-format
 msgid "Accepting a new connection failed: %m"
 msgstr "Aanname van nieuwe verbinding is mislukt: %m"
 
-#: src/net.c:932
-msgid "Closed attempted connection."
-msgstr "Aangenomen verbinding verbroken."
+#: src/net.c:1015
+#, fuzzy
+msgid "Closed attempted connection"
+msgstr "Aangenomen verbinding verbroken"
 
-#: src/net.c:959
+#: src/net.c:1042
 #, c-format
 msgid "Metadata socket error: %s"
 msgstr "Fout op socket voor metaverkeer: %s"
 
-#: src/net.c:965
-msgid "Metadata read buffer overflow."
-msgstr "Metadata ontvangstbuffer overloop."
+#: src/net.c:1048
+#, fuzzy
+msgid "Metadata read buffer overflow!"
+msgstr "Metadata ontvangstbuffer overloop!"
 
-#: src/net.c:973
+#: src/net.c:1058
 #, c-format
 msgid "Metadata socket read error: %m"
-msgstr "Fout op socket voor metaverkeer: %m"
+msgstr "Fout op socket voor metaverkeer tijdens lezen: %m"
 
-#: src/net.c:1000
-#, c-format
-msgid "Unknown request: %s"
-msgstr "Onbekend verzoek: %s"
+#: src/net.c:1082
+#, fuzzy
+msgid "Got request from "
+msgstr "Ontving verzoek van "
 
-#: src/net.c:1005
+#: src/net.c:1082
 #, c-format
-msgid "Got request: %s"
-msgstr "Ontving verzoek: %s"
+msgid " (%s): %s"
+msgstr " (%s): %s"
+
+#: src/net.c:1088
+#, fuzzy
+msgid "Unknown request from "
+msgstr "Onbekend verzoek van "
 
-#: src/net.c:1009
+#: src/net.c:1095
 msgid "Error while processing request from "
 msgstr "Fout tijdens afhandelen van verzoek van "
 
-#: src/net.c:1015
-msgid "Bogus data received."
-msgstr "Onzinnige data ontvangen."
+#: src/net.c:1102
+#, fuzzy
+msgid "Bogus data received from "
+msgstr "Onzinnige data ontvangen van "
 
-#: src/net.c:1059
+#: src/net.c:1147
 #, c-format
 msgid "Outgoing data socket error: %s"
 msgstr "Fout op socket voor uitgaand verkeer: %s"
 
-#: src/net.c:1094
+#: src/net.c:1182
 #, c-format
 msgid "Error while reading from tapdevice: %m"
-msgstr "Fout tijdens lezen van tap-apparaatbestand: %m"
+msgstr "Fout tijdens lezen van tap-apparaatbestand tijdens lezen: %m"
 
-#: src/net.c:1104
+#: src/net.c:1192
 #, c-format
 msgid "Non-IP ethernet frame %04x from "
 msgstr "Niet-IP ethernet pakket %04x van "
 
-#: src/net.c:1112
+#: src/net.c:1200
 msgid "Dropping short packet"
 msgstr "Te kort pakket genegeerd"
 
-#: src/net.c:1120
-#, c-format
-msgid "An IP packet (%04x) for "
-msgstr "Een IP pakket (%04x) voor "
-
-#: src/net.c:1120
-msgid " from "
-msgstr " van "
-
-#: src/net.c:1123 src/protocol.c:110
-msgid " to "
-msgstr " naar "
-
-#: src/net.c:1158
+#: src/net.c:1239
 #, c-format
 msgid "Error while waiting for input: %m"
 msgstr "Fout tijdens wachten op invoer: %m"
 
-#: src/netutl.c:219
+#: src/netutl.c:218
 #, c-format
 msgid "Error looking up `%s': %s\n"
 msgstr "Fout bij het opzoeken van `%s': %s\n"
 
-#: src/netutl.c:243
+#: src/netutl.c:242
 msgid "Connection list:"
 msgstr "Verbindingslijst:"
 
-#: src/protocol.c:54
-#, c-format
-msgid "Send ACK to %s"
-msgstr "ACK zenden naar %s"
+#: src/netutl.c:246
+msgid " "
+msgstr " "
 
-#: src/protocol.c:60
-#, c-format
-msgid "send failed: %d:%d: %m"
-msgstr "verzenden mislukte: %d:%d: %m"
+#: src/netutl.c:246
+msgid "/"
+msgstr "/"
 
-#: src/protocol.c:64 src/protocol.c:480
+#: src/netutl.c:246
 #, c-format
-msgid "Connection with %s activated."
-msgstr "Verbinding met %s geactiveerd."
-
-#: src/protocol.c:73
-msgid "Send TERMREQ to "
-msgstr "TERMREQ zenden naar "
+msgid " at %s flags %d sockets %d, %d status %04x"
+msgstr " op %s vlaggen %d sockets %d, %d status %04x"
 
-#: src/protocol.c:81 src/protocol.c:99 src/protocol.c:117 src/protocol.c:134
-#: src/protocol.c:148 src/protocol.c:166 src/protocol.c:184 src/protocol.c:212
-#: src/protocol.c:233 src/protocol.c:251 src/protocol.c:265 src/protocol.c:292
-#: src/protocol.c:322 src/protocol.c:656 src/protocol.c:754
-#, c-format
-msgid "send failed: %s:%d: %m"
-msgstr "verzenden mislukte: %s:%d: %m"
-
-#: src/protocol.c:92
-msgid "Send TIMEOUT to "
-msgstr "TIMEOUT zenden naar "
-
-#: src/protocol.c:110
-msgid "Sending delete host "
-msgstr "Verzenden van verwijderingsverzoek van "
-
-#: src/protocol.c:128
-msgid "pinging "
-msgstr "pingen van "
-
-#: src/protocol.c:159
-msgid "Sending add host to "
-msgstr "Verzenden van toevoegen van "
-
-#: src/protocol.c:177
-msgid "Sending KEY_CHANGED to "
-msgstr "KEY_CHANGED verzenden naar "
+#: src/protocol.c:54
+#, fuzzy
+msgid "Sending ACK to "
+msgstr "Verzending ACK naar "
+
+#: src/protocol.c:61
+#, fuzzy, c-format
+msgid "Send failed: %d:%d: %m"
+msgstr "Verzenden mislukte: %d:%d: %m"
+
+#: src/protocol.c:66 src/protocol.c:510
+#, fuzzy
+msgid "Connection with "
+msgstr "Verbinding met "
+
+#: src/protocol.c:66 src/protocol.c:510
+#, c-format
+msgid " (%s) activated"
+msgstr " (%s) geactiveerd"
+
+#: src/protocol.c:76
+#, fuzzy
+msgid "Sending TERMREQ to "
+msgstr "Verzending TERMREQ naar "
+
+#: src/protocol.c:84 src/protocol.c:102 src/protocol.c:120 src/protocol.c:138
+#: src/protocol.c:156 src/protocol.c:195 src/protocol.c:213 src/protocol.c:241
+#: src/protocol.c:262 src/protocol.c:280 src/protocol.c:323 src/protocol.c:738
+#: src/protocol.c:841
+#, fuzzy, c-format
+msgid "Send failed: %s:%d: %m"
+msgstr "Verzenden mislukte: %s:%d: %m"
+
+#: src/protocol.c:95
+#, fuzzy
+msgid "Sending TIMEOUT to "
+msgstr "Verzending TIMEOUT naar "
+
+#: src/protocol.c:113
+#, fuzzy
+msgid "Sending DEL_HOST for "
+msgstr "Verzending DEL_HOST voor "
+
+#: src/protocol.c:113 src/protocol.c:188
+#, fuzzy, c-format
+msgid " (%s) to "
+msgstr " (%s) naar "
+
+#: src/protocol.c:131
+#, fuzzy
+msgid "Sending PING to "
+msgstr "Verzending PING naar "
+
+#: src/protocol.c:149
+#, fuzzy
+msgid "Sending PONG to "
+msgstr "Verzending PONG naar "
+
+#: src/protocol.c:188
+#, fuzzy
+msgid "Sending ADD_HOST for "
+msgstr "Verzending ADD_HOST voor "
+
+#: src/protocol.c:206
+#, fuzzy
+msgid "Sending KEY_CHANGED origin "
+msgstr "Verzending KEY_CHANGED herkomst "
+
+#: src/protocol.c:206
+msgid " to "
+msgstr " naar "
 
-#: src/protocol.c:205
-msgid "Send BASIC_INFO to "
-msgstr "BASIC_INFO sturen naar "
+#: src/protocol.c:234
+#, fuzzy, c-format
+msgid "Sending BASIC_INFO to %s"
+msgstr "Verzending BASIC_INFO naar %s"
 
-#: src/protocol.c:226
-#, c-format
-msgid "Send PASSPHRASE %s to "
-msgstr "PASSPHRASE %s sturen naar "
+#: src/protocol.c:255
+#, fuzzy
+msgid "Sending PASSPHRASE to "
+msgstr "Verzending PASSPHRASE naar "
 
-#: src/protocol.c:244
-#, c-format
-msgid "Send PUBLIC_KEY %s to "
-msgstr "PUBLIC_KEY %s verzenden naar "
+#: src/protocol.c:273
+#, fuzzy
+msgid "Sending PUBLIC_KEY to "
+msgstr "Verzending PUBLIC_KEY naar "
 
-#: src/protocol.c:279
-msgid "Attempting to send key request to "
-msgstr "Poging tot verzenden van sleutelverzoek naar "
+#: src/protocol.c:310
+#, fuzzy
+msgid "Attempting to send REQ_KEY to "
+msgstr "Poging tot verzenden REQ_KEY naar "
 
-#: src/protocol.c:279 src/protocol.c:309 src/protocol.c:643 src/protocol.c:725
-#: src/protocol.c:741 src/protocol.c:781
+#: src/protocol.c:310 src/protocol.c:340 src/protocol.c:725 src/protocol.c:812
+#: src/protocol.c:828 src/protocol.c:875
 msgid ", which does not exist?"
 msgstr ", die niet bestaat?"
 
-#: src/protocol.c:285
-msgid "Sending out request for public key to "
-msgstr "Verzoek om openbare sleutel verzenden naar "
+#: src/protocol.c:316
+#, fuzzy
+msgid "Sending REQ_KEY to "
+msgstr "Verzending REQ_KEY naar "
 
-#: src/protocol.c:309
-msgid "Attempting to send key answer to "
-msgstr "Poging tot verzenden van een sleutel naar "
+#: src/protocol.c:340
+#, fuzzy
+msgid "Attempting to send ANS_KEY to "
+msgstr "Poging tot verzenden ANS_KEY naar "
 
-#: src/protocol.c:315
-msgid "Sending public key to "
-msgstr "Verzenden van openbare sleutel naar "
+#: src/protocol.c:346
+#, fuzzy
+msgid "Sending ANS_KEY to "
+msgstr "Verzending ANS_KEY naar "
 
-#: src/protocol.c:370
+#: src/protocol.c:353
 #, c-format
-msgid "got bad BASIC_INFO request: %s"
-msgstr "Ongeldig BASIC_INFO verzoek ontvangen: %s"
+msgid "Send failed: %s:%d: %m"
+msgstr "Verzenden mislukte: %s:%d: %m"
 
-#: src/protocol.c:376
-#, c-format
-msgid "Peer uses incompatible protocol version %d."
-msgstr "De ander gebruikt een niet-compatibel protocol versie %d."
-
-#: src/protocol.c:382
-#, c-format
-msgid "got BASIC_INFO(%hd,"
-msgstr "BASIC_INFO(%hd,"
+#: src/protocol.c:400
+#, fuzzy, c-format
+msgid "Got BASIC_INFO from %s"
+msgstr "Kreeg BASIC_INFO van %s"
 
-#: src/protocol.c:382 src/protocol.c:584
-msgid ","
-msgstr ","
-
-#: src/protocol.c:382
-msgid ")"
-msgstr ") ontvangen"
-
-#: src/protocol.c:385
-#, c-format
-msgid "Peer uses protocol version %d"
-msgstr "De ander gebruikt protocol versie %d"
+#: src/protocol.c:404
+#, fuzzy, c-format
+msgid "Got bad BASIC_INFO from %s"
+msgstr "Kreeg ongeldige BASIC_INFO van %s"
 
 #: src/protocol.c:411
-#, c-format
-msgid "got bad PASSPHRASE request: %s"
+#, fuzzy, c-format
+msgid "Peer uses incompatible protocol version %d"
+msgstr "De ander gebruikt een niet-compatibel protocol versie %d"
+
+#: src/protocol.c:439
+#, fuzzy
+msgid "Got bad PASSPHRASE from "
 msgstr "Ongeldig PASSPHRASE verzoek ontvangen: %s"
 
-#: src/protocol.c:417
-msgid "got PASSPHRASE"
+#: src/protocol.c:446
+#, fuzzy
+msgid "Got PASSPHRASE from "
 msgstr "PASSPHRASE ontvangen"
 
-#: src/protocol.c:434
-#, c-format
-msgid "got bad PUBLIC_KEY request: %s"
-msgstr "Ongeldig PUBLIC_KEY verzoek ontvangen: %s"
+#: src/protocol.c:464
+#, fuzzy
+msgid "Got bad PUBLIC_KEY from "
+msgstr "Kreeg ongeldige PUBLIC_KEY van "
 
-#: src/protocol.c:439
-#, c-format
-msgid "got PUBLIC_KEY %s"
-msgstr "PUBLIC_KEY %s verzoek ontvangen"
+#: src/protocol.c:470
+#, fuzzy
+msgid "Got PUBLIC_KEY from "
+msgstr "Kreeg PUBLIC_KEY van "
 
 #. intruder!
-#: src/protocol.c:444
-msgid "Intruder: passphrase does not match."
-msgstr "Indringer: wachwoord komt niet overeen."
-
-#: src/protocol.c:449
-msgid "Passphrase OK"
-msgstr "Wachtwoord OK"
-
-#: src/protocol.c:477
-msgid "got ACK"
-msgstr "ACK ontvangen"
-
-#: src/protocol.c:488
-msgid " wants to quit"
-msgstr " wil beëindigen"
-
-#: src/protocol.c:501
-msgid " says it's gotten a timeout from us"
-msgstr " vindt dat wij te traag zijn"
+#: src/protocol.c:476
+#, fuzzy
+msgid "Intruder: passphrase does not match!"
+msgstr "Indringer: wachwoord komt niet overeen!"
 
-#: src/protocol.c:517
-#, c-format
-msgid "got bad DEL_HOST request: %s"
-msgstr "Ongeldig DEL_HOST verzoek ontvangen: %s"
+#: src/protocol.c:506
+#, fuzzy
+msgid "Got ACK from "
+msgstr "Kreeg ACK van "
 
 #: src/protocol.c:522
-msgid "got DEL_HOST for "
-msgstr "DEL_HOST ontvangen voor "
+msgid "Got unauthorized TERMREQ from "
+msgstr "Kreeg niet-geautoriseerde TERMREQ van "
 
-#: src/protocol.c:527
-msgid "Somebody wanted to delete "
-msgstr "Iemand wilde "
+#: src/protocol.c:528
+#, fuzzy
+msgid "Got TERMREQ from "
+msgstr "Kreeg TERMREQ van "
 
-#: src/protocol.c:527
-msgid " which does not exist?"
-msgstr " verwijderen, die niet bestaat?"
+#: src/protocol.c:548
+msgid "Got unauthorized TIMEOUT from "
+msgstr "Kreeg niet-geautoriseerde TIMEOUT van "
 
-#: src/protocol.c:545
-msgid "responding to ping from "
-msgstr " antwoordde niet op verzoeken"
+#: src/protocol.c:554
+#, fuzzy
+msgid "Got TIMEOUT from "
+msgstr "Kreeg TIMEOUT van "
 
-#: src/protocol.c:559
-msgid "ok, got pong from "
-msgstr "ok, pong ontvangen van "
+#: src/protocol.c:570
+#, fuzzy
+msgid "Got unauthorized DEL_HOST from "
+msgstr "Kreeg niet-geautoriseerde DEL_HOST van "
 
 #: src/protocol.c:577
-#, c-format
-msgid "got bad ADD_HOST request: %s"
-msgstr "Ongeldig ADD_HOST verzoek ontvangen: %s"
+#, fuzzy
+msgid "Got bad DEL_HOST from "
+msgstr "Kreeg ongeldige DEL_HOST van "
 
-#: src/protocol.c:582
-msgid "Add host request from "
-msgstr "Ontving verzoek tot toevoegen van "
+#: src/protocol.c:584 src/protocol.c:590
+#, fuzzy
+msgid "Got DEL_HOST for "
+msgstr "Kreeg DEL_HOST voor "
 
-#: src/protocol.c:584
-msgid "got ADD_HOST("
-msgstr "ADD_HOST("
+#: src/protocol.c:584 src/protocol.c:712 src/protocol.c:803 src/protocol.c:868
+msgid " from "
+msgstr " van "
 
 #: src/protocol.c:584
-#, c-format
-msgid ",%hd)"
-msgstr ",%hd) ontvangen"
+#, fuzzy, c-format
+msgid " (%s) which does not exist?"
+msgstr " (%s), die niet bestaat?"
 
-#: src/protocol.c:596
-msgid "Invalid add_host request from "
-msgstr "Ontving ongeldig add_host verzoek van "
+#: src/protocol.c:590 src/protocol.c:683
+#, fuzzy, c-format
+msgid " (%s) from "
+msgstr " (%s) van "
 
-#: src/protocol.c:625
-#, c-format
-msgid "got bad request: %s"
-msgstr "Ongeldig verzoek ontvangen: %s"
-
-#: src/protocol.c:630
-msgid "got REQ_KEY from "
-msgstr "REQ_KEY ontvangen van "
-
-#: src/protocol.c:630 src/protocol.c:714
-msgid " for "
-msgstr " voor "
+#: src/protocol.c:608
+msgid "Got unauthorized PING from "
+msgstr "Kreeg niet-geautoriseerde PING van "
 
-#: src/protocol.c:643
-msgid "Attempting to forward key request to "
-msgstr "Poging tot doorsturen van sleutelaanvraag naar "
-
-#: src/protocol.c:649
-msgid "Forwarding request for public key to "
-msgstr "Doorsturen van openbare sleutel-aanvraag naar "
-
-#: src/protocol.c:709 src/protocol.c:769
-#, c-format
-msgid "got bad ANS_KEY request: %s"
-msgstr "Ongeldig ANS_KEY verzoek ontvangen: %s"
+#: src/protocol.c:614
+#, fuzzy
+msgid "Got PING from "
+msgstr "Kreeg PING van "
 
-#: src/protocol.c:714
-msgid "got ANS_KEY from "
-msgstr "ANS_KEY ontvangen van "
-
-#: src/protocol.c:720
-msgid "Yeah! key arrived. Now do something with it."
-msgstr "Hoi hoi! sleutel is binnen. Doe er nu iets leuks mee."
+#: src/protocol.c:630
+msgid "Got unauthorized PONG from "
+msgstr "Kreeg niet-geautoriseerde PONG van "
+
+#: src/protocol.c:636
+#, fuzzy
+msgid "Got PONG from "
+msgstr "Kreeg PONG van "
+
+#: src/protocol.c:655
+msgid "Got unauthorized ADD_HOST from "
+msgstr "Kreeg niet-geautoriseerde ADD_HOST van "
+
+#: src/protocol.c:662
+#, fuzzy
+msgid "Got bad ADD_HOST from "
+msgstr "Kreeg ongeldige ADD_HOST van "
+
+#: src/protocol.c:683
+#, fuzzy
+msgid "Got ADD_HOST for "
+msgstr "Kreeg ADD_HOST voor "
+
+#: src/protocol.c:699
+#, fuzzy
+msgid "Got unauthorized REQ_KEY from "
+msgstr "Kreeg niet-geautoriseerde REQ_KEY van "
+
+#: src/protocol.c:706
+#, fuzzy
+msgid "Got bad REQ_KEY from "
+msgstr "Kreeg ongeldige REQ_KEY van "
+
+#: src/protocol.c:712
+#, fuzzy
+msgid "Got REQ_KEY origin "
+msgstr "Kreeg REQ_KEY van "
+
+#: src/protocol.c:712 src/protocol.c:803
+msgid " destination "
+msgstr " bestemming "
 
 #: src/protocol.c:725
-msgid "Receiving key from "
-msgstr "Sleutel ontvangen van "
-
-#: src/protocol.c:741
-msgid "Attempting to forward key to "
-msgstr "Poging tot doorsturen van sleutel naar "
+#, fuzzy
+msgid "Attempting to forward REQ_KEY to "
+msgstr "Poging tot doorsturenREQ_KEY naar "
 
-#: src/protocol.c:747
-msgid "Forwarding public key to "
-msgstr "Doorsturen van openbare sleutel naar "
-
-#: src/protocol.c:774
-msgid "got KEY_CHANGED from "
-msgstr "KEY_CHANGED verzoek ontvangen "
-
-#: src/protocol.c:781
-msgid "Got changed key from "
-msgstr "Veranderde sleutel ontvangen van "
+#: src/protocol.c:731
+#, fuzzy
+msgid "Forwarding REQ_KEY to "
+msgstr "Doorsturen REQ_KEY naar "
 
 #: src/protocol.c:790
-msgid "Forwarding key invalidation request"
-msgstr "Doorsturen van sleutelvervalaanvraag"
+#, fuzzy
+msgid "Got unauthorized ANS_KEY from "
+msgstr "Kreeg niet-geautoriseerde ANS_KEY van "
+
+#: src/protocol.c:797
+#, fuzzy
+msgid "Got bad ANS_KEY from "
+msgstr "Kreeg ongeldige ANS_KEY van "
+
+#: src/protocol.c:803
+#, fuzzy
+msgid "Got ANS_KEY origin "
+msgstr "Kreeg ANS_KEY van "
+
+#: src/protocol.c:812
+#, fuzzy
+msgid "Receiving ANS_KEY from "
+msgstr "Ontvangst ANS_KEY van "
+
+#: src/protocol.c:828
+#, fuzzy
+msgid "Attempting to forward ANS_KEY to "
+msgstr "Poging tot doorsturen ANS_KEY naar "
+
+#: src/protocol.c:834
+#, fuzzy
+msgid "Forwarding ANS_KEY to "
+msgstr "Doorsturen ANS_KEY naar "
+
+#: src/protocol.c:855
+#, fuzzy
+msgid "Got unauthorized KEY_CHANGED from "
+msgstr Kreeg niet-geautoriseerde KEY_CHANGED van "
+
+#: src/protocol.c:862
+#, fuzzy
+msgid "Got bad KEY_CHANGED from "
+msgstr "Kreeg ongeldige KEY_CHANGED van "
+
+#: src/protocol.c:868
+#, fuzzy
+msgid "Got KEY_CHANGED origin "
+msgstr "Kreeg KEY_CHANGED herkomst "
+
+#: src/protocol.c:875
+#, fuzzy
+msgid "Got KEY_CHANGED from "
+msgstr "Kreeg KEY_CHANGED van "
 
 #: src/tincd.c:95
 #, c-format
@@ -689,24 +824,24 @@ msgid "Invalid timeout value `%s'.\n"
 msgstr "Ongeldige timeout waarde `%s'.\n"
 
 #: src/tincd.c:159
-#, c-format
-msgid "Memory exhausted (last is %s:%d) (couldn't allocate %d bytes); exiting."
+#, fuzzy, c-format
+msgid "Memory exhausted (last is %s:%d) (couldn't allocate %d bytes), exiting."
 msgstr ""
 "Geheugen is vol (laatste %s:%d) (kon geen %d bytes vrijmaken); beëindigen."
 
 #: src/tincd.c:214
-#, c-format
-msgid "tincd %s (%s %s) starting, debug level %d."
+#, fuzzy, c-format
+msgid "tincd %s (%s %s) starting, debug level %d"
 msgstr "tincd %s (%s %s) gestart, debugniveau %d."
 
 #: src/tincd.c:217
-#, c-format
-msgid "tincd %s starting, debug level %d."
-msgstr "tincd %s gestart, debugniveau %d."
+#, fuzzy, c-format
+msgid "tincd %s starting"
+msgstr "tincd %s gestart"
 
 #: src/tincd.c:232
-#, c-format
-msgid "Total bytes written: tap %d, socket %d; bytes read: tap %d, socket %d."
+#, fuzzy, c-format
+msgid "Total bytes written: tap %d, socket %d; bytes read: tap %d, socket %d"
 msgstr ""
 "Totaal aantal bytes geschreven: tap %d, socket %d; bytes gelezen: top %d, "
 "socket %d."
@@ -766,9 +901,9 @@ msgstr ""
 "(eay@mincom.oz.au)\n"
 
 #: src/tincd.c:355
-msgid "You must be root to run this program. sorry.\n"
+msgid "You must be root to run this program. Sorry.\n"
 msgstr ""
-"Je moet systeembeheerder zijn om dit programma te kunnen draaien. sorry.\n"
+"Je moet systeembeheerder zijn om dit programma te kunnen draaien. Sorry.\n"
 
 #: src/tincd.c:390
 msgid "Got TERM signal"
@@ -783,13 +918,14 @@ msgid "Got another SEGV signal: not restarting"
 msgstr "Kreeg nog een SEGV signaal: niet herstarten"
 
 #: src/tincd.c:413
-#, c-format
-msgid "Got SEGV signal after %s line %d. Trying to re-execute."
+#, fuzzy, c-format
+msgid "Got SEGV signal after %s line %d, trying to re-execute"
 msgstr "Kreeg SEGV signaal na %s regel %d. Probeer opnieuw opstarten."
 
 #: src/tincd.c:416
-msgid "Got SEGV signal; trying to re-execute."
-msgstr "Kreeg SEGV signaal; probeer opnieuw opstarten."
+#, fuzzy
+msgid "Got SEGV signal, trying to re-execute"
+msgstr "Kreeg SEGV signaal, probeer opnieuw opstarten"
 
 #: src/tincd.c:429
 msgid "Got HUP signal"
@@ -804,11 +940,11 @@ msgid "Forcing new key generation"
 msgstr "Nieuwe sleutels geforceerd"
 
 #: src/tincd.c:461
-#, c-format
-msgid "Got unexpected signal (%d) after %s line %d."
-msgstr "Ontving onverwacht signaal (%d) na %s regel %d."
+#, fuzzy, c-format
+msgid "Got unexpected signal %d after %s line %d"
+msgstr "Ontving onverwacht signaal %d na %s regel %d"
 
 #: src/tincd.c:464
-#, c-format
-msgid "Got unexpected signal (%d)."
-msgstr "Ontving onverwacht signaal (%d)."
+#, fuzzy, c-format
+msgid "Got unexpected signal %d"
+msgstr "Ontving onverwacht signaal %d"

diff --git a/src/protocol.c b/src/protocol.c
index 2e9769d24cedc843286224322dd26a1906f1f5af..2cc49ad79fd6d39804ee10b2eb4af8792385dbb5 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -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.12 2000/06/27 20:55:12 guus Exp $
+    $Id: protocol.c,v 1.28.4.13 2000/06/28 11:38:00 guus Exp $
 */
 
 #include "config.h"
@@ -110,8 +110,8 @@ int send_del_host(conn_list_t *cl, conn_list_t *new_host)
 {
 cp
   if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Sending DEL_HOST for " IP_ADDR_S " to " IP_ADDR_S " (%s)"),
-          IP_ADDR_V(new_host->vpn_ip), IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_DEBUG, _("Sending DEL_HOST for " IP_ADDR_S " (%s) to " IP_ADDR_S " (%s)"),
+          IP_ADDR_V(new_host->vpn_ip), new_host->hostname, IP_ADDR_V(cl->vpn_ip), cl->hostname);
 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", DEL_HOST, new_host->vpn_ip);
 
@@ -350,7 +350,7 @@ cp
 
   if((write(fw->nexthop->meta_socket, buffer, buflen)) < 0)
     {
-      syslog(LOG_ERR, _("send failed: %s:%d: %m"), __FILE__, __LINE__);
+      syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
       return -1;
     }
 cp
@@ -579,10 +579,6 @@ cp
        return -1;
     }  
 
-  if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Got DEL_HOST for " IP_ADDR_S " from " IP_ADDR_S " (%s)"),
-           IP_ADDR_V(vpn_ip), IP_ADDR_V(cl->vpn_ip), cl->hostname);
-
   if(!(fw = lookup_conn(vpn_ip)))
     {
       syslog(LOG_ERR, _("Got DEL_HOST for " IP_ADDR_S " from " IP_ADDR_S " (%s) which does not exist?"),
@@ -590,6 +586,10 @@ cp
       return 0;
     }
 
+  if(debug_lvl > 1)
+    syslog(LOG_DEBUG, _("Got DEL_HOST for " IP_ADDR_S " (%s) from " IP_ADDR_S " (%s)"),
+           IP_ADDR_V(fw->vpn_ip), fw->hostname, IP_ADDR_V(cl->vpn_ip), cl->hostname);
+
   notify_others(fw, cl, send_del_host);
 
   fw->status.termreq = 1;

diff --git a/src/tincd.c b/src/tincd.c
index c9cd09ee1aac357b3e67d1e1c2a3c9114095e208..0ae2b7c33c31e1b5913b6ca6d3e05d0a5341c20d 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -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.1 2000/06/25 15:16:12 guus Exp $
+    $Id: tincd.c,v 1.10.4.2 2000/06/28 11:38:01 guus Exp $
 */
 
 #include "config.h"
@@ -352,7 +352,7 @@ main(int argc, char **argv, char **envp)
 
   if(geteuid())
     {
-      fprintf(stderr, _("You must be root to run this program. sorry.\n"));
+      fprintf(stderr, _("You must be root to run this program. Sorry.\n"));
       return 1;
     }