import of dnsmasq-2.55.tar.gzv2.55

16 files changed, 716 insertions, 692 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 735e00a..3739541 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,19 @@
+version 2.55
+           Fix crash when /etc/ethers is in use. Thanks to 
+	   Gianluigi Tiesi for finding this.
+
+	   Fix crash in netlink_multicast(). Thanks to Arno Wald for
+	   finding this one.
+
+	   Allow the empty domain "." in dhcp domain-search (119)
+	   options. 
+
+
+version 2.54
+           There is no version 2.54 to avoid confusion with 2.53,
+           which incorrectly identifies itself as 2.54.
+
+
 version 2.53
             Fix failure to compile on Debian/kFreeBSD. Thanks to 
 	    Axel Beckert and Petr Salinger.
diff --git a/po/de.po b/po/de.po
index 5a822a6..43ad8bb 100644
--- a/po/de.po
+++ b/po/de.po
@@ -35,7 +35,7 @@ msgstr "Fehlerhafte Adresse in %s Zeile %d"
 msgid "bad name at %s line %d"
 msgstr "Fehlerhafter Name in %s Zeile %d"
 
-#: cache.c:863 dhcp.c:955
+#: cache.c:863 dhcp.c:956
 #, c-format
 msgid "read %s - %d addresses"
 msgstr "%s gelesen - %d Adressen"
@@ -44,7 +44,7 @@ msgstr "%s gelesen - %d Adressen"
 msgid "cleared cache"
 msgstr "Cache geleert"
 
-#: cache.c:933 option.c:1103
+#: cache.c:933 option.c:1112
 #, c-format
 msgid "cannot access directory %s: %s"
 msgstr "Kann auf Verzeichnis %s nicht zugreifen: %s"
@@ -583,201 +583,201 @@ msgstr "Fehlerhafte DHCP-Option"
 msgid "bad IP address"
 msgstr "Fehlerhafte IP-Adresse"
 
-#: option.c:937
+#: option.c:941
 msgid "bad domain in dhcp-option"
 msgstr "Fehlerhafte Domäne in DHCP-Option"
 
-#: option.c:998
+#: option.c:1007
 msgid "dhcp-option too long"
 msgstr "DHCP-Option zu lang"
 
-#: option.c:1007
+#: option.c:1016
 msgid "illegal dhcp-match"
 msgstr "Unzulässige dhcp-match-Option"
 
-#: option.c:1043
+#: option.c:1052
 msgid "illegal repeated flag"
 msgstr "unzulässig wiederholte Markierung"
 
-#: option.c:1051
+#: option.c:1060
 msgid "illegal repeated keyword"
 msgstr "unzulässig wiederholtes Schlüsselwort"
 
-#: option.c:1134 tftp.c:413
+#: option.c:1143 tftp.c:413
 #, c-format
 msgid "cannot access %s: %s"
 msgstr "Kann auf %s nicht zugreifen: %s"
 
-#: option.c:1179
+#: option.c:1188
 msgid "only one dhcp-hostsfile allowed"
 msgstr "nur eine DHCP-Hostdatei (dhcp-hostsfile) zulässig"
 
-#: option.c:1186
+#: option.c:1195
 msgid "only one dhcp-optsfile allowed"
 msgstr "nur eine DHCP-Optionsdatei (dhcp-optsfile) zulässig"
 
-#: option.c:1231
+#: option.c:1240
 msgid "bad MX preference"
 msgstr "unzulässige MX-Präferenz-Angabe"
 
-#: option.c:1236
+#: option.c:1245
 msgid "bad MX name"
 msgstr "unzulässiger MX-Name"
 
-#: option.c:1250
+#: option.c:1259
 msgid "bad MX target"
 msgstr "unzulässiges MX-Ziel"
 
-#: option.c:1260
+#: option.c:1269
 msgid "cannot run scripts under uClinux"
 msgstr "unter uClinux ist die Skriptausführung nicht möglich"
 
-#: option.c:1262
+#: option.c:1271
 msgid "recompile with HAVE_SCRIPT defined to enable lease-change scripts"
 msgstr "Neuübersetzung mit HAVE_SCRIPT nötig, um Lease-Änderungs-Skripte auszuführen"
 
-#: option.c:1507 option.c:1511
+#: option.c:1516 option.c:1520
 msgid "bad port"
 msgstr "unzulässiger Port"
 
-#: option.c:1530 option.c:1555
+#: option.c:1539 option.c:1564
 msgid "interface binding not supported"
 msgstr "Schnittstellenbindung nicht unterstützt"
 
-#: option.c:1701
+#: option.c:1710
 msgid "bad port range"
 msgstr "unzulässiger Portbereich"
 
-#: option.c:1718
+#: option.c:1727
 msgid "bad bridge-interface"
 msgstr "unzulässige Brücken-Schnittstelle"
 
-#: option.c:1760
+#: option.c:1769
 msgid "bad dhcp-range"
 msgstr "unzulässiger DHCP-Bereich"
 
-#: option.c:1788
+#: option.c:1797
 msgid "only one tag allowed"
 msgstr "nur eine Marke zulässig"
 
-#: option.c:1835
+#: option.c:1844
 msgid "inconsistent DHCP range"
 msgstr "inkonsistenter DHCP-Bereich"
 
-#: option.c:2010
+#: option.c:2019
 msgid "bad DHCP host name"
 msgstr "unzulässiger DHCP-Hostname"
 
-#: option.c:2091
+#: option.c:2100
 msgid "bad tag-if"
 msgstr "unzulässige bedingte Marke (tag-if)"
 
-#: option.c:2365 option.c:2664
+#: option.c:2374 option.c:2673
 msgid "invalid port number"
 msgstr "unzulässige Portnummer"
 
-#: option.c:2427
+#: option.c:2436
 msgid "bad dhcp-proxy address"
 msgstr "Fehlerhafte DHCP-Proxy-Adresse"
 
-#: option.c:2467
+#: option.c:2476
 msgid "invalid alias range"
 msgstr "unzulässiger Alias-Bereich"
 
-#: option.c:2480
+#: option.c:2489
 msgid "bad interface name"
 msgstr "unzulässiger Schnittestellenname"
 
-#: option.c:2505
+#: option.c:2514
 msgid "bad CNAME"
 msgstr "unzulässiger CNAME"
 
-#: option.c:2510
+#: option.c:2519
 msgid "duplicate CNAME"
 msgstr "doppelter CNAME"
 
-#: option.c:2530
+#: option.c:2539
 msgid "bad PTR record"
 msgstr "unzulässiger PTR-Eintrag"
 
-#: option.c:2561
+#: option.c:2570
 msgid "bad NAPTR record"
 msgstr "unzulässiger NAPTR-Eintrag"
 
-#: option.c:2586
+#: option.c:2595
 msgid "TXT record string too long"
 msgstr "TXT-Eintrag zu lang"
 
-#: option.c:2634
+#: option.c:2643
 msgid "bad TXT record"
 msgstr "unzulässiger TXT-Eintrag"
 
-#: option.c:2650
+#: option.c:2659
 msgid "bad SRV record"
 msgstr "unzulässiger SRV-Eintrag"
 
-#: option.c:2657
+#: option.c:2666
 msgid "bad SRV target"
 msgstr "unzulässiges SRV-Ziel"
 
-#: option.c:2671
+#: option.c:2680
 msgid "invalid priority"
 msgstr "unzulässige Priorität"
 
-#: option.c:2678
+#: option.c:2687
 msgid "invalid weight"
 msgstr "unzulässige Wichtung"
 
-#: option.c:2697
+#: option.c:2706
 msgid "unsupported option (check that dnsmasq was compiled with DHCP/TFTP/DBus support)"
 msgstr "unzulässige Option (prüfen Sie, ob dnsmasq mit DHCP/TFTP/DBus-Unterstützt übersetzt wurde)"
 
-#: option.c:2739
+#: option.c:2748
 #, c-format
 msgid "files nested too deep in %s"
 msgstr "Dateien in %s zu tief verschachtelt"
 
-#: option.c:2747 tftp.c:567
+#: option.c:2756 tftp.c:567
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "kann %s nicht lesen: %s"
 
-#: option.c:2804
+#: option.c:2813
 msgid "missing \""
 msgstr "fehlende \\\""
 
-#: option.c:2863
+#: option.c:2872
 msgid "bad option"
 msgstr "unzulässige Option"
 
-#: option.c:2865
+#: option.c:2874
 msgid "extraneous parameter"
 msgstr "überschüssiger Parameter"
 
-#: option.c:2867
+#: option.c:2876
 msgid "missing parameter"
 msgstr "fehler Parameter"
 
-#: option.c:2871
+#: option.c:2880
 msgid "error"
 msgstr "Fehler"
 
-#: option.c:2876
+#: option.c:2885
 #, c-format
 msgid "%s at line %d of %%s"
 msgstr "%s in Zeile %d von %%s"
 
-#: option.c:2933 option.c:2964
+#: option.c:2942 option.c:2973
 #, c-format
 msgid "read %s"
 msgstr "%s gelesen"
 
-#: option.c:3036
+#: option.c:3045
 #, c-format
 msgid "Dnsmasq version %s  %s\n"
 msgstr "Dnsmasq Version %s  %s\n"
 
-#: option.c:3037
+#: option.c:3046
 #, c-format
 msgid ""
 "Compile time options %s\n"
@@ -786,63 +786,63 @@ msgstr ""
 "Ãœbersetzungs-Optionen %s\n"
 "\n"
 
-#: option.c:3038
+#: option.c:3047
 #, c-format
 msgid "This software comes with ABSOLUTELY NO WARRANTY.\n"
 msgstr "Für diese Software wird ABSOLUT KEINE GARANTIE gewährt.\n"
 
 # FIXME: this must be one long string! -- MA
-#: option.c:3039
+#: option.c:3048
 #, c-format
 msgid "Dnsmasq is free software, and you are welcome to redistribute it\n"
 msgstr ""
 
-#: option.c:3040
+#: option.c:3049
 #, c-format
 msgid "under the terms of the GNU General Public License, version 2 or 3.\n"
 msgstr ""
 
-#: option.c:3051
+#: option.c:3060
 msgid "try --help"
 msgstr "versuchen Sie --help"
 
-#: option.c:3053
+#: option.c:3062
 msgid "try -w"
 msgstr "versuchen Sie -w"
 
-#: option.c:3056
+#: option.c:3065
 #, c-format
 msgid "bad command line options: %s"
 msgstr "unzulässige Optionen auf der Befehlszeile: %s"
 
-#: option.c:3097
+#: option.c:3106
 #, c-format
 msgid "cannot get host-name: %s"
 msgstr "kann Hostnamen nicht ermitteln: %s"
 
-#: option.c:3125
+#: option.c:3134
 msgid "only one resolv.conf file allowed in no-poll mode."
 msgstr "mit -n/--no-poll ist nur eine resolv.conf-Datei zulässig."
 
-#: option.c:3135
+#: option.c:3144
 msgid "must have exactly one resolv.conf to read domain from."
 msgstr "Um die Domäne zu lesen, muss genau eine resolv.conf-Datei verwendet werden."
 
-#: option.c:3138 network.c:813 dhcp.c:814
+#: option.c:3147 network.c:813 dhcp.c:814
 #, c-format
 msgid "failed to read %s: %s"
 msgstr "konnte %s nicht lesen: %s"
 
-#: option.c:3155
+#: option.c:3164
 #, c-format
 msgid "no search directive found in %s"
 msgstr "keine \"search\"-Anweisung in %s gefunden"
 
-#: option.c:3176
+#: option.c:3185
 msgid "there must be a default domain when --dhcp-fqdn is set"
 msgstr "für --dhcp-fqdn muss eine Domäne vorausgewählt werden"
 
-#: option.c:3180
+#: option.c:3189
 msgid "syntax check OK"
 msgstr "Syntaxprüfung OK"
 
@@ -1191,22 +1191,22 @@ msgstr "ungültige Zeile %2$d in Datei %1$s"
 msgid "ignoring %s line %d, duplicate name or IP address"
 msgstr "ignoriere %s Zeile %d, doppelter Name oder doppelte IP-Adresse"
 
-#: dhcp.c:977
+#: dhcp.c:978
 #, c-format
 msgid "duplicate IP address %s in dhcp-config directive."
 msgstr "doppelte IP-Adresse %s in \"dhcp-config\"-Anweisung"
 
-#: dhcp.c:980
+#: dhcp.c:981
 #, c-format
 msgid "duplicate IP address %s in %s."
 msgstr "doppelte IP-Adresse %s in %s."
 
-#: dhcp.c:1023
+#: dhcp.c:1024
 #, c-format
 msgid "%s has more than one address in hostsfile, using %s for DHCP"
 msgstr "%s hat mehr als eine Adresse in hosts-Datei, benutze %s für DHCP"
 
-#: dhcp.c:1028
+#: dhcp.c:1029
 #, c-format
 msgid "duplicate IP address %s (%s) in dhcp-config directive"
 msgstr "doppelte IP-Adresse %s (%s) in \"dhcp-config\"-Anweisung"
diff --git a/po/es.po b/po/es.po
index 7ae1984..37456e4 100644
--- a/po/es.po
+++ b/po/es.po
@@ -30,7 +30,7 @@ msgstr "dirección errónea en %s línea %d"
 msgid "bad name at %s line %d"
 msgstr "nombre erróneo en %s línea %d"
 
-#: cache.c:863 dhcp.c:955
+#: cache.c:863 dhcp.c:956
 #, c-format
 msgid "read %s - %d addresses"
 msgstr "direcciónes %s - %d leídas"
@@ -39,7 +39,7 @@ msgstr "direcciónes %s - %d leídas"
 msgid "cleared cache"
 msgstr "el caché fue liberado"
 
-#: cache.c:933 option.c:1103
+#: cache.c:933 option.c:1112
 #, fuzzy, c-format
 msgid "cannot access directory %s: %s"
 msgstr "no se puede accesar directorio %s: %s"
@@ -586,211 +586,211 @@ msgstr "opción dhcp-option errónea"
 msgid "bad IP address"
 msgstr "dirección IP errónea"
 
-#: option.c:937
+#: option.c:941
 msgid "bad domain in dhcp-option"
 msgstr "dominio erróneo en dhcp-option"
 
-#: option.c:998
+#: option.c:1007
 msgid "dhcp-option too long"
 msgstr "opción dhcp-option demasiado larga"
 
-#: option.c:1007
+#: option.c:1016
 msgid "illegal dhcp-match"
 msgstr "dhcp-match ilegal"
 
-#: option.c:1043
+#: option.c:1052
 msgid "illegal repeated flag"
 msgstr "opción repetida ilegal"
 
-#: option.c:1051
+#: option.c:1060
 msgid "illegal repeated keyword"
 msgstr "palabra clave repetida ilegal"
 
-#: option.c:1134 tftp.c:413
+#: option.c:1143 tftp.c:413
 #, fuzzy, c-format
 msgid "cannot access %s: %s"
 msgstr "no se puede accesar %s: %s"
 
-#: option.c:1179
+#: option.c:1188
 #, fuzzy
 msgid "only one dhcp-hostsfile allowed"
 msgstr "solo un dhcp-hostsfile permitido"
 
-#: option.c:1186
+#: option.c:1195
 #, fuzzy
 msgid "only one dhcp-optsfile allowed"
 msgstr "solo un dhcp-optsfile permitido"
 
-#: option.c:1231
+#: option.c:1240
 msgid "bad MX preference"
 msgstr "preferencia MX errónea"
 
-#: option.c:1236
+#: option.c:1245
 msgid "bad MX name"
 msgstr "nombre MX erróneo"
 
-#: option.c:1250
+#: option.c:1259
 msgid "bad MX target"
 msgstr "destino MX erróneo"
 
-#: option.c:1260
+#: option.c:1269
 msgid "cannot run scripts under uClinux"
 msgstr "no se pueden correr archivos guiónes bajo uClinux"
 
-#: option.c:1262
+#: option.c:1271
 msgid "recompile with HAVE_SCRIPT defined to enable lease-change scripts"
 msgstr "recompilar con HAVE_SCRIPT definido para habilitar guiónes de cambio de arriendo"
 
-#: option.c:1507 option.c:1511
+#: option.c:1516 option.c:1520
 msgid "bad port"
 msgstr "puerto erróneo"
 
-#: option.c:1530 option.c:1555
+#: option.c:1539 option.c:1564
 msgid "interface binding not supported"
 msgstr "vinculación de interface no está soportado"
 
-#: option.c:1701
+#: option.c:1710
 #, fuzzy
 msgid "bad port range"
 msgstr "rango de puertos erróneo"
 
-#: option.c:1718
+#: option.c:1727
 msgid "bad bridge-interface"
 msgstr "opción bridge-interface (interface puente) errónea"
 
-#: option.c:1760
+#: option.c:1769
 msgid "bad dhcp-range"
 msgstr "opción dhcp-range (rango DHCP) errónea"
 
-#: option.c:1788
+#: option.c:1797
 msgid "only one tag allowed"
 msgstr "solo una etiqueta permitida"
 
-#: option.c:1835
+#: option.c:1844
 msgid "inconsistent DHCP range"
 msgstr "rango DHCP inconsistente"
 
-#: option.c:2010
+#: option.c:2019
 #, fuzzy
 msgid "bad DHCP host name"
 msgstr "nombre de host DHCP erróneo"
 
-#: option.c:2091
+#: option.c:2100
 #, fuzzy
 msgid "bad tag-if"
 msgstr "destino MX erróneo"
 
-#: option.c:2365 option.c:2664
+#: option.c:2374 option.c:2673
 msgid "invalid port number"
 msgstr "número de puerto inválido"
 
-#: option.c:2427
+#: option.c:2436
 #, fuzzy
 msgid "bad dhcp-proxy address"
 msgstr "dirección IP errónea"
 
-#: option.c:2467
+#: option.c:2476
 #, fuzzy
 msgid "invalid alias range"
 msgstr "rango alias inválido"
 
-#: option.c:2480
+#: option.c:2489
 #, fuzzy
 msgid "bad interface name"
 msgstr "nombre de interface erróneo"
 
-#: option.c:2505
+#: option.c:2514
 msgid "bad CNAME"
 msgstr "CNAME erróneo"
 
-#: option.c:2510
+#: option.c:2519
 msgid "duplicate CNAME"
 msgstr "CNAME duplicado"
 
-#: option.c:2530
+#: option.c:2539
 #, fuzzy
 msgid "bad PTR record"
 msgstr "expediente PTR erróneo"
 
-#: option.c:2561
+#: option.c:2570
 #, fuzzy
 msgid "bad NAPTR record"
 msgstr "expediente NAPTR erróneo"
 
-#: option.c:2586
+#: option.c:2595
 msgid "TXT record string too long"
 msgstr "expediente TXT demasiado largo"
 
-#: option.c:2634
+#: option.c:2643
 msgid "bad TXT record"
 msgstr "expediente TXT erróneo"
 
-#: option.c:2650
+#: option.c:2659
 msgid "bad SRV record"
 msgstr "expediente SRV erróneo"
 
-#: option.c:2657
+#: option.c:2666
 msgid "bad SRV target"
 msgstr "destino SRV erróneo"
 
-#: option.c:2671
+#: option.c:2680
 msgid "invalid priority"
 msgstr "prioridad inválida"
 
-#: option.c:2678
+#: option.c:2687
 msgid "invalid weight"
 msgstr "peso inválido"
 
-#: option.c:2697
+#: option.c:2706
 msgid "unsupported option (check that dnsmasq was compiled with DHCP/TFTP/DBus support)"
 msgstr "opción no soportada (verificar que dnsmasq fue compilado con soporte para DHCP/TFTP/DBus)"
 
-#: option.c:2739
+#: option.c:2748
 #, c-format
 msgid "files nested too deep in %s"
 msgstr "archivos jerarquizados demasiado profundo en %s"
 
-#: option.c:2747 tftp.c:567
+#: option.c:2756 tftp.c:567
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "no se puede leer %s: %s"
 
-#: option.c:2804
+#: option.c:2813
 msgid "missing \""
 msgstr "falta \""
 
-#: option.c:2863
+#: option.c:2872
 msgid "bad option"
 msgstr "opción errónea"
 
-#: option.c:2865
+#: option.c:2874
 msgid "extraneous parameter"
 msgstr "parámetro extraño"
 
-#: option.c:2867
+#: option.c:2876
 msgid "missing parameter"
 msgstr "parámetro ausente"
 
-#: option.c:2871
+#: option.c:2880
 msgid "error"
 msgstr "error"
 
-#: option.c:2876
+#: option.c:2885
 #, c-format
 msgid "%s at line %d of %%s"
 msgstr "%s en línea %d de %%s"
 
-#: option.c:2933 option.c:2964
+#: option.c:2942 option.c:2973
 #, fuzzy, c-format
 msgid "read %s"
 msgstr "leyendo %s"
 
-#: option.c:3036
+#: option.c:3045
 #, c-format
 msgid "Dnsmasq version %s  %s\n"
 msgstr "Dnsmasq versión %s  %s\n"
 
-#: option.c:3037
+#: option.c:3046
 #, c-format
 msgid ""
 "Compile time options %s\n"
@@ -799,62 +799,62 @@ msgstr ""
 "Opciones de compilación %s\n"
 "\n"
 
-#: option.c:3038
+#: option.c:3047
 #, c-format
 msgid "This software comes with ABSOLUTELY NO WARRANTY.\n"
 msgstr "Este software viene SIN NINGUNA GARANTIA.\n"
 
-#: option.c:3039
+#: option.c:3048
 #, 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:3040
+#: option.c:3049
 #, 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:3051
+#: option.c:3060
 msgid "try --help"
 msgstr "pruebe --help"
 
-#: option.c:3053
+#: option.c:3062
 msgid "try -w"
 msgstr "pruebe -w"
 
-#: option.c:3056
+#: option.c:3065
 #, fuzzy, c-format
 msgid "bad command line options: %s"
 msgstr "opciones de línea de comandos erróneas: %s"
 
-#: option.c:3097
+#: option.c:3106
 #, c-format
 msgid "cannot get host-name: %s"
 msgstr "no se puede obtener host-name (nombre de host): %s"
 
-#: option.c:3125
+#: option.c:3134
 msgid "only one resolv.conf file allowed in no-poll mode."
 msgstr "solo un archivo resolv.conf permitido en modo no-poll."
 
-#: option.c:3135
+#: option.c:3144
 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:3138 network.c:813 dhcp.c:814
+#: option.c:3147 network.c:813 dhcp.c:814
 #, fuzzy, c-format
 msgid "failed to read %s: %s"
 msgstr "no se pudo leer %s: %s"
 
-#: option.c:3155
+#: option.c:3164
 #, c-format
 msgid "no search directive found in %s"
 msgstr "ninguna directiva de búsqueda encontrada en %s"
 
-#: option.c:3176
+#: option.c:3185
 msgid "there must be a default domain when --dhcp-fqdn is set"
 msgstr "debe haber un dominio predeterminado cuando --dhcp-fqdn está fijado"
 
-#: option.c:3180
+#: option.c:3189
 msgid "syntax check OK"
 msgstr "revisión de sintaxis OK"
 
@@ -1205,22 +1205,22 @@ msgstr "línea errónea en %s línea %d"
 msgid "ignoring %s line %d, duplicate name or IP address"
 msgstr "ignorando %s línea %d, nombre o dirección IP duplicada"
 
-#: dhcp.c:977
+#: dhcp.c:978
 #, c-format
 msgid "duplicate IP address %s in dhcp-config directive."
 msgstr "dirección IP duplicada %s en directiva dhcp-config."
 
-#: dhcp.c:980
+#: dhcp.c:981
 #, fuzzy, c-format
 msgid "duplicate IP address %s in %s."
 msgstr "dirección IP duplicada %s en %s."
 
-#: dhcp.c:1023
+#: dhcp.c:1024
 #, c-format
 msgid "%s has more than one address in hostsfile, using %s for DHCP"
 msgstr "%s tiene más de una dirección en hostsfile, usando %s para DHCP"
 
-#: dhcp.c:1028
+#: dhcp.c:1029
 #, c-format
 msgid "duplicate IP address %s (%s) in dhcp-config directive"
 msgstr "dirección IP duplicada %s (%s) en directiva dhcp-config"
diff --git a/po/fi.po b/po/fi.po
index 4d4e25b..98e3088 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -30,7 +30,7 @@ msgstr ""
 msgid "bad name at %s line %d"
 msgstr ""
 
-#: cache.c:863 dhcp.c:955
+#: cache.c:863 dhcp.c:956
 #, c-format
 msgid "read %s - %d addresses"
 msgstr ""
@@ -39,7 +39,7 @@ msgstr ""
 msgid "cleared cache"
 msgstr ""
 
-#: cache.c:933 option.c:1103
+#: cache.c:933 option.c:1112
 #, c-format
 msgid "cannot access directory %s: %s"
 msgstr ""
@@ -565,263 +565,263 @@ msgstr ""
 msgid "bad IP address"
 msgstr ""
 
-#: option.c:937
+#: option.c:941
 msgid "bad domain in dhcp-option"
 msgstr ""
 
-#: option.c:998
+#: option.c:1007
 msgid "dhcp-option too long"
 msgstr ""
 
-#: option.c:1007
+#: option.c:1016
 msgid "illegal dhcp-match"
 msgstr ""
 
-#: option.c:1043
+#: option.c:1052
 msgid "illegal repeated flag"
 msgstr ""
 
-#: option.c:1051
+#: option.c:1060
 msgid "illegal repeated keyword"
 msgstr ""
 
-#: option.c:1134 tftp.c:413
+#: option.c:1143 tftp.c:413
 #, c-format
 msgid "cannot access %s: %s"
 msgstr ""
 
-#: option.c:1179
+#: option.c:1188
 msgid "only one dhcp-hostsfile allowed"
 msgstr ""
 
-#: option.c:1186
+#: option.c:1195
 msgid "only one dhcp-optsfile allowed"
 msgstr ""
 
-#: option.c:1231
+#: option.c:1240
 msgid "bad MX preference"
 msgstr ""
 
-#: option.c:1236
+#: option.c:1245
 msgid "bad MX name"
 msgstr ""
 
-#: option.c:1250
+#: option.c:1259
 msgid "bad MX target"
 msgstr ""
 
-#: option.c:1260
+#: option.c:1269
 msgid "cannot run scripts under uClinux"
 msgstr ""
 
-#: option.c:1262
+#: option.c:1271
 msgid "recompile with HAVE_SCRIPT defined to enable lease-change scripts"
 msgstr ""
 
-#: option.c:1507 option.c:1511
+#: option.c:1516 option.c:1520
 msgid "bad port"
 msgstr ""
 
-#: option.c:1530 option.c:1555
+#: option.c:1539 option.c:1564
 msgid "interface binding not supported"
 msgstr ""
 
-#: option.c:1701
+#: option.c:1710
 msgid "bad port range"
 msgstr ""
 
-#: option.c:1718
+#: option.c:1727
 msgid "bad bridge-interface"
 msgstr ""
 
-#: option.c:1760
+#: option.c:1769
 msgid "bad dhcp-range"
 msgstr ""
 
-#: option.c:1788
+#: option.c:1797
 msgid "only one tag allowed"
 msgstr ""
 
-#: option.c:1835
+#: option.c:1844
 msgid "inconsistent DHCP range"
 msgstr ""
 
-#: option.c:2010
+#: option.c:2019
 msgid "bad DHCP host name"
 msgstr ""
 
-#: option.c:2091
+#: option.c:2100
 msgid "bad tag-if"
 msgstr ""
 
-#: option.c:2365 option.c:2664
+#: option.c:2374 option.c:2673
 msgid "invalid port number"
 msgstr ""
 
-#: option.c:2427
+#: option.c:2436
 msgid "bad dhcp-proxy address"
 msgstr ""
 
-#: option.c:2467
+#: option.c:2476
 msgid "invalid alias range"
 msgstr ""
 
-#: option.c:2480
+#: option.c:2489
 msgid "bad interface name"
 msgstr ""
 
-#: option.c:2505
+#: option.c:2514
 msgid "bad CNAME"
 msgstr ""
 
-#: option.c:2510
+#: option.c:2519
 msgid "duplicate CNAME"
 msgstr ""
 
-#: option.c:2530
+#: option.c:2539
 msgid "bad PTR record"
 msgstr ""
 
-#: option.c:2561
+#: option.c:2570
 msgid "bad NAPTR record"
 msgstr ""
 
-#: option.c:2586
+#: option.c:2595
 msgid "TXT record string too long"
 msgstr ""
 
-#: option.c:2634
+#: option.c:2643
 msgid "bad TXT record"
 msgstr ""
 
-#: option.c:2650
+#: option.c:2659
 msgid "bad SRV record"
 msgstr ""
 
-#: option.c:2657
+#: option.c:2666
 msgid "bad SRV target"
 msgstr ""
 
-#: option.c:2671
+#: option.c:2680
 msgid "invalid priority"
 msgstr ""
 
-#: option.c:2678
+#: option.c:2687
 msgid "invalid weight"
 msgstr ""
 
-#: option.c:2697
+#: option.c:2706
 msgid "unsupported option (check that dnsmasq was compiled with DHCP/TFTP/DBus support)"
 msgstr ""
 
-#: option.c:2739
+#: option.c:2748
 #, c-format
 msgid "files nested too deep in %s"
 msgstr ""
 
-#: option.c:2747 tftp.c:567
+#: option.c:2756 tftp.c:567
 #, c-format
 msgid "cannot read %s: %s"
 msgstr ""
 
-#: option.c:2804
+#: option.c:2813
 msgid "missing \""
 msgstr ""
 
-#: option.c:2863
+#: option.c:2872
 msgid "bad option"
 msgstr ""
 
-#: option.c:2865
+#: option.c:2874
 msgid "extraneous parameter"
 msgstr ""
 
-#: option.c:2867
+#: option.c:2876
 msgid "missing parameter"
 msgstr ""
 
-#: option.c:2871
+#: option.c:2880
 msgid "error"
 msgstr ""
 
-#: option.c:2876
+#: option.c:2885
 #, c-format
 msgid "%s at line %d of %%s"
 msgstr ""
 
-#: option.c:2933 option.c:2964
+#: option.c:2942 option.c:2973
 #, c-format
 msgid "read %s"
 msgstr ""
 
-#: option.c:3036
+#: option.c:3045
 #, c-format
 msgid "Dnsmasq version %s  %s\n"
 msgstr ""
 
-#: option.c:3037
+#: option.c:3046
 #, c-format
 msgid ""
 "Compile time options %s\n"
 "\n"
 msgstr ""
 
-#: option.c:3038
+#: option.c:3047
 #, c-format
 msgid "This software comes with ABSOLUTELY NO WARRANTY.\n"
 msgstr ""
 
-#: option.c:3039
+#: option.c:3048
 #, c-format
 msgid "Dnsmasq is free software, and you are welcome to redistribute it\n"
 msgstr ""
 
-#: option.c:3040
+#: option.c:3049
 #, c-format
 msgid "under the terms of the GNU General Public License, version 2 or 3.\n"
 msgstr ""
 
-#: option.c:3051
+#: option.c:3060
 msgid "try --help"
 msgstr ""
 
-#: option.c:3053
+#: option.c:3062
 msgid "try -w"
 msgstr ""
 
-#: option.c:3056
+#: option.c:3065
 #, c-format
 msgid "bad command line options: %s"
 msgstr ""
 
-#: option.c:3097
+#: option.c:3106
 #, c-format
 msgid "cannot get host-name: %s"
 msgstr ""
 
-#: option.c:3125
+#: option.c:3134
 msgid "only one resolv.conf file allowed in no-poll mode."
 msgstr ""
 
-#: option.c:3135
+#: option.c:3144
 msgid "must have exactly one resolv.conf to read domain from."
 msgstr ""
 
-#: option.c:3138 network.c:813 dhcp.c:814
+#: option.c:3147 network.c:813 dhcp.c:814
 #, c-format
 msgid "failed to read %s: %s"
 msgstr ""
 
-#: option.c:3155
+#: option.c:3164
 #, c-format
 msgid "no search directive found in %s"
 msgstr ""
 
-#: option.c:3176
+#: option.c:3185
 msgid "there must be a default domain when --dhcp-fqdn is set"
 msgstr ""
 
-#: option.c:3180
+#: option.c:3189
 msgid "syntax check OK"
 msgstr ""
 
@@ -1168,22 +1168,22 @@ msgstr ""
 msgid "ignoring %s line %d, duplicate name or IP address"
 msgstr ""
 
-#: dhcp.c:977
+#: dhcp.c:978
 #, c-format
 msgid "duplicate IP address %s in dhcp-config directive."
 msgstr ""
 
-#: dhcp.c:980
+#: dhcp.c:981
 #, c-format
 msgid "duplicate IP address %s in %s."
 msgstr ""
 
-#: dhcp.c:1023
+#: dhcp.c:1024
 #, c-format
 msgid "%s has more than one address in hostsfile, using %s for DHCP"
 msgstr ""
 
-#: dhcp.c:1028
+#: dhcp.c:1029
 #, c-format
 msgid "duplicate IP address %s (%s) in dhcp-config directive"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 949358d..694d1ec 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -29,7 +29,7 @@ msgstr "mauvaise adresse dans %s ligne %d"
 msgid "bad name at %s line %d"
 msgstr "mauvais nom dans %s ligne %d"
 
-#: cache.c:863 dhcp.c:955
+#: cache.c:863 dhcp.c:956
 #, c-format
 msgid "read %s - %d addresses"
 msgstr "lecture %s - %d adresses"
@@ -38,7 +38,7 @@ msgstr "lecture %s - %d adresses"
 msgid "cleared cache"
 msgstr "cache vidé"
 
-#: cache.c:933 option.c:1103
+#: cache.c:933 option.c:1112
 #, c-format
 msgid "cannot access directory %s: %s"
 msgstr "Ne peut pas lire le répertoire %s : %s"
@@ -587,210 +587,210 @@ msgstr "mauvaise valeur de 'dhcp-option'"
 msgid "bad IP address"
 msgstr "mauvaise adresse IP"
 
-#: option.c:937
+#: option.c:941
 msgid "bad domain in dhcp-option"
 msgstr "mauvais domaine dans dhcp-option"
 
-#: option.c:998
+#: option.c:1007
 msgid "dhcp-option too long"
 msgstr "dhcp-option trop long"
 
-#: option.c:1007
+#: option.c:1016
 msgid "illegal dhcp-match"
 msgstr "valeur illégale pour 'dhcp-match'"
 
-#: option.c:1043
+#: option.c:1052
 msgid "illegal repeated flag"
 msgstr "Une option ne pouvant être spécifié qu'une seule fois à été donnée plusieurs fois."
 
-#: option.c:1051
+#: option.c:1060
 msgid "illegal repeated keyword"
 msgstr "Mot-clef ne pouvant être répété"
 
-#: option.c:1134 tftp.c:413
+#: option.c:1143 tftp.c:413
 #, c-format
 msgid "cannot access %s: %s"
 msgstr "Ne peut pas lire %s : %s"
 
 #
-#: option.c:1179
+#: option.c:1188
 msgid "only one dhcp-hostsfile allowed"
 msgstr "une seule valeur est autorisée pour 'dhcp-hostsfile'"
 
 #
-#: option.c:1186
+#: option.c:1195
 msgid "only one dhcp-optsfile allowed"
 msgstr "une seule valeur est autorisée pour 'dhcp-optsfile'"
 
-#: option.c:1231
+#: option.c:1240
 msgid "bad MX preference"
 msgstr "préference MX incorrecte"
 
-#: option.c:1236
+#: option.c:1245
 msgid "bad MX name"
 msgstr "nom MX incorrect"
 
-#: option.c:1250
+#: option.c:1259
 msgid "bad MX target"
 msgstr "valeur MX cible incorrecte"
 
-#: option.c:1260
+#: option.c:1269
 msgid "cannot run scripts under uClinux"
 msgstr "ne peut exécuter de script sous uClinux"
 
-#: option.c:1262
+#: option.c:1271
 msgid "recompile with HAVE_SCRIPT defined to enable lease-change scripts"
 msgstr "pour permettre l'exécution de scripts au changement de bail (lease-change), recompiler en définissant HAVE_SCRIPT"
 
-#: option.c:1507 option.c:1511
+#: option.c:1516 option.c:1520
 msgid "bad port"
 msgstr "numéro de port incorrect"
 
-#: option.c:1530 option.c:1555
+#: option.c:1539 option.c:1564
 msgid "interface binding not supported"
 msgstr "association d'interface non supportée"
 
 #
-#: option.c:1701
+#: option.c:1710
 msgid "bad port range"
 msgstr "gamme de ports incorrecte"
 
-#: option.c:1718
+#: option.c:1727
 msgid "bad bridge-interface"
 msgstr "interface-pont incorrecte"
 
-#: option.c:1760
+#: option.c:1769
 msgid "bad dhcp-range"
 msgstr "plage d'adresses DHCP (dhcp-range) incorrecte"
 
-#: option.c:1788
+#: option.c:1797
 msgid "only one tag allowed"
 msgstr "une seule étiquette est autorisée"
 
-#: option.c:1835
+#: option.c:1844
 msgid "inconsistent DHCP range"
 msgstr "plage d'adresses DHCP incohérente"
 
 #
-#: option.c:2010
+#: option.c:2019
 msgid "bad DHCP host name"
 msgstr "nom d'hôte DHCP incorrect"
 
-#: option.c:2091
+#: option.c:2100
 msgid "bad tag-if"
 msgstr "mauvaise étiquette tag-if"
 
-#: option.c:2365 option.c:2664
+#: option.c:2374 option.c:2673
 msgid "invalid port number"
 msgstr "numéro de port invalide"
 
 #
-#: option.c:2427
+#: option.c:2436
 msgid "bad dhcp-proxy address"
 msgstr "adresse dhcp-proxy incorrecte"
 
 #
-#: option.c:2467
+#: option.c:2476
 msgid "invalid alias range"
 msgstr "poids invalide"
 
 #
-#: option.c:2480
+#: option.c:2489
 msgid "bad interface name"
 msgstr "nom d'interface invalide"
 
-#: option.c:2505
+#: option.c:2514
 msgid "bad CNAME"
 msgstr "mauvais CNAME"
 
-#: option.c:2510
+#: option.c:2519
 msgid "duplicate CNAME"
 msgstr "ce CNAME existe déja"
 
 #
-#: option.c:2530
+#: option.c:2539
 msgid "bad PTR record"
 msgstr "mauvais champ PTR"
 
 #
-#: option.c:2561
+#: option.c:2570
 msgid "bad NAPTR record"
 msgstr "mauvais champ NAPTR"
 
-#: option.c:2586
+#: option.c:2595
 msgid "TXT record string too long"
 msgstr "chaîne du champ TXT trop longue"
 
-#: option.c:2634
+#: option.c:2643
 msgid "bad TXT record"
 msgstr "champ TXT invalide"
 
-#: option.c:2650
+#: option.c:2659
 msgid "bad SRV record"
 msgstr "champ SRV invalide"
 
-#: option.c:2657
+#: option.c:2666
 msgid "bad SRV target"
 msgstr "cible SRV invalide"
 
-#: option.c:2671
+#: option.c:2680
 msgid "invalid priority"
 msgstr "priorité invalide"
 
-#: option.c:2678
+#: option.c:2687
 msgid "invalid weight"
 msgstr "poids invalide"
 
-#: option.c:2697
+#: option.c:2706
 msgid "unsupported option (check that dnsmasq was compiled with DHCP/TFTP/DBus support)"
 msgstr "option non supportée (vérifier que Dnsmasq a été compilé avec le support DHCP/TFTP/DBus)"
 
-#: option.c:2739
+#: option.c:2748
 #, c-format
 msgid "files nested too deep in %s"
 msgstr "trop de niveaux de récursion pour les fichiers dans %s"
 
-#: option.c:2747 tftp.c:567
+#: option.c:2756 tftp.c:567
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "Ne peut pas lire %s : %s"
 
-#: option.c:2804
+#: option.c:2813
 msgid "missing \""
 msgstr "il manque \""
 
-#: option.c:2863
+#: option.c:2872
 msgid "bad option"
 msgstr "mauvaise option"
 
-#: option.c:2865
+#: option.c:2874
 msgid "extraneous parameter"
 msgstr "paramètre en trop"
 
-#: option.c:2867
+#: option.c:2876
 msgid "missing parameter"
 msgstr "paramètre manquant"
 
-#: option.c:2871
+#: option.c:2880
 msgid "error"
 msgstr "erreur"
 
-#: option.c:2876
+#: option.c:2885
 #, c-format
 msgid "%s at line %d of %%s"
 msgstr "%s à la ligne %d de %%s"
 
-#: option.c:2933 option.c:2964
+#: option.c:2942 option.c:2973
 #, c-format
 msgid "read %s"
 msgstr "Lecture de %s"
 
-#: option.c:3036
+#: option.c:3045
 #, c-format
 msgid "Dnsmasq version %s  %s\n"
 msgstr "Version de Dnsmasq %s  %s\n"
 
-#: option.c:3037
+#: option.c:3046
 #, c-format
 msgid ""
 "Compile time options %s\n"
@@ -799,62 +799,62 @@ msgstr ""
 "Options à la compilation %s\n"
 "\n"
 
-#: option.c:3038
+#: option.c:3047
 #, c-format
 msgid "This software comes with ABSOLUTELY NO WARRANTY.\n"
 msgstr "Ce logiciel est fourni sans AUCUNE GARANTIE.\n"
 
-#: option.c:3039
+#: option.c:3048
 #, 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:3040
+#: option.c:3049
 #, 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:3051
+#: option.c:3060
 msgid "try --help"
 msgstr "essayez avec --help"
 
-#: option.c:3053
+#: option.c:3062
 msgid "try -w"
 msgstr "essayez avec -w"
 
-#: option.c:3056
+#: option.c:3065
 #, c-format
 msgid "bad command line options: %s"
 msgstr "mauvaises options en ligne de commande : %s."
 
-#: option.c:3097
+#: option.c:3106
 #, c-format
 msgid "cannot get host-name: %s"
 msgstr "ne peut pas obtenir le nom de la machine : %s"
 
-#: option.c:3125
+#: option.c:3134
 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:3135
+#: option.c:3144
 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:3138 network.c:813 dhcp.c:814
+#: option.c:3147 network.c:813 dhcp.c:814
 #, c-format
 msgid "failed to read %s: %s"
 msgstr "impossible de lire %s : %s"
 
-#: option.c:3155
+#: option.c:3164
 #, c-format
 msgid "no search directive found in %s"
 msgstr "pas de directive de recherche trouvée dans %s"
 
-#: option.c:3176
+#: option.c:3185
 msgid "there must be a default domain when --dhcp-fqdn is set"
 msgstr "un domaine par défaut doit être spécifié lorsque l'option --dhcp-fqdn est utilisée"
 
-#: option.c:3180
+#: option.c:3189
 msgid "syntax check OK"
 msgstr "vérification de syntaxe OK"
 
@@ -1204,22 +1204,22 @@ msgstr "mauvaise ligne dans %s ligne %d"
 msgid "ignoring %s line %d, duplicate name or IP address"
 msgstr "ignore %s à la ligne %d : duplication de nom ou d'adresse IP"
 
-#: dhcp.c:977
+#: dhcp.c:978
 #, c-format
 msgid "duplicate IP address %s in dhcp-config directive."
 msgstr "adresse IP %s dupliquée dans la directive dhcp-config."
 
-#: dhcp.c:980
+#: dhcp.c:981
 #, c-format
 msgid "duplicate IP address %s in %s."
 msgstr "adresse IP %s dupliquée dans %s."
 
-#: dhcp.c:1023
+#: dhcp.c:1024
 #, c-format
 msgid "%s has more than one address in hostsfile, using %s for DHCP"
 msgstr "%s a plus d'une adresse dans le fichier d'hôte, utilisation de %s pour le DHCP."
 
-#: dhcp.c:1028
+#: dhcp.c:1029
 #, c-format
 msgid "duplicate IP address %s (%s) in dhcp-config directive"
 msgstr "adresse IP %s (%s) dupliquée dans la directive dhcp-config."
diff --git a/po/id.po b/po/id.po
index 5437b6f..b813a32 100644
--- a/po/id.po
+++ b/po/id.po
@@ -33,7 +33,7 @@ msgid "bad name at %s line %d"
 msgstr "kesalahan nama pada %s baris %d"
 
 # OK
-#: cache.c:863 dhcp.c:955
+#: cache.c:863 dhcp.c:956
 #, c-format
 msgid "read %s - %d addresses"
 msgstr "membaca %s - %d alamat"
@@ -44,7 +44,7 @@ msgid "cleared cache"
 msgstr "cache telah dihapus"
 
 # OK
-#: cache.c:933 option.c:1103
+#: cache.c:933 option.c:1112
 #, fuzzy, c-format
 msgid "cannot access directory %s: %s"
 msgstr "tidak bisa membaca %s: %s"
@@ -668,242 +668,242 @@ msgid "bad IP address"
 msgstr "membaca %s - %d alamat"
 
 # OK
-#: option.c:937
+#: option.c:941
 msgid "bad domain in dhcp-option"
 msgstr "domain dalam dhcp-option salah"
 
 # OK
-#: option.c:998
+#: option.c:1007
 msgid "dhcp-option too long"
 msgstr "dhcp-option terlalu panjang"
 
-#: option.c:1007
+#: option.c:1016
 msgid "illegal dhcp-match"
 msgstr ""
 
-#: option.c:1043
+#: option.c:1052
 msgid "illegal repeated flag"
 msgstr ""
 
-#: option.c:1051
+#: option.c:1060
 msgid "illegal repeated keyword"
 msgstr ""
 
 # OK
-#: option.c:1134 tftp.c:413
+#: option.c:1143 tftp.c:413
 #, fuzzy, c-format
 msgid "cannot access %s: %s"
 msgstr "tidak bisa membaca %s: %s"
 
-#: option.c:1179
+#: option.c:1188
 msgid "only one dhcp-hostsfile allowed"
 msgstr ""
 
-#: option.c:1186
+#: option.c:1195
 msgid "only one dhcp-optsfile allowed"
 msgstr ""
 
 # OK
-#: option.c:1231
+#: option.c:1240
 msgid "bad MX preference"
 msgstr "kesukaan MX salah"
 
 # OK
-#: option.c:1236
+#: option.c:1245
 msgid "bad MX name"
 msgstr "nama MX salah"
 
 # OK
-#: option.c:1250
+#: option.c:1259
 msgid "bad MX target"
 msgstr "target MX salah"
 
-#: option.c:1260
+#: option.c:1269
 msgid "cannot run scripts under uClinux"
 msgstr ""
 
-#: option.c:1262
+#: option.c:1271
 msgid "recompile with HAVE_SCRIPT defined to enable lease-change scripts"
 msgstr ""
 
 # OK
-#: option.c:1507 option.c:1511
+#: option.c:1516 option.c:1520
 msgid "bad port"
 msgstr "port salah"
 
-#: option.c:1530 option.c:1555
+#: option.c:1539 option.c:1564
 msgid "interface binding not supported"
 msgstr ""
 
 # OK
-#: option.c:1701
+#: option.c:1710
 #, fuzzy
 msgid "bad port range"
 msgstr "port salah"
 
-#: option.c:1718
+#: option.c:1727
 msgid "bad bridge-interface"
 msgstr ""
 
 # OK
-#: option.c:1760
+#: option.c:1769
 msgid "bad dhcp-range"
 msgstr "dhcp-range salah"
 
-#: option.c:1788
+#: option.c:1797
 msgid "only one tag allowed"
 msgstr ""
 
 # OK
-#: option.c:1835
+#: option.c:1844
 msgid "inconsistent DHCP range"
 msgstr "jangkauan DHCP tidak konsisten"
 
 # OK
-#: option.c:2010
+#: option.c:2019
 #, fuzzy
 msgid "bad DHCP host name"
 msgstr "nama MX salah"
 
 # OK
-#: option.c:2091
+#: option.c:2100
 #, fuzzy
 msgid "bad tag-if"
 msgstr "target MX salah"
 
 # OK
-#: option.c:2365 option.c:2664
+#: option.c:2374 option.c:2673
 msgid "invalid port number"
 msgstr "nomor port tidak benar"
 
 # OK
-#: option.c:2427
+#: option.c:2436
 #, fuzzy
 msgid "bad dhcp-proxy address"
 msgstr "membaca %s - %d alamat"
 
 # OK
-#: option.c:2467
+#: option.c:2476
 #, fuzzy
 msgid "invalid alias range"
 msgstr "weight tidak benar"
 
 # OK
-#: option.c:2480
+#: option.c:2489
 #, fuzzy
 msgid "bad interface name"
 msgstr "nama MX salah"
 
-#: option.c:2505
+#: option.c:2514
 msgid "bad CNAME"
 msgstr ""
 
-#: option.c:2510
+#: option.c:2519
 msgid "duplicate CNAME"
 msgstr ""
 
 # OK
-#: option.c:2530
+#: option.c:2539
 #, fuzzy
 msgid "bad PTR record"
 msgstr "rekord SRV salah"
 
 # OK
-#: option.c:2561
+#: option.c:2570
 #, fuzzy
 msgid "bad NAPTR record"
 msgstr "rekord SRV salah"
 
 # OK
-#: option.c:2586
+#: option.c:2595
 msgid "TXT record string too long"
 msgstr "string rekord TXT terlalu panjang"
 
 # OK
-#: option.c:2634
+#: option.c:2643
 msgid "bad TXT record"
 msgstr "rekord TXT salah"
 
 # OK
-#: option.c:2650
+#: option.c:2659
 msgid "bad SRV record"
 msgstr "rekord SRV salah"
 
 # OK
-#: option.c:2657
+#: option.c:2666
 msgid "bad SRV target"
 msgstr "target SRV salah"
 
 # OK
-#: option.c:2671
+#: option.c:2680
 msgid "invalid priority"
 msgstr "prioritas tidak benar"
 
 # OK
-#: option.c:2678
+#: option.c:2687
 msgid "invalid weight"
 msgstr "weight tidak benar"
 
-#: option.c:2697
+#: option.c:2706
 msgid "unsupported option (check that dnsmasq was compiled with DHCP/TFTP/DBus support)"
 msgstr ""
 
-#: option.c:2739
+#: option.c:2748
 #, c-format
 msgid "files nested too deep in %s"
 msgstr ""
 
 # OK
-#: option.c:2747 tftp.c:567
+#: option.c:2756 tftp.c:567
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "tidak bisa membaca %s: %s"
 
 # OK
-#: option.c:2804
+#: option.c:2813
 msgid "missing \""
 msgstr "kurang \""
 
 # OK
-#: option.c:2863
+#: option.c:2872
 msgid "bad option"
 msgstr "pilihan salah"
 
 # OK
-#: option.c:2865
+#: option.c:2874
 msgid "extraneous parameter"
 msgstr "parameter berlebihan"
 
 # OK
-#: option.c:2867
+#: option.c:2876
 msgid "missing parameter"
 msgstr "parameter kurang"
 
 # OK
-#: option.c:2871
+#: option.c:2880
 msgid "error"
 msgstr "kesalahan"
 
 # OK
-#: option.c:2876
+#: option.c:2885
 #, c-format
 msgid "%s at line %d of %%s"
 msgstr "%s pada baris %d dari %%s"
 
 # OK
-#: option.c:2933 option.c:2964
+#: option.c:2942 option.c:2973
 #, fuzzy, c-format
 msgid "read %s"
 msgstr "membaca %s"
 
 # OK
-#: option.c:3036
+#: option.c:3045
 #, c-format
 msgid "Dnsmasq version %s  %s\n"
 msgstr "Dnsmasq versi %s  %s\n"
 
 # OK
-#: option.c:3037
+#: option.c:3046
 #, c-format
 msgid ""
 "Compile time options %s\n"
@@ -913,70 +913,70 @@ msgstr ""
 "\n"
 
 # OK
-#: option.c:3038
+#: option.c:3047
 #, c-format
 msgid "This software comes with ABSOLUTELY NO WARRANTY.\n"
 msgstr "Perangkat lunak ini tersedia TANPA JAMINAN SEDIKITPUN.\n"
 
 # OK
-#: option.c:3039
+#: option.c:3048
 #, 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:3040
+#: option.c:3049
 #, 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:3051
+#: option.c:3060
 msgid "try --help"
 msgstr ""
 
-#: option.c:3053
+#: option.c:3062
 msgid "try -w"
 msgstr ""
 
 # OK
-#: option.c:3056
+#: option.c:3065
 #, fuzzy, c-format
 msgid "bad command line options: %s"
 msgstr "pilihan baris perintah salah: %s."
 
 # OK
-#: option.c:3097
+#: option.c:3106
 #, c-format
 msgid "cannot get host-name: %s"
 msgstr "tidak bisa mendapatkan host-name: %s"
 
 # OK
-#: option.c:3125
+#: option.c:3134
 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:3135
+#: option.c:3144
 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:3138 network.c:813 dhcp.c:814
+#: option.c:3147 network.c:813 dhcp.c:814
 #, fuzzy, c-format
 msgid "failed to read %s: %s"
 msgstr "gagal membaca %s: %s"
 
 # OK
-#: option.c:3155
+#: option.c:3164
 #, c-format
 msgid "no search directive found in %s"
 msgstr "tidak ditemukan direktif search di %s"
 
-#: option.c:3176
+#: option.c:3185
 msgid "there must be a default domain when --dhcp-fqdn is set"
 msgstr ""
 
-#: option.c:3180
+#: option.c:3189
 msgid "syntax check OK"
 msgstr ""
 
@@ -1378,24 +1378,24 @@ msgid "ignoring %s line %d, duplicate name or IP address"
 msgstr ""
 
 # OK
-#: dhcp.c:977
+#: dhcp.c:978
 #, c-format
 msgid "duplicate IP address %s in dhcp-config directive."
 msgstr "alamat IP kembar %s dalam direktif dhcp-config"
 
 # OK
-#: dhcp.c:980
+#: dhcp.c:981
 #, fuzzy, c-format
 msgid "duplicate IP address %s in %s."
 msgstr "alamat IP kembar %s dalam direktif dhcp-config"
 
-#: dhcp.c:1023
+#: dhcp.c:1024
 #, c-format
 msgid "%s has more than one address in hostsfile, using %s for DHCP"
 msgstr ""
 
 # OK
-#: dhcp.c:1028
+#: dhcp.c:1029
 #, c-format
 msgid "duplicate IP address %s (%s) in dhcp-config directive"
 msgstr "alamat IP kembar %s (%s) dalam direktif dhcp-config"
diff --git a/po/it.po b/po/it.po
index 8ac4661..af819e9 100644
--- a/po/it.po
+++ b/po/it.po
@@ -30,7 +30,7 @@ msgstr ""
 msgid "bad name at %s line %d"
 msgstr ""
 
-#: cache.c:863 dhcp.c:955
+#: cache.c:863 dhcp.c:956
 #, c-format
 msgid "read %s - %d addresses"
 msgstr ""
@@ -39,7 +39,7 @@ msgstr ""
 msgid "cleared cache"
 msgstr ""
 
-#: cache.c:933 option.c:1103
+#: cache.c:933 option.c:1112
 #, c-format
 msgid "cannot access directory %s: %s"
 msgstr ""
@@ -565,263 +565,263 @@ msgstr ""
 msgid "bad IP address"
 msgstr ""
 
-#: option.c:937
+#: option.c:941
 msgid "bad domain in dhcp-option"
 msgstr ""
 
-#: option.c:998
+#: option.c:1007
 msgid "dhcp-option too long"
 msgstr ""
 
-#: option.c:1007
+#: option.c:1016
 msgid "illegal dhcp-match"
 msgstr ""
 
-#: option.c:1043
+#: option.c:1052
 msgid "illegal repeated flag"
 msgstr ""
 
-#: option.c:1051
+#: option.c:1060
 msgid "illegal repeated keyword"
 msgstr ""
 
-#: option.c:1134 tftp.c:413
+#: option.c:1143 tftp.c:413
 #, c-format
 msgid "cannot access %s: %s"
 msgstr ""
 
-#: option.c:1179
+#: option.c:1188
 msgid "only one dhcp-hostsfile allowed"
 msgstr ""
 
-#: option.c:1186
+#: option.c:1195
 msgid "only one dhcp-optsfile allowed"
 msgstr ""
 
-#: option.c:1231
+#: option.c:1240
 msgid "bad MX preference"
 msgstr ""
 
-#: option.c:1236
+#: option.c:1245
 msgid "bad MX name"
 msgstr ""
 
-#: option.c:1250
+#: option.c:1259
 msgid "bad MX target"
 msgstr ""
 
-#: option.c:1260
+#: option.c:1269
 msgid "cannot run scripts under uClinux"
 msgstr ""
 
-#: option.c:1262
+#: option.c:1271
 msgid "recompile with HAVE_SCRIPT defined to enable lease-change scripts"
 msgstr ""
 
-#: option.c:1507 option.c:1511
+#: option.c:1516 option.c:1520
 msgid "bad port"
 msgstr ""
 
-#: option.c:1530 option.c:1555
+#: option.c:1539 option.c:1564
 msgid "interface binding not supported"
 msgstr ""
 
-#: option.c:1701
+#: option.c:1710
 msgid "bad port range"
 msgstr ""
 
-#: option.c:1718
+#: option.c:1727
 msgid "bad bridge-interface"
 msgstr ""
 
-#: option.c:1760
+#: option.c:1769
 msgid "bad dhcp-range"
 msgstr ""
 
-#: option.c:1788
+#: option.c:1797
 msgid "only one tag allowed"
 msgstr ""
 
-#: option.c:1835
+#: option.c:1844
 msgid "inconsistent DHCP range"
 msgstr ""
 
-#: option.c:2010
+#: option.c:2019
 msgid "bad DHCP host name"
 msgstr ""
 
-#: option.c:2091
+#: option.c:2100
 msgid "bad tag-if"
 msgstr ""
 
-#: option.c:2365 option.c:2664
+#: option.c:2374 option.c:2673
 msgid "invalid port number"
 msgstr ""
 
-#: option.c:2427
+#: option.c:2436
 msgid "bad dhcp-proxy address"
 msgstr ""
 
-#: option.c:2467
+#: option.c:2476
 msgid "invalid alias range"
 msgstr ""
 
-#: option.c:2480
+#: option.c:2489
 msgid "bad interface name"
 msgstr ""
 
-#: option.c:2505
+#: option.c:2514
 msgid "bad CNAME"
 msgstr ""
 
-#: option.c:2510
+#: option.c:2519
 msgid "duplicate CNAME"
 msgstr ""
 
-#: option.c:2530
+#: option.c:2539
 msgid "bad PTR record"
 msgstr ""
 
-#: option.c:2561
+#: option.c:2570
 msgid "bad NAPTR record"
 msgstr ""
 
-#: option.c:2586
+#: option.c:2595
 msgid "TXT record string too long"
 msgstr ""
 
-#: option.c:2634
+#: option.c:2643
 msgid "bad TXT record"
 msgstr ""
 
-#: option.c:2650
+#: option.c:2659
 msgid "bad SRV record"
 msgstr ""
 
-#: option.c:2657
+#: option.c:2666
 msgid "bad SRV target"
 msgstr ""
 
-#: option.c:2671
+#: option.c:2680
 msgid "invalid priority"
 msgstr ""
 
-#: option.c:2678
+#: option.c:2687
 msgid "invalid weight"
 msgstr ""
 
-#: option.c:2697
+#: option.c:2706
 msgid "unsupported option (check that dnsmasq was compiled with DHCP/TFTP/DBus support)"
 msgstr ""
 
-#: option.c:2739
+#: option.c:2748
 #, c-format
 msgid "files nested too deep in %s"
 msgstr ""
 
-#: option.c:2747 tftp.c:567
+#: option.c:2756 tftp.c:567
 #, c-format
 msgid "cannot read %s: %s"
 msgstr ""
 
-#: option.c:2804
+#: option.c:2813
 msgid "missing \""
 msgstr ""
 
-#: option.c:2863
+#: option.c:2872
 msgid "bad option"
 msgstr ""
 
-#: option.c:2865
+#: option.c:2874
 msgid "extraneous parameter"
 msgstr ""
 
-#: option.c:2867
+#: option.c:2876
 msgid "missing parameter"
 msgstr ""
 
-#: option.c:2871
+#: option.c:2880
 msgid "error"
 msgstr ""
 
-#: option.c:2876
+#: option.c:2885
 #, c-format
 msgid "%s at line %d of %%s"
 msgstr ""
 
-#: option.c:2933 option.c:2964
+#: option.c:2942 option.c:2973
 #, c-format
 msgid "read %s"
 msgstr ""
 
-#: option.c:3036
+#: option.c:3045
 #, c-format
 msgid "Dnsmasq version %s  %s\n"
 msgstr ""
 
-#: option.c:3037
+#: option.c:3046
 #, c-format
 msgid ""
 "Compile time options %s\n"
 "\n"
 msgstr ""
 
-#: option.c:3038
+#: option.c:3047
 #, c-format
 msgid "This software comes with ABSOLUTELY NO WARRANTY.\n"
 msgstr ""
 
-#: option.c:3039
+#: option.c:3048
 #, c-format
 msgid "Dnsmasq is free software, and you are welcome to redistribute it\n"
 msgstr ""
 
-#: option.c:3040
+#: option.c:3049
 #, c-format
 msgid "under the terms of the GNU General Public License, version 2 or 3.\n"
 msgstr ""
 
-#: option.c:3051
+#: option.c:3060
 msgid "try --help"
 msgstr ""
 
-#: option.c:3053
+#: option.c:3062
 msgid "try -w"
 msgstr ""
 
-#: option.c:3056
+#: option.c:3065
 #, c-format
 msgid "bad command line options: %s"
 msgstr ""
 
-#: option.c:3097
+#: option.c:3106
 #, c-format
 msgid "cannot get host-name: %s"
 msgstr ""
 
-#: option.c:3125
+#: option.c:3134
 msgid "only one resolv.conf file allowed in no-poll mode."
 msgstr ""
 
-#: option.c:3135
+#: option.c:3144
 msgid "must have exactly one resolv.conf to read domain from."
 msgstr ""
 
-#: option.c:3138 network.c:813 dhcp.c:814
+#: option.c:3147 network.c:813 dhcp.c:814
 #, c-format
 msgid "failed to read %s: %s"
 msgstr ""
 
-#: option.c:3155
+#: option.c:3164
 #, c-format
 msgid "no search directive found in %s"
 msgstr ""
 
-#: option.c:3176
+#: option.c:3185
 msgid "there must be a default domain when --dhcp-fqdn is set"
 msgstr ""
 
-#: option.c:3180
+#: option.c:3189
 msgid "syntax check OK"
 msgstr ""
 
@@ -1168,22 +1168,22 @@ msgstr ""
 msgid "ignoring %s line %d, duplicate name or IP address"
 msgstr ""
 
-#: dhcp.c:977
+#: dhcp.c:978
 #, c-format
 msgid "duplicate IP address %s in dhcp-config directive."
 msgstr ""
 
-#: dhcp.c:980
+#: dhcp.c:981
 #, c-format
 msgid "duplicate IP address %s in %s."
 msgstr ""
 
-#: dhcp.c:1023
+#: dhcp.c:1024
 #, c-format
 msgid "%s has more than one address in hostsfile, using %s for DHCP"
 msgstr ""
 
-#: dhcp.c:1028
+#: dhcp.c:1029
 #, c-format
 msgid "duplicate IP address %s (%s) in dhcp-config directive"
 msgstr ""
diff --git a/po/no.po b/po/no.po
index bb14641..04ceabc 100644
--- a/po/no.po
+++ b/po/no.po
@@ -32,7 +32,7 @@ msgstr "dårlig adresse ved %s linje %d"
 msgid "bad name at %s line %d"
 msgstr "dårlig navn ved %s linje %d"
 
-#: cache.c:863 dhcp.c:955
+#: cache.c:863 dhcp.c:956
 #, c-format
 msgid "read %s - %d addresses"
 msgstr "les %s - %d adresser"
@@ -41,7 +41,7 @@ msgstr "les %s - %d adresser"
 msgid "cleared cache"
 msgstr "mellomlager tømt"
 
-#: cache.c:933 option.c:1103
+#: cache.c:933 option.c:1112
 #, fuzzy, c-format
 msgid "cannot access directory %s: %s"
 msgstr "kan ikke lese %s: %s"
@@ -586,209 +586,209 @@ msgstr "dårlig dhcp-opsjon"
 msgid "bad IP address"
 msgstr "les %s - %d adresser"
 
-#: option.c:937
+#: option.c:941
 msgid "bad domain in dhcp-option"
 msgstr "dårlig domene i dhcp-opsjon"
 
-#: option.c:998
+#: option.c:1007
 msgid "dhcp-option too long"
 msgstr "dhcp-opsjon for lang"
 
-#: option.c:1007
+#: option.c:1016
 msgid "illegal dhcp-match"
 msgstr ""
 
-#: option.c:1043
+#: option.c:1052
 msgid "illegal repeated flag"
 msgstr ""
 
-#: option.c:1051
+#: option.c:1060
 msgid "illegal repeated keyword"
 msgstr ""
 
-#: option.c:1134 tftp.c:413
+#: option.c:1143 tftp.c:413
 #, fuzzy, c-format
 msgid "cannot access %s: %s"
 msgstr "kan ikke lese %s: %s"
 
-#: option.c:1179
+#: option.c:1188
 msgid "only one dhcp-hostsfile allowed"
 msgstr ""
 
-#: option.c:1186
+#: option.c:1195
 msgid "only one dhcp-optsfile allowed"
 msgstr ""
 
-#: option.c:1231
+#: option.c:1240
 msgid "bad MX preference"
 msgstr "dårlig MX preferanse"
 
-#: option.c:1236
+#: option.c:1245
 msgid "bad MX name"
 msgstr "dårlig MX navn"
 
-#: option.c:1250
+#: option.c:1259
 msgid "bad MX target"
 msgstr "dårlig MX mål"
 
-#: option.c:1260
+#: option.c:1269
 msgid "cannot run scripts under uClinux"
 msgstr ""
 
-#: option.c:1262
+#: option.c:1271
 msgid "recompile with HAVE_SCRIPT defined to enable lease-change scripts"
 msgstr ""
 
-#: option.c:1507 option.c:1511
+#: option.c:1516 option.c:1520
 msgid "bad port"
 msgstr "dårlig port"
 
-#: option.c:1530 option.c:1555
+#: option.c:1539 option.c:1564
 msgid "interface binding not supported"
 msgstr ""
 
-#: option.c:1701
+#: option.c:1710
 #, fuzzy
 msgid "bad port range"
 msgstr "dårlig port"
 
-#: option.c:1718
+#: option.c:1727
 msgid "bad bridge-interface"
 msgstr ""
 
-#: option.c:1760
+#: option.c:1769
 msgid "bad dhcp-range"
 msgstr "dårlig dhcp-område"
 
-#: option.c:1788
+#: option.c:1797
 msgid "only one tag allowed"
 msgstr ""
 
-#: option.c:1835
+#: option.c:1844
 msgid "inconsistent DHCP range"
 msgstr "ikke konsistent DHCP område"
 
-#: option.c:2010
+#: option.c:2019
 #, fuzzy
 msgid "bad DHCP host name"
 msgstr "dårlig MX navn"
 
-#: option.c:2091
+#: option.c:2100
 #, fuzzy
 msgid "bad tag-if"
 msgstr "dårlig MX mål"
 
-#: option.c:2365 option.c:2664
+#: option.c:2374 option.c:2673
 msgid "invalid port number"
 msgstr "ugyldig portnummer"
 
-#: option.c:2427
+#: option.c:2436
 #, fuzzy
 msgid "bad dhcp-proxy address"
 msgstr "les %s - %d adresser"
 
-#: option.c:2467
+#: option.c:2476
 #, fuzzy
 msgid "invalid alias range"
 msgstr "ugyldig vekt"
 
-#: option.c:2480
+#: option.c:2489
 #, fuzzy
 msgid "bad interface name"
 msgstr "dårlig MX navn"
 
-#: option.c:2505
+#: option.c:2514
 msgid "bad CNAME"
 msgstr ""
 
-#: option.c:2510
+#: option.c:2519
 msgid "duplicate CNAME"
 msgstr ""
 
-#: option.c:2530
+#: option.c:2539
 #, fuzzy
 msgid "bad PTR record"
 msgstr "dårlig SRV post"
 
-#: option.c:2561
+#: option.c:2570
 #, fuzzy
 msgid "bad NAPTR record"
 msgstr "dårlig SRV post"
 
-#: option.c:2586
+#: option.c:2595
 msgid "TXT record string too long"
 msgstr "TXT post streng for lang"
 
-#: option.c:2634
+#: option.c:2643
 msgid "bad TXT record"
 msgstr "dårlig TXT post"
 
-#: option.c:2650
+#: option.c:2659
 msgid "bad SRV record"
 msgstr "dårlig SRV post"
 
-#: option.c:2657
+#: option.c:2666
 msgid "bad SRV target"
 msgstr "dårlig SRV mål"
 
-#: option.c:2671
+#: option.c:2680
 msgid "invalid priority"
 msgstr "ugyldig prioritet"
 
-#: option.c:2678
+#: option.c:2687
 msgid "invalid weight"
 msgstr "ugyldig vekt"
 
-#: option.c:2697
+#: option.c:2706
 msgid "unsupported option (check that dnsmasq was compiled with DHCP/TFTP/DBus support)"
 msgstr ""
 
-#: option.c:2739
+#: option.c:2748
 #, c-format
 msgid "files nested too deep in %s"
 msgstr ""
 
-#: option.c:2747 tftp.c:567
+#: option.c:2756 tftp.c:567
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "kan ikke lese %s: %s"
 
-#: option.c:2804
+#: option.c:2813
 msgid "missing \""
 msgstr "mangler \""
 
-#: option.c:2863
+#: option.c:2872
 msgid "bad option"
 msgstr "dårlig opsjon"
 
-#: option.c:2865
+#: option.c:2874
 msgid "extraneous parameter"
 msgstr "overflødig parameter"
 
-#: option.c:2867
+#: option.c:2876
 msgid "missing parameter"
 msgstr "mangler parameter"
 
-#: option.c:2871
+#: option.c:2880
 msgid "error"
 msgstr "feil"
 
-#: option.c:2876
+#: option.c:2885
 #, c-format
 msgid "%s at line %d of %%s"
 msgstr "%s på linje %d av %%s"
 
-#: option.c:2933 option.c:2964
+#: option.c:2942 option.c:2973
 #, fuzzy, c-format
 msgid "read %s"
 msgstr "leser %s"
 
-#: option.c:3036
+#: option.c:3045
 #, c-format
 msgid "Dnsmasq version %s  %s\n"
 msgstr "Dnsmasq versjon %s %s\n"
 
-#: option.c:3037
+#: option.c:3046
 #, c-format
 msgid ""
 "Compile time options %s\n"
@@ -797,62 +797,62 @@ msgstr ""
 "Kompileringsopsjoner %s\n"
 "\n"
 
-#: option.c:3038
+#: option.c:3047
 #, c-format
 msgid "This software comes with ABSOLUTELY NO WARRANTY.\n"
 msgstr "Denne programvaren kommer med ABSOLUTT INGEN GARANTI.\n"
 
-#: option.c:3039
+#: option.c:3048
 #, 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:3040
+#: option.c:3049
 #, 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:3051
+#: option.c:3060
 msgid "try --help"
 msgstr ""
 
-#: option.c:3053
+#: option.c:3062
 msgid "try -w"
 msgstr ""
 
-#: option.c:3056
+#: option.c:3065
 #, fuzzy, c-format
 msgid "bad command line options: %s"
 msgstr "dårlige kommandlinje opsjoner: %s."
 
-#: option.c:3097
+#: option.c:3106
 #, c-format
 msgid "cannot get host-name: %s"
 msgstr "klarer ikke å få vertsnavn: %s"
 
-#: option.c:3125
+#: option.c:3134
 msgid "only one resolv.conf file allowed in no-poll mode."
 msgstr "kun en resolv.conf fil tillat i no-poll modus."
 
-#: option.c:3135
+#: option.c:3144
 msgid "must have exactly one resolv.conf to read domain from."
 msgstr "må ha nøyaktig en resolv.conf å lese domene fra."
 
-#: option.c:3138 network.c:813 dhcp.c:814
+#: option.c:3147 network.c:813 dhcp.c:814
 #, fuzzy, c-format
 msgid "failed to read %s: %s"
 msgstr "feilet å lese %s: %s"
 
-#: option.c:3155
+#: option.c:3164
 #, c-format
 msgid "no search directive found in %s"
 msgstr "intet søke direktiv funnet i %s"
 
-#: option.c:3176
+#: option.c:3185
 msgid "there must be a default domain when --dhcp-fqdn is set"
 msgstr ""
 
-#: option.c:3180
+#: option.c:3189
 msgid "syntax check OK"
 msgstr ""
 
@@ -1202,22 +1202,22 @@ msgstr "dårlig linje ved %s linje %d"
 msgid "ignoring %s line %d, duplicate name or IP address"
 msgstr ""
 
-#: dhcp.c:977
+#: dhcp.c:978
 #, c-format
 msgid "duplicate IP address %s in dhcp-config directive."
 msgstr "dubliserte IP adresser i %s dhcp-config direktiv."
 
-#: dhcp.c:980
+#: dhcp.c:981
 #, fuzzy, c-format
 msgid "duplicate IP address %s in %s."
 msgstr "dubliserte IP adresser i %s dhcp-config direktiv."
 
-#: dhcp.c:1023
+#: dhcp.c:1024
 #, c-format
 msgid "%s has more than one address in hostsfile, using %s for DHCP"
 msgstr ""
 
-#: dhcp.c:1028
+#: dhcp.c:1029
 #, c-format
 msgid "duplicate IP address %s (%s) in dhcp-config directive"
 msgstr "dubliserte IP adresser i %s (%s) i dhcp-config direktiv"
diff --git a/po/pl.po b/po/pl.po
index 632f4c5..1506669 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -35,7 +35,7 @@ msgstr "b³êdny adres w pliku %s, w linii %d"
 msgid "bad name at %s line %d"
 msgstr "b³êdna nazwa w pliku %s, w linii %d"
 
-#: cache.c:863 dhcp.c:955
+#: cache.c:863 dhcp.c:956
 #, c-format
 msgid "read %s - %d addresses"
 msgstr "wczyta³em %s - %d adresów"
@@ -44,7 +44,7 @@ msgstr "wczyta³em %s - %d adresów"
 msgid "cleared cache"
 msgstr "wyczyszczono pamiêæ podrêczn±"
 
-#: cache.c:933 option.c:1103
+#: cache.c:933 option.c:1112
 #, c-format
 msgid "cannot access directory %s: %s"
 msgstr "brak dostêpu do katalogu %s: %s"
@@ -572,201 +572,201 @@ msgstr "b³±d w dhcp-option"
 msgid "bad IP address"
 msgstr "z³y adres IP"
 
-#: option.c:937
+#: option.c:941
 msgid "bad domain in dhcp-option"
 msgstr "nieprawid³owa nazwa domeny w dhcp-option"
 
-#: option.c:998
+#: option.c:1007
 msgid "dhcp-option too long"
 msgstr "zbyt d³uga dhcp-option (>255 znaków)"
 
-#: option.c:1007
+#: option.c:1016
 msgid "illegal dhcp-match"
 msgstr "niedopuszczalne dhcp-match"
 
-#: option.c:1043
+#: option.c:1052
 msgid "illegal repeated flag"
 msgstr "wielokrotne u¿ycie opcji niedozwolone (pojawi³a siê wcze¶niej w linii poleceñ)"
 
-#: option.c:1051
+#: option.c:1060
 msgid "illegal repeated keyword"
 msgstr "wielokrotne u¿ycie opcji niedozwolone (pojawi³a siê wsze¶niej w pliku konfiguracyjnym)"
 
-#: option.c:1134 tftp.c:413
+#: option.c:1143 tftp.c:413
 #, c-format
 msgid "cannot access %s: %s"
 msgstr "brak dostêpu do %s: %s"
 
-#: option.c:1179
+#: option.c:1188
 msgid "only one dhcp-hostsfile allowed"
 msgstr "mo¿na wskazaæ tylko jeden plik dhcp-hostsfile"
 
-#: option.c:1186
+#: option.c:1195
 msgid "only one dhcp-optsfile allowed"
 msgstr "mo¿na wskazaæ tylko jeden plik dhcp-optsfile"
 
-#: option.c:1231
+#: option.c:1240
 msgid "bad MX preference"
 msgstr "nieprawid³owa warto¶æ preferencji MX"
 
-#: option.c:1236
+#: option.c:1245
 msgid "bad MX name"
 msgstr "nieprawid³owa nazwa MX"
 
-#: option.c:1250
+#: option.c:1259
 msgid "bad MX target"
 msgstr "nieprawid³owa warto¶æ celu MX"
 
-#: option.c:1260
+#: option.c:1269
 msgid "cannot run scripts under uClinux"
 msgstr "w uClinuksie nie ma mo¿liwo¶ci uruchamiania skryptów"
 
-#: option.c:1262
+#: option.c:1271
 msgid "recompile with HAVE_SCRIPT defined to enable lease-change scripts"
 msgstr "¿eby mieæ mo¿liwo¶æ u¿ywania skryptów wywo³ywanych przy zmianie dzier¿awy, przekompiluj dnsmasq-a z w³±czon± flag± HAVE_SCRIPT"
 
-#: option.c:1507 option.c:1511
+#: option.c:1516 option.c:1520
 msgid "bad port"
 msgstr "nieprawid³owy numer portu"
 
-#: option.c:1530 option.c:1555
+#: option.c:1539 option.c:1564
 msgid "interface binding not supported"
 msgstr "nie ma mo¿liwo¶ci dowi±zywania do interfejsu"
 
-#: option.c:1701
+#: option.c:1710
 msgid "bad port range"
 msgstr "nieprawid³owy zakres numerów portów"
 
-#: option.c:1718
+#: option.c:1727
 msgid "bad bridge-interface"
 msgstr "nieprawid³owa nazwa urz±dzenia w bridge-interface"
 
-#: option.c:1760
+#: option.c:1769
 msgid "bad dhcp-range"
 msgstr "nieprawid³owy zakres dhcp-range"
 
-#: option.c:1788
+#: option.c:1797
 msgid "only one tag allowed"
 msgstr "mo¿na wskazaæ tylko jeden znacznik sieci"
 
-#: option.c:1835
+#: option.c:1844
 msgid "inconsistent DHCP range"
 msgstr "niespójny zakres adresów DHCP"
 
-#: option.c:2010
+#: option.c:2019
 msgid "bad DHCP host name"
 msgstr "niedopuszczalna nazwa komputera w dhcp-host"
 
-#: option.c:2091
+#: option.c:2100
 msgid "bad tag-if"
 msgstr "nieprawid³owa sk³adnia 'tag-if'"
 
-#: option.c:2365 option.c:2664
+#: option.c:2374 option.c:2673
 msgid "invalid port number"
 msgstr "nieprawid³owy numer portu"
 
-#: option.c:2427
+#: option.c:2436
 msgid "bad dhcp-proxy address"
 msgstr "z³y adres dhcp-proxy"
 
-#: option.c:2467
+#: option.c:2476
 msgid "invalid alias range"
 msgstr "nieprawid³owy zakres adresów w --alias"
 
-#: option.c:2480
+#: option.c:2489
 msgid "bad interface name"
 msgstr "nieprawid³owa nazwa interfejsu"
 
-#: option.c:2505
+#: option.c:2514
 msgid "bad CNAME"
 msgstr "z³a CNAME"
 
-#: option.c:2510
+#: option.c:2519
 msgid "duplicate CNAME"
 msgstr "powtórzona CNAME"
 
-#: option.c:2530
+#: option.c:2539
 msgid "bad PTR record"
 msgstr "nieprawid³owy zapis rekordu PTR"
 
-#: option.c:2561
+#: option.c:2570
 msgid "bad NAPTR record"
 msgstr "nieprawid³owy zapis rekordu NAPTR"
 
-#: option.c:2586
+#: option.c:2595
 msgid "TXT record string too long"
 msgstr "zbyt d³ugi rekord TXT"
 
-#: option.c:2634
+#: option.c:2643
 msgid "bad TXT record"
 msgstr "nieprawid³owy zapis rekordu TXT"
 
-#: option.c:2650
+#: option.c:2659
 msgid "bad SRV record"
 msgstr "nieprawid³owy zapis rekordu SRV"
 
-#: option.c:2657
+#: option.c:2666
 msgid "bad SRV target"
 msgstr "nieprawid³owa warto¶æ celu SRV"
 
-#: option.c:2671
+#: option.c:2680
 msgid "invalid priority"
 msgstr "nieprawid³owy priorytet"
 
-#: option.c:2678
+#: option.c:2687
 msgid "invalid weight"
 msgstr "nieprawid³owa waga"
 
-#: option.c:2697
+#: option.c:2706
 msgid "unsupported option (check that dnsmasq was compiled with DHCP/TFTP/DBus support)"
 msgstr "nieobs³ugiwana opcja (sprawd¼, czy obs³uga DHCP/TFTP/DBus zosta³a wkompilowana)"
 
-#: option.c:2739
+#: option.c:2748
 #, c-format
 msgid "files nested too deep in %s"
 msgstr "zbyt du¿e zag³êbienie plików w %s"
 
-#: option.c:2747 tftp.c:567
+#: option.c:2756 tftp.c:567
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "b³±d odczytu z pliku %s: %s"
 
-#: option.c:2804
+#: option.c:2813
 msgid "missing \""
 msgstr "brakuje \""
 
-#: option.c:2863
+#: option.c:2872
 msgid "bad option"
 msgstr "nieprawid³owa opcja"
 
-#: option.c:2865
+#: option.c:2874
 msgid "extraneous parameter"
 msgstr "nadwy¿kowy parametr"
 
-#: option.c:2867
+#: option.c:2876
 msgid "missing parameter"
 msgstr "brak parametru"
 
-#: option.c:2871
+#: option.c:2880
 msgid "error"
 msgstr "b³±d"
 
-#: option.c:2876
+#: option.c:2885
 #, c-format
 msgid "%s at line %d of %%s"
 msgstr "%s w linii %d pliku %%s"
 
-#: option.c:2933 option.c:2964
+#: option.c:2942 option.c:2973
 #, c-format
 msgid "read %s"
 msgstr "przeczyta³em %s"
 
-#: option.c:3036
+#: option.c:3045
 #, c-format
 msgid "Dnsmasq version %s  %s\n"
 msgstr "Dnsmasq, wersja %s  %s\n"
 
-#: option.c:3037
+#: option.c:3046
 #, c-format
 msgid ""
 "Compile time options %s\n"
@@ -775,62 +775,62 @@ msgstr ""
 "Wkompilowane opcje %s\n"
 "\n"
 
-#: option.c:3038
+#: option.c:3047
 #, c-format
 msgid "This software comes with ABSOLUTELY NO WARRANTY.\n"
 msgstr "Autor nie daje ¯ADNYCH GWARANCJI egzekwowalnych prawnie.\n"
 
-#: option.c:3039
+#: option.c:3048
 #, 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:3040
+#: option.c:3049
 #, 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:3051
+#: option.c:3060
 msgid "try --help"
 msgstr "spróbuj: --help"
 
-#: option.c:3053
+#: option.c:3062
 msgid "try -w"
 msgstr "spróbuj: -w"
 
-#: option.c:3056
+#: option.c:3065
 #, c-format
 msgid "bad command line options: %s"
 msgstr "nieprawid³owa opcja w linii poleceñ %s"
 
-#: option.c:3097
+#: option.c:3106
 #, c-format
 msgid "cannot get host-name: %s"
 msgstr "nie mo¿na pobraæ nazwy hosta: %s"
 
-#: option.c:3125
+#: option.c:3134
 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:3135
+#: option.c:3144
 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:3138 network.c:813 dhcp.c:814
+#: option.c:3147 network.c:813 dhcp.c:814
 #, c-format
 msgid "failed to read %s: %s"
 msgstr "nie uda³o siê odczytaæ %s: %s"
 
-#: option.c:3155
+#: option.c:3164
 #, c-format
 msgid "no search directive found in %s"
 msgstr "brak wytycznych wyszukiwania w %s"
 
-#: option.c:3176
+#: option.c:3185
 msgid "there must be a default domain when --dhcp-fqdn is set"
 msgstr "w przypadku u¿ywania --dhcp-fqdn trzeba wskazaæ domy¶ln± domenê"
 
-#: option.c:3180
+#: option.c:3189
 msgid "syntax check OK"
 msgstr "sk³adnia sprawdzona, jest prawid³owa"
 
@@ -1177,22 +1177,22 @@ msgstr "z³a zawarto¶æ pliku %s, w linii %d"
 msgid "ignoring %s line %d, duplicate name or IP address"
 msgstr "w %s pomijam liniê %d -- powtórzona nazwa lub adres IP"
 
-#: dhcp.c:977
+#: dhcp.c:978
 #, c-format
 msgid "duplicate IP address %s in dhcp-config directive."
 msgstr "powtórzony adres IP (%s) w parametrze dhcp-config"
 
-#: dhcp.c:980
+#: dhcp.c:981
 #, c-format
 msgid "duplicate IP address %s in %s."
 msgstr "powtórzony adres IP (%s) w pliku %s"
 
-#: dhcp.c:1023
+#: dhcp.c:1024
 #, c-format
 msgid "%s has more than one address in hostsfile, using %s for DHCP"
 msgstr "do komputera o nazwie %s pasuje wiêcej ni¿ jeden adres, w odpowiedzi DHCP wysy³am %s"
 
-#: dhcp.c:1028
+#: dhcp.c:1029
 #, c-format
 msgid "duplicate IP address %s (%s) in dhcp-config directive"
 msgstr "powtórzenie adresu IP %s (%s) w opcji dhcp-config"
@@ -1471,5 +1471,3 @@ msgstr "nie uda³o siê zapisaæ komunikatów do %s"
 #: log.c:431
 msgid "FAILED to start up"
 msgstr "B£¡D: nie uda³o siê uruchomiæ dnsmasq-a"
-
-
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a1cdba9..798a9c7 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -30,7 +30,7 @@ msgstr ""
 msgid "bad name at %s line %d"
 msgstr ""
 
-#: cache.c:863 dhcp.c:955
+#: cache.c:863 dhcp.c:956
 #, c-format
 msgid "read %s - %d addresses"
 msgstr ""
@@ -39,7 +39,7 @@ msgstr ""
 msgid "cleared cache"
 msgstr ""
 
-#: cache.c:933 option.c:1103
+#: cache.c:933 option.c:1112
 #, c-format
 msgid "cannot access directory %s: %s"
 msgstr ""
@@ -565,263 +565,263 @@ msgstr ""
 msgid "bad IP address"
 msgstr ""
 
-#: option.c:937
+#: option.c:941
 msgid "bad domain in dhcp-option"
 msgstr ""
 
-#: option.c:998
+#: option.c:1007
 msgid "dhcp-option too long"
 msgstr ""
 
-#: option.c:1007
+#: option.c:1016
 msgid "illegal dhcp-match"
 msgstr ""
 
-#: option.c:1043
+#: option.c:1052
 msgid "illegal repeated flag"
 msgstr ""
 
-#: option.c:1051
+#: option.c:1060
 msgid "illegal repeated keyword"
 msgstr ""
 
-#: option.c:1134 tftp.c:413
+#: option.c:1143 tftp.c:413
 #, c-format
 msgid "cannot access %s: %s"
 msgstr ""
 
-#: option.c:1179
+#: option.c:1188
 msgid "only one dhcp-hostsfile allowed"
 msgstr ""
 
-#: option.c:1186
+#: option.c:1195
 msgid "only one dhcp-optsfile allowed"
 msgstr ""
 
-#: option.c:1231
+#: option.c:1240
 msgid "bad MX preference"
 msgstr ""
 
-#: option.c:1236
+#: option.c:1245
 msgid "bad MX name"
 msgstr ""
 
-#: option.c:1250
+#: option.c:1259
 msgid "bad MX target"
 msgstr ""
 
-#: option.c:1260
+#: option.c:1269
 msgid "cannot run scripts under uClinux"
 msgstr ""
 
-#: option.c:1262
+#: option.c:1271
 msgid "recompile with HAVE_SCRIPT defined to enable lease-change scripts"
 msgstr ""
 
-#: option.c:1507 option.c:1511
+#: option.c:1516 option.c:1520
 msgid "bad port"
 msgstr ""
 
-#: option.c:1530 option.c:1555
+#: option.c:1539 option.c:1564
 msgid "interface binding not supported"
 msgstr ""
 
-#: option.c:1701
+#: option.c:1710
 msgid "bad port range"
 msgstr ""
 
-#: option.c:1718
+#: option.c:1727
 msgid "bad bridge-interface"
 msgstr ""
 
-#: option.c:1760
+#: option.c:1769
 msgid "bad dhcp-range"
 msgstr ""
 
-#: option.c:1788
+#: option.c:1797
 msgid "only one tag allowed"
 msgstr ""
 
-#: option.c:1835
+#: option.c:1844
 msgid "inconsistent DHCP range"
 msgstr ""
 
-#: option.c:2010
+#: option.c:2019
 msgid "bad DHCP host name"
 msgstr ""
 
-#: option.c:2091
+#: option.c:2100
 msgid "bad tag-if"
 msgstr ""
 
-#: option.c:2365 option.c:2664
+#: option.c:2374 option.c:2673
 msgid "invalid port number"
 msgstr ""
 
-#: option.c:2427
+#: option.c:2436
 msgid "bad dhcp-proxy address"
 msgstr ""
 
-#: option.c:2467
+#: option.c:2476
 msgid "invalid alias range"
 msgstr ""
 
-#: option.c:2480
+#: option.c:2489
 msgid "bad interface name"
 msgstr ""
 
-#: option.c:2505
+#: option.c:2514
 msgid "bad CNAME"
 msgstr ""
 
-#: option.c:2510
+#: option.c:2519
 msgid "duplicate CNAME"
 msgstr ""
 
-#: option.c:2530
+#: option.c:2539
 msgid "bad PTR record"
 msgstr ""
 
-#: option.c:2561
+#: option.c:2570
 msgid "bad NAPTR record"
 msgstr ""
 
-#: option.c:2586
+#: option.c:2595
 msgid "TXT record string too long"
 msgstr ""
 
-#: option.c:2634
+#: option.c:2643
 msgid "bad TXT record"
 msgstr ""
 
-#: option.c:2650
+#: option.c:2659
 msgid "bad SRV record"
 msgstr ""
 
-#: option.c:2657
+#: option.c:2666
 msgid "bad SRV target"
 msgstr ""
 
-#: option.c:2671
+#: option.c:2680
 msgid "invalid priority"
 msgstr ""
 
-#: option.c:2678
+#: option.c:2687
 msgid "invalid weight"
 msgstr ""
 
-#: option.c:2697
+#: option.c:2706
 msgid "unsupported option (check that dnsmasq was compiled with DHCP/TFTP/DBus support)"
 msgstr ""
 
-#: option.c:2739
+#: option.c:2748
 #, c-format
 msgid "files nested too deep in %s"
 msgstr ""
 
-#: option.c:2747 tftp.c:567
+#: option.c:2756 tftp.c:567
 #, c-format
 msgid "cannot read %s: %s"
 msgstr ""
 
-#: option.c:2804
+#: option.c:2813
 msgid "missing \""
 msgstr ""
 
-#: option.c:2863
+#: option.c:2872
 msgid "bad option"
 msgstr ""
 
-#: option.c:2865
+#: option.c:2874
 msgid "extraneous parameter"
 msgstr ""
 
-#: option.c:2867
+#: option.c:2876
 msgid "missing parameter"
 msgstr ""
 
-#: option.c:2871
+#: option.c:2880
 msgid "error"
 msgstr ""
 
-#: option.c:2876
+#: option.c:2885
 #, c-format
 msgid "%s at line %d of %%s"
 msgstr ""
 
-#: option.c:2933 option.c:2964
+#: option.c:2942 option.c:2973
 #, c-format
 msgid "read %s"
 msgstr ""
 
-#: option.c:3036
+#: option.c:3045
 #, c-format
 msgid "Dnsmasq version %s  %s\n"
 msgstr ""
 
-#: option.c:3037
+#: option.c:3046
 #, c-format
 msgid ""
 "Compile time options %s\n"
 "\n"
 msgstr ""
 
-#: option.c:3038
+#: option.c:3047
 #, c-format
 msgid "This software comes with ABSOLUTELY NO WARRANTY.\n"
 msgstr ""
 
-#: option.c:3039
+#: option.c:3048
 #, c-format
 msgid "Dnsmasq is free software, and you are welcome to redistribute it\n"
 msgstr ""
 
-#: option.c:3040
+#: option.c:3049
 #, c-format
 msgid "under the terms of the GNU General Public License, version 2 or 3.\n"
 msgstr ""
 
-#: option.c:3051
+#: option.c:3060
 msgid "try --help"
 msgstr ""
 
-#: option.c:3053
+#: option.c:3062
 msgid "try -w"
 msgstr ""
 
-#: option.c:3056
+#: option.c:3065
 #, c-format
 msgid "bad command line options: %s"
 msgstr ""
 
-#: option.c:3097
+#: option.c:3106
 #, c-format
 msgid "cannot get host-name: %s"
 msgstr ""
 
-#: option.c:3125
+#: option.c:3134
 msgid "only one resolv.conf file allowed in no-poll mode."
 msgstr ""
 
-#: option.c:3135
+#: option.c:3144
 msgid "must have exactly one resolv.conf to read domain from."
 msgstr ""
 
-#: option.c:3138 network.c:813 dhcp.c:814
+#: option.c:3147 network.c:813 dhcp.c:814
 #, c-format
 msgid "failed to read %s: %s"
 msgstr ""
 
-#: option.c:3155
+#: option.c:3164
 #, c-format
 msgid "no search directive found in %s"
 msgstr ""
 
-#: option.c:3176
+#: option.c:3185
 msgid "there must be a default domain when --dhcp-fqdn is set"
 msgstr ""
 
-#: option.c:3180
+#: option.c:3189
 msgid "syntax check OK"
 msgstr ""
 
@@ -1168,22 +1168,22 @@ msgstr ""
 msgid "ignoring %s line %d, duplicate name or IP address"
 msgstr ""
 
-#: dhcp.c:977
+#: dhcp.c:978
 #, c-format
 msgid "duplicate IP address %s in dhcp-config directive."
 msgstr ""
 
-#: dhcp.c:980
+#: dhcp.c:981
 #, c-format
 msgid "duplicate IP address %s in %s."
 msgstr ""
 
-#: dhcp.c:1023
+#: dhcp.c:1024
 #, c-format
 msgid "%s has more than one address in hostsfile, using %s for DHCP"
 msgstr ""
 
-#: dhcp.c:1028
+#: dhcp.c:1029
 #, c-format
 msgid "duplicate IP address %s (%s) in dhcp-config directive"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index aae4251..a1a62f0 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -30,7 +30,7 @@ msgstr "adresă greşită în %s, linia %d"
 msgid "bad name at %s line %d"
 msgstr "nume greşit în %s linia %d"
 
-#: cache.c:863 dhcp.c:955
+#: cache.c:863 dhcp.c:956
 #, c-format
 msgid "read %s - %d addresses"
 msgstr "citesc %s - %d adrese"
@@ -39,7 +39,7 @@ msgstr "citesc %s - %d adrese"
 msgid "cleared cache"
 msgstr "memoria temporară a fost ştearsă"
 
-#: cache.c:933 option.c:1103
+#: cache.c:933 option.c:1112
 #, fuzzy, c-format
 msgid "cannot access directory %s: %s"
 msgstr "nu pot citi %s: %s"
@@ -584,209 +584,209 @@ msgstr "dhcp-option invalid"
 msgid "bad IP address"
 msgstr "citesc %s - %d adrese"
 
-#: option.c:937
+#: option.c:941
 msgid "bad domain in dhcp-option"
 msgstr "domeniu DNS invalid în declaraţia dhcp-option"
 
-#: option.c:998
+#: option.c:1007
 msgid "dhcp-option too long"
 msgstr "declararea dhcp-option este prea lungă"
 
-#: option.c:1007
+#: option.c:1016
 msgid "illegal dhcp-match"
 msgstr ""
 
-#: option.c:1043
+#: option.c:1052
 msgid "illegal repeated flag"
 msgstr ""
 
-#: option.c:1051
+#: option.c:1060
 msgid "illegal repeated keyword"
 msgstr ""
 
-#: option.c:1134 tftp.c:413
+#: option.c:1143 tftp.c:413
 #, fuzzy, c-format
 msgid "cannot access %s: %s"
 msgstr "nu pot citi %s: %s"
 
-#: option.c:1179
+#: option.c:1188
 msgid "only one dhcp-hostsfile allowed"
 msgstr ""
 
-#: option.c:1186
+#: option.c:1195
 msgid "only one dhcp-optsfile allowed"
 msgstr ""
 
-#: option.c:1231
+#: option.c:1240
 msgid "bad MX preference"
 msgstr "preferinţă MX invalidă"
 
-#: option.c:1236
+#: option.c:1245
 msgid "bad MX name"
 msgstr "nume MX invalid"
 
-#: option.c:1250
+#: option.c:1259
 msgid "bad MX target"
 msgstr "ţintă MX invalidă"
 
-#: option.c:1260
+#: option.c:1269
 msgid "cannot run scripts under uClinux"
 msgstr ""
 
-#: option.c:1262
+#: option.c:1271
 msgid "recompile with HAVE_SCRIPT defined to enable lease-change scripts"
 msgstr ""
 
-#: option.c:1507 option.c:1511
+#: option.c:1516 option.c:1520
 msgid "bad port"
 msgstr "port invalid"
 
-#: option.c:1530 option.c:1555
+#: option.c:1539 option.c:1564
 msgid "interface binding not supported"
 msgstr ""
 
-#: option.c:1701
+#: option.c:1710
 #, fuzzy
 msgid "bad port range"
 msgstr "port invalid"
 
-#: option.c:1718
+#: option.c:1727
 msgid "bad bridge-interface"
 msgstr ""
 
-#: option.c:1760
+#: option.c:1769
 msgid "bad dhcp-range"
 msgstr "dhcp-range invalid"
 
-#: option.c:1788
+#: option.c:1797
 msgid "only one tag allowed"
 msgstr ""
 
-#: option.c:1835
+#: option.c:1844
 msgid "inconsistent DHCP range"
 msgstr "domeniu DHCP inconsistent"
 
-#: option.c:2010
+#: option.c:2019
 #, fuzzy
 msgid "bad DHCP host name"
 msgstr "nume MX invalid"
 
-#: option.c:2091
+#: option.c:2100
 #, fuzzy
 msgid "bad tag-if"
 msgstr "ţintă MX invalidă"
 
-#: option.c:2365 option.c:2664
+#: option.c:2374 option.c:2673
 msgid "invalid port number"
 msgstr "număr de port invalid"
 
-#: option.c:2427
+#: option.c:2436
 #, fuzzy
 msgid "bad dhcp-proxy address"
 msgstr "citesc %s - %d adrese"
 
-#: option.c:2467
+#: option.c:2476
 #, fuzzy
 msgid "invalid alias range"
 msgstr "pondere invalidă"
 
-#: option.c:2480
+#: option.c:2489
 #, fuzzy
 msgid "bad interface name"
 msgstr "nume MX invalid"
 
-#: option.c:2505
+#: option.c:2514
 msgid "bad CNAME"
 msgstr ""
 
-#: option.c:2510
+#: option.c:2519
 msgid "duplicate CNAME"
 msgstr ""
 
-#: option.c:2530
+#: option.c:2539
 #, fuzzy
 msgid "bad PTR record"
 msgstr "înregistrare SRV invalidă"
 
-#: option.c:2561
+#: option.c:2570
 #, fuzzy
 msgid "bad NAPTR record"
 msgstr "înregistrare SRV invalidă"
 
-#: option.c:2586
+#: option.c:2595
 msgid "TXT record string too long"
 msgstr "şirul de caractere pentru înregistrarea TXT este prea lung"
 
-#: option.c:2634
+#: option.c:2643
 msgid "bad TXT record"
 msgstr "înregistrare TXT invalidă"
 
-#: option.c:2650
+#: option.c:2659
 msgid "bad SRV record"
 msgstr "înregistrare SRV invalidă"
 
-#: option.c:2657
+#: option.c:2666
 msgid "bad SRV target"
 msgstr "ţintă SRV invalidă"
 
-#: option.c:2671
+#: option.c:2680
 msgid "invalid priority"
 msgstr "prioritate invalidă"
 
-#: option.c:2678
+#: option.c:2687
 msgid "invalid weight"
 msgstr "pondere invalidă"
 
-#: option.c:2697
+#: option.c:2706
 msgid "unsupported option (check that dnsmasq was compiled with DHCP/TFTP/DBus support)"
 msgstr ""
 
-#: option.c:2739
+#: option.c:2748
 #, c-format
 msgid "files nested too deep in %s"
 msgstr ""
 
-#: option.c:2747 tftp.c:567
+#: option.c:2756 tftp.c:567
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "nu pot citi %s: %s"
 
-#: option.c:2804
+#: option.c:2813
 msgid "missing \""
 msgstr "lipseÅŸte \""
 
-#: option.c:2863
+#: option.c:2872
 msgid "bad option"
 msgstr "opţiune invalidă"
 
-#: option.c:2865
+#: option.c:2874
 msgid "extraneous parameter"
 msgstr "parametru nerecunoscut"
 
-#: option.c:2867
+#: option.c:2876
 msgid "missing parameter"
 msgstr "parametru lipsa"
 
-#: option.c:2871
+#: option.c:2880
 msgid "error"
 msgstr "eroare"
 
-#: option.c:2876
+#: option.c:2885
 #, c-format
 msgid "%s at line %d of %%s"
 msgstr "%s la linia %d din %%s"
 
-#: option.c:2933 option.c:2964
+#: option.c:2942 option.c:2973
 #, fuzzy, c-format
 msgid "read %s"
 msgstr "citesc %s"
 
-#: option.c:3036
+#: option.c:3045
 #, c-format
 msgid "Dnsmasq version %s  %s\n"
 msgstr "dnsmasq versiunea %s  %s\n"
 
-#: option.c:3037
+#: option.c:3046
 #, c-format
 msgid ""
 "Compile time options %s\n"
@@ -795,62 +795,62 @@ msgstr ""
 "Opţiuni cu care a fost compilat %s\n"
 "\n"
 
-#: option.c:3038
+#: option.c:3047
 #, c-format
 msgid "This software comes with ABSOLUTELY NO WARRANTY.\n"
 msgstr "Acest program vine FÄ‚RÄ‚ NICI O GARANÅ¢IE.\n"
 
-#: option.c:3039
+#: option.c:3048
 #, 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:3040
+#: option.c:3049
 #, 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:3051
+#: option.c:3060
 msgid "try --help"
 msgstr ""
 
-#: option.c:3053
+#: option.c:3062
 msgid "try -w"
 msgstr ""
 
-#: option.c:3056
+#: option.c:3065
 #, fuzzy, c-format
 msgid "bad command line options: %s"
 msgstr "opţiuni în linie de comandă invalide: %s."
 
-#: option.c:3097
+#: option.c:3106
 #, c-format
 msgid "cannot get host-name: %s"
 msgstr "nu pot citi numele maÅŸinii: %s"
 
-#: option.c:3125
+#: option.c:3134
 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:3135
+#: option.c:3144
 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:3138 network.c:813 dhcp.c:814
+#: option.c:3147 network.c:813 dhcp.c:814
 #, fuzzy, c-format
 msgid "failed to read %s: %s"
 msgstr "nu pot citi %s: %s"
 
-#: option.c:3155
+#: option.c:3164
 #, c-format
 msgid "no search directive found in %s"
 msgstr "nu s-a găsit nici un criteriu de căutare în %s"
 
-#: option.c:3176
+#: option.c:3185
 msgid "there must be a default domain when --dhcp-fqdn is set"
 msgstr ""
 
-#: option.c:3180
+#: option.c:3189
 msgid "syntax check OK"
 msgstr ""
 
@@ -1203,22 +1203,22 @@ msgstr "linie invalidă în %s rândul %d"
 msgid "ignoring %s line %d, duplicate name or IP address"
 msgstr ""
 
-#: dhcp.c:977
+#: dhcp.c:978
 #, c-format
 msgid "duplicate IP address %s in dhcp-config directive."
 msgstr "adresă IP duplicat %s în declaraţia dhcp-config."
 
-#: dhcp.c:980
+#: dhcp.c:981
 #, fuzzy, c-format
 msgid "duplicate IP address %s in %s."
 msgstr "adresă IP duplicat %s în declaraţia dhcp-config."
 
-#: dhcp.c:1023
+#: dhcp.c:1024
 #, c-format
 msgid "%s has more than one address in hostsfile, using %s for DHCP"
 msgstr ""
 
-#: dhcp.c:1028
+#: dhcp.c:1029
 #, c-format
 msgid "duplicate IP address %s (%s) in dhcp-config directive"
 msgstr "adresă IP duplicat %s (%s) în declaraţia dhcp-config."
diff --git a/src/config.h b/src/config.h
index c10f0f8..204e363 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.54"
+#define VERSION "2.55"
 
 #define FTABSIZ 150 /* max number of outstanding requests (default) */
 #define MAX_PROCS 20 /* max no children for TCP requests */
diff --git a/src/dhcp.c b/src/dhcp.c
index 8c300cf..00ca03a 100644
--- a/src/dhcp.c
+++ b/src/dhcp.c
@@ -917,6 +917,7 @@ void dhcp_read_ethers(void)
 	      config->flags = CONFIG_FROM_ETHERS;
 	      config->hwaddr = NULL;
 	      config->domain = NULL;
+	      config->netid = NULL;
 	      config->next = daemon->dhcp_conf;
 	      daemon->dhcp_conf = config;
 	    }
diff --git a/src/dnsmasq.c b/src/dnsmasq.c
index 8783650..727d5e2 100644
--- a/src/dnsmasq.c
+++ b/src/dnsmasq.c
@@ -641,6 +641,11 @@ int main (int argc, char **argv)
 
       check_log_writer(&wset);
 
+#ifdef HAVE_LINUX_NETWORK
+      if (FD_ISSET(daemon->netlinkfd, &rset))
+	netlink_multicast();
+#endif
+
       /* Check for changes to resolv files once per second max. */
       /* Don't go silent for long periods if the clock goes backwards. */
       if (daemon->last_resolv == 0 || 
@@ -657,11 +662,6 @@ int main (int argc, char **argv)
       if (FD_ISSET(piperead, &rset))
 	async_event(piperead, now);
       
-#ifdef HAVE_LINUX_NETWORK
-      if (FD_ISSET(daemon->netlinkfd, &rset))
-	netlink_multicast();
-#endif
-      
 #ifdef HAVE_DBUS
       /* if we didn't create a DBus connection, retry now. */ 
      if ((daemon->options & OPT_DBUS) && !daemon->dbus)
diff --git a/src/netlink.c b/src/netlink.c
index 46c8d26..0fc4a14 100644
--- a/src/netlink.c
+++ b/src/netlink.c
@@ -281,7 +281,7 @@ static void nl_routechange(struct nlmsghdr *h)
 	return;
 
       /* Force re-reading resolv file right now, for luck. */
-      poll_resolv(1, 1, dnsmasq_time()); 
+      daemon->last_resolv = 0;
       
       if (daemon->srv_save)
 	{
diff --git a/src/option.c b/src/option.c
index 7c934da..ec16b4b 100644
--- a/src/option.c
+++ b/src/option.c
@@ -931,34 +931,43 @@ static char *parse_dhcp_opt(char *arg, int flags)
 	      
 	      while (arg && *arg)
 		{
-		  char *dom;
-		  if (!(dom = arg = canonicalise_opt(arg)))
+		  char *in, *dom = NULL;
+		  size_t domlen = 1;
+		  /* Allow "." as an empty domain */
+		  if (strcmp (arg, ".") != 0)
 		    {
-		      problem = _("bad domain in dhcp-option");
-		      break;
+		      if (!(dom = canonicalise_opt(arg)))
+			{
+			  problem = _("bad domain in dhcp-option");
+			  break;
+			}
+		      domlen = strlen(dom) + 2;
 		    }
-		  
-		  newp = opt_malloc(len + strlen(arg) + 2 + header_size);
+		      
+		  newp = opt_malloc(len + domlen + header_size);
 		  if (m)
-		    memcpy(newp, m, header_size + len);
+		    {
+		      memcpy(newp, m, header_size + len);
+		      free(m);
+		    }
 		  m = newp;
 		  p = m + header_size;
 		  q = p + len;
 		  
 		  /* add string on the end in RFC1035 format */
-		  while (*arg) 
+		  for (in = dom; in && *in;) 
 		    {
 		      unsigned char *cp = q++;
 		      int j;
-		      for (j = 0; *arg && (*arg != '.'); arg++, j++)
-			*q++ = *arg;
+		      for (j = 0; *in && (*in != '.'); in++, j++)
+			*q++ = *in;
 		      *cp = j;
-		      if (*arg)
-			arg++;
+		      if (*in)
+			in++;
 		    }
 		  *q++ = 0;
 		  free(dom);
-
+		  
 		  /* Now tail-compress using earlier names. */
 		  newlen = q - p;
 		  for (tail = p + len; *tail; tail += (*tail) + 1)