BUILD_DIR -> BUILDDIR, for consistency.
diff --git a/po/it.po b/po/it.po
index 792b2d7..14ebd67 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:757
+#: cache.c:764
 #, c-format
 msgid "failed to load names from %s: %s"
 msgstr ""
 
-#: cache.c:791 dhcp.c:936
+#: cache.c:797 dhcp.c:855
 #, c-format
 msgid "bad address at %s line %d"
 msgstr ""
 
-#: cache.c:849 dhcp.c:952
+#: cache.c:846 dhcp.c:871
 #, c-format
 msgid "bad name at %s line %d"
 msgstr ""
 
-#: cache.c:856 dhcp.c:1027
+#: cache.c:853 dhcp.c:946
 #, c-format
 msgid "read %s - %d addresses"
 msgstr ""
 
-#: cache.c:895
+#: cache.c:892
 msgid "cleared cache"
 msgstr ""
 
-#: cache.c:930
+#: cache.c:953
 #, c-format
 msgid "No IPv4 address found for %s"
 msgstr ""
 
-#: cache.c:971
+#: cache.c:1005
 #, c-format
 msgid "%s is a CNAME, not giving it to the DHCP lease of %s"
 msgstr ""
 
-#: cache.c:977
+#: cache.c:1011
 #, 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:1050
+#: cache.c:1086
 #, c-format
 msgid "time %lu"
 msgstr ""
 
-#: cache.c:1051
+#: cache.c:1087
 #, c-format
 msgid "cache size %d, %d/%d cache insertions re-used unexpired cache entries."
 msgstr ""
 
-#: cache.c:1053
+#: cache.c:1089
 #, c-format
 msgid "queries forwarded %u, queries answered locally %u"
 msgstr ""
 
-#: cache.c:1076
+#: cache.c:1112
 #, 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:585
+#: util.c:227 option.c:714
 msgid "could not get memory"
 msgstr ""
 
@@ -97,7 +97,7 @@
 msgid "failed to allocate %d bytes"
 msgstr ""
 
-#: util.c:377
+#: util.c:400
 #, c-format
 msgid "infinite"
 msgstr ""
@@ -401,463 +401,484 @@
 msgstr ""
 
 #: option.c:323
-msgid "Script to run on DHCP lease creation and destruction."
+msgid "Shell script to run on DHCP lease creation and destruction."
 msgstr ""
 
 #: option.c:324
-msgid "Read configuration from all the files in this directory."
+msgid "Lua script to run on DHCP lease creation and destruction."
 msgstr ""
 
 #: option.c:325
-msgid "Log to this syslog facility or file. (defaults to DAEMON)"
+msgid "Run lease-change scripts as this user."
 msgstr ""
 
 #: option.c:326
-msgid "Do not use leasefile."
+msgid "Read configuration from all the files in this directory."
 msgstr ""
 
 #: option.c:327
+msgid "Log to this syslog facility or file. (defaults to DAEMON)"
+msgstr ""
+
+#: option.c:328
+msgid "Do not use leasefile."
+msgstr ""
+
+#: option.c:329
 #, c-format
 msgid "Maximum number of concurrent DNS queries. (defaults to %s)"
 msgstr ""
 
-#: option.c:328
+#: option.c:330
 #, c-format
 msgid "Clear DNS cache when reloading %s."
 msgstr ""
 
-#: option.c:329
+#: option.c:331
 msgid "Ignore hostnames provided by DHCP clients."
 msgstr ""
 
-#: option.c:330
+#: option.c:332
 msgid "Do NOT reuse filename and server fields for extra DHCP options."
 msgstr ""
 
-#: option.c:331
+#: option.c:333
 msgid "Enable integrated read-only TFTP server."
 msgstr ""
 
-#: option.c:332
+#: option.c:334
 msgid "Export files by TFTP only from the specified subtree."
 msgstr ""
 
-#: option.c:333
+#: option.c:335
 msgid "Add client IP address to tftp-root."
 msgstr ""
 
-#: option.c:334
+#: option.c:336
 msgid "Allow access only to files owned by the user running dnsmasq."
 msgstr ""
 
-#: option.c:335
+#: option.c:337
 #, c-format
 msgid "Maximum number of conncurrent TFTP transfers (defaults to %s)."
 msgstr ""
 
-#: option.c:336
+#: option.c:338
 msgid "Disable the TFTP blocksize extension."
 msgstr ""
 
-#: option.c:337
+#: option.c:339
 msgid "Ephemeral port range for use by TFTP transfers."
 msgstr ""
 
-#: option.c:338
+#: option.c:340
 msgid "Extra logging for DHCP."
 msgstr ""
 
-#: option.c:339
+#: option.c:341
 msgid "Enable async. logging; optionally set queue length."
 msgstr ""
 
-#: option.c:340
+#: option.c:342
 msgid "Stop DNS rebinding. Filter private IP ranges when resolving."
 msgstr ""
 
-#: option.c:341
+#: option.c:343
 msgid "Allow rebinding of 127.0.0.0/8, for RBL servers."
 msgstr ""
 
-#: option.c:342
+#: option.c:344
 msgid "Inhibit DNS-rebind protection on this domain."
 msgstr ""
 
-#: option.c:343
+#: option.c:345
 msgid "Always perform DNS queries to all servers."
 msgstr ""
 
-#: option.c:344
+#: option.c:346
 msgid "Set tag if client includes matching option in request."
 msgstr ""
 
-#: option.c:345
+#: option.c:347
 msgid "Use alternative ports for DHCP."
 msgstr ""
 
-#: option.c:346
-msgid "Run lease-change script as this user."
-msgstr ""
-
-#: option.c:347
+#: option.c:348
 msgid "Specify NAPTR DNS record."
 msgstr ""
 
-#: option.c:348
+#: option.c:349
 msgid "Specify lowest port available for DNS query transmission."
 msgstr ""
 
-#: option.c:349
+#: option.c:350
 msgid "Use only fully qualified domain names for DHCP clients."
 msgstr ""
 
-#: option.c:350
+#: option.c:351
 msgid "Generate hostnames based on MAC address for nameless clients."
 msgstr ""
 
-#: option.c:351
+#: option.c:352
 msgid "Use these DHCP relays as full proxies."
 msgstr ""
 
-#: option.c:352
+#: option.c:353
 msgid "Specify alias name for LOCAL DNS name."
 msgstr ""
 
-#: option.c:353
+#: option.c:354
 msgid "Prompt to send to PXE clients."
 msgstr ""
 
-#: option.c:354
+#: option.c:355
 msgid "Boot service for PXE menu."
 msgstr ""
 
-#: option.c:355
+#: option.c:356
 msgid "Check configuration syntax."
 msgstr ""
 
-#: option.c:356
+#: option.c:357
 msgid "Add requestor's MAC address to forwarded DNS queries."
 msgstr ""
 
-#: option.c:357
+#: option.c:358
 msgid "Proxy DNSSEC validation results from upstream nameservers."
 msgstr ""
 
-#: option.c:358
+#: option.c:359
 msgid "Attempt to allocate sequential IP addresses to DHCP clients."
 msgstr ""
 
-#: option.c:359
+#: option.c:360
 msgid "Copy connection-track mark from queries to upstream connections."
 msgstr ""
 
-#: option.c:360
+#: option.c:361
 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
+#: option.c:779
 #, c-format
 msgid ""
 "Usage: dnsmasq [options]\n"
 "\n"
 msgstr ""
 
-#: option.c:652
+#: option.c:781
 #, c-format
 msgid "Use short options only on the command line.\n"
 msgstr ""
 
-#: option.c:654
+#: option.c:783
 #, c-format
 msgid "Valid options are:\n"
 msgstr ""
 
-#: option.c:695
+#: option.c:824
 #, c-format
 msgid "Known DHCP options:\n"
 msgstr ""
 
-#: option.c:810
+#: option.c:835
+#, c-format
+msgid "Known DHCPv6 options:\n"
+msgstr ""
+
+#: option.c:970
+msgid "unsupported encapsulation for IPv6 option"
+msgstr ""
+
+#: option.c:998
 msgid "bad dhcp-option"
 msgstr ""
 
-#: option.c:872
+#: option.c:1065
 msgid "bad IP address"
 msgstr ""
 
-#: option.c:980
+#: option.c:1068 option.c:1174 option.c:2484
+msgid "bad IPv6 address"
+msgstr ""
+
+#: option.c:1202
 msgid "bad domain in dhcp-option"
 msgstr ""
 
-#: option.c:1046
+#: option.c:1326
 msgid "dhcp-option too long"
 msgstr ""
 
-#: option.c:1055
+#: option.c:1335
 msgid "illegal dhcp-match"
 msgstr ""
 
-#: option.c:1099
+#: option.c:1389
 msgid "illegal repeated flag"
 msgstr ""
 
-#: option.c:1107
+#: option.c:1397
 msgid "illegal repeated keyword"
 msgstr ""
 
-#: option.c:1159 option.c:3077
+#: option.c:1449 option.c:3509
 #, c-format
 msgid "cannot access directory %s: %s"
 msgstr ""
 
-#: option.c:1190 tftp.c:464
+#: option.c:1480 tftp.c:464
 #, c-format
 msgid "cannot access %s: %s"
 msgstr ""
 
-#: option.c:1219
+#: option.c:1509
 msgid "setting log facility is not possible under Android"
 msgstr ""
 
-#: option.c:1228
+#: option.c:1518
 msgid "bad log facility"
 msgstr ""
 
-#: option.c:1277
+#: option.c:1567
 msgid "bad MX preference"
 msgstr ""
 
-#: option.c:1282
+#: option.c:1572
 msgid "bad MX name"
 msgstr ""
 
-#: option.c:1296
+#: option.c:1586
 msgid "bad MX target"
 msgstr ""
 
-#: option.c:1308
+#: option.c:1598
 msgid "cannot run scripts under uClinux"
 msgstr ""
 
-#: option.c:1310
+#: option.c:1600
 msgid "recompile with HAVE_SCRIPT defined to enable lease-change scripts"
 msgstr ""
 
-#: option.c:1314
+#: option.c:1604
 msgid "recompile with HAVE_LUASCRIPT defined to enable Lua scripts"
 msgstr ""
 
-#: option.c:1622 option.c:1626
+#: option.c:1986 option.c:1990
 msgid "bad port"
 msgstr ""
 
-#: option.c:1649 option.c:1680
+#: option.c:2013 option.c:2044
 msgid "interface binding not supported"
 msgstr ""
 
-#: option.c:1660 option.c:2629
+#: option.c:2024 option.c:3061
 msgid "bad interface name"
 msgstr ""
 
-#: option.c:1825
+#: option.c:2189
 msgid "bad port range"
 msgstr ""
 
-#: option.c:1842
+#: option.c:2206
 msgid "bad bridge-interface"
 msgstr ""
 
-#: option.c:1885
+#: option.c:2240
 msgid "bad dhcp-range"
 msgstr ""
 
-#: option.c:1913
+#: option.c:2270
 msgid "only one tag allowed"
 msgstr ""
 
-#: option.c:1960
+#: option.c:2321
 msgid "inconsistent DHCP range"
 msgstr ""
 
-#: option.c:2054 option.c:2082
+#: option.c:2357
+msgid "prefix must be at least 64"
+msgstr ""
+
+#: option.c:2361
+msgid "inconsistent DHCPv6 range"
+msgstr ""
+
+#: option.c:2454 option.c:2494
 msgid "bad hex constant"
 msgstr ""
 
-#: option.c:2076
+#: option.c:2476
 msgid "cannot match tags in --dhcp-host"
 msgstr ""
 
-#: option.c:2144
+#: option.c:2556
 msgid "bad DHCP host name"
 msgstr ""
 
-#: option.c:2225
+#: option.c:2637
 msgid "bad tag-if"
 msgstr ""
 
-#: option.c:2514 option.c:2799
+#: option.c:2946 option.c:3231
 msgid "invalid port number"
 msgstr ""
 
-#: option.c:2576
+#: option.c:3008
 msgid "bad dhcp-proxy address"
 msgstr ""
 
-#: option.c:2616
+#: option.c:3048
 msgid "invalid alias range"
 msgstr ""
 
-#: option.c:2654
+#: option.c:3086
 msgid "bad CNAME"
 msgstr ""
 
-#: option.c:2659
+#: option.c:3091
 msgid "duplicate CNAME"
 msgstr ""
 
-#: option.c:2679
+#: option.c:3111
 msgid "bad PTR record"
 msgstr ""
 
-#: option.c:2710
+#: option.c:3142
 msgid "bad NAPTR record"
 msgstr ""
 
-#: option.c:2742
+#: option.c:3174
 msgid "bad TXT record"
 msgstr ""
 
-#: option.c:2785
+#: option.c:3217
 msgid "bad SRV record"
 msgstr ""
 
-#: option.c:2792
+#: option.c:3224
 msgid "bad SRV target"
 msgstr ""
 
-#: option.c:2806
+#: option.c:3238
 msgid "invalid priority"
 msgstr ""
 
-#: option.c:2813
+#: option.c:3245
 msgid "invalid weight"
 msgstr ""
 
-#: option.c:2832
+#: option.c:3264
 msgid "unsupported option (check that dnsmasq was compiled with DHCP/TFTP/DBus support)"
 msgstr ""
 
-#: option.c:2896
+#: option.c:3328
 msgid "missing \""
 msgstr ""
 
-#: option.c:2955
+#: option.c:3387
 msgid "bad option"
 msgstr ""
 
-#: option.c:2957
+#: option.c:3389
 msgid "extraneous parameter"
 msgstr ""
 
-#: option.c:2959
+#: option.c:3391
 msgid "missing parameter"
 msgstr ""
 
-#: option.c:2963
+#: option.c:3395
 msgid "error"
 msgstr ""
 
-#: option.c:2968
+#: option.c:3400
 #, c-format
 msgid "%s at line %d of %%s"
 msgstr ""
 
-#: option.c:3032 tftp.c:627
+#: option.c:3464 tftp.c:627
 #, c-format
 msgid "cannot read %s: %s"
 msgstr ""
 
-#: option.c:3198 option.c:3234
+#: option.c:3630 option.c:3666
 #, c-format
 msgid "read %s"
 msgstr ""
 
-#: option.c:3286
+#: option.c:3718
 msgid "junk found in command line"
 msgstr ""
 
-#: option.c:3316
+#: option.c:3753
 #, c-format
 msgid "Dnsmasq version %s  %s\n"
 msgstr ""
 
-#: option.c:3317
+#: option.c:3754
 #, c-format
 msgid ""
-"Compile time options %s\n"
+"Compile time options: %s\n"
 "\n"
 msgstr ""
 
-#: option.c:3318
+#: option.c:3755
 #, c-format
 msgid "This software comes with ABSOLUTELY NO WARRANTY.\n"
 msgstr ""
 
-#: option.c:3319
+#: option.c:3756
 #, c-format
 msgid "Dnsmasq is free software, and you are welcome to redistribute it\n"
 msgstr ""
 
-#: option.c:3320
+#: option.c:3757
 #, c-format
 msgid "under the terms of the GNU General Public License, version 2 or 3.\n"
 msgstr ""
 
-#: option.c:3331
+#: option.c:3768
 msgid "try --help"
 msgstr ""
 
-#: option.c:3333
+#: option.c:3770
 msgid "try -w"
 msgstr ""
 
-#: option.c:3336
+#: option.c:3773
 #, c-format
 msgid "bad command line options: %s"
 msgstr ""
 
-#: option.c:3377
+#: option.c:3814
 #, c-format
 msgid "cannot get host-name: %s"
 msgstr ""
 
-#: option.c:3405
+#: option.c:3842
 msgid "only one resolv.conf file allowed in no-poll mode."
 msgstr ""
 
-#: option.c:3415
+#: option.c:3852
 msgid "must have exactly one resolv.conf to read domain from."
 msgstr ""
 
-#: option.c:3418 network.c:821 dhcp.c:885
+#: option.c:3855 network.c:822 dhcp.c:804
 #, c-format
 msgid "failed to read %s: %s"
 msgstr ""
 
-#: option.c:3435
+#: option.c:3872
 #, c-format
 msgid "no search directive found in %s"
 msgstr ""
 
-#: option.c:3456
+#: option.c:3893
 msgid "there must be a default domain when --dhcp-fqdn is set"
 msgstr ""
 
-#: option.c:3460
+#: option.c:3897
 msgid "syntax check OK"
 msgstr ""
 
@@ -871,282 +892,282 @@
 msgid "possible DNS-rebind attack detected: %s"
 msgstr ""
 
-#: network.c:354
+#: network.c:355
 #, c-format
 msgid "failed to create listening socket for %s: %s"
 msgstr ""
 
-#: network.c:719
+#: network.c:720
 #, c-format
 msgid "failed to bind server socket for %s: %s"
 msgstr ""
 
-#: network.c:756
+#: network.c:757
 #, c-format
 msgid "ignoring nameserver %s - local interface"
 msgstr ""
 
-#: network.c:767
+#: network.c:768
 #, c-format
 msgid "ignoring nameserver %s - cannot make/bind socket: %s"
 msgstr ""
 
-#: network.c:784
+#: network.c:785
 msgid "unqualified"
 msgstr ""
 
-#: network.c:784
+#: network.c:785
 msgid "names"
 msgstr ""
 
-#: network.c:786
+#: network.c:787
 msgid "default"
 msgstr ""
 
-#: network.c:788
+#: network.c:789
 msgid "domain"
 msgstr ""
 
-#: network.c:791
+#: network.c:792
 #, c-format
 msgid "using local addresses only for %s %s"
 msgstr ""
 
-#: network.c:793
+#: network.c:794
 #, c-format
 msgid "using standard nameservers for %s %s"
 msgstr ""
 
-#: network.c:795
+#: network.c:796
 #, c-format
 msgid "using nameserver %s#%d for %s %s"
 msgstr ""
 
-#: network.c:798
+#: network.c:799
 #, c-format
 msgid "using nameserver %s#%d(via %s)"
 msgstr ""
 
-#: network.c:800
+#: network.c:801
 #, c-format
 msgid "using nameserver %s#%d"
 msgstr ""
 
-#: dnsmasq.c:114
+#: dnsmasq.c:123
 msgid "TFTP server not available: set HAVE_TFTP in src/config.h"
 msgstr ""
 
-#: dnsmasq.c:119
+#: dnsmasq.c:128
 msgid "Cannot use --conntrack AND --query-port"
 msgstr ""
 
-#: dnsmasq.c:122
+#: dnsmasq.c:131
 msgid "Conntrack support not available: set HAVE_CONNTRACK in src/config.h"
 msgstr ""
 
-#: dnsmasq.c:127
+#: dnsmasq.c:136
 msgid "asychronous logging is not available under Solaris"
 msgstr ""
 
-#: dnsmasq.c:132
+#: dnsmasq.c:141
 msgid "asychronous logging is not available under Android"
 msgstr ""
 
-#: dnsmasq.c:151
+#: dnsmasq.c:167
 #, c-format
 msgid "failed to find list of interfaces: %s"
 msgstr ""
 
-#: dnsmasq.c:159
+#: dnsmasq.c:175
 #, c-format
 msgid "unknown interface %s"
 msgstr ""
 
-#: dnsmasq.c:165
+#: dnsmasq.c:181
 #, c-format
 msgid "no interface with address %s"
 msgstr ""
 
-#: dnsmasq.c:181 dnsmasq.c:680
+#: dnsmasq.c:197 dnsmasq.c:732
 #, c-format
 msgid "DBus error: %s"
 msgstr ""
 
-#: dnsmasq.c:184
+#: dnsmasq.c:200
 msgid "DBus not available: set HAVE_DBUS in src/config.h"
 msgstr ""
 
-#: dnsmasq.c:211
+#: dnsmasq.c:227
 #, c-format
 msgid "unknown user or group: %s"
 msgstr ""
 
-#: dnsmasq.c:266
+#: dnsmasq.c:282
 #, c-format
 msgid "cannot chdir to filesystem root: %s"
 msgstr ""
 
-#: dnsmasq.c:441
+#: dnsmasq.c:457
 #, c-format
 msgid "started, version %s DNS disabled"
 msgstr ""
 
-#: dnsmasq.c:443
+#: dnsmasq.c:459
 #, c-format
 msgid "started, version %s cachesize %d"
 msgstr ""
 
-#: dnsmasq.c:445
+#: dnsmasq.c:461
 #, c-format
 msgid "started, version %s cache disabled"
 msgstr ""
 
-#: dnsmasq.c:447
+#: dnsmasq.c:463
 #, c-format
 msgid "compile time options: %s"
 msgstr ""
 
-#: dnsmasq.c:453
+#: dnsmasq.c:469
 msgid "DBus support enabled: connected to system bus"
 msgstr ""
 
-#: dnsmasq.c:455
+#: dnsmasq.c:471
 msgid "DBus support enabled: bus connection pending"
 msgstr ""
 
-#: dnsmasq.c:460
+#: dnsmasq.c:476
 #, c-format
 msgid "warning: failed to change owner of %s: %s"
 msgstr ""
 
-#: dnsmasq.c:464
+#: dnsmasq.c:480
 msgid "setting --bind-interfaces option because of OS limitations"
 msgstr ""
 
-#: dnsmasq.c:469
+#: dnsmasq.c:485
 #, c-format
 msgid "warning: interface %s does not currently exist"
 msgstr ""
 
-#: dnsmasq.c:474
+#: dnsmasq.c:490
 msgid "warning: ignoring resolv-file flag because no-resolv is set"
 msgstr ""
 
-#: dnsmasq.c:477
+#: dnsmasq.c:493
 msgid "warning: no upstream servers configured"
 msgstr ""
 
-#: dnsmasq.c:481
-#, c-format
-msgid "asynchronous logging enabled, queue limit is %d messages"
-msgstr ""
-
-#: dnsmasq.c:494
-#, c-format
-msgid "DHCP, static leases only on %.0s%s, lease time %s"
-msgstr ""
-
-#: dnsmasq.c:496
-#, c-format
-msgid "DHCP, proxy on subnet %.0s%s%.0s"
-msgstr ""
-
 #: dnsmasq.c:497
 #, c-format
+msgid "asynchronous logging enabled, queue limit is %d messages"
+msgstr ""
+
+#: dnsmasq.c:527
+#, c-format
+msgid "DHCP, static leases only on %.0s%s, lease time %s"
+msgstr ""
+
+#: dnsmasq.c:529
+#, c-format
+msgid "DHCP, proxy on subnet %.0s%s%.0s"
+msgstr ""
+
+#: dnsmasq.c:530
+#, c-format
 msgid "DHCP, IP range %s -- %s, lease time %s"
 msgstr ""
 
-#: dnsmasq.c:512
+#: dnsmasq.c:556
 msgid "root is "
 msgstr ""
 
-#: dnsmasq.c:512
+#: dnsmasq.c:556
 msgid "enabled"
 msgstr ""
 
-#: dnsmasq.c:514
+#: dnsmasq.c:558
 msgid "secure mode"
 msgstr ""
 
-#: dnsmasq.c:540
+#: dnsmasq.c:584
 #, c-format
 msgid "restricting maximum simultaneous TFTP transfers to %d"
 msgstr ""
 
-#: dnsmasq.c:682
+#: dnsmasq.c:734
 msgid "connected to system DBus"
 msgstr ""
 
-#: dnsmasq.c:806
+#: dnsmasq.c:866
 #, c-format
 msgid "cannot fork into background: %s"
 msgstr ""
 
-#: dnsmasq.c:809
+#: dnsmasq.c:869
 #, c-format
 msgid "failed to create helper: %s"
 msgstr ""
 
-#: dnsmasq.c:812
+#: dnsmasq.c:872
 #, c-format
 msgid "setting capabilities failed: %s"
 msgstr ""
 
-#: dnsmasq.c:815
+#: dnsmasq.c:875
 #, c-format
 msgid "failed to change user-id to %s: %s"
 msgstr ""
 
-#: dnsmasq.c:818
+#: dnsmasq.c:878
 #, c-format
 msgid "failed to change group-id to %s: %s"
 msgstr ""
 
-#: dnsmasq.c:821
+#: dnsmasq.c:881
 #, c-format
 msgid "failed to open pidfile %s: %s"
 msgstr ""
 
-#: dnsmasq.c:824
+#: dnsmasq.c:884
 #, c-format
 msgid "cannot open log %s: %s"
 msgstr ""
 
-#: dnsmasq.c:827
+#: dnsmasq.c:887
 #, c-format
 msgid "failed to load Lua script: %s"
 msgstr ""
 
-#: dnsmasq.c:886
+#: dnsmasq.c:946
 #, c-format
 msgid "script process killed by signal %d"
 msgstr ""
 
-#: dnsmasq.c:890
+#: dnsmasq.c:950
 #, c-format
 msgid "script process exited with status %d"
 msgstr ""
 
-#: dnsmasq.c:894
+#: dnsmasq.c:954
 #, c-format
 msgid "failed to execute %s: %s"
 msgstr ""
 
-#: dnsmasq.c:939
+#: dnsmasq.c:999
 msgid "exiting on receipt of SIGTERM"
 msgstr ""
 
-#: dnsmasq.c:967
+#: dnsmasq.c:1027
 #, c-format
 msgid "failed to access %s: %s"
 msgstr ""
 
-#: dnsmasq.c:997
+#: dnsmasq.c:1057
 #, c-format
 msgid "reading %s"
 msgstr ""
 
-#: dnsmasq.c:1008
+#: dnsmasq.c:1068
 #, c-format
 msgid "no servers found in %s, will retry"
 msgstr ""
@@ -1176,252 +1197,222 @@
 msgid "cannot create ICMP raw socket: %s."
 msgstr ""
 
-#: dhcp.c:264
+#: dhcp.c:227
 #, c-format
 msgid "unknown interface %s in bridge-interface"
 msgstr ""
 
-#: dhcp.c:289
+#: dhcp.c:252
 #, c-format
 msgid "DHCP packet received on %s which has no address"
 msgstr ""
 
-#: dhcp.c:504
+#: dhcp.c:467
 #, c-format
 msgid "DHCP range %s -- %s is not consistent with netmask %s"
 msgstr ""
 
-#: dhcp.c:923
+#: dhcp.c:842
 #, c-format
 msgid "bad line at %s line %d"
 msgstr ""
 
-#: dhcp.c:966
+#: dhcp.c:885
 #, c-format
 msgid "ignoring %s line %d, duplicate name or IP address"
 msgstr ""
 
-#: dhcp.c:1049
-#, c-format
-msgid "duplicate IP address %s in dhcp-config directive."
-msgstr ""
-
-#: dhcp.c:1052
-#, c-format
-msgid "duplicate IP address %s in %s."
-msgstr ""
-
-#: dhcp.c:1095
-#, c-format
-msgid "%s has more than one address in hostsfile, using %s for DHCP"
-msgstr ""
-
-#: dhcp.c:1100
-#, c-format
-msgid "duplicate IP address %s (%s) in dhcp-config directive"
-msgstr ""
-
-#: lease.c:70
+#: lease.c:61
 #, c-format
 msgid "cannot open or create lease file %s: %s"
 msgstr ""
 
-#: lease.c:116
+#: lease.c:132
 msgid "too many stored leases"
 msgstr ""
 
-#: lease.c:173
+#: lease.c:163
 #, c-format
 msgid "cannot run lease-init script %s: %s"
 msgstr ""
 
-#: lease.c:179
+#: lease.c:169
 #, c-format
 msgid "lease-init script returned exit code %s"
 msgstr ""
 
-#: lease.c:325
+#: lease.c:326
 #, c-format
 msgid "failed to write %s: %s (retry in %us)"
 msgstr ""
 
-#: rfc2131.c:342
-#, c-format
-msgid "no address range available for DHCP request %s %s"
-msgstr ""
-
-#: rfc2131.c:343
-msgid "with subnet selector"
-msgstr ""
-
-#: rfc2131.c:343
-msgid "via"
-msgstr ""
-
-#: rfc2131.c:355
-#, c-format
-msgid "%u available DHCP subnet: %s/%s"
-msgstr ""
-
-#: rfc2131.c:358
-#, c-format
-msgid "%u available DHCP range: %s -- %s"
-msgstr ""
-
-#: rfc2131.c:387
-msgid "disabled"
-msgstr ""
-
-#: rfc2131.c:428 rfc2131.c:944 rfc2131.c:1336
-msgid "ignored"
-msgstr ""
-
-#: rfc2131.c:443 rfc2131.c:1182
-msgid "address in use"
-msgstr ""
-
-#: rfc2131.c:457 rfc2131.c:998
-msgid "no address available"
-msgstr ""
-
-#: rfc2131.c:464 rfc2131.c:1145
-msgid "wrong network"
-msgstr ""
-
-#: rfc2131.c:479
-msgid "no address configured"
-msgstr ""
-
-#: rfc2131.c:485 rfc2131.c:1195
-msgid "no leases left"
-msgstr ""
-
-#: rfc2131.c:569
-#, c-format
-msgid "%u client provides name: %s"
-msgstr ""
-
-#: rfc2131.c:724
-#, c-format
-msgid "%u vendor class: %s"
-msgstr ""
-
-#: rfc2131.c:726
-#, c-format
-msgid "%u user class: %s"
-msgstr ""
-
-#: rfc2131.c:785
-msgid "PXE BIS not supported"
-msgstr ""
-
-#: rfc2131.c:914
-#, c-format
-msgid "disabling DHCP static address %s for %s"
-msgstr ""
-
-#: rfc2131.c:935
-msgid "unknown lease"
-msgstr ""
-
-#: rfc2131.c:967
-#, c-format
-msgid "not using configured address %s because it is leased to %s"
-msgstr ""
-
-#: rfc2131.c:977
-#, c-format
-msgid "not using configured address %s because it is in use by the server or relay"
-msgstr ""
-
-#: rfc2131.c:980
-#, c-format
-msgid "not using configured address %s because it was previously declined"
-msgstr ""
-
-#: rfc2131.c:996 rfc2131.c:1188
-msgid "no unique-id"
-msgstr ""
-
-#: rfc2131.c:1083
-msgid "wrong server-ID"
-msgstr ""
-
-#: rfc2131.c:1102
-msgid "wrong address"
-msgstr ""
-
-#: rfc2131.c:1120
-msgid "lease not found"
-msgstr ""
-
-#: rfc2131.c:1153
-msgid "address not available"
-msgstr ""
-
-#: rfc2131.c:1164
-msgid "static lease available"
-msgstr ""
-
-#: rfc2131.c:1168
-msgid "address reserved"
-msgstr ""
-
-#: rfc2131.c:1176
-#, c-format
-msgid "abandoning lease to %s of %s"
-msgstr ""
-
-#: rfc2131.c:1745
-#, c-format
-msgid "%u tags: %s"
-msgstr ""
-
-#: rfc2131.c:1773
-#, c-format
-msgid "%u bootfile name: %s"
-msgstr ""
-
-#: rfc2131.c:1782
-#, c-format
-msgid "%u server name: %s"
-msgstr ""
-
-#: rfc2131.c:1790
-#, c-format
-msgid "%u next server: %s"
-msgstr ""
-
-#: rfc2131.c:1793
-#, c-format
-msgid "%u broadcast response"
-msgstr ""
-
-#: rfc2131.c:1856
-#, c-format
-msgid "cannot send DHCP/BOOTP option %d: no space left in packet"
-msgstr ""
-
-#: rfc2131.c:2096
-msgid "PXE menu too large"
-msgstr ""
-
-#: rfc2131.c:2252
-#, c-format
-msgid "Ignoring duplicate dhcp-option %d"
-msgstr ""
-
-#: rfc2131.c:2256
+#: lease.c:662
 #, c-format
 msgid "Ignoring domain %s for DHCP host name %s"
 msgstr ""
 
-#: rfc2131.c:2274
+#: rfc2131.c:337
+#, c-format
+msgid "no address range available for DHCP request %s %s"
+msgstr ""
+
+#: rfc2131.c:338
+msgid "with subnet selector"
+msgstr ""
+
+#: rfc2131.c:338
+msgid "via"
+msgstr ""
+
+#: rfc2131.c:350
+#, c-format
+msgid "%u available DHCP subnet: %s/%s"
+msgstr ""
+
+#: rfc2131.c:353 rfc3315.c:219
+#, c-format
+msgid "%u available DHCP range: %s -- %s"
+msgstr ""
+
+#: rfc2131.c:382
+msgid "disabled"
+msgstr ""
+
+#: rfc2131.c:423 rfc2131.c:941 rfc2131.c:1341
+msgid "ignored"
+msgstr ""
+
+#: rfc2131.c:438 rfc2131.c:1179
+msgid "address in use"
+msgstr ""
+
+#: rfc2131.c:452 rfc2131.c:995
+msgid "no address available"
+msgstr ""
+
+#: rfc2131.c:459 rfc2131.c:1142
+msgid "wrong network"
+msgstr ""
+
+#: rfc2131.c:474
+msgid "no address configured"
+msgstr ""
+
+#: rfc2131.c:480 rfc2131.c:1192
+msgid "no leases left"
+msgstr ""
+
+#: rfc2131.c:564 rfc3315.c:372
+#, c-format
+msgid "%u client provides name: %s"
+msgstr ""
+
+#: rfc2131.c:719
+#, c-format
+msgid "%u vendor class: %s"
+msgstr ""
+
+#: rfc2131.c:721
+#, c-format
+msgid "%u user class: %s"
+msgstr ""
+
+#: rfc2131.c:780
+msgid "PXE BIS not supported"
+msgstr ""
+
+#: rfc2131.c:911 rfc3315.c:1057
+#, c-format
+msgid "disabling DHCP static address %s for %s"
+msgstr ""
+
+#: rfc2131.c:932
+msgid "unknown lease"
+msgstr ""
+
+#: rfc2131.c:964 rfc3315.c:552
+#, c-format
+msgid "not using configured address %s because it is leased to %s"
+msgstr ""
+
+#: rfc2131.c:974
+#, c-format
+msgid "not using configured address %s because it is in use by the server or relay"
+msgstr ""
+
+#: rfc2131.c:977 rfc3315.c:556
+#, c-format
+msgid "not using configured address %s because it was previously declined"
+msgstr ""
+
+#: rfc2131.c:993 rfc2131.c:1185
+msgid "no unique-id"
+msgstr ""
+
+#: rfc2131.c:1080
+msgid "wrong server-ID"
+msgstr ""
+
+#: rfc2131.c:1099
+msgid "wrong address"
+msgstr ""
+
+#: rfc2131.c:1117
+msgid "lease not found"
+msgstr ""
+
+#: rfc2131.c:1150
+msgid "address not available"
+msgstr ""
+
+#: rfc2131.c:1161
+msgid "static lease available"
+msgstr ""
+
+#: rfc2131.c:1165
+msgid "address reserved"
+msgstr ""
+
+#: rfc2131.c:1173
+#, c-format
+msgid "abandoning lease to %s of %s"
+msgstr ""
+
+#: rfc2131.c:1658
+#, c-format
+msgid "%u bootfile name: %s"
+msgstr ""
+
+#: rfc2131.c:1667
+#, c-format
+msgid "%u server name: %s"
+msgstr ""
+
+#: rfc2131.c:1675
+#, c-format
+msgid "%u next server: %s"
+msgstr ""
+
+#: rfc2131.c:1678
+#, c-format
+msgid "%u broadcast response"
+msgstr ""
+
+#: rfc2131.c:1741
+#, c-format
+msgid "cannot send DHCP/BOOTP option %d: no space left in packet"
+msgstr ""
+
+#: rfc2131.c:1981
+msgid "PXE menu too large"
+msgstr ""
+
+#: rfc2131.c:2116 rfc3315.c:1245
 #, c-format
 msgid "%u requested options: %s"
 msgstr ""
 
-#: rfc2131.c:2549
+#: rfc2131.c:2391
 #, c-format
 msgid "cannot send RFC3925 option: too many options for enterprise number %d"
 msgstr ""
@@ -1431,7 +1422,7 @@
 msgid "cannot create netlink socket: %s"
 msgstr ""
 
-#: netlink.c:321
+#: netlink.c:322
 #, c-format
 msgid "netlink returns error: %s"
 msgstr ""
@@ -1448,17 +1439,17 @@
 msgid "could not register a DBus message handler"
 msgstr ""
 
-#: bpf.c:225
+#: bpf.c:238
 #, c-format
 msgid "cannot create DHCP BPF socket: %s"
 msgstr ""
 
-#: bpf.c:253
+#: bpf.c:266
 #, c-format
 msgid "DHCP request for unsupported hardware type (%d) received on %s"
 msgstr ""
 
-#: helper.c:130
+#: helper.c:140
 msgid "lease() function missing in Lua script"
 msgstr ""
 
@@ -1510,17 +1501,62 @@
 msgid "Conntrack connection mark retrieval failed: %s"
 msgstr ""
 
-#: dhcp6.c:42
+#: dhcp6.c:54
 #, c-format
 msgid "cannot create DHCPv6 socket: %s"
 msgstr ""
 
-#: dhcp6.c:53
+#: dhcp6.c:65
 #, c-format
 msgid "failed to bind DHCPv6 server socket: %s"
 msgstr ""
 
-#: dhcp6.c:57
+#: dhcp6.c:71
 #, c-format
 msgid "failed to join DHCPv6 multicast group: %s"
 msgstr ""
+
+#: rfc3315.c:104
+#, c-format
+msgid "no address range available for DHCPv6 request from relay at %s"
+msgstr ""
+
+#: rfc3315.c:113
+#, c-format
+msgid "no address range available for DHCPv6 request via %s"
+msgstr ""
+
+#: rfc3315.c:216
+#, c-format
+msgid "%u available DHCPv6 subnet: %s/%d"
+msgstr ""
+
+#: dhcp-common.c:138
+#, c-format
+msgid "Ignoring duplicate dhcp-option %d"
+msgstr ""
+
+#: dhcp-common.c:208
+#, c-format
+msgid "%u tags: %s"
+msgstr ""
+
+#: dhcp-common.c:261
+#, c-format
+msgid "duplicate IP address %s in dhcp-config directive."
+msgstr ""
+
+#: dhcp-common.c:264
+#, c-format
+msgid "duplicate IP address %s in %s."
+msgstr ""
+
+#: dhcp-common.c:323
+#, c-format
+msgid "%s has more than one address in hostsfile, using %s for DHCP"
+msgstr ""
+
+#: dhcp-common.c:344
+#, c-format
+msgid "duplicate IP address %s (%s) in dhcp-config directive"
+msgstr ""