diff -Nru dnsmasq-2.41/CHANGELOG dnsmasq-2.42/CHANGELOG --- dnsmasq-2.41/CHANGELOG 2008-02-12 21:36:39.000000000 +0100 +++ dnsmasq-2.42/CHANGELOG 2008-05-29 21:49:22.000000000 +0200 @@ -2459,10 +2459,50 @@ SIP, XMPP and Google-talk to the example config file. Fix va_list abuse in log.c. This fixes crashes on powerpc - when debug mode is set. Thanks to cedric Duval for the + when debug mode is set. Thanks to Cedric Duval for the patch. +version 2.42 + Define _GNU_SOURCE to avoid problems with later glibc + headers. Thanks to Jima for spotting the problem. - + Add --dhcp-alternate-port option. Thanks to Jan Psota for + the suggestion. + Fix typo in code which is only used on BSD, when Dbus and + IPv6 support is enabled. Thanks to Roy Marples. + Updated Polish translations - thank to Jan Psota. + + Fix OS detection logic to cope with GNU/FreeBSD. + + Fix unitialised variable in DBus code - thanks to Roy + Marples. + + Fix network enumeration code to work on later NetBSD - + thanks to Roy Marples. + + Provide --dhcp-bridge on all BSD variants. + + Define _LARGEFILE_SOURCE which removes an arbitrary 2GB + limit on logfiles. Thanks to Paul Chambers for spotting + the problem. + + Fix RFC3046 agent-id echo code, broken for many + releases. Thanks to Jeremy Laine for spotting the problem + and providing a patch. + + Added Solaris 10 service manifest from David Connelly in + contrib/Solaris10 + + Add --dhcp-scriptuser option. + + Support new capability interface on suitable Linux + kernels, removes "legacy support in use" messages. Thanks + to Jorge Bastos for pointing this out. + + Fix subtle bug in cache code which could cause dnsmasq to + lock spinning CPU in rare circumstances. Thanks to Alex + Chekholko for bug reports and help debugging. + + Support netascii transfer mode for TFTP. diff -Nru /tmp/7MO8KY0fpf/dnsmasq-2.41/contrib/Solaris10/dnsmasq.xml /tmp/pRA3L6jhPD/dnsmasq-2.42/contrib/Solaris10/dnsmasq.xml --- dnsmasq-2.41/contrib/Solaris10/dnsmasq.xml 1970-01-01 01:00:00.000000000 +0100 +++ dnsmasq-2.42/contrib/Solaris10/dnsmasq.xml 2008-05-29 21:49:22.000000000 +0200 @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru /tmp/7MO8KY0fpf/dnsmasq-2.41/contrib/Solaris10/README /tmp/pRA3L6jhPD/dnsmasq-2.42/contrib/Solaris10/README --- dnsmasq-2.41/contrib/Solaris10/README 1970-01-01 01:00:00.000000000 +0100 +++ dnsmasq-2.42/contrib/Solaris10/README 2008-05-29 21:49:22.000000000 +0200 @@ -0,0 +1,28 @@ +From: David Connelly +Date: Mon, Apr 7, 2008 at 3:31 AM +Subject: Solaris 10 service manifest +To: dnsmasq-discuss@lists.thekelleys.org.uk + + +I've found dnsmasq much easier to set up on my home server running Solaris +10 than the stock dhcp/dns server, which is probably overkill anyway for my +simple home network needs. Since Solaris now uses SMF (Service Management +Facility) to manage services I thought I'd create a simple service manifest +for the dnsmasq service. The manifest currently assumes that dnsmasq has +been installed in '/usr/local/sbin/dnsmasq' and the configuration file in +'/usr/local/etc/dnsmasq.conf', so you may have to adjust these paths for +your local installation. Here are the steps I followed to install and enable +the dnsmasq service: + # svccfg import dnsmasq.xml + # svcadm enable dnsmasq + +To confirm that the service is enabled and online: + + # svcs -l dnsmasq + +I've just started learning about SMF so if anyone has any +corrections/feedback they are more than welcome. + +Thanks, +David + diff -Nru /tmp/7MO8KY0fpf/dnsmasq-2.41/debian/changelog /tmp/pRA3L6jhPD/dnsmasq-2.42/debian/changelog --- dnsmasq-2.41/debian/changelog 2008-06-17 14:38:42.000000000 +0200 +++ dnsmasq-2.42/debian/changelog 2008-06-17 14:38:43.000000000 +0200 @@ -1,3 +1,38 @@ +dnsmasq (2.42-3ubuntu1) intrepid; urgency=low + + * Apply latest TearDown spec recommendation + - Replaced "multiuser" in debian/postinst + - Set "Default-Stop: 1" in debian/init LSB header + * Merge from debian unstable (LP: #239404), remaining changes: + - TearDown spec recommendations in debian/postinst and debian/init + - debian/control: Updated maintainer to match DebianMaintainerField + * Dropped changes: + - LSBified init script (fix included in Debian) + + -- Thierry Carrez Tue, 17 Jun 2008 14:18:20 +0200 + +dnsmasq (2.42-3) unstable; urgency=low + + * Fix thinko in init script, breaks status command. (closes: 486455) + + -- Simon Kelley Mon, 16 Jun 2008 11:26:20 +0000 + +dnsmasq (2.42-2) unstable; urgency=low + + * Error check in postinst file. (closes: 485645) + + -- Simon Kelley Tue, 10 Jun 2008 20:25:10 +0000 + +dnsmasq (2.42-1) unstable; urgency=low + + * New upstream. + * Fix manpage typos. (closes: #468762) + * Use LSB log_*_msg rather than echo in init script. (closes: #473117) + * Fix agent-id echo problem. (closes: #473015) + * Fixup changing /usr/share/doc/dnsmasq to symlink. (closes: #468763) + + -- Simon Kelley Wed, 27 Feb 2008 21:15:28 +0000 + dnsmasq (2.41-2ubuntu1) hardy; urgency=low * Merge from debian unstable, remaining changes: @@ -12,7 +47,7 @@ dnsmasq (2.41-2) unstable; urgency=low * Fix rules to build binary-arch and binary-indep correctly. - + -- Simon Kelley Wed, 27 Feb 2008 19:57:10 +0000 dnsmasq (2.41-1) unstable; urgency=low diff -Nru /tmp/7MO8KY0fpf/dnsmasq-2.41/debian/copyright /tmp/pRA3L6jhPD/dnsmasq-2.42/debian/copyright --- dnsmasq-2.41/debian/copyright 2008-06-17 14:38:42.000000000 +0200 +++ dnsmasq-2.42/debian/copyright 2008-06-17 14:38:43.000000000 +0200 @@ -1,4 +1,4 @@ -dnsmasq is Copyright (c) 2000 - 2007 Simon Kelley +dnsmasq is Copyright (c) 2000 - 2008 Simon Kelley It was downloaded from: http://www.thekelleys.org.uk/dnsmasq/ @@ -13,7 +13,8 @@ GNU General Public License for more details. On Debian GNU/Linux systems, the text of the GNU general public license is -available in the file /usr/share/common-licenses/GPL +available in the file /usr/share/common-licenses/GPL-2 or +/usr/share/common-licenses/GPL-3 The Debian package of dnsmasq was created by Simon Kelley with assistance from Lars Bahner. diff -Nru /tmp/7MO8KY0fpf/dnsmasq-2.41/debian/init /tmp/pRA3L6jhPD/dnsmasq-2.42/debian/init --- dnsmasq-2.41/debian/init 2008-06-17 14:38:42.000000000 +0200 +++ dnsmasq-2.42/debian/init 2008-06-17 14:38:43.000000000 +0200 @@ -4,7 +4,7 @@ # Required-Start: $network $remote_fs $syslog # Required-Stop: $network $remote_fs $syslog # Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 +# Default-Stop: 1 # Description: DHCP and DNS server ### END INIT INFO @@ -26,7 +26,22 @@ test "$ENABLED" != "0" || exit 0 test -x $DAEMON || exit 0 -. /lib/lsb/init-functions +# Provide skeleton LSB log functions for backports which don't have LSB functions. +if [ -f /lib/lsb/init-functions ]; then + . /lib/lsb/init-functions +else + log_warning_msg () { + echo -n " ($@)" + } + + log_daemon_msg () { + echo -n "${1}: $2" + } + + log_end_msg () { + echo "."; + } +fi # RESOLV_CONF: # If the resolvconf package is installed then use the resolv conf file @@ -142,7 +157,7 @@ exit 0 ;; 1) - log_warning_msg "(already running)" + log_warning_msg "already running" log_end_msg 0 exit 0 ;; @@ -199,10 +214,10 @@ log_daemon_msg "Checking $DESC" "$NAME" status case "$?" in - 0) log_warning_msg "running" ; log_msg_end 0; exit 0 ;; - 1) log_warning_msg "dead, pid file exists" ; log_msg_end 1; exit 1 ;; - 3) log_warning_msg "not running" ; log_msg_end 3; exit 3 ;; - *) log_warning_msg "unknown" ; log_msg_end 4; exit 4 ;; + 0) log_warning_msg "running" ; log_end_msg 0; exit 0 ;; + 1) log_warning_msg "dead, pid file exists" ; log_end_msg 1; exit 1 ;; + 3) log_warning_msg "not running" ; log_end_msg 3; exit 3 ;; + *) log_warning_msg "unknown" ; log_end_msg 4; exit 4 ;; esac ;; *) diff -Nru /tmp/7MO8KY0fpf/dnsmasq-2.41/debian/postinst /tmp/pRA3L6jhPD/dnsmasq-2.42/debian/postinst --- dnsmasq-2.41/debian/postinst 2008-06-17 14:38:42.000000000 +0200 +++ dnsmasq-2.42/debian/postinst 2008-06-17 14:38:43.000000000 +0200 @@ -11,7 +11,7 @@ fi -update-rc.d dnsmasq multiuser 15 85 >/dev/null +update-rc.d dnsmasq start 15 2 3 4 5 . stop 85 1 . >/dev/null if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then if [ -e /var/run/dnsmasq.pid ]; then @@ -27,3 +27,11 @@ fi fi + +# dpkg can botch the change of /usr/share/doc/dnsmasq from +# directory to symlink. Fix up here. +if [ ! -h /usr/share/doc/dnsmasq ] && [ rmdir /usr/share/doc/dnsmasq ]; then + cd /usr/share/doc/ + ln -s /usr/share/doc/dnsmasq-base dnsmasq +fi + diff -Nru /tmp/7MO8KY0fpf/dnsmasq-2.41/debian/rules /tmp/pRA3L6jhPD/dnsmasq-2.42/debian/rules --- dnsmasq-2.41/debian/rules 2008-06-17 14:38:42.000000000 +0200 +++ dnsmasq-2.42/debian/rules 2008-06-17 14:38:43.000000000 +0200 @@ -1,6 +1,6 @@ #!/usr/bin/make -f # debian/rules file - for dnsmasq. -# Copyright 2001 by Simon Kelley +# Copyright 2001-2008 by Simon Kelley # Based on the sample in the debian hello package which carries the following: # Copyright 1994,1995 by Ian Jackson. # I hereby give you perpetual unlimited permission to copy, @@ -47,6 +47,7 @@ make clean binary-indep: checkroot + $(checkdir) rm -rf debian/daemon install -m 755 \ -d debian/daemon/DEBIAN \ diff -Nru /tmp/7MO8KY0fpf/dnsmasq-2.41/FAQ /tmp/pRA3L6jhPD/dnsmasq-2.42/FAQ --- dnsmasq-2.41/FAQ 2008-02-12 21:36:39.000000000 +0100 +++ dnsmasq-2.42/FAQ 2008-05-29 21:49:22.000000000 +0200 @@ -226,7 +226,7 @@ Q: What network types are supported by the DHCP server? A: Ethernet (and 802.11 wireless) are supported on all platforms. On - Linux Token Ring is also supported. + Linux all network types (including FireWire) are supported. Q: What is this strange "bind-interface" option? diff -Nru /tmp/7MO8KY0fpf/dnsmasq-2.41/man/dnsmasq.8 /tmp/pRA3L6jhPD/dnsmasq-2.42/man/dnsmasq.8 --- dnsmasq-2.41/man/dnsmasq.8 2008-02-12 21:36:39.000000000 +0100 +++ dnsmasq-2.42/man/dnsmasq.8 2008-05-29 21:49:22.000000000 +0200 @@ -77,7 +77,7 @@ .B \-8, --log-facility= Set the facility to which dnsmasq will send syslog entries, this defaults to DAEMON, and to LOCAL0 when debug mode is in operation. If -the facilty given contains at least one '/' character, it is taken to +the facility given contains at least one '/' character, it is taken to be a filename, and dnsmasq logs to the given file, instead of syslog. (Errors whilst reading configuration will still go to syslog, but all output from a successful startup, and all output whilst @@ -378,7 +378,7 @@ the given interface. This flag specifies an A record for the given name in the same way as an /etc/hosts line, except that the address is not constant, but taken from the given interface. If the interface is -down, not configured or non-existant, an empty record is returned. The +down, not configured or non-existent, an empty record is returned. The matching PTR record is also created, mapping the interface address to the name. More than one name may be associated with an interface address by repeating the flag; in that case the first instance is used @@ -406,7 +406,7 @@ options. If the lease time is given, then leases will be given for that length of time. The lease time is in seconds, or minutes (eg 45m) or hours (eg 1h) or the literal "infinite". The -minimum lease time is two minutres. This +minimum lease time is two minutes. This option may be repeated, with different addresses, to enable DHCP service to more than one network. For directly connected networks (ie, networks on which the machine running dnsmasq has an interface) the @@ -635,7 +635,7 @@ .B --dhcp-ignore-names[=[,]] When all the given network-ids match the set of network-ids derived from the net, host, vendor and user classes, ignore any hostname -provided by the host. Note that, unlike dhcp-ignore, it is permissable +provided by the host. Note that, unlike dhcp-ignore, it is permissible to supply no netid tags, in which case DHCP-client supplied hostnames are always ignored, and DHCP hosts are added to the DNS using only dhcp-host configuration in dnsmasq and the contents of /etc/hosts and @@ -671,7 +671,15 @@ unknown leases from unknown hosts are not ignored. This allows new hosts to get a lease without a tedious timeout under all circumstances. It also allows dnsmasq to rebuild its lease database without each client needing to -reaquire a lease, if the database is lost. +reacquire a lease, if the database is lost. +.TP +.B --dhcp-alternate-port[=[,]] +Change the ports used for DHCP from the default. If this option is +given alone, without arguments, it changes the ports used for DHCP +from 67 and 68 to 1067 and 1068. If a single argument is given, that +port number is used for the server and the port number plus one used +for the client. Finally, two port numbers allows arbitrary +specification of both server and client ports for DHCP. .TP .B \-3, --bootp-dynamic Enable dynamic allocation of IP addresses to BOOTP clients. Use this @@ -728,9 +736,9 @@ removed, an "old" event is generated with the new state of the lease, ie no name, and the former name is provided in the environment variable DNSMASQ_OLD_HOSTNAME. DNSMASQ_INTERFACE stores the name of -the interface on which the reuest arrived; this is not set for "old" +the interface on which the request arrived; this is not set for "old" actions when dnsmasq restarts. -All file decriptors are +All file descriptors are closed except stdin, stdout and stderr which are open to /dev/null (except in debug mode). The script is not invoked concurrently: if subsequent lease @@ -740,7 +748,10 @@ leases will be called with "del" and others with "old". must be an absolute pathname, no PATH search occurs. When dnsmasq receives a HUP signal, the script will be invoked for existing leases -with an "old " event. +with an "old " event. +.TP +.B --dhcp-scriptuser +Specify the user as which to run the lease-change script. This defaults to root, but can be changed to another user using this flag. .TP .B \-9, --leasefile-ro Completely suppress use of the lease database file. The file will not @@ -759,7 +770,7 @@ .B --bridge-interface=,[,] Treat DHCP request packets arriving at any of the interfaces as if they had arrived at . This option is only available -on FreeBSD and Dragonfly BSD, and is necessary when using "old style" bridging, since +on BSD platforms, and is necessary when using "old style" bridging, since packets arrive at tap interfaces which don't have an IP address. .TP .B \-s, --domain= @@ -784,8 +795,8 @@ .TP .B --enable-tftp Enable the TFTP server function. This is deliberately limited to that -needed to net-boot a client: Only reading is allowed, and only in -binary/octet mode. The tsize and blksize extensions are supported. +needed to net-boot a client. Only reading is allowed; the tsize and +blksize extensions are supported (tsize is only supported in octet mode). .TP .B --tftp-root= Look for files to transfer using TFTP relative to the given @@ -902,7 +913,7 @@ dnsmasq will not be running as root. When it first creates the logfile dnsmasq changes the ownership of the file to the non-root user it will run as. Logrotate should be configured to create a new log file with -the ownership which matches the exising one before sending SIGUSR2. +the ownership which matches the existing one before sending SIGUSR2. If TCP DNS queries are in progress, the old logfile will remain open in child processes which are handling TCP queries and may continue to be written. There is a limit of 150 seconds, after which all existing TCP @@ -1027,7 +1038,7 @@ 2 - A problem with network access occurred (address in use, attempt to use privileged ports without permission). .PP -3 - A problem occured with a filesystem operation (missing +3 - A problem occurred with a filesystem operation (missing file/directory, permissions). .PP 4 - Memory allocation failure. diff -Nru /tmp/7MO8KY0fpf/dnsmasq-2.41/po/de.po /tmp/pRA3L6jhPD/dnsmasq-2.42/po/de.po --- dnsmasq-2.41/po/de.po 2008-02-12 21:36:39.000000000 +0100 +++ dnsmasq-2.42/po/de.po 2008-05-29 21:49:22.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: dnsmasq 2.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-12 11:04+0000\n" +"POT-Creation-Date: 2008-05-23 21:33+0100\n" "PO-Revision-Date: 2005-09-27 09:37+0100\n" "Last-Translator: Simon Kelley \n" "Language-Team: German \n" @@ -15,37 +15,37 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: cache.c:680 +#: cache.c:700 #, c-format msgid "failed to load names from %s: %s" msgstr "" -#: cache.c:714 dhcp.c:757 +#: cache.c:734 dhcp.c:757 #, c-format msgid "bad address at %s line %d" msgstr "" # @Simon: Here I need an example to understand it :) -#: cache.c:761 dhcp.c:771 +#: cache.c:781 dhcp.c:771 #, c-format msgid "bad name at %s line %d" msgstr "" # @Simon: Here I need an example to understand it :) -#: cache.c:768 dhcp.c:825 +#: cache.c:788 dhcp.c:825 #, c-format msgid "read %s - %d addresses" msgstr "lese %s - %d Adressen" # @Simon: 'lese' is present, is that ok? If it should be past, it would be # @Simon: "gelesen: %s - %d Adressen" - note the colon, it's a must, then. -#: cache.c:806 +#: cache.c:826 msgid "cleared cache" msgstr "Cache geleert" # @Simon: "Cache geleert" is literally "Cache emptied" but I think other translations could be misleading # @Simon: (I don't know a good german replacement for "Cache" but AFAIK "Cache" is common in german) -#: cache.c:855 +#: cache.c:875 #, c-format msgid "" "not giving name %s to the DHCP lease of %s because the name exists in %s " @@ -54,26 +54,26 @@ "Name %s wurde nicht dem DHCP 'Mieter' von %s zugewiesen, da der Name in %" "smit der Adresse %s bereits existiert" -#: cache.c:907 +#: cache.c:927 #, c-format msgid "time %lu" msgstr "" # @Simon: "Mieter" is rather 'logder, renter, tenant, lessee' but I couldn't find anything that fits better. # @Simon: So I thought I put it in ''-marks :) -#: cache.c:908 +#: cache.c:928 #, fuzzy, c-format msgid "cache size %d, %d/%d cache insertions re-used unexpired cache entries." msgstr "" "Cache Größe %d, %d/%d Cache-Einfügungen verwendeten nicht abgelaufene Cache-" "Einträge wieder." -#: cache.c:910 +#: cache.c:930 #, c-format msgid "queries forwarded %u, queries answered locally %u" msgstr "" -#: cache.c:933 +#: cache.c:953 #, c-format msgid "server %s#%d: queries sent %u, retried or failed %u" msgstr "" @@ -98,26 +98,26 @@ msgid "infinite" msgstr "unendlich" -#: option.c:244 +#: option.c:248 msgid "Specify local address(es) to listen on." msgstr "Lokale abzuhörende Adresse(n) angeben." # @Simon: Quite literal translation, sounds not too polite in german. # @Simon: How about: "Bitte die lokalen abzuhörende Adresse(n) angeben." # @Simon: = "Please specify the local address(es) to listen on." -#: option.c:245 +#: option.c:249 msgid "Return ipaddr for all hosts in specified domains." msgstr "Rückkehr-IP-Adresse für alle Geräte in angebenen Domänen" # @Simon: I hope "Return ipaddr" is similar to "Return-ipaddr" and not "Return the ipaddr ... !" -#: option.c:246 +#: option.c:250 msgid "Fake reverse lookups for RFC1918 private address ranges." msgstr "" "'Gefälschte' Rückwärts-Ergebnisse für private Adressbereiche nach RFC1918" # @Simon: I'm a bit unsure about the meaning of "Fake" here, and the best word for "lookup" is "Nachsehen" # @Simon: (that is "looking-for") but I think that cannot be used. "Ergebnisse" = "results", is that near enough? -#: option.c:247 +#: option.c:251 msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)." msgstr "Behandle IP-Adr als NXDOMAIN (wehrt Verisign-Platzhalter ab)." @@ -128,17 +128,17 @@ # @Simon: "Behandle IP-Adr als NXDOMAIN (gegen Verisigns Platzhalter-Gebrauch)." # @Simon: = "Treat ipaddr as NXDOMAIN (defeats Verisigns wildcard usage)." ? # @Simon: But the explanatory(?) effect is only a very tiny bit better, I believe - what do U think? -#: option.c:248 +#: option.c:252 #, c-format msgid "Specify the size of the cache in entries (defaults to %s)." msgstr "Angabe der Größe des Caches in Einträgen (Voreinstellung: %s)." -#: option.c:249 +#: option.c:253 #, c-format msgid "Specify configuration file (defaults to %s)." msgstr "Angabe der Konfigurationsdatei (Voreinstellung: %s)." -#: option.c:250 +#: option.c:254 msgid "Do NOT fork into the background: run in debug mode." msgstr "NICHT in den Hintergrund gehen: Betrieb im Debug-Modus" @@ -146,523 +146,531 @@ # @Simon: I know it sounds a bit clumsy in english, but "fork" would be hard to understand # @Simon: and then I get a problem between "go" and "run" - so... # @Simon: "Debug-mode" = "Fehlersuch-Modus", literally, but I think "Debug-Modus" is better :) -#: option.c:251 +#: option.c:255 msgid "Do NOT forward queries with no domain part." msgstr "Anfragen ohne Domänen-Teil NICHT weiterschicken" # @Simon: "weiterschicken" is rather "pass on" (I hope) but that's the best I found. -#: option.c:252 +#: option.c:256 msgid "Return self-pointing MX records for local hosts." msgstr "Rückgabe auf sich selbst zeigender MX-Einträge für lokale Geräte" # @Simon: "self-pointing" is a bit difficult, the meaning is clear but takes 3-4 words to express it in german. # @Simon: "Geräte" is about "hard-devices". There is a word for "host" (it is "Wirt") but it would be misleading. # @Simon: My online dict suggest "Rechner" (= Computer), but I think "hard-devices" is better because it's more general. -#: option.c:253 +#: option.c:257 msgid "Expand simple names in /etc/hosts with domain-suffix." msgstr "Erweitere einfache Namen in /etc/hosts mit der Domänen-Endung" -#: option.c:254 +#: option.c:258 msgid "Don't forward spurious DNS requests from Windows hosts." msgstr "'unechte' DNS-Anfragen von Windows-Rechnern nicht weiterleiten" # @Simon: I'm a bit unsure about "spurious" -#: option.c:255 +#: option.c:259 msgid "Enable DHCP in the range given with lease duration." msgstr "" -#: option.c:256 +#: option.c:260 #, c-format msgid "Change to this group after startup (defaults to %s)." msgstr "" -#: option.c:257 +#: option.c:261 msgid "Set address or hostname for a specified machine." msgstr "" -#: option.c:258 +#: option.c:262 msgid "Read DHCP host specs from file" msgstr "" -#: option.c:259 +#: option.c:263 msgid "Read DHCP option specs from file" msgstr "" -#: option.c:260 +#: option.c:264 #, c-format msgid "Do NOT load %s file." msgstr "" -#: option.c:261 +#: option.c:265 #, c-format msgid "Specify a hosts file to be read in addition to %s." msgstr "" -#: option.c:262 +#: option.c:266 msgid "Specify interface(s) to listen on." msgstr "" -#: option.c:263 +#: option.c:267 msgid "Specify interface(s) NOT to listen on." msgstr "" -#: option.c:264 +#: option.c:268 msgid "Map DHCP user class to tag." msgstr "" -#: option.c:265 +#: option.c:269 msgid "Map RFC3046 circuit-id to tag." msgstr "" -#: option.c:266 +#: option.c:270 msgid "Map RFC3046 remote-id to tag." msgstr "" -#: option.c:267 +#: option.c:271 msgid "Map RFC3993 subscriber-id to tag." msgstr "" -#: option.c:268 +#: option.c:272 msgid "Don't do DHCP for hosts with tag set." msgstr "" -#: option.c:269 +#: option.c:273 msgid "Force broadcast replies for hosts with tag set." msgstr "" -#: option.c:270 +#: option.c:274 msgid "Do NOT fork into the background, do NOT run in debug mode." msgstr "" -#: option.c:271 +#: option.c:275 msgid "Assume we are the only DHCP server on the local network." msgstr "" -#: option.c:272 +#: option.c:276 #, c-format msgid "Specify where to store DHCP leases (defaults to %s)." msgstr "" -#: option.c:273 +#: option.c:277 msgid "Return MX records for local hosts." msgstr "" -#: option.c:274 +#: option.c:278 msgid "Specify an MX record." msgstr "" -#: option.c:275 +#: option.c:279 msgid "Specify BOOTP options to DHCP server." msgstr "" -#: option.c:276 +#: option.c:280 #, c-format msgid "Do NOT poll %s file, reload only on SIGHUP." msgstr "" -#: option.c:277 +#: option.c:281 msgid "Do NOT cache failed search results." msgstr "" -#: option.c:278 +#: option.c:282 #, c-format msgid "Use nameservers strictly in the order given in %s." msgstr "" -#: option.c:279 +#: option.c:283 msgid "Specify options to be sent to DHCP clients." msgstr "" -#: option.c:280 +#: option.c:284 msgid "DHCP option sent even if the client does not request it." msgstr "" -#: option.c:281 +#: option.c:285 msgid "Specify port to listen for DNS requests on (defaults to 53)." msgstr "" -#: option.c:282 +#: option.c:286 #, c-format msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)." msgstr "" -#: option.c:283 +#: option.c:287 msgid "Log DNS queries." msgstr "" -#: option.c:284 +#: option.c:288 msgid "Force the originating port for upstream DNS queries." msgstr "" -#: option.c:285 +#: option.c:289 msgid "Do NOT read resolv.conf." msgstr "" -#: option.c:286 +#: option.c:290 #, c-format msgid "Specify path to resolv.conf (defaults to %s)." msgstr "" -#: option.c:287 +#: option.c:291 msgid "Specify address(es) of upstream servers with optional domains." msgstr "" -#: option.c:288 +#: option.c:292 msgid "Never forward queries to specified domains." msgstr "" -#: option.c:289 +#: option.c:293 msgid "Specify the domain to be assigned in DHCP leases." msgstr "" -#: option.c:290 +#: option.c:294 msgid "Specify default target in an MX record." msgstr "" -#: option.c:291 +#: option.c:295 msgid "Specify time-to-live in seconds for replies from /etc/hosts." msgstr "" -#: option.c:292 +#: option.c:296 msgid "Specify time-to-live in seconds for negative caching." msgstr "" -#: option.c:293 +#: option.c:297 #, c-format msgid "Change to this user after startup. (defaults to %s)." msgstr "" -#: option.c:294 +#: option.c:298 msgid "Map DHCP vendor class to tag." msgstr "" -#: option.c:295 +#: option.c:299 msgid "Display dnsmasq version and copyright information." msgstr "" -#: option.c:296 +#: option.c:300 msgid "Translate IPv4 addresses from upstream servers." msgstr "" -#: option.c:297 +#: option.c:301 msgid "Specify a SRV record." msgstr "" -#: option.c:298 +#: option.c:302 msgid "Display this message. Use --help dhcp for known DHCP options." msgstr "" -#: option.c:299 +#: option.c:303 #, fuzzy, c-format msgid "Specify path of PID file (defaults to %s)." msgstr "Angabe der Konfigurationsdatei (Voreinstellung: %s)." -#: option.c:300 +#: option.c:304 #, c-format msgid "Specify maximum number of DHCP leases (defaults to %s)." msgstr "" -#: option.c:301 +#: option.c:305 msgid "Answer DNS queries based on the interface a query was sent to." msgstr "" -#: option.c:302 +#: option.c:306 msgid "Specify TXT DNS record." msgstr "" -#: option.c:303 +#: option.c:307 msgid "Specify PTR DNS record." msgstr "" -#: option.c:304 +#: option.c:308 msgid "Give DNS name to IPv4 address of interface." msgstr "" -#: option.c:305 +#: option.c:309 msgid "Bind only to interfaces in use." msgstr "" -#: option.c:306 +#: option.c:310 #, c-format msgid "Read DHCP static host information from %s." msgstr "" -#: option.c:307 +#: option.c:311 msgid "Enable the DBus interface for setting upstream servers, etc." msgstr "" -#: option.c:308 +#: option.c:312 msgid "Do not provide DHCP on this interface, only provide DNS." msgstr "" -#: option.c:309 +#: option.c:313 msgid "Enable dynamic address allocation for bootp." msgstr "" -#: option.c:310 +#: option.c:314 msgid "Map MAC address (with wildcards) to option set." msgstr "" -#: option.c:312 +#: option.c:316 msgid "Treat DHCP requests on aliases as arriving from interface." msgstr "" -#: option.c:314 +#: option.c:318 msgid "Disable ICMP echo address checking in the DHCP server." msgstr "" -#: option.c:315 +#: option.c:319 msgid "Script to run on DHCP lease creation and destruction." msgstr "" -#: option.c:316 +#: option.c:320 msgid "Read configuration from all the files in this directory." msgstr "" -#: option.c:317 +#: option.c:321 msgid "Log to this syslog facility or file. (defaults to DAEMON)" msgstr "" -#: option.c:318 +#: option.c:322 msgid "Read leases at startup, but never write the lease file." msgstr "" -#: option.c:319 +#: option.c:323 #, c-format msgid "Maximum number of concurrent DNS queries. (defaults to %s)" msgstr "" -#: option.c:320 +#: option.c:324 #, c-format msgid "Clear DNS cache when reloading %s." msgstr "" -#: option.c:321 +#: option.c:325 msgid "Ignore hostnames provided by DHCP clients." msgstr "" -#: option.c:322 +#: option.c:326 msgid "Do NOT reuse filename and server fields for extra DHCP options." msgstr "" -#: option.c:323 +#: option.c:327 msgid "Enable integrated read-only TFTP server." msgstr "" -#: option.c:324 +#: option.c:328 msgid "Export files by TFTP only from the specified subtree." msgstr "" -#: option.c:325 +#: option.c:329 msgid "Add client IP address to tftp-root." msgstr "" -#: option.c:326 +#: option.c:330 msgid "Allow access only to files owned by the user running dnsmasq." msgstr "" -#: option.c:327 +#: option.c:331 #, c-format msgid "Maximum number of conncurrent TFTP transfers (defaults to %s)." msgstr "" -#: option.c:328 +#: option.c:332 msgid "Disable the TFTP blocksize extension." msgstr "" -#: option.c:329 +#: option.c:333 msgid "Ephemeral port range for use by TFTP transfers." msgstr "" -#: option.c:330 +#: option.c:334 msgid "Extra logging for DHCP." msgstr "" -#: option.c:331 +#: option.c:335 msgid "Enable async. logging; optionally set queue length." msgstr "" -#: option.c:332 +#: option.c:336 msgid "Stop DNS rebinding. Filter private IP ranges when resolving." msgstr "" -#: option.c:333 +#: option.c:337 msgid "Always perform DNS queries to all servers." msgstr "" -#: option.c:334 +#: option.c:338 msgid "Set tag if client includes option in request." msgstr "" -#: option.c:585 +#: option.c:339 +msgid "Use alternative ports for DHCP." +msgstr "" + +#: option.c:340 +msgid "Run lease-change script as this user." +msgstr "" + +#: option.c:591 #, c-format msgid "" "Usage: dnsmasq [options]\n" "\n" msgstr "" -#: option.c:587 +#: option.c:593 #, c-format msgid "Use short options only on the command line.\n" msgstr "" -#: option.c:589 +#: option.c:595 #, c-format msgid "Valid options are :\n" msgstr "" -#: option.c:610 +#: option.c:616 #, c-format msgid "Known DHCP options:\n" msgstr "" -#: option.c:683 +#: option.c:689 msgid "bad dhcp-option" msgstr "" # @Simon: Here I need an example to understand it :) -#: option.c:739 +#: option.c:745 #, fuzzy msgid "bad IP address" msgstr "lese %s - %d Adressen" -#: option.c:837 +#: option.c:843 msgid "bad domain in dhcp-option" msgstr "" -#: option.c:895 +#: option.c:901 msgid "dhcp-option too long" msgstr "" -#: option.c:942 +#: option.c:948 #, c-format msgid "cannot access directory %s: %s" msgstr "" -#: option.c:961 tftp.c:343 +#: option.c:967 tftp.c:348 #, c-format msgid "cannot access %s: %s" msgstr "" -#: option.c:998 +#: option.c:1004 msgid "only one dhcp-hostsfile allowed" msgstr "" -#: option.c:1005 +#: option.c:1011 msgid "only one dhcp-optsfile allowed" msgstr "" -#: option.c:1049 +#: option.c:1055 msgid "bad MX preference" msgstr "" -#: option.c:1053 +#: option.c:1059 msgid "bad MX name" msgstr "" -#: option.c:1067 +#: option.c:1073 msgid "bad MX target" msgstr "" -#: option.c:1078 +#: option.c:1084 msgid "cannot run scripts under uClinux" msgstr "" -#: option.c:1265 option.c:1273 +#: option.c:1275 option.c:1283 msgid "bad port" msgstr "" -#: option.c:1293 option.c:1318 +#: option.c:1303 option.c:1328 msgid "interface binding not supported" msgstr "" -#: option.c:1427 +#: option.c:1437 msgid "bad port range" msgstr "" -#: option.c:1444 +#: option.c:1454 msgid "bad bridge-interface" msgstr "" -#: option.c:1485 +#: option.c:1495 msgid "bad dhcp-range" msgstr "" -#: option.c:1511 +#: option.c:1521 msgid "only one netid tag allowed" msgstr "" -#: option.c:1551 +#: option.c:1561 msgid "inconsistent DHCP range" msgstr "" -#: option.c:1719 +#: option.c:1729 msgid "bad DHCP host name" msgstr "" -#: option.c:1959 +#: option.c:1900 option.c:2107 +msgid "invalid port number" +msgstr "" + +#: option.c:1986 msgid "bad interface name" msgstr "" -#: option.c:1979 +#: option.c:2006 msgid "bad PTR record" msgstr "" -#: option.c:1999 +#: option.c:2026 msgid "TXT record string too long" msgstr "" -#: option.c:2003 +#: option.c:2030 msgid "bad TXT record" msgstr "" -#: option.c:2063 +#: option.c:2090 msgid "bad SRV record" msgstr "" -#: option.c:2072 +#: option.c:2099 msgid "bad SRV target" msgstr "" -#: option.c:2080 -msgid "invalid port number" -msgstr "" - -#: option.c:2087 +#: option.c:2114 msgid "invalid priority" msgstr "" -#: option.c:2094 +#: option.c:2121 msgid "invalid weight" msgstr "" -#: option.c:2130 +#: option.c:2157 #, c-format msgid "files nested too deep in %s" msgstr "" -#: option.c:2138 tftp.c:497 +#: option.c:2165 tftp.c:503 #, c-format msgid "cannot read %s: %s" msgstr "" -#: option.c:2199 +#: option.c:2226 msgid "missing \"" msgstr "" -#: option.c:2246 +#: option.c:2273 msgid "bad option" msgstr "" -#: option.c:2248 +#: option.c:2275 msgid "extraneous parameter" msgstr "" -#: option.c:2250 +#: option.c:2277 msgid "missing parameter" msgstr "" -#: option.c:2258 +#: option.c:2285 msgid "error" msgstr "" @@ -671,75 +679,75 @@ # @Simon: ("keinen Speicher" = "no memory", "... nicht bekommen" = "... not get") # @Simon: both would be correct - but would sound rather clumsy in german # @Simon: how about "Nicht genügend Speicher verfügbar" = "Not enough memory available" ? -#: option.c:2264 +#: option.c:2291 #, c-format msgid "%s at line %d of %%s" msgstr "%s in Zeile %d von %%s" -#: option.c:2304 option.c:2334 +#: option.c:2331 option.c:2361 #, c-format msgid "read %s" msgstr "" -#: option.c:2400 +#: option.c:2429 #, c-format msgid "Dnsmasq version %s %s\n" msgstr "" -#: option.c:2401 +#: option.c:2430 #, c-format msgid "" "Compile time options %s\n" "\n" msgstr "" -#: option.c:2402 +#: option.c:2431 #, c-format msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" msgstr "" -#: option.c:2403 +#: option.c:2432 #, c-format msgid "Dnsmasq is free software, and you are welcome to redistribute it\n" msgstr "" -#: option.c:2404 +#: option.c:2433 #, c-format msgid "under the terms of the GNU General Public License, version 2 or 3.\n" msgstr "" -#: option.c:2415 +#: option.c:2444 msgid "try --help" msgstr "" -#: option.c:2417 +#: option.c:2446 msgid "try -w" msgstr "" -#: option.c:2420 +#: option.c:2449 #, c-format msgid "bad command line options: %s" msgstr "" -#: option.c:2461 +#: option.c:2490 #, c-format msgid "cannot get host-name: %s" msgstr "" -#: option.c:2489 +#: option.c:2518 msgid "only one resolv.conf file allowed in no-poll mode." msgstr "" -#: option.c:2499 +#: option.c:2528 msgid "must have exactly one resolv.conf to read domain from." msgstr "" -#: option.c:2502 network.c:640 +#: option.c:2531 network.c:640 #, c-format msgid "failed to read %s: %s" msgstr "" -#: option.c:2520 +#: option.c:2549 #, c-format msgid "no search directive found in %s" msgstr "" @@ -753,7 +761,7 @@ msgid "possible DNS-rebind attack detected" msgstr "" -#: isc.c:77 dnsmasq.c:747 +#: isc.c:77 dnsmasq.c:769 #, c-format msgid "failed to access %s: %s" msgstr "" @@ -763,7 +771,7 @@ msgid "failed to load %s: %s" msgstr "" -#: isc.c:97 dnsmasq.c:769 +#: isc.c:97 dnsmasq.c:791 #, c-format msgid "reading %s" msgstr "" @@ -783,7 +791,7 @@ msgid "unknown interface %s in bridge-interface" msgstr "" -#: network.c:389 dnsmasq.c:180 +#: network.c:389 dnsmasq.c:183 #, c-format msgid "failed to create listening socket: %s" msgstr "" @@ -859,177 +867,182 @@ msgid "using nameserver %s#%d" msgstr "" -#: dnsmasq.c:110 +#: dnsmasq.c:113 msgid "" "ISC dhcpd integration not available: set HAVE_ISC_READER in src/config.h" msgstr "" -#: dnsmasq.c:132 +#: dnsmasq.c:135 msgid "TFTP server not available: set HAVE_TFTP in src/config.h" msgstr "" -#: dnsmasq.c:137 +#: dnsmasq.c:140 msgid "asychronous logging is not available under Solaris" msgstr "" -#: dnsmasq.c:151 +#: dnsmasq.c:154 msgid "must set exactly one interface on broken systems without IP_RECVIF" msgstr "" -#: dnsmasq.c:161 +#: dnsmasq.c:164 #, c-format msgid "failed to find list of interfaces: %s" msgstr "" -#: dnsmasq.c:169 +#: dnsmasq.c:172 #, c-format msgid "unknown interface %s" msgstr "" -#: dnsmasq.c:175 +#: dnsmasq.c:178 #, c-format msgid "no interface with address %s" msgstr "" -#: dnsmasq.c:192 dnsmasq.c:561 +#: dnsmasq.c:195 dnsmasq.c:575 #, c-format msgid "DBus error: %s" msgstr "" -#: dnsmasq.c:195 +#: dnsmasq.c:198 msgid "DBus not available: set HAVE_DBUS in src/config.h" msgstr "" -#: dnsmasq.c:204 +#: dnsmasq.c:207 #, c-format msgid "cannot create pipe: %s" msgstr "" -#: dnsmasq.c:225 +#: dnsmasq.c:223 #, c-format -msgid "cannot fork into background: %s" +msgid "cannot chdir to filesystem root: %s" msgstr "" -#: dnsmasq.c:239 +#: dnsmasq.c:231 #, c-format -msgid "cannot chdir to filesystem root: %s" +msgid "cannot fork into background: %s" msgstr "" -#: dnsmasq.c:349 +#: dnsmasq.c:363 #, c-format msgid "started, version %s DNS disabled" msgstr "" -#: dnsmasq.c:351 +#: dnsmasq.c:365 #, c-format msgid "started, version %s cachesize %d" msgstr "" -#: dnsmasq.c:353 +#: dnsmasq.c:367 #, c-format msgid "started, version %s cache disabled" msgstr "" -#: dnsmasq.c:355 +#: dnsmasq.c:369 #, c-format msgid "compile time options: %s" msgstr "" -#: dnsmasq.c:361 +#: dnsmasq.c:375 msgid "DBus support enabled: connected to system bus" msgstr "" -#: dnsmasq.c:363 +#: dnsmasq.c:377 msgid "DBus support enabled: bus connection pending" msgstr "" -#: dnsmasq.c:368 +#: dnsmasq.c:382 msgid "setting --bind-interfaces option because of OS limitations" msgstr "" -#: dnsmasq.c:373 +#: dnsmasq.c:387 #, c-format msgid "warning: interface %s does not currently exist" msgstr "" -#: dnsmasq.c:378 +#: dnsmasq.c:392 msgid "warning: ignoring resolv-file flag because no-resolv is set" msgstr "" -#: dnsmasq.c:381 +#: dnsmasq.c:395 msgid "warning: no upstream servers configured" msgstr "" -#: dnsmasq.c:385 +#: dnsmasq.c:399 #, c-format msgid "asynchronous logging enabled, queue limit is %d messages" msgstr "" -#: dnsmasq.c:397 +#: dnsmasq.c:411 #, c-format msgid "DHCP, static leases only on %.0s%s, lease time %s" msgstr "" -#: dnsmasq.c:398 +#: dnsmasq.c:412 #, c-format msgid "DHCP, IP range %s -- %s, lease time %s" msgstr "" -#: dnsmasq.c:412 +#: dnsmasq.c:426 msgid "root is " msgstr "" -#: dnsmasq.c:412 +#: dnsmasq.c:426 msgid "enabled" msgstr "" -#: dnsmasq.c:414 +#: dnsmasq.c:428 msgid "secure mode" msgstr "" -#: dnsmasq.c:440 +#: dnsmasq.c:454 #, c-format msgid "restricting maximum simultaneous TFTP transfers to %d" msgstr "" -#: dnsmasq.c:449 +#: dnsmasq.c:463 #, c-format msgid "warning: setting capabilities failed: %s" msgstr "" -#: dnsmasq.c:451 +#: dnsmasq.c:465 msgid "running as root" msgstr "" -#: dnsmasq.c:563 +#: dnsmasq.c:577 msgid "connected to system DBus" msgstr "" -#: dnsmasq.c:683 +#: dnsmasq.c:697 #, c-format msgid "child process killed by signal %d" msgstr "" -#: dnsmasq.c:687 +#: dnsmasq.c:701 #, c-format msgid "child process exited with status %d" msgstr "" -#: dnsmasq.c:691 +#: dnsmasq.c:705 #, c-format msgid "failed to execute %s: %s" msgstr "" -#: dnsmasq.c:695 +#: dnsmasq.c:710 #, c-format msgid "failed to create helper: %s" msgstr "" -#: dnsmasq.c:729 +#: dnsmasq.c:714 +#, c-format +msgid "cannot change to user %s for script execution%s%s" +msgstr "" + +#: dnsmasq.c:751 msgid "exiting on receipt of SIGTERM" msgstr "" -#: dnsmasq.c:780 +#: dnsmasq.c:802 #, c-format msgid "no servers found in %s, will retry" msgstr "" @@ -1133,152 +1146,152 @@ msgid "failed to write %s: %s (retry in %us)" msgstr "" -#: rfc2131.c:303 +#: rfc2131.c:304 #, c-format msgid "no address range available for DHCP request %s %s" msgstr "" -#: rfc2131.c:304 +#: rfc2131.c:305 msgid "with subnet selector" msgstr "" -#: rfc2131.c:304 +#: rfc2131.c:305 msgid "via" msgstr "" -#: rfc2131.c:315 +#: rfc2131.c:316 #, c-format msgid "DHCP packet: transaction-id is %u" msgstr "" -#: rfc2131.c:320 +#: rfc2131.c:321 #, c-format msgid "Available DHCP subnet: %s/%s" msgstr "" -#: rfc2131.c:322 +#: rfc2131.c:323 #, c-format msgid "Available DHCP range: %s -- %s" msgstr "" -#: rfc2131.c:350 rfc2131.c:381 +#: rfc2131.c:351 rfc2131.c:382 msgid "disabled" msgstr "" -#: rfc2131.c:393 rfc2131.c:873 +#: rfc2131.c:394 rfc2131.c:874 msgid "address in use" msgstr "" -#: rfc2131.c:396 +#: rfc2131.c:397 msgid "no address configured" msgstr "" -#: rfc2131.c:409 rfc2131.c:736 +#: rfc2131.c:410 rfc2131.c:737 msgid "no address available" msgstr "" -#: rfc2131.c:418 rfc2131.c:883 +#: rfc2131.c:419 rfc2131.c:884 msgid "no leases left" msgstr "" -#: rfc2131.c:421 rfc2131.c:847 +#: rfc2131.c:422 rfc2131.c:848 msgid "wrong network" msgstr "" -#: rfc2131.c:520 +#: rfc2131.c:521 #, c-format msgid "Ignoring domain %s for DHCP host name %s" msgstr "" -#: rfc2131.c:614 +#: rfc2131.c:615 #, c-format msgid "Vendor class: %s" msgstr "" -#: rfc2131.c:616 +#: rfc2131.c:617 #, c-format msgid "User class: %s" msgstr "" -#: rfc2131.c:657 +#: rfc2131.c:658 #, c-format msgid "disabling DHCP static address %s for %s" msgstr "" -#: rfc2131.c:678 +#: rfc2131.c:679 msgid "unknown lease" msgstr "" -#: rfc2131.c:687 rfc2131.c:992 +#: rfc2131.c:688 rfc2131.c:995 msgid "ignored" msgstr "" -#: rfc2131.c:707 +#: rfc2131.c:708 #, c-format msgid "not using configured address %s because it is leased to %s" msgstr "" -#: rfc2131.c:717 +#: rfc2131.c:718 #, c-format msgid "" "not using configured address %s because it is in use by the server or relay" msgstr "" -#: rfc2131.c:720 +#: rfc2131.c:721 #, c-format msgid "not using configured address %s because it was previously declined" msgstr "" -#: rfc2131.c:734 rfc2131.c:876 +#: rfc2131.c:735 rfc2131.c:877 msgid "no unique-id" msgstr "" -#: rfc2131.c:806 +#: rfc2131.c:807 msgid "wrong address" msgstr "" -#: rfc2131.c:823 +#: rfc2131.c:824 msgid "lease not found" msgstr "" -#: rfc2131.c:855 +#: rfc2131.c:856 msgid "address not available" msgstr "" -#: rfc2131.c:866 +#: rfc2131.c:867 msgid "static lease available" msgstr "" -#: rfc2131.c:870 +#: rfc2131.c:871 msgid "address reserved" msgstr "" -#: rfc2131.c:1265 +#: rfc2131.c:1268 #, c-format msgid "tags: %s" msgstr "" -#: rfc2131.c:1352 +#: rfc2131.c:1355 #, c-format msgid "cannot send DHCP/BOOTP option %d: no space left in packet" msgstr "" -#: rfc2131.c:1507 +#: rfc2131.c:1525 #, c-format msgid "requested options: %s" msgstr "" -#: rfc2131.c:1556 +#: rfc2131.c:1574 #, c-format msgid "next server: %s" msgstr "" -#: rfc2131.c:1580 +#: rfc2131.c:1598 #, c-format msgid "bootfile name: %s" msgstr "" -#: rfc2131.c:1583 +#: rfc2131.c:1601 #, c-format msgid "server name: %s" msgstr "" @@ -1297,11 +1310,11 @@ msgid "attempt to set an IPv6 server address via DBus - no IPv6 support" msgstr "" -#: dbus.c:241 +#: dbus.c:243 msgid "setting upstream servers from DBus" msgstr "" -#: dbus.c:279 +#: dbus.c:281 msgid "could not register a DBus message handler" msgstr "" @@ -1315,31 +1328,31 @@ msgid "DHCP request for unsupported hardware type (%d) received on %s" msgstr "" -#: tftp.c:173 +#: tftp.c:175 msgid "unable to get free port for TFTP" msgstr "" -#: tftp.c:188 +#: tftp.c:190 #, c-format msgid "unsupported request from %s" msgstr "" -#: tftp.c:266 +#: tftp.c:271 #, c-format msgid "TFTP sent %s to %s" msgstr "" -#: tftp.c:289 +#: tftp.c:294 #, c-format msgid "file %s not found" msgstr "" -#: tftp.c:399 +#: tftp.c:405 #, c-format msgid "TFTP error %d %s received from %s" msgstr "" -#: tftp.c:430 +#: tftp.c:436 #, c-format msgid "TFTP failed sending %s to %s" msgstr "" diff -Nru /tmp/7MO8KY0fpf/dnsmasq-2.41/po/es.po /tmp/pRA3L6jhPD/dnsmasq-2.42/po/es.po --- dnsmasq-2.41/po/es.po 2008-02-12 21:36:39.000000000 +0100 +++ dnsmasq-2.42/po/es.po 2008-05-29 21:49:22.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: dnsmasq 2.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-12 11:04+0000\n" +"POT-Creation-Date: 2008-05-23 21:33+0100\n" "PO-Revision-Date: 2005-10-07 11:04+0100\n" "Last-Translator: Christopher Chatham \n" "Language-Team: Spanish \n" @@ -15,31 +15,31 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: cache.c:680 +#: cache.c:700 #, fuzzy, c-format msgid "failed to load names from %s: %s" msgstr "no se pudo cargar nombres desde %s: %s" -#: cache.c:714 dhcp.c:757 +#: cache.c:734 dhcp.c:757 #, fuzzy, c-format msgid "bad address at %s line %d" msgstr "direcci�n err�nea en %s l�nea %d" -#: cache.c:761 dhcp.c:771 +#: cache.c:781 dhcp.c:771 #, c-format msgid "bad name at %s line %d" msgstr "nombre err�neo en %s l�nea %d" -#: cache.c:768 dhcp.c:825 +#: cache.c:788 dhcp.c:825 #, c-format msgid "read %s - %d addresses" msgstr "direcci�nes %s - %d le�das" -#: cache.c:806 +#: cache.c:826 msgid "cleared cache" msgstr "el cach� fue liberado" -#: cache.c:855 +#: cache.c:875 #, c-format msgid "" "not giving name %s to the DHCP lease of %s because the name exists in %s " @@ -48,24 +48,24 @@ "no otorgando nombre %s al arriendo DHCP de %s porque el nombre existe en %s " "con direcci�n %s" -#: cache.c:907 +#: cache.c:927 #, c-format msgid "time %lu" msgstr "tiempo %lu" -#: cache.c:908 +#: cache.c:928 #, fuzzy, c-format msgid "cache size %d, %d/%d cache insertions re-used unexpired cache entries." msgstr "" "tama�o de cach� %d, %d/%d inserci�nes de cach� reutilizaron objetos no " "vencidos." -#: cache.c:910 +#: cache.c:930 #, c-format msgid "queries forwarded %u, queries answered locally %u" msgstr "b�squedas reenviadas %u, b�squedas respondidas localmente %u" -#: cache.c:933 +#: cache.c:953 #, c-format msgid "server %s#%d: queries sent %u, retried or failed %u" msgstr "servidor %s#%d: b�squedas enviadas %u, reintentadas o fallidas %u" @@ -84,409 +84,417 @@ msgid "infinite" msgstr "infinito" -#: option.c:244 +#: option.c:248 msgid "Specify local address(es) to listen on." msgstr "Especificar direcci�n(es) locales d�nde escuchar." -#: option.c:245 +#: option.c:249 msgid "Return ipaddr for all hosts in specified domains." msgstr "" "Retornar ipaddr (direcci�n IP) para todos los hosts en los dominios " "especificados." -#: option.c:246 +#: option.c:250 msgid "Fake reverse lookups for RFC1918 private address ranges." msgstr "" "Falsificar b�squedas reversas para rangos de direcci�n privados RFC1918." -#: option.c:247 +#: option.c:251 msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)." msgstr "Tratar ipaddr (direcci�n IP) como NXDOMAIN (derrota comod�n Verisign)." -#: option.c:248 +#: option.c:252 #, c-format msgid "Specify the size of the cache in entries (defaults to %s)." msgstr "" "Especificar tama�o de cach� en cuanto a cantidad de objetos (%s por " "predeterminado)." -#: option.c:249 +#: option.c:253 #, c-format msgid "Specify configuration file (defaults to %s)." msgstr "Especificar archivo de configuraci�n (%s por predeterminado)." -#: option.c:250 +#: option.c:254 msgid "Do NOT fork into the background: run in debug mode." msgstr "NO hacer un fork hacia el fondo: correr en modo debug." -#: option.c:251 +#: option.c:255 msgid "Do NOT forward queries with no domain part." msgstr "NO reenviar b�squedas sin parte de dominio." -#: option.c:252 +#: option.c:256 msgid "Return self-pointing MX records for local hosts." msgstr "Retornar expedientes MX auto-se�aladores para hosts locales." -#: option.c:253 +#: option.c:257 msgid "Expand simple names in /etc/hosts with domain-suffix." msgstr "" "Expandir nombres simples en /etc/hosts con domain-suffix (sufijo de dominio)." -#: option.c:254 +#: option.c:258 msgid "Don't forward spurious DNS requests from Windows hosts." msgstr "No reenviar pedidos DNS falsos desde m�quinas Windows." -#: option.c:255 +#: option.c:259 msgid "Enable DHCP in the range given with lease duration." msgstr "Habilitar DHCP dentro del rango brindado con duraci�n del arriendo." -#: option.c:256 +#: option.c:260 #, c-format msgid "Change to this group after startup (defaults to %s)." msgstr "Cambiar a este grupo despu�s del inicio (%s por predeterminado)." -#: option.c:257 +#: option.c:261 msgid "Set address or hostname for a specified machine." msgstr "Fijar direcci�n o nombre de host para una m�quina especificada." -#: option.c:258 +#: option.c:262 msgid "Read DHCP host specs from file" msgstr "Leer especificaciones DHCP de host desde archivo" -#: option.c:259 +#: option.c:263 msgid "Read DHCP option specs from file" msgstr "Leer opciones DHCP de host desde archivo" -#: option.c:260 +#: option.c:264 #, c-format msgid "Do NOT load %s file." msgstr "NO cargar archivo %s." -#: option.c:261 +#: option.c:265 #, c-format msgid "Specify a hosts file to be read in addition to %s." msgstr "Especificar un archivo de hosts para ser le�do adicionalmente a %s." -#: option.c:262 +#: option.c:266 msgid "Specify interface(s) to listen on." msgstr "Especificar interface(s) donde escuchar." -#: option.c:263 +#: option.c:267 msgid "Specify interface(s) NOT to listen on." msgstr "Especificar interface(s) donde NO escuchar." -#: option.c:264 +#: option.c:268 #, fuzzy msgid "Map DHCP user class to tag." msgstr "Trazar clase de usuario DHCP a etiqueta." -#: option.c:265 +#: option.c:269 msgid "Map RFC3046 circuit-id to tag." msgstr "Trazar circuit-id (identificaci�n de circuito) RFC3046 a etiqueta." -#: option.c:266 +#: option.c:270 msgid "Map RFC3046 remote-id to tag." msgstr "Trazar remote-id (identificaci�n remota) RFC3046 a etiqueta." -#: option.c:267 +#: option.c:271 msgid "Map RFC3993 subscriber-id to tag." msgstr "Trazar subscriber-id (identificaci�n de suscritor) RFC3993 a etiqueta." -#: option.c:268 +#: option.c:272 #, fuzzy msgid "Don't do DHCP for hosts with tag set." msgstr "No hacer DHCP para hosts con la etiqueta fijada." -#: option.c:269 +#: option.c:273 #, fuzzy msgid "Force broadcast replies for hosts with tag set." msgstr "Forzar respuestas broadcast para hosts con etiqueta fijada." -#: option.c:270 +#: option.c:274 msgid "Do NOT fork into the background, do NOT run in debug mode." msgstr "NO hacer un fork hacia el fondo, NO correr en modo debug." -#: option.c:271 +#: option.c:275 msgid "Assume we are the only DHCP server on the local network." msgstr "Asumir que somos el �nico servidor DHCP en la red local." -#: option.c:272 +#: option.c:276 #, c-format msgid "Specify where to store DHCP leases (defaults to %s)." msgstr "Especificar donde almacenar arriendos DHCP (%s por predeterminado)." -#: option.c:273 +#: option.c:277 msgid "Return MX records for local hosts." msgstr "Retornar expedientes MX para hosts locales." -#: option.c:274 +#: option.c:278 msgid "Specify an MX record." msgstr "Especificar un expediente MX." -#: option.c:275 +#: option.c:279 msgid "Specify BOOTP options to DHCP server." msgstr "Especificar opciones BOOTP a servidor DHCP." -#: option.c:276 +#: option.c:280 #, c-format msgid "Do NOT poll %s file, reload only on SIGHUP." msgstr "NO revisar archivo %s peri�dicamente, recargar solo con SIGHUP." -#: option.c:277 +#: option.c:281 msgid "Do NOT cache failed search results." msgstr "NO almacenar en cach� resultados de b�squedas fallidas." -#: option.c:278 +#: option.c:282 #, c-format msgid "Use nameservers strictly in the order given in %s." msgstr "Usar servidores DNS estrictamente en el �rden brindado en %s." -#: option.c:279 +#: option.c:283 #, fuzzy msgid "Specify options to be sent to DHCP clients." msgstr "Especificar opciones para ser enviadas a clientes DHCP." -#: option.c:280 +#: option.c:284 msgid "DHCP option sent even if the client does not request it." msgstr "Opci�n DHCP enviada a�n si el cliente no la pide." -#: option.c:281 +#: option.c:285 msgid "Specify port to listen for DNS requests on (defaults to 53)." msgstr "" "Especificar puerto donde escuchar por b�squedas DNS (53 por predeterminado)." -#: option.c:282 +#: option.c:286 #, c-format msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)." msgstr "" "Tama�o m�ximo de paquetes UDP soportado para EDNS.0 (%s por predeterminado)." -#: option.c:283 +#: option.c:287 #, fuzzy msgid "Log DNS queries." msgstr "Bitacorear b�squedas." -#: option.c:284 +#: option.c:288 #, fuzzy msgid "Force the originating port for upstream DNS queries." msgstr "Enforzar el puerto original para b�squedas upstream." -#: option.c:285 +#: option.c:289 msgid "Do NOT read resolv.conf." msgstr "NO leer resolv.conf." -#: option.c:286 +#: option.c:290 #, c-format msgid "Specify path to resolv.conf (defaults to %s)." msgstr "Especificar el path hacia resolv.conf (%s por predeterminado)." -#: option.c:287 +#: option.c:291 msgid "Specify address(es) of upstream servers with optional domains." msgstr "" "Especificar direcci�n(es) de servidores upstream con dominios opcionales." -#: option.c:288 +#: option.c:292 msgid "Never forward queries to specified domains." msgstr "Nunca reenviar b�squedas a dominios especificados." -#: option.c:289 +#: option.c:293 msgid "Specify the domain to be assigned in DHCP leases." msgstr "Especificar el dominio para ser asignado en arriendos DHCP." -#: option.c:290 +#: option.c:294 msgid "Specify default target in an MX record." msgstr "Especificar destino predeterminado en un expediente MX." -#: option.c:291 +#: option.c:295 msgid "Specify time-to-live in seconds for replies from /etc/hosts." msgstr "" "Especificar tiempo de vida en segundos para respuestas desde /etc/hosts." -#: option.c:292 +#: option.c:296 #, fuzzy msgid "Specify time-to-live in seconds for negative caching." msgstr "Especificar tiempo de vida en segundos para cach� negativo." -#: option.c:293 +#: option.c:297 #, c-format msgid "Change to this user after startup. (defaults to %s)." msgstr "Cambiar a este usuario despues del inicio (%s por predeterminado)." -#: option.c:294 +#: option.c:298 #, fuzzy msgid "Map DHCP vendor class to tag." msgstr "Trazar clase de vendedor DHCP a etiqueta." -#: option.c:295 +#: option.c:299 msgid "Display dnsmasq version and copyright information." msgstr "Mostrar informaci�n sobre la versi�n y copyright de dnsmasq." -#: option.c:296 +#: option.c:300 msgid "Translate IPv4 addresses from upstream servers." msgstr "Traducir direcciones IPv4 desde servidores upstream." -#: option.c:297 +#: option.c:301 msgid "Specify a SRV record." msgstr "Especificar un expediente SRV." -#: option.c:298 +#: option.c:302 msgid "Display this message. Use --help dhcp for known DHCP options." msgstr "Mostrar este mensaje. Usar --help dhcp para opciones DHCP conocidas." -#: option.c:299 +#: option.c:303 #, fuzzy, c-format msgid "Specify path of PID file (defaults to %s)." msgstr "Especificar path de archivo PID (%s por predeterminado)." -#: option.c:300 +#: option.c:304 #, c-format msgid "Specify maximum number of DHCP leases (defaults to %s)." msgstr "Especificar n�mero m�ximo de arriendos DHCP (%s por predeterminado)." -#: option.c:301 +#: option.c:305 msgid "Answer DNS queries based on the interface a query was sent to." msgstr "" "Responder a b�squedas DNS en base a la interface a la cu�l fueron enviadas." -#: option.c:302 +#: option.c:306 msgid "Specify TXT DNS record." msgstr "Especificar expediente DNS TXT." -#: option.c:303 +#: option.c:307 #, fuzzy msgid "Specify PTR DNS record." msgstr "Especificar expediente DNS PTR." -#: option.c:304 +#: option.c:308 msgid "Give DNS name to IPv4 address of interface." msgstr "Otorgar nombre DNS a direcci�n IPv4 de interface." -#: option.c:305 +#: option.c:309 msgid "Bind only to interfaces in use." msgstr "Acoplar solo a interfaces en uso." -#: option.c:306 +#: option.c:310 #, c-format msgid "Read DHCP static host information from %s." msgstr "Leer informaci�n sobre hosts DHCP est�ticos desde %s." -#: option.c:307 +#: option.c:311 msgid "Enable the DBus interface for setting upstream servers, etc." msgstr "Habilitar la interface DBus para fijar servidores upstream, etc." -#: option.c:308 +#: option.c:312 msgid "Do not provide DHCP on this interface, only provide DNS." msgstr "No proveer DHCP en esta interface, s�lo proveer DNS." -#: option.c:309 +#: option.c:313 msgid "Enable dynamic address allocation for bootp." msgstr "Habilitar alocaci�n din�mica de direcci�nes para BOOTP." -#: option.c:310 +#: option.c:314 #, fuzzy msgid "Map MAC address (with wildcards) to option set." msgstr "Trazar direcci�n MAC (con comod�nes) a opci�n fijada." -#: option.c:312 +#: option.c:316 msgid "Treat DHCP requests on aliases as arriving from interface." msgstr "Tratar pedidos DHCP en alias como si llegaran de la interface." -#: option.c:314 +#: option.c:318 msgid "Disable ICMP echo address checking in the DHCP server." msgstr "" "Deshabilitar verificaci�n de direcci�nes echo ICMP en el servidor DHCP." -#: option.c:315 +#: option.c:319 msgid "Script to run on DHCP lease creation and destruction." msgstr "" "Archivo gui�n para ejecutar cuando se crea o destruye un arriendo DHCP." -#: option.c:316 +#: option.c:320 msgid "Read configuration from all the files in this directory." msgstr "Leer configuraci�n desde todos los archivos en este directorio." -#: option.c:317 +#: option.c:321 #, fuzzy msgid "Log to this syslog facility or file. (defaults to DAEMON)" msgstr "" "Bitacorear a esta facilidad syslog o archivo. (DAEMON por predeterminado)" -#: option.c:318 +#: option.c:322 msgid "Read leases at startup, but never write the lease file." msgstr "Leer arriendos al inicio, pero nunca escribir el archivo de arriendos." -#: option.c:319 +#: option.c:323 #, fuzzy, c-format msgid "Maximum number of concurrent DNS queries. (defaults to %s)" msgstr "N�mero m�ximo de b�squedas DNS simult�neas. (%s por predeterminado)" -#: option.c:320 +#: option.c:324 #, c-format msgid "Clear DNS cache when reloading %s." msgstr "Liberar cach� DNS al recargar %s." -#: option.c:321 +#: option.c:325 msgid "Ignore hostnames provided by DHCP clients." msgstr "Ignorar nombres de host brindados por clientes DHCP." -#: option.c:322 +#: option.c:326 msgid "Do NOT reuse filename and server fields for extra DHCP options." msgstr "" "NO reutilizar campos de nombre de archivo y servidor para opciones DHCP " "extra." -#: option.c:323 +#: option.c:327 msgid "Enable integrated read-only TFTP server." msgstr "Habilitar servidor integrado TFTP solo-lectura." -#: option.c:324 +#: option.c:328 msgid "Export files by TFTP only from the specified subtree." msgstr "Exportar archivos v�a TFTP solo del sub-�rbol especificado." -#: option.c:325 +#: option.c:329 msgid "Add client IP address to tftp-root." msgstr "Agregar IP de cliente a tftp-root." -#: option.c:326 +#: option.c:330 msgid "Allow access only to files owned by the user running dnsmasq." msgstr "" "Permitir acceso solo a archivos pertenecientes al usuario que corre dnsmasq." -#: option.c:327 +#: option.c:331 #, fuzzy, c-format msgid "Maximum number of conncurrent TFTP transfers (defaults to %s)." msgstr "" "N�mero m�ximo de transferencias TFTP simult�neas (%s por predeterminado)." -#: option.c:328 +#: option.c:332 msgid "Disable the TFTP blocksize extension." msgstr "Deshabilitar la extensi�n TFTP blocksize (tama�o de bloque)." -#: option.c:329 +#: option.c:333 msgid "Ephemeral port range for use by TFTP transfers." msgstr "Rango de puertos ef�meros para ser usados por transferencias TFTP." -#: option.c:330 +#: option.c:334 msgid "Extra logging for DHCP." msgstr "Bitacoreo extra para DHCP." -#: option.c:331 +#: option.c:335 msgid "Enable async. logging; optionally set queue length." msgstr "Habilitar bitacoreo asincr�nico; opcionalmente fijar tama�o de cola." -#: option.c:332 +#: option.c:336 msgid "Stop DNS rebinding. Filter private IP ranges when resolving." msgstr "Detener revinculaci�n DNS. Filtrar rangos de IP privados al resolver." -#: option.c:333 +#: option.c:337 msgid "Always perform DNS queries to all servers." msgstr "Siempre realizar b�squedas DNS a todos los servidores." -#: option.c:334 +#: option.c:338 msgid "Set tag if client includes option in request." msgstr "Fijar etiqueta si cliente incluye opci�n en pedido." -#: option.c:585 +#: option.c:339 +msgid "Use alternative ports for DHCP." +msgstr "" + +#: option.c:340 +msgid "Run lease-change script as this user." +msgstr "" + +#: option.c:591 #, c-format msgid "" "Usage: dnsmasq [options]\n" @@ -495,192 +503,192 @@ "Modo de uso: dnsmasq [opciones]\n" "\n" -#: option.c:587 +#: option.c:593 #, c-format msgid "Use short options only on the command line.\n" msgstr "Usar opciones cortas solo en la l�nea de comandos.\n" -#: option.c:589 +#: option.c:595 #, c-format msgid "Valid options are :\n" msgstr "Opciones v�lidas son :\n" -#: option.c:610 +#: option.c:616 #, c-format msgid "Known DHCP options:\n" msgstr "Opciones DHCP conocidas:\n" -#: option.c:683 +#: option.c:689 msgid "bad dhcp-option" msgstr "opci�n dhcp-option err�nea" -#: option.c:739 +#: option.c:745 #, fuzzy msgid "bad IP address" msgstr "direcci�n IP err�nea" -#: option.c:837 +#: option.c:843 msgid "bad domain in dhcp-option" msgstr "dominio err�neo en dhcp-option" -#: option.c:895 +#: option.c:901 msgid "dhcp-option too long" msgstr "opci�n dhcp-option demasiado larga" -#: option.c:942 +#: option.c:948 #, fuzzy, c-format msgid "cannot access directory %s: %s" msgstr "no se puede accesar directorio %s: %s" -#: option.c:961 tftp.c:343 +#: option.c:967 tftp.c:348 #, fuzzy, c-format msgid "cannot access %s: %s" msgstr "no se puede accesar %s: %s" -#: option.c:998 +#: option.c:1004 #, fuzzy msgid "only one dhcp-hostsfile allowed" msgstr "solo un dhcp-hostsfile permitido" -#: option.c:1005 +#: option.c:1011 #, fuzzy msgid "only one dhcp-optsfile allowed" msgstr "solo un dhcp-optsfile permitido" -#: option.c:1049 +#: option.c:1055 msgid "bad MX preference" msgstr "preferencia MX err�nea" -#: option.c:1053 +#: option.c:1059 msgid "bad MX name" msgstr "nombre MX err�neo" -#: option.c:1067 +#: option.c:1073 msgid "bad MX target" msgstr "destino MX err�neo" -#: option.c:1078 +#: option.c:1084 msgid "cannot run scripts under uClinux" msgstr "no se pueden correr archivos gui�nes bajo uClinux" -#: option.c:1265 option.c:1273 +#: option.c:1275 option.c:1283 msgid "bad port" msgstr "puerto err�neo" -#: option.c:1293 option.c:1318 +#: option.c:1303 option.c:1328 msgid "interface binding not supported" msgstr "vinculaci�n de interface no est� soportado" -#: option.c:1427 +#: option.c:1437 #, fuzzy msgid "bad port range" msgstr "puerto err�neo" -#: option.c:1444 +#: option.c:1454 msgid "bad bridge-interface" msgstr "opci�n bridge-interface (interface puente) err�nea" -#: option.c:1485 +#: option.c:1495 msgid "bad dhcp-range" msgstr "opci�n dhcp-range (rango DHCP) err�nea" -#: option.c:1511 +#: option.c:1521 msgid "only one netid tag allowed" msgstr "solo una etiqueta netid permitida" -#: option.c:1551 +#: option.c:1561 msgid "inconsistent DHCP range" msgstr "rango DHCP inconsistente" -#: option.c:1719 +#: option.c:1729 #, fuzzy msgid "bad DHCP host name" msgstr "nombre de host DHCP err�neo" -#: option.c:1959 +#: option.c:1900 option.c:2107 +msgid "invalid port number" +msgstr "n�mero de puerto inv�lido" + +#: option.c:1986 #, fuzzy msgid "bad interface name" msgstr "nombre de interface err�neo" -#: option.c:1979 +#: option.c:2006 #, fuzzy msgid "bad PTR record" msgstr "expediente PTR err�neo" -#: option.c:1999 +#: option.c:2026 msgid "TXT record string too long" msgstr "expediente TXT demasiado largo" -#: option.c:2003 +#: option.c:2030 msgid "bad TXT record" msgstr "expediente TXT err�neo" -#: option.c:2063 +#: option.c:2090 msgid "bad SRV record" msgstr "expediente SRV err�neo" -#: option.c:2072 +#: option.c:2099 msgid "bad SRV target" msgstr "destino SRV err�neo" -#: option.c:2080 -msgid "invalid port number" -msgstr "n�mero de puerto inv�lido" - -#: option.c:2087 +#: option.c:2114 msgid "invalid priority" msgstr "prioridad inv�lida" -#: option.c:2094 +#: option.c:2121 msgid "invalid weight" msgstr "peso inv�lido" -#: option.c:2130 +#: option.c:2157 #, c-format msgid "files nested too deep in %s" msgstr "archivos jerarquizados demasiado profundo en %s" -#: option.c:2138 tftp.c:497 +#: option.c:2165 tftp.c:503 #, c-format msgid "cannot read %s: %s" msgstr "no se puede leer %s: %s" -#: option.c:2199 +#: option.c:2226 msgid "missing \"" msgstr "falta \"" -#: option.c:2246 +#: option.c:2273 msgid "bad option" msgstr "opci�n err�nea" -#: option.c:2248 +#: option.c:2275 msgid "extraneous parameter" msgstr "par�metro extra�o" -#: option.c:2250 +#: option.c:2277 msgid "missing parameter" msgstr "par�metro ausente" -#: option.c:2258 +#: option.c:2285 msgid "error" msgstr "error" -#: option.c:2264 +#: option.c:2291 #, c-format msgid "%s at line %d of %%s" msgstr "%s en l�nea %d de %%s" -#: option.c:2304 option.c:2334 +#: option.c:2331 option.c:2361 #, fuzzy, c-format msgid "read %s" msgstr "leyendo %s" -#: option.c:2400 +#: option.c:2429 #, c-format msgid "Dnsmasq version %s %s\n" msgstr "Dnsmasq versi�n %s %s\n" -#: option.c:2401 +#: option.c:2430 #, c-format msgid "" "Compile time options %s\n" @@ -689,53 +697,53 @@ "Opciones de compilaci�n %s\n" "\n" -#: option.c:2402 +#: option.c:2431 #, c-format msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" msgstr "Este software viene SIN NINGUNA GARANTIA.\n" -#: option.c:2403 +#: option.c:2432 #, c-format msgid "Dnsmasq is free software, and you are welcome to redistribute it\n" msgstr "Dnsmasq es software libre, y usted est� bienvenido a redistribuirlo\n" -#: option.c:2404 +#: option.c:2433 #, fuzzy, c-format msgid "under the terms of the GNU General Public License, version 2 or 3.\n" msgstr "bajo los t�rminos de la GNU General Public License, versi�n 2.\n" -#: option.c:2415 +#: option.c:2444 msgid "try --help" msgstr "pruebe --help" -#: option.c:2417 +#: option.c:2446 msgid "try -w" msgstr "pruebe -w" -#: option.c:2420 +#: option.c:2449 #, fuzzy, c-format msgid "bad command line options: %s" msgstr "opciones de l�nea de comandos err�neas: %s" -#: option.c:2461 +#: option.c:2490 #, c-format msgid "cannot get host-name: %s" msgstr "no se puede obtener host-name (nombre de host): %s" -#: option.c:2489 +#: option.c:2518 msgid "only one resolv.conf file allowed in no-poll mode." msgstr "solo un archivo resolv.conf permitido en modo no-poll." -#: option.c:2499 +#: option.c:2528 msgid "must have exactly one resolv.conf to read domain from." msgstr "debe haber ex�ctamente un resolv.conf desde donde leer dominio." -#: option.c:2502 network.c:640 +#: option.c:2531 network.c:640 #, fuzzy, c-format msgid "failed to read %s: %s" msgstr "no se pudo leer %s: %s" -#: option.c:2520 +#: option.c:2549 #, c-format msgid "no search directive found in %s" msgstr "ninguna directiva de b�squeda encontrada en %s" @@ -749,7 +757,7 @@ msgid "possible DNS-rebind attack detected" msgstr "posible ataque de revinculaci�n DNS detectado" -#: isc.c:77 dnsmasq.c:747 +#: isc.c:77 dnsmasq.c:769 #, fuzzy, c-format msgid "failed to access %s: %s" msgstr "no se pudo accesar %s: %s" @@ -759,7 +767,7 @@ msgid "failed to load %s: %s" msgstr "no se pudo cargar %s: %s" -#: isc.c:97 dnsmasq.c:769 +#: isc.c:97 dnsmasq.c:791 #, c-format msgid "reading %s" msgstr "leyendo %s" @@ -780,7 +788,7 @@ msgid "unknown interface %s in bridge-interface" msgstr "interface desconocida %s en bridge-interface" -#: network.c:389 dnsmasq.c:180 +#: network.c:389 dnsmasq.c:183 #, c-format msgid "failed to create listening socket: %s" msgstr "no se pudo crear un socket escuchador: %s" @@ -856,183 +864,188 @@ msgid "using nameserver %s#%d" msgstr "usando servidor DNS %s#%d" -#: dnsmasq.c:110 +#: dnsmasq.c:113 msgid "" "ISC dhcpd integration not available: set HAVE_ISC_READER in src/config.h" msgstr "" "integraci�n dhcpd ISC no disponible: fijar HAVE_ISC_READER en src/config.h" -#: dnsmasq.c:132 +#: dnsmasq.c:135 #, fuzzy msgid "TFTP server not available: set HAVE_TFTP in src/config.h" msgstr "servidor TFTP no disponible: fijar HAVE_TFTP en src/config.h" -#: dnsmasq.c:137 +#: dnsmasq.c:140 #, fuzzy msgid "asychronous logging is not available under Solaris" msgstr "bitacoreo asincr�nico no est� disponible bajo Solaris" -#: dnsmasq.c:151 +#: dnsmasq.c:154 msgid "must set exactly one interface on broken systems without IP_RECVIF" msgstr "debe fijarse ex�ctamente una interface en sistemas rotos sin IP_RECVIF" -#: dnsmasq.c:161 +#: dnsmasq.c:164 #, c-format msgid "failed to find list of interfaces: %s" msgstr "no se pudo encontrar lista de interfaces: %s" -#: dnsmasq.c:169 +#: dnsmasq.c:172 #, c-format msgid "unknown interface %s" msgstr "interface desconocida %s" -#: dnsmasq.c:175 +#: dnsmasq.c:178 #, c-format msgid "no interface with address %s" msgstr "ninguna interface con direcci�n %s" -#: dnsmasq.c:192 dnsmasq.c:561 +#: dnsmasq.c:195 dnsmasq.c:575 #, c-format msgid "DBus error: %s" msgstr "error DBus: %s" -#: dnsmasq.c:195 +#: dnsmasq.c:198 msgid "DBus not available: set HAVE_DBUS in src/config.h" msgstr "DBus no disponible: fijar HAVE_DBUS en src/config.h" -#: dnsmasq.c:204 +#: dnsmasq.c:207 #, fuzzy, c-format msgid "cannot create pipe: %s" msgstr "no se puede crear pipe: %s" -#: dnsmasq.c:225 -#, c-format -msgid "cannot fork into background: %s" -msgstr "no se puede hacer fork hacia el fondo: %s" - -#: dnsmasq.c:239 +#: dnsmasq.c:223 #, c-format msgid "cannot chdir to filesystem root: %s" msgstr "no se puede cambiar directorio a ra�z de sistema de archivos: %s" -#: dnsmasq.c:349 +#: dnsmasq.c:231 +#, c-format +msgid "cannot fork into background: %s" +msgstr "no se puede hacer fork hacia el fondo: %s" + +#: dnsmasq.c:363 #, fuzzy, c-format msgid "started, version %s DNS disabled" msgstr "iniciado, versi�n %s DNS deshabilitado" -#: dnsmasq.c:351 +#: dnsmasq.c:365 #, c-format msgid "started, version %s cachesize %d" msgstr "iniciado, versi�n %s tama�o de cach� %d" -#: dnsmasq.c:353 +#: dnsmasq.c:367 #, c-format msgid "started, version %s cache disabled" msgstr "iniciado, versi�n %s cach� deshabilitado" -#: dnsmasq.c:355 +#: dnsmasq.c:369 #, c-format msgid "compile time options: %s" msgstr "opciones de compilaci�n: %s" -#: dnsmasq.c:361 +#: dnsmasq.c:375 msgid "DBus support enabled: connected to system bus" msgstr "soporte DBus habilitado: conectado a bus de sistema" -#: dnsmasq.c:363 +#: dnsmasq.c:377 msgid "DBus support enabled: bus connection pending" msgstr "soporte DBus habilitado: conecci�n a bus pendiente" -#: dnsmasq.c:368 +#: dnsmasq.c:382 msgid "setting --bind-interfaces option because of OS limitations" msgstr "" "fijando opci�n --bind-interfaces debido a limitaciones de sistema operativo" -#: dnsmasq.c:373 +#: dnsmasq.c:387 #, c-format msgid "warning: interface %s does not currently exist" msgstr "advertencia: interface %s no existe actu�lmente" -#: dnsmasq.c:378 +#: dnsmasq.c:392 msgid "warning: ignoring resolv-file flag because no-resolv is set" msgstr "advertencia: ignorando opci�n resolv-file porque no-resolv est� fijado" -#: dnsmasq.c:381 +#: dnsmasq.c:395 #, fuzzy msgid "warning: no upstream servers configured" msgstr "advertencia: ning�n servidor upstream configurado" -#: dnsmasq.c:385 +#: dnsmasq.c:399 #, c-format msgid "asynchronous logging enabled, queue limit is %d messages" msgstr "bitacoreo asincr�nico habilitado, l�mite de cola es %d mensajes" -#: dnsmasq.c:397 +#: dnsmasq.c:411 #, c-format msgid "DHCP, static leases only on %.0s%s, lease time %s" msgstr "DHCP, arriendos est�ticos solo en %.0s%s, tiempo de arriendo %s" -#: dnsmasq.c:398 +#: dnsmasq.c:412 #, c-format msgid "DHCP, IP range %s -- %s, lease time %s" msgstr "DHCP, rango de IPs %s -- %s, tiempo de arriendo %s" -#: dnsmasq.c:412 +#: dnsmasq.c:426 msgid "root is " msgstr "root es " -#: dnsmasq.c:412 +#: dnsmasq.c:426 #, fuzzy msgid "enabled" msgstr "habilitado" -#: dnsmasq.c:414 +#: dnsmasq.c:428 msgid "secure mode" msgstr "modo seguro" -#: dnsmasq.c:440 +#: dnsmasq.c:454 #, c-format msgid "restricting maximum simultaneous TFTP transfers to %d" msgstr "limitando n�mero m�ximo de transferencias TFTP simult�neas a %d" -#: dnsmasq.c:449 +#: dnsmasq.c:463 #, fuzzy, c-format msgid "warning: setting capabilities failed: %s" msgstr "advertencia: configuraci�n de capacidades ha fallado: %s" -#: dnsmasq.c:451 +#: dnsmasq.c:465 msgid "running as root" msgstr "corriendo como root" -#: dnsmasq.c:563 +#: dnsmasq.c:577 msgid "connected to system DBus" msgstr "conectado a DBus de sistema" -#: dnsmasq.c:683 +#: dnsmasq.c:697 #, c-format msgid "child process killed by signal %d" msgstr "proceso hijo eliminado por se�al %d" -#: dnsmasq.c:687 +#: dnsmasq.c:701 #, c-format msgid "child process exited with status %d" msgstr "proceso hijo hizo exit con estado %d" -#: dnsmasq.c:691 +#: dnsmasq.c:705 #, fuzzy, c-format msgid "failed to execute %s: %s" msgstr "no se pudo ejecutar %s: %s" -#: dnsmasq.c:695 +#: dnsmasq.c:710 #, fuzzy, c-format msgid "failed to create helper: %s" msgstr "no se pudo crear ayudante: %s" -#: dnsmasq.c:729 +#: dnsmasq.c:714 +#, c-format +msgid "cannot change to user %s for script execution%s%s" +msgstr "" + +#: dnsmasq.c:751 msgid "exiting on receipt of SIGTERM" msgstr "saliendo al recibir SIGTERM" -#: dnsmasq.c:780 +#: dnsmasq.c:802 #, fuzzy, c-format msgid "no servers found in %s, will retry" msgstr "ning�n servidor encontrado en %s, se reintentar�" @@ -1136,153 +1149,153 @@ msgid "failed to write %s: %s (retry in %us)" msgstr "error al escribir %s: %s (reintentar en %us)" -#: rfc2131.c:303 +#: rfc2131.c:304 #, c-format msgid "no address range available for DHCP request %s %s" msgstr "ning�n rango de direcci�nes disponible para pedido DHCP %s %s" -#: rfc2131.c:304 +#: rfc2131.c:305 msgid "with subnet selector" msgstr "con selector de subred" -#: rfc2131.c:304 +#: rfc2131.c:305 msgid "via" msgstr "v�a" -#: rfc2131.c:315 +#: rfc2131.c:316 #, c-format msgid "DHCP packet: transaction-id is %u" msgstr "paquete DHCP: transaction-id (identificaci�n de transacci�n) es %u" -#: rfc2131.c:320 +#: rfc2131.c:321 #, c-format msgid "Available DHCP subnet: %s/%s" msgstr "Subred DHCP disponible: %s/%s" -#: rfc2131.c:322 +#: rfc2131.c:323 #, c-format msgid "Available DHCP range: %s -- %s" msgstr "Rango DHCP disponible: %s -- %s" -#: rfc2131.c:350 rfc2131.c:381 +#: rfc2131.c:351 rfc2131.c:382 msgid "disabled" msgstr "deshabilitado" -#: rfc2131.c:393 rfc2131.c:873 +#: rfc2131.c:394 rfc2131.c:874 msgid "address in use" msgstr "direcci�n en uso" -#: rfc2131.c:396 +#: rfc2131.c:397 msgid "no address configured" msgstr "ninguna direcci�n configurada" -#: rfc2131.c:409 rfc2131.c:736 +#: rfc2131.c:410 rfc2131.c:737 msgid "no address available" msgstr "ninguna direcci�n disponible" -#: rfc2131.c:418 rfc2131.c:883 +#: rfc2131.c:419 rfc2131.c:884 msgid "no leases left" msgstr "no sobra ning�n arriendo" -#: rfc2131.c:421 rfc2131.c:847 +#: rfc2131.c:422 rfc2131.c:848 msgid "wrong network" msgstr "red equivocada" -#: rfc2131.c:520 +#: rfc2131.c:521 #, c-format msgid "Ignoring domain %s for DHCP host name %s" msgstr "Ignorando dominio %s para nombre de host DHCP %s" -#: rfc2131.c:614 +#: rfc2131.c:615 #, c-format msgid "Vendor class: %s" msgstr "Clase de vendedor: %s" -#: rfc2131.c:616 +#: rfc2131.c:617 #, c-format msgid "User class: %s" msgstr "Clase de usuario: %s" -#: rfc2131.c:657 +#: rfc2131.c:658 #, fuzzy, c-format msgid "disabling DHCP static address %s for %s" msgstr "deshabilitando direcci�n DHCP est�tica %s para %s" -#: rfc2131.c:678 +#: rfc2131.c:679 msgid "unknown lease" msgstr "arriendo desconocido" -#: rfc2131.c:687 rfc2131.c:992 +#: rfc2131.c:688 rfc2131.c:995 msgid "ignored" msgstr "ignorado" -#: rfc2131.c:707 +#: rfc2131.c:708 #, c-format msgid "not using configured address %s because it is leased to %s" msgstr "no usando direcci�n configurada %s porque est� arrendada a %s" -#: rfc2131.c:717 +#: rfc2131.c:718 #, fuzzy, c-format msgid "" "not using configured address %s because it is in use by the server or relay" msgstr "" "no usando direcci�n configurada %s porque est� en uso por el servidor o relay" -#: rfc2131.c:720 +#: rfc2131.c:721 #, fuzzy, c-format msgid "not using configured address %s because it was previously declined" msgstr "no usando direcci�n configurada %s porque fu� previamente denegada" -#: rfc2131.c:734 rfc2131.c:876 +#: rfc2131.c:735 rfc2131.c:877 msgid "no unique-id" msgstr "ning�n unique-id (identificaci�n �nica)" -#: rfc2131.c:806 +#: rfc2131.c:807 msgid "wrong address" msgstr "direcci�n equivocada" -#: rfc2131.c:823 +#: rfc2131.c:824 msgid "lease not found" msgstr "arriendo no encontrado" -#: rfc2131.c:855 +#: rfc2131.c:856 msgid "address not available" msgstr "direcci�n no disponible" -#: rfc2131.c:866 +#: rfc2131.c:867 msgid "static lease available" msgstr "arriendo est�tico disponible" -#: rfc2131.c:870 +#: rfc2131.c:871 msgid "address reserved" msgstr "direcci�n reservada" -#: rfc2131.c:1265 +#: rfc2131.c:1268 #, c-format msgid "tags: %s" msgstr "etiquetas: %s" -#: rfc2131.c:1352 +#: rfc2131.c:1355 #, fuzzy, c-format msgid "cannot send DHCP/BOOTP option %d: no space left in packet" msgstr "no se puede enviar opci�n DHCP/BOOTP %d: no queda espacio en paquete" -#: rfc2131.c:1507 +#: rfc2131.c:1525 #, fuzzy, c-format msgid "requested options: %s" msgstr "opciones solicitadas: %s" -#: rfc2131.c:1556 +#: rfc2131.c:1574 #, fuzzy, c-format msgid "next server: %s" msgstr "siguiente servidor: %s" -#: rfc2131.c:1580 +#: rfc2131.c:1598 #, c-format msgid "bootfile name: %s" msgstr "nombre de bootfile: %s" -#: rfc2131.c:1583 +#: rfc2131.c:1601 #, c-format msgid "server name: %s" msgstr "nombre de servidor: %s" @@ -1302,11 +1315,11 @@ msgstr "" "intento de fijar direcci�n de servidor IPv6 v�a DBus - no hay soporte IPv6" -#: dbus.c:241 +#: dbus.c:243 msgid "setting upstream servers from DBus" msgstr "fijando servidores upstream desde DBus" -#: dbus.c:279 +#: dbus.c:281 msgid "could not register a DBus message handler" msgstr "no se pudo registrar un manejador de mensajes DBus" @@ -1320,31 +1333,31 @@ msgid "DHCP request for unsupported hardware type (%d) received on %s" msgstr "pedido DHCP por tipo de hardware no-soportado (%d) recibido en %s" -#: tftp.c:173 +#: tftp.c:175 msgid "unable to get free port for TFTP" msgstr "incapaz de conseguir puerto libre para TFTP" -#: tftp.c:188 +#: tftp.c:190 #, c-format msgid "unsupported request from %s" msgstr "pedido no-soportado desde %s" -#: tftp.c:266 +#: tftp.c:271 #, c-format msgid "TFTP sent %s to %s" msgstr "TFTP envi� %s a %s" -#: tftp.c:289 +#: tftp.c:294 #, fuzzy, c-format msgid "file %s not found" msgstr "archivo %s no encontrado" -#: tftp.c:399 +#: tftp.c:405 #, c-format msgid "TFTP error %d %s received from %s" msgstr "error TFTP %d %s recibido de %s" -#: tftp.c:430 +#: tftp.c:436 #, fuzzy, c-format msgid "TFTP failed sending %s to %s" msgstr "TFTP no pudo enviar %s a %s" diff -Nru /tmp/7MO8KY0fpf/dnsmasq-2.41/po/fi.po /tmp/pRA3L6jhPD/dnsmasq-2.42/po/fi.po --- dnsmasq-2.41/po/fi.po 2008-02-12 21:36:39.000000000 +0100 +++ dnsmasq-2.42/po/fi.po 2008-05-29 21:49:22.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: dnsmasq 2.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-12 11:04+0000\n" +"POT-Creation-Date: 2008-05-23 21:33+0100\n" "PO-Revision-Date: 2005-11-28 22:05+0000\n" "Last-Translator: Simon Kelley \n" "Language-Team: Finnish \n" @@ -15,53 +15,53 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: cache.c:680 +#: cache.c:700 #, c-format msgid "failed to load names from %s: %s" msgstr "" -#: cache.c:714 dhcp.c:757 +#: cache.c:734 dhcp.c:757 #, c-format msgid "bad address at %s line %d" msgstr "" -#: cache.c:761 dhcp.c:771 +#: cache.c:781 dhcp.c:771 #, c-format msgid "bad name at %s line %d" msgstr "" -#: cache.c:768 dhcp.c:825 +#: cache.c:788 dhcp.c:825 #, c-format msgid "read %s - %d addresses" msgstr "" -#: cache.c:806 +#: cache.c:826 msgid "cleared cache" msgstr "" -#: cache.c:855 +#: cache.c:875 #, c-format msgid "" "not giving name %s to the DHCP lease of %s because the name exists in %s " "with address %s" msgstr "" -#: cache.c:907 +#: cache.c:927 #, c-format msgid "time %lu" msgstr "" -#: cache.c:908 +#: cache.c:928 #, c-format msgid "cache size %d, %d/%d cache insertions re-used unexpired cache entries." msgstr "" -#: cache.c:910 +#: cache.c:930 #, c-format msgid "queries forwarded %u, queries answered locally %u" msgstr "" -#: cache.c:933 +#: cache.c:953 #, c-format msgid "server %s#%d: queries sent %u, retried or failed %u" msgstr "" @@ -80,618 +80,626 @@ msgid "infinite" msgstr "" -#: option.c:244 +#: option.c:248 msgid "Specify local address(es) to listen on." msgstr "" -#: option.c:245 +#: option.c:249 msgid "Return ipaddr for all hosts in specified domains." msgstr "" -#: option.c:246 +#: option.c:250 msgid "Fake reverse lookups for RFC1918 private address ranges." msgstr "" -#: option.c:247 +#: option.c:251 msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)." msgstr "" -#: option.c:248 +#: option.c:252 #, c-format msgid "Specify the size of the cache in entries (defaults to %s)." msgstr "" -#: option.c:249 +#: option.c:253 #, c-format msgid "Specify configuration file (defaults to %s)." msgstr "" -#: option.c:250 +#: option.c:254 msgid "Do NOT fork into the background: run in debug mode." msgstr "" -#: option.c:251 +#: option.c:255 msgid "Do NOT forward queries with no domain part." msgstr "" -#: option.c:252 +#: option.c:256 msgid "Return self-pointing MX records for local hosts." msgstr "" -#: option.c:253 +#: option.c:257 msgid "Expand simple names in /etc/hosts with domain-suffix." msgstr "" -#: option.c:254 +#: option.c:258 msgid "Don't forward spurious DNS requests from Windows hosts." msgstr "" -#: option.c:255 +#: option.c:259 msgid "Enable DHCP in the range given with lease duration." msgstr "" -#: option.c:256 +#: option.c:260 #, c-format msgid "Change to this group after startup (defaults to %s)." msgstr "" -#: option.c:257 +#: option.c:261 msgid "Set address or hostname for a specified machine." msgstr "" -#: option.c:258 +#: option.c:262 msgid "Read DHCP host specs from file" msgstr "" -#: option.c:259 +#: option.c:263 msgid "Read DHCP option specs from file" msgstr "" -#: option.c:260 +#: option.c:264 #, c-format msgid "Do NOT load %s file." msgstr "" -#: option.c:261 +#: option.c:265 #, c-format msgid "Specify a hosts file to be read in addition to %s." msgstr "" -#: option.c:262 +#: option.c:266 msgid "Specify interface(s) to listen on." msgstr "" -#: option.c:263 +#: option.c:267 msgid "Specify interface(s) NOT to listen on." msgstr "" -#: option.c:264 +#: option.c:268 msgid "Map DHCP user class to tag." msgstr "" -#: option.c:265 +#: option.c:269 msgid "Map RFC3046 circuit-id to tag." msgstr "" -#: option.c:266 +#: option.c:270 msgid "Map RFC3046 remote-id to tag." msgstr "" -#: option.c:267 +#: option.c:271 msgid "Map RFC3993 subscriber-id to tag." msgstr "" -#: option.c:268 +#: option.c:272 msgid "Don't do DHCP for hosts with tag set." msgstr "" -#: option.c:269 +#: option.c:273 msgid "Force broadcast replies for hosts with tag set." msgstr "" -#: option.c:270 +#: option.c:274 msgid "Do NOT fork into the background, do NOT run in debug mode." msgstr "" -#: option.c:271 +#: option.c:275 msgid "Assume we are the only DHCP server on the local network." msgstr "" -#: option.c:272 +#: option.c:276 #, c-format msgid "Specify where to store DHCP leases (defaults to %s)." msgstr "" -#: option.c:273 +#: option.c:277 msgid "Return MX records for local hosts." msgstr "" -#: option.c:274 +#: option.c:278 msgid "Specify an MX record." msgstr "" -#: option.c:275 +#: option.c:279 msgid "Specify BOOTP options to DHCP server." msgstr "" -#: option.c:276 +#: option.c:280 #, c-format msgid "Do NOT poll %s file, reload only on SIGHUP." msgstr "" -#: option.c:277 +#: option.c:281 msgid "Do NOT cache failed search results." msgstr "" -#: option.c:278 +#: option.c:282 #, c-format msgid "Use nameservers strictly in the order given in %s." msgstr "" -#: option.c:279 +#: option.c:283 msgid "Specify options to be sent to DHCP clients." msgstr "" -#: option.c:280 +#: option.c:284 msgid "DHCP option sent even if the client does not request it." msgstr "" -#: option.c:281 +#: option.c:285 msgid "Specify port to listen for DNS requests on (defaults to 53)." msgstr "" -#: option.c:282 +#: option.c:286 #, c-format msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)." msgstr "" -#: option.c:283 +#: option.c:287 msgid "Log DNS queries." msgstr "" -#: option.c:284 +#: option.c:288 msgid "Force the originating port for upstream DNS queries." msgstr "" -#: option.c:285 +#: option.c:289 msgid "Do NOT read resolv.conf." msgstr "" -#: option.c:286 +#: option.c:290 #, c-format msgid "Specify path to resolv.conf (defaults to %s)." msgstr "" -#: option.c:287 +#: option.c:291 msgid "Specify address(es) of upstream servers with optional domains." msgstr "" -#: option.c:288 +#: option.c:292 msgid "Never forward queries to specified domains." msgstr "" -#: option.c:289 +#: option.c:293 msgid "Specify the domain to be assigned in DHCP leases." msgstr "" -#: option.c:290 +#: option.c:294 msgid "Specify default target in an MX record." msgstr "" -#: option.c:291 +#: option.c:295 msgid "Specify time-to-live in seconds for replies from /etc/hosts." msgstr "" -#: option.c:292 +#: option.c:296 msgid "Specify time-to-live in seconds for negative caching." msgstr "" -#: option.c:293 +#: option.c:297 #, c-format msgid "Change to this user after startup. (defaults to %s)." msgstr "" -#: option.c:294 +#: option.c:298 msgid "Map DHCP vendor class to tag." msgstr "" -#: option.c:295 +#: option.c:299 msgid "Display dnsmasq version and copyright information." msgstr "" -#: option.c:296 +#: option.c:300 msgid "Translate IPv4 addresses from upstream servers." msgstr "" -#: option.c:297 +#: option.c:301 msgid "Specify a SRV record." msgstr "" -#: option.c:298 +#: option.c:302 msgid "Display this message. Use --help dhcp for known DHCP options." msgstr "" -#: option.c:299 +#: option.c:303 #, c-format msgid "Specify path of PID file (defaults to %s)." msgstr "" -#: option.c:300 +#: option.c:304 #, c-format msgid "Specify maximum number of DHCP leases (defaults to %s)." msgstr "" -#: option.c:301 +#: option.c:305 msgid "Answer DNS queries based on the interface a query was sent to." msgstr "" -#: option.c:302 +#: option.c:306 msgid "Specify TXT DNS record." msgstr "" -#: option.c:303 +#: option.c:307 msgid "Specify PTR DNS record." msgstr "" -#: option.c:304 +#: option.c:308 msgid "Give DNS name to IPv4 address of interface." msgstr "" -#: option.c:305 +#: option.c:309 msgid "Bind only to interfaces in use." msgstr "" -#: option.c:306 +#: option.c:310 #, c-format msgid "Read DHCP static host information from %s." msgstr "" -#: option.c:307 +#: option.c:311 msgid "Enable the DBus interface for setting upstream servers, etc." msgstr "" -#: option.c:308 +#: option.c:312 msgid "Do not provide DHCP on this interface, only provide DNS." msgstr "" -#: option.c:309 +#: option.c:313 msgid "Enable dynamic address allocation for bootp." msgstr "" -#: option.c:310 +#: option.c:314 msgid "Map MAC address (with wildcards) to option set." msgstr "" -#: option.c:312 +#: option.c:316 msgid "Treat DHCP requests on aliases as arriving from interface." msgstr "" -#: option.c:314 +#: option.c:318 msgid "Disable ICMP echo address checking in the DHCP server." msgstr "" -#: option.c:315 +#: option.c:319 msgid "Script to run on DHCP lease creation and destruction." msgstr "" -#: option.c:316 +#: option.c:320 msgid "Read configuration from all the files in this directory." msgstr "" -#: option.c:317 +#: option.c:321 msgid "Log to this syslog facility or file. (defaults to DAEMON)" msgstr "" -#: option.c:318 +#: option.c:322 msgid "Read leases at startup, but never write the lease file." msgstr "" -#: option.c:319 +#: option.c:323 #, c-format msgid "Maximum number of concurrent DNS queries. (defaults to %s)" msgstr "" -#: option.c:320 +#: option.c:324 #, c-format msgid "Clear DNS cache when reloading %s." msgstr "" -#: option.c:321 +#: option.c:325 msgid "Ignore hostnames provided by DHCP clients." msgstr "" -#: option.c:322 +#: option.c:326 msgid "Do NOT reuse filename and server fields for extra DHCP options." msgstr "" -#: option.c:323 +#: option.c:327 msgid "Enable integrated read-only TFTP server." msgstr "" -#: option.c:324 +#: option.c:328 msgid "Export files by TFTP only from the specified subtree." msgstr "" -#: option.c:325 +#: option.c:329 msgid "Add client IP address to tftp-root." msgstr "" -#: option.c:326 +#: option.c:330 msgid "Allow access only to files owned by the user running dnsmasq." msgstr "" -#: option.c:327 +#: option.c:331 #, c-format msgid "Maximum number of conncurrent TFTP transfers (defaults to %s)." msgstr "" -#: option.c:328 +#: option.c:332 msgid "Disable the TFTP blocksize extension." msgstr "" -#: option.c:329 +#: option.c:333 msgid "Ephemeral port range for use by TFTP transfers." msgstr "" -#: option.c:330 +#: option.c:334 msgid "Extra logging for DHCP." msgstr "" -#: option.c:331 +#: option.c:335 msgid "Enable async. logging; optionally set queue length." msgstr "" -#: option.c:332 +#: option.c:336 msgid "Stop DNS rebinding. Filter private IP ranges when resolving." msgstr "" -#: option.c:333 +#: option.c:337 msgid "Always perform DNS queries to all servers." msgstr "" -#: option.c:334 +#: option.c:338 msgid "Set tag if client includes option in request." msgstr "" -#: option.c:585 +#: option.c:339 +msgid "Use alternative ports for DHCP." +msgstr "" + +#: option.c:340 +msgid "Run lease-change script as this user." +msgstr "" + +#: option.c:591 #, c-format msgid "" "Usage: dnsmasq [options]\n" "\n" msgstr "" -#: option.c:587 +#: option.c:593 #, c-format msgid "Use short options only on the command line.\n" msgstr "" -#: option.c:589 +#: option.c:595 #, c-format msgid "Valid options are :\n" msgstr "" -#: option.c:610 +#: option.c:616 #, c-format msgid "Known DHCP options:\n" msgstr "" -#: option.c:683 +#: option.c:689 msgid "bad dhcp-option" msgstr "" -#: option.c:739 +#: option.c:745 msgid "bad IP address" msgstr "" -#: option.c:837 +#: option.c:843 msgid "bad domain in dhcp-option" msgstr "" -#: option.c:895 +#: option.c:901 msgid "dhcp-option too long" msgstr "" -#: option.c:942 +#: option.c:948 #, c-format msgid "cannot access directory %s: %s" msgstr "" -#: option.c:961 tftp.c:343 +#: option.c:967 tftp.c:348 #, c-format msgid "cannot access %s: %s" msgstr "" -#: option.c:998 +#: option.c:1004 msgid "only one dhcp-hostsfile allowed" msgstr "" -#: option.c:1005 +#: option.c:1011 msgid "only one dhcp-optsfile allowed" msgstr "" -#: option.c:1049 +#: option.c:1055 msgid "bad MX preference" msgstr "" -#: option.c:1053 +#: option.c:1059 msgid "bad MX name" msgstr "" -#: option.c:1067 +#: option.c:1073 msgid "bad MX target" msgstr "" -#: option.c:1078 +#: option.c:1084 msgid "cannot run scripts under uClinux" msgstr "" -#: option.c:1265 option.c:1273 +#: option.c:1275 option.c:1283 msgid "bad port" msgstr "" -#: option.c:1293 option.c:1318 +#: option.c:1303 option.c:1328 msgid "interface binding not supported" msgstr "" -#: option.c:1427 +#: option.c:1437 msgid "bad port range" msgstr "" -#: option.c:1444 +#: option.c:1454 msgid "bad bridge-interface" msgstr "" -#: option.c:1485 +#: option.c:1495 msgid "bad dhcp-range" msgstr "" -#: option.c:1511 +#: option.c:1521 msgid "only one netid tag allowed" msgstr "" -#: option.c:1551 +#: option.c:1561 msgid "inconsistent DHCP range" msgstr "" -#: option.c:1719 +#: option.c:1729 msgid "bad DHCP host name" msgstr "" -#: option.c:1959 +#: option.c:1900 option.c:2107 +msgid "invalid port number" +msgstr "" + +#: option.c:1986 msgid "bad interface name" msgstr "" -#: option.c:1979 +#: option.c:2006 msgid "bad PTR record" msgstr "" -#: option.c:1999 +#: option.c:2026 msgid "TXT record string too long" msgstr "" -#: option.c:2003 +#: option.c:2030 msgid "bad TXT record" msgstr "" -#: option.c:2063 +#: option.c:2090 msgid "bad SRV record" msgstr "" -#: option.c:2072 +#: option.c:2099 msgid "bad SRV target" msgstr "" -#: option.c:2080 -msgid "invalid port number" -msgstr "" - -#: option.c:2087 +#: option.c:2114 msgid "invalid priority" msgstr "" -#: option.c:2094 +#: option.c:2121 msgid "invalid weight" msgstr "" -#: option.c:2130 +#: option.c:2157 #, c-format msgid "files nested too deep in %s" msgstr "" -#: option.c:2138 tftp.c:497 +#: option.c:2165 tftp.c:503 #, c-format msgid "cannot read %s: %s" msgstr "" -#: option.c:2199 +#: option.c:2226 msgid "missing \"" msgstr "" -#: option.c:2246 +#: option.c:2273 msgid "bad option" msgstr "" -#: option.c:2248 +#: option.c:2275 msgid "extraneous parameter" msgstr "" -#: option.c:2250 +#: option.c:2277 msgid "missing parameter" msgstr "" -#: option.c:2258 +#: option.c:2285 msgid "error" msgstr "" -#: option.c:2264 +#: option.c:2291 #, c-format msgid "%s at line %d of %%s" msgstr "" -#: option.c:2304 option.c:2334 +#: option.c:2331 option.c:2361 #, c-format msgid "read %s" msgstr "" -#: option.c:2400 +#: option.c:2429 #, c-format msgid "Dnsmasq version %s %s\n" msgstr "" -#: option.c:2401 +#: option.c:2430 #, c-format msgid "" "Compile time options %s\n" "\n" msgstr "" -#: option.c:2402 +#: option.c:2431 #, c-format msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" msgstr "" -#: option.c:2403 +#: option.c:2432 #, c-format msgid "Dnsmasq is free software, and you are welcome to redistribute it\n" msgstr "" -#: option.c:2404 +#: option.c:2433 #, c-format msgid "under the terms of the GNU General Public License, version 2 or 3.\n" msgstr "" -#: option.c:2415 +#: option.c:2444 msgid "try --help" msgstr "" -#: option.c:2417 +#: option.c:2446 msgid "try -w" msgstr "" -#: option.c:2420 +#: option.c:2449 #, c-format msgid "bad command line options: %s" msgstr "" -#: option.c:2461 +#: option.c:2490 #, c-format msgid "cannot get host-name: %s" msgstr "" -#: option.c:2489 +#: option.c:2518 msgid "only one resolv.conf file allowed in no-poll mode." msgstr "" -#: option.c:2499 +#: option.c:2528 msgid "must have exactly one resolv.conf to read domain from." msgstr "" -#: option.c:2502 network.c:640 +#: option.c:2531 network.c:640 #, c-format msgid "failed to read %s: %s" msgstr "" -#: option.c:2520 +#: option.c:2549 #, c-format msgid "no search directive found in %s" msgstr "" @@ -705,7 +713,7 @@ msgid "possible DNS-rebind attack detected" msgstr "" -#: isc.c:77 dnsmasq.c:747 +#: isc.c:77 dnsmasq.c:769 #, c-format msgid "failed to access %s: %s" msgstr "" @@ -715,7 +723,7 @@ msgid "failed to load %s: %s" msgstr "" -#: isc.c:97 dnsmasq.c:769 +#: isc.c:97 dnsmasq.c:791 #, c-format msgid "reading %s" msgstr "" @@ -735,7 +743,7 @@ msgid "unknown interface %s in bridge-interface" msgstr "" -#: network.c:389 dnsmasq.c:180 +#: network.c:389 dnsmasq.c:183 #, c-format msgid "failed to create listening socket: %s" msgstr "" @@ -811,177 +819,182 @@ msgid "using nameserver %s#%d" msgstr "" -#: dnsmasq.c:110 +#: dnsmasq.c:113 msgid "" "ISC dhcpd integration not available: set HAVE_ISC_READER in src/config.h" msgstr "" -#: dnsmasq.c:132 +#: dnsmasq.c:135 msgid "TFTP server not available: set HAVE_TFTP in src/config.h" msgstr "" -#: dnsmasq.c:137 +#: dnsmasq.c:140 msgid "asychronous logging is not available under Solaris" msgstr "" -#: dnsmasq.c:151 +#: dnsmasq.c:154 msgid "must set exactly one interface on broken systems without IP_RECVIF" msgstr "" -#: dnsmasq.c:161 +#: dnsmasq.c:164 #, c-format msgid "failed to find list of interfaces: %s" msgstr "" -#: dnsmasq.c:169 +#: dnsmasq.c:172 #, c-format msgid "unknown interface %s" msgstr "" -#: dnsmasq.c:175 +#: dnsmasq.c:178 #, c-format msgid "no interface with address %s" msgstr "" -#: dnsmasq.c:192 dnsmasq.c:561 +#: dnsmasq.c:195 dnsmasq.c:575 #, c-format msgid "DBus error: %s" msgstr "" -#: dnsmasq.c:195 +#: dnsmasq.c:198 msgid "DBus not available: set HAVE_DBUS in src/config.h" msgstr "" -#: dnsmasq.c:204 +#: dnsmasq.c:207 #, c-format msgid "cannot create pipe: %s" msgstr "" -#: dnsmasq.c:225 +#: dnsmasq.c:223 #, c-format -msgid "cannot fork into background: %s" +msgid "cannot chdir to filesystem root: %s" msgstr "" -#: dnsmasq.c:239 +#: dnsmasq.c:231 #, c-format -msgid "cannot chdir to filesystem root: %s" +msgid "cannot fork into background: %s" msgstr "" -#: dnsmasq.c:349 +#: dnsmasq.c:363 #, c-format msgid "started, version %s DNS disabled" msgstr "" -#: dnsmasq.c:351 +#: dnsmasq.c:365 #, c-format msgid "started, version %s cachesize %d" msgstr "" -#: dnsmasq.c:353 +#: dnsmasq.c:367 #, c-format msgid "started, version %s cache disabled" msgstr "" -#: dnsmasq.c:355 +#: dnsmasq.c:369 #, c-format msgid "compile time options: %s" msgstr "" -#: dnsmasq.c:361 +#: dnsmasq.c:375 msgid "DBus support enabled: connected to system bus" msgstr "" -#: dnsmasq.c:363 +#: dnsmasq.c:377 msgid "DBus support enabled: bus connection pending" msgstr "" -#: dnsmasq.c:368 +#: dnsmasq.c:382 msgid "setting --bind-interfaces option because of OS limitations" msgstr "" -#: dnsmasq.c:373 +#: dnsmasq.c:387 #, c-format msgid "warning: interface %s does not currently exist" msgstr "" -#: dnsmasq.c:378 +#: dnsmasq.c:392 msgid "warning: ignoring resolv-file flag because no-resolv is set" msgstr "" -#: dnsmasq.c:381 +#: dnsmasq.c:395 msgid "warning: no upstream servers configured" msgstr "" -#: dnsmasq.c:385 +#: dnsmasq.c:399 #, c-format msgid "asynchronous logging enabled, queue limit is %d messages" msgstr "" -#: dnsmasq.c:397 +#: dnsmasq.c:411 #, c-format msgid "DHCP, static leases only on %.0s%s, lease time %s" msgstr "" -#: dnsmasq.c:398 +#: dnsmasq.c:412 #, c-format msgid "DHCP, IP range %s -- %s, lease time %s" msgstr "" -#: dnsmasq.c:412 +#: dnsmasq.c:426 msgid "root is " msgstr "" -#: dnsmasq.c:412 +#: dnsmasq.c:426 msgid "enabled" msgstr "" -#: dnsmasq.c:414 +#: dnsmasq.c:428 msgid "secure mode" msgstr "" -#: dnsmasq.c:440 +#: dnsmasq.c:454 #, c-format msgid "restricting maximum simultaneous TFTP transfers to %d" msgstr "" -#: dnsmasq.c:449 +#: dnsmasq.c:463 #, c-format msgid "warning: setting capabilities failed: %s" msgstr "" -#: dnsmasq.c:451 +#: dnsmasq.c:465 msgid "running as root" msgstr "" -#: dnsmasq.c:563 +#: dnsmasq.c:577 msgid "connected to system DBus" msgstr "" -#: dnsmasq.c:683 +#: dnsmasq.c:697 #, c-format msgid "child process killed by signal %d" msgstr "" -#: dnsmasq.c:687 +#: dnsmasq.c:701 #, c-format msgid "child process exited with status %d" msgstr "" -#: dnsmasq.c:691 +#: dnsmasq.c:705 #, c-format msgid "failed to execute %s: %s" msgstr "" -#: dnsmasq.c:695 +#: dnsmasq.c:710 #, c-format msgid "failed to create helper: %s" msgstr "" -#: dnsmasq.c:729 +#: dnsmasq.c:714 +#, c-format +msgid "cannot change to user %s for script execution%s%s" +msgstr "" + +#: dnsmasq.c:751 msgid "exiting on receipt of SIGTERM" msgstr "" -#: dnsmasq.c:780 +#: dnsmasq.c:802 #, c-format msgid "no servers found in %s, will retry" msgstr "" @@ -1085,152 +1098,152 @@ msgid "failed to write %s: %s (retry in %us)" msgstr "" -#: rfc2131.c:303 +#: rfc2131.c:304 #, c-format msgid "no address range available for DHCP request %s %s" msgstr "" -#: rfc2131.c:304 +#: rfc2131.c:305 msgid "with subnet selector" msgstr "" -#: rfc2131.c:304 +#: rfc2131.c:305 msgid "via" msgstr "" -#: rfc2131.c:315 +#: rfc2131.c:316 #, c-format msgid "DHCP packet: transaction-id is %u" msgstr "" -#: rfc2131.c:320 +#: rfc2131.c:321 #, c-format msgid "Available DHCP subnet: %s/%s" msgstr "" -#: rfc2131.c:322 +#: rfc2131.c:323 #, c-format msgid "Available DHCP range: %s -- %s" msgstr "" -#: rfc2131.c:350 rfc2131.c:381 +#: rfc2131.c:351 rfc2131.c:382 msgid "disabled" msgstr "" -#: rfc2131.c:393 rfc2131.c:873 +#: rfc2131.c:394 rfc2131.c:874 msgid "address in use" msgstr "" -#: rfc2131.c:396 +#: rfc2131.c:397 msgid "no address configured" msgstr "" -#: rfc2131.c:409 rfc2131.c:736 +#: rfc2131.c:410 rfc2131.c:737 msgid "no address available" msgstr "" -#: rfc2131.c:418 rfc2131.c:883 +#: rfc2131.c:419 rfc2131.c:884 msgid "no leases left" msgstr "" -#: rfc2131.c:421 rfc2131.c:847 +#: rfc2131.c:422 rfc2131.c:848 msgid "wrong network" msgstr "" -#: rfc2131.c:520 +#: rfc2131.c:521 #, c-format msgid "Ignoring domain %s for DHCP host name %s" msgstr "" -#: rfc2131.c:614 +#: rfc2131.c:615 #, c-format msgid "Vendor class: %s" msgstr "" -#: rfc2131.c:616 +#: rfc2131.c:617 #, c-format msgid "User class: %s" msgstr "" -#: rfc2131.c:657 +#: rfc2131.c:658 #, c-format msgid "disabling DHCP static address %s for %s" msgstr "" -#: rfc2131.c:678 +#: rfc2131.c:679 msgid "unknown lease" msgstr "" -#: rfc2131.c:687 rfc2131.c:992 +#: rfc2131.c:688 rfc2131.c:995 msgid "ignored" msgstr "" -#: rfc2131.c:707 +#: rfc2131.c:708 #, c-format msgid "not using configured address %s because it is leased to %s" msgstr "" -#: rfc2131.c:717 +#: rfc2131.c:718 #, c-format msgid "" "not using configured address %s because it is in use by the server or relay" msgstr "" -#: rfc2131.c:720 +#: rfc2131.c:721 #, c-format msgid "not using configured address %s because it was previously declined" msgstr "" -#: rfc2131.c:734 rfc2131.c:876 +#: rfc2131.c:735 rfc2131.c:877 msgid "no unique-id" msgstr "" -#: rfc2131.c:806 +#: rfc2131.c:807 msgid "wrong address" msgstr "" -#: rfc2131.c:823 +#: rfc2131.c:824 msgid "lease not found" msgstr "" -#: rfc2131.c:855 +#: rfc2131.c:856 msgid "address not available" msgstr "" -#: rfc2131.c:866 +#: rfc2131.c:867 msgid "static lease available" msgstr "" -#: rfc2131.c:870 +#: rfc2131.c:871 msgid "address reserved" msgstr "" -#: rfc2131.c:1265 +#: rfc2131.c:1268 #, c-format msgid "tags: %s" msgstr "" -#: rfc2131.c:1352 +#: rfc2131.c:1355 #, c-format msgid "cannot send DHCP/BOOTP option %d: no space left in packet" msgstr "" -#: rfc2131.c:1507 +#: rfc2131.c:1525 #, c-format msgid "requested options: %s" msgstr "" -#: rfc2131.c:1556 +#: rfc2131.c:1574 #, c-format msgid "next server: %s" msgstr "" -#: rfc2131.c:1580 +#: rfc2131.c:1598 #, c-format msgid "bootfile name: %s" msgstr "" -#: rfc2131.c:1583 +#: rfc2131.c:1601 #, c-format msgid "server name: %s" msgstr "" @@ -1249,11 +1262,11 @@ msgid "attempt to set an IPv6 server address via DBus - no IPv6 support" msgstr "" -#: dbus.c:241 +#: dbus.c:243 msgid "setting upstream servers from DBus" msgstr "" -#: dbus.c:279 +#: dbus.c:281 msgid "could not register a DBus message handler" msgstr "" @@ -1267,31 +1280,31 @@ msgid "DHCP request for unsupported hardware type (%d) received on %s" msgstr "" -#: tftp.c:173 +#: tftp.c:175 msgid "unable to get free port for TFTP" msgstr "" -#: tftp.c:188 +#: tftp.c:190 #, c-format msgid "unsupported request from %s" msgstr "" -#: tftp.c:266 +#: tftp.c:271 #, c-format msgid "TFTP sent %s to %s" msgstr "" -#: tftp.c:289 +#: tftp.c:294 #, c-format msgid "file %s not found" msgstr "" -#: tftp.c:399 +#: tftp.c:405 #, c-format msgid "TFTP error %d %s received from %s" msgstr "" -#: tftp.c:430 +#: tftp.c:436 #, c-format msgid "TFTP failed sending %s to %s" msgstr "" diff -Nru /tmp/7MO8KY0fpf/dnsmasq-2.41/po/fr.po /tmp/pRA3L6jhPD/dnsmasq-2.42/po/fr.po --- dnsmasq-2.41/po/fr.po 2008-02-12 21:36:39.000000000 +0100 +++ dnsmasq-2.42/po/fr.po 2008-05-29 21:49:22.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: dnsmasq 2.34\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-12 11:04+0000\n" +"POT-Creation-Date: 2008-05-23 21:33+0100\n" "PO-Revision-Date: 2005-10-02 19:05+0100\n" "Last-Translator: Lionel Tricon \n" "Language-Team: French \n" @@ -16,31 +16,31 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: cache.c:680 +#: cache.c:700 #, fuzzy, c-format msgid "failed to load names from %s: %s" msgstr "Impossible de charger les noms � partir de %s : %m" -#: cache.c:714 dhcp.c:757 +#: cache.c:734 dhcp.c:757 #, c-format msgid "bad address at %s line %d" msgstr "mauvaise adresse dans %s ligne %d" -#: cache.c:761 dhcp.c:771 +#: cache.c:781 dhcp.c:771 #, c-format msgid "bad name at %s line %d" msgstr "mauvais nom dans %s ligne %d" -#: cache.c:768 dhcp.c:825 +#: cache.c:788 dhcp.c:825 #, c-format msgid "read %s - %d addresses" msgstr "lecture %s - %d adresses" -#: cache.c:806 +#: cache.c:826 msgid "cleared cache" msgstr "cache vid�" -#: cache.c:855 +#: cache.c:875 #, c-format msgid "" "not giving name %s to the DHCP lease of %s because the name exists in %s " @@ -49,24 +49,24 @@ "ne donne pas de nom %s au bail DHCP de %s parce-que le nom existe dans %s " "avec l'adresse %s" -#: cache.c:907 +#: cache.c:927 #, c-format msgid "time %lu" msgstr "" -#: cache.c:908 +#: cache.c:928 #, fuzzy, c-format msgid "cache size %d, %d/%d cache insertions re-used unexpired cache entries." msgstr "" "temps %lu, taille de cache %d, %d/%d insertions dans le cache ont " "r�utilis�es des entr�es qui n'ont pas expir�es" -#: cache.c:910 +#: cache.c:930 #, c-format msgid "queries forwarded %u, queries answered locally %u" msgstr "" -#: cache.c:933 +#: cache.c:953 #, c-format msgid "server %s#%d: queries sent %u, retried or failed %u" msgstr "" @@ -85,422 +85,430 @@ msgid "infinite" msgstr "illimit�(e)" -#: option.c:244 +#: option.c:248 msgid "Specify local address(es) to listen on." msgstr "" "Sp�cifie la ou les adresse(s) locales o� le d�mon doit se mettre � l'�coute." -#: option.c:245 +#: option.c:249 msgid "Return ipaddr for all hosts in specified domains." msgstr "" "Retourne les adresses IP pour toutes les machines pr�sentes dans les " "domaines sp�cifi�s" -#: option.c:246 +#: option.c:250 msgid "Fake reverse lookups for RFC1918 private address ranges." msgstr "Traduction inverse truqu�e pour la plage d'adresse priv�e RFC1918" -#: option.c:247 +#: option.c:251 msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)." msgstr "" "Traite l'adresse IP comme un domaine inexistant NXDOMAIN (contourne le " "systeme de redirection de Verisign)" -#: option.c:248 +#: option.c:252 #, c-format msgid "Specify the size of the cache in entries (defaults to %s)." msgstr "" "Sp�cifie le nombre d'entr�es que contiendra le cache (par d�faut : %s)." -#: option.c:249 +#: option.c:253 #, c-format msgid "Specify configuration file (defaults to %s)." msgstr "Sp�cifie le nom du fichier de configuration (par d�faut : %s)" -#: option.c:250 +#: option.c:254 msgid "Do NOT fork into the background: run in debug mode." msgstr "Ne passe pas en t�che de fond : d�marre en mode debug" -#: option.c:251 +#: option.c:255 msgid "Do NOT forward queries with no domain part." msgstr "Ne retransmet pas les requ�tes qui n'ont pas de domaine." -#: option.c:252 +#: option.c:256 msgid "Return self-pointing MX records for local hosts." msgstr "Retourne les champs MX pour les machines locales." -#: option.c:253 +#: option.c:257 msgid "Expand simple names in /etc/hosts with domain-suffix." msgstr "" "Etend les noms uniques des machines dans /etc/hosts avec le suffixe du " "domaine." -#: option.c:254 +#: option.c:258 msgid "Don't forward spurious DNS requests from Windows hosts." msgstr "" "Ne retransmet pas les fausses requ�tes DNS en provenance des machines " "Windows." -#: option.c:255 +#: option.c:259 msgid "Enable DHCP in the range given with lease duration." msgstr "" "Autorise DHCP dans la plage d'adresses donn�e sur la dur�e de validit� du " "bail." -#: option.c:256 +#: option.c:260 #, c-format msgid "Change to this group after startup (defaults to %s)." msgstr "On change pour ce groupe apr�s le d�marrage (par d�faut : %s)." -#: option.c:257 +#: option.c:261 msgid "Set address or hostname for a specified machine." msgstr "On assigne une adresse ou un nom pour une machine sp�cifi�e." -#: option.c:258 +#: option.c:262 msgid "Read DHCP host specs from file" msgstr "" -#: option.c:259 +#: option.c:263 msgid "Read DHCP option specs from file" msgstr "" -#: option.c:260 +#: option.c:264 #, c-format msgid "Do NOT load %s file." msgstr "Ne charge PAS le fichier %s." -#: option.c:261 +#: option.c:265 #, c-format msgid "Specify a hosts file to be read in addition to %s." msgstr "Sp�cifie un nom de fichier hosts � lire en compl�ment de %s" -#: option.c:262 +#: option.c:266 msgid "Specify interface(s) to listen on." msgstr "Sp�cifie la ou les interface(s) o� le d�mon doit se mettre � l'�coute." -#: option.c:263 +#: option.c:267 msgid "Specify interface(s) NOT to listen on." msgstr "Sp�cifie la ou les interface(s) que le d�mon ne doit PAS traiter." -#: option.c:264 +#: option.c:268 #, fuzzy msgid "Map DHCP user class to tag." msgstr "Associe les classes d'utilisateurs ('user class') DHCP aux options." -#: option.c:265 +#: option.c:269 msgid "Map RFC3046 circuit-id to tag." msgstr "" -#: option.c:266 +#: option.c:270 msgid "Map RFC3046 remote-id to tag." msgstr "" -#: option.c:267 +#: option.c:271 msgid "Map RFC3993 subscriber-id to tag." msgstr "" -#: option.c:268 +#: option.c:272 #, fuzzy msgid "Don't do DHCP for hosts with tag set." msgstr "Ne pas autoriser DHCP pour les machines �numer�es dans les options." -#: option.c:269 +#: option.c:273 #, fuzzy msgid "Force broadcast replies for hosts with tag set." msgstr "Ne pas autoriser DHCP pour les machines �numer�es dans les options." -#: option.c:270 +#: option.c:274 msgid "Do NOT fork into the background, do NOT run in debug mode." msgstr "Ne passe pas en t�che de fond, ne pas s'ex�cuter en mode debug." -#: option.c:271 +#: option.c:275 msgid "Assume we are the only DHCP server on the local network." msgstr "On consid�re que l'on est le seul serveur DHCP sur le r�seau local." -#: option.c:272 +#: option.c:276 #, c-format msgid "Specify where to store DHCP leases (defaults to %s)." msgstr "Sp�cifie o� il faut sauvegarder les baux DHCP (par d�faut : %s)." -#: option.c:273 +#: option.c:277 msgid "Return MX records for local hosts." msgstr "Retourne les champs MX pour les machines locales." -#: option.c:274 +#: option.c:278 msgid "Specify an MX record." msgstr "Sp�cifie un champ MX." -#: option.c:275 +#: option.c:279 msgid "Specify BOOTP options to DHCP server." msgstr "Sp�cifie les options BOOTP pour le serveur DHCP." -#: option.c:276 +#: option.c:280 #, c-format msgid "Do NOT poll %s file, reload only on SIGHUP." msgstr "" "Ne pas scruter le fichier %s, ne recharger les modifications que sur " "r�ception du signal SIGHUP." -#: option.c:277 +#: option.c:281 msgid "Do NOT cache failed search results." msgstr "Ne place pas en cache le r�sultat des requ�tes qui ont echou�es." -#: option.c:278 +#: option.c:282 #, c-format msgid "Use nameservers strictly in the order given in %s." msgstr "Utilise les serveurs de noms dans l'ordre donn� dans %s." -#: option.c:279 +#: option.c:283 #, fuzzy msgid "Specify options to be sent to DHCP clients." msgstr "Options suppl�mentaires � associer aux clients DHCP." -#: option.c:280 +#: option.c:284 msgid "DHCP option sent even if the client does not request it." msgstr "" -#: option.c:281 +#: option.c:285 msgid "Specify port to listen for DNS requests on (defaults to 53)." msgstr "" "Sp�cifie le port o� il faut �couter les requ�tes DNS (par d�faut : 53)." -#: option.c:282 +#: option.c:286 #, c-format msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)." msgstr "" "Taille maximale des paquets UDP support�s pour EDNS.0 (par d�faut : %s)." -#: option.c:283 +#: option.c:287 #, fuzzy msgid "Log DNS queries." msgstr "Enregistre les requ�tes dans un journal d'activit�." -#: option.c:284 +#: option.c:288 #, fuzzy msgid "Force the originating port for upstream DNS queries." msgstr "Force le port d'origine pour les requ�tes vers les serveurs amonts." -#: option.c:285 +#: option.c:289 msgid "Do NOT read resolv.conf." msgstr "Ne pas lire le fichier resolv.conf." -#: option.c:286 +#: option.c:290 #, c-format msgid "Specify path to resolv.conf (defaults to %s)." msgstr "Sp�cifie le chemin pour le fichier resolv.conf (par d�faut : %s)." -#: option.c:287 +#: option.c:291 msgid "Specify address(es) of upstream servers with optional domains." msgstr "" "Sp�cifie la ou les adresses des serveurs amonts avec des domaines optionels." -#: option.c:288 +#: option.c:292 msgid "Never forward queries to specified domains." msgstr "Ne jamais retransmettre les requ�tes pour les domaines sp�cifi�s." -#: option.c:289 +#: option.c:293 msgid "Specify the domain to be assigned in DHCP leases." msgstr "Sp�cifie le domaine qui doit etre assign� aux baux DHCP." -#: option.c:290 +#: option.c:294 msgid "Specify default target in an MX record." msgstr "Sp�cifie la cible par d�faut dans un champ MX." -#: option.c:291 +#: option.c:295 msgid "Specify time-to-live in seconds for replies from /etc/hosts." msgstr "" "Sp�cifie le TTL en secondes pour les r�ponses qui utilisent /etc/hosts." -#: option.c:292 +#: option.c:296 #, fuzzy msgid "Specify time-to-live in seconds for negative caching." msgstr "" "Sp�cifie le TTL en secondes pour les r�ponses qui utilisent /etc/hosts." -#: option.c:293 +#: option.c:297 #, c-format msgid "Change to this user after startup. (defaults to %s)." msgstr "Change pour cet utilisateur apr�s le d�marrage (par d�faut : %s)." -#: option.c:294 +#: option.c:298 #, fuzzy msgid "Map DHCP vendor class to tag." msgstr "Associe les classes de fournisseurs ('vendor class') DHCP aux options." -#: option.c:295 +#: option.c:299 msgid "Display dnsmasq version and copyright information." msgstr "Affiche la version de Dnsmasq et les informations li�es au copyright." -#: option.c:296 +#: option.c:300 msgid "Translate IPv4 addresses from upstream servers." msgstr "Traduit les adresses IPV4 des serveurs amonts." -#: option.c:297 +#: option.c:301 msgid "Specify a SRV record." msgstr " Sp�cifie un champ SRV." -#: option.c:298 +#: option.c:302 msgid "Display this message. Use --help dhcp for known DHCP options." msgstr "" -#: option.c:299 +#: option.c:303 #, fuzzy, c-format msgid "Specify path of PID file (defaults to %s)." msgstr "Sp�cifie un chemin pour le fichier PID (par d�faut : %s)." -#: option.c:300 +#: option.c:304 #, c-format msgid "Specify maximum number of DHCP leases (defaults to %s)." msgstr "Sp�cifie le nombre maximum de baux DHCP (par d�faut : %s)." -#: option.c:301 +#: option.c:305 msgid "Answer DNS queries based on the interface a query was sent to." msgstr "" "Repond aux requ�tes DNS en se basant sur l'interface ou a �t� envoy�e la " "requ�te." -#: option.c:302 +#: option.c:306 msgid "Specify TXT DNS record." msgstr "Sp�cifie un champ DNS TXT" -#: option.c:303 +#: option.c:307 #, fuzzy msgid "Specify PTR DNS record." msgstr "Sp�cifie un champ DNS TXT" -#: option.c:304 +#: option.c:308 msgid "Give DNS name to IPv4 address of interface." msgstr "" -#: option.c:305 +#: option.c:309 msgid "Bind only to interfaces in use." msgstr "Association uniquement aux interfaces r�seau actuellement actives." -#: option.c:306 +#: option.c:310 #, c-format msgid "Read DHCP static host information from %s." msgstr "Lecture des informations de DHCP statique � partir de %s." -#: option.c:307 +#: option.c:311 msgid "Enable the DBus interface for setting upstream servers, etc." msgstr "" "Autorise l'interface DBus pour la configuration des serveurs amonts, etc." -#: option.c:308 +#: option.c:312 msgid "Do not provide DHCP on this interface, only provide DNS." msgstr "" "Ne pas assurer de fonction DHCP sur cette interface, mais seulement la " "fonction DNS." -#: option.c:309 +#: option.c:313 msgid "Enable dynamic address allocation for bootp." msgstr "Autorise l'allocation dynamique d'adresse pour bootp." -#: option.c:310 +#: option.c:314 #, fuzzy msgid "Map MAC address (with wildcards) to option set." msgstr "Associe l'adresse MAC (avec les jokers) aux options." -#: option.c:312 +#: option.c:316 msgid "Treat DHCP requests on aliases as arriving from interface." msgstr "Traiter les requ�tes DHCP sur les alias comme arrivant de l'interface." -#: option.c:314 +#: option.c:318 msgid "Disable ICMP echo address checking in the DHCP server." msgstr "" "Supprime la v�rification d'adresse sur le serveur au moyen de paquets ICMP " "echo" -#: option.c:315 +#: option.c:319 msgid "Script to run on DHCP lease creation and destruction." msgstr "Script � ex�cuter lors de la cr�ation ou destruction de bail DHCP." -#: option.c:316 +#: option.c:320 msgid "Read configuration from all the files in this directory." msgstr "Lecture de la configuration dans tous les fichiers de ce r�pertoire." -#: option.c:317 +#: option.c:321 #, fuzzy msgid "Log to this syslog facility or file. (defaults to DAEMON)" msgstr "" "Enregistrer les journaux d'activit� dans cette facilit� syslog. (d�faut : " "DAEMON)" -#: option.c:318 +#: option.c:322 msgid "Read leases at startup, but never write the lease file." msgstr "Lecture des baux au d�marrage, mais aucune �criture de fichier de baux" -#: option.c:319 +#: option.c:323 #, fuzzy, c-format msgid "Maximum number of concurrent DNS queries. (defaults to %s)" msgstr "Sp�cifie le nombre maximum de baux DHCP (par d�faut : %s)." -#: option.c:320 +#: option.c:324 #, c-format msgid "Clear DNS cache when reloading %s." msgstr "Vider le cache DNS lors du rechargement de %s." -#: option.c:321 +#: option.c:325 msgid "Ignore hostnames provided by DHCP clients." msgstr "Ignorer les noms d'h�tes fournis par les clients DHCP" -#: option.c:322 +#: option.c:326 msgid "Do NOT reuse filename and server fields for extra DHCP options." msgstr "" -#: option.c:323 +#: option.c:327 msgid "Enable integrated read-only TFTP server." msgstr "Activer le server TFTP int�gr� (fonctionnant en lecture seulement)" -#: option.c:324 +#: option.c:328 msgid "Export files by TFTP only from the specified subtree." msgstr "" "N'exporter par TFTP que les fichiers de l'arborescence de fichier sp�cifi�e" -#: option.c:325 +#: option.c:329 msgid "Add client IP address to tftp-root." msgstr "" -#: option.c:326 +#: option.c:330 msgid "Allow access only to files owned by the user running dnsmasq." msgstr "" "Acc�s aux seuls fichiers appartenants � l'utilisateur sous lequel tourne " "dnsmasq" -#: option.c:327 +#: option.c:331 #, fuzzy, c-format msgid "Maximum number of conncurrent TFTP transfers (defaults to %s)." msgstr "Sp�cifie le nombre maximum de baux DHCP (par d�faut : %s)." -#: option.c:328 +#: option.c:332 msgid "Disable the TFTP blocksize extension." msgstr "D�sactivation de l'extension TFTP � taille de bloc �" -#: option.c:329 +#: option.c:333 msgid "Ephemeral port range for use by TFTP transfers." msgstr "" -#: option.c:330 +#: option.c:334 msgid "Extra logging for DHCP." msgstr "" -#: option.c:331 +#: option.c:335 msgid "Enable async. logging; optionally set queue length." msgstr "" -#: option.c:332 +#: option.c:336 msgid "Stop DNS rebinding. Filter private IP ranges when resolving." msgstr "" -#: option.c:333 +#: option.c:337 msgid "Always perform DNS queries to all servers." msgstr "" -#: option.c:334 +#: option.c:338 msgid "Set tag if client includes option in request." msgstr "" -#: option.c:585 +#: option.c:339 +msgid "Use alternative ports for DHCP." +msgstr "" + +#: option.c:340 +msgid "Run lease-change script as this user." +msgstr "" + +#: option.c:591 #, c-format msgid "" "Usage: dnsmasq [options]\n" @@ -509,192 +517,192 @@ "Usage : dnsmasq [options]\n" "\n" -#: option.c:587 +#: option.c:593 #, c-format msgid "Use short options only on the command line.\n" msgstr "Utilisez les options courtes uniquement sur la ligne de commande.\n" -#: option.c:589 +#: option.c:595 #, c-format msgid "Valid options are :\n" msgstr "Les options valides sont :\n" -#: option.c:610 +#: option.c:616 #, c-format msgid "Known DHCP options:\n" msgstr "" -#: option.c:683 +#: option.c:689 msgid "bad dhcp-option" msgstr "mauvais dhcp-option" -#: option.c:739 +#: option.c:745 #, fuzzy msgid "bad IP address" msgstr "lecture %s - %d adresses" -#: option.c:837 +#: option.c:843 msgid "bad domain in dhcp-option" msgstr "mauvais domaine dans dhcp-option" -#: option.c:895 +#: option.c:901 msgid "dhcp-option too long" msgstr "dhcp-option trop long" -#: option.c:942 +#: option.c:948 #, fuzzy, c-format msgid "cannot access directory %s: %s" msgstr "Ne peut pas lire le r�pertoire %s : %s" -#: option.c:961 tftp.c:343 +#: option.c:967 tftp.c:348 #, fuzzy, c-format msgid "cannot access %s: %s" msgstr "Ne peut pas lire %s : %s" -#: option.c:998 +#: option.c:1004 #, fuzzy msgid "only one dhcp-hostsfile allowed" msgstr "une seule �tiquette netid est autoris�e" -#: option.c:1005 +#: option.c:1011 #, fuzzy msgid "only one dhcp-optsfile allowed" msgstr "une seule �tiquette netid est autoris�e" -#: option.c:1049 +#: option.c:1055 msgid "bad MX preference" msgstr "Mauvaise pr�ference MX" -#: option.c:1053 +#: option.c:1059 msgid "bad MX name" msgstr "mauvais nom MX" -#: option.c:1067 +#: option.c:1073 msgid "bad MX target" msgstr "mauvaise cible MX" -#: option.c:1078 +#: option.c:1084 msgid "cannot run scripts under uClinux" msgstr "ne peut ex�cuter de script sous uClinux" -#: option.c:1265 option.c:1273 +#: option.c:1275 option.c:1283 msgid "bad port" msgstr "mauvais port" -#: option.c:1293 option.c:1318 +#: option.c:1303 option.c:1328 msgid "interface binding not supported" msgstr "" -#: option.c:1427 +#: option.c:1437 #, fuzzy msgid "bad port range" msgstr "mauvais port" -#: option.c:1444 +#: option.c:1454 msgid "bad bridge-interface" msgstr "mauvaise interface-pont" -#: option.c:1485 +#: option.c:1495 msgid "bad dhcp-range" msgstr "mauvaise plage d'adresses DHCP (dhcp-range)" -#: option.c:1511 +#: option.c:1521 msgid "only one netid tag allowed" msgstr "une seule �tiquette netid est autoris�e" -#: option.c:1551 +#: option.c:1561 msgid "inconsistent DHCP range" msgstr "plage d'adresses DHCP incoh�rente" -#: option.c:1719 +#: option.c:1729 #, fuzzy msgid "bad DHCP host name" msgstr "mauvais nom MX" -#: option.c:1959 +#: option.c:1900 option.c:2107 +msgid "invalid port number" +msgstr "num�ro de port invalide" + +#: option.c:1986 #, fuzzy msgid "bad interface name" msgstr "mauvaise interface-pont" -#: option.c:1979 +#: option.c:2006 #, fuzzy msgid "bad PTR record" msgstr "mauvais champ SRV" -#: option.c:1999 +#: option.c:2026 msgid "TXT record string too long" msgstr "cha�ne du champ TXT trop longue" -#: option.c:2003 +#: option.c:2030 msgid "bad TXT record" msgstr "mauvais champ TXT" -#: option.c:2063 +#: option.c:2090 msgid "bad SRV record" msgstr "mauvais champ SRV" -#: option.c:2072 +#: option.c:2099 msgid "bad SRV target" msgstr "mauvaise cible SRV" -#: option.c:2080 -msgid "invalid port number" -msgstr "num�ro de port invalide" - -#: option.c:2087 +#: option.c:2114 msgid "invalid priority" msgstr "priorit� invalide" -#: option.c:2094 +#: option.c:2121 msgid "invalid weight" msgstr "poids invalide" -#: option.c:2130 +#: option.c:2157 #, c-format msgid "files nested too deep in %s" msgstr "trop de niveaux de r�cursion pour les fichiers dans %s" -#: option.c:2138 tftp.c:497 +#: option.c:2165 tftp.c:503 #, c-format msgid "cannot read %s: %s" msgstr "Ne peut pas lire %s : %s" -#: option.c:2199 +#: option.c:2226 msgid "missing \"" msgstr "il manque \"" -#: option.c:2246 +#: option.c:2273 msgid "bad option" msgstr "mauvaise option" -#: option.c:2248 +#: option.c:2275 msgid "extraneous parameter" msgstr "param�tre en trop" -#: option.c:2250 +#: option.c:2277 msgid "missing parameter" msgstr "param�tre manquant" -#: option.c:2258 +#: option.c:2285 msgid "error" msgstr "erreur" -#: option.c:2264 +#: option.c:2291 #, c-format msgid "%s at line %d of %%s" msgstr "%s � la ligne %d de %%s" -#: option.c:2304 option.c:2334 +#: option.c:2331 option.c:2361 #, fuzzy, c-format msgid "read %s" msgstr "Lecture de %s" -#: option.c:2400 +#: option.c:2429 #, c-format msgid "Dnsmasq version %s %s\n" msgstr "Version de Dnsmasq %s %s\n" -#: option.c:2401 +#: option.c:2430 #, c-format msgid "" "Compile time options %s\n" @@ -703,56 +711,56 @@ "Options � la compilation %s\n" "\n" -#: option.c:2402 +#: option.c:2431 #, c-format msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" msgstr "Ce logiciel est fourni sans AUCUNE GARANTIE.\n" -#: option.c:2403 +#: option.c:2432 #, c-format msgid "Dnsmasq is free software, and you are welcome to redistribute it\n" msgstr "Dnsmasq est un logiciel libre, il vous est permis de le redistribuer\n" -#: option.c:2404 +#: option.c:2433 #, fuzzy, c-format msgid "under the terms of the GNU General Public License, version 2 or 3.\n" msgstr "" "sous les termes de la licence GPL (GNU General Public License), version 2.\n" -#: option.c:2415 +#: option.c:2444 msgid "try --help" msgstr "essayez avec --help" -#: option.c:2417 +#: option.c:2446 msgid "try -w" msgstr "essayez avec -w" -#: option.c:2420 +#: option.c:2449 #, fuzzy, c-format msgid "bad command line options: %s" msgstr "mauvaises options en ligne de commande : %s." -#: option.c:2461 +#: option.c:2490 #, c-format msgid "cannot get host-name: %s" msgstr "ne peut pas obtenir le nom de la machine : %s" -#: option.c:2489 +#: option.c:2518 msgid "only one resolv.conf file allowed in no-poll mode." msgstr "seul un fichier resolv.conf est autoris� dans le mode no-poll" -#: option.c:2499 +#: option.c:2528 msgid "must have exactly one resolv.conf to read domain from." msgstr "" "un fichier resolv.conf (et un seul) est n�cessaire pour y r�cuperer le nom " "de domaine." -#: option.c:2502 network.c:640 +#: option.c:2531 network.c:640 #, fuzzy, c-format msgid "failed to read %s: %s" msgstr "impossible de lire %s : %m" -#: option.c:2520 +#: option.c:2549 #, c-format msgid "no search directive found in %s" msgstr "pas de directive de recherche trouv�e dans %s" @@ -766,7 +774,7 @@ msgid "possible DNS-rebind attack detected" msgstr "" -#: isc.c:77 dnsmasq.c:747 +#: isc.c:77 dnsmasq.c:769 #, fuzzy, c-format msgid "failed to access %s: %s" msgstr "impossible d'acc�der � %s : %m" @@ -776,7 +784,7 @@ msgid "failed to load %s: %s" msgstr "impossible de charger %s : %m" -#: isc.c:97 dnsmasq.c:769 +#: isc.c:97 dnsmasq.c:791 #, c-format msgid "reading %s" msgstr "Lecture de %s" @@ -797,7 +805,7 @@ msgid "unknown interface %s in bridge-interface" msgstr "interface %s inconnue" -#: network.c:389 dnsmasq.c:180 +#: network.c:389 dnsmasq.c:183 #, c-format msgid "failed to create listening socket: %s" msgstr "impossible de cr�er une socket de lecture : %s" @@ -873,187 +881,192 @@ msgid "using nameserver %s#%d" msgstr "utilise le serveur de nom %s#%d" -#: dnsmasq.c:110 +#: dnsmasq.c:113 msgid "" "ISC dhcpd integration not available: set HAVE_ISC_READER in src/config.h" msgstr "" "L'int�gration DHCP ISC n'est pas disponible : activez HAVE_ISC_READER dans " "src/config.h" -#: dnsmasq.c:132 +#: dnsmasq.c:135 #, fuzzy msgid "TFTP server not available: set HAVE_TFTP in src/config.h" msgstr "DBus n'est pas disponible : activez HAVE_DBUS dans src/config.h" -#: dnsmasq.c:137 +#: dnsmasq.c:140 msgid "asychronous logging is not available under Solaris" msgstr "" -#: dnsmasq.c:151 +#: dnsmasq.c:154 msgid "must set exactly one interface on broken systems without IP_RECVIF" msgstr "" "Une interface et une seule doit �tre d�clar�e sur les syst�mes sans IP_RECVIF" -#: dnsmasq.c:161 +#: dnsmasq.c:164 #, c-format msgid "failed to find list of interfaces: %s" msgstr "impossible de trouver la liste des interfaces : %s" -#: dnsmasq.c:169 +#: dnsmasq.c:172 #, c-format msgid "unknown interface %s" msgstr "interface %s inconnue" -#: dnsmasq.c:175 +#: dnsmasq.c:178 #, c-format msgid "no interface with address %s" msgstr "pas d'interface avec l'adresse %s" -#: dnsmasq.c:192 dnsmasq.c:561 +#: dnsmasq.c:195 dnsmasq.c:575 #, c-format msgid "DBus error: %s" msgstr "Erreur DBus : %s" -#: dnsmasq.c:195 +#: dnsmasq.c:198 msgid "DBus not available: set HAVE_DBUS in src/config.h" msgstr "DBus n'est pas disponible : activez HAVE_DBUS dans src/config.h" -#: dnsmasq.c:204 +#: dnsmasq.c:207 #, fuzzy, c-format msgid "cannot create pipe: %s" msgstr "Ne peut pas lire %s : %s" -#: dnsmasq.c:225 +#: dnsmasq.c:223 #, c-format -msgid "cannot fork into background: %s" +msgid "cannot chdir to filesystem root: %s" msgstr "" -#: dnsmasq.c:239 +#: dnsmasq.c:231 #, c-format -msgid "cannot chdir to filesystem root: %s" +msgid "cannot fork into background: %s" msgstr "" -#: dnsmasq.c:349 +#: dnsmasq.c:363 #, fuzzy, c-format msgid "started, version %s DNS disabled" msgstr "d�marrage avec le cache d�sactiv� (version %s)" -#: dnsmasq.c:351 +#: dnsmasq.c:365 #, c-format msgid "started, version %s cachesize %d" msgstr "demarr�, version %s (taille de cache %d)" -#: dnsmasq.c:353 +#: dnsmasq.c:367 #, c-format msgid "started, version %s cache disabled" msgstr "d�marrage avec le cache d�sactiv� (version %s)" -#: dnsmasq.c:355 +#: dnsmasq.c:369 #, c-format msgid "compile time options: %s" msgstr "options � la compilation : %s" -#: dnsmasq.c:361 +#: dnsmasq.c:375 msgid "DBus support enabled: connected to system bus" msgstr "Support DBus autoris� : connect� au bus syst�me" -#: dnsmasq.c:363 +#: dnsmasq.c:377 msgid "DBus support enabled: bus connection pending" msgstr "Support DBus autoris� : connexion au bus en attente" -#: dnsmasq.c:368 +#: dnsmasq.c:382 msgid "setting --bind-interfaces option because of OS limitations" msgstr "" "active l'option --bind-interfaces � cause de limitations dans le syst�me " "d'exploitation" -#: dnsmasq.c:373 +#: dnsmasq.c:387 #, c-format msgid "warning: interface %s does not currently exist" msgstr "attention : l'interface %s n'existe pas actuellement" -#: dnsmasq.c:378 +#: dnsmasq.c:392 msgid "warning: ignoring resolv-file flag because no-resolv is set" msgstr "" "attention : l'option � resolv-file � sera ignor�e car � no-resolv � a �t� " "sp�cifi�" -#: dnsmasq.c:381 +#: dnsmasq.c:395 #, fuzzy msgid "warning: no upstream servers configured" msgstr "configuration des serveurs amonts � partir de DBus" -#: dnsmasq.c:385 +#: dnsmasq.c:399 #, c-format msgid "asynchronous logging enabled, queue limit is %d messages" msgstr "" -#: dnsmasq.c:397 +#: dnsmasq.c:411 #, c-format msgid "DHCP, static leases only on %.0s%s, lease time %s" msgstr "baux statiques DHCP seulement sur %.0s%s, dur�e de validit� de bail %s" -#: dnsmasq.c:398 +#: dnsmasq.c:412 #, c-format msgid "DHCP, IP range %s -- %s, lease time %s" msgstr "DHCP, plage d'adresses %s -- %s, dur�e de bail %s" -#: dnsmasq.c:412 +#: dnsmasq.c:426 msgid "root is " msgstr "root est" -#: dnsmasq.c:412 +#: dnsmasq.c:426 #, fuzzy msgid "enabled" msgstr "d�sactiv�" -#: dnsmasq.c:414 +#: dnsmasq.c:428 msgid "secure mode" msgstr "mode s�curis�" -#: dnsmasq.c:440 +#: dnsmasq.c:454 #, c-format msgid "restricting maximum simultaneous TFTP transfers to %d" msgstr "le nombre maximum de transferts TFTP simultan�s sera restreint � %d" -#: dnsmasq.c:449 +#: dnsmasq.c:463 #, fuzzy, c-format msgid "warning: setting capabilities failed: %s" msgstr "attention : impossible de configurer la capacit� %m" -#: dnsmasq.c:451 +#: dnsmasq.c:465 msgid "running as root" msgstr "execut� en temps que root" -#: dnsmasq.c:563 +#: dnsmasq.c:577 msgid "connected to system DBus" msgstr "connect� au systeme DBus" -#: dnsmasq.c:683 +#: dnsmasq.c:697 #, c-format msgid "child process killed by signal %d" msgstr "Le processus fils a �t� termin� par le signal %d" -#: dnsmasq.c:687 +#: dnsmasq.c:701 #, c-format msgid "child process exited with status %d" msgstr "Le processus fils s'est termin� avec le statut %d" -#: dnsmasq.c:691 +#: dnsmasq.c:705 #, fuzzy, c-format msgid "failed to execute %s: %s" msgstr "impossible d'acc�der � %s : %m" -#: dnsmasq.c:695 +#: dnsmasq.c:710 #, fuzzy, c-format msgid "failed to create helper: %s" msgstr "impossible de lire %s : %m" -#: dnsmasq.c:729 +#: dnsmasq.c:714 +#, c-format +msgid "cannot change to user %s for script execution%s%s" +msgstr "" + +#: dnsmasq.c:751 msgid "exiting on receipt of SIGTERM" msgstr "sortie sur r�ception du signal SIGTERM" -#: dnsmasq.c:780 +#: dnsmasq.c:802 #, fuzzy, c-format msgid "no servers found in %s, will retry" msgstr "aucun serveur trouv� dans %s, va r�essayer" @@ -1159,93 +1172,93 @@ msgid "failed to write %s: %s (retry in %us)" msgstr "impossible de lire %s : %s (prochain essai dans %us)" -#: rfc2131.c:303 +#: rfc2131.c:304 #, c-format msgid "no address range available for DHCP request %s %s" msgstr "pas de plage d'adresse disponible pour la requ�te DHCP %s %s" -#: rfc2131.c:304 +#: rfc2131.c:305 msgid "with subnet selector" msgstr "avec s�lecteur de sous-reseau" -#: rfc2131.c:304 +#: rfc2131.c:305 msgid "via" msgstr "par l'interm�diaire de" -#: rfc2131.c:315 +#: rfc2131.c:316 #, c-format msgid "DHCP packet: transaction-id is %u" msgstr "" -#: rfc2131.c:320 +#: rfc2131.c:321 #, c-format msgid "Available DHCP subnet: %s/%s" msgstr "" -#: rfc2131.c:322 +#: rfc2131.c:323 #, c-format msgid "Available DHCP range: %s -- %s" msgstr "" -#: rfc2131.c:350 rfc2131.c:381 +#: rfc2131.c:351 rfc2131.c:382 msgid "disabled" msgstr "d�sactiv�" -#: rfc2131.c:393 rfc2131.c:873 +#: rfc2131.c:394 rfc2131.c:874 msgid "address in use" msgstr "adresse d�j� utilis�e" -#: rfc2131.c:396 +#: rfc2131.c:397 msgid "no address configured" msgstr "pas d'adresse configur�e" -#: rfc2131.c:409 rfc2131.c:736 +#: rfc2131.c:410 rfc2131.c:737 msgid "no address available" msgstr "pas d'adresse disponible" -#: rfc2131.c:418 rfc2131.c:883 +#: rfc2131.c:419 rfc2131.c:884 msgid "no leases left" msgstr "plus aucun bail disponible" -#: rfc2131.c:421 rfc2131.c:847 +#: rfc2131.c:422 rfc2131.c:848 msgid "wrong network" msgstr "mauvais r�seau" -#: rfc2131.c:520 +#: rfc2131.c:521 #, c-format msgid "Ignoring domain %s for DHCP host name %s" msgstr "" -#: rfc2131.c:614 +#: rfc2131.c:615 #, c-format msgid "Vendor class: %s" msgstr "" -#: rfc2131.c:616 +#: rfc2131.c:617 #, c-format msgid "User class: %s" msgstr "" -#: rfc2131.c:657 +#: rfc2131.c:658 #, fuzzy, c-format msgid "disabling DHCP static address %s for %s" msgstr "d�sactive l'adresse statique DHCP %s pour %s" -#: rfc2131.c:678 +#: rfc2131.c:679 msgid "unknown lease" msgstr "bail inconnu" -#: rfc2131.c:687 rfc2131.c:992 +#: rfc2131.c:688 rfc2131.c:995 msgid "ignored" msgstr "ignor�" -#: rfc2131.c:707 +#: rfc2131.c:708 #, c-format msgid "not using configured address %s because it is leased to %s" msgstr "" "L'adresse statique %s ne sera pas utilis�e car un bail est d�j� attribu� � %s" -#: rfc2131.c:717 +#: rfc2131.c:718 #, c-format msgid "" "not using configured address %s because it is in use by the server or relay" @@ -1253,64 +1266,64 @@ "L'adresse statique %s ne sera pas utilis�e car elle est utilis�e par le " "serveur ou un relai" -#: rfc2131.c:720 +#: rfc2131.c:721 #, c-format msgid "not using configured address %s because it was previously declined" msgstr "" "L'adresse statique %s ne sera pas utilis�e car elle a pr�alablement �t� " "refus�e" -#: rfc2131.c:734 rfc2131.c:876 +#: rfc2131.c:735 rfc2131.c:877 msgid "no unique-id" msgstr "pas d'identifiant unique" -#: rfc2131.c:806 +#: rfc2131.c:807 msgid "wrong address" msgstr "mauvaise adresse" -#: rfc2131.c:823 +#: rfc2131.c:824 msgid "lease not found" msgstr "bail non trouv�" -#: rfc2131.c:855 +#: rfc2131.c:856 msgid "address not available" msgstr "adresse non disponible" -#: rfc2131.c:866 +#: rfc2131.c:867 msgid "static lease available" msgstr "bail statique disponible" -#: rfc2131.c:870 +#: rfc2131.c:871 msgid "address reserved" msgstr "adresse reserv�e" -#: rfc2131.c:1265 +#: rfc2131.c:1268 #, c-format msgid "tags: %s" msgstr "" -#: rfc2131.c:1352 +#: rfc2131.c:1355 #, fuzzy, c-format msgid "cannot send DHCP/BOOTP option %d: no space left in packet" msgstr "" "Impossible d'envoyer l'option DHCP %d : pas assez d'espace dans le paquet" -#: rfc2131.c:1507 +#: rfc2131.c:1525 #, fuzzy, c-format msgid "requested options: %s" msgstr "options � la compilation : %s" -#: rfc2131.c:1556 +#: rfc2131.c:1574 #, fuzzy, c-format msgid "next server: %s" msgstr "Erreur netlink : %s" -#: rfc2131.c:1580 +#: rfc2131.c:1598 #, c-format msgid "bootfile name: %s" msgstr "" -#: rfc2131.c:1583 +#: rfc2131.c:1601 #, c-format msgid "server name: %s" msgstr "" @@ -1330,11 +1343,11 @@ msgstr "" "tentative de lier une adresse serveur IPV6 via DBus - pas de support IPV6" -#: dbus.c:241 +#: dbus.c:243 msgid "setting upstream servers from DBus" msgstr "configuration des serveurs amonts � partir de DBus" -#: dbus.c:279 +#: dbus.c:281 msgid "could not register a DBus message handler" msgstr "ne peut enregistrer une routine de traitement des messages DBus" @@ -1348,31 +1361,31 @@ msgid "DHCP request for unsupported hardware type (%d) received on %s" msgstr "requ�te DHCP pour un type de mat�riel non support� (%d) re�ue sur %s" -#: tftp.c:173 +#: tftp.c:175 msgid "unable to get free port for TFTP" msgstr "" -#: tftp.c:188 +#: tftp.c:190 #, c-format msgid "unsupported request from %s" msgstr "requ�te de %s non support�e" -#: tftp.c:266 +#: tftp.c:271 #, c-format msgid "TFTP sent %s to %s" msgstr "TFTP envoy� %s � %s" -#: tftp.c:289 +#: tftp.c:294 #, fuzzy, c-format msgid "file %s not found" msgstr "bail non trouv�" -#: tftp.c:399 +#: tftp.c:405 #, c-format msgid "TFTP error %d %s received from %s" msgstr "TFTP erreur %d %s re�u de %s" -#: tftp.c:430 +#: tftp.c:436 #, fuzzy, c-format msgid "TFTP failed sending %s to %s" msgstr "impossible de lire %s : %m" diff -Nru /tmp/7MO8KY0fpf/dnsmasq-2.41/po/id.po /tmp/pRA3L6jhPD/dnsmasq-2.42/po/id.po --- dnsmasq-2.41/po/id.po 2008-02-12 21:36:39.000000000 +0100 +++ dnsmasq-2.42/po/id.po 2008-05-29 21:49:22.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: dnsmasq 2.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-12 11:04+0000\n" +"POT-Creation-Date: 2008-05-23 21:33+0100\n" "PO-Revision-Date: 2005-10-07 11:45+0100\n" "Last-Translator: Salman AS \n" "Language-Team: Indonesian \n" @@ -15,36 +15,36 @@ "Content-Transfer-Encoding: 8bit\n" # OK -#: cache.c:680 +#: cache.c:700 #, fuzzy, c-format msgid "failed to load names from %s: %s" msgstr "gagal memuat nama-nama dari %s: %m" # OK -#: cache.c:714 dhcp.c:757 +#: cache.c:734 dhcp.c:757 #, fuzzy, c-format msgid "bad address at %s line %d" msgstr "kesalahan nama pada %s baris %d" # OK -#: cache.c:761 dhcp.c:771 +#: cache.c:781 dhcp.c:771 #, c-format msgid "bad name at %s line %d" msgstr "kesalahan nama pada %s baris %d" # OK -#: cache.c:768 dhcp.c:825 +#: cache.c:788 dhcp.c:825 #, c-format msgid "read %s - %d addresses" msgstr "membaca %s - %d alamat" # OK -#: cache.c:806 +#: cache.c:826 msgid "cleared cache" msgstr "cache telah dihapus" # OK -#: cache.c:855 +#: cache.c:875 #, c-format msgid "" "not giving name %s to the DHCP lease of %s because the name exists in %s " @@ -53,24 +53,24 @@ "tidak memberikan nama %s kepada lease DHCP %s karena nama telah ada dalam %" "sdengan alamat %s" -#: cache.c:907 +#: cache.c:927 #, c-format msgid "time %lu" msgstr "" # OK -#: cache.c:908 +#: cache.c:928 #, fuzzy, c-format msgid "cache size %d, %d/%d cache insertions re-used unexpired cache entries." msgstr "" "ukuran cache %d, %d/%d penyisipan cache menimpa cache yang belum kadaluwarsa" -#: cache.c:910 +#: cache.c:930 #, c-format msgid "queries forwarded %u, queries answered locally %u" msgstr "" -#: cache.c:933 +#: cache.c:953 #, c-format msgid "server %s#%d: queries sent %u, retried or failed %u" msgstr "" @@ -93,456 +93,464 @@ msgstr "tak terbatas" # OK -#: option.c:244 +#: option.c:248 msgid "Specify local address(es) to listen on." msgstr "Tentukan alamat lokal untuk mendengarkan." # OK -#: option.c:245 +#: option.c:249 msgid "Return ipaddr for all hosts in specified domains." msgstr "Menghasilkan ipaddr untuk semua host dalam domain yang dipilih." # OK -#: option.c:246 +#: option.c:250 msgid "Fake reverse lookups for RFC1918 private address ranges." msgstr "Fake pencarian balik untuk alamat private sesuai dengan RFC1918." # OK -#: option.c:247 +#: option.c:251 msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)." msgstr "Perlakukan ipaddr sebagai NXDOMAIN (mengalahkan wildcard Verisign)." # OK -#: option.c:248 +#: option.c:252 #, c-format msgid "Specify the size of the cache in entries (defaults to %s)." msgstr "Tentukan ukuran cache, dalam jumlah isian (default %s)." # OK -#: option.c:249 +#: option.c:253 #, c-format msgid "Specify configuration file (defaults to %s)." msgstr "Tentukan file konfigurasi (default %s)." # OK -#: option.c:250 +#: option.c:254 msgid "Do NOT fork into the background: run in debug mode." msgstr "JANGAN berjalan di background: berjalan dalam modus debug." # OK -#: option.c:251 +#: option.c:255 msgid "Do NOT forward queries with no domain part." msgstr "JANGAN teruskan permintaan tanpa bagian domain." # OK -#: option.c:252 +#: option.c:256 msgid "Return self-pointing MX records for local hosts." msgstr "Mengembalikan record MX untuk diri sendiri host-host lokal." # OK -#: option.c:253 +#: option.c:257 msgid "Expand simple names in /etc/hosts with domain-suffix." msgstr "Melengkapi nama-nama di /etc/hosts dengan akhiran domain." # OK -#: option.c:254 +#: option.c:258 msgid "Don't forward spurious DNS requests from Windows hosts." msgstr "Jangan meneruskan permintaan DNS spurious dari host-host Windows." # OK -#: option.c:255 +#: option.c:259 msgid "Enable DHCP in the range given with lease duration." msgstr "Bolehkan DHCP dalam jangkauan yang diberikan dengan durasi lease." # OK -#: option.c:256 +#: option.c:260 #, c-format msgid "Change to this group after startup (defaults to %s)." msgstr "Ubah ke group ini setelah mulai (default %s)." # OK -#: option.c:257 +#: option.c:261 msgid "Set address or hostname for a specified machine." msgstr "Setel alamat atau nama host untuk mesin yang disebutkan." -#: option.c:258 +#: option.c:262 msgid "Read DHCP host specs from file" msgstr "" -#: option.c:259 +#: option.c:263 msgid "Read DHCP option specs from file" msgstr "" # OK -#: option.c:260 +#: option.c:264 #, c-format msgid "Do NOT load %s file." msgstr "JANGAN muat file %s." # OK -#: option.c:261 +#: option.c:265 #, c-format msgid "Specify a hosts file to be read in addition to %s." msgstr "" "Sebutkan sebuah file hosts yang harus dibaca sebagai tambahan untuk %s." # OK -#: option.c:262 +#: option.c:266 msgid "Specify interface(s) to listen on." msgstr "Sebutkan antarmuka untuk mendengarkan." # OK -#: option.c:263 +#: option.c:267 msgid "Specify interface(s) NOT to listen on." msgstr "Sebutkan antarmuka untuk TIDAK mendengarkan." # OK -#: option.c:264 +#: option.c:268 #, fuzzy msgid "Map DHCP user class to tag." msgstr "Petakan kelas user DHCP ke setelan yang dipilih." -#: option.c:265 +#: option.c:269 msgid "Map RFC3046 circuit-id to tag." msgstr "" -#: option.c:266 +#: option.c:270 msgid "Map RFC3046 remote-id to tag." msgstr "" -#: option.c:267 +#: option.c:271 msgid "Map RFC3993 subscriber-id to tag." msgstr "" # OK -#: option.c:268 +#: option.c:272 #, fuzzy msgid "Don't do DHCP for hosts with tag set." msgstr "Jangan menggunakan DHCP untuk host-host yang dipilih." # OK -#: option.c:269 +#: option.c:273 #, fuzzy msgid "Force broadcast replies for hosts with tag set." msgstr "Jangan menggunakan DHCP untuk host-host yang dipilih." # OK -#: option.c:270 +#: option.c:274 msgid "Do NOT fork into the background, do NOT run in debug mode." msgstr "JANGAN berjalan di background, jangan berjalan dalam modus debug." # OK -#: option.c:271 +#: option.c:275 msgid "Assume we are the only DHCP server on the local network." msgstr "Berpikir bahwa kita satu-satunya DHCP server dalam jaringan." # OK -#: option.c:272 +#: option.c:276 #, c-format msgid "Specify where to store DHCP leases (defaults to %s)." msgstr "Sebutkan lokasi untuk menyimpan lease DHCP (default %s)." # OK -#: option.c:273 +#: option.c:277 msgid "Return MX records for local hosts." msgstr "Kembalikan rekord MX untuk host-host lokal." # OK -#: option.c:274 +#: option.c:278 msgid "Specify an MX record." msgstr "Sebutkan sebuah rekord MX." # OK -#: option.c:275 +#: option.c:279 msgid "Specify BOOTP options to DHCP server." msgstr "Sebutkan pilihan-pilihan BOOTP untuk DHCP server." -#: option.c:276 +#: option.c:280 #, c-format msgid "Do NOT poll %s file, reload only on SIGHUP." msgstr "Jangan kumpulkan file %s, muat kembali saat SIGHUP." # OK -#: option.c:277 +#: option.c:281 msgid "Do NOT cache failed search results." msgstr "JANGAN menyimpan hasil pencarian yang gagal." # OK -#: option.c:278 +#: option.c:282 #, c-format msgid "Use nameservers strictly in the order given in %s." msgstr "Gunakan secara ketat namaserver yang disebutkan sesuai urutan di %s." # OK -#: option.c:279 +#: option.c:283 #, fuzzy msgid "Specify options to be sent to DHCP clients." msgstr "" "Setel pilihan-pilihan tambahan yang akan disetel untuk klien-klien DHCP." -#: option.c:280 +#: option.c:284 msgid "DHCP option sent even if the client does not request it." msgstr "" # OK -#: option.c:281 +#: option.c:285 msgid "Specify port to listen for DNS requests on (defaults to 53)." msgstr "Sebutkan port untuk mendengarkan permintaan DNS (default port 53)." # OK -#: option.c:282 +#: option.c:286 #, c-format msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)." msgstr "Ukuran maksimum paket UDP yang didukung untuk EDNS.0 (default %s)." # OK -#: option.c:283 +#: option.c:287 #, fuzzy msgid "Log DNS queries." msgstr "Permintaan log." # OK -#: option.c:284 +#: option.c:288 #, fuzzy msgid "Force the originating port for upstream DNS queries." msgstr "Paksa port asal untuk permintaan ke atas." # OK -#: option.c:285 +#: option.c:289 msgid "Do NOT read resolv.conf." msgstr "JANGAN baca resolv.conf." # OK -#: option.c:286 +#: option.c:290 #, c-format msgid "Specify path to resolv.conf (defaults to %s)." msgstr "Sebutkan path ke resolv.conf (default %s)." # OK -#: option.c:287 +#: option.c:291 msgid "Specify address(es) of upstream servers with optional domains." msgstr "" "Sebutkan alamat-alamat server di atas, boleh dilengkapi dengan nama domain." # OK -#: option.c:288 +#: option.c:292 msgid "Never forward queries to specified domains." msgstr "JANGAN pernah meneruskan permintaan ke domain yang disebutkan." # OK -#: option.c:289 +#: option.c:293 msgid "Specify the domain to be assigned in DHCP leases." msgstr "Sebutkan domain yang digunakan dalam lease DHCP." # OK -#: option.c:290 +#: option.c:294 msgid "Specify default target in an MX record." msgstr "Sebutkan tujuan default dalam rekord MX." # OK -#: option.c:291 +#: option.c:295 msgid "Specify time-to-live in seconds for replies from /etc/hosts." msgstr "Sebutkan time-to-live dalam detik untuk jawaban dari /etc/hosts." # OK -#: option.c:292 +#: option.c:296 #, fuzzy msgid "Specify time-to-live in seconds for negative caching." msgstr "Sebutkan time-to-live dalam detik untuk jawaban dari /etc/hosts." # OK -#: option.c:293 +#: option.c:297 #, c-format msgid "Change to this user after startup. (defaults to %s)." msgstr "Ubah ke user ini setelah mulai. (default %s)." # OK -#: option.c:294 +#: option.c:298 #, fuzzy msgid "Map DHCP vendor class to tag." msgstr "Memetakan kelas vendor DHCP ke daftar pilihan." # OK -#: option.c:295 +#: option.c:299 msgid "Display dnsmasq version and copyright information." msgstr "Menampilkan versi dan informasi hak cipta dnsmasq." # OK -#: option.c:296 +#: option.c:300 msgid "Translate IPv4 addresses from upstream servers." msgstr "Terjemahkan alamat-alamat IPv4 dari server-server di atas." # OK -#: option.c:297 +#: option.c:301 msgid "Specify a SRV record." msgstr "Sebutkan rekord SRV." -#: option.c:298 +#: option.c:302 msgid "Display this message. Use --help dhcp for known DHCP options." msgstr "" # OK -#: option.c:299 +#: option.c:303 #, fuzzy, c-format msgid "Specify path of PID file (defaults to %s)." msgstr "Sebutkan path file PID. (default %s)." # OK -#: option.c:300 +#: option.c:304 #, c-format msgid "Specify maximum number of DHCP leases (defaults to %s)." msgstr "Sebutkan jumlah maksimum lease DHCP (default %s)." # OK -#: option.c:301 +#: option.c:305 msgid "Answer DNS queries based on the interface a query was sent to." msgstr "" "Jawab permintaan DNS berdasarkan antarmuka dimana permintaan dikirimkan." # OK -#: option.c:302 +#: option.c:306 msgid "Specify TXT DNS record." msgstr "Sebutkan rekord TXT DNS." # OK -#: option.c:303 +#: option.c:307 #, fuzzy msgid "Specify PTR DNS record." msgstr "Sebutkan rekord TXT DNS." -#: option.c:304 +#: option.c:308 msgid "Give DNS name to IPv4 address of interface." msgstr "" # OK -#: option.c:305 +#: option.c:309 msgid "Bind only to interfaces in use." msgstr "Hanya kaitkan ke antarmuka yang sedang digunakan saja." # OK -#: option.c:306 +#: option.c:310 #, c-format msgid "Read DHCP static host information from %s." msgstr "Baca informasi statik host DHCP dari %s." # OK -#: option.c:307 +#: option.c:311 msgid "Enable the DBus interface for setting upstream servers, etc." msgstr "Mungkinkan antar muka DBus untuk menyetel server-server di atas, dsb." # OK -#: option.c:308 +#: option.c:312 msgid "Do not provide DHCP on this interface, only provide DNS." msgstr "JANGAN menyediakan DHCP pada antarmuka ini, hanya menyediakan DNS." # OK -#: option.c:309 +#: option.c:313 msgid "Enable dynamic address allocation for bootp." msgstr "Mungkinkan alokasi alamat dinamis untuk bootp." # OK -#: option.c:310 +#: option.c:314 #, fuzzy msgid "Map MAC address (with wildcards) to option set." msgstr "Memetakan kelas vendor DHCP ke daftar pilihan." -#: option.c:312 +#: option.c:316 msgid "Treat DHCP requests on aliases as arriving from interface." msgstr "" -#: option.c:314 +#: option.c:318 msgid "Disable ICMP echo address checking in the DHCP server." msgstr "" -#: option.c:315 +#: option.c:319 msgid "Script to run on DHCP lease creation and destruction." msgstr "" -#: option.c:316 +#: option.c:320 msgid "Read configuration from all the files in this directory." msgstr "" # OK -#: option.c:317 +#: option.c:321 #, fuzzy msgid "Log to this syslog facility or file. (defaults to DAEMON)" msgstr "Ubah ke user ini setelah mulai. (default %s)." -#: option.c:318 +#: option.c:322 msgid "Read leases at startup, but never write the lease file." msgstr "" # OK -#: option.c:319 +#: option.c:323 #, fuzzy, c-format msgid "Maximum number of concurrent DNS queries. (defaults to %s)" msgstr "Sebutkan jumlah maksimum lease DHCP (default %s)." -#: option.c:320 +#: option.c:324 #, c-format msgid "Clear DNS cache when reloading %s." msgstr "" -#: option.c:321 +#: option.c:325 msgid "Ignore hostnames provided by DHCP clients." msgstr "" -#: option.c:322 +#: option.c:326 msgid "Do NOT reuse filename and server fields for extra DHCP options." msgstr "" -#: option.c:323 +#: option.c:327 msgid "Enable integrated read-only TFTP server." msgstr "" -#: option.c:324 +#: option.c:328 msgid "Export files by TFTP only from the specified subtree." msgstr "" -#: option.c:325 +#: option.c:329 msgid "Add client IP address to tftp-root." msgstr "" -#: option.c:326 +#: option.c:330 msgid "Allow access only to files owned by the user running dnsmasq." msgstr "" # OK -#: option.c:327 +#: option.c:331 #, fuzzy, c-format msgid "Maximum number of conncurrent TFTP transfers (defaults to %s)." msgstr "Sebutkan jumlah maksimum lease DHCP (default %s)." -#: option.c:328 +#: option.c:332 msgid "Disable the TFTP blocksize extension." msgstr "" -#: option.c:329 +#: option.c:333 msgid "Ephemeral port range for use by TFTP transfers." msgstr "" -#: option.c:330 +#: option.c:334 msgid "Extra logging for DHCP." msgstr "" -#: option.c:331 +#: option.c:335 msgid "Enable async. logging; optionally set queue length." msgstr "" -#: option.c:332 +#: option.c:336 msgid "Stop DNS rebinding. Filter private IP ranges when resolving." msgstr "" -#: option.c:333 +#: option.c:337 msgid "Always perform DNS queries to all servers." msgstr "" -#: option.c:334 +#: option.c:338 msgid "Set tag if client includes option in request." msgstr "" +#: option.c:339 +msgid "Use alternative ports for DHCP." +msgstr "" + +#: option.c:340 +msgid "Run lease-change script as this user." +msgstr "" + # OK -#: option.c:585 +#: option.c:591 #, c-format msgid "" "Usage: dnsmasq [options]\n" @@ -552,224 +560,224 @@ "\n" # OK -#: option.c:587 +#: option.c:593 #, c-format msgid "Use short options only on the command line.\n" msgstr "Gunakan pilihan pendek saja pada perintah baris.\n" # OK -#: option.c:589 +#: option.c:595 #, c-format msgid "Valid options are :\n" msgstr "Pilihan yang boleh adalah:\n" -#: option.c:610 +#: option.c:616 #, c-format msgid "Known DHCP options:\n" msgstr "" # OK -#: option.c:683 +#: option.c:689 msgid "bad dhcp-option" msgstr "dhcp-option salah" # OK -#: option.c:739 +#: option.c:745 #, fuzzy msgid "bad IP address" msgstr "membaca %s - %d alamat" # OK -#: option.c:837 +#: option.c:843 msgid "bad domain in dhcp-option" msgstr "domain dalam dhcp-option salah" # OK -#: option.c:895 +#: option.c:901 msgid "dhcp-option too long" msgstr "dhcp-option terlalu panjang" # OK -#: option.c:942 +#: option.c:948 #, fuzzy, c-format msgid "cannot access directory %s: %s" msgstr "tidak bisa membaca %s: %s" # OK -#: option.c:961 tftp.c:343 +#: option.c:967 tftp.c:348 #, fuzzy, c-format msgid "cannot access %s: %s" msgstr "tidak bisa membaca %s: %s" -#: option.c:998 +#: option.c:1004 msgid "only one dhcp-hostsfile allowed" msgstr "" -#: option.c:1005 +#: option.c:1011 msgid "only one dhcp-optsfile allowed" msgstr "" # OK -#: option.c:1049 +#: option.c:1055 msgid "bad MX preference" msgstr "kesukaan MX salah" # OK -#: option.c:1053 +#: option.c:1059 msgid "bad MX name" msgstr "nama MX salah" # OK -#: option.c:1067 +#: option.c:1073 msgid "bad MX target" msgstr "target MX salah" -#: option.c:1078 +#: option.c:1084 msgid "cannot run scripts under uClinux" msgstr "" # OK -#: option.c:1265 option.c:1273 +#: option.c:1275 option.c:1283 msgid "bad port" msgstr "port salah" -#: option.c:1293 option.c:1318 +#: option.c:1303 option.c:1328 msgid "interface binding not supported" msgstr "" # OK -#: option.c:1427 +#: option.c:1437 #, fuzzy msgid "bad port range" msgstr "port salah" -#: option.c:1444 +#: option.c:1454 msgid "bad bridge-interface" msgstr "" # OK -#: option.c:1485 +#: option.c:1495 msgid "bad dhcp-range" msgstr "dhcp-range salah" -#: option.c:1511 +#: option.c:1521 msgid "only one netid tag allowed" msgstr "" # OK -#: option.c:1551 +#: option.c:1561 msgid "inconsistent DHCP range" msgstr "jangkauan DHCP tidak konsisten" # OK -#: option.c:1719 +#: option.c:1729 #, fuzzy msgid "bad DHCP host name" msgstr "nama MX salah" # OK -#: option.c:1959 +#: option.c:1900 option.c:2107 +msgid "invalid port number" +msgstr "nomor port tidak benar" + +# OK +#: option.c:1986 #, fuzzy msgid "bad interface name" msgstr "nama MX salah" # OK -#: option.c:1979 +#: option.c:2006 #, fuzzy msgid "bad PTR record" msgstr "rekord SRV salah" # OK -#: option.c:1999 +#: option.c:2026 msgid "TXT record string too long" msgstr "string rekord TXT terlalu panjang" # OK -#: option.c:2003 +#: option.c:2030 msgid "bad TXT record" msgstr "rekord TXT salah" # OK -#: option.c:2063 +#: option.c:2090 msgid "bad SRV record" msgstr "rekord SRV salah" # OK -#: option.c:2072 +#: option.c:2099 msgid "bad SRV target" msgstr "target SRV salah" # OK -#: option.c:2080 -msgid "invalid port number" -msgstr "nomor port tidak benar" - -# OK -#: option.c:2087 +#: option.c:2114 msgid "invalid priority" msgstr "prioritas tidak benar" # OK -#: option.c:2094 +#: option.c:2121 msgid "invalid weight" msgstr "weight tidak benar" -#: option.c:2130 +#: option.c:2157 #, c-format msgid "files nested too deep in %s" msgstr "" # OK -#: option.c:2138 tftp.c:497 +#: option.c:2165 tftp.c:503 #, c-format msgid "cannot read %s: %s" msgstr "tidak bisa membaca %s: %s" # OK -#: option.c:2199 +#: option.c:2226 msgid "missing \"" msgstr "kurang \"" # OK -#: option.c:2246 +#: option.c:2273 msgid "bad option" msgstr "pilihan salah" # OK -#: option.c:2248 +#: option.c:2275 msgid "extraneous parameter" msgstr "parameter berlebihan" # OK -#: option.c:2250 +#: option.c:2277 msgid "missing parameter" msgstr "parameter kurang" # OK -#: option.c:2258 +#: option.c:2285 msgid "error" msgstr "kesalahan" # OK -#: option.c:2264 +#: option.c:2291 #, c-format msgid "%s at line %d of %%s" msgstr "%s pada baris %d dari %%s" # OK -#: option.c:2304 option.c:2334 +#: option.c:2331 option.c:2361 #, fuzzy, c-format msgid "read %s" msgstr "membaca %s" # OK -#: option.c:2400 +#: option.c:2429 #, c-format msgid "Dnsmasq version %s %s\n" msgstr "Dnsmasq versi %s %s\n" # OK -#: option.c:2401 +#: option.c:2430 #, c-format msgid "" "Compile time options %s\n" @@ -779,13 +787,13 @@ "\n" # OK -#: option.c:2402 +#: option.c:2431 #, c-format msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" msgstr "Perangkat lunak ini tersedia TANPA JAMINAN SEDIKITPUN.\n" # OK -#: option.c:2403 +#: option.c:2432 #, c-format msgid "Dnsmasq is free software, and you are welcome to redistribute it\n" msgstr "" @@ -793,49 +801,49 @@ "membagikannya\n" # OK -#: option.c:2404 +#: option.c:2433 #, fuzzy, c-format msgid "under the terms of the GNU General Public License, version 2 or 3.\n" msgstr "dengan aturan GNU General Public License, versi 2.\n" -#: option.c:2415 +#: option.c:2444 msgid "try --help" msgstr "" -#: option.c:2417 +#: option.c:2446 msgid "try -w" msgstr "" # OK -#: option.c:2420 +#: option.c:2449 #, fuzzy, c-format msgid "bad command line options: %s" msgstr "pilihan baris perintah salah: %s." # OK -#: option.c:2461 +#: option.c:2490 #, c-format msgid "cannot get host-name: %s" msgstr "tidak bisa mendapatkan host-name: %s" # OK -#: option.c:2489 +#: option.c:2518 msgid "only one resolv.conf file allowed in no-poll mode." msgstr "hanya satu file resolv.conf yang diperbolehkan dalam modus no-poll." # OK -#: option.c:2499 +#: option.c:2528 msgid "must have exactly one resolv.conf to read domain from." msgstr "harus mempunyai tepat satu resolv.conf untuk mendapatkan nama domain." # OK -#: option.c:2502 network.c:640 +#: option.c:2531 network.c:640 #, fuzzy, c-format msgid "failed to read %s: %s" msgstr "gagal membaca %s: %m" # OK -#: option.c:2520 +#: option.c:2549 #, c-format msgid "no search directive found in %s" msgstr "tidak ditemukan direktif search di %s" @@ -851,7 +859,7 @@ msgstr "" # OK -#: isc.c:77 dnsmasq.c:747 +#: isc.c:77 dnsmasq.c:769 #, fuzzy, c-format msgid "failed to access %s: %s" msgstr "gagal mengakses %s: %m" @@ -863,7 +871,7 @@ msgstr "gagal memuat %S: %m" # OK -#: isc.c:97 dnsmasq.c:769 +#: isc.c:97 dnsmasq.c:791 #, c-format msgid "reading %s" msgstr "membaca %s" @@ -888,7 +896,7 @@ msgstr "antarmuka tidak dikenal %s" # OK -#: network.c:389 dnsmasq.c:180 +#: network.c:389 dnsmasq.c:183 #, c-format msgid "failed to create listening socket: %s" msgstr "gagal membuat socket: %s " @@ -976,7 +984,7 @@ msgstr "menggunakan nameserver %s#%d" # OK -#: dnsmasq.c:110 +#: dnsmasq.c:113 msgid "" "ISC dhcpd integration not available: set HAVE_ISC_READER in src/config.h" msgstr "" @@ -984,201 +992,206 @@ "config.h" # OK -#: dnsmasq.c:132 +#: dnsmasq.c:135 #, fuzzy msgid "TFTP server not available: set HAVE_TFTP in src/config.h" msgstr "DBus tidak tersedia: setel HAVE_DBUS dalam src/config.h" -#: dnsmasq.c:137 +#: dnsmasq.c:140 msgid "asychronous logging is not available under Solaris" msgstr "" # OK -#: dnsmasq.c:151 +#: dnsmasq.c:154 msgid "must set exactly one interface on broken systems without IP_RECVIF" msgstr "" "harus menyetel satu antarmuka saja pada sistem yang tidak benar dengan " "IP_RECVIF" # OK -#: dnsmasq.c:161 +#: dnsmasq.c:164 #, c-format msgid "failed to find list of interfaces: %s" msgstr "gagal mendapatkan daftar antarmuka: %s" # OK -#: dnsmasq.c:169 +#: dnsmasq.c:172 #, c-format msgid "unknown interface %s" msgstr "antarmuka tidak dikenal %s" # OK -#: dnsmasq.c:175 +#: dnsmasq.c:178 #, c-format msgid "no interface with address %s" msgstr "tidak ada antarmuka dengan alamat %s" # OK -#: dnsmasq.c:192 dnsmasq.c:561 +#: dnsmasq.c:195 dnsmasq.c:575 #, c-format msgid "DBus error: %s" msgstr "DBus error: %s" # OK -#: dnsmasq.c:195 +#: dnsmasq.c:198 msgid "DBus not available: set HAVE_DBUS in src/config.h" msgstr "DBus tidak tersedia: setel HAVE_DBUS dalam src/config.h" # OK -#: dnsmasq.c:204 +#: dnsmasq.c:207 #, fuzzy, c-format msgid "cannot create pipe: %s" msgstr "tidak bisa membaca %s: %s" -#: dnsmasq.c:225 +#: dnsmasq.c:223 #, c-format -msgid "cannot fork into background: %s" +msgid "cannot chdir to filesystem root: %s" msgstr "" -#: dnsmasq.c:239 +#: dnsmasq.c:231 #, c-format -msgid "cannot chdir to filesystem root: %s" +msgid "cannot fork into background: %s" msgstr "" # OK -#: dnsmasq.c:349 +#: dnsmasq.c:363 #, fuzzy, c-format msgid "started, version %s DNS disabled" msgstr "dimulai, cache versi %s di disable" # OK -#: dnsmasq.c:351 +#: dnsmasq.c:365 #, c-format msgid "started, version %s cachesize %d" msgstr "dimulai, versi %s ukuran cache %d" # OK -#: dnsmasq.c:353 +#: dnsmasq.c:367 #, c-format msgid "started, version %s cache disabled" msgstr "dimulai, cache versi %s di disable" # OK -#: dnsmasq.c:355 +#: dnsmasq.c:369 #, c-format msgid "compile time options: %s" msgstr "pilihan-pilihan saat kompilasi: %s" # OK -#: dnsmasq.c:361 +#: dnsmasq.c:375 msgid "DBus support enabled: connected to system bus" msgstr "dukungan DBus dimungkinkan: terkoneksi pada bus sistem" # OK -#: dnsmasq.c:363 +#: dnsmasq.c:377 msgid "DBus support enabled: bus connection pending" msgstr "dukungan DBus dimungkinkan: koneksi bus ditunda" # OK -#: dnsmasq.c:368 +#: dnsmasq.c:382 msgid "setting --bind-interfaces option because of OS limitations" msgstr "setelan opsi --bind-interfaces disebabkan keterbatasan OS" # OK -#: dnsmasq.c:373 +#: dnsmasq.c:387 #, c-format msgid "warning: interface %s does not currently exist" msgstr "peringatan: antarmuka %s tidak ada" -#: dnsmasq.c:378 +#: dnsmasq.c:392 msgid "warning: ignoring resolv-file flag because no-resolv is set" msgstr "" # OK -#: dnsmasq.c:381 +#: dnsmasq.c:395 #, fuzzy msgid "warning: no upstream servers configured" msgstr "menyetel server-server di atas dengan DBus" -#: dnsmasq.c:385 +#: dnsmasq.c:399 #, c-format msgid "asynchronous logging enabled, queue limit is %d messages" msgstr "" # OK -#: dnsmasq.c:397 +#: dnsmasq.c:411 #, c-format msgid "DHCP, static leases only on %.0s%s, lease time %s" msgstr "DHCP, lease static pada %.0s%s, waktu lease %s" # OK -#: dnsmasq.c:398 +#: dnsmasq.c:412 #, c-format msgid "DHCP, IP range %s -- %s, lease time %s" msgstr "DHCP, jangkaun IP %s -- %s, waktu lease %s" -#: dnsmasq.c:412 +#: dnsmasq.c:426 msgid "root is " msgstr "" # OK -#: dnsmasq.c:412 +#: dnsmasq.c:426 #, fuzzy msgid "enabled" msgstr "di disable" -#: dnsmasq.c:414 +#: dnsmasq.c:428 msgid "secure mode" msgstr "" -#: dnsmasq.c:440 +#: dnsmasq.c:454 #, c-format msgid "restricting maximum simultaneous TFTP transfers to %d" msgstr "" -#: dnsmasq.c:449 +#: dnsmasq.c:463 #, c-format msgid "warning: setting capabilities failed: %s" msgstr "" # OK -#: dnsmasq.c:451 +#: dnsmasq.c:465 msgid "running as root" msgstr "berjalan menggunakan root" # OK -#: dnsmasq.c:563 +#: dnsmasq.c:577 msgid "connected to system DBus" msgstr "terhubung ke sistem DBus" -#: dnsmasq.c:683 +#: dnsmasq.c:697 #, c-format msgid "child process killed by signal %d" msgstr "" -#: dnsmasq.c:687 +#: dnsmasq.c:701 #, c-format msgid "child process exited with status %d" msgstr "" # OK -#: dnsmasq.c:691 +#: dnsmasq.c:705 #, fuzzy, c-format msgid "failed to execute %s: %s" msgstr "gagal mengakses %s: %m" # OK -#: dnsmasq.c:695 +#: dnsmasq.c:710 #, fuzzy, c-format msgid "failed to create helper: %s" msgstr "gagal membaca %s: %m" -#: dnsmasq.c:729 +#: dnsmasq.c:714 +#, c-format +msgid "cannot change to user %s for script execution%s%s" +msgstr "" + +#: dnsmasq.c:751 msgid "exiting on receipt of SIGTERM" msgstr "keluar karena menerima SIGTERM" # OK -#: dnsmasq.c:780 +#: dnsmasq.c:802 #, fuzzy, c-format msgid "no servers found in %s, will retry" msgstr "tidak ditemukan direktif search di %s" @@ -1299,170 +1312,170 @@ msgstr "gagal membaca %s: %m" # OK -#: rfc2131.c:303 +#: rfc2131.c:304 #, c-format msgid "no address range available for DHCP request %s %s" msgstr "tidak ada alamat yang bisa dipakai untuk permintaan DHCP %s %s" # OK -#: rfc2131.c:304 +#: rfc2131.c:305 msgid "with subnet selector" msgstr "dengan pemilih subnet" # OK -#: rfc2131.c:304 +#: rfc2131.c:305 msgid "via" msgstr "lewat" -#: rfc2131.c:315 +#: rfc2131.c:316 #, c-format msgid "DHCP packet: transaction-id is %u" msgstr "" -#: rfc2131.c:320 +#: rfc2131.c:321 #, c-format msgid "Available DHCP subnet: %s/%s" msgstr "" -#: rfc2131.c:322 +#: rfc2131.c:323 #, c-format msgid "Available DHCP range: %s -- %s" msgstr "" # OK -#: rfc2131.c:350 rfc2131.c:381 +#: rfc2131.c:351 rfc2131.c:382 msgid "disabled" msgstr "di disable" # OK -#: rfc2131.c:393 rfc2131.c:873 +#: rfc2131.c:394 rfc2131.c:874 msgid "address in use" msgstr "alamat telah digunakan" # OK -#: rfc2131.c:396 +#: rfc2131.c:397 msgid "no address configured" msgstr "tak ada alamat yang disetel" # OK -#: rfc2131.c:409 rfc2131.c:736 +#: rfc2131.c:410 rfc2131.c:737 msgid "no address available" msgstr "tak ada alamat yang tersedia" # OK -#: rfc2131.c:418 rfc2131.c:883 +#: rfc2131.c:419 rfc2131.c:884 msgid "no leases left" msgstr "tak ada lease yang tersisa" # OK -#: rfc2131.c:421 rfc2131.c:847 +#: rfc2131.c:422 rfc2131.c:848 msgid "wrong network" msgstr "jaringan yang salah" -#: rfc2131.c:520 +#: rfc2131.c:521 #, c-format msgid "Ignoring domain %s for DHCP host name %s" msgstr "" -#: rfc2131.c:614 +#: rfc2131.c:615 #, c-format msgid "Vendor class: %s" msgstr "" -#: rfc2131.c:616 +#: rfc2131.c:617 #, c-format msgid "User class: %s" msgstr "" # OK -#: rfc2131.c:657 +#: rfc2131.c:658 #, fuzzy, c-format msgid "disabling DHCP static address %s for %s" msgstr "men-disable alamat statik DHCP %s" # OK -#: rfc2131.c:678 +#: rfc2131.c:679 msgid "unknown lease" msgstr "lease tidak diketahui" # OK -#: rfc2131.c:687 rfc2131.c:992 +#: rfc2131.c:688 rfc2131.c:995 msgid "ignored" msgstr "diabaikan" -#: rfc2131.c:707 +#: rfc2131.c:708 #, c-format msgid "not using configured address %s because it is leased to %s" msgstr "" -#: rfc2131.c:717 +#: rfc2131.c:718 #, c-format msgid "" "not using configured address %s because it is in use by the server or relay" msgstr "" -#: rfc2131.c:720 +#: rfc2131.c:721 #, c-format msgid "not using configured address %s because it was previously declined" msgstr "" -#: rfc2131.c:734 rfc2131.c:876 +#: rfc2131.c:735 rfc2131.c:877 msgid "no unique-id" msgstr "" # OK -#: rfc2131.c:806 +#: rfc2131.c:807 msgid "wrong address" msgstr "alamat salah" # OK -#: rfc2131.c:823 +#: rfc2131.c:824 msgid "lease not found" msgstr "lease tak ditemukan" # OK -#: rfc2131.c:855 +#: rfc2131.c:856 msgid "address not available" msgstr "alamat tak tersedia" # OK -#: rfc2131.c:866 +#: rfc2131.c:867 msgid "static lease available" msgstr "lease statik tak tersedia" # OK -#: rfc2131.c:870 +#: rfc2131.c:871 msgid "address reserved" msgstr "alamat telah dipesan" -#: rfc2131.c:1265 +#: rfc2131.c:1268 #, c-format msgid "tags: %s" msgstr "" -#: rfc2131.c:1352 +#: rfc2131.c:1355 #, c-format msgid "cannot send DHCP/BOOTP option %d: no space left in packet" msgstr "" # OK -#: rfc2131.c:1507 +#: rfc2131.c:1525 #, fuzzy, c-format msgid "requested options: %s" msgstr "pilihan-pilihan saat kompilasi: %s" # OK -#: rfc2131.c:1556 +#: rfc2131.c:1574 #, fuzzy, c-format msgid "next server: %s" msgstr "DBus error: %s" -#: rfc2131.c:1580 +#: rfc2131.c:1598 #, c-format msgid "bootfile name: %s" msgstr "" -#: rfc2131.c:1583 +#: rfc2131.c:1601 #, c-format msgid "server name: %s" msgstr "" @@ -1487,12 +1500,12 @@ "untuk IPv6" # OK -#: dbus.c:241 +#: dbus.c:243 msgid "setting upstream servers from DBus" msgstr "menyetel server-server di atas dengan DBus" # OK -#: dbus.c:279 +#: dbus.c:281 msgid "could not register a DBus message handler" msgstr "tidak bisa mendaftar sebuah DBus message handler" @@ -1509,33 +1522,33 @@ msgstr "" "permintaan DHCP untuk tipe hardware yang tidak didukung (%d) diterima pada %s" -#: tftp.c:173 +#: tftp.c:175 msgid "unable to get free port for TFTP" msgstr "" -#: tftp.c:188 +#: tftp.c:190 #, c-format msgid "unsupported request from %s" msgstr "" -#: tftp.c:266 +#: tftp.c:271 #, c-format msgid "TFTP sent %s to %s" msgstr "" # OK -#: tftp.c:289 +#: tftp.c:294 #, fuzzy, c-format msgid "file %s not found" msgstr "lease tak ditemukan" -#: tftp.c:399 +#: tftp.c:405 #, c-format msgid "TFTP error %d %s received from %s" msgstr "" # OK -#: tftp.c:430 +#: tftp.c:436 #, fuzzy, c-format msgid "TFTP failed sending %s to %s" msgstr "gagal membaca %s: %m" diff -Nru /tmp/7MO8KY0fpf/dnsmasq-2.41/po/it.po /tmp/pRA3L6jhPD/dnsmasq-2.42/po/it.po --- dnsmasq-2.41/po/it.po 2008-02-12 21:36:39.000000000 +0100 +++ dnsmasq-2.42/po/it.po 2008-05-29 21:49:22.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: dnsmasq 2.32\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-12 11:04+0000\n" +"POT-Creation-Date: 2008-05-23 21:33+0100\n" "PO-Revision-Date: 2006-05-22 11:09+0100\n" "Last-Translator: Simon Kelley \n" "Language-Team: Italian \n" @@ -15,53 +15,53 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: cache.c:680 +#: cache.c:700 #, c-format msgid "failed to load names from %s: %s" msgstr "" -#: cache.c:714 dhcp.c:757 +#: cache.c:734 dhcp.c:757 #, c-format msgid "bad address at %s line %d" msgstr "" -#: cache.c:761 dhcp.c:771 +#: cache.c:781 dhcp.c:771 #, c-format msgid "bad name at %s line %d" msgstr "" -#: cache.c:768 dhcp.c:825 +#: cache.c:788 dhcp.c:825 #, c-format msgid "read %s - %d addresses" msgstr "" -#: cache.c:806 +#: cache.c:826 msgid "cleared cache" msgstr "" -#: cache.c:855 +#: cache.c:875 #, c-format msgid "" "not giving name %s to the DHCP lease of %s because the name exists in %s " "with address %s" msgstr "" -#: cache.c:907 +#: cache.c:927 #, c-format msgid "time %lu" msgstr "" -#: cache.c:908 +#: cache.c:928 #, c-format msgid "cache size %d, %d/%d cache insertions re-used unexpired cache entries." msgstr "" -#: cache.c:910 +#: cache.c:930 #, c-format msgid "queries forwarded %u, queries answered locally %u" msgstr "" -#: cache.c:933 +#: cache.c:953 #, c-format msgid "server %s#%d: queries sent %u, retried or failed %u" msgstr "" @@ -80,618 +80,626 @@ msgid "infinite" msgstr "" -#: option.c:244 +#: option.c:248 msgid "Specify local address(es) to listen on." msgstr "" -#: option.c:245 +#: option.c:249 msgid "Return ipaddr for all hosts in specified domains." msgstr "" -#: option.c:246 +#: option.c:250 msgid "Fake reverse lookups for RFC1918 private address ranges." msgstr "" -#: option.c:247 +#: option.c:251 msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)." msgstr "" -#: option.c:248 +#: option.c:252 #, c-format msgid "Specify the size of the cache in entries (defaults to %s)." msgstr "" -#: option.c:249 +#: option.c:253 #, c-format msgid "Specify configuration file (defaults to %s)." msgstr "" -#: option.c:250 +#: option.c:254 msgid "Do NOT fork into the background: run in debug mode." msgstr "" -#: option.c:251 +#: option.c:255 msgid "Do NOT forward queries with no domain part." msgstr "" -#: option.c:252 +#: option.c:256 msgid "Return self-pointing MX records for local hosts." msgstr "" -#: option.c:253 +#: option.c:257 msgid "Expand simple names in /etc/hosts with domain-suffix." msgstr "" -#: option.c:254 +#: option.c:258 msgid "Don't forward spurious DNS requests from Windows hosts." msgstr "" -#: option.c:255 +#: option.c:259 msgid "Enable DHCP in the range given with lease duration." msgstr "" -#: option.c:256 +#: option.c:260 #, c-format msgid "Change to this group after startup (defaults to %s)." msgstr "" -#: option.c:257 +#: option.c:261 msgid "Set address or hostname for a specified machine." msgstr "" -#: option.c:258 +#: option.c:262 msgid "Read DHCP host specs from file" msgstr "" -#: option.c:259 +#: option.c:263 msgid "Read DHCP option specs from file" msgstr "" -#: option.c:260 +#: option.c:264 #, c-format msgid "Do NOT load %s file." msgstr "" -#: option.c:261 +#: option.c:265 #, c-format msgid "Specify a hosts file to be read in addition to %s." msgstr "" -#: option.c:262 +#: option.c:266 msgid "Specify interface(s) to listen on." msgstr "" -#: option.c:263 +#: option.c:267 msgid "Specify interface(s) NOT to listen on." msgstr "" -#: option.c:264 +#: option.c:268 msgid "Map DHCP user class to tag." msgstr "" -#: option.c:265 +#: option.c:269 msgid "Map RFC3046 circuit-id to tag." msgstr "" -#: option.c:266 +#: option.c:270 msgid "Map RFC3046 remote-id to tag." msgstr "" -#: option.c:267 +#: option.c:271 msgid "Map RFC3993 subscriber-id to tag." msgstr "" -#: option.c:268 +#: option.c:272 msgid "Don't do DHCP for hosts with tag set." msgstr "" -#: option.c:269 +#: option.c:273 msgid "Force broadcast replies for hosts with tag set." msgstr "" -#: option.c:270 +#: option.c:274 msgid "Do NOT fork into the background, do NOT run in debug mode." msgstr "" -#: option.c:271 +#: option.c:275 msgid "Assume we are the only DHCP server on the local network." msgstr "" -#: option.c:272 +#: option.c:276 #, c-format msgid "Specify where to store DHCP leases (defaults to %s)." msgstr "" -#: option.c:273 +#: option.c:277 msgid "Return MX records for local hosts." msgstr "" -#: option.c:274 +#: option.c:278 msgid "Specify an MX record." msgstr "" -#: option.c:275 +#: option.c:279 msgid "Specify BOOTP options to DHCP server." msgstr "" -#: option.c:276 +#: option.c:280 #, c-format msgid "Do NOT poll %s file, reload only on SIGHUP." msgstr "" -#: option.c:277 +#: option.c:281 msgid "Do NOT cache failed search results." msgstr "" -#: option.c:278 +#: option.c:282 #, c-format msgid "Use nameservers strictly in the order given in %s." msgstr "" -#: option.c:279 +#: option.c:283 msgid "Specify options to be sent to DHCP clients." msgstr "" -#: option.c:280 +#: option.c:284 msgid "DHCP option sent even if the client does not request it." msgstr "" -#: option.c:281 +#: option.c:285 msgid "Specify port to listen for DNS requests on (defaults to 53)." msgstr "" -#: option.c:282 +#: option.c:286 #, c-format msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)." msgstr "" -#: option.c:283 +#: option.c:287 msgid "Log DNS queries." msgstr "" -#: option.c:284 +#: option.c:288 msgid "Force the originating port for upstream DNS queries." msgstr "" -#: option.c:285 +#: option.c:289 msgid "Do NOT read resolv.conf." msgstr "" -#: option.c:286 +#: option.c:290 #, c-format msgid "Specify path to resolv.conf (defaults to %s)." msgstr "" -#: option.c:287 +#: option.c:291 msgid "Specify address(es) of upstream servers with optional domains." msgstr "" -#: option.c:288 +#: option.c:292 msgid "Never forward queries to specified domains." msgstr "" -#: option.c:289 +#: option.c:293 msgid "Specify the domain to be assigned in DHCP leases." msgstr "" -#: option.c:290 +#: option.c:294 msgid "Specify default target in an MX record." msgstr "" -#: option.c:291 +#: option.c:295 msgid "Specify time-to-live in seconds for replies from /etc/hosts." msgstr "" -#: option.c:292 +#: option.c:296 msgid "Specify time-to-live in seconds for negative caching." msgstr "" -#: option.c:293 +#: option.c:297 #, c-format msgid "Change to this user after startup. (defaults to %s)." msgstr "" -#: option.c:294 +#: option.c:298 msgid "Map DHCP vendor class to tag." msgstr "" -#: option.c:295 +#: option.c:299 msgid "Display dnsmasq version and copyright information." msgstr "" -#: option.c:296 +#: option.c:300 msgid "Translate IPv4 addresses from upstream servers." msgstr "" -#: option.c:297 +#: option.c:301 msgid "Specify a SRV record." msgstr "" -#: option.c:298 +#: option.c:302 msgid "Display this message. Use --help dhcp for known DHCP options." msgstr "" -#: option.c:299 +#: option.c:303 #, c-format msgid "Specify path of PID file (defaults to %s)." msgstr "" -#: option.c:300 +#: option.c:304 #, c-format msgid "Specify maximum number of DHCP leases (defaults to %s)." msgstr "" -#: option.c:301 +#: option.c:305 msgid "Answer DNS queries based on the interface a query was sent to." msgstr "" -#: option.c:302 +#: option.c:306 msgid "Specify TXT DNS record." msgstr "" -#: option.c:303 +#: option.c:307 msgid "Specify PTR DNS record." msgstr "" -#: option.c:304 +#: option.c:308 msgid "Give DNS name to IPv4 address of interface." msgstr "" -#: option.c:305 +#: option.c:309 msgid "Bind only to interfaces in use." msgstr "" -#: option.c:306 +#: option.c:310 #, c-format msgid "Read DHCP static host information from %s." msgstr "" -#: option.c:307 +#: option.c:311 msgid "Enable the DBus interface for setting upstream servers, etc." msgstr "" -#: option.c:308 +#: option.c:312 msgid "Do not provide DHCP on this interface, only provide DNS." msgstr "" -#: option.c:309 +#: option.c:313 msgid "Enable dynamic address allocation for bootp." msgstr "" -#: option.c:310 +#: option.c:314 msgid "Map MAC address (with wildcards) to option set." msgstr "" -#: option.c:312 +#: option.c:316 msgid "Treat DHCP requests on aliases as arriving from interface." msgstr "" -#: option.c:314 +#: option.c:318 msgid "Disable ICMP echo address checking in the DHCP server." msgstr "" -#: option.c:315 +#: option.c:319 msgid "Script to run on DHCP lease creation and destruction." msgstr "" -#: option.c:316 +#: option.c:320 msgid "Read configuration from all the files in this directory." msgstr "" -#: option.c:317 +#: option.c:321 msgid "Log to this syslog facility or file. (defaults to DAEMON)" msgstr "" -#: option.c:318 +#: option.c:322 msgid "Read leases at startup, but never write the lease file." msgstr "" -#: option.c:319 +#: option.c:323 #, c-format msgid "Maximum number of concurrent DNS queries. (defaults to %s)" msgstr "" -#: option.c:320 +#: option.c:324 #, c-format msgid "Clear DNS cache when reloading %s." msgstr "" -#: option.c:321 +#: option.c:325 msgid "Ignore hostnames provided by DHCP clients." msgstr "" -#: option.c:322 +#: option.c:326 msgid "Do NOT reuse filename and server fields for extra DHCP options." msgstr "" -#: option.c:323 +#: option.c:327 msgid "Enable integrated read-only TFTP server." msgstr "" -#: option.c:324 +#: option.c:328 msgid "Export files by TFTP only from the specified subtree." msgstr "" -#: option.c:325 +#: option.c:329 msgid "Add client IP address to tftp-root." msgstr "" -#: option.c:326 +#: option.c:330 msgid "Allow access only to files owned by the user running dnsmasq." msgstr "" -#: option.c:327 +#: option.c:331 #, c-format msgid "Maximum number of conncurrent TFTP transfers (defaults to %s)." msgstr "" -#: option.c:328 +#: option.c:332 msgid "Disable the TFTP blocksize extension." msgstr "" -#: option.c:329 +#: option.c:333 msgid "Ephemeral port range for use by TFTP transfers." msgstr "" -#: option.c:330 +#: option.c:334 msgid "Extra logging for DHCP." msgstr "" -#: option.c:331 +#: option.c:335 msgid "Enable async. logging; optionally set queue length." msgstr "" -#: option.c:332 +#: option.c:336 msgid "Stop DNS rebinding. Filter private IP ranges when resolving." msgstr "" -#: option.c:333 +#: option.c:337 msgid "Always perform DNS queries to all servers." msgstr "" -#: option.c:334 +#: option.c:338 msgid "Set tag if client includes option in request." msgstr "" -#: option.c:585 +#: option.c:339 +msgid "Use alternative ports for DHCP." +msgstr "" + +#: option.c:340 +msgid "Run lease-change script as this user." +msgstr "" + +#: option.c:591 #, c-format msgid "" "Usage: dnsmasq [options]\n" "\n" msgstr "" -#: option.c:587 +#: option.c:593 #, c-format msgid "Use short options only on the command line.\n" msgstr "" -#: option.c:589 +#: option.c:595 #, c-format msgid "Valid options are :\n" msgstr "" -#: option.c:610 +#: option.c:616 #, c-format msgid "Known DHCP options:\n" msgstr "" -#: option.c:683 +#: option.c:689 msgid "bad dhcp-option" msgstr "" -#: option.c:739 +#: option.c:745 msgid "bad IP address" msgstr "" -#: option.c:837 +#: option.c:843 msgid "bad domain in dhcp-option" msgstr "" -#: option.c:895 +#: option.c:901 msgid "dhcp-option too long" msgstr "" -#: option.c:942 +#: option.c:948 #, c-format msgid "cannot access directory %s: %s" msgstr "" -#: option.c:961 tftp.c:343 +#: option.c:967 tftp.c:348 #, c-format msgid "cannot access %s: %s" msgstr "" -#: option.c:998 +#: option.c:1004 msgid "only one dhcp-hostsfile allowed" msgstr "" -#: option.c:1005 +#: option.c:1011 msgid "only one dhcp-optsfile allowed" msgstr "" -#: option.c:1049 +#: option.c:1055 msgid "bad MX preference" msgstr "" -#: option.c:1053 +#: option.c:1059 msgid "bad MX name" msgstr "" -#: option.c:1067 +#: option.c:1073 msgid "bad MX target" msgstr "" -#: option.c:1078 +#: option.c:1084 msgid "cannot run scripts under uClinux" msgstr "" -#: option.c:1265 option.c:1273 +#: option.c:1275 option.c:1283 msgid "bad port" msgstr "" -#: option.c:1293 option.c:1318 +#: option.c:1303 option.c:1328 msgid "interface binding not supported" msgstr "" -#: option.c:1427 +#: option.c:1437 msgid "bad port range" msgstr "" -#: option.c:1444 +#: option.c:1454 msgid "bad bridge-interface" msgstr "" -#: option.c:1485 +#: option.c:1495 msgid "bad dhcp-range" msgstr "" -#: option.c:1511 +#: option.c:1521 msgid "only one netid tag allowed" msgstr "" -#: option.c:1551 +#: option.c:1561 msgid "inconsistent DHCP range" msgstr "" -#: option.c:1719 +#: option.c:1729 msgid "bad DHCP host name" msgstr "" -#: option.c:1959 +#: option.c:1900 option.c:2107 +msgid "invalid port number" +msgstr "" + +#: option.c:1986 msgid "bad interface name" msgstr "" -#: option.c:1979 +#: option.c:2006 msgid "bad PTR record" msgstr "" -#: option.c:1999 +#: option.c:2026 msgid "TXT record string too long" msgstr "" -#: option.c:2003 +#: option.c:2030 msgid "bad TXT record" msgstr "" -#: option.c:2063 +#: option.c:2090 msgid "bad SRV record" msgstr "" -#: option.c:2072 +#: option.c:2099 msgid "bad SRV target" msgstr "" -#: option.c:2080 -msgid "invalid port number" -msgstr "" - -#: option.c:2087 +#: option.c:2114 msgid "invalid priority" msgstr "" -#: option.c:2094 +#: option.c:2121 msgid "invalid weight" msgstr "" -#: option.c:2130 +#: option.c:2157 #, c-format msgid "files nested too deep in %s" msgstr "" -#: option.c:2138 tftp.c:497 +#: option.c:2165 tftp.c:503 #, c-format msgid "cannot read %s: %s" msgstr "" -#: option.c:2199 +#: option.c:2226 msgid "missing \"" msgstr "" -#: option.c:2246 +#: option.c:2273 msgid "bad option" msgstr "" -#: option.c:2248 +#: option.c:2275 msgid "extraneous parameter" msgstr "" -#: option.c:2250 +#: option.c:2277 msgid "missing parameter" msgstr "" -#: option.c:2258 +#: option.c:2285 msgid "error" msgstr "" -#: option.c:2264 +#: option.c:2291 #, c-format msgid "%s at line %d of %%s" msgstr "" -#: option.c:2304 option.c:2334 +#: option.c:2331 option.c:2361 #, c-format msgid "read %s" msgstr "" -#: option.c:2400 +#: option.c:2429 #, c-format msgid "Dnsmasq version %s %s\n" msgstr "" -#: option.c:2401 +#: option.c:2430 #, c-format msgid "" "Compile time options %s\n" "\n" msgstr "" -#: option.c:2402 +#: option.c:2431 #, c-format msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" msgstr "" -#: option.c:2403 +#: option.c:2432 #, c-format msgid "Dnsmasq is free software, and you are welcome to redistribute it\n" msgstr "" -#: option.c:2404 +#: option.c:2433 #, c-format msgid "under the terms of the GNU General Public License, version 2 or 3.\n" msgstr "" -#: option.c:2415 +#: option.c:2444 msgid "try --help" msgstr "" -#: option.c:2417 +#: option.c:2446 msgid "try -w" msgstr "" -#: option.c:2420 +#: option.c:2449 #, c-format msgid "bad command line options: %s" msgstr "" -#: option.c:2461 +#: option.c:2490 #, c-format msgid "cannot get host-name: %s" msgstr "" -#: option.c:2489 +#: option.c:2518 msgid "only one resolv.conf file allowed in no-poll mode." msgstr "" -#: option.c:2499 +#: option.c:2528 msgid "must have exactly one resolv.conf to read domain from." msgstr "" -#: option.c:2502 network.c:640 +#: option.c:2531 network.c:640 #, c-format msgid "failed to read %s: %s" msgstr "" -#: option.c:2520 +#: option.c:2549 #, c-format msgid "no search directive found in %s" msgstr "" @@ -705,7 +713,7 @@ msgid "possible DNS-rebind attack detected" msgstr "" -#: isc.c:77 dnsmasq.c:747 +#: isc.c:77 dnsmasq.c:769 #, c-format msgid "failed to access %s: %s" msgstr "" @@ -715,7 +723,7 @@ msgid "failed to load %s: %s" msgstr "" -#: isc.c:97 dnsmasq.c:769 +#: isc.c:97 dnsmasq.c:791 #, c-format msgid "reading %s" msgstr "" @@ -735,7 +743,7 @@ msgid "unknown interface %s in bridge-interface" msgstr "" -#: network.c:389 dnsmasq.c:180 +#: network.c:389 dnsmasq.c:183 #, c-format msgid "failed to create listening socket: %s" msgstr "" @@ -811,177 +819,182 @@ msgid "using nameserver %s#%d" msgstr "" -#: dnsmasq.c:110 +#: dnsmasq.c:113 msgid "" "ISC dhcpd integration not available: set HAVE_ISC_READER in src/config.h" msgstr "" -#: dnsmasq.c:132 +#: dnsmasq.c:135 msgid "TFTP server not available: set HAVE_TFTP in src/config.h" msgstr "" -#: dnsmasq.c:137 +#: dnsmasq.c:140 msgid "asychronous logging is not available under Solaris" msgstr "" -#: dnsmasq.c:151 +#: dnsmasq.c:154 msgid "must set exactly one interface on broken systems without IP_RECVIF" msgstr "" -#: dnsmasq.c:161 +#: dnsmasq.c:164 #, c-format msgid "failed to find list of interfaces: %s" msgstr "" -#: dnsmasq.c:169 +#: dnsmasq.c:172 #, c-format msgid "unknown interface %s" msgstr "" -#: dnsmasq.c:175 +#: dnsmasq.c:178 #, c-format msgid "no interface with address %s" msgstr "" -#: dnsmasq.c:192 dnsmasq.c:561 +#: dnsmasq.c:195 dnsmasq.c:575 #, c-format msgid "DBus error: %s" msgstr "" -#: dnsmasq.c:195 +#: dnsmasq.c:198 msgid "DBus not available: set HAVE_DBUS in src/config.h" msgstr "" -#: dnsmasq.c:204 +#: dnsmasq.c:207 #, c-format msgid "cannot create pipe: %s" msgstr "" -#: dnsmasq.c:225 +#: dnsmasq.c:223 #, c-format -msgid "cannot fork into background: %s" +msgid "cannot chdir to filesystem root: %s" msgstr "" -#: dnsmasq.c:239 +#: dnsmasq.c:231 #, c-format -msgid "cannot chdir to filesystem root: %s" +msgid "cannot fork into background: %s" msgstr "" -#: dnsmasq.c:349 +#: dnsmasq.c:363 #, c-format msgid "started, version %s DNS disabled" msgstr "" -#: dnsmasq.c:351 +#: dnsmasq.c:365 #, c-format msgid "started, version %s cachesize %d" msgstr "" -#: dnsmasq.c:353 +#: dnsmasq.c:367 #, c-format msgid "started, version %s cache disabled" msgstr "" -#: dnsmasq.c:355 +#: dnsmasq.c:369 #, c-format msgid "compile time options: %s" msgstr "" -#: dnsmasq.c:361 +#: dnsmasq.c:375 msgid "DBus support enabled: connected to system bus" msgstr "" -#: dnsmasq.c:363 +#: dnsmasq.c:377 msgid "DBus support enabled: bus connection pending" msgstr "" -#: dnsmasq.c:368 +#: dnsmasq.c:382 msgid "setting --bind-interfaces option because of OS limitations" msgstr "" -#: dnsmasq.c:373 +#: dnsmasq.c:387 #, c-format msgid "warning: interface %s does not currently exist" msgstr "" -#: dnsmasq.c:378 +#: dnsmasq.c:392 msgid "warning: ignoring resolv-file flag because no-resolv is set" msgstr "" -#: dnsmasq.c:381 +#: dnsmasq.c:395 msgid "warning: no upstream servers configured" msgstr "" -#: dnsmasq.c:385 +#: dnsmasq.c:399 #, c-format msgid "asynchronous logging enabled, queue limit is %d messages" msgstr "" -#: dnsmasq.c:397 +#: dnsmasq.c:411 #, c-format msgid "DHCP, static leases only on %.0s%s, lease time %s" msgstr "" -#: dnsmasq.c:398 +#: dnsmasq.c:412 #, c-format msgid "DHCP, IP range %s -- %s, lease time %s" msgstr "" -#: dnsmasq.c:412 +#: dnsmasq.c:426 msgid "root is " msgstr "" -#: dnsmasq.c:412 +#: dnsmasq.c:426 msgid "enabled" msgstr "" -#: dnsmasq.c:414 +#: dnsmasq.c:428 msgid "secure mode" msgstr "" -#: dnsmasq.c:440 +#: dnsmasq.c:454 #, c-format msgid "restricting maximum simultaneous TFTP transfers to %d" msgstr "" -#: dnsmasq.c:449 +#: dnsmasq.c:463 #, c-format msgid "warning: setting capabilities failed: %s" msgstr "" -#: dnsmasq.c:451 +#: dnsmasq.c:465 msgid "running as root" msgstr "" -#: dnsmasq.c:563 +#: dnsmasq.c:577 msgid "connected to system DBus" msgstr "" -#: dnsmasq.c:683 +#: dnsmasq.c:697 #, c-format msgid "child process killed by signal %d" msgstr "" -#: dnsmasq.c:687 +#: dnsmasq.c:701 #, c-format msgid "child process exited with status %d" msgstr "" -#: dnsmasq.c:691 +#: dnsmasq.c:705 #, c-format msgid "failed to execute %s: %s" msgstr "" -#: dnsmasq.c:695 +#: dnsmasq.c:710 #, c-format msgid "failed to create helper: %s" msgstr "" -#: dnsmasq.c:729 +#: dnsmasq.c:714 +#, c-format +msgid "cannot change to user %s for script execution%s%s" +msgstr "" + +#: dnsmasq.c:751 msgid "exiting on receipt of SIGTERM" msgstr "" -#: dnsmasq.c:780 +#: dnsmasq.c:802 #, c-format msgid "no servers found in %s, will retry" msgstr "" @@ -1085,152 +1098,152 @@ msgid "failed to write %s: %s (retry in %us)" msgstr "" -#: rfc2131.c:303 +#: rfc2131.c:304 #, c-format msgid "no address range available for DHCP request %s %s" msgstr "" -#: rfc2131.c:304 +#: rfc2131.c:305 msgid "with subnet selector" msgstr "" -#: rfc2131.c:304 +#: rfc2131.c:305 msgid "via" msgstr "" -#: rfc2131.c:315 +#: rfc2131.c:316 #, c-format msgid "DHCP packet: transaction-id is %u" msgstr "" -#: rfc2131.c:320 +#: rfc2131.c:321 #, c-format msgid "Available DHCP subnet: %s/%s" msgstr "" -#: rfc2131.c:322 +#: rfc2131.c:323 #, c-format msgid "Available DHCP range: %s -- %s" msgstr "" -#: rfc2131.c:350 rfc2131.c:381 +#: rfc2131.c:351 rfc2131.c:382 msgid "disabled" msgstr "" -#: rfc2131.c:393 rfc2131.c:873 +#: rfc2131.c:394 rfc2131.c:874 msgid "address in use" msgstr "" -#: rfc2131.c:396 +#: rfc2131.c:397 msgid "no address configured" msgstr "" -#: rfc2131.c:409 rfc2131.c:736 +#: rfc2131.c:410 rfc2131.c:737 msgid "no address available" msgstr "" -#: rfc2131.c:418 rfc2131.c:883 +#: rfc2131.c:419 rfc2131.c:884 msgid "no leases left" msgstr "" -#: rfc2131.c:421 rfc2131.c:847 +#: rfc2131.c:422 rfc2131.c:848 msgid "wrong network" msgstr "" -#: rfc2131.c:520 +#: rfc2131.c:521 #, c-format msgid "Ignoring domain %s for DHCP host name %s" msgstr "" -#: rfc2131.c:614 +#: rfc2131.c:615 #, c-format msgid "Vendor class: %s" msgstr "" -#: rfc2131.c:616 +#: rfc2131.c:617 #, c-format msgid "User class: %s" msgstr "" -#: rfc2131.c:657 +#: rfc2131.c:658 #, c-format msgid "disabling DHCP static address %s for %s" msgstr "" -#: rfc2131.c:678 +#: rfc2131.c:679 msgid "unknown lease" msgstr "" -#: rfc2131.c:687 rfc2131.c:992 +#: rfc2131.c:688 rfc2131.c:995 msgid "ignored" msgstr "" -#: rfc2131.c:707 +#: rfc2131.c:708 #, c-format msgid "not using configured address %s because it is leased to %s" msgstr "" -#: rfc2131.c:717 +#: rfc2131.c:718 #, c-format msgid "" "not using configured address %s because it is in use by the server or relay" msgstr "" -#: rfc2131.c:720 +#: rfc2131.c:721 #, c-format msgid "not using configured address %s because it was previously declined" msgstr "" -#: rfc2131.c:734 rfc2131.c:876 +#: rfc2131.c:735 rfc2131.c:877 msgid "no unique-id" msgstr "" -#: rfc2131.c:806 +#: rfc2131.c:807 msgid "wrong address" msgstr "" -#: rfc2131.c:823 +#: rfc2131.c:824 msgid "lease not found" msgstr "" -#: rfc2131.c:855 +#: rfc2131.c:856 msgid "address not available" msgstr "" -#: rfc2131.c:866 +#: rfc2131.c:867 msgid "static lease available" msgstr "" -#: rfc2131.c:870 +#: rfc2131.c:871 msgid "address reserved" msgstr "" -#: rfc2131.c:1265 +#: rfc2131.c:1268 #, c-format msgid "tags: %s" msgstr "" -#: rfc2131.c:1352 +#: rfc2131.c:1355 #, c-format msgid "cannot send DHCP/BOOTP option %d: no space left in packet" msgstr "" -#: rfc2131.c:1507 +#: rfc2131.c:1525 #, c-format msgid "requested options: %s" msgstr "" -#: rfc2131.c:1556 +#: rfc2131.c:1574 #, c-format msgid "next server: %s" msgstr "" -#: rfc2131.c:1580 +#: rfc2131.c:1598 #, c-format msgid "bootfile name: %s" msgstr "" -#: rfc2131.c:1583 +#: rfc2131.c:1601 #, c-format msgid "server name: %s" msgstr "" @@ -1249,11 +1262,11 @@ msgid "attempt to set an IPv6 server address via DBus - no IPv6 support" msgstr "" -#: dbus.c:241 +#: dbus.c:243 msgid "setting upstream servers from DBus" msgstr "" -#: dbus.c:279 +#: dbus.c:281 msgid "could not register a DBus message handler" msgstr "" @@ -1267,31 +1280,31 @@ msgid "DHCP request for unsupported hardware type (%d) received on %s" msgstr "" -#: tftp.c:173 +#: tftp.c:175 msgid "unable to get free port for TFTP" msgstr "" -#: tftp.c:188 +#: tftp.c:190 #, c-format msgid "unsupported request from %s" msgstr "" -#: tftp.c:266 +#: tftp.c:271 #, c-format msgid "TFTP sent %s to %s" msgstr "" -#: tftp.c:289 +#: tftp.c:294 #, c-format msgid "file %s not found" msgstr "" -#: tftp.c:399 +#: tftp.c:405 #, c-format msgid "TFTP error %d %s received from %s" msgstr "" -#: tftp.c:430 +#: tftp.c:436 #, c-format msgid "TFTP failed sending %s to %s" msgstr "" diff -Nru /tmp/7MO8KY0fpf/dnsmasq-2.41/po/no.po /tmp/pRA3L6jhPD/dnsmasq-2.42/po/no.po --- dnsmasq-2.41/po/no.po 2008-02-12 21:36:39.000000000 +0100 +++ dnsmasq-2.42/po/no.po 2008-05-29 21:49:22.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: dnsmasq 2.25\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-12 11:04+0000\n" +"POT-Creation-Date: 2008-05-23 21:33+0100\n" "PO-Revision-Date: 2006-01-11 17:39+0000\n" "Last-Translator: Jan Erik Askildt \n" "Language-Team: Norwegian \n" @@ -17,31 +17,31 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: cache.c:680 +#: cache.c:700 #, fuzzy, c-format msgid "failed to load names from %s: %s" msgstr "feilet � laste navn fra %s: %m" -#: cache.c:714 dhcp.c:757 +#: cache.c:734 dhcp.c:757 #, c-format msgid "bad address at %s line %d" msgstr "d�rlig adresse ved %s linje %d" -#: cache.c:761 dhcp.c:771 +#: cache.c:781 dhcp.c:771 #, c-format msgid "bad name at %s line %d" msgstr "d�rlig navn ved %s linje %d" -#: cache.c:768 dhcp.c:825 +#: cache.c:788 dhcp.c:825 #, c-format msgid "read %s - %d addresses" msgstr "les %s - %d adresser" -#: cache.c:806 +#: cache.c:826 msgid "cleared cache" msgstr "mellomlager t�mt" -#: cache.c:855 +#: cache.c:875 #, c-format msgid "" "not giving name %s to the DHCP lease of %s because the name exists in %s " @@ -50,24 +50,24 @@ "gir ikke navnet %s til DHCP leien for %s fordi navnet eksisterer i %s med " "adressen %s" -#: cache.c:907 +#: cache.c:927 #, c-format msgid "time %lu" msgstr "" -#: cache.c:908 +#: cache.c:928 #, fuzzy, c-format msgid "cache size %d, %d/%d cache insertions re-used unexpired cache entries." msgstr "" "mellomlager st�rrelse %d, %d/%d mellomlager innsettinger re-bruker " "mellomlager plasser som ikke er utl�pt" -#: cache.c:910 +#: cache.c:930 #, c-format msgid "queries forwarded %u, queries answered locally %u" msgstr "" -#: cache.c:933 +#: cache.c:953 #, c-format msgid "server %s#%d: queries sent %u, retried or failed %u" msgstr "" @@ -86,391 +86,399 @@ msgid "infinite" msgstr "uendelig" -#: option.c:244 +#: option.c:248 msgid "Specify local address(es) to listen on." msgstr "Spesifiser lokal(e) adresse(r) � lytte p�." -#: option.c:245 +#: option.c:249 msgid "Return ipaddr for all hosts in specified domains." msgstr "Returner ipaddr for alle verter i det spesifiserte domenet." -#: option.c:246 +#: option.c:250 msgid "Fake reverse lookups for RFC1918 private address ranges." msgstr "Forfalsk revers oppslag for RFC1918 private adresse omr�der." -#: option.c:247 +#: option.c:251 msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)." msgstr "Behandle ipaddr som NXDOMAIN (omg�r Verisign wildcard)." -#: option.c:248 +#: option.c:252 #, c-format msgid "Specify the size of the cache in entries (defaults to %s)." msgstr "Spesifiser st�rrelsen p� mellomlager plassene (standard er %s)." -#: option.c:249 +#: option.c:253 #, c-format msgid "Specify configuration file (defaults to %s)." msgstr "Spesifiser konfigurasjonsfil (standard er %s)." -#: option.c:250 +#: option.c:254 msgid "Do NOT fork into the background: run in debug mode." msgstr "IKKE legg (fork) som bakgrunnsprosess: kj�r i debug modus." -#: option.c:251 +#: option.c:255 msgid "Do NOT forward queries with no domain part." msgstr "IKKE videresend oppslag som mangler domene del." -#: option.c:252 +#: option.c:256 msgid "Return self-pointing MX records for local hosts." msgstr "Returner selv-pekende MX post for lokale verter." -#: option.c:253 +#: option.c:257 msgid "Expand simple names in /etc/hosts with domain-suffix." msgstr "Utvid enkle navn i /etc/hosts med domene-suffiks." -#: option.c:254 +#: option.c:258 msgid "Don't forward spurious DNS requests from Windows hosts." msgstr "Ikke videresend falske/uekte DNS foresp�rsler fra Windows verter." -#: option.c:255 +#: option.c:259 msgid "Enable DHCP in the range given with lease duration." msgstr "Aktiver DHCP i det gitte omr�det med leie varighet" -#: option.c:256 +#: option.c:260 #, c-format msgid "Change to this group after startup (defaults to %s)." msgstr "Skift til denne gruppen etter oppstart (standard er %s)." -#: option.c:257 +#: option.c:261 msgid "Set address or hostname for a specified machine." msgstr "Sett adresse eller vertsnavn for en spesifikk maskin." -#: option.c:258 +#: option.c:262 msgid "Read DHCP host specs from file" msgstr "" -#: option.c:259 +#: option.c:263 msgid "Read DHCP option specs from file" msgstr "" -#: option.c:260 +#: option.c:264 #, c-format msgid "Do NOT load %s file." msgstr "IKKE last %s filen." -#: option.c:261 +#: option.c:265 #, c-format msgid "Specify a hosts file to be read in addition to %s." msgstr "Spesifiser en verts (hosts) fil som skal leses i tilleg til %s." -#: option.c:262 +#: option.c:266 msgid "Specify interface(s) to listen on." msgstr "Spesifiser nettverkskort det skal lyttes p�." -#: option.c:263 +#: option.c:267 msgid "Specify interface(s) NOT to listen on." msgstr "Spesifiser nettverkskort det IKKE skal lyttes p�." -#: option.c:264 +#: option.c:268 #, fuzzy msgid "Map DHCP user class to tag." msgstr "Map DHCP bruker klasse til opsjon sett." -#: option.c:265 +#: option.c:269 msgid "Map RFC3046 circuit-id to tag." msgstr "" -#: option.c:266 +#: option.c:270 msgid "Map RFC3046 remote-id to tag." msgstr "" -#: option.c:267 +#: option.c:271 msgid "Map RFC3993 subscriber-id to tag." msgstr "" -#: option.c:268 +#: option.c:272 #, fuzzy msgid "Don't do DHCP for hosts with tag set." msgstr "Ikke utf�r DHCP for klienter i opsjon sett." -#: option.c:269 +#: option.c:273 #, fuzzy msgid "Force broadcast replies for hosts with tag set." msgstr "Ikke utf�r DHCP for klienter i opsjon sett." -#: option.c:270 +#: option.c:274 msgid "Do NOT fork into the background, do NOT run in debug mode." msgstr "IKKE last (fork) som bakgrunnsprosess, IKKE kj�r i debug modus." -#: option.c:271 +#: option.c:275 msgid "Assume we are the only DHCP server on the local network." msgstr "Anta at vi er den eneste DHCP tjeneren p� det lokale nettverket." -#: option.c:272 +#: option.c:276 #, c-format msgid "Specify where to store DHCP leases (defaults to %s)." msgstr "Spesifiser hvor DHCP leiene skal lagres (standard er %s)." -#: option.c:273 +#: option.c:277 msgid "Return MX records for local hosts." msgstr "Returner MX records for lokale verter." -#: option.c:274 +#: option.c:278 msgid "Specify an MX record." msgstr "Spesifiser en MX post." -#: option.c:275 +#: option.c:279 msgid "Specify BOOTP options to DHCP server." msgstr "Spesifiser BOOTP opsjoner til DHCP tjener." -#: option.c:276 +#: option.c:280 #, c-format msgid "Do NOT poll %s file, reload only on SIGHUP." msgstr "IKKE sp�r (poll) %s fil, les p� nytt kun ved SIGHUP" -#: option.c:277 +#: option.c:281 msgid "Do NOT cache failed search results." msgstr "IKKE mellomlagre s�keresultater som feiler." -#: option.c:278 +#: option.c:282 #, c-format msgid "Use nameservers strictly in the order given in %s." msgstr "Bruk navnetjenere kun som bestemt i rekkef�lgen gitt i %s." -#: option.c:279 +#: option.c:283 #, fuzzy msgid "Specify options to be sent to DHCP clients." msgstr "Sett ekstra opsjoner som skal fordeles til DHCP klientene." -#: option.c:280 +#: option.c:284 msgid "DHCP option sent even if the client does not request it." msgstr "" -#: option.c:281 +#: option.c:285 msgid "Specify port to listen for DNS requests on (defaults to 53)." msgstr "Spesifiser lytteport for DNS oppslag (standard er 53)." -#: option.c:282 +#: option.c:286 #, c-format msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)." msgstr "Maksimal st�ttet UDP pakkest�rrelse for EDNS.0 (standard er %s)." -#: option.c:283 +#: option.c:287 #, fuzzy msgid "Log DNS queries." msgstr "Logg oppslag." -#: option.c:284 +#: option.c:288 #, fuzzy msgid "Force the originating port for upstream DNS queries." msgstr "Tving bruk av opprinnelig port for oppstr�ms oppslag." -#: option.c:285 +#: option.c:289 msgid "Do NOT read resolv.conf." msgstr "IKKE les resolv.conf." -#: option.c:286 +#: option.c:290 #, c-format msgid "Specify path to resolv.conf (defaults to %s)." msgstr "Spesifiser stien til resolv.conf (standard er %s)." -#: option.c:287 +#: option.c:291 msgid "Specify address(es) of upstream servers with optional domains." msgstr "Spesifiser adressen(e) til oppstr�ms tjenere med valgfrie domener." -#: option.c:288 +#: option.c:292 msgid "Never forward queries to specified domains." msgstr "Aldri videresend oppslag til spesifiserte domener." -#: option.c:289 +#: option.c:293 msgid "Specify the domain to be assigned in DHCP leases." msgstr "Spesifiser domenet som skal tildeles i DHCP leien." -#: option.c:290 +#: option.c:294 msgid "Specify default target in an MX record." msgstr "Spesifiser default m�l i en MX post." -#: option.c:291 +#: option.c:295 msgid "Specify time-to-live in seconds for replies from /etc/hosts." msgstr "Spesifiser time-to-live i sekunder for svar fra /etc/hosts." -#: option.c:292 +#: option.c:296 #, fuzzy msgid "Specify time-to-live in seconds for negative caching." msgstr "Spesifiser time-to-live i sekunder for svar fra /etc/hosts." -#: option.c:293 +#: option.c:297 #, c-format msgid "Change to this user after startup. (defaults to %s)." msgstr "Skift til denne bruker etter oppstart (standard er %s)." -#: option.c:294 +#: option.c:298 #, fuzzy msgid "Map DHCP vendor class to tag." msgstr "Map DHCP produsent klasse til opsjon sett." -#: option.c:295 +#: option.c:299 msgid "Display dnsmasq version and copyright information." msgstr "Vis dnsmasq versjon og copyright informasjon." -#: option.c:296 +#: option.c:300 msgid "Translate IPv4 addresses from upstream servers." msgstr "Oversett IPv4 adresser fra oppstr�ms tjenere." -#: option.c:297 +#: option.c:301 msgid "Specify a SRV record." msgstr "Spesifiser en SRV post." -#: option.c:298 +#: option.c:302 msgid "Display this message. Use --help dhcp for known DHCP options." msgstr "" -#: option.c:299 +#: option.c:303 #, fuzzy, c-format msgid "Specify path of PID file (defaults to %s)." msgstr "Spesifiser stien til PID fil. (standard er %s)." -#: option.c:300 +#: option.c:304 #, c-format msgid "Specify maximum number of DHCP leases (defaults to %s)." msgstr "Spesifiser maksimum antall DHCP leier (standard er %s)" -#: option.c:301 +#: option.c:305 msgid "Answer DNS queries based on the interface a query was sent to." msgstr "Svar DNS oppslag basert p� nettverkskortet oppslaget ble sendt til." -#: option.c:302 +#: option.c:306 msgid "Specify TXT DNS record." msgstr "Spesifiser TXT DNS post." -#: option.c:303 +#: option.c:307 #, fuzzy msgid "Specify PTR DNS record." msgstr "Spesifiser TXT DNS post." -#: option.c:304 +#: option.c:308 msgid "Give DNS name to IPv4 address of interface." msgstr "" -#: option.c:305 +#: option.c:309 msgid "Bind only to interfaces in use." msgstr "Bind kun til nettverkskort som er i bruk." -#: option.c:306 +#: option.c:310 #, c-format msgid "Read DHCP static host information from %s." msgstr "Les DHCP statisk vert informasjon fra %s." -#: option.c:307 +#: option.c:311 msgid "Enable the DBus interface for setting upstream servers, etc." msgstr "Aktiver DBus interface for � sette oppstr�ms tjenere, osv." -#: option.c:308 +#: option.c:312 msgid "Do not provide DHCP on this interface, only provide DNS." msgstr "Ikke lever DHCP p� dette nettverkskortet, kun lever DNS." -#: option.c:309 +#: option.c:313 msgid "Enable dynamic address allocation for bootp." msgstr "Aktiver dynamisk adresse allokering for bootp." -#: option.c:310 +#: option.c:314 #, fuzzy msgid "Map MAC address (with wildcards) to option set." msgstr "Map DHCP produsent klasse til opsjon sett." -#: option.c:312 +#: option.c:316 msgid "Treat DHCP requests on aliases as arriving from interface." msgstr "" -#: option.c:314 +#: option.c:318 msgid "Disable ICMP echo address checking in the DHCP server." msgstr "" -#: option.c:315 +#: option.c:319 msgid "Script to run on DHCP lease creation and destruction." msgstr "" -#: option.c:316 +#: option.c:320 msgid "Read configuration from all the files in this directory." msgstr "" -#: option.c:317 +#: option.c:321 #, fuzzy msgid "Log to this syslog facility or file. (defaults to DAEMON)" msgstr "Skift til denne bruker etter oppstart (standard er %s)." -#: option.c:318 +#: option.c:322 msgid "Read leases at startup, but never write the lease file." msgstr "" -#: option.c:319 +#: option.c:323 #, fuzzy, c-format msgid "Maximum number of concurrent DNS queries. (defaults to %s)" msgstr "Spesifiser maksimum antall DHCP leier (standard er %s)" -#: option.c:320 +#: option.c:324 #, c-format msgid "Clear DNS cache when reloading %s." msgstr "" -#: option.c:321 +#: option.c:325 msgid "Ignore hostnames provided by DHCP clients." msgstr "" -#: option.c:322 +#: option.c:326 msgid "Do NOT reuse filename and server fields for extra DHCP options." msgstr "" -#: option.c:323 +#: option.c:327 msgid "Enable integrated read-only TFTP server." msgstr "" -#: option.c:324 +#: option.c:328 msgid "Export files by TFTP only from the specified subtree." msgstr "" -#: option.c:325 +#: option.c:329 msgid "Add client IP address to tftp-root." msgstr "" -#: option.c:326 +#: option.c:330 msgid "Allow access only to files owned by the user running dnsmasq." msgstr "" -#: option.c:327 +#: option.c:331 #, fuzzy, c-format msgid "Maximum number of conncurrent TFTP transfers (defaults to %s)." msgstr "Spesifiser maksimum antall DHCP leier (standard er %s)" -#: option.c:328 +#: option.c:332 msgid "Disable the TFTP blocksize extension." msgstr "" -#: option.c:329 +#: option.c:333 msgid "Ephemeral port range for use by TFTP transfers." msgstr "" -#: option.c:330 +#: option.c:334 msgid "Extra logging for DHCP." msgstr "" -#: option.c:331 +#: option.c:335 msgid "Enable async. logging; optionally set queue length." msgstr "" -#: option.c:332 +#: option.c:336 msgid "Stop DNS rebinding. Filter private IP ranges when resolving." msgstr "" -#: option.c:333 +#: option.c:337 msgid "Always perform DNS queries to all servers." msgstr "" -#: option.c:334 +#: option.c:338 msgid "Set tag if client includes option in request." msgstr "" -#: option.c:585 +#: option.c:339 +msgid "Use alternative ports for DHCP." +msgstr "" + +#: option.c:340 +msgid "Run lease-change script as this user." +msgstr "" + +#: option.c:591 #, c-format msgid "" "Usage: dnsmasq [options]\n" @@ -479,190 +487,190 @@ "Bruk: dnsmasq [opsjoner]\n" "\n" -#: option.c:587 +#: option.c:593 #, c-format msgid "Use short options only on the command line.\n" msgstr "Bruk korte opsjoner kun p� kommandolinjen.\n" -#: option.c:589 +#: option.c:595 #, c-format msgid "Valid options are :\n" msgstr "Gyldige opsjoner er :\n" -#: option.c:610 +#: option.c:616 #, c-format msgid "Known DHCP options:\n" msgstr "" -#: option.c:683 +#: option.c:689 msgid "bad dhcp-option" msgstr "d�rlig dhcp-opsjon" -#: option.c:739 +#: option.c:745 #, fuzzy msgid "bad IP address" msgstr "les %s - %d adresser" -#: option.c:837 +#: option.c:843 msgid "bad domain in dhcp-option" msgstr "d�rlig domene i dhcp-opsjon" -#: option.c:895 +#: option.c:901 msgid "dhcp-option too long" msgstr "dhcp-opsjon for lang" -#: option.c:942 +#: option.c:948 #, fuzzy, c-format msgid "cannot access directory %s: %s" msgstr "kan ikke lese %s: %s" -#: option.c:961 tftp.c:343 +#: option.c:967 tftp.c:348 #, fuzzy, c-format msgid "cannot access %s: %s" msgstr "kan ikke lese %s: %s" -#: option.c:998 +#: option.c:1004 msgid "only one dhcp-hostsfile allowed" msgstr "" -#: option.c:1005 +#: option.c:1011 msgid "only one dhcp-optsfile allowed" msgstr "" -#: option.c:1049 +#: option.c:1055 msgid "bad MX preference" msgstr "d�rlig MX preferanse" -#: option.c:1053 +#: option.c:1059 msgid "bad MX name" msgstr "d�rlig MX navn" -#: option.c:1067 +#: option.c:1073 msgid "bad MX target" msgstr "d�rlig MX m�l" -#: option.c:1078 +#: option.c:1084 msgid "cannot run scripts under uClinux" msgstr "" -#: option.c:1265 option.c:1273 +#: option.c:1275 option.c:1283 msgid "bad port" msgstr "d�rlig port" -#: option.c:1293 option.c:1318 +#: option.c:1303 option.c:1328 msgid "interface binding not supported" msgstr "" -#: option.c:1427 +#: option.c:1437 #, fuzzy msgid "bad port range" msgstr "d�rlig port" -#: option.c:1444 +#: option.c:1454 msgid "bad bridge-interface" msgstr "" -#: option.c:1485 +#: option.c:1495 msgid "bad dhcp-range" msgstr "d�rlig dhcp-omr�de" -#: option.c:1511 +#: option.c:1521 msgid "only one netid tag allowed" msgstr "" -#: option.c:1551 +#: option.c:1561 msgid "inconsistent DHCP range" msgstr "ikke konsistent DHCP omr�de" -#: option.c:1719 +#: option.c:1729 #, fuzzy msgid "bad DHCP host name" msgstr "d�rlig MX navn" -#: option.c:1959 +#: option.c:1900 option.c:2107 +msgid "invalid port number" +msgstr "ugyldig portnummer" + +#: option.c:1986 #, fuzzy msgid "bad interface name" msgstr "d�rlig MX navn" -#: option.c:1979 +#: option.c:2006 #, fuzzy msgid "bad PTR record" msgstr "d�rlig SRV post" -#: option.c:1999 +#: option.c:2026 msgid "TXT record string too long" msgstr "TXT post streng for lang" -#: option.c:2003 +#: option.c:2030 msgid "bad TXT record" msgstr "d�rlig TXT post" -#: option.c:2063 +#: option.c:2090 msgid "bad SRV record" msgstr "d�rlig SRV post" -#: option.c:2072 +#: option.c:2099 msgid "bad SRV target" msgstr "d�rlig SRV m�l" -#: option.c:2080 -msgid "invalid port number" -msgstr "ugyldig portnummer" - -#: option.c:2087 +#: option.c:2114 msgid "invalid priority" msgstr "ugyldig prioritet" -#: option.c:2094 +#: option.c:2121 msgid "invalid weight" msgstr "ugyldig vekt" -#: option.c:2130 +#: option.c:2157 #, c-format msgid "files nested too deep in %s" msgstr "" -#: option.c:2138 tftp.c:497 +#: option.c:2165 tftp.c:503 #, c-format msgid "cannot read %s: %s" msgstr "kan ikke lese %s: %s" -#: option.c:2199 +#: option.c:2226 msgid "missing \"" msgstr "mangler \"" -#: option.c:2246 +#: option.c:2273 msgid "bad option" msgstr "d�rlig opsjon" -#: option.c:2248 +#: option.c:2275 msgid "extraneous parameter" msgstr "overfl�dig parameter" -#: option.c:2250 +#: option.c:2277 msgid "missing parameter" msgstr "mangler parameter" -#: option.c:2258 +#: option.c:2285 msgid "error" msgstr "feil" -#: option.c:2264 +#: option.c:2291 #, c-format msgid "%s at line %d of %%s" msgstr "%s p� linje %d av %%s" -#: option.c:2304 option.c:2334 +#: option.c:2331 option.c:2361 #, fuzzy, c-format msgid "read %s" msgstr "leser %s" -#: option.c:2400 +#: option.c:2429 #, c-format msgid "Dnsmasq version %s %s\n" msgstr "Dnsmasq versjon %s %s\n" -#: option.c:2401 +#: option.c:2430 #, c-format msgid "" "Compile time options %s\n" @@ -671,53 +679,53 @@ "Kompileringsopsjoner %s\n" "\n" -#: option.c:2402 +#: option.c:2431 #, c-format msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" msgstr "Denne programvaren kommer med ABSOLUTT INGEN GARANTI.\n" -#: option.c:2403 +#: option.c:2432 #, c-format msgid "Dnsmasq is free software, and you are welcome to redistribute it\n" msgstr "DNsmasq er fri programvare, du er velkommen til � redistribuere den\n" -#: option.c:2404 +#: option.c:2433 #, fuzzy, c-format msgid "under the terms of the GNU General Public License, version 2 or 3.\n" msgstr "under vilk�rene gitt i GNU General Public License, versjon 2.\n" -#: option.c:2415 +#: option.c:2444 msgid "try --help" msgstr "" -#: option.c:2417 +#: option.c:2446 msgid "try -w" msgstr "" -#: option.c:2420 +#: option.c:2449 #, fuzzy, c-format msgid "bad command line options: %s" msgstr "d�rlige kommandlinje opsjoner: %s." -#: option.c:2461 +#: option.c:2490 #, c-format msgid "cannot get host-name: %s" msgstr "klarer ikke � f� vertsnavn: %s" -#: option.c:2489 +#: option.c:2518 msgid "only one resolv.conf file allowed in no-poll mode." msgstr "kun en resolv.conf fil tillat i no-poll modus." -#: option.c:2499 +#: option.c:2528 msgid "must have exactly one resolv.conf to read domain from." msgstr "m� ha n�yaktig en resolv.conf � lese domene fra." -#: option.c:2502 network.c:640 +#: option.c:2531 network.c:640 #, fuzzy, c-format msgid "failed to read %s: %s" msgstr "feilet � lese %s: %m" -#: option.c:2520 +#: option.c:2549 #, c-format msgid "no search directive found in %s" msgstr "intet s�ke direktiv funnet i %s" @@ -731,7 +739,7 @@ msgid "possible DNS-rebind attack detected" msgstr "" -#: isc.c:77 dnsmasq.c:747 +#: isc.c:77 dnsmasq.c:769 #, fuzzy, c-format msgid "failed to access %s: %s" msgstr "feilet � f� tilgang til %s: %m" @@ -741,7 +749,7 @@ msgid "failed to load %s: %s" msgstr "feilet � laste %s: %m" -#: isc.c:97 dnsmasq.c:769 +#: isc.c:97 dnsmasq.c:791 #, c-format msgid "reading %s" msgstr "leser %s" @@ -761,7 +769,7 @@ msgid "unknown interface %s in bridge-interface" msgstr "ukjent tilknytning (interface) %s" -#: network.c:389 dnsmasq.c:180 +#: network.c:389 dnsmasq.c:183 #, c-format msgid "failed to create listening socket: %s" msgstr "feilet � lage lytte socket: %s" @@ -837,181 +845,186 @@ msgid "using nameserver %s#%d" msgstr "benytter navnetjener %s#%d" -#: dnsmasq.c:110 +#: dnsmasq.c:113 msgid "" "ISC dhcpd integration not available: set HAVE_ISC_READER in src/config.h" msgstr "" "ISC dhcpf integrasjon ikke tilgjengelig: sett HAVE_ISC_READER i src/config.h" -#: dnsmasq.c:132 +#: dnsmasq.c:135 #, fuzzy msgid "TFTP server not available: set HAVE_TFTP in src/config.h" msgstr "DBus ikke tilgjengelig: sett HAVE_DBUS i src/config.h" -#: dnsmasq.c:137 +#: dnsmasq.c:140 msgid "asychronous logging is not available under Solaris" msgstr "" -#: dnsmasq.c:151 +#: dnsmasq.c:154 msgid "must set exactly one interface on broken systems without IP_RECVIF" msgstr "m� sette n�yaktig et interface p� �delagte systemer uten IP_RECVIF" -#: dnsmasq.c:161 +#: dnsmasq.c:164 #, c-format msgid "failed to find list of interfaces: %s" msgstr "feilet � finne liste av tilknytninger (interfaces): %s" -#: dnsmasq.c:169 +#: dnsmasq.c:172 #, c-format msgid "unknown interface %s" msgstr "ukjent tilknytning (interface) %s" -#: dnsmasq.c:175 +#: dnsmasq.c:178 #, c-format msgid "no interface with address %s" msgstr "ingen tilknytning (interface) med adresse %s" -#: dnsmasq.c:192 dnsmasq.c:561 +#: dnsmasq.c:195 dnsmasq.c:575 #, c-format msgid "DBus error: %s" msgstr "DBus feil: %s" -#: dnsmasq.c:195 +#: dnsmasq.c:198 msgid "DBus not available: set HAVE_DBUS in src/config.h" msgstr "DBus ikke tilgjengelig: sett HAVE_DBUS i src/config.h" -#: dnsmasq.c:204 +#: dnsmasq.c:207 #, fuzzy, c-format msgid "cannot create pipe: %s" msgstr "kan ikke lese %s: %s" -#: dnsmasq.c:225 +#: dnsmasq.c:223 #, c-format -msgid "cannot fork into background: %s" +msgid "cannot chdir to filesystem root: %s" msgstr "" -#: dnsmasq.c:239 +#: dnsmasq.c:231 #, c-format -msgid "cannot chdir to filesystem root: %s" +msgid "cannot fork into background: %s" msgstr "" -#: dnsmasq.c:349 +#: dnsmasq.c:363 #, fuzzy, c-format msgid "started, version %s DNS disabled" msgstr "startet, versjon %s mellomlager deaktivert" -#: dnsmasq.c:351 +#: dnsmasq.c:365 #, c-format msgid "started, version %s cachesize %d" msgstr "startet, versjon %s mellomlager st�rrelse %d" -#: dnsmasq.c:353 +#: dnsmasq.c:367 #, c-format msgid "started, version %s cache disabled" msgstr "startet, versjon %s mellomlager deaktivert" -#: dnsmasq.c:355 +#: dnsmasq.c:369 #, c-format msgid "compile time options: %s" msgstr "kompilerings opsjoner: %s" -#: dnsmasq.c:361 +#: dnsmasq.c:375 msgid "DBus support enabled: connected to system bus" msgstr "DBus st�tte aktivert: koblet til system buss" -#: dnsmasq.c:363 +#: dnsmasq.c:377 msgid "DBus support enabled: bus connection pending" msgstr "DBus st�tte aktivert: avventer buss tilkobling" -#: dnsmasq.c:368 +#: dnsmasq.c:382 msgid "setting --bind-interfaces option because of OS limitations" msgstr "setter --bind-interfaces opsjon p� grunn av OS begrensninger" -#: dnsmasq.c:373 +#: dnsmasq.c:387 #, c-format msgid "warning: interface %s does not currently exist" msgstr "advarsel: nettverkskort %s eksisterer ikke for tiden" -#: dnsmasq.c:378 +#: dnsmasq.c:392 msgid "warning: ignoring resolv-file flag because no-resolv is set" msgstr "" -#: dnsmasq.c:381 +#: dnsmasq.c:395 #, fuzzy msgid "warning: no upstream servers configured" msgstr "setter oppstr�ms tjener fra DBus" -#: dnsmasq.c:385 +#: dnsmasq.c:399 #, c-format msgid "asynchronous logging enabled, queue limit is %d messages" msgstr "" -#: dnsmasq.c:397 +#: dnsmasq.c:411 #, c-format msgid "DHCP, static leases only on %.0s%s, lease time %s" msgstr "DHCP, statisk leie kun p� %.0s%s, leie tid %s" -#: dnsmasq.c:398 +#: dnsmasq.c:412 #, c-format msgid "DHCP, IP range %s -- %s, lease time %s" msgstr "DHCP, IP omr�de %s -- %s, leie tid %s" -#: dnsmasq.c:412 +#: dnsmasq.c:426 msgid "root is " msgstr "" -#: dnsmasq.c:412 +#: dnsmasq.c:426 #, fuzzy msgid "enabled" msgstr "deaktivert" -#: dnsmasq.c:414 +#: dnsmasq.c:428 msgid "secure mode" msgstr "" -#: dnsmasq.c:440 +#: dnsmasq.c:454 #, c-format msgid "restricting maximum simultaneous TFTP transfers to %d" msgstr "" -#: dnsmasq.c:449 +#: dnsmasq.c:463 #, c-format msgid "warning: setting capabilities failed: %s" msgstr "" -#: dnsmasq.c:451 +#: dnsmasq.c:465 msgid "running as root" msgstr "kj�rer som rot (root)" -#: dnsmasq.c:563 +#: dnsmasq.c:577 msgid "connected to system DBus" msgstr "tilkoblet til system DBus" -#: dnsmasq.c:683 +#: dnsmasq.c:697 #, c-format msgid "child process killed by signal %d" msgstr "" -#: dnsmasq.c:687 +#: dnsmasq.c:701 #, c-format msgid "child process exited with status %d" msgstr "" -#: dnsmasq.c:691 +#: dnsmasq.c:705 #, fuzzy, c-format msgid "failed to execute %s: %s" msgstr "feilet � f� tilgang til %s: %m" -#: dnsmasq.c:695 +#: dnsmasq.c:710 #, fuzzy, c-format msgid "failed to create helper: %s" msgstr "feilet � lese %s: %m" -#: dnsmasq.c:729 +#: dnsmasq.c:714 +#, c-format +msgid "cannot change to user %s for script execution%s%s" +msgstr "" + +#: dnsmasq.c:751 msgid "exiting on receipt of SIGTERM" msgstr "avslutter etter mottak av SIGTERM" -#: dnsmasq.c:780 +#: dnsmasq.c:802 #, fuzzy, c-format msgid "no servers found in %s, will retry" msgstr "intet s�ke direktiv funnet i %s" @@ -1115,152 +1128,152 @@ msgid "failed to write %s: %s (retry in %us)" msgstr "feilet � lese %s: %m" -#: rfc2131.c:303 +#: rfc2131.c:304 #, c-format msgid "no address range available for DHCP request %s %s" msgstr "ingen adresse omr�de tilgjengelig for DHCP krav %s %s" -#: rfc2131.c:304 +#: rfc2131.c:305 msgid "with subnet selector" msgstr "med subnet velger" -#: rfc2131.c:304 +#: rfc2131.c:305 msgid "via" msgstr "via" -#: rfc2131.c:315 +#: rfc2131.c:316 #, c-format msgid "DHCP packet: transaction-id is %u" msgstr "" -#: rfc2131.c:320 +#: rfc2131.c:321 #, c-format msgid "Available DHCP subnet: %s/%s" msgstr "" -#: rfc2131.c:322 +#: rfc2131.c:323 #, c-format msgid "Available DHCP range: %s -- %s" msgstr "" -#: rfc2131.c:350 rfc2131.c:381 +#: rfc2131.c:351 rfc2131.c:382 msgid "disabled" msgstr "deaktivert" -#: rfc2131.c:393 rfc2131.c:873 +#: rfc2131.c:394 rfc2131.c:874 msgid "address in use" msgstr "adresse i bruk" -#: rfc2131.c:396 +#: rfc2131.c:397 msgid "no address configured" msgstr "ingen adresse konfigurert" -#: rfc2131.c:409 rfc2131.c:736 +#: rfc2131.c:410 rfc2131.c:737 msgid "no address available" msgstr "ingen adresse tilgjengelig" -#: rfc2131.c:418 rfc2131.c:883 +#: rfc2131.c:419 rfc2131.c:884 msgid "no leases left" msgstr "ingen leier igjen" -#: rfc2131.c:421 rfc2131.c:847 +#: rfc2131.c:422 rfc2131.c:848 msgid "wrong network" msgstr "galt nettverk" -#: rfc2131.c:520 +#: rfc2131.c:521 #, c-format msgid "Ignoring domain %s for DHCP host name %s" msgstr "" -#: rfc2131.c:614 +#: rfc2131.c:615 #, c-format msgid "Vendor class: %s" msgstr "" -#: rfc2131.c:616 +#: rfc2131.c:617 #, c-format msgid "User class: %s" msgstr "" -#: rfc2131.c:657 +#: rfc2131.c:658 #, fuzzy, c-format msgid "disabling DHCP static address %s for %s" msgstr "deaktiverer DHCP statisk adresse %s" -#: rfc2131.c:678 +#: rfc2131.c:679 msgid "unknown lease" msgstr "ukjent leie" -#: rfc2131.c:687 rfc2131.c:992 +#: rfc2131.c:688 rfc2131.c:995 msgid "ignored" msgstr "oversett" -#: rfc2131.c:707 +#: rfc2131.c:708 #, c-format msgid "not using configured address %s because it is leased to %s" msgstr "" -#: rfc2131.c:717 +#: rfc2131.c:718 #, c-format msgid "" "not using configured address %s because it is in use by the server or relay" msgstr "" -#: rfc2131.c:720 +#: rfc2131.c:721 #, c-format msgid "not using configured address %s because it was previously declined" msgstr "" -#: rfc2131.c:734 rfc2131.c:876 +#: rfc2131.c:735 rfc2131.c:877 msgid "no unique-id" msgstr "" -#: rfc2131.c:806 +#: rfc2131.c:807 msgid "wrong address" msgstr "gal adresse" -#: rfc2131.c:823 +#: rfc2131.c:824 msgid "lease not found" msgstr "leie ikke funnet" -#: rfc2131.c:855 +#: rfc2131.c:856 msgid "address not available" msgstr "adresse ikke tilgjengelig" -#: rfc2131.c:866 +#: rfc2131.c:867 msgid "static lease available" msgstr "statisk leie tilgjengelig" -#: rfc2131.c:870 +#: rfc2131.c:871 msgid "address reserved" msgstr "adresse reservert" -#: rfc2131.c:1265 +#: rfc2131.c:1268 #, c-format msgid "tags: %s" msgstr "" -#: rfc2131.c:1352 +#: rfc2131.c:1355 #, fuzzy, c-format msgid "cannot send DHCP/BOOTP option %d: no space left in packet" msgstr "kan ikke sende DHCP opsjon %d: ikke mer plass i pakken" -#: rfc2131.c:1507 +#: rfc2131.c:1525 #, fuzzy, c-format msgid "requested options: %s" msgstr "kompilerings opsjoner: %s" -#: rfc2131.c:1556 +#: rfc2131.c:1574 #, fuzzy, c-format msgid "next server: %s" msgstr "DBus feil: %s" -#: rfc2131.c:1580 +#: rfc2131.c:1598 #, c-format msgid "bootfile name: %s" msgstr "" -#: rfc2131.c:1583 +#: rfc2131.c:1601 #, c-format msgid "server name: %s" msgstr "" @@ -1279,11 +1292,11 @@ msgid "attempt to set an IPv6 server address via DBus - no IPv6 support" msgstr "fors�k p� � sette en IPv6 tjener adresse via DBus - ingen IPv6 st�tte" -#: dbus.c:241 +#: dbus.c:243 msgid "setting upstream servers from DBus" msgstr "setter oppstr�ms tjener fra DBus" -#: dbus.c:279 +#: dbus.c:281 msgid "could not register a DBus message handler" msgstr "kunne ikke registrere en DBus meldingsh�ndterer" @@ -1297,31 +1310,31 @@ msgid "DHCP request for unsupported hardware type (%d) received on %s" msgstr "DHCP krav for ikke st�ttet maskinvare type (%d) mottatt p� %s" -#: tftp.c:173 +#: tftp.c:175 msgid "unable to get free port for TFTP" msgstr "" -#: tftp.c:188 +#: tftp.c:190 #, c-format msgid "unsupported request from %s" msgstr "" -#: tftp.c:266 +#: tftp.c:271 #, c-format msgid "TFTP sent %s to %s" msgstr "" -#: tftp.c:289 +#: tftp.c:294 #, fuzzy, c-format msgid "file %s not found" msgstr "leie ikke funnet" -#: tftp.c:399 +#: tftp.c:405 #, c-format msgid "TFTP error %d %s received from %s" msgstr "" -#: tftp.c:430 +#: tftp.c:436 #, fuzzy, c-format msgid "TFTP failed sending %s to %s" msgstr "feilet � lese %s: %m" diff -Nru /tmp/7MO8KY0fpf/dnsmasq-2.41/po/pl.po /tmp/pRA3L6jhPD/dnsmasq-2.42/po/pl.po --- dnsmasq-2.41/po/pl.po 2008-02-12 21:36:39.000000000 +0100 +++ dnsmasq-2.42/po/pl.po 2008-05-29 21:49:22.000000000 +0200 @@ -1,487 +1,501 @@ +# translation of pl.po to Polski # Polish translations for dnsmasq package. # This file is put in the public domain. -# Tomasz Socha�ski , 2005. # +# Tomasz Socha�ski , 2005. +# Jan Psota , 2008. msgid "" msgstr "" -"Project-Id-Version: dnsmasq 2.24\n" +"Project-Id-Version: pl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-12 11:04+0000\n" -"PO-Revision-Date: 2005-10-04 19:17+0100\n" -"Last-Translator: Tomasz Socha�ski \n" -"Language-Team: Polish \n" +"POT-Creation-Date: 2008-05-23 21:33+0100\n" +"PO-Revision-Date: 2008-03-11 23:43+0100\n" +"Last-Translator: Jan Psota \n" +"Language-Team: Polski \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%" +"100<10 || n%100>=20) ? 1 : 2);\n" +"X-Generator: KBabel 1.11.4\n" -#: cache.c:680 -#, fuzzy, c-format +#: cache.c:700 +#, c-format msgid "failed to load names from %s: %s" -msgstr "b��d �adowania nazw z %s: %m" +msgstr "nie potrafi� wczyta� nazw z %s: %s" -#: cache.c:714 dhcp.c:757 -#, fuzzy, c-format +#: cache.c:734 dhcp.c:757 +#, c-format msgid "bad address at %s line %d" -msgstr "b��dna nazwa w %s, linia %d" +msgstr "b��dny adres w pliku %s, w linii %d" -#: cache.c:761 dhcp.c:771 +#: cache.c:781 dhcp.c:771 #, c-format msgid "bad name at %s line %d" -msgstr "b��dna nazwa w %s, linia %d" +msgstr "b��dna nazwa w pliku %s, w linii %d" -#: cache.c:768 dhcp.c:825 +#: cache.c:788 dhcp.c:825 #, c-format msgid "read %s - %d addresses" msgstr "przeczytano %s - %d adres�w" -#: cache.c:806 +#: cache.c:826 msgid "cleared cache" -msgstr "wyczyszczono cache" +msgstr "wyczyszczono pami�� podr�czn�" -#: cache.c:855 +#: cache.c:875 #, c-format msgid "" "not giving name %s to the DHCP lease of %s because the name exists in %s " "with address %s" msgstr "" -"nazwa %s nie zosta�a nadana dzier�awie DHCP %s, poniewa� nazwa istnieje w %s " -"i ma adres %s" +"nazwa %s nie zosta�a nadana dzier�awie DHCP %s,poniewa� nazwa istnieje w %s " +"i ma ju� adres %s" -#: cache.c:907 +#: cache.c:927 #, c-format msgid "time %lu" -msgstr "" +msgstr "czas %lu" -#: cache.c:908 -#, fuzzy, c-format +#: cache.c:928 +#, c-format msgid "cache size %d, %d/%d cache insertions re-used unexpired cache entries." msgstr "" -"wielko�� cache %d, %d/%d wpis�w cache u�yto ponownie z niewygas�ych wpis�w" +"wielko�� pami�ci podr�cznej: %d; %d z %d miejsc aktualnych wpis�w u�yto " +"ponownie" -#: cache.c:910 +#: cache.c:930 #, c-format msgid "queries forwarded %u, queries answered locally %u" -msgstr "" +msgstr "%u zapyta� przes�anych dalej,%u odpowiedzi udzielonych samodzielnie" -#: cache.c:933 +#: cache.c:953 #, c-format msgid "server %s#%d: queries sent %u, retried or failed %u" -msgstr "" +msgstr "serwer %s#%d: %u zapyta� wys�anych, %u ponowionych lub nieudanych" #: util.c:160 msgid "could not get memory" -msgstr "nie mo�na pobra� pami�ci" +msgstr "nie mo�na dosta� pami�ci" #: util.c:170 -#, fuzzy, c-format +#, c-format msgid "failed to allocate %d bytes" -msgstr "b��d �adowania %s: %m" +msgstr "niemo�liwo�� przydzielenia %d bajt�w pami�ci" #: util.c:275 #, c-format msgid "infinite" msgstr "niesko�czona" -#: option.c:244 +#: option.c:248 msgid "Specify local address(es) to listen on." msgstr "Adres(y) lokalne do nas�uchiwania." -#: option.c:245 +#: option.c:249 msgid "Return ipaddr for all hosts in specified domains." msgstr "Zwracanie adresu IP dla wszystkich host�w w podanych domenach." -#: option.c:246 +#: option.c:250 msgid "Fake reverse lookups for RFC1918 private address ranges." msgstr "Symulacja reverse lookups dla adres�w prywatnych opisanych w RFC1918." -#: option.c:247 +#: option.c:251 msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)." -msgstr "Adres IP traktowany jak NXDOMAIN" +msgstr "Traktowanie adresu IP jak NXDOMAIN" -#: option.c:248 +#: option.c:252 #, c-format msgid "Specify the size of the cache in entries (defaults to %s)." -msgstr "Wielko�� pami�ci cache we wpisach (domy�lna: %s)" +msgstr "Wielko�� pami�ci podr�cznej (domy�lnie: %s miejsc)" -#: option.c:249 +#: option.c:253 #, c-format msgid "Specify configuration file (defaults to %s)." -msgstr "�cie�ka do pliku konfiguracyjnego (domy�lna: %s)" +msgstr "�cie�ka do pliku konfiguracyjnego (domy�lnie: %s)" -#: option.c:250 +#: option.c:254 msgid "Do NOT fork into the background: run in debug mode." msgstr "NIE tw�rz procesu potomnego w tle: dzia�anie w trybie debugowania." -#: option.c:251 +#: option.c:255 msgid "Do NOT forward queries with no domain part." -msgstr "Wy��czenie przekazywania zapyta� bez cz�ci domenowej." +msgstr "Wy��czenie przekazywania zapyta� bez podanej cz�ci domenowej." -#: option.c:252 +#: option.c:256 msgid "Return self-pointing MX records for local hosts." msgstr "Zwracanie samowskazuj�cego rekordu MX dla lokalnych host�w." -#: option.c:253 +#: option.c:257 msgid "Expand simple names in /etc/hosts with domain-suffix." msgstr "Rozwijanie prostych nazw z /etc/hosts przyrostkiem domenowym." -#: option.c:254 +#: option.c:258 msgid "Don't forward spurious DNS requests from Windows hosts." -msgstr "Wy��czenie przekazywania pozornych zapyta� DNS z komputer�w Windows" +msgstr "" +"Wy��czenie przekazywania pozornych zapyta� DNS z komputer�w dzia�aj�cych pod " +"Windows." -#: option.c:255 +#: option.c:259 msgid "Enable DHCP in the range given with lease duration." -msgstr "Enable DHCP w zakresie okre�lonym czasem dzier�awy." +msgstr "" +"W��czenie serwera DHCP dla wskazanego zakresu adres�w z okre�leniem czasu " +"dzier�awy." -#: option.c:256 +#: option.c:260 #, c-format msgid "Change to this group after startup (defaults to %s)." -msgstr "Po starcie zmiana grupy procesu na podan� (domy�lnie: %s)." +msgstr "Po uruchomieniu zmiana grupy procesu na podan� (domy�lnie: %s)." -#: option.c:257 +#: option.c:261 msgid "Set address or hostname for a specified machine." -msgstr "Ustawienie adresu lub nazwy hosta dla okre�lonej maszyny." +msgstr "Ustawienie adresu lub nazwy dla wskazanego komputera." -#: option.c:258 +#: option.c:262 msgid "Read DHCP host specs from file" -msgstr "" +msgstr "Wczytanie z podanego pliku opis�w maszyn na potrzeby DHCP." -#: option.c:259 +#: option.c:263 msgid "Read DHCP option specs from file" -msgstr "" +msgstr "Wczytanie z podanego pliku warto�ci opcji DHCP." -#: option.c:260 +#: option.c:264 #, c-format msgid "Do NOT load %s file." -msgstr "Ignorowanie pliku %s." +msgstr "Pomini�cie pliku %s." -#: option.c:261 +#: option.c:265 #, c-format msgid "Specify a hosts file to be read in addition to %s." -msgstr "Dodatkowy plik host�w poza %s." +msgstr "Wskazanie dodatkowego pliku 'hosts' opr�cz %s." -#: option.c:262 +#: option.c:266 msgid "Specify interface(s) to listen on." -msgstr "Interfejs(y) do nas�uchiwania." +msgstr "Interfejsy, na kt�rych nas�uchiwa�." -#: option.c:263 +#: option.c:267 msgid "Specify interface(s) NOT to listen on." -msgstr "Interfejs(y), na kt�rych nie nas�uchiwa�." +msgstr "Interfejsy, na kt�rych NIE nas�uchiwa�." -#: option.c:264 -#, fuzzy +#: option.c:268 msgid "Map DHCP user class to tag." -msgstr "W��czenie mapowania klasy u�ytkownika DHCP do option set." +msgstr "Powi�zanie klasy u�ytkownika DHCP ze znacznikiem." -#: option.c:265 +#: option.c:269 msgid "Map RFC3046 circuit-id to tag." msgstr "" -#: option.c:266 +#: option.c:270 msgid "Map RFC3046 remote-id to tag." msgstr "" -#: option.c:267 +#: option.c:271 msgid "Map RFC3993 subscriber-id to tag." msgstr "" -#: option.c:268 -#, fuzzy +#: option.c:272 msgid "Don't do DHCP for hosts with tag set." -msgstr "" -"Wy��czenie odpowiadania na �adania DHCP host�w okre�lonych w option set" +msgstr "Wy��czenie DHCP dla host�w z okre�lonym znacznikiem." -#: option.c:269 -#, fuzzy +#: option.c:273 msgid "Force broadcast replies for hosts with tag set." msgstr "" -"Wy��czenie odpowiadania na �adania DHCP host�w okre�lonych w option set" +"Wymuszenie odpowiedzi w trybie rozg�oszeniowym dla host�w z okre�lonym " +"znacznikiem." -#: option.c:270 +#: option.c:274 msgid "Do NOT fork into the background, do NOT run in debug mode." -msgstr "" -"Wy��czenie tworzenia procesu potomnego w tle, wy��czenie dzia�ania w trybie " -"debug." +msgstr "NIE tw�rz procesu potomnego w tle i NIE w��czaj trybu debugowania." -#: option.c:271 +#: option.c:275 msgid "Assume we are the only DHCP server on the local network." -msgstr "Za�o�enie, �e jeste�my jedynym serwerem DHCP w sieci lokalnej." +msgstr "Zak�adanie, �e jeste�my jedynym serwerem DHCP w sieci lokalnej." -#: option.c:272 +#: option.c:276 #, c-format msgid "Specify where to store DHCP leases (defaults to %s)." -msgstr "�cie�ka przechowywania pliku dzier�aw DHCP (domy�lna: %s)" +msgstr "�cie�ka przechowywania pliku dzier�aw DHCP (domy�lnie: %s)" -#: option.c:273 +#: option.c:277 msgid "Return MX records for local hosts." -msgstr "W��czenie zwracania rekord MX dla host�w lokalnych." +msgstr "W��czenie zwracania rekordu MX dla host�w lokalnych." -#: option.c:274 +#: option.c:278 msgid "Specify an MX record." msgstr "Specyfikacja rekordu MX." -#: option.c:275 +#: option.c:279 msgid "Specify BOOTP options to DHCP server." msgstr "Okre�lenie opcji BOOTP serwera DHCP." -#: option.c:276 +#: option.c:280 #, c-format msgid "Do NOT poll %s file, reload only on SIGHUP." msgstr "" -"Wy�aczenie analizy pliku %s, ponownie �adowanie tylko po otrzymaniu sygna�u " -"HUP" +"Wy��czenie obserwacji pliku %s, ponowne odczytywanie tylko po odebraniu " +"sygna�u SIGHUP." -#: option.c:277 +#: option.c:281 msgid "Do NOT cache failed search results." msgstr "" -"Wy��czenie zapisywania w pami�ci podr�cznej nieudanych wynik�w wyszukiwania." +"Wy��czenie przechowywania w pami�ci podr�cznej wynik�w nieudanych wyszukiwa�." -#: option.c:278 +#: option.c:282 #, c-format msgid "Use nameservers strictly in the order given in %s." -msgstr "W��czenie u�ywania serwer�w nazw w kolejno�ci podanej w %s." +msgstr "" -#: option.c:279 +#: option.c:283 #, fuzzy msgid "Specify options to be sent to DHCP clients." msgstr "Dodatkowe opcje ustawie� dla klient�w DHCP." -#: option.c:280 +#: option.c:284 msgid "DHCP option sent even if the client does not request it." -msgstr "" +msgstr "Opcja DHCP wysy�ana nawet je�eli klient o ni� nie prosi." -#: option.c:281 +#: option.c:285 msgid "Specify port to listen for DNS requests on (defaults to 53)." msgstr "Port nas�uchiwania zapyta� DNS (domy�lnie: 53)." -#: option.c:282 +#: option.c:286 #, c-format msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)." msgstr "Maksymalna obs�ugiwana wielko�� pakietu EDNS.0 (domy�lnie: %s)." -#: option.c:283 +#: option.c:287 #, fuzzy msgid "Log DNS queries." msgstr "Zapytania zapisywane w pliku log." -#: option.c:284 +#: option.c:288 msgid "Force the originating port for upstream DNS queries." msgstr "" -#: option.c:285 +#: option.c:289 msgid "Do NOT read resolv.conf." msgstr "Wy��czenie czytania pliku resolv.conf" -#: option.c:286 +#: option.c:290 #, c-format msgid "Specify path to resolv.conf (defaults to %s)." msgstr "Podaj �cie�k� do pliku resolv.conf (domy�lnie: %s)." -#: option.c:287 +#: option.c:291 msgid "Specify address(es) of upstream servers with optional domains." msgstr "" -#: option.c:288 +#: option.c:292 msgid "Never forward queries to specified domains." msgstr "Wy��czenie przekazywania zapyta� do okre�lonych domen." -#: option.c:289 +#: option.c:293 msgid "Specify the domain to be assigned in DHCP leases." msgstr "Nazwa domeny, kt�ra b�dzie przypisana w dzier�awach DHCP." -#: option.c:290 +#: option.c:294 msgid "Specify default target in an MX record." msgstr "Okre�lenie domy�lnego celu w rekordzie MX." -#: option.c:291 +#: option.c:295 msgid "Specify time-to-live in seconds for replies from /etc/hosts." msgstr "" "Okre�lenie czasu wa�no�ci (time-to-live) w sekundach odpowiedzi branych z /" "etc/hosts." -#: option.c:292 +#: option.c:296 #, fuzzy msgid "Specify time-to-live in seconds for negative caching." msgstr "" "Okre�lenie czasu wa�no�ci (time-to-live) w sekundach odpowiedzi branych z /" "etc/hosts." -#: option.c:293 +#: option.c:297 #, c-format msgid "Change to this user after startup. (defaults to %s)." msgstr "Po starcie zmiana u�ytkownika procesu na podanego. (domy�lnie: %s)." -#: option.c:294 +#: option.c:298 #, fuzzy msgid "Map DHCP vendor class to tag." msgstr "Mapowanie nazwy dystrybutora DHCP do ustawie� opcji." -#: option.c:295 +#: option.c:299 msgid "Display dnsmasq version and copyright information." msgstr "" "W��czenie pokazywania wersji dnsmasq i informacji o ochronie praw autorskich." -#: option.c:296 +#: option.c:300 msgid "Translate IPv4 addresses from upstream servers." -msgstr "" +msgstr "T�umaczenie adres�w IPv4 z serwer�w nadrz�dnych." -#: option.c:297 +#: option.c:301 msgid "Specify a SRV record." msgstr "Okre�lenie rekordu SRV." -#: option.c:298 +#: option.c:302 msgid "Display this message. Use --help dhcp for known DHCP options." msgstr "" +"Wy�wietla ten komunikat. U�yj '--help dhcp' chc�c przejrze� list� opcji DHCP " +"(dhcp-option=xxx,...)." -#: option.c:299 +#: option.c:303 #, fuzzy, c-format msgid "Specify path of PID file (defaults to %s)." msgstr "Okre�lenie �cie�ki do pliku PID. (domy�lnie: %s)." -#: option.c:300 +#: option.c:304 #, c-format msgid "Specify maximum number of DHCP leases (defaults to %s)." msgstr "Maksymalna liczba dzier�aw DHCP. (domy�lnie: %s)." -#: option.c:301 +#: option.c:305 msgid "Answer DNS queries based on the interface a query was sent to." msgstr "" "Odpowiedzi na zapytania DNS uzale�nione od interfejsu, kt�ry odebra� " "zapytanie." -#: option.c:302 +#: option.c:306 msgid "Specify TXT DNS record." msgstr "Rekord TXT DNS." -#: option.c:303 +#: option.c:307 #, fuzzy msgid "Specify PTR DNS record." msgstr "Rekord TXT DNS." -#: option.c:304 +#: option.c:308 msgid "Give DNS name to IPv4 address of interface." msgstr "" +"Zwraca nazw� domenow� powi�zan� z pierwszym adresem interfejsu sieciowego." -#: option.c:305 +#: option.c:309 msgid "Bind only to interfaces in use." msgstr "W��czenie nas�uchiwania tylko na u�ywanych interfejsach." -#: option.c:306 +#: option.c:310 #, c-format msgid "Read DHCP static host information from %s." msgstr "Statycznych informacji DHCP hosta z pliku %s." -#: option.c:307 +#: option.c:311 msgid "Enable the DBus interface for setting upstream servers, etc." msgstr "" -#: option.c:308 +#: option.c:312 msgid "Do not provide DHCP on this interface, only provide DNS." msgstr "Wy��czenie DHCP na tym interfejsie, w��czenie tylko DNS." -#: option.c:309 +#: option.c:313 msgid "Enable dynamic address allocation for bootp." msgstr "W��czenie automatycznej alokacji adresu dla BOOTP." -#: option.c:310 +#: option.c:314 #, fuzzy msgid "Map MAC address (with wildcards) to option set." msgstr "Mapowanie nazwy dystrybutora DHCP do ustawie� opcji." -#: option.c:312 +#: option.c:316 msgid "Treat DHCP requests on aliases as arriving from interface." msgstr "" -#: option.c:314 +#: option.c:318 msgid "Disable ICMP echo address checking in the DHCP server." msgstr "" -#: option.c:315 +#: option.c:319 msgid "Script to run on DHCP lease creation and destruction." msgstr "" -#: option.c:316 +#: option.c:320 msgid "Read configuration from all the files in this directory." msgstr "" -#: option.c:317 +#: option.c:321 #, fuzzy msgid "Log to this syslog facility or file. (defaults to DAEMON)" msgstr "Po starcie zmiana u�ytkownika procesu na podanego. (domy�lnie: %s)." -#: option.c:318 +#: option.c:322 msgid "Read leases at startup, but never write the lease file." msgstr "" -#: option.c:319 +#: option.c:323 #, fuzzy, c-format msgid "Maximum number of concurrent DNS queries. (defaults to %s)" msgstr "Maksymalna liczba dzier�aw DHCP. (domy�lnie: %s)." -#: option.c:320 +#: option.c:324 #, c-format msgid "Clear DNS cache when reloading %s." msgstr "" -#: option.c:321 +#: option.c:325 msgid "Ignore hostnames provided by DHCP clients." msgstr "" -#: option.c:322 +#: option.c:326 msgid "Do NOT reuse filename and server fields for extra DHCP options." msgstr "" -#: option.c:323 +#: option.c:327 msgid "Enable integrated read-only TFTP server." msgstr "" -#: option.c:324 +#: option.c:328 msgid "Export files by TFTP only from the specified subtree." msgstr "" -#: option.c:325 +#: option.c:329 msgid "Add client IP address to tftp-root." msgstr "" -#: option.c:326 +#: option.c:330 msgid "Allow access only to files owned by the user running dnsmasq." msgstr "" -#: option.c:327 +#: option.c:331 #, fuzzy, c-format msgid "Maximum number of conncurrent TFTP transfers (defaults to %s)." msgstr "Maksymalna liczba dzier�aw DHCP. (domy�lnie: %s)." -#: option.c:328 +#: option.c:332 msgid "Disable the TFTP blocksize extension." msgstr "" -#: option.c:329 +#: option.c:333 msgid "Ephemeral port range for use by TFTP transfers." msgstr "" -#: option.c:330 +#: option.c:334 msgid "Extra logging for DHCP." msgstr "" -#: option.c:331 +#: option.c:335 msgid "Enable async. logging; optionally set queue length." msgstr "" -#: option.c:332 +#: option.c:336 msgid "Stop DNS rebinding. Filter private IP ranges when resolving." msgstr "" -#: option.c:333 +#: option.c:337 msgid "Always perform DNS queries to all servers." msgstr "" -#: option.c:334 +#: option.c:338 msgid "Set tag if client includes option in request." msgstr "" -#: option.c:585 +#: option.c:339 +msgid "Use alternative ports for DHCP." +msgstr "" + +#: option.c:340 +msgid "Run lease-change script as this user." +msgstr "" + +#: option.c:591 #, c-format msgid "" "Usage: dnsmasq [options]\n" @@ -490,190 +504,190 @@ "U�ycie: dnsmasq [opcje]\n" "\n" -#: option.c:587 +#: option.c:593 #, c-format msgid "Use short options only on the command line.\n" msgstr "Tylko kr�tkie opcje w linii komend.\n" -#: option.c:589 +#: option.c:595 #, c-format msgid "Valid options are :\n" msgstr "Obs�ugiwane opcje:\n" -#: option.c:610 +#: option.c:616 #, c-format msgid "Known DHCP options:\n" msgstr "" -#: option.c:683 +#: option.c:689 msgid "bad dhcp-option" msgstr "b��d w dhcp-option" -#: option.c:739 +#: option.c:745 #, fuzzy msgid "bad IP address" msgstr "przeczytano %s - %d adres�w" -#: option.c:837 +#: option.c:843 msgid "bad domain in dhcp-option" msgstr "nieprawid�owa nazwa domeny w dhcp-option" -#: option.c:895 +#: option.c:901 msgid "dhcp-option too long" msgstr "zbyt d�uga nazwa w dhcp-option" -#: option.c:942 +#: option.c:948 #, fuzzy, c-format msgid "cannot access directory %s: %s" msgstr "b��d odczytu z %s: %s" -#: option.c:961 tftp.c:343 +#: option.c:967 tftp.c:348 #, fuzzy, c-format msgid "cannot access %s: %s" msgstr "b��d odczytu z %s: %s" -#: option.c:998 +#: option.c:1004 msgid "only one dhcp-hostsfile allowed" msgstr "" -#: option.c:1005 +#: option.c:1011 msgid "only one dhcp-optsfile allowed" msgstr "" -#: option.c:1049 +#: option.c:1055 msgid "bad MX preference" msgstr "" -#: option.c:1053 +#: option.c:1059 msgid "bad MX name" msgstr "b��dna nazwa MX" -#: option.c:1067 +#: option.c:1073 msgid "bad MX target" msgstr "b��dny cel MX" -#: option.c:1078 +#: option.c:1084 msgid "cannot run scripts under uClinux" msgstr "" -#: option.c:1265 option.c:1273 +#: option.c:1275 option.c:1283 msgid "bad port" msgstr "nieprawid�owy port" -#: option.c:1293 option.c:1318 +#: option.c:1303 option.c:1328 msgid "interface binding not supported" msgstr "" -#: option.c:1427 +#: option.c:1437 #, fuzzy msgid "bad port range" msgstr "nieprawid�owy port" -#: option.c:1444 +#: option.c:1454 msgid "bad bridge-interface" msgstr "" -#: option.c:1485 +#: option.c:1495 msgid "bad dhcp-range" msgstr "nieprawid�owy zakres dhcp-range" -#: option.c:1511 +#: option.c:1521 msgid "only one netid tag allowed" msgstr "" -#: option.c:1551 +#: option.c:1561 msgid "inconsistent DHCP range" msgstr "niesp�jny zakres DHCP" -#: option.c:1719 +#: option.c:1729 #, fuzzy msgid "bad DHCP host name" msgstr "b��dna nazwa MX" -#: option.c:1959 +#: option.c:1900 option.c:2107 +msgid "invalid port number" +msgstr "nieprawid�owy port" + +#: option.c:1986 #, fuzzy msgid "bad interface name" msgstr "b��dna nazwa MX" -#: option.c:1979 +#: option.c:2006 #, fuzzy msgid "bad PTR record" msgstr "b��d w rekordzie SRV" -#: option.c:1999 +#: option.c:2026 msgid "TXT record string too long" msgstr "zbyt d�ugi rekord TXT" -#: option.c:2003 +#: option.c:2030 msgid "bad TXT record" msgstr "nieprawid�owy rekord TX" -#: option.c:2063 +#: option.c:2090 msgid "bad SRV record" msgstr "b��d w rekordzie SRV" -#: option.c:2072 +#: option.c:2099 msgid "bad SRV target" msgstr "nieprawid�owy cel SRV" -#: option.c:2080 -msgid "invalid port number" -msgstr "nieprawid�owy port" - -#: option.c:2087 +#: option.c:2114 msgid "invalid priority" msgstr "nieprawid�owy priorytet" -#: option.c:2094 +#: option.c:2121 msgid "invalid weight" msgstr "nieprawid�owe znaczenie" -#: option.c:2130 +#: option.c:2157 #, c-format msgid "files nested too deep in %s" msgstr "" -#: option.c:2138 tftp.c:497 +#: option.c:2165 tftp.c:503 #, c-format msgid "cannot read %s: %s" msgstr "b��d odczytu z %s: %s" -#: option.c:2199 +#: option.c:2226 msgid "missing \"" msgstr "brakuje \"" -#: option.c:2246 +#: option.c:2273 msgid "bad option" msgstr "nieprawid�owa opcja" -#: option.c:2248 +#: option.c:2275 msgid "extraneous parameter" msgstr "dodatkowy parametr" -#: option.c:2250 +#: option.c:2277 msgid "missing parameter" msgstr "brak parametru" -#: option.c:2258 +#: option.c:2285 msgid "error" msgstr "b��d" -#: option.c:2264 +#: option.c:2291 #, c-format msgid "%s at line %d of %%s" msgstr "%s w linii %d z %%s" -#: option.c:2304 option.c:2334 +#: option.c:2331 option.c:2361 #, fuzzy, c-format msgid "read %s" msgstr "czytanie %s" -#: option.c:2400 +#: option.c:2429 #, c-format msgid "Dnsmasq version %s %s\n" msgstr "Dnsmasq, wersja %s %s\n" -#: option.c:2401 +#: option.c:2430 #, c-format msgid "" "Compile time options %s\n" @@ -682,53 +696,53 @@ "Wkompilowane opcje %s\n" "\n" -#: option.c:2402 +#: option.c:2431 #, c-format msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" msgstr "Oprogramowanie to nie zawiera �adnych gwarancji.\n" -#: option.c:2403 +#: option.c:2432 #, c-format msgid "Dnsmasq is free software, and you are welcome to redistribute it\n" msgstr "Dnsmasq jest wolnym oprogramowaniem, mo�esz je rozprowadza�\n" -#: option.c:2404 +#: option.c:2433 #, fuzzy, c-format msgid "under the terms of the GNU General Public License, version 2 or 3.\n" msgstr "na warunkach okre�lonych w GNU General Public Licence, wersja 2.\n" -#: option.c:2415 +#: option.c:2444 msgid "try --help" msgstr "" -#: option.c:2417 +#: option.c:2446 msgid "try -w" msgstr "" -#: option.c:2420 +#: option.c:2449 #, fuzzy, c-format msgid "bad command line options: %s" msgstr "nieprawid�owa opcja linii komend: %s." -#: option.c:2461 +#: option.c:2490 #, c-format msgid "cannot get host-name: %s" msgstr "nie mo�na pobra� nazwy hosta: %s" -#: option.c:2489 +#: option.c:2518 msgid "only one resolv.conf file allowed in no-poll mode." msgstr "tylko jeden plik resolv.conf jest dopuszczany w trybie no-poll." -#: option.c:2499 +#: option.c:2528 msgid "must have exactly one resolv.conf to read domain from." msgstr "musisz mie� dok�adnie jeden plik resolv.conf do odczytu domen." -#: option.c:2502 network.c:640 +#: option.c:2531 network.c:640 #, fuzzy, c-format msgid "failed to read %s: %s" msgstr "b��d w odczycie %s: %m" -#: option.c:2520 +#: option.c:2549 #, c-format msgid "no search directive found in %s" msgstr "brak wytycznych wyszukiwania w %s" @@ -742,7 +756,7 @@ msgid "possible DNS-rebind attack detected" msgstr "" -#: isc.c:77 dnsmasq.c:747 +#: isc.c:77 dnsmasq.c:769 #, fuzzy, c-format msgid "failed to access %s: %s" msgstr "b��d w dost�pie do %s: %m" @@ -752,7 +766,7 @@ msgid "failed to load %s: %s" msgstr "b��d �adowania %s: %m" -#: isc.c:97 dnsmasq.c:769 +#: isc.c:97 dnsmasq.c:791 #, c-format msgid "reading %s" msgstr "czytanie %s" @@ -774,7 +788,7 @@ msgid "unknown interface %s in bridge-interface" msgstr "nieznany interfejs %s" -#: network.c:389 dnsmasq.c:180 +#: network.c:389 dnsmasq.c:183 #, c-format msgid "failed to create listening socket: %s" msgstr "b��d podczas tworzenia gniazda: %s" @@ -850,182 +864,186 @@ msgid "using nameserver %s#%d" msgstr "u�ywany serwer nazw %s#%d" -#: dnsmasq.c:110 +#: dnsmasq.c:113 msgid "" "ISC dhcpd integration not available: set HAVE_ISC_READER in src/config.h" msgstr "" "Intergracja z ISC dhcpd nie jest dost�pna: ustaw HAVE_ISC_READER w src/" "config.h" -#: dnsmasq.c:132 +#: dnsmasq.c:135 #, fuzzy msgid "TFTP server not available: set HAVE_TFTP in src/config.h" msgstr "DBus jest niedost�pny: ustaw HAVE_DBUS w src/config.h" -#: dnsmasq.c:137 +#: dnsmasq.c:140 msgid "asychronous logging is not available under Solaris" msgstr "" -#: dnsmasq.c:151 +#: dnsmasq.c:154 msgid "must set exactly one interface on broken systems without IP_RECVIF" msgstr "musisz ustawi� dok�adnie jeden interfejs w systemach bez IP_RECVIF" -#: dnsmasq.c:161 +#: dnsmasq.c:164 #, c-format msgid "failed to find list of interfaces: %s" msgstr "b��d w znalezieniu listy interfejs�w sieciowych: %s" -#: dnsmasq.c:169 +#: dnsmasq.c:172 #, c-format msgid "unknown interface %s" msgstr "nieznany interfejs %s" -#: dnsmasq.c:175 +#: dnsmasq.c:178 #, c-format msgid "no interface with address %s" msgstr "brak interfejsu z adresem %s" -#: dnsmasq.c:192 dnsmasq.c:561 +#: dnsmasq.c:195 dnsmasq.c:575 #, c-format msgid "DBus error: %s" msgstr "b��d DBus: %s" -#: dnsmasq.c:195 +#: dnsmasq.c:198 msgid "DBus not available: set HAVE_DBUS in src/config.h" msgstr "DBus jest niedost�pny: ustaw HAVE_DBUS w src/config.h" -#: dnsmasq.c:204 +#: dnsmasq.c:207 #, fuzzy, c-format msgid "cannot create pipe: %s" msgstr "b��d odczytu z %s: %s" -#: dnsmasq.c:225 +#: dnsmasq.c:223 #, c-format -msgid "cannot fork into background: %s" +msgid "cannot chdir to filesystem root: %s" msgstr "" -#: dnsmasq.c:239 +#: dnsmasq.c:231 #, c-format -msgid "cannot chdir to filesystem root: %s" +msgid "cannot fork into background: %s" msgstr "" -#: dnsmasq.c:349 +#: dnsmasq.c:363 #, fuzzy, c-format msgid "started, version %s DNS disabled" msgstr "uruchomiony, wersja %s cache wy��czony" -#: dnsmasq.c:351 +#: dnsmasq.c:365 #, c-format msgid "started, version %s cachesize %d" msgstr "uruchomiony, wersja %s wielko�� cache %d" -#: dnsmasq.c:353 +#: dnsmasq.c:367 #, c-format msgid "started, version %s cache disabled" msgstr "uruchomiony, wersja %s cache wy��czony" -#: dnsmasq.c:355 +#: dnsmasq.c:369 #, c-format msgid "compile time options: %s" msgstr "opcje kompilacji: %s" -#: dnsmasq.c:361 +#: dnsmasq.c:375 msgid "DBus support enabled: connected to system bus" msgstr "obs�uga DBus w��czona: pod��czono do szyny systemowej" -#: dnsmasq.c:363 +#: dnsmasq.c:377 msgid "DBus support enabled: bus connection pending" msgstr "obs�uga DBus w��czona: pod��czanie do szyny systemowej w toku" -#: dnsmasq.c:368 +#: dnsmasq.c:382 msgid "setting --bind-interfaces option because of OS limitations" msgstr "ustawiam opcj� --bind-interfaces z powodu limit�w systemu operacyjnego" -#: dnsmasq.c:373 +#: dnsmasq.c:387 #, c-format msgid "warning: interface %s does not currently exist" msgstr "ostrze�enie: interfejs %s obecnie nie istnieje" -#: dnsmasq.c:378 +#: dnsmasq.c:392 msgid "warning: ignoring resolv-file flag because no-resolv is set" msgstr "" -#: dnsmasq.c:381 +#: dnsmasq.c:395 #, fuzzy msgid "warning: no upstream servers configured" msgstr "brak skonfigurowanego adresu" -#: dnsmasq.c:385 +#: dnsmasq.c:399 #, c-format msgid "asynchronous logging enabled, queue limit is %d messages" msgstr "" -#: dnsmasq.c:397 +#: dnsmasq.c:411 #, c-format msgid "DHCP, static leases only on %.0s%s, lease time %s" msgstr "DHCP, statyczne dzier�awy tylko na %.0s%s, czas dzier�awy %s" -#: dnsmasq.c:398 +#: dnsmasq.c:412 #, c-format msgid "DHCP, IP range %s -- %s, lease time %s" msgstr "DHCP, zakres IP %s -- %s, czas dzier�awy %s" -#: dnsmasq.c:412 +#: dnsmasq.c:426 msgid "root is " msgstr "" -#: dnsmasq.c:412 -#, fuzzy +#: dnsmasq.c:426 msgid "enabled" -msgstr "wy��czony(a)" +msgstr "w��czony(a)" -#: dnsmasq.c:414 +#: dnsmasq.c:428 msgid "secure mode" msgstr "" -#: dnsmasq.c:440 +#: dnsmasq.c:454 #, c-format msgid "restricting maximum simultaneous TFTP transfers to %d" msgstr "" -#: dnsmasq.c:449 +#: dnsmasq.c:463 #, c-format msgid "warning: setting capabilities failed: %s" msgstr "" -#: dnsmasq.c:451 +#: dnsmasq.c:465 msgid "running as root" msgstr "pracuje z uprawnieniami u�ytkownika root" -#: dnsmasq.c:563 +#: dnsmasq.c:577 msgid "connected to system DBus" msgstr "po��czono do systemowego DBus" -#: dnsmasq.c:683 +#: dnsmasq.c:697 #, c-format msgid "child process killed by signal %d" msgstr "" -#: dnsmasq.c:687 +#: dnsmasq.c:701 #, c-format msgid "child process exited with status %d" msgstr "" -#: dnsmasq.c:691 +#: dnsmasq.c:705 #, fuzzy, c-format msgid "failed to execute %s: %s" msgstr "b��d w dost�pie do %s: %m" -#: dnsmasq.c:695 +#: dnsmasq.c:710 #, fuzzy, c-format msgid "failed to create helper: %s" msgstr "b��d w odczycie %s: %m" -#: dnsmasq.c:729 +#: dnsmasq.c:714 +#, c-format +msgid "cannot change to user %s for script execution%s%s" +msgstr "" + +#: dnsmasq.c:751 msgid "exiting on receipt of SIGTERM" msgstr "wy��czenie po otrzymaniu sygnalu SIGTERM" -#: dnsmasq.c:780 +#: dnsmasq.c:802 #, fuzzy, c-format msgid "no servers found in %s, will retry" msgstr "brak wytycznych wyszukiwania w %s" @@ -1129,152 +1147,152 @@ msgid "failed to write %s: %s (retry in %us)" msgstr "b��d w odczycie %s: %m" -#: rfc2131.c:303 +#: rfc2131.c:304 #, c-format msgid "no address range available for DHCP request %s %s" msgstr "�aden zakres adresowy nie jest dost�pny dla �adania DHCP %s %s" -#: rfc2131.c:304 +#: rfc2131.c:305 msgid "with subnet selector" msgstr "z selekcj� podsieci" -#: rfc2131.c:304 +#: rfc2131.c:305 msgid "via" msgstr "przez" -#: rfc2131.c:315 +#: rfc2131.c:316 #, c-format msgid "DHCP packet: transaction-id is %u" msgstr "" -#: rfc2131.c:320 +#: rfc2131.c:321 #, c-format msgid "Available DHCP subnet: %s/%s" msgstr "" -#: rfc2131.c:322 +#: rfc2131.c:323 #, c-format msgid "Available DHCP range: %s -- %s" msgstr "" -#: rfc2131.c:350 rfc2131.c:381 +#: rfc2131.c:351 rfc2131.c:382 msgid "disabled" msgstr "wy��czony(a)" -#: rfc2131.c:393 rfc2131.c:873 +#: rfc2131.c:394 rfc2131.c:874 msgid "address in use" msgstr "adres w u�yciu" -#: rfc2131.c:396 +#: rfc2131.c:397 msgid "no address configured" msgstr "brak skonfigurowanego adresu" -#: rfc2131.c:409 rfc2131.c:736 +#: rfc2131.c:410 rfc2131.c:737 msgid "no address available" msgstr "brak dost�pnego adresu" -#: rfc2131.c:418 rfc2131.c:883 +#: rfc2131.c:419 rfc2131.c:884 msgid "no leases left" msgstr "brak wolnych dzier�aw" -#: rfc2131.c:421 rfc2131.c:847 +#: rfc2131.c:422 rfc2131.c:848 msgid "wrong network" msgstr "nieprawid�owa sie�" -#: rfc2131.c:520 +#: rfc2131.c:521 #, c-format msgid "Ignoring domain %s for DHCP host name %s" msgstr "" -#: rfc2131.c:614 +#: rfc2131.c:615 #, c-format msgid "Vendor class: %s" msgstr "" -#: rfc2131.c:616 +#: rfc2131.c:617 #, c-format msgid "User class: %s" msgstr "" -#: rfc2131.c:657 +#: rfc2131.c:658 #, fuzzy, c-format msgid "disabling DHCP static address %s for %s" msgstr "wy��czanie statycznego adresu DHCP %s" -#: rfc2131.c:678 +#: rfc2131.c:679 msgid "unknown lease" msgstr "nieznana dzier�awa" -#: rfc2131.c:687 rfc2131.c:992 +#: rfc2131.c:688 rfc2131.c:995 msgid "ignored" msgstr "ignoruj�" -#: rfc2131.c:707 +#: rfc2131.c:708 #, c-format msgid "not using configured address %s because it is leased to %s" msgstr "" -#: rfc2131.c:717 +#: rfc2131.c:718 #, c-format msgid "" "not using configured address %s because it is in use by the server or relay" msgstr "" -#: rfc2131.c:720 +#: rfc2131.c:721 #, c-format msgid "not using configured address %s because it was previously declined" msgstr "" -#: rfc2131.c:734 rfc2131.c:876 +#: rfc2131.c:735 rfc2131.c:877 msgid "no unique-id" msgstr "" -#: rfc2131.c:806 +#: rfc2131.c:807 msgid "wrong address" msgstr "b��dny adres" -#: rfc2131.c:823 +#: rfc2131.c:824 msgid "lease not found" msgstr "dzier�awa nie znaleziona" -#: rfc2131.c:855 +#: rfc2131.c:856 msgid "address not available" msgstr "adres niedost�pny" -#: rfc2131.c:866 +#: rfc2131.c:867 msgid "static lease available" msgstr "dost�pna statyczna dzier�awa" -#: rfc2131.c:870 +#: rfc2131.c:871 msgid "address reserved" msgstr "adres zarezerwowany" -#: rfc2131.c:1265 +#: rfc2131.c:1268 #, c-format msgid "tags: %s" msgstr "" -#: rfc2131.c:1352 +#: rfc2131.c:1355 #, c-format msgid "cannot send DHCP/BOOTP option %d: no space left in packet" msgstr "" -#: rfc2131.c:1507 +#: rfc2131.c:1525 #, fuzzy, c-format msgid "requested options: %s" msgstr "opcje kompilacji: %s" -#: rfc2131.c:1556 +#: rfc2131.c:1574 #, fuzzy, c-format msgid "next server: %s" msgstr "b��d DBus: %s" -#: rfc2131.c:1580 +#: rfc2131.c:1598 #, c-format msgid "bootfile name: %s" msgstr "" -#: rfc2131.c:1583 +#: rfc2131.c:1601 #, c-format msgid "server name: %s" msgstr "" @@ -1293,11 +1311,11 @@ msgid "attempt to set an IPv6 server address via DBus - no IPv6 support" msgstr "pr�ba ustawienia adresu IPv6 serwera przez DBus - brak obs�ugi IPv6" -#: dbus.c:241 +#: dbus.c:243 msgid "setting upstream servers from DBus" msgstr "" -#: dbus.c:279 +#: dbus.c:281 msgid "could not register a DBus message handler" msgstr "nie mo�na zarejestrowa� uchwytu wiadomo�ci DBus" @@ -1309,101 +1327,57 @@ #: bpf.c:174 #, fuzzy, c-format msgid "DHCP request for unsupported hardware type (%d) received on %s" -msgstr "��danie DHCP nieobs�ugiwanego typu sprz�towego (%d) otrzymane na %s" +msgstr "��danie DHCP nieobs�ugiwanego typu sprz�tu (%d) otrzymane na %s" -#: tftp.c:173 +#: tftp.c:175 msgid "unable to get free port for TFTP" -msgstr "" +msgstr "brak wolnego portu dla us�ugi TFTP" -#: tftp.c:188 +#: tftp.c:190 #, c-format msgid "unsupported request from %s" -msgstr "" +msgstr "nieobs�ugiwane ��danie od komputera %s" -#: tftp.c:266 +#: tftp.c:271 #, c-format msgid "TFTP sent %s to %s" -msgstr "" +msgstr "TFTP: plik %s wys�ano do %s" -#: tftp.c:289 -#, fuzzy, c-format +#: tftp.c:294 +#, c-format msgid "file %s not found" -msgstr "dzier�awa nie znaleziona" +msgstr "nie znaleziono pliku %s" -#: tftp.c:399 +#: tftp.c:405 #, c-format msgid "TFTP error %d %s received from %s" -msgstr "" +msgstr "b��d TFTP: %d bajt�w odebrano w %s od %s" -#: tftp.c:430 -#, fuzzy, c-format +#: tftp.c:436 +#, c-format msgid "TFTP failed sending %s to %s" -msgstr "b��d w odczycie %s: %m" +msgstr "b��d wysy�ania pliku %s przez TFTP do komputera %s" #: log.c:73 -#, fuzzy, c-format +#, c-format msgid "cannot open %s: %s" -msgstr "nie mo�na otworzy� %s:%s" +msgstr "nie mo�na otworzy� %s: %s" #: log.c:89 -#, fuzzy, c-format +#, c-format msgid "warning: failed to change owner of %s: %s" -msgstr "b��d �adowania nazw z %s: %m" +msgstr "uwaga: brak mo�liwo�ci zmiany u�ytkownika pliku %s na %s" #: log.c:161 #, c-format msgid "overflow: %d log entries lost" -msgstr "" +msgstr "przepe�nienie: stracono %d wpis�w do logu" #: log.c:238 #, c-format msgid "log failed: %s" -msgstr "" +msgstr "nie potrafi� zapisa� komunikat�w do %s" #: log.c:394 msgid "FAILED to start up" msgstr "B��D uruchomienia" - -#, fuzzy -#~ msgid "read %s - %d hosts" -#~ msgstr "przeczytano %s - %d adres�w" - -#~ msgid "bad dhcp-host" -#~ msgstr "b��d w dhcp-host" - -#~ msgid "domains" -#~ msgstr "domeny" - -#~ msgid "Ignoring DHCP host name %s because it has an illegal domain part" -#~ msgstr "" -#~ "Ignoruj� nazw� hosta DHCP %s, poniewa� posiada nieprawid�ow� cz�� " -#~ "domenow�" - -#~ msgid "Display this message." -#~ msgstr "Wy�wietlenie tych informacji." - -#~ msgid "failed to read %s: %m" -#~ msgstr "b��d w odczycie %s: %m" - -#~ msgid "failed to read %s:%m" -#~ msgstr "b��d odczytu %s:%m" - -#~ msgid "More than one vendor class matches, using %s" -#~ msgstr "Wi�cej ni� jeden dystrybutor pasuj�cy, u�ywam %s" - -#~ msgid "forwarding table overflow: check for server loops." -#~ msgstr "" -#~ "przekroczenie zakresu tablicy przekazywania: sprawd� zap�tlenie serwera." - -#~ msgid "nested includes not allowed" -#~ msgstr "zagnie�d�one do��czanie plik�w jest niedozwolone" - -#~ msgid "DHCP, %s will be written every %s" -#~ msgstr "DHCP, %s b�dzie zapisywane co %s" - -#~ msgid "" -#~ "cannot create DHCP packet socket: %s. Is CONFIG_PACKET enabled in your " -#~ "kernel?" -#~ msgstr "" -#~ "b��d utworzenia gniazda pakiet�w DHCP: %s. Czy w Twoim kernelu " -#~ "uaktywni�e� opcj� CONFIG_PACKET?" diff -Nru /tmp/7MO8KY0fpf/dnsmasq-2.41/po/pt_BR.po /tmp/pRA3L6jhPD/dnsmasq-2.42/po/pt_BR.po --- dnsmasq-2.41/po/pt_BR.po 2008-02-12 21:36:39.000000000 +0100 +++ dnsmasq-2.42/po/pt_BR.po 2008-05-29 21:49:22.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: dnsmasq 2.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-12 11:04+0000\n" +"POT-Creation-Date: 2008-05-23 21:33+0100\n" "PO-Revision-Date: 2006-01-16 20:42+0000\n" "Last-Translator: Simon Kelley \n" "Language-Team: Portuguese \n" @@ -15,53 +15,53 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: cache.c:680 +#: cache.c:700 #, c-format msgid "failed to load names from %s: %s" msgstr "" -#: cache.c:714 dhcp.c:757 +#: cache.c:734 dhcp.c:757 #, c-format msgid "bad address at %s line %d" msgstr "" -#: cache.c:761 dhcp.c:771 +#: cache.c:781 dhcp.c:771 #, c-format msgid "bad name at %s line %d" msgstr "" -#: cache.c:768 dhcp.c:825 +#: cache.c:788 dhcp.c:825 #, c-format msgid "read %s - %d addresses" msgstr "" -#: cache.c:806 +#: cache.c:826 msgid "cleared cache" msgstr "" -#: cache.c:855 +#: cache.c:875 #, c-format msgid "" "not giving name %s to the DHCP lease of %s because the name exists in %s " "with address %s" msgstr "" -#: cache.c:907 +#: cache.c:927 #, c-format msgid "time %lu" msgstr "" -#: cache.c:908 +#: cache.c:928 #, c-format msgid "cache size %d, %d/%d cache insertions re-used unexpired cache entries." msgstr "" -#: cache.c:910 +#: cache.c:930 #, c-format msgid "queries forwarded %u, queries answered locally %u" msgstr "" -#: cache.c:933 +#: cache.c:953 #, c-format msgid "server %s#%d: queries sent %u, retried or failed %u" msgstr "" @@ -80,618 +80,626 @@ msgid "infinite" msgstr "" -#: option.c:244 +#: option.c:248 msgid "Specify local address(es) to listen on." msgstr "" -#: option.c:245 +#: option.c:249 msgid "Return ipaddr for all hosts in specified domains." msgstr "" -#: option.c:246 +#: option.c:250 msgid "Fake reverse lookups for RFC1918 private address ranges." msgstr "" -#: option.c:247 +#: option.c:251 msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)." msgstr "" -#: option.c:248 +#: option.c:252 #, c-format msgid "Specify the size of the cache in entries (defaults to %s)." msgstr "" -#: option.c:249 +#: option.c:253 #, c-format msgid "Specify configuration file (defaults to %s)." msgstr "" -#: option.c:250 +#: option.c:254 msgid "Do NOT fork into the background: run in debug mode." msgstr "" -#: option.c:251 +#: option.c:255 msgid "Do NOT forward queries with no domain part." msgstr "" -#: option.c:252 +#: option.c:256 msgid "Return self-pointing MX records for local hosts." msgstr "" -#: option.c:253 +#: option.c:257 msgid "Expand simple names in /etc/hosts with domain-suffix." msgstr "" -#: option.c:254 +#: option.c:258 msgid "Don't forward spurious DNS requests from Windows hosts." msgstr "" -#: option.c:255 +#: option.c:259 msgid "Enable DHCP in the range given with lease duration." msgstr "" -#: option.c:256 +#: option.c:260 #, c-format msgid "Change to this group after startup (defaults to %s)." msgstr "" -#: option.c:257 +#: option.c:261 msgid "Set address or hostname for a specified machine." msgstr "" -#: option.c:258 +#: option.c:262 msgid "Read DHCP host specs from file" msgstr "" -#: option.c:259 +#: option.c:263 msgid "Read DHCP option specs from file" msgstr "" -#: option.c:260 +#: option.c:264 #, c-format msgid "Do NOT load %s file." msgstr "" -#: option.c:261 +#: option.c:265 #, c-format msgid "Specify a hosts file to be read in addition to %s." msgstr "" -#: option.c:262 +#: option.c:266 msgid "Specify interface(s) to listen on." msgstr "" -#: option.c:263 +#: option.c:267 msgid "Specify interface(s) NOT to listen on." msgstr "" -#: option.c:264 +#: option.c:268 msgid "Map DHCP user class to tag." msgstr "" -#: option.c:265 +#: option.c:269 msgid "Map RFC3046 circuit-id to tag." msgstr "" -#: option.c:266 +#: option.c:270 msgid "Map RFC3046 remote-id to tag." msgstr "" -#: option.c:267 +#: option.c:271 msgid "Map RFC3993 subscriber-id to tag." msgstr "" -#: option.c:268 +#: option.c:272 msgid "Don't do DHCP for hosts with tag set." msgstr "" -#: option.c:269 +#: option.c:273 msgid "Force broadcast replies for hosts with tag set." msgstr "" -#: option.c:270 +#: option.c:274 msgid "Do NOT fork into the background, do NOT run in debug mode." msgstr "" -#: option.c:271 +#: option.c:275 msgid "Assume we are the only DHCP server on the local network." msgstr "" -#: option.c:272 +#: option.c:276 #, c-format msgid "Specify where to store DHCP leases (defaults to %s)." msgstr "" -#: option.c:273 +#: option.c:277 msgid "Return MX records for local hosts." msgstr "" -#: option.c:274 +#: option.c:278 msgid "Specify an MX record." msgstr "" -#: option.c:275 +#: option.c:279 msgid "Specify BOOTP options to DHCP server." msgstr "" -#: option.c:276 +#: option.c:280 #, c-format msgid "Do NOT poll %s file, reload only on SIGHUP." msgstr "" -#: option.c:277 +#: option.c:281 msgid "Do NOT cache failed search results." msgstr "" -#: option.c:278 +#: option.c:282 #, c-format msgid "Use nameservers strictly in the order given in %s." msgstr "" -#: option.c:279 +#: option.c:283 msgid "Specify options to be sent to DHCP clients." msgstr "" -#: option.c:280 +#: option.c:284 msgid "DHCP option sent even if the client does not request it." msgstr "" -#: option.c:281 +#: option.c:285 msgid "Specify port to listen for DNS requests on (defaults to 53)." msgstr "" -#: option.c:282 +#: option.c:286 #, c-format msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)." msgstr "" -#: option.c:283 +#: option.c:287 msgid "Log DNS queries." msgstr "" -#: option.c:284 +#: option.c:288 msgid "Force the originating port for upstream DNS queries." msgstr "" -#: option.c:285 +#: option.c:289 msgid "Do NOT read resolv.conf." msgstr "" -#: option.c:286 +#: option.c:290 #, c-format msgid "Specify path to resolv.conf (defaults to %s)." msgstr "" -#: option.c:287 +#: option.c:291 msgid "Specify address(es) of upstream servers with optional domains." msgstr "" -#: option.c:288 +#: option.c:292 msgid "Never forward queries to specified domains." msgstr "" -#: option.c:289 +#: option.c:293 msgid "Specify the domain to be assigned in DHCP leases." msgstr "" -#: option.c:290 +#: option.c:294 msgid "Specify default target in an MX record." msgstr "" -#: option.c:291 +#: option.c:295 msgid "Specify time-to-live in seconds for replies from /etc/hosts." msgstr "" -#: option.c:292 +#: option.c:296 msgid "Specify time-to-live in seconds for negative caching." msgstr "" -#: option.c:293 +#: option.c:297 #, c-format msgid "Change to this user after startup. (defaults to %s)." msgstr "" -#: option.c:294 +#: option.c:298 msgid "Map DHCP vendor class to tag." msgstr "" -#: option.c:295 +#: option.c:299 msgid "Display dnsmasq version and copyright information." msgstr "" -#: option.c:296 +#: option.c:300 msgid "Translate IPv4 addresses from upstream servers." msgstr "" -#: option.c:297 +#: option.c:301 msgid "Specify a SRV record." msgstr "" -#: option.c:298 +#: option.c:302 msgid "Display this message. Use --help dhcp for known DHCP options." msgstr "" -#: option.c:299 +#: option.c:303 #, c-format msgid "Specify path of PID file (defaults to %s)." msgstr "" -#: option.c:300 +#: option.c:304 #, c-format msgid "Specify maximum number of DHCP leases (defaults to %s)." msgstr "" -#: option.c:301 +#: option.c:305 msgid "Answer DNS queries based on the interface a query was sent to." msgstr "" -#: option.c:302 +#: option.c:306 msgid "Specify TXT DNS record." msgstr "" -#: option.c:303 +#: option.c:307 msgid "Specify PTR DNS record." msgstr "" -#: option.c:304 +#: option.c:308 msgid "Give DNS name to IPv4 address of interface." msgstr "" -#: option.c:305 +#: option.c:309 msgid "Bind only to interfaces in use." msgstr "" -#: option.c:306 +#: option.c:310 #, c-format msgid "Read DHCP static host information from %s." msgstr "" -#: option.c:307 +#: option.c:311 msgid "Enable the DBus interface for setting upstream servers, etc." msgstr "" -#: option.c:308 +#: option.c:312 msgid "Do not provide DHCP on this interface, only provide DNS." msgstr "" -#: option.c:309 +#: option.c:313 msgid "Enable dynamic address allocation for bootp." msgstr "" -#: option.c:310 +#: option.c:314 msgid "Map MAC address (with wildcards) to option set." msgstr "" -#: option.c:312 +#: option.c:316 msgid "Treat DHCP requests on aliases as arriving from interface." msgstr "" -#: option.c:314 +#: option.c:318 msgid "Disable ICMP echo address checking in the DHCP server." msgstr "" -#: option.c:315 +#: option.c:319 msgid "Script to run on DHCP lease creation and destruction." msgstr "" -#: option.c:316 +#: option.c:320 msgid "Read configuration from all the files in this directory." msgstr "" -#: option.c:317 +#: option.c:321 msgid "Log to this syslog facility or file. (defaults to DAEMON)" msgstr "" -#: option.c:318 +#: option.c:322 msgid "Read leases at startup, but never write the lease file." msgstr "" -#: option.c:319 +#: option.c:323 #, c-format msgid "Maximum number of concurrent DNS queries. (defaults to %s)" msgstr "" -#: option.c:320 +#: option.c:324 #, c-format msgid "Clear DNS cache when reloading %s." msgstr "" -#: option.c:321 +#: option.c:325 msgid "Ignore hostnames provided by DHCP clients." msgstr "" -#: option.c:322 +#: option.c:326 msgid "Do NOT reuse filename and server fields for extra DHCP options." msgstr "" -#: option.c:323 +#: option.c:327 msgid "Enable integrated read-only TFTP server." msgstr "" -#: option.c:324 +#: option.c:328 msgid "Export files by TFTP only from the specified subtree." msgstr "" -#: option.c:325 +#: option.c:329 msgid "Add client IP address to tftp-root." msgstr "" -#: option.c:326 +#: option.c:330 msgid "Allow access only to files owned by the user running dnsmasq." msgstr "" -#: option.c:327 +#: option.c:331 #, c-format msgid "Maximum number of conncurrent TFTP transfers (defaults to %s)." msgstr "" -#: option.c:328 +#: option.c:332 msgid "Disable the TFTP blocksize extension." msgstr "" -#: option.c:329 +#: option.c:333 msgid "Ephemeral port range for use by TFTP transfers." msgstr "" -#: option.c:330 +#: option.c:334 msgid "Extra logging for DHCP." msgstr "" -#: option.c:331 +#: option.c:335 msgid "Enable async. logging; optionally set queue length." msgstr "" -#: option.c:332 +#: option.c:336 msgid "Stop DNS rebinding. Filter private IP ranges when resolving." msgstr "" -#: option.c:333 +#: option.c:337 msgid "Always perform DNS queries to all servers." msgstr "" -#: option.c:334 +#: option.c:338 msgid "Set tag if client includes option in request." msgstr "" -#: option.c:585 +#: option.c:339 +msgid "Use alternative ports for DHCP." +msgstr "" + +#: option.c:340 +msgid "Run lease-change script as this user." +msgstr "" + +#: option.c:591 #, c-format msgid "" "Usage: dnsmasq [options]\n" "\n" msgstr "" -#: option.c:587 +#: option.c:593 #, c-format msgid "Use short options only on the command line.\n" msgstr "" -#: option.c:589 +#: option.c:595 #, c-format msgid "Valid options are :\n" msgstr "" -#: option.c:610 +#: option.c:616 #, c-format msgid "Known DHCP options:\n" msgstr "" -#: option.c:683 +#: option.c:689 msgid "bad dhcp-option" msgstr "" -#: option.c:739 +#: option.c:745 msgid "bad IP address" msgstr "" -#: option.c:837 +#: option.c:843 msgid "bad domain in dhcp-option" msgstr "" -#: option.c:895 +#: option.c:901 msgid "dhcp-option too long" msgstr "" -#: option.c:942 +#: option.c:948 #, c-format msgid "cannot access directory %s: %s" msgstr "" -#: option.c:961 tftp.c:343 +#: option.c:967 tftp.c:348 #, c-format msgid "cannot access %s: %s" msgstr "" -#: option.c:998 +#: option.c:1004 msgid "only one dhcp-hostsfile allowed" msgstr "" -#: option.c:1005 +#: option.c:1011 msgid "only one dhcp-optsfile allowed" msgstr "" -#: option.c:1049 +#: option.c:1055 msgid "bad MX preference" msgstr "" -#: option.c:1053 +#: option.c:1059 msgid "bad MX name" msgstr "" -#: option.c:1067 +#: option.c:1073 msgid "bad MX target" msgstr "" -#: option.c:1078 +#: option.c:1084 msgid "cannot run scripts under uClinux" msgstr "" -#: option.c:1265 option.c:1273 +#: option.c:1275 option.c:1283 msgid "bad port" msgstr "" -#: option.c:1293 option.c:1318 +#: option.c:1303 option.c:1328 msgid "interface binding not supported" msgstr "" -#: option.c:1427 +#: option.c:1437 msgid "bad port range" msgstr "" -#: option.c:1444 +#: option.c:1454 msgid "bad bridge-interface" msgstr "" -#: option.c:1485 +#: option.c:1495 msgid "bad dhcp-range" msgstr "" -#: option.c:1511 +#: option.c:1521 msgid "only one netid tag allowed" msgstr "" -#: option.c:1551 +#: option.c:1561 msgid "inconsistent DHCP range" msgstr "" -#: option.c:1719 +#: option.c:1729 msgid "bad DHCP host name" msgstr "" -#: option.c:1959 +#: option.c:1900 option.c:2107 +msgid "invalid port number" +msgstr "" + +#: option.c:1986 msgid "bad interface name" msgstr "" -#: option.c:1979 +#: option.c:2006 msgid "bad PTR record" msgstr "" -#: option.c:1999 +#: option.c:2026 msgid "TXT record string too long" msgstr "" -#: option.c:2003 +#: option.c:2030 msgid "bad TXT record" msgstr "" -#: option.c:2063 +#: option.c:2090 msgid "bad SRV record" msgstr "" -#: option.c:2072 +#: option.c:2099 msgid "bad SRV target" msgstr "" -#: option.c:2080 -msgid "invalid port number" -msgstr "" - -#: option.c:2087 +#: option.c:2114 msgid "invalid priority" msgstr "" -#: option.c:2094 +#: option.c:2121 msgid "invalid weight" msgstr "" -#: option.c:2130 +#: option.c:2157 #, c-format msgid "files nested too deep in %s" msgstr "" -#: option.c:2138 tftp.c:497 +#: option.c:2165 tftp.c:503 #, c-format msgid "cannot read %s: %s" msgstr "" -#: option.c:2199 +#: option.c:2226 msgid "missing \"" msgstr "" -#: option.c:2246 +#: option.c:2273 msgid "bad option" msgstr "" -#: option.c:2248 +#: option.c:2275 msgid "extraneous parameter" msgstr "" -#: option.c:2250 +#: option.c:2277 msgid "missing parameter" msgstr "" -#: option.c:2258 +#: option.c:2285 msgid "error" msgstr "" -#: option.c:2264 +#: option.c:2291 #, c-format msgid "%s at line %d of %%s" msgstr "" -#: option.c:2304 option.c:2334 +#: option.c:2331 option.c:2361 #, c-format msgid "read %s" msgstr "" -#: option.c:2400 +#: option.c:2429 #, c-format msgid "Dnsmasq version %s %s\n" msgstr "" -#: option.c:2401 +#: option.c:2430 #, c-format msgid "" "Compile time options %s\n" "\n" msgstr "" -#: option.c:2402 +#: option.c:2431 #, c-format msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" msgstr "" -#: option.c:2403 +#: option.c:2432 #, c-format msgid "Dnsmasq is free software, and you are welcome to redistribute it\n" msgstr "" -#: option.c:2404 +#: option.c:2433 #, c-format msgid "under the terms of the GNU General Public License, version 2 or 3.\n" msgstr "" -#: option.c:2415 +#: option.c:2444 msgid "try --help" msgstr "" -#: option.c:2417 +#: option.c:2446 msgid "try -w" msgstr "" -#: option.c:2420 +#: option.c:2449 #, c-format msgid "bad command line options: %s" msgstr "" -#: option.c:2461 +#: option.c:2490 #, c-format msgid "cannot get host-name: %s" msgstr "" -#: option.c:2489 +#: option.c:2518 msgid "only one resolv.conf file allowed in no-poll mode." msgstr "" -#: option.c:2499 +#: option.c:2528 msgid "must have exactly one resolv.conf to read domain from." msgstr "" -#: option.c:2502 network.c:640 +#: option.c:2531 network.c:640 #, c-format msgid "failed to read %s: %s" msgstr "" -#: option.c:2520 +#: option.c:2549 #, c-format msgid "no search directive found in %s" msgstr "" @@ -705,7 +713,7 @@ msgid "possible DNS-rebind attack detected" msgstr "" -#: isc.c:77 dnsmasq.c:747 +#: isc.c:77 dnsmasq.c:769 #, c-format msgid "failed to access %s: %s" msgstr "" @@ -715,7 +723,7 @@ msgid "failed to load %s: %s" msgstr "" -#: isc.c:97 dnsmasq.c:769 +#: isc.c:97 dnsmasq.c:791 #, c-format msgid "reading %s" msgstr "" @@ -735,7 +743,7 @@ msgid "unknown interface %s in bridge-interface" msgstr "" -#: network.c:389 dnsmasq.c:180 +#: network.c:389 dnsmasq.c:183 #, c-format msgid "failed to create listening socket: %s" msgstr "" @@ -811,177 +819,182 @@ msgid "using nameserver %s#%d" msgstr "" -#: dnsmasq.c:110 +#: dnsmasq.c:113 msgid "" "ISC dhcpd integration not available: set HAVE_ISC_READER in src/config.h" msgstr "" -#: dnsmasq.c:132 +#: dnsmasq.c:135 msgid "TFTP server not available: set HAVE_TFTP in src/config.h" msgstr "" -#: dnsmasq.c:137 +#: dnsmasq.c:140 msgid "asychronous logging is not available under Solaris" msgstr "" -#: dnsmasq.c:151 +#: dnsmasq.c:154 msgid "must set exactly one interface on broken systems without IP_RECVIF" msgstr "" -#: dnsmasq.c:161 +#: dnsmasq.c:164 #, c-format msgid "failed to find list of interfaces: %s" msgstr "" -#: dnsmasq.c:169 +#: dnsmasq.c:172 #, c-format msgid "unknown interface %s" msgstr "" -#: dnsmasq.c:175 +#: dnsmasq.c:178 #, c-format msgid "no interface with address %s" msgstr "" -#: dnsmasq.c:192 dnsmasq.c:561 +#: dnsmasq.c:195 dnsmasq.c:575 #, c-format msgid "DBus error: %s" msgstr "" -#: dnsmasq.c:195 +#: dnsmasq.c:198 msgid "DBus not available: set HAVE_DBUS in src/config.h" msgstr "" -#: dnsmasq.c:204 +#: dnsmasq.c:207 #, c-format msgid "cannot create pipe: %s" msgstr "" -#: dnsmasq.c:225 +#: dnsmasq.c:223 #, c-format -msgid "cannot fork into background: %s" +msgid "cannot chdir to filesystem root: %s" msgstr "" -#: dnsmasq.c:239 +#: dnsmasq.c:231 #, c-format -msgid "cannot chdir to filesystem root: %s" +msgid "cannot fork into background: %s" msgstr "" -#: dnsmasq.c:349 +#: dnsmasq.c:363 #, c-format msgid "started, version %s DNS disabled" msgstr "" -#: dnsmasq.c:351 +#: dnsmasq.c:365 #, c-format msgid "started, version %s cachesize %d" msgstr "" -#: dnsmasq.c:353 +#: dnsmasq.c:367 #, c-format msgid "started, version %s cache disabled" msgstr "" -#: dnsmasq.c:355 +#: dnsmasq.c:369 #, c-format msgid "compile time options: %s" msgstr "" -#: dnsmasq.c:361 +#: dnsmasq.c:375 msgid "DBus support enabled: connected to system bus" msgstr "" -#: dnsmasq.c:363 +#: dnsmasq.c:377 msgid "DBus support enabled: bus connection pending" msgstr "" -#: dnsmasq.c:368 +#: dnsmasq.c:382 msgid "setting --bind-interfaces option because of OS limitations" msgstr "" -#: dnsmasq.c:373 +#: dnsmasq.c:387 #, c-format msgid "warning: interface %s does not currently exist" msgstr "" -#: dnsmasq.c:378 +#: dnsmasq.c:392 msgid "warning: ignoring resolv-file flag because no-resolv is set" msgstr "" -#: dnsmasq.c:381 +#: dnsmasq.c:395 msgid "warning: no upstream servers configured" msgstr "" -#: dnsmasq.c:385 +#: dnsmasq.c:399 #, c-format msgid "asynchronous logging enabled, queue limit is %d messages" msgstr "" -#: dnsmasq.c:397 +#: dnsmasq.c:411 #, c-format msgid "DHCP, static leases only on %.0s%s, lease time %s" msgstr "" -#: dnsmasq.c:398 +#: dnsmasq.c:412 #, c-format msgid "DHCP, IP range %s -- %s, lease time %s" msgstr "" -#: dnsmasq.c:412 +#: dnsmasq.c:426 msgid "root is " msgstr "" -#: dnsmasq.c:412 +#: dnsmasq.c:426 msgid "enabled" msgstr "" -#: dnsmasq.c:414 +#: dnsmasq.c:428 msgid "secure mode" msgstr "" -#: dnsmasq.c:440 +#: dnsmasq.c:454 #, c-format msgid "restricting maximum simultaneous TFTP transfers to %d" msgstr "" -#: dnsmasq.c:449 +#: dnsmasq.c:463 #, c-format msgid "warning: setting capabilities failed: %s" msgstr "" -#: dnsmasq.c:451 +#: dnsmasq.c:465 msgid "running as root" msgstr "" -#: dnsmasq.c:563 +#: dnsmasq.c:577 msgid "connected to system DBus" msgstr "" -#: dnsmasq.c:683 +#: dnsmasq.c:697 #, c-format msgid "child process killed by signal %d" msgstr "" -#: dnsmasq.c:687 +#: dnsmasq.c:701 #, c-format msgid "child process exited with status %d" msgstr "" -#: dnsmasq.c:691 +#: dnsmasq.c:705 #, c-format msgid "failed to execute %s: %s" msgstr "" -#: dnsmasq.c:695 +#: dnsmasq.c:710 #, c-format msgid "failed to create helper: %s" msgstr "" -#: dnsmasq.c:729 +#: dnsmasq.c:714 +#, c-format +msgid "cannot change to user %s for script execution%s%s" +msgstr "" + +#: dnsmasq.c:751 msgid "exiting on receipt of SIGTERM" msgstr "" -#: dnsmasq.c:780 +#: dnsmasq.c:802 #, c-format msgid "no servers found in %s, will retry" msgstr "" @@ -1085,152 +1098,152 @@ msgid "failed to write %s: %s (retry in %us)" msgstr "" -#: rfc2131.c:303 +#: rfc2131.c:304 #, c-format msgid "no address range available for DHCP request %s %s" msgstr "" -#: rfc2131.c:304 +#: rfc2131.c:305 msgid "with subnet selector" msgstr "" -#: rfc2131.c:304 +#: rfc2131.c:305 msgid "via" msgstr "" -#: rfc2131.c:315 +#: rfc2131.c:316 #, c-format msgid "DHCP packet: transaction-id is %u" msgstr "" -#: rfc2131.c:320 +#: rfc2131.c:321 #, c-format msgid "Available DHCP subnet: %s/%s" msgstr "" -#: rfc2131.c:322 +#: rfc2131.c:323 #, c-format msgid "Available DHCP range: %s -- %s" msgstr "" -#: rfc2131.c:350 rfc2131.c:381 +#: rfc2131.c:351 rfc2131.c:382 msgid "disabled" msgstr "" -#: rfc2131.c:393 rfc2131.c:873 +#: rfc2131.c:394 rfc2131.c:874 msgid "address in use" msgstr "" -#: rfc2131.c:396 +#: rfc2131.c:397 msgid "no address configured" msgstr "" -#: rfc2131.c:409 rfc2131.c:736 +#: rfc2131.c:410 rfc2131.c:737 msgid "no address available" msgstr "" -#: rfc2131.c:418 rfc2131.c:883 +#: rfc2131.c:419 rfc2131.c:884 msgid "no leases left" msgstr "" -#: rfc2131.c:421 rfc2131.c:847 +#: rfc2131.c:422 rfc2131.c:848 msgid "wrong network" msgstr "" -#: rfc2131.c:520 +#: rfc2131.c:521 #, c-format msgid "Ignoring domain %s for DHCP host name %s" msgstr "" -#: rfc2131.c:614 +#: rfc2131.c:615 #, c-format msgid "Vendor class: %s" msgstr "" -#: rfc2131.c:616 +#: rfc2131.c:617 #, c-format msgid "User class: %s" msgstr "" -#: rfc2131.c:657 +#: rfc2131.c:658 #, c-format msgid "disabling DHCP static address %s for %s" msgstr "" -#: rfc2131.c:678 +#: rfc2131.c:679 msgid "unknown lease" msgstr "" -#: rfc2131.c:687 rfc2131.c:992 +#: rfc2131.c:688 rfc2131.c:995 msgid "ignored" msgstr "" -#: rfc2131.c:707 +#: rfc2131.c:708 #, c-format msgid "not using configured address %s because it is leased to %s" msgstr "" -#: rfc2131.c:717 +#: rfc2131.c:718 #, c-format msgid "" "not using configured address %s because it is in use by the server or relay" msgstr "" -#: rfc2131.c:720 +#: rfc2131.c:721 #, c-format msgid "not using configured address %s because it was previously declined" msgstr "" -#: rfc2131.c:734 rfc2131.c:876 +#: rfc2131.c:735 rfc2131.c:877 msgid "no unique-id" msgstr "" -#: rfc2131.c:806 +#: rfc2131.c:807 msgid "wrong address" msgstr "" -#: rfc2131.c:823 +#: rfc2131.c:824 msgid "lease not found" msgstr "" -#: rfc2131.c:855 +#: rfc2131.c:856 msgid "address not available" msgstr "" -#: rfc2131.c:866 +#: rfc2131.c:867 msgid "static lease available" msgstr "" -#: rfc2131.c:870 +#: rfc2131.c:871 msgid "address reserved" msgstr "" -#: rfc2131.c:1265 +#: rfc2131.c:1268 #, c-format msgid "tags: %s" msgstr "" -#: rfc2131.c:1352 +#: rfc2131.c:1355 #, c-format msgid "cannot send DHCP/BOOTP option %d: no space left in packet" msgstr "" -#: rfc2131.c:1507 +#: rfc2131.c:1525 #, c-format msgid "requested options: %s" msgstr "" -#: rfc2131.c:1556 +#: rfc2131.c:1574 #, c-format msgid "next server: %s" msgstr "" -#: rfc2131.c:1580 +#: rfc2131.c:1598 #, c-format msgid "bootfile name: %s" msgstr "" -#: rfc2131.c:1583 +#: rfc2131.c:1601 #, c-format msgid "server name: %s" msgstr "" @@ -1249,11 +1262,11 @@ msgid "attempt to set an IPv6 server address via DBus - no IPv6 support" msgstr "" -#: dbus.c:241 +#: dbus.c:243 msgid "setting upstream servers from DBus" msgstr "" -#: dbus.c:279 +#: dbus.c:281 msgid "could not register a DBus message handler" msgstr "" @@ -1267,31 +1280,31 @@ msgid "DHCP request for unsupported hardware type (%d) received on %s" msgstr "" -#: tftp.c:173 +#: tftp.c:175 msgid "unable to get free port for TFTP" msgstr "" -#: tftp.c:188 +#: tftp.c:190 #, c-format msgid "unsupported request from %s" msgstr "" -#: tftp.c:266 +#: tftp.c:271 #, c-format msgid "TFTP sent %s to %s" msgstr "" -#: tftp.c:289 +#: tftp.c:294 #, c-format msgid "file %s not found" msgstr "" -#: tftp.c:399 +#: tftp.c:405 #, c-format msgid "TFTP error %d %s received from %s" msgstr "" -#: tftp.c:430 +#: tftp.c:436 #, c-format msgid "TFTP failed sending %s to %s" msgstr "" diff -Nru /tmp/7MO8KY0fpf/dnsmasq-2.41/po/ro.po /tmp/pRA3L6jhPD/dnsmasq-2.42/po/ro.po --- dnsmasq-2.41/po/ro.po 2008-02-12 21:36:39.000000000 +0100 +++ dnsmasq-2.42/po/ro.po 2008-05-29 21:49:22.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: dnsmasq 2.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-12 11:04+0000\n" +"POT-Creation-Date: 2008-05-23 21:33+0100\n" "PO-Revision-Date: 2005-11-22 16:46+0000\n" "Last-Translator: Simon Kelley \n" "Language-Team: Romanian \n" @@ -15,31 +15,31 @@ "Content-Transfer-Encoding: 8bit\n" # for compatibility purposes the letters â, ă, ş, ţ and î can be written as their look-alike correspondent. -#: cache.c:680 +#: cache.c:700 #, fuzzy, c-format msgid "failed to load names from %s: %s" msgstr "încărcarea numelor din %s: %m a eşuat" -#: cache.c:714 dhcp.c:757 +#: cache.c:734 dhcp.c:757 #, c-format msgid "bad address at %s line %d" msgstr "adresă greşită în %s, linia %d" -#: cache.c:761 dhcp.c:771 +#: cache.c:781 dhcp.c:771 #, c-format msgid "bad name at %s line %d" msgstr "nume greşit în %s linia %d" -#: cache.c:768 dhcp.c:825 +#: cache.c:788 dhcp.c:825 #, c-format msgid "read %s - %d addresses" msgstr "citesc %s - %d adrese" -#: cache.c:806 +#: cache.c:826 msgid "cleared cache" msgstr "memoria temporară a fost ştearsă" -#: cache.c:855 +#: cache.c:875 #, c-format msgid "" "not giving name %s to the DHCP lease of %s because the name exists in %s " @@ -48,24 +48,24 @@ "nu pot da numele %s împrumutului de adresă DHCP a lui %s deoarece " "numeleexistă în %s cu adresa %s" -#: cache.c:907 +#: cache.c:927 #, c-format msgid "time %lu" msgstr "" -#: cache.c:908 +#: cache.c:928 #, fuzzy, c-format msgid "cache size %d, %d/%d cache insertions re-used unexpired cache entries." msgstr "" "cantitate de memorie temporară %d, %d/%d stocări temporare aureutilizat " "locaţii neexpirate." -#: cache.c:910 +#: cache.c:930 #, c-format msgid "queries forwarded %u, queries answered locally %u" msgstr "" -#: cache.c:933 +#: cache.c:953 #, c-format msgid "server %s#%d: queries sent %u, retried or failed %u" msgstr "" @@ -84,393 +84,401 @@ msgid "infinite" msgstr "infinit" -#: option.c:244 +#: option.c:248 msgid "Specify local address(es) to listen on." msgstr "Specificaţi adresele locale deservite." -#: option.c:245 +#: option.c:249 msgid "Return ipaddr for all hosts in specified domains." msgstr "Afişează adresele IP ale maşinilor în domeniul dat." -#: option.c:246 +#: option.c:250 msgid "Fake reverse lookups for RFC1918 private address ranges." msgstr "" "Simulează căutări după adresă pentru domenii de adresă private (RFC1918)." -#: option.c:247 +#: option.c:251 msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)." msgstr "Interpretează adresa IP ca NXDOMAIN (împotriva manipulărilor Verisign)" -#: option.c:248 +#: option.c:252 #, c-format msgid "Specify the size of the cache in entries (defaults to %s)." msgstr "Specifică mărimea înregistrărilor temporare (implicit e %s)." -#: option.c:249 +#: option.c:253 #, c-format msgid "Specify configuration file (defaults to %s)." msgstr "Specifică fişier de configurare (implicit e %s)." -#: option.c:250 +#: option.c:254 msgid "Do NOT fork into the background: run in debug mode." msgstr "NU porneşte în fundal: rulează în modul depanare." -#: option.c:251 +#: option.c:255 msgid "Do NOT forward queries with no domain part." msgstr "NU înainta cererile ce nu conţin domeniu DNS." -#: option.c:252 +#: option.c:256 msgid "Return self-pointing MX records for local hosts." msgstr "Răspunde cu înregistrări MX spre el însuşi pentru maşini locale." -#: option.c:253 +#: option.c:257 msgid "Expand simple names in /etc/hosts with domain-suffix." msgstr "Adaugă numelor simple din /etc/hosts numele domeniului ca sufix." -#: option.c:254 +#: option.c:258 msgid "Don't forward spurious DNS requests from Windows hosts." msgstr "Nu inainta cereri DNS defecte provenite de la maşini Windows." -#: option.c:255 +#: option.c:259 msgid "Enable DHCP in the range given with lease duration." msgstr "Activează DHCP în domeniul dat cu durată limitată de împrumut." -#: option.c:256 +#: option.c:260 #, c-format msgid "Change to this group after startup (defaults to %s)." msgstr "Rulează sub acest grup după pornire (implicit e %s)." -#: option.c:257 +#: option.c:261 msgid "Set address or hostname for a specified machine." msgstr "Schimbă adresa sau numele maşinii specificate." -#: option.c:258 +#: option.c:262 msgid "Read DHCP host specs from file" msgstr "" -#: option.c:259 +#: option.c:263 msgid "Read DHCP option specs from file" msgstr "" -#: option.c:260 +#: option.c:264 #, c-format msgid "Do NOT load %s file." msgstr "Nu încarcă fişierul %s." -#: option.c:261 +#: option.c:265 #, c-format msgid "Specify a hosts file to be read in addition to %s." msgstr "Specifică spre citire un fişier hosts adiţional la %s." -#: option.c:262 +#: option.c:266 msgid "Specify interface(s) to listen on." msgstr "Specifică interfeţele deservite." -#: option.c:263 +#: option.c:267 msgid "Specify interface(s) NOT to listen on." msgstr "Specifică interfeţele NE-deservite." -#: option.c:264 +#: option.c:268 #, fuzzy msgid "Map DHCP user class to tag." msgstr "Leagă clasa de utilizator DHCP cu grup de opţiuni." -#: option.c:265 +#: option.c:269 msgid "Map RFC3046 circuit-id to tag." msgstr "" -#: option.c:266 +#: option.c:270 msgid "Map RFC3046 remote-id to tag." msgstr "" -#: option.c:267 +#: option.c:271 msgid "Map RFC3993 subscriber-id to tag." msgstr "" -#: option.c:268 +#: option.c:272 #, fuzzy msgid "Don't do DHCP for hosts with tag set." msgstr "Nu furniza DHCP maşinilor din grupul de opţiuni." -#: option.c:269 +#: option.c:273 #, fuzzy msgid "Force broadcast replies for hosts with tag set." msgstr "Nu furniza DHCP maşinilor din grupul de opţiuni." -#: option.c:270 +#: option.c:274 msgid "Do NOT fork into the background, do NOT run in debug mode." msgstr "NU porneşte în fundal, NU rulează în modul depanare." -#: option.c:271 +#: option.c:275 msgid "Assume we are the only DHCP server on the local network." msgstr "Presupune că suntem singurul server DHCP din reţeaua locală." -#: option.c:272 +#: option.c:276 #, c-format msgid "Specify where to store DHCP leases (defaults to %s)." msgstr "Specifică fişierul de stocare a împrumuturilor DHCP (implicit e %s)." -#: option.c:273 +#: option.c:277 msgid "Return MX records for local hosts." msgstr "Răspunde cu întregistrări MX pentru maşini locale." -#: option.c:274 +#: option.c:278 msgid "Specify an MX record." msgstr "Specifică o înregistrare MX." -#: option.c:275 +#: option.c:279 msgid "Specify BOOTP options to DHCP server." msgstr "Specifică opţiuni BOOTP serverului DHCP." -#: option.c:276 +#: option.c:280 #, c-format msgid "Do NOT poll %s file, reload only on SIGHUP." msgstr "Nu încărca fişierul %s, citeşte-l doar la SIGHUP." -#: option.c:277 +#: option.c:281 msgid "Do NOT cache failed search results." msgstr "NU memora rezultatele de căutare DNS eşuatată." -#: option.c:278 +#: option.c:282 #, c-format msgid "Use nameservers strictly in the order given in %s." msgstr "Foloseşte servere DNS strict în ordinea dată în %s." -#: option.c:279 +#: option.c:283 #, fuzzy msgid "Specify options to be sent to DHCP clients." msgstr "Configurează opţiuni în plusce trebuie trimise clienţilor DHCP." -#: option.c:280 +#: option.c:284 msgid "DHCP option sent even if the client does not request it." msgstr "" -#: option.c:281 +#: option.c:285 msgid "Specify port to listen for DNS requests on (defaults to 53)." msgstr "Specifică numărul portului pentru cereri DNS (implicit e 53)." -#: option.c:282 +#: option.c:286 #, c-format msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)." msgstr "Marimea maximă a pachetului UDP pentru EDNS.0 (implicit e %s)." -#: option.c:283 +#: option.c:287 #, fuzzy msgid "Log DNS queries." msgstr "Înregistrează tranzacţiile." -#: option.c:284 +#: option.c:288 #, fuzzy msgid "Force the originating port for upstream DNS queries." msgstr "Forţează acest port pentru datele ce pleacă." -#: option.c:285 +#: option.c:289 msgid "Do NOT read resolv.conf." msgstr "NU citi fişierul resolv.conf" -#: option.c:286 +#: option.c:290 #, c-format msgid "Specify path to resolv.conf (defaults to %s)." msgstr "Specifică calea către resolv.conf (implicit e %s)." -#: option.c:287 +#: option.c:291 msgid "Specify address(es) of upstream servers with optional domains." msgstr "Specifică adresele server(elor) superioare cu domenii opţionale." -#: option.c:288 +#: option.c:292 msgid "Never forward queries to specified domains." msgstr "Nu înaintează cererile spre domeniile specificate." -#: option.c:289 +#: option.c:293 msgid "Specify the domain to be assigned in DHCP leases." msgstr "Specifică domeniul de transmis prin DHCP." -#: option.c:290 +#: option.c:294 msgid "Specify default target in an MX record." msgstr "Specifică o ţintă într-o înregistrare MX." -#: option.c:291 +#: option.c:295 msgid "Specify time-to-live in seconds for replies from /etc/hosts." msgstr "Specifică TTL în secunde pentru răspunsurile din /etc/hosts." -#: option.c:292 +#: option.c:296 #, fuzzy msgid "Specify time-to-live in seconds for negative caching." msgstr "Specifică TTL în secunde pentru răspunsurile din /etc/hosts." -#: option.c:293 +#: option.c:297 #, c-format msgid "Change to this user after startup. (defaults to %s)." msgstr "Rulează sub acest utilizator după pornire. (implicit e %s)." -#: option.c:294 +#: option.c:298 #, fuzzy msgid "Map DHCP vendor class to tag." msgstr "Trimite opţiuni DHCP în funcţie de marca plăcii de reţea." -#: option.c:295 +#: option.c:299 msgid "Display dnsmasq version and copyright information." msgstr "Afişează versiunea dnsmasq şi drepturile de autor." -#: option.c:296 +#: option.c:300 msgid "Translate IPv4 addresses from upstream servers." msgstr "Traduce adresele IPv4 de la serverele DNS superioare." -#: option.c:297 +#: option.c:301 msgid "Specify a SRV record." msgstr "Specifică o înregistrare SRV." -#: option.c:298 +#: option.c:302 msgid "Display this message. Use --help dhcp for known DHCP options." msgstr "" -#: option.c:299 +#: option.c:303 #, fuzzy, c-format msgid "Specify path of PID file (defaults to %s)." msgstr "Specifică o cale pentru fişierul PID. (implicit %s)." -#: option.c:300 +#: option.c:304 #, c-format msgid "Specify maximum number of DHCP leases (defaults to %s)." msgstr "Specifică numărul maxim de împrumuturi DHCP (implicit %s)." -#: option.c:301 +#: option.c:305 msgid "Answer DNS queries based on the interface a query was sent to." msgstr "" "Răspunde cererilor DNS în funcţie de interfaţa pe care a venit cererea." -#: option.c:302 +#: option.c:306 msgid "Specify TXT DNS record." msgstr "Specifică o înregistrare TXT." -#: option.c:303 +#: option.c:307 #, fuzzy msgid "Specify PTR DNS record." msgstr "Specifică o înregistrare TXT." -#: option.c:304 +#: option.c:308 msgid "Give DNS name to IPv4 address of interface." msgstr "" -#: option.c:305 +#: option.c:309 msgid "Bind only to interfaces in use." msgstr "Ascultă doar pe interfeţele active." -#: option.c:306 +#: option.c:310 #, c-format msgid "Read DHCP static host information from %s." msgstr "Citeşte informaţii DHCP statice despre maşină din %s." -#: option.c:307 +#: option.c:311 msgid "Enable the DBus interface for setting upstream servers, etc." msgstr "Activeaza interfaţa DBus pentru configurarea serverelor superioare." -#: option.c:308 +#: option.c:312 msgid "Do not provide DHCP on this interface, only provide DNS." msgstr "Nu activează DHCP ci doar DNS pe această interfaţă." -#: option.c:309 +#: option.c:313 msgid "Enable dynamic address allocation for bootp." msgstr "Activează alocarea dinamică a adreselor pentru BOOTP." -#: option.c:310 +#: option.c:314 #, fuzzy msgid "Map MAC address (with wildcards) to option set." msgstr "Trimite opţiuni DHCP în funcţie de marca plăcii de reţea." -#: option.c:312 +#: option.c:316 msgid "Treat DHCP requests on aliases as arriving from interface." msgstr "" -#: option.c:314 +#: option.c:318 msgid "Disable ICMP echo address checking in the DHCP server." msgstr "" -#: option.c:315 +#: option.c:319 msgid "Script to run on DHCP lease creation and destruction." msgstr "" -#: option.c:316 +#: option.c:320 msgid "Read configuration from all the files in this directory." msgstr "" -#: option.c:317 +#: option.c:321 #, fuzzy msgid "Log to this syslog facility or file. (defaults to DAEMON)" msgstr "Rulează sub acest utilizator după pornire. (implicit e %s)." -#: option.c:318 +#: option.c:322 msgid "Read leases at startup, but never write the lease file." msgstr "" -#: option.c:319 +#: option.c:323 #, fuzzy, c-format msgid "Maximum number of concurrent DNS queries. (defaults to %s)" msgstr "Specifică numărul maxim de împrumuturi DHCP (implicit %s)." -#: option.c:320 +#: option.c:324 #, c-format msgid "Clear DNS cache when reloading %s." msgstr "" -#: option.c:321 +#: option.c:325 msgid "Ignore hostnames provided by DHCP clients." msgstr "" -#: option.c:322 +#: option.c:326 msgid "Do NOT reuse filename and server fields for extra DHCP options." msgstr "" -#: option.c:323 +#: option.c:327 msgid "Enable integrated read-only TFTP server." msgstr "" -#: option.c:324 +#: option.c:328 msgid "Export files by TFTP only from the specified subtree." msgstr "" -#: option.c:325 +#: option.c:329 msgid "Add client IP address to tftp-root." msgstr "" -#: option.c:326 +#: option.c:330 msgid "Allow access only to files owned by the user running dnsmasq." msgstr "" -#: option.c:327 +#: option.c:331 #, fuzzy, c-format msgid "Maximum number of conncurrent TFTP transfers (defaults to %s)." msgstr "Specifică numărul maxim de împrumuturi DHCP (implicit %s)." -#: option.c:328 +#: option.c:332 msgid "Disable the TFTP blocksize extension." msgstr "" -#: option.c:329 +#: option.c:333 msgid "Ephemeral port range for use by TFTP transfers." msgstr "" -#: option.c:330 +#: option.c:334 msgid "Extra logging for DHCP." msgstr "" -#: option.c:331 +#: option.c:335 msgid "Enable async. logging; optionally set queue length." msgstr "" -#: option.c:332 +#: option.c:336 msgid "Stop DNS rebinding. Filter private IP ranges when resolving." msgstr "" -#: option.c:333 +#: option.c:337 msgid "Always perform DNS queries to all servers." msgstr "" -#: option.c:334 +#: option.c:338 msgid "Set tag if client includes option in request." msgstr "" -#: option.c:585 +#: option.c:339 +msgid "Use alternative ports for DHCP." +msgstr "" + +#: option.c:340 +msgid "Run lease-change script as this user." +msgstr "" + +#: option.c:591 #, c-format msgid "" "Usage: dnsmasq [options]\n" @@ -479,190 +487,190 @@ "Utilizare: dnsmasq [opţiuni]\n" "\n" -#: option.c:587 +#: option.c:593 #, c-format msgid "Use short options only on the command line.\n" msgstr "Folosiţi opţiunile prescurtate doar în linie de comandă.\n" -#: option.c:589 +#: option.c:595 #, c-format msgid "Valid options are :\n" msgstr "Opţiunile valide sunt:\n" -#: option.c:610 +#: option.c:616 #, c-format msgid "Known DHCP options:\n" msgstr "" -#: option.c:683 +#: option.c:689 msgid "bad dhcp-option" msgstr "dhcp-option invalid" -#: option.c:739 +#: option.c:745 #, fuzzy msgid "bad IP address" msgstr "citesc %s - %d adrese" -#: option.c:837 +#: option.c:843 msgid "bad domain in dhcp-option" msgstr "domeniu DNS invalid în declaraţia dhcp-option" -#: option.c:895 +#: option.c:901 msgid "dhcp-option too long" msgstr "declararea dhcp-option este prea lungă" -#: option.c:942 +#: option.c:948 #, fuzzy, c-format msgid "cannot access directory %s: %s" msgstr "nu pot citi %s: %s" -#: option.c:961 tftp.c:343 +#: option.c:967 tftp.c:348 #, fuzzy, c-format msgid "cannot access %s: %s" msgstr "nu pot citi %s: %s" -#: option.c:998 +#: option.c:1004 msgid "only one dhcp-hostsfile allowed" msgstr "" -#: option.c:1005 +#: option.c:1011 msgid "only one dhcp-optsfile allowed" msgstr "" -#: option.c:1049 +#: option.c:1055 msgid "bad MX preference" msgstr "preferinţă MX invalidă" -#: option.c:1053 +#: option.c:1059 msgid "bad MX name" msgstr "nume MX invalid" -#: option.c:1067 +#: option.c:1073 msgid "bad MX target" msgstr "ţintă MX invalidă" -#: option.c:1078 +#: option.c:1084 msgid "cannot run scripts under uClinux" msgstr "" -#: option.c:1265 option.c:1273 +#: option.c:1275 option.c:1283 msgid "bad port" msgstr "port invalid" -#: option.c:1293 option.c:1318 +#: option.c:1303 option.c:1328 msgid "interface binding not supported" msgstr "" -#: option.c:1427 +#: option.c:1437 #, fuzzy msgid "bad port range" msgstr "port invalid" -#: option.c:1444 +#: option.c:1454 msgid "bad bridge-interface" msgstr "" -#: option.c:1485 +#: option.c:1495 msgid "bad dhcp-range" msgstr "dhcp-range invalid" -#: option.c:1511 +#: option.c:1521 msgid "only one netid tag allowed" msgstr "" -#: option.c:1551 +#: option.c:1561 msgid "inconsistent DHCP range" msgstr "domeniu DHCP inconsistent" -#: option.c:1719 +#: option.c:1729 #, fuzzy msgid "bad DHCP host name" msgstr "nume MX invalid" -#: option.c:1959 +#: option.c:1900 option.c:2107 +msgid "invalid port number" +msgstr "număr de port invalid" + +#: option.c:1986 #, fuzzy msgid "bad interface name" msgstr "nume MX invalid" -#: option.c:1979 +#: option.c:2006 #, fuzzy msgid "bad PTR record" msgstr "înregistrare SRV invalidă" -#: option.c:1999 +#: option.c:2026 msgid "TXT record string too long" msgstr "şirul de caractere pentru înregistrarea TXT este prea lung" -#: option.c:2003 +#: option.c:2030 msgid "bad TXT record" msgstr "înregistrare TXT invalidă" -#: option.c:2063 +#: option.c:2090 msgid "bad SRV record" msgstr "înregistrare SRV invalidă" -#: option.c:2072 +#: option.c:2099 msgid "bad SRV target" msgstr "ţintă SRV invalidă" -#: option.c:2080 -msgid "invalid port number" -msgstr "număr de port invalid" - -#: option.c:2087 +#: option.c:2114 msgid "invalid priority" msgstr "prioritate invalidă" -#: option.c:2094 +#: option.c:2121 msgid "invalid weight" msgstr "pondere invalidă" -#: option.c:2130 +#: option.c:2157 #, c-format msgid "files nested too deep in %s" msgstr "" -#: option.c:2138 tftp.c:497 +#: option.c:2165 tftp.c:503 #, c-format msgid "cannot read %s: %s" msgstr "nu pot citi %s: %s" -#: option.c:2199 +#: option.c:2226 msgid "missing \"" msgstr "lipseşte \"" -#: option.c:2246 +#: option.c:2273 msgid "bad option" msgstr "opţiune invalidă" -#: option.c:2248 +#: option.c:2275 msgid "extraneous parameter" msgstr "parametru nerecunoscut" -#: option.c:2250 +#: option.c:2277 msgid "missing parameter" msgstr "parametru lipsa" -#: option.c:2258 +#: option.c:2285 msgid "error" msgstr "eroare" -#: option.c:2264 +#: option.c:2291 #, c-format msgid "%s at line %d of %%s" msgstr "%s la linia %d din %%s" -#: option.c:2304 option.c:2334 +#: option.c:2331 option.c:2361 #, fuzzy, c-format msgid "read %s" msgstr "citesc %s" -#: option.c:2400 +#: option.c:2429 #, c-format msgid "Dnsmasq version %s %s\n" msgstr "dnsmasq versiunea %s %s\n" -#: option.c:2401 +#: option.c:2430 #, c-format msgid "" "Compile time options %s\n" @@ -671,54 +679,54 @@ "Opţiuni cu care a fost compilat %s\n" "\n" -#: option.c:2402 +#: option.c:2431 #, c-format msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" msgstr "Acest program vine FĂRĂ NICI O GARANŢIE.\n" -#: option.c:2403 +#: option.c:2432 #, c-format msgid "Dnsmasq is free software, and you are welcome to redistribute it\n" msgstr "Dnsmasq este un program gratuit, sunteţi invitaţi să-l redistribuiţi\n" -#: option.c:2404 +#: option.c:2433 #, fuzzy, c-format msgid "under the terms of the GNU General Public License, version 2 or 3.\n" msgstr "în termenii Licenţei publice generale GNU, versiunea 2.\n" -#: option.c:2415 +#: option.c:2444 msgid "try --help" msgstr "" -#: option.c:2417 +#: option.c:2446 msgid "try -w" msgstr "" -#: option.c:2420 +#: option.c:2449 #, fuzzy, c-format msgid "bad command line options: %s" msgstr "opţiuni în linie de comandă invalide: %s." -#: option.c:2461 +#: option.c:2490 #, c-format msgid "cannot get host-name: %s" msgstr "nu pot citi numele maşinii: %s" -#: option.c:2489 +#: option.c:2518 msgid "only one resolv.conf file allowed in no-poll mode." msgstr "se permite un singur fişier resolv.conf în modul no-poll" -#: option.c:2499 +#: option.c:2528 msgid "must have exactly one resolv.conf to read domain from." msgstr "" "am nevoie de un singur resolv.conf din care să citesc numele domeniului." -#: option.c:2502 network.c:640 +#: option.c:2531 network.c:640 #, fuzzy, c-format msgid "failed to read %s: %s" msgstr "nu pot citi %s: %n" -#: option.c:2520 +#: option.c:2549 #, c-format msgid "no search directive found in %s" msgstr "nu s-a găsit nici un criteriu de căutare în %s" @@ -732,7 +740,7 @@ msgid "possible DNS-rebind attack detected" msgstr "" -#: isc.c:77 dnsmasq.c:747 +#: isc.c:77 dnsmasq.c:769 #, fuzzy, c-format msgid "failed to access %s: %s" msgstr "accesarea serverului %s a eşuat: %n" @@ -742,7 +750,7 @@ msgid "failed to load %s: %s" msgstr "nu pot încărca %s: %n" -#: isc.c:97 dnsmasq.c:769 +#: isc.c:97 dnsmasq.c:791 #, c-format msgid "reading %s" msgstr "citesc %s" @@ -762,7 +770,7 @@ msgid "unknown interface %s in bridge-interface" msgstr "interfaţă necunoscută %s" -#: network.c:389 dnsmasq.c:180 +#: network.c:389 dnsmasq.c:183 #, c-format msgid "failed to create listening socket: %s" msgstr "creearea socket-ului de ascultare a eşuat: %s" @@ -838,184 +846,189 @@ msgid "using nameserver %s#%d" msgstr "folosim serverul DNS %s#%d" -#: dnsmasq.c:110 +#: dnsmasq.c:113 msgid "" "ISC dhcpd integration not available: set HAVE_ISC_READER in src/config.h" msgstr "" "Integrarea cu ISC dhcpd nu este disponibilă:puneţi HAVE_ISC_HEADER în src/" "config.h" -#: dnsmasq.c:132 +#: dnsmasq.c:135 #, fuzzy msgid "TFTP server not available: set HAVE_TFTP in src/config.h" msgstr "DBus nu este disponibil: puneţi HAVE_DBUS in src/config.h" -#: dnsmasq.c:137 +#: dnsmasq.c:140 msgid "asychronous logging is not available under Solaris" msgstr "" -#: dnsmasq.c:151 +#: dnsmasq.c:154 msgid "must set exactly one interface on broken systems without IP_RECVIF" msgstr "" "trebuie specificată exact o singură interfaţă pe sistemele defectece nu au " "IP_RECVIF" -#: dnsmasq.c:161 +#: dnsmasq.c:164 #, c-format msgid "failed to find list of interfaces: %s" msgstr "enumerarea interfeţelor a eşuat: %s" -#: dnsmasq.c:169 +#: dnsmasq.c:172 #, c-format msgid "unknown interface %s" msgstr "interfaţă necunoscută %s" -#: dnsmasq.c:175 +#: dnsmasq.c:178 #, c-format msgid "no interface with address %s" msgstr "nu exista interfaţă pentru adresa %s" -#: dnsmasq.c:192 dnsmasq.c:561 +#: dnsmasq.c:195 dnsmasq.c:575 #, c-format msgid "DBus error: %s" msgstr "eroare DBus: %s" -#: dnsmasq.c:195 +#: dnsmasq.c:198 msgid "DBus not available: set HAVE_DBUS in src/config.h" msgstr "DBus nu este disponibil: puneţi HAVE_DBUS in src/config.h" -#: dnsmasq.c:204 +#: dnsmasq.c:207 #, fuzzy, c-format msgid "cannot create pipe: %s" msgstr "nu pot citi %s: %s" -#: dnsmasq.c:225 +#: dnsmasq.c:223 #, c-format -msgid "cannot fork into background: %s" +msgid "cannot chdir to filesystem root: %s" msgstr "" -#: dnsmasq.c:239 +#: dnsmasq.c:231 #, c-format -msgid "cannot chdir to filesystem root: %s" +msgid "cannot fork into background: %s" msgstr "" -#: dnsmasq.c:349 +#: dnsmasq.c:363 #, fuzzy, c-format msgid "started, version %s DNS disabled" msgstr "am pornit, versiunea %s memorie temporară dezactivată" -#: dnsmasq.c:351 +#: dnsmasq.c:365 #, c-format msgid "started, version %s cachesize %d" msgstr "am ponit, versiunea %s memorie temporară %d" -#: dnsmasq.c:353 +#: dnsmasq.c:367 #, c-format msgid "started, version %s cache disabled" msgstr "am pornit, versiunea %s memorie temporară dezactivată" -#: dnsmasq.c:355 +#: dnsmasq.c:369 #, c-format msgid "compile time options: %s" msgstr "compilat cu opţiunile: %s" -#: dnsmasq.c:361 +#: dnsmasq.c:375 msgid "DBus support enabled: connected to system bus" msgstr "suportul DBus activ: sunt conectat la magistrala sistem" -#: dnsmasq.c:363 +#: dnsmasq.c:377 msgid "DBus support enabled: bus connection pending" msgstr "suportul DBus activ: aştept conexiunea la magistrală" -#: dnsmasq.c:368 +#: dnsmasq.c:382 msgid "setting --bind-interfaces option because of OS limitations" msgstr "specific opţiunea --bind-interfaces din cauza limitărilor SO" -#: dnsmasq.c:373 +#: dnsmasq.c:387 #, c-format msgid "warning: interface %s does not currently exist" msgstr "atenţie: interfaţa %s nu există momentan" -#: dnsmasq.c:378 +#: dnsmasq.c:392 msgid "warning: ignoring resolv-file flag because no-resolv is set" msgstr "" -#: dnsmasq.c:381 +#: dnsmasq.c:395 #, fuzzy msgid "warning: no upstream servers configured" msgstr "configurăm serverele superioare prin Dbus" -#: dnsmasq.c:385 +#: dnsmasq.c:399 #, c-format msgid "asynchronous logging enabled, queue limit is %d messages" msgstr "" -#: dnsmasq.c:397 +#: dnsmasq.c:411 #, c-format msgid "DHCP, static leases only on %.0s%s, lease time %s" msgstr "DHCP, împrumuturi statice doar către %.0s%s, timpul reînoirii %s" -#: dnsmasq.c:398 +#: dnsmasq.c:412 #, c-format msgid "DHCP, IP range %s -- %s, lease time %s" msgstr "DHCP, domeniu IP %s -- %s, timpul reînoirii %s" -#: dnsmasq.c:412 +#: dnsmasq.c:426 msgid "root is " msgstr "" -#: dnsmasq.c:412 +#: dnsmasq.c:426 #, fuzzy msgid "enabled" msgstr "dezactivat" -#: dnsmasq.c:414 +#: dnsmasq.c:428 msgid "secure mode" msgstr "" -#: dnsmasq.c:440 +#: dnsmasq.c:454 #, c-format msgid "restricting maximum simultaneous TFTP transfers to %d" msgstr "" -#: dnsmasq.c:449 +#: dnsmasq.c:463 #, c-format msgid "warning: setting capabilities failed: %s" msgstr "" -#: dnsmasq.c:451 +#: dnsmasq.c:465 msgid "running as root" msgstr "rulez ca root" -#: dnsmasq.c:563 +#: dnsmasq.c:577 msgid "connected to system DBus" msgstr "magistrala sistem Dbus conectată" -#: dnsmasq.c:683 +#: dnsmasq.c:697 #, c-format msgid "child process killed by signal %d" msgstr "" -#: dnsmasq.c:687 +#: dnsmasq.c:701 #, c-format msgid "child process exited with status %d" msgstr "" -#: dnsmasq.c:691 +#: dnsmasq.c:705 #, fuzzy, c-format msgid "failed to execute %s: %s" msgstr "accesarea serverului %s a eşuat: %n" -#: dnsmasq.c:695 +#: dnsmasq.c:710 #, fuzzy, c-format msgid "failed to create helper: %s" msgstr "nu pot citi %s: %n" -#: dnsmasq.c:729 +#: dnsmasq.c:714 +#, c-format +msgid "cannot change to user %s for script execution%s%s" +msgstr "" + +#: dnsmasq.c:751 msgid "exiting on receipt of SIGTERM" msgstr "am primit SIGTERM, am terminat" -#: dnsmasq.c:780 +#: dnsmasq.c:802 #, fuzzy, c-format msgid "no servers found in %s, will retry" msgstr "nu s-a găsit nici un criteriu de căutare în %s" @@ -1119,152 +1132,152 @@ msgid "failed to write %s: %s (retry in %us)" msgstr "nu pot citi %s: %n" -#: rfc2131.c:303 +#: rfc2131.c:304 #, c-format msgid "no address range available for DHCP request %s %s" msgstr "nici un domeniu de adrese disponibil pentru cererea DHCP %s %s" -#: rfc2131.c:304 +#: rfc2131.c:305 msgid "with subnet selector" msgstr "cu selectorul de subreţea" -#: rfc2131.c:304 +#: rfc2131.c:305 msgid "via" msgstr "prin" -#: rfc2131.c:315 +#: rfc2131.c:316 #, c-format msgid "DHCP packet: transaction-id is %u" msgstr "" -#: rfc2131.c:320 +#: rfc2131.c:321 #, c-format msgid "Available DHCP subnet: %s/%s" msgstr "" -#: rfc2131.c:322 +#: rfc2131.c:323 #, c-format msgid "Available DHCP range: %s -- %s" msgstr "" -#: rfc2131.c:350 rfc2131.c:381 +#: rfc2131.c:351 rfc2131.c:382 msgid "disabled" msgstr "dezactivat" -#: rfc2131.c:393 rfc2131.c:873 +#: rfc2131.c:394 rfc2131.c:874 msgid "address in use" msgstr "adresa este folosită" -#: rfc2131.c:396 +#: rfc2131.c:397 msgid "no address configured" msgstr "adresă lipsă" -#: rfc2131.c:409 rfc2131.c:736 +#: rfc2131.c:410 rfc2131.c:737 msgid "no address available" msgstr "nici o adresă disponibilă" -#: rfc2131.c:418 rfc2131.c:883 +#: rfc2131.c:419 rfc2131.c:884 msgid "no leases left" msgstr "nu mai am de unde să împrumut" -#: rfc2131.c:421 rfc2131.c:847 +#: rfc2131.c:422 rfc2131.c:848 msgid "wrong network" msgstr "reţea greşită" -#: rfc2131.c:520 +#: rfc2131.c:521 #, c-format msgid "Ignoring domain %s for DHCP host name %s" msgstr "" -#: rfc2131.c:614 +#: rfc2131.c:615 #, c-format msgid "Vendor class: %s" msgstr "" -#: rfc2131.c:616 +#: rfc2131.c:617 #, c-format msgid "User class: %s" msgstr "" -#: rfc2131.c:657 +#: rfc2131.c:658 #, fuzzy, c-format msgid "disabling DHCP static address %s for %s" msgstr "dezactivăm adresele DHCP statice %s" -#: rfc2131.c:678 +#: rfc2131.c:679 msgid "unknown lease" msgstr "împrumut necunoscut" -#: rfc2131.c:687 rfc2131.c:992 +#: rfc2131.c:688 rfc2131.c:995 msgid "ignored" msgstr "ignorat" -#: rfc2131.c:707 +#: rfc2131.c:708 #, c-format msgid "not using configured address %s because it is leased to %s" msgstr "" -#: rfc2131.c:717 +#: rfc2131.c:718 #, c-format msgid "" "not using configured address %s because it is in use by the server or relay" msgstr "" -#: rfc2131.c:720 +#: rfc2131.c:721 #, c-format msgid "not using configured address %s because it was previously declined" msgstr "" -#: rfc2131.c:734 rfc2131.c:876 +#: rfc2131.c:735 rfc2131.c:877 msgid "no unique-id" msgstr "" -#: rfc2131.c:806 +#: rfc2131.c:807 msgid "wrong address" msgstr "adresă greşită" -#: rfc2131.c:823 +#: rfc2131.c:824 msgid "lease not found" msgstr "împrumutul nu a fost găsit" -#: rfc2131.c:855 +#: rfc2131.c:856 msgid "address not available" msgstr "adresă indisponibilă" -#: rfc2131.c:866 +#: rfc2131.c:867 msgid "static lease available" msgstr "împrumut static este disponibil" -#: rfc2131.c:870 +#: rfc2131.c:871 msgid "address reserved" msgstr "adresă rezervată" -#: rfc2131.c:1265 +#: rfc2131.c:1268 #, c-format msgid "tags: %s" msgstr "" -#: rfc2131.c:1352 +#: rfc2131.c:1355 #, fuzzy, c-format msgid "cannot send DHCP/BOOTP option %d: no space left in packet" msgstr "nu pot trimite opţiunea DHCP %d: nu mai este loc în pachet" -#: rfc2131.c:1507 +#: rfc2131.c:1525 #, fuzzy, c-format msgid "requested options: %s" msgstr "compilat cu opţiunile: %s" -#: rfc2131.c:1556 +#: rfc2131.c:1574 #, fuzzy, c-format msgid "next server: %s" msgstr "eroare DBus: %s" -#: rfc2131.c:1580 +#: rfc2131.c:1598 #, c-format msgid "bootfile name: %s" msgstr "" -#: rfc2131.c:1583 +#: rfc2131.c:1601 #, c-format msgid "server name: %s" msgstr "" @@ -1283,11 +1296,11 @@ msgid "attempt to set an IPv6 server address via DBus - no IPv6 support" msgstr "incerc să configurez un server IPv6 prin Dbus - nu este suport IPv6" -#: dbus.c:241 +#: dbus.c:243 msgid "setting upstream servers from DBus" msgstr "configurăm serverele superioare prin Dbus" -#: dbus.c:279 +#: dbus.c:281 msgid "could not register a DBus message handler" msgstr "nu pot activa o interfaţă de mesaje DBus" @@ -1301,31 +1314,31 @@ msgid "DHCP request for unsupported hardware type (%d) received on %s" msgstr "cerere DHCP pentru dispozitiv nesuportat (%d) recepţionată prin %s" -#: tftp.c:173 +#: tftp.c:175 msgid "unable to get free port for TFTP" msgstr "" -#: tftp.c:188 +#: tftp.c:190 #, c-format msgid "unsupported request from %s" msgstr "" -#: tftp.c:266 +#: tftp.c:271 #, c-format msgid "TFTP sent %s to %s" msgstr "" -#: tftp.c:289 +#: tftp.c:294 #, fuzzy, c-format msgid "file %s not found" msgstr "împrumutul nu a fost găsit" -#: tftp.c:399 +#: tftp.c:405 #, c-format msgid "TFTP error %d %s received from %s" msgstr "" -#: tftp.c:430 +#: tftp.c:436 #, fuzzy, c-format msgid "TFTP failed sending %s to %s" msgstr "nu pot citi %s: %n" diff -Nru /tmp/7MO8KY0fpf/dnsmasq-2.41/src/bpf.c /tmp/pRA3L6jhPD/dnsmasq-2.42/src/bpf.c --- dnsmasq-2.41/src/bpf.c 2008-02-12 21:36:39.000000000 +0100 +++ dnsmasq-2.42/src/bpf.c 2008-05-29 21:49:22.000000000 +0200 @@ -69,7 +69,7 @@ an aligned buffer to avoid nasty complaints about unaligned accesses. */ #ifdef HAVE_SOCKADDR_SA_LEN - len = ((struct ifreq *)ptr)->ifr_addr.sa_len + IF_NAMESIZE; + len = ((struct ifreq *)ptr)->ifr_addr.sa_len + offsetof(struct ifreq, ifr_ifru); #else len = sizeof(struct ifreq); #endif @@ -212,8 +212,8 @@ sum = (sum & 0xffff) + (sum >> 16); ip.ip_sum = (sum == 0xffff) ? sum : ~sum; - udp.uh_sport = htons(DHCP_SERVER_PORT); - udp.uh_dport = htons(DHCP_CLIENT_PORT); + udp.uh_sport = htons(daemon->dhcp_server_port); + udp.uh_dport = htons(daemon->dhcp_client_port); if (len & 1) ((char *)mess)[len] = 0; /* for checksum, in case length is odd. */ udp.uh_sum = 0; diff -Nru /tmp/7MO8KY0fpf/dnsmasq-2.41/src/cache.c /tmp/pRA3L6jhPD/dnsmasq-2.42/src/cache.c --- dnsmasq-2.41/src/cache.c 2008-02-12 21:36:39.000000000 +0100 +++ dnsmasq-2.42/src/cache.c 2008-05-29 21:49:22.000000000 +0200 @@ -359,6 +359,7 @@ struct crec *new; union bigname *big_name = NULL; int freed_all = flags & F_REVERSE; + int free_avail = 0; log_query(flags | F_UPSTREAM, name, addr, 0, NULL, 0); @@ -392,8 +393,24 @@ if (new->flags & (F_FORWARD | F_REVERSE)) { + /* If free_avail set, we believe that an entry has been freed. + Bugs have been known to make this not true, resulting in + a tight loop here. If that happens, log a warning and abandon the + insert. Once in this state, all inserts will probably fail. */ + + if (free_avail) + { + static int warned = 0; + + if (!warned) + my_syslog(LOG_ERR, "BUG in cache detected. Please mail simon@thekelleys.org.uk"); + warned = insert_error = 1; + return NULL; + } + if (freed_all) { + free_avail = 1; /* Must be free space now. */ cache_scan_free(cache_get_name(new), &new->addr.addr, now, new->flags); cache_live_freed++; } @@ -516,19 +533,22 @@ Make sure that re-ordering doesn't break the hash-chain order invariants. */ - if (!insert) - { - insert = up; - ins_flags = crecp->flags & (F_REVERSE | F_IMMORTAL); - up = &crecp->hash_next; - } - else if ((crecp->flags & (F_REVERSE | F_IMMORTAL)) == ins_flags) + if (insert && (crecp->flags & (F_REVERSE | F_IMMORTAL)) == ins_flags) { *up = crecp->hash_next; crecp->hash_next = *insert; *insert = crecp; insert = &crecp->hash_next; } + else + { + if (!insert) + { + insert = up; + ins_flags = crecp->flags & (F_REVERSE | F_IMMORTAL); + } + up = &crecp->hash_next; + } } else /* case : not expired, incorrect entry. */ diff -Nru /tmp/7MO8KY0fpf/dnsmasq-2.41/src/config.h /tmp/pRA3L6jhPD/dnsmasq-2.42/src/config.h --- dnsmasq-2.41/src/config.h 2008-02-12 21:36:39.000000000 +0100 +++ dnsmasq-2.42/src/config.h 2008-05-29 21:49:22.000000000 +0200 @@ -14,7 +14,7 @@ along with this program. If not, see . */ -#define VERSION "2.41" +#define VERSION "2.42" #define FTABSIZ 150 /* max number of outstanding requests (default) */ #define MAX_PROCS 20 /* max no children for TCP requests */ @@ -54,6 +54,8 @@ #define CHGRP "dip" #define DHCP_SERVER_PORT 67 #define DHCP_CLIENT_PORT 68 +#define DHCP_SERVER_ALTPORT 1067 +#define DHCP_CLIENT_ALTPORT 1068 #define TFTP_PORT 69 #define TFTP_MAX_CONNECTIONS 50 /* max simultaneous connections */ #define LOG_MAX 5 /* log-queue length */ @@ -85,13 +87,6 @@ #endif -/* Get linux C library versions. */ -#if defined(__linux__) && !defined(__UCLIBC__) && !defined(__uClinux__) -/*# include */ -# include -#endif - - /* Follows system specific switches. If you run on a new system, you may want to edit these. May replace this with Autoconf one day. @@ -153,6 +148,10 @@ define some methods to allow (re)configuration of the upstream DNS servers via DBus. +HAVE_BSD_BRIDGE + Define this to enable the --bridge-interface option, useful on some + BSD systems. + NOTES: For Linux you should define HAVE_LINUX_NETWORK @@ -188,7 +187,7 @@ # error HAVE_ISC_READER is not compatible with HAVE_BROKEN_RTC #endif -/* Allow TFTP to be disabled with COPT=-DNO_TFTP */ +/* Allow TFTP to be disabled with COPTS=-DNO_TFTP */ #ifdef NO_TFTP #undef HAVE_TFTP #endif @@ -249,7 +248,10 @@ # define HAVE_BROKEN_SOCKADDR_IN6 #endif -#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) +#elif defined(__FreeBSD__) || \ + defined(__OpenBSD__) || \ + defined(__DragonFly__) || \ + defined (__FreeBSD_kernel__) #define HAVE_BSD_NETWORK /* Later verions of FreeBSD have getopt_long() */ #if defined(optional_argument) && defined(required_argument) @@ -261,6 +263,7 @@ #define HAVE_RANDOM #define HAVE_DEV_URANDOM #define HAVE_SOCKADDR_SA_LEN +#define HAVE_BSD_BRIDGE #elif defined(__APPLE__) #define HAVE_BSD_NETWORK @@ -282,6 +285,7 @@ #define HAVE_DEV_URANDOM #define HAVE_DEV_RANDOM #define HAVE_SOCKADDR_SA_LEN +#define HAVE_BSD_BRIDGE #elif defined(__sun) || defined(__sun__) #define HAVE_SOLARIS_NETWORK diff -Nru /tmp/7MO8KY0fpf/dnsmasq-2.41/src/dbus.c /tmp/pRA3L6jhPD/dnsmasq-2.42/src/dbus.c --- dnsmasq-2.41/src/dbus.c 2008-02-12 21:36:39.000000000 +0100 +++ dnsmasq-2.42/src/dbus.c 2008-05-29 21:49:22.000000000 +0200 @@ -118,7 +118,7 @@ { memcpy(&addr.in6.sin6_addr, p, sizeof(struct in6_addr)); #ifdef HAVE_SOCKADDR_SA_LEN - source_addr.in6.sin6_len = addr.in6.sin6_len = sizeof(stuct sockaddr_in6); + source_addr.in6.sin6_len = addr.in6.sin6_len = sizeof(struct sockaddr_in6); #endif source_addr.in6.sin6_family = addr.in6.sin6_family = AF_INET6; addr.in6.sin6_port = htons(NAMESERVER_PORT); @@ -167,8 +167,11 @@ if (!serv && (serv = whine_malloc(sizeof (struct server)))) { /* Not found, create a new one. */ + memset(serv, 0, sizeof(struct server)); + if (domain) serv->domain = whine_malloc(strlen(domain)+1); + if (domain && !serv->domain) { free(serv); @@ -179,7 +182,6 @@ serv->next = daemon->servers; daemon->servers = serv; serv->flags = SERV_FROM_DBUS; - serv->sfd = NULL; if (domain) { strcpy(serv->domain, domain); diff -Nru /tmp/7MO8KY0fpf/dnsmasq-2.41/src/dhcp.c /tmp/pRA3L6jhPD/dnsmasq-2.42/src/dhcp.c --- dnsmasq-2.41/src/dhcp.c 2008-02-12 21:36:39.000000000 +0100 +++ dnsmasq-2.42/src/dhcp.c 2008-05-29 21:49:22.000000000 +0200 @@ -71,7 +71,7 @@ memset(&saddr, 0, sizeof(saddr)); saddr.sin_family = AF_INET; - saddr.sin_port = htons(DHCP_SERVER_PORT); + saddr.sin_port = htons(daemon->dhcp_server_port); saddr.sin_addr.s_addr = INADDR_ANY; #ifdef HAVE_SOCKADDR_SA_LEN saddr.sin_len = sizeof(struct sockaddr_in); @@ -264,7 +264,7 @@ if (mess->giaddr.s_addr) { /* Send to BOOTP relay */ - dest.sin_port = htons(DHCP_SERVER_PORT); + dest.sin_port = htons(daemon->dhcp_server_port); dest.sin_addr = mess->giaddr; } else if (mess->ciaddr.s_addr) @@ -276,7 +276,7 @@ if ((!is_inform && dest.sin_addr.s_addr != mess->ciaddr.s_addr) || dest.sin_port == 0 || dest.sin_addr.s_addr == 0) { - dest.sin_port = htons(DHCP_CLIENT_PORT); + dest.sin_port = htons(daemon->dhcp_client_port); dest.sin_addr = mess->ciaddr; } } @@ -296,7 +296,7 @@ cmptr->cmsg_level = SOL_IP; cmptr->cmsg_type = IP_PKTINFO; dest.sin_addr.s_addr = INADDR_BROADCAST; - dest.sin_port = htons(DHCP_CLIENT_PORT); + dest.sin_port = htons(daemon->dhcp_client_port); } else { @@ -304,7 +304,7 @@ struct sockaddr limits size to 14 bytes. */ struct arpreq req; dest.sin_addr = mess->yiaddr; - dest.sin_port = htons(DHCP_CLIENT_PORT); + dest.sin_port = htons(daemon->dhcp_client_port); *((struct sockaddr_in *)&req.arp_pa) = dest; req.arp_ha.sa_family = mess->htype; memcpy(req.arp_ha.sa_data, mess->chaddr, mess->hlen); @@ -317,7 +317,7 @@ { /* broadcast to 255.255.255.255 (or mac address invalid) */ dest.sin_addr.s_addr = INADDR_BROADCAST; - dest.sin_port = htons(DHCP_CLIENT_PORT); + dest.sin_port = htons(daemon->dhcp_client_port); /* note that we don't specify the interface here: that's done by the IP_XMIT_IF sockopt lower down. */ } @@ -329,7 +329,7 @@ mysteriously. Bah. Fall back to broadcast for other net types. */ struct arpreq req; dest.sin_addr = mess->yiaddr; - dest.sin_port = htons(DHCP_CLIENT_PORT); + dest.sin_port = htons(daemon->dhcp_client_port); *((struct sockaddr_in *)&req.arp_pa) = dest; req.arp_ha.sa_family = AF_UNSPEC; memcpy(req.arp_ha.sa_data, mess->chaddr, mess->hlen); diff -Nru /tmp/7MO8KY0fpf/dnsmasq-2.41/src/dnsmasq.c /tmp/pRA3L6jhPD/dnsmasq-2.42/src/dnsmasq.c --- dnsmasq-2.41/src/dnsmasq.c 2008-02-12 21:36:39.000000000 +0100 +++ dnsmasq-2.42/src/dnsmasq.c 2008-05-29 21:49:22.000000000 +0200 @@ -33,6 +33,9 @@ #ifdef NO_FORK "no-MMU " #endif +#ifdef HAVE_BSD_BRIDGE +"BSD-bridge " +#endif #ifndef HAVE_ISC_READER "no-" #endif @@ -216,6 +219,9 @@ /* The following code "daemonizes" the process. See Stevens section 12.4 */ + if (chdir("/") != 0) + die(_("cannot chdir to filesystem root: %s"), NULL, EC_MISC); + #ifndef NO_FORK if (!(daemon->options & OPT_NO_FORK)) { @@ -223,7 +229,9 @@ if ((pid = fork()) == -1 ) die(_("cannot fork into background: %s"), NULL, EC_MISC); - + + /* NO calls to die() from here on. */ + if (pid != 0) _exit(EC_GOOD); @@ -234,10 +242,7 @@ _exit(0); } #endif - - if (chdir("/") != 0) - die(_("cannot chdir to filesystem root: %s"), NULL, EC_MISC); - + /* write pidfile _after_ forking ! */ if (daemon->runfile && (pidfile = fopen(daemon->runfile, "w"))) { @@ -259,8 +264,6 @@ #endif ent_pw = daemon->username ? getpwnam(daemon->username) : NULL; - - /* before here, we should only call die(), after here, only call syslog() */ log_start(ent_pw); if (!(daemon->options & OPT_DEBUG)) @@ -287,9 +290,20 @@ /* On linux, we keep CAP_NETADMIN (for ARP-injection) and CAP_NET_RAW (for icmp) if we're doing dhcp */ cap_user_header_t hdr = safe_malloc(sizeof(*hdr)); - cap_user_data_t data = safe_malloc(sizeof(*data)); - hdr->version = _LINUX_CAPABILITY_VERSION; + cap_user_data_t data; + int capsize = 1; /* for header version 1 */ + hdr->version = 0; + /* find version supported by kernel */ + capget(hdr, NULL); + if (hdr->version != LINUX_CAPABILITY_VERSION_1) + { + /* if not version 1, use version 2 */ + hdr->version = LINUX_CAPABILITY_VERSION_2; + capsize = 2; + } hdr->pid = 0; /* this process */ + data = safe_malloc(sizeof(*data) * capsize); + memset(hdr, sizeof(*data) * capsize, 0); data->effective = data->permitted = data->inheritable = (1 << CAP_NET_ADMIN) | (1 << CAP_NET_RAW) | (1 << CAP_SETGID) | (1 << CAP_SETUID); @@ -688,13 +702,21 @@ break; case EVENT_EXEC_ERR: - my_syslog(LOG_ERR, _("failed to execute %s: %s"), daemon->lease_change_command, strerror(ev.data)); + my_syslog(LOG_ERR, _("failed to execute %s: %s"), + daemon->lease_change_command, strerror(ev.data)); break; case EVENT_PIPE_ERR: my_syslog(LOG_ERR, _("failed to create helper: %s"), strerror(ev.data)); break; + case EVENT_USER_ERR: + my_syslog(LOG_ERR, _("cannot change to user %s for script execution%s%s"), + daemon->scriptuser, + ev.data != 0 ? ": " : "", + ev.data != 0 ? strerror(ev.data) : ""); + break; + case EVENT_REOPEN: /* Note: this may leave TCP-handling processes with the old file still open. Since any such process will die in CHILD_LIFETIME or probably much sooner, diff -Nru /tmp/7MO8KY0fpf/dnsmasq-2.41/src/dnsmasq.h /tmp/pRA3L6jhPD/dnsmasq-2.42/src/dnsmasq.h --- dnsmasq-2.41/src/dnsmasq.h 2008-02-12 21:36:39.000000000 +0100 +++ dnsmasq-2.42/src/dnsmasq.h 2008-05-29 21:49:22.000000000 +0200 @@ -16,6 +16,16 @@ #define COPYRIGHT "Copyright (C) 2000-2008 Simon Kelley" +/* Ensure we can use files >2GB (log files may grow this big) */ +#define _LARGEFILE_SOURCE 1 +#define _FILE_OFFSET_BITS 64 + +/* Get linux C library versions. */ +#ifdef __linux__ +# define _GNU_SOURCE +# include +#endif + /* get these before config.h for IPv6 stuff... */ #include #include @@ -60,6 +70,7 @@ #include #include #include +#include #include #include #include @@ -84,8 +95,12 @@ #if defined(HAVE_LINUX_NETWORK) #include /* There doesn't seem to be a universally-available - userpace header for this. */ + userpace header for these. */ extern int capset(cap_user_header_t header, cap_user_data_t data); +extern int capget(cap_user_header_t header, cap_user_data_t data); +#define LINUX_CAPABILITY_VERSION_1 0x19980330 +#define LINUX_CAPABILITY_VERSION_2 0x20071026 + #include #elif defined(HAVE_SOLARIS_PRIVS) #include @@ -109,6 +124,7 @@ #define EVENT_KILLED 8 #define EVENT_EXEC_ERR 9 #define EVENT_PIPE_ERR 10 +#define EVENT_USER_ERR 11 /* Exit codes. */ #define EC_GOOD 0 @@ -455,7 +471,7 @@ struct dhcp_mac *next; }; -#if defined(__FreeBSD__) || defined(__DragonFly__) +#ifdef HAVE_BSD_BRIDGE struct dhcp_bridge { char iface[IF_NAMESIZE]; struct dhcp_bridge *alias, *next; @@ -509,9 +525,10 @@ int sockfd; time_t timeout; int backoff; - unsigned int block, blocksize; + unsigned int block, blocksize, expansion; + off_t offset; struct sockaddr_in peer; - char opt_blocksize, opt_transize; + char opt_blocksize, opt_transize, netascii, carrylf; struct tftp_file *file; struct tftp_transfer *next; }; @@ -529,7 +546,7 @@ struct interface_name *int_names; char *mxtarget; char *lease_file; - char *username, *groupname; + char *username, *groupname, *scriptuser; char *domain_suffix; char *runfile; char *lease_change_command; @@ -552,6 +569,7 @@ struct dhcp_netid_list *dhcp_ignore, *dhcp_ignore_names, *force_broadcast; char *dhcp_hosts_file, *dhcp_opts_file; int dhcp_max, tftp_max; + int dhcp_server_port, dhcp_client_port; int start_tftp_port, end_tftp_port; unsigned int min_leasetime; struct doctor *doctors; @@ -582,7 +600,7 @@ char *dhcp_buff, *dhcp_buff2; struct ping_result *ping_results; FILE *lease_stream; -#if defined(__FreeBSD__) || defined(__DragonFly__) +#ifdef HAVE_BSD_BRIDGE struct dhcp_bridge *bridges; #endif diff -Nru /tmp/7MO8KY0fpf/dnsmasq-2.41/src/helper.c /tmp/pRA3L6jhPD/dnsmasq-2.42/src/helper.c --- dnsmasq-2.41/src/helper.c 2008-02-12 21:36:39.000000000 +0100 +++ dnsmasq-2.42/src/helper.c 2008-05-29 21:49:22.000000000 +0200 @@ -55,10 +55,18 @@ pid_t pid; int i, pipefd[2]; struct sigaction sigact; + struct passwd *ent_pw = NULL; if (!daemon->dhcp || !daemon->lease_change_command) return -1; + if (daemon->scriptuser && !(ent_pw = getpwnam(daemon->scriptuser))) + { + /* too late to die() */ + send_event(event_fd, EVENT_USER_ERR, 0); + return -1; + } + /* create the pipe through which the main program sends us commands, then fork our process. By now it's too late to die(), we just log any failure via the main process. */ @@ -173,6 +181,20 @@ continue; } + /* Change ownership of child, if this fails, log and ditch, + rather than running wrong user */ + if (ent_pw) + { + gid_t dummy; + if (setgroups(0, &dummy) == -1 || + setgid(ent_pw->pw_gid) == -1 || + setuid(ent_pw->pw_uid) == -1) + { + send_event(event_fd, EVENT_USER_ERR, errno); + _exit(0); + } + } + if (data.clid_len != 0) my_setenv("DNSMASQ_CLIENT_ID", daemon->packet, &err); diff -Nru /tmp/7MO8KY0fpf/dnsmasq-2.41/src/network.c /tmp/pRA3L6jhPD/dnsmasq-2.42/src/network.c --- dnsmasq-2.41/src/network.c 2008-02-12 21:36:39.000000000 +0100 +++ dnsmasq-2.42/src/network.c 2008-05-29 21:49:22.000000000 +0200 @@ -27,8 +27,8 @@ if (indexp) { -#if defined(__FreeBSD__) || defined(__DragonFly__) - /* One form of bridging on FreeBSD has the property that packets +#ifdef HAVE_BSD_BRIDGE + /* One form of bridging on BSD has the property that packets can be recieved on bridge interfaces which do not have an IP address. We allow these to be treated as aliases of another interface which does have an IP address with --dhcp-bridge=interface,alias,alias */ diff -Nru /tmp/7MO8KY0fpf/dnsmasq-2.41/src/option.c /tmp/pRA3L6jhPD/dnsmasq-2.42/src/option.c --- dnsmasq-2.41/src/option.c 2008-02-12 21:36:39.000000000 +0100 +++ dnsmasq-2.42/src/option.c 2008-05-29 21:49:22.000000000 +0200 @@ -91,6 +91,8 @@ #define LOPT_MATCH 281 #define LOPT_BROADCAST 282 #define LOPT_NEGTTL 283 +#define LOPT_ALTPORT 284 +#define LOPT_SCRIPTUSR 285 #ifdef HAVE_GETOPT_LONG static const struct option opts[] = @@ -171,7 +173,7 @@ {"tftp-root", 1, 0, LOPT_PREFIX }, {"tftp-max", 1, 0, LOPT_TFTP_MAX }, {"ptr-record", 1, 0, LOPT_PTR }, -#if defined(__FreeBSD__) || defined(__DragonFly__) +#ifdef HAVE_BSD_BRIDGE {"bridge-interface", 1, 0 , LOPT_BRIDGE }, #endif {"dhcp-option-force", 1, 0, LOPT_FORCE }, @@ -191,6 +193,8 @@ {"dhcp-match", 1, 0, LOPT_MATCH }, {"dhcp-broadcast", 1, 0, LOPT_BROADCAST }, {"neg-ttl", 1, 0, LOPT_NEGTTL }, + {"dhcp-alternate-port", 2, 0, LOPT_ALTPORT }, + {"dhcp-scriptuser", 1, 0, LOPT_SCRIPTUSR }, { NULL, 0, 0, 0 } }; @@ -308,7 +312,7 @@ { "-2, --no-dhcp-interface=interface", gettext_noop("Do not provide DHCP on this interface, only provide DNS."), NULL }, { "-3, --bootp-dynamic", gettext_noop("Enable dynamic address allocation for bootp."), NULL }, { "-4, --dhcp-mac=,", gettext_noop("Map MAC address (with wildcards) to option set."), NULL }, -#if defined(__FreeBSD__) || defined(__DragonFly__) +#ifdef HAVE_BSD_BRIDGE { " --bridge-interface=iface,alias,..", gettext_noop("Treat DHCP requests on aliases as arriving from interface."), NULL }, #endif { "-5, --no-ping", gettext_noop("Disable ICMP echo address checking in the DHCP server."), NULL }, @@ -332,6 +336,8 @@ { " --stop-dns-rebind", gettext_noop("Stop DNS rebinding. Filter private IP ranges when resolving."), NULL }, { " --all-servers", gettext_noop("Always perform DNS queries to all servers."), NULL }, { " --dhcp-match=,", gettext_noop("Set tag if client includes option in request."), NULL }, + { " --dhcp-alternate-port[=]", gettext_noop("Use alternative ports for DHCP."), NULL }, + { " --dhcp-scriptuser=", gettext_noop("Run lease-change script as this user."), NULL }, { NULL, NULL, NULL } }; @@ -396,8 +402,8 @@ { "client-id", 61,OT_INTERNAL }, { "nis-domain", 64, 0 }, { "nis-server", 65, OT_ADDR_LIST }, - { "tftp-server", 66, OT_INTERNAL }, - { "bootfile-name", 67, OT_INTERNAL }, + { "tftp-server", 66, 0 }, + { "bootfile-name", 67, 0 }, { "mobile-ip-home", 68, OT_ADDR_LIST }, { "smtp-server", 69, OT_ADDR_LIST }, { "pop3-server", 70, OT_ADDR_LIST }, @@ -1108,6 +1114,10 @@ case 'g': /* --group */ daemon->groupname = opt_string_alloc(arg); break; + + case LOPT_SCRIPTUSR: /* --scriptuser */ + daemon->scriptuser = opt_string_alloc(arg); + break; case 'i': /* --interface */ do { @@ -1435,7 +1445,7 @@ break; -#if defined(__FreeBSD__) || defined(__DragonFly__) +#ifdef HAVE_BSD_BRIDGE case LOPT_BRIDGE: /* --bridge-interface */ { struct dhcp_bridge *new = opt_malloc(sizeof(struct dhcp_bridge)); @@ -1876,6 +1886,23 @@ break; } + case LOPT_ALTPORT: /* --dhcp-alternate-port */ + if (!arg) + { + daemon->dhcp_server_port = DHCP_SERVER_ALTPORT; + daemon->dhcp_client_port = DHCP_CLIENT_ALTPORT; + } + else + { + comma = split(arg); + if (!atoi_check(arg, &daemon->dhcp_server_port) || + (comma && !atoi_check(comma, &daemon->dhcp_client_port))) + problem = _("invalid port number"); + if (!comma) + daemon->dhcp_client_port = daemon->dhcp_server_port+1; + } + break; + case 'J': /* --dhcp-ignore */ case LOPT_NO_NAMES: /* --dhcp-ignore-names */ case LOPT_BROADCAST: /* --dhcp-broadcast */ @@ -2351,6 +2378,8 @@ daemon->cachesize = CACHESIZ; daemon->ftabsize = FTABSIZ; daemon->port = NAMESERVER_PORT; + daemon->dhcp_client_port = DHCP_CLIENT_PORT; + daemon->dhcp_server_port = DHCP_SERVER_PORT; daemon->default_resolv.is_default = 1; daemon->default_resolv.name = RESOLVFILE; daemon->resolv_files = &daemon->default_resolv; diff -Nru /tmp/7MO8KY0fpf/dnsmasq-2.41/src/rfc1035.c /tmp/pRA3L6jhPD/dnsmasq-2.42/src/rfc1035.c --- dnsmasq-2.41/src/rfc1035.c 2008-02-12 21:36:39.000000000 +0100 +++ dnsmasq-2.42/src/rfc1035.c 2008-05-29 21:49:22.000000000 +0200 @@ -227,7 +227,7 @@ if (*name == '\\' && *(name+1) == '[' && (*(name+2) == 'x' || *(name+2) == 'X')) { - for (j = 0, cp1 = name+3; *cp1 && isxdigit(*cp1) && j < 32; cp1++, j++) + for (j = 0, cp1 = name+3; *cp1 && isxdigit((int) *cp1) && j < 32; cp1++, j++) { char xdig[2]; xdig[0] = *cp1; diff -Nru /tmp/7MO8KY0fpf/dnsmasq-2.41/src/rfc2131.c /tmp/pRA3L6jhPD/dnsmasq-2.42/src/rfc2131.c --- dnsmasq-2.41/src/rfc2131.c 2008-02-12 21:36:39.000000000 +0100 +++ dnsmasq-2.42/src/rfc2131.c 2008-05-29 21:49:22.000000000 +0200 @@ -82,7 +82,8 @@ static unsigned char *option_find(struct dhcp_packet *mess, size_t size, int opt_type, int minsize); static unsigned char *option_find1(unsigned char *p, unsigned char *end, int opt, int minsize); static size_t dhcp_packet_size(struct dhcp_packet *mess, struct dhcp_netid *netid); -static void clear_packet(struct dhcp_packet *mess, unsigned char *end); +static void clear_packet(struct dhcp_packet *mess, unsigned char *end, unsigned char *agent_id); +static void restore_agent_id(unsigned char *agent_id, struct dhcp_packet *mess, unsigned char *real_end); static void do_options(struct dhcp_context *context, struct dhcp_packet *mess, unsigned char *real_end, @@ -436,7 +437,7 @@ lease_set_expires(lease, 0xffffffff, now); /* infinite lease */ lease_set_interface(lease, int_index); - clear_packet(mess, end); + clear_packet(mess, end, NULL); do_options(context, mess, end, NULL, hostname, netid, subnet_addr, 0, 0, NULL); } @@ -750,7 +751,7 @@ } time = calc_time(context, config, option_find(mess, sz, OPTION_LEASE_TIME, 4)); - clear_packet(mess, end); + clear_packet(mess, end, agent_id); option_put(mess, end, OPTION_MESSAGE_TYPE, 1, DHCPOFFER); option_put(mess, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, ntohl(context->local.s_addr)); option_put(mess, end, OPTION_LEASE_TIME, 4, time); @@ -889,11 +890,13 @@ log_packet("NAK", &mess->yiaddr, emac, emac_len, iface_name, message); mess->yiaddr.s_addr = 0; - clear_packet(mess, end); + clear_packet(mess, end, agent_id); option_put(mess, end, OPTION_MESSAGE_TYPE, 1, DHCPNAK); option_put(mess, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, ntohl(context ? context->local.s_addr : fallback.s_addr)); option_put_string(mess, end, OPTION_MESSAGE, message, borken_opt); + /* DHCPNAK gets agent-id too */ + restore_agent_id(agent_id, mess, end); /* This fixes a problem with the DHCP spec, broadcasting a NAK to a host on a distant subnet which unicast a REQ to us won't work. */ if (!unicast_dest || mess->giaddr.s_addr != 0 || @@ -970,7 +973,7 @@ log_packet("ACK", &mess->yiaddr, emac, emac_len, iface_name, hostname); - clear_packet(mess, end); + clear_packet(mess, end, agent_id); option_put(mess, end, OPTION_MESSAGE_TYPE, 1, DHCPACK); option_put(mess, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, ntohl(context->local.s_addr)); option_put(mess, end, OPTION_LEASE_TIME, 4, time); @@ -1015,7 +1018,7 @@ netid = &context->netid; } - clear_packet(mess, end); + clear_packet(mess, end, agent_id); option_put(mess, end, OPTION_MESSAGE_TYPE, 1, DHCPACK); option_put(mess, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, ntohl(context->local.s_addr)); @@ -1462,14 +1465,29 @@ } } -static void clear_packet(struct dhcp_packet *mess, unsigned char *end) +static void clear_packet(struct dhcp_packet *mess, unsigned char *end, unsigned char *agent_id) { + /* don't clear agent_id */ + if (agent_id) + end = agent_id; + memset(mess->sname, 0, sizeof(mess->sname)); memset(mess->file, 0, sizeof(mess->file)); memset(&mess->options[0] + sizeof(u32), 0, end - (&mess->options[0] + sizeof(u32))); mess->siaddr.s_addr = 0; } +static void restore_agent_id(unsigned char *agent_id, struct dhcp_packet *mess, unsigned char *real_end) +{ + if (agent_id) + { + unsigned char *p = dhcp_skip_opts(&mess->options[0] + sizeof(u32)); + memmove(p, agent_id, real_end - agent_id); + p += real_end - agent_id; + memset(p, 0, real_end - p); /* in case of overlap */ + } +} + static void do_options(struct dhcp_context *context, struct dhcp_packet *mess, unsigned char *real_end, @@ -1784,13 +1802,7 @@ } /* move agent_id back down to the end of the packet */ - if (agent_id) - { - p = dhcp_skip_opts(&mess->options[0] + sizeof(u32)); - memmove(p, agent_id, real_end - agent_id); - p += real_end - agent_id; - memset(p, 0, real_end - p); /* in case of overlap */ - } + restore_agent_id(agent_id, mess, real_end); /* restore BOOTP anti-overload hack */ if (!req_options || (daemon->options & OPT_NO_OVERRIDE)) diff -Nru /tmp/7MO8KY0fpf/dnsmasq-2.41/src/tftp.c /tmp/pRA3L6jhPD/dnsmasq-2.42/src/tftp.c --- dnsmasq-2.41/src/tftp.c 2008-02-12 21:36:39.000000000 +0100 +++ dnsmasq-2.42/src/tftp.c 2008-05-29 21:49:22.000000000 +0200 @@ -151,8 +151,10 @@ transfer->backoff = 1; transfer->block = 1; transfer->blocksize = 512; + transfer->offset = 0; transfer->file = NULL; transfer->opt_blocksize = transfer->opt_transize = 0; + transfer->netascii = transfer->carrylf = 0; /* if we have a nailed-down range, iterate until we find a free one. */ while (1) @@ -184,10 +186,13 @@ if (ntohs(*((unsigned short *)packet)) != OP_RRQ || !(filename = next(&p, end)) || !(mode = next(&p, end)) || - strcasecmp(mode, "octet") != 0) + (strcasecmp(mode, "octet") != 0 && strcasecmp(mode, "netascii") != 0)) len = tftp_err(ERR_ILL, packet, _("unsupported request from %s"), inet_ntoa(peer.sin_addr)); else { + if (strcasecmp(mode, "netascii") == 0) + transfer->netascii = 1; + while ((opt = next(&p, end))) { if (strcasecmp(opt, "blksize") == 0 && @@ -203,7 +208,7 @@ transfer->block = 0; } - if (strcasecmp(opt, "tsize") == 0 && next(&p, end)) + if (strcasecmp(opt, "tsize") == 0 && next(&p, end) && !transfer->netascii) { transfer->opt_transize = 1; transfer->block = 0; @@ -378,7 +383,8 @@ /* Got ack, ensure we take the (re)transmit path */ transfer->timeout = now; transfer->backoff = 0; - transfer->block++; + if (transfer->block++ != 0) + transfer->offset += transfer->blocksize - transfer->expansion; } else if (ntohs(mess->op) == OP_ERR) { @@ -532,24 +538,52 @@ unsigned char data[]; } *mess = (struct datamess *)packet; - off_t offset = transfer->blocksize * (transfer->block - 1); - size_t size = transfer->file->size - offset; + size_t size = transfer->file->size - transfer->offset; - if (offset > transfer->file->size) + if (transfer->offset > transfer->file->size) return 0; /* finished */ if (size > transfer->blocksize) size = transfer->blocksize; - lseek(transfer->file->fd, offset, SEEK_SET); - mess->op = htons(OP_DATA); mess->block = htons((unsigned short)(transfer->block)); - if (!read_write(transfer->file->fd, mess->data, size, 1)) + if (lseek(transfer->file->fd, transfer->offset, SEEK_SET) == (off_t)-1 || + !read_write(transfer->file->fd, mess->data, size, 1)) return -1; - else - return size + 4; + + transfer->expansion = 0; + + /* Map '\n' to CR-LF in netascii mode */ + if (transfer->netascii) + { + size_t i; + int newcarrylf; + + for (i = 0, newcarrylf = 0; i < size; i++) + if (mess->data[i] == '\n' && ( i != 0 || !transfer->carrylf)) + { + if (size == transfer->blocksize) + { + transfer->expansion++; + if (i == size - 1) + newcarrylf = 1; /* don't expand LF again if it moves to the next block */ + } + else + size++; /* room in this block */ + + /* make space and insert CR */ + memmove(&mess->data[i+1], &mess->data[i], size - (i + 1)); + mess->data[i] = '\r'; + + i++; + } + transfer->carrylf = newcarrylf; + + } + + return size + 4; } }