import of dnsmasq-2.36.tar.gz
diff --git a/po/de.po b/po/de.po
index c892646..4617dc3 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: 2006-10-28 15:42+0100\n"
+"POT-Creation-Date: 2007-01-21 15:53+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:665
+#: cache.c:671
 #, c-format
 msgid "failed to load names from %s: %m"
 msgstr ""
 
-#: cache.c:699 dhcp.c:701
+#: cache.c:705 dhcp.c:715
 #, c-format
 msgid "bad address at %s line %d"
 msgstr ""
 
 # @Simon: Here I need an example to understand it :)
-#: cache.c:745 dhcp.c:715
+#: cache.c:751 dhcp.c:729
 #, c-format
 msgid "bad name at %s line %d"
 msgstr ""
 
 # @Simon: Here I need an example to understand it :)
-#: cache.c:752 dhcp.c:769
+#: cache.c:758 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:790
+#: cache.c:796
 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:843
+#: cache.c:849
 #, 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:887
+#: cache.c:893
 #, 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:153 option.c:1221
+#: util.c:154 option.c:579
 msgid "could not get memory"
 msgstr "Speicher nicht verfügbar"
 
@@ -79,7 +79,7 @@
 # @Simon: ("keinen Speicher" = "no memory", "... nicht bekommen" = "... not get") 
 # @Simon: both would be correct - but would sound rather clumsy in german
 # @Simon: how about "Nicht genügend Speicher verfügbar" = "Not enough memory available" ?
-#: util.c:176
+#: util.c:177
 #, c-format
 msgid "%s at line %d of %%s"
 msgstr "%s in Zeile %d von %%s"
@@ -87,36 +87,36 @@
 # @Simon: I would like to have an example :) - instead of "von" it would be possible to use "aus",
 # @Simon: both translate to "of" and nothing else, but depending on the sense one could be better 
 # @Simon: than the other.
-#: util.c:183
+#: util.c:184
 msgid "FAILED to start up"
 msgstr "Start gescheitert"
 
 # @Simon: not perfect but I cannot get nearer right now.
-#: util.c:304
+#: util.c:305
 #, c-format
 msgid "infinite"
 msgstr "unendlich"
 
-#: option.c:147
+#: option.c:164
 msgid "Specify local address(es) to listen on."
 msgstr "Lokale abzuhörende Adresse(n) angeben."
 
 # @Simon: Quite literal translation, sounds not too polite in german.
 # @Simon: How about: "Bitte die lokalen abzuhörende Adresse(n) angeben."
 # @Simon: = "Please specify the local address(es) to listen on."
-#: option.c:148
+#: option.c:165
 msgid "Return ipaddr for all hosts in specified domains."
 msgstr "Rückkehr-IP-Adresse für alle Geräte in angebenen Domänen"
 
 # @Simon: I hope "Return ipaddr" is similar to "Return-ipaddr" and not "Return the ipaddr ... !"
-#: option.c:149
+#: option.c:166
 msgid "Fake reverse lookups for RFC1918 private address ranges."
 msgstr ""
 "'Gefälschte' Rückwärts-Ergebnisse für private Adressbereiche nach RFC1918"
 
 # @Simon: I'm a bit unsure about the meaning of "Fake" here, and the best word for "lookup" is "Nachsehen" 
 # @Simon: (that is "looking-for") but I think that cannot be used. "Ergebnisse" = "results", is that near enough?
-#: option.c:150
+#: option.c:167
 msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)."
 msgstr "Behandle IP-Adr als NXDOMAIN (wehrt Verisign-Platzhalter ab)."
 
@@ -127,17 +127,17 @@
 # @Simon:   "Behandle IP-Adr als NXDOMAIN (gegen Verisigns Platzhalter-Gebrauch)."
 # @Simon: = "Treat ipaddr as NXDOMAIN (defeats Verisigns wildcard usage)." ?
 # @Simon: But the explanatory(?) effect is only a very tiny bit better, I believe - what do U think? 
-#: option.c:151
+#: option.c:168
 #, c-format
 msgid "Specify the size of the cache in entries (defaults to %s)."
 msgstr "Angabe der Größe des Caches in Einträgen (Voreinstellung: %s)."
 
-#: option.c:152
+#: option.c:169
 #, c-format
 msgid "Specify configuration file (defaults to %s)."
 msgstr "Angabe der Konfigurationsdatei (Voreinstellung: %s)."
 
-#: option.c:153
+#: option.c:170
 msgid "Do NOT fork into the background: run in debug mode."
 msgstr "NICHT in den Hintergrund gehen: Betrieb im Debug-Modus"
 
@@ -145,455 +145,492 @@
 # @Simon: I know it sounds a bit clumsy in english, but "fork" would be hard to understand
 # @Simon: and then I get a problem between "go" and "run" - so...
 # @Simon: "Debug-mode" = "Fehlersuch-Modus", literally, but I think "Debug-Modus" is better :)
-#: option.c:154
+#: option.c:171
 msgid "Do NOT forward queries with no domain part."
 msgstr "Anfragen ohne Domänen-Teil NICHT weiterschicken"
 
 # @Simon: "weiterschicken" is rather "pass on" (I hope) but that's the best I found.
-#: option.c:155
+#: option.c:172
 msgid "Return self-pointing MX records for local hosts."
 msgstr "Rückgabe auf sich selbst zeigender MX-Einträge für lokale Geräte"
 
 # @Simon: "self-pointing" is a bit difficult, the meaning is clear but takes 3-4 words to express it in german.
 # @Simon: "Geräte" is about "hard-devices". There is a word for "host" (it is "Wirt") but it would be misleading.
 # @Simon: My online dict suggest "Rechner" (= Computer), but I think "hard-devices" is better because it's more general.
-#: option.c:156
+#: option.c:173
 msgid "Expand simple names in /etc/hosts with domain-suffix."
 msgstr "Erweitere einfache Namen in /etc/hosts mit der Domänen-Endung"
 
-#: option.c:157
+#: option.c:174
 msgid "Don't forward spurious DNS requests from Windows hosts."
 msgstr "'unechte' DNS-Anfragen von Windows-Rechnern nicht weiterleiten"
 
 # @Simon: I'm a bit unsure about "spurious"
-#: option.c:158
+#: option.c:175
 msgid "Enable DHCP in the range given with lease duration."
 msgstr ""
 
-#: option.c:159
+#: option.c:176
 #, c-format
 msgid "Change to this group after startup (defaults to %s)."
 msgstr ""
 
-#: option.c:160
-msgid "Set address or hostname for a specified machine."
-msgstr ""
-
-#: option.c:161
-#, c-format
-msgid "Do NOT load %s file."
-msgstr ""
-
-#: option.c:162
-#, c-format
-msgid "Specify a hosts file to be read in addition to %s."
-msgstr ""
-
-#: option.c:163
-msgid "Specify interface(s) to listen on."
-msgstr ""
-
-#: option.c:164
-msgid "Specify interface(s) NOT to listen on."
-msgstr ""
-
-#: option.c:165
-msgid "Map DHCP user class to option set."
-msgstr ""
-
-#: option.c:166
-msgid "Don't do DHCP for hosts in option set."
-msgstr ""
-
-#: option.c:167
-msgid "Do NOT fork into the background, do NOT run in debug mode."
-msgstr ""
-
-#: option.c:168
-msgid "Assume we are the only DHCP server on the local network."
-msgstr ""
-
-#: option.c:169
-#, c-format
-msgid "Specify where to store DHCP leases (defaults to %s)."
-msgstr ""
-
-#: option.c:170
-msgid "Return MX records for local hosts."
-msgstr ""
-
-#: option.c:171
-msgid "Specify an MX record."
-msgstr ""
-
-#: option.c:172
-msgid "Specify BOOTP options to DHCP server."
-msgstr ""
-
-#: option.c:173
-#, c-format
-msgid "Do NOT poll %s file, reload only on SIGHUP."
-msgstr ""
-
-#: option.c:174
-msgid "Do NOT cache failed search results."
-msgstr ""
-
-#: option.c:175
-#, c-format
-msgid "Use nameservers strictly in the order given in %s."
-msgstr ""
-
-#: option.c:176
-msgid "Set extra options to be set to DHCP clients."
-msgstr ""
-
 #: option.c:177
-msgid "Specify port to listen for DNS requests on (defaults to 53)."
+msgid "Set address or hostname for a specified machine."
 msgstr ""
 
 #: option.c:178
 #, c-format
-msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)."
+msgid "Do NOT load %s file."
 msgstr ""
 
 #: option.c:179
-msgid "Log queries."
+#, c-format
+msgid "Specify a hosts file to be read in addition to %s."
 msgstr ""
 
 #: option.c:180
-msgid "Force the originating port for upstream queries."
+msgid "Specify interface(s) to listen on."
 msgstr ""
 
 #: option.c:181
-msgid "Do NOT read resolv.conf."
+msgid "Specify interface(s) NOT to listen on."
 msgstr ""
 
 #: option.c:182
-#, c-format
-msgid "Specify path to resolv.conf (defaults to %s)."
+msgid "Map DHCP user class to option set."
 msgstr ""
 
 #: option.c:183
-msgid "Specify address(es) of upstream servers with optional domains."
+msgid "Don't do DHCP for hosts in option set."
 msgstr ""
 
 #: option.c:184
-msgid "Never forward queries to specified domains."
+msgid "Do NOT fork into the background, do NOT run in debug mode."
 msgstr ""
 
 #: option.c:185
-msgid "Specify the domain to be assigned in DHCP leases."
+msgid "Assume we are the only DHCP server on the local network."
 msgstr ""
 
 #: option.c:186
-msgid "Specify default target in an MX record."
+#, c-format
+msgid "Specify where to store DHCP leases (defaults to %s)."
 msgstr ""
 
 #: option.c:187
-msgid "Specify time-to-live in seconds for replies from /etc/hosts."
+msgid "Return MX records for local hosts."
 msgstr ""
 
 #: option.c:188
-#, c-format
-msgid "Change to this user after startup. (defaults to %s)."
+msgid "Specify an MX record."
 msgstr ""
 
 #: option.c:189
-msgid "Map DHCP vendor class to option set."
+msgid "Specify BOOTP options to DHCP server."
 msgstr ""
 
 #: option.c:190
-msgid "Display dnsmasq version and copyright information."
+#, c-format
+msgid "Do NOT poll %s file, reload only on SIGHUP."
 msgstr ""
 
 #: option.c:191
-msgid "Translate IPv4 addresses from upstream servers."
+msgid "Do NOT cache failed search results."
 msgstr ""
 
 #: option.c:192
-msgid "Specify a SRV record."
+#, c-format
+msgid "Use nameservers strictly in the order given in %s."
 msgstr ""
 
 #: option.c:193
-msgid "Display this message."
+msgid "Set extra options to be set to DHCP clients."
 msgstr ""
 
 #: option.c:194
-#, c-format
-msgid "Specify path of PID file. (defaults to %s)."
+msgid "Specify port to listen for DNS requests on (defaults to 53)."
 msgstr ""
 
 #: option.c:195
 #, c-format
-msgid "Specify maximum number of DHCP leases (defaults to %s)."
+msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)."
 msgstr ""
 
 #: option.c:196
-msgid "Answer DNS queries based on the interface a query was sent to."
+msgid "Log queries."
 msgstr ""
 
 #: option.c:197
-msgid "Specify TXT DNS record."
+msgid "Force the originating port for upstream queries."
 msgstr ""
 
 #: option.c:198
-msgid "Bind only to interfaces in use."
+msgid "Do NOT read resolv.conf."
 msgstr ""
 
 #: option.c:199
 #, c-format
-msgid "Read DHCP static host information from %s."
+msgid "Specify path to resolv.conf (defaults to %s)."
 msgstr ""
 
 #: option.c:200
-msgid "Enable the DBus interface for setting upstream servers, etc."
+msgid "Specify address(es) of upstream servers with optional domains."
 msgstr ""
 
 #: option.c:201
-msgid "Do not provide DHCP on this interface, only provide DNS."
+msgid "Never forward queries to specified domains."
 msgstr ""
 
 #: option.c:202
-msgid "Enable dynamic address allocation for bootp."
+msgid "Specify the domain to be assigned in DHCP leases."
 msgstr ""
 
 #: option.c:203
-msgid "Map MAC address (with wildcards) to option set."
+msgid "Specify default target in an MX record."
 msgstr ""
 
 #: option.c:204
-msgid "Disable ICMP echo address checking in the DHCP server."
+msgid "Specify time-to-live in seconds for replies from /etc/hosts."
 msgstr ""
 
 #: option.c:205
-msgid "Script to run on DHCP lease creation and destruction."
+#, c-format
+msgid "Change to this user after startup. (defaults to %s)."
 msgstr ""
 
 #: option.c:206
-msgid "Read configuration from all the files in this directory."
+msgid "Map DHCP vendor class to option set."
 msgstr ""
 
 #: option.c:207
-msgid "Log to this syslog facility. (defaults to DAEMON)"
+msgid "Display dnsmasq version and copyright information."
 msgstr ""
 
 #: option.c:208
-msgid "Read leases at startup, but never write the lease file."
+msgid "Translate IPv4 addresses from upstream servers."
 msgstr ""
 
 #: option.c:209
+msgid "Specify a SRV record."
+msgstr ""
+
+#: option.c:210
+msgid "Display this message."
+msgstr ""
+
+#: option.c:211
+#, fuzzy, c-format
+msgid "Specify path of PID file (defaults to %s)."
+msgstr "Angabe der Konfigurationsdatei (Voreinstellung: %s)."
+
+#: option.c:212
+#, c-format
+msgid "Specify maximum number of DHCP leases (defaults to %s)."
+msgstr ""
+
+#: option.c:213
+msgid "Answer DNS queries based on the interface a query was sent to."
+msgstr ""
+
+#: option.c:214
+msgid "Specify TXT DNS record."
+msgstr ""
+
+#: option.c:215
+msgid "Specify PTR DNS record."
+msgstr ""
+
+#: option.c:216
+msgid "Bind only to interfaces in use."
+msgstr ""
+
+#: option.c:217
+#, c-format
+msgid "Read DHCP static host information from %s."
+msgstr ""
+
+#: option.c:218
+msgid "Enable the DBus interface for setting upstream servers, etc."
+msgstr ""
+
+#: option.c:219
+msgid "Do not provide DHCP on this interface, only provide DNS."
+msgstr ""
+
+#: option.c:220
+msgid "Enable dynamic address allocation for bootp."
+msgstr ""
+
+#: option.c:221
+msgid "Map MAC address (with wildcards) to option set."
+msgstr ""
+
+#: option.c:223
+msgid "Treat DHCP requests on aliases as arriving from interface."
+msgstr ""
+
+#: option.c:225
+msgid "Disable ICMP echo address checking in the DHCP server."
+msgstr ""
+
+#: option.c:226
+msgid "Script to run on DHCP lease creation and destruction."
+msgstr ""
+
+#: option.c:227
+msgid "Read configuration from all the files in this directory."
+msgstr ""
+
+#: option.c:228
+msgid "Log to this syslog facility. (defaults to DAEMON)"
+msgstr ""
+
+#: option.c:229
+msgid "Read leases at startup, but never write the lease file."
+msgstr ""
+
+#: option.c:230
 #, c-format
 msgid "Maximum number of concurrent DNS queries. (defaults to %s)"
 msgstr ""
 
-#: option.c:210
+#: option.c:231
 #, c-format
 msgid "Clear DNS cache when reloading %s."
 msgstr ""
 
-#: option.c:323
+#: option.c:232
+msgid "Ignore hostnames provided by DHCP clients."
+msgstr ""
+
+#: option.c:233
+msgid "Enable integrated read-only TFTP server."
+msgstr ""
+
+#: option.c:234
+msgid "Export files by TFTP only from the specified subtree."
+msgstr ""
+
+#: option.c:235
+msgid "Allow access only to files owned by the user running dnsmasq."
+msgstr ""
+
+#: option.c:236
+#, c-format
+msgid "Maximum number of conncurrent TFTP transfers (defaults to %s)."
+msgstr ""
+
+#: option.c:361
 #, c-format
 msgid ""
 "Usage: dnsmasq [options]\n"
 "\n"
 msgstr ""
 
-#: option.c:325
+#: option.c:363
 #, c-format
 msgid "Use short options only on the command line.\n"
 msgstr ""
 
-#: option.c:327
+#: option.c:365
 #, c-format
 msgid "Valid options are :\n"
 msgstr ""
 
-#: option.c:362
-msgid "extraneous parameter"
+#: option.c:428
+msgid "bad dhcp-option"
 msgstr ""
 
-#: option.c:366
-msgid "missing parameter"
+#: option.c:574
+msgid "bad domain in dhcp-option"
 msgstr ""
 
-#: option.c:388
+#: option.c:631
+msgid "dhcp-option too long"
+msgstr ""
+
+#: option.c:693
 #, c-format
 msgid "cannot access directory %s: %s"
 msgstr ""
 
-#: option.c:407
+#: option.c:712 tftp.c:230
 #, c-format
 msgid "cannot access %s: %s"
 msgstr ""
 
-#: option.c:484
+#: option.c:789
 msgid "bad MX preference"
 msgstr ""
 
-#: option.c:493
+#: option.c:798
 msgid "bad MX name"
 msgstr ""
 
-#: option.c:511
+#: option.c:816
 msgid "bad MX target"
 msgstr ""
 
-#: option.c:523
+#: option.c:828
 msgid "cannot run scripts under uClinux"
 msgstr ""
 
-#: option.c:722 option.c:733
+#: option.c:1027 option.c:1038
 msgid "bad port"
 msgstr ""
 
-#: option.c:878
+#: option.c:1182
+msgid "bad bridge-interface"
+msgstr ""
+
+#: option.c:1226
 msgid "bad dhcp-range"
 msgstr ""
 
-#: option.c:907
+#: option.c:1255
 msgid "only one netid tag allowed"
 msgstr ""
 
-#: option.c:952
+#: option.c:1300
 msgid "inconsistent DHCP range"
 msgstr ""
 
-#: option.c:1137
+#: option.c:1485
 msgid "bad dhcp-host"
 msgstr ""
 
-#: option.c:1198
-msgid "bad dhcp-option"
+#: option.c:1685
+msgid "bad PTR record"
 msgstr ""
 
-#: option.c:1216
-msgid "bad domain in dhcp-option"
-msgstr ""
-
-#: option.c:1386
-msgid "dhcp-option too long"
-msgstr ""
-
-#: option.c:1583
+#: option.c:1710
 msgid "bad TXT record"
 msgstr ""
 
-#: option.c:1615
+#: option.c:1742
 msgid "TXT record string too long"
 msgstr ""
 
-#: option.c:1654
+#: option.c:1781
 msgid "bad SRV record"
 msgstr ""
 
-#: option.c:1667
+#: option.c:1794
 msgid "bad SRV target"
 msgstr ""
 
-#: option.c:1679
+#: option.c:1806
 msgid "invalid port number"
 msgstr ""
 
-#: option.c:1690
+#: option.c:1817
 msgid "invalid priority"
 msgstr ""
 
-#: option.c:1701
+#: option.c:1828
 msgid "invalid weight"
 msgstr ""
 
-#: option.c:1732
+#: option.c:1859
 #, c-format
 msgid "files nested too deep in %s"
 msgstr ""
 
-#: option.c:1739
+#: option.c:1866 tftp.c:235 tftp.c:366
 #, c-format
 msgid "cannot read %s: %s"
 msgstr ""
 
-#: option.c:1781
+#: option.c:1909
 msgid "missing \""
 msgstr ""
 
-#: option.c:1816
-msgid "error"
-msgstr ""
-
-#: option.c:1820
+#: option.c:1948
 msgid "bad option"
 msgstr ""
 
-#: option.c:1884
+#: option.c:1950
+msgid "extraneous parameter"
+msgstr ""
+
+#: option.c:1952
+msgid "missing parameter"
+msgstr ""
+
+#: option.c:1954
+msgid "error"
+msgstr ""
+
+#: option.c:2022
 #, c-format
 msgid "Dnsmasq version %s  %s\n"
 msgstr ""
 
-#: option.c:1885
+#: option.c:2023
 #, c-format
 msgid ""
 "Compile time options %s\n"
 "\n"
 msgstr ""
 
-#: option.c:1886
+#: option.c:2024
 #, c-format
 msgid "This software comes with ABSOLUTELY NO WARRANTY.\n"
 msgstr ""
 
-#: option.c:1887
+#: option.c:2025
 #, c-format
 msgid "Dnsmasq is free software, and you are welcome to redistribute it\n"
 msgstr ""
 
-#: option.c:1888
+#: option.c:2026
 #, c-format
 msgid "under the terms of the GNU General Public License, version 2.\n"
 msgstr ""
 
-#: option.c:1899
+#: option.c:2037
 msgid "try --help"
 msgstr ""
 
-#: option.c:1901
+#: option.c:2039
 msgid "try -w"
 msgstr ""
 
-#: option.c:1904
+#: option.c:2042
 #, c-format
 msgid "bad command line options: %s"
 msgstr ""
 
-#: option.c:1955
+#: option.c:2093
 #, c-format
 msgid "cannot get host-name: %s"
 msgstr ""
 
-#: option.c:1983
+#: option.c:2121
 msgid "only one resolv.conf file allowed in no-poll mode."
 msgstr ""
 
-#: option.c:1993
+#: option.c:2131
 msgid "must have exactly one resolv.conf to read domain from."
 msgstr ""
 
-#: option.c:1996
+#: option.c:2134
 #, c-format
 msgid "failed to read %s: %s"
 msgstr ""
 
-#: option.c:2014
+#: option.c:2152
 #, c-format
 msgid "no search directive found in %s"
 msgstr ""
 
-#: forward.c:370
+#: forward.c:376
 #, c-format
 msgid "nameserver %s refused to do a recursive query"
 msgstr ""
 
-#: isc.c:73 dnsmasq.c:482
+#: isc.c:73 dnsmasq.c:527
 #, c-format
 msgid "failed to access %s: %m"
 msgstr ""
@@ -603,7 +640,7 @@
 msgid "failed to load %s: %m"
 msgstr ""
 
-#: isc.c:93 dnsmasq.c:504
+#: isc.c:93 dnsmasq.c:549
 #, c-format
 msgid "reading %s"
 msgstr ""
@@ -618,64 +655,74 @@
 msgid "Ignoring DHCP lease for %s because it has an illegal domain part"
 msgstr ""
 
-#: network.c:315 dnsmasq.c:132
+#: network.c:41
+#, c-format
+msgid "unknown interface %s in bridge-interface"
+msgstr ""
+
+#: network.c:379 dnsmasq.c:137
 #, c-format
 msgid "failed to create listening socket: %s"
 msgstr ""
 
-#: network.c:322
+#: network.c:386
 #, c-format
 msgid "failed to set IPV6 options on listening socket: %s"
 msgstr ""
 
-#: network.c:340
+#: network.c:404
 #, c-format
 msgid "failed to bind listening socket for %s: %s"
 msgstr ""
 
-#: network.c:348
+#: network.c:412
 #, c-format
 msgid "failed to listen on socket: %s"
 msgstr ""
 
-#: network.c:419
+#: network.c:423
+#, c-format
+msgid "failed to create TFTP socket: %s"
+msgstr ""
+
+#: network.c:495
 #, c-format
 msgid "ignoring nameserver %s - local interface"
 msgstr ""
 
-#: network.c:428
+#: network.c:504
 #, c-format
 msgid "ignoring nameserver %s - cannot make/bind socket: %m"
 msgstr ""
 
-#: network.c:442
+#: network.c:518
 msgid "domain"
 msgstr ""
 
-#: network.c:444
+#: network.c:520
 msgid "unqualified"
 msgstr ""
 
-#: network.c:444
+#: network.c:520
 msgid "domains"
 msgstr ""
 
-#: network.c:447
+#: network.c:523
 #, c-format
 msgid "using local addresses only for %s %s"
 msgstr ""
 
-#: network.c:449
+#: network.c:525
 #, c-format
 msgid "using nameserver %s#%d for %s %s"
 msgstr ""
 
-#: network.c:452
+#: network.c:528
 #, c-format
 msgid "using nameserver %s#%d"
 msgstr ""
 
-#: network.c:472
+#: network.c:548
 #, c-format
 msgid "failed to read %s: %m"
 msgstr ""
@@ -686,103 +733,124 @@
 msgstr ""
 
 #: dnsmasq.c:114
+msgid "TFTP server not available: set HAVE_TFTP in src/config.h"
+msgstr ""
+
+#: dnsmasq.c:119
 #, c-format
 msgid "failed to find list of interfaces: %s"
 msgstr ""
 
-#: dnsmasq.c:122
+#: dnsmasq.c:127
 #, c-format
 msgid "unknown interface %s"
 msgstr ""
 
-#: dnsmasq.c:128
+#: dnsmasq.c:133
 #, c-format
 msgid "no interface with address %s"
 msgstr ""
 
-#: dnsmasq.c:147
+#: dnsmasq.c:152
 msgid "must set exactly one interface on broken systems without IP_RECVIF"
 msgstr ""
 
-#: dnsmasq.c:160 dnsmasq.c:609
+#: dnsmasq.c:165 dnsmasq.c:654
 #, c-format
 msgid "DBus error: %s"
 msgstr ""
 
-#: dnsmasq.c:163
+#: dnsmasq.c:168
 msgid "DBus not available: set HAVE_DBUS in src/config.h"
 msgstr ""
 
-#: dnsmasq.c:194
+#: dnsmasq.c:199
 #, c-format
 msgid "cannot create pipe: %s"
 msgstr ""
 
-#: dnsmasq.c:337
+#: dnsmasq.c:342
 #, c-format
 msgid "started, version %s cachesize %d"
 msgstr ""
 
-#: dnsmasq.c:339
+#: dnsmasq.c:344
 #, c-format
 msgid "started, version %s cache disabled"
 msgstr ""
 
-#: dnsmasq.c:341
+#: dnsmasq.c:346
 #, c-format
 msgid "compile time options: %s"
 msgstr ""
 
-#: dnsmasq.c:347
+#: dnsmasq.c:352
 msgid "DBus support enabled: connected to system bus"
 msgstr ""
 
-#: dnsmasq.c:349
+#: dnsmasq.c:354
 msgid "DBus support enabled: bus connection pending"
 msgstr ""
 
-#: dnsmasq.c:354
+#: dnsmasq.c:359
 msgid "setting --bind-interfaces option because of OS limitations"
 msgstr ""
 
-#: dnsmasq.c:359
+#: dnsmasq.c:364
 #, c-format
 msgid "warning: interface %s does not currently exist"
 msgstr ""
 
-#: dnsmasq.c:364
+#: dnsmasq.c:369
 msgid "warning: ignoring resolv-file flag because no-resolv is set"
 msgstr ""
 
-#: dnsmasq.c:378
+#: dnsmasq.c:383
 #, c-format
 msgid "DHCP, static leases only on %.0s%s, lease time %s"
 msgstr ""
 
-#: dnsmasq.c:379
+#: dnsmasq.c:384
 #, c-format
 msgid "DHCP, IP range %s -- %s, lease time %s"
 msgstr ""
 
-#: dnsmasq.c:389
+#: dnsmasq.c:400
+msgid "root is "
+msgstr ""
+
+#: dnsmasq.c:400
+msgid "enabled"
+msgstr ""
+
+#: dnsmasq.c:402
+msgid "secure mode"
+msgstr ""
+
+#: dnsmasq.c:422
+#, c-format
+msgid "restricting maximum simultaneous TFTP transfers to %d"
+msgstr ""
+
+#: dnsmasq.c:433
 #, c-format
 msgid "warning: setting capabilities failed: %m"
 msgstr ""
 
-#: dnsmasq.c:391
+#: dnsmasq.c:435
 msgid "running as root"
 msgstr ""
 
-#: dnsmasq.c:515
+#: dnsmasq.c:560
 #, c-format
 msgid "no servers found in %s, will retry"
 msgstr ""
 
-#: dnsmasq.c:574
+#: dnsmasq.c:619
 msgid "exiting on receipt of SIGTERM"
 msgstr ""
 
-#: dnsmasq.c:611
+#: dnsmasq.c:656
 msgid "connected to system DBus"
 msgstr ""
 
@@ -816,27 +884,32 @@
 msgid "duplicate IP address %s in dhcp-config directive."
 msgstr ""
 
-#: dhcp.c:336
+#: dhcp.c:219
+#, c-format
+msgid "DHCP packet received on %s which has no address"
+msgstr ""
+
+#: dhcp.c:350
 #, c-format
 msgid "DHCP range %s -- %s is not consistent with netmask %s"
 msgstr ""
 
-#: dhcp.c:653
+#: dhcp.c:667
 #, c-format
 msgid "failed to read %s:%m"
 msgstr ""
 
-#: dhcp.c:688
+#: dhcp.c:702
 #, c-format
 msgid "bad line at %s line %d"
 msgstr ""
 
-#: dhcp.c:795
+#: dhcp.c:809
 #, c-format
 msgid "duplicate IP address %s (%s) in dhcp-config directive"
 msgstr ""
 
-#: dhcp.c:831
+#: dhcp.c:845
 #, c-format
 msgid "Ignoring DHCP host name %s because it has an illegal domain part"
 msgstr ""
@@ -882,7 +955,7 @@
 msgid "disabled"
 msgstr ""
 
-#: rfc2131.c:324 rfc2131.c:762
+#: rfc2131.c:324 rfc2131.c:763
 msgid "address in use"
 msgstr ""
 
@@ -890,87 +963,87 @@
 msgid "no address configured"
 msgstr ""
 
-#: rfc2131.c:340 rfc2131.c:631
+#: rfc2131.c:340 rfc2131.c:630
 msgid "no address available"
 msgstr ""
 
-#: rfc2131.c:349 rfc2131.c:772
+#: rfc2131.c:349 rfc2131.c:773
 msgid "no leases left"
 msgstr ""
 
-#: rfc2131.c:352 rfc2131.c:736
+#: rfc2131.c:352 rfc2131.c:737
 msgid "wrong network"
 msgstr ""
 
-#: rfc2131.c:559
+#: rfc2131.c:558
 #, c-format
 msgid "disabling DHCP static address %s for %s"
 msgstr ""
 
-#: rfc2131.c:580
+#: rfc2131.c:579
 msgid "unknown lease"
 msgstr ""
 
-#: rfc2131.c:589 rfc2131.c:873
+#: rfc2131.c:588 rfc2131.c:885
 msgid "ignored"
 msgstr ""
 
-#: rfc2131.c:605
+#: rfc2131.c:604
 #, c-format
 msgid "not using configured address %s because it is leased to %s"
 msgstr ""
 
-#: rfc2131.c:614
+#: rfc2131.c:613
 #, c-format
 msgid ""
 "not using configured address %s because it is in use by the server or relay"
 msgstr ""
 
-#: rfc2131.c:617
+#: rfc2131.c:616
 #, c-format
 msgid "not using configured address %s because it was previously declined"
 msgstr ""
 
-#: rfc2131.c:699
+#: rfc2131.c:700
 msgid "wrong address"
 msgstr ""
 
-#: rfc2131.c:712
+#: rfc2131.c:713
 msgid "lease not found"
 msgstr ""
 
-#: rfc2131.c:744
+#: rfc2131.c:745
 msgid "address not available"
 msgstr ""
 
-#: rfc2131.c:755
+#: rfc2131.c:756
 msgid "static lease available"
 msgstr ""
 
-#: rfc2131.c:759
+#: rfc2131.c:760
 msgid "address reserved"
 msgstr ""
 
-#: rfc2131.c:765
+#: rfc2131.c:766
 msgid "no unique-id"
 msgstr ""
 
-#: rfc2131.c:1011
+#: rfc2131.c:1023
 #, c-format
 msgid "cannot send DHCP option %d: no space left in packet"
 msgstr ""
 
-#: rfc2131.c:1312
+#: rfc2131.c:1322
 #, c-format
 msgid "More than one vendor class matches, using %s"
 msgstr ""
 
-#: netlink.c:51
+#: netlink.c:59
 #, c-format
 msgid "cannot create netlink socket: %s"
 msgstr ""
 
-#: netlink.c:224
+#: netlink.c:232
 #, c-format
 msgid "netlink returns error: %s"
 msgstr ""
@@ -1011,3 +1084,28 @@
 #, c-format
 msgid "failed to execute %s: %m"
 msgstr ""
+
+#: tftp.c:157
+#, c-format
+msgid "unsupported request from %s"
+msgstr ""
+
+#: tftp.c:226
+#, c-format
+msgid "file %s not found"
+msgstr ""
+
+#: tftp.c:293
+#, c-format
+msgid "TFTP sent %s to %s"
+msgstr ""
+
+#: tftp.c:343
+#, c-format
+msgid "TFTP error %d %s received from %s"
+msgstr ""
+
+#: tftp.c:374
+#, c-format
+msgid "TFTP failed sending %s to %s"
+msgstr ""