diff options
| -rw-r--r-- | CHANGELOG | 31 | ||||
| -rw-r--r-- | dnsmasq.conf.example | 17 | ||||
| -rw-r--r-- | man/dnsmasq.8 | 19 | ||||
| -rw-r--r-- | po/de.po | 321 | ||||
| -rw-r--r-- | po/es.po | 326 | ||||
| -rw-r--r-- | po/fi.po | 321 | ||||
| -rw-r--r-- | po/fr.po | 328 | ||||
| -rw-r--r-- | po/id.po | 322 | ||||
| -rw-r--r-- | po/it.po | 321 | ||||
| -rw-r--r-- | po/no.po | 326 | ||||
| -rw-r--r-- | po/pl.po | 322 | ||||
| -rw-r--r-- | po/pt_BR.po | 321 | ||||
| -rw-r--r-- | po/ro.po | 326 | ||||
| -rw-r--r-- | src/cache.c | 37 | ||||
| -rw-r--r-- | src/config.h | 5 | ||||
| -rw-r--r-- | src/dnsmasq.h | 7 | ||||
| -rw-r--r-- | src/forward.c | 4 | ||||
| -rw-r--r-- | src/option.c | 45 | ||||
| -rw-r--r-- | src/rfc2131.c | 212 | ||||
| -rw-r--r-- | src/tftp.c | 3 |
20 files changed, 1889 insertions, 1725 deletions
@@ -2119,7 +2119,36 @@ version 2.37 Added a LIMITS section to the man-page, with guidance on maximum numbers of clients, file sizes and tuning. +release 2.38 + Fix compilation on *BSD. Thanks to Tom Hensel. + Don't send length zero DHCP option 43 and cope with + encapsulated options whose total length exceeds 255 octets + by splitting them into multiple option 43 pieces. - + Avoid queries being retried forever when --strict-order is + set and an upstream server returns a SERVFAIL + error. Thanks to Johannes Stezenbach for spotting this. + + Fix BOOTP support, broken in version 2.37. + + Add example dhcp-options for Etherboot. + + Add \e (for ASCII ESCape) to the set of valid escapes + in config-file strings. + + Added --dhcp-option-force flag and examples in the + configuration file which use this to control PXELinux. + Added --tftp-no-blocksize option. + + Set netid tag "bootp" when BOOTP (rather than DHCP) is in + use. This makes it easy to customise which options are + sent to BOOTP clients. (BOOTP allows only 64 octets for + options, so it can be necessary to trim things.) + + Fix rare hang in cache code, a 2.37 regression. This + probably needs an infinite DHCP lease and some bad luck to + trigger. Thanks to Detlef Reichelt for bug reports and testing. + + diff --git a/dnsmasq.conf.example b/dnsmasq.conf.example index 210e14e..d0104d0 100644 --- a/dnsmasq.conf.example +++ b/dnsmasq.conf.example @@ -276,6 +276,23 @@ # http://technet2.microsoft.com/WindowsServer/en/library/a70f1bb7-d2d4-49f0-96d6-4b7414ecfaae1033.mspx?mfr=true #dhcp-option=vendor:MSFT,2,1i +# Send the Encapsulated-vendor-class ID needed by some configurations of +# Etherboot to allow is to recognise the DHCP server. +#dhcp-option=vendor:Etherboot,60,"Etherboot" + +# Send options to PXELinux. Note that we need to send the options even +# though they don't appear in the parameter request list, so we need +# to use dhcp-option-force here. +# See http://syslinux.zytor.com/pxe.php#special for details. +# Magic number - needed before anything else is recognised +#dhcp-option-force=208,f1:00:74:7e +# Configuration file name +#dhcp-option-force=209,configs/common +# Path prefix +#dhcp-option-force=210,/tftpboot/pxelinux/files/ +# Reboot time. (Note 'i' to send 32-bit value) +#dhcp-option-force=211,30i + # Set the boot filename for BOOTP. You will only need # this is you want to boot machines over the network and you will need # a TFTP server; either dnsmasq's built in TFTP server or an diff --git a/man/dnsmasq.8 b/man/dnsmasq.8 index 9245cdb..4b59f5d 100644 --- a/man/dnsmasq.8 +++ b/man/dnsmasq.8 @@ -484,13 +484,23 @@ Encapsulated Vendor-class options may also be specified using sends the encapsulated vendor class-specific option "mftp-address=0.0.0.0" to any client whose vendor-class matches "PXEClient". The vendor-class matching is -substring based (see --dhcp-vendorclass for details) and it is +substring based (see --dhcp-vendorclass for details). If a +vendor-class option (number 60) is sent by dnsmasq, then that is used +for selecting encapsulated options in preference to any sent by the +client. It is possible to omit the vendorclass completely; .B --dhcp-option=vendor:,1,0.0.0.0 in which case the encapsulated option is always sent. The address 0.0.0.0 is not treated specially in encapsulated vendor class options. .TP +.B --dhcp-option-force=[<network-id>,[<network-id>,]][vendor:[<vendor-class>],]<opt>,[<value>[,<value>]] +This works in exactly the same way as +.B --dhcp-otion +except that the option will always be sent, even of the client does +not ask for it in the parameter request list. This is sometimes +needed, for example when sending options to PXELinux. +.TP .B \-U, --dhcp-vendorclass=<network-id>,<vendor-class> Map from a vendor-class string to a network id. Most DHCP clients provide a "vendor class" which represents, in some sense, the type of host. This option @@ -686,6 +696,11 @@ file descriptor per unique file (plus a few others). So serving the same file simultaneously to n clients will use require about n + 10 file descriptors, serving different files simultaneously to n clients will require about (2*n) + 10 descriptors. +.TP +.B --tftp-no-blocksize +Stop the TFTP server from negotiating the "blocksize" option with a +client. Some buggy clients request this option but then behave badly +when it is granted. .TP .B \-C, --conf-file=<file> Specify a different configuration file. The conf-file option is also allowed in @@ -835,7 +850,7 @@ on a particular network. (Setting --bootp-dynamic removes the need for static address mappings.) The filename parameter in a BOOTP request is matched against netids in .B dhcp-option -configurations, allowing some control over the options returned to +configurations, as is the tag "bootp", allowing some control over the options returned to different classes of hosts. .SH LIMITS @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: dnsmasq 2.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-05 14:27+0000\n" +"POT-Creation-Date: 2007-02-12 17:55+0000\n" "PO-Revision-Date: 2005-09-27 09:37+0100\n" "Last-Translator: Simon Kelley <simon@thekelleys.org.uk>\n" "Language-Team: German <de@li.org>\n" @@ -15,37 +15,37 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: cache.c:697 +#: cache.c:694 #, c-format msgid "failed to load names from %s: %m" msgstr "" -#: cache.c:731 dhcp.c:715 +#: cache.c:728 dhcp.c:715 #, c-format msgid "bad address at %s line %d" msgstr "" # @Simon: Here I need an example to understand it :) -#: cache.c:777 dhcp.c:729 +#: cache.c:774 dhcp.c:729 #, c-format msgid "bad name at %s line %d" msgstr "" # @Simon: Here I need an example to understand it :) -#: cache.c:784 dhcp.c:783 +#: cache.c:781 dhcp.c:783 #, 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:822 +#: cache.c:819 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:875 +#: cache.c:866 #, c-format msgid "" "not giving name %s to the DHCP lease of %s because the name exists in %s " @@ -56,7 +56,7 @@ 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:919 +#: cache.c:906 #, fuzzy, c-format msgid "" "time %lu, cache size %d, %d/%d cache insertions re-used unexpired cache " @@ -70,7 +70,7 @@ msgstr "" # @Simon: I would prefer to use "noch gültige" = "still valid", would that fit to the sense? Then it would be: # @Simon: msgstr "Cache Größe %d, %d/%d Cache-Einfügungen verwendeten noch gültige Cache-Einträge wieder." # @Simon: btw, what is the "%d/%d"-part? -#: util.c:154 option.c:582 +#: util.c:154 option.c:589 msgid "could not get memory" msgstr "Speicher nicht verfügbar" @@ -97,26 +97,26 @@ msgstr "Start gescheitert" msgid "infinite" msgstr "unendlich" -#: option.c:164 +#: option.c:169 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:165 +#: option.c:170 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:166 +#: option.c:171 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:167 +#: option.c:172 msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)." msgstr "Behandle IP-Adr als NXDOMAIN (wehrt Verisign-Platzhalter ab)." @@ -127,17 +127,17 @@ msgstr "Behandle IP-Adr als NXDOMAIN (wehrt Verisign-Platzhalter ab)." # @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:168 +#: option.c:173 #, 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:169 +#: option.c:174 #, c-format msgid "Specify configuration file (defaults to %s)." msgstr "Angabe der Konfigurationsdatei (Voreinstellung: %s)." -#: option.c:170 +#: option.c:175 msgid "Do NOT fork into the background: run in debug mode." msgstr "NICHT in den Hintergrund gehen: Betrieb im Debug-Modus" @@ -145,482 +145,490 @@ msgstr "NICHT in den Hintergrund gehen: Betrieb im Debug-Modus" # @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:171 +#: option.c:176 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:172 +#: option.c:177 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:173 +#: option.c:178 msgid "Expand simple names in /etc/hosts with domain-suffix." msgstr "Erweitere einfache Namen in /etc/hosts mit der Domänen-Endung" -#: option.c:174 +#: option.c:179 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:175 +#: option.c:180 msgid "Enable DHCP in the range given with lease duration." msgstr "" -#: option.c:176 +#: option.c:181 #, c-format msgid "Change to this group after startup (defaults to %s)." msgstr "" -#: option.c:177 +#: option.c:182 msgid "Set address or hostname for a specified machine." msgstr "" -#: option.c:178 +#: option.c:183 #, c-format msgid "Do NOT load %s file." msgstr "" -#: option.c:179 +#: option.c:184 #, c-format msgid "Specify a hosts file to be read in addition to %s." msgstr "" -#: option.c:180 +#: option.c:185 msgid "Specify interface(s) to listen on." msgstr "" -#: option.c:181 +#: option.c:186 msgid "Specify interface(s) NOT to listen on." msgstr "" -#: option.c:182 +#: option.c:187 msgid "Map DHCP user class to option set." msgstr "" -#: option.c:183 +#: option.c:188 msgid "Don't do DHCP for hosts in option set." msgstr "" -#: option.c:184 +#: option.c:189 msgid "Do NOT fork into the background, do NOT run in debug mode." msgstr "" -#: option.c:185 +#: option.c:190 msgid "Assume we are the only DHCP server on the local network." msgstr "" -#: option.c:186 +#: option.c:191 #, c-format msgid "Specify where to store DHCP leases (defaults to %s)." msgstr "" -#: option.c:187 +#: option.c:192 msgid "Return MX records for local hosts." msgstr "" -#: option.c:188 +#: option.c:193 msgid "Specify an MX record." msgstr "" -#: option.c:189 +#: option.c:194 msgid "Specify BOOTP options to DHCP server." msgstr "" -#: option.c:190 +#: option.c:195 #, c-format msgid "Do NOT poll %s file, reload only on SIGHUP." msgstr "" -#: option.c:191 +#: option.c:196 msgid "Do NOT cache failed search results." msgstr "" -#: option.c:192 +#: option.c:197 #, c-format msgid "Use nameservers strictly in the order given in %s." msgstr "" -#: option.c:193 -msgid "Set extra options to be set to DHCP clients." +#: option.c:198 +msgid "Specify options to be sent to DHCP clients." msgstr "" -#: option.c:194 +#: option.c:199 +msgid "DHCP option sent even if the client does not request it." +msgstr "" + +#: option.c:200 msgid "Specify port to listen for DNS requests on (defaults to 53)." msgstr "" -#: option.c:195 +#: option.c:201 #, c-format msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)." msgstr "" -#: option.c:196 +#: option.c:202 msgid "Log queries." msgstr "" -#: option.c:197 +#: option.c:203 msgid "Force the originating port for upstream queries." msgstr "" -#: option.c:198 +#: option.c:204 msgid "Do NOT read resolv.conf." msgstr "" -#: option.c:199 +#: option.c:205 #, c-format msgid "Specify path to resolv.conf (defaults to %s)." msgstr "" -#: option.c:200 +#: option.c:206 msgid "Specify address(es) of upstream servers with optional domains." msgstr "" -#: option.c:201 +#: option.c:207 msgid "Never forward queries to specified domains." msgstr "" -#: option.c:202 +#: option.c:208 msgid "Specify the domain to be assigned in DHCP leases." msgstr "" -#: option.c:203 +#: option.c:209 msgid "Specify default target in an MX record." msgstr "" -#: option.c:204 +#: option.c:210 msgid "Specify time-to-live in seconds for replies from /etc/hosts." msgstr "" -#: option.c:205 +#: option.c:211 #, c-format msgid "Change to this user after startup. (defaults to %s)." msgstr "" -#: option.c:206 +#: option.c:212 msgid "Map DHCP vendor class to option set." msgstr "" -#: option.c:207 +#: option.c:213 msgid "Display dnsmasq version and copyright information." msgstr "" -#: option.c:208 +#: option.c:214 msgid "Translate IPv4 addresses from upstream servers." msgstr "" -#: option.c:209 +#: option.c:215 msgid "Specify a SRV record." msgstr "" -#: option.c:210 +#: option.c:216 msgid "Display this message." msgstr "" -#: option.c:211 +#: option.c:217 #, fuzzy, c-format msgid "Specify path of PID file (defaults to %s)." msgstr "Angabe der Konfigurationsdatei (Voreinstellung: %s)." -#: option.c:212 +#: option.c:218 #, c-format msgid "Specify maximum number of DHCP leases (defaults to %s)." msgstr "" -#: option.c:213 +#: option.c:219 msgid "Answer DNS queries based on the interface a query was sent to." msgstr "" -#: option.c:214 +#: option.c:220 msgid "Specify TXT DNS record." msgstr "" -#: option.c:215 +#: option.c:221 msgid "Specify PTR DNS record." msgstr "" -#: option.c:216 +#: option.c:222 msgid "Bind only to interfaces in use." msgstr "" -#: option.c:217 +#: option.c:223 #, c-format msgid "Read DHCP static host information from %s." msgstr "" -#: option.c:218 +#: option.c:224 msgid "Enable the DBus interface for setting upstream servers, etc." msgstr "" -#: option.c:219 +#: option.c:225 msgid "Do not provide DHCP on this interface, only provide DNS." msgstr "" -#: option.c:220 +#: option.c:226 msgid "Enable dynamic address allocation for bootp." msgstr "" -#: option.c:221 +#: option.c:227 msgid "Map MAC address (with wildcards) to option set." msgstr "" -#: option.c:223 +#: option.c:229 msgid "Treat DHCP requests on aliases as arriving from interface." msgstr "" -#: option.c:225 +#: option.c:231 msgid "Disable ICMP echo address checking in the DHCP server." msgstr "" -#: option.c:226 +#: option.c:232 msgid "Script to run on DHCP lease creation and destruction." msgstr "" -#: option.c:227 +#: option.c:233 msgid "Read configuration from all the files in this directory." msgstr "" -#: option.c:228 +#: option.c:234 msgid "Log to this syslog facility. (defaults to DAEMON)" msgstr "" -#: option.c:229 +#: option.c:235 msgid "Read leases at startup, but never write the lease file." msgstr "" -#: option.c:230 +#: option.c:236 #, c-format msgid "Maximum number of concurrent DNS queries. (defaults to %s)" msgstr "" -#: option.c:231 +#: option.c:237 #, c-format msgid "Clear DNS cache when reloading %s." msgstr "" -#: option.c:232 +#: option.c:238 msgid "Ignore hostnames provided by DHCP clients." msgstr "" -#: option.c:233 +#: option.c:239 msgid "Enable integrated read-only TFTP server." msgstr "" -#: option.c:234 +#: option.c:240 msgid "Export files by TFTP only from the specified subtree." msgstr "" -#: option.c:235 +#: option.c:241 msgid "Allow access only to files owned by the user running dnsmasq." msgstr "" -#: option.c:236 +#: option.c:242 #, c-format msgid "Maximum number of conncurrent TFTP transfers (defaults to %s)." msgstr "" -#: option.c:361 +#: option.c:243 +msgid "Disable the TFTP blocksize extension." +msgstr "" + +#: option.c:368 #, c-format msgid "" "Usage: dnsmasq [options]\n" "\n" msgstr "" -#: option.c:363 +#: option.c:370 #, c-format msgid "Use short options only on the command line.\n" msgstr "" -#: option.c:365 +#: option.c:372 #, c-format msgid "Valid options are :\n" msgstr "" -#: option.c:431 +#: option.c:438 msgid "bad dhcp-option" msgstr "" -#: option.c:577 +#: option.c:584 msgid "bad domain in dhcp-option" msgstr "" -#: option.c:634 +#: option.c:641 msgid "dhcp-option too long" msgstr "" -#: option.c:696 +#: option.c:698 #, c-format msgid "cannot access directory %s: %s" msgstr "" -#: option.c:715 tftp.c:300 +#: option.c:717 tftp.c:301 #, c-format msgid "cannot access %s: %s" msgstr "" -#: option.c:792 +#: option.c:794 msgid "bad MX preference" msgstr "" -#: option.c:801 +#: option.c:803 msgid "bad MX name" msgstr "" -#: option.c:819 +#: option.c:821 msgid "bad MX target" msgstr "" -#: option.c:831 +#: option.c:833 msgid "cannot run scripts under uClinux" msgstr "" -#: option.c:1030 option.c:1041 +#: option.c:1032 option.c:1043 msgid "bad port" msgstr "" -#: option.c:1185 +#: option.c:1187 msgid "bad bridge-interface" msgstr "" -#: option.c:1229 +#: option.c:1231 msgid "bad dhcp-range" msgstr "" -#: option.c:1258 +#: option.c:1260 msgid "only one netid tag allowed" msgstr "" -#: option.c:1303 +#: option.c:1305 msgid "inconsistent DHCP range" msgstr "" -#: option.c:1488 +#: option.c:1490 msgid "bad dhcp-host" msgstr "" -#: option.c:1688 +#: option.c:1691 msgid "bad PTR record" msgstr "" -#: option.c:1713 +#: option.c:1716 msgid "bad TXT record" msgstr "" -#: option.c:1745 +#: option.c:1748 msgid "TXT record string too long" msgstr "" -#: option.c:1784 +#: option.c:1787 msgid "bad SRV record" msgstr "" -#: option.c:1797 +#: option.c:1800 msgid "bad SRV target" msgstr "" -#: option.c:1809 +#: option.c:1812 msgid "invalid port number" msgstr "" -#: option.c:1820 +#: option.c:1823 msgid "invalid priority" msgstr "" -#: option.c:1831 +#: option.c:1834 msgid "invalid weight" msgstr "" -#: option.c:1862 +#: option.c:1865 #, c-format msgid "files nested too deep in %s" msgstr "" -#: option.c:1869 tftp.c:450 +#: option.c:1872 tftp.c:451 #, c-format msgid "cannot read %s: %s" msgstr "" -#: option.c:1912 +#: option.c:1917 msgid "missing \"" msgstr "" -#: option.c:1951 +#: option.c:1956 msgid "bad option" msgstr "" -#: option.c:1953 +#: option.c:1958 msgid "extraneous parameter" msgstr "" -#: option.c:1955 +#: option.c:1960 msgid "missing parameter" msgstr "" -#: option.c:1957 +#: option.c:1962 msgid "error" msgstr "" -#: option.c:2025 +#: option.c:2030 #, c-format msgid "Dnsmasq version %s %s\n" msgstr "" -#: option.c:2026 +#: option.c:2031 #, c-format msgid "" "Compile time options %s\n" "\n" msgstr "" -#: option.c:2027 +#: option.c:2032 #, c-format msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" msgstr "" -#: option.c:2028 +#: option.c:2033 #, c-format msgid "Dnsmasq is free software, and you are welcome to redistribute it\n" msgstr "" -#: option.c:2029 +#: option.c:2034 #, c-format msgid "under the terms of the GNU General Public License, version 2.\n" msgstr "" -#: option.c:2040 +#: option.c:2045 msgid "try --help" msgstr "" -#: option.c:2042 +#: option.c:2047 msgid "try -w" msgstr "" -#: option.c:2045 +#: option.c:2050 #, c-format msgid "bad command line options: %s" msgstr "" -#: option.c:2096 +#: option.c:2101 #, c-format msgid "cannot get host-name: %s" msgstr "" -#: option.c:2124 +#: option.c:2129 msgid "only one resolv.conf file allowed in no-poll mode." msgstr "" -#: option.c:2134 +#: option.c:2139 msgid "must have exactly one resolv.conf to read domain from." msgstr "" -#: option.c:2137 +#: option.c:2142 #, c-format msgid "failed to read %s: %s" msgstr "" -#: option.c:2155 +#: option.c:2160 #, c-format msgid "no search directive found in %s" msgstr "" @@ -942,104 +950,99 @@ msgstr "" msgid "failed to write %s: %s (retry in %us)" msgstr "" -#: rfc2131.c:297 +#: rfc2131.c:271 #, c-format msgid "no address range available for DHCP request %s %s" msgstr "" -#: rfc2131.c:298 +#: rfc2131.c:272 msgid "with subnet selector" msgstr "" -#: rfc2131.c:298 +#: rfc2131.c:272 msgid "via" msgstr "" -#: rfc2131.c:322 rfc2131.c:347 +#: rfc2131.c:296 rfc2131.c:327 msgid "disabled" msgstr "" -#: rfc2131.c:359 rfc2131.c:814 +#: rfc2131.c:339 rfc2131.c:778 msgid "address in use" msgstr "" -#: rfc2131.c:362 +#: rfc2131.c:342 msgid "no address configured" msgstr "" -#: rfc2131.c:375 rfc2131.c:682 +#: rfc2131.c:355 rfc2131.c:646 msgid "no address available" msgstr "" -#: rfc2131.c:384 rfc2131.c:824 +#: rfc2131.c:364 rfc2131.c:788 msgid "no leases left" msgstr "" -#: rfc2131.c:387 rfc2131.c:788 +#: rfc2131.c:367 rfc2131.c:752 msgid "wrong network" msgstr "" -#: rfc2131.c:605 +#: rfc2131.c:569 #, c-format msgid "disabling DHCP static address %s for %s" msgstr "" -#: rfc2131.c:626 +#: rfc2131.c:590 msgid "unknown lease" msgstr "" -#: rfc2131.c:635 rfc2131.c:934 +#: rfc2131.c:599 rfc2131.c:898 msgid "ignored" msgstr "" -#: rfc2131.c:655 +#: rfc2131.c:619 #, c-format msgid "not using configured address %s because it is leased to %s" msgstr "" -#: rfc2131.c:665 +#: rfc2131.c:629 #, c-format msgid "" "not using configured address %s because it is in use by the server or relay" msgstr "" -#: rfc2131.c:668 +#: rfc2131.c:632 #, c-format msgid "not using configured address %s because it was previously declined" msgstr "" -#: rfc2131.c:751 +#: rfc2131.c:715 msgid "wrong address" msgstr "" -#: rfc2131.c:764 +#: rfc2131.c:728 msgid "lease not found" msgstr "" -#: rfc2131.c:796 +#: rfc2131.c:760 msgid "address not available" msgstr "" -#: rfc2131.c:807 +#: rfc2131.c:771 msgid "static lease available" msgstr "" -#: rfc2131.c:811 +#: rfc2131.c:775 msgid "address reserved" msgstr "" -#: rfc2131.c:817 +#: rfc2131.c:781 msgid "no unique-id" msgstr "" -#: rfc2131.c:1181 -#, c-format -msgid "cannot send DHCP option %d: no space left in packet" -msgstr "" - -#: rfc2131.c:1476 +#: rfc2131.c:1180 #, c-format -msgid "cannot send encapsulated option %d: no space left in wrapper" +msgid "cannot send DHCP/BOOTP option %d: no space left in packet" msgstr "" #: netlink.c:59 @@ -1094,22 +1097,22 @@ msgstr "" msgid "unsupported request from %s" msgstr "" -#: tftp.c:229 +#: tftp.c:230 #, c-format msgid "TFTP sent %s to %s" msgstr "" -#: tftp.c:296 +#: tftp.c:297 #, c-format msgid "file %s not found" msgstr "" -#: tftp.c:352 +#: tftp.c:353 #, c-format msgid "TFTP error %d %s received from %s" msgstr "" -#: tftp.c:383 +#: tftp.c:384 #, c-format msgid "TFTP failed sending %s to %s" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: dnsmasq 2.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-05 14:27+0000\n" +"POT-Creation-Date: 2007-02-12 17:55+0000\n" "PO-Revision-Date: 2005-10-07 11:04+0100\n" "Last-Translator: Christopher Chatham <chrislinux@gmail.com>\n" "Language-Team: Spanish <es@li.org>\n" @@ -15,31 +15,31 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: cache.c:697 +#: cache.c:694 #, c-format msgid "failed to load names from %s: %m" msgstr "no se pudo cargar nombres desde %s: %m" -#: cache.c:731 dhcp.c:715 +#: cache.c:728 dhcp.c:715 #, fuzzy, c-format msgid "bad address at %s line %d" msgstr "nombre erróneo en %s línea %d" -#: cache.c:777 dhcp.c:729 +#: cache.c:774 dhcp.c:729 #, c-format msgid "bad name at %s line %d" msgstr "nombre erróneo en %s línea %d" -#: cache.c:784 dhcp.c:783 +#: cache.c:781 dhcp.c:783 #, c-format msgid "read %s - %d addresses" msgstr "direcciónes %s - %d leídas" -#: cache.c:822 +#: cache.c:819 msgid "cleared cache" msgstr "el caché fue liberado" -#: cache.c:875 +#: cache.c:866 #, c-format msgid "" "not giving name %s to the DHCP lease of %s because the name exists in %s " @@ -48,7 +48,7 @@ msgstr "" "no otorgando nombre %s al arriendo DHCP de %s porque el nombre existe en %s " "con dirección %s" -#: cache.c:919 +#: cache.c:906 #, fuzzy, c-format msgid "" "time %lu, cache size %d, %d/%d cache insertions re-used unexpired cache " @@ -57,7 +57,7 @@ msgstr "" "tiempo %lu, tamaño de caché %d, %d/%d inserciónes de caché reutilizaron " "objetos no vencidos." -#: util.c:154 option.c:582 +#: util.c:154 option.c:589 msgid "could not get memory" msgstr "no se pudo conseguir memoria" @@ -75,324 +75,333 @@ msgstr "el inicio ha FALLADO" msgid "infinite" msgstr "infinito" -#: option.c:164 +#: option.c:169 msgid "Specify local address(es) to listen on." msgstr "Especificar dirección(es) locales dónde escuchar." -#: option.c:165 +#: option.c:170 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:166 +#: option.c:171 msgid "Fake reverse lookups for RFC1918 private address ranges." msgstr "" "Falsificar búsquedas reversas para rangos de dirección privados RFC1918." -#: option.c:167 +#: option.c:172 msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)." msgstr "Tratar ipaddr (dirección IP) como NXDOMAIN (derrota comodín Verisign)." -#: option.c:168 +#: option.c:173 #, 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:169 +#: option.c:174 #, c-format msgid "Specify configuration file (defaults to %s)." msgstr "Especificar archivo de configuración (%s por predeterminado)." -#: option.c:170 +#: option.c:175 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:171 +#: option.c:176 msgid "Do NOT forward queries with no domain part." msgstr "NO reenviar búsquedas sin parte de dominio." -#: option.c:172 +#: option.c:177 msgid "Return self-pointing MX records for local hosts." msgstr "Retornar expedientes MX auto-señaladores para hosts locales." -#: option.c:173 +#: option.c:178 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:174 +#: option.c:179 msgid "Don't forward spurious DNS requests from Windows hosts." msgstr "No reenviar pedidos DNS falsos desde máquinas Windows." -#: option.c:175 +#: option.c:180 msgid "Enable DHCP in the range given with lease duration." msgstr "Habilitar DHCP dentro del rango brindado con duración del arriendo." -#: option.c:176 +#: option.c:181 #, 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:177 +#: option.c:182 msgid "Set address or hostname for a specified machine." msgstr "Fijar dirección o nombre de host para una máquina específica." -#: option.c:178 +#: option.c:183 #, c-format msgid "Do NOT load %s file." msgstr "NO cargar archivo %s." -#: option.c:179 +#: option.c:184 #, 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:180 +#: option.c:185 msgid "Specify interface(s) to listen on." msgstr "Especificar interface(s) donde escuchar." -#: option.c:181 +#: option.c:186 msgid "Specify interface(s) NOT to listen on." msgstr "Especificar interface(s) donde NO escuchar." -#: option.c:182 +#: option.c:187 msgid "Map DHCP user class to option set." msgstr "Trazar clase de usuario DHCP a la opción fijada." -#: option.c:183 +#: option.c:188 msgid "Don't do DHCP for hosts in option set." msgstr "No hacer DHCP para hosts en la opción fijada." -#: option.c:184 +#: option.c:189 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:185 +#: option.c:190 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:186 +#: option.c:191 #, c-format msgid "Specify where to store DHCP leases (defaults to %s)." msgstr "Especificar donde almacenar arriendos DHCP (%s por predeterminado)." -#: option.c:187 +#: option.c:192 msgid "Return MX records for local hosts." msgstr "Retornar expedientes MX para hosts locales." -#: option.c:188 +#: option.c:193 msgid "Specify an MX record." msgstr "Especificar un expediente MX." -#: option.c:189 +#: option.c:194 msgid "Specify BOOTP options to DHCP server." msgstr "Especificar opciones BOOTP a servidor DHCP." -#: option.c:190 +#: option.c:195 #, 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:191 +#: option.c:196 msgid "Do NOT cache failed search results." msgstr "NO almacenar en caché resultados de búsquedas fallidas." -#: option.c:192 +#: option.c:197 #, 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:193 -msgid "Set extra options to be set to DHCP clients." +#: option.c:198 +#, fuzzy +msgid "Specify options to be sent to DHCP clients." msgstr "Fijar opciones extras para ser enviadas a clientes DHCP." -#: option.c:194 +#: option.c:199 +msgid "DHCP option sent even if the client does not request it." +msgstr "" + +#: option.c:200 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:195 +#: option.c:201 #, 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:196 +#: option.c:202 msgid "Log queries." msgstr "Bitacorear búsquedas." -#: option.c:197 +#: option.c:203 msgid "Force the originating port for upstream queries." msgstr "Enforzar el puerto original para búsquedas upstream." -#: option.c:198 +#: option.c:204 msgid "Do NOT read resolv.conf." msgstr "NO leer resolv.conf." -#: option.c:199 +#: option.c:205 #, c-format msgid "Specify path to resolv.conf (defaults to %s)." msgstr "Especificar el path hacia resolv.conf (%s por predeterminado)." -#: option.c:200 +#: option.c:206 msgid "Specify address(es) of upstream servers with optional domains." msgstr "" "Especificar dirección(es) de servidores upstream con dominios opcionales." -#: option.c:201 +#: option.c:207 msgid "Never forward queries to specified domains." msgstr "Nunca reenviar búsquedas a dominios especificados." -#: option.c:202 +#: option.c:208 msgid "Specify the domain to be assigned in DHCP leases." msgstr "Especificar el dominio para ser asignado en arriendos DHCP." -#: option.c:203 +#: option.c:209 msgid "Specify default target in an MX record." msgstr "Especificar destino predeterminado en un expediente MX." -#: option.c:204 +#: option.c:210 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:205 +#: option.c:211 #, 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:206 +#: option.c:212 msgid "Map DHCP vendor class to option set." msgstr "Trazar clase de vendedor DHCP a opción fijada." -#: option.c:207 +#: option.c:213 msgid "Display dnsmasq version and copyright information." msgstr "Mostrar información sobre la versión y copyright de dnsmasq." -#: option.c:208 +#: option.c:214 msgid "Translate IPv4 addresses from upstream servers." msgstr "Traducir direcciones IPv4 desde servidores upstream." -#: option.c:209 +#: option.c:215 msgid "Specify a SRV record." msgstr "Especificar un expediente SRV." -#: option.c:210 +#: option.c:216 msgid "Display this message." msgstr "Mostrar este mensaje." -#: option.c:211 +#: option.c:217 #, fuzzy, c-format msgid "Specify path of PID file (defaults to %s)." msgstr "Especificar path de archivo PID (%s por predeterminado)." -#: option.c:212 +#: option.c:218 #, 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:213 +#: option.c:219 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:214 +#: option.c:220 msgid "Specify TXT DNS record." msgstr "Especificar expediente DNS TXT." -#: option.c:215 +#: option.c:221 #, fuzzy msgid "Specify PTR DNS record." msgstr "Especificar expediente DNS TXT." -#: option.c:216 +#: option.c:222 msgid "Bind only to interfaces in use." msgstr "Acoplar solo a interfaces en uso." -#: option.c:217 +#: option.c:223 #, c-format msgid "Read DHCP static host information from %s." msgstr "Leer información sobre hosts DHCP estáticos desde %s." -#: option.c:218 +#: option.c:224 msgid "Enable the DBus interface for setting upstream servers, etc." msgstr "Habilitar la interface DBus para fijar servidores upstream, etc." -#: option.c:219 +#: option.c:225 msgid "Do not provide DHCP on this interface, only provide DNS." msgstr "No proveer DHCP en esta interface, sólo proveer DNS." -#: option.c:220 +#: option.c:226 msgid "Enable dynamic address allocation for bootp." msgstr "Habilitar alocación dinámica de direcciónes para BOOTP." -#: option.c:221 +#: option.c:227 #, fuzzy msgid "Map MAC address (with wildcards) to option set." msgstr "Trazar clase de vendedor DHCP a opción fijada." -#: option.c:223 +#: option.c:229 msgid "Treat DHCP requests on aliases as arriving from interface." msgstr "" -#: option.c:225 +#: option.c:231 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:226 +#: option.c:232 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:227 +#: option.c:233 msgid "Read configuration from all the files in this directory." msgstr "Leer configuración desde todos los archivos en este directorio." -#: option.c:228 +#: option.c:234 #, fuzzy msgid "Log to this syslog facility. (defaults to DAEMON)" msgstr "Bitacorear a esta facilidad syslog." -#: option.c:229 +#: option.c:235 msgid "Read leases at startup, but never write the lease file." msgstr "" -#: option.c:230 +#: option.c:236 #, fuzzy, c-format msgid "Maximum number of concurrent DNS queries. (defaults to %s)" msgstr "Especificar número máximo de arriendos DHCP (%s por predeterminado)." -#: option.c:231 +#: option.c:237 #, c-format msgid "Clear DNS cache when reloading %s." msgstr "" -#: option.c:232 +#: option.c:238 msgid "Ignore hostnames provided by DHCP clients." msgstr "" -#: option.c:233 +#: option.c:239 msgid "Enable integrated read-only TFTP server." msgstr "" -#: option.c:234 +#: option.c:240 msgid "Export files by TFTP only from the specified subtree." msgstr "" -#: option.c:235 +#: option.c:241 msgid "Allow access only to files owned by the user running dnsmasq." msgstr "" -#: option.c:236 +#: option.c:242 #, fuzzy, c-format msgid "Maximum number of conncurrent TFTP transfers (defaults to %s)." msgstr "Especificar número máximo de arriendos DHCP (%s por predeterminado)." -#: option.c:361 +#: option.c:243 +msgid "Disable the TFTP blocksize extension." +msgstr "" + +#: option.c:368 #, c-format msgid "" "Usage: dnsmasq [options]\n" @@ -401,147 +410,147 @@ msgstr "" "Modo de uso: dnsmasq [opciones]\n" "\n" -#: option.c:363 +#: option.c:370 #, 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:365 +#: option.c:372 #, c-format msgid "Valid options are :\n" msgstr "Opciones válidas son :\n" -#: option.c:431 +#: option.c:438 msgid "bad dhcp-option" msgstr "dhcp-option erróneo" -#: option.c:577 +#: option.c:584 msgid "bad domain in dhcp-option" msgstr "dominio erróneo en dhcp-option" -#: option.c:634 +#: option.c:641 msgid "dhcp-option too long" msgstr "opción dhcp-option demasiado larga" -#: option.c:696 +#: option.c:698 #, fuzzy, c-format msgid "cannot access directory %s: %s" msgstr "no se puede leer %s: %s" -#: option.c:715 tftp.c:300 +#: option.c:717 tftp.c:301 #, fuzzy, c-format msgid "cannot access %s: %s" msgstr "no se puede leer %s: %s" -#: option.c:792 +#: option.c:794 msgid "bad MX preference" msgstr "preferencia MX errónea" -#: option.c:801 +#: option.c:803 msgid "bad MX name" msgstr "nombre MX erróneo" -#: option.c:819 +#: option.c:821 msgid "bad MX target" msgstr "destino MX erróneo" -#: option.c:831 +#: option.c:833 msgid "cannot run scripts under uClinux" msgstr "no se pueden correr guiónes bajo uClinux" -#: option.c:1030 option.c:1041 +#: option.c:1032 option.c:1043 msgid "bad port" msgstr "puerto erróneo" -#: option.c:1185 +#: option.c:1187 msgid "bad bridge-interface" msgstr "" -#: option.c:1229 +#: option.c:1231 msgid "bad dhcp-range" msgstr "dhcp-range (rango DHCP) erróneo" -#: option.c:1258 +#: option.c:1260 msgid "only one netid tag allowed" msgstr "solo una etiqueta netid permitida" -#: option.c:1303 +#: option.c:1305 msgid "inconsistent DHCP range" msgstr "rango DHCP inconsistente" -#: option.c:1488 +#: option.c:1490 msgid "bad dhcp-host" msgstr "dhcp-host erróneo" -#: option.c:1688 +#: option.c:1691 #, fuzzy msgid "bad PTR record" msgstr "expediente SRV erróneo" -#: option.c:1713 +#: option.c:1716 msgid "bad TXT record" msgstr "expediente TXT erróneo" -#: option.c:1745 +#: option.c:1748 msgid "TXT record string too long" msgstr "expediente TXT demasiado largo" -#: option.c:1784 +#: option.c:1787 msgid "bad SRV record" msgstr "expediente SRV erróneo" -#: option.c:1797 +#: option.c:1800 msgid "bad SRV target" msgstr "destino SRV erróneo" -#: option.c:1809 +#: option.c:1812 msgid "invalid port number" msgstr "número de puerto inválido" -#: option.c:1820 +#: option.c:1823 msgid "invalid priority" msgstr "prioridad inválida" -#: option.c:1831 +#: option.c:1834 msgid "invalid weight" msgstr "peso inválido" -#: option.c:1862 +#: option.c:1865 #, c-format msgid "files nested too deep in %s" msgstr "" -#: option.c:1869 tftp.c:450 +#: option.c:1872 tftp.c:451 #, c-format msgid "cannot read %s: %s" msgstr "no se puede leer %s: %s" -#: option.c:1912 +#: option.c:1917 msgid "missing \"" msgstr "falta \"" -#: option.c:1951 +#: option.c:1956 msgid "bad option" msgstr "opción errónea" -#: option.c:1953 +#: option.c:1958 msgid "extraneous parameter" msgstr "parámetro extraño" -#: option.c:1955 +#: option.c:1960 msgid "missing parameter" msgstr "parámetro ausente" -#: option.c:1957 +#: option.c:1962 msgid "error" msgstr "error" -#: option.c:2025 +#: option.c:2030 #, c-format msgid "Dnsmasq version %s %s\n" msgstr "Dnsmasq versión %s %s\n" -#: option.c:2026 +#: option.c:2031 #, c-format msgid "" "Compile time options %s\n" @@ -550,53 +559,53 @@ msgstr "" "Opciones de compilación %s\n" "\n" -#: option.c:2027 +#: option.c:2032 #, c-format msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" msgstr "Este software viene SIN NINGUNA GARANTIA.\n" -#: option.c:2028 +#: option.c:2033 #, 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:2029 +#: option.c:2034 #, c-format msgid "under the terms of the GNU General Public License, version 2.\n" msgstr "bajo los términos de la GNU General Public License, versión 2.\n" -#: option.c:2040 +#: option.c:2045 msgid "try --help" msgstr "pruebe --help" -#: option.c:2042 +#: option.c:2047 msgid "try -w" msgstr "pruebe -w" -#: option.c:2045 +#: option.c:2050 #, fuzzy, c-format msgid "bad command line options: %s" msgstr "opciones de línea de comandos erróneas: %s." -#: option.c:2096 +#: option.c:2101 #, c-format msgid "cannot get host-name: %s" msgstr "no se puede obtener host-name (nombre de host): %s" -#: option.c:2124 +#: option.c:2129 msgid "only one resolv.conf file allowed in no-poll mode." msgstr "solo un archivo resolv.conf permitido en modo no-poll." -#: option.c:2134 +#: option.c:2139 msgid "must have exactly one resolv.conf to read domain from." msgstr "debe haber exactamente un resolv.conf desde donde leer dominio." -#: option.c:2137 +#: option.c:2142 #, fuzzy, c-format msgid "failed to read %s: %s" msgstr "no se pudo leer %s: %m" -#: option.c:2155 +#: option.c:2160 #, c-format msgid "no search directive found in %s" msgstr "ninguna directiva de búsqueda encontrada en %s" @@ -925,105 +934,100 @@ msgstr "" msgid "failed to write %s: %s (retry in %us)" msgstr "no se pudo escribir %s: %s (reintentar en %us)" -#: rfc2131.c:297 +#: rfc2131.c:271 #, 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:298 +#: rfc2131.c:272 msgid "with subnet selector" msgstr "con selector de subred" -#: rfc2131.c:298 +#: rfc2131.c:272 msgid "via" msgstr "vía" -#: rfc2131.c:322 rfc2131.c:347 +#: rfc2131.c:296 rfc2131.c:327 msgid "disabled" msgstr "deshabilitado" -#: rfc2131.c:359 rfc2131.c:814 +#: rfc2131.c:339 rfc2131.c:778 msgid "address in use" msgstr "dirección en uso" -#: rfc2131.c:362 +#: rfc2131.c:342 msgid "no address configured" msgstr "ninguna dirección configurada" -#: rfc2131.c:375 rfc2131.c:682 +#: rfc2131.c:355 rfc2131.c:646 msgid "no address available" msgstr "ninguna dirección disponible" -#: rfc2131.c:384 rfc2131.c:824 +#: rfc2131.c:364 rfc2131.c:788 msgid "no leases left" msgstr "no queda ningún arriendo" -#: rfc2131.c:387 rfc2131.c:788 +#: rfc2131.c:367 rfc2131.c:752 msgid "wrong network" msgstr "red equivocada" -#: rfc2131.c:605 +#: rfc2131.c:569 #, fuzzy, c-format msgid "disabling DHCP static address %s for %s" msgstr "deshabilitando dirección DHCP estática %s" -#: rfc2131.c:626 +#: rfc2131.c:590 msgid "unknown lease" msgstr "arriendo desconocido" -#: rfc2131.c:635 rfc2131.c:934 +#: rfc2131.c:599 rfc2131.c:898 msgid "ignored" msgstr "ignorado" -#: rfc2131.c:655 +#: rfc2131.c:619 #, c-format msgid "not using configured address %s because it is leased to %s" msgstr "no usando dirección configurada %s porque esta arriendada a %s" -#: rfc2131.c:665 +#: rfc2131.c:629 #, 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 esta siendo usada por el servidor" -#: rfc2131.c:668 +#: rfc2131.c:632 #, fuzzy, c-format msgid "not using configured address %s because it was previously declined" msgstr "no usando dirección configurada %s porque esta arriendada a %s" -#: rfc2131.c:751 +#: rfc2131.c:715 msgid "wrong address" msgstr "dirección equivocada" -#: rfc2131.c:764 +#: rfc2131.c:728 msgid "lease not found" msgstr "arriendo no encontrado" -#: rfc2131.c:796 +#: rfc2131.c:760 msgid "address not available" msgstr "dirección no disponible" -#: rfc2131.c:807 +#: rfc2131.c:771 msgid "static lease available" msgstr "arriendo estático disponible" -#: rfc2131.c:811 +#: rfc2131.c:775 msgid "address reserved" msgstr "dirección reservada" -#: rfc2131.c:817 +#: rfc2131.c:781 msgid "no unique-id" msgstr "ningún unique-id (ID único)" -#: rfc2131.c:1181 -#, c-format -msgid "cannot send DHCP option %d: no space left in packet" -msgstr "no se puede enviar opción DHCP %d: no queda espacio en el paquete" - -#: rfc2131.c:1476 +#: rfc2131.c:1180 #, fuzzy, c-format -msgid "cannot send encapsulated option %d: no space left in wrapper" +msgid "cannot send DHCP/BOOTP option %d: no space left in packet" msgstr "no se puede enviar opción DHCP %d: no queda espacio en el paquete" #: netlink.c:59 @@ -1079,26 +1083,30 @@ msgstr "no se pudo ejecutar %s: %m" msgid "unsupported request from %s" msgstr "" -#: tftp.c:229 +#: tftp.c:230 #, c-format msgid "TFTP sent %s to %s" msgstr "" -#: tftp.c:296 +#: tftp.c:297 #, fuzzy, c-format msgid "file %s not found" msgstr "arriendo no encontrado" -#: tftp.c:352 +#: tftp.c:353 #, c-format msgid "TFTP error %d %s received from %s" msgstr "" -#: tftp.c:383 +#: tftp.c:384 #, fuzzy, c-format msgid "TFTP failed sending %s to %s" msgstr "no se pudo leer %s: %m" +#, fuzzy +#~ msgid "cannot send encapsulated option %d: no space left in wrapper" +#~ msgstr "no se puede enviar opción DHCP %d: no queda espacio en el paquete" + #~ msgid "More than one vendor class matches, using %s" #~ msgstr "Más de una clase de vendedor coincide, usando %s" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: dnsmasq 2.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-05 14:27+0000\n" +"POT-Creation-Date: 2007-02-12 17:55+0000\n" "PO-Revision-Date: 2005-11-28 22:05+0000\n" "Last-Translator: Simon Kelley <simon@thekelleys.org.uk>\n" "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n" @@ -15,45 +15,45 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: cache.c:697 +#: cache.c:694 #, c-format msgid "failed to load names from %s: %m" msgstr "" -#: cache.c:731 dhcp.c:715 +#: cache.c:728 dhcp.c:715 #, c-format msgid "bad address at %s line %d" msgstr "" -#: cache.c:777 dhcp.c:729 +#: cache.c:774 dhcp.c:729 #, c-format msgid "bad name at %s line %d" msgstr "" -#: cache.c:784 dhcp.c:783 +#: cache.c:781 dhcp.c:783 #, c-format msgid "read %s - %d addresses" msgstr "" -#: cache.c:822 +#: cache.c:819 msgid "cleared cache" msgstr "" -#: cache.c:875 +#: cache.c:866 #, 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:919 +#: cache.c:906 #, c-format msgid "" "time %lu, cache size %d, %d/%d cache insertions re-used unexpired cache " "entries." msgstr "" -#: util.c:154 option.c:582 +#: util.c:154 option.c:589 msgid "could not get memory" msgstr "" @@ -71,507 +71,515 @@ msgstr "" msgid "infinite" msgstr "" -#: option.c:164 +#: option.c:169 msgid "Specify local address(es) to listen on." msgstr "" -#: option.c:165 +#: option.c:170 msgid "Return ipaddr for all hosts in specified domains." msgstr "" -#: option.c:166 +#: option.c:171 msgid "Fake reverse lookups for RFC1918 private address ranges." msgstr "" -#: option.c:167 +#: option.c:172 msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)." msgstr "" -#: option.c:168 +#: option.c:173 #, c-format msgid "Specify the size of the cache in entries (defaults to %s)." msgstr "" -#: option.c:169 +#: option.c:174 #, c-format msgid "Specify configuration file (defaults to %s)." msgstr "" -#: option.c:170 +#: option.c:175 msgid "Do NOT fork into the background: run in debug mode." msgstr "" -#: option.c:171 +#: option.c:176 msgid "Do NOT forward queries with no domain part." msgstr "" -#: option.c:172 +#: option.c:177 msgid "Return self-pointing MX records for local hosts." msgstr "" -#: option.c:173 +#: option.c:178 msgid "Expand simple names in /etc/hosts with domain-suffix." msgstr "" -#: option.c:174 +#: option.c:179 msgid "Don't forward spurious DNS requests from Windows hosts." msgstr "" -#: option.c:175 +#: option.c:180 msgid "Enable DHCP in the range given with lease duration." msgstr "" -#: option.c:176 +#: option.c:181 #, c-format msgid "Change to this group after startup (defaults to %s)." msgstr "" -#: option.c:177 +#: option.c:182 msgid "Set address or hostname for a specified machine." msgstr "" -#: option.c:178 +#: option.c:183 #, c-format msgid "Do NOT load %s file." msgstr "" -#: option.c:179 +#: option.c:184 #, c-format msgid "Specify a hosts file to be read in addition to %s." msgstr "" -#: option.c:180 +#: option.c:185 msgid "Specify interface(s) to listen on." msgstr "" -#: option.c:181 +#: option.c:186 msgid "Specify interface(s) NOT to listen on." msgstr "" -#: option.c:182 +#: option.c:187 msgid "Map DHCP user class to option set." msgstr "" -#: option.c:183 +#: option.c:188 msgid "Don't do DHCP for hosts in option set." msgstr "" -#: option.c:184 +#: option.c:189 msgid "Do NOT fork into the background, do NOT run in debug mode." msgstr "" -#: option.c:185 +#: option.c:190 msgid "Assume we are the only DHCP server on the local network." msgstr "" -#: option.c:186 +#: option.c:191 #, c-format msgid "Specify where to store DHCP leases (defaults to %s)." msgstr "" -#: option.c:187 +#: option.c:192 msgid "Return MX records for local hosts." msgstr "" -#: option.c:188 +#: option.c:193 msgid "Specify an MX record." msgstr "" -#: option.c:189 +#: option.c:194 msgid "Specify BOOTP options to DHCP server." msgstr "" -#: option.c:190 +#: option.c:195 #, c-format msgid "Do NOT poll %s file, reload only on SIGHUP." msgstr "" -#: option.c:191 +#: option.c:196 msgid "Do NOT cache failed search results." msgstr "" -#: option.c:192 +#: option.c:197 #, c-format msgid "Use nameservers strictly in the order given in %s." msgstr "" -#: option.c:193 -msgid "Set extra options to be set to DHCP clients." +#: option.c:198 +msgid "Specify options to be sent to DHCP clients." msgstr "" -#: option.c:194 +#: option.c:199 +msgid "DHCP option sent even if the client does not request it." +msgstr "" + +#: option.c:200 msgid "Specify port to listen for DNS requests on (defaults to 53)." msgstr "" -#: option.c:195 +#: option.c:201 #, c-format msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)." msgstr "" -#: option.c:196 +#: option.c:202 msgid "Log queries." msgstr "" -#: option.c:197 +#: option.c:203 msgid "Force the originating port for upstream queries." msgstr "" -#: option.c:198 +#: option.c:204 msgid "Do NOT read resolv.conf." msgstr "" -#: option.c:199 +#: option.c:205 #, c-format msgid "Specify path to resolv.conf (defaults to %s)." msgstr "" -#: option.c:200 +#: option.c:206 msgid "Specify address(es) of upstream servers with optional domains." msgstr "" -#: option.c:201 +#: option.c:207 msgid "Never forward queries to specified domains." msgstr "" -#: option.c:202 +#: option.c:208 msgid "Specify the domain to be assigned in DHCP leases." msgstr "" -#: option.c:203 +#: option.c:209 msgid "Specify default target in an MX record." msgstr "" -#: option.c:204 +#: option.c:210 msgid "Specify time-to-live in seconds for replies from /etc/hosts." msgstr "" -#: option.c:205 +#: option.c:211 #, c-format msgid "Change to this user after startup. (defaults to %s)." msgstr "" -#: option.c:206 +#: option.c:212 msgid "Map DHCP vendor class to option set." msgstr "" -#: option.c:207 +#: option.c:213 msgid "Display dnsmasq version and copyright information." msgstr "" -#: option.c:208 +#: option.c:214 msgid "Translate IPv4 addresses from upstream servers." msgstr "" -#: option.c:209 +#: option.c:215 msgid "Specify a SRV record." msgstr "" -#: option.c:210 +#: option.c:216 msgid "Display this message." msgstr "" -#: option.c:211 +#: option.c:217 #, c-format msgid "Specify path of PID file (defaults to %s)." msgstr "" -#: option.c:212 +#: option.c:218 #, c-format msgid "Specify maximum number of DHCP leases (defaults to %s)." msgstr "" -#: option.c:213 +#: option.c:219 msgid "Answer DNS queries based on the interface a query was sent to." msgstr "" -#: option.c:214 +#: option.c:220 msgid "Specify TXT DNS record." msgstr "" -#: option.c:215 +#: option.c:221 msgid "Specify PTR DNS record." msgstr "" -#: option.c:216 +#: option.c:222 msgid "Bind only to interfaces in use." msgstr "" -#: option.c:217 +#: option.c:223 #, c-format msgid "Read DHCP static host information from %s." msgstr "" -#: option.c:218 +#: option.c:224 msgid "Enable the DBus interface for setting upstream servers, etc." msgstr "" -#: option.c:219 +#: option.c:225 msgid "Do not provide DHCP on this interface, only provide DNS." msgstr "" -#: option.c:220 +#: option.c:226 msgid "Enable dynamic address allocation for bootp." msgstr "" -#: option.c:221 +#: option.c:227 msgid "Map MAC address (with wildcards) to option set." msgstr "" -#: option.c:223 +#: option.c:229 msgid "Treat DHCP requests on aliases as arriving from interface." msgstr "" -#: option.c:225 +#: option.c:231 msgid "Disable ICMP echo address checking in the DHCP server." msgstr "" -#: option.c:226 +#: option.c:232 msgid "Script to run on DHCP lease creation and destruction." msgstr "" -#: option.c:227 +#: option.c:233 msgid "Read configuration from all the files in this directory." msgstr "" -#: option.c:228 +#: option.c:234 msgid "Log to this syslog facility. (defaults to DAEMON)" msgstr "" -#: option.c:229 +#: option.c:235 msgid "Read leases at startup, but never write the lease file." msgstr "" -#: option.c:230 +#: option.c:236 #, c-format msgid "Maximum number of concurrent DNS queries. (defaults to %s)" msgstr "" -#: option.c:231 +#: option.c:237 #, c-format msgid "Clear DNS cache when reloading %s." msgstr "" -#: option.c:232 +#: option.c:238 msgid "Ignore hostnames provided by DHCP clients." msgstr "" -#: option.c:233 +#: option.c:239 msgid "Enable integrated read-only TFTP server." msgstr "" -#: option.c:234 +#: option.c:240 msgid "Export files by TFTP only from the specified subtree." msgstr "" -#: option.c:235 +#: option.c:241 msgid "Allow access only to files owned by the user running dnsmasq." msgstr "" -#: option.c:236 +#: option.c:242 #, c-format msgid "Maximum number of conncurrent TFTP transfers (defaults to %s)." msgstr "" -#: option.c:361 +#: option.c:243 +msgid "Disable the TFTP blocksize extension." +msgstr "" + +#: option.c:368 #, c-format msgid "" "Usage: dnsmasq [options]\n" "\n" msgstr "" -#: option.c:363 +#: option.c:370 #, c-format msgid "Use short options only on the command line.\n" msgstr "" -#: option.c:365 +#: option.c:372 #, c-format msgid "Valid options are :\n" msgstr "" -#: option.c:431 +#: option.c:438 msgid "bad dhcp-option" msgstr "" -#: option.c:577 +#: option.c:584 msgid "bad domain in dhcp-option" msgstr "" -#: option.c:634 +#: option.c:641 msgid "dhcp-option too long" msgstr "" -#: option.c:696 +#: option.c:698 #, c-format msgid "cannot access directory %s: %s" msgstr "" -#: option.c:715 tftp.c:300 +#: option.c:717 tftp.c:301 #, c-format msgid "cannot access %s: %s" msgstr "" -#: option.c:792 +#: option.c:794 msgid "bad MX preference" msgstr "" -#: option.c:801 +#: option.c:803 msgid "bad MX name" msgstr "" -#: option.c:819 +#: option.c:821 msgid "bad MX target" msgstr "" -#: option.c:831 +#: option.c:833 msgid "cannot run scripts under uClinux" msgstr "" -#: option.c:1030 option.c:1041 +#: option.c:1032 option.c:1043 msgid "bad port" msgstr "" -#: option.c:1185 +#: option.c:1187 msgid "bad bridge-interface" msgstr "" -#: option.c:1229 +#: option.c:1231 msgid "bad dhcp-range" msgstr "" -#: option.c:1258 +#: option.c:1260 msgid "only one netid tag allowed" msgstr "" -#: option.c:1303 +#: option.c:1305 msgid "inconsistent DHCP range" msgstr "" -#: option.c:1488 +#: option.c:1490 msgid "bad dhcp-host" msgstr "" -#: option.c:1688 +#: option.c:1691 msgid "bad PTR record" msgstr "" -#: option.c:1713 +#: option.c:1716 msgid "bad TXT record" msgstr "" -#: option.c:1745 +#: option.c:1748 msgid "TXT record string too long" msgstr "" -#: option.c:1784 +#: option.c:1787 msgid "bad SRV record" msgstr "" -#: option.c:1797 +#: option.c:1800 msgid "bad SRV target" msgstr "" -#: option.c:1809 +#: option.c:1812 msgid "invalid port number" msgstr "" -#: option.c:1820 +#: option.c:1823 msgid "invalid priority" msgstr "" -#: option.c:1831 +#: option.c:1834 msgid "invalid weight" msgstr "" -#: option.c:1862 +#: option.c:1865 #, c-format msgid "files nested too deep in %s" msgstr "" -#: option.c:1869 tftp.c:450 +#: option.c:1872 tftp.c:451 #, c-format msgid "cannot read %s: %s" msgstr "" -#: option.c:1912 +#: option.c:1917 msgid "missing \"" msgstr "" -#: option.c:1951 +#: option.c:1956 msgid "bad option" msgstr "" -#: option.c:1953 +#: option.c:1958 msgid "extraneous parameter" msgstr "" -#: option.c:1955 +#: option.c:1960 msgid "missing parameter" msgstr "" -#: option.c:1957 +#: option.c:1962 msgid "error" msgstr "" -#: option.c:2025 +#: option.c:2030 #, c-format msgid "Dnsmasq version %s %s\n" msgstr "" -#: option.c:2026 +#: option.c:2031 #, c-format msgid "" "Compile time options %s\n" "\n" msgstr "" -#: option.c:2027 +#: option.c:2032 #, c-format msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" msgstr "" -#: option.c:2028 +#: option.c:2033 #, c-format msgid "Dnsmasq is free software, and you are welcome to redistribute it\n" msgstr "" -#: option.c:2029 +#: option.c:2034 #, c-format msgid "under the terms of the GNU General Public License, version 2.\n" msgstr "" -#: option.c:2040 +#: option.c:2045 msgid "try --help" msgstr "" -#: option.c:2042 +#: option.c:2047 msgid "try -w" msgstr "" -#: option.c:2045 +#: option.c:2050 #, c-format msgid "bad command line options: %s" msgstr "" -#: option.c:2096 +#: option.c:2101 #, c-format msgid "cannot get host-name: %s" msgstr "" -#: option.c:2124 +#: option.c:2129 msgid "only one resolv.conf file allowed in no-poll mode." msgstr "" -#: option.c:2134 +#: option.c:2139 msgid "must have exactly one resolv.conf to read domain from." msgstr "" -#: option.c:2137 +#: option.c:2142 #, c-format msgid "failed to read %s: %s" msgstr "" -#: option.c:2155 +#: option.c:2160 #, c-format msgid "no search directive found in %s" msgstr "" @@ -893,104 +901,99 @@ msgstr "" msgid "failed to write %s: %s (retry in %us)" msgstr "" -#: rfc2131.c:297 +#: rfc2131.c:271 #, c-format msgid "no address range available for DHCP request %s %s" msgstr "" -#: rfc2131.c:298 +#: rfc2131.c:272 msgid "with subnet selector" msgstr "" -#: rfc2131.c:298 +#: rfc2131.c:272 msgid "via" msgstr "" -#: rfc2131.c:322 rfc2131.c:347 +#: rfc2131.c:296 rfc2131.c:327 msgid "disabled" msgstr "" -#: rfc2131.c:359 rfc2131.c:814 +#: rfc2131.c:339 rfc2131.c:778 msgid "address in use" msgstr "" -#: rfc2131.c:362 +#: rfc2131.c:342 msgid "no address configured" msgstr "" -#: rfc2131.c:375 rfc2131.c:682 +#: rfc2131.c:355 rfc2131.c:646 msgid "no address available" msgstr "" -#: rfc2131.c:384 rfc2131.c:824 +#: rfc2131.c:364 rfc2131.c:788 msgid "no leases left" msgstr "" -#: rfc2131.c:387 rfc2131.c:788 +#: rfc2131.c:367 rfc2131.c:752 msgid "wrong network" msgstr "" -#: rfc2131.c:605 +#: rfc2131.c:569 #, c-format msgid "disabling DHCP static address %s for %s" msgstr "" -#: rfc2131.c:626 +#: rfc2131.c:590 msgid "unknown lease" msgstr "" -#: rfc2131.c:635 rfc2131.c:934 +#: rfc2131.c:599 rfc2131.c:898 msgid "ignored" msgstr "" -#: rfc2131.c:655 +#: rfc2131.c:619 #, c-format msgid "not using configured address %s because it is leased to %s" msgstr "" -#: rfc2131.c:665 +#: rfc2131.c:629 #, c-format msgid "" "not using configured address %s because it is in use by the server or relay" msgstr "" -#: rfc2131.c:668 +#: rfc2131.c:632 #, c-format msgid "not using configured address %s because it was previously declined" msgstr "" -#: rfc2131.c:751 +#: rfc2131.c:715 msgid "wrong address" msgstr "" -#: rfc2131.c:764 +#: rfc2131.c:728 msgid "lease not found" msgstr "" -#: rfc2131.c:796 +#: rfc2131.c:760 msgid "address not available" msgstr "" -#: rfc2131.c:807 +#: rfc2131.c:771 msgid "static lease available" msgstr "" -#: rfc2131.c:811 +#: rfc2131.c:775 msgid "address reserved" msgstr "" -#: rfc2131.c:817 +#: rfc2131.c:781 msgid "no unique-id" msgstr "" -#: rfc2131.c:1181 -#, c-format -msgid "cannot send DHCP option %d: no space left in packet" -msgstr "" - -#: rfc2131.c:1476 +#: rfc2131.c:1180 #, c-format -msgid "cannot send encapsulated option %d: no space left in wrapper" +msgid "cannot send DHCP/BOOTP option %d: no space left in packet" msgstr "" #: netlink.c:59 @@ -1045,22 +1048,22 @@ msgstr "" msgid "unsupported request from %s" msgstr "" -#: tftp.c:229 +#: tftp.c:230 #, c-format msgid "TFTP sent %s to %s" msgstr "" -#: tftp.c:296 +#: tftp.c:297 #, c-format msgid "file %s not found" msgstr "" -#: tftp.c:352 +#: tftp.c:353 #, c-format msgid "TFTP error %d %s received from %s" msgstr "" -#: tftp.c:383 +#: tftp.c:384 #, c-format msgid "TFTP failed sending %s to %s" msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: dnsmasq 2.34\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-05 14:27+0000\n" +"POT-Creation-Date: 2007-02-12 17:55+0000\n" "PO-Revision-Date: 2005-10-02 19:05+0100\n" "Last-Translator: Lionel Tricon <lionel.tricon@free.fr>\n" "Language-Team: French <traduc@traduc.org>\n" @@ -16,31 +16,31 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: cache.c:697 +#: cache.c:694 #, c-format msgid "failed to load names from %s: %m" msgstr "Impossible de charger les noms à partir de %s : %m" -#: cache.c:731 dhcp.c:715 +#: cache.c:728 dhcp.c:715 #, c-format msgid "bad address at %s line %d" msgstr "mauvaise adresse dans %s ligne %d" -#: cache.c:777 dhcp.c:729 +#: cache.c:774 dhcp.c:729 #, c-format msgid "bad name at %s line %d" msgstr "mauvais nom dans %s ligne %d" -#: cache.c:784 dhcp.c:783 +#: cache.c:781 dhcp.c:783 #, c-format msgid "read %s - %d addresses" msgstr "lecture %s - %d adresses" -#: cache.c:822 +#: cache.c:819 msgid "cleared cache" msgstr "cache vidé" -#: cache.c:875 +#: cache.c:866 #, c-format msgid "" "not giving name %s to the DHCP lease of %s because the name exists in %s " @@ -49,7 +49,7 @@ msgstr "" "ne donne pas de nom %s au bail DHCP de %s parce-que le nom existe dans %s " "avec l'adresse %s" -#: cache.c:919 +#: cache.c:906 #, c-format msgid "" "time %lu, cache size %d, %d/%d cache insertions re-used unexpired cache " @@ -58,7 +58,7 @@ 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" -#: util.c:154 option.c:582 +#: util.c:154 option.c:589 msgid "could not get memory" msgstr "impossible d'allouer de la mémoire" @@ -76,336 +76,345 @@ msgstr "IMPOSSIBLE de démarrer" msgid "infinite" msgstr "illimité(e)" -#: option.c:164 +#: option.c:169 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:165 +#: option.c:170 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:166 +#: option.c:171 msgid "Fake reverse lookups for RFC1918 private address ranges." msgstr "Traduction inverse truquée pour la plage d'adresse privée RFC1918" -#: option.c:167 +#: option.c:172 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:168 +#: option.c:173 #, 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:169 +#: option.c:174 #, c-format msgid "Specify configuration file (defaults to %s)." msgstr "Spécifie le nom du fichier de configuration (par défaut : %s)" -#: option.c:170 +#: option.c:175 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:171 +#: option.c:176 msgid "Do NOT forward queries with no domain part." msgstr "Ne retransmet pas les requêtes qui n'ont pas de domaine." -#: option.c:172 +#: option.c:177 msgid "Return self-pointing MX records for local hosts." msgstr "Retourne les champs MX pour les machines locales." -#: option.c:173 +#: option.c:178 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:174 +#: option.c:179 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:175 +#: option.c:180 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:176 +#: option.c:181 #, 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:177 +#: option.c:182 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:178 +#: option.c:183 #, c-format msgid "Do NOT load %s file." msgstr "Ne charge PAS le fichier %s." -#: option.c:179 +#: option.c:184 #, 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:180 +#: option.c:185 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:181 +#: option.c:186 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:182 +#: option.c:187 msgid "Map DHCP user class to option set." msgstr "Associe les classes d'utilisateurs ('user class') DHCP aux options." -#: option.c:183 +#: option.c:188 msgid "Don't do DHCP for hosts in option set." msgstr "Ne pas autoriser DHCP pour les machines énumerées dans les options." -#: option.c:184 +#: option.c:189 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:185 +#: option.c:190 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:186 +#: option.c:191 #, 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:187 +#: option.c:192 msgid "Return MX records for local hosts." msgstr "Retourne les champs MX pour les machines locales." -#: option.c:188 +#: option.c:193 msgid "Specify an MX record." msgstr "Spécifie un champ MX." -#: option.c:189 +#: option.c:194 msgid "Specify BOOTP options to DHCP server." msgstr "Spécifie les options BOOTP pour le serveur DHCP." -#: option.c:190 +#: option.c:195 #, 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:191 +#: option.c:196 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:192 +#: option.c:197 #, 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:193 -msgid "Set extra options to be set to DHCP clients." +#: option.c:198 +#, fuzzy +msgid "Specify options to be sent to DHCP clients." msgstr "Options supplémentaires à associer aux clients DHCP." -#: option.c:194 +#: option.c:199 +msgid "DHCP option sent even if the client does not request it." +msgstr "" + +#: option.c:200 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:195 +#: option.c:201 #, 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:196 +#: option.c:202 msgid "Log queries." msgstr "Logue les requêtes." -#: option.c:197 +#: option.c:203 msgid "Force the originating port for upstream queries." msgstr "Force le port d'origine pour les requêtes vers les serveurs amonts." -#: option.c:198 +#: option.c:204 msgid "Do NOT read resolv.conf." msgstr "Ne pas lire le fichier resolv.conf." -#: option.c:199 +#: option.c:205 #, 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:200 +#: option.c:206 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:201 +#: option.c:207 msgid "Never forward queries to specified domains." msgstr "Ne jamais retransmettre les requêtes pour les domaines spécifiés." -#: option.c:202 +#: option.c:208 msgid "Specify the domain to be assigned in DHCP leases." msgstr "Spécifie le domaine qui doit etre assigné aux baux DHCP." -#: option.c:203 +#: option.c:209 msgid "Specify default target in an MX record." msgstr "Spécifie la cible par défaut dans un champ MX." -#: option.c:204 +#: option.c:210 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:205 +#: option.c:211 #, 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:206 +#: option.c:212 msgid "Map DHCP vendor class to option set." msgstr "Associe les classes de fournisseurs ('vendor class') DHCP aux options." -#: option.c:207 +#: option.c:213 msgid "Display dnsmasq version and copyright information." msgstr "Affiche la version de Dnsmasq et les informations liées au copyright." -#: option.c:208 +#: option.c:214 msgid "Translate IPv4 addresses from upstream servers." msgstr "Traduit les adresses IPV4 des serveurs amonts." -#: option.c:209 +#: option.c:215 msgid "Specify a SRV record." msgstr " Spécifie un champ SRV." -#: option.c:210 +#: option.c:216 msgid "Display this message." msgstr "Affiche ce message." -#: option.c:211 +#: option.c:217 #, 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:212 +#: option.c:218 #, 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:213 +#: option.c:219 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:214 +#: option.c:220 msgid "Specify TXT DNS record." msgstr "Spécifie un champ DNS TXT" -#: option.c:215 +#: option.c:221 #, fuzzy msgid "Specify PTR DNS record." msgstr "Spécifie un champ DNS TXT" -#: option.c:216 +#: option.c:222 msgid "Bind only to interfaces in use." msgstr "Association uniquement aux interfaces réseau actuellement actives." -#: option.c:217 +#: option.c:223 #, c-format msgid "Read DHCP static host information from %s." msgstr "Lecture des informations de DHCP statique à partir de %s." -#: option.c:218 +#: option.c:224 msgid "Enable the DBus interface for setting upstream servers, etc." msgstr "" "Autorise l'interface DBus pour la configuration des serveurs amonts, etc." -#: option.c:219 +#: option.c:225 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:220 +#: option.c:226 msgid "Enable dynamic address allocation for bootp." msgstr "Autorise l'allocation dynamique d'adresse pour bootp." -#: option.c:221 +#: option.c:227 #, fuzzy msgid "Map MAC address (with wildcards) to option set." msgstr "Associe l'adresse MAC (avec les jokers) aux options." -#: option.c:223 +#: option.c:229 msgid "Treat DHCP requests on aliases as arriving from interface." msgstr "" -#: option.c:225 +#: option.c:231 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:226 +#: option.c:232 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:227 +#: option.c:233 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:228 +#: option.c:234 #, fuzzy msgid "Log to this syslog facility. (defaults to DAEMON)" msgstr "Logue dans cette facilité syslog. (défaut : DAEMON)" -#: option.c:229 +#: option.c:235 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:230 +#: option.c:236 #, 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:231 +#: option.c:237 #, c-format msgid "Clear DNS cache when reloading %s." msgstr "" -#: option.c:232 +#: option.c:238 msgid "Ignore hostnames provided by DHCP clients." msgstr "" -#: option.c:233 +#: option.c:239 msgid "Enable integrated read-only TFTP server." msgstr "" -#: option.c:234 +#: option.c:240 msgid "Export files by TFTP only from the specified subtree." msgstr "" -#: option.c:235 +#: option.c:241 msgid "Allow access only to files owned by the user running dnsmasq." msgstr "" -#: option.c:236 +#: option.c:242 #, 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:361 +#: option.c:243 +msgid "Disable the TFTP blocksize extension." +msgstr "" + +#: option.c:368 #, c-format msgid "" "Usage: dnsmasq [options]\n" @@ -414,147 +423,147 @@ msgstr "" "Usage : dnsmasq [options]\n" "\n" -#: option.c:363 +#: option.c:370 #, 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:365 +#: option.c:372 #, c-format msgid "Valid options are :\n" msgstr "Les options valides sont :\n" -#: option.c:431 +#: option.c:438 msgid "bad dhcp-option" msgstr "mauvais dhcp-option" -#: option.c:577 +#: option.c:584 msgid "bad domain in dhcp-option" msgstr "mauvais domaine dans dhcp-option" -#: option.c:634 +#: option.c:641 msgid "dhcp-option too long" msgstr "dhcp-option trop long" -#: option.c:696 +#: option.c:698 #, fuzzy, c-format msgid "cannot access directory %s: %s" msgstr "Ne peut pas lire le répertoire %s : %s" -#: option.c:715 tftp.c:300 +#: option.c:717 tftp.c:301 #, fuzzy, c-format msgid "cannot access %s: %s" msgstr "Ne peut pas lire %s : %s" -#: option.c:792 +#: option.c:794 msgid "bad MX preference" msgstr "Mauvaise préference MX" -#: option.c:801 +#: option.c:803 msgid "bad MX name" msgstr "mauvais nom MX" -#: option.c:819 +#: option.c:821 msgid "bad MX target" msgstr "mauvaise cible MX" -#: option.c:831 +#: option.c:833 msgid "cannot run scripts under uClinux" msgstr "ne peut exécuter de script sous uClinux" -#: option.c:1030 option.c:1041 +#: option.c:1032 option.c:1043 msgid "bad port" msgstr "mauvais port" -#: option.c:1185 +#: option.c:1187 msgid "bad bridge-interface" msgstr "" -#: option.c:1229 +#: option.c:1231 msgid "bad dhcp-range" msgstr "mauvaise plage d'adresses DHCP (dhcp-range)" -#: option.c:1258 +#: option.c:1260 msgid "only one netid tag allowed" msgstr "une seule étiquette netid est autorisée" -#: option.c:1303 +#: option.c:1305 msgid "inconsistent DHCP range" msgstr "plage d'adresses DHCP incohérente" -#: option.c:1488 +#: option.c:1490 msgid "bad dhcp-host" msgstr "mauvais dhcp-host" -#: option.c:1688 +#: option.c:1691 #, fuzzy msgid "bad PTR record" msgstr "mauvais champ SRV" -#: option.c:1713 +#: option.c:1716 msgid "bad TXT record" msgstr "mauvais champ TXT" -#: option.c:1745 +#: option.c:1748 msgid "TXT record string too long" msgstr "chaîne du champ TXT trop longue" -#: option.c:1784 +#: option.c:1787 msgid "bad SRV record" msgstr "mauvais champ SRV" -#: option.c:1797 +#: option.c:1800 msgid "bad SRV target" msgstr "mauvaise cible SRV" -#: option.c:1809 +#: option.c:1812 msgid "invalid port number" msgstr "numéro de port invalide" -#: option.c:1820 +#: option.c:1823 msgid "invalid priority" msgstr "priorité invalide" -#: option.c:1831 +#: option.c:1834 msgid "invalid weight" msgstr "poids invalide" -#: option.c:1862 +#: option.c:1865 #, c-format msgid "files nested too deep in %s" msgstr "trop de niveaux de récursion pour les fichiers dans %s" -#: option.c:1869 tftp.c:450 +#: option.c:1872 tftp.c:451 #, c-format msgid "cannot read %s: %s" msgstr "Ne peut pas lire %s : %s" -#: option.c:1912 +#: option.c:1917 msgid "missing \"" msgstr "il manque \"" -#: option.c:1951 +#: option.c:1956 msgid "bad option" msgstr "mauvaise option" -#: option.c:1953 +#: option.c:1958 msgid "extraneous parameter" msgstr "paramètre en trop" -#: option.c:1955 +#: option.c:1960 msgid "missing parameter" msgstr "paramètre manquant" -#: option.c:1957 +#: option.c:1962 msgid "error" msgstr "erreur" -#: option.c:2025 +#: option.c:2030 #, c-format msgid "Dnsmasq version %s %s\n" msgstr "Version de Dnsmasq %s %s\n" -#: option.c:2026 +#: option.c:2031 #, c-format msgid "" "Compile time options %s\n" @@ -563,56 +572,56 @@ msgstr "" "Options à la compilation %s\n" "\n" -#: option.c:2027 +#: option.c:2032 #, c-format msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" msgstr "Ce logiciel est fourni sans AUCUNE GARANTIE.\n" -#: option.c:2028 +#: option.c:2033 #, 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:2029 +#: option.c:2034 #, c-format msgid "under the terms of the GNU General Public License, version 2.\n" msgstr "" "sous les termes de la licence GPL (GNU General Public License), version 2.\n" -#: option.c:2040 +#: option.c:2045 msgid "try --help" msgstr "essayez avec --help" -#: option.c:2042 +#: option.c:2047 msgid "try -w" msgstr "essayez avec -w" -#: option.c:2045 +#: option.c:2050 #, fuzzy, c-format msgid "bad command line options: %s" msgstr "mauvaises options en ligne de commande : %s." -#: option.c:2096 +#: option.c:2101 #, c-format msgid "cannot get host-name: %s" msgstr "ne peut pas obtenir le nom de la machine : %s" -#: option.c:2124 +#: option.c:2129 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:2134 +#: option.c:2139 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:2137 +#: option.c:2142 #, fuzzy, c-format msgid "failed to read %s: %s" msgstr "impossible de lire %s : %m" -#: option.c:2155 +#: option.c:2160 #, c-format msgid "no search directive found in %s" msgstr "pas de directive de recherche trouvée dans %s" @@ -948,63 +957,63 @@ msgstr "le script lease-init a retourné le code %s" msgid "failed to write %s: %s (retry in %us)" msgstr "impossible de lire %s : %s (prochain essai dans %us)" -#: rfc2131.c:297 +#: rfc2131.c:271 #, 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:298 +#: rfc2131.c:272 msgid "with subnet selector" msgstr "avec sélecteur de sous-reseau" -#: rfc2131.c:298 +#: rfc2131.c:272 msgid "via" msgstr "par l'intermédiaire de" -#: rfc2131.c:322 rfc2131.c:347 +#: rfc2131.c:296 rfc2131.c:327 msgid "disabled" msgstr "désactivé" -#: rfc2131.c:359 rfc2131.c:814 +#: rfc2131.c:339 rfc2131.c:778 msgid "address in use" msgstr "adresse déjà utilisée" -#: rfc2131.c:362 +#: rfc2131.c:342 msgid "no address configured" msgstr "pas d'adresse configurée" -#: rfc2131.c:375 rfc2131.c:682 +#: rfc2131.c:355 rfc2131.c:646 msgid "no address available" msgstr "pas d'adresse disponible" -#: rfc2131.c:384 rfc2131.c:824 +#: rfc2131.c:364 rfc2131.c:788 msgid "no leases left" msgstr "plus aucun bail disponible" -#: rfc2131.c:387 rfc2131.c:788 +#: rfc2131.c:367 rfc2131.c:752 msgid "wrong network" msgstr "mauvais réseau" -#: rfc2131.c:605 +#: rfc2131.c:569 #, fuzzy, c-format msgid "disabling DHCP static address %s for %s" msgstr "désactive l'adresse statique DHCP %s pour %s" -#: rfc2131.c:626 +#: rfc2131.c:590 msgid "unknown lease" msgstr "bail inconnu" -#: rfc2131.c:635 rfc2131.c:934 +#: rfc2131.c:599 rfc2131.c:898 msgid "ignored" msgstr "ignoré" -#: rfc2131.c:655 +#: rfc2131.c:619 #, 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:665 +#: rfc2131.c:629 #, c-format msgid "" "not using configured address %s because it is in use by the server or relay" @@ -1012,46 +1021,40 @@ msgstr "" "L'adresse statique %s ne sera pas utilisée car elle est utilisée par le " "serveur ou un relai" -#: rfc2131.c:668 +#: rfc2131.c:632 #, 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:751 +#: rfc2131.c:715 msgid "wrong address" msgstr "mauvaise adresse" -#: rfc2131.c:764 +#: rfc2131.c:728 msgid "lease not found" msgstr "bail non trouvé" -#: rfc2131.c:796 +#: rfc2131.c:760 msgid "address not available" msgstr "adresse non disponible" -#: rfc2131.c:807 +#: rfc2131.c:771 msgid "static lease available" msgstr "bail statique disponible" -#: rfc2131.c:811 +#: rfc2131.c:775 msgid "address reserved" msgstr "adresse reservée" -#: rfc2131.c:817 +#: rfc2131.c:781 msgid "no unique-id" msgstr "pas d'identifiant unique" -#: rfc2131.c:1181 -#, c-format -msgid "cannot send DHCP option %d: no space left in packet" -msgstr "" -"Impossible d'envoyer l'option DHCP %d : pas assez d'espace dans le paquet" - -#: rfc2131.c:1476 +#: rfc2131.c:1180 #, fuzzy, c-format -msgid "cannot send encapsulated option %d: no space left in wrapper" +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" @@ -1108,25 +1111,30 @@ msgstr "impossible d'accéder à %s : %m" msgid "unsupported request from %s" msgstr "" -#: tftp.c:229 +#: tftp.c:230 #, c-format msgid "TFTP sent %s to %s" msgstr "" -#: tftp.c:296 +#: tftp.c:297 #, fuzzy, c-format msgid "file %s not found" msgstr "bail non trouvé" -#: tftp.c:352 +#: tftp.c:353 #, c-format msgid "TFTP error %d %s received from %s" msgstr "" -#: tftp.c:383 +#: tftp.c:384 #, fuzzy, c-format msgid "TFTP failed sending %s to %s" msgstr "impossible de lire %s : %m" +#, fuzzy +#~ msgid "cannot send encapsulated option %d: no space left in wrapper" +#~ msgstr "" +#~ "Impossible d'envoyer l'option DHCP %d : pas assez d'espace dans le paquet" + #~ msgid "More than one vendor class matches, using %s" #~ msgstr "Plusieurs classes de fournisseurs correspondent, %s sera utilisé" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: dnsmasq 2.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-05 14:27+0000\n" +"POT-Creation-Date: 2007-02-12 17:55+0000\n" "PO-Revision-Date: 2005-10-07 11:45+0100\n" "Last-Translator: Salman AS <sas@salman.or.id>\n" "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n" @@ -15,36 +15,36 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" # OK -#: cache.c:697 +#: cache.c:694 #, c-format msgid "failed to load names from %s: %m" msgstr "gagal memuat nama-nama dari %s: %m" # OK -#: cache.c:731 dhcp.c:715 +#: cache.c:728 dhcp.c:715 #, fuzzy, c-format msgid "bad address at %s line %d" msgstr "kesalahan nama pada %s baris %d" # OK -#: cache.c:777 dhcp.c:729 +#: cache.c:774 dhcp.c:729 #, c-format msgid "bad name at %s line %d" msgstr "kesalahan nama pada %s baris %d" # OK -#: cache.c:784 dhcp.c:783 +#: cache.c:781 dhcp.c:783 #, c-format msgid "read %s - %d addresses" msgstr "membaca %s - %d alamat" # OK -#: cache.c:822 +#: cache.c:819 msgid "cleared cache" msgstr "cache telah dihapus" # OK -#: cache.c:875 +#: cache.c:866 #, c-format msgid "" "not giving name %s to the DHCP lease of %s because the name exists in %s " @@ -54,7 +54,7 @@ msgstr "" "sdengan alamat %s" # OK -#: cache.c:919 +#: cache.c:906 #, fuzzy, c-format msgid "" "time %lu, cache size %d, %d/%d cache insertions re-used unexpired cache " @@ -63,7 +63,7 @@ msgstr "" "ukuran cache %d, %d/%d penyisipan cache menimpa cache yang belum kadaluwarsa" # OK -#: util.c:154 option.c:582 +#: util.c:154 option.c:589 msgid "could not get memory" msgstr "tidak bisa mendapatkan memory" @@ -85,375 +85,384 @@ msgid "infinite" msgstr "tak terbatas" # OK -#: option.c:164 +#: option.c:169 msgid "Specify local address(es) to listen on." msgstr "Tentukan alamat lokal untuk mendengarkan." # OK -#: option.c:165 +#: option.c:170 msgid "Return ipaddr for all hosts in specified domains." msgstr "Menghasilkan ipaddr untuk semua host dalam domain yang dipilih." # OK -#: option.c:166 +#: option.c:171 msgid "Fake reverse lookups for RFC1918 private address ranges." msgstr "Fake pencarian balik untuk alamat private sesuai dengan RFC1918." # OK -#: option.c:167 +#: option.c:172 msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)." msgstr "Perlakukan ipaddr sebagai NXDOMAIN (mengalahkan wildcard Verisign)." # OK -#: option.c:168 +#: option.c:173 #, 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:169 +#: option.c:174 #, c-format msgid "Specify configuration file (defaults to %s)." msgstr "Tentukan file konfigurasi (default %s)." # OK -#: option.c:170 +#: option.c:175 msgid "Do NOT fork into the background: run in debug mode." msgstr "JANGAN berjalan di background: berjalan dalam modus debug." # OK -#: option.c:171 +#: option.c:176 msgid "Do NOT forward queries with no domain part." msgstr "JANGAN teruskan permintaan tanpa bagian domain." # OK -#: option.c:172 +#: option.c:177 msgid "Return self-pointing MX records for local hosts." msgstr "Mengembalikan record MX untuk diri sendiri host-host lokal." # OK -#: option.c:173 +#: option.c:178 msgid "Expand simple names in /etc/hosts with domain-suffix." msgstr "Melengkapi nama-nama di /etc/hosts dengan akhiran domain." # OK -#: option.c:174 +#: option.c:179 msgid "Don't forward spurious DNS requests from Windows hosts." msgstr "Jangan meneruskan permintaan DNS spurious dari host-host Windows." # OK -#: option.c:175 +#: option.c:180 msgid "Enable DHCP in the range given with lease duration." msgstr "Bolehkan DHCP dalam jangkauan yang diberikan dengan durasi lease." # OK -#: option.c:176 +#: option.c:181 #, c-format msgid "Change to this group after startup (defaults to %s)." msgstr "Ubah ke group ini setelah mulai (default %s)." # OK -#: option.c:177 +#: option.c:182 msgid "Set address or hostname for a specified machine." msgstr "Setel alamat atau nama host untuk mesin yang disebutkan." # OK -#: option.c:178 +#: option.c:183 #, c-format msgid "Do NOT load %s file." msgstr "JANGAN muat file %s." # OK -#: option.c:179 +#: option.c:184 #, 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:180 +#: option.c:185 msgid "Specify interface(s) to listen on." msgstr "Sebutkan antarmuka untuk mendengarkan." # OK -#: option.c:181 +#: option.c:186 msgid "Specify interface(s) NOT to listen on." msgstr "Sebutkan antarmuka untuk TIDAK mendengarkan." # OK -#: option.c:182 +#: option.c:187 msgid "Map DHCP user class to option set." msgstr "Petakan kelas user DHCP ke setelan yang dipilih." # OK -#: option.c:183 +#: option.c:188 msgid "Don't do DHCP for hosts in option set." msgstr "Jangan menggunakan DHCP untuk host-host yang dipilih." # OK -#: option.c:184 +#: option.c:189 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:185 +#: option.c:190 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:186 +#: option.c:191 #, c-format msgid "Specify where to store DHCP leases (defaults to %s)." msgstr "Sebutkan lokasi untuk menyimpan lease DHCP (default %s)." # OK -#: option.c:187 +#: option.c:192 msgid "Return MX records for local hosts." msgstr "Kembalikan rekord MX untuk host-host lokal." # OK -#: option.c:188 +#: option.c:193 msgid "Specify an MX record." msgstr "Sebutkan sebuah rekord MX." # OK -#: option.c:189 +#: option.c:194 msgid "Specify BOOTP options to DHCP server." msgstr "Sebutkan pilihan-pilihan BOOTP untuk DHCP server." -#: option.c:190 +#: option.c:195 #, c-format msgid "Do NOT poll %s file, reload only on SIGHUP." msgstr "Jangan kumpulkan file %s, muat kembali saat SIGHUP." # OK -#: option.c:191 +#: option.c:196 msgid "Do NOT cache failed search results." msgstr "JANGAN menyimpan hasil pencarian yang gagal." # OK -#: option.c:192 +#: option.c:197 #, 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:193 -msgid "Set extra options to be set to DHCP clients." +#: option.c:198 +#, fuzzy +msgid "Specify options to be sent to DHCP clients." msgstr "" "Setel pilihan-pilihan tambahan yang akan disetel untuk klien-klien DHCP." +#: option.c:199 +msgid "DHCP option sent even if the client does not request it." +msgstr "" + # OK -#: option.c:194 +#: option.c:200 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:195 +#: option.c:201 #, 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:196 +#: option.c:202 msgid "Log queries." msgstr "Permintaan log." # OK -#: option.c:197 +#: option.c:203 msgid "Force the originating port for upstream queries." msgstr "Paksa port asal untuk permintaan ke atas." # OK -#: option.c:198 +#: option.c:204 msgid "Do NOT read resolv.conf." msgstr "JANGAN baca resolv.conf." # OK -#: option.c:199 +#: option.c:205 #, c-format msgid "Specify path to resolv.conf (defaults to %s)." msgstr "Sebutkan path ke resolv.conf (default %s)." # OK -#: option.c:200 +#: option.c:206 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:201 +#: option.c:207 msgid "Never forward queries to specified domains." msgstr "JANGAN pernah meneruskan permintaan ke domain yang disebutkan." # OK -#: option.c:202 +#: option.c:208 msgid "Specify the domain to be assigned in DHCP leases." msgstr "Sebutkan domain yang digunakan dalam lease DHCP." # OK -#: option.c:203 +#: option.c:209 msgid "Specify default target in an MX record." msgstr "Sebutkan tujuan default dalam rekord MX." # OK -#: option.c:204 +#: option.c:210 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:205 +#: option.c:211 #, c-format msgid "Change to this user after startup. (defaults to %s)." msgstr "Ubah ke user ini setelah mulai. (default %s)." # OK -#: option.c:206 +#: option.c:212 msgid "Map DHCP vendor class to option set." msgstr "Memetakan kelas vendor DHCP ke daftar pilihan." # OK -#: option.c:207 +#: option.c:213 msgid "Display dnsmasq version and copyright information." msgstr "Menampilkan versi dan informasi hak cipta dnsmasq." # OK -#: option.c:208 +#: option.c:214 msgid "Translate IPv4 addresses from upstream servers." msgstr "Terjemahkan alamat-alamat IPv4 dari server-server di atas." # OK -#: option.c:209 +#: option.c:215 msgid "Specify a SRV record." msgstr "Sebutkan rekord SRV." # OK -#: option.c:210 +#: option.c:216 msgid "Display this message." msgstr "Menampilkan pesan ini." # OK -#: option.c:211 +#: option.c:217 #, fuzzy, c-format msgid "Specify path of PID file (defaults to %s)." msgstr "Sebutkan path file PID. (default %s)." # OK -#: option.c:212 +#: option.c:218 #, c-format msgid "Specify maximum number of DHCP leases (defaults to %s)." msgstr "Sebutkan jumlah maksimum lease DHCP (default %s)." # OK -#: option.c:213 +#: option.c:219 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:214 +#: option.c:220 msgid "Specify TXT DNS record." msgstr "Sebutkan rekord TXT DNS." # OK -#: option.c:215 +#: option.c:221 #, fuzzy msgid "Specify PTR DNS record." msgstr "Sebutkan rekord TXT DNS." # OK -#: option.c:216 +#: option.c:222 msgid "Bind only to interfaces in use." msgstr "Hanya kaitkan ke antarmuka yang sedang digunakan saja." # OK -#: option.c:217 +#: option.c:223 #, c-format msgid "Read DHCP static host information from %s." msgstr "Baca informasi statik host DHCP dari %s." # OK -#: option.c:218 +#: option.c:224 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:219 +#: option.c:225 msgid "Do not provide DHCP on this interface, only provide DNS." msgstr "JANGAN menyediakan DHCP pada antarmuka ini, hanya menyediakan DNS." # OK -#: option.c:220 +#: option.c:226 msgid "Enable dynamic address allocation for bootp." msgstr "Mungkinkan alokasi alamat dinamis untuk bootp." # OK -#: option.c:221 +#: option.c:227 #, fuzzy msgid "Map MAC address (with wildcards) to option set." msgstr "Memetakan kelas vendor DHCP ke daftar pilihan." -#: option.c:223 +#: option.c:229 msgid "Treat DHCP requests on aliases as arriving from interface." msgstr "" -#: option.c:225 +#: option.c:231 msgid "Disable ICMP echo address checking in the DHCP server." msgstr "" -#: option.c:226 +#: option.c:232 msgid "Script to run on DHCP lease creation and destruction." msgstr "" -#: option.c:227 +#: option.c:233 msgid "Read configuration from all the files in this directory." msgstr "" # OK -#: option.c:228 +#: option.c:234 #, fuzzy msgid "Log to this syslog facility. (defaults to DAEMON)" msgstr "Ubah ke user ini setelah mulai. (default %s)." -#: option.c:229 +#: option.c:235 msgid "Read leases at startup, but never write the lease file." msgstr "" # OK -#: option.c:230 +#: option.c:236 #, fuzzy, c-format msgid "Maximum number of concurrent DNS queries. (defaults to %s)" msgstr "Sebutkan jumlah maksimum lease DHCP (default %s)." -#: option.c:231 +#: option.c:237 #, c-format msgid "Clear DNS cache when reloading %s." msgstr "" -#: option.c:232 +#: option.c:238 msgid "Ignore hostnames provided by DHCP clients." msgstr "" -#: option.c:233 +#: option.c:239 msgid "Enable integrated read-only TFTP server." msgstr "" -#: option.c:234 +#: option.c:240 msgid "Export files by TFTP only from the specified subtree." msgstr "" -#: option.c:235 +#: option.c:241 msgid "Allow access only to files owned by the user running dnsmasq." msgstr "" # OK -#: option.c:236 +#: option.c:242 #, fuzzy, c-format msgid "Maximum number of conncurrent TFTP transfers (defaults to %s)." msgstr "Sebutkan jumlah maksimum lease DHCP (default %s)." +#: option.c:243 +msgid "Disable the TFTP blocksize extension." +msgstr "" + # OK -#: option.c:361 +#: option.c:368 #, c-format msgid "" "Usage: dnsmasq [options]\n" @@ -463,176 +472,176 @@ msgstr "" "\n" # OK -#: option.c:363 +#: option.c:370 #, c-format msgid "Use short options only on the command line.\n" msgstr "Gunakan pilihan pendek saja pada perintah baris.\n" # OK -#: option.c:365 +#: option.c:372 #, c-format msgid "Valid options are :\n" msgstr "Pilihan yang boleh adalah:\n" # OK -#: option.c:431 +#: option.c:438 msgid "bad dhcp-option" msgstr "dhcp-option salah" # OK -#: option.c:577 +#: option.c:584 msgid "bad domain in dhcp-option" msgstr "domain dalam dhcp-option salah" # OK -#: option.c:634 +#: option.c:641 msgid "dhcp-option too long" msgstr "dhcp-option terlalu panjang" # OK -#: option.c:696 +#: option.c:698 #, fuzzy, c-format msgid "cannot access directory %s: %s" msgstr "tidak bisa membaca %s: %s" # OK -#: option.c:715 tftp.c:300 +#: option.c:717 tftp.c:301 #, fuzzy, c-format msgid "cannot access %s: %s" msgstr "tidak bisa membaca %s: %s" # OK -#: option.c:792 +#: option.c:794 msgid "bad MX preference" msgstr "kesukaan MX salah" # OK -#: option.c:801 +#: option.c:803 msgid "bad MX name" msgstr "nama MX salah" # OK -#: option.c:819 +#: option.c:821 msgid "bad MX target" msgstr "target MX salah" -#: option.c:831 +#: option.c:833 msgid "cannot run scripts under uClinux" msgstr "" # OK -#: option.c:1030 option.c:1041 +#: option.c:1032 option.c:1043 msgid "bad port" msgstr "port salah" -#: option.c:1185 +#: option.c:1187 msgid "bad bridge-interface" msgstr "" # OK -#: option.c:1229 +#: option.c:1231 msgid "bad dhcp-range" msgstr "dhcp-range salah" -#: option.c:1258 +#: option.c:1260 msgid "only one netid tag allowed" msgstr "" # OK -#: option.c:1303 +#: option.c:1305 msgid "inconsistent DHCP range" msgstr "jangkauan DHCP tidak konsisten" # OK -#: option.c:1488 +#: option.c:1490 msgid "bad dhcp-host" msgstr "dhcp-host salah" # OK -#: option.c:1688 +#: option.c:1691 #, fuzzy msgid "bad PTR record" msgstr "rekord SRV salah" # OK -#: option.c:1713 +#: option.c:1716 msgid "bad TXT record" msgstr "rekord TXT salah" # OK -#: option.c:1745 +#: option.c:1748 msgid "TXT record string too long" msgstr "string rekord TXT terlalu panjang" # OK -#: option.c:1784 +#: option.c:1787 msgid "bad SRV record" msgstr "rekord SRV salah" # OK -#: option.c:1797 +#: option.c:1800 msgid "bad SRV target" msgstr "target SRV salah" # OK -#: option.c:1809 +#: option.c:1812 msgid "invalid port number" msgstr "nomor port tidak benar" # OK -#: option.c:1820 +#: option.c:1823 msgid "invalid priority" msgstr "prioritas tidak benar" # OK -#: option.c:1831 +#: option.c:1834 msgid "invalid weight" msgstr "weight tidak benar" -#: option.c:1862 +#: option.c:1865 #, c-format msgid "files nested too deep in %s" msgstr "" # OK -#: option.c:1869 tftp.c:450 +#: option.c:1872 tftp.c:451 #, c-format msgid "cannot read %s: %s" msgstr "tidak bisa membaca %s: %s" # OK -#: option.c:1912 +#: option.c:1917 msgid "missing \"" msgstr "kurang \"" # OK -#: option.c:1951 +#: option.c:1956 msgid "bad option" msgstr "pilihan salah" # OK -#: option.c:1953 +#: option.c:1958 msgid "extraneous parameter" msgstr "parameter berlebihan" # OK -#: option.c:1955 +#: option.c:1960 msgid "missing parameter" msgstr "parameter kurang" # OK -#: option.c:1957 +#: option.c:1962 msgid "error" msgstr "kesalahan" # OK -#: option.c:2025 +#: option.c:2030 #, c-format msgid "Dnsmasq version %s %s\n" msgstr "Dnsmasq versi %s %s\n" # OK -#: option.c:2026 +#: option.c:2031 #, c-format msgid "" "Compile time options %s\n" @@ -642,13 +651,13 @@ msgstr "" "\n" # OK -#: option.c:2027 +#: option.c:2032 #, c-format msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" msgstr "Perangkat lunak ini tersedia TANPA JAMINAN SEDIKITPUN.\n" # OK -#: option.c:2028 +#: option.c:2033 #, c-format msgid "Dnsmasq is free software, and you are welcome to redistribute it\n" msgstr "" @@ -656,49 +665,49 @@ msgstr "" "membagikannya\n" # OK -#: option.c:2029 +#: option.c:2034 #, c-format msgid "under the terms of the GNU General Public License, version 2.\n" msgstr "dengan aturan GNU General Public License, versi 2.\n" -#: option.c:2040 +#: option.c:2045 msgid "try --help" msgstr "" -#: option.c:2042 +#: option.c:2047 msgid "try -w" msgstr "" # OK -#: option.c:2045 +#: option.c:2050 #, fuzzy, c-format msgid "bad command line options: %s" msgstr "pilihan baris perintah salah: %s." # OK -#: option.c:2096 +#: option.c:2101 #, c-format msgid "cannot get host-name: %s" msgstr "tidak bisa mendapatkan host-name: %s" # OK -#: option.c:2124 +#: option.c:2129 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:2134 +#: option.c:2139 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:2137 +#: option.c:2142 #, fuzzy, c-format msgid "failed to read %s: %s" msgstr "gagal membaca %s: %m" # OK -#: option.c:2155 +#: option.c:2160 #, c-format msgid "no search directive found in %s" msgstr "tidak ditemukan direktif search di %s" @@ -1088,120 +1097,115 @@ msgid "failed to write %s: %s (retry in %us)" msgstr "gagal membaca %s: %m" # OK -#: rfc2131.c:297 +#: rfc2131.c:271 #, 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:298 +#: rfc2131.c:272 msgid "with subnet selector" msgstr "dengan pemilih subnet" # OK -#: rfc2131.c:298 +#: rfc2131.c:272 msgid "via" msgstr "lewat" # OK -#: rfc2131.c:322 rfc2131.c:347 +#: rfc2131.c:296 rfc2131.c:327 msgid "disabled" msgstr "di disable" # OK -#: rfc2131.c:359 rfc2131.c:814 +#: rfc2131.c:339 rfc2131.c:778 msgid "address in use" msgstr "alamat telah digunakan" # OK -#: rfc2131.c:362 +#: rfc2131.c:342 msgid "no address configured" msgstr "tak ada alamat yang disetel" # OK -#: rfc2131.c:375 rfc2131.c:682 +#: rfc2131.c:355 rfc2131.c:646 msgid "no address available" msgstr "tak ada alamat yang tersedia" # OK -#: rfc2131.c:384 rfc2131.c:824 +#: rfc2131.c:364 rfc2131.c:788 msgid "no leases left" msgstr "tak ada lease yang tersisa" # OK -#: rfc2131.c:387 rfc2131.c:788 +#: rfc2131.c:367 rfc2131.c:752 msgid "wrong network" msgstr "jaringan yang salah" # OK -#: rfc2131.c:605 +#: rfc2131.c:569 #, fuzzy, c-format msgid "disabling DHCP static address %s for %s" msgstr "men-disable alamat statik DHCP %s" # OK -#: rfc2131.c:626 +#: rfc2131.c:590 msgid "unknown lease" msgstr "lease tidak diketahui" # OK -#: rfc2131.c:635 rfc2131.c:934 +#: rfc2131.c:599 rfc2131.c:898 msgid "ignored" msgstr "diabaikan" -#: rfc2131.c:655 +#: rfc2131.c:619 #, c-format msgid "not using configured address %s because it is leased to %s" msgstr "" -#: rfc2131.c:665 +#: rfc2131.c:629 #, c-format msgid "" "not using configured address %s because it is in use by the server or relay" msgstr "" -#: rfc2131.c:668 +#: rfc2131.c:632 #, c-format msgid "not using configured address %s because it was previously declined" msgstr "" # OK -#: rfc2131.c:751 +#: rfc2131.c:715 msgid "wrong address" msgstr "alamat salah" # OK -#: rfc2131.c:764 +#: rfc2131.c:728 msgid "lease not found" msgstr "lease tak ditemukan" # OK -#: rfc2131.c:796 +#: rfc2131.c:760 msgid "address not available" msgstr "alamat tak tersedia" # OK -#: rfc2131.c:807 +#: rfc2131.c:771 msgid "static lease available" msgstr "lease statik tak tersedia" # OK -#: rfc2131.c:811 +#: rfc2131.c:775 msgid "address reserved" msgstr "alamat telah dipesan" -#: rfc2131.c:817 +#: rfc2131.c:781 msgid "no unique-id" msgstr "" -#: rfc2131.c:1181 -#, c-format -msgid "cannot send DHCP option %d: no space left in packet" -msgstr "" - -#: rfc2131.c:1476 +#: rfc2131.c:1180 #, c-format -msgid "cannot send encapsulated option %d: no space left in wrapper" +msgid "cannot send DHCP/BOOTP option %d: no space left in packet" msgstr "" # OK @@ -1267,24 +1271,24 @@ msgstr "gagal mengakses %s: %m" msgid "unsupported request from %s" msgstr "" -#: tftp.c:229 +#: tftp.c:230 #, c-format msgid "TFTP sent %s to %s" msgstr "" # OK -#: tftp.c:296 +#: tftp.c:297 #, fuzzy, c-format msgid "file %s not found" msgstr "lease tak ditemukan" -#: tftp.c:352 +#: tftp.c:353 #, c-format msgid "TFTP error %d %s received from %s" msgstr "" # OK -#: tftp.c:383 +#: tftp.c:384 #, fuzzy, c-format msgid "TFTP failed sending %s to %s" msgstr "gagal membaca %s: %m" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: dnsmasq 2.32\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-05 14:27+0000\n" +"POT-Creation-Date: 2007-02-12 17:55+0000\n" "PO-Revision-Date: 2006-05-22 11:09+0100\n" "Last-Translator: Simon Kelley <simon@thekelleys.org.uk>\n" "Language-Team: Italian <tp@lists.linux.it>\n" @@ -15,45 +15,45 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: cache.c:697 +#: cache.c:694 #, c-format msgid "failed to load names from %s: %m" msgstr "" -#: cache.c:731 dhcp.c:715 +#: cache.c:728 dhcp.c:715 #, c-format msgid "bad address at %s line %d" msgstr "" -#: cache.c:777 dhcp.c:729 +#: cache.c:774 dhcp.c:729 #, c-format msgid "bad name at %s line %d" msgstr "" -#: cache.c:784 dhcp.c:783 +#: cache.c:781 dhcp.c:783 #, c-format msgid "read %s - %d addresses" msgstr "" -#: cache.c:822 +#: cache.c:819 msgid "cleared cache" msgstr "" -#: cache.c:875 +#: cache.c:866 #, 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:919 +#: cache.c:906 #, c-format msgid "" "time %lu, cache size %d, %d/%d cache insertions re-used unexpired cache " "entries." msgstr "" -#: util.c:154 option.c:582 +#: util.c:154 option.c:589 msgid "could not get memory" msgstr "" @@ -71,507 +71,515 @@ msgstr "" msgid "infinite" msgstr "" -#: option.c:164 +#: option.c:169 msgid "Specify local address(es) to listen on." msgstr "" -#: option.c:165 +#: option.c:170 msgid "Return ipaddr for all hosts in specified domains." msgstr "" -#: option.c:166 +#: option.c:171 msgid "Fake reverse lookups for RFC1918 private address ranges." msgstr "" -#: option.c:167 +#: option.c:172 msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)." msgstr "" -#: option.c:168 +#: option.c:173 #, c-format msgid "Specify the size of the cache in entries (defaults to %s)." msgstr "" -#: option.c:169 +#: option.c:174 #, c-format msgid "Specify configuration file (defaults to %s)." msgstr "" -#: option.c:170 +#: option.c:175 msgid "Do NOT fork into the background: run in debug mode." msgstr "" -#: option.c:171 +#: option.c:176 msgid "Do NOT forward queries with no domain part." msgstr "" -#: option.c:172 +#: option.c:177 msgid "Return self-pointing MX records for local hosts." msgstr "" -#: option.c:173 +#: option.c:178 msgid "Expand simple names in /etc/hosts with domain-suffix." msgstr "" -#: option.c:174 +#: option.c:179 msgid "Don't forward spurious DNS requests from Windows hosts." msgstr "" -#: option.c:175 +#: option.c:180 msgid "Enable DHCP in the range given with lease duration." msgstr "" -#: option.c:176 +#: option.c:181 #, c-format msgid "Change to this group after startup (defaults to %s)." msgstr "" -#: option.c:177 +#: option.c:182 msgid "Set address or hostname for a specified machine." msgstr "" -#: option.c:178 +#: option.c:183 #, c-format msgid "Do NOT load %s file." msgstr "" -#: option.c:179 +#: option.c:184 #, c-format msgid "Specify a hosts file to be read in addition to %s." msgstr "" -#: option.c:180 +#: option.c:185 msgid "Specify interface(s) to listen on." msgstr "" -#: option.c:181 +#: option.c:186 msgid "Specify interface(s) NOT to listen on." msgstr "" -#: option.c:182 +#: option.c:187 msgid "Map DHCP user class to option set." msgstr "" -#: option.c:183 +#: option.c:188 msgid "Don't do DHCP for hosts in option set." msgstr "" -#: option.c:184 +#: option.c:189 msgid "Do NOT fork into the background, do NOT run in debug mode." msgstr "" -#: option.c:185 +#: option.c:190 msgid "Assume we are the only DHCP server on the local network." msgstr "" -#: option.c:186 +#: option.c:191 #, c-format msgid "Specify where to store DHCP leases (defaults to %s)." msgstr "" -#: option.c:187 +#: option.c:192 msgid "Return MX records for local hosts." msgstr "" -#: option.c:188 +#: option.c:193 msgid "Specify an MX record." msgstr "" -#: option.c:189 +#: option.c:194 msgid "Specify BOOTP options to DHCP server." msgstr "" -#: option.c:190 +#: option.c:195 #, c-format msgid "Do NOT poll %s file, reload only on SIGHUP." msgstr "" -#: option.c:191 +#: option.c:196 msgid "Do NOT cache failed search results." msgstr "" -#: option.c:192 +#: option.c:197 #, c-format msgid "Use nameservers strictly in the order given in %s." msgstr "" -#: option.c:193 -msgid "Set extra options to be set to DHCP clients." +#: option.c:198 +msgid "Specify options to be sent to DHCP clients." msgstr "" -#: option.c:194 +#: option.c:199 +msgid "DHCP option sent even if the client does not request it." +msgstr "" + +#: option.c:200 msgid "Specify port to listen for DNS requests on (defaults to 53)." msgstr "" -#: option.c:195 +#: option.c:201 #, c-format msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)." msgstr "" -#: option.c:196 +#: option.c:202 msgid "Log queries." msgstr "" -#: option.c:197 +#: option.c:203 msgid "Force the originating port for upstream queries." msgstr "" -#: option.c:198 +#: option.c:204 msgid "Do NOT read resolv.conf." msgstr "" -#: option.c:199 +#: option.c:205 #, c-format msgid "Specify path to resolv.conf (defaults to %s)." msgstr "" -#: option.c:200 +#: option.c:206 msgid "Specify address(es) of upstream servers with optional domains." msgstr "" -#: option.c:201 +#: option.c:207 msgid "Never forward queries to specified domains." msgstr "" -#: option.c:202 +#: option.c:208 msgid "Specify the domain to be assigned in DHCP leases." msgstr "" -#: option.c:203 +#: option.c:209 msgid "Specify default target in an MX record." msgstr "" -#: option.c:204 +#: option.c:210 msgid "Specify time-to-live in seconds for replies from /etc/hosts." msgstr "" -#: option.c:205 +#: option.c:211 #, c-format msgid "Change to this user after startup. (defaults to %s)." msgstr "" -#: option.c:206 +#: option.c:212 msgid "Map DHCP vendor class to option set." msgstr "" -#: option.c:207 +#: option.c:213 msgid "Display dnsmasq version and copyright information." msgstr "" -#: option.c:208 +#: option.c:214 msgid "Translate IPv4 addresses from upstream servers." msgstr "" -#: option.c:209 +#: option.c:215 msgid "Specify a SRV record." msgstr "" -#: option.c:210 +#: option.c:216 msgid "Display this message." msgstr "" -#: option.c:211 +#: option.c:217 #, c-format msgid "Specify path of PID file (defaults to %s)." msgstr "" -#: option.c:212 +#: option.c:218 #, c-format msgid "Specify maximum number of DHCP leases (defaults to %s)." msgstr "" -#: option.c:213 +#: option.c:219 msgid "Answer DNS queries based on the interface a query was sent to." msgstr "" -#: option.c:214 +#: option.c:220 msgid "Specify TXT DNS record." msgstr "" -#: option.c:215 +#: option.c:221 msgid "Specify PTR DNS record." msgstr "" -#: option.c:216 +#: option.c:222 msgid "Bind only to interfaces in use." msgstr "" -#: option.c:217 +#: option.c:223 #, c-format msgid "Read DHCP static host information from %s." msgstr "" -#: option.c:218 +#: option.c:224 msgid "Enable the DBus interface for setting upstream servers, etc." msgstr "" -#: option.c:219 +#: option.c:225 msgid "Do not provide DHCP on this interface, only provide DNS." msgstr "" -#: option.c:220 +#: option.c:226 msgid "Enable dynamic address allocation for bootp." msgstr "" -#: option.c:221 +#: option.c:227 msgid "Map MAC address (with wildcards) to option set." msgstr "" -#: option.c:223 +#: option.c:229 msgid "Treat DHCP requests on aliases as arriving from interface." msgstr "" -#: option.c:225 +#: option.c:231 msgid "Disable ICMP echo address checking in the DHCP server." msgstr "" -#: option.c:226 +#: option.c:232 msgid "Script to run on DHCP lease creation and destruction." msgstr "" -#: option.c:227 +#: option.c:233 msgid "Read configuration from all the files in this directory." msgstr "" -#: option.c:228 +#: option.c:234 msgid "Log to this syslog facility. (defaults to DAEMON)" msgstr "" -#: option.c:229 +#: option.c:235 msgid "Read leases at startup, but never write the lease file." msgstr "" -#: option.c:230 +#: option.c:236 #, c-format msgid "Maximum number of concurrent DNS queries. (defaults to %s)" msgstr "" -#: option.c:231 +#: option.c:237 #, c-format msgid "Clear DNS cache when reloading %s." msgstr "" -#: option.c:232 +#: option.c:238 msgid "Ignore hostnames provided by DHCP clients." msgstr "" -#: option.c:233 +#: option.c:239 msgid "Enable integrated read-only TFTP server." msgstr "" -#: option.c:234 +#: option.c:240 msgid "Export files by TFTP only from the specified subtree." msgstr "" -#: option.c:235 +#: option.c:241 msgid "Allow access only to files owned by the user running dnsmasq." msgstr "" -#: option.c:236 +#: option.c:242 #, c-format msgid "Maximum number of conncurrent TFTP transfers (defaults to %s)." msgstr "" -#: option.c:361 +#: option.c:243 +msgid "Disable the TFTP blocksize extension." +msgstr "" + +#: option.c:368 #, c-format msgid "" "Usage: dnsmasq [options]\n" "\n" msgstr "" -#: option.c:363 +#: option.c:370 #, c-format msgid "Use short options only on the command line.\n" msgstr "" -#: option.c:365 +#: option.c:372 #, c-format msgid "Valid options are :\n" msgstr "" -#: option.c:431 +#: option.c:438 msgid "bad dhcp-option" msgstr "" -#: option.c:577 +#: option.c:584 msgid "bad domain in dhcp-option" msgstr "" -#: option.c:634 +#: option.c:641 msgid "dhcp-option too long" msgstr "" -#: option.c:696 +#: option.c:698 #, c-format msgid "cannot access directory %s: %s" msgstr "" -#: option.c:715 tftp.c:300 +#: option.c:717 tftp.c:301 #, c-format msgid "cannot access %s: %s" msgstr "" -#: option.c:792 +#: option.c:794 msgid "bad MX preference" msgstr "" -#: option.c:801 +#: option.c:803 msgid "bad MX name" msgstr "" -#: option.c:819 +#: option.c:821 msgid "bad MX target" msgstr "" -#: option.c:831 +#: option.c:833 msgid "cannot run scripts under uClinux" msgstr "" -#: option.c:1030 option.c:1041 +#: option.c:1032 option.c:1043 msgid "bad port" msgstr "" -#: option.c:1185 +#: option.c:1187 msgid "bad bridge-interface" msgstr "" -#: option.c:1229 +#: option.c:1231 msgid "bad dhcp-range" msgstr "" -#: option.c:1258 +#: option.c:1260 msgid "only one netid tag allowed" msgstr "" -#: option.c:1303 +#: option.c:1305 msgid "inconsistent DHCP range" msgstr "" -#: option.c:1488 +#: option.c:1490 msgid "bad dhcp-host" msgstr "" -#: option.c:1688 +#: option.c:1691 msgid "bad PTR record" msgstr "" -#: option.c:1713 +#: option.c:1716 msgid "bad TXT record" msgstr "" -#: option.c:1745 +#: option.c:1748 msgid "TXT record string too long" msgstr "" -#: option.c:1784 +#: option.c:1787 msgid "bad SRV record" msgstr "" -#: option.c:1797 +#: option.c:1800 msgid "bad SRV target" msgstr "" -#: option.c:1809 +#: option.c:1812 msgid "invalid port number" msgstr "" -#: option.c:1820 +#: option.c:1823 msgid "invalid priority" msgstr "" -#: option.c:1831 +#: option.c:1834 msgid "invalid weight" msgstr "" -#: option.c:1862 +#: option.c:1865 #, c-format msgid "files nested too deep in %s" msgstr "" -#: option.c:1869 tftp.c:450 +#: option.c:1872 tftp.c:451 #, c-format msgid "cannot read %s: %s" msgstr "" -#: option.c:1912 +#: option.c:1917 msgid "missing \"" msgstr "" -#: option.c:1951 +#: option.c:1956 msgid "bad option" msgstr "" -#: option.c:1953 +#: option.c:1958 msgid "extraneous parameter" msgstr "" -#: option.c:1955 +#: option.c:1960 msgid "missing parameter" msgstr "" -#: option.c:1957 +#: option.c:1962 msgid "error" msgstr "" -#: option.c:2025 +#: option.c:2030 #, c-format msgid "Dnsmasq version %s %s\n" msgstr "" -#: option.c:2026 +#: option.c:2031 #, c-format msgid "" "Compile time options %s\n" "\n" msgstr "" -#: option.c:2027 +#: option.c:2032 #, c-format msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" msgstr "" -#: option.c:2028 +#: option.c:2033 #, c-format msgid "Dnsmasq is free software, and you are welcome to redistribute it\n" msgstr "" -#: option.c:2029 +#: option.c:2034 #, c-format msgid "under the terms of the GNU General Public License, version 2.\n" msgstr "" -#: option.c:2040 +#: option.c:2045 msgid "try --help" msgstr "" -#: option.c:2042 +#: option.c:2047 msgid "try -w" msgstr "" -#: option.c:2045 +#: option.c:2050 #, c-format msgid "bad command line options: %s" msgstr "" -#: option.c:2096 +#: option.c:2101 #, c-format msgid "cannot get host-name: %s" msgstr "" -#: option.c:2124 +#: option.c:2129 msgid "only one resolv.conf file allowed in no-poll mode." msgstr "" -#: option.c:2134 +#: option.c:2139 msgid "must have exactly one resolv.conf to read domain from." msgstr "" -#: option.c:2137 +#: option.c:2142 #, c-format msgid "failed to read %s: %s" msgstr "" -#: option.c:2155 +#: option.c:2160 #, c-format msgid "no search directive found in %s" msgstr "" @@ -893,104 +901,99 @@ msgstr "" msgid "failed to write %s: %s (retry in %us)" msgstr "" -#: rfc2131.c:297 +#: rfc2131.c:271 #, c-format msgid "no address range available for DHCP request %s %s" msgstr "" -#: rfc2131.c:298 +#: rfc2131.c:272 msgid "with subnet selector" msgstr "" -#: rfc2131.c:298 +#: rfc2131.c:272 msgid "via" msgstr "" -#: rfc2131.c:322 rfc2131.c:347 +#: rfc2131.c:296 rfc2131.c:327 msgid "disabled" msgstr "" -#: rfc2131.c:359 rfc2131.c:814 +#: rfc2131.c:339 rfc2131.c:778 msgid "address in use" msgstr "" -#: rfc2131.c:362 +#: rfc2131.c:342 msgid "no address configured" msgstr "" -#: rfc2131.c:375 rfc2131.c:682 +#: rfc2131.c:355 rfc2131.c:646 msgid "no address available" msgstr "" -#: rfc2131.c:384 rfc2131.c:824 +#: rfc2131.c:364 rfc2131.c:788 msgid "no leases left" msgstr "" -#: rfc2131.c:387 rfc2131.c:788 +#: rfc2131.c:367 rfc2131.c:752 msgid "wrong network" msgstr "" -#: rfc2131.c:605 +#: rfc2131.c:569 #, c-format msgid "disabling DHCP static address %s for %s" msgstr "" -#: rfc2131.c:626 +#: rfc2131.c:590 msgid "unknown lease" msgstr "" -#: rfc2131.c:635 rfc2131.c:934 +#: rfc2131.c:599 rfc2131.c:898 msgid "ignored" msgstr "" -#: rfc2131.c:655 +#: rfc2131.c:619 #, c-format msgid "not using configured address %s because it is leased to %s" msgstr "" -#: rfc2131.c:665 +#: rfc2131.c:629 #, c-format msgid "" "not using configured address %s because it is in use by the server or relay" msgstr "" -#: rfc2131.c:668 +#: rfc2131.c:632 #, c-format msgid "not using configured address %s because it was previously declined" msgstr "" -#: rfc2131.c:751 +#: rfc2131.c:715 msgid "wrong address" msgstr "" -#: rfc2131.c:764 +#: rfc2131.c:728 msgid "lease not found" msgstr "" -#: rfc2131.c:796 +#: rfc2131.c:760 msgid "address not available" msgstr "" -#: rfc2131.c:807 +#: rfc2131.c:771 msgid "static lease available" msgstr "" -#: rfc2131.c:811 +#: rfc2131.c:775 msgid "address reserved" msgstr "" -#: rfc2131.c:817 +#: rfc2131.c:781 msgid "no unique-id" msgstr "" -#: rfc2131.c:1181 -#, c-format -msgid "cannot send DHCP option %d: no space left in packet" -msgstr "" - -#: rfc2131.c:1476 +#: rfc2131.c:1180 #, c-format -msgid "cannot send encapsulated option %d: no space left in wrapper" +msgid "cannot send DHCP/BOOTP option %d: no space left in packet" msgstr "" #: netlink.c:59 @@ -1045,22 +1048,22 @@ msgstr "" msgid "unsupported request from %s" msgstr "" -#: tftp.c:229 +#: tftp.c:230 #, c-format msgid "TFTP sent %s to %s" msgstr "" -#: tftp.c:296 +#: tftp.c:297 #, c-format msgid "file %s not found" msgstr "" -#: tftp.c:352 +#: tftp.c:353 #, c-format msgid "TFTP error %d %s received from %s" msgstr "" -#: tftp.c:383 +#: tftp.c:384 #, c-format msgid "TFTP failed sending %s to %s" msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dnsmasq 2.25\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-05 14:27+0000\n" +"POT-Creation-Date: 2007-02-12 17:55+0000\n" "PO-Revision-Date: 2006-01-11 17:39+0000\n" "Last-Translator: Jan Erik Askildt <jeaskildt@gmail.com>\n" "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n" @@ -17,31 +17,31 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: cache.c:697 +#: cache.c:694 #, c-format msgid "failed to load names from %s: %m" msgstr "feilet å laste navn fra %s: %m" -#: cache.c:731 dhcp.c:715 +#: cache.c:728 dhcp.c:715 #, c-format msgid "bad address at %s line %d" msgstr "dårlig adresse ved %s linje %d" -#: cache.c:777 dhcp.c:729 +#: cache.c:774 dhcp.c:729 #, c-format msgid "bad name at %s line %d" msgstr "dårlig navn ved %s linje %d" -#: cache.c:784 dhcp.c:783 +#: cache.c:781 dhcp.c:783 #, c-format msgid "read %s - %d addresses" msgstr "les %s - %d adresser" -#: cache.c:822 +#: cache.c:819 msgid "cleared cache" msgstr "mellomlager tømt" -#: cache.c:875 +#: cache.c:866 #, c-format msgid "" "not giving name %s to the DHCP lease of %s because the name exists in %s " @@ -50,7 +50,7 @@ msgstr "" "gir ikke navnet %s til DHCP leien for %s fordi navnet eksisterer i %s med " "adressen %s" -#: cache.c:919 +#: cache.c:906 #, fuzzy, c-format msgid "" "time %lu, cache size %d, %d/%d cache insertions re-used unexpired cache " @@ -59,7 +59,7 @@ msgstr "" "mellomlager størrelse %d, %d/%d mellomlager innsettinger re-bruker " "mellomlager plasser som ikke er utløpt" -#: util.c:154 option.c:582 +#: util.c:154 option.c:589 msgid "could not get memory" msgstr "kunne ikke få minne" @@ -77,311 +77,320 @@ msgstr "FEILET å starte opp" msgid "infinite" msgstr "uendelig" -#: option.c:164 +#: option.c:169 msgid "Specify local address(es) to listen on." msgstr "Spesifiser lokal(e) adresse(r) å lytte på." -#: option.c:165 +#: option.c:170 msgid "Return ipaddr for all hosts in specified domains." msgstr "Returner ipaddr for alle verter i det spesifiserte domenet." -#: option.c:166 +#: option.c:171 msgid "Fake reverse lookups for RFC1918 private address ranges." msgstr "Forfalsk revers oppslag for RFC1918 private adresse områder." -#: option.c:167 +#: option.c:172 msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)." msgstr "Behandle ipaddr som NXDOMAIN (omgår Verisign wildcard)." -#: option.c:168 +#: option.c:173 #, 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:169 +#: option.c:174 #, c-format msgid "Specify configuration file (defaults to %s)." msgstr "Spesifiser konfigurasjonsfil (standard er %s)." -#: option.c:170 +#: option.c:175 msgid "Do NOT fork into the background: run in debug mode." msgstr "IKKE legg (fork) som bakgrunnsprosess: kjør i debug modus." -#: option.c:171 +#: option.c:176 msgid "Do NOT forward queries with no domain part." msgstr "IKKE videresend oppslag som mangler domene del." -#: option.c:172 +#: option.c:177 msgid "Return self-pointing MX records for local hosts." msgstr "Returner selv-pekende MX post for lokale verter." -#: option.c:173 +#: option.c:178 msgid "Expand simple names in /etc/hosts with domain-suffix." msgstr "Utvid enkle navn i /etc/hosts med domene-suffiks." -#: option.c:174 +#: option.c:179 msgid "Don't forward spurious DNS requests from Windows hosts." msgstr "Ikke videresend falske/uekte DNS forespørsler fra Windows verter." -#: option.c:175 +#: option.c:180 msgid "Enable DHCP in the range given with lease duration." msgstr "Aktiver DHCP i det gitte området med leie varighet" -#: option.c:176 +#: option.c:181 #, c-format msgid "Change to this group after startup (defaults to %s)." msgstr "Skift til denne gruppen etter oppstart (standard er %s)." -#: option.c:177 +#: option.c:182 msgid "Set address or hostname for a specified machine." msgstr "Sett adresse eller vertsnavn for en spesifikk maskin." -#: option.c:178 +#: option.c:183 #, c-format msgid "Do NOT load %s file." msgstr "IKKE last %s filen." -#: option.c:179 +#: option.c:184 #, 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:180 +#: option.c:185 msgid "Specify interface(s) to listen on." msgstr "Spesifiser nettverkskort det skal lyttes på." -#: option.c:181 +#: option.c:186 msgid "Specify interface(s) NOT to listen on." msgstr "Spesifiser nettverkskort det IKKE skal lyttes på." -#: option.c:182 +#: option.c:187 msgid "Map DHCP user class to option set." msgstr "Map DHCP bruker klasse til opsjon sett." -#: option.c:183 +#: option.c:188 msgid "Don't do DHCP for hosts in option set." msgstr "Ikke utfør DHCP for klienter i opsjon sett." -#: option.c:184 +#: option.c:189 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:185 +#: option.c:190 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:186 +#: option.c:191 #, c-format msgid "Specify where to store DHCP leases (defaults to %s)." msgstr "Spesifiser hvor DHCP leiene skal lagres (standard er %s)." -#: option.c:187 +#: option.c:192 msgid "Return MX records for local hosts." msgstr "Returner MX records for lokale verter." -#: option.c:188 +#: option.c:193 msgid "Specify an MX record." msgstr "Spesifiser en MX post." -#: option.c:189 +#: option.c:194 msgid "Specify BOOTP options to DHCP server." msgstr "Spesifiser BOOTP opsjoner til DHCP tjener." -#: option.c:190 +#: option.c:195 #, 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:191 +#: option.c:196 msgid "Do NOT cache failed search results." msgstr "IKKE mellomlagre søkeresultater som feiler." -#: option.c:192 +#: option.c:197 #, 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:193 -msgid "Set extra options to be set to DHCP clients." +#: option.c:198 +#, fuzzy +msgid "Specify options to be sent to DHCP clients." msgstr "Sett ekstra opsjoner som skal fordeles til DHCP klientene." -#: option.c:194 +#: option.c:199 +msgid "DHCP option sent even if the client does not request it." +msgstr "" + +#: option.c:200 msgid "Specify port to listen for DNS requests on (defaults to 53)." msgstr "Spesifiser lytteport for DNS oppslag (standard er 53)." -#: option.c:195 +#: option.c:201 #, 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:196 +#: option.c:202 msgid "Log queries." msgstr "Logg oppslag." -#: option.c:197 +#: option.c:203 msgid "Force the originating port for upstream queries." msgstr "Tving bruk av opprinnelig port for oppstrøms oppslag." -#: option.c:198 +#: option.c:204 msgid "Do NOT read resolv.conf." msgstr "IKKE les resolv.conf." -#: option.c:199 +#: option.c:205 #, c-format msgid "Specify path to resolv.conf (defaults to %s)." msgstr "Spesifiser stien til resolv.conf (standard er %s)." -#: option.c:200 +#: option.c:206 msgid "Specify address(es) of upstream servers with optional domains." msgstr "Spesifiser adressen(e) til oppstrøms tjenere med valgfrie domener." -#: option.c:201 +#: option.c:207 msgid "Never forward queries to specified domains." msgstr "Aldri videresend oppslag til spesifiserte domener." -#: option.c:202 +#: option.c:208 msgid "Specify the domain to be assigned in DHCP leases." msgstr "Spesifiser domenet som skal tildeles i DHCP leien." -#: option.c:203 +#: option.c:209 msgid "Specify default target in an MX record." msgstr "Spesifiser default mål i en MX post." -#: option.c:204 +#: option.c:210 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:205 +#: option.c:211 #, c-format msgid "Change to this user after startup. (defaults to %s)." msgstr "Skift til denne bruker etter oppstart (standard er %s)." -#: option.c:206 +#: option.c:212 msgid "Map DHCP vendor class to option set." msgstr "Map DHCP produsent klasse til opsjon sett." -#: option.c:207 +#: option.c:213 msgid "Display dnsmasq version and copyright information." msgstr "Vis dnsmasq versjon og copyright informasjon." -#: option.c:208 +#: option.c:214 msgid "Translate IPv4 addresses from upstream servers." msgstr "Oversett IPv4 adresser fra oppstrøms tjenere." -#: option.c:209 +#: option.c:215 msgid "Specify a SRV record." msgstr "Spesifiser en SRV post." -#: option.c:210 +#: option.c:216 msgid "Display this message." msgstr "Vis denne meldingen." -#: option.c:211 +#: option.c:217 #, fuzzy, c-format msgid "Specify path of PID file (defaults to %s)." msgstr "Spesifiser stien til PID fil. (standard er %s)." -#: option.c:212 +#: option.c:218 #, c-format msgid "Specify maximum number of DHCP leases (defaults to %s)." msgstr "Spesifiser maksimum antall DHCP leier (standard er %s)" -#: option.c:213 +#: option.c:219 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:214 +#: option.c:220 msgid "Specify TXT DNS record." msgstr "Spesifiser TXT DNS post." -#: option.c:215 +#: option.c:221 #, fuzzy msgid "Specify PTR DNS record." msgstr "Spesifiser TXT DNS post." -#: option.c:216 +#: option.c:222 msgid "Bind only to interfaces in use." msgstr "Bind kun til nettverkskort som er i bruk." -#: option.c:217 +#: option.c:223 #, c-format msgid "Read DHCP static host information from %s." msgstr "Les DHCP statisk vert informasjon fra %s." -#: option.c:218 +#: option.c:224 msgid "Enable the DBus interface for setting upstream servers, etc." msgstr "Aktiver DBus interface for å sette oppstrøms tjenere, osv." -#: option.c:219 +#: option.c:225 msgid "Do not provide DHCP on this interface, only provide DNS." msgstr "Ikke lever DHCP på dette nettverkskortet, kun lever DNS." -#: option.c:220 +#: option.c:226 msgid "Enable dynamic address allocation for bootp." msgstr "Aktiver dynamisk adresse allokering for bootp." -#: option.c:221 +#: option.c:227 #, fuzzy msgid "Map MAC address (with wildcards) to option set." msgstr "Map DHCP produsent klasse til opsjon sett." -#: option.c:223 +#: option.c:229 msgid "Treat DHCP requests on aliases as arriving from interface." msgstr "" -#: option.c:225 +#: option.c:231 msgid "Disable ICMP echo address checking in the DHCP server." msgstr "" -#: option.c:226 +#: option.c:232 msgid "Script to run on DHCP lease creation and destruction." msgstr "" -#: option.c:227 +#: option.c:233 msgid "Read configuration from all the files in this directory." msgstr "" -#: option.c:228 +#: option.c:234 #, fuzzy msgid "Log to this syslog facility. (defaults to DAEMON)" msgstr "Skift til denne bruker etter oppstart (standard er %s)." -#: option.c:229 +#: option.c:235 msgid "Read leases at startup, but never write the lease file." msgstr "" -#: option.c:230 +#: option.c:236 #, fuzzy, c-format msgid "Maximum number of concurrent DNS queries. (defaults to %s)" msgstr "Spesifiser maksimum antall DHCP leier (standard er %s)" -#: option.c:231 +#: option.c:237 #, c-format msgid "Clear DNS cache when reloading %s." msgstr "" -#: option.c:232 +#: option.c:238 msgid "Ignore hostnames provided by DHCP clients." msgstr "" -#: option.c:233 +#: option.c:239 msgid "Enable integrated read-only TFTP server." msgstr "" -#: option.c:234 +#: option.c:240 msgid "Export files by TFTP only from the specified subtree." msgstr "" -#: option.c:235 +#: option.c:241 msgid "Allow access only to files owned by the user running dnsmasq." msgstr "" -#: option.c:236 +#: option.c:242 #, fuzzy, c-format msgid "Maximum number of conncurrent TFTP transfers (defaults to %s)." msgstr "Spesifiser maksimum antall DHCP leier (standard er %s)" -#: option.c:361 +#: option.c:243 +msgid "Disable the TFTP blocksize extension." +msgstr "" + +#: option.c:368 #, c-format msgid "" "Usage: dnsmasq [options]\n" @@ -390,147 +399,147 @@ msgstr "" "Bruk: dnsmasq [opsjoner]\n" "\n" -#: option.c:363 +#: option.c:370 #, c-format msgid "Use short options only on the command line.\n" msgstr "Bruk korte opsjoner kun på kommandolinjen.\n" -#: option.c:365 +#: option.c:372 #, c-format msgid "Valid options are :\n" msgstr "Gyldige opsjoner er :\n" -#: option.c:431 +#: option.c:438 msgid "bad dhcp-option" msgstr "dårlig dhcp-opsjon" -#: option.c:577 +#: option.c:584 msgid "bad domain in dhcp-option" msgstr "dårlig domene i dhcp-opsjon" -#: option.c:634 +#: option.c:641 msgid "dhcp-option too long" msgstr "dhcp-opsjon for lang" -#: option.c:696 +#: option.c:698 #, fuzzy, c-format msgid "cannot access directory %s: %s" msgstr "kan ikke lese %s: %s" -#: option.c:715 tftp.c:300 +#: option.c:717 tftp.c:301 #, fuzzy, c-format msgid "cannot access %s: %s" msgstr "kan ikke lese %s: %s" -#: option.c:792 +#: option.c:794 msgid "bad MX preference" msgstr "dårlig MX preferanse" -#: option.c:801 +#: option.c:803 msgid "bad MX name" msgstr "dårlig MX navn" -#: option.c:819 +#: option.c:821 msgid "bad MX target" msgstr "dårlig MX mål" -#: option.c:831 +#: option.c:833 msgid "cannot run scripts under uClinux" msgstr "" -#: option.c:1030 option.c:1041 +#: option.c:1032 option.c:1043 msgid "bad port" msgstr "dårlig port" -#: option.c:1185 +#: option.c:1187 msgid "bad bridge-interface" msgstr "" -#: option.c:1229 +#: option.c:1231 msgid "bad dhcp-range" msgstr "dårlig dhcp-område" -#: option.c:1258 +#: option.c:1260 msgid "only one netid tag allowed" msgstr "" -#: option.c:1303 +#: option.c:1305 msgid "inconsistent DHCP range" msgstr "ikke konsistent DHCP område" -#: option.c:1488 +#: option.c:1490 msgid "bad dhcp-host" msgstr "dårlig dhcp-vert" -#: option.c:1688 +#: option.c:1691 #, fuzzy msgid "bad PTR record" msgstr "dårlig SRV post" -#: option.c:1713 +#: option.c:1716 msgid "bad TXT record" msgstr "dårlig TXT post" -#: option.c:1745 +#: option.c:1748 msgid "TXT record string too long" msgstr "TXT post streng for lang" -#: option.c:1784 +#: option.c:1787 msgid "bad SRV record" msgstr "dårlig SRV post" -#: option.c:1797 +#: option.c:1800 msgid "bad SRV target" msgstr "dårlig SRV mål" -#: option.c:1809 +#: option.c:1812 msgid "invalid port number" msgstr "ugyldig portnummer" -#: option.c:1820 +#: option.c:1823 msgid "invalid priority" msgstr "ugyldig prioritet" -#: option.c:1831 +#: option.c:1834 msgid "invalid weight" msgstr "ugyldig vekt" -#: option.c:1862 +#: option.c:1865 #, c-format msgid "files nested too deep in %s" msgstr "" -#: option.c:1869 tftp.c:450 +#: option.c:1872 tftp.c:451 #, c-format msgid "cannot read %s: %s" msgstr "kan ikke lese %s: %s" -#: option.c:1912 +#: option.c:1917 msgid "missing \"" msgstr "mangler \"" -#: option.c:1951 +#: option.c:1956 msgid "bad option" msgstr "dårlig opsjon" -#: option.c:1953 +#: option.c:1958 msgid "extraneous parameter" msgstr "overflødig parameter" -#: option.c:1955 +#: option.c:1960 msgid "missing parameter" msgstr "mangler parameter" -#: option.c:1957 +#: option.c:1962 msgid "error" msgstr "feil" -#: option.c:2025 +#: option.c:2030 #, c-format msgid "Dnsmasq version %s %s\n" msgstr "Dnsmasq versjon %s %s\n" -#: option.c:2026 +#: option.c:2031 #, c-format msgid "" "Compile time options %s\n" @@ -539,53 +548,53 @@ msgstr "" "Kompileringsopsjoner %s\n" "\n" -#: option.c:2027 +#: option.c:2032 #, c-format msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" msgstr "Denne programvaren kommer med ABSOLUTT INGEN GARANTI.\n" -#: option.c:2028 +#: option.c:2033 #, 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:2029 +#: option.c:2034 #, c-format msgid "under the terms of the GNU General Public License, version 2.\n" msgstr "under vilkårene gitt i GNU General Public License, versjon 2.\n" -#: option.c:2040 +#: option.c:2045 msgid "try --help" msgstr "" -#: option.c:2042 +#: option.c:2047 msgid "try -w" msgstr "" -#: option.c:2045 +#: option.c:2050 #, fuzzy, c-format msgid "bad command line options: %s" msgstr "dårlige kommandlinje opsjoner: %s." -#: option.c:2096 +#: option.c:2101 #, c-format msgid "cannot get host-name: %s" msgstr "klarer ikke å få vertsnavn: %s" -#: option.c:2124 +#: option.c:2129 msgid "only one resolv.conf file allowed in no-poll mode." msgstr "kun en resolv.conf fil tillat i no-poll modus." -#: option.c:2134 +#: option.c:2139 msgid "must have exactly one resolv.conf to read domain from." msgstr "må ha nøyaktig en resolv.conf å lese domene fra." -#: option.c:2137 +#: option.c:2142 #, fuzzy, c-format msgid "failed to read %s: %s" msgstr "feilet å lese %s: %m" -#: option.c:2155 +#: option.c:2160 #, c-format msgid "no search directive found in %s" msgstr "intet søke direktiv funnet i %s" @@ -911,104 +920,99 @@ msgstr "" msgid "failed to write %s: %s (retry in %us)" msgstr "feilet å lese %s: %m" -#: rfc2131.c:297 +#: rfc2131.c:271 #, 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:298 +#: rfc2131.c:272 msgid "with subnet selector" msgstr "med subnet velger" -#: rfc2131.c:298 +#: rfc2131.c:272 msgid "via" msgstr "via" -#: rfc2131.c:322 rfc2131.c:347 +#: rfc2131.c:296 rfc2131.c:327 msgid "disabled" msgstr "deaktivert" -#: rfc2131.c:359 rfc2131.c:814 +#: rfc2131.c:339 rfc2131.c:778 msgid "address in use" msgstr "adresse i bruk" -#: rfc2131.c:362 +#: rfc2131.c:342 msgid "no address configured" msgstr "ingen adresse konfigurert" -#: rfc2131.c:375 rfc2131.c:682 +#: rfc2131.c:355 rfc2131.c:646 msgid "no address available" msgstr "ingen adresse tilgjengelig" -#: rfc2131.c:384 rfc2131.c:824 +#: rfc2131.c:364 rfc2131.c:788 msgid "no leases left" msgstr "ingen leier igjen" -#: rfc2131.c:387 rfc2131.c:788 +#: rfc2131.c:367 rfc2131.c:752 msgid "wrong network" msgstr "galt nettverk" -#: rfc2131.c:605 +#: rfc2131.c:569 #, fuzzy, c-format msgid "disabling DHCP static address %s for %s" msgstr "deaktiverer DHCP statisk adresse %s" -#: rfc2131.c:626 +#: rfc2131.c:590 msgid "unknown lease" msgstr "ukjent leie" -#: rfc2131.c:635 rfc2131.c:934 +#: rfc2131.c:599 rfc2131.c:898 msgid "ignored" msgstr "oversett" -#: rfc2131.c:655 +#: rfc2131.c:619 #, c-format msgid "not using configured address %s because it is leased to %s" msgstr "" -#: rfc2131.c:665 +#: rfc2131.c:629 #, c-format msgid "" "not using configured address %s because it is in use by the server or relay" msgstr "" -#: rfc2131.c:668 +#: rfc2131.c:632 #, c-format msgid "not using configured address %s because it was previously declined" msgstr "" -#: rfc2131.c:751 +#: rfc2131.c:715 msgid "wrong address" msgstr "gal adresse" -#: rfc2131.c:764 +#: rfc2131.c:728 msgid "lease not found" msgstr "leie ikke funnet" -#: rfc2131.c:796 +#: rfc2131.c:760 msgid "address not available" msgstr "adresse ikke tilgjengelig" -#: rfc2131.c:807 +#: rfc2131.c:771 msgid "static lease available" msgstr "statisk leie tilgjengelig" -#: rfc2131.c:811 +#: rfc2131.c:775 msgid "address reserved" msgstr "adresse reservert" -#: rfc2131.c:817 +#: rfc2131.c:781 msgid "no unique-id" msgstr "" -#: rfc2131.c:1181 -#, c-format -msgid "cannot send DHCP option %d: no space left in packet" -msgstr "kan ikke sende DHCP opsjon %d: ikke mer plass i pakken" - -#: rfc2131.c:1476 +#: rfc2131.c:1180 #, fuzzy, c-format -msgid "cannot send encapsulated option %d: no space left in wrapper" +msgid "cannot send DHCP/BOOTP option %d: no space left in packet" msgstr "kan ikke sende DHCP opsjon %d: ikke mer plass i pakken" #: netlink.c:59 @@ -1063,26 +1067,30 @@ msgstr "feilet å få tilgang til %s: %m" msgid "unsupported request from %s" msgstr "" -#: tftp.c:229 +#: tftp.c:230 #, c-format msgid "TFTP sent %s to %s" msgstr "" -#: tftp.c:296 +#: tftp.c:297 #, fuzzy, c-format msgid "file %s not found" msgstr "leie ikke funnet" -#: tftp.c:352 +#: tftp.c:353 #, c-format msgid "TFTP error %d %s received from %s" msgstr "" -#: tftp.c:383 +#: tftp.c:384 #, fuzzy, c-format msgid "TFTP failed sending %s to %s" msgstr "feilet å lese %s: %m" +#, fuzzy +#~ msgid "cannot send encapsulated option %d: no space left in wrapper" +#~ msgstr "kan ikke sende DHCP opsjon %d: ikke mer plass i pakken" + #~ msgid "More than one vendor class matches, using %s" #~ msgstr "Mer enn en produsent klasse som passer, bruker %s" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: dnsmasq 2.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-05 14:27+0000\n" +"POT-Creation-Date: 2007-02-12 17:55+0000\n" "PO-Revision-Date: 2005-10-04 19:17+0100\n" "Last-Translator: Tomasz Sochañski <nerdhero@gmail.com>\n" "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n" @@ -16,31 +16,31 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -#: cache.c:697 +#: cache.c:694 #, c-format msgid "failed to load names from %s: %m" msgstr "b³±d ³adowania nazw z %s: %m" -#: cache.c:731 dhcp.c:715 +#: cache.c:728 dhcp.c:715 #, fuzzy, c-format msgid "bad address at %s line %d" msgstr "b³êdna nazwa w %s, linia %d" -#: cache.c:777 dhcp.c:729 +#: cache.c:774 dhcp.c:729 #, c-format msgid "bad name at %s line %d" msgstr "b³êdna nazwa w %s, linia %d" -#: cache.c:784 dhcp.c:783 +#: cache.c:781 dhcp.c:783 #, c-format msgid "read %s - %d addresses" msgstr "przeczytano %s - %d adresów" -#: cache.c:822 +#: cache.c:819 msgid "cleared cache" msgstr "wyczyszczono cache" -#: cache.c:875 +#: cache.c:866 #, c-format msgid "" "not giving name %s to the DHCP lease of %s because the name exists in %s " @@ -49,7 +49,7 @@ msgstr "" "nazwa %s nie zosta³a nadana dzier¿awie DHCP %s, poniewa¿ nazwa istnieje w %s " "i ma adres %s" -#: cache.c:919 +#: cache.c:906 #, fuzzy, c-format msgid "" "time %lu, cache size %d, %d/%d cache insertions re-used unexpired cache " @@ -57,7 +57,7 @@ msgid "" msgstr "" "wielko¶æ cache %d, %d/%d wpisów cache u¿yto ponownie z niewygas³ych wpisów" -#: util.c:154 option.c:582 +#: util.c:154 option.c:589 msgid "could not get memory" msgstr "nie mo¿na pobraæ pamiêci" @@ -75,322 +75,331 @@ msgstr "B£¡D uruchomienia" msgid "infinite" msgstr "nieskoñczona" -#: option.c:164 +#: option.c:169 msgid "Specify local address(es) to listen on." msgstr "Adres(y) lokalne do nas³uchiwania." -#: option.c:165 +#: option.c:170 msgid "Return ipaddr for all hosts in specified domains." msgstr "Zwracanie adresu IP dla wszystkich hostów w podanych domenach." -#: option.c:166 +#: option.c:171 msgid "Fake reverse lookups for RFC1918 private address ranges." msgstr "Symulacja reverse lookups dla adresów prywatnych opisanych w RFC1918." -#: option.c:167 +#: option.c:172 msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)." msgstr "Adres IP traktowany jak NXDOMAIN" -#: option.c:168 +#: option.c:173 #, c-format msgid "Specify the size of the cache in entries (defaults to %s)." msgstr "Wielko¶æ pamiêci cache we wpisach (domy¶lna: %s)" -#: option.c:169 +#: option.c:174 #, c-format msgid "Specify configuration file (defaults to %s)." msgstr "¦cie¿ka do pliku konfiguracyjnego (domy¶lna: %s)" -#: option.c:170 +#: option.c:175 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:171 +#: option.c:176 msgid "Do NOT forward queries with no domain part." msgstr "Wy³±czenie przekazywania zapytañ bez czê¶ci domenowej." -#: option.c:172 +#: option.c:177 msgid "Return self-pointing MX records for local hosts." msgstr "Zwracanie samowskazuj±cego rekordu MX dla lokalnych hostów." -#: option.c:173 +#: option.c:178 msgid "Expand simple names in /etc/hosts with domain-suffix." msgstr "Rozwijanie prostych nazw z /etc/hosts przyrostkiem domenowym." -#: option.c:174 +#: option.c:179 msgid "Don't forward spurious DNS requests from Windows hosts." msgstr "Wy³±czenie przekazywania pozornych zapytañ DNS z komputerów Windows" -#: option.c:175 +#: option.c:180 msgid "Enable DHCP in the range given with lease duration." msgstr "Enable DHCP w zakresie okre¶lonym czasem dzier¿awy." -#: option.c:176 +#: option.c:181 #, c-format msgid "Change to this group after startup (defaults to %s)." msgstr "Po starcie zmiana grupy procesu na podan± (domy¶lnie: %s)." -#: option.c:177 +#: option.c:182 msgid "Set address or hostname for a specified machine." msgstr "Ustawienie adresu lub nazwy hosta dla okre¶lonej maszyny." -#: option.c:178 +#: option.c:183 #, c-format msgid "Do NOT load %s file." msgstr "Ignorowanie pliku %s." -#: option.c:179 +#: option.c:184 #, c-format msgid "Specify a hosts file to be read in addition to %s." msgstr "Dodatkowy plik hostów poza %s." -#: option.c:180 +#: option.c:185 msgid "Specify interface(s) to listen on." msgstr "Interfejs(y) do nas³uchiwania." -#: option.c:181 +#: option.c:186 msgid "Specify interface(s) NOT to listen on." msgstr "Interfejs(y), na których nie nas³uchiwaæ." -#: option.c:182 +#: option.c:187 msgid "Map DHCP user class to option set." msgstr "W³±czenie mapowania klasy u¿ytkownika DHCP do option set." -#: option.c:183 +#: option.c:188 msgid "Don't do DHCP for hosts in option set." msgstr "" "Wy³±czenie odpowiadania na ¿adania DHCP hostów okre¶lonych w option set" -#: option.c:184 +#: option.c:189 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." -#: option.c:185 +#: option.c:190 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." -#: option.c:186 +#: option.c:191 #, c-format msgid "Specify where to store DHCP leases (defaults to %s)." msgstr "¦cie¿ka przechowywania pliku dzier¿aw DHCP (domy¶lna: %s)" -#: option.c:187 +#: option.c:192 msgid "Return MX records for local hosts." msgstr "W³±czenie zwracania rekord MX dla hostów lokalnych." -#: option.c:188 +#: option.c:193 msgid "Specify an MX record." msgstr "Specyfikacja rekordu MX." -#: option.c:189 +#: option.c:194 msgid "Specify BOOTP options to DHCP server." msgstr "Okre¶lenie opcji BOOTP serwera DHCP." -#: option.c:190 +#: option.c:195 #, 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" -#: option.c:191 +#: option.c:196 msgid "Do NOT cache failed search results." msgstr "" "Wy³±czenie zapisywania w pamiêci podrêcznej nieudanych wyników wyszukiwania." -#: option.c:192 +#: option.c:197 #, 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." -#: option.c:193 -msgid "Set extra options to be set to DHCP clients." +#: option.c:198 +#, fuzzy +msgid "Specify options to be sent to DHCP clients." msgstr "Dodatkowe opcje ustawieñ dla klientów DHCP." -#: option.c:194 +#: option.c:199 +msgid "DHCP option sent even if the client does not request it." +msgstr "" + +#: option.c:200 msgid "Specify port to listen for DNS requests on (defaults to 53)." msgstr "Port nas³uchiwania zapytañ DNS (domy¶lnie: 53)." -#: option.c:195 +#: option.c:201 #, 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:196 +#: option.c:202 msgid "Log queries." msgstr "Zapytania zapisywane w pliku log." -#: option.c:197 +#: option.c:203 msgid "Force the originating port for upstream queries." msgstr "" -#: option.c:198 +#: option.c:204 msgid "Do NOT read resolv.conf." msgstr "Wy³±czenie czytania pliku resolv.conf" -#: option.c:199 +#: option.c:205 #, c-format msgid "Specify path to resolv.conf (defaults to %s)." msgstr "Podaj ¶cie¿kê do pliku resolv.conf (domy¶lnie: %s)." -#: option.c:200 +#: option.c:206 msgid "Specify address(es) of upstream servers with optional domains." msgstr "" -#: option.c:201 +#: option.c:207 msgid "Never forward queries to specified domains." msgstr "Wy³±czenie przekazywania zapytañ do okre¶lonych domen." -#: option.c:202 +#: option.c:208 msgid "Specify the domain to be assigned in DHCP leases." msgstr "Nazwa domeny, która bêdzie przypisana w dzier¿awach DHCP." -#: option.c:203 +#: option.c:209 msgid "Specify default target in an MX record." msgstr "Okre¶lenie domy¶lnego celu w rekordzie MX." -#: option.c:204 +#: option.c:210 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:205 +#: option.c:211 #, 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:206 +#: option.c:212 msgid "Map DHCP vendor class to option set." msgstr "Mapowanie nazwy dystrybutora DHCP do ustawieñ opcji." -#: option.c:207 +#: option.c:213 msgid "Display dnsmasq version and copyright information." msgstr "" "W³±czenie pokazywania wersji dnsmasq i informacji o ochronie praw autorskich." -#: option.c:208 +#: option.c:214 msgid "Translate IPv4 addresses from upstream servers." msgstr "" -#: option.c:209 +#: option.c:215 msgid "Specify a SRV record." msgstr "Okre¶lenie rekordu SRV." -#: option.c:210 +#: option.c:216 msgid "Display this message." msgstr "Wy¶wietlenie tych informacji." -#: option.c:211 +#: option.c:217 #, 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:212 +#: option.c:218 #, c-format msgid "Specify maximum number of DHCP leases (defaults to %s)." msgstr "Maksymalna liczba dzier¿aw DHCP. (domy¶lnie: %s)." -#: option.c:213 +#: option.c:219 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:214 +#: option.c:220 msgid "Specify TXT DNS record." msgstr "Rekord TXT DNS." -#: option.c:215 +#: option.c:221 #, fuzzy msgid "Specify PTR DNS record." msgstr "Rekord TXT DNS." -#: option.c:216 +#: option.c:222 msgid "Bind only to interfaces in use." msgstr "W³±czenie nas³uchiwania tylko na u¿ywanych interfejsach." -#: option.c:217 +#: option.c:223 #, c-format msgid "Read DHCP static host information from %s." msgstr "Statycznych informacji DHCP hosta z pliku %s." -#: option.c:218 +#: option.c:224 msgid "Enable the DBus interface for setting upstream servers, etc." msgstr "" -#: option.c:219 +#: option.c:225 msgid "Do not provide DHCP on this interface, only provide DNS." msgstr "Wy³±czenie DHCP na tym interfejsie, w³±czenie tylko DNS." -#: option.c:220 +#: option.c:226 msgid "Enable dynamic address allocation for bootp." msgstr "W³±czenie automatycznej alokacji adresu dla BOOTP." -#: option.c:221 +#: option.c:227 #, fuzzy msgid "Map MAC address (with wildcards) to option set." msgstr "Mapowanie nazwy dystrybutora DHCP do ustawieñ opcji." -#: option.c:223 +#: option.c:229 msgid "Treat DHCP requests on aliases as arriving from interface." msgstr "" -#: option.c:225 +#: option.c:231 msgid "Disable ICMP echo address checking in the DHCP server." msgstr "" -#: option.c:226 +#: option.c:232 msgid "Script to run on DHCP lease creation and destruction." msgstr "" -#: option.c:227 +#: option.c:233 msgid "Read configuration from all the files in this directory." msgstr "" -#: option.c:228 +#: option.c:234 #, fuzzy msgid "Log to this syslog facility. (defaults to DAEMON)" msgstr "Po starcie zmiana u¿ytkownika procesu na podanego. (domy¶lnie: %s)." -#: option.c:229 +#: option.c:235 msgid "Read leases at startup, but never write the lease file." msgstr "" -#: option.c:230 +#: option.c:236 #, fuzzy, c-format msgid "Maximum number of concurrent DNS queries. (defaults to %s)" msgstr "Maksymalna liczba dzier¿aw DHCP. (domy¶lnie: %s)." -#: option.c:231 +#: option.c:237 #, c-format msgid "Clear DNS cache when reloading %s." msgstr "" -#: option.c:232 +#: option.c:238 msgid "Ignore hostnames provided by DHCP clients." msgstr "" -#: option.c:233 +#: option.c:239 msgid "Enable integrated read-only TFTP server." msgstr "" -#: option.c:234 +#: option.c:240 msgid "Export files by TFTP only from the specified subtree." msgstr "" -#: option.c:235 +#: option.c:241 msgid "Allow access only to files owned by the user running dnsmasq." msgstr "" -#: option.c:236 +#: option.c:242 #, fuzzy, c-format msgid "Maximum number of conncurrent TFTP transfers (defaults to %s)." msgstr "Maksymalna liczba dzier¿aw DHCP. (domy¶lnie: %s)." -#: option.c:361 +#: option.c:243 +msgid "Disable the TFTP blocksize extension." +msgstr "" + +#: option.c:368 #, c-format msgid "" "Usage: dnsmasq [options]\n" @@ -399,147 +408,147 @@ msgstr "" "U¿ycie: dnsmasq [opcje]\n" "\n" -#: option.c:363 +#: option.c:370 #, c-format msgid "Use short options only on the command line.\n" msgstr "Tylko krótkie opcje w linii komend.\n" -#: option.c:365 +#: option.c:372 #, c-format msgid "Valid options are :\n" msgstr "Obs³ugiwane opcje:\n" -#: option.c:431 +#: option.c:438 msgid "bad dhcp-option" msgstr "b³±d w dhcp-option" -#: option.c:577 +#: option.c:584 msgid "bad domain in dhcp-option" msgstr "nieprawid³owa nazwa domeny w dhcp-option" -#: option.c:634 +#: option.c:641 msgid "dhcp-option too long" msgstr "zbyt d³uga nazwa w dhcp-option" -#: option.c:696 +#: option.c:698 #, fuzzy, c-format msgid "cannot access directory %s: %s" msgstr "b³±d odczytu z %s: %s" -#: option.c:715 tftp.c:300 +#: option.c:717 tftp.c:301 #, fuzzy, c-format msgid "cannot access %s: %s" msgstr "b³±d odczytu z %s: %s" -#: option.c:792 +#: option.c:794 msgid "bad MX preference" msgstr "" -#: option.c:801 +#: option.c:803 msgid "bad MX name" msgstr "b³êdna nazwa MX" -#: option.c:819 +#: option.c:821 msgid "bad MX target" msgstr "b³êdny cel MX" -#: option.c:831 +#: option.c:833 msgid "cannot run scripts under uClinux" msgstr "" -#: option.c:1030 option.c:1041 +#: option.c:1032 option.c:1043 msgid "bad port" msgstr "nieprawid³owy port" -#: option.c:1185 +#: option.c:1187 msgid "bad bridge-interface" msgstr "" -#: option.c:1229 +#: option.c:1231 msgid "bad dhcp-range" msgstr "nieprawid³owy zakres dhcp-range" -#: option.c:1258 +#: option.c:1260 msgid "only one netid tag allowed" msgstr "" -#: option.c:1303 +#: option.c:1305 msgid "inconsistent DHCP range" msgstr "niespójny zakres DHCP" -#: option.c:1488 +#: option.c:1490 msgid "bad dhcp-host" msgstr "b³±d w dhcp-host" -#: option.c:1688 +#: option.c:1691 #, fuzzy msgid "bad PTR record" msgstr "b³±d w rekordzie SRV" -#: option.c:1713 +#: option.c:1716 msgid "bad TXT record" msgstr "nieprawid³owy rekord TX" -#: option.c:1745 +#: option.c:1748 msgid "TXT record string too long" msgstr "zbyt d³ugi rekord TXT" -#: option.c:1784 +#: option.c:1787 msgid "bad SRV record" msgstr "b³±d w rekordzie SRV" -#: option.c:1797 +#: option.c:1800 msgid "bad SRV target" msgstr "nieprawid³owy cel SRV" -#: option.c:1809 +#: option.c:1812 msgid "invalid port number" msgstr "nieprawid³owy port" -#: option.c:1820 +#: option.c:1823 msgid "invalid priority" msgstr "nieprawid³owy priorytet" -#: option.c:1831 +#: option.c:1834 msgid "invalid weight" msgstr "nieprawid³owe znaczenie" -#: option.c:1862 +#: option.c:1865 #, c-format msgid "files nested too deep in %s" msgstr "" -#: option.c:1869 tftp.c:450 +#: option.c:1872 tftp.c:451 #, c-format msgid "cannot read %s: %s" msgstr "b³±d odczytu z %s: %s" -#: option.c:1912 +#: option.c:1917 msgid "missing \"" msgstr "brakuje \"" -#: option.c:1951 +#: option.c:1956 msgid "bad option" msgstr "nieprawid³owa opcja" -#: option.c:1953 +#: option.c:1958 msgid "extraneous parameter" msgstr "dodatkowy parametr" -#: option.c:1955 +#: option.c:1960 msgid "missing parameter" msgstr "brak parametru" -#: option.c:1957 +#: option.c:1962 msgid "error" msgstr "b³±d" -#: option.c:2025 +#: option.c:2030 #, c-format msgid "Dnsmasq version %s %s\n" msgstr "Dnsmasq, wersja %s %s\n" -#: option.c:2026 +#: option.c:2031 #, c-format msgid "" "Compile time options %s\n" @@ -548,53 +557,53 @@ msgstr "" "Wkompilowane opcje %s\n" "\n" -#: option.c:2027 +#: option.c:2032 #, c-format msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" msgstr "Oprogramowanie to nie zawiera ¿adnych gwarancji.\n" -#: option.c:2028 +#: option.c:2033 #, 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:2029 +#: option.c:2034 #, c-format msgid "under the terms of the GNU General Public License, version 2.\n" msgstr "na warunkach okre¶lonych w GNU General Public Licence, wersja 2.\n" -#: option.c:2040 +#: option.c:2045 msgid "try --help" msgstr "" -#: option.c:2042 +#: option.c:2047 msgid "try -w" msgstr "" -#: option.c:2045 +#: option.c:2050 #, fuzzy, c-format msgid "bad command line options: %s" msgstr "nieprawid³owa opcja linii komend: %s." -#: option.c:2096 +#: option.c:2101 #, c-format msgid "cannot get host-name: %s" msgstr "nie mo¿na pobraæ nazwy hosta: %s" -#: option.c:2124 +#: option.c:2129 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:2134 +#: option.c:2139 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:2137 +#: option.c:2142 #, fuzzy, c-format msgid "failed to read %s: %s" msgstr "b³±d w odczycie %s: %m" -#: option.c:2155 +#: option.c:2160 #, c-format msgid "no search directive found in %s" msgstr "brak wytycznych wyszukiwania w %s" @@ -924,104 +933,99 @@ msgstr "" msgid "failed to write %s: %s (retry in %us)" msgstr "b³±d w odczycie %s: %m" -#: rfc2131.c:297 +#: rfc2131.c:271 #, 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:298 +#: rfc2131.c:272 msgid "with subnet selector" msgstr "z selekcj± podsieci" -#: rfc2131.c:298 +#: rfc2131.c:272 msgid "via" msgstr "przez" -#: rfc2131.c:322 rfc2131.c:347 +#: rfc2131.c:296 rfc2131.c:327 msgid "disabled" msgstr "wy³±czony(a)" -#: rfc2131.c:359 rfc2131.c:814 +#: rfc2131.c:339 rfc2131.c:778 msgid "address in use" msgstr "adres w u¿yciu" -#: rfc2131.c:362 +#: rfc2131.c:342 msgid "no address configured" msgstr "brak skonfigurowanego adresu" -#: rfc2131.c:375 rfc2131.c:682 +#: rfc2131.c:355 rfc2131.c:646 msgid "no address available" msgstr "brak dostêpnego adresu" -#: rfc2131.c:384 rfc2131.c:824 +#: rfc2131.c:364 rfc2131.c:788 msgid "no leases left" msgstr "brak wolnych dzier¿aw" -#: rfc2131.c:387 rfc2131.c:788 +#: rfc2131.c:367 rfc2131.c:752 msgid "wrong network" msgstr "nieprawid³owa sieæ" -#: rfc2131.c:605 +#: rfc2131.c:569 #, fuzzy, c-format msgid "disabling DHCP static address %s for %s" msgstr "wy³±czanie statycznego adresu DHCP %s" -#: rfc2131.c:626 +#: rfc2131.c:590 msgid "unknown lease" msgstr "nieznana dzier¿awa" -#: rfc2131.c:635 rfc2131.c:934 +#: rfc2131.c:599 rfc2131.c:898 msgid "ignored" msgstr "ignorujê" -#: rfc2131.c:655 +#: rfc2131.c:619 #, c-format msgid "not using configured address %s because it is leased to %s" msgstr "" -#: rfc2131.c:665 +#: rfc2131.c:629 #, c-format msgid "" "not using configured address %s because it is in use by the server or relay" msgstr "" -#: rfc2131.c:668 +#: rfc2131.c:632 #, c-format msgid "not using configured address %s because it was previously declined" msgstr "" -#: rfc2131.c:751 +#: rfc2131.c:715 msgid "wrong address" msgstr "b³êdny adres" -#: rfc2131.c:764 +#: rfc2131.c:728 msgid "lease not found" msgstr "dzier¿awa nie znaleziona" -#: rfc2131.c:796 +#: rfc2131.c:760 msgid "address not available" msgstr "adres niedostêpny" -#: rfc2131.c:807 +#: rfc2131.c:771 msgid "static lease available" msgstr "dostêpna statyczna dzier¿awa" -#: rfc2131.c:811 +#: rfc2131.c:775 msgid "address reserved" msgstr "adres zarezerwowany" -#: rfc2131.c:817 +#: rfc2131.c:781 msgid "no unique-id" msgstr "" -#: rfc2131.c:1181 -#, c-format -msgid "cannot send DHCP option %d: no space left in packet" -msgstr "" - -#: rfc2131.c:1476 +#: rfc2131.c:1180 #, c-format -msgid "cannot send encapsulated option %d: no space left in wrapper" +msgid "cannot send DHCP/BOOTP option %d: no space left in packet" msgstr "" #: netlink.c:59 @@ -1076,22 +1080,22 @@ msgstr "b³±d w dostêpie do %s: %m" msgid "unsupported request from %s" msgstr "" -#: tftp.c:229 +#: tftp.c:230 #, c-format msgid "TFTP sent %s to %s" msgstr "" -#: tftp.c:296 +#: tftp.c:297 #, fuzzy, c-format msgid "file %s not found" msgstr "dzier¿awa nie znaleziona" -#: tftp.c:352 +#: tftp.c:353 #, c-format msgid "TFTP error %d %s received from %s" msgstr "" -#: tftp.c:383 +#: tftp.c:384 #, fuzzy, c-format msgid "TFTP failed sending %s to %s" msgstr "b³±d w odczycie %s: %m" diff --git a/po/pt_BR.po b/po/pt_BR.po index cea7cd7..707309f 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: dnsmasq 2.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-05 14:27+0000\n" +"POT-Creation-Date: 2007-02-12 17:55+0000\n" "PO-Revision-Date: 2006-01-16 20:42+0000\n" "Last-Translator: Simon Kelley <simon@thekelleys.org.uk>\n" "Language-Team: Portuguese <ldp-br@bazar.conectiva.com.br>\n" @@ -15,45 +15,45 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: cache.c:697 +#: cache.c:694 #, c-format msgid "failed to load names from %s: %m" msgstr "" -#: cache.c:731 dhcp.c:715 +#: cache.c:728 dhcp.c:715 #, c-format msgid "bad address at %s line %d" msgstr "" -#: cache.c:777 dhcp.c:729 +#: cache.c:774 dhcp.c:729 #, c-format msgid "bad name at %s line %d" msgstr "" -#: cache.c:784 dhcp.c:783 +#: cache.c:781 dhcp.c:783 #, c-format msgid "read %s - %d addresses" msgstr "" -#: cache.c:822 +#: cache.c:819 msgid "cleared cache" msgstr "" -#: cache.c:875 +#: cache.c:866 #, 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:919 +#: cache.c:906 #, c-format msgid "" "time %lu, cache size %d, %d/%d cache insertions re-used unexpired cache " "entries." msgstr "" -#: util.c:154 option.c:582 +#: util.c:154 option.c:589 msgid "could not get memory" msgstr "" @@ -71,507 +71,515 @@ msgstr "" msgid "infinite" msgstr "" -#: option.c:164 +#: option.c:169 msgid "Specify local address(es) to listen on." msgstr "" -#: option.c:165 +#: option.c:170 msgid "Return ipaddr for all hosts in specified domains." msgstr "" -#: option.c:166 +#: option.c:171 msgid "Fake reverse lookups for RFC1918 private address ranges." msgstr "" -#: option.c:167 +#: option.c:172 msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)." msgstr "" -#: option.c:168 +#: option.c:173 #, c-format msgid "Specify the size of the cache in entries (defaults to %s)." msgstr "" -#: option.c:169 +#: option.c:174 #, c-format msgid "Specify configuration file (defaults to %s)." msgstr "" -#: option.c:170 +#: option.c:175 msgid "Do NOT fork into the background: run in debug mode." msgstr "" -#: option.c:171 +#: option.c:176 msgid "Do NOT forward queries with no domain part." msgstr "" -#: option.c:172 +#: option.c:177 msgid "Return self-pointing MX records for local hosts." msgstr "" -#: option.c:173 +#: option.c:178 msgid "Expand simple names in /etc/hosts with domain-suffix." msgstr "" -#: option.c:174 +#: option.c:179 msgid "Don't forward spurious DNS requests from Windows hosts." msgstr "" -#: option.c:175 +#: option.c:180 msgid "Enable DHCP in the range given with lease duration." msgstr "" -#: option.c:176 +#: option.c:181 #, c-format msgid "Change to this group after startup (defaults to %s)." msgstr "" -#: option.c:177 +#: option.c:182 msgid "Set address or hostname for a specified machine." msgstr "" -#: option.c:178 +#: option.c:183 #, c-format msgid "Do NOT load %s file." msgstr "" -#: option.c:179 +#: option.c:184 #, c-format msgid "Specify a hosts file to be read in addition to %s." msgstr "" -#: option.c:180 +#: option.c:185 msgid "Specify interface(s) to listen on." msgstr "" -#: option.c:181 +#: option.c:186 msgid "Specify interface(s) NOT to listen on." msgstr "" -#: option.c:182 +#: option.c:187 msgid "Map DHCP user class to option set." msgstr "" -#: option.c:183 +#: option.c:188 msgid "Don't do DHCP for hosts in option set." msgstr "" -#: option.c:184 +#: option.c:189 msgid "Do NOT fork into the background, do NOT run in debug mode." msgstr "" -#: option.c:185 +#: option.c:190 msgid "Assume we are the only DHCP server on the local network." msgstr "" -#: option.c:186 +#: option.c:191 #, c-format msgid "Specify where to store DHCP leases (defaults to %s)." msgstr "" -#: option.c:187 +#: option.c:192 msgid "Return MX records for local hosts." msgstr "" -#: option.c:188 +#: option.c:193 msgid "Specify an MX record." msgstr "" -#: option.c:189 +#: option.c:194 msgid "Specify BOOTP options to DHCP server." msgstr "" -#: option.c:190 +#: option.c:195 #, c-format msgid "Do NOT poll %s file, reload only on SIGHUP." msgstr "" -#: option.c:191 +#: option.c:196 msgid "Do NOT cache failed search results." msgstr "" -#: option.c:192 +#: option.c:197 #, c-format msgid "Use nameservers strictly in the order given in %s." msgstr "" -#: option.c:193 -msgid "Set extra options to be set to DHCP clients." +#: option.c:198 +msgid "Specify options to be sent to DHCP clients." msgstr "" -#: option.c:194 +#: option.c:199 +msgid "DHCP option sent even if the client does not request it." +msgstr "" + +#: option.c:200 msgid "Specify port to listen for DNS requests on (defaults to 53)." msgstr "" -#: option.c:195 +#: option.c:201 #, c-format msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)." msgstr "" -#: option.c:196 +#: option.c:202 msgid "Log queries." msgstr "" -#: option.c:197 +#: option.c:203 msgid "Force the originating port for upstream queries." msgstr "" -#: option.c:198 +#: option.c:204 msgid "Do NOT read resolv.conf." msgstr "" -#: option.c:199 +#: option.c:205 #, c-format msgid "Specify path to resolv.conf (defaults to %s)." msgstr "" -#: option.c:200 +#: option.c:206 msgid "Specify address(es) of upstream servers with optional domains." msgstr "" -#: option.c:201 +#: option.c:207 msgid "Never forward queries to specified domains." msgstr "" -#: option.c:202 +#: option.c:208 msgid "Specify the domain to be assigned in DHCP leases." msgstr "" -#: option.c:203 +#: option.c:209 msgid "Specify default target in an MX record." msgstr "" -#: option.c:204 +#: option.c:210 msgid "Specify time-to-live in seconds for replies from /etc/hosts." msgstr "" -#: option.c:205 +#: option.c:211 #, c-format msgid "Change to this user after startup. (defaults to %s)." msgstr "" -#: option.c:206 +#: option.c:212 msgid "Map DHCP vendor class to option set." msgstr "" -#: option.c:207 +#: option.c:213 msgid "Display dnsmasq version and copyright information." msgstr "" -#: option.c:208 +#: option.c:214 msgid "Translate IPv4 addresses from upstream servers." msgstr "" -#: option.c:209 +#: option.c:215 msgid "Specify a SRV record." msgstr "" -#: option.c:210 +#: option.c:216 msgid "Display this message." msgstr "" -#: option.c:211 +#: option.c:217 #, c-format msgid "Specify path of PID file (defaults to %s)." msgstr "" -#: option.c:212 +#: option.c:218 #, c-format msgid "Specify maximum number of DHCP leases (defaults to %s)." msgstr "" -#: option.c:213 +#: option.c:219 msgid "Answer DNS queries based on the interface a query was sent to." msgstr "" -#: option.c:214 +#: option.c:220 msgid "Specify TXT DNS record." msgstr "" -#: option.c:215 +#: option.c:221 msgid "Specify PTR DNS record." msgstr "" -#: option.c:216 +#: option.c:222 msgid "Bind only to interfaces in use." msgstr "" -#: option.c:217 +#: option.c:223 #, c-format msgid "Read DHCP static host information from %s." msgstr "" -#: option.c:218 +#: option.c:224 msgid "Enable the DBus interface for setting upstream servers, etc." msgstr "" -#: option.c:219 +#: option.c:225 msgid "Do not provide DHCP on this interface, only provide DNS." msgstr "" -#: option.c:220 +#: option.c:226 msgid "Enable dynamic address allocation for bootp." msgstr "" -#: option.c:221 +#: option.c:227 msgid "Map MAC address (with wildcards) to option set." msgstr "" -#: option.c:223 +#: option.c:229 msgid "Treat DHCP requests on aliases as arriving from interface." msgstr "" -#: option.c:225 +#: option.c:231 msgid "Disable ICMP echo address checking in the DHCP server." msgstr "" -#: option.c:226 +#: option.c:232 msgid "Script to run on DHCP lease creation and destruction." msgstr "" -#: option.c:227 +#: option.c:233 msgid "Read configuration from all the files in this directory." msgstr "" -#: option.c:228 +#: option.c:234 msgid "Log to this syslog facility. (defaults to DAEMON)" msgstr "" -#: option.c:229 +#: option.c:235 msgid "Read leases at startup, but never write the lease file." msgstr "" -#: option.c:230 +#: option.c:236 #, c-format msgid "Maximum number of concurrent DNS queries. (defaults to %s)" msgstr "" -#: option.c:231 +#: option.c:237 #, c-format msgid "Clear DNS cache when reloading %s." msgstr "" -#: option.c:232 +#: option.c:238 msgid "Ignore hostnames provided by DHCP clients." msgstr "" -#: option.c:233 +#: option.c:239 msgid "Enable integrated read-only TFTP server." msgstr "" -#: option.c:234 +#: option.c:240 msgid "Export files by TFTP only from the specified subtree." msgstr "" -#: option.c:235 +#: option.c:241 msgid "Allow access only to files owned by the user running dnsmasq." msgstr "" -#: option.c:236 +#: option.c:242 #, c-format msgid "Maximum number of conncurrent TFTP transfers (defaults to %s)." msgstr "" -#: option.c:361 +#: option.c:243 +msgid "Disable the TFTP blocksize extension." +msgstr "" + +#: option.c:368 #, c-format msgid "" "Usage: dnsmasq [options]\n" "\n" msgstr "" -#: option.c:363 +#: option.c:370 #, c-format msgid "Use short options only on the command line.\n" msgstr "" -#: option.c:365 +#: option.c:372 #, c-format msgid "Valid options are :\n" msgstr "" -#: option.c:431 +#: option.c:438 msgid "bad dhcp-option" msgstr "" -#: option.c:577 +#: option.c:584 msgid "bad domain in dhcp-option" msgstr "" -#: option.c:634 +#: option.c:641 msgid "dhcp-option too long" msgstr "" -#: option.c:696 +#: option.c:698 #, c-format msgid "cannot access directory %s: %s" msgstr "" -#: option.c:715 tftp.c:300 +#: option.c:717 tftp.c:301 #, c-format msgid "cannot access %s: %s" msgstr "" -#: option.c:792 +#: option.c:794 msgid "bad MX preference" msgstr "" -#: option.c:801 +#: option.c:803 msgid "bad MX name" msgstr "" -#: option.c:819 +#: option.c:821 msgid "bad MX target" msgstr "" -#: option.c:831 +#: option.c:833 msgid "cannot run scripts under uClinux" msgstr "" -#: option.c:1030 option.c:1041 +#: option.c:1032 option.c:1043 msgid "bad port" msgstr "" -#: option.c:1185 +#: option.c:1187 msgid "bad bridge-interface" msgstr "" -#: option.c:1229 +#: option.c:1231 msgid "bad dhcp-range" msgstr "" -#: option.c:1258 +#: option.c:1260 msgid "only one netid tag allowed" msgstr "" -#: option.c:1303 +#: option.c:1305 msgid "inconsistent DHCP range" msgstr "" -#: option.c:1488 +#: option.c:1490 msgid "bad dhcp-host" msgstr "" -#: option.c:1688 +#: option.c:1691 msgid "bad PTR record" msgstr "" -#: option.c:1713 +#: option.c:1716 msgid "bad TXT record" msgstr "" -#: option.c:1745 +#: option.c:1748 msgid "TXT record string too long" msgstr "" -#: option.c:1784 +#: option.c:1787 msgid "bad SRV record" msgstr "" -#: option.c:1797 +#: option.c:1800 msgid "bad SRV target" msgstr "" -#: option.c:1809 +#: option.c:1812 msgid "invalid port number" msgstr "" -#: option.c:1820 +#: option.c:1823 msgid "invalid priority" msgstr "" -#: option.c:1831 +#: option.c:1834 msgid "invalid weight" msgstr "" -#: option.c:1862 +#: option.c:1865 #, c-format msgid "files nested too deep in %s" msgstr "" -#: option.c:1869 tftp.c:450 +#: option.c:1872 tftp.c:451 #, c-format msgid "cannot read %s: %s" msgstr "" -#: option.c:1912 +#: option.c:1917 msgid "missing \"" msgstr "" -#: option.c:1951 +#: option.c:1956 msgid "bad option" msgstr "" -#: option.c:1953 +#: option.c:1958 msgid "extraneous parameter" msgstr "" -#: option.c:1955 +#: option.c:1960 msgid "missing parameter" msgstr "" -#: option.c:1957 +#: option.c:1962 msgid "error" msgstr "" -#: option.c:2025 +#: option.c:2030 #, c-format msgid "Dnsmasq version %s %s\n" msgstr "" -#: option.c:2026 +#: option.c:2031 #, c-format msgid "" "Compile time options %s\n" "\n" msgstr "" -#: option.c:2027 +#: option.c:2032 #, c-format msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" msgstr "" -#: option.c:2028 +#: option.c:2033 #, c-format msgid "Dnsmasq is free software, and you are welcome to redistribute it\n" msgstr "" -#: option.c:2029 +#: option.c:2034 #, c-format msgid "under the terms of the GNU General Public License, version 2.\n" msgstr "" -#: option.c:2040 +#: option.c:2045 msgid "try --help" msgstr "" -#: option.c:2042 +#: option.c:2047 msgid "try -w" msgstr "" -#: option.c:2045 +#: option.c:2050 #, c-format msgid "bad command line options: %s" msgstr "" -#: option.c:2096 +#: option.c:2101 #, c-format msgid "cannot get host-name: %s" msgstr "" -#: option.c:2124 +#: option.c:2129 msgid "only one resolv.conf file allowed in no-poll mode." msgstr "" -#: option.c:2134 +#: option.c:2139 msgid "must have exactly one resolv.conf to read domain from." msgstr "" -#: option.c:2137 +#: option.c:2142 #, c-format msgid "failed to read %s: %s" msgstr "" -#: option.c:2155 +#: option.c:2160 #, c-format msgid "no search directive found in %s" msgstr "" @@ -893,104 +901,99 @@ msgstr "" msgid "failed to write %s: %s (retry in %us)" msgstr "" -#: rfc2131.c:297 +#: rfc2131.c:271 #, c-format msgid "no address range available for DHCP request %s %s" msgstr "" -#: rfc2131.c:298 +#: rfc2131.c:272 msgid "with subnet selector" msgstr "" -#: rfc2131.c:298 +#: rfc2131.c:272 msgid "via" msgstr "" -#: rfc2131.c:322 rfc2131.c:347 +#: rfc2131.c:296 rfc2131.c:327 msgid "disabled" msgstr "" -#: rfc2131.c:359 rfc2131.c:814 +#: rfc2131.c:339 rfc2131.c:778 msgid "address in use" msgstr "" -#: rfc2131.c:362 +#: rfc2131.c:342 msgid "no address configured" msgstr "" -#: rfc2131.c:375 rfc2131.c:682 +#: rfc2131.c:355 rfc2131.c:646 msgid "no address available" msgstr "" -#: rfc2131.c:384 rfc2131.c:824 +#: rfc2131.c:364 rfc2131.c:788 msgid "no leases left" msgstr "" -#: rfc2131.c:387 rfc2131.c:788 +#: rfc2131.c:367 rfc2131.c:752 msgid "wrong network" msgstr "" -#: rfc2131.c:605 +#: rfc2131.c:569 #, c-format msgid "disabling DHCP static address %s for %s" msgstr "" -#: rfc2131.c:626 +#: rfc2131.c:590 msgid "unknown lease" msgstr "" -#: rfc2131.c:635 rfc2131.c:934 +#: rfc2131.c:599 rfc2131.c:898 msgid "ignored" msgstr "" -#: rfc2131.c:655 +#: rfc2131.c:619 #, c-format msgid "not using configured address %s because it is leased to %s" msgstr "" -#: rfc2131.c:665 +#: rfc2131.c:629 #, c-format msgid "" "not using configured address %s because it is in use by the server or relay" msgstr "" -#: rfc2131.c:668 +#: rfc2131.c:632 #, c-format msgid "not using configured address %s because it was previously declined" msgstr "" -#: rfc2131.c:751 +#: rfc2131.c:715 msgid "wrong address" msgstr "" -#: rfc2131.c:764 +#: rfc2131.c:728 msgid "lease not found" msgstr "" -#: rfc2131.c:796 +#: rfc2131.c:760 msgid "address not available" msgstr "" -#: rfc2131.c:807 +#: rfc2131.c:771 msgid "static lease available" msgstr "" -#: rfc2131.c:811 +#: rfc2131.c:775 msgid "address reserved" msgstr "" -#: rfc2131.c:817 +#: rfc2131.c:781 msgid "no unique-id" msgstr "" -#: rfc2131.c:1181 -#, c-format -msgid "cannot send DHCP option %d: no space left in packet" -msgstr "" - -#: rfc2131.c:1476 +#: rfc2131.c:1180 #, c-format -msgid "cannot send encapsulated option %d: no space left in wrapper" +msgid "cannot send DHCP/BOOTP option %d: no space left in packet" msgstr "" #: netlink.c:59 @@ -1045,22 +1048,22 @@ msgstr "" msgid "unsupported request from %s" msgstr "" -#: tftp.c:229 +#: tftp.c:230 #, c-format msgid "TFTP sent %s to %s" msgstr "" -#: tftp.c:296 +#: tftp.c:297 #, c-format msgid "file %s not found" msgstr "" -#: tftp.c:352 +#: tftp.c:353 #, c-format msgid "TFTP error %d %s received from %s" msgstr "" -#: tftp.c:383 +#: tftp.c:384 #, c-format msgid "TFTP failed sending %s to %s" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: dnsmasq 2.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-05 14:27+0000\n" +"POT-Creation-Date: 2007-02-12 17:55+0000\n" "PO-Revision-Date: 2005-11-22 16:46+0000\n" "Last-Translator: Simon Kelley <simon@thekelleys.org.uk>\n" "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n" @@ -15,31 +15,31 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" # for compatibility purposes the letters â, ă, ÅŸ, Å£ and î can be written as their look-alike correspondent. -#: cache.c:697 +#: cache.c:694 #, c-format msgid "failed to load names from %s: %m" msgstr "încărcarea numelor din %s: %m a eÅŸuat" -#: cache.c:731 dhcp.c:715 +#: cache.c:728 dhcp.c:715 #, c-format msgid "bad address at %s line %d" msgstr "adresă greÅŸită în %s, linia %d" -#: cache.c:777 dhcp.c:729 +#: cache.c:774 dhcp.c:729 #, c-format msgid "bad name at %s line %d" msgstr "nume greÅŸit în %s linia %d" -#: cache.c:784 dhcp.c:783 +#: cache.c:781 dhcp.c:783 #, c-format msgid "read %s - %d addresses" msgstr "citesc %s - %d adrese" -#: cache.c:822 +#: cache.c:819 msgid "cleared cache" msgstr "memoria temporară a fost ÅŸtearsă" -#: cache.c:875 +#: cache.c:866 #, c-format msgid "" "not giving name %s to the DHCP lease of %s because the name exists in %s " @@ -48,7 +48,7 @@ msgstr "" "nu pot da numele %s împrumutului de adresă DHCP a lui %s deoarece " "numeleexistă în %s cu adresa %s" -#: cache.c:919 +#: cache.c:906 #, fuzzy, c-format msgid "" "time %lu, cache size %d, %d/%d cache insertions re-used unexpired cache " @@ -57,7 +57,7 @@ msgstr "" "cantitate de memorie temporară %d, %d/%d stocări temporare aureutilizat " "locaÅ£ii neexpirate." -#: util.c:154 option.c:582 +#: util.c:154 option.c:589 msgid "could not get memory" msgstr "nu am putut aloca memorie" @@ -75,313 +75,322 @@ msgstr "pornirea A EÅžUAT" msgid "infinite" msgstr "infinit" -#: option.c:164 +#: option.c:169 msgid "Specify local address(es) to listen on." msgstr "SpecificaÅ£i adresele locale deservite." -#: option.c:165 +#: option.c:170 msgid "Return ipaddr for all hosts in specified domains." msgstr "AfiÅŸează adresele IP ale maÅŸinilor în domeniul dat." -#: option.c:166 +#: option.c:171 msgid "Fake reverse lookups for RFC1918 private address ranges." msgstr "" "Simulează căutări după adresă pentru domenii de adresă private (RFC1918)." -#: option.c:167 +#: option.c:172 msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)." msgstr "Interpretează adresa IP ca NXDOMAIN (împotriva manipulărilor Verisign)" -#: option.c:168 +#: option.c:173 #, 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:169 +#: option.c:174 #, c-format msgid "Specify configuration file (defaults to %s)." msgstr "Specifică fiÅŸier de configurare (implicit e %s)." -#: option.c:170 +#: option.c:175 msgid "Do NOT fork into the background: run in debug mode." msgstr "NU porneÅŸte în fundal: rulează în modul depanare." -#: option.c:171 +#: option.c:176 msgid "Do NOT forward queries with no domain part." msgstr "NU înainta cererile ce nu conÅ£in domeniu DNS." -#: option.c:172 +#: option.c:177 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:173 +#: option.c:178 msgid "Expand simple names in /etc/hosts with domain-suffix." msgstr "Adaugă numelor simple din /etc/hosts numele domeniului ca sufix." -#: option.c:174 +#: option.c:179 msgid "Don't forward spurious DNS requests from Windows hosts." msgstr "Nu inainta cereri DNS defecte provenite de la maÅŸini Windows." -#: option.c:175 +#: option.c:180 msgid "Enable DHCP in the range given with lease duration." msgstr "Activează DHCP în domeniul dat cu durată limitată de împrumut." -#: option.c:176 +#: option.c:181 #, c-format msgid "Change to this group after startup (defaults to %s)." msgstr "Rulează sub acest grup după pornire (implicit e %s)." -#: option.c:177 +#: option.c:182 msgid "Set address or hostname for a specified machine." msgstr "Schimbă adresa sau numele maÅŸinii specificate." -#: option.c:178 +#: option.c:183 #, c-format msgid "Do NOT load %s file." msgstr "Nu încarcă fiÅŸierul %s." -#: option.c:179 +#: option.c:184 #, 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:180 +#: option.c:185 msgid "Specify interface(s) to listen on." msgstr "Specifică interfeÅ£ele deservite." -#: option.c:181 +#: option.c:186 msgid "Specify interface(s) NOT to listen on." msgstr "Specifică interfeÅ£ele NE-deservite." -#: option.c:182 +#: option.c:187 msgid "Map DHCP user class to option set." msgstr "Leagă clasa de utilizator DHCP cu grup de opÅ£iuni." -#: option.c:183 +#: option.c:188 msgid "Don't do DHCP for hosts in option set." msgstr "Nu furniza DHCP maÅŸinilor din grupul de opÅ£iuni." -#: option.c:184 +#: option.c:189 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:185 +#: option.c:190 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:186 +#: option.c:191 #, 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:187 +#: option.c:192 msgid "Return MX records for local hosts." msgstr "Răspunde cu întregistrări MX pentru maÅŸini locale." -#: option.c:188 +#: option.c:193 msgid "Specify an MX record." msgstr "Specifică o înregistrare MX." -#: option.c:189 +#: option.c:194 msgid "Specify BOOTP options to DHCP server." msgstr "Specifică opÅ£iuni BOOTP serverului DHCP." -#: option.c:190 +#: option.c:195 #, 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:191 +#: option.c:196 msgid "Do NOT cache failed search results." msgstr "NU memora rezultatele de căutare DNS eÅŸuatată." -#: option.c:192 +#: option.c:197 #, 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:193 -msgid "Set extra options to be set to DHCP clients." +#: option.c:198 +#, fuzzy +msgid "Specify options to be sent to DHCP clients." msgstr "Configurează opÅ£iuni în plusce trebuie trimise clienÅ£ilor DHCP." -#: option.c:194 +#: option.c:199 +msgid "DHCP option sent even if the client does not request it." +msgstr "" + +#: option.c:200 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:195 +#: option.c:201 #, 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:196 +#: option.c:202 msgid "Log queries." msgstr "ÃŽnregistrează tranzacÅ£iile." -#: option.c:197 +#: option.c:203 msgid "Force the originating port for upstream queries." msgstr "ForÅ£ează acest port pentru datele ce pleacă." -#: option.c:198 +#: option.c:204 msgid "Do NOT read resolv.conf." msgstr "NU citi fiÅŸierul resolv.conf" -#: option.c:199 +#: option.c:205 #, c-format msgid "Specify path to resolv.conf (defaults to %s)." msgstr "Specifică calea către resolv.conf (implicit e %s)." -#: option.c:200 +#: option.c:206 msgid "Specify address(es) of upstream servers with optional domains." msgstr "Specifică adresele server(elor) superioare cu domenii opÅ£ionale." -#: option.c:201 +#: option.c:207 msgid "Never forward queries to specified domains." msgstr "Nu înaintează cererile spre domeniile specificate." -#: option.c:202 +#: option.c:208 msgid "Specify the domain to be assigned in DHCP leases." msgstr "Specifică domeniul de transmis prin DHCP." -#: option.c:203 +#: option.c:209 msgid "Specify default target in an MX record." msgstr "Specifică o Å£intă într-o înregistrare MX." -#: option.c:204 +#: option.c:210 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:205 +#: option.c:211 #, c-format msgid "Change to this user after startup. (defaults to %s)." msgstr "Rulează sub acest utilizator după pornire. (implicit e %s)." -#: option.c:206 +#: option.c:212 msgid "Map DHCP vendor class to option set." msgstr "Trimite opÅ£iuni DHCP în funcÅ£ie de marca plăcii de reÅ£ea." -#: option.c:207 +#: option.c:213 msgid "Display dnsmasq version and copyright information." msgstr "AfiÅŸează versiunea dnsmasq ÅŸi drepturile de autor." -#: option.c:208 +#: option.c:214 msgid "Translate IPv4 addresses from upstream servers." msgstr "Traduce adresele IPv4 de la serverele DNS superioare." -#: option.c:209 +#: option.c:215 msgid "Specify a SRV record." msgstr "Specifică o înregistrare SRV." -#: option.c:210 +#: option.c:216 msgid "Display this message." msgstr "AfiÅŸează acest mesaj." -#: option.c:211 +#: option.c:217 #, fuzzy, c-format msgid "Specify path of PID file (defaults to %s)." msgstr "Specifică o cale pentru fiÅŸierul PID. (implicit %s)." -#: option.c:212 +#: option.c:218 #, c-format msgid "Specify maximum number of DHCP leases (defaults to %s)." msgstr "Specifică numărul maxim de împrumuturi DHCP (implicit %s)." -#: option.c:213 +#: option.c:219 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:214 +#: option.c:220 msgid "Specify TXT DNS record." msgstr "Specifică o înregistrare TXT." -#: option.c:215 +#: option.c:221 #, fuzzy msgid "Specify PTR DNS record." msgstr "Specifică o înregistrare TXT." -#: option.c:216 +#: option.c:222 msgid "Bind only to interfaces in use." msgstr "Ascultă doar pe interfeÅ£ele active." -#: option.c:217 +#: option.c:223 #, c-format msgid "Read DHCP static host information from %s." msgstr "CiteÅŸte informaÅ£ii DHCP statice despre maÅŸină din %s." -#: option.c:218 +#: option.c:224 msgid "Enable the DBus interface for setting upstream servers, etc." msgstr "Activeaza interfaÅ£a DBus pentru configurarea serverelor superioare." -#: option.c:219 +#: option.c:225 msgid "Do not provide DHCP on this interface, only provide DNS." msgstr "Nu activează DHCP ci doar DNS pe această interfaţă." -#: option.c:220 +#: option.c:226 msgid "Enable dynamic address allocation for bootp." msgstr "Activează alocarea dinamică a adreselor pentru BOOTP." -#: option.c:221 +#: option.c:227 #, 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:223 +#: option.c:229 msgid "Treat DHCP requests on aliases as arriving from interface." msgstr "" -#: option.c:225 +#: option.c:231 msgid "Disable ICMP echo address checking in the DHCP server." msgstr "" -#: option.c:226 +#: option.c:232 msgid "Script to run on DHCP lease creation and destruction." msgstr "" -#: option.c:227 +#: option.c:233 msgid "Read configuration from all the files in this directory." msgstr "" -#: option.c:228 +#: option.c:234 #, fuzzy msgid "Log to this syslog facility. (defaults to DAEMON)" msgstr "Rulează sub acest utilizator după pornire. (implicit e %s)." -#: option.c:229 +#: option.c:235 msgid "Read leases at startup, but never write the lease file." msgstr "" -#: option.c:230 +#: option.c:236 #, 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:231 +#: option.c:237 #, c-format msgid "Clear DNS cache when reloading %s." msgstr "" -#: option.c:232 +#: option.c:238 msgid "Ignore hostnames provided by DHCP clients." msgstr "" -#: option.c:233 +#: option.c:239 msgid "Enable integrated read-only TFTP server." msgstr "" -#: option.c:234 +#: option.c:240 msgid "Export files by TFTP only from the specified subtree." msgstr "" -#: option.c:235 +#: option.c:241 msgid "Allow access only to files owned by the user running dnsmasq." msgstr "" -#: option.c:236 +#: option.c:242 #, 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:361 +#: option.c:243 +msgid "Disable the TFTP blocksize extension." +msgstr "" + +#: option.c:368 #, c-format msgid "" "Usage: dnsmasq [options]\n" @@ -390,147 +399,147 @@ msgstr "" "Utilizare: dnsmasq [opÅ£iuni]\n" "\n" -#: option.c:363 +#: option.c:370 #, 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:365 +#: option.c:372 #, c-format msgid "Valid options are :\n" msgstr "OpÅ£iunile valide sunt:\n" -#: option.c:431 +#: option.c:438 msgid "bad dhcp-option" msgstr "dhcp-option invalid" -#: option.c:577 +#: option.c:584 msgid "bad domain in dhcp-option" msgstr "domeniu DNS invalid în declaraÅ£ia dhcp-option" -#: option.c:634 +#: option.c:641 msgid "dhcp-option too long" msgstr "declararea dhcp-option este prea lungă" -#: option.c:696 +#: option.c:698 #, fuzzy, c-format msgid "cannot access directory %s: %s" msgstr "nu pot citi %s: %s" -#: option.c:715 tftp.c:300 +#: option.c:717 tftp.c:301 #, fuzzy, c-format msgid "cannot access %s: %s" msgstr "nu pot citi %s: %s" -#: option.c:792 +#: option.c:794 msgid "bad MX preference" msgstr "preferinţă MX invalidă" -#: option.c:801 +#: option.c:803 msgid "bad MX name" msgstr "nume MX invalid" -#: option.c:819 +#: option.c:821 msgid "bad MX target" msgstr "Å£intă MX invalidă" -#: option.c:831 +#: option.c:833 msgid "cannot run scripts under uClinux" msgstr "" -#: option.c:1030 option.c:1041 +#: option.c:1032 option.c:1043 msgid "bad port" msgstr "port invalid" -#: option.c:1185 +#: option.c:1187 msgid "bad bridge-interface" msgstr "" -#: option.c:1229 +#: option.c:1231 msgid "bad dhcp-range" msgstr "dhcp-range invalid" -#: option.c:1258 +#: option.c:1260 msgid "only one netid tag allowed" msgstr "" -#: option.c:1303 +#: option.c:1305 msgid "inconsistent DHCP range" msgstr "domeniu DHCP inconsistent" -#: option.c:1488 +#: option.c:1490 msgid "bad dhcp-host" msgstr "dhcp-host invalid" -#: option.c:1688 +#: option.c:1691 #, fuzzy msgid "bad PTR record" msgstr "înregistrare SRV invalidă" -#: option.c:1713 +#: option.c:1716 msgid "bad TXT record" msgstr "înregistrare TXT invalidă" -#: option.c:1745 +#: option.c:1748 msgid "TXT record string too long" msgstr "ÅŸirul de caractere pentru înregistrarea TXT este prea lung" -#: option.c:1784 +#: option.c:1787 msgid "bad SRV record" msgstr "înregistrare SRV invalidă" -#: option.c:1797 +#: option.c:1800 msgid "bad SRV target" msgstr "Å£intă SRV invalidă" -#: option.c:1809 +#: option.c:1812 msgid "invalid port number" msgstr "număr de port invalid" -#: option.c:1820 +#: option.c:1823 msgid "invalid priority" msgstr "prioritate invalidă" -#: option.c:1831 +#: option.c:1834 msgid "invalid weight" msgstr "pondere invalidă" -#: option.c:1862 +#: option.c:1865 #, c-format msgid "files nested too deep in %s" msgstr "" -#: option.c:1869 tftp.c:450 +#: option.c:1872 tftp.c:451 #, c-format msgid "cannot read %s: %s" msgstr "nu pot citi %s: %s" -#: option.c:1912 +#: option.c:1917 msgid "missing \"" msgstr "lipseÅŸte \"" -#: option.c:1951 +#: option.c:1956 msgid "bad option" msgstr "opÅ£iune invalidă" -#: option.c:1953 +#: option.c:1958 msgid "extraneous parameter" msgstr "parametru nerecunoscut" -#: option.c:1955 +#: option.c:1960 msgid "missing parameter" msgstr "parametru lipsa" -#: option.c:1957 +#: option.c:1962 msgid "error" msgstr "eroare" -#: option.c:2025 +#: option.c:2030 #, c-format msgid "Dnsmasq version %s %s\n" msgstr "dnsmasq versiunea %s %s\n" -#: option.c:2026 +#: option.c:2031 #, c-format msgid "" "Compile time options %s\n" @@ -539,54 +548,54 @@ msgstr "" "OpÅ£iuni cu care a fost compilat %s\n" "\n" -#: option.c:2027 +#: option.c:2032 #, c-format msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" msgstr "Acest program vine FÄ‚RÄ‚ NICI O GARANÅ¢IE.\n" -#: option.c:2028 +#: option.c:2033 #, 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:2029 +#: option.c:2034 #, c-format msgid "under the terms of the GNU General Public License, version 2.\n" msgstr "în termenii LicenÅ£ei publice generale GNU, versiunea 2.\n" -#: option.c:2040 +#: option.c:2045 msgid "try --help" msgstr "" -#: option.c:2042 +#: option.c:2047 msgid "try -w" msgstr "" -#: option.c:2045 +#: option.c:2050 #, fuzzy, c-format msgid "bad command line options: %s" msgstr "opÅ£iuni în linie de comandă invalide: %s." -#: option.c:2096 +#: option.c:2101 #, c-format msgid "cannot get host-name: %s" msgstr "nu pot citi numele maÅŸinii: %s" -#: option.c:2124 +#: option.c:2129 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:2134 +#: option.c:2139 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:2137 +#: option.c:2142 #, fuzzy, c-format msgid "failed to read %s: %s" msgstr "nu pot citi %s: %n" -#: option.c:2155 +#: option.c:2160 #, c-format msgid "no search directive found in %s" msgstr "nu s-a găsit nici un criteriu de căutare în %s" @@ -915,104 +924,99 @@ msgstr "" msgid "failed to write %s: %s (retry in %us)" msgstr "nu pot citi %s: %n" -#: rfc2131.c:297 +#: rfc2131.c:271 #, 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:298 +#: rfc2131.c:272 msgid "with subnet selector" msgstr "cu selectorul de subreÅ£ea" -#: rfc2131.c:298 +#: rfc2131.c:272 msgid "via" msgstr "prin" -#: rfc2131.c:322 rfc2131.c:347 +#: rfc2131.c:296 rfc2131.c:327 msgid "disabled" msgstr "dezactivat" -#: rfc2131.c:359 rfc2131.c:814 +#: rfc2131.c:339 rfc2131.c:778 msgid "address in use" msgstr "adresa este folosită" -#: rfc2131.c:362 +#: rfc2131.c:342 msgid "no address configured" msgstr "adresă lipsă" -#: rfc2131.c:375 rfc2131.c:682 +#: rfc2131.c:355 rfc2131.c:646 msgid "no address available" msgstr "nici o adresă disponibilă" -#: rfc2131.c:384 rfc2131.c:824 +#: rfc2131.c:364 rfc2131.c:788 msgid "no leases left" msgstr "nu mai am de unde să împrumut" -#: rfc2131.c:387 rfc2131.c:788 +#: rfc2131.c:367 rfc2131.c:752 msgid "wrong network" msgstr "reÅ£ea greÅŸită" -#: rfc2131.c:605 +#: rfc2131.c:569 #, fuzzy, c-format msgid "disabling DHCP static address %s for %s" msgstr "dezactivăm adresele DHCP statice %s" -#: rfc2131.c:626 +#: rfc2131.c:590 msgid "unknown lease" msgstr "împrumut necunoscut" -#: rfc2131.c:635 rfc2131.c:934 +#: rfc2131.c:599 rfc2131.c:898 msgid "ignored" msgstr "ignorat" -#: rfc2131.c:655 +#: rfc2131.c:619 #, c-format msgid "not using configured address %s because it is leased to %s" msgstr "" -#: rfc2131.c:665 +#: rfc2131.c:629 #, c-format msgid "" "not using configured address %s because it is in use by the server or relay" msgstr "" -#: rfc2131.c:668 +#: rfc2131.c:632 #, c-format msgid "not using configured address %s because it was previously declined" msgstr "" -#: rfc2131.c:751 +#: rfc2131.c:715 msgid "wrong address" msgstr "adresă greÅŸită" -#: rfc2131.c:764 +#: rfc2131.c:728 msgid "lease not found" msgstr "împrumutul nu a fost găsit" -#: rfc2131.c:796 +#: rfc2131.c:760 msgid "address not available" msgstr "adresă indisponibilă" -#: rfc2131.c:807 +#: rfc2131.c:771 msgid "static lease available" msgstr "împrumut static este disponibil" -#: rfc2131.c:811 +#: rfc2131.c:775 msgid "address reserved" msgstr "adresă rezervată" -#: rfc2131.c:817 +#: rfc2131.c:781 msgid "no unique-id" msgstr "" -#: rfc2131.c:1181 -#, c-format -msgid "cannot send DHCP option %d: no space left in packet" -msgstr "nu pot trimite opÅ£iunea DHCP %d: nu mai este loc în pachet" - -#: rfc2131.c:1476 +#: rfc2131.c:1180 #, fuzzy, c-format -msgid "cannot send encapsulated option %d: no space left in wrapper" +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" #: netlink.c:59 @@ -1067,26 +1071,30 @@ msgstr "accesarea serverului %s a eÅŸuat: %n" msgid "unsupported request from %s" msgstr "" -#: tftp.c:229 +#: tftp.c:230 #, c-format msgid "TFTP sent %s to %s" msgstr "" -#: tftp.c:296 +#: tftp.c:297 #, fuzzy, c-format msgid "file %s not found" msgstr "împrumutul nu a fost găsit" -#: tftp.c:352 +#: tftp.c:353 #, c-format msgid "TFTP error %d %s received from %s" msgstr "" -#: tftp.c:383 +#: tftp.c:384 #, fuzzy, c-format msgid "TFTP failed sending %s to %s" msgstr "nu pot citi %s: %n" +#, fuzzy +#~ msgid "cannot send encapsulated option %d: no space left in wrapper" +#~ msgstr "nu pot trimite opÅ£iunea DHCP %d: nu mai este loc în pachet" + #~ msgid "More than one vendor class matches, using %s" #~ msgstr "Se potrivesc mai multe clase de mărci de interfeÅ£e, folosim %s" diff --git a/src/cache.c b/src/cache.c index d88ac4d..b377e5a 100644 --- a/src/cache.c +++ b/src/cache.c @@ -13,7 +13,7 @@ #include "dnsmasq.h" static struct crec *cache_head, *cache_tail, **hash_table; -static struct crec *dhcp_inuse, *dhcp_spare, *new_chain; +static struct crec *dhcp_spare, *new_chain; static int cache_inserted, cache_live_freed, insert_error; static union bigname *big_free; static int bignames_left, log_queries, cache_size, hash_size; @@ -74,7 +74,7 @@ void cache_init(int size, int logq) addrbuff = NULL; cache_head = cache_tail = NULL; - dhcp_inuse = dhcp_spare = NULL; + dhcp_spare = NULL; new_chain = NULL; hash_table = NULL; cache_size = size; @@ -170,7 +170,7 @@ static void cache_hash(struct crec *crecp) up = &((*up)->hash_next); if (crecp->flags & F_IMMORTAL) - while (*up && (!(*up)->flags & F_IMMORTAL)) + while (*up && !((*up)->flags & F_IMMORTAL)) up = &((*up)->hash_next); } crecp->hash_next = *up; @@ -282,9 +282,7 @@ static int cache_scan_free(char *name, struct all_addr *addr, time_t now, unsign if (flags & F_FORWARD) { - for (up = hash_bucket(name), crecp = *up; - crecp && ((crecp->flags & F_REVERSE) || !(crecp->flags & F_IMMORTAL)); - crecp = crecp->hash_next) + for (up = hash_bucket(name), crecp = *up; crecp; crecp = crecp->hash_next) if (is_expired(now, crecp) || is_outdated_cname_pointer(crecp)) { *up = crecp->hash_next; @@ -601,8 +599,7 @@ struct crec *cache_find_by_addr(struct crec *crecp, struct all_addr *addr, crecp = crecp->hash_next) if (!is_expired(now, crecp)) { - if ((crecp->flags & F_REVERSE) && - (crecp->flags & prot) && + if ((crecp->flags & prot) && memcmp(&crecp->addr.addr, addr, addrlen) == 0) { if (crecp->flags & (F_HOSTS | F_DHCP)) @@ -834,25 +831,19 @@ void cache_reload(int opts, char *buff, char *domain_suffix, struct hostsfile *a void cache_unhash_dhcp(void) { - struct crec *tmp, *cache, **up; + struct crec *cache, **up; int i; for (i=0; i<hash_size; i++) for (cache = hash_table[i], up = &hash_table[i]; cache; cache = cache->hash_next) if (cache->flags & F_DHCP) - *up = cache->hash_next; + { + *up = cache->hash_next; + cache->next = dhcp_spare; + dhcp_spare = cache; + } else up = &cache->hash_next; - - /* prev field links all dhcp entries */ - for (cache = dhcp_inuse; cache; cache = tmp) - { - tmp = cache->prev; - cache->prev = dhcp_spare; - dhcp_spare = cache; - } - - dhcp_inuse = NULL; } void cache_add_dhcp_entry(struct daemon *daemon, char *host_name, @@ -893,7 +884,7 @@ void cache_add_dhcp_entry(struct daemon *daemon, char *host_name, } if ((crec = dhcp_spare)) - dhcp_spare = dhcp_spare->prev; + dhcp_spare = dhcp_spare->next; else /* need new one */ crec = malloc(sizeof(struct crec)); @@ -906,14 +897,10 @@ void cache_add_dhcp_entry(struct daemon *daemon, char *host_name, crec->ttd = ttd; crec->addr.addr.addr.addr4 = *host_address; crec->name.namep = host_name; - crec->prev = dhcp_inuse; - dhcp_inuse = crec; cache_hash(crec); } } - - void dump_cache(struct daemon *daemon, time_t now) { syslog(LOG_INFO, _("time %lu, cache size %d, %d/%d cache insertions re-used unexpired cache entries."), diff --git a/src/config.h b/src/config.h index 3894a25..d8daf7b 100644 --- a/src/config.h +++ b/src/config.h @@ -10,7 +10,7 @@ GNU General Public License for more details. */ -#define VERSION "2.37" +#define VERSION "2.38" #define FTABSIZ 150 /* max number of outstanding requests (default) */ #define MAX_PROCS 20 /* max no children for TCP requests */ @@ -180,7 +180,7 @@ NOTES: # error HAVE_ISC_READER is not compatible with HAVE_BROKEN_RTC #endif -/* Allow TFTP to be disabled with CFLAGS=-DNO_TFTP */ +/* Allow TFTP to be disabled with COPT=-DNO_TFTP */ #ifdef NO_TFTP #undef HAVE_TFTP #endif @@ -276,6 +276,7 @@ typedef unsigned long in_addr_t; #endif /* Decide if we're going to support IPv6 */ +/* IPv6 can be forced off with "make COPTS=-DNO_IPV6" */ /* We assume that systems which don't have IPv6 headers don't have ntop and pton either */ diff --git a/src/dnsmasq.h b/src/dnsmasq.h index 841fda2..3950a9b 100644 --- a/src/dnsmasq.h +++ b/src/dnsmasq.h @@ -114,6 +114,7 @@ extern int capset(cap_user_header_t header, cap_user_data_t data); #define OPT_RELOAD (1<<24) #define OPT_TFTP (1<<25) #define OPT_TFTP_SECURE (1<<26) +#define OPT_TFTP_NOBLOCK (1<<27) struct all_addr { union { @@ -365,7 +366,9 @@ struct dhcp_opt { #define DHOPT_ADDR 1 #define DHOPT_STRING 2 -#define DHOPT_VENDOR_MATCH 4 +#define DHOPT_ENCAPSULATE 4 +#define DHOPT_VENDOR_MATCH 8 +#define DHOPT_FORCE 16 struct dhcp_boot { char *file, *sname; @@ -474,7 +477,7 @@ struct daemon { struct hostsfile *addn_hosts; struct dhcp_context *dhcp; struct dhcp_config *dhcp_conf; - struct dhcp_opt *dhcp_opts, *vendor_opts; + struct dhcp_opt *dhcp_opts; struct dhcp_vendor *dhcp_vendors; struct dhcp_mac *dhcp_macs; struct dhcp_boot *boot_config; diff --git a/src/forward.c b/src/forward.c index f5c516c..940d1f5 100644 --- a/src/forward.c +++ b/src/forward.c @@ -447,7 +447,9 @@ void reply_query(struct serverfd *sfd, struct daemon *daemon, time_t now) { struct server *server = forward->sentto; - if ((header->rcode == SERVFAIL || header->rcode == REFUSED) && forward->forwardall == 0) + if ((header->rcode == SERVFAIL || header->rcode == REFUSED) && + !(daemon->options & OPT_ORDER) && + forward->forwardall == 0) /* for broken servers, attempt to send to another one. */ { unsigned char *pheader; diff --git a/src/option.c b/src/option.c index ef267dc..b5768da 100644 --- a/src/option.c +++ b/src/option.c @@ -35,6 +35,8 @@ struct myoption { #define LOPT_PTR 261 #define LOPT_BRIDGE 262 #define LOPT_TFTP_MAX 263 +#define LOPT_FORCE 264 +#define LOPT_NOBLOCK 265 #ifdef HAVE_GETOPT_LONG static const struct option opts[] = @@ -117,6 +119,8 @@ static const struct myoption opts[] = #if defined(__FreeBSD__) || defined(__DragonFly__) {"bridge-interface", 1, 0 , LOPT_BRIDGE }, #endif + {"dhcp-option-force", 1, 0, LOPT_FORCE }, + {"tftp-no-blocksize", 0, 0, LOPT_NOBLOCK }, { NULL, 0, 0, 0 } }; @@ -151,6 +155,7 @@ static const struct optflags optmap[] = { { LOPT_RELOAD, OPT_RELOAD }, { LOPT_TFTP, OPT_TFTP }, { LOPT_SECURE, OPT_TFTP_SECURE }, + { LOPT_NOBLOCK, OPT_TFTP_NOBLOCK }, { 'v', 0}, { 'w', 0}, { 0, 0 } @@ -190,7 +195,8 @@ static const struct { { "-n, --no-poll", gettext_noop("Do NOT poll %s file, reload only on SIGHUP."), RESOLVFILE }, { "-N, --no-negcache", gettext_noop("Do NOT cache failed search results."), NULL }, { "-o, --strict-order", gettext_noop("Use nameservers strictly in the order given in %s."), RESOLVFILE }, - { "-O, --dhcp-option=<optspec>", gettext_noop("Set extra options to be set to DHCP clients."), NULL }, + { "-O, --dhcp-option=<optspec>", gettext_noop("Specify options to be sent to DHCP clients."), NULL }, + { " --dhcp-option-force=<optspec>", gettext_noop("DHCP option sent even if the client does not request it."), NULL}, { "-p, --port=number", gettext_noop("Specify port to listen for DNS requests on (defaults to 53)."), NULL }, { "-P, --edns-packet-max=<size>", gettext_noop("Maximum supported UDP packet size for EDNS.0 (defaults to %s)."), "*" }, { "-q, --log-queries", gettext_noop("Log queries."), NULL }, @@ -234,17 +240,18 @@ static const struct { { " --tftp-root=<directory>", gettext_noop("Export files by TFTP only from the specified subtree."), NULL }, { " --tftp-secure", gettext_noop("Allow access only to files owned by the user running dnsmasq."), NULL }, { " --tftp-max=<connections>", gettext_noop("Maximum number of conncurrent TFTP transfers (defaults to %s)."), "#" }, + { " --tftp-no-blocksize", gettext_noop("Disable the TFTP blocksize extension."), NULL }, { NULL, NULL, NULL } }; /* We hide metacharaters in quoted strings by mapping them into the ASCII control - character space. Note that the \0, \t \a \b \r and \n characters are carefully placed in the + character space. Note that the \0, \t \a \b \r \033 and \n characters are carefully placed in the following sequence so that they map to themselves: it is therefore possible to call unhide_metas repeatedly on string without breaking things. The transformation gets undone by opt_canonicalise, atoi_check and safe_string_alloc, and a couple of other places. */ -static const char meta[] = "\000123456\a\b\t\n78\r90abcdefABCDEF:,."; +static const char meta[] = "\000123456\a\b\t\n78\r90abcdefABCDE\033F:,."; static void one_file(struct daemon *daemon, char *file, int nest); @@ -380,15 +387,15 @@ static void do_usage(void) } /* This is too insanely large to keep in-line in the switch */ -static char *parse_dhcp_opt(struct daemon *daemon, char *arg) +static char *parse_dhcp_opt(struct daemon *daemon, char *arg, int forced) { struct dhcp_opt *new = safe_malloc(sizeof(struct dhcp_opt)); char lenchar = 0, *cp; - int addrs, digs, is_addr, is_hex, is_dec, is_vend = 0; + int addrs, digs, is_addr, is_hex, is_dec; char *comma, *problem = NULL; new->len = 0; - new->flags = 0; + new->flags = forced ? DHOPT_FORCE : 0; new->netid = NULL; new->val = NULL; new->vendor_class = NULL; @@ -408,7 +415,7 @@ static char *parse_dhcp_opt(struct daemon *daemon, char *arg) if (strstr(arg, "vendor:") == arg) { new->vendor_class = (unsigned char *)safe_string_alloc(arg+7); - is_vend = 1; + new->flags |= DHOPT_ENCAPSULATE; } else { @@ -488,7 +495,7 @@ static char *parse_dhcp_opt(struct daemon *daemon, char *arg) new->len = 2; else if (lenchar == 'i') new->len = 4; - else if (new->vendor_class) + else if (new->flags & DHOPT_ENCAPSULATE) { if (val & 0xffff0000) new->len = 4; @@ -517,12 +524,12 @@ static char *parse_dhcp_opt(struct daemon *daemon, char *arg) /* max length of address/subnet descriptor is five bytes, add one for the option 120 enc byte too */ new->val = op = safe_malloc((5 * addrs) + 1); - if (!new->vendor_class) + new->flags |= DHOPT_ADDR; + + if (!(new->flags & DHOPT_ENCAPSULATE) && new->opt == 120) { - if (new->opt == 120) - *(op++) = 1; /* RFC 3361 "enc byte" */ - else - new->flags |= DHOPT_ADDR; + *(op++) = 1; /* RFC 3361 "enc byte" */ + new->flags &= ~DHOPT_ADDR; } while (addrs--) { @@ -558,7 +565,7 @@ static char *parse_dhcp_opt(struct daemon *daemon, char *arg) else { /* text arg */ - if ((new->opt == 119 || new->opt == 120) && !new->vendor_class) + if ((new->opt == 119 || new->opt == 120) && !(new->flags & DHOPT_ENCAPSULATE)) { /* dns search, RFC 3397, or SIP, RFC 3361 */ unsigned char *q, *r, *tail; @@ -643,11 +650,6 @@ static char *parse_dhcp_opt(struct daemon *daemon, char *arg) free(new->vendor_class); free(new); } - else if (is_vend) - { - new->next = daemon->vendor_opts; - daemon->vendor_opts = new; - } else { new->next = daemon->dhcp_opts; @@ -1501,7 +1503,8 @@ static char *one_opt(struct daemon *daemon, int option, char *arg, char *problem } case 'O': - if ((problem = parse_dhcp_opt(daemon, arg))) + case LOPT_FORCE: + if ((problem = parse_dhcp_opt(daemon, arg, option == LOPT_FORCE))) option = '?'; break; @@ -1899,6 +1902,8 @@ static void one_file(struct daemon *daemon, char *file, int nest) p[1] = '\b'; else if (p[1] == 'r') p[1] = '\r'; + else if (p[1] == 'e') /* escape */ + p[1] = '\033'; memmove(p, p+1, strlen(p+1)+1); } *p = hide_meta(*p); diff --git a/src/rfc2131.c b/src/rfc2131.c index 8b46cce..4759bcf 100644 --- a/src/rfc2131.c +++ b/src/rfc2131.c @@ -87,35 +87,10 @@ static void do_options(struct dhcp_context *context, unsigned char fqdn_flags, int null_term, unsigned char *agent_id); - -/* find a good value to use as MAC address for logging and address-allocation hashing. - This is normally just the chaddr field from the DHCP packet, - but eg Firewire will have hlen == 0 and use the client-id instead. - This could be anything, but will normally be EUI64 for Firewire. - We assume that if the first byte of the client-id equals the htype byte - then the client-id is using the usual encoding and use the rest of the - client-id: if not we can use the whole client-id. This should give - sane MAC address logs. */ static unsigned char *extended_hwaddr(int hwtype, int hwlen, unsigned char *hwaddr, - int clid_len, unsigned char *clid, int *len_out) -{ - if (hwlen == 0 && clid && clid_len > 3) - { - if ((clid[0] == ARPHRD_EUI64 && hwtype == ARPHRD_IEEE1394) || clid[0] == hwtype) - { - *len_out = clid_len - 1 ; - return clid + 1; - } - else - { - *len_out = clid_len; - return clid; - } - } - - *len_out = hwlen; - return hwaddr; -} + int clid_len, unsigned char *clid, int *len_out); +static void match_vendor_opts(unsigned char *opt, struct dhcp_opt *dopt); + size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_name, size_t sz, time_t now, int unicast_dest) @@ -123,7 +98,6 @@ size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *ifa unsigned char *opt, *clid = NULL; struct dhcp_lease *ltmp, *lease = NULL; struct dhcp_vendor *vendor; - struct dhcp_opt *dopt; struct dhcp_mac *mac; struct dhcp_netid_list *id_list; int clid_len = 0, ignore = 0, do_classes = 0, selecting = 0; @@ -311,7 +285,7 @@ size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *ifa if (mess_type == 0) { /* BOOTP request */ - struct dhcp_netid id; + struct dhcp_netid id, bootp_id; struct in_addr *logaddr = NULL; /* must have a MAC addr for bootp */ @@ -341,6 +315,12 @@ size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *ifa id.next = netid; netid = &id; } + + /* Add "bootp" as a tag to allow different options, address ranges etc + for BOOTP clients */ + bootp_id.net = "bootp"; + bootp_id.next = netid; + netid = &bootp_id; for (id_list = daemon->dhcp_ignore; id_list; id_list = id_list->next) if (match_netid(id_list->list, netid, 0)) @@ -409,7 +389,7 @@ size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *ifa log_packet(daemon, NULL, logaddr, mess->chaddr, mess->hlen, iface_name, message); - return message ? dhcp_packet_size(mess) : 0; + return message ? 0 : dhcp_packet_size(mess); } if ((opt = option_find(mess, sz, OPTION_CLIENT_FQDN, 4))) @@ -534,23 +514,7 @@ size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *ifa } /* mark vendor-encapsulated options which match the client-supplied vendor class */ - opt = option_find(mess, sz, OPTION_VENDOR_ID, 1); - for (dopt = daemon->vendor_opts; dopt; dopt = dopt->next) - { - int i, len = 0; - dopt->flags &= ~DHOPT_VENDOR_MATCH; - if (opt) - { - if (dopt->vendor_class) - len = strlen((char *)dopt->vendor_class); - for (i = 0; i <= (option_len(opt) - len); i++) - if (len == 0 || memcmp(dopt->vendor_class, option_ptr(opt)+i, len) == 0) - { - dopt->flags |= DHOPT_VENDOR_MATCH; - break; - } - } - } + match_vendor_opts(option_find(mess, sz, OPTION_VENDOR_ID, 1), daemon->dhcp_opts); /* if all the netids in the ignore list are present, ignore this client */ for (id_list = daemon->dhcp_ignore; id_list; id_list = id_list->next) @@ -961,6 +925,41 @@ size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *ifa return 0; } +/* find a good value to use as MAC address for logging and address-allocation hashing. + This is normally just the chaddr field from the DHCP packet, + but eg Firewire will have hlen == 0 and use the client-id instead. + This could be anything, but will normally be EUI64 for Firewire. + We assume that if the first byte of the client-id equals the htype byte + then the client-id is using the usual encoding and use the rest of the + client-id: if not we can use the whole client-id. This should give + sane MAC address logs. */ +static unsigned char *extended_hwaddr(int hwtype, int hwlen, unsigned char *hwaddr, + int clid_len, unsigned char *clid, int *len_out) +{ + if (hwlen == 0 && clid && clid_len > 3) + { + if (clid[0] == hwtype) + { + *len_out = clid_len - 1 ; + return clid + 1; + } + +#if defined(ARPHRD_EUI64) && defined(ARPHRD_IEEE1394) + if (clid[0] == ARPHRD_EUI64 && hwtype == ARPHRD_IEEE1394) + { + *len_out = clid_len - 1 ; + return clid + 1; + } +#endif + + *len_out = clid_len; + return clid; + } + + *len_out = hwlen; + return hwaddr; +} + static unsigned int calc_time(struct dhcp_context *context, struct dhcp_config *config, struct dhcp_lease *lease, unsigned char *opt, time_t now) { @@ -1178,7 +1177,7 @@ static unsigned char *free_space(struct dhcp_packet *mess, unsigned char *end, i } if (!p) - syslog(LOG_WARNING, _("cannot send DHCP option %d: no space left in packet"), opt); + syslog(LOG_WARNING, _("cannot send DHCP/BOOTP option %d: no space left in packet"), opt); } if (p) @@ -1223,7 +1222,7 @@ static int do_opt(struct dhcp_opt *opt, unsigned char *p, struct in_addr local, if (p && len != 0) { - if (opt->flags & DHOPT_ADDR) + if ((opt->flags & DHOPT_ADDR) && !(opt->flags & DHOPT_ENCAPSULATE)) { int j; struct in_addr *a = (struct in_addr *)opt->val; @@ -1246,8 +1245,8 @@ static int do_opt(struct dhcp_opt *opt, unsigned char *p, struct in_addr local, static int in_list(unsigned char *list, int opt) { int i; - - /* If no requested options, send everything, not nothing. */ + + /* If no requested options, send everything, not nothing. */ if (!list) return 1; @@ -1262,13 +1261,35 @@ static struct dhcp_opt *option_find2(struct dhcp_netid *netid, struct dhcp_opt * { struct dhcp_opt *tmp; for (tmp = opts; tmp; tmp = tmp->next) - if (tmp->opt == opt) + if (tmp->opt == opt && !(tmp->flags & DHOPT_ENCAPSULATE)) if (match_netid(tmp->netid, netid, 1) || match_netid(tmp->netid, netid, 0)) return tmp; return netid ? option_find2(NULL, opts, opt) : NULL; } +/* mark vendor-encapsulated options which match the client-supplied or + config-supplied vendor class */ +static void match_vendor_opts(unsigned char *opt, struct dhcp_opt *dopt) +{ + for (; dopt; dopt = dopt->next) + { + dopt->flags &= ~DHOPT_VENDOR_MATCH; + if (opt && (dopt->flags & DHOPT_ENCAPSULATE)) + { + int i, len = 0; + if (dopt->vendor_class) + len = strlen((char *)dopt->vendor_class); + for (i = 0; i <= (option_len(opt) - len); i++) + if (len == 0 || memcmp(dopt->vendor_class, option_ptr(opt)+i, len) == 0) + { + dopt->flags |= DHOPT_VENDOR_MATCH; + break; + } + } + } +} + static void clear_packet(struct dhcp_packet *mess, unsigned char *end) { memset(mess->sname, 0, sizeof(mess->sname)); @@ -1292,7 +1313,7 @@ static void do_options(struct dhcp_context *context, struct dhcp_opt *opt, *config_opts = daemon->dhcp_opts; struct dhcp_boot *boot; unsigned char *p, *end = agent_id ? agent_id : real_end; - int len; + int len, force_encap = 0; unsigned char f0 = 0, s0 = 0; /* decide which dhcp-boot option we're using */ @@ -1428,17 +1449,23 @@ static void do_options(struct dhcp_context *context, } } - for (opt=config_opts; opt; opt = opt->next) + for (opt = config_opts; opt; opt = opt->next) { + /* was it asked for, or are we sending it anyway? */ + if (!(opt->flags & DHOPT_FORCE) && !in_list(req_options, opt->opt)) + continue; + + /* prohibit some used-internally options */ if (opt->opt == OPTION_HOSTNAME || opt->opt == OPTION_CLIENT_FQDN || opt->opt == OPTION_MAXMESSAGE || - opt->opt == OPTION_VENDOR_CLASS_OPT || opt->opt == OPTION_OVERLOAD || opt->opt == OPTION_PAD || - opt->opt == OPTION_END || - !in_list(req_options, opt->opt) || - opt != option_find2(netid, config_opts, opt->opt)) + opt->opt == OPTION_END) + continue; + + /* netids match and not encapsulated? */ + if (opt != option_find2(netid, config_opts, opt->opt)) continue; /* For the options we have default values on @@ -1453,41 +1480,66 @@ static void do_options(struct dhcp_context *context, len = do_opt(opt, NULL, context->local, null_term); if ((p = free_space(mess, end, opt->opt, len))) - do_opt(opt, p, context->local, null_term); - } + { + do_opt(opt, p, context->local, null_term); + + /* If we send a vendor-id, revisit which vendor-ops we consider + it appropriate to send. */ + if (opt->opt == OPTION_VENDOR_ID) + match_vendor_opts(p - 2, config_opts); + } + } - if (in_list(req_options, OPTION_VENDOR_CLASS_OPT)) + /* prune encapsulated options based on netid, and look if we're forcing them to be sent */ + for (opt = config_opts; opt; opt = opt->next) + if (opt->flags & DHOPT_VENDOR_MATCH) + { + if (!match_netid(opt->netid, netid, 1) && !match_netid(opt->netid, netid, 0)) + opt->flags &= ~DHOPT_VENDOR_MATCH; + else if (opt->flags & DHOPT_FORCE) + force_encap = 1; + } + + if (force_encap || in_list(req_options, OPTION_VENDOR_CLASS_OPT)) { int enc_len = 0; - + struct dhcp_opt *start; + /* find size in advance */ - for (opt = daemon->vendor_opts; opt; opt = opt->next) + for (start = opt = config_opts; opt; opt = opt->next) if (opt->flags & DHOPT_VENDOR_MATCH) { - if (!match_netid(opt->netid, netid, 1) && !match_netid(opt->netid, netid, 0)) - opt->flags &= ~DHOPT_VENDOR_MATCH; + int new = do_opt(opt, NULL, context->local, null_term) + 2; + if (enc_len + new <= 255) + enc_len += new; else { - int new = enc_len + do_opt(opt, NULL, context->local, null_term) + 2; - if (new <= 255) - enc_len = new; - else - { - syslog(LOG_WARNING, _("cannot send encapsulated option %d: no space left in wrapper"), opt->opt); - opt->flags &= ~DHOPT_VENDOR_MATCH; - } + p = free_space(mess, end, OPTION_VENDOR_CLASS_OPT, enc_len); + for (; start && start != opt; start = start->next) + if (p && (start->flags & DHOPT_VENDOR_MATCH)) + { + len = do_opt(start, p + 2, context->local, null_term); + *(p++) = start->opt; + *(p++) = len; + p += len; + } + enc_len = new; + start = opt; } } - - if ((p = free_space(mess, end, OPTION_VENDOR_CLASS_OPT, enc_len))) + + if (enc_len != 0 && + (p = free_space(mess, end, OPTION_VENDOR_CLASS_OPT, enc_len + 1))) { - for (opt = daemon->vendor_opts; opt; opt = opt->next) - if (opt->flags & DHOPT_VENDOR_MATCH) + for (; start; start = start->next) + if (start->flags & DHOPT_VENDOR_MATCH) { - len = do_opt(opt, p + 2, context->local, null_term); - *(p++) = opt->opt; + len = do_opt(start, p + 2, context->local, null_term); + *(p++) = start->opt; *(p++) = len; + p += len; } + *p = OPTION_END; } } @@ -160,7 +160,8 @@ void tftp_request(struct listener *listen, struct daemon *daemon, time_t now) while ((opt = next(&p, end))) { if (strcasecmp(opt, "blksize") == 0 && - (opt = next(&p, end))) + (opt = next(&p, end)) && + !(daemon->options & OPT_TFTP_NOBLOCK)) { transfer->blocksize = atoi(opt); if (transfer->blocksize < 1) |