Accumulated 2.60 changes going into git
diff --git a/po/it.po b/po/it.po
index 5f6675f..792b2d7 100644
--- a/po/it.po
+++ b/po/it.po
@@ -15,61 +15,61 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: cache.c:761
+#: cache.c:757
 #, c-format
 msgid "failed to load names from %s: %s"
 msgstr ""
 
-#: cache.c:795 dhcp.c:874
+#: cache.c:791 dhcp.c:936
 #, c-format
 msgid "bad address at %s line %d"
 msgstr ""
 
-#: cache.c:853 dhcp.c:890
+#: cache.c:849 dhcp.c:952
 #, c-format
 msgid "bad name at %s line %d"
 msgstr ""
 
-#: cache.c:860 dhcp.c:965
+#: cache.c:856 dhcp.c:1027
 #, c-format
 msgid "read %s - %d addresses"
 msgstr ""
 
-#: cache.c:899
+#: cache.c:895
 msgid "cleared cache"
 msgstr ""
 
-#: cache.c:934
+#: cache.c:930
 #, c-format
 msgid "No IPv4 address found for %s"
 msgstr ""
 
-#: cache.c:975
+#: cache.c:971
 #, c-format
 msgid "%s is a CNAME, not giving it to the DHCP lease of %s"
 msgstr ""
 
-#: cache.c:981
+#: cache.c:977
 #, 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:1054
+#: cache.c:1050
 #, c-format
 msgid "time %lu"
 msgstr ""
 
-#: cache.c:1055
+#: cache.c:1051
 #, c-format
 msgid "cache size %d, %d/%d cache insertions re-used unexpired cache entries."
 msgstr ""
 
-#: cache.c:1057
+#: cache.c:1053
 #, c-format
 msgid "queries forwarded %u, queries answered locally %u"
 msgstr ""
 
-#: cache.c:1083
+#: cache.c:1076
 #, c-format
 msgid "server %s#%d: queries sent %u, retried or failed %u"
 msgstr ""
@@ -83,7 +83,7 @@
 msgid "failed to allocate memory"
 msgstr ""
 
-#: util.c:227 option.c:579
+#: util.c:227 option.c:585
 msgid "could not get memory"
 msgstr ""
 
@@ -97,755 +97,767 @@
 msgid "failed to allocate %d bytes"
 msgstr ""
 
-#: util.c:358
+#: util.c:377
 #, c-format
 msgid "infinite"
 msgstr ""
 
-#: option.c:248
+#: option.c:252
 msgid "Specify local address(es) to listen on."
 msgstr ""
 
-#: option.c:249
+#: option.c:253
 msgid "Return ipaddr for all hosts in specified domains."
 msgstr ""
 
-#: option.c:250
+#: option.c:254
 msgid "Fake reverse lookups for RFC1918 private address ranges."
 msgstr ""
 
-#: option.c:251
+#: option.c:255
 msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)."
 msgstr ""
 
-#: option.c:252
+#: option.c:256
 #, c-format
 msgid "Specify the size of the cache in entries (defaults to %s)."
 msgstr ""
 
-#: option.c:253
+#: option.c:257
 #, c-format
 msgid "Specify configuration file (defaults to %s)."
 msgstr ""
 
-#: option.c:254
+#: option.c:258
 msgid "Do NOT fork into the background: run in debug mode."
 msgstr ""
 
-#: option.c:255
+#: option.c:259
 msgid "Do NOT forward queries with no domain part."
 msgstr ""
 
-#: option.c:256
+#: option.c:260
 msgid "Return self-pointing MX records for local hosts."
 msgstr ""
 
-#: option.c:257
+#: option.c:261
 msgid "Expand simple names in /etc/hosts with domain-suffix."
 msgstr ""
 
-#: option.c:258
+#: option.c:262
 msgid "Don't forward spurious DNS requests from Windows hosts."
 msgstr ""
 
-#: option.c:259
+#: option.c:263
 msgid "Enable DHCP in the range given with lease duration."
 msgstr ""
 
-#: option.c:260
+#: option.c:264
 #, c-format
 msgid "Change to this group after startup (defaults to %s)."
 msgstr ""
 
-#: option.c:261
+#: option.c:265
 msgid "Set address or hostname for a specified machine."
 msgstr ""
 
-#: option.c:262
+#: option.c:266
 msgid "Read DHCP host specs from file."
 msgstr ""
 
-#: option.c:263
+#: option.c:267
 msgid "Read DHCP option specs from file."
 msgstr ""
 
-#: option.c:264
+#: option.c:268
 msgid "Evaluate conditional tag expression."
 msgstr ""
 
-#: option.c:265
+#: option.c:269
 #, c-format
 msgid "Do NOT load %s file."
 msgstr ""
 
-#: option.c:266
+#: option.c:270
 #, c-format
 msgid "Specify a hosts file to be read in addition to %s."
 msgstr ""
 
-#: option.c:267
+#: option.c:271
 msgid "Specify interface(s) to listen on."
 msgstr ""
 
-#: option.c:268
+#: option.c:272
 msgid "Specify interface(s) NOT to listen on."
 msgstr ""
 
-#: option.c:269
+#: option.c:273
 msgid "Map DHCP user class to tag."
 msgstr ""
 
-#: option.c:270
+#: option.c:274
 msgid "Map RFC3046 circuit-id to tag."
 msgstr ""
 
-#: option.c:271
+#: option.c:275
 msgid "Map RFC3046 remote-id to tag."
 msgstr ""
 
-#: option.c:272
+#: option.c:276
 msgid "Map RFC3993 subscriber-id to tag."
 msgstr ""
 
-#: option.c:273
+#: option.c:277
 msgid "Don't do DHCP for hosts with tag set."
 msgstr ""
 
-#: option.c:274
+#: option.c:278
 msgid "Force broadcast replies for hosts with tag set."
 msgstr ""
 
-#: option.c:275
+#: option.c:279
 msgid "Do NOT fork into the background, do NOT run in debug mode."
 msgstr ""
 
-#: option.c:276
-msgid "Assume we are the only DHCP server on the local network."
-msgstr ""
-
-#: option.c:277
-#, c-format
-msgid "Specify where to store DHCP leases (defaults to %s)."
-msgstr ""
-
-#: option.c:278
-msgid "Return MX records for local hosts."
-msgstr ""
-
-#: option.c:279
-msgid "Specify an MX record."
-msgstr ""
-
 #: option.c:280
-msgid "Specify BOOTP options to DHCP server."
+msgid "Assume we are the only DHCP server on the local network."
 msgstr ""
 
 #: option.c:281
 #, c-format
-msgid "Do NOT poll %s file, reload only on SIGHUP."
+msgid "Specify where to store DHCP leases (defaults to %s)."
 msgstr ""
 
 #: option.c:282
-msgid "Do NOT cache failed search results."
+msgid "Return MX records for local hosts."
 msgstr ""
 
 #: option.c:283
-#, c-format
-msgid "Use nameservers strictly in the order given in %s."
+msgid "Specify an MX record."
 msgstr ""
 
 #: option.c:284
-msgid "Specify options to be sent to DHCP clients."
+msgid "Specify BOOTP options to DHCP server."
 msgstr ""
 
 #: option.c:285
-msgid "DHCP option sent even if the client does not request it."
+#, c-format
+msgid "Do NOT poll %s file, reload only on SIGHUP."
 msgstr ""
 
 #: option.c:286
-msgid "Specify port to listen for DNS requests on (defaults to 53)."
+msgid "Do NOT cache failed search results."
 msgstr ""
 
 #: option.c:287
 #, c-format
-msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)."
+msgid "Use nameservers strictly in the order given in %s."
 msgstr ""
 
 #: option.c:288
-msgid "Log DNS queries."
+msgid "Specify options to be sent to DHCP clients."
 msgstr ""
 
 #: option.c:289
-msgid "Force the originating port for upstream DNS queries."
+msgid "DHCP option sent even if the client does not request it."
 msgstr ""
 
 #: option.c:290
-msgid "Do NOT read resolv.conf."
+msgid "Specify port to listen for DNS requests on (defaults to 53)."
 msgstr ""
 
 #: option.c:291
 #, c-format
-msgid "Specify path to resolv.conf (defaults to %s)."
+msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)."
 msgstr ""
 
 #: option.c:292
-msgid "Specify address(es) of upstream servers with optional domains."
+msgid "Log DNS queries."
 msgstr ""
 
 #: option.c:293
-msgid "Never forward queries to specified domains."
+msgid "Force the originating port for upstream DNS queries."
 msgstr ""
 
 #: option.c:294
-msgid "Specify the domain to be assigned in DHCP leases."
+msgid "Do NOT read resolv.conf."
 msgstr ""
 
 #: option.c:295
-msgid "Specify default target in an MX record."
+#, c-format
+msgid "Specify path to resolv.conf (defaults to %s)."
 msgstr ""
 
 #: option.c:296
-msgid "Specify time-to-live in seconds for replies from /etc/hosts."
+msgid "Specify address(es) of upstream servers with optional domains."
 msgstr ""
 
 #: option.c:297
-msgid "Specify time-to-live in seconds for negative caching."
+msgid "Never forward queries to specified domains."
 msgstr ""
 
 #: option.c:298
-msgid "Specify time-to-live in seconds for maximum TTL to send to clients."
+msgid "Specify the domain to be assigned in DHCP leases."
 msgstr ""
 
 #: option.c:299
+msgid "Specify default target in an MX record."
+msgstr ""
+
+#: option.c:300
+msgid "Specify time-to-live in seconds for replies from /etc/hosts."
+msgstr ""
+
+#: option.c:301
+msgid "Specify time-to-live in seconds for negative caching."
+msgstr ""
+
+#: option.c:302
+msgid "Specify time-to-live in seconds for maximum TTL to send to clients."
+msgstr ""
+
+#: option.c:303
 #, c-format
 msgid "Change to this user after startup. (defaults to %s)."
 msgstr ""
 
-#: option.c:300
+#: option.c:304
 msgid "Map DHCP vendor class to tag."
 msgstr ""
 
-#: option.c:301
+#: option.c:305
 msgid "Display dnsmasq version and copyright information."
 msgstr ""
 
-#: option.c:302
+#: option.c:306
 msgid "Translate IPv4 addresses from upstream servers."
 msgstr ""
 
-#: option.c:303
+#: option.c:307
 msgid "Specify a SRV record."
 msgstr ""
 
-#: option.c:304
+#: option.c:308
 msgid "Display this message. Use --help dhcp for known DHCP options."
 msgstr ""
 
-#: option.c:305
+#: option.c:309
 #, c-format
 msgid "Specify path of PID file (defaults to %s)."
 msgstr ""
 
-#: option.c:306
+#: option.c:310
 #, c-format
 msgid "Specify maximum number of DHCP leases (defaults to %s)."
 msgstr ""
 
-#: option.c:307
+#: option.c:311
 msgid "Answer DNS queries based on the interface a query was sent to."
 msgstr ""
 
-#: option.c:308
+#: option.c:312
 msgid "Specify TXT DNS record."
 msgstr ""
 
-#: option.c:309
+#: option.c:313
 msgid "Specify PTR DNS record."
 msgstr ""
 
-#: option.c:310
+#: option.c:314
 msgid "Give DNS name to IPv4 address of interface."
 msgstr ""
 
-#: option.c:311
+#: option.c:315
 msgid "Bind only to interfaces in use."
 msgstr ""
 
-#: option.c:312
+#: option.c:316
 #, c-format
 msgid "Read DHCP static host information from %s."
 msgstr ""
 
-#: option.c:313
+#: option.c:317
 msgid "Enable the DBus interface for setting upstream servers, etc."
 msgstr ""
 
-#: option.c:314
+#: option.c:318
 msgid "Do not provide DHCP on this interface, only provide DNS."
 msgstr ""
 
-#: option.c:315
+#: option.c:319
 msgid "Enable dynamic address allocation for bootp."
 msgstr ""
 
-#: option.c:316
+#: option.c:320
 msgid "Map MAC address (with wildcards) to option set."
 msgstr ""
 
-#: option.c:317
+#: option.c:321
 msgid "Treat DHCP requests on aliases as arriving from interface."
 msgstr ""
 
-#: option.c:318
+#: option.c:322
 msgid "Disable ICMP echo address checking in the DHCP server."
 msgstr ""
 
-#: option.c:319
+#: option.c:323
 msgid "Script to run on DHCP lease creation and destruction."
 msgstr ""
 
-#: option.c:320
+#: option.c:324
 msgid "Read configuration from all the files in this directory."
 msgstr ""
 
-#: option.c:321
+#: option.c:325
 msgid "Log to this syslog facility or file. (defaults to DAEMON)"
 msgstr ""
 
-#: option.c:322
+#: option.c:326
 msgid "Do not use leasefile."
 msgstr ""
 
-#: option.c:323
+#: option.c:327
 #, c-format
 msgid "Maximum number of concurrent DNS queries. (defaults to %s)"
 msgstr ""
 
-#: option.c:324
+#: option.c:328
 #, c-format
 msgid "Clear DNS cache when reloading %s."
 msgstr ""
 
-#: option.c:325
+#: option.c:329
 msgid "Ignore hostnames provided by DHCP clients."
 msgstr ""
 
-#: option.c:326
+#: option.c:330
 msgid "Do NOT reuse filename and server fields for extra DHCP options."
 msgstr ""
 
-#: option.c:327
+#: option.c:331
 msgid "Enable integrated read-only TFTP server."
 msgstr ""
 
-#: option.c:328
+#: option.c:332
 msgid "Export files by TFTP only from the specified subtree."
 msgstr ""
 
-#: option.c:329
+#: option.c:333
 msgid "Add client IP address to tftp-root."
 msgstr ""
 
-#: option.c:330
+#: option.c:334
 msgid "Allow access only to files owned by the user running dnsmasq."
 msgstr ""
 
-#: option.c:331
+#: option.c:335
 #, c-format
 msgid "Maximum number of conncurrent TFTP transfers (defaults to %s)."
 msgstr ""
 
-#: option.c:332
+#: option.c:336
 msgid "Disable the TFTP blocksize extension."
 msgstr ""
 
-#: option.c:333
+#: option.c:337
 msgid "Ephemeral port range for use by TFTP transfers."
 msgstr ""
 
-#: option.c:334
+#: option.c:338
 msgid "Extra logging for DHCP."
 msgstr ""
 
-#: option.c:335
+#: option.c:339
 msgid "Enable async. logging; optionally set queue length."
 msgstr ""
 
-#: option.c:336
+#: option.c:340
 msgid "Stop DNS rebinding. Filter private IP ranges when resolving."
 msgstr ""
 
-#: option.c:337
+#: option.c:341
 msgid "Allow rebinding of 127.0.0.0/8, for RBL servers."
 msgstr ""
 
-#: option.c:338
+#: option.c:342
 msgid "Inhibit DNS-rebind protection on this domain."
 msgstr ""
 
-#: option.c:339
+#: option.c:343
 msgid "Always perform DNS queries to all servers."
 msgstr ""
 
-#: option.c:340
+#: option.c:344
 msgid "Set tag if client includes matching option in request."
 msgstr ""
 
-#: option.c:341
+#: option.c:345
 msgid "Use alternative ports for DHCP."
 msgstr ""
 
-#: option.c:342
+#: option.c:346
 msgid "Run lease-change script as this user."
 msgstr ""
 
-#: option.c:343
+#: option.c:347
 msgid "Specify NAPTR DNS record."
 msgstr ""
 
-#: option.c:344
+#: option.c:348
 msgid "Specify lowest port available for DNS query transmission."
 msgstr ""
 
-#: option.c:345
+#: option.c:349
 msgid "Use only fully qualified domain names for DHCP clients."
 msgstr ""
 
-#: option.c:346
+#: option.c:350
 msgid "Generate hostnames based on MAC address for nameless clients."
 msgstr ""
 
-#: option.c:347
+#: option.c:351
 msgid "Use these DHCP relays as full proxies."
 msgstr ""
 
-#: option.c:348
+#: option.c:352
 msgid "Specify alias name for LOCAL DNS name."
 msgstr ""
 
-#: option.c:349
+#: option.c:353
 msgid "Prompt to send to PXE clients."
 msgstr ""
 
-#: option.c:350
+#: option.c:354
 msgid "Boot service for PXE menu."
 msgstr ""
 
-#: option.c:351
+#: option.c:355
 msgid "Check configuration syntax."
 msgstr ""
 
-#: option.c:352
+#: option.c:356
 msgid "Add requestor's MAC address to forwarded DNS queries."
 msgstr ""
 
-#: option.c:353
+#: option.c:357
 msgid "Proxy DNSSEC validation results from upstream nameservers."
 msgstr ""
 
-#: option.c:354
+#: option.c:358
 msgid "Attempt to allocate sequential IP addresses to DHCP clients."
 msgstr ""
 
-#: option.c:355
+#: option.c:359
 msgid "Copy connection-track mark from queries to upstream connections."
 msgstr ""
 
-#: option.c:644
+#: option.c:360
+msgid "Allow DHCP clients to do their own DDNS updates."
+msgstr ""
+
+#: option.c:361
+msgid "Specify path to Lua script (no default)."
+msgstr ""
+
+#: option.c:650
 #, c-format
 msgid ""
 "Usage: dnsmasq [options]\n"
 "\n"
 msgstr ""
 
-#: option.c:646
+#: option.c:652
 #, c-format
 msgid "Use short options only on the command line.\n"
 msgstr ""
 
-#: option.c:648
+#: option.c:654
 #, c-format
 msgid "Valid options are:\n"
 msgstr ""
 
-#: option.c:689
+#: option.c:695
 #, c-format
 msgid "Known DHCP options:\n"
 msgstr ""
 
-#: option.c:804
+#: option.c:810
 msgid "bad dhcp-option"
 msgstr ""
 
-#: option.c:866
+#: option.c:872
 msgid "bad IP address"
 msgstr ""
 
-#: option.c:974
+#: option.c:980
 msgid "bad domain in dhcp-option"
 msgstr ""
 
-#: option.c:1040
+#: option.c:1046
 msgid "dhcp-option too long"
 msgstr ""
 
-#: option.c:1049
+#: option.c:1055
 msgid "illegal dhcp-match"
 msgstr ""
 
-#: option.c:1093
+#: option.c:1099
 msgid "illegal repeated flag"
 msgstr ""
 
-#: option.c:1101
+#: option.c:1107
 msgid "illegal repeated keyword"
 msgstr ""
 
-#: option.c:1153 option.c:3062
+#: option.c:1159 option.c:3077
 #, c-format
 msgid "cannot access directory %s: %s"
 msgstr ""
 
-#: option.c:1184 tftp.c:465
+#: option.c:1190 tftp.c:464
 #, c-format
 msgid "cannot access %s: %s"
 msgstr ""
 
-#: option.c:1213
+#: option.c:1219
 msgid "setting log facility is not possible under Android"
 msgstr ""
 
-#: option.c:1222
+#: option.c:1228
 msgid "bad log facility"
 msgstr ""
 
-#: option.c:1271
+#: option.c:1277
 msgid "bad MX preference"
 msgstr ""
 
-#: option.c:1276
+#: option.c:1282
 msgid "bad MX name"
 msgstr ""
 
-#: option.c:1290
+#: option.c:1296
 msgid "bad MX target"
 msgstr ""
 
-#: option.c:1300
+#: option.c:1308
 msgid "cannot run scripts under uClinux"
 msgstr ""
 
-#: option.c:1302
+#: option.c:1310
 msgid "recompile with HAVE_SCRIPT defined to enable lease-change scripts"
 msgstr ""
 
-#: option.c:1607 option.c:1611
+#: option.c:1314
+msgid "recompile with HAVE_LUASCRIPT defined to enable Lua scripts"
+msgstr ""
+
+#: option.c:1622 option.c:1626
 msgid "bad port"
 msgstr ""
 
-#: option.c:1634 option.c:1665
+#: option.c:1649 option.c:1680
 msgid "interface binding not supported"
 msgstr ""
 
-#: option.c:1645 option.c:2614
+#: option.c:1660 option.c:2629
 msgid "bad interface name"
 msgstr ""
 
-#: option.c:1810
+#: option.c:1825
 msgid "bad port range"
 msgstr ""
 
-#: option.c:1827
+#: option.c:1842
 msgid "bad bridge-interface"
 msgstr ""
 
-#: option.c:1870
+#: option.c:1885
 msgid "bad dhcp-range"
 msgstr ""
 
-#: option.c:1898
+#: option.c:1913
 msgid "only one tag allowed"
 msgstr ""
 
-#: option.c:1945
+#: option.c:1960
 msgid "inconsistent DHCP range"
 msgstr ""
 
-#: option.c:2039 option.c:2067
+#: option.c:2054 option.c:2082
 msgid "bad hex constant"
 msgstr ""
 
-#: option.c:2061
+#: option.c:2076
 msgid "cannot match tags in --dhcp-host"
 msgstr ""
 
-#: option.c:2129
+#: option.c:2144
 msgid "bad DHCP host name"
 msgstr ""
 
-#: option.c:2210
+#: option.c:2225
 msgid "bad tag-if"
 msgstr ""
 
-#: option.c:2499 option.c:2784
+#: option.c:2514 option.c:2799
 msgid "invalid port number"
 msgstr ""
 
-#: option.c:2561
+#: option.c:2576
 msgid "bad dhcp-proxy address"
 msgstr ""
 
-#: option.c:2601
+#: option.c:2616
 msgid "invalid alias range"
 msgstr ""
 
-#: option.c:2639
+#: option.c:2654
 msgid "bad CNAME"
 msgstr ""
 
-#: option.c:2644
+#: option.c:2659
 msgid "duplicate CNAME"
 msgstr ""
 
-#: option.c:2664
+#: option.c:2679
 msgid "bad PTR record"
 msgstr ""
 
-#: option.c:2695
+#: option.c:2710
 msgid "bad NAPTR record"
 msgstr ""
 
-#: option.c:2727
+#: option.c:2742
 msgid "bad TXT record"
 msgstr ""
 
-#: option.c:2770
+#: option.c:2785
 msgid "bad SRV record"
 msgstr ""
 
-#: option.c:2777
+#: option.c:2792
 msgid "bad SRV target"
 msgstr ""
 
-#: option.c:2791
+#: option.c:2806
 msgid "invalid priority"
 msgstr ""
 
-#: option.c:2798
+#: option.c:2813
 msgid "invalid weight"
 msgstr ""
 
-#: option.c:2817
+#: option.c:2832
 msgid "unsupported option (check that dnsmasq was compiled with DHCP/TFTP/DBus support)"
 msgstr ""
 
-#: option.c:2881
+#: option.c:2896
 msgid "missing \""
 msgstr ""
 
-#: option.c:2940
+#: option.c:2955
 msgid "bad option"
 msgstr ""
 
-#: option.c:2942
+#: option.c:2957
 msgid "extraneous parameter"
 msgstr ""
 
-#: option.c:2944
+#: option.c:2959
 msgid "missing parameter"
 msgstr ""
 
-#: option.c:2948
+#: option.c:2963
 msgid "error"
 msgstr ""
 
-#: option.c:2953
+#: option.c:2968
 #, c-format
 msgid "%s at line %d of %%s"
 msgstr ""
 
-#: option.c:3017 tftp.c:629
+#: option.c:3032 tftp.c:627
 #, c-format
 msgid "cannot read %s: %s"
 msgstr ""
 
-#: option.c:3183 option.c:3219
+#: option.c:3198 option.c:3234
 #, c-format
 msgid "read %s"
 msgstr ""
 
-#: option.c:3271
+#: option.c:3286
 msgid "junk found in command line"
 msgstr ""
 
-#: option.c:3301
+#: option.c:3316
 #, c-format
 msgid "Dnsmasq version %s  %s\n"
 msgstr ""
 
-#: option.c:3302
+#: option.c:3317
 #, c-format
 msgid ""
 "Compile time options %s\n"
 "\n"
 msgstr ""
 
-#: option.c:3303
+#: option.c:3318
 #, c-format
 msgid "This software comes with ABSOLUTELY NO WARRANTY.\n"
 msgstr ""
 
-#: option.c:3304
+#: option.c:3319
 #, c-format
 msgid "Dnsmasq is free software, and you are welcome to redistribute it\n"
 msgstr ""
 
-#: option.c:3305
+#: option.c:3320
 #, c-format
 msgid "under the terms of the GNU General Public License, version 2 or 3.\n"
 msgstr ""
 
-#: option.c:3316
+#: option.c:3331
 msgid "try --help"
 msgstr ""
 
-#: option.c:3318
+#: option.c:3333
 msgid "try -w"
 msgstr ""
 
-#: option.c:3321
+#: option.c:3336
 #, c-format
 msgid "bad command line options: %s"
 msgstr ""
 
-#: option.c:3362
+#: option.c:3377
 #, c-format
 msgid "cannot get host-name: %s"
 msgstr ""
 
-#: option.c:3390
+#: option.c:3405
 msgid "only one resolv.conf file allowed in no-poll mode."
 msgstr ""
 
-#: option.c:3400
+#: option.c:3415
 msgid "must have exactly one resolv.conf to read domain from."
 msgstr ""
 
-#: option.c:3403 network.c:845 dhcp.c:823
+#: option.c:3418 network.c:821 dhcp.c:885
 #, c-format
 msgid "failed to read %s: %s"
 msgstr ""
 
-#: option.c:3420
+#: option.c:3435
 #, c-format
 msgid "no search directive found in %s"
 msgstr ""
 
-#: option.c:3441
+#: option.c:3456
 msgid "there must be a default domain when --dhcp-fqdn is set"
 msgstr ""
 
-#: option.c:3445
+#: option.c:3460
 msgid "syntax check OK"
 msgstr ""
 
@@ -859,371 +871,376 @@
 msgid "possible DNS-rebind attack detected: %s"
 msgstr ""
 
-#: network.c:171
-#, c-format
-msgid "unknown interface %s in bridge-interface"
-msgstr ""
-
-#: network.c:384
+#: network.c:354
 #, c-format
 msgid "failed to create listening socket for %s: %s"
 msgstr ""
 
-#: network.c:743
+#: network.c:719
 #, c-format
 msgid "failed to bind server socket for %s: %s"
 msgstr ""
 
-#: network.c:780
+#: network.c:756
 #, c-format
 msgid "ignoring nameserver %s - local interface"
 msgstr ""
 
-#: network.c:791
+#: network.c:767
 #, c-format
 msgid "ignoring nameserver %s - cannot make/bind socket: %s"
 msgstr ""
 
-#: network.c:808
+#: network.c:784
 msgid "unqualified"
 msgstr ""
 
-#: network.c:808
+#: network.c:784
 msgid "names"
 msgstr ""
 
-#: network.c:810
+#: network.c:786
 msgid "default"
 msgstr ""
 
-#: network.c:812
+#: network.c:788
 msgid "domain"
 msgstr ""
 
-#: network.c:815
+#: network.c:791
 #, c-format
 msgid "using local addresses only for %s %s"
 msgstr ""
 
-#: network.c:817
+#: network.c:793
 #, c-format
 msgid "using standard nameservers for %s %s"
 msgstr ""
 
-#: network.c:819
+#: network.c:795
 #, c-format
 msgid "using nameserver %s#%d for %s %s"
 msgstr ""
 
-#: network.c:822
+#: network.c:798
 #, c-format
 msgid "using nameserver %s#%d(via %s)"
 msgstr ""
 
-#: network.c:824
+#: network.c:800
 #, c-format
 msgid "using nameserver %s#%d"
 msgstr ""
 
-#: dnsmasq.c:152
+#: dnsmasq.c:114
 msgid "TFTP server not available: set HAVE_TFTP in src/config.h"
 msgstr ""
 
-#: dnsmasq.c:157
+#: dnsmasq.c:119
 msgid "Cannot use --conntrack AND --query-port"
 msgstr ""
 
-#: dnsmasq.c:160
+#: dnsmasq.c:122
 msgid "Conntrack support not available: set HAVE_CONNTRACK in src/config.h"
 msgstr ""
 
-#: dnsmasq.c:165
+#: dnsmasq.c:127
 msgid "asychronous logging is not available under Solaris"
 msgstr ""
 
-#: dnsmasq.c:170
+#: dnsmasq.c:132
 msgid "asychronous logging is not available under Android"
 msgstr ""
 
-#: dnsmasq.c:189
+#: dnsmasq.c:151
 #, c-format
 msgid "failed to find list of interfaces: %s"
 msgstr ""
 
-#: dnsmasq.c:197
+#: dnsmasq.c:159
 #, c-format
 msgid "unknown interface %s"
 msgstr ""
 
-#: dnsmasq.c:203
+#: dnsmasq.c:165
 #, c-format
 msgid "no interface with address %s"
 msgstr ""
 
-#: dnsmasq.c:219 dnsmasq.c:716
+#: dnsmasq.c:181 dnsmasq.c:680
 #, c-format
 msgid "DBus error: %s"
 msgstr ""
 
-#: dnsmasq.c:222
+#: dnsmasq.c:184
 msgid "DBus not available: set HAVE_DBUS in src/config.h"
 msgstr ""
 
-#: dnsmasq.c:248
+#: dnsmasq.c:211
 #, c-format
 msgid "unknown user or group: %s"
 msgstr ""
 
-#: dnsmasq.c:303
+#: dnsmasq.c:266
 #, c-format
 msgid "cannot chdir to filesystem root: %s"
 msgstr ""
 
-#: dnsmasq.c:477
+#: dnsmasq.c:441
 #, c-format
 msgid "started, version %s DNS disabled"
 msgstr ""
 
-#: dnsmasq.c:479
+#: dnsmasq.c:443
 #, c-format
 msgid "started, version %s cachesize %d"
 msgstr ""
 
-#: dnsmasq.c:481
+#: dnsmasq.c:445
 #, c-format
 msgid "started, version %s cache disabled"
 msgstr ""
 
-#: dnsmasq.c:483
+#: dnsmasq.c:447
 #, c-format
 msgid "compile time options: %s"
 msgstr ""
 
-#: dnsmasq.c:489
+#: dnsmasq.c:453
 msgid "DBus support enabled: connected to system bus"
 msgstr ""
 
-#: dnsmasq.c:491
+#: dnsmasq.c:455
 msgid "DBus support enabled: bus connection pending"
 msgstr ""
 
-#: dnsmasq.c:496
+#: dnsmasq.c:460
 #, c-format
 msgid "warning: failed to change owner of %s: %s"
 msgstr ""
 
-#: dnsmasq.c:500
+#: dnsmasq.c:464
 msgid "setting --bind-interfaces option because of OS limitations"
 msgstr ""
 
-#: dnsmasq.c:505
+#: dnsmasq.c:469
 #, c-format
 msgid "warning: interface %s does not currently exist"
 msgstr ""
 
-#: dnsmasq.c:510
+#: dnsmasq.c:474
 msgid "warning: ignoring resolv-file flag because no-resolv is set"
 msgstr ""
 
-#: dnsmasq.c:513
+#: dnsmasq.c:477
 msgid "warning: no upstream servers configured"
 msgstr ""
 
-#: dnsmasq.c:517
+#: dnsmasq.c:481
 #, c-format
 msgid "asynchronous logging enabled, queue limit is %d messages"
 msgstr ""
 
-#: dnsmasq.c:530
+#: dnsmasq.c:494
 #, c-format
 msgid "DHCP, static leases only on %.0s%s, lease time %s"
 msgstr ""
 
-#: dnsmasq.c:532
+#: dnsmasq.c:496
 #, c-format
 msgid "DHCP, proxy on subnet %.0s%s%.0s"
 msgstr ""
 
-#: dnsmasq.c:533
+#: dnsmasq.c:497
 #, c-format
 msgid "DHCP, IP range %s -- %s, lease time %s"
 msgstr ""
 
-#: dnsmasq.c:548
+#: dnsmasq.c:512
 msgid "root is "
 msgstr ""
 
-#: dnsmasq.c:548
+#: dnsmasq.c:512
 msgid "enabled"
 msgstr ""
 
-#: dnsmasq.c:550
+#: dnsmasq.c:514
 msgid "secure mode"
 msgstr ""
 
-#: dnsmasq.c:576
+#: dnsmasq.c:540
 #, c-format
 msgid "restricting maximum simultaneous TFTP transfers to %d"
 msgstr ""
 
-#: dnsmasq.c:718
+#: dnsmasq.c:682
 msgid "connected to system DBus"
 msgstr ""
 
-#: dnsmasq.c:813
+#: dnsmasq.c:806
 #, c-format
 msgid "cannot fork into background: %s"
 msgstr ""
 
-#: dnsmasq.c:816
+#: dnsmasq.c:809
 #, c-format
 msgid "failed to create helper: %s"
 msgstr ""
 
-#: dnsmasq.c:819
+#: dnsmasq.c:812
 #, c-format
 msgid "setting capabilities failed: %s"
 msgstr ""
 
-#: dnsmasq.c:823
+#: dnsmasq.c:815
 #, c-format
 msgid "failed to change user-id to %s: %s"
 msgstr ""
 
-#: dnsmasq.c:828
+#: dnsmasq.c:818
 #, c-format
 msgid "failed to change group-id to %s: %s"
 msgstr ""
 
-#: dnsmasq.c:831
+#: dnsmasq.c:821
 #, c-format
 msgid "failed to open pidfile %s: %s"
 msgstr ""
 
-#: dnsmasq.c:834
+#: dnsmasq.c:824
 #, c-format
-msgid "cannot open %s: %s"
+msgid "cannot open log %s: %s"
 msgstr ""
 
-#: dnsmasq.c:889
+#: dnsmasq.c:827
 #, c-format
-msgid "child process killed by signal %d"
+msgid "failed to load Lua script: %s"
 msgstr ""
 
-#: dnsmasq.c:893
+#: dnsmasq.c:886
 #, c-format
-msgid "child process exited with status %d"
+msgid "script process killed by signal %d"
 msgstr ""
 
-#: dnsmasq.c:897
+#: dnsmasq.c:890
+#, c-format
+msgid "script process exited with status %d"
+msgstr ""
+
+#: dnsmasq.c:894
 #, c-format
 msgid "failed to execute %s: %s"
 msgstr ""
 
-#: dnsmasq.c:941
+#: dnsmasq.c:939
 msgid "exiting on receipt of SIGTERM"
 msgstr ""
 
-#: dnsmasq.c:969
+#: dnsmasq.c:967
 #, c-format
 msgid "failed to access %s: %s"
 msgstr ""
 
-#: dnsmasq.c:999
+#: dnsmasq.c:997
 #, c-format
 msgid "reading %s"
 msgstr ""
 
-#: dnsmasq.c:1010
+#: dnsmasq.c:1008
 #, c-format
 msgid "no servers found in %s, will retry"
 msgstr ""
 
-#: dhcp.c:39
+#: dhcp.c:49
 #, c-format
 msgid "cannot create DHCP socket: %s"
 msgstr ""
 
-#: dhcp.c:51
+#: dhcp.c:64
 #, c-format
 msgid "failed to set options on DHCP socket: %s"
 msgstr ""
 
-#: dhcp.c:64
+#: dhcp.c:77
 #, c-format
 msgid "failed to set SO_REUSE{ADDR|PORT} on DHCP socket: %s"
 msgstr ""
 
-#: dhcp.c:76
+#: dhcp.c:89
 #, c-format
 msgid "failed to bind DHCP server socket: %s"
 msgstr ""
 
-#: dhcp.c:102
+#: dhcp.c:115
 #, c-format
 msgid "cannot create ICMP raw socket: %s."
 msgstr ""
 
-#: dhcp.c:278
+#: dhcp.c:264
+#, c-format
+msgid "unknown interface %s in bridge-interface"
+msgstr ""
+
+#: dhcp.c:289
 #, c-format
 msgid "DHCP packet received on %s which has no address"
 msgstr ""
 
-#: dhcp.c:442
+#: dhcp.c:504
 #, c-format
 msgid "DHCP range %s -- %s is not consistent with netmask %s"
 msgstr ""
 
-#: dhcp.c:861
+#: dhcp.c:923
 #, c-format
 msgid "bad line at %s line %d"
 msgstr ""
 
-#: dhcp.c:904
+#: dhcp.c:966
 #, c-format
 msgid "ignoring %s line %d, duplicate name or IP address"
 msgstr ""
 
-#: dhcp.c:987
+#: dhcp.c:1049
 #, c-format
 msgid "duplicate IP address %s in dhcp-config directive."
 msgstr ""
 
-#: dhcp.c:990
+#: dhcp.c:1052
 #, c-format
 msgid "duplicate IP address %s in %s."
 msgstr ""
 
-#: dhcp.c:1033
+#: dhcp.c:1095
 #, c-format
 msgid "%s has more than one address in hostsfile, using %s for DHCP"
 msgstr ""
 
-#: dhcp.c:1038
+#: dhcp.c:1100
 #, c-format
 msgid "duplicate IP address %s (%s) in dhcp-config directive"
 msgstr ""
 
-#: lease.c:67
+#: lease.c:70
 #, c-format
 msgid "cannot open or create lease file %s: %s"
 msgstr ""
 
-#: lease.c:93
+#: lease.c:116
 msgid "too many stored leases"
 msgstr ""
 
-#: lease.c:129
+#: lease.c:173
 #, c-format
 msgid "cannot run lease-init script %s: %s"
 msgstr ""
 
-#: lease.c:135
+#: lease.c:179
 #, c-format
 msgid "lease-init script returned exit code %s"
 msgstr ""
 
-#: lease.c:235
+#: lease.c:325
 #, c-format
 msgid "failed to write %s: %s (retry in %us)"
 msgstr ""
@@ -1255,19 +1272,19 @@
 msgid "disabled"
 msgstr ""
 
-#: rfc2131.c:428 rfc2131.c:945 rfc2131.c:1337
+#: rfc2131.c:428 rfc2131.c:944 rfc2131.c:1336
 msgid "ignored"
 msgstr ""
 
-#: rfc2131.c:443 rfc2131.c:1183
+#: rfc2131.c:443 rfc2131.c:1182
 msgid "address in use"
 msgstr ""
 
-#: rfc2131.c:457 rfc2131.c:999
+#: rfc2131.c:457 rfc2131.c:998
 msgid "no address available"
 msgstr ""
 
-#: rfc2131.c:464 rfc2131.c:1146
+#: rfc2131.c:464 rfc2131.c:1145
 msgid "wrong network"
 msgstr ""
 
@@ -1275,146 +1292,146 @@
 msgid "no address configured"
 msgstr ""
 
-#: rfc2131.c:485 rfc2131.c:1196
+#: rfc2131.c:485 rfc2131.c:1195
 msgid "no leases left"
 msgstr ""
 
-#: rfc2131.c:570
+#: rfc2131.c:569
 #, c-format
 msgid "%u client provides name: %s"
 msgstr ""
 
-#: rfc2131.c:725
+#: rfc2131.c:724
 #, c-format
 msgid "%u vendor class: %s"
 msgstr ""
 
-#: rfc2131.c:727
+#: rfc2131.c:726
 #, c-format
 msgid "%u user class: %s"
 msgstr ""
 
-#: rfc2131.c:786
+#: rfc2131.c:785
 msgid "PXE BIS not supported"
 msgstr ""
 
-#: rfc2131.c:915
+#: rfc2131.c:914
 #, c-format
 msgid "disabling DHCP static address %s for %s"
 msgstr ""
 
-#: rfc2131.c:936
+#: rfc2131.c:935
 msgid "unknown lease"
 msgstr ""
 
-#: rfc2131.c:968
+#: rfc2131.c:967
 #, c-format
 msgid "not using configured address %s because it is leased to %s"
 msgstr ""
 
-#: rfc2131.c:978
+#: rfc2131.c:977
 #, c-format
 msgid "not using configured address %s because it is in use by the server or relay"
 msgstr ""
 
-#: rfc2131.c:981
+#: rfc2131.c:980
 #, c-format
 msgid "not using configured address %s because it was previously declined"
 msgstr ""
 
-#: rfc2131.c:997 rfc2131.c:1189
+#: rfc2131.c:996 rfc2131.c:1188
 msgid "no unique-id"
 msgstr ""
 
-#: rfc2131.c:1084
+#: rfc2131.c:1083
 msgid "wrong server-ID"
 msgstr ""
 
-#: rfc2131.c:1103
+#: rfc2131.c:1102
 msgid "wrong address"
 msgstr ""
 
-#: rfc2131.c:1121
+#: rfc2131.c:1120
 msgid "lease not found"
 msgstr ""
 
-#: rfc2131.c:1154
+#: rfc2131.c:1153
 msgid "address not available"
 msgstr ""
 
-#: rfc2131.c:1165
+#: rfc2131.c:1164
 msgid "static lease available"
 msgstr ""
 
-#: rfc2131.c:1169
+#: rfc2131.c:1168
 msgid "address reserved"
 msgstr ""
 
-#: rfc2131.c:1177
+#: rfc2131.c:1176
 #, c-format
 msgid "abandoning lease to %s of %s"
 msgstr ""
 
-#: rfc2131.c:1746
+#: rfc2131.c:1745
 #, c-format
 msgid "%u tags: %s"
 msgstr ""
 
-#: rfc2131.c:1774
+#: rfc2131.c:1773
 #, c-format
 msgid "%u bootfile name: %s"
 msgstr ""
 
-#: rfc2131.c:1783
+#: rfc2131.c:1782
 #, c-format
 msgid "%u server name: %s"
 msgstr ""
 
-#: rfc2131.c:1791
+#: rfc2131.c:1790
 #, c-format
 msgid "%u next server: %s"
 msgstr ""
 
-#: rfc2131.c:1794
+#: rfc2131.c:1793
 #, c-format
 msgid "%u broadcast response"
 msgstr ""
 
-#: rfc2131.c:1857
+#: rfc2131.c:1856
 #, c-format
 msgid "cannot send DHCP/BOOTP option %d: no space left in packet"
 msgstr ""
 
-#: rfc2131.c:2097
+#: rfc2131.c:2096
 msgid "PXE menu too large"
 msgstr ""
 
-#: rfc2131.c:2253
+#: rfc2131.c:2252
 #, c-format
 msgid "Ignoring duplicate dhcp-option %d"
 msgstr ""
 
-#: rfc2131.c:2257
+#: rfc2131.c:2256
 #, c-format
 msgid "Ignoring domain %s for DHCP host name %s"
 msgstr ""
 
-#: rfc2131.c:2275
+#: rfc2131.c:2274
 #, c-format
 msgid "%u requested options: %s"
 msgstr ""
 
-#: rfc2131.c:2550
+#: rfc2131.c:2549
 #, c-format
 msgid "cannot send RFC3925 option: too many options for enterprise number %d"
 msgstr ""
 
-#: netlink.c:70
+#: netlink.c:71
 #, c-format
 msgid "cannot create netlink socket: %s"
 msgstr ""
 
-#: netlink.c:289
+#: netlink.c:321
 #, c-format
 msgid "netlink returns error: %s"
 msgstr ""
@@ -1431,41 +1448,45 @@
 msgid "could not register a DBus message handler"
 msgstr ""
 
-#: bpf.c:224
+#: bpf.c:225
 #, c-format
 msgid "cannot create DHCP BPF socket: %s"
 msgstr ""
 
-#: bpf.c:252
+#: bpf.c:253
 #, c-format
 msgid "DHCP request for unsupported hardware type (%d) received on %s"
 msgstr ""
 
-#: tftp.c:286
+#: helper.c:130
+msgid "lease() function missing in Lua script"
+msgstr ""
+
+#: tftp.c:285
 msgid "unable to get free port for TFTP"
 msgstr ""
 
-#: tftp.c:301
+#: tftp.c:300
 #, c-format
 msgid "unsupported request from %s"
 msgstr ""
 
-#: tftp.c:411
+#: tftp.c:410
 #, c-format
 msgid "file %s not found"
 msgstr ""
 
-#: tftp.c:527
+#: tftp.c:525
 #, c-format
 msgid "error %d %s received from %s"
 msgstr ""
 
-#: tftp.c:559
+#: tftp.c:557
 #, c-format
 msgid "failed sending %s to %s"
 msgstr ""
 
-#: tftp.c:573
+#: tftp.c:571
 #, c-format
 msgid "sent %s to %s"
 msgstr ""
@@ -1475,12 +1496,12 @@
 msgid "overflow: %d log entries lost"
 msgstr ""
 
-#: log.c:267
+#: log.c:268
 #, c-format
 msgid "log failed: %s"
 msgstr ""
 
-#: log.c:471
+#: log.c:472
 msgid "FAILED to start up"
 msgstr ""
 
@@ -1488,3 +1509,18 @@
 #, c-format
 msgid "Conntrack connection mark retrieval failed: %s"
 msgstr ""
+
+#: dhcp6.c:42
+#, c-format
+msgid "cannot create DHCPv6 socket: %s"
+msgstr ""
+
+#: dhcp6.c:53
+#, c-format
+msgid "failed to bind DHCPv6 server socket: %s"
+msgstr ""
+
+#: dhcp6.c:57
+#, c-format
+msgid "failed to join DHCPv6 multicast group: %s"
+msgstr ""