import of dnsmasq-2.37.tar.gz
diff --git a/po/de.po b/po/de.po
index 4617dc3..66802f2 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: dnsmasq 2.24\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-21 15:53+0000\n"
+"POT-Creation-Date: 2007-02-05 14:27+0000\n"
 "PO-Revision-Date: 2005-09-27 09:37+0100\n"
 "Last-Translator: Simon Kelley <simon@thekelleys.org.uk>\n"
 "Language-Team: German <de@li.org>\n"
@@ -15,37 +15,37 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: cache.c:671
+#: cache.c:697
 #, c-format
 msgid "failed to load names from %s: %m"
 msgstr ""
 
-#: cache.c:705 dhcp.c:715
+#: cache.c:731 dhcp.c:715
 #, c-format
 msgid "bad address at %s line %d"
 msgstr ""
 
 # @Simon: Here I need an example to understand it :)
-#: cache.c:751 dhcp.c:729
+#: cache.c:777 dhcp.c:729
 #, c-format
 msgid "bad name at %s line %d"
 msgstr ""
 
 # @Simon: Here I need an example to understand it :)
-#: cache.c:758 dhcp.c:783
+#: cache.c:784 dhcp.c:783
 #, c-format
 msgid "read %s - %d addresses"
 msgstr "lese %s - %d Adressen"
 
 # @Simon: 'lese' is present, is that ok? If it should be past, it would be
 # @Simon: "gelesen: %s - %d Adressen" - note the colon, it's a must, then.
-#: cache.c:796
+#: cache.c:822
 msgid "cleared cache"
 msgstr "Cache geleert"
 
 # @Simon: "Cache geleert" is literally "Cache emptied" but I think other translations could be misleading
 # @Simon: (I don't know a good german replacement for "Cache" but AFAIK "Cache" is common in german)
-#: cache.c:849
+#: cache.c:875
 #, c-format
 msgid ""
 "not giving name %s to the DHCP lease of %s because the name exists in %s "
@@ -56,7 +56,7 @@
 
 # @Simon: "Mieter" is rather 'logder, renter, tenant, lessee' but I couldn't find anything that fits better.
 # @Simon: So I thought I put it in ''-marks :)
-#: cache.c:893
+#: cache.c:919
 #, fuzzy, c-format
 msgid ""
 "time %lu, cache size %d, %d/%d cache insertions re-used unexpired cache "
@@ -70,7 +70,7 @@
 # @Simon: I would prefer to use "noch gültige" = "still valid", would that fit to the sense? Then it would be:
 # @Simon: msgstr "Cache Größe %d, %d/%d Cache-Einfügungen verwendeten noch gültige Cache-Einträge wieder."
 # @Simon: btw, what is the "%d/%d"-part?
-#: util.c:154 option.c:579
+#: util.c:154 option.c:582
 msgid "could not get memory"
 msgstr "Speicher nicht verfügbar"
 
@@ -438,189 +438,189 @@
 msgid "Valid options are :\n"
 msgstr ""
 
-#: option.c:428
+#: option.c:431
 msgid "bad dhcp-option"
 msgstr ""
 
-#: option.c:574
+#: option.c:577
 msgid "bad domain in dhcp-option"
 msgstr ""
 
-#: option.c:631
+#: option.c:634
 msgid "dhcp-option too long"
 msgstr ""
 
-#: option.c:693
+#: option.c:696
 #, c-format
 msgid "cannot access directory %s: %s"
 msgstr ""
 
-#: option.c:712 tftp.c:230
+#: option.c:715 tftp.c:300
 #, c-format
 msgid "cannot access %s: %s"
 msgstr ""
 
-#: option.c:789
+#: option.c:792
 msgid "bad MX preference"
 msgstr ""
 
-#: option.c:798
+#: option.c:801
 msgid "bad MX name"
 msgstr ""
 
-#: option.c:816
+#: option.c:819
 msgid "bad MX target"
 msgstr ""
 
-#: option.c:828
+#: option.c:831
 msgid "cannot run scripts under uClinux"
 msgstr ""
 
-#: option.c:1027 option.c:1038
+#: option.c:1030 option.c:1041
 msgid "bad port"
 msgstr ""
 
-#: option.c:1182
+#: option.c:1185
 msgid "bad bridge-interface"
 msgstr ""
 
-#: option.c:1226
+#: option.c:1229
 msgid "bad dhcp-range"
 msgstr ""
 
-#: option.c:1255
+#: option.c:1258
 msgid "only one netid tag allowed"
 msgstr ""
 
-#: option.c:1300
+#: option.c:1303
 msgid "inconsistent DHCP range"
 msgstr ""
 
-#: option.c:1485
+#: option.c:1488
 msgid "bad dhcp-host"
 msgstr ""
 
-#: option.c:1685
+#: option.c:1688
 msgid "bad PTR record"
 msgstr ""
 
-#: option.c:1710
+#: option.c:1713
 msgid "bad TXT record"
 msgstr ""
 
-#: option.c:1742
+#: option.c:1745
 msgid "TXT record string too long"
 msgstr ""
 
-#: option.c:1781
+#: option.c:1784
 msgid "bad SRV record"
 msgstr ""
 
-#: option.c:1794
+#: option.c:1797
 msgid "bad SRV target"
 msgstr ""
 
-#: option.c:1806
+#: option.c:1809
 msgid "invalid port number"
 msgstr ""
 
-#: option.c:1817
+#: option.c:1820
 msgid "invalid priority"
 msgstr ""
 
-#: option.c:1828
+#: option.c:1831
 msgid "invalid weight"
 msgstr ""
 
-#: option.c:1859
+#: option.c:1862
 #, c-format
 msgid "files nested too deep in %s"
 msgstr ""
 
-#: option.c:1866 tftp.c:235 tftp.c:366
+#: option.c:1869 tftp.c:450
 #, c-format
 msgid "cannot read %s: %s"
 msgstr ""
 
-#: option.c:1909
+#: option.c:1912
 msgid "missing \""
 msgstr ""
 
-#: option.c:1948
+#: option.c:1951
 msgid "bad option"
 msgstr ""
 
-#: option.c:1950
+#: option.c:1953
 msgid "extraneous parameter"
 msgstr ""
 
-#: option.c:1952
+#: option.c:1955
 msgid "missing parameter"
 msgstr ""
 
-#: option.c:1954
+#: option.c:1957
 msgid "error"
 msgstr ""
 
-#: option.c:2022
+#: option.c:2025
 #, c-format
 msgid "Dnsmasq version %s  %s\n"
 msgstr ""
 
-#: option.c:2023
+#: option.c:2026
 #, c-format
 msgid ""
 "Compile time options %s\n"
 "\n"
 msgstr ""
 
-#: option.c:2024
+#: option.c:2027
 #, c-format
 msgid "This software comes with ABSOLUTELY NO WARRANTY.\n"
 msgstr ""
 
-#: option.c:2025
+#: option.c:2028
 #, c-format
 msgid "Dnsmasq is free software, and you are welcome to redistribute it\n"
 msgstr ""
 
-#: option.c:2026
+#: option.c:2029
 #, c-format
 msgid "under the terms of the GNU General Public License, version 2.\n"
 msgstr ""
 
-#: option.c:2037
+#: option.c:2040
 msgid "try --help"
 msgstr ""
 
-#: option.c:2039
+#: option.c:2042
 msgid "try -w"
 msgstr ""
 
-#: option.c:2042
+#: option.c:2045
 #, c-format
 msgid "bad command line options: %s"
 msgstr ""
 
-#: option.c:2093
+#: option.c:2096
 #, c-format
 msgid "cannot get host-name: %s"
 msgstr ""
 
-#: option.c:2121
+#: option.c:2124
 msgid "only one resolv.conf file allowed in no-poll mode."
 msgstr ""
 
-#: option.c:2131
+#: option.c:2134
 msgid "must have exactly one resolv.conf to read domain from."
 msgstr ""
 
-#: option.c:2134
+#: option.c:2137
 #, c-format
 msgid "failed to read %s: %s"
 msgstr ""
 
-#: option.c:2152
+#: option.c:2155
 #, c-format
 msgid "no search directive found in %s"
 msgstr ""
@@ -630,7 +630,7 @@
 msgid "nameserver %s refused to do a recursive query"
 msgstr ""
 
-#: isc.c:73 dnsmasq.c:527
+#: isc.c:73 dnsmasq.c:533
 #, c-format
 msgid "failed to access %s: %m"
 msgstr ""
@@ -640,7 +640,7 @@
 msgid "failed to load %s: %m"
 msgstr ""
 
-#: isc.c:93 dnsmasq.c:549
+#: isc.c:93 dnsmasq.c:555
 #, c-format
 msgid "reading %s"
 msgstr ""
@@ -660,7 +660,7 @@
 msgid "unknown interface %s in bridge-interface"
 msgstr ""
 
-#: network.c:379 dnsmasq.c:137
+#: network.c:379 dnsmasq.c:141
 #, c-format
 msgid "failed to create listening socket: %s"
 msgstr ""
@@ -727,130 +727,134 @@
 msgid "failed to read %s: %m"
 msgstr ""
 
-#: dnsmasq.c:97
+#: dnsmasq.c:101
 msgid ""
 "ISC dhcpd integration not available: set HAVE_ISC_READER in src/config.h"
 msgstr ""
 
-#: dnsmasq.c:114
+#: dnsmasq.c:118
 msgid "TFTP server not available: set HAVE_TFTP in src/config.h"
 msgstr ""
 
-#: dnsmasq.c:119
+#: dnsmasq.c:123
 #, c-format
 msgid "failed to find list of interfaces: %s"
 msgstr ""
 
-#: dnsmasq.c:127
+#: dnsmasq.c:131
 #, c-format
 msgid "unknown interface %s"
 msgstr ""
 
-#: dnsmasq.c:133
+#: dnsmasq.c:137
 #, c-format
 msgid "no interface with address %s"
 msgstr ""
 
-#: dnsmasq.c:152
+#: dnsmasq.c:156
 msgid "must set exactly one interface on broken systems without IP_RECVIF"
 msgstr ""
 
-#: dnsmasq.c:165 dnsmasq.c:654
+#: dnsmasq.c:169 dnsmasq.c:660
 #, c-format
 msgid "DBus error: %s"
 msgstr ""
 
-#: dnsmasq.c:168
+#: dnsmasq.c:172
 msgid "DBus not available: set HAVE_DBUS in src/config.h"
 msgstr ""
 
-#: dnsmasq.c:199
+#: dnsmasq.c:203
 #, c-format
 msgid "cannot create pipe: %s"
 msgstr ""
 
-#: dnsmasq.c:342
+#: dnsmasq.c:346
 #, c-format
 msgid "started, version %s cachesize %d"
 msgstr ""
 
-#: dnsmasq.c:344
+#: dnsmasq.c:348
 #, c-format
 msgid "started, version %s cache disabled"
 msgstr ""
 
-#: dnsmasq.c:346
+#: dnsmasq.c:350
 #, c-format
 msgid "compile time options: %s"
 msgstr ""
 
-#: dnsmasq.c:352
+#: dnsmasq.c:356
 msgid "DBus support enabled: connected to system bus"
 msgstr ""
 
-#: dnsmasq.c:354
+#: dnsmasq.c:358
 msgid "DBus support enabled: bus connection pending"
 msgstr ""
 
-#: dnsmasq.c:359
+#: dnsmasq.c:363
 msgid "setting --bind-interfaces option because of OS limitations"
 msgstr ""
 
-#: dnsmasq.c:364
+#: dnsmasq.c:368
 #, c-format
 msgid "warning: interface %s does not currently exist"
 msgstr ""
 
-#: dnsmasq.c:369
+#: dnsmasq.c:373
 msgid "warning: ignoring resolv-file flag because no-resolv is set"
 msgstr ""
 
-#: dnsmasq.c:383
+#: dnsmasq.c:376
+msgid "warning: no upstream servers configured"
+msgstr ""
+
+#: dnsmasq.c:389
 #, c-format
 msgid "DHCP, static leases only on %.0s%s, lease time %s"
 msgstr ""
 
-#: dnsmasq.c:384
+#: dnsmasq.c:390
 #, c-format
 msgid "DHCP, IP range %s -- %s, lease time %s"
 msgstr ""
 
-#: dnsmasq.c:400
+#: dnsmasq.c:406
 msgid "root is "
 msgstr ""
 
-#: dnsmasq.c:400
+#: dnsmasq.c:406
 msgid "enabled"
 msgstr ""
 
-#: dnsmasq.c:402
+#: dnsmasq.c:408
 msgid "secure mode"
 msgstr ""
 
-#: dnsmasq.c:422
+#: dnsmasq.c:428
 #, c-format
 msgid "restricting maximum simultaneous TFTP transfers to %d"
 msgstr ""
 
-#: dnsmasq.c:433
+#: dnsmasq.c:439
 #, c-format
 msgid "warning: setting capabilities failed: %m"
 msgstr ""
 
-#: dnsmasq.c:435
+#: dnsmasq.c:441
 msgid "running as root"
 msgstr ""
 
-#: dnsmasq.c:560
+#: dnsmasq.c:566
 #, c-format
 msgid "no servers found in %s, will retry"
 msgstr ""
 
-#: dnsmasq.c:619
+#: dnsmasq.c:625
 msgid "exiting on receipt of SIGTERM"
 msgstr ""
 
-#: dnsmasq.c:656
+#: dnsmasq.c:662
 msgid "connected to system DBus"
 msgstr ""
 
@@ -938,104 +942,104 @@
 msgid "failed to write %s: %s (retry in %us)"
 msgstr ""
 
-#: rfc2131.c:261
+#: rfc2131.c:297
 #, c-format
 msgid "no address range available for DHCP request %s %s"
 msgstr ""
 
-#: rfc2131.c:262
+#: rfc2131.c:298
 msgid "with subnet selector"
 msgstr ""
 
-#: rfc2131.c:262
+#: rfc2131.c:298
 msgid "via"
 msgstr ""
 
-#: rfc2131.c:288 rfc2131.c:312
+#: rfc2131.c:322 rfc2131.c:347
 msgid "disabled"
 msgstr ""
 
-#: rfc2131.c:324 rfc2131.c:763
+#: rfc2131.c:359 rfc2131.c:814
 msgid "address in use"
 msgstr ""
 
-#: rfc2131.c:327
+#: rfc2131.c:362
 msgid "no address configured"
 msgstr ""
 
-#: rfc2131.c:340 rfc2131.c:630
+#: rfc2131.c:375 rfc2131.c:682
 msgid "no address available"
 msgstr ""
 
-#: rfc2131.c:349 rfc2131.c:773
+#: rfc2131.c:384 rfc2131.c:824
 msgid "no leases left"
 msgstr ""
 
-#: rfc2131.c:352 rfc2131.c:737
+#: rfc2131.c:387 rfc2131.c:788
 msgid "wrong network"
 msgstr ""
 
-#: rfc2131.c:558
+#: rfc2131.c:605
 #, c-format
 msgid "disabling DHCP static address %s for %s"
 msgstr ""
 
-#: rfc2131.c:579
+#: rfc2131.c:626
 msgid "unknown lease"
 msgstr ""
 
-#: rfc2131.c:588 rfc2131.c:885
+#: rfc2131.c:635 rfc2131.c:934
 msgid "ignored"
 msgstr ""
 
-#: rfc2131.c:604
+#: rfc2131.c:655
 #, c-format
 msgid "not using configured address %s because it is leased to %s"
 msgstr ""
 
-#: rfc2131.c:613
+#: rfc2131.c:665
 #, c-format
 msgid ""
 "not using configured address %s because it is in use by the server or relay"
 msgstr ""
 
-#: rfc2131.c:616
+#: rfc2131.c:668
 #, c-format
 msgid "not using configured address %s because it was previously declined"
 msgstr ""
 
-#: rfc2131.c:700
+#: rfc2131.c:751
 msgid "wrong address"
 msgstr ""
 
-#: rfc2131.c:713
+#: rfc2131.c:764
 msgid "lease not found"
 msgstr ""
 
-#: rfc2131.c:745
+#: rfc2131.c:796
 msgid "address not available"
 msgstr ""
 
-#: rfc2131.c:756
+#: rfc2131.c:807
 msgid "static lease available"
 msgstr ""
 
-#: rfc2131.c:760
+#: rfc2131.c:811
 msgid "address reserved"
 msgstr ""
 
-#: rfc2131.c:766
+#: rfc2131.c:817
 msgid "no unique-id"
 msgstr ""
 
-#: rfc2131.c:1023
+#: rfc2131.c:1181
 #, c-format
 msgid "cannot send DHCP option %d: no space left in packet"
 msgstr ""
 
-#: rfc2131.c:1322
+#: rfc2131.c:1476
 #, c-format
-msgid "More than one vendor class matches, using %s"
+msgid "cannot send encapsulated option %d: no space left in wrapper"
 msgstr ""
 
 #: netlink.c:59
@@ -1090,22 +1094,22 @@
 msgid "unsupported request from %s"
 msgstr ""
 
-#: tftp.c:226
-#, c-format
-msgid "file %s not found"
-msgstr ""
-
-#: tftp.c:293
+#: tftp.c:229
 #, c-format
 msgid "TFTP sent %s to %s"
 msgstr ""
 
-#: tftp.c:343
+#: tftp.c:296
+#, c-format
+msgid "file %s not found"
+msgstr ""
+
+#: tftp.c:352
 #, c-format
 msgid "TFTP error %d %s received from %s"
 msgstr ""
 
-#: tftp.c:374
+#: tftp.c:383
 #, c-format
 msgid "TFTP failed sending %s to %s"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 9360748..ccf329a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: dnsmasq 2.24\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-21 15:53+0000\n"
+"POT-Creation-Date: 2007-02-05 14:27+0000\n"
 "PO-Revision-Date: 2005-10-07 11:04+0100\n"
 "Last-Translator: Christopher Chatham <chrislinux@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -15,31 +15,31 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: cache.c:671
+#: cache.c:697
 #, c-format
 msgid "failed to load names from %s: %m"
 msgstr "no se pudo cargar nombres desde %s: %m"
 
-#: cache.c:705 dhcp.c:715
+#: cache.c:731 dhcp.c:715
 #, fuzzy, c-format
 msgid "bad address at %s line %d"
 msgstr "nombre erróneo en %s línea %d"
 
-#: cache.c:751 dhcp.c:729
+#: cache.c:777 dhcp.c:729
 #, c-format
 msgid "bad name at %s line %d"
 msgstr "nombre erróneo en %s línea %d"
 
-#: cache.c:758 dhcp.c:783
+#: cache.c:784 dhcp.c:783
 #, c-format
 msgid "read %s - %d addresses"
 msgstr "direcciónes %s - %d leídas"
 
-#: cache.c:796
+#: cache.c:822
 msgid "cleared cache"
 msgstr "el caché fue liberado"
 
-#: cache.c:849
+#: cache.c:875
 #, c-format
 msgid ""
 "not giving name %s to the DHCP lease of %s because the name exists in %s "
@@ -48,7 +48,7 @@
 "no otorgando nombre %s al arriendo DHCP de %s porque el nombre existe en %s "
 "con dirección %s"
 
-#: cache.c:893
+#: cache.c:919
 #, fuzzy, c-format
 msgid ""
 "time %lu, cache size %d, %d/%d cache insertions re-used unexpired cache "
@@ -57,7 +57,7 @@
 "tiempo %lu, tamaño de caché %d, %d/%d inserciónes de caché reutilizaron "
 "objetos no vencidos."
 
-#: util.c:154 option.c:579
+#: util.c:154 option.c:582
 msgid "could not get memory"
 msgstr "no se pudo conseguir memoria"
 
@@ -411,137 +411,137 @@
 msgid "Valid options are :\n"
 msgstr "Opciones válidas son :\n"
 
-#: option.c:428
+#: option.c:431
 msgid "bad dhcp-option"
 msgstr "dhcp-option erróneo"
 
-#: option.c:574
+#: option.c:577
 msgid "bad domain in dhcp-option"
 msgstr "dominio erróneo en dhcp-option"
 
-#: option.c:631
+#: option.c:634
 msgid "dhcp-option too long"
 msgstr "opción dhcp-option demasiado larga"
 
-#: option.c:693
+#: option.c:696
 #, fuzzy, c-format
 msgid "cannot access directory %s: %s"
 msgstr "no se puede leer %s: %s"
 
-#: option.c:712 tftp.c:230
+#: option.c:715 tftp.c:300
 #, fuzzy, c-format
 msgid "cannot access %s: %s"
 msgstr "no se puede leer %s: %s"
 
-#: option.c:789
+#: option.c:792
 msgid "bad MX preference"
 msgstr "preferencia MX errónea"
 
-#: option.c:798
+#: option.c:801
 msgid "bad MX name"
 msgstr "nombre MX erróneo"
 
-#: option.c:816
+#: option.c:819
 msgid "bad MX target"
 msgstr "destino MX erróneo"
 
-#: option.c:828
+#: option.c:831
 msgid "cannot run scripts under uClinux"
 msgstr "no se pueden correr guiónes bajo uClinux"
 
-#: option.c:1027 option.c:1038
+#: option.c:1030 option.c:1041
 msgid "bad port"
 msgstr "puerto erróneo"
 
-#: option.c:1182
+#: option.c:1185
 msgid "bad bridge-interface"
 msgstr ""
 
-#: option.c:1226
+#: option.c:1229
 msgid "bad dhcp-range"
 msgstr "dhcp-range (rango DHCP) erróneo"
 
-#: option.c:1255
+#: option.c:1258
 msgid "only one netid tag allowed"
 msgstr "solo una etiqueta netid permitida"
 
-#: option.c:1300
+#: option.c:1303
 msgid "inconsistent DHCP range"
 msgstr "rango DHCP inconsistente"
 
-#: option.c:1485
+#: option.c:1488
 msgid "bad dhcp-host"
 msgstr "dhcp-host erróneo"
 
-#: option.c:1685
+#: option.c:1688
 #, fuzzy
 msgid "bad PTR record"
 msgstr "expediente SRV erróneo"
 
-#: option.c:1710
+#: option.c:1713
 msgid "bad TXT record"
 msgstr "expediente TXT erróneo"
 
-#: option.c:1742
+#: option.c:1745
 msgid "TXT record string too long"
 msgstr "expediente TXT demasiado largo"
 
-#: option.c:1781
+#: option.c:1784
 msgid "bad SRV record"
 msgstr "expediente SRV erróneo"
 
-#: option.c:1794
+#: option.c:1797
 msgid "bad SRV target"
 msgstr "destino SRV erróneo"
 
-#: option.c:1806
+#: option.c:1809
 msgid "invalid port number"
 msgstr "número de puerto inválido"
 
-#: option.c:1817
+#: option.c:1820
 msgid "invalid priority"
 msgstr "prioridad inválida"
 
-#: option.c:1828
+#: option.c:1831
 msgid "invalid weight"
 msgstr "peso inválido"
 
-#: option.c:1859
+#: option.c:1862
 #, c-format
 msgid "files nested too deep in %s"
 msgstr ""
 
-#: option.c:1866 tftp.c:235 tftp.c:366
+#: option.c:1869 tftp.c:450
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "no se puede leer %s: %s"
 
-#: option.c:1909
+#: option.c:1912
 msgid "missing \""
 msgstr "falta \""
 
-#: option.c:1948
+#: option.c:1951
 msgid "bad option"
 msgstr "opción errónea"
 
-#: option.c:1950
+#: option.c:1953
 msgid "extraneous parameter"
 msgstr "parámetro extraño"
 
-#: option.c:1952
+#: option.c:1955
 msgid "missing parameter"
 msgstr "parámetro ausente"
 
-#: option.c:1954
+#: option.c:1957
 msgid "error"
 msgstr "error"
 
-#: option.c:2022
+#: option.c:2025
 #, c-format
 msgid "Dnsmasq version %s  %s\n"
 msgstr "Dnsmasq versión %s  %s\n"
 
-#: option.c:2023
+#: option.c:2026
 #, c-format
 msgid ""
 "Compile time options %s\n"
@@ -550,53 +550,53 @@
 "Opciones de compilación %s\n"
 "\n"
 
-#: option.c:2024
+#: option.c:2027
 #, c-format
 msgid "This software comes with ABSOLUTELY NO WARRANTY.\n"
 msgstr "Este software viene SIN NINGUNA GARANTIA.\n"
 
-#: option.c:2025
+#: option.c:2028
 #, 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:2026
+#: option.c:2029
 #, c-format
 msgid "under the terms of the GNU General Public License, version 2.\n"
 msgstr "bajo los términos de la GNU General Public License, versión 2.\n"
 
-#: option.c:2037
+#: option.c:2040
 msgid "try --help"
 msgstr "pruebe --help"
 
-#: option.c:2039
+#: option.c:2042
 msgid "try -w"
 msgstr "pruebe -w"
 
-#: option.c:2042
+#: option.c:2045
 #, fuzzy, c-format
 msgid "bad command line options: %s"
 msgstr "opciones de línea de comandos erróneas: %s."
 
-#: option.c:2093
+#: option.c:2096
 #, c-format
 msgid "cannot get host-name: %s"
 msgstr "no se puede obtener host-name (nombre de host): %s"
 
-#: option.c:2121
+#: option.c:2124
 msgid "only one resolv.conf file allowed in no-poll mode."
 msgstr "solo un archivo resolv.conf permitido en modo no-poll."
 
-#: option.c:2131
+#: option.c:2134
 msgid "must have exactly one resolv.conf to read domain from."
 msgstr "debe haber exactamente un resolv.conf desde donde leer dominio."
 
-#: option.c:2134
+#: option.c:2137
 #, fuzzy, c-format
 msgid "failed to read %s: %s"
 msgstr "no se pudo leer %s: %m"
 
-#: option.c:2152
+#: option.c:2155
 #, c-format
 msgid "no search directive found in %s"
 msgstr "ninguna directiva de búsqueda encontrada en %s"
@@ -606,7 +606,7 @@
 msgid "nameserver %s refused to do a recursive query"
 msgstr "servidor DNS %s se reusó a hacer una búsqueda recursiva"
 
-#: isc.c:73 dnsmasq.c:527
+#: isc.c:73 dnsmasq.c:533
 #, c-format
 msgid "failed to access %s: %m"
 msgstr "no se pudo accesar %s: %m"
@@ -616,7 +616,7 @@
 msgid "failed to load %s: %m"
 msgstr "no se pudo cargar %s: %m"
 
-#: isc.c:93 dnsmasq.c:549
+#: isc.c:93 dnsmasq.c:555
 #, c-format
 msgid "reading %s"
 msgstr "leyendo %s"
@@ -637,7 +637,7 @@
 msgid "unknown interface %s in bridge-interface"
 msgstr "interface desconocida %s"
 
-#: network.c:379 dnsmasq.c:137
+#: network.c:379 dnsmasq.c:141
 #, c-format
 msgid "failed to create listening socket: %s"
 msgstr "no se pudo crear un socket escuchador: %s"
@@ -704,134 +704,139 @@
 msgid "failed to read %s: %m"
 msgstr "no se pudo leer %s: %m"
 
-#: dnsmasq.c:97
+#: dnsmasq.c:101
 msgid ""
 "ISC dhcpd integration not available: set HAVE_ISC_READER in src/config.h"
 msgstr ""
 "Integración dhcpd ISC no disponible: fijar HAVE_ISC_READER en src/config.h"
 
-#: dnsmasq.c:114
+#: dnsmasq.c:118
 #, fuzzy
 msgid "TFTP server not available: set HAVE_TFTP in src/config.h"
 msgstr "DBus no disponible: fijar HAVE_DBUS en src/config.h"
 
-#: dnsmasq.c:119
+#: dnsmasq.c:123
 #, c-format
 msgid "failed to find list of interfaces: %s"
 msgstr "no se pudo encontrar lista de interfaces: %s"
 
-#: dnsmasq.c:127
+#: dnsmasq.c:131
 #, c-format
 msgid "unknown interface %s"
 msgstr "interface desconocida %s"
 
-#: dnsmasq.c:133
+#: dnsmasq.c:137
 #, c-format
 msgid "no interface with address %s"
 msgstr "ninguna interface con dirección %s"
 
-#: dnsmasq.c:152
+#: dnsmasq.c:156
 msgid "must set exactly one interface on broken systems without IP_RECVIF"
 msgstr "debe fijarse exactamente una interface en sistemas rotos sin IP_RECVIF"
 
-#: dnsmasq.c:165 dnsmasq.c:654
+#: dnsmasq.c:169 dnsmasq.c:660
 #, c-format
 msgid "DBus error: %s"
 msgstr "error DBus: %s"
 
-#: dnsmasq.c:168
+#: dnsmasq.c:172
 msgid "DBus not available: set HAVE_DBUS in src/config.h"
 msgstr "DBus no disponible: fijar HAVE_DBUS en src/config.h"
 
-#: dnsmasq.c:199
+#: dnsmasq.c:203
 #, fuzzy, c-format
 msgid "cannot create pipe: %s"
 msgstr "no se puede leer pipe: %s"
 
-#: dnsmasq.c:342
+#: dnsmasq.c:346
 #, c-format
 msgid "started, version %s cachesize %d"
 msgstr "versión %s iniciada, tamaño de caché %d"
 
-#: dnsmasq.c:344
+#: dnsmasq.c:348
 #, c-format
 msgid "started, version %s cache disabled"
 msgstr "versión %s iniciada, caché deshabilitado"
 
-#: dnsmasq.c:346
+#: dnsmasq.c:350
 #, c-format
 msgid "compile time options: %s"
 msgstr "opciones de compilación: %s"
 
-#: dnsmasq.c:352
+#: dnsmasq.c:356
 msgid "DBus support enabled: connected to system bus"
 msgstr "soporte DBus habilitado: conectado a bus de sistema"
 
-#: dnsmasq.c:354
+#: dnsmasq.c:358
 msgid "DBus support enabled: bus connection pending"
 msgstr "soporte DBus habilitado: conección a bus pendiente"
 
-#: dnsmasq.c:359
+#: dnsmasq.c:363
 msgid "setting --bind-interfaces option because of OS limitations"
 msgstr ""
 "fijando opción --bind-interfaces debido a limitaciones de sistema operativo"
 
-#: dnsmasq.c:364
+#: dnsmasq.c:368
 #, c-format
 msgid "warning: interface %s does not currently exist"
 msgstr "advertencia: interface %s no existe actualmente"
 
-#: dnsmasq.c:369
+#: dnsmasq.c:373
 msgid "warning: ignoring resolv-file flag because no-resolv is set"
 msgstr ""
 
-#: dnsmasq.c:383
+#: dnsmasq.c:376
+#, fuzzy
+msgid "warning: no upstream servers configured"
+msgstr "fijando servidores upstream desde DBus"
+
+#: dnsmasq.c:389
 #, c-format
 msgid "DHCP, static leases only on %.0s%s, lease time %s"
 msgstr "DHCP, arriendos estáticos solo en %.0s%s, tiempo de arriendo %s"
 
-#: dnsmasq.c:384
+#: dnsmasq.c:390
 #, c-format
 msgid "DHCP, IP range %s -- %s, lease time %s"
 msgstr "DHCP, rango de IPs %s -- %s, tiempo de arriendo %s"
 
-#: dnsmasq.c:400
+#: dnsmasq.c:406
 msgid "root is "
 msgstr ""
 
-#: dnsmasq.c:400
+#: dnsmasq.c:406
 #, fuzzy
 msgid "enabled"
 msgstr "deshabilitado"
 
-#: dnsmasq.c:402
+#: dnsmasq.c:408
 msgid "secure mode"
 msgstr ""
 
-#: dnsmasq.c:422
+#: dnsmasq.c:428
 #, c-format
 msgid "restricting maximum simultaneous TFTP transfers to %d"
 msgstr ""
 
-#: dnsmasq.c:433
+#: dnsmasq.c:439
 #, c-format
 msgid "warning: setting capabilities failed: %m"
 msgstr "advertencia: configuración de capacidades ha fallado: %m"
 
-#: dnsmasq.c:435
+#: dnsmasq.c:441
 msgid "running as root"
 msgstr "corriendo como root"
 
-#: dnsmasq.c:560
+#: dnsmasq.c:566
 #, fuzzy, c-format
 msgid "no servers found in %s, will retry"
 msgstr "ninguna directiva de búsqueda encontrada en %s"
 
-#: dnsmasq.c:619
+#: dnsmasq.c:625
 msgid "exiting on receipt of SIGTERM"
 msgstr "saliendo al haber recibido SIGTERM"
 
-#: dnsmasq.c:656
+#: dnsmasq.c:662
 msgid "connected to system DBus"
 msgstr "conectado a DBus de sistema"
 
@@ -920,106 +925,106 @@
 msgid "failed to write %s: %s (retry in %us)"
 msgstr "no se pudo escribir %s: %s (reintentar en %us)"
 
-#: rfc2131.c:261
+#: rfc2131.c:297
 #, c-format
 msgid "no address range available for DHCP request %s %s"
 msgstr "ningún rango de direcciónes disponible para pedido DHCP %s %s"
 
-#: rfc2131.c:262
+#: rfc2131.c:298
 msgid "with subnet selector"
 msgstr "con selector de subred"
 
-#: rfc2131.c:262
+#: rfc2131.c:298
 msgid "via"
 msgstr "vía"
 
-#: rfc2131.c:288 rfc2131.c:312
+#: rfc2131.c:322 rfc2131.c:347
 msgid "disabled"
 msgstr "deshabilitado"
 
-#: rfc2131.c:324 rfc2131.c:763
+#: rfc2131.c:359 rfc2131.c:814
 msgid "address in use"
 msgstr "dirección en uso"
 
-#: rfc2131.c:327
+#: rfc2131.c:362
 msgid "no address configured"
 msgstr "ninguna dirección configurada"
 
-#: rfc2131.c:340 rfc2131.c:630
+#: rfc2131.c:375 rfc2131.c:682
 msgid "no address available"
 msgstr "ninguna dirección disponible"
 
-#: rfc2131.c:349 rfc2131.c:773
+#: rfc2131.c:384 rfc2131.c:824
 msgid "no leases left"
 msgstr "no queda ningún arriendo"
 
-#: rfc2131.c:352 rfc2131.c:737
+#: rfc2131.c:387 rfc2131.c:788
 msgid "wrong network"
 msgstr "red equivocada"
 
-#: rfc2131.c:558
+#: rfc2131.c:605
 #, fuzzy, c-format
 msgid "disabling DHCP static address %s for %s"
 msgstr "deshabilitando dirección DHCP estática %s"
 
-#: rfc2131.c:579
+#: rfc2131.c:626
 msgid "unknown lease"
 msgstr "arriendo desconocido"
 
-#: rfc2131.c:588 rfc2131.c:885
+#: rfc2131.c:635 rfc2131.c:934
 msgid "ignored"
 msgstr "ignorado"
 
-#: rfc2131.c:604
+#: rfc2131.c:655
 #, c-format
 msgid "not using configured address %s because it is leased to %s"
 msgstr "no usando dirección configurada %s porque esta arriendada a %s"
 
-#: rfc2131.c:613
+#: rfc2131.c:665
 #, fuzzy, c-format
 msgid ""
 "not using configured address %s because it is in use by the server or relay"
 msgstr ""
 "no usando dirección configurada %s porque esta siendo usada por el servidor"
 
-#: rfc2131.c:616
+#: rfc2131.c:668
 #, fuzzy, c-format
 msgid "not using configured address %s because it was previously declined"
 msgstr "no usando dirección configurada %s porque esta arriendada a %s"
 
-#: rfc2131.c:700
+#: rfc2131.c:751
 msgid "wrong address"
 msgstr "dirección equivocada"
 
-#: rfc2131.c:713
+#: rfc2131.c:764
 msgid "lease not found"
 msgstr "arriendo no encontrado"
 
-#: rfc2131.c:745
+#: rfc2131.c:796
 msgid "address not available"
 msgstr "dirección no disponible"
 
-#: rfc2131.c:756
+#: rfc2131.c:807
 msgid "static lease available"
 msgstr "arriendo estático disponible"
 
-#: rfc2131.c:760
+#: rfc2131.c:811
 msgid "address reserved"
 msgstr "dirección reservada"
 
-#: rfc2131.c:766
+#: rfc2131.c:817
 msgid "no unique-id"
 msgstr "ningún unique-id (ID único)"
 
-#: rfc2131.c:1023
+#: rfc2131.c:1181
 #, c-format
 msgid "cannot send DHCP option %d: no space left in packet"
 msgstr "no se puede enviar opción DHCP %d: no queda espacio en el paquete"
 
-#: rfc2131.c:1322
-#, c-format
-msgid "More than one vendor class matches, using %s"
-msgstr "Más de una clase de vendedor coincide, usando %s"
+#: rfc2131.c:1476
+#, fuzzy, c-format
+msgid "cannot send encapsulated option %d: no space left in wrapper"
+msgstr "no se puede enviar opción DHCP %d: no queda espacio en el paquete"
 
 #: netlink.c:59
 #, fuzzy, c-format
@@ -1074,26 +1079,29 @@
 msgid "unsupported request from %s"
 msgstr ""
 
-#: tftp.c:226
-#, fuzzy, c-format
-msgid "file %s not found"
-msgstr "arriendo no encontrado"
-
-#: tftp.c:293
+#: tftp.c:229
 #, c-format
 msgid "TFTP sent %s to %s"
 msgstr ""
 
-#: tftp.c:343
+#: tftp.c:296
+#, fuzzy, c-format
+msgid "file %s not found"
+msgstr "arriendo no encontrado"
+
+#: tftp.c:352
 #, c-format
 msgid "TFTP error %d %s received from %s"
 msgstr ""
 
-#: tftp.c:374
+#: tftp.c:383
 #, fuzzy, c-format
 msgid "TFTP failed sending %s to %s"
 msgstr "no se pudo leer %s: %m"
 
+#~ msgid "More than one vendor class matches, using %s"
+#~ msgstr "Más de una clase de vendedor coincide, usando %s"
+
 #~ msgid "forwarding table overflow: check for server loops."
 #~ msgstr ""
 #~ "desbordamiento en la tabla de reenvio: revisar si hay loops de servidor."
diff --git a/po/fi.po b/po/fi.po
index 078e209..a1c4b60 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: dnsmasq 2.24\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-21 15:53+0000\n"
+"POT-Creation-Date: 2007-02-05 14:27+0000\n"
 "PO-Revision-Date: 2005-11-28 22:05+0000\n"
 "Last-Translator: Simon Kelley <simon@thekelleys.org.uk>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -15,45 +15,45 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: cache.c:671
+#: cache.c:697
 #, c-format
 msgid "failed to load names from %s: %m"
 msgstr ""
 
-#: cache.c:705 dhcp.c:715
+#: cache.c:731 dhcp.c:715
 #, c-format
 msgid "bad address at %s line %d"
 msgstr ""
 
-#: cache.c:751 dhcp.c:729
+#: cache.c:777 dhcp.c:729
 #, c-format
 msgid "bad name at %s line %d"
 msgstr ""
 
-#: cache.c:758 dhcp.c:783
+#: cache.c:784 dhcp.c:783
 #, c-format
 msgid "read %s - %d addresses"
 msgstr ""
 
-#: cache.c:796
+#: cache.c:822
 msgid "cleared cache"
 msgstr ""
 
-#: cache.c:849
+#: cache.c:875
 #, c-format
 msgid ""
 "not giving name %s to the DHCP lease of %s because the name exists in %s "
 "with address %s"
 msgstr ""
 
-#: cache.c:893
+#: cache.c:919
 #, c-format
 msgid ""
 "time %lu, cache size %d, %d/%d cache insertions re-used unexpired cache "
 "entries."
 msgstr ""
 
-#: util.c:154 option.c:579
+#: util.c:154 option.c:582
 msgid "could not get memory"
 msgstr ""
 
@@ -389,189 +389,189 @@
 msgid "Valid options are :\n"
 msgstr ""
 
-#: option.c:428
+#: option.c:431
 msgid "bad dhcp-option"
 msgstr ""
 
-#: option.c:574
+#: option.c:577
 msgid "bad domain in dhcp-option"
 msgstr ""
 
-#: option.c:631
+#: option.c:634
 msgid "dhcp-option too long"
 msgstr ""
 
-#: option.c:693
+#: option.c:696
 #, c-format
 msgid "cannot access directory %s: %s"
 msgstr ""
 
-#: option.c:712 tftp.c:230
+#: option.c:715 tftp.c:300
 #, c-format
 msgid "cannot access %s: %s"
 msgstr ""
 
-#: option.c:789
+#: option.c:792
 msgid "bad MX preference"
 msgstr ""
 
-#: option.c:798
+#: option.c:801
 msgid "bad MX name"
 msgstr ""
 
-#: option.c:816
+#: option.c:819
 msgid "bad MX target"
 msgstr ""
 
-#: option.c:828
+#: option.c:831
 msgid "cannot run scripts under uClinux"
 msgstr ""
 
-#: option.c:1027 option.c:1038
+#: option.c:1030 option.c:1041
 msgid "bad port"
 msgstr ""
 
-#: option.c:1182
+#: option.c:1185
 msgid "bad bridge-interface"
 msgstr ""
 
-#: option.c:1226
+#: option.c:1229
 msgid "bad dhcp-range"
 msgstr ""
 
-#: option.c:1255
+#: option.c:1258
 msgid "only one netid tag allowed"
 msgstr ""
 
-#: option.c:1300
+#: option.c:1303
 msgid "inconsistent DHCP range"
 msgstr ""
 
-#: option.c:1485
+#: option.c:1488
 msgid "bad dhcp-host"
 msgstr ""
 
-#: option.c:1685
+#: option.c:1688
 msgid "bad PTR record"
 msgstr ""
 
-#: option.c:1710
+#: option.c:1713
 msgid "bad TXT record"
 msgstr ""
 
-#: option.c:1742
+#: option.c:1745
 msgid "TXT record string too long"
 msgstr ""
 
-#: option.c:1781
+#: option.c:1784
 msgid "bad SRV record"
 msgstr ""
 
-#: option.c:1794
+#: option.c:1797
 msgid "bad SRV target"
 msgstr ""
 
-#: option.c:1806
+#: option.c:1809
 msgid "invalid port number"
 msgstr ""
 
-#: option.c:1817
+#: option.c:1820
 msgid "invalid priority"
 msgstr ""
 
-#: option.c:1828
+#: option.c:1831
 msgid "invalid weight"
 msgstr ""
 
-#: option.c:1859
+#: option.c:1862
 #, c-format
 msgid "files nested too deep in %s"
 msgstr ""
 
-#: option.c:1866 tftp.c:235 tftp.c:366
+#: option.c:1869 tftp.c:450
 #, c-format
 msgid "cannot read %s: %s"
 msgstr ""
 
-#: option.c:1909
+#: option.c:1912
 msgid "missing \""
 msgstr ""
 
-#: option.c:1948
+#: option.c:1951
 msgid "bad option"
 msgstr ""
 
-#: option.c:1950
+#: option.c:1953
 msgid "extraneous parameter"
 msgstr ""
 
-#: option.c:1952
+#: option.c:1955
 msgid "missing parameter"
 msgstr ""
 
-#: option.c:1954
+#: option.c:1957
 msgid "error"
 msgstr ""
 
-#: option.c:2022
+#: option.c:2025
 #, c-format
 msgid "Dnsmasq version %s  %s\n"
 msgstr ""
 
-#: option.c:2023
+#: option.c:2026
 #, c-format
 msgid ""
 "Compile time options %s\n"
 "\n"
 msgstr ""
 
-#: option.c:2024
+#: option.c:2027
 #, c-format
 msgid "This software comes with ABSOLUTELY NO WARRANTY.\n"
 msgstr ""
 
-#: option.c:2025
+#: option.c:2028
 #, c-format
 msgid "Dnsmasq is free software, and you are welcome to redistribute it\n"
 msgstr ""
 
-#: option.c:2026
+#: option.c:2029
 #, c-format
 msgid "under the terms of the GNU General Public License, version 2.\n"
 msgstr ""
 
-#: option.c:2037
+#: option.c:2040
 msgid "try --help"
 msgstr ""
 
-#: option.c:2039
+#: option.c:2042
 msgid "try -w"
 msgstr ""
 
-#: option.c:2042
+#: option.c:2045
 #, c-format
 msgid "bad command line options: %s"
 msgstr ""
 
-#: option.c:2093
+#: option.c:2096
 #, c-format
 msgid "cannot get host-name: %s"
 msgstr ""
 
-#: option.c:2121
+#: option.c:2124
 msgid "only one resolv.conf file allowed in no-poll mode."
 msgstr ""
 
-#: option.c:2131
+#: option.c:2134
 msgid "must have exactly one resolv.conf to read domain from."
 msgstr ""
 
-#: option.c:2134
+#: option.c:2137
 #, c-format
 msgid "failed to read %s: %s"
 msgstr ""
 
-#: option.c:2152
+#: option.c:2155
 #, c-format
 msgid "no search directive found in %s"
 msgstr ""
@@ -581,7 +581,7 @@
 msgid "nameserver %s refused to do a recursive query"
 msgstr ""
 
-#: isc.c:73 dnsmasq.c:527
+#: isc.c:73 dnsmasq.c:533
 #, c-format
 msgid "failed to access %s: %m"
 msgstr ""
@@ -591,7 +591,7 @@
 msgid "failed to load %s: %m"
 msgstr ""
 
-#: isc.c:93 dnsmasq.c:549
+#: isc.c:93 dnsmasq.c:555
 #, c-format
 msgid "reading %s"
 msgstr ""
@@ -611,7 +611,7 @@
 msgid "unknown interface %s in bridge-interface"
 msgstr ""
 
-#: network.c:379 dnsmasq.c:137
+#: network.c:379 dnsmasq.c:141
 #, c-format
 msgid "failed to create listening socket: %s"
 msgstr ""
@@ -678,130 +678,134 @@
 msgid "failed to read %s: %m"
 msgstr ""
 
-#: dnsmasq.c:97
+#: dnsmasq.c:101
 msgid ""
 "ISC dhcpd integration not available: set HAVE_ISC_READER in src/config.h"
 msgstr ""
 
-#: dnsmasq.c:114
+#: dnsmasq.c:118
 msgid "TFTP server not available: set HAVE_TFTP in src/config.h"
 msgstr ""
 
-#: dnsmasq.c:119
+#: dnsmasq.c:123
 #, c-format
 msgid "failed to find list of interfaces: %s"
 msgstr ""
 
-#: dnsmasq.c:127
+#: dnsmasq.c:131
 #, c-format
 msgid "unknown interface %s"
 msgstr ""
 
-#: dnsmasq.c:133
+#: dnsmasq.c:137
 #, c-format
 msgid "no interface with address %s"
 msgstr ""
 
-#: dnsmasq.c:152
+#: dnsmasq.c:156
 msgid "must set exactly one interface on broken systems without IP_RECVIF"
 msgstr ""
 
-#: dnsmasq.c:165 dnsmasq.c:654
+#: dnsmasq.c:169 dnsmasq.c:660
 #, c-format
 msgid "DBus error: %s"
 msgstr ""
 
-#: dnsmasq.c:168
+#: dnsmasq.c:172
 msgid "DBus not available: set HAVE_DBUS in src/config.h"
 msgstr ""
 
-#: dnsmasq.c:199
+#: dnsmasq.c:203
 #, c-format
 msgid "cannot create pipe: %s"
 msgstr ""
 
-#: dnsmasq.c:342
+#: dnsmasq.c:346
 #, c-format
 msgid "started, version %s cachesize %d"
 msgstr ""
 
-#: dnsmasq.c:344
+#: dnsmasq.c:348
 #, c-format
 msgid "started, version %s cache disabled"
 msgstr ""
 
-#: dnsmasq.c:346
+#: dnsmasq.c:350
 #, c-format
 msgid "compile time options: %s"
 msgstr ""
 
-#: dnsmasq.c:352
+#: dnsmasq.c:356
 msgid "DBus support enabled: connected to system bus"
 msgstr ""
 
-#: dnsmasq.c:354
+#: dnsmasq.c:358
 msgid "DBus support enabled: bus connection pending"
 msgstr ""
 
-#: dnsmasq.c:359
+#: dnsmasq.c:363
 msgid "setting --bind-interfaces option because of OS limitations"
 msgstr ""
 
-#: dnsmasq.c:364
+#: dnsmasq.c:368
 #, c-format
 msgid "warning: interface %s does not currently exist"
 msgstr ""
 
-#: dnsmasq.c:369
+#: dnsmasq.c:373
 msgid "warning: ignoring resolv-file flag because no-resolv is set"
 msgstr ""
 
-#: dnsmasq.c:383
+#: dnsmasq.c:376
+msgid "warning: no upstream servers configured"
+msgstr ""
+
+#: dnsmasq.c:389
 #, c-format
 msgid "DHCP, static leases only on %.0s%s, lease time %s"
 msgstr ""
 
-#: dnsmasq.c:384
+#: dnsmasq.c:390
 #, c-format
 msgid "DHCP, IP range %s -- %s, lease time %s"
 msgstr ""
 
-#: dnsmasq.c:400
+#: dnsmasq.c:406
 msgid "root is "
 msgstr ""
 
-#: dnsmasq.c:400
+#: dnsmasq.c:406
 msgid "enabled"
 msgstr ""
 
-#: dnsmasq.c:402
+#: dnsmasq.c:408
 msgid "secure mode"
 msgstr ""
 
-#: dnsmasq.c:422
+#: dnsmasq.c:428
 #, c-format
 msgid "restricting maximum simultaneous TFTP transfers to %d"
 msgstr ""
 
-#: dnsmasq.c:433
+#: dnsmasq.c:439
 #, c-format
 msgid "warning: setting capabilities failed: %m"
 msgstr ""
 
-#: dnsmasq.c:435
+#: dnsmasq.c:441
 msgid "running as root"
 msgstr ""
 
-#: dnsmasq.c:560
+#: dnsmasq.c:566
 #, c-format
 msgid "no servers found in %s, will retry"
 msgstr ""
 
-#: dnsmasq.c:619
+#: dnsmasq.c:625
 msgid "exiting on receipt of SIGTERM"
 msgstr ""
 
-#: dnsmasq.c:656
+#: dnsmasq.c:662
 msgid "connected to system DBus"
 msgstr ""
 
@@ -889,104 +893,104 @@
 msgid "failed to write %s: %s (retry in %us)"
 msgstr ""
 
-#: rfc2131.c:261
+#: rfc2131.c:297
 #, c-format
 msgid "no address range available for DHCP request %s %s"
 msgstr ""
 
-#: rfc2131.c:262
+#: rfc2131.c:298
 msgid "with subnet selector"
 msgstr ""
 
-#: rfc2131.c:262
+#: rfc2131.c:298
 msgid "via"
 msgstr ""
 
-#: rfc2131.c:288 rfc2131.c:312
+#: rfc2131.c:322 rfc2131.c:347
 msgid "disabled"
 msgstr ""
 
-#: rfc2131.c:324 rfc2131.c:763
+#: rfc2131.c:359 rfc2131.c:814
 msgid "address in use"
 msgstr ""
 
-#: rfc2131.c:327
+#: rfc2131.c:362
 msgid "no address configured"
 msgstr ""
 
-#: rfc2131.c:340 rfc2131.c:630
+#: rfc2131.c:375 rfc2131.c:682
 msgid "no address available"
 msgstr ""
 
-#: rfc2131.c:349 rfc2131.c:773
+#: rfc2131.c:384 rfc2131.c:824
 msgid "no leases left"
 msgstr ""
 
-#: rfc2131.c:352 rfc2131.c:737
+#: rfc2131.c:387 rfc2131.c:788
 msgid "wrong network"
 msgstr ""
 
-#: rfc2131.c:558
+#: rfc2131.c:605
 #, c-format
 msgid "disabling DHCP static address %s for %s"
 msgstr ""
 
-#: rfc2131.c:579
+#: rfc2131.c:626
 msgid "unknown lease"
 msgstr ""
 
-#: rfc2131.c:588 rfc2131.c:885
+#: rfc2131.c:635 rfc2131.c:934
 msgid "ignored"
 msgstr ""
 
-#: rfc2131.c:604
+#: rfc2131.c:655
 #, c-format
 msgid "not using configured address %s because it is leased to %s"
 msgstr ""
 
-#: rfc2131.c:613
+#: rfc2131.c:665
 #, c-format
 msgid ""
 "not using configured address %s because it is in use by the server or relay"
 msgstr ""
 
-#: rfc2131.c:616
+#: rfc2131.c:668
 #, c-format
 msgid "not using configured address %s because it was previously declined"
 msgstr ""
 
-#: rfc2131.c:700
+#: rfc2131.c:751
 msgid "wrong address"
 msgstr ""
 
-#: rfc2131.c:713
+#: rfc2131.c:764
 msgid "lease not found"
 msgstr ""
 
-#: rfc2131.c:745
+#: rfc2131.c:796
 msgid "address not available"
 msgstr ""
 
-#: rfc2131.c:756
+#: rfc2131.c:807
 msgid "static lease available"
 msgstr ""
 
-#: rfc2131.c:760
+#: rfc2131.c:811
 msgid "address reserved"
 msgstr ""
 
-#: rfc2131.c:766
+#: rfc2131.c:817
 msgid "no unique-id"
 msgstr ""
 
-#: rfc2131.c:1023
+#: rfc2131.c:1181
 #, c-format
 msgid "cannot send DHCP option %d: no space left in packet"
 msgstr ""
 
-#: rfc2131.c:1322
+#: rfc2131.c:1476
 #, c-format
-msgid "More than one vendor class matches, using %s"
+msgid "cannot send encapsulated option %d: no space left in wrapper"
 msgstr ""
 
 #: netlink.c:59
@@ -1041,22 +1045,22 @@
 msgid "unsupported request from %s"
 msgstr ""
 
-#: tftp.c:226
-#, c-format
-msgid "file %s not found"
-msgstr ""
-
-#: tftp.c:293
+#: tftp.c:229
 #, c-format
 msgid "TFTP sent %s to %s"
 msgstr ""
 
-#: tftp.c:343
+#: tftp.c:296
+#, c-format
+msgid "file %s not found"
+msgstr ""
+
+#: tftp.c:352
 #, c-format
 msgid "TFTP error %d %s received from %s"
 msgstr ""
 
-#: tftp.c:374
+#: tftp.c:383
 #, c-format
 msgid "TFTP failed sending %s to %s"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 2460597..157831d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: dnsmasq 2.34\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-21 15:53+0000\n"
+"POT-Creation-Date: 2007-02-05 14:27+0000\n"
 "PO-Revision-Date: 2005-10-02 19:05+0100\n"
 "Last-Translator:  Lionel Tricon <lionel.tricon@free.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -16,31 +16,31 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: cache.c:671
+#: cache.c:697
 #, c-format
 msgid "failed to load names from %s: %m"
 msgstr "Impossible de charger les noms à partir de %s : %m"
 
-#: cache.c:705 dhcp.c:715
+#: cache.c:731 dhcp.c:715
 #, c-format
 msgid "bad address at %s line %d"
 msgstr "mauvaise adresse dans %s ligne %d"
 
-#: cache.c:751 dhcp.c:729
+#: cache.c:777 dhcp.c:729
 #, c-format
 msgid "bad name at %s line %d"
 msgstr "mauvais nom dans %s ligne %d"
 
-#: cache.c:758 dhcp.c:783
+#: cache.c:784 dhcp.c:783
 #, c-format
 msgid "read %s - %d addresses"
 msgstr "lecture %s - %d adresses"
 
-#: cache.c:796
+#: cache.c:822
 msgid "cleared cache"
 msgstr "cache vidé"
 
-#: cache.c:849
+#: cache.c:875
 #, c-format
 msgid ""
 "not giving name %s to the DHCP lease of %s because the name exists in %s "
@@ -49,7 +49,7 @@
 "ne donne pas de nom %s au bail DHCP de %s parce-que le nom existe dans %s "
 "avec l'adresse %s"
 
-#: cache.c:893
+#: cache.c:919
 #, c-format
 msgid ""
 "time %lu, cache size %d, %d/%d cache insertions re-used unexpired cache "
@@ -58,7 +58,7 @@
 "temps %lu, taille de cache %d, %d/%d insertions dans le cache ont "
 "réutilisées des entrées qui n'ont pas expirées"
 
-#: util.c:154 option.c:579
+#: util.c:154 option.c:582
 msgid "could not get memory"
 msgstr "impossible d'allouer de la mémoire"
 
@@ -424,137 +424,137 @@
 msgid "Valid options are :\n"
 msgstr "Les options valides sont :\n"
 
-#: option.c:428
+#: option.c:431
 msgid "bad dhcp-option"
 msgstr "mauvais dhcp-option"
 
-#: option.c:574
+#: option.c:577
 msgid "bad domain in dhcp-option"
 msgstr "mauvais domaine dans dhcp-option"
 
-#: option.c:631
+#: option.c:634
 msgid "dhcp-option too long"
 msgstr "dhcp-option trop long"
 
-#: option.c:693
+#: option.c:696
 #, fuzzy, c-format
 msgid "cannot access directory %s: %s"
 msgstr "Ne peut pas lire le répertoire %s : %s"
 
-#: option.c:712 tftp.c:230
+#: option.c:715 tftp.c:300
 #, fuzzy, c-format
 msgid "cannot access %s: %s"
 msgstr "Ne peut pas lire %s : %s"
 
-#: option.c:789
+#: option.c:792
 msgid "bad MX preference"
 msgstr "Mauvaise préference MX"
 
-#: option.c:798
+#: option.c:801
 msgid "bad MX name"
 msgstr "mauvais nom MX"
 
-#: option.c:816
+#: option.c:819
 msgid "bad MX target"
 msgstr "mauvaise cible MX"
 
-#: option.c:828
+#: option.c:831
 msgid "cannot run scripts under uClinux"
 msgstr "ne peut exécuter de script sous uClinux"
 
-#: option.c:1027 option.c:1038
+#: option.c:1030 option.c:1041
 msgid "bad port"
 msgstr "mauvais port"
 
-#: option.c:1182
+#: option.c:1185
 msgid "bad bridge-interface"
 msgstr ""
 
-#: option.c:1226
+#: option.c:1229
 msgid "bad dhcp-range"
 msgstr "mauvaise plage d'adresses DHCP (dhcp-range)"
 
-#: option.c:1255
+#: option.c:1258
 msgid "only one netid tag allowed"
 msgstr "une seule étiquette netid est autorisée"
 
-#: option.c:1300
+#: option.c:1303
 msgid "inconsistent DHCP range"
 msgstr "plage d'adresses DHCP incohérente"
 
-#: option.c:1485
+#: option.c:1488
 msgid "bad dhcp-host"
 msgstr "mauvais dhcp-host"
 
-#: option.c:1685
+#: option.c:1688
 #, fuzzy
 msgid "bad PTR record"
 msgstr "mauvais champ SRV"
 
-#: option.c:1710
+#: option.c:1713
 msgid "bad TXT record"
 msgstr "mauvais champ TXT"
 
-#: option.c:1742
+#: option.c:1745
 msgid "TXT record string too long"
 msgstr "chaîne du champ TXT trop longue"
 
-#: option.c:1781
+#: option.c:1784
 msgid "bad SRV record"
 msgstr "mauvais champ SRV"
 
-#: option.c:1794
+#: option.c:1797
 msgid "bad SRV target"
 msgstr "mauvaise cible SRV"
 
-#: option.c:1806
+#: option.c:1809
 msgid "invalid port number"
 msgstr "numéro de port invalide"
 
-#: option.c:1817
+#: option.c:1820
 msgid "invalid priority"
 msgstr "priorité invalide"
 
-#: option.c:1828
+#: option.c:1831
 msgid "invalid weight"
 msgstr "poids invalide"
 
-#: option.c:1859
+#: option.c:1862
 #, c-format
 msgid "files nested too deep in %s"
 msgstr "trop de niveaux de récursion pour les fichiers dans %s"
 
-#: option.c:1866 tftp.c:235 tftp.c:366
+#: option.c:1869 tftp.c:450
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "Ne peut pas lire %s : %s"
 
-#: option.c:1909
+#: option.c:1912
 msgid "missing \""
 msgstr "il manque \""
 
-#: option.c:1948
+#: option.c:1951
 msgid "bad option"
 msgstr "mauvaise option"
 
-#: option.c:1950
+#: option.c:1953
 msgid "extraneous parameter"
 msgstr "paramètre en trop"
 
-#: option.c:1952
+#: option.c:1955
 msgid "missing parameter"
 msgstr "paramètre manquant"
 
-#: option.c:1954
+#: option.c:1957
 msgid "error"
 msgstr "erreur"
 
-#: option.c:2022
+#: option.c:2025
 #, c-format
 msgid "Dnsmasq version %s  %s\n"
 msgstr "Version de Dnsmasq %s  %s\n"
 
-#: option.c:2023
+#: option.c:2026
 #, c-format
 msgid ""
 "Compile time options %s\n"
@@ -563,56 +563,56 @@
 "Options à la compilation %s\n"
 "\n"
 
-#: option.c:2024
+#: option.c:2027
 #, c-format
 msgid "This software comes with ABSOLUTELY NO WARRANTY.\n"
 msgstr "Ce logiciel est fourni sans AUCUNE GARANTIE.\n"
 
-#: option.c:2025
+#: option.c:2028
 #, 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:2026
+#: option.c:2029
 #, c-format
 msgid "under the terms of the GNU General Public License, version 2.\n"
 msgstr ""
 "sous les termes de la licence GPL (GNU General Public License), version 2.\n"
 
-#: option.c:2037
+#: option.c:2040
 msgid "try --help"
 msgstr "essayez avec --help"
 
-#: option.c:2039
+#: option.c:2042
 msgid "try -w"
 msgstr "essayez avec -w"
 
-#: option.c:2042
+#: option.c:2045
 #, fuzzy, c-format
 msgid "bad command line options: %s"
 msgstr "mauvaises options en ligne de commande : %s."
 
-#: option.c:2093
+#: option.c:2096
 #, c-format
 msgid "cannot get host-name: %s"
 msgstr "ne peut pas obtenir le nom de la machine : %s"
 
-#: option.c:2121
+#: option.c:2124
 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:2131
+#: option.c:2134
 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:2134
+#: option.c:2137
 #, fuzzy, c-format
 msgid "failed to read %s: %s"
 msgstr "impossible de lire %s : %m"
 
-#: option.c:2152
+#: option.c:2155
 #, c-format
 msgid "no search directive found in %s"
 msgstr "pas de directive de recherche trouvée dans %s"
@@ -622,7 +622,7 @@
 msgid "nameserver %s refused to do a recursive query"
 msgstr "le serveur de nom %s a refusé de faire une recherche récursive"
 
-#: isc.c:73 dnsmasq.c:527
+#: isc.c:73 dnsmasq.c:533
 #, c-format
 msgid "failed to access %s: %m"
 msgstr "impossible d'accéder à %s : %m"
@@ -632,7 +632,7 @@
 msgid "failed to load %s: %m"
 msgstr "impossible de charger %s : %m"
 
-#: isc.c:93 dnsmasq.c:549
+#: isc.c:93 dnsmasq.c:555
 #, c-format
 msgid "reading %s"
 msgstr "Lecture de %s"
@@ -653,7 +653,7 @@
 msgid "unknown interface %s in bridge-interface"
 msgstr "interface %s inconnue"
 
-#: network.c:379 dnsmasq.c:137
+#: network.c:379 dnsmasq.c:141
 #, c-format
 msgid "failed to create listening socket: %s"
 msgstr "impossible de créer une socket de lecture : %s"
@@ -720,138 +720,143 @@
 msgid "failed to read %s: %m"
 msgstr "impossible de lire %s : %m"
 
-#: dnsmasq.c:97
+#: dnsmasq.c:101
 msgid ""
 "ISC dhcpd integration not available: set HAVE_ISC_READER in src/config.h"
 msgstr ""
 "L'intégration DHCP ISC n'est pas disponible : activez HAVE_ISC_READER dans "
 "src/config.h"
 
-#: dnsmasq.c:114
+#: dnsmasq.c:118
 #, fuzzy
 msgid "TFTP server not available: set HAVE_TFTP in src/config.h"
 msgstr "DBus n'est pas disponible : activez HAVE_DBUS dans src/config.h"
 
-#: dnsmasq.c:119
+#: dnsmasq.c:123
 #, c-format
 msgid "failed to find list of interfaces: %s"
 msgstr "impossible de trouver la liste des interfaces : %s"
 
-#: dnsmasq.c:127
+#: dnsmasq.c:131
 #, c-format
 msgid "unknown interface %s"
 msgstr "interface %s inconnue"
 
-#: dnsmasq.c:133
+#: dnsmasq.c:137
 #, c-format
 msgid "no interface with address %s"
 msgstr "pas d'interface avec l'adresse %s"
 
-#: dnsmasq.c:152
+#: dnsmasq.c:156
 msgid "must set exactly one interface on broken systems without IP_RECVIF"
 msgstr ""
 "Une interface et une seule doit être déclarée sur les systèmes sans IP_RECVIF"
 
-#: dnsmasq.c:165 dnsmasq.c:654
+#: dnsmasq.c:169 dnsmasq.c:660
 #, c-format
 msgid "DBus error: %s"
 msgstr "Erreur DBus : %s"
 
-#: dnsmasq.c:168
+#: dnsmasq.c:172
 msgid "DBus not available: set HAVE_DBUS in src/config.h"
 msgstr "DBus n'est pas disponible : activez HAVE_DBUS dans src/config.h"
 
-#: dnsmasq.c:199
+#: dnsmasq.c:203
 #, fuzzy, c-format
 msgid "cannot create pipe: %s"
 msgstr "Ne peut pas lire %s : %s"
 
-#: dnsmasq.c:342
+#: dnsmasq.c:346
 #, c-format
 msgid "started, version %s cachesize %d"
 msgstr "demarré, version %s (taille de cache %d)"
 
-#: dnsmasq.c:344
+#: dnsmasq.c:348
 #, c-format
 msgid "started, version %s cache disabled"
 msgstr "démarrage avec le cache désactivé (version %s)"
 
-#: dnsmasq.c:346
+#: dnsmasq.c:350
 #, c-format
 msgid "compile time options: %s"
 msgstr "options à la compilation : %s"
 
-#: dnsmasq.c:352
+#: dnsmasq.c:356
 msgid "DBus support enabled: connected to system bus"
 msgstr "Support DBus autorisé : connecté au bus système"
 
-#: dnsmasq.c:354
+#: dnsmasq.c:358
 msgid "DBus support enabled: bus connection pending"
 msgstr "Support DBus autorisé : connexion au bus en attente"
 
-#: dnsmasq.c:359
+#: dnsmasq.c:363
 msgid "setting --bind-interfaces option because of OS limitations"
 msgstr ""
 "active l'option --bind-interfaces à cause de limitations dans le système "
 "d'exploitation"
 
-#: dnsmasq.c:364
+#: dnsmasq.c:368
 #, c-format
 msgid "warning: interface %s does not currently exist"
 msgstr "attention : l'interface %s n'existe pas actuellement"
 
-#: dnsmasq.c:369
+#: dnsmasq.c:373
 msgid "warning: ignoring resolv-file flag because no-resolv is set"
 msgstr ""
 "attention : le drapeau resolv-file sera ignoré car no-resolv a été spécifié"
 
-#: dnsmasq.c:383
+#: dnsmasq.c:376
+#, fuzzy
+msgid "warning: no upstream servers configured"
+msgstr "configuration des serveurs amonts à partir de DBus"
+
+#: dnsmasq.c:389
 #, c-format
 msgid "DHCP, static leases only on %.0s%s, lease time %s"
 msgstr "baux statiques DHCP seulement sur %.0s%s, durée de validité de bail %s"
 
-#: dnsmasq.c:384
+#: dnsmasq.c:390
 #, c-format
 msgid "DHCP, IP range %s -- %s, lease time %s"
 msgstr "DHCP, plage d'adresses %s -- %s, durée de bail %s"
 
-#: dnsmasq.c:400
+#: dnsmasq.c:406
 msgid "root is "
 msgstr ""
 
-#: dnsmasq.c:400
+#: dnsmasq.c:406
 #, fuzzy
 msgid "enabled"
 msgstr "désactivé"
 
-#: dnsmasq.c:402
+#: dnsmasq.c:408
 msgid "secure mode"
 msgstr ""
 
-#: dnsmasq.c:422
+#: dnsmasq.c:428
 #, c-format
 msgid "restricting maximum simultaneous TFTP transfers to %d"
 msgstr ""
 
-#: dnsmasq.c:433
+#: dnsmasq.c:439
 #, c-format
 msgid "warning: setting capabilities failed: %m"
 msgstr "attention : impossible de configurer la capacité %m"
 
-#: dnsmasq.c:435
+#: dnsmasq.c:441
 msgid "running as root"
 msgstr "executé en temps que root"
 
-#: dnsmasq.c:560
+#: dnsmasq.c:566
 #, fuzzy, c-format
 msgid "no servers found in %s, will retry"
 msgstr "aucun serveur trouvé dans %s, va réessayer"
 
-#: dnsmasq.c:619
+#: dnsmasq.c:625
 msgid "exiting on receipt of SIGTERM"
 msgstr "sortie sur réception du signal SIGTERM"
 
-#: dnsmasq.c:656
+#: dnsmasq.c:662
 msgid "connected to system DBus"
 msgstr "connecté au systeme DBus"
 
@@ -943,63 +948,63 @@
 msgid "failed to write %s: %s (retry in %us)"
 msgstr "impossible de lire %s : %s (prochain essai dans %us)"
 
-#: rfc2131.c:261
+#: rfc2131.c:297
 #, c-format
 msgid "no address range available for DHCP request %s %s"
 msgstr "pas de plage d'adresse disponible pour la requête DHCP %s %s"
 
-#: rfc2131.c:262
+#: rfc2131.c:298
 msgid "with subnet selector"
 msgstr "avec sélecteur de sous-reseau"
 
-#: rfc2131.c:262
+#: rfc2131.c:298
 msgid "via"
 msgstr "par l'intermédiaire de"
 
-#: rfc2131.c:288 rfc2131.c:312
+#: rfc2131.c:322 rfc2131.c:347
 msgid "disabled"
 msgstr "désactivé"
 
-#: rfc2131.c:324 rfc2131.c:763
+#: rfc2131.c:359 rfc2131.c:814
 msgid "address in use"
 msgstr "adresse déjà utilisée"
 
-#: rfc2131.c:327
+#: rfc2131.c:362
 msgid "no address configured"
 msgstr "pas d'adresse configurée"
 
-#: rfc2131.c:340 rfc2131.c:630
+#: rfc2131.c:375 rfc2131.c:682
 msgid "no address available"
 msgstr "pas d'adresse disponible"
 
-#: rfc2131.c:349 rfc2131.c:773
+#: rfc2131.c:384 rfc2131.c:824
 msgid "no leases left"
 msgstr "plus aucun bail disponible"
 
-#: rfc2131.c:352 rfc2131.c:737
+#: rfc2131.c:387 rfc2131.c:788
 msgid "wrong network"
 msgstr "mauvais réseau"
 
-#: rfc2131.c:558
+#: rfc2131.c:605
 #, fuzzy, c-format
 msgid "disabling DHCP static address %s for %s"
 msgstr "désactive l'adresse statique DHCP %s pour %s"
 
-#: rfc2131.c:579
+#: rfc2131.c:626
 msgid "unknown lease"
 msgstr "bail inconnu"
 
-#: rfc2131.c:588 rfc2131.c:885
+#: rfc2131.c:635 rfc2131.c:934
 msgid "ignored"
 msgstr "ignoré"
 
-#: rfc2131.c:604
+#: rfc2131.c:655
 #, c-format
 msgid "not using configured address %s because it is leased to %s"
 msgstr ""
 "L'adresse statique %s ne sera pas utilisée car un bail est déjà attribué à %s"
 
-#: rfc2131.c:613
+#: rfc2131.c:665
 #, c-format
 msgid ""
 "not using configured address %s because it is in use by the server or relay"
@@ -1007,47 +1012,48 @@
 "L'adresse statique %s ne sera pas utilisée car elle est utilisée par le "
 "serveur ou un relai"
 
-#: rfc2131.c:616
+#: rfc2131.c:668
 #, c-format
 msgid "not using configured address %s because it was previously declined"
 msgstr ""
 "L'adresse statique %s ne sera pas utilisée car elle a préalablement été "
 "refusée"
 
-#: rfc2131.c:700
+#: rfc2131.c:751
 msgid "wrong address"
 msgstr "mauvaise adresse"
 
-#: rfc2131.c:713
+#: rfc2131.c:764
 msgid "lease not found"
 msgstr "bail non trouvé"
 
-#: rfc2131.c:745
+#: rfc2131.c:796
 msgid "address not available"
 msgstr "adresse non disponible"
 
-#: rfc2131.c:756
+#: rfc2131.c:807
 msgid "static lease available"
 msgstr "bail statique disponible"
 
-#: rfc2131.c:760
+#: rfc2131.c:811
 msgid "address reserved"
 msgstr "adresse reservée"
 
-#: rfc2131.c:766
+#: rfc2131.c:817
 msgid "no unique-id"
 msgstr "pas d'identifiant unique"
 
-#: rfc2131.c:1023
+#: rfc2131.c:1181
 #, c-format
 msgid "cannot send DHCP option %d: no space left in packet"
 msgstr ""
 "Impossible d'envoyer l'option DHCP %d : pas assez d'espace dans le paquet"
 
-#: rfc2131.c:1322
-#, c-format
-msgid "More than one vendor class matches, using %s"
-msgstr "Plusieurs classes de fournisseurs correspondent, %s sera utilisé"
+#: rfc2131.c:1476
+#, fuzzy, c-format
+msgid "cannot send encapsulated option %d: no space left in wrapper"
+msgstr ""
+"Impossible d'envoyer l'option DHCP %d : pas assez d'espace dans le paquet"
 
 #: netlink.c:59
 #, fuzzy, c-format
@@ -1102,22 +1108,25 @@
 msgid "unsupported request from %s"
 msgstr ""
 
-#: tftp.c:226
-#, fuzzy, c-format
-msgid "file %s not found"
-msgstr "bail non trouvé"
-
-#: tftp.c:293
+#: tftp.c:229
 #, c-format
 msgid "TFTP sent %s to %s"
 msgstr ""
 
-#: tftp.c:343
+#: tftp.c:296
+#, fuzzy, c-format
+msgid "file %s not found"
+msgstr "bail non trouvé"
+
+#: tftp.c:352
 #, c-format
 msgid "TFTP error %d %s received from %s"
 msgstr ""
 
-#: tftp.c:374
+#: tftp.c:383
 #, fuzzy, c-format
 msgid "TFTP failed sending %s to %s"
 msgstr "impossible de lire %s : %m"
+
+#~ msgid "More than one vendor class matches, using %s"
+#~ msgstr "Plusieurs classes de fournisseurs correspondent, %s sera utilisé"
diff --git a/po/id.po b/po/id.po
index 4653081..9c8c4ed 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: dnsmasq 2.24\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-21 15:53+0000\n"
+"POT-Creation-Date: 2007-02-05 14:27+0000\n"
 "PO-Revision-Date: 2005-10-07 11:45+0100\n"
 "Last-Translator: Salman AS <sas@salman.or.id>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -15,36 +15,36 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 # OK
-#: cache.c:671
+#: cache.c:697
 #, c-format
 msgid "failed to load names from %s: %m"
 msgstr "gagal memuat nama-nama dari %s: %m"
 
 # OK
-#: cache.c:705 dhcp.c:715
+#: cache.c:731 dhcp.c:715
 #, fuzzy, c-format
 msgid "bad address at %s line %d"
 msgstr "kesalahan nama pada %s baris %d"
 
 # OK
-#: cache.c:751 dhcp.c:729
+#: cache.c:777 dhcp.c:729
 #, c-format
 msgid "bad name at %s line %d"
 msgstr "kesalahan nama pada %s baris %d"
 
 # OK
-#: cache.c:758 dhcp.c:783
+#: cache.c:784 dhcp.c:783
 #, c-format
 msgid "read %s - %d addresses"
 msgstr "membaca %s - %d alamat"
 
 # OK
-#: cache.c:796
+#: cache.c:822
 msgid "cleared cache"
 msgstr "cache telah dihapus"
 
 # OK
-#: cache.c:849
+#: cache.c:875
 #, c-format
 msgid ""
 "not giving name %s to the DHCP lease of %s because the name exists in %s "
@@ -54,7 +54,7 @@
 "sdengan alamat %s"
 
 # OK
-#: cache.c:893
+#: cache.c:919
 #, fuzzy, c-format
 msgid ""
 "time %lu, cache size %d, %d/%d cache insertions re-used unexpired cache "
@@ -63,7 +63,7 @@
 "ukuran cache %d, %d/%d penyisipan cache menimpa cache yang belum kadaluwarsa"
 
 # OK
-#: util.c:154 option.c:579
+#: util.c:154 option.c:582
 msgid "could not get memory"
 msgstr "tidak bisa mendapatkan memory"
 
@@ -475,164 +475,164 @@
 msgstr "Pilihan yang boleh adalah:\n"
 
 # OK
-#: option.c:428
+#: option.c:431
 msgid "bad dhcp-option"
 msgstr "dhcp-option salah"
 
 # OK
-#: option.c:574
+#: option.c:577
 msgid "bad domain in dhcp-option"
 msgstr "domain dalam dhcp-option salah"
 
 # OK
-#: option.c:631
+#: option.c:634
 msgid "dhcp-option too long"
 msgstr "dhcp-option terlalu panjang"
 
 # OK
-#: option.c:693
+#: option.c:696
 #, fuzzy, c-format
 msgid "cannot access directory %s: %s"
 msgstr "tidak bisa membaca %s: %s"
 
 # OK
-#: option.c:712 tftp.c:230
+#: option.c:715 tftp.c:300
 #, fuzzy, c-format
 msgid "cannot access %s: %s"
 msgstr "tidak bisa membaca %s: %s"
 
 # OK
-#: option.c:789
+#: option.c:792
 msgid "bad MX preference"
 msgstr "kesukaan MX salah"
 
 # OK
-#: option.c:798
+#: option.c:801
 msgid "bad MX name"
 msgstr "nama MX salah"
 
 # OK
-#: option.c:816
+#: option.c:819
 msgid "bad MX target"
 msgstr "target MX salah"
 
-#: option.c:828
+#: option.c:831
 msgid "cannot run scripts under uClinux"
 msgstr ""
 
 # OK
-#: option.c:1027 option.c:1038
+#: option.c:1030 option.c:1041
 msgid "bad port"
 msgstr "port salah"
 
-#: option.c:1182
+#: option.c:1185
 msgid "bad bridge-interface"
 msgstr ""
 
 # OK
-#: option.c:1226
+#: option.c:1229
 msgid "bad dhcp-range"
 msgstr "dhcp-range salah"
 
-#: option.c:1255
+#: option.c:1258
 msgid "only one netid tag allowed"
 msgstr ""
 
 # OK
-#: option.c:1300
+#: option.c:1303
 msgid "inconsistent DHCP range"
 msgstr "jangkauan DHCP tidak konsisten"
 
 # OK
-#: option.c:1485
+#: option.c:1488
 msgid "bad dhcp-host"
 msgstr "dhcp-host salah"
 
 # OK
-#: option.c:1685
+#: option.c:1688
 #, fuzzy
 msgid "bad PTR record"
 msgstr "rekord SRV salah"
 
 # OK
-#: option.c:1710
+#: option.c:1713
 msgid "bad TXT record"
 msgstr "rekord TXT salah"
 
 # OK
-#: option.c:1742
+#: option.c:1745
 msgid "TXT record string too long"
 msgstr "string rekord TXT terlalu panjang"
 
 # OK
-#: option.c:1781
+#: option.c:1784
 msgid "bad SRV record"
 msgstr "rekord SRV salah"
 
 # OK
-#: option.c:1794
+#: option.c:1797
 msgid "bad SRV target"
 msgstr "target SRV salah"
 
 # OK
-#: option.c:1806
+#: option.c:1809
 msgid "invalid port number"
 msgstr "nomor port tidak benar"
 
 # OK
-#: option.c:1817
+#: option.c:1820
 msgid "invalid priority"
 msgstr "prioritas tidak benar"
 
 # OK
-#: option.c:1828
+#: option.c:1831
 msgid "invalid weight"
 msgstr "weight tidak benar"
 
-#: option.c:1859
+#: option.c:1862
 #, c-format
 msgid "files nested too deep in %s"
 msgstr ""
 
 # OK
-#: option.c:1866 tftp.c:235 tftp.c:366
+#: option.c:1869 tftp.c:450
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "tidak bisa membaca %s: %s"
 
 # OK
-#: option.c:1909
+#: option.c:1912
 msgid "missing \""
 msgstr "kurang \""
 
 # OK
-#: option.c:1948
+#: option.c:1951
 msgid "bad option"
 msgstr "pilihan salah"
 
 # OK
-#: option.c:1950
+#: option.c:1953
 msgid "extraneous parameter"
 msgstr "parameter berlebihan"
 
 # OK
-#: option.c:1952
+#: option.c:1955
 msgid "missing parameter"
 msgstr "parameter kurang"
 
 # OK
-#: option.c:1954
+#: option.c:1957
 msgid "error"
 msgstr "kesalahan"
 
 # OK
-#: option.c:2022
+#: option.c:2025
 #, c-format
 msgid "Dnsmasq version %s  %s\n"
 msgstr "Dnsmasq versi %s  %s\n"
 
 # OK
-#: option.c:2023
+#: option.c:2026
 #, c-format
 msgid ""
 "Compile time options %s\n"
@@ -642,13 +642,13 @@
 "\n"
 
 # OK
-#: option.c:2024
+#: option.c:2027
 #, c-format
 msgid "This software comes with ABSOLUTELY NO WARRANTY.\n"
 msgstr "Perangkat lunak ini tersedia TANPA JAMINAN SEDIKITPUN.\n"
 
 # OK
-#: option.c:2025
+#: option.c:2028
 #, c-format
 msgid "Dnsmasq is free software, and you are welcome to redistribute it\n"
 msgstr ""
@@ -656,49 +656,49 @@
 "membagikannya\n"
 
 # OK
-#: option.c:2026
+#: option.c:2029
 #, c-format
 msgid "under the terms of the GNU General Public License, version 2.\n"
 msgstr "dengan aturan GNU General Public License, versi 2.\n"
 
-#: option.c:2037
+#: option.c:2040
 msgid "try --help"
 msgstr ""
 
-#: option.c:2039
+#: option.c:2042
 msgid "try -w"
 msgstr ""
 
 # OK
-#: option.c:2042
+#: option.c:2045
 #, fuzzy, c-format
 msgid "bad command line options: %s"
 msgstr "pilihan baris perintah salah: %s."
 
 # OK
-#: option.c:2093
+#: option.c:2096
 #, c-format
 msgid "cannot get host-name: %s"
 msgstr "tidak bisa mendapatkan host-name: %s"
 
 # OK
-#: option.c:2121
+#: option.c:2124
 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:2131
+#: option.c:2134
 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:2134
+#: option.c:2137
 #, fuzzy, c-format
 msgid "failed to read %s: %s"
 msgstr "gagal membaca %s: %m"
 
 # OK
-#: option.c:2152
+#: option.c:2155
 #, c-format
 msgid "no search directive found in %s"
 msgstr "tidak ditemukan direktif search di %s"
@@ -710,7 +710,7 @@
 msgstr "nameserver %s menolak melakukan resolusi rekursif"
 
 # OK
-#: isc.c:73 dnsmasq.c:527
+#: isc.c:73 dnsmasq.c:533
 #, c-format
 msgid "failed to access %s: %m"
 msgstr "gagal mengakses %s: %m"
@@ -722,7 +722,7 @@
 msgstr "gagal memuat %S: %m"
 
 # OK
-#: isc.c:93 dnsmasq.c:549
+#: isc.c:93 dnsmasq.c:555
 #, c-format
 msgid "reading %s"
 msgstr "membaca %s"
@@ -747,7 +747,7 @@
 msgstr "antarmuka tidak dikenal %s"
 
 # OK
-#: network.c:379 dnsmasq.c:137
+#: network.c:379 dnsmasq.c:141
 #, c-format
 msgid "failed to create listening socket: %s"
 msgstr "gagal membuat socket: %s "
@@ -827,7 +827,7 @@
 msgstr "gagal membaca %s: %m"
 
 # OK
-#: dnsmasq.c:97
+#: dnsmasq.c:101
 msgid ""
 "ISC dhcpd integration not available: set HAVE_ISC_READER in src/config.h"
 msgstr ""
@@ -835,149 +835,155 @@
 "config.h"
 
 # OK
-#: dnsmasq.c:114
+#: dnsmasq.c:118
 #, fuzzy
 msgid "TFTP server not available: set HAVE_TFTP in src/config.h"
 msgstr "DBus tidak tersedia: setel HAVE_DBUS dalam src/config.h"
 
 # OK
-#: dnsmasq.c:119
+#: dnsmasq.c:123
 #, c-format
 msgid "failed to find list of interfaces: %s"
 msgstr "gagal mendapatkan daftar antarmuka: %s"
 
 # OK
-#: dnsmasq.c:127
+#: dnsmasq.c:131
 #, c-format
 msgid "unknown interface %s"
 msgstr "antarmuka tidak dikenal %s"
 
 # OK
-#: dnsmasq.c:133
+#: dnsmasq.c:137
 #, c-format
 msgid "no interface with address %s"
 msgstr "tidak ada antarmuka dengan alamat %s"
 
 # OK
-#: dnsmasq.c:152
+#: dnsmasq.c:156
 msgid "must set exactly one interface on broken systems without IP_RECVIF"
 msgstr ""
 "harus menyetel satu antarmuka saja pada sistem yang tidak benar dengan "
 "IP_RECVIF"
 
 # OK
-#: dnsmasq.c:165 dnsmasq.c:654
+#: dnsmasq.c:169 dnsmasq.c:660
 #, c-format
 msgid "DBus error: %s"
 msgstr "DBus error: %s"
 
 # OK
-#: dnsmasq.c:168
+#: dnsmasq.c:172
 msgid "DBus not available: set HAVE_DBUS in src/config.h"
 msgstr "DBus tidak tersedia: setel HAVE_DBUS dalam src/config.h"
 
 # OK
-#: dnsmasq.c:199
+#: dnsmasq.c:203
 #, fuzzy, c-format
 msgid "cannot create pipe: %s"
 msgstr "tidak bisa membaca %s: %s"
 
 # OK
-#: dnsmasq.c:342
+#: dnsmasq.c:346
 #, c-format
 msgid "started, version %s cachesize %d"
 msgstr "dimulai, versi %s ukuran cache %d"
 
 # OK
-#: dnsmasq.c:344
+#: dnsmasq.c:348
 #, c-format
 msgid "started, version %s cache disabled"
 msgstr "dimulai, cache versi %s di disable"
 
 # OK
-#: dnsmasq.c:346
+#: dnsmasq.c:350
 #, c-format
 msgid "compile time options: %s"
 msgstr "pilihan-pilihan saat kompilasi: %s"
 
 # OK
-#: dnsmasq.c:352
+#: dnsmasq.c:356
 msgid "DBus support enabled: connected to system bus"
 msgstr "dukungan DBus dimungkinkan: terkoneksi pada bus sistem"
 
 # OK
-#: dnsmasq.c:354
+#: dnsmasq.c:358
 msgid "DBus support enabled: bus connection pending"
 msgstr "dukungan DBus dimungkinkan: koneksi bus ditunda"
 
 # OK
-#: dnsmasq.c:359
+#: dnsmasq.c:363
 msgid "setting --bind-interfaces option because of OS limitations"
 msgstr "setelan opsi --bind-interfaces disebabkan keterbatasan OS"
 
 # OK
-#: dnsmasq.c:364
+#: dnsmasq.c:368
 #, c-format
 msgid "warning: interface %s does not currently exist"
 msgstr "peringatan: antarmuka %s tidak ada"
 
-#: dnsmasq.c:369
+#: dnsmasq.c:373
 msgid "warning: ignoring resolv-file flag because no-resolv is set"
 msgstr ""
 
 # OK
-#: dnsmasq.c:383
+#: dnsmasq.c:376
+#, fuzzy
+msgid "warning: no upstream servers configured"
+msgstr "menyetel server-server di atas dengan DBus"
+
+# OK
+#: dnsmasq.c:389
 #, c-format
 msgid "DHCP, static leases only on %.0s%s, lease time %s"
 msgstr "DHCP, lease static pada %.0s%s, waktu lease %s"
 
 # OK
-#: dnsmasq.c:384
+#: dnsmasq.c:390
 #, c-format
 msgid "DHCP, IP range %s -- %s, lease time %s"
 msgstr "DHCP, jangkaun IP %s -- %s, waktu lease %s"
 
-#: dnsmasq.c:400
+#: dnsmasq.c:406
 msgid "root is "
 msgstr ""
 
 # OK
-#: dnsmasq.c:400
+#: dnsmasq.c:406
 #, fuzzy
 msgid "enabled"
 msgstr "di disable"
 
-#: dnsmasq.c:402
+#: dnsmasq.c:408
 msgid "secure mode"
 msgstr ""
 
-#: dnsmasq.c:422
+#: dnsmasq.c:428
 #, c-format
 msgid "restricting maximum simultaneous TFTP transfers to %d"
 msgstr ""
 
-#: dnsmasq.c:433
+#: dnsmasq.c:439
 #, c-format
 msgid "warning: setting capabilities failed: %m"
 msgstr ""
 
 # OK
-#: dnsmasq.c:435
+#: dnsmasq.c:441
 msgid "running as root"
 msgstr "berjalan menggunakan root"
 
 # OK
-#: dnsmasq.c:560
+#: dnsmasq.c:566
 #, fuzzy, c-format
 msgid "no servers found in %s, will retry"
 msgstr "tidak ditemukan direktif search di %s"
 
-#: dnsmasq.c:619
+#: dnsmasq.c:625
 msgid "exiting on receipt of SIGTERM"
 msgstr "keluar karena menerima SIGTERM"
 
 # OK
-#: dnsmasq.c:656
+#: dnsmasq.c:662
 msgid "connected to system DBus"
 msgstr "terhubung ke sistem DBus"
 
@@ -1082,122 +1088,121 @@
 msgstr "gagal membaca %s: %m"
 
 # OK
-#: rfc2131.c:261
+#: rfc2131.c:297
 #, c-format
 msgid "no address range available for DHCP request %s %s"
 msgstr "tidak ada alamat yang bisa dipakai untuk permintaan DHCP %s %s"
 
 # OK
-#: rfc2131.c:262
+#: rfc2131.c:298
 msgid "with subnet selector"
 msgstr "dengan pemilih subnet"
 
 # OK
-#: rfc2131.c:262
+#: rfc2131.c:298
 msgid "via"
 msgstr "lewat"
 
 # OK
-#: rfc2131.c:288 rfc2131.c:312
+#: rfc2131.c:322 rfc2131.c:347
 msgid "disabled"
 msgstr "di disable"
 
 # OK
-#: rfc2131.c:324 rfc2131.c:763
+#: rfc2131.c:359 rfc2131.c:814
 msgid "address in use"
 msgstr "alamat telah digunakan"
 
 # OK
-#: rfc2131.c:327
+#: rfc2131.c:362
 msgid "no address configured"
 msgstr "tak ada alamat yang disetel"
 
 # OK
-#: rfc2131.c:340 rfc2131.c:630
+#: rfc2131.c:375 rfc2131.c:682
 msgid "no address available"
 msgstr "tak ada alamat yang tersedia"
 
 # OK
-#: rfc2131.c:349 rfc2131.c:773
+#: rfc2131.c:384 rfc2131.c:824
 msgid "no leases left"
 msgstr "tak ada lease yang tersisa"
 
 # OK
-#: rfc2131.c:352 rfc2131.c:737
+#: rfc2131.c:387 rfc2131.c:788
 msgid "wrong network"
 msgstr "jaringan yang salah"
 
 # OK
-#: rfc2131.c:558
+#: rfc2131.c:605
 #, fuzzy, c-format
 msgid "disabling DHCP static address %s for %s"
 msgstr "men-disable alamat statik DHCP %s"
 
 # OK
-#: rfc2131.c:579
+#: rfc2131.c:626
 msgid "unknown lease"
 msgstr "lease tidak diketahui"
 
 # OK
-#: rfc2131.c:588 rfc2131.c:885
+#: rfc2131.c:635 rfc2131.c:934
 msgid "ignored"
 msgstr "diabaikan"
 
-#: rfc2131.c:604
+#: rfc2131.c:655
 #, c-format
 msgid "not using configured address %s because it is leased to %s"
 msgstr ""
 
-#: rfc2131.c:613
+#: rfc2131.c:665
 #, c-format
 msgid ""
 "not using configured address %s because it is in use by the server or relay"
 msgstr ""
 
-#: rfc2131.c:616
+#: rfc2131.c:668
 #, c-format
 msgid "not using configured address %s because it was previously declined"
 msgstr ""
 
 # OK
-#: rfc2131.c:700
+#: rfc2131.c:751
 msgid "wrong address"
 msgstr "alamat salah"
 
 # OK
-#: rfc2131.c:713
+#: rfc2131.c:764
 msgid "lease not found"
 msgstr "lease tak ditemukan"
 
 # OK
-#: rfc2131.c:745
+#: rfc2131.c:796
 msgid "address not available"
 msgstr "alamat tak tersedia"
 
 # OK
-#: rfc2131.c:756
+#: rfc2131.c:807
 msgid "static lease available"
 msgstr "lease statik tak tersedia"
 
 # OK
-#: rfc2131.c:760
+#: rfc2131.c:811
 msgid "address reserved"
 msgstr "alamat telah dipesan"
 
-#: rfc2131.c:766
+#: rfc2131.c:817
 msgid "no unique-id"
 msgstr ""
 
-#: rfc2131.c:1023
+#: rfc2131.c:1181
 #, c-format
 msgid "cannot send DHCP option %d: no space left in packet"
 msgstr ""
 
-# OK
-#: rfc2131.c:1322
+#: rfc2131.c:1476
 #, c-format
-msgid "More than one vendor class matches, using %s"
-msgstr "Lebih dari satu kelas vendor yang sesuai, menggunakan %s"
+msgid "cannot send encapsulated option %d: no space left in wrapper"
+msgstr ""
 
 # OK
 #: netlink.c:59
@@ -1262,29 +1267,33 @@
 msgid "unsupported request from %s"
 msgstr ""
 
-# OK
-#: tftp.c:226
-#, fuzzy, c-format
-msgid "file %s not found"
-msgstr "lease tak ditemukan"
-
-#: tftp.c:293
+#: tftp.c:229
 #, c-format
 msgid "TFTP sent %s to %s"
 msgstr ""
 
-#: tftp.c:343
+# OK
+#: tftp.c:296
+#, fuzzy, c-format
+msgid "file %s not found"
+msgstr "lease tak ditemukan"
+
+#: tftp.c:352
 #, c-format
 msgid "TFTP error %d %s received from %s"
 msgstr ""
 
 # OK
-#: tftp.c:374
+#: tftp.c:383
 #, fuzzy, c-format
 msgid "TFTP failed sending %s to %s"
 msgstr "gagal membaca %s: %m"
 
 # OK
+#~ msgid "More than one vendor class matches, using %s"
+#~ msgstr "Lebih dari satu kelas vendor yang sesuai, menggunakan %s"
+
+# OK
 #~ msgid "forwarding table overflow: check for server loops."
 #~ msgstr "meneruskan tabel overflow: memeriksa apakah terjadi loop server."
 
diff --git a/po/it.po b/po/it.po
index 925377f..618797f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: dnsmasq 2.32\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-21 15:53+0000\n"
+"POT-Creation-Date: 2007-02-05 14:27+0000\n"
 "PO-Revision-Date: 2006-05-22 11:09+0100\n"
 "Last-Translator: Simon Kelley <simon@thekelleys.org.uk>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -15,45 +15,45 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: cache.c:671
+#: cache.c:697
 #, c-format
 msgid "failed to load names from %s: %m"
 msgstr ""
 
-#: cache.c:705 dhcp.c:715
+#: cache.c:731 dhcp.c:715
 #, c-format
 msgid "bad address at %s line %d"
 msgstr ""
 
-#: cache.c:751 dhcp.c:729
+#: cache.c:777 dhcp.c:729
 #, c-format
 msgid "bad name at %s line %d"
 msgstr ""
 
-#: cache.c:758 dhcp.c:783
+#: cache.c:784 dhcp.c:783
 #, c-format
 msgid "read %s - %d addresses"
 msgstr ""
 
-#: cache.c:796
+#: cache.c:822
 msgid "cleared cache"
 msgstr ""
 
-#: cache.c:849
+#: cache.c:875
 #, c-format
 msgid ""
 "not giving name %s to the DHCP lease of %s because the name exists in %s "
 "with address %s"
 msgstr ""
 
-#: cache.c:893
+#: cache.c:919
 #, c-format
 msgid ""
 "time %lu, cache size %d, %d/%d cache insertions re-used unexpired cache "
 "entries."
 msgstr ""
 
-#: util.c:154 option.c:579
+#: util.c:154 option.c:582
 msgid "could not get memory"
 msgstr ""
 
@@ -389,189 +389,189 @@
 msgid "Valid options are :\n"
 msgstr ""
 
-#: option.c:428
+#: option.c:431
 msgid "bad dhcp-option"
 msgstr ""
 
-#: option.c:574
+#: option.c:577
 msgid "bad domain in dhcp-option"
 msgstr ""
 
-#: option.c:631
+#: option.c:634
 msgid "dhcp-option too long"
 msgstr ""
 
-#: option.c:693
+#: option.c:696
 #, c-format
 msgid "cannot access directory %s: %s"
 msgstr ""
 
-#: option.c:712 tftp.c:230
+#: option.c:715 tftp.c:300
 #, c-format
 msgid "cannot access %s: %s"
 msgstr ""
 
-#: option.c:789
+#: option.c:792
 msgid "bad MX preference"
 msgstr ""
 
-#: option.c:798
+#: option.c:801
 msgid "bad MX name"
 msgstr ""
 
-#: option.c:816
+#: option.c:819
 msgid "bad MX target"
 msgstr ""
 
-#: option.c:828
+#: option.c:831
 msgid "cannot run scripts under uClinux"
 msgstr ""
 
-#: option.c:1027 option.c:1038
+#: option.c:1030 option.c:1041
 msgid "bad port"
 msgstr ""
 
-#: option.c:1182
+#: option.c:1185
 msgid "bad bridge-interface"
 msgstr ""
 
-#: option.c:1226
+#: option.c:1229
 msgid "bad dhcp-range"
 msgstr ""
 
-#: option.c:1255
+#: option.c:1258
 msgid "only one netid tag allowed"
 msgstr ""
 
-#: option.c:1300
+#: option.c:1303
 msgid "inconsistent DHCP range"
 msgstr ""
 
-#: option.c:1485
+#: option.c:1488
 msgid "bad dhcp-host"
 msgstr ""
 
-#: option.c:1685
+#: option.c:1688
 msgid "bad PTR record"
 msgstr ""
 
-#: option.c:1710
+#: option.c:1713
 msgid "bad TXT record"
 msgstr ""
 
-#: option.c:1742
+#: option.c:1745
 msgid "TXT record string too long"
 msgstr ""
 
-#: option.c:1781
+#: option.c:1784
 msgid "bad SRV record"
 msgstr ""
 
-#: option.c:1794
+#: option.c:1797
 msgid "bad SRV target"
 msgstr ""
 
-#: option.c:1806
+#: option.c:1809
 msgid "invalid port number"
 msgstr ""
 
-#: option.c:1817
+#: option.c:1820
 msgid "invalid priority"
 msgstr ""
 
-#: option.c:1828
+#: option.c:1831
 msgid "invalid weight"
 msgstr ""
 
-#: option.c:1859
+#: option.c:1862
 #, c-format
 msgid "files nested too deep in %s"
 msgstr ""
 
-#: option.c:1866 tftp.c:235 tftp.c:366
+#: option.c:1869 tftp.c:450
 #, c-format
 msgid "cannot read %s: %s"
 msgstr ""
 
-#: option.c:1909
+#: option.c:1912
 msgid "missing \""
 msgstr ""
 
-#: option.c:1948
+#: option.c:1951
 msgid "bad option"
 msgstr ""
 
-#: option.c:1950
+#: option.c:1953
 msgid "extraneous parameter"
 msgstr ""
 
-#: option.c:1952
+#: option.c:1955
 msgid "missing parameter"
 msgstr ""
 
-#: option.c:1954
+#: option.c:1957
 msgid "error"
 msgstr ""
 
-#: option.c:2022
+#: option.c:2025
 #, c-format
 msgid "Dnsmasq version %s  %s\n"
 msgstr ""
 
-#: option.c:2023
+#: option.c:2026
 #, c-format
 msgid ""
 "Compile time options %s\n"
 "\n"
 msgstr ""
 
-#: option.c:2024
+#: option.c:2027
 #, c-format
 msgid "This software comes with ABSOLUTELY NO WARRANTY.\n"
 msgstr ""
 
-#: option.c:2025
+#: option.c:2028
 #, c-format
 msgid "Dnsmasq is free software, and you are welcome to redistribute it\n"
 msgstr ""
 
-#: option.c:2026
+#: option.c:2029
 #, c-format
 msgid "under the terms of the GNU General Public License, version 2.\n"
 msgstr ""
 
-#: option.c:2037
+#: option.c:2040
 msgid "try --help"
 msgstr ""
 
-#: option.c:2039
+#: option.c:2042
 msgid "try -w"
 msgstr ""
 
-#: option.c:2042
+#: option.c:2045
 #, c-format
 msgid "bad command line options: %s"
 msgstr ""
 
-#: option.c:2093
+#: option.c:2096
 #, c-format
 msgid "cannot get host-name: %s"
 msgstr ""
 
-#: option.c:2121
+#: option.c:2124
 msgid "only one resolv.conf file allowed in no-poll mode."
 msgstr ""
 
-#: option.c:2131
+#: option.c:2134
 msgid "must have exactly one resolv.conf to read domain from."
 msgstr ""
 
-#: option.c:2134
+#: option.c:2137
 #, c-format
 msgid "failed to read %s: %s"
 msgstr ""
 
-#: option.c:2152
+#: option.c:2155
 #, c-format
 msgid "no search directive found in %s"
 msgstr ""
@@ -581,7 +581,7 @@
 msgid "nameserver %s refused to do a recursive query"
 msgstr ""
 
-#: isc.c:73 dnsmasq.c:527
+#: isc.c:73 dnsmasq.c:533
 #, c-format
 msgid "failed to access %s: %m"
 msgstr ""
@@ -591,7 +591,7 @@
 msgid "failed to load %s: %m"
 msgstr ""
 
-#: isc.c:93 dnsmasq.c:549
+#: isc.c:93 dnsmasq.c:555
 #, c-format
 msgid "reading %s"
 msgstr ""
@@ -611,7 +611,7 @@
 msgid "unknown interface %s in bridge-interface"
 msgstr ""
 
-#: network.c:379 dnsmasq.c:137
+#: network.c:379 dnsmasq.c:141
 #, c-format
 msgid "failed to create listening socket: %s"
 msgstr ""
@@ -678,130 +678,134 @@
 msgid "failed to read %s: %m"
 msgstr ""
 
-#: dnsmasq.c:97
+#: dnsmasq.c:101
 msgid ""
 "ISC dhcpd integration not available: set HAVE_ISC_READER in src/config.h"
 msgstr ""
 
-#: dnsmasq.c:114
+#: dnsmasq.c:118
 msgid "TFTP server not available: set HAVE_TFTP in src/config.h"
 msgstr ""
 
-#: dnsmasq.c:119
+#: dnsmasq.c:123
 #, c-format
 msgid "failed to find list of interfaces: %s"
 msgstr ""
 
-#: dnsmasq.c:127
+#: dnsmasq.c:131
 #, c-format
 msgid "unknown interface %s"
 msgstr ""
 
-#: dnsmasq.c:133
+#: dnsmasq.c:137
 #, c-format
 msgid "no interface with address %s"
 msgstr ""
 
-#: dnsmasq.c:152
+#: dnsmasq.c:156
 msgid "must set exactly one interface on broken systems without IP_RECVIF"
 msgstr ""
 
-#: dnsmasq.c:165 dnsmasq.c:654
+#: dnsmasq.c:169 dnsmasq.c:660
 #, c-format
 msgid "DBus error: %s"
 msgstr ""
 
-#: dnsmasq.c:168
+#: dnsmasq.c:172
 msgid "DBus not available: set HAVE_DBUS in src/config.h"
 msgstr ""
 
-#: dnsmasq.c:199
+#: dnsmasq.c:203
 #, c-format
 msgid "cannot create pipe: %s"
 msgstr ""
 
-#: dnsmasq.c:342
+#: dnsmasq.c:346
 #, c-format
 msgid "started, version %s cachesize %d"
 msgstr ""
 
-#: dnsmasq.c:344
+#: dnsmasq.c:348
 #, c-format
 msgid "started, version %s cache disabled"
 msgstr ""
 
-#: dnsmasq.c:346
+#: dnsmasq.c:350
 #, c-format
 msgid "compile time options: %s"
 msgstr ""
 
-#: dnsmasq.c:352
+#: dnsmasq.c:356
 msgid "DBus support enabled: connected to system bus"
 msgstr ""
 
-#: dnsmasq.c:354
+#: dnsmasq.c:358
 msgid "DBus support enabled: bus connection pending"
 msgstr ""
 
-#: dnsmasq.c:359
+#: dnsmasq.c:363
 msgid "setting --bind-interfaces option because of OS limitations"
 msgstr ""
 
-#: dnsmasq.c:364
+#: dnsmasq.c:368
 #, c-format
 msgid "warning: interface %s does not currently exist"
 msgstr ""
 
-#: dnsmasq.c:369
+#: dnsmasq.c:373
 msgid "warning: ignoring resolv-file flag because no-resolv is set"
 msgstr ""
 
-#: dnsmasq.c:383
+#: dnsmasq.c:376
+msgid "warning: no upstream servers configured"
+msgstr ""
+
+#: dnsmasq.c:389
 #, c-format
 msgid "DHCP, static leases only on %.0s%s, lease time %s"
 msgstr ""
 
-#: dnsmasq.c:384
+#: dnsmasq.c:390
 #, c-format
 msgid "DHCP, IP range %s -- %s, lease time %s"
 msgstr ""
 
-#: dnsmasq.c:400
+#: dnsmasq.c:406
 msgid "root is "
 msgstr ""
 
-#: dnsmasq.c:400
+#: dnsmasq.c:406
 msgid "enabled"
 msgstr ""
 
-#: dnsmasq.c:402
+#: dnsmasq.c:408
 msgid "secure mode"
 msgstr ""
 
-#: dnsmasq.c:422
+#: dnsmasq.c:428
 #, c-format
 msgid "restricting maximum simultaneous TFTP transfers to %d"
 msgstr ""
 
-#: dnsmasq.c:433
+#: dnsmasq.c:439
 #, c-format
 msgid "warning: setting capabilities failed: %m"
 msgstr ""
 
-#: dnsmasq.c:435
+#: dnsmasq.c:441
 msgid "running as root"
 msgstr ""
 
-#: dnsmasq.c:560
+#: dnsmasq.c:566
 #, c-format
 msgid "no servers found in %s, will retry"
 msgstr ""
 
-#: dnsmasq.c:619
+#: dnsmasq.c:625
 msgid "exiting on receipt of SIGTERM"
 msgstr ""
 
-#: dnsmasq.c:656
+#: dnsmasq.c:662
 msgid "connected to system DBus"
 msgstr ""
 
@@ -889,104 +893,104 @@
 msgid "failed to write %s: %s (retry in %us)"
 msgstr ""
 
-#: rfc2131.c:261
+#: rfc2131.c:297
 #, c-format
 msgid "no address range available for DHCP request %s %s"
 msgstr ""
 
-#: rfc2131.c:262
+#: rfc2131.c:298
 msgid "with subnet selector"
 msgstr ""
 
-#: rfc2131.c:262
+#: rfc2131.c:298
 msgid "via"
 msgstr ""
 
-#: rfc2131.c:288 rfc2131.c:312
+#: rfc2131.c:322 rfc2131.c:347
 msgid "disabled"
 msgstr ""
 
-#: rfc2131.c:324 rfc2131.c:763
+#: rfc2131.c:359 rfc2131.c:814
 msgid "address in use"
 msgstr ""
 
-#: rfc2131.c:327
+#: rfc2131.c:362
 msgid "no address configured"
 msgstr ""
 
-#: rfc2131.c:340 rfc2131.c:630
+#: rfc2131.c:375 rfc2131.c:682
 msgid "no address available"
 msgstr ""
 
-#: rfc2131.c:349 rfc2131.c:773
+#: rfc2131.c:384 rfc2131.c:824
 msgid "no leases left"
 msgstr ""
 
-#: rfc2131.c:352 rfc2131.c:737
+#: rfc2131.c:387 rfc2131.c:788
 msgid "wrong network"
 msgstr ""
 
-#: rfc2131.c:558
+#: rfc2131.c:605
 #, c-format
 msgid "disabling DHCP static address %s for %s"
 msgstr ""
 
-#: rfc2131.c:579
+#: rfc2131.c:626
 msgid "unknown lease"
 msgstr ""
 
-#: rfc2131.c:588 rfc2131.c:885
+#: rfc2131.c:635 rfc2131.c:934
 msgid "ignored"
 msgstr ""
 
-#: rfc2131.c:604
+#: rfc2131.c:655
 #, c-format
 msgid "not using configured address %s because it is leased to %s"
 msgstr ""
 
-#: rfc2131.c:613
+#: rfc2131.c:665
 #, c-format
 msgid ""
 "not using configured address %s because it is in use by the server or relay"
 msgstr ""
 
-#: rfc2131.c:616
+#: rfc2131.c:668
 #, c-format
 msgid "not using configured address %s because it was previously declined"
 msgstr ""
 
-#: rfc2131.c:700
+#: rfc2131.c:751
 msgid "wrong address"
 msgstr ""
 
-#: rfc2131.c:713
+#: rfc2131.c:764
 msgid "lease not found"
 msgstr ""
 
-#: rfc2131.c:745
+#: rfc2131.c:796
 msgid "address not available"
 msgstr ""
 
-#: rfc2131.c:756
+#: rfc2131.c:807
 msgid "static lease available"
 msgstr ""
 
-#: rfc2131.c:760
+#: rfc2131.c:811
 msgid "address reserved"
 msgstr ""
 
-#: rfc2131.c:766
+#: rfc2131.c:817
 msgid "no unique-id"
 msgstr ""
 
-#: rfc2131.c:1023
+#: rfc2131.c:1181
 #, c-format
 msgid "cannot send DHCP option %d: no space left in packet"
 msgstr ""
 
-#: rfc2131.c:1322
+#: rfc2131.c:1476
 #, c-format
-msgid "More than one vendor class matches, using %s"
+msgid "cannot send encapsulated option %d: no space left in wrapper"
 msgstr ""
 
 #: netlink.c:59
@@ -1041,22 +1045,22 @@
 msgid "unsupported request from %s"
 msgstr ""
 
-#: tftp.c:226
-#, c-format
-msgid "file %s not found"
-msgstr ""
-
-#: tftp.c:293
+#: tftp.c:229
 #, c-format
 msgid "TFTP sent %s to %s"
 msgstr ""
 
-#: tftp.c:343
+#: tftp.c:296
+#, c-format
+msgid "file %s not found"
+msgstr ""
+
+#: tftp.c:352
 #, c-format
 msgid "TFTP error %d %s received from %s"
 msgstr ""
 
-#: tftp.c:374
+#: tftp.c:383
 #, c-format
 msgid "TFTP failed sending %s to %s"
 msgstr ""
diff --git a/po/no.po b/po/no.po
index 2a6a1b4..b6852ca 100644
--- a/po/no.po
+++ b/po/no.po
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: dnsmasq 2.25\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-21 15:53+0000\n"
+"POT-Creation-Date: 2007-02-05 14:27+0000\n"
 "PO-Revision-Date: 2006-01-11 17:39+0000\n"
 "Last-Translator: Jan Erik Askildt <jeaskildt@gmail.com>\n"
 "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
@@ -17,31 +17,31 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: cache.c:671
+#: cache.c:697
 #, c-format
 msgid "failed to load names from %s: %m"
 msgstr "feilet å laste navn fra %s: %m"
 
-#: cache.c:705 dhcp.c:715
+#: cache.c:731 dhcp.c:715
 #, c-format
 msgid "bad address at %s line %d"
 msgstr "dårlig adresse ved %s linje %d"
 
-#: cache.c:751 dhcp.c:729
+#: cache.c:777 dhcp.c:729
 #, c-format
 msgid "bad name at %s line %d"
 msgstr "dårlig navn ved %s linje %d"
 
-#: cache.c:758 dhcp.c:783
+#: cache.c:784 dhcp.c:783
 #, c-format
 msgid "read %s - %d addresses"
 msgstr "les %s - %d adresser"
 
-#: cache.c:796
+#: cache.c:822
 msgid "cleared cache"
 msgstr "mellomlager tømt"
 
-#: cache.c:849
+#: cache.c:875
 #, c-format
 msgid ""
 "not giving name %s to the DHCP lease of %s because the name exists in %s "
@@ -50,7 +50,7 @@
 "gir ikke navnet %s til DHCP leien for %s fordi navnet eksisterer i %s med "
 "adressen %s"
 
-#: cache.c:893
+#: cache.c:919
 #, fuzzy, c-format
 msgid ""
 "time %lu, cache size %d, %d/%d cache insertions re-used unexpired cache "
@@ -59,7 +59,7 @@
 "mellomlager størrelse %d, %d/%d mellomlager innsettinger re-bruker "
 "mellomlager plasser som ikke er utløpt"
 
-#: util.c:154 option.c:579
+#: util.c:154 option.c:582
 msgid "could not get memory"
 msgstr "kunne ikke få minne"
 
@@ -400,137 +400,137 @@
 msgid "Valid options are :\n"
 msgstr "Gyldige opsjoner er :\n"
 
-#: option.c:428
+#: option.c:431
 msgid "bad dhcp-option"
 msgstr "dårlig dhcp-opsjon"
 
-#: option.c:574
+#: option.c:577
 msgid "bad domain in dhcp-option"
 msgstr "dårlig domene i dhcp-opsjon"
 
-#: option.c:631
+#: option.c:634
 msgid "dhcp-option too long"
 msgstr "dhcp-opsjon for lang"
 
-#: option.c:693
+#: option.c:696
 #, fuzzy, c-format
 msgid "cannot access directory %s: %s"
 msgstr "kan ikke lese %s: %s"
 
-#: option.c:712 tftp.c:230
+#: option.c:715 tftp.c:300
 #, fuzzy, c-format
 msgid "cannot access %s: %s"
 msgstr "kan ikke lese %s: %s"
 
-#: option.c:789
+#: option.c:792
 msgid "bad MX preference"
 msgstr "dårlig MX preferanse"
 
-#: option.c:798
+#: option.c:801
 msgid "bad MX name"
 msgstr "dårlig MX navn"
 
-#: option.c:816
+#: option.c:819
 msgid "bad MX target"
 msgstr "dårlig MX mål"
 
-#: option.c:828
+#: option.c:831
 msgid "cannot run scripts under uClinux"
 msgstr ""
 
-#: option.c:1027 option.c:1038
+#: option.c:1030 option.c:1041
 msgid "bad port"
 msgstr "dårlig port"
 
-#: option.c:1182
+#: option.c:1185
 msgid "bad bridge-interface"
 msgstr ""
 
-#: option.c:1226
+#: option.c:1229
 msgid "bad dhcp-range"
 msgstr "dårlig dhcp-område"
 
-#: option.c:1255
+#: option.c:1258
 msgid "only one netid tag allowed"
 msgstr ""
 
-#: option.c:1300
+#: option.c:1303
 msgid "inconsistent DHCP range"
 msgstr "ikke konsistent DHCP område"
 
-#: option.c:1485
+#: option.c:1488
 msgid "bad dhcp-host"
 msgstr "dårlig dhcp-vert"
 
-#: option.c:1685
+#: option.c:1688
 #, fuzzy
 msgid "bad PTR record"
 msgstr "dårlig SRV post"
 
-#: option.c:1710
+#: option.c:1713
 msgid "bad TXT record"
 msgstr "dårlig TXT post"
 
-#: option.c:1742
+#: option.c:1745
 msgid "TXT record string too long"
 msgstr "TXT post streng for lang"
 
-#: option.c:1781
+#: option.c:1784
 msgid "bad SRV record"
 msgstr "dårlig SRV post"
 
-#: option.c:1794
+#: option.c:1797
 msgid "bad SRV target"
 msgstr "dårlig SRV mål"
 
-#: option.c:1806
+#: option.c:1809
 msgid "invalid port number"
 msgstr "ugyldig portnummer"
 
-#: option.c:1817
+#: option.c:1820
 msgid "invalid priority"
 msgstr "ugyldig prioritet"
 
-#: option.c:1828
+#: option.c:1831
 msgid "invalid weight"
 msgstr "ugyldig vekt"
 
-#: option.c:1859
+#: option.c:1862
 #, c-format
 msgid "files nested too deep in %s"
 msgstr ""
 
-#: option.c:1866 tftp.c:235 tftp.c:366
+#: option.c:1869 tftp.c:450
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "kan ikke lese %s: %s"
 
-#: option.c:1909
+#: option.c:1912
 msgid "missing \""
 msgstr "mangler \""
 
-#: option.c:1948
+#: option.c:1951
 msgid "bad option"
 msgstr "dårlig opsjon"
 
-#: option.c:1950
+#: option.c:1953
 msgid "extraneous parameter"
 msgstr "overflødig parameter"
 
-#: option.c:1952
+#: option.c:1955
 msgid "missing parameter"
 msgstr "mangler parameter"
 
-#: option.c:1954
+#: option.c:1957
 msgid "error"
 msgstr "feil"
 
-#: option.c:2022
+#: option.c:2025
 #, c-format
 msgid "Dnsmasq version %s  %s\n"
 msgstr "Dnsmasq versjon %s %s\n"
 
-#: option.c:2023
+#: option.c:2026
 #, c-format
 msgid ""
 "Compile time options %s\n"
@@ -539,53 +539,53 @@
 "Kompileringsopsjoner %s\n"
 "\n"
 
-#: option.c:2024
+#: option.c:2027
 #, c-format
 msgid "This software comes with ABSOLUTELY NO WARRANTY.\n"
 msgstr "Denne programvaren kommer med ABSOLUTT INGEN GARANTI.\n"
 
-#: option.c:2025
+#: option.c:2028
 #, 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:2026
+#: option.c:2029
 #, c-format
 msgid "under the terms of the GNU General Public License, version 2.\n"
 msgstr "under vilkårene gitt i GNU General Public License, versjon 2.\n"
 
-#: option.c:2037
+#: option.c:2040
 msgid "try --help"
 msgstr ""
 
-#: option.c:2039
+#: option.c:2042
 msgid "try -w"
 msgstr ""
 
-#: option.c:2042
+#: option.c:2045
 #, fuzzy, c-format
 msgid "bad command line options: %s"
 msgstr "dårlige kommandlinje opsjoner: %s."
 
-#: option.c:2093
+#: option.c:2096
 #, c-format
 msgid "cannot get host-name: %s"
 msgstr "klarer ikke å få vertsnavn: %s"
 
-#: option.c:2121
+#: option.c:2124
 msgid "only one resolv.conf file allowed in no-poll mode."
 msgstr "kun en resolv.conf fil tillat i no-poll modus."
 
-#: option.c:2131
+#: option.c:2134
 msgid "must have exactly one resolv.conf to read domain from."
 msgstr "må ha nøyaktig en resolv.conf å lese domene fra."
 
-#: option.c:2134
+#: option.c:2137
 #, fuzzy, c-format
 msgid "failed to read %s: %s"
 msgstr "feilet å lese %s: %m"
 
-#: option.c:2152
+#: option.c:2155
 #, c-format
 msgid "no search directive found in %s"
 msgstr "intet søke direktiv funnet i %s"
@@ -595,7 +595,7 @@
 msgid "nameserver %s refused to do a recursive query"
 msgstr "navnetjener %s nektet å gjøre et rekursivt oppslag"
 
-#: isc.c:73 dnsmasq.c:527
+#: isc.c:73 dnsmasq.c:533
 #, c-format
 msgid "failed to access %s: %m"
 msgstr "feilet å få tilgang til %s: %m"
@@ -605,7 +605,7 @@
 msgid "failed to load %s: %m"
 msgstr "feilet å laste %s: %m"
 
-#: isc.c:93 dnsmasq.c:549
+#: isc.c:93 dnsmasq.c:555
 #, c-format
 msgid "reading %s"
 msgstr "leser %s"
@@ -625,7 +625,7 @@
 msgid "unknown interface %s in bridge-interface"
 msgstr "ukjent tilknytning (interface) %s"
 
-#: network.c:379 dnsmasq.c:137
+#: network.c:379 dnsmasq.c:141
 #, c-format
 msgid "failed to create listening socket: %s"
 msgstr "feilet å lage lytte socket: %s"
@@ -692,133 +692,138 @@
 msgid "failed to read %s: %m"
 msgstr "feilet å lese %s: %m"
 
-#: dnsmasq.c:97
+#: dnsmasq.c:101
 msgid ""
 "ISC dhcpd integration not available: set HAVE_ISC_READER in src/config.h"
 msgstr ""
 "ISC dhcpf integrasjon ikke tilgjengelig: sett HAVE_ISC_READER i src/config.h"
 
-#: dnsmasq.c:114
+#: dnsmasq.c:118
 #, fuzzy
 msgid "TFTP server not available: set HAVE_TFTP in src/config.h"
 msgstr "DBus ikke tilgjengelig: sett HAVE_DBUS i src/config.h"
 
-#: dnsmasq.c:119
+#: dnsmasq.c:123
 #, c-format
 msgid "failed to find list of interfaces: %s"
 msgstr "feilet å finne liste av tilknytninger (interfaces): %s"
 
-#: dnsmasq.c:127
+#: dnsmasq.c:131
 #, c-format
 msgid "unknown interface %s"
 msgstr "ukjent tilknytning (interface) %s"
 
-#: dnsmasq.c:133
+#: dnsmasq.c:137
 #, c-format
 msgid "no interface with address %s"
 msgstr "ingen tilknytning (interface) med adresse %s"
 
-#: dnsmasq.c:152
+#: dnsmasq.c:156
 msgid "must set exactly one interface on broken systems without IP_RECVIF"
 msgstr "må sette nøyaktig et interface på ødelagte systemer uten IP_RECVIF"
 
-#: dnsmasq.c:165 dnsmasq.c:654
+#: dnsmasq.c:169 dnsmasq.c:660
 #, c-format
 msgid "DBus error: %s"
 msgstr "DBus feil: %s"
 
-#: dnsmasq.c:168
+#: dnsmasq.c:172
 msgid "DBus not available: set HAVE_DBUS in src/config.h"
 msgstr "DBus ikke tilgjengelig: sett HAVE_DBUS i src/config.h"
 
-#: dnsmasq.c:199
+#: dnsmasq.c:203
 #, fuzzy, c-format
 msgid "cannot create pipe: %s"
 msgstr "kan ikke lese %s: %s"
 
-#: dnsmasq.c:342
+#: dnsmasq.c:346
 #, c-format
 msgid "started, version %s cachesize %d"
 msgstr "startet, versjon %s mellomlager størrelse %d"
 
-#: dnsmasq.c:344
+#: dnsmasq.c:348
 #, c-format
 msgid "started, version %s cache disabled"
 msgstr "startet, versjon %s mellomlager deaktivert"
 
-#: dnsmasq.c:346
+#: dnsmasq.c:350
 #, c-format
 msgid "compile time options: %s"
 msgstr "kompilerings opsjoner: %s"
 
-#: dnsmasq.c:352
+#: dnsmasq.c:356
 msgid "DBus support enabled: connected to system bus"
 msgstr "DBus støtte aktivert: koblet til system buss"
 
-#: dnsmasq.c:354
+#: dnsmasq.c:358
 msgid "DBus support enabled: bus connection pending"
 msgstr "DBus støtte aktivert: avventer buss tilkobling"
 
-#: dnsmasq.c:359
+#: dnsmasq.c:363
 msgid "setting --bind-interfaces option because of OS limitations"
 msgstr "setter --bind-interfaces opsjon på grunn av OS begrensninger"
 
-#: dnsmasq.c:364
+#: dnsmasq.c:368
 #, c-format
 msgid "warning: interface %s does not currently exist"
 msgstr "advarsel: nettverkskort %s eksisterer ikke for tiden"
 
-#: dnsmasq.c:369
+#: dnsmasq.c:373
 msgid "warning: ignoring resolv-file flag because no-resolv is set"
 msgstr ""
 
-#: dnsmasq.c:383
+#: dnsmasq.c:376
+#, fuzzy
+msgid "warning: no upstream servers configured"
+msgstr "setter oppstrøms tjener fra DBus"
+
+#: dnsmasq.c:389
 #, c-format
 msgid "DHCP, static leases only on %.0s%s, lease time %s"
 msgstr "DHCP, statisk leie kun på %.0s%s, leie tid %s"
 
-#: dnsmasq.c:384
+#: dnsmasq.c:390
 #, c-format
 msgid "DHCP, IP range %s -- %s, lease time %s"
 msgstr "DHCP, IP område %s -- %s, leie tid %s"
 
-#: dnsmasq.c:400
+#: dnsmasq.c:406
 msgid "root is "
 msgstr ""
 
-#: dnsmasq.c:400
+#: dnsmasq.c:406
 #, fuzzy
 msgid "enabled"
 msgstr "deaktivert"
 
-#: dnsmasq.c:402
+#: dnsmasq.c:408
 msgid "secure mode"
 msgstr ""
 
-#: dnsmasq.c:422
+#: dnsmasq.c:428
 #, c-format
 msgid "restricting maximum simultaneous TFTP transfers to %d"
 msgstr ""
 
-#: dnsmasq.c:433
+#: dnsmasq.c:439
 #, c-format
 msgid "warning: setting capabilities failed: %m"
 msgstr ""
 
-#: dnsmasq.c:435
+#: dnsmasq.c:441
 msgid "running as root"
 msgstr "kjører som rot (root)"
 
-#: dnsmasq.c:560
+#: dnsmasq.c:566
 #, fuzzy, c-format
 msgid "no servers found in %s, will retry"
 msgstr "intet søke direktiv funnet i %s"
 
-#: dnsmasq.c:619
+#: dnsmasq.c:625
 msgid "exiting on receipt of SIGTERM"
 msgstr "avslutter etter mottak av SIGTERM"
 
-#: dnsmasq.c:656
+#: dnsmasq.c:662
 msgid "connected to system DBus"
 msgstr "tilkoblet til system DBus"
 
@@ -906,105 +911,105 @@
 msgid "failed to write %s: %s (retry in %us)"
 msgstr "feilet å lese %s: %m"
 
-#: rfc2131.c:261
+#: rfc2131.c:297
 #, c-format
 msgid "no address range available for DHCP request %s %s"
 msgstr "ingen adresse område tilgjengelig for DHCP krav %s %s"
 
-#: rfc2131.c:262
+#: rfc2131.c:298
 msgid "with subnet selector"
 msgstr "med subnet velger"
 
-#: rfc2131.c:262
+#: rfc2131.c:298
 msgid "via"
 msgstr "via"
 
-#: rfc2131.c:288 rfc2131.c:312
+#: rfc2131.c:322 rfc2131.c:347
 msgid "disabled"
 msgstr "deaktivert"
 
-#: rfc2131.c:324 rfc2131.c:763
+#: rfc2131.c:359 rfc2131.c:814
 msgid "address in use"
 msgstr "adresse i bruk"
 
-#: rfc2131.c:327
+#: rfc2131.c:362
 msgid "no address configured"
 msgstr "ingen adresse konfigurert"
 
-#: rfc2131.c:340 rfc2131.c:630
+#: rfc2131.c:375 rfc2131.c:682
 msgid "no address available"
 msgstr "ingen adresse tilgjengelig"
 
-#: rfc2131.c:349 rfc2131.c:773
+#: rfc2131.c:384 rfc2131.c:824
 msgid "no leases left"
 msgstr "ingen leier igjen"
 
-#: rfc2131.c:352 rfc2131.c:737
+#: rfc2131.c:387 rfc2131.c:788
 msgid "wrong network"
 msgstr "galt nettverk"
 
-#: rfc2131.c:558
+#: rfc2131.c:605
 #, fuzzy, c-format
 msgid "disabling DHCP static address %s for %s"
 msgstr "deaktiverer DHCP statisk adresse %s"
 
-#: rfc2131.c:579
+#: rfc2131.c:626
 msgid "unknown lease"
 msgstr "ukjent leie"
 
-#: rfc2131.c:588 rfc2131.c:885
+#: rfc2131.c:635 rfc2131.c:934
 msgid "ignored"
 msgstr "oversett"
 
-#: rfc2131.c:604
+#: rfc2131.c:655
 #, c-format
 msgid "not using configured address %s because it is leased to %s"
 msgstr ""
 
-#: rfc2131.c:613
+#: rfc2131.c:665
 #, c-format
 msgid ""
 "not using configured address %s because it is in use by the server or relay"
 msgstr ""
 
-#: rfc2131.c:616
+#: rfc2131.c:668
 #, c-format
 msgid "not using configured address %s because it was previously declined"
 msgstr ""
 
-#: rfc2131.c:700
+#: rfc2131.c:751
 msgid "wrong address"
 msgstr "gal adresse"
 
-#: rfc2131.c:713
+#: rfc2131.c:764
 msgid "lease not found"
 msgstr "leie ikke funnet"
 
-#: rfc2131.c:745
+#: rfc2131.c:796
 msgid "address not available"
 msgstr "adresse ikke tilgjengelig"
 
-#: rfc2131.c:756
+#: rfc2131.c:807
 msgid "static lease available"
 msgstr "statisk leie tilgjengelig"
 
-#: rfc2131.c:760
+#: rfc2131.c:811
 msgid "address reserved"
 msgstr "adresse reservert"
 
-#: rfc2131.c:766
+#: rfc2131.c:817
 msgid "no unique-id"
 msgstr ""
 
-#: rfc2131.c:1023
+#: rfc2131.c:1181
 #, c-format
 msgid "cannot send DHCP option %d: no space left in packet"
 msgstr "kan ikke sende DHCP opsjon %d: ikke mer plass i pakken"
 
-#: rfc2131.c:1322
-#, c-format
-msgid "More than one vendor class matches, using %s"
-msgstr "Mer enn en produsent klasse som passer, bruker %s"
+#: rfc2131.c:1476
+#, fuzzy, c-format
+msgid "cannot send encapsulated option %d: no space left in wrapper"
+msgstr "kan ikke sende DHCP opsjon %d: ikke mer plass i pakken"
 
 #: netlink.c:59
 #, fuzzy, c-format
@@ -1058,26 +1063,29 @@
 msgid "unsupported request from %s"
 msgstr ""
 
-#: tftp.c:226
-#, fuzzy, c-format
-msgid "file %s not found"
-msgstr "leie ikke funnet"
-
-#: tftp.c:293
+#: tftp.c:229
 #, c-format
 msgid "TFTP sent %s to %s"
 msgstr ""
 
-#: tftp.c:343
+#: tftp.c:296
+#, fuzzy, c-format
+msgid "file %s not found"
+msgstr "leie ikke funnet"
+
+#: tftp.c:352
 #, c-format
 msgid "TFTP error %d %s received from %s"
 msgstr ""
 
-#: tftp.c:374
+#: tftp.c:383
 #, fuzzy, c-format
 msgid "TFTP failed sending %s to %s"
 msgstr "feilet å lese %s: %m"
 
+#~ msgid "More than one vendor class matches, using %s"
+#~ msgstr "Mer enn en produsent klasse som passer, bruker %s"
+
 #~ msgid "forwarding table overflow: check for server loops."
 #~ msgstr ""
 #~ "fremsendelse (forwarding) tabell overflyt: sjekk etter tjener løkker."
diff --git a/po/pl.po b/po/pl.po
index 0fca34b..a9750d5 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: dnsmasq 2.24\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-21 15:53+0000\n"
+"POT-Creation-Date: 2007-02-05 14:27+0000\n"
 "PO-Revision-Date: 2005-10-04 19:17+0100\n"
 "Last-Translator: Tomasz Sochañski <nerdhero@gmail.com>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -16,31 +16,31 @@
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
-#: cache.c:671
+#: cache.c:697
 #, c-format
 msgid "failed to load names from %s: %m"
 msgstr "b³±d ³adowania nazw z %s: %m"
 
-#: cache.c:705 dhcp.c:715
+#: cache.c:731 dhcp.c:715
 #, fuzzy, c-format
 msgid "bad address at %s line %d"
 msgstr "b³êdna nazwa w %s, linia %d"
 
-#: cache.c:751 dhcp.c:729
+#: cache.c:777 dhcp.c:729
 #, c-format
 msgid "bad name at %s line %d"
 msgstr "b³êdna nazwa w %s, linia %d"
 
-#: cache.c:758 dhcp.c:783
+#: cache.c:784 dhcp.c:783
 #, c-format
 msgid "read %s - %d addresses"
 msgstr "przeczytano %s - %d adresów"
 
-#: cache.c:796
+#: cache.c:822
 msgid "cleared cache"
 msgstr "wyczyszczono cache"
 
-#: cache.c:849
+#: cache.c:875
 #, c-format
 msgid ""
 "not giving name %s to the DHCP lease of %s because the name exists in %s "
@@ -49,7 +49,7 @@
 "nazwa %s nie zosta³a nadana dzier¿awie DHCP %s, poniewa¿ nazwa istnieje w %s "
 "i ma adres %s"
 
-#: cache.c:893
+#: cache.c:919
 #, fuzzy, c-format
 msgid ""
 "time %lu, cache size %d, %d/%d cache insertions re-used unexpired cache "
@@ -57,7 +57,7 @@
 msgstr ""
 "wielko¶æ cache %d, %d/%d wpisów cache u¿yto ponownie z niewygas³ych wpisów"
 
-#: util.c:154 option.c:579
+#: util.c:154 option.c:582
 msgid "could not get memory"
 msgstr "nie mo¿na pobraæ pamiêci"
 
@@ -409,137 +409,137 @@
 msgid "Valid options are :\n"
 msgstr "Obs³ugiwane opcje:\n"
 
-#: option.c:428
+#: option.c:431
 msgid "bad dhcp-option"
 msgstr "b³±d w dhcp-option"
 
-#: option.c:574
+#: option.c:577
 msgid "bad domain in dhcp-option"
 msgstr "nieprawid³owa nazwa domeny w dhcp-option"
 
-#: option.c:631
+#: option.c:634
 msgid "dhcp-option too long"
 msgstr "zbyt d³uga nazwa w dhcp-option"
 
-#: option.c:693
+#: option.c:696
 #, fuzzy, c-format
 msgid "cannot access directory %s: %s"
 msgstr "b³±d odczytu z %s: %s"
 
-#: option.c:712 tftp.c:230
+#: option.c:715 tftp.c:300
 #, fuzzy, c-format
 msgid "cannot access %s: %s"
 msgstr "b³±d odczytu z %s: %s"
 
-#: option.c:789
+#: option.c:792
 msgid "bad MX preference"
 msgstr ""
 
-#: option.c:798
+#: option.c:801
 msgid "bad MX name"
 msgstr "b³êdna nazwa MX"
 
-#: option.c:816
+#: option.c:819
 msgid "bad MX target"
 msgstr "b³êdny cel MX"
 
-#: option.c:828
+#: option.c:831
 msgid "cannot run scripts under uClinux"
 msgstr ""
 
-#: option.c:1027 option.c:1038
+#: option.c:1030 option.c:1041
 msgid "bad port"
 msgstr "nieprawid³owy port"
 
-#: option.c:1182
+#: option.c:1185
 msgid "bad bridge-interface"
 msgstr ""
 
-#: option.c:1226
+#: option.c:1229
 msgid "bad dhcp-range"
 msgstr "nieprawid³owy zakres dhcp-range"
 
-#: option.c:1255
+#: option.c:1258
 msgid "only one netid tag allowed"
 msgstr ""
 
-#: option.c:1300
+#: option.c:1303
 msgid "inconsistent DHCP range"
 msgstr "niespójny zakres DHCP"
 
-#: option.c:1485
+#: option.c:1488
 msgid "bad dhcp-host"
 msgstr "b³±d w dhcp-host"
 
-#: option.c:1685
+#: option.c:1688
 #, fuzzy
 msgid "bad PTR record"
 msgstr "b³±d w rekordzie SRV"
 
-#: option.c:1710
+#: option.c:1713
 msgid "bad TXT record"
 msgstr "nieprawid³owy rekord TX"
 
-#: option.c:1742
+#: option.c:1745
 msgid "TXT record string too long"
 msgstr "zbyt d³ugi rekord TXT"
 
-#: option.c:1781
+#: option.c:1784
 msgid "bad SRV record"
 msgstr "b³±d w rekordzie SRV"
 
-#: option.c:1794
+#: option.c:1797
 msgid "bad SRV target"
 msgstr "nieprawid³owy cel SRV"
 
-#: option.c:1806
+#: option.c:1809
 msgid "invalid port number"
 msgstr "nieprawid³owy port"
 
-#: option.c:1817
+#: option.c:1820
 msgid "invalid priority"
 msgstr "nieprawid³owy priorytet"
 
-#: option.c:1828
+#: option.c:1831
 msgid "invalid weight"
 msgstr "nieprawid³owe znaczenie"
 
-#: option.c:1859
+#: option.c:1862
 #, c-format
 msgid "files nested too deep in %s"
 msgstr ""
 
-#: option.c:1866 tftp.c:235 tftp.c:366
+#: option.c:1869 tftp.c:450
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "b³±d odczytu z %s: %s"
 
-#: option.c:1909
+#: option.c:1912
 msgid "missing \""
 msgstr "brakuje \""
 
-#: option.c:1948
+#: option.c:1951
 msgid "bad option"
 msgstr "nieprawid³owa opcja"
 
-#: option.c:1950
+#: option.c:1953
 msgid "extraneous parameter"
 msgstr "dodatkowy parametr"
 
-#: option.c:1952
+#: option.c:1955
 msgid "missing parameter"
 msgstr "brak parametru"
 
-#: option.c:1954
+#: option.c:1957
 msgid "error"
 msgstr "b³±d"
 
-#: option.c:2022
+#: option.c:2025
 #, c-format
 msgid "Dnsmasq version %s  %s\n"
 msgstr "Dnsmasq, wersja %s %s\n"
 
-#: option.c:2023
+#: option.c:2026
 #, c-format
 msgid ""
 "Compile time options %s\n"
@@ -548,53 +548,53 @@
 "Wkompilowane opcje %s\n"
 "\n"
 
-#: option.c:2024
+#: option.c:2027
 #, c-format
 msgid "This software comes with ABSOLUTELY NO WARRANTY.\n"
 msgstr "Oprogramowanie to nie zawiera ¿adnych gwarancji.\n"
 
-#: option.c:2025
+#: option.c:2028
 #, c-format
 msgid "Dnsmasq is free software, and you are welcome to redistribute it\n"
 msgstr "Dnsmasq jest wolnym oprogramowaniem, mo¿esz je rozprowadzaæ\n"
 
-#: option.c:2026
+#: option.c:2029
 #, c-format
 msgid "under the terms of the GNU General Public License, version 2.\n"
 msgstr "na warunkach okre¶lonych w GNU General Public Licence, wersja 2.\n"
 
-#: option.c:2037
+#: option.c:2040
 msgid "try --help"
 msgstr ""
 
-#: option.c:2039
+#: option.c:2042
 msgid "try -w"
 msgstr ""
 
-#: option.c:2042
+#: option.c:2045
 #, fuzzy, c-format
 msgid "bad command line options: %s"
 msgstr "nieprawid³owa opcja linii komend: %s."
 
-#: option.c:2093
+#: option.c:2096
 #, c-format
 msgid "cannot get host-name: %s"
 msgstr "nie mo¿na pobraæ nazwy hosta: %s"
 
-#: option.c:2121
+#: option.c:2124
 msgid "only one resolv.conf file allowed in no-poll mode."
 msgstr "tylko jeden plik resolv.conf jest dopuszczany w trybie no-poll."
 
-#: option.c:2131
+#: option.c:2134
 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:2134
+#: option.c:2137
 #, fuzzy, c-format
 msgid "failed to read %s: %s"
 msgstr "b³±d w odczycie %s: %m"
 
-#: option.c:2152
+#: option.c:2155
 #, c-format
 msgid "no search directive found in %s"
 msgstr "brak wytycznych wyszukiwania w %s"
@@ -604,7 +604,7 @@
 msgid "nameserver %s refused to do a recursive query"
 msgstr "serwer nazw %s odmawia wykonania zapytania rekursywnego"
 
-#: isc.c:73 dnsmasq.c:527
+#: isc.c:73 dnsmasq.c:533
 #, c-format
 msgid "failed to access %s: %m"
 msgstr "b³±d w dostêpie do %s: %m"
@@ -614,7 +614,7 @@
 msgid "failed to load %s: %m"
 msgstr "b³±d ³adowania %s: %m"
 
-#: isc.c:93 dnsmasq.c:549
+#: isc.c:93 dnsmasq.c:555
 #, c-format
 msgid "reading %s"
 msgstr "czytanie %s"
@@ -636,7 +636,7 @@
 msgid "unknown interface %s in bridge-interface"
 msgstr "nieznany interfejs %s"
 
-#: network.c:379 dnsmasq.c:137
+#: network.c:379 dnsmasq.c:141
 #, c-format
 msgid "failed to create listening socket: %s"
 msgstr "b³±d podczas tworzenia gniazda: %s"
@@ -703,134 +703,139 @@
 msgid "failed to read %s: %m"
 msgstr "b³±d w odczycie %s: %m"
 
-#: dnsmasq.c:97
+#: dnsmasq.c:101
 msgid ""
 "ISC dhcpd integration not available: set HAVE_ISC_READER in src/config.h"
 msgstr ""
 "Intergracja z ISC dhcpd nie jest dostêpna: ustaw HAVE_ISC_READER w src/"
 "config.h"
 
-#: dnsmasq.c:114
+#: dnsmasq.c:118
 #, fuzzy
 msgid "TFTP server not available: set HAVE_TFTP in src/config.h"
 msgstr "DBus jest niedostêpny: ustaw HAVE_DBUS w src/config.h"
 
-#: dnsmasq.c:119
+#: dnsmasq.c:123
 #, c-format
 msgid "failed to find list of interfaces: %s"
 msgstr "b³±d w znalezieniu listy interfejsów sieciowych: %s"
 
-#: dnsmasq.c:127
+#: dnsmasq.c:131
 #, c-format
 msgid "unknown interface %s"
 msgstr "nieznany interfejs %s"
 
-#: dnsmasq.c:133
+#: dnsmasq.c:137
 #, c-format
 msgid "no interface with address %s"
 msgstr "brak interfejsu z adresem %s"
 
-#: dnsmasq.c:152
+#: dnsmasq.c:156
 msgid "must set exactly one interface on broken systems without IP_RECVIF"
 msgstr "musisz ustawiæ dok³adnie jeden interfejs w systemach bez IP_RECVIF"
 
-#: dnsmasq.c:165 dnsmasq.c:654
+#: dnsmasq.c:169 dnsmasq.c:660
 #, c-format
 msgid "DBus error: %s"
 msgstr "b³±d DBus: %s"
 
-#: dnsmasq.c:168
+#: dnsmasq.c:172
 msgid "DBus not available: set HAVE_DBUS in src/config.h"
 msgstr "DBus jest niedostêpny: ustaw HAVE_DBUS w src/config.h"
 
-#: dnsmasq.c:199
+#: dnsmasq.c:203
 #, fuzzy, c-format
 msgid "cannot create pipe: %s"
 msgstr "b³±d odczytu z %s: %s"
 
-#: dnsmasq.c:342
+#: dnsmasq.c:346
 #, c-format
 msgid "started, version %s cachesize %d"
 msgstr "uruchomiony, wersja %s wielko¶æ cache %d"
 
-#: dnsmasq.c:344
+#: dnsmasq.c:348
 #, c-format
 msgid "started, version %s cache disabled"
 msgstr "uruchomiony, wersja %s cache wy³±czony"
 
-#: dnsmasq.c:346
+#: dnsmasq.c:350
 #, c-format
 msgid "compile time options: %s"
 msgstr "opcje kompilacji: %s"
 
-#: dnsmasq.c:352
+#: dnsmasq.c:356
 msgid "DBus support enabled: connected to system bus"
 msgstr "obs³uga DBus w³±czona: pod³±czono do szyny systemowej"
 
-#: dnsmasq.c:354
+#: dnsmasq.c:358
 msgid "DBus support enabled: bus connection pending"
 msgstr "obs³uga DBus w³±czona: pod³±czanie do szyny systemowej w toku"
 
-#: dnsmasq.c:359
+#: dnsmasq.c:363
 msgid "setting --bind-interfaces option because of OS limitations"
 msgstr "ustawiam opcjê --bind-interfaces z powodu limitów systemu operacyjnego"
 
-#: dnsmasq.c:364
+#: dnsmasq.c:368
 #, c-format
 msgid "warning: interface %s does not currently exist"
 msgstr "ostrze¿enie: interfejs %s obecnie nie istnieje"
 
-#: dnsmasq.c:369
+#: dnsmasq.c:373
 msgid "warning: ignoring resolv-file flag because no-resolv is set"
 msgstr ""
 
-#: dnsmasq.c:383
+#: dnsmasq.c:376
+#, fuzzy
+msgid "warning: no upstream servers configured"
+msgstr "brak skonfigurowanego adresu"
+
+#: dnsmasq.c:389
 #, c-format
 msgid "DHCP, static leases only on %.0s%s, lease time %s"
 msgstr "DHCP, statyczne dzier¿awy tylko na %.0s%s, czas dzier¿awy %s"
 
-#: dnsmasq.c:384
+#: dnsmasq.c:390
 #, c-format
 msgid "DHCP, IP range %s -- %s, lease time %s"
 msgstr "DHCP, zakres IP %s -- %s, czas dzier¿awy %s"
 
-#: dnsmasq.c:400
+#: dnsmasq.c:406
 msgid "root is "
 msgstr ""
 
-#: dnsmasq.c:400
+#: dnsmasq.c:406
 #, fuzzy
 msgid "enabled"
 msgstr "wy³±czony(a)"
 
-#: dnsmasq.c:402
+#: dnsmasq.c:408
 msgid "secure mode"
 msgstr ""
 
-#: dnsmasq.c:422
+#: dnsmasq.c:428
 #, c-format
 msgid "restricting maximum simultaneous TFTP transfers to %d"
 msgstr ""
 
-#: dnsmasq.c:433
+#: dnsmasq.c:439
 #, c-format
 msgid "warning: setting capabilities failed: %m"
 msgstr ""
 
-#: dnsmasq.c:435
+#: dnsmasq.c:441
 msgid "running as root"
 msgstr "pracuje z uprawnieniami u¿ytkownika root"
 
-#: dnsmasq.c:560
+#: dnsmasq.c:566
 #, fuzzy, c-format
 msgid "no servers found in %s, will retry"
 msgstr "brak wytycznych wyszukiwania w %s"
 
-#: dnsmasq.c:619
+#: dnsmasq.c:625
 msgid "exiting on receipt of SIGTERM"
 msgstr "wy³±czenie po otrzymaniu sygnalu SIGTERM"
 
-#: dnsmasq.c:656
+#: dnsmasq.c:662
 msgid "connected to system DBus"
 msgstr "po³±czono do systemowego DBus"
 
@@ -919,105 +924,105 @@
 msgid "failed to write %s: %s (retry in %us)"
 msgstr "b³±d w odczycie %s: %m"
 
-#: rfc2131.c:261
+#: rfc2131.c:297
 #, c-format
 msgid "no address range available for DHCP request %s %s"
 msgstr "¿aden zakres adresowy nie jest dostêpny dla ¿adania DHCP %s %s"
 
-#: rfc2131.c:262
+#: rfc2131.c:298
 msgid "with subnet selector"
 msgstr "z selekcj± podsieci"
 
-#: rfc2131.c:262
+#: rfc2131.c:298
 msgid "via"
 msgstr "przez"
 
-#: rfc2131.c:288 rfc2131.c:312
+#: rfc2131.c:322 rfc2131.c:347
 msgid "disabled"
 msgstr "wy³±czony(a)"
 
-#: rfc2131.c:324 rfc2131.c:763
+#: rfc2131.c:359 rfc2131.c:814
 msgid "address in use"
 msgstr "adres w u¿yciu"
 
-#: rfc2131.c:327
+#: rfc2131.c:362
 msgid "no address configured"
 msgstr "brak skonfigurowanego adresu"
 
-#: rfc2131.c:340 rfc2131.c:630
+#: rfc2131.c:375 rfc2131.c:682
 msgid "no address available"
 msgstr "brak dostêpnego adresu"
 
-#: rfc2131.c:349 rfc2131.c:773
+#: rfc2131.c:384 rfc2131.c:824
 msgid "no leases left"
 msgstr "brak wolnych dzier¿aw"
 
-#: rfc2131.c:352 rfc2131.c:737
+#: rfc2131.c:387 rfc2131.c:788
 msgid "wrong network"
 msgstr "nieprawid³owa sieæ"
 
-#: rfc2131.c:558
+#: rfc2131.c:605
 #, fuzzy, c-format
 msgid "disabling DHCP static address %s for %s"
 msgstr "wy³±czanie statycznego adresu DHCP %s"
 
-#: rfc2131.c:579
+#: rfc2131.c:626
 msgid "unknown lease"
 msgstr "nieznana dzier¿awa"
 
-#: rfc2131.c:588 rfc2131.c:885
+#: rfc2131.c:635 rfc2131.c:934
 msgid "ignored"
 msgstr "ignorujê"
 
-#: rfc2131.c:604
+#: rfc2131.c:655
 #, c-format
 msgid "not using configured address %s because it is leased to %s"
 msgstr ""
 
-#: rfc2131.c:613
+#: rfc2131.c:665
 #, c-format
 msgid ""
 "not using configured address %s because it is in use by the server or relay"
 msgstr ""
 
-#: rfc2131.c:616
+#: rfc2131.c:668
 #, c-format
 msgid "not using configured address %s because it was previously declined"
 msgstr ""
 
-#: rfc2131.c:700
+#: rfc2131.c:751
 msgid "wrong address"
 msgstr "b³êdny adres"
 
-#: rfc2131.c:713
+#: rfc2131.c:764
 msgid "lease not found"
 msgstr "dzier¿awa nie znaleziona"
 
-#: rfc2131.c:745
+#: rfc2131.c:796
 msgid "address not available"
 msgstr "adres niedostêpny"
 
-#: rfc2131.c:756
+#: rfc2131.c:807
 msgid "static lease available"
 msgstr "dostêpna statyczna dzier¿awa"
 
-#: rfc2131.c:760
+#: rfc2131.c:811
 msgid "address reserved"
 msgstr "adres zarezerwowany"
 
-#: rfc2131.c:766
+#: rfc2131.c:817
 msgid "no unique-id"
 msgstr ""
 
-#: rfc2131.c:1023
+#: rfc2131.c:1181
 #, c-format
 msgid "cannot send DHCP option %d: no space left in packet"
 msgstr ""
 
-#: rfc2131.c:1322
+#: rfc2131.c:1476
 #, c-format
-msgid "More than one vendor class matches, using %s"
-msgstr "Wiêcej ni¿ jeden dystrybutor pasuj±cy, u¿ywam %s"
+msgid "cannot send encapsulated option %d: no space left in wrapper"
+msgstr ""
 
 #: netlink.c:59
 #, fuzzy, c-format
@@ -1071,26 +1076,29 @@
 msgid "unsupported request from %s"
 msgstr ""
 
-#: tftp.c:226
-#, fuzzy, c-format
-msgid "file %s not found"
-msgstr "dzier¿awa nie znaleziona"
-
-#: tftp.c:293
+#: tftp.c:229
 #, c-format
 msgid "TFTP sent %s to %s"
 msgstr ""
 
-#: tftp.c:343
+#: tftp.c:296
+#, fuzzy, c-format
+msgid "file %s not found"
+msgstr "dzier¿awa nie znaleziona"
+
+#: tftp.c:352
 #, c-format
 msgid "TFTP error %d %s received from %s"
 msgstr ""
 
-#: tftp.c:374
+#: tftp.c:383
 #, fuzzy, c-format
 msgid "TFTP failed sending %s to %s"
 msgstr "b³±d w odczycie %s: %m"
 
+#~ msgid "More than one vendor class matches, using %s"
+#~ msgstr "Wiêcej ni¿ jeden dystrybutor pasuj±cy, u¿ywam %s"
+
 #~ msgid "forwarding table overflow: check for server loops."
 #~ msgstr ""
 #~ "przekroczenie zakresu tablicy przekazywania: sprawd¼ zapêtlenie serwera."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 79b0bfb..cea7cd7 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: dnsmasq 2.26\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-21 15:53+0000\n"
+"POT-Creation-Date: 2007-02-05 14:27+0000\n"
 "PO-Revision-Date: 2006-01-16 20:42+0000\n"
 "Last-Translator: Simon Kelley <simon@thekelleys.org.uk>\n"
 "Language-Team: Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -15,45 +15,45 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: cache.c:671
+#: cache.c:697
 #, c-format
 msgid "failed to load names from %s: %m"
 msgstr ""
 
-#: cache.c:705 dhcp.c:715
+#: cache.c:731 dhcp.c:715
 #, c-format
 msgid "bad address at %s line %d"
 msgstr ""
 
-#: cache.c:751 dhcp.c:729
+#: cache.c:777 dhcp.c:729
 #, c-format
 msgid "bad name at %s line %d"
 msgstr ""
 
-#: cache.c:758 dhcp.c:783
+#: cache.c:784 dhcp.c:783
 #, c-format
 msgid "read %s - %d addresses"
 msgstr ""
 
-#: cache.c:796
+#: cache.c:822
 msgid "cleared cache"
 msgstr ""
 
-#: cache.c:849
+#: cache.c:875
 #, c-format
 msgid ""
 "not giving name %s to the DHCP lease of %s because the name exists in %s "
 "with address %s"
 msgstr ""
 
-#: cache.c:893
+#: cache.c:919
 #, c-format
 msgid ""
 "time %lu, cache size %d, %d/%d cache insertions re-used unexpired cache "
 "entries."
 msgstr ""
 
-#: util.c:154 option.c:579
+#: util.c:154 option.c:582
 msgid "could not get memory"
 msgstr ""
 
@@ -389,189 +389,189 @@
 msgid "Valid options are :\n"
 msgstr ""
 
-#: option.c:428
+#: option.c:431
 msgid "bad dhcp-option"
 msgstr ""
 
-#: option.c:574
+#: option.c:577
 msgid "bad domain in dhcp-option"
 msgstr ""
 
-#: option.c:631
+#: option.c:634
 msgid "dhcp-option too long"
 msgstr ""
 
-#: option.c:693
+#: option.c:696
 #, c-format
 msgid "cannot access directory %s: %s"
 msgstr ""
 
-#: option.c:712 tftp.c:230
+#: option.c:715 tftp.c:300
 #, c-format
 msgid "cannot access %s: %s"
 msgstr ""
 
-#: option.c:789
+#: option.c:792
 msgid "bad MX preference"
 msgstr ""
 
-#: option.c:798
+#: option.c:801
 msgid "bad MX name"
 msgstr ""
 
-#: option.c:816
+#: option.c:819
 msgid "bad MX target"
 msgstr ""
 
-#: option.c:828
+#: option.c:831
 msgid "cannot run scripts under uClinux"
 msgstr ""
 
-#: option.c:1027 option.c:1038
+#: option.c:1030 option.c:1041
 msgid "bad port"
 msgstr ""
 
-#: option.c:1182
+#: option.c:1185
 msgid "bad bridge-interface"
 msgstr ""
 
-#: option.c:1226
+#: option.c:1229
 msgid "bad dhcp-range"
 msgstr ""
 
-#: option.c:1255
+#: option.c:1258
 msgid "only one netid tag allowed"
 msgstr ""
 
-#: option.c:1300
+#: option.c:1303
 msgid "inconsistent DHCP range"
 msgstr ""
 
-#: option.c:1485
+#: option.c:1488
 msgid "bad dhcp-host"
 msgstr ""
 
-#: option.c:1685
+#: option.c:1688
 msgid "bad PTR record"
 msgstr ""
 
-#: option.c:1710
+#: option.c:1713
 msgid "bad TXT record"
 msgstr ""
 
-#: option.c:1742
+#: option.c:1745
 msgid "TXT record string too long"
 msgstr ""
 
-#: option.c:1781
+#: option.c:1784
 msgid "bad SRV record"
 msgstr ""
 
-#: option.c:1794
+#: option.c:1797
 msgid "bad SRV target"
 msgstr ""
 
-#: option.c:1806
+#: option.c:1809
 msgid "invalid port number"
 msgstr ""
 
-#: option.c:1817
+#: option.c:1820
 msgid "invalid priority"
 msgstr ""
 
-#: option.c:1828
+#: option.c:1831
 msgid "invalid weight"
 msgstr ""
 
-#: option.c:1859
+#: option.c:1862
 #, c-format
 msgid "files nested too deep in %s"
 msgstr ""
 
-#: option.c:1866 tftp.c:235 tftp.c:366
+#: option.c:1869 tftp.c:450
 #, c-format
 msgid "cannot read %s: %s"
 msgstr ""
 
-#: option.c:1909
+#: option.c:1912
 msgid "missing \""
 msgstr ""
 
-#: option.c:1948
+#: option.c:1951
 msgid "bad option"
 msgstr ""
 
-#: option.c:1950
+#: option.c:1953
 msgid "extraneous parameter"
 msgstr ""
 
-#: option.c:1952
+#: option.c:1955
 msgid "missing parameter"
 msgstr ""
 
-#: option.c:1954
+#: option.c:1957
 msgid "error"
 msgstr ""
 
-#: option.c:2022
+#: option.c:2025
 #, c-format
 msgid "Dnsmasq version %s  %s\n"
 msgstr ""
 
-#: option.c:2023
+#: option.c:2026
 #, c-format
 msgid ""
 "Compile time options %s\n"
 "\n"
 msgstr ""
 
-#: option.c:2024
+#: option.c:2027
 #, c-format
 msgid "This software comes with ABSOLUTELY NO WARRANTY.\n"
 msgstr ""
 
-#: option.c:2025
+#: option.c:2028
 #, c-format
 msgid "Dnsmasq is free software, and you are welcome to redistribute it\n"
 msgstr ""
 
-#: option.c:2026
+#: option.c:2029
 #, c-format
 msgid "under the terms of the GNU General Public License, version 2.\n"
 msgstr ""
 
-#: option.c:2037
+#: option.c:2040
 msgid "try --help"
 msgstr ""
 
-#: option.c:2039
+#: option.c:2042
 msgid "try -w"
 msgstr ""
 
-#: option.c:2042
+#: option.c:2045
 #, c-format
 msgid "bad command line options: %s"
 msgstr ""
 
-#: option.c:2093
+#: option.c:2096
 #, c-format
 msgid "cannot get host-name: %s"
 msgstr ""
 
-#: option.c:2121
+#: option.c:2124
 msgid "only one resolv.conf file allowed in no-poll mode."
 msgstr ""
 
-#: option.c:2131
+#: option.c:2134
 msgid "must have exactly one resolv.conf to read domain from."
 msgstr ""
 
-#: option.c:2134
+#: option.c:2137
 #, c-format
 msgid "failed to read %s: %s"
 msgstr ""
 
-#: option.c:2152
+#: option.c:2155
 #, c-format
 msgid "no search directive found in %s"
 msgstr ""
@@ -581,7 +581,7 @@
 msgid "nameserver %s refused to do a recursive query"
 msgstr ""
 
-#: isc.c:73 dnsmasq.c:527
+#: isc.c:73 dnsmasq.c:533
 #, c-format
 msgid "failed to access %s: %m"
 msgstr ""
@@ -591,7 +591,7 @@
 msgid "failed to load %s: %m"
 msgstr ""
 
-#: isc.c:93 dnsmasq.c:549
+#: isc.c:93 dnsmasq.c:555
 #, c-format
 msgid "reading %s"
 msgstr ""
@@ -611,7 +611,7 @@
 msgid "unknown interface %s in bridge-interface"
 msgstr ""
 
-#: network.c:379 dnsmasq.c:137
+#: network.c:379 dnsmasq.c:141
 #, c-format
 msgid "failed to create listening socket: %s"
 msgstr ""
@@ -678,130 +678,134 @@
 msgid "failed to read %s: %m"
 msgstr ""
 
-#: dnsmasq.c:97
+#: dnsmasq.c:101
 msgid ""
 "ISC dhcpd integration not available: set HAVE_ISC_READER in src/config.h"
 msgstr ""
 
-#: dnsmasq.c:114
+#: dnsmasq.c:118
 msgid "TFTP server not available: set HAVE_TFTP in src/config.h"
 msgstr ""
 
-#: dnsmasq.c:119
+#: dnsmasq.c:123
 #, c-format
 msgid "failed to find list of interfaces: %s"
 msgstr ""
 
-#: dnsmasq.c:127
+#: dnsmasq.c:131
 #, c-format
 msgid "unknown interface %s"
 msgstr ""
 
-#: dnsmasq.c:133
+#: dnsmasq.c:137
 #, c-format
 msgid "no interface with address %s"
 msgstr ""
 
-#: dnsmasq.c:152
+#: dnsmasq.c:156
 msgid "must set exactly one interface on broken systems without IP_RECVIF"
 msgstr ""
 
-#: dnsmasq.c:165 dnsmasq.c:654
+#: dnsmasq.c:169 dnsmasq.c:660
 #, c-format
 msgid "DBus error: %s"
 msgstr ""
 
-#: dnsmasq.c:168
+#: dnsmasq.c:172
 msgid "DBus not available: set HAVE_DBUS in src/config.h"
 msgstr ""
 
-#: dnsmasq.c:199
+#: dnsmasq.c:203
 #, c-format
 msgid "cannot create pipe: %s"
 msgstr ""
 
-#: dnsmasq.c:342
+#: dnsmasq.c:346
 #, c-format
 msgid "started, version %s cachesize %d"
 msgstr ""
 
-#: dnsmasq.c:344
+#: dnsmasq.c:348
 #, c-format
 msgid "started, version %s cache disabled"
 msgstr ""
 
-#: dnsmasq.c:346
+#: dnsmasq.c:350
 #, c-format
 msgid "compile time options: %s"
 msgstr ""
 
-#: dnsmasq.c:352
+#: dnsmasq.c:356
 msgid "DBus support enabled: connected to system bus"
 msgstr ""
 
-#: dnsmasq.c:354
+#: dnsmasq.c:358
 msgid "DBus support enabled: bus connection pending"
 msgstr ""
 
-#: dnsmasq.c:359
+#: dnsmasq.c:363
 msgid "setting --bind-interfaces option because of OS limitations"
 msgstr ""
 
-#: dnsmasq.c:364
+#: dnsmasq.c:368
 #, c-format
 msgid "warning: interface %s does not currently exist"
 msgstr ""
 
-#: dnsmasq.c:369
+#: dnsmasq.c:373
 msgid "warning: ignoring resolv-file flag because no-resolv is set"
 msgstr ""
 
-#: dnsmasq.c:383
+#: dnsmasq.c:376
+msgid "warning: no upstream servers configured"
+msgstr ""
+
+#: dnsmasq.c:389
 #, c-format
 msgid "DHCP, static leases only on %.0s%s, lease time %s"
 msgstr ""
 
-#: dnsmasq.c:384
+#: dnsmasq.c:390
 #, c-format
 msgid "DHCP, IP range %s -- %s, lease time %s"
 msgstr ""
 
-#: dnsmasq.c:400
+#: dnsmasq.c:406
 msgid "root is "
 msgstr ""
 
-#: dnsmasq.c:400
+#: dnsmasq.c:406
 msgid "enabled"
 msgstr ""
 
-#: dnsmasq.c:402
+#: dnsmasq.c:408
 msgid "secure mode"
 msgstr ""
 
-#: dnsmasq.c:422
+#: dnsmasq.c:428
 #, c-format
 msgid "restricting maximum simultaneous TFTP transfers to %d"
 msgstr ""
 
-#: dnsmasq.c:433
+#: dnsmasq.c:439
 #, c-format
 msgid "warning: setting capabilities failed: %m"
 msgstr ""
 
-#: dnsmasq.c:435
+#: dnsmasq.c:441
 msgid "running as root"
 msgstr ""
 
-#: dnsmasq.c:560
+#: dnsmasq.c:566
 #, c-format
 msgid "no servers found in %s, will retry"
 msgstr ""
 
-#: dnsmasq.c:619
+#: dnsmasq.c:625
 msgid "exiting on receipt of SIGTERM"
 msgstr ""
 
-#: dnsmasq.c:656
+#: dnsmasq.c:662
 msgid "connected to system DBus"
 msgstr ""
 
@@ -889,104 +893,104 @@
 msgid "failed to write %s: %s (retry in %us)"
 msgstr ""
 
-#: rfc2131.c:261
+#: rfc2131.c:297
 #, c-format
 msgid "no address range available for DHCP request %s %s"
 msgstr ""
 
-#: rfc2131.c:262
+#: rfc2131.c:298
 msgid "with subnet selector"
 msgstr ""
 
-#: rfc2131.c:262
+#: rfc2131.c:298
 msgid "via"
 msgstr ""
 
-#: rfc2131.c:288 rfc2131.c:312
+#: rfc2131.c:322 rfc2131.c:347
 msgid "disabled"
 msgstr ""
 
-#: rfc2131.c:324 rfc2131.c:763
+#: rfc2131.c:359 rfc2131.c:814
 msgid "address in use"
 msgstr ""
 
-#: rfc2131.c:327
+#: rfc2131.c:362
 msgid "no address configured"
 msgstr ""
 
-#: rfc2131.c:340 rfc2131.c:630
+#: rfc2131.c:375 rfc2131.c:682
 msgid "no address available"
 msgstr ""
 
-#: rfc2131.c:349 rfc2131.c:773
+#: rfc2131.c:384 rfc2131.c:824
 msgid "no leases left"
 msgstr ""
 
-#: rfc2131.c:352 rfc2131.c:737
+#: rfc2131.c:387 rfc2131.c:788
 msgid "wrong network"
 msgstr ""
 
-#: rfc2131.c:558
+#: rfc2131.c:605
 #, c-format
 msgid "disabling DHCP static address %s for %s"
 msgstr ""
 
-#: rfc2131.c:579
+#: rfc2131.c:626
 msgid "unknown lease"
 msgstr ""
 
-#: rfc2131.c:588 rfc2131.c:885
+#: rfc2131.c:635 rfc2131.c:934
 msgid "ignored"
 msgstr ""
 
-#: rfc2131.c:604
+#: rfc2131.c:655
 #, c-format
 msgid "not using configured address %s because it is leased to %s"
 msgstr ""
 
-#: rfc2131.c:613
+#: rfc2131.c:665
 #, c-format
 msgid ""
 "not using configured address %s because it is in use by the server or relay"
 msgstr ""
 
-#: rfc2131.c:616
+#: rfc2131.c:668
 #, c-format
 msgid "not using configured address %s because it was previously declined"
 msgstr ""
 
-#: rfc2131.c:700
+#: rfc2131.c:751
 msgid "wrong address"
 msgstr ""
 
-#: rfc2131.c:713
+#: rfc2131.c:764
 msgid "lease not found"
 msgstr ""
 
-#: rfc2131.c:745
+#: rfc2131.c:796
 msgid "address not available"
 msgstr ""
 
-#: rfc2131.c:756
+#: rfc2131.c:807
 msgid "static lease available"
 msgstr ""
 
-#: rfc2131.c:760
+#: rfc2131.c:811
 msgid "address reserved"
 msgstr ""
 
-#: rfc2131.c:766
+#: rfc2131.c:817
 msgid "no unique-id"
 msgstr ""
 
-#: rfc2131.c:1023
+#: rfc2131.c:1181
 #, c-format
 msgid "cannot send DHCP option %d: no space left in packet"
 msgstr ""
 
-#: rfc2131.c:1322
+#: rfc2131.c:1476
 #, c-format
-msgid "More than one vendor class matches, using %s"
+msgid "cannot send encapsulated option %d: no space left in wrapper"
 msgstr ""
 
 #: netlink.c:59
@@ -1041,22 +1045,22 @@
 msgid "unsupported request from %s"
 msgstr ""
 
-#: tftp.c:226
-#, c-format
-msgid "file %s not found"
-msgstr ""
-
-#: tftp.c:293
+#: tftp.c:229
 #, c-format
 msgid "TFTP sent %s to %s"
 msgstr ""
 
-#: tftp.c:343
+#: tftp.c:296
+#, c-format
+msgid "file %s not found"
+msgstr ""
+
+#: tftp.c:352
 #, c-format
 msgid "TFTP error %d %s received from %s"
 msgstr ""
 
-#: tftp.c:374
+#: tftp.c:383
 #, c-format
 msgid "TFTP failed sending %s to %s"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 5c49c88..40aba5a 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: dnsmasq 2.24\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-21 15:53+0000\n"
+"POT-Creation-Date: 2007-02-05 14:27+0000\n"
 "PO-Revision-Date: 2005-11-22 16:46+0000\n"
 "Last-Translator: Simon Kelley <simon@thekelleys.org.uk>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -15,31 +15,31 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 # for compatibility purposes the letters â, ă, ş, ţ and î can be written as their look-alike correspondent.
-#: cache.c:671
+#: cache.c:697
 #, c-format
 msgid "failed to load names from %s: %m"
 msgstr "încărcarea numelor din %s: %m a eşuat"
 
-#: cache.c:705 dhcp.c:715
+#: cache.c:731 dhcp.c:715
 #, c-format
 msgid "bad address at %s line %d"
 msgstr "adresă greşită în %s, linia %d"
 
-#: cache.c:751 dhcp.c:729
+#: cache.c:777 dhcp.c:729
 #, c-format
 msgid "bad name at %s line %d"
 msgstr "nume greşit în %s linia %d"
 
-#: cache.c:758 dhcp.c:783
+#: cache.c:784 dhcp.c:783
 #, c-format
 msgid "read %s - %d addresses"
 msgstr "citesc %s - %d adrese"
 
-#: cache.c:796
+#: cache.c:822
 msgid "cleared cache"
 msgstr "memoria temporară a fost ştearsă"
 
-#: cache.c:849
+#: cache.c:875
 #, c-format
 msgid ""
 "not giving name %s to the DHCP lease of %s because the name exists in %s "
@@ -48,7 +48,7 @@
 "nu pot da numele %s împrumutului de adresă DHCP a lui %s deoarece "
 "numeleexistă în %s cu adresa %s"
 
-#: cache.c:893
+#: cache.c:919
 #, fuzzy, c-format
 msgid ""
 "time %lu, cache size %d, %d/%d cache insertions re-used unexpired cache "
@@ -57,7 +57,7 @@
 "cantitate de memorie temporară %d, %d/%d stocări temporare aureutilizat "
 "locaţii neexpirate."
 
-#: util.c:154 option.c:579
+#: util.c:154 option.c:582
 msgid "could not get memory"
 msgstr "nu am putut aloca memorie"
 
@@ -400,137 +400,137 @@
 msgid "Valid options are :\n"
 msgstr "Opţiunile valide sunt:\n"
 
-#: option.c:428
+#: option.c:431
 msgid "bad dhcp-option"
 msgstr "dhcp-option invalid"
 
-#: option.c:574
+#: option.c:577
 msgid "bad domain in dhcp-option"
 msgstr "domeniu DNS invalid în declaraţia dhcp-option"
 
-#: option.c:631
+#: option.c:634
 msgid "dhcp-option too long"
 msgstr "declararea dhcp-option este prea lungă"
 
-#: option.c:693
+#: option.c:696
 #, fuzzy, c-format
 msgid "cannot access directory %s: %s"
 msgstr "nu pot citi %s: %s"
 
-#: option.c:712 tftp.c:230
+#: option.c:715 tftp.c:300
 #, fuzzy, c-format
 msgid "cannot access %s: %s"
 msgstr "nu pot citi %s: %s"
 
-#: option.c:789
+#: option.c:792
 msgid "bad MX preference"
 msgstr "preferinţă MX invalidă"
 
-#: option.c:798
+#: option.c:801
 msgid "bad MX name"
 msgstr "nume MX invalid"
 
-#: option.c:816
+#: option.c:819
 msgid "bad MX target"
 msgstr "ţintă MX invalidă"
 
-#: option.c:828
+#: option.c:831
 msgid "cannot run scripts under uClinux"
 msgstr ""
 
-#: option.c:1027 option.c:1038
+#: option.c:1030 option.c:1041
 msgid "bad port"
 msgstr "port invalid"
 
-#: option.c:1182
+#: option.c:1185
 msgid "bad bridge-interface"
 msgstr ""
 
-#: option.c:1226
+#: option.c:1229
 msgid "bad dhcp-range"
 msgstr "dhcp-range invalid"
 
-#: option.c:1255
+#: option.c:1258
 msgid "only one netid tag allowed"
 msgstr ""
 
-#: option.c:1300
+#: option.c:1303
 msgid "inconsistent DHCP range"
 msgstr "domeniu DHCP inconsistent"
 
-#: option.c:1485
+#: option.c:1488
 msgid "bad dhcp-host"
 msgstr "dhcp-host invalid"
 
-#: option.c:1685
+#: option.c:1688
 #, fuzzy
 msgid "bad PTR record"
 msgstr "înregistrare SRV invalidă"
 
-#: option.c:1710
+#: option.c:1713
 msgid "bad TXT record"
 msgstr "înregistrare TXT invalidă"
 
-#: option.c:1742
+#: option.c:1745
 msgid "TXT record string too long"
 msgstr "şirul de caractere pentru înregistrarea TXT este prea lung"
 
-#: option.c:1781
+#: option.c:1784
 msgid "bad SRV record"
 msgstr "înregistrare SRV invalidă"
 
-#: option.c:1794
+#: option.c:1797
 msgid "bad SRV target"
 msgstr "ţintă SRV invalidă"
 
-#: option.c:1806
+#: option.c:1809
 msgid "invalid port number"
 msgstr "număr de port invalid"
 
-#: option.c:1817
+#: option.c:1820
 msgid "invalid priority"
 msgstr "prioritate invalidă"
 
-#: option.c:1828
+#: option.c:1831
 msgid "invalid weight"
 msgstr "pondere invalidă"
 
-#: option.c:1859
+#: option.c:1862
 #, c-format
 msgid "files nested too deep in %s"
 msgstr ""
 
-#: option.c:1866 tftp.c:235 tftp.c:366
+#: option.c:1869 tftp.c:450
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "nu pot citi %s: %s"
 
-#: option.c:1909
+#: option.c:1912
 msgid "missing \""
 msgstr "lipseşte \""
 
-#: option.c:1948
+#: option.c:1951
 msgid "bad option"
 msgstr "opţiune invalidă"
 
-#: option.c:1950
+#: option.c:1953
 msgid "extraneous parameter"
 msgstr "parametru nerecunoscut"
 
-#: option.c:1952
+#: option.c:1955
 msgid "missing parameter"
 msgstr "parametru lipsa"
 
-#: option.c:1954
+#: option.c:1957
 msgid "error"
 msgstr "eroare"
 
-#: option.c:2022
+#: option.c:2025
 #, c-format
 msgid "Dnsmasq version %s  %s\n"
 msgstr "dnsmasq versiunea %s  %s\n"
 
-#: option.c:2023
+#: option.c:2026
 #, c-format
 msgid ""
 "Compile time options %s\n"
@@ -539,54 +539,54 @@
 "Opţiuni cu care a fost compilat %s\n"
 "\n"
 
-#: option.c:2024
+#: option.c:2027
 #, c-format
 msgid "This software comes with ABSOLUTELY NO WARRANTY.\n"
 msgstr "Acest program vine FĂRĂ NICI O GARANŢIE.\n"
 
-#: option.c:2025
+#: option.c:2028
 #, 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:2026
+#: option.c:2029
 #, c-format
 msgid "under the terms of the GNU General Public License, version 2.\n"
 msgstr "în termenii Licenţei publice generale GNU, versiunea 2.\n"
 
-#: option.c:2037
+#: option.c:2040
 msgid "try --help"
 msgstr ""
 
-#: option.c:2039
+#: option.c:2042
 msgid "try -w"
 msgstr ""
 
-#: option.c:2042
+#: option.c:2045
 #, fuzzy, c-format
 msgid "bad command line options: %s"
 msgstr "opţiuni în linie de comandă invalide: %s."
 
-#: option.c:2093
+#: option.c:2096
 #, c-format
 msgid "cannot get host-name: %s"
 msgstr "nu pot citi numele maşinii: %s"
 
-#: option.c:2121
+#: option.c:2124
 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:2131
+#: option.c:2134
 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:2134
+#: option.c:2137
 #, fuzzy, c-format
 msgid "failed to read %s: %s"
 msgstr "nu pot citi %s: %n"
 
-#: option.c:2152
+#: option.c:2155
 #, c-format
 msgid "no search directive found in %s"
 msgstr "nu s-a găsit nici un criteriu de căutare în %s"
@@ -596,7 +596,7 @@
 msgid "nameserver %s refused to do a recursive query"
 msgstr "serverul DNS %s refuză interogările recursive"
 
-#: isc.c:73 dnsmasq.c:527
+#: isc.c:73 dnsmasq.c:533
 #, c-format
 msgid "failed to access %s: %m"
 msgstr "accesarea serverului %s a eşuat: %n"
@@ -606,7 +606,7 @@
 msgid "failed to load %s: %m"
 msgstr "nu pot încărca %s: %n"
 
-#: isc.c:93 dnsmasq.c:549
+#: isc.c:93 dnsmasq.c:555
 #, c-format
 msgid "reading %s"
 msgstr "citesc %s"
@@ -626,7 +626,7 @@
 msgid "unknown interface %s in bridge-interface"
 msgstr "interfaţă necunoscută %s"
 
-#: network.c:379 dnsmasq.c:137
+#: network.c:379 dnsmasq.c:141
 #, c-format
 msgid "failed to create listening socket: %s"
 msgstr "creearea socket-ului de ascultare a eşuat: %s"
@@ -693,136 +693,141 @@
 msgid "failed to read %s: %m"
 msgstr "nu pot citi %s: %n"
 
-#: dnsmasq.c:97
+#: dnsmasq.c:101
 msgid ""
 "ISC dhcpd integration not available: set HAVE_ISC_READER in src/config.h"
 msgstr ""
 "Integrarea cu ISC dhcpd nu este disponibilă:puneţi HAVE_ISC_HEADER în src/"
 "config.h"
 
-#: dnsmasq.c:114
+#: dnsmasq.c:118
 #, fuzzy
 msgid "TFTP server not available: set HAVE_TFTP in src/config.h"
 msgstr "DBus nu este disponibil: puneţi HAVE_DBUS in src/config.h"
 
-#: dnsmasq.c:119
+#: dnsmasq.c:123
 #, c-format
 msgid "failed to find list of interfaces: %s"
 msgstr "enumerarea interfeţelor a eşuat: %s"
 
-#: dnsmasq.c:127
+#: dnsmasq.c:131
 #, c-format
 msgid "unknown interface %s"
 msgstr "interfaţă necunoscută %s"
 
-#: dnsmasq.c:133
+#: dnsmasq.c:137
 #, c-format
 msgid "no interface with address %s"
 msgstr "nu exista interfaţă pentru adresa %s"
 
-#: dnsmasq.c:152
+#: dnsmasq.c:156
 msgid "must set exactly one interface on broken systems without IP_RECVIF"
 msgstr ""
 "trebuie specificată exact o singură interfaţă pe sistemele defectece nu au "
 "IP_RECVIF"
 
-#: dnsmasq.c:165 dnsmasq.c:654
+#: dnsmasq.c:169 dnsmasq.c:660
 #, c-format
 msgid "DBus error: %s"
 msgstr "eroare DBus: %s"
 
-#: dnsmasq.c:168
+#: dnsmasq.c:172
 msgid "DBus not available: set HAVE_DBUS in src/config.h"
 msgstr "DBus nu este disponibil: puneţi HAVE_DBUS in src/config.h"
 
-#: dnsmasq.c:199
+#: dnsmasq.c:203
 #, fuzzy, c-format
 msgid "cannot create pipe: %s"
 msgstr "nu pot citi %s: %s"
 
-#: dnsmasq.c:342
+#: dnsmasq.c:346
 #, c-format
 msgid "started, version %s cachesize %d"
 msgstr "am ponit, versiunea %s memorie temporară %d"
 
-#: dnsmasq.c:344
+#: dnsmasq.c:348
 #, c-format
 msgid "started, version %s cache disabled"
 msgstr "am pornit, versiunea %s memorie temporară dezactivată"
 
-#: dnsmasq.c:346
+#: dnsmasq.c:350
 #, c-format
 msgid "compile time options: %s"
 msgstr "compilat cu opţiunile: %s"
 
-#: dnsmasq.c:352
+#: dnsmasq.c:356
 msgid "DBus support enabled: connected to system bus"
 msgstr "suportul DBus activ: sunt conectat la magistrala sistem"
 
-#: dnsmasq.c:354
+#: dnsmasq.c:358
 msgid "DBus support enabled: bus connection pending"
 msgstr "suportul DBus activ: aştept conexiunea la magistrală"
 
-#: dnsmasq.c:359
+#: dnsmasq.c:363
 msgid "setting --bind-interfaces option because of OS limitations"
 msgstr "specific opţiunea --bind-interfaces din cauza limitărilor SO"
 
-#: dnsmasq.c:364
+#: dnsmasq.c:368
 #, c-format
 msgid "warning: interface %s does not currently exist"
 msgstr "atenţie: interfaţa %s nu există momentan"
 
-#: dnsmasq.c:369
+#: dnsmasq.c:373
 msgid "warning: ignoring resolv-file flag because no-resolv is set"
 msgstr ""
 
-#: dnsmasq.c:383
+#: dnsmasq.c:376
+#, fuzzy
+msgid "warning: no upstream servers configured"
+msgstr "configurăm serverele superioare prin Dbus"
+
+#: dnsmasq.c:389
 #, c-format
 msgid "DHCP, static leases only on %.0s%s, lease time %s"
 msgstr "DHCP, împrumuturi statice doar către  %.0s%s, timpul reînoirii %s"
 
-#: dnsmasq.c:384
+#: dnsmasq.c:390
 #, c-format
 msgid "DHCP, IP range %s -- %s, lease time %s"
 msgstr "DHCP, domeniu IP %s -- %s, timpul reînoirii %s"
 
-#: dnsmasq.c:400
+#: dnsmasq.c:406
 msgid "root is "
 msgstr ""
 
-#: dnsmasq.c:400
+#: dnsmasq.c:406
 #, fuzzy
 msgid "enabled"
 msgstr "dezactivat"
 
-#: dnsmasq.c:402
+#: dnsmasq.c:408
 msgid "secure mode"
 msgstr ""
 
-#: dnsmasq.c:422
+#: dnsmasq.c:428
 #, c-format
 msgid "restricting maximum simultaneous TFTP transfers to %d"
 msgstr ""
 
-#: dnsmasq.c:433
+#: dnsmasq.c:439
 #, c-format
 msgid "warning: setting capabilities failed: %m"
 msgstr ""
 
-#: dnsmasq.c:435
+#: dnsmasq.c:441
 msgid "running as root"
 msgstr "rulez ca root"
 
-#: dnsmasq.c:560
+#: dnsmasq.c:566
 #, fuzzy, c-format
 msgid "no servers found in %s, will retry"
 msgstr "nu s-a găsit nici un criteriu de căutare în %s"
 
-#: dnsmasq.c:619
+#: dnsmasq.c:625
 msgid "exiting on receipt of SIGTERM"
 msgstr "am primit SIGTERM, am terminat"
 
-#: dnsmasq.c:656
+#: dnsmasq.c:662
 msgid "connected to system DBus"
 msgstr "magistrala sistem Dbus conectată"
 
@@ -910,105 +915,105 @@
 msgid "failed to write %s: %s (retry in %us)"
 msgstr "nu pot citi %s: %n"
 
-#: rfc2131.c:261
+#: rfc2131.c:297
 #, c-format
 msgid "no address range available for DHCP request %s %s"
 msgstr "nici un domeniu de adrese disponibil pentru cererea DHCP %s %s"
 
-#: rfc2131.c:262
+#: rfc2131.c:298
 msgid "with subnet selector"
 msgstr "cu selectorul de subreţea"
 
-#: rfc2131.c:262
+#: rfc2131.c:298
 msgid "via"
 msgstr "prin"
 
-#: rfc2131.c:288 rfc2131.c:312
+#: rfc2131.c:322 rfc2131.c:347
 msgid "disabled"
 msgstr "dezactivat"
 
-#: rfc2131.c:324 rfc2131.c:763
+#: rfc2131.c:359 rfc2131.c:814
 msgid "address in use"
 msgstr "adresa este folosită"
 
-#: rfc2131.c:327
+#: rfc2131.c:362
 msgid "no address configured"
 msgstr "adresă lipsă"
 
-#: rfc2131.c:340 rfc2131.c:630
+#: rfc2131.c:375 rfc2131.c:682
 msgid "no address available"
 msgstr "nici o adresă disponibilă"
 
-#: rfc2131.c:349 rfc2131.c:773
+#: rfc2131.c:384 rfc2131.c:824
 msgid "no leases left"
 msgstr "nu mai am de unde să împrumut"
 
-#: rfc2131.c:352 rfc2131.c:737
+#: rfc2131.c:387 rfc2131.c:788
 msgid "wrong network"
 msgstr "reţea greşită"
 
-#: rfc2131.c:558
+#: rfc2131.c:605
 #, fuzzy, c-format
 msgid "disabling DHCP static address %s for %s"
 msgstr "dezactivăm adresele DHCP statice %s"
 
-#: rfc2131.c:579
+#: rfc2131.c:626
 msgid "unknown lease"
 msgstr "împrumut necunoscut"
 
-#: rfc2131.c:588 rfc2131.c:885
+#: rfc2131.c:635 rfc2131.c:934
 msgid "ignored"
 msgstr "ignorat"
 
-#: rfc2131.c:604
+#: rfc2131.c:655
 #, c-format
 msgid "not using configured address %s because it is leased to %s"
 msgstr ""
 
-#: rfc2131.c:613
+#: rfc2131.c:665
 #, c-format
 msgid ""
 "not using configured address %s because it is in use by the server or relay"
 msgstr ""
 
-#: rfc2131.c:616
+#: rfc2131.c:668
 #, c-format
 msgid "not using configured address %s because it was previously declined"
 msgstr ""
 
-#: rfc2131.c:700
+#: rfc2131.c:751
 msgid "wrong address"
 msgstr "adresă greşită"
 
-#: rfc2131.c:713
+#: rfc2131.c:764
 msgid "lease not found"
 msgstr "împrumutul nu a fost găsit"
 
-#: rfc2131.c:745
+#: rfc2131.c:796
 msgid "address not available"
 msgstr "adresă indisponibilă"
 
-#: rfc2131.c:756
+#: rfc2131.c:807
 msgid "static lease available"
 msgstr "împrumut static este disponibil"
 
-#: rfc2131.c:760
+#: rfc2131.c:811
 msgid "address reserved"
 msgstr "adresă rezervată"
 
-#: rfc2131.c:766
+#: rfc2131.c:817
 msgid "no unique-id"
 msgstr ""
 
-#: rfc2131.c:1023
+#: rfc2131.c:1181
 #, c-format
 msgid "cannot send DHCP option %d: no space left in packet"
 msgstr "nu pot trimite opţiunea DHCP %d: nu mai este loc în pachet"
 
-#: rfc2131.c:1322
-#, c-format
-msgid "More than one vendor class matches, using %s"
-msgstr "Se potrivesc mai multe clase de mărci de interfeţe, folosim %s"
+#: rfc2131.c:1476
+#, fuzzy, c-format
+msgid "cannot send encapsulated option %d: no space left in wrapper"
+msgstr "nu pot trimite opţiunea DHCP %d: nu mai este loc în pachet"
 
 #: netlink.c:59
 #, fuzzy, c-format
@@ -1062,26 +1067,29 @@
 msgid "unsupported request from %s"
 msgstr ""
 
-#: tftp.c:226
-#, fuzzy, c-format
-msgid "file %s not found"
-msgstr "împrumutul nu a fost găsit"
-
-#: tftp.c:293
+#: tftp.c:229
 #, c-format
 msgid "TFTP sent %s to %s"
 msgstr ""
 
-#: tftp.c:343
+#: tftp.c:296
+#, fuzzy, c-format
+msgid "file %s not found"
+msgstr "împrumutul nu a fost găsit"
+
+#: tftp.c:352
 #, c-format
 msgid "TFTP error %d %s received from %s"
 msgstr ""
 
-#: tftp.c:374
+#: tftp.c:383
 #, fuzzy, c-format
 msgid "TFTP failed sending %s to %s"
 msgstr "nu pot citi %s: %n"
 
+#~ msgid "More than one vendor class matches, using %s"
+#~ msgstr "Se potrivesc mai multe clase de mărci de interfeţe, folosim %s"
+
 #~ msgid "forwarding table overflow: check for server loops."
 #~ msgstr ""
 #~ "depăşire de memorie în tabela cu înaintări DNS: verificaţi de bucle."