diff options
| author | Simon Kelley <simon@thekelleys.org.uk> | 2008-07-20 20:22:50 +0100 |
|---|---|---|
| committer | Simon Kelley <simon@thekelleys.org.uk> | 2012-01-05 17:31:14 +0000 |
| commit | 1ad24ae15c799bff2d644cc02bc272ab91cf6f79 (patch) | |
| tree | d9fac39dd5e64f342aac92e2f13565898dba0a02 | |
| parent | 3927da46aa47328bcb58aa10429f590897e40fb0 (diff) | |
| download | dnsmasq-1ad24ae15c799bff2d644cc02bc272ab91cf6f79.tar.gz | |
import of dnsmasq-2.45.tar.gzv2.45
| -rw-r--r-- | CHANGELOG | 10 | ||||
| -rw-r--r-- | po/de.po | 140 | ||||
| -rw-r--r-- | po/es.po | 140 | ||||
| -rw-r--r-- | po/fi.po | 140 | ||||
| -rw-r--r-- | po/fr.po | 140 | ||||
| -rw-r--r-- | po/id.po | 140 | ||||
| -rw-r--r-- | po/it.po | 140 | ||||
| -rw-r--r-- | po/no.po | 140 | ||||
| -rw-r--r-- | po/pl.po | 140 | ||||
| -rw-r--r-- | po/pt_BR.po | 140 | ||||
| -rw-r--r-- | po/ro.po | 140 | ||||
| -rw-r--r-- | src/config.h | 2 | ||||
| -rw-r--r-- | src/network.c | 13 | ||||
| -rw-r--r-- | src/option.c | 40 |
14 files changed, 745 insertions, 720 deletions
@@ -2599,3 +2599,13 @@ version 2.44 Patch to enable compilation of latest Mac OS X. Thanks to David Gilman. + + Update Spanish translation. Thanks to Christopher Chatham. + +version 2.45 + Fix total DNS failure in release 2.43 unless --min-port + specified. Thanks to Steven Barth and Grant Coady for + bugreport. Also reject out-of-range port spec, which could + break things too: suggestion from Gilles Espinasse. + + @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: dnsmasq 2.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-07-20 09:38+0100\n" +"POT-Creation-Date: 2008-07-20 20:03+0100\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" @@ -513,187 +513,187 @@ msgstr "" msgid "Specify lowest port available for DNS query transmission." msgstr "" -#: option.c:564 +#: option.c:574 #, c-format msgid "" "Usage: dnsmasq [options]\n" "\n" msgstr "" -#: option.c:566 +#: option.c:576 #, c-format msgid "Use short options only on the command line.\n" msgstr "" -#: option.c:568 +#: option.c:578 #, c-format msgid "Valid options are:\n" msgstr "" -#: option.c:608 +#: option.c:618 #, c-format msgid "Known DHCP options:\n" msgstr "" -#: option.c:681 +#: option.c:691 msgid "bad dhcp-option" msgstr "" # @Simon: Here I need an example to understand it :) -#: option.c:737 +#: option.c:747 #, fuzzy msgid "bad IP address" msgstr "lese %s - %d Adressen" -#: option.c:835 +#: option.c:845 msgid "bad domain in dhcp-option" msgstr "" -#: option.c:893 +#: option.c:903 msgid "dhcp-option too long" msgstr "" -#: option.c:922 +#: option.c:932 msgid "illegal repeated flag" msgstr "" -#: option.c:930 +#: option.c:940 msgid "illegal repeated keyword" msgstr "" -#: option.c:964 +#: option.c:974 #, c-format msgid "cannot access directory %s: %s" msgstr "" -#: option.c:983 tftp.c:348 +#: option.c:993 tftp.c:348 #, c-format msgid "cannot access %s: %s" msgstr "" -#: option.c:1020 +#: option.c:1030 msgid "only one dhcp-hostsfile allowed" msgstr "" -#: option.c:1027 +#: option.c:1037 msgid "only one dhcp-optsfile allowed" msgstr "" -#: option.c:1071 +#: option.c:1081 msgid "bad MX preference" msgstr "" -#: option.c:1075 +#: option.c:1085 msgid "bad MX name" msgstr "" -#: option.c:1089 +#: option.c:1099 msgid "bad MX target" msgstr "" -#: option.c:1100 +#: option.c:1110 msgid "cannot run scripts under uClinux" msgstr "" -#: option.c:1293 option.c:1301 +#: option.c:1303 option.c:1311 msgid "bad port" msgstr "" -#: option.c:1321 option.c:1346 +#: option.c:1331 option.c:1356 msgid "interface binding not supported" msgstr "" -#: option.c:1464 +#: option.c:1474 msgid "bad port range" msgstr "" -#: option.c:1481 +#: option.c:1491 msgid "bad bridge-interface" msgstr "" -#: option.c:1522 +#: option.c:1532 msgid "bad dhcp-range" msgstr "" -#: option.c:1548 +#: option.c:1558 msgid "only one netid tag allowed" msgstr "" -#: option.c:1588 +#: option.c:1598 msgid "inconsistent DHCP range" msgstr "" -#: option.c:1756 +#: option.c:1766 msgid "bad DHCP host name" msgstr "" -#: option.c:1928 option.c:2171 +#: option.c:1938 option.c:2181 msgid "invalid port number" msgstr "" -#: option.c:2014 +#: option.c:2024 msgid "bad interface name" msgstr "" -#: option.c:2034 +#: option.c:2044 msgid "bad PTR record" msgstr "" -#: option.c:2064 +#: option.c:2074 msgid "bad NAPTR record" msgstr "" -#: option.c:2090 +#: option.c:2100 msgid "TXT record string too long" msgstr "" -#: option.c:2094 +#: option.c:2104 msgid "bad TXT record" msgstr "" -#: option.c:2154 +#: option.c:2164 msgid "bad SRV record" msgstr "" -#: option.c:2163 +#: option.c:2173 msgid "bad SRV target" msgstr "" -#: option.c:2178 +#: option.c:2188 msgid "invalid priority" msgstr "" -#: option.c:2185 +#: option.c:2195 msgid "invalid weight" msgstr "" -#: option.c:2221 +#: option.c:2231 #, c-format msgid "files nested too deep in %s" msgstr "" -#: option.c:2229 tftp.c:503 +#: option.c:2239 tftp.c:503 #, c-format msgid "cannot read %s: %s" msgstr "" -#: option.c:2290 +#: option.c:2300 msgid "missing \"" msgstr "" -#: option.c:2337 +#: option.c:2347 msgid "bad option" msgstr "" -#: option.c:2339 +#: option.c:2349 msgid "extraneous parameter" msgstr "" -#: option.c:2341 +#: option.c:2351 msgid "missing parameter" msgstr "" -#: option.c:2349 +#: option.c:2359 msgid "error" msgstr "" @@ -702,75 +702,75 @@ msgstr "" # @Simon: ("keinen Speicher" = "no memory", "... nicht bekommen" = "... not get") # @Simon: both would be correct - but would sound rather clumsy in german # @Simon: how about "Nicht genügend Speicher verfügbar" = "Not enough memory available" ? -#: option.c:2355 +#: option.c:2365 #, c-format msgid "%s at line %d of %%s" msgstr "%s in Zeile %d von %%s" -#: option.c:2395 option.c:2425 +#: option.c:2405 option.c:2435 #, c-format msgid "read %s" msgstr "" -#: option.c:2492 +#: option.c:2502 #, c-format msgid "Dnsmasq version %s %s\n" msgstr "" -#: option.c:2493 +#: option.c:2503 #, c-format msgid "" "Compile time options %s\n" "\n" msgstr "" -#: option.c:2494 +#: option.c:2504 #, c-format msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" msgstr "" -#: option.c:2495 +#: option.c:2505 #, c-format msgid "Dnsmasq is free software, and you are welcome to redistribute it\n" msgstr "" -#: option.c:2496 +#: option.c:2506 #, c-format msgid "under the terms of the GNU General Public License, version 2 or 3.\n" msgstr "" -#: option.c:2507 +#: option.c:2517 msgid "try --help" msgstr "" -#: option.c:2509 +#: option.c:2519 msgid "try -w" msgstr "" -#: option.c:2512 +#: option.c:2522 #, c-format msgid "bad command line options: %s" msgstr "" -#: option.c:2553 +#: option.c:2563 #, c-format msgid "cannot get host-name: %s" msgstr "" -#: option.c:2581 +#: option.c:2591 msgid "only one resolv.conf file allowed in no-poll mode." msgstr "" -#: option.c:2591 +#: option.c:2601 msgid "must have exactly one resolv.conf to read domain from." msgstr "" -#: option.c:2594 network.c:719 +#: option.c:2604 network.c:724 #, c-format msgid "failed to read %s: %s" msgstr "" -#: option.c:2612 +#: option.c:2622 #, c-format msgid "no search directive found in %s" msgstr "" @@ -839,53 +839,53 @@ msgstr "" msgid "failed to create TFTP socket: %s" msgstr "" -#: network.c:626 +#: network.c:631 #, c-format msgid "failed to bind server socket for %s: %s" msgstr "" -#: network.c:659 +#: network.c:664 #, c-format msgid "ignoring nameserver %s - local interface" msgstr "" -#: network.c:670 +#: network.c:675 #, c-format msgid "ignoring nameserver %s - cannot make/bind socket: %s" msgstr "" -#: network.c:685 +#: network.c:690 msgid "unqualified" msgstr "" -#: network.c:685 +#: network.c:690 msgid "names" msgstr "" -#: network.c:687 +#: network.c:692 msgid "default" msgstr "" -#: network.c:689 +#: network.c:694 msgid "domain" msgstr "" -#: network.c:692 +#: network.c:697 #, c-format msgid "using local addresses only for %s %s" msgstr "" -#: network.c:694 +#: network.c:699 #, c-format msgid "using nameserver %s#%d for %s %s" msgstr "" -#: network.c:697 +#: network.c:702 #, c-format msgid "using nameserver %s#%d(via %s)" msgstr "" -#: network.c:699 +#: network.c:704 #, c-format msgid "using nameserver %s#%d" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: dnsmasq 2.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-07-20 09:38+0100\n" +"POT-Creation-Date: 2008-07-20 20:03+0100\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" @@ -489,7 +489,7 @@ msgstr "Especificar expediente DNS NAPTR." msgid "Specify lowest port available for DNS query transmission." msgstr "Especificar puerto más bajo disponible para transmisión de búsquedas DNS." -#: option.c:564 +#: option.c:574 #, c-format msgid "" "Usage: dnsmasq [options]\n" @@ -498,205 +498,205 @@ msgstr "" "Modo de uso: dnsmasq [opciones]\n" "\n" -#: option.c:566 +#: option.c:576 #, 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:568 +#: option.c:578 #, fuzzy, c-format msgid "Valid options are:\n" msgstr "Opciones válidas son :\n" -#: option.c:608 +#: option.c:618 #, c-format msgid "Known DHCP options:\n" msgstr "Opciones DHCP conocidas:\n" -#: option.c:681 +#: option.c:691 msgid "bad dhcp-option" msgstr "opción dhcp-option errónea" -#: option.c:737 +#: option.c:747 #, fuzzy msgid "bad IP address" msgstr "dirección IP errónea" -#: option.c:835 +#: option.c:845 msgid "bad domain in dhcp-option" msgstr "dominio erróneo en dhcp-option" -#: option.c:893 +#: option.c:903 msgid "dhcp-option too long" msgstr "opción dhcp-option demasiado larga" -#: option.c:922 +#: option.c:932 msgid "illegal repeated flag" msgstr "opción repetida ilegal" -#: option.c:930 +#: option.c:940 msgid "illegal repeated keyword" msgstr "palabra clave repetida ilegal" -#: option.c:964 +#: option.c:974 #, fuzzy, c-format msgid "cannot access directory %s: %s" msgstr "no se puede accesar directorio %s: %s" -#: option.c:983 tftp.c:348 +#: option.c:993 tftp.c:348 #, fuzzy, c-format msgid "cannot access %s: %s" msgstr "no se puede accesar %s: %s" -#: option.c:1020 +#: option.c:1030 #, fuzzy msgid "only one dhcp-hostsfile allowed" msgstr "solo un dhcp-hostsfile permitido" -#: option.c:1027 +#: option.c:1037 #, fuzzy msgid "only one dhcp-optsfile allowed" msgstr "solo un dhcp-optsfile permitido" -#: option.c:1071 +#: option.c:1081 msgid "bad MX preference" msgstr "preferencia MX errónea" -#: option.c:1075 +#: option.c:1085 msgid "bad MX name" msgstr "nombre MX erróneo" -#: option.c:1089 +#: option.c:1099 msgid "bad MX target" msgstr "destino MX erróneo" -#: option.c:1100 +#: option.c:1110 msgid "cannot run scripts under uClinux" msgstr "no se pueden correr archivos guiónes bajo uClinux" -#: option.c:1293 option.c:1301 +#: option.c:1303 option.c:1311 msgid "bad port" msgstr "puerto erróneo" -#: option.c:1321 option.c:1346 +#: option.c:1331 option.c:1356 msgid "interface binding not supported" msgstr "vinculación de interface no está soportado" -#: option.c:1464 +#: option.c:1474 #, fuzzy msgid "bad port range" msgstr "rango de puertos erróneo" -#: option.c:1481 +#: option.c:1491 msgid "bad bridge-interface" msgstr "opción bridge-interface (interface puente) errónea" -#: option.c:1522 +#: option.c:1532 msgid "bad dhcp-range" msgstr "opción dhcp-range (rango DHCP) errónea" -#: option.c:1548 +#: option.c:1558 msgid "only one netid tag allowed" msgstr "solo una etiqueta netid permitida" -#: option.c:1588 +#: option.c:1598 msgid "inconsistent DHCP range" msgstr "rango DHCP inconsistente" -#: option.c:1756 +#: option.c:1766 #, fuzzy msgid "bad DHCP host name" msgstr "nombre de host DHCP erróneo" -#: option.c:1928 option.c:2171 +#: option.c:1938 option.c:2181 msgid "invalid port number" msgstr "número de puerto inválido" -#: option.c:2014 +#: option.c:2024 #, fuzzy msgid "bad interface name" msgstr "nombre de interface erróneo" -#: option.c:2034 +#: option.c:2044 #, fuzzy msgid "bad PTR record" msgstr "expediente PTR erróneo" -#: option.c:2064 +#: option.c:2074 #, fuzzy msgid "bad NAPTR record" msgstr "expediente NAPTR erróneo" -#: option.c:2090 +#: option.c:2100 msgid "TXT record string too long" msgstr "expediente TXT demasiado largo" -#: option.c:2094 +#: option.c:2104 msgid "bad TXT record" msgstr "expediente TXT erróneo" -#: option.c:2154 +#: option.c:2164 msgid "bad SRV record" msgstr "expediente SRV erróneo" -#: option.c:2163 +#: option.c:2173 msgid "bad SRV target" msgstr "destino SRV erróneo" -#: option.c:2178 +#: option.c:2188 msgid "invalid priority" msgstr "prioridad inválida" -#: option.c:2185 +#: option.c:2195 msgid "invalid weight" msgstr "peso inválido" -#: option.c:2221 +#: option.c:2231 #, c-format msgid "files nested too deep in %s" msgstr "archivos jerarquizados demasiado profundo en %s" -#: option.c:2229 tftp.c:503 +#: option.c:2239 tftp.c:503 #, c-format msgid "cannot read %s: %s" msgstr "no se puede leer %s: %s" -#: option.c:2290 +#: option.c:2300 msgid "missing \"" msgstr "falta \"" -#: option.c:2337 +#: option.c:2347 msgid "bad option" msgstr "opción errónea" -#: option.c:2339 +#: option.c:2349 msgid "extraneous parameter" msgstr "parámetro extraño" -#: option.c:2341 +#: option.c:2351 msgid "missing parameter" msgstr "parámetro ausente" -#: option.c:2349 +#: option.c:2359 msgid "error" msgstr "error" -#: option.c:2355 +#: option.c:2365 #, c-format msgid "%s at line %d of %%s" msgstr "%s en línea %d de %%s" -#: option.c:2395 option.c:2425 +#: option.c:2405 option.c:2435 #, fuzzy, c-format msgid "read %s" msgstr "leyendo %s" -#: option.c:2492 +#: option.c:2502 #, c-format msgid "Dnsmasq version %s %s\n" msgstr "Dnsmasq versión %s %s\n" -#: option.c:2493 +#: option.c:2503 #, c-format msgid "" "Compile time options %s\n" @@ -705,53 +705,53 @@ msgstr "" "Opciones de compilación %s\n" "\n" -#: option.c:2494 +#: option.c:2504 #, c-format msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" msgstr "Este software viene SIN NINGUNA GARANTIA.\n" -#: option.c:2495 +#: option.c:2505 #, 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:2496 +#: option.c:2506 #, fuzzy, c-format msgid "under the terms of the GNU General Public License, version 2 or 3.\n" msgstr "bajo los términos de la GNU General Public License, versión 2 o 3.\n" -#: option.c:2507 +#: option.c:2517 msgid "try --help" msgstr "pruebe --help" -#: option.c:2509 +#: option.c:2519 msgid "try -w" msgstr "pruebe -w" -#: option.c:2512 +#: option.c:2522 #, fuzzy, c-format msgid "bad command line options: %s" msgstr "opciones de línea de comandos erróneas: %s" -#: option.c:2553 +#: option.c:2563 #, c-format msgid "cannot get host-name: %s" msgstr "no se puede obtener host-name (nombre de host): %s" -#: option.c:2581 +#: option.c:2591 msgid "only one resolv.conf file allowed in no-poll mode." msgstr "solo un archivo resolv.conf permitido en modo no-poll." -#: option.c:2591 +#: option.c:2601 msgid "must have exactly one resolv.conf to read domain from." msgstr "debe haber exáctamente un resolv.conf desde donde leer dominio." -#: option.c:2594 network.c:719 +#: option.c:2604 network.c:724 #, fuzzy, c-format msgid "failed to read %s: %s" msgstr "no se pudo leer %s: %s" -#: option.c:2612 +#: option.c:2622 #, c-format msgid "no search directive found in %s" msgstr "ninguna directiva de búsqueda encontrada en %s" @@ -820,53 +820,53 @@ msgstr "no se pudo escuchar en socket: %s" msgid "failed to create TFTP socket: %s" msgstr "no se pudo crear socket TFTP: %s" -#: network.c:626 +#: network.c:631 #, fuzzy, c-format msgid "failed to bind server socket for %s: %s" msgstr "no se pudo acoplar socket escuchador para %s: %s" -#: network.c:659 +#: network.c:664 #, c-format msgid "ignoring nameserver %s - local interface" msgstr "ignorando servidor DNS %s - interface local" -#: network.c:670 +#: network.c:675 #, fuzzy, c-format msgid "ignoring nameserver %s - cannot make/bind socket: %s" msgstr "ignorando servidor DNS %s - no se puede crear/acoplar socket: %s" -#: network.c:685 +#: network.c:690 msgid "unqualified" msgstr "no calificado" -#: network.c:685 +#: network.c:690 msgid "names" msgstr "nombres" -#: network.c:687 +#: network.c:692 msgid "default" msgstr "predeterminado" -#: network.c:689 +#: network.c:694 msgid "domain" msgstr "dominio" -#: network.c:692 +#: network.c:697 #, c-format msgid "using local addresses only for %s %s" msgstr "usando direcciones locales solo para %s %s" -#: network.c:694 +#: network.c:699 #, c-format msgid "using nameserver %s#%d for %s %s" msgstr "usando servidor DNS %s#%d para %s %s" -#: network.c:697 +#: network.c:702 #, fuzzy, c-format msgid "using nameserver %s#%d(via %s)" msgstr "usando servidor DNS %s#%d(vía %s)" -#: network.c:699 +#: network.c:704 #, c-format msgid "using nameserver %s#%d" msgstr "usando servidor DNS %s#%d" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: dnsmasq 2.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-07-20 09:38+0100\n" +"POT-Creation-Date: 2008-07-20 20:03+0100\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" @@ -477,257 +477,257 @@ msgstr "" msgid "Specify lowest port available for DNS query transmission." msgstr "" -#: option.c:564 +#: option.c:574 #, c-format msgid "" "Usage: dnsmasq [options]\n" "\n" msgstr "" -#: option.c:566 +#: option.c:576 #, c-format msgid "Use short options only on the command line.\n" msgstr "" -#: option.c:568 +#: option.c:578 #, c-format msgid "Valid options are:\n" msgstr "" -#: option.c:608 +#: option.c:618 #, c-format msgid "Known DHCP options:\n" msgstr "" -#: option.c:681 +#: option.c:691 msgid "bad dhcp-option" msgstr "" -#: option.c:737 +#: option.c:747 msgid "bad IP address" msgstr "" -#: option.c:835 +#: option.c:845 msgid "bad domain in dhcp-option" msgstr "" -#: option.c:893 +#: option.c:903 msgid "dhcp-option too long" msgstr "" -#: option.c:922 +#: option.c:932 msgid "illegal repeated flag" msgstr "" -#: option.c:930 +#: option.c:940 msgid "illegal repeated keyword" msgstr "" -#: option.c:964 +#: option.c:974 #, c-format msgid "cannot access directory %s: %s" msgstr "" -#: option.c:983 tftp.c:348 +#: option.c:993 tftp.c:348 #, c-format msgid "cannot access %s: %s" msgstr "" -#: option.c:1020 +#: option.c:1030 msgid "only one dhcp-hostsfile allowed" msgstr "" -#: option.c:1027 +#: option.c:1037 msgid "only one dhcp-optsfile allowed" msgstr "" -#: option.c:1071 +#: option.c:1081 msgid "bad MX preference" msgstr "" -#: option.c:1075 +#: option.c:1085 msgid "bad MX name" msgstr "" -#: option.c:1089 +#: option.c:1099 msgid "bad MX target" msgstr "" -#: option.c:1100 +#: option.c:1110 msgid "cannot run scripts under uClinux" msgstr "" -#: option.c:1293 option.c:1301 +#: option.c:1303 option.c:1311 msgid "bad port" msgstr "" -#: option.c:1321 option.c:1346 +#: option.c:1331 option.c:1356 msgid "interface binding not supported" msgstr "" -#: option.c:1464 +#: option.c:1474 msgid "bad port range" msgstr "" -#: option.c:1481 +#: option.c:1491 msgid "bad bridge-interface" msgstr "" -#: option.c:1522 +#: option.c:1532 msgid "bad dhcp-range" msgstr "" -#: option.c:1548 +#: option.c:1558 msgid "only one netid tag allowed" msgstr "" -#: option.c:1588 +#: option.c:1598 msgid "inconsistent DHCP range" msgstr "" -#: option.c:1756 +#: option.c:1766 msgid "bad DHCP host name" msgstr "" -#: option.c:1928 option.c:2171 +#: option.c:1938 option.c:2181 msgid "invalid port number" msgstr "" -#: option.c:2014 +#: option.c:2024 msgid "bad interface name" msgstr "" -#: option.c:2034 +#: option.c:2044 msgid "bad PTR record" msgstr "" -#: option.c:2064 +#: option.c:2074 msgid "bad NAPTR record" msgstr "" -#: option.c:2090 +#: option.c:2100 msgid "TXT record string too long" msgstr "" -#: option.c:2094 +#: option.c:2104 msgid "bad TXT record" msgstr "" -#: option.c:2154 +#: option.c:2164 msgid "bad SRV record" msgstr "" -#: option.c:2163 +#: option.c:2173 msgid "bad SRV target" msgstr "" -#: option.c:2178 +#: option.c:2188 msgid "invalid priority" msgstr "" -#: option.c:2185 +#: option.c:2195 msgid "invalid weight" msgstr "" -#: option.c:2221 +#: option.c:2231 #, c-format msgid "files nested too deep in %s" msgstr "" -#: option.c:2229 tftp.c:503 +#: option.c:2239 tftp.c:503 #, c-format msgid "cannot read %s: %s" msgstr "" -#: option.c:2290 +#: option.c:2300 msgid "missing \"" msgstr "" -#: option.c:2337 +#: option.c:2347 msgid "bad option" msgstr "" -#: option.c:2339 +#: option.c:2349 msgid "extraneous parameter" msgstr "" -#: option.c:2341 +#: option.c:2351 msgid "missing parameter" msgstr "" -#: option.c:2349 +#: option.c:2359 msgid "error" msgstr "" -#: option.c:2355 +#: option.c:2365 #, c-format msgid "%s at line %d of %%s" msgstr "" -#: option.c:2395 option.c:2425 +#: option.c:2405 option.c:2435 #, c-format msgid "read %s" msgstr "" -#: option.c:2492 +#: option.c:2502 #, c-format msgid "Dnsmasq version %s %s\n" msgstr "" -#: option.c:2493 +#: option.c:2503 #, c-format msgid "" "Compile time options %s\n" "\n" msgstr "" -#: option.c:2494 +#: option.c:2504 #, c-format msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" msgstr "" -#: option.c:2495 +#: option.c:2505 #, c-format msgid "Dnsmasq is free software, and you are welcome to redistribute it\n" msgstr "" -#: option.c:2496 +#: option.c:2506 #, c-format msgid "under the terms of the GNU General Public License, version 2 or 3.\n" msgstr "" -#: option.c:2507 +#: option.c:2517 msgid "try --help" msgstr "" -#: option.c:2509 +#: option.c:2519 msgid "try -w" msgstr "" -#: option.c:2512 +#: option.c:2522 #, c-format msgid "bad command line options: %s" msgstr "" -#: option.c:2553 +#: option.c:2563 #, c-format msgid "cannot get host-name: %s" msgstr "" -#: option.c:2581 +#: option.c:2591 msgid "only one resolv.conf file allowed in no-poll mode." msgstr "" -#: option.c:2591 +#: option.c:2601 msgid "must have exactly one resolv.conf to read domain from." msgstr "" -#: option.c:2594 network.c:719 +#: option.c:2604 network.c:724 #, c-format msgid "failed to read %s: %s" msgstr "" -#: option.c:2612 +#: option.c:2622 #, c-format msgid "no search directive found in %s" msgstr "" @@ -796,53 +796,53 @@ msgstr "" msgid "failed to create TFTP socket: %s" msgstr "" -#: network.c:626 +#: network.c:631 #, c-format msgid "failed to bind server socket for %s: %s" msgstr "" -#: network.c:659 +#: network.c:664 #, c-format msgid "ignoring nameserver %s - local interface" msgstr "" -#: network.c:670 +#: network.c:675 #, c-format msgid "ignoring nameserver %s - cannot make/bind socket: %s" msgstr "" -#: network.c:685 +#: network.c:690 msgid "unqualified" msgstr "" -#: network.c:685 +#: network.c:690 msgid "names" msgstr "" -#: network.c:687 +#: network.c:692 msgid "default" msgstr "" -#: network.c:689 +#: network.c:694 msgid "domain" msgstr "" -#: network.c:692 +#: network.c:697 #, c-format msgid "using local addresses only for %s %s" msgstr "" -#: network.c:694 +#: network.c:699 #, c-format msgid "using nameserver %s#%d for %s %s" msgstr "" -#: network.c:697 +#: network.c:702 #, c-format msgid "using nameserver %s#%d(via %s)" msgstr "" -#: network.c:699 +#: network.c:704 #, c-format msgid "using nameserver %s#%d" msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: dnsmasq 2.34\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-07-20 09:38+0100\n" +"POT-Creation-Date: 2008-07-20 20:03+0100\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" @@ -490,7 +490,7 @@ msgstr "Spécifie un champ DNS NAPTR." msgid "Specify lowest port available for DNS query transmission." msgstr "Définie le plus petit port utilisé pour la transmission d'une requête DNS." -#: option.c:564 +#: option.c:574 #, c-format msgid "" "Usage: dnsmasq [options]\n" @@ -499,205 +499,205 @@ msgstr "" "Usage : dnsmasq [options]\n" "\n" -#: option.c:566 +#: option.c:576 #, 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:568 +#: option.c:578 #, fuzzy, c-format msgid "Valid options are:\n" msgstr "Les options valides sont :\n" -#: option.c:608 +#: option.c:618 #, c-format msgid "Known DHCP options:\n" msgstr "Options DHCP connues :\n" -#: option.c:681 +#: option.c:691 msgid "bad dhcp-option" msgstr "mauvaise valeur de 'dhcp-option'" -#: option.c:737 +#: option.c:747 #, fuzzy msgid "bad IP address" msgstr "mauvaise adresse IP" -#: option.c:835 +#: option.c:845 msgid "bad domain in dhcp-option" msgstr "mauvais domaine dans dhcp-option" -#: option.c:893 +#: option.c:903 msgid "dhcp-option too long" msgstr "dhcp-option trop long" -#: option.c:922 +#: option.c:932 msgid "illegal repeated flag" msgstr "Une option ne pouvant être spécifié qu'une seule fois à été donnée plusieurs fois." -#: option.c:930 +#: option.c:940 msgid "illegal repeated keyword" msgstr "Mot-clef ne pouvant être répété" -#: option.c:964 +#: option.c:974 #, fuzzy, c-format msgid "cannot access directory %s: %s" msgstr "Ne peut pas lire le répertoire %s : %s" -#: option.c:983 tftp.c:348 +#: option.c:993 tftp.c:348 #, fuzzy, c-format msgid "cannot access %s: %s" msgstr "Ne peut pas lire %s : %s" -#: option.c:1020 +#: option.c:1030 #, fuzzy msgid "only one dhcp-hostsfile allowed" msgstr "une seule valeur est autorisée pour 'dhcp-hostsfile'" -#: option.c:1027 +#: option.c:1037 #, fuzzy msgid "only one dhcp-optsfile allowed" msgstr "une seule valeur est autorisée pour 'dhcp-optsfile'" -#: option.c:1071 +#: option.c:1081 msgid "bad MX preference" msgstr "Mauvaise préference MX" -#: option.c:1075 +#: option.c:1085 msgid "bad MX name" msgstr "mauvais nom MX" -#: option.c:1089 +#: option.c:1099 msgid "bad MX target" msgstr "mauvaise cible MX" -#: option.c:1100 +#: option.c:1110 msgid "cannot run scripts under uClinux" msgstr "ne peut exécuter de script sous uClinux" -#: option.c:1293 option.c:1301 +#: option.c:1303 option.c:1311 msgid "bad port" msgstr "mauvais port" -#: option.c:1321 option.c:1346 +#: option.c:1331 option.c:1356 msgid "interface binding not supported" msgstr "association d'interface non supportée" -#: option.c:1464 +#: option.c:1474 #, fuzzy msgid "bad port range" msgstr "mauvaise gamme de ports" -#: option.c:1481 +#: option.c:1491 msgid "bad bridge-interface" msgstr "mauvaise interface-pont" -#: option.c:1522 +#: option.c:1532 msgid "bad dhcp-range" msgstr "mauvaise plage d'adresses DHCP (dhcp-range)" -#: option.c:1548 +#: option.c:1558 msgid "only one netid tag allowed" msgstr "une seule étiquette netid est autorisée" -#: option.c:1588 +#: option.c:1598 msgid "inconsistent DHCP range" msgstr "plage d'adresses DHCP incohérente" -#: option.c:1756 +#: option.c:1766 #, fuzzy msgid "bad DHCP host name" msgstr "mauvais nom d'hôte DHCP" -#: option.c:1928 option.c:2171 +#: option.c:1938 option.c:2181 msgid "invalid port number" msgstr "numéro de port invalide" -#: option.c:2014 +#: option.c:2024 #, fuzzy msgid "bad interface name" msgstr "mauvais nom d'interface" -#: option.c:2034 +#: option.c:2044 #, fuzzy msgid "bad PTR record" msgstr "mauvais champ PTR" -#: option.c:2064 +#: option.c:2074 #, fuzzy msgid "bad NAPTR record" msgstr "mauvais champ NAPTR" -#: option.c:2090 +#: option.c:2100 msgid "TXT record string too long" msgstr "chaîne du champ TXT trop longue" -#: option.c:2094 +#: option.c:2104 msgid "bad TXT record" msgstr "mauvais champ TXT" -#: option.c:2154 +#: option.c:2164 msgid "bad SRV record" msgstr "mauvais champ SRV" -#: option.c:2163 +#: option.c:2173 msgid "bad SRV target" msgstr "mauvaise cible SRV" -#: option.c:2178 +#: option.c:2188 msgid "invalid priority" msgstr "priorité invalide" -#: option.c:2185 +#: option.c:2195 msgid "invalid weight" msgstr "poids invalide" -#: option.c:2221 +#: option.c:2231 #, c-format msgid "files nested too deep in %s" msgstr "trop de niveaux de récursion pour les fichiers dans %s" -#: option.c:2229 tftp.c:503 +#: option.c:2239 tftp.c:503 #, c-format msgid "cannot read %s: %s" msgstr "Ne peut pas lire %s : %s" -#: option.c:2290 +#: option.c:2300 msgid "missing \"" msgstr "il manque \"" -#: option.c:2337 +#: option.c:2347 msgid "bad option" msgstr "mauvaise option" -#: option.c:2339 +#: option.c:2349 msgid "extraneous parameter" msgstr "paramètre en trop" -#: option.c:2341 +#: option.c:2351 msgid "missing parameter" msgstr "paramètre manquant" -#: option.c:2349 +#: option.c:2359 msgid "error" msgstr "erreur" -#: option.c:2355 +#: option.c:2365 #, c-format msgid "%s at line %d of %%s" msgstr "%s à la ligne %d de %%s" -#: option.c:2395 option.c:2425 +#: option.c:2405 option.c:2435 #, fuzzy, c-format msgid "read %s" msgstr "Lecture de %s" -#: option.c:2492 +#: option.c:2502 #, c-format msgid "Dnsmasq version %s %s\n" msgstr "Version de Dnsmasq %s %s\n" -#: option.c:2493 +#: option.c:2503 #, c-format msgid "" "Compile time options %s\n" @@ -706,53 +706,53 @@ msgstr "" "Options à la compilation %s\n" "\n" -#: option.c:2494 +#: option.c:2504 #, c-format msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" msgstr "Ce logiciel est fourni sans AUCUNE GARANTIE.\n" -#: option.c:2495 +#: option.c:2505 #, 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:2496 +#: option.c:2506 #, fuzzy, c-format msgid "under the terms of the GNU General Public License, version 2 or 3.\n" msgstr "sous les termes de la licence GPL (GNU General Public License), version 2 ou 3.\n" -#: option.c:2507 +#: option.c:2517 msgid "try --help" msgstr "essayez avec --help" -#: option.c:2509 +#: option.c:2519 msgid "try -w" msgstr "essayez avec -w" -#: option.c:2512 +#: option.c:2522 #, fuzzy, c-format msgid "bad command line options: %s" msgstr "mauvaises options en ligne de commande : %s." -#: option.c:2553 +#: option.c:2563 #, c-format msgid "cannot get host-name: %s" msgstr "ne peut pas obtenir le nom de la machine : %s" -#: option.c:2581 +#: option.c:2591 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:2591 +#: option.c:2601 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:2594 network.c:719 +#: option.c:2604 network.c:724 #, fuzzy, c-format msgid "failed to read %s: %s" msgstr "impossible de lire %s : %m" -#: option.c:2612 +#: option.c:2622 #, c-format msgid "no search directive found in %s" msgstr "pas de directive de recherche trouvée dans %s" @@ -821,53 +821,53 @@ msgstr "impossible de lire sur la socket : %s" msgid "failed to create TFTP socket: %s" msgstr "impossible de créer une socket de lecture : %s" -#: network.c:626 +#: network.c:631 #, fuzzy, c-format msgid "failed to bind server socket for %s: %s" msgstr "impossible de lier la socket de lecture pour %s : %s" -#: network.c:659 +#: network.c:664 #, c-format msgid "ignoring nameserver %s - local interface" msgstr "ignore le serveur de nom %s - interface locale" -#: network.c:670 +#: network.c:675 #, fuzzy, c-format msgid "ignoring nameserver %s - cannot make/bind socket: %s" msgstr "ignore le serveur de nom %s - ne peut construire/lier la socket : %m" -#: network.c:685 +#: network.c:690 msgid "unqualified" msgstr "non-qualifié(e)" -#: network.c:685 +#: network.c:690 msgid "names" msgstr "noms" -#: network.c:687 +#: network.c:692 msgid "default" msgstr "défaut" -#: network.c:689 +#: network.c:694 msgid "domain" msgstr "domaine" -#: network.c:692 +#: network.c:697 #, c-format msgid "using local addresses only for %s %s" msgstr "utilise les adresses locales seulement pour %s %s" -#: network.c:694 +#: network.c:699 #, c-format msgid "using nameserver %s#%d for %s %s" msgstr "utilise le serveur de nom %s#%d pour %s %s" -#: network.c:697 +#: network.c:702 #, fuzzy, c-format msgid "using nameserver %s#%d(via %s)" msgstr "utilise le serveur de nom %s#%d (via %s)" -#: network.c:699 +#: network.c:704 #, c-format msgid "using nameserver %s#%d" msgstr "utilise le serveur de nom %s#%d" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: dnsmasq 2.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-07-20 09:38+0100\n" +"POT-Creation-Date: 2008-07-20 20:03+0100\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" @@ -563,7 +563,7 @@ msgid "Specify lowest port available for DNS query transmission." msgstr "" # OK -#: option.c:564 +#: option.c:574 #, c-format msgid "" "Usage: dnsmasq [options]\n" @@ -573,238 +573,238 @@ msgstr "" "\n" # OK -#: option.c:566 +#: option.c:576 #, c-format msgid "Use short options only on the command line.\n" msgstr "Gunakan pilihan pendek saja pada perintah baris.\n" # OK -#: option.c:568 +#: option.c:578 #, fuzzy, c-format msgid "Valid options are:\n" msgstr "Pilihan yang boleh adalah:\n" -#: option.c:608 +#: option.c:618 #, c-format msgid "Known DHCP options:\n" msgstr "" # OK -#: option.c:681 +#: option.c:691 msgid "bad dhcp-option" msgstr "dhcp-option salah" # OK -#: option.c:737 +#: option.c:747 #, fuzzy msgid "bad IP address" msgstr "membaca %s - %d alamat" # OK -#: option.c:835 +#: option.c:845 msgid "bad domain in dhcp-option" msgstr "domain dalam dhcp-option salah" # OK -#: option.c:893 +#: option.c:903 msgid "dhcp-option too long" msgstr "dhcp-option terlalu panjang" -#: option.c:922 +#: option.c:932 msgid "illegal repeated flag" msgstr "" -#: option.c:930 +#: option.c:940 msgid "illegal repeated keyword" msgstr "" # OK -#: option.c:964 +#: option.c:974 #, fuzzy, c-format msgid "cannot access directory %s: %s" msgstr "tidak bisa membaca %s: %s" # OK -#: option.c:983 tftp.c:348 +#: option.c:993 tftp.c:348 #, fuzzy, c-format msgid "cannot access %s: %s" msgstr "tidak bisa membaca %s: %s" -#: option.c:1020 +#: option.c:1030 msgid "only one dhcp-hostsfile allowed" msgstr "" -#: option.c:1027 +#: option.c:1037 msgid "only one dhcp-optsfile allowed" msgstr "" # OK -#: option.c:1071 +#: option.c:1081 msgid "bad MX preference" msgstr "kesukaan MX salah" # OK -#: option.c:1075 +#: option.c:1085 msgid "bad MX name" msgstr "nama MX salah" # OK -#: option.c:1089 +#: option.c:1099 msgid "bad MX target" msgstr "target MX salah" -#: option.c:1100 +#: option.c:1110 msgid "cannot run scripts under uClinux" msgstr "" # OK -#: option.c:1293 option.c:1301 +#: option.c:1303 option.c:1311 msgid "bad port" msgstr "port salah" -#: option.c:1321 option.c:1346 +#: option.c:1331 option.c:1356 msgid "interface binding not supported" msgstr "" # OK -#: option.c:1464 +#: option.c:1474 #, fuzzy msgid "bad port range" msgstr "port salah" -#: option.c:1481 +#: option.c:1491 msgid "bad bridge-interface" msgstr "" # OK -#: option.c:1522 +#: option.c:1532 msgid "bad dhcp-range" msgstr "dhcp-range salah" -#: option.c:1548 +#: option.c:1558 msgid "only one netid tag allowed" msgstr "" # OK -#: option.c:1588 +#: option.c:1598 msgid "inconsistent DHCP range" msgstr "jangkauan DHCP tidak konsisten" # OK -#: option.c:1756 +#: option.c:1766 #, fuzzy msgid "bad DHCP host name" msgstr "nama MX salah" # OK -#: option.c:1928 option.c:2171 +#: option.c:1938 option.c:2181 msgid "invalid port number" msgstr "nomor port tidak benar" # OK -#: option.c:2014 +#: option.c:2024 #, fuzzy msgid "bad interface name" msgstr "nama MX salah" # OK -#: option.c:2034 +#: option.c:2044 #, fuzzy msgid "bad PTR record" msgstr "rekord SRV salah" # OK -#: option.c:2064 +#: option.c:2074 #, fuzzy msgid "bad NAPTR record" msgstr "rekord SRV salah" # OK -#: option.c:2090 +#: option.c:2100 msgid "TXT record string too long" msgstr "string rekord TXT terlalu panjang" # OK -#: option.c:2094 +#: option.c:2104 msgid "bad TXT record" msgstr "rekord TXT salah" # OK -#: option.c:2154 +#: option.c:2164 msgid "bad SRV record" msgstr "rekord SRV salah" # OK -#: option.c:2163 +#: option.c:2173 msgid "bad SRV target" msgstr "target SRV salah" # OK -#: option.c:2178 +#: option.c:2188 msgid "invalid priority" msgstr "prioritas tidak benar" # OK -#: option.c:2185 +#: option.c:2195 msgid "invalid weight" msgstr "weight tidak benar" -#: option.c:2221 +#: option.c:2231 #, c-format msgid "files nested too deep in %s" msgstr "" # OK -#: option.c:2229 tftp.c:503 +#: option.c:2239 tftp.c:503 #, c-format msgid "cannot read %s: %s" msgstr "tidak bisa membaca %s: %s" # OK -#: option.c:2290 +#: option.c:2300 msgid "missing \"" msgstr "kurang \"" # OK -#: option.c:2337 +#: option.c:2347 msgid "bad option" msgstr "pilihan salah" # OK -#: option.c:2339 +#: option.c:2349 msgid "extraneous parameter" msgstr "parameter berlebihan" # OK -#: option.c:2341 +#: option.c:2351 msgid "missing parameter" msgstr "parameter kurang" # OK -#: option.c:2349 +#: option.c:2359 msgid "error" msgstr "kesalahan" # OK -#: option.c:2355 +#: option.c:2365 #, c-format msgid "%s at line %d of %%s" msgstr "%s pada baris %d dari %%s" # OK -#: option.c:2395 option.c:2425 +#: option.c:2405 option.c:2435 #, fuzzy, c-format msgid "read %s" msgstr "membaca %s" # OK -#: option.c:2492 +#: option.c:2502 #, c-format msgid "Dnsmasq version %s %s\n" msgstr "Dnsmasq versi %s %s\n" # OK -#: option.c:2493 +#: option.c:2503 #, c-format msgid "" "Compile time options %s\n" @@ -814,61 +814,61 @@ msgstr "" "\n" # OK -#: option.c:2494 +#: option.c:2504 #, c-format msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" msgstr "Perangkat lunak ini tersedia TANPA JAMINAN SEDIKITPUN.\n" # OK -#: option.c:2495 +#: option.c:2505 #, c-format msgid "Dnsmasq is free software, and you are welcome to redistribute it\n" msgstr "Dnsdmasq adalah perangkat lunak bebas, dan Anda dipersilahkan untuk membagikannya\n" # OK -#: option.c:2496 +#: option.c:2506 #, fuzzy, c-format msgid "under the terms of the GNU General Public License, version 2 or 3.\n" msgstr "dengan aturan GNU General Public License, versi 2.\n" -#: option.c:2507 +#: option.c:2517 msgid "try --help" msgstr "" -#: option.c:2509 +#: option.c:2519 msgid "try -w" msgstr "" # OK -#: option.c:2512 +#: option.c:2522 #, fuzzy, c-format msgid "bad command line options: %s" msgstr "pilihan baris perintah salah: %s." # OK -#: option.c:2553 +#: option.c:2563 #, c-format msgid "cannot get host-name: %s" msgstr "tidak bisa mendapatkan host-name: %s" # OK -#: option.c:2581 +#: option.c:2591 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:2591 +#: option.c:2601 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:2594 network.c:719 +#: option.c:2604 network.c:724 #, fuzzy, c-format msgid "failed to read %s: %s" msgstr "gagal membaca %s: %m" # OK -#: option.c:2612 +#: option.c:2622 #, c-format msgid "no search directive found in %s" msgstr "tidak ditemukan direktif search di %s" @@ -948,61 +948,61 @@ msgstr "gagal mendengarkan di socket: %s" msgid "failed to create TFTP socket: %s" msgstr "gagal membuat socket: %s " -#: network.c:626 +#: network.c:631 #, fuzzy, c-format msgid "failed to bind server socket for %s: %s" msgstr "gagal mem-bind socket untuk mendengarkan %s: %s" # OK -#: network.c:659 +#: network.c:664 #, c-format msgid "ignoring nameserver %s - local interface" msgstr "mengabaikan nameserver %s - antarmuka lokal" # OK -#: network.c:670 +#: network.c:675 #, fuzzy, c-format msgid "ignoring nameserver %s - cannot make/bind socket: %s" msgstr "mengabaikan nameserver %s - tak dapat membuat/mem-bind socket: %m" # OK -#: network.c:685 +#: network.c:690 msgid "unqualified" msgstr "tidak memenuhi syarat" -#: network.c:685 +#: network.c:690 msgid "names" msgstr "" -#: network.c:687 +#: network.c:692 msgid "default" msgstr "" # OK -#: network.c:689 +#: network.c:694 msgid "domain" msgstr "domain" # OK -#: network.c:692 +#: network.c:697 #, c-format msgid "using local addresses only for %s %s" msgstr "menggunakan alamat lokal saja untuk %s %s" # OK -#: network.c:694 +#: network.c:699 #, c-format msgid "using nameserver %s#%d for %s %s" msgstr "menggunakan nameserver %s#%d untuk %s %s" # OK -#: network.c:697 +#: network.c:702 #, fuzzy, c-format msgid "using nameserver %s#%d(via %s)" msgstr "menggunakan nameserver %s#%d" # OK -#: network.c:699 +#: network.c:704 #, c-format msgid "using nameserver %s#%d" msgstr "menggunakan nameserver %s#%d" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: dnsmasq 2.32\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-07-20 09:38+0100\n" +"POT-Creation-Date: 2008-07-20 20:03+0100\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" @@ -477,257 +477,257 @@ msgstr "" msgid "Specify lowest port available for DNS query transmission." msgstr "" -#: option.c:564 +#: option.c:574 #, c-format msgid "" "Usage: dnsmasq [options]\n" "\n" msgstr "" -#: option.c:566 +#: option.c:576 #, c-format msgid "Use short options only on the command line.\n" msgstr "" -#: option.c:568 +#: option.c:578 #, c-format msgid "Valid options are:\n" msgstr "" -#: option.c:608 +#: option.c:618 #, c-format msgid "Known DHCP options:\n" msgstr "" -#: option.c:681 +#: option.c:691 msgid "bad dhcp-option" msgstr "" -#: option.c:737 +#: option.c:747 msgid "bad IP address" msgstr "" -#: option.c:835 +#: option.c:845 msgid "bad domain in dhcp-option" msgstr "" -#: option.c:893 +#: option.c:903 msgid "dhcp-option too long" msgstr "" -#: option.c:922 +#: option.c:932 msgid "illegal repeated flag" msgstr "" -#: option.c:930 +#: option.c:940 msgid "illegal repeated keyword" msgstr "" -#: option.c:964 +#: option.c:974 #, c-format msgid "cannot access directory %s: %s" msgstr "" -#: option.c:983 tftp.c:348 +#: option.c:993 tftp.c:348 #, c-format msgid "cannot access %s: %s" msgstr "" -#: option.c:1020 +#: option.c:1030 msgid "only one dhcp-hostsfile allowed" msgstr "" -#: option.c:1027 +#: option.c:1037 msgid "only one dhcp-optsfile allowed" msgstr "" -#: option.c:1071 +#: option.c:1081 msgid "bad MX preference" msgstr "" -#: option.c:1075 +#: option.c:1085 msgid "bad MX name" msgstr "" -#: option.c:1089 +#: option.c:1099 msgid "bad MX target" msgstr "" -#: option.c:1100 +#: option.c:1110 msgid "cannot run scripts under uClinux" msgstr "" -#: option.c:1293 option.c:1301 +#: option.c:1303 option.c:1311 msgid "bad port" msgstr "" -#: option.c:1321 option.c:1346 +#: option.c:1331 option.c:1356 msgid "interface binding not supported" msgstr "" -#: option.c:1464 +#: option.c:1474 msgid "bad port range" msgstr "" -#: option.c:1481 +#: option.c:1491 msgid "bad bridge-interface" msgstr "" -#: option.c:1522 +#: option.c:1532 msgid "bad dhcp-range" msgstr "" -#: option.c:1548 +#: option.c:1558 msgid "only one netid tag allowed" msgstr "" -#: option.c:1588 +#: option.c:1598 msgid "inconsistent DHCP range" msgstr "" -#: option.c:1756 +#: option.c:1766 msgid "bad DHCP host name" msgstr "" -#: option.c:1928 option.c:2171 +#: option.c:1938 option.c:2181 msgid "invalid port number" msgstr "" -#: option.c:2014 +#: option.c:2024 msgid "bad interface name" msgstr "" -#: option.c:2034 +#: option.c:2044 msgid "bad PTR record" msgstr "" -#: option.c:2064 +#: option.c:2074 msgid "bad NAPTR record" msgstr "" -#: option.c:2090 +#: option.c:2100 msgid "TXT record string too long" msgstr "" -#: option.c:2094 +#: option.c:2104 msgid "bad TXT record" msgstr "" -#: option.c:2154 +#: option.c:2164 msgid "bad SRV record" msgstr "" -#: option.c:2163 +#: option.c:2173 msgid "bad SRV target" msgstr "" -#: option.c:2178 +#: option.c:2188 msgid "invalid priority" msgstr "" -#: option.c:2185 +#: option.c:2195 msgid "invalid weight" msgstr "" -#: option.c:2221 +#: option.c:2231 #, c-format msgid "files nested too deep in %s" msgstr "" -#: option.c:2229 tftp.c:503 +#: option.c:2239 tftp.c:503 #, c-format msgid "cannot read %s: %s" msgstr "" -#: option.c:2290 +#: option.c:2300 msgid "missing \"" msgstr "" -#: option.c:2337 +#: option.c:2347 msgid "bad option" msgstr "" -#: option.c:2339 +#: option.c:2349 msgid "extraneous parameter" msgstr "" -#: option.c:2341 +#: option.c:2351 msgid "missing parameter" msgstr "" -#: option.c:2349 +#: option.c:2359 msgid "error" msgstr "" -#: option.c:2355 +#: option.c:2365 #, c-format msgid "%s at line %d of %%s" msgstr "" -#: option.c:2395 option.c:2425 +#: option.c:2405 option.c:2435 #, c-format msgid "read %s" msgstr "" -#: option.c:2492 +#: option.c:2502 #, c-format msgid "Dnsmasq version %s %s\n" msgstr "" -#: option.c:2493 +#: option.c:2503 #, c-format msgid "" "Compile time options %s\n" "\n" msgstr "" -#: option.c:2494 +#: option.c:2504 #, c-format msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" msgstr "" -#: option.c:2495 +#: option.c:2505 #, c-format msgid "Dnsmasq is free software, and you are welcome to redistribute it\n" msgstr "" -#: option.c:2496 +#: option.c:2506 #, c-format msgid "under the terms of the GNU General Public License, version 2 or 3.\n" msgstr "" -#: option.c:2507 +#: option.c:2517 msgid "try --help" msgstr "" -#: option.c:2509 +#: option.c:2519 msgid "try -w" msgstr "" -#: option.c:2512 +#: option.c:2522 #, c-format msgid "bad command line options: %s" msgstr "" -#: option.c:2553 +#: option.c:2563 #, c-format msgid "cannot get host-name: %s" msgstr "" -#: option.c:2581 +#: option.c:2591 msgid "only one resolv.conf file allowed in no-poll mode." msgstr "" -#: option.c:2591 +#: option.c:2601 msgid "must have exactly one resolv.conf to read domain from." msgstr "" -#: option.c:2594 network.c:719 +#: option.c:2604 network.c:724 #, c-format msgid "failed to read %s: %s" msgstr "" -#: option.c:2612 +#: option.c:2622 #, c-format msgid "no search directive found in %s" msgstr "" @@ -796,53 +796,53 @@ msgstr "" msgid "failed to create TFTP socket: %s" msgstr "" -#: network.c:626 +#: network.c:631 #, c-format msgid "failed to bind server socket for %s: %s" msgstr "" -#: network.c:659 +#: network.c:664 #, c-format msgid "ignoring nameserver %s - local interface" msgstr "" -#: network.c:670 +#: network.c:675 #, c-format msgid "ignoring nameserver %s - cannot make/bind socket: %s" msgstr "" -#: network.c:685 +#: network.c:690 msgid "unqualified" msgstr "" -#: network.c:685 +#: network.c:690 msgid "names" msgstr "" -#: network.c:687 +#: network.c:692 msgid "default" msgstr "" -#: network.c:689 +#: network.c:694 msgid "domain" msgstr "" -#: network.c:692 +#: network.c:697 #, c-format msgid "using local addresses only for %s %s" msgstr "" -#: network.c:694 +#: network.c:699 #, c-format msgid "using nameserver %s#%d for %s %s" msgstr "" -#: network.c:697 +#: network.c:702 #, c-format msgid "using nameserver %s#%d(via %s)" msgstr "" -#: network.c:699 +#: network.c:704 #, c-format msgid "using nameserver %s#%d" msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dnsmasq 2.25\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-07-20 09:38+0100\n" +"POT-Creation-Date: 2008-07-20 20:03+0100\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" @@ -491,7 +491,7 @@ msgstr "Spesifiser TXT DNS post." msgid "Specify lowest port available for DNS query transmission." msgstr "" -#: option.c:564 +#: option.c:574 #, c-format msgid "" "Usage: dnsmasq [options]\n" @@ -500,203 +500,203 @@ msgstr "" "Bruk: dnsmasq [opsjoner]\n" "\n" -#: option.c:566 +#: option.c:576 #, c-format msgid "Use short options only on the command line.\n" msgstr "Bruk korte opsjoner kun på kommandolinjen.\n" -#: option.c:568 +#: option.c:578 #, fuzzy, c-format msgid "Valid options are:\n" msgstr "Gyldige opsjoner er :\n" -#: option.c:608 +#: option.c:618 #, c-format msgid "Known DHCP options:\n" msgstr "" -#: option.c:681 +#: option.c:691 msgid "bad dhcp-option" msgstr "dårlig dhcp-opsjon" -#: option.c:737 +#: option.c:747 #, fuzzy msgid "bad IP address" msgstr "les %s - %d adresser" -#: option.c:835 +#: option.c:845 msgid "bad domain in dhcp-option" msgstr "dårlig domene i dhcp-opsjon" -#: option.c:893 +#: option.c:903 msgid "dhcp-option too long" msgstr "dhcp-opsjon for lang" -#: option.c:922 +#: option.c:932 msgid "illegal repeated flag" msgstr "" -#: option.c:930 +#: option.c:940 msgid "illegal repeated keyword" msgstr "" -#: option.c:964 +#: option.c:974 #, fuzzy, c-format msgid "cannot access directory %s: %s" msgstr "kan ikke lese %s: %s" -#: option.c:983 tftp.c:348 +#: option.c:993 tftp.c:348 #, fuzzy, c-format msgid "cannot access %s: %s" msgstr "kan ikke lese %s: %s" -#: option.c:1020 +#: option.c:1030 msgid "only one dhcp-hostsfile allowed" msgstr "" -#: option.c:1027 +#: option.c:1037 msgid "only one dhcp-optsfile allowed" msgstr "" -#: option.c:1071 +#: option.c:1081 msgid "bad MX preference" msgstr "dårlig MX preferanse" -#: option.c:1075 +#: option.c:1085 msgid "bad MX name" msgstr "dårlig MX navn" -#: option.c:1089 +#: option.c:1099 msgid "bad MX target" msgstr "dårlig MX mål" -#: option.c:1100 +#: option.c:1110 msgid "cannot run scripts under uClinux" msgstr "" -#: option.c:1293 option.c:1301 +#: option.c:1303 option.c:1311 msgid "bad port" msgstr "dårlig port" -#: option.c:1321 option.c:1346 +#: option.c:1331 option.c:1356 msgid "interface binding not supported" msgstr "" -#: option.c:1464 +#: option.c:1474 #, fuzzy msgid "bad port range" msgstr "dårlig port" -#: option.c:1481 +#: option.c:1491 msgid "bad bridge-interface" msgstr "" -#: option.c:1522 +#: option.c:1532 msgid "bad dhcp-range" msgstr "dårlig dhcp-område" -#: option.c:1548 +#: option.c:1558 msgid "only one netid tag allowed" msgstr "" -#: option.c:1588 +#: option.c:1598 msgid "inconsistent DHCP range" msgstr "ikke konsistent DHCP område" -#: option.c:1756 +#: option.c:1766 #, fuzzy msgid "bad DHCP host name" msgstr "dårlig MX navn" -#: option.c:1928 option.c:2171 +#: option.c:1938 option.c:2181 msgid "invalid port number" msgstr "ugyldig portnummer" -#: option.c:2014 +#: option.c:2024 #, fuzzy msgid "bad interface name" msgstr "dårlig MX navn" -#: option.c:2034 +#: option.c:2044 #, fuzzy msgid "bad PTR record" msgstr "dårlig SRV post" -#: option.c:2064 +#: option.c:2074 #, fuzzy msgid "bad NAPTR record" msgstr "dårlig SRV post" -#: option.c:2090 +#: option.c:2100 msgid "TXT record string too long" msgstr "TXT post streng for lang" -#: option.c:2094 +#: option.c:2104 msgid "bad TXT record" msgstr "dårlig TXT post" -#: option.c:2154 +#: option.c:2164 msgid "bad SRV record" msgstr "dårlig SRV post" -#: option.c:2163 +#: option.c:2173 msgid "bad SRV target" msgstr "dårlig SRV mål" -#: option.c:2178 +#: option.c:2188 msgid "invalid priority" msgstr "ugyldig prioritet" -#: option.c:2185 +#: option.c:2195 msgid "invalid weight" msgstr "ugyldig vekt" -#: option.c:2221 +#: option.c:2231 #, c-format msgid "files nested too deep in %s" msgstr "" -#: option.c:2229 tftp.c:503 +#: option.c:2239 tftp.c:503 #, c-format msgid "cannot read %s: %s" msgstr "kan ikke lese %s: %s" -#: option.c:2290 +#: option.c:2300 msgid "missing \"" msgstr "mangler \"" -#: option.c:2337 +#: option.c:2347 msgid "bad option" msgstr "dårlig opsjon" -#: option.c:2339 +#: option.c:2349 msgid "extraneous parameter" msgstr "overflødig parameter" -#: option.c:2341 +#: option.c:2351 msgid "missing parameter" msgstr "mangler parameter" -#: option.c:2349 +#: option.c:2359 msgid "error" msgstr "feil" -#: option.c:2355 +#: option.c:2365 #, c-format msgid "%s at line %d of %%s" msgstr "%s på linje %d av %%s" -#: option.c:2395 option.c:2425 +#: option.c:2405 option.c:2435 #, fuzzy, c-format msgid "read %s" msgstr "leser %s" -#: option.c:2492 +#: option.c:2502 #, c-format msgid "Dnsmasq version %s %s\n" msgstr "Dnsmasq versjon %s %s\n" -#: option.c:2493 +#: option.c:2503 #, c-format msgid "" "Compile time options %s\n" @@ -705,53 +705,53 @@ msgstr "" "Kompileringsopsjoner %s\n" "\n" -#: option.c:2494 +#: option.c:2504 #, c-format msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" msgstr "Denne programvaren kommer med ABSOLUTT INGEN GARANTI.\n" -#: option.c:2495 +#: option.c:2505 #, 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:2496 +#: option.c:2506 #, fuzzy, c-format msgid "under the terms of the GNU General Public License, version 2 or 3.\n" msgstr "under vilkårene gitt i GNU General Public License, versjon 2.\n" -#: option.c:2507 +#: option.c:2517 msgid "try --help" msgstr "" -#: option.c:2509 +#: option.c:2519 msgid "try -w" msgstr "" -#: option.c:2512 +#: option.c:2522 #, fuzzy, c-format msgid "bad command line options: %s" msgstr "dårlige kommandlinje opsjoner: %s." -#: option.c:2553 +#: option.c:2563 #, c-format msgid "cannot get host-name: %s" msgstr "klarer ikke å få vertsnavn: %s" -#: option.c:2581 +#: option.c:2591 msgid "only one resolv.conf file allowed in no-poll mode." msgstr "kun en resolv.conf fil tillat i no-poll modus." -#: option.c:2591 +#: option.c:2601 msgid "must have exactly one resolv.conf to read domain from." msgstr "må ha nøyaktig en resolv.conf å lese domene fra." -#: option.c:2594 network.c:719 +#: option.c:2604 network.c:724 #, fuzzy, c-format msgid "failed to read %s: %s" msgstr "feilet å lese %s: %m" -#: option.c:2612 +#: option.c:2622 #, c-format msgid "no search directive found in %s" msgstr "intet søke direktiv funnet i %s" @@ -820,53 +820,53 @@ msgstr "feilet å lytte på socket: %s" msgid "failed to create TFTP socket: %s" msgstr "feilet å lage lytte socket: %s" -#: network.c:626 +#: network.c:631 #, fuzzy, c-format msgid "failed to bind server socket for %s: %s" msgstr "feilet å binde lytte socket for %s: %s" -#: network.c:659 +#: network.c:664 #, c-format msgid "ignoring nameserver %s - local interface" msgstr "ignorerer navnetjener %s - lokal tilknytning" -#: network.c:670 +#: network.c:675 #, fuzzy, c-format msgid "ignoring nameserver %s - cannot make/bind socket: %s" msgstr "ignorerer navnetjener %s - kan ikke lage/dinde socket: %m" -#: network.c:685 +#: network.c:690 msgid "unqualified" msgstr "ikke kvalifisert" -#: network.c:685 +#: network.c:690 msgid "names" msgstr "" -#: network.c:687 +#: network.c:692 msgid "default" msgstr "" -#: network.c:689 +#: network.c:694 msgid "domain" msgstr "domene" -#: network.c:692 +#: network.c:697 #, c-format msgid "using local addresses only for %s %s" msgstr "benytter lokale adresser kun for %s %s" -#: network.c:694 +#: network.c:699 #, c-format msgid "using nameserver %s#%d for %s %s" msgstr "benytter navnetjener %s#%d for %s %s" -#: network.c:697 +#: network.c:702 #, fuzzy, c-format msgid "using nameserver %s#%d(via %s)" msgstr "benytter navnetjener %s#%d" -#: network.c:699 +#: network.c:704 #, c-format msgid "using nameserver %s#%d" msgstr "benytter navnetjener %s#%d" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-07-20 09:38+0100\n" +"POT-Creation-Date: 2008-07-20 20:03+0100\n" "PO-Revision-Date: 2008-07-10 22:40+0200\n" "Last-Translator: Jan Psota <jasiu@belsznica.pl>\n" "Language-Team: Polski <pl@li.org>\n" @@ -480,7 +480,7 @@ msgstr "Specyfikacja rekordu DNS NAPTR." msgid "Specify lowest port available for DNS query transmission." msgstr "Ustawienie dolnej granicy numerów portów do przesy³ania zapytañ DNS." -#: option.c:564 +#: option.c:574 #, c-format msgid "" "Usage: dnsmasq [options]\n" @@ -489,197 +489,197 @@ msgstr "" "U¿ycie: dnsmasq [opcje]\n" "\n" -#: option.c:566 +#: option.c:576 #, c-format msgid "Use short options only on the command line.\n" msgstr "W tym systemie w linii poleceñ mo¿na u¿ywaæ wy³±cznie jednoliterowych opcji.\n" -#: option.c:568 +#: option.c:578 #, c-format msgid "Valid options are:\n" msgstr "Dostêpne opcje:\n" -#: option.c:608 +#: option.c:618 #, c-format msgid "Known DHCP options:\n" msgstr "Znane opcje DHCP:\n" -#: option.c:681 +#: option.c:691 msgid "bad dhcp-option" msgstr "b³±d w dhcp-option" -#: option.c:737 +#: option.c:747 msgid "bad IP address" msgstr "z³y adres IP" -#: option.c:835 +#: option.c:845 msgid "bad domain in dhcp-option" msgstr "nieprawid³owa nazwa domeny w dhcp-option" -#: option.c:893 +#: option.c:903 msgid "dhcp-option too long" msgstr "zbyt d³uga dhcp-option (>255 znaków)" -#: option.c:922 +#: option.c:932 msgid "illegal repeated flag" msgstr "wielokrotne u¿ycie opcji niedozwolone (pojawi³a siê wcze¶niej w linii poleceñ)" -#: option.c:930 +#: option.c:940 msgid "illegal repeated keyword" msgstr "wielokrotne u¿ycie opcji niedozwolone (pojawi³a siê wsze¶niej w pliku konfiguracyjnym)" -#: option.c:964 +#: option.c:974 #, c-format msgid "cannot access directory %s: %s" msgstr "brak dostêpu do katalogu %s: %s" -#: option.c:983 tftp.c:348 +#: option.c:993 tftp.c:348 #, c-format msgid "cannot access %s: %s" msgstr "brak dostêpu do %s: %s" -#: option.c:1020 +#: option.c:1030 msgid "only one dhcp-hostsfile allowed" msgstr "mo¿na wskazaæ tylko jeden plik dhcp-hostsfile" -#: option.c:1027 +#: option.c:1037 msgid "only one dhcp-optsfile allowed" msgstr "mo¿na wskazaæ tylko jeden plik dhcp-optsfile" -#: option.c:1071 +#: option.c:1081 msgid "bad MX preference" msgstr "nieprawid³owa warto¶æ preferencji MX" -#: option.c:1075 +#: option.c:1085 msgid "bad MX name" msgstr "nieprawid³owa nazwa MX" -#: option.c:1089 +#: option.c:1099 msgid "bad MX target" msgstr "nieprawid³owa warto¶æ celu MX" -#: option.c:1100 +#: option.c:1110 msgid "cannot run scripts under uClinux" msgstr "w uClinuksie nie ma mo¿liwo¶ci uruchamiania skryptów" -#: option.c:1293 option.c:1301 +#: option.c:1303 option.c:1311 msgid "bad port" msgstr "nieprawid³owy numer portu" -#: option.c:1321 option.c:1346 +#: option.c:1331 option.c:1356 msgid "interface binding not supported" msgstr "nie ma mo¿liwo¶ci dowi±zywania do interfejsu" -#: option.c:1464 +#: option.c:1474 msgid "bad port range" msgstr "nieprawid³owy zakres numerów portów" -#: option.c:1481 +#: option.c:1491 msgid "bad bridge-interface" msgstr "nieprawid³owa nazwa urz±dzenia w bridge-interface" -#: option.c:1522 +#: option.c:1532 msgid "bad dhcp-range" msgstr "nieprawid³owy zakres dhcp-range" -#: option.c:1548 +#: option.c:1558 msgid "only one netid tag allowed" msgstr "mo¿na wskazaæ tylko jeden znacznik sieci" -#: option.c:1588 +#: option.c:1598 msgid "inconsistent DHCP range" msgstr "niespójny zakres adresów DHCP" -#: option.c:1756 +#: option.c:1766 msgid "bad DHCP host name" msgstr "niedopuszczalna nazwa komputera w dhcp-host" -#: option.c:1928 option.c:2171 +#: option.c:1938 option.c:2181 msgid "invalid port number" msgstr "nieprawid³owy numer portu" -#: option.c:2014 +#: option.c:2024 msgid "bad interface name" msgstr "nieprawid³owa nazwa interfejsu" -#: option.c:2034 +#: option.c:2044 msgid "bad PTR record" msgstr "nieprawid³owy zapis rekordu PTR" -#: option.c:2064 +#: option.c:2074 msgid "bad NAPTR record" msgstr "nieprawid³owy zapis rekordu NAPTR" -#: option.c:2090 +#: option.c:2100 msgid "TXT record string too long" msgstr "zbyt d³ugi rekord TXT" -#: option.c:2094 +#: option.c:2104 msgid "bad TXT record" msgstr "nieprawid³owy zapis rekordu TXT" -#: option.c:2154 +#: option.c:2164 msgid "bad SRV record" msgstr "nieprawid³owy zapis rekordu SRV" -#: option.c:2163 +#: option.c:2173 msgid "bad SRV target" msgstr "nieprawid³owa warto¶æ celu SRV" -#: option.c:2178 +#: option.c:2188 msgid "invalid priority" msgstr "nieprawid³owy priorytet" -#: option.c:2185 +#: option.c:2195 msgid "invalid weight" msgstr "nieprawid³owa waga" -#: option.c:2221 +#: option.c:2231 #, c-format msgid "files nested too deep in %s" msgstr "zbyt du¿e zag³êbienie plików w %s" -#: option.c:2229 tftp.c:503 +#: option.c:2239 tftp.c:503 #, c-format msgid "cannot read %s: %s" msgstr "b³±d odczytu z pliku %s: %s" -#: option.c:2290 +#: option.c:2300 msgid "missing \"" msgstr "brakuje \"" -#: option.c:2337 +#: option.c:2347 msgid "bad option" msgstr "nieprawid³owa opcja" -#: option.c:2339 +#: option.c:2349 msgid "extraneous parameter" msgstr "nadwy¿kowy parametr" -#: option.c:2341 +#: option.c:2351 msgid "missing parameter" msgstr "brak parametru" -#: option.c:2349 +#: option.c:2359 msgid "error" msgstr "b³±d" -#: option.c:2355 +#: option.c:2365 #, c-format msgid "%s at line %d of %%s" msgstr "%s w linii %d pliku %%s" -#: option.c:2395 option.c:2425 +#: option.c:2405 option.c:2435 #, c-format msgid "read %s" msgstr "przeczyta³em %s" -#: option.c:2492 +#: option.c:2502 #, c-format msgid "Dnsmasq version %s %s\n" msgstr "Dnsmasq, wersja %s %s\n" -#: option.c:2493 +#: option.c:2503 #, c-format msgid "" "Compile time options %s\n" @@ -688,53 +688,53 @@ msgstr "" "Wkompilowane opcje %s\n" "\n" -#: option.c:2494 +#: option.c:2504 #, c-format msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" msgstr "To oprogramowanie nie daje ¿adnych gwarancji.\n" -#: option.c:2495 +#: option.c:2505 #, c-format msgid "Dnsmasq is free software, and you are welcome to redistribute it\n" msgstr "Dnsmasq jest wolnym oprogramowaniem, mo¿esz go rozprowadzaæ\n" -#: option.c:2496 +#: option.c:2506 #, c-format msgid "under the terms of the GNU General Public License, version 2 or 3.\n" msgstr "na warunkach okre¶lonych w GNU General Public Licence, w wersji 2 lub 3.\n" -#: option.c:2507 +#: option.c:2517 msgid "try --help" msgstr "spróbuj: --help" -#: option.c:2509 +#: option.c:2519 msgid "try -w" msgstr "spróbuj: -w" -#: option.c:2512 +#: option.c:2522 #, c-format msgid "bad command line options: %s" msgstr "nieprawid³owa opcja w linii poleceñ %s" -#: option.c:2553 +#: option.c:2563 #, c-format msgid "cannot get host-name: %s" msgstr "nie mo¿na pobraæ nazwy hosta: %s" -#: option.c:2581 +#: option.c:2591 msgid "only one resolv.conf file allowed in no-poll mode." msgstr "w trybie no-poll mo¿na wskazaæ najwy¿ej jeden plik resolv.conf." -#: option.c:2591 +#: option.c:2601 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:2594 network.c:719 +#: option.c:2604 network.c:724 #, c-format msgid "failed to read %s: %s" msgstr "nie uda³o siê odczytaæ %s: %s" -#: option.c:2612 +#: option.c:2622 #, c-format msgid "no search directive found in %s" msgstr "brak wytycznych wyszukiwania w %s" @@ -803,53 +803,53 @@ msgstr "b³±d przy w³±czaniu nas³uchu na gnie¼dzie: %s" msgid "failed to create TFTP socket: %s" msgstr "nie powiod³o siê otwieranie gniazda dla us³ugi TFTP: %s" -#: network.c:626 +#: network.c:631 #, c-format msgid "failed to bind server socket for %s: %s" msgstr "b³±d przy przyznawaniu nazwy gniazdu serwera %s: %s" -#: network.c:659 +#: network.c:664 #, c-format msgid "ignoring nameserver %s - local interface" msgstr "ignorowanie serwera nazw %s - interfejs lokalny" -#: network.c:670 +#: network.c:675 #, c-format msgid "ignoring nameserver %s - cannot make/bind socket: %s" msgstr "ignorowanie serwera nazw %s - nie mo¿na utworzyæ/dowi±zaæ gniazda: %s" -#: network.c:685 +#: network.c:690 msgid "unqualified" msgstr "niekwalifikowane(-a)" -#: network.c:685 +#: network.c:690 msgid "names" msgstr "nazwy" -#: network.c:687 +#: network.c:692 msgid "default" msgstr "domy¶lne" -#: network.c:689 +#: network.c:694 msgid "domain" msgstr "domena" -#: network.c:692 +#: network.c:697 #, c-format msgid "using local addresses only for %s %s" msgstr "u¿ywam adresów lokalnych tylko dla %s %s" -#: network.c:694 +#: network.c:699 #, c-format msgid "using nameserver %s#%d for %s %s" msgstr "u¿ywam serwera nazw %s#%d dla %s %s" -#: network.c:697 +#: network.c:702 #, c-format msgid "using nameserver %s#%d(via %s)" msgstr "u¿ywam serwera nazw %s#%d (przez %s)" -#: network.c:699 +#: network.c:704 #, c-format msgid "using nameserver %s#%d" msgstr "u¿ywam serwera nazw %s#%d" diff --git a/po/pt_BR.po b/po/pt_BR.po index e493a00..c255918 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: 2008-07-20 09:38+0100\n" +"POT-Creation-Date: 2008-07-20 20:03+0100\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" @@ -477,257 +477,257 @@ msgstr "" msgid "Specify lowest port available for DNS query transmission." msgstr "" -#: option.c:564 +#: option.c:574 #, c-format msgid "" "Usage: dnsmasq [options]\n" "\n" msgstr "" -#: option.c:566 +#: option.c:576 #, c-format msgid "Use short options only on the command line.\n" msgstr "" -#: option.c:568 +#: option.c:578 #, c-format msgid "Valid options are:\n" msgstr "" -#: option.c:608 +#: option.c:618 #, c-format msgid "Known DHCP options:\n" msgstr "" -#: option.c:681 +#: option.c:691 msgid "bad dhcp-option" msgstr "" -#: option.c:737 +#: option.c:747 msgid "bad IP address" msgstr "" -#: option.c:835 +#: option.c:845 msgid "bad domain in dhcp-option" msgstr "" -#: option.c:893 +#: option.c:903 msgid "dhcp-option too long" msgstr "" -#: option.c:922 +#: option.c:932 msgid "illegal repeated flag" msgstr "" -#: option.c:930 +#: option.c:940 msgid "illegal repeated keyword" msgstr "" -#: option.c:964 +#: option.c:974 #, c-format msgid "cannot access directory %s: %s" msgstr "" -#: option.c:983 tftp.c:348 +#: option.c:993 tftp.c:348 #, c-format msgid "cannot access %s: %s" msgstr "" -#: option.c:1020 +#: option.c:1030 msgid "only one dhcp-hostsfile allowed" msgstr "" -#: option.c:1027 +#: option.c:1037 msgid "only one dhcp-optsfile allowed" msgstr "" -#: option.c:1071 +#: option.c:1081 msgid "bad MX preference" msgstr "" -#: option.c:1075 +#: option.c:1085 msgid "bad MX name" msgstr "" -#: option.c:1089 +#: option.c:1099 msgid "bad MX target" msgstr "" -#: option.c:1100 +#: option.c:1110 msgid "cannot run scripts under uClinux" msgstr "" -#: option.c:1293 option.c:1301 +#: option.c:1303 option.c:1311 msgid "bad port" msgstr "" -#: option.c:1321 option.c:1346 +#: option.c:1331 option.c:1356 msgid "interface binding not supported" msgstr "" -#: option.c:1464 +#: option.c:1474 msgid "bad port range" msgstr "" -#: option.c:1481 +#: option.c:1491 msgid "bad bridge-interface" msgstr "" -#: option.c:1522 +#: option.c:1532 msgid "bad dhcp-range" msgstr "" -#: option.c:1548 +#: option.c:1558 msgid "only one netid tag allowed" msgstr "" -#: option.c:1588 +#: option.c:1598 msgid "inconsistent DHCP range" msgstr "" -#: option.c:1756 +#: option.c:1766 msgid "bad DHCP host name" msgstr "" -#: option.c:1928 option.c:2171 +#: option.c:1938 option.c:2181 msgid "invalid port number" msgstr "" -#: option.c:2014 +#: option.c:2024 msgid "bad interface name" msgstr "" -#: option.c:2034 +#: option.c:2044 msgid "bad PTR record" msgstr "" -#: option.c:2064 +#: option.c:2074 msgid "bad NAPTR record" msgstr "" -#: option.c:2090 +#: option.c:2100 msgid "TXT record string too long" msgstr "" -#: option.c:2094 +#: option.c:2104 msgid "bad TXT record" msgstr "" -#: option.c:2154 +#: option.c:2164 msgid "bad SRV record" msgstr "" -#: option.c:2163 +#: option.c:2173 msgid "bad SRV target" msgstr "" -#: option.c:2178 +#: option.c:2188 msgid "invalid priority" msgstr "" -#: option.c:2185 +#: option.c:2195 msgid "invalid weight" msgstr "" -#: option.c:2221 +#: option.c:2231 #, c-format msgid "files nested too deep in %s" msgstr "" -#: option.c:2229 tftp.c:503 +#: option.c:2239 tftp.c:503 #, c-format msgid "cannot read %s: %s" msgstr "" -#: option.c:2290 +#: option.c:2300 msgid "missing \"" msgstr "" -#: option.c:2337 +#: option.c:2347 msgid "bad option" msgstr "" -#: option.c:2339 +#: option.c:2349 msgid "extraneous parameter" msgstr "" -#: option.c:2341 +#: option.c:2351 msgid "missing parameter" msgstr "" -#: option.c:2349 +#: option.c:2359 msgid "error" msgstr "" -#: option.c:2355 +#: option.c:2365 #, c-format msgid "%s at line %d of %%s" msgstr "" -#: option.c:2395 option.c:2425 +#: option.c:2405 option.c:2435 #, c-format msgid "read %s" msgstr "" -#: option.c:2492 +#: option.c:2502 #, c-format msgid "Dnsmasq version %s %s\n" msgstr "" -#: option.c:2493 +#: option.c:2503 #, c-format msgid "" "Compile time options %s\n" "\n" msgstr "" -#: option.c:2494 +#: option.c:2504 #, c-format msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" msgstr "" -#: option.c:2495 +#: option.c:2505 #, c-format msgid "Dnsmasq is free software, and you are welcome to redistribute it\n" msgstr "" -#: option.c:2496 +#: option.c:2506 #, c-format msgid "under the terms of the GNU General Public License, version 2 or 3.\n" msgstr "" -#: option.c:2507 +#: option.c:2517 msgid "try --help" msgstr "" -#: option.c:2509 +#: option.c:2519 msgid "try -w" msgstr "" -#: option.c:2512 +#: option.c:2522 #, c-format msgid "bad command line options: %s" msgstr "" -#: option.c:2553 +#: option.c:2563 #, c-format msgid "cannot get host-name: %s" msgstr "" -#: option.c:2581 +#: option.c:2591 msgid "only one resolv.conf file allowed in no-poll mode." msgstr "" -#: option.c:2591 +#: option.c:2601 msgid "must have exactly one resolv.conf to read domain from." msgstr "" -#: option.c:2594 network.c:719 +#: option.c:2604 network.c:724 #, c-format msgid "failed to read %s: %s" msgstr "" -#: option.c:2612 +#: option.c:2622 #, c-format msgid "no search directive found in %s" msgstr "" @@ -796,53 +796,53 @@ msgstr "" msgid "failed to create TFTP socket: %s" msgstr "" -#: network.c:626 +#: network.c:631 #, c-format msgid "failed to bind server socket for %s: %s" msgstr "" -#: network.c:659 +#: network.c:664 #, c-format msgid "ignoring nameserver %s - local interface" msgstr "" -#: network.c:670 +#: network.c:675 #, c-format msgid "ignoring nameserver %s - cannot make/bind socket: %s" msgstr "" -#: network.c:685 +#: network.c:690 msgid "unqualified" msgstr "" -#: network.c:685 +#: network.c:690 msgid "names" msgstr "" -#: network.c:687 +#: network.c:692 msgid "default" msgstr "" -#: network.c:689 +#: network.c:694 msgid "domain" msgstr "" -#: network.c:692 +#: network.c:697 #, c-format msgid "using local addresses only for %s %s" msgstr "" -#: network.c:694 +#: network.c:699 #, c-format msgid "using nameserver %s#%d for %s %s" msgstr "" -#: network.c:697 +#: network.c:702 #, c-format msgid "using nameserver %s#%d(via %s)" msgstr "" -#: network.c:699 +#: network.c:704 #, c-format msgid "using nameserver %s#%d" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: dnsmasq 2.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-07-20 09:38+0100\n" +"POT-Creation-Date: 2008-07-20 20:03+0100\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" @@ -489,7 +489,7 @@ msgstr "Specifică o înregistrare TXT." msgid "Specify lowest port available for DNS query transmission." msgstr "" -#: option.c:564 +#: option.c:574 #, c-format msgid "" "Usage: dnsmasq [options]\n" @@ -498,203 +498,203 @@ msgstr "" "Utilizare: dnsmasq [opÅ£iuni]\n" "\n" -#: option.c:566 +#: option.c:576 #, 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:568 +#: option.c:578 #, fuzzy, c-format msgid "Valid options are:\n" msgstr "OpÅ£iunile valide sunt:\n" -#: option.c:608 +#: option.c:618 #, c-format msgid "Known DHCP options:\n" msgstr "" -#: option.c:681 +#: option.c:691 msgid "bad dhcp-option" msgstr "dhcp-option invalid" -#: option.c:737 +#: option.c:747 #, fuzzy msgid "bad IP address" msgstr "citesc %s - %d adrese" -#: option.c:835 +#: option.c:845 msgid "bad domain in dhcp-option" msgstr "domeniu DNS invalid în declaraÅ£ia dhcp-option" -#: option.c:893 +#: option.c:903 msgid "dhcp-option too long" msgstr "declararea dhcp-option este prea lungă" -#: option.c:922 +#: option.c:932 msgid "illegal repeated flag" msgstr "" -#: option.c:930 +#: option.c:940 msgid "illegal repeated keyword" msgstr "" -#: option.c:964 +#: option.c:974 #, fuzzy, c-format msgid "cannot access directory %s: %s" msgstr "nu pot citi %s: %s" -#: option.c:983 tftp.c:348 +#: option.c:993 tftp.c:348 #, fuzzy, c-format msgid "cannot access %s: %s" msgstr "nu pot citi %s: %s" -#: option.c:1020 +#: option.c:1030 msgid "only one dhcp-hostsfile allowed" msgstr "" -#: option.c:1027 +#: option.c:1037 msgid "only one dhcp-optsfile allowed" msgstr "" -#: option.c:1071 +#: option.c:1081 msgid "bad MX preference" msgstr "preferinţă MX invalidă" -#: option.c:1075 +#: option.c:1085 msgid "bad MX name" msgstr "nume MX invalid" -#: option.c:1089 +#: option.c:1099 msgid "bad MX target" msgstr "Å£intă MX invalidă" -#: option.c:1100 +#: option.c:1110 msgid "cannot run scripts under uClinux" msgstr "" -#: option.c:1293 option.c:1301 +#: option.c:1303 option.c:1311 msgid "bad port" msgstr "port invalid" -#: option.c:1321 option.c:1346 +#: option.c:1331 option.c:1356 msgid "interface binding not supported" msgstr "" -#: option.c:1464 +#: option.c:1474 #, fuzzy msgid "bad port range" msgstr "port invalid" -#: option.c:1481 +#: option.c:1491 msgid "bad bridge-interface" msgstr "" -#: option.c:1522 +#: option.c:1532 msgid "bad dhcp-range" msgstr "dhcp-range invalid" -#: option.c:1548 +#: option.c:1558 msgid "only one netid tag allowed" msgstr "" -#: option.c:1588 +#: option.c:1598 msgid "inconsistent DHCP range" msgstr "domeniu DHCP inconsistent" -#: option.c:1756 +#: option.c:1766 #, fuzzy msgid "bad DHCP host name" msgstr "nume MX invalid" -#: option.c:1928 option.c:2171 +#: option.c:1938 option.c:2181 msgid "invalid port number" msgstr "număr de port invalid" -#: option.c:2014 +#: option.c:2024 #, fuzzy msgid "bad interface name" msgstr "nume MX invalid" -#: option.c:2034 +#: option.c:2044 #, fuzzy msgid "bad PTR record" msgstr "înregistrare SRV invalidă" -#: option.c:2064 +#: option.c:2074 #, fuzzy msgid "bad NAPTR record" msgstr "înregistrare SRV invalidă" -#: option.c:2090 +#: option.c:2100 msgid "TXT record string too long" msgstr "ÅŸirul de caractere pentru înregistrarea TXT este prea lung" -#: option.c:2094 +#: option.c:2104 msgid "bad TXT record" msgstr "înregistrare TXT invalidă" -#: option.c:2154 +#: option.c:2164 msgid "bad SRV record" msgstr "înregistrare SRV invalidă" -#: option.c:2163 +#: option.c:2173 msgid "bad SRV target" msgstr "Å£intă SRV invalidă" -#: option.c:2178 +#: option.c:2188 msgid "invalid priority" msgstr "prioritate invalidă" -#: option.c:2185 +#: option.c:2195 msgid "invalid weight" msgstr "pondere invalidă" -#: option.c:2221 +#: option.c:2231 #, c-format msgid "files nested too deep in %s" msgstr "" -#: option.c:2229 tftp.c:503 +#: option.c:2239 tftp.c:503 #, c-format msgid "cannot read %s: %s" msgstr "nu pot citi %s: %s" -#: option.c:2290 +#: option.c:2300 msgid "missing \"" msgstr "lipseÅŸte \"" -#: option.c:2337 +#: option.c:2347 msgid "bad option" msgstr "opÅ£iune invalidă" -#: option.c:2339 +#: option.c:2349 msgid "extraneous parameter" msgstr "parametru nerecunoscut" -#: option.c:2341 +#: option.c:2351 msgid "missing parameter" msgstr "parametru lipsa" -#: option.c:2349 +#: option.c:2359 msgid "error" msgstr "eroare" -#: option.c:2355 +#: option.c:2365 #, c-format msgid "%s at line %d of %%s" msgstr "%s la linia %d din %%s" -#: option.c:2395 option.c:2425 +#: option.c:2405 option.c:2435 #, fuzzy, c-format msgid "read %s" msgstr "citesc %s" -#: option.c:2492 +#: option.c:2502 #, c-format msgid "Dnsmasq version %s %s\n" msgstr "dnsmasq versiunea %s %s\n" -#: option.c:2493 +#: option.c:2503 #, c-format msgid "" "Compile time options %s\n" @@ -703,53 +703,53 @@ msgstr "" "OpÅ£iuni cu care a fost compilat %s\n" "\n" -#: option.c:2494 +#: option.c:2504 #, c-format msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" msgstr "Acest program vine FÄ‚RÄ‚ NICI O GARANÅ¢IE.\n" -#: option.c:2495 +#: option.c:2505 #, 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:2496 +#: option.c:2506 #, fuzzy, c-format msgid "under the terms of the GNU General Public License, version 2 or 3.\n" msgstr "în termenii LicenÅ£ei publice generale GNU, versiunea 2.\n" -#: option.c:2507 +#: option.c:2517 msgid "try --help" msgstr "" -#: option.c:2509 +#: option.c:2519 msgid "try -w" msgstr "" -#: option.c:2512 +#: option.c:2522 #, fuzzy, c-format msgid "bad command line options: %s" msgstr "opÅ£iuni în linie de comandă invalide: %s." -#: option.c:2553 +#: option.c:2563 #, c-format msgid "cannot get host-name: %s" msgstr "nu pot citi numele maÅŸinii: %s" -#: option.c:2581 +#: option.c:2591 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:2591 +#: option.c:2601 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:2594 network.c:719 +#: option.c:2604 network.c:724 #, fuzzy, c-format msgid "failed to read %s: %s" msgstr "nu pot citi %s: %n" -#: option.c:2612 +#: option.c:2622 #, c-format msgid "no search directive found in %s" msgstr "nu s-a găsit nici un criteriu de căutare în %s" @@ -818,53 +818,53 @@ msgstr "ascultarea pe socket a eÅŸuat: %s" msgid "failed to create TFTP socket: %s" msgstr "creearea socket-ului de ascultare a eÅŸuat: %s" -#: network.c:626 +#: network.c:631 #, fuzzy, c-format msgid "failed to bind server socket for %s: %s" msgstr "activarea socket-ului de ascultare pentru %s a eÅŸuat: %s" -#: network.c:659 +#: network.c:664 #, c-format msgid "ignoring nameserver %s - local interface" msgstr "ignorăm serverul DNS %s - interfaţă locală" -#: network.c:670 +#: network.c:675 #, fuzzy, c-format msgid "ignoring nameserver %s - cannot make/bind socket: %s" msgstr "ignorăm serverul DNS %s - nu pot creea/activa socket-ul: %s" -#: network.c:685 +#: network.c:690 msgid "unqualified" msgstr "invalid" -#: network.c:685 +#: network.c:690 msgid "names" msgstr "" -#: network.c:687 +#: network.c:692 msgid "default" msgstr "" -#: network.c:689 +#: network.c:694 msgid "domain" msgstr "domeniu" -#: network.c:692 +#: network.c:697 #, c-format msgid "using local addresses only for %s %s" msgstr "folosim adresele locale doar pentru %S %s" -#: network.c:694 +#: network.c:699 #, c-format msgid "using nameserver %s#%d for %s %s" msgstr "folosim serverul DNS %s#%d pentru %s %s" -#: network.c:697 +#: network.c:702 #, fuzzy, c-format msgid "using nameserver %s#%d(via %s)" msgstr "folosim serverul DNS %s#%d" -#: network.c:699 +#: network.c:704 #, c-format msgid "using nameserver %s#%d" msgstr "folosim serverul DNS %s#%d" diff --git a/src/config.h b/src/config.h index 25074c0..562f03c 100644 --- a/src/config.h +++ b/src/config.h @@ -14,7 +14,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#define VERSION "2.44" +#define VERSION "2.45" #define FTABSIZ 150 /* max number of outstanding requests (default) */ #define MAX_PROCS 20 /* max no children for TCP requests */ diff --git a/src/network.c b/src/network.c index 90f556e..2fc2db2 100644 --- a/src/network.c +++ b/src/network.c @@ -451,19 +451,24 @@ int random_sock(int family) if ((fd = socket(family, SOCK_DGRAM, 0)) != -1) { union mysockaddr addr; - unsigned short ports_avail = 65536u - (unsigned short)daemon->min_port; - int i; + unsigned int ports_avail = 65536u - (unsigned short)daemon->min_port; + int i, tries = 3 * ports_avail; + + if (tries > 100) + tries = 100; memset(&addr, 0, sizeof(addr)); addr.sa.sa_family = family; + /* don't loop forever if all ports in use. */ + if (fix_fd(fd)) - for (i = ports_avail; i != 0; i--) + for (i = tries; i != 0; i--) { unsigned short port = rand16(); if (daemon->min_port != 0) - port = htons(daemon->min_port + (port % ports_avail)); + port = htons(daemon->min_port + (port % ((unsigned short)ports_avail))); if (family == AF_INET) { diff --git a/src/option.c b/src/option.c index 6b1a6b6..de3c237 100644 --- a/src/option.c +++ b/src/option.c @@ -529,6 +529,16 @@ static int atoi_check(char *a, int *res) return 1; } +static int atoi_check16(char *a, int *res) +{ + if (!(atoi_check(a, res)) || + *res < 0 || + *res > 0xffff) + return 0; + + return 1; +} + static void add_txt(char *name, char *txt) { size_t len = strlen(txt); @@ -1067,7 +1077,7 @@ static char *one_opt(int option, char *arg, char *gen_prob, int nest) if ((comma = split(arg))) { char *prefstr; - if ((prefstr=split(comma)) && !atoi_check(prefstr, &pref)) + if ((prefstr=split(comma)) && !atoi_check16(prefstr, &pref)) problem = _("bad MX preference"); } @@ -1289,7 +1299,7 @@ static char *one_opt(int option, char *arg, char *gen_prob, int nest) if ((portno = strchr(source+1, '#'))) { *portno = 0; - if (!atoi_check(portno+1, &source_port)) + if (!atoi_check16(portno+1, &source_port)) problem = _("bad port"); } } @@ -1297,7 +1307,7 @@ static char *one_opt(int option, char *arg, char *gen_prob, int nest) if ((portno = strchr(arg, '#'))) /* is there a port no. */ { *portno = 0; - if (!atoi_check(portno+1, &serv_port)) + if (!atoi_check16(portno+1, &serv_port)) problem = _("bad port"); } @@ -1390,12 +1400,12 @@ static char *one_opt(int option, char *arg, char *gen_prob, int nest) } case 'p': /* --port */ - if (!atoi_check(arg, &daemon->port)) + if (!atoi_check16(arg, &daemon->port)) option = '?'; break; case LOPT_MINPORT: /* --min-port */ - if (!atoi_check(arg, &daemon->min_port)) + if (!atoi_check16(arg, &daemon->min_port)) option = '?'; break; @@ -1422,7 +1432,7 @@ static char *one_opt(int option, char *arg, char *gen_prob, int nest) } case 'Q': /* --query-port */ - if (!atoi_check(arg, &daemon->query_port)) + if (!atoi_check16(arg, &daemon->query_port)) option = '?'; /* if explicitly set to zero, use single OS ephemeral port and disable random ports */ @@ -1459,8 +1469,8 @@ static char *one_opt(int option, char *arg, char *gen_prob, int nest) case LOPT_TFTPPORTS: /* --tftp-port-range */ if (!(comma = split(arg)) || - !atoi_check(arg, &daemon->start_tftp_port) || - !atoi_check(comma, &daemon->end_tftp_port)) + !atoi_check16(arg, &daemon->start_tftp_port) || + !atoi_check16(comma, &daemon->end_tftp_port)) problem = _("bad port range"); if (daemon->start_tftp_port > daemon->end_tftp_port) @@ -1923,8 +1933,8 @@ static char *one_opt(int option, char *arg, char *gen_prob, int nest) else { comma = split(arg); - if (!atoi_check(arg, &daemon->dhcp_server_port) || - (comma && !atoi_check(comma, &daemon->dhcp_client_port))) + if (!atoi_check16(arg, &daemon->dhcp_server_port) || + (comma && !atoi_check16(comma, &daemon->dhcp_client_port))) problem = _("invalid port number"); if (!comma) daemon->dhcp_client_port = daemon->dhcp_server_port+1; @@ -2058,8 +2068,8 @@ static char *one_opt(int option, char *arg, char *gen_prob, int nest) if (k < 6 || !canonicalise_opt(a[0]) || - !atoi_check(a[1], &order) || - !atoi_check(a[2], &pref) || + !atoi_check16(a[1], &order) || + !atoi_check16(a[2], &pref) || (k == 7 && !canonicalise_opt(a[6]))) problem = _("bad NAPTR record"); else @@ -2167,21 +2177,21 @@ static char *one_opt(int option, char *arg, char *gen_prob, int nest) { arg = comma; comma = split(arg); - if (!atoi_check(arg, &port)) + if (!atoi_check16(arg, &port)) problem = _("invalid port number"); if (comma) { arg = comma; comma = split(arg); - if (!atoi_check(arg, &priority)) + if (!atoi_check16(arg, &priority)) problem = _("invalid priority"); if (comma) { arg = comma; comma = split(arg); - if (!atoi_check(arg, &weight)) + if (!atoi_check16(arg, &weight)) problem = _("invalid weight"); } } |