Changed a few messages wrt. system calls; updated and changed the Dutch translation...

diff --git a/po/nl.po b/po/nl.po
index aabeee11b30a6a5fe853f3172c62b9db6106c711..50e97e74c0c8de38470cdcef388bb720a39ea4c1 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tinc 1.0pre3\n"
-"POT-Creation-Date: 2000-10-30 01:16+0100\n"
+"POT-Creation-Date: 2000-11-02 23:03+0100\n"
 "PO-Revision-Date: 2000-05-31 20:14+02:00\n"
 "Last-Translator: Guus Sliepen <guus@sliepen.warande.net>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"
@@ -42,19 +42,19 @@ msgstr ""
 #: src/conf.c:219
 #, c-format
 msgid "Failed to read `%s': %m\n"
-msgstr "Gefaald om `%s' te lezen: %m\n"
+msgstr "`%s' lezen mislukte: %m\n"
 
 #: src/meta.c:45
 #, c-format
 msgid "Sending %d bytes of metadata to %s (%s): %s"
-msgstr "Verzending %d bytes metadata naar %s (%s): %s"
+msgstr "Verzenden van %d bytes metadata naar %s (%s): %s"
 
 #: src/meta.c:61
 #, c-format
 msgid "Sending meta data to %s (%s) failed: %m"
 msgstr "Fout tijdens verzenden metadata naar %s (%s): %m"
 
-#: src/meta.c:89 src/net.c:974
+#: src/meta.c:89 src/net.c:979
 #, c-format
 msgid "This is a bug: %s:%d: %d:%m %s (%s)"
 msgstr "Dit is een programmeerfout: %s:%d: %d:%m %s (%s)"
@@ -82,7 +82,7 @@ msgstr "Kreeg verzoek van %s (%s): %s"
 #: src/meta.c:166
 #, c-format
 msgid "Metadata read buffer overflow for %s (%s)"
-msgstr "Metadata leesbuffer overvol voor %s (%s)"
+msgstr "Metadata leesbuffer overloop voor %s (%s)"
 
 #: src/net.c:127
 #, c-format
@@ -97,7 +97,7 @@ msgstr "Fout tijdens verzenden pakket naar %s (%s): %m"
 #: src/net.c:165
 #, c-format
 msgid "Writing packet of %d bytes to tap device"
-msgstr "Verzending pakket van %d bytes naar tap device"
+msgstr "Verzending pakket van %d bytes naar tap-apparaat"
 
 #: src/net.c:175
 #, c-format
@@ -148,252 +148,238 @@ msgstr "%s is een nieuwe stijl tun/tap apparaat"
 msgid "Creating metasocket failed: %m"
 msgstr "Aanmaak van metasocket mislukt: %m"
 
-#: src/net.c:460 src/net.c:466 src/net.c:528
+#: src/net.c:460 src/net.c:467 src/net.c:475 src/net.c:506 src/net.c:532
+#: src/net.c:540 src/net.c:1004
 #, c-format
-msgid "setsockopt: %m"
-msgstr "setsockopt: %m"
+msgid "System call `%s' failed: %m"
+msgstr "Systeemaanroep `%s' mislukte: %m"
 
-#: src/net.c:473 src/net.c:535
-#, c-format
-msgid "fcntl: %m"
-msgstr "fcntl: %m"
-
-#: src/net.c:481
+#: src/net.c:484
 #, c-format
 msgid "Unable to bind listen socket to interface %s: %m"
 msgstr "Kon luistersocket niet binden aan interface %s: %m"
 
-#: src/net.c:497
+#: src/net.c:500
 #, c-format
 msgid "Can't bind to port %hd/tcp: %m"
 msgstr "Kan niet aan poort %hd/tcp binden: %m"
 
-#: src/net.c:503
-#, c-format
-msgid "listen: %m"
-msgstr "listen: %m"
-
-#: src/net.c:522
+#: src/net.c:526
 #, c-format
 msgid "Creating socket failed: %m"
 msgstr "Aanmaak socket mislukte: %m"
 
-#: src/net.c:546
+#: src/net.c:552
 #, c-format
 msgid "Can't bind to port %hd/udp: %m"
 msgstr "Kan niet aan poort %hd/udp binden: %m"
 
-#: src/net.c:563
+#: src/net.c:569
 #, c-format
 msgid "Trying to connect to %s"
 msgstr "Poging tot verbinding met %s"
 
-#: src/net.c:573
+#: src/net.c:579
 #, c-format
 msgid "Creating socket for %s port %d failed: %m"
 msgstr "Aanmaken socket voor %s poort %d mislukt: %m"
 
-#: src/net.c:584
+#: src/net.c:590
 #, c-format
 msgid "%s port %hd: %m"
 msgstr "%s poort %hd: %m"
 
-#: src/net.c:591
+#: src/net.c:597
 #, c-format
 msgid "fcntl for %s port %d: %m"
 msgstr "fcntl voor %s poort %d: %m"
 
-#: src/net.c:597
+#: src/net.c:603
 #, c-format
 msgid "Connected to %s port %hd"
 msgstr "Verbonden met %s poort %hd"
 
-#: src/net.c:620
+#: src/net.c:626
 msgid "Invalid name for outgoing connection"
 msgstr "Ongelige naam voor uitgaande verbinding"
 
-#: src/net.c:629
+#: src/net.c:635
 #, c-format
 msgid "Error reading host configuration file for %s"
 msgstr "Fout tijdens lezen host configuratie bestand voor %s"
 
-#: src/net.c:636
+#: src/net.c:642
 #, c-format
 msgid "No address specified for %s"
 msgstr "Geen adres gespecificeerd voor %s"
 
-#: src/net.c:643
+#: src/net.c:649
 #, c-format
 msgid "Error looking up `%s': %m"
 msgstr "Fout bij het opzoeken van `%s': %m"
 
-#: src/net.c:653
+#: src/net.c:659
 #, c-format
 msgid "Could not set up a meta connection to %s"
 msgstr "Kon geen metaverbinding aangaan met %s"
 
-#: src/net.c:688
+#: src/net.c:694
 msgid "Name for tinc daemon required!"
 msgstr "Naam voor tinc daemon verplicht!"
 
-#: src/net.c:696
+#: src/net.c:702
 msgid "Invalid name for myself!"
 msgstr "Ongelige naam voor mijzelf!"
 
-#: src/net.c:702
+#: src/net.c:708
 msgid "Private key for tinc daemon required!"
 msgstr "Privé sleutel voor tinc daemon verplicht!"
 
-#: src/net.c:714
+#: src/net.c:720
 msgid "Cannot open host configuration file for myself!"
 msgstr "Kan host configuratie bestand voor mijzelf niet openen!"
 
-#: src/net.c:720
+#: src/net.c:726
 msgid "Public key for tinc daemon required!"
 msgstr "Publieke sleutel voor tinc daemon verplicht!"
 
-#: src/net.c:760
+#: src/net.c:766
 msgid "Network address and subnet mask do not match!"
 msgstr "Netwerk adres en subnet masker komen niet overeen!"
 
-#: src/net.c:769
+#: src/net.c:775
 msgid "Unable to set up a listening socket!"
 msgstr "Kon geen luistersocket aanmaken!"
 
-#: src/net.c:775
+#: src/net.c:781
 msgid "Unable to set up an incoming vpn data socket!"
 msgstr "Kon geen socket maken voor inkomend vpn verkeer!"
 
-#: src/net.c:800
+#: src/net.c:806
 #, c-format
 msgid "Ready: listening on port %hd"
 msgstr "Gereed: luisterend op poort %hd"
 
-#: src/net.c:832
+#: src/net.c:838
 #, 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:867 src/net.c:927
+#: src/net.c:872 src/net.c:932
 #, c-format
 msgid "Error while executing %s: %m"
 msgstr "Fout tijdens uitvoeren %s: %m"
 
-#: src/net.c:889
+#: src/net.c:894
 #, 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:937
+#: src/net.c:942
 msgid "Terminating"
 msgstr "Beëindigen"
 
-#: src/net.c:951
+#: src/net.c:956
 #, c-format
 msgid "Opening UDP socket to %s"
 msgstr "Bezig met openen UDP socket naar %s"
 
-#: src/net.c:956
+#: src/net.c:961
 #, c-format
 msgid "Creating UDP socket failed: %m"
 msgstr "Aanmaak UDP socket mislukte: %m"
 
-#: src/net.c:966
+#: src/net.c:971
 #, c-format
 msgid "Connecting to %s port %d failed: %m"
 msgstr "Verbinding naar %s poort %d mislukt: %m"
 
-#: src/net.c:999
-#, c-format
-msgid "Error: getpeername: %m"
-msgstr "Fout: getpeername: %m"
-
-#: src/net.c:1014
+#: src/net.c:1020
 #, c-format
 msgid "Connection from %s port %d"
 msgstr "Verbinding van %s poort %d"
 
-#: src/net.c:1060
+#: src/net.c:1066
 #, c-format
 msgid "This is a bug: %s:%d: %d:%m"
 msgstr "Dit is een programmeerfout: %s:%d: %d:%m"
 
-#: src/net.c:1066
+#: src/net.c:1072
 #, c-format
 msgid "Incoming data socket error: %s"
 msgstr "Fout op socket voor inkomend verkeer: %s"
 
-#: src/net.c:1072
+#: src/net.c:1078
 #, c-format
 msgid "Receiving packet failed: %m"
 msgstr "Ontvangst pakket mislukt: %m"
 
-#: src/net.c:1078
+#: src/net.c:1084
 #, c-format
 msgid "Received packet of %d bytes"
 msgstr "Ontvangst pakket van %d bytes"
 
-#: src/net.c:1100
+#: src/net.c:1106
 #, c-format
 msgid "Closing connection with %s (%s)"
 msgstr "Beëindigen verbinding met %s (%s)"
 
-#: src/net.c:1136
+#: src/net.c:1142
 msgid "Trying to re-establish outgoing connection in 5 seconds"
 msgstr "Poging tot herstellen van uitgaande verbinding over 5 seconden"
 
-#: src/net.c:1168
+#: src/net.c:1174
 #, c-format
 msgid "%s (%s) didn't respond to PING"
 msgstr "%s (%s) antwoordde niet op ping"
 
-#: src/net.c:1199
+#: src/net.c:1205
 #, c-format
 msgid "Accepting a new connection failed: %m"
 msgstr "Aanname van nieuwe verbinding is mislukt: %m"
 
-#: src/net.c:1207
+#: src/net.c:1213
 msgid "Closed attempted connection"
 msgstr "Aangenomen verbinding verbroken"
 
-#: src/net.c:1240
+#: src/net.c:1246
 #, c-format
 msgid "Outgoing data socket error for %s (%s): %s"
 msgstr "Fout op socket voor uitgaand verkeer voor %s (%s): %s"
 
-#: src/net.c:1276
+#: src/net.c:1282
 #, c-format
 msgid "Error while reading from tun/tap device: %m"
 msgstr "Fout tijdens lezen van tun/tap apparaat: %m"
 
-#: src/net.c:1285
+#: src/net.c:1291
 #, c-format
 msgid "Error while reading from ethertap device: %m"
 msgstr "Fout tijdens lezen van ethertap apparaat: %m"
 
-#: src/net.c:1296
+#: src/net.c:1302
 msgid "Received short packet from tap device"
 msgstr "Kort pakket ontvangen van tap apparaat"
 
-#: src/net.c:1302
+#: src/net.c:1308
 #, c-format
 msgid "Read packet of length %d from tap device"
 msgstr "Pakket gelezen van lengte %d van tap apparaat"
 
-#: src/net.c:1334
+#: src/net.c:1340
 #, c-format
 msgid "Error while waiting for input: %m"
 msgstr "Fout tijdens wachten op invoer: %m"
 
-#: src/net.c:1341
+#: src/net.c:1347
 msgid "Rereading configuration file and restarting in 5 seconds"
 msgstr "Herlezen configuratiebestand en herstart in 5 seconden"
 
-#: src/net.c:1348
+#: src/net.c:1354
 msgid "Unable to reread configuration file, exiting"
 msgstr "Kan configuratiebestand niet herlezen, beëindigen"
 
-#: src/net.c:1374
+#: src/net.c:1380
 msgid "Regenerating symmetric key"
 msgstr "Hergenereren symmetrische sleutel"
 
@@ -578,7 +564,7 @@ msgstr "Waarschuwing: kreeg ADD_SUBNET van %s (%s) voor onszelf, herstart"
 #, c-format
 msgid "Got ADD_SUBNET for %s from %s (%s) which is not in our connection list"
 msgstr ""
-"Kreeg ADD_SUBNET voor %d.%d.%d.%d van %s (%s) die niet voorkomt in onze "
+"Kreeg ADD_SUBNET voor %s van %s (%s) die niet voorkomt in onze "
 "verbindingslijst"
 
 #: src/protocol.c:734
@@ -605,7 +591,7 @@ msgstr "Waarschuwing: kreeg DEL_SUBNET van %s (%s) voor onszelf, herstart"
 #, c-format
 msgid "Got DEL_SUBNET for %s from %s (%s) which is not in our connection list"
 msgstr ""
-"Kreeg DEL_SUBNET voor %d.%d.%d.%d van %s (%s) die niet voorkomt in onze "
+"Kreeg DEL_SUBNET voor %s van %s (%s) die niet voorkomt in onze "
 "verbindingslijst"
 
 #: src/protocol.c:811
@@ -950,3 +936,15 @@ msgstr "Kreeg INT signaal, be
 #, c-format
 msgid "Got unexpected signal %d (%s)"
 msgstr "Kreeg onverwacht signaal %d (%s)"
+
+#~ msgid "Error: getpeername: %m"
+#~ msgstr "Fout: getpeername: %m"
+
+#~ msgid "setsockopt: %m"
+#~ msgstr "setsockopt: %m"
+
+#~ msgid "fcntl: %m"
+#~ msgstr "fcntl: %m"
+
+#~ msgid "listen: %m"
+#~ msgstr "listen: %m"

diff --git a/src/net.c b/src/net.c
index 9376ec3b9101b9ac19553b6fb0991bc0e1268eff..308a64f6796007685878338c92bab2e9d52063ff 100644 (file)
--- a/src/net.c
+++ b/src/net.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: net.c,v 1.35.4.56 2000/10/30 00:22:53 guus Exp $
+    $Id: net.c,v 1.35.4.57 2000/11/02 22:05:35 zarq Exp $
 */
 
 #include "config.h"
@@ -457,20 +457,23 @@ cp
 
   if(setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)))
     {
-      syslog(LOG_ERR, _("setsockopt: %m"));
+      syslog(LOG_ERR, _("System call `%s' failed: %m"),
+            "setsockopt");
       return -1;
     }
 
   if(setsockopt(nfd, SOL_SOCKET, SO_KEEPALIVE, &one, sizeof(one)))
     {
-      syslog(LOG_ERR, _("setsockopt: %m"));
+      syslog(LOG_ERR, _("System call `%s' failed: %m"),
+            "setsockopt");
       return -1;
     }
 
   flags = fcntl(nfd, F_GETFL);
   if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0)
     {
-      syslog(LOG_ERR, _("fcntl: %m"));
+      syslog(LOG_ERR, _("System call `%s' failed: %m"),
+            "fcntl");
       return -1;
     }
 
@@ -500,7 +503,8 @@ cp
 
   if(listen(nfd, 3))
     {
-      syslog(LOG_ERR, _("listen: %m"));
+      syslog(LOG_ERR, _("System call `%s' failed: %m"),
+            "listen");
       return -1;
     }
 cp
@@ -525,14 +529,16 @@ cp
 
   if(setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)))
     {
-      syslog(LOG_ERR, _("setsockopt: %m"));
+      syslog(LOG_ERR, _("System call `%s' failed: %m"),
+            "setsockopt");
       return -1;
     }
 
   flags = fcntl(nfd, F_GETFL);
   if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0)
     {
-      syslog(LOG_ERR, _("fcntl: %m"));
+      syslog(LOG_ERR, _("System call `%s' failed: %m"),
+            "fcntl");
       return -1;
     }
 
@@ -860,7 +866,6 @@ cp
 
   if(!fork())
     {
-
       execl(scriptname, NULL);
 
       if(errno != ENOENT)
@@ -996,7 +1001,8 @@ cp
 
   if(getpeername(sfd, &ci, &len) < 0)
     {
-      syslog(LOG_ERR, _("Error: getpeername: %m"));
+      syslog(LOG_ERR, _("System call `%s' failed: %m"),
+            "getpeername");
       return NULL;
     }