Merge new messages into .po files.
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 824a78f..3abae37 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -21,17 +21,17 @@
 msgid "failed to load names from %s: %s"
 msgstr ""
 
-#: cache.c:834 dhcp.c:845
+#: cache.c:834 dhcp.c:819
 #, c-format
 msgid "bad address at %s line %d"
 msgstr ""
 
-#: cache.c:885 dhcp.c:861
+#: cache.c:885 dhcp.c:835
 #, c-format
 msgid "bad name at %s line %d"
 msgstr ""
 
-#: cache.c:892 dhcp.c:936
+#: cache.c:892 dhcp.c:910
 #, c-format
 msgid "read %s - %d addresses"
 msgstr ""
@@ -40,37 +40,37 @@
 msgid "cleared cache"
 msgstr ""
 
-#: cache.c:1016
+#: cache.c:984
 #, c-format
 msgid "No IPv4 address found for %s"
 msgstr ""
 
-#: cache.c:1093
+#: cache.c:1061
 #, c-format
 msgid "%s is a CNAME, not giving it to the DHCP lease of %s"
 msgstr ""
 
-#: cache.c:1117
+#: cache.c:1085
 #, 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:1162
+#: cache.c:1130
 #, c-format
 msgid "time %lu"
 msgstr ""
 
-#: cache.c:1163
+#: cache.c:1131
 #, c-format
 msgid "cache size %d, %d/%d cache insertions re-used unexpired cache entries."
 msgstr ""
 
-#: cache.c:1165
+#: cache.c:1133
 #, c-format
 msgid "queries forwarded %u, queries answered locally %u"
 msgstr ""
 
-#: cache.c:1188
+#: cache.c:1156
 #, c-format
 msgid "server %s#%d: queries sent %u, retried or failed %u"
 msgstr ""
@@ -80,893 +80,913 @@
 msgid "failed to seed the random number generator: %s"
 msgstr ""
 
-#: util.c:189
+#: util.c:192
 msgid "failed to allocate memory"
 msgstr ""
 
-#: util.c:227 option.c:531
+#: util.c:230 option.c:540
 msgid "could not get memory"
 msgstr ""
 
-#: util.c:237
+#: util.c:240
 #, c-format
 msgid "cannot create pipe: %s"
 msgstr ""
 
-#: util.c:245
+#: util.c:248
 #, c-format
 msgid "failed to allocate %d bytes"
 msgstr ""
 
-#: util.c:400
+#: util.c:403
 #, c-format
 msgid "infinite"
 msgstr ""
 
-#: option.c:286
+#: option.c:292
 msgid "Specify local address(es) to listen on."
 msgstr ""
 
-#: option.c:287
+#: option.c:293
 msgid "Return ipaddr for all hosts in specified domains."
 msgstr ""
 
-#: option.c:288
+#: option.c:294
 msgid "Fake reverse lookups for RFC1918 private address ranges."
 msgstr ""
 
-#: option.c:289
+#: option.c:295
 msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)."
 msgstr ""
 
-#: option.c:290
+#: option.c:296
 #, c-format
 msgid "Specify the size of the cache in entries (defaults to %s)."
 msgstr ""
 
-#: option.c:291
+#: option.c:297
 #, c-format
 msgid "Specify configuration file (defaults to %s)."
 msgstr ""
 
-#: option.c:292
+#: option.c:298
 msgid "Do NOT fork into the background: run in debug mode."
 msgstr ""
 
-#: option.c:293
+#: option.c:299
 msgid "Do NOT forward queries with no domain part."
 msgstr ""
 
-#: option.c:294
+#: option.c:300
 msgid "Return self-pointing MX records for local hosts."
 msgstr ""
 
-#: option.c:295
+#: option.c:301
 msgid "Expand simple names in /etc/hosts with domain-suffix."
 msgstr ""
 
-#: option.c:296
+#: option.c:302
 msgid "Don't forward spurious DNS requests from Windows hosts."
 msgstr ""
 
-#: option.c:297
-msgid "Enable DHCP in the range given with lease duration."
-msgstr ""
-
-#: option.c:298
-#, c-format
-msgid "Change to this group after startup (defaults to %s)."
-msgstr ""
-
-#: option.c:299
-msgid "Set address or hostname for a specified machine."
-msgstr ""
-
-#: option.c:300
-msgid "Read DHCP host specs from file."
-msgstr ""
-
-#: option.c:301
-msgid "Read DHCP option specs from file."
-msgstr ""
-
-#: option.c:302
-msgid "Evaluate conditional tag expression."
-msgstr ""
-
 #: option.c:303
-#, c-format
-msgid "Do NOT load %s file."
+msgid "Enable DHCP in the range given with lease duration."
 msgstr ""
 
 #: option.c:304
 #, c-format
-msgid "Specify a hosts file to be read in addition to %s."
+msgid "Change to this group after startup (defaults to %s)."
 msgstr ""
 
 #: option.c:305
-msgid "Specify interface(s) to listen on."
+msgid "Set address or hostname for a specified machine."
 msgstr ""
 
 #: option.c:306
-msgid "Specify interface(s) NOT to listen on."
+msgid "Read DHCP host specs from file."
 msgstr ""
 
 #: option.c:307
-msgid "Map DHCP user class to tag."
+msgid "Read DHCP option specs from file."
 msgstr ""
 
 #: option.c:308
-msgid "Map RFC3046 circuit-id to tag."
+msgid "Evaluate conditional tag expression."
 msgstr ""
 
 #: option.c:309
-msgid "Map RFC3046 remote-id to tag."
+#, c-format
+msgid "Do NOT load %s file."
 msgstr ""
 
 #: option.c:310
-msgid "Map RFC3993 subscriber-id to tag."
+#, c-format
+msgid "Specify a hosts file to be read in addition to %s."
 msgstr ""
 
 #: option.c:311
-msgid "Don't do DHCP for hosts with tag set."
+msgid "Specify interface(s) to listen on."
 msgstr ""
 
 #: option.c:312
-msgid "Force broadcast replies for hosts with tag set."
+msgid "Specify interface(s) NOT to listen on."
 msgstr ""
 
 #: option.c:313
-msgid "Do NOT fork into the background, do NOT run in debug mode."
+msgid "Map DHCP user class to tag."
 msgstr ""
 
 #: option.c:314
-msgid "Assume we are the only DHCP server on the local network."
+msgid "Map RFC3046 circuit-id to tag."
 msgstr ""
 
 #: option.c:315
-#, c-format
-msgid "Specify where to store DHCP leases (defaults to %s)."
+msgid "Map RFC3046 remote-id to tag."
 msgstr ""
 
 #: option.c:316
-msgid "Return MX records for local hosts."
+msgid "Map RFC3993 subscriber-id to tag."
 msgstr ""
 
 #: option.c:317
-msgid "Specify an MX record."
+msgid "Don't do DHCP for hosts with tag set."
 msgstr ""
 
 #: option.c:318
-msgid "Specify BOOTP options to DHCP server."
+msgid "Force broadcast replies for hosts with tag set."
 msgstr ""
 
 #: option.c:319
-#, c-format
-msgid "Do NOT poll %s file, reload only on SIGHUP."
+msgid "Do NOT fork into the background, do NOT run in debug mode."
 msgstr ""
 
 #: option.c:320
-msgid "Do NOT cache failed search results."
+msgid "Assume we are the only DHCP server on the local network."
 msgstr ""
 
 #: option.c:321
 #, c-format
-msgid "Use nameservers strictly in the order given in %s."
+msgid "Specify where to store DHCP leases (defaults to %s)."
 msgstr ""
 
 #: option.c:322
-msgid "Specify options to be sent to DHCP clients."
+msgid "Return MX records for local hosts."
 msgstr ""
 
 #: option.c:323
-msgid "DHCP option sent even if the client does not request it."
+msgid "Specify an MX record."
 msgstr ""
 
 #: option.c:324
-msgid "Specify port to listen for DNS requests on (defaults to 53)."
+msgid "Specify BOOTP options to DHCP server."
 msgstr ""
 
 #: option.c:325
 #, c-format
-msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)."
+msgid "Do NOT poll %s file, reload only on SIGHUP."
 msgstr ""
 
 #: option.c:326
-msgid "Log DNS queries."
+msgid "Do NOT cache failed search results."
 msgstr ""
 
 #: option.c:327
-msgid "Force the originating port for upstream DNS queries."
+#, c-format
+msgid "Use nameservers strictly in the order given in %s."
 msgstr ""
 
 #: option.c:328
-msgid "Do NOT read resolv.conf."
+msgid "Specify options to be sent to DHCP clients."
 msgstr ""
 
 #: option.c:329
+msgid "DHCP option sent even if the client does not request it."
+msgstr ""
+
+#: option.c:330
+msgid "Specify port to listen for DNS requests on (defaults to 53)."
+msgstr ""
+
+#: option.c:331
+#, c-format
+msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)."
+msgstr ""
+
+#: option.c:332
+msgid "Log DNS queries."
+msgstr ""
+
+#: option.c:333
+msgid "Force the originating port for upstream DNS queries."
+msgstr ""
+
+#: option.c:334
+msgid "Do NOT read resolv.conf."
+msgstr ""
+
+#: option.c:335
 #, c-format
 msgid "Specify path to resolv.conf (defaults to %s)."
 msgstr ""
 
-#: option.c:330
+#: option.c:336
 msgid "Specify address(es) of upstream servers with optional domains."
 msgstr ""
 
-#: option.c:331
+#: option.c:337
 msgid "Never forward queries to specified domains."
 msgstr ""
 
-#: option.c:332
+#: option.c:338
 msgid "Specify the domain to be assigned in DHCP leases."
 msgstr ""
 
-#: option.c:333
+#: option.c:339
 msgid "Specify default target in an MX record."
 msgstr ""
 
-#: option.c:334
+#: option.c:340
 msgid "Specify time-to-live in seconds for replies from /etc/hosts."
 msgstr ""
 
-#: option.c:335
+#: option.c:341
 msgid "Specify time-to-live in seconds for negative caching."
 msgstr ""
 
-#: option.c:336
-msgid "Specify time-to-live in seconds for maximum TTL to send to clients."
-msgstr ""
-
-#: option.c:337
-#, c-format
-msgid "Change to this user after startup. (defaults to %s)."
-msgstr ""
-
-#: option.c:338
-msgid "Map DHCP vendor class to tag."
-msgstr ""
-
-#: option.c:339
-msgid "Display dnsmasq version and copyright information."
-msgstr ""
-
-#: option.c:340
-msgid "Translate IPv4 addresses from upstream servers."
-msgstr ""
-
-#: option.c:341
-msgid "Specify a SRV record."
-msgstr ""
-
 #: option.c:342
-msgid "Display this message. Use --help dhcp for known DHCP options."
+msgid "Specify time-to-live in seconds for maximum TTL to send to clients."
 msgstr ""
 
 #: option.c:343
 #, c-format
-msgid "Specify path of PID file (defaults to %s)."
+msgid "Change to this user after startup. (defaults to %s)."
 msgstr ""
 
 #: option.c:344
-#, c-format
-msgid "Specify maximum number of DHCP leases (defaults to %s)."
+msgid "Map DHCP vendor class to tag."
 msgstr ""
 
 #: option.c:345
-msgid "Answer DNS queries based on the interface a query was sent to."
+msgid "Display dnsmasq version and copyright information."
 msgstr ""
 
 #: option.c:346
-msgid "Specify TXT DNS record."
+msgid "Translate IPv4 addresses from upstream servers."
 msgstr ""
 
 #: option.c:347
-msgid "Specify PTR DNS record."
+msgid "Specify a SRV record."
 msgstr ""
 
 #: option.c:348
-msgid "Give DNS name to IPv4 address of interface."
+msgid "Display this message. Use --help dhcp for known DHCP options."
 msgstr ""
 
 #: option.c:349
-msgid "Bind only to interfaces in use."
+#, c-format
+msgid "Specify path of PID file (defaults to %s)."
 msgstr ""
 
 #: option.c:350
 #, c-format
-msgid "Read DHCP static host information from %s."
+msgid "Specify maximum number of DHCP leases (defaults to %s)."
 msgstr ""
 
 #: option.c:351
-msgid "Enable the DBus interface for setting upstream servers, etc."
+msgid "Answer DNS queries based on the interface a query was sent to."
 msgstr ""
 
 #: option.c:352
-msgid "Do not provide DHCP on this interface, only provide DNS."
+msgid "Specify TXT DNS record."
 msgstr ""
 
 #: option.c:353
-msgid "Enable dynamic address allocation for bootp."
+msgid "Specify PTR DNS record."
 msgstr ""
 
 #: option.c:354
-msgid "Map MAC address (with wildcards) to option set."
+msgid "Give DNS name to IPv4 address of interface."
 msgstr ""
 
 #: option.c:355
-msgid "Treat DHCP requests on aliases as arriving from interface."
+msgid "Bind only to interfaces in use."
 msgstr ""
 
 #: option.c:356
-msgid "Disable ICMP echo address checking in the DHCP server."
+#, c-format
+msgid "Read DHCP static host information from %s."
 msgstr ""
 
 #: option.c:357
-msgid "Shell script to run on DHCP lease creation and destruction."
+msgid "Enable the DBus interface for setting upstream servers, etc."
 msgstr ""
 
 #: option.c:358
-msgid "Lua script to run on DHCP lease creation and destruction."
+msgid "Do not provide DHCP on this interface, only provide DNS."
 msgstr ""
 
 #: option.c:359
-msgid "Run lease-change scripts as this user."
+msgid "Enable dynamic address allocation for bootp."
 msgstr ""
 
 #: option.c:360
-msgid "Read configuration from all the files in this directory."
+msgid "Map MAC address (with wildcards) to option set."
 msgstr ""
 
 #: option.c:361
-msgid "Log to this syslog facility or file. (defaults to DAEMON)"
+msgid "Treat DHCP requests on aliases as arriving from interface."
 msgstr ""
 
 #: option.c:362
-msgid "Do not use leasefile."
+msgid "Disable ICMP echo address checking in the DHCP server."
 msgstr ""
 
 #: option.c:363
+msgid "Shell script to run on DHCP lease creation and destruction."
+msgstr ""
+
+#: option.c:364
+msgid "Lua script to run on DHCP lease creation and destruction."
+msgstr ""
+
+#: option.c:365
+msgid "Run lease-change scripts as this user."
+msgstr ""
+
+#: option.c:366
+msgid "Read configuration from all the files in this directory."
+msgstr ""
+
+#: option.c:367
+msgid "Log to this syslog facility or file. (defaults to DAEMON)"
+msgstr ""
+
+#: option.c:368
+msgid "Do not use leasefile."
+msgstr ""
+
+#: option.c:369
 #, c-format
 msgid "Maximum number of concurrent DNS queries. (defaults to %s)"
 msgstr ""
 
-#: option.c:364
+#: option.c:370
 #, c-format
 msgid "Clear DNS cache when reloading %s."
 msgstr ""
 
-#: option.c:365
+#: option.c:371
 msgid "Ignore hostnames provided by DHCP clients."
 msgstr ""
 
-#: option.c:366
+#: option.c:372
 msgid "Do NOT reuse filename and server fields for extra DHCP options."
 msgstr ""
 
-#: option.c:367
+#: option.c:373
 msgid "Enable integrated read-only TFTP server."
 msgstr ""
 
-#: option.c:368
+#: option.c:374
 msgid "Export files by TFTP only from the specified subtree."
 msgstr ""
 
-#: option.c:369
+#: option.c:375
 msgid "Add client IP address to tftp-root."
 msgstr ""
 
-#: option.c:370
+#: option.c:376
 msgid "Allow access only to files owned by the user running dnsmasq."
 msgstr ""
 
-#: option.c:371
+#: option.c:377
 #, c-format
 msgid "Maximum number of conncurrent TFTP transfers (defaults to %s)."
 msgstr ""
 
-#: option.c:372
+#: option.c:378
 msgid "Disable the TFTP blocksize extension."
 msgstr ""
 
-#: option.c:373
+#: option.c:379
 msgid "Convert TFTP filenames to lowercase"
 msgstr ""
 
-#: option.c:374
+#: option.c:380
 msgid "Ephemeral port range for use by TFTP transfers."
 msgstr ""
 
-#: option.c:375
+#: option.c:381
 msgid "Extra logging for DHCP."
 msgstr ""
 
-#: option.c:376
+#: option.c:382
 msgid "Enable async. logging; optionally set queue length."
 msgstr ""
 
-#: option.c:377
+#: option.c:383
 msgid "Stop DNS rebinding. Filter private IP ranges when resolving."
 msgstr ""
 
-#: option.c:378
+#: option.c:384
 msgid "Allow rebinding of 127.0.0.0/8, for RBL servers."
 msgstr ""
 
-#: option.c:379
+#: option.c:385
 msgid "Inhibit DNS-rebind protection on this domain."
 msgstr ""
 
-#: option.c:380
+#: option.c:386
 msgid "Always perform DNS queries to all servers."
 msgstr ""
 
-#: option.c:381
+#: option.c:387
 msgid "Set tag if client includes matching option in request."
 msgstr ""
 
-#: option.c:382
+#: option.c:388
 msgid "Use alternative ports for DHCP."
 msgstr ""
 
-#: option.c:383
+#: option.c:389
 msgid "Specify NAPTR DNS record."
 msgstr ""
 
-#: option.c:384
+#: option.c:390
 msgid "Specify lowest port available for DNS query transmission."
 msgstr ""
 
-#: option.c:385
+#: option.c:391
 msgid "Use only fully qualified domain names for DHCP clients."
 msgstr ""
 
-#: option.c:386
+#: option.c:392
 msgid "Generate hostnames based on MAC address for nameless clients."
 msgstr ""
 
-#: option.c:387
+#: option.c:393
 msgid "Use these DHCP relays as full proxies."
 msgstr ""
 
-#: option.c:388
-msgid "Specify alias name for LOCAL DNS name."
-msgstr ""
-
-#: option.c:389
-msgid "Prompt to send to PXE clients."
-msgstr ""
-
-#: option.c:390
-msgid "Boot service for PXE menu."
-msgstr ""
-
-#: option.c:391
-msgid "Check configuration syntax."
-msgstr ""
-
-#: option.c:392
-msgid "Add requestor's MAC address to forwarded DNS queries."
-msgstr ""
-
-#: option.c:393
-msgid "Proxy DNSSEC validation results from upstream nameservers."
-msgstr ""
-
 #: option.c:394
-msgid "Attempt to allocate sequential IP addresses to DHCP clients."
+msgid "Relay DHCP requests to a remote server"
 msgstr ""
 
 #: option.c:395
-msgid "Copy connection-track mark from queries to upstream connections."
+msgid "Specify alias name for LOCAL DNS name."
 msgstr ""
 
 #: option.c:396
-msgid "Allow DHCP clients to do their own DDNS updates."
+msgid "Prompt to send to PXE clients."
 msgstr ""
 
 #: option.c:397
-msgid "Send router-advertisements for interfaces doing DHCPv6"
+msgid "Boot service for PXE menu."
 msgstr ""
 
 #: option.c:398
-msgid "Specify DUID_EN-type DHCPv6 server DUID"
+msgid "Check configuration syntax."
 msgstr ""
 
 #: option.c:399
-msgid "Specify host (A/AAAA and PTR) records"
+msgid "Add requestor's MAC address to forwarded DNS queries."
 msgstr ""
 
 #: option.c:400
-msgid "Specify arbitrary DNS resource record"
+msgid "Proxy DNSSEC validation results from upstream nameservers."
 msgstr ""
 
 #: option.c:401
-msgid "Bind to interfaces in use - check for new interfaces"
+msgid "Attempt to allocate sequential IP addresses to DHCP clients."
 msgstr ""
 
 #: option.c:402
-msgid "Export local names to global DNS"
+msgid "Copy connection-track mark from queries to upstream connections."
 msgstr ""
 
 #: option.c:403
-msgid "Domain to export to global DNS"
+msgid "Allow DHCP clients to do their own DDNS updates."
 msgstr ""
 
 #: option.c:404
-msgid "Set TTL for authoritative replies"
+msgid "Send router-advertisements for interfaces doing DHCPv6"
 msgstr ""
 
 #: option.c:405
-msgid "Set authoritive zone information"
+msgid "Always send frequent router-advertisements"
 msgstr ""
 
 #: option.c:406
-msgid "Secondary authoritative nameservers for forward domains"
+msgid "Specify DUID_EN-type DHCPv6 server DUID"
 msgstr ""
 
 #: option.c:407
-msgid "Peers which are allowed to do zone transfer"
+msgid "Specify host (A/AAAA and PTR) records"
 msgstr ""
 
 #: option.c:408
-msgid "Specify ipsets to which matching domains should be added"
+msgid "Specify arbitrary DNS resource record"
+msgstr ""
+
+#: option.c:409
+msgid "Bind to interfaces in use - check for new interfaces"
 msgstr ""
 
 #: option.c:410
+msgid "Export local names to global DNS"
+msgstr ""
+
+#: option.c:411
+msgid "Domain to export to global DNS"
+msgstr ""
+
+#: option.c:412
+msgid "Set TTL for authoritative replies"
+msgstr ""
+
+#: option.c:413
+msgid "Set authoritive zone information"
+msgstr ""
+
+#: option.c:414
+msgid "Secondary authoritative nameservers for forward domains"
+msgstr ""
+
+#: option.c:415
+msgid "Peers which are allowed to do zone transfer"
+msgstr ""
+
+#: option.c:416
+msgid "Specify ipsets to which matching domains should be added"
+msgstr ""
+
+#: option.c:417
+msgid "Specify a domain and address range for sythesised names"
+msgstr ""
+
+#: option.c:419
 msgid "Specify DHCPv6 prefix class"
 msgstr ""
 
-#: option.c:596
+#: option.c:605
 #, c-format
 msgid ""
 "Usage: dnsmasq [options]\n"
 "\n"
 msgstr ""
 
-#: option.c:598
+#: option.c:607
 #, c-format
 msgid "Use short options only on the command line.\n"
 msgstr ""
 
-#: option.c:600
+#: option.c:609
 #, c-format
 msgid "Valid options are:\n"
 msgstr ""
 
-#: option.c:650 option.c:654
+#: option.c:659 option.c:663
 msgid "bad port"
 msgstr ""
 
-#: option.c:681 option.c:713
+#: option.c:690 option.c:722
 msgid "interface binding not supported"
 msgstr ""
 
-#: option.c:690 option.c:3179
+#: option.c:699 option.c:3275
 msgid "bad interface name"
 msgstr ""
 
-#: option.c:720
+#: option.c:729
 msgid "bad address"
 msgstr ""
 
-#: option.c:847
+#: option.c:863
 msgid "unsupported encapsulation for IPv6 option"
 msgstr ""
 
-#: option.c:861
+#: option.c:877
 msgid "bad dhcp-option"
 msgstr ""
 
-#: option.c:929
+#: option.c:945
 msgid "bad IP address"
 msgstr ""
 
-#: option.c:932 option.c:1070 option.c:2549
+#: option.c:948 option.c:1086 option.c:2620
 msgid "bad IPv6 address"
 msgstr ""
 
-#: option.c:1097 option.c:1191
+#: option.c:1113 option.c:1207
 msgid "bad domain in dhcp-option"
 msgstr ""
 
-#: option.c:1229
+#: option.c:1245
 msgid "dhcp-option too long"
 msgstr ""
 
-#: option.c:1236
+#: option.c:1252
 msgid "illegal dhcp-match"
 msgstr ""
 
-#: option.c:1298
+#: option.c:1314
 msgid "illegal repeated flag"
 msgstr ""
 
-#: option.c:1306
+#: option.c:1322
 msgid "illegal repeated keyword"
 msgstr ""
 
-#: option.c:1358 option.c:3702
+#: option.c:1374 option.c:3802
 #, c-format
 msgid "cannot access directory %s: %s"
 msgstr ""
 
-#: option.c:1390 tftp.c:474
+#: option.c:1406 tftp.c:487
 #, c-format
 msgid "cannot access %s: %s"
 msgstr ""
 
-#: option.c:1426
+#: option.c:1442
 msgid "setting log facility is not possible under Android"
 msgstr ""
 
-#: option.c:1435
+#: option.c:1451
 msgid "bad log facility"
 msgstr ""
 
-#: option.c:1484
+#: option.c:1500
 msgid "bad MX preference"
 msgstr ""
 
-#: option.c:1489
+#: option.c:1505
 msgid "bad MX name"
 msgstr ""
 
-#: option.c:1503
+#: option.c:1519
 msgid "bad MX target"
 msgstr ""
 
-#: option.c:1515
+#: option.c:1531
 msgid "cannot run scripts under uClinux"
 msgstr ""
 
-#: option.c:1517
+#: option.c:1533
 msgid "recompile with HAVE_SCRIPT defined to enable lease-change scripts"
 msgstr ""
 
-#: option.c:1521
+#: option.c:1537
 msgid "recompile with HAVE_LUASCRIPT defined to enable Lua scripts"
 msgstr ""
 
-#: option.c:1631
+#: option.c:1739 option.c:1800
 msgid "bad prefix"
 msgstr ""
 
-#: option.c:2043
+#: option.c:2094
 msgid "recompile with HAVE_IPSET defined to enable ipset directives"
 msgstr ""
 
-#: option.c:2223
+#: option.c:2274
 msgid "bad port range"
 msgstr ""
 
-#: option.c:2239
+#: option.c:2290
 msgid "bad bridge-interface"
 msgstr ""
 
-#: option.c:2297
+#: option.c:2350
 msgid "only one tag allowed"
 msgstr ""
 
-#: option.c:2317 option.c:2329 option.c:2461
+#: option.c:2370 option.c:2382 option.c:2491 option.c:2532
 msgid "bad dhcp-range"
 msgstr ""
 
-#: option.c:2344
+#: option.c:2397
 msgid "inconsistent DHCP range"
 msgstr ""
 
-#: option.c:2402
-msgid "prefix must be exactly 64 for RA subnets"
+#: option.c:2459
+msgid "prefix length must be exactly 64 for RA subnets"
 msgstr ""
 
-#: option.c:2404
-msgid "prefix must be exactly 64 for subnet constructors"
+#: option.c:2461
+msgid "prefix length must be exactly 64 for subnet constructors"
 msgstr ""
 
-#: option.c:2407
-msgid "prefix must be at least 64"
+#: option.c:2465
+msgid "prefix length must be at least 64"
 msgstr ""
 
-#: option.c:2412
+#: option.c:2468
 msgid "inconsistent DHCPv6 range"
 msgstr ""
 
-#: option.c:2519 option.c:2567
+#: option.c:2479
+msgid "prefix must be zero with \"constructor:\" argument"
+msgstr ""
+
+#: option.c:2590 option.c:2638
 msgid "bad hex constant"
 msgstr ""
 
-#: option.c:2541
+#: option.c:2612
 msgid "cannot match tags in --dhcp-host"
 msgstr ""
 
-#: option.c:2589
+#: option.c:2660
 #, c-format
 msgid "duplicate dhcp-host IP address %s"
 msgstr ""
 
-#: option.c:2645
+#: option.c:2716
 msgid "bad DHCP host name"
 msgstr ""
 
-#: option.c:2727
+#: option.c:2798
 msgid "bad tag-if"
 msgstr ""
 
-#: option.c:3051 option.c:3379
+#: option.c:3122 option.c:3479
 msgid "invalid port number"
 msgstr ""
 
-#: option.c:3113
+#: option.c:3184
 msgid "bad dhcp-proxy address"
 msgstr ""
 
-#: option.c:3124
+#: option.c:3210
+msgid "Bad dhcp-relay"
+msgstr ""
+
+#: option.c:3220
 msgid "bad DUID"
 msgstr ""
 
-#: option.c:3166
+#: option.c:3262
 msgid "invalid alias range"
 msgstr ""
 
-#: option.c:3205
+#: option.c:3305
 msgid "bad CNAME"
 msgstr ""
 
-#: option.c:3210
+#: option.c:3310
 msgid "duplicate CNAME"
 msgstr ""
 
-#: option.c:3230
+#: option.c:3330
 msgid "bad PTR record"
 msgstr ""
 
-#: option.c:3261
+#: option.c:3361
 msgid "bad NAPTR record"
 msgstr ""
 
-#: option.c:3295
+#: option.c:3395
 msgid "bad RR record"
 msgstr ""
 
-#: option.c:3324
+#: option.c:3424
 msgid "bad TXT record"
 msgstr ""
 
-#: option.c:3365
+#: option.c:3465
 msgid "bad SRV record"
 msgstr ""
 
-#: option.c:3372
+#: option.c:3472
 msgid "bad SRV target"
 msgstr ""
 
-#: option.c:3386
+#: option.c:3486
 msgid "invalid priority"
 msgstr ""
 
-#: option.c:3393
+#: option.c:3493
 msgid "invalid weight"
 msgstr ""
 
-#: option.c:3417
+#: option.c:3517
 msgid "Bad host-record"
 msgstr ""
 
-#: option.c:3434
+#: option.c:3534
 msgid "Bad name in host-record"
 msgstr ""
 
-#: option.c:3464
+#: option.c:3564
 msgid "unsupported option (check that dnsmasq was compiled with DHCP/TFTP/DBus support)"
 msgstr ""
 
-#: option.c:3522
+#: option.c:3622
 msgid "missing \""
 msgstr ""
 
-#: option.c:3579
+#: option.c:3679
 msgid "bad option"
 msgstr ""
 
-#: option.c:3581
+#: option.c:3681
 msgid "extraneous parameter"
 msgstr ""
 
-#: option.c:3583
+#: option.c:3683
 msgid "missing parameter"
 msgstr ""
 
-#: option.c:3590
+#: option.c:3690
 msgid "error"
 msgstr ""
 
-#: option.c:3592
+#: option.c:3692
 #, c-format
 msgid " at line %d of %s"
 msgstr ""
 
-#: option.c:3656 tftp.c:648
+#: option.c:3756 tftp.c:661
 #, c-format
 msgid "cannot read %s: %s"
 msgstr ""
 
-#: option.c:3823 option.c:3859
+#: option.c:3923 option.c:3959
 #, c-format
 msgid "read %s"
 msgstr ""
 
-#: option.c:3915
+#: option.c:4015
 msgid "junk found in command line"
 msgstr ""
 
-#: option.c:3950
+#: option.c:4050
 #, c-format
 msgid "Dnsmasq version %s  %s\n"
 msgstr ""
 
-#: option.c:3951
+#: option.c:4051
 #, c-format
 msgid ""
 "Compile time options: %s\n"
 "\n"
 msgstr ""
 
-#: option.c:3952
+#: option.c:4052
 #, c-format
 msgid "This software comes with ABSOLUTELY NO WARRANTY.\n"
 msgstr ""
 
-#: option.c:3953
+#: option.c:4053
 #, c-format
 msgid "Dnsmasq is free software, and you are welcome to redistribute it\n"
 msgstr ""
 
-#: option.c:3954
+#: option.c:4054
 #, c-format
 msgid "under the terms of the GNU General Public License, version 2 or 3.\n"
 msgstr ""
 
-#: option.c:3965
+#: option.c:4065
 msgid "try --help"
 msgstr ""
 
-#: option.c:3967
+#: option.c:4067
 msgid "try -w"
 msgstr ""
 
-#: option.c:3969
+#: option.c:4069
 #, c-format
 msgid "bad command line options: %s"
 msgstr ""
 
-#: option.c:4018
+#: option.c:4118
 #, c-format
 msgid "cannot get host-name: %s"
 msgstr ""
 
-#: option.c:4046
+#: option.c:4146
 msgid "only one resolv.conf file allowed in no-poll mode."
 msgstr ""
 
-#: option.c:4056
+#: option.c:4156
 msgid "must have exactly one resolv.conf to read domain from."
 msgstr ""
 
-#: option.c:4059 network.c:1039 dhcp.c:794
+#: option.c:4159 network.c:1178 dhcp.c:768
 #, c-format
 msgid "failed to read %s: %s"
 msgstr ""
 
-#: option.c:4076
+#: option.c:4176
 #, c-format
 msgid "no search directive found in %s"
 msgstr ""
 
-#: option.c:4097
+#: option.c:4197
 msgid "there must be a default domain when --dhcp-fqdn is set"
 msgstr ""
 
-#: option.c:4101
+#: option.c:4201
 msgid "syntax check OK"
 msgstr ""
 
@@ -985,101 +1005,106 @@
 msgid "possible DNS-rebind attack detected: %s"
 msgstr ""
 
-#: network.c:414
+#: forward.c:1216
+#, c-format
+msgid "Maximum number of concurrent DNS queries reached (max: %d)"
+msgstr ""
+
+#: network.c:551
 #, c-format
 msgid "failed to create listening socket for %s: %s"
 msgstr ""
 
-#: network.c:743
+#: network.c:882
 #, c-format
 msgid "interface %s failed to join DHCPv6 multicast group: %s"
 msgstr ""
 
-#: network.c:937
+#: network.c:1076
 #, c-format
 msgid "failed to bind server socket for %s: %s"
 msgstr ""
 
-#: network.c:974
+#: network.c:1113
 #, c-format
 msgid "ignoring nameserver %s - local interface"
 msgstr ""
 
-#: network.c:985
+#: network.c:1124
 #, c-format
 msgid "ignoring nameserver %s - cannot make/bind socket: %s"
 msgstr ""
 
-#: network.c:1002
+#: network.c:1141
 msgid "unqualified"
 msgstr ""
 
-#: network.c:1002
+#: network.c:1141
 msgid "names"
 msgstr ""
 
-#: network.c:1004
+#: network.c:1143
 msgid "default"
 msgstr ""
 
-#: network.c:1006
+#: network.c:1145
 msgid "domain"
 msgstr ""
 
-#: network.c:1009
+#: network.c:1148
 #, c-format
 msgid "using local addresses only for %s %s"
 msgstr ""
 
-#: network.c:1011
+#: network.c:1150
 #, c-format
 msgid "using standard nameservers for %s %s"
 msgstr ""
 
-#: network.c:1013
+#: network.c:1152
 #, c-format
 msgid "using nameserver %s#%d for %s %s"
 msgstr ""
 
-#: network.c:1016
+#: network.c:1155
 #, c-format
 msgid "using nameserver %s#%d(via %s)"
 msgstr ""
 
-#: network.c:1018
+#: network.c:1157
 #, c-format
 msgid "using nameserver %s#%d"
 msgstr ""
 
-#: dnsmasq.c:131
+#: dnsmasq.c:134
 msgid "TFTP server not available: set HAVE_TFTP in src/config.h"
 msgstr ""
 
-#: dnsmasq.c:136
+#: dnsmasq.c:139
 msgid "Cannot use --conntrack AND --query-port"
 msgstr ""
 
-#: dnsmasq.c:139
+#: dnsmasq.c:142
 msgid "Conntrack support not available: set HAVE_CONNTRACK in src/config.h"
 msgstr ""
 
-#: dnsmasq.c:144
+#: dnsmasq.c:147
 msgid "asychronous logging is not available under Solaris"
 msgstr ""
 
-#: dnsmasq.c:149
+#: dnsmasq.c:152
 msgid "asychronous logging is not available under Android"
 msgstr ""
 
-#: dnsmasq.c:154
+#: dnsmasq.c:157
 msgid "authoritative DNS not available: set HAVE_AUTH in src/config.h"
 msgstr ""
 
-#: dnsmasq.c:164
+#: dnsmasq.c:167
 msgid "zone serial must be configured in --auth-soa"
 msgstr ""
 
-#: dnsmasq.c:186
+#: dnsmasq.c:185
 msgid "dhcp-range constructor not available on this platform"
 msgstr ""
 
@@ -1097,426 +1122,431 @@
 msgid "unknown interface %s"
 msgstr ""
 
-#: dnsmasq.c:274 dnsmasq.c:860
+#: dnsmasq.c:275 dnsmasq.c:870
 #, c-format
 msgid "DBus error: %s"
 msgstr ""
 
-#: dnsmasq.c:277
+#: dnsmasq.c:278
 msgid "DBus not available: set HAVE_DBUS in src/config.h"
 msgstr ""
 
-#: dnsmasq.c:305
+#: dnsmasq.c:306
 #, c-format
 msgid "unknown user or group: %s"
 msgstr ""
 
-#: dnsmasq.c:360
+#: dnsmasq.c:361
 #, c-format
 msgid "cannot chdir to filesystem root: %s"
 msgstr ""
 
-#: dnsmasq.c:597
+#: dnsmasq.c:598
 #, c-format
 msgid "started, version %s DNS disabled"
 msgstr ""
 
-#: dnsmasq.c:599
+#: dnsmasq.c:600
 #, c-format
 msgid "started, version %s cachesize %d"
 msgstr ""
 
-#: dnsmasq.c:601
+#: dnsmasq.c:602
 #, c-format
 msgid "started, version %s cache disabled"
 msgstr ""
 
-#: dnsmasq.c:603
+#: dnsmasq.c:604
 #, c-format
 msgid "compile time options: %s"
 msgstr ""
 
-#: dnsmasq.c:609
+#: dnsmasq.c:610
 msgid "DBus support enabled: connected to system bus"
 msgstr ""
 
-#: dnsmasq.c:611
+#: dnsmasq.c:612
 msgid "DBus support enabled: bus connection pending"
 msgstr ""
 
-#: dnsmasq.c:616
+#: dnsmasq.c:617
 #, c-format
 msgid "warning: failed to change owner of %s: %s"
 msgstr ""
 
-#: dnsmasq.c:620
+#: dnsmasq.c:621
 msgid "setting --bind-interfaces option because of OS limitations"
 msgstr ""
 
-#: dnsmasq.c:625
+#: dnsmasq.c:626
 #, c-format
 msgid "warning: interface %s does not currently exist"
 msgstr ""
 
-#: dnsmasq.c:630
+#: dnsmasq.c:631
 msgid "warning: ignoring resolv-file flag because no-resolv is set"
 msgstr ""
 
-#: dnsmasq.c:633
+#: dnsmasq.c:634
 msgid "warning: no upstream servers configured"
 msgstr ""
 
-#: dnsmasq.c:637
+#: dnsmasq.c:638
 #, c-format
 msgid "asynchronous logging enabled, queue limit is %d messages"
 msgstr ""
 
-#: dnsmasq.c:652
+#: dnsmasq.c:659
 msgid "IPv6 router advertisement enabled"
 msgstr ""
 
-#: dnsmasq.c:669
+#: dnsmasq.c:676
 msgid "root is "
 msgstr ""
 
-#: dnsmasq.c:669
+#: dnsmasq.c:676
 msgid "enabled"
 msgstr ""
 
-#: dnsmasq.c:671
+#: dnsmasq.c:678
 msgid "secure mode"
 msgstr ""
 
-#: dnsmasq.c:697
+#: dnsmasq.c:704
 #, c-format
 msgid "restricting maximum simultaneous TFTP transfers to %d"
 msgstr ""
 
-#: dnsmasq.c:862
+#: dnsmasq.c:872
 msgid "connected to system DBus"
 msgstr ""
 
-#: dnsmasq.c:1007
+#: dnsmasq.c:1017
 #, c-format
 msgid "cannot fork into background: %s"
 msgstr ""
 
-#: dnsmasq.c:1010
+#: dnsmasq.c:1020
 #, c-format
 msgid "failed to create helper: %s"
 msgstr ""
 
-#: dnsmasq.c:1013
+#: dnsmasq.c:1023
 #, c-format
 msgid "setting capabilities failed: %s"
 msgstr ""
 
-#: dnsmasq.c:1016
+#: dnsmasq.c:1026
 #, c-format
 msgid "failed to change user-id to %s: %s"
 msgstr ""
 
-#: dnsmasq.c:1019
+#: dnsmasq.c:1029
 #, c-format
 msgid "failed to change group-id to %s: %s"
 msgstr ""
 
-#: dnsmasq.c:1022
+#: dnsmasq.c:1032
 #, c-format
 msgid "failed to open pidfile %s: %s"
 msgstr ""
 
-#: dnsmasq.c:1025
+#: dnsmasq.c:1035
 #, c-format
 msgid "cannot open log %s: %s"
 msgstr ""
 
-#: dnsmasq.c:1028
+#: dnsmasq.c:1038
 #, c-format
 msgid "failed to load Lua script: %s"
 msgstr ""
 
-#: dnsmasq.c:1031
+#: dnsmasq.c:1041
 #, c-format
 msgid "TFTP directory %s inaccessible: %s"
 msgstr ""
 
-#: dnsmasq.c:1095
+#: dnsmasq.c:1105
 #, c-format
 msgid "script process killed by signal %d"
 msgstr ""
 
-#: dnsmasq.c:1099
+#: dnsmasq.c:1109
 #, c-format
 msgid "script process exited with status %d"
 msgstr ""
 
-#: dnsmasq.c:1103
+#: dnsmasq.c:1113
 #, c-format
 msgid "failed to execute %s: %s"
 msgstr ""
 
-#: dnsmasq.c:1148
+#: dnsmasq.c:1158
 msgid "exiting on receipt of SIGTERM"
 msgstr ""
 
-#: dnsmasq.c:1176
+#: dnsmasq.c:1186
 #, c-format
 msgid "failed to access %s: %s"
 msgstr ""
 
-#: dnsmasq.c:1206
+#: dnsmasq.c:1216
 #, c-format
 msgid "reading %s"
 msgstr ""
 
-#: dnsmasq.c:1217
+#: dnsmasq.c:1227
 #, c-format
 msgid "no servers found in %s, will retry"
 msgstr ""
 
-#: dhcp.c:49
+#: dhcp.c:53
 #, c-format
 msgid "cannot create DHCP socket: %s"
 msgstr ""
 
-#: dhcp.c:64
+#: dhcp.c:68
 #, c-format
 msgid "failed to set options on DHCP socket: %s"
 msgstr ""
 
-#: dhcp.c:77
+#: dhcp.c:89
 #, c-format
 msgid "failed to set SO_REUSE{ADDR|PORT} on DHCP socket: %s"
 msgstr ""
 
-#: dhcp.c:89
+#: dhcp.c:101
 #, c-format
 msgid "failed to bind DHCP server socket: %s"
 msgstr ""
 
-#: dhcp.c:115
+#: dhcp.c:127
 #, c-format
 msgid "cannot create ICMP raw socket: %s."
 msgstr ""
 
-#: dhcp.c:225
+#: dhcp.c:239
 #, c-format
 msgid "unknown interface %s in bridge-interface"
 msgstr ""
 
-#: dhcp.c:250
+#: dhcp.c:278
 #, c-format
 msgid "DHCP packet received on %s which has no address"
 msgstr ""
 
-#: dhcp.c:457
+#: dhcp.c:505
 #, c-format
 msgid "DHCP range %s -- %s is not consistent with netmask %s"
 msgstr ""
 
-#: dhcp.c:832
+#: dhcp.c:806
 #, c-format
 msgid "bad line at %s line %d"
 msgstr ""
 
-#: dhcp.c:875
+#: dhcp.c:849
 #, c-format
 msgid "ignoring %s line %d, duplicate name or IP address"
 msgstr ""
 
+#: dhcp.c:993 rfc3315.c:2047
+#, c-format
+msgid "DHCP relay %s -> %s"
+msgstr ""
+
 #: lease.c:61
 #, c-format
 msgid "cannot open or create lease file %s: %s"
 msgstr ""
 
-#: lease.c:133
+#: lease.c:134
 msgid "too many stored leases"
 msgstr ""
 
-#: lease.c:164
+#: lease.c:165
 #, c-format
 msgid "cannot run lease-init script %s: %s"
 msgstr ""
 
-#: lease.c:170
+#: lease.c:171
 #, c-format
 msgid "lease-init script returned exit code %s"
 msgstr ""
 
-#: lease.c:339
+#: lease.c:342
 #, c-format
 msgid "failed to write %s: %s (retry in %us)"
 msgstr ""
 
-#: lease.c:843
+#: lease.c:871
 #, c-format
 msgid "Ignoring domain %s for DHCP host name %s"
 msgstr ""
 
-#: rfc2131.c:337
+#: rfc2131.c:338
 #, c-format
 msgid "no address range available for DHCP request %s %s"
 msgstr ""
 
-#: rfc2131.c:338
+#: rfc2131.c:339
 msgid "with subnet selector"
 msgstr ""
 
-#: rfc2131.c:338
+#: rfc2131.c:339
 msgid "via"
 msgstr ""
 
-#: rfc2131.c:350
+#: rfc2131.c:351
 #, c-format
 msgid "%u available DHCP subnet: %s/%s"
 msgstr ""
 
-#: rfc2131.c:353 rfc3315.c:272
+#: rfc2131.c:354 rfc3315.c:292
 #, c-format
 msgid "%u available DHCP range: %s -- %s"
 msgstr ""
 
-#: rfc2131.c:382
-msgid "disabled"
-msgstr ""
-
-#: rfc2131.c:423 rfc2131.c:953 rfc2131.c:1371 rfc3315.c:555 rfc3315.c:771
-#: rfc3315.c:1017
-msgid "ignored"
-msgstr ""
-
-#: rfc2131.c:438 rfc2131.c:1191 rfc3315.c:814
-msgid "address in use"
-msgstr ""
-
-#: rfc2131.c:452 rfc2131.c:1007
-msgid "no address available"
-msgstr ""
-
-#: rfc2131.c:459 rfc2131.c:1154
-msgid "wrong network"
-msgstr ""
-
-#: rfc2131.c:474
-msgid "no address configured"
-msgstr ""
-
-#: rfc2131.c:480 rfc2131.c:1204
-msgid "no leases left"
-msgstr ""
-
-#: rfc2131.c:576 rfc3315.c:428
-#, c-format
-msgid "%u client provides name: %s"
-msgstr ""
-
-#: rfc2131.c:731
+#: rfc2131.c:465
 #, c-format
 msgid "%u vendor class: %s"
 msgstr ""
 
-#: rfc2131.c:733
+#: rfc2131.c:467
 #, c-format
 msgid "%u user class: %s"
 msgstr ""
 
+#: rfc2131.c:494
+msgid "disabled"
+msgstr ""
+
+#: rfc2131.c:535 rfc2131.c:961 rfc2131.c:1379 rfc3315.c:593 rfc3315.c:813
+#: rfc3315.c:1082
+msgid "ignored"
+msgstr ""
+
+#: rfc2131.c:550 rfc2131.c:1199 rfc3315.c:863
+msgid "address in use"
+msgstr ""
+
+#: rfc2131.c:564 rfc2131.c:1015
+msgid "no address available"
+msgstr ""
+
+#: rfc2131.c:571 rfc2131.c:1162
+msgid "wrong network"
+msgstr ""
+
+#: rfc2131.c:586
+msgid "no address configured"
+msgstr ""
+
+#: rfc2131.c:592 rfc2131.c:1212
+msgid "no leases left"
+msgstr ""
+
+#: rfc2131.c:687 rfc3315.c:466
+#, c-format
+msgid "%u client provides name: %s"
+msgstr ""
+
 #: rfc2131.c:792
 msgid "PXE BIS not supported"
 msgstr ""
 
-#: rfc2131.c:923 rfc3315.c:1111
+#: rfc2131.c:931 rfc3315.c:1176
 #, c-format
 msgid "disabling DHCP static address %s for %s"
 msgstr ""
 
-#: rfc2131.c:944
+#: rfc2131.c:952
 msgid "unknown lease"
 msgstr ""
 
-#: rfc2131.c:976
+#: rfc2131.c:984
 #, c-format
 msgid "not using configured address %s because it is leased to %s"
 msgstr ""
 
-#: rfc2131.c:986
+#: rfc2131.c:994
 #, c-format
 msgid "not using configured address %s because it is in use by the server or relay"
 msgstr ""
 
-#: rfc2131.c:989
+#: rfc2131.c:997
 #, c-format
 msgid "not using configured address %s because it was previously declined"
 msgstr ""
 
-#: rfc2131.c:1005 rfc2131.c:1197
+#: rfc2131.c:1013 rfc2131.c:1205
 msgid "no unique-id"
 msgstr ""
 
-#: rfc2131.c:1092
+#: rfc2131.c:1100
 msgid "wrong server-ID"
 msgstr ""
 
-#: rfc2131.c:1111
+#: rfc2131.c:1119
 msgid "wrong address"
 msgstr ""
 
-#: rfc2131.c:1129 rfc3315.c:911
+#: rfc2131.c:1137 rfc3315.c:959
 msgid "lease not found"
 msgstr ""
 
-#: rfc2131.c:1162
+#: rfc2131.c:1170
 msgid "address not available"
 msgstr ""
 
-#: rfc2131.c:1173
+#: rfc2131.c:1181
 msgid "static lease available"
 msgstr ""
 
-#: rfc2131.c:1177
+#: rfc2131.c:1185
 msgid "address reserved"
 msgstr ""
 
-#: rfc2131.c:1185
+#: rfc2131.c:1193
 #, c-format
 msgid "abandoning lease to %s of %s"
 msgstr ""
 
-#: rfc2131.c:1679
+#: rfc2131.c:1701
 #, c-format
 msgid "%u bootfile name: %s"
 msgstr ""
 
-#: rfc2131.c:1688
+#: rfc2131.c:1710
 #, c-format
 msgid "%u server name: %s"
 msgstr ""
 
-#: rfc2131.c:1696
+#: rfc2131.c:1718
 #, c-format
 msgid "%u next server: %s"
 msgstr ""
 
-#: rfc2131.c:1699
+#: rfc2131.c:1721
 #, c-format
 msgid "%u broadcast response"
 msgstr ""
 
-#: rfc2131.c:1762
+#: rfc2131.c:1784
 #, c-format
 msgid "cannot send DHCP/BOOTP option %d: no space left in packet"
 msgstr ""
 
-#: rfc2131.c:2002
+#: rfc2131.c:2025
 msgid "PXE menu too large"
 msgstr ""
 
-#: rfc2131.c:2139 rfc3315.c:1332
+#: rfc2131.c:2162 rfc3315.c:1420
 #, c-format
 msgid "%u requested options: %s"
 msgstr ""
 
-#: rfc2131.c:2415
+#: rfc2131.c:2442
 #, c-format
 msgid "cannot send RFC3925 option: too many options for enterprise number %d"
 msgstr ""
@@ -1526,7 +1556,7 @@
 msgid "cannot create netlink socket: %s"
 msgstr ""
 
-#: netlink.c:354
+#: netlink.c:363
 #, c-format
 msgid "netlink returns error: %s"
 msgstr ""
@@ -1535,53 +1565,53 @@
 msgid "attempt to set an IPv6 server address via DBus - no IPv6 support"
 msgstr ""
 
-#: dbus.c:308 dbus.c:504
+#: dbus.c:523
 msgid "setting upstream servers from DBus"
 msgstr ""
 
-#: dbus.c:561
+#: dbus.c:570
 msgid "could not register a DBus message handler"
 msgstr ""
 
-#: bpf.c:197
+#: bpf.c:245
 #, c-format
 msgid "cannot create DHCP BPF socket: %s"
 msgstr ""
 
-#: bpf.c:225
+#: bpf.c:273
 #, c-format
 msgid "DHCP request for unsupported hardware type (%d) received on %s"
 msgstr ""
 
-#: helper.c:145
+#: helper.c:151
 msgid "lease() function missing in Lua script"
 msgstr ""
 
-#: tftp.c:290
+#: tftp.c:303
 msgid "unable to get free port for TFTP"
 msgstr ""
 
-#: tftp.c:306
+#: tftp.c:319
 #, c-format
 msgid "unsupported request from %s"
 msgstr ""
 
-#: tftp.c:420
+#: tftp.c:433
 #, c-format
 msgid "file %s not found"
 msgstr ""
 
-#: tftp.c:529
+#: tftp.c:542
 #, c-format
 msgid "error %d %s received from %s"
 msgstr ""
 
-#: tftp.c:571
+#: tftp.c:584
 #, c-format
 msgid "failed sending %s to %s"
 msgstr ""
 
-#: tftp.c:571
+#: tftp.c:584
 #, c-format
 msgid "sent %s to %s"
 msgstr ""
@@ -1605,176 +1635,195 @@
 msgid "Conntrack connection mark retrieval failed: %s"
 msgstr ""
 
-#: dhcp6.c:49
+#: dhcp6.c:59
 #, c-format
 msgid "cannot create DHCPv6 socket: %s"
 msgstr ""
 
-#: dhcp6.c:62
+#: dhcp6.c:80
 #, c-format
 msgid "failed to set SO_REUSE{ADDR|PORT} on DHCPv6 socket: %s"
 msgstr ""
 
-#: dhcp6.c:74
+#: dhcp6.c:92
 #, c-format
 msgid "failed to bind DHCPv6 server socket: %s"
 msgstr ""
 
-#: rfc3315.c:135
+#: rfc3315.c:149
 #, c-format
 msgid "no address range available for DHCPv6 request from relay at %s"
 msgstr ""
 
-#: rfc3315.c:144
+#: rfc3315.c:158
 #, c-format
 msgid "no address range available for DHCPv6 request via %s"
 msgstr ""
 
-#: rfc3315.c:269
+#: rfc3315.c:289
 #, c-format
 msgid "%u available DHCPv6 subnet: %s/%d"
 msgstr ""
 
-#: rfc3315.c:350
+#: rfc3315.c:370
 #, c-format
 msgid "%u vendor class: %u"
 msgstr ""
 
-#: rfc3315.c:609
+#: rfc3315.c:418
+#, c-format
+msgid "%u client MAC address: %s"
+msgstr ""
+
+#: rfc3315.c:650
 #, c-format
 msgid "unknown prefix-class %d"
 msgstr ""
 
-#: rfc3315.c:741 rfc3315.c:854
+#: rfc3315.c:781 rfc3315.c:903
 msgid "success"
 msgstr ""
 
-#: rfc3315.c:756 rfc3315.c:758 rfc3315.c:862 rfc3315.c:864
+#: rfc3315.c:796 rfc3315.c:798 rfc3315.c:911 rfc3315.c:913
 msgid "no addresses available"
 msgstr ""
 
-#: rfc3315.c:806
+#: rfc3315.c:855
 msgid "address unavailable"
 msgstr ""
 
-#: rfc3315.c:841
+#: rfc3315.c:890
 msgid "not on link"
 msgstr ""
 
-#: rfc3315.c:915 rfc3315.c:1073 rfc3315.c:1150
+#: rfc3315.c:963 rfc3315.c:1138 rfc3315.c:1215
 msgid "no binding found"
 msgstr ""
 
-#: rfc3315.c:948
+#: rfc3315.c:1001
 msgid "deprecated"
 msgstr ""
 
-#: rfc3315.c:951
+#: rfc3315.c:1006
 msgid "address invalid"
 msgstr ""
 
-#: rfc3315.c:992
+#: rfc3315.c:1048
 msgid "confirm failed"
 msgstr ""
 
-#: rfc3315.c:1003
+#: rfc3315.c:1059
 msgid "all addresses still on link"
 msgstr ""
 
-#: rfc3315.c:1082
+#: rfc3315.c:1147
 msgid "release received"
 msgstr ""
 
+#: rfc3315.c:2038
+msgid "Cannot multicast to DHCPv6 server without correct interface"
+msgstr ""
+
 #: dhcp-common.c:145
 #, c-format
 msgid "Ignoring duplicate dhcp-option %d"
 msgstr ""
 
-#: dhcp-common.c:215
+#: dhcp-common.c:222
 #, c-format
 msgid "%u tags: %s"
 msgstr ""
 
-#: dhcp-common.c:296
+#: dhcp-common.c:407
 #, c-format
 msgid "%s has more than one address in hostsfile, using %s for DHCP"
 msgstr ""
 
-#: dhcp-common.c:319
+#: dhcp-common.c:430
 #, c-format
 msgid "duplicate IP address %s (%s) in dhcp-config directive"
 msgstr ""
 
-#: dhcp-common.c:367
+#: dhcp-common.c:484
 #, c-format
 msgid "failed to set SO_BINDTODEVICE on DHCP socket: %s"
 msgstr ""
 
-#: dhcp-common.c:489
+#: dhcp-common.c:606
 #, c-format
 msgid "Known DHCP options:\n"
 msgstr ""
 
-#: dhcp-common.c:500
+#: dhcp-common.c:617
 #, c-format
 msgid "Known DHCPv6 options:\n"
 msgstr ""
 
-#: dhcp-common.c:693
+#: dhcp-common.c:814
 msgid ", prefix deprecated"
 msgstr ""
 
-#: dhcp-common.c:696
+#: dhcp-common.c:817
 #, c-format
 msgid ", lease time "
 msgstr ""
 
-#: dhcp-common.c:727
+#: dhcp-common.c:849
 #, c-format
 msgid "%s stateless on %s%.0s%.0s%s"
 msgstr ""
 
-#: dhcp-common.c:729
+#: dhcp-common.c:851
 #, c-format
 msgid "%s, static leases only on %.0s%s%s%.0s"
 msgstr ""
 
-#: dhcp-common.c:731
+#: dhcp-common.c:853
 #, c-format
 msgid "%s, proxy on subnet %.0s%s%.0s%.0s"
 msgstr ""
 
-#: dhcp-common.c:732
+#: dhcp-common.c:854
 #, c-format
 msgid "%s, IP range %s -- %s%s%.0s"
 msgstr ""
 
-#: dhcp-common.c:739
+#: dhcp-common.c:861
 #, c-format
 msgid "DHCPv4-derived IPv6 names on %s%s"
 msgstr ""
 
-#: dhcp-common.c:742
+#: dhcp-common.c:864
 #, c-format
 msgid "router advertisement on %s%s"
 msgstr ""
 
-#: radv.c:87
+#: dhcp-common.c:875
+#, c-format
+msgid "DHCP relay from %s to %s via %s"
+msgstr ""
+
+#: dhcp-common.c:877
+#, c-format
+msgid "DHCP relay from %s to %s"
+msgstr ""
+
+#: radv.c:93
 #, c-format
 msgid "cannot create ICMPv6 socket: %s"
 msgstr ""
 
-#: auth.c:402
+#: auth.c:435
 #, c-format
 msgid "ignoring zone transfer request from %s"
 msgstr ""
 
-#: ipset.c:71
+#: ipset.c:95
 #, c-format
 msgid "failed to find kernel version: %s"
 msgstr ""
 
-#: ipset.c:90
+#: ipset.c:114
 #, c-format
 msgid "failed to create IPset control socket: %s"
 msgstr ""