Merged messages.
diff --git a/po/pt_BR.po b/po/pt_BR.po
index e1646d3..824a78f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -10,66 +10,67 @@
 "PO-Revision-Date: 2006-01-16 20:42+0000\n"
 "Last-Translator: Simon Kelley <simon@thekelleys.org.uk>\n"
 "Language-Team: Portuguese <ldp-br@bazar.conectiva.com.br>\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ASCII\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: cache.c:764
+#: cache.c:808
 #, c-format
 msgid "failed to load names from %s: %s"
 msgstr ""
 
-#: cache.c:797 dhcp.c:855
+#: cache.c:834 dhcp.c:845
 #, c-format
 msgid "bad address at %s line %d"
 msgstr ""
 
-#: cache.c:846 dhcp.c:871
+#: cache.c:885 dhcp.c:861
 #, c-format
 msgid "bad name at %s line %d"
 msgstr ""
 
-#: cache.c:853 dhcp.c:946
+#: cache.c:892 dhcp.c:936
 #, c-format
 msgid "read %s - %d addresses"
 msgstr ""
 
-#: cache.c:892
+#: cache.c:961
 msgid "cleared cache"
 msgstr ""
 
-#: cache.c:953
+#: cache.c:1016
 #, c-format
 msgid "No IPv4 address found for %s"
 msgstr ""
 
-#: cache.c:1005
+#: cache.c:1093
 #, c-format
 msgid "%s is a CNAME, not giving it to the DHCP lease of %s"
 msgstr ""
 
-#: cache.c:1011
+#: cache.c:1117
 #, 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:1086
+#: cache.c:1162
 #, c-format
 msgid "time %lu"
 msgstr ""
 
-#: cache.c:1087
+#: cache.c:1163
 #, c-format
 msgid "cache size %d, %d/%d cache insertions re-used unexpired cache entries."
 msgstr ""
 
-#: cache.c:1089
+#: cache.c:1165
 #, c-format
 msgid "queries forwarded %u, queries answered locally %u"
 msgstr ""
 
-#: cache.c:1112
+#: cache.c:1188
 #, c-format
 msgid "server %s#%d: queries sent %u, retried or failed %u"
 msgstr ""
@@ -83,7 +84,7 @@
 msgid "failed to allocate memory"
 msgstr ""
 
-#: util.c:227 option.c:717
+#: util.c:227 option.c:531
 msgid "could not get memory"
 msgstr ""
 
@@ -102,1090 +103,1174 @@
 msgid "infinite"
 msgstr ""
 
-#: option.c:254
+#: option.c:286
 msgid "Specify local address(es) to listen on."
 msgstr ""
 
-#: option.c:255
+#: option.c:287
 msgid "Return ipaddr for all hosts in specified domains."
 msgstr ""
 
-#: option.c:256
+#: option.c:288
 msgid "Fake reverse lookups for RFC1918 private address ranges."
 msgstr ""
 
-#: option.c:257
+#: option.c:289
 msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)."
 msgstr ""
 
-#: option.c:258
+#: option.c:290
 #, c-format
 msgid "Specify the size of the cache in entries (defaults to %s)."
 msgstr ""
 
-#: option.c:259
+#: option.c:291
 #, c-format
 msgid "Specify configuration file (defaults to %s)."
 msgstr ""
 
-#: option.c:260
+#: option.c:292
 msgid "Do NOT fork into the background: run in debug mode."
 msgstr ""
 
-#: option.c:261
+#: option.c:293
 msgid "Do NOT forward queries with no domain part."
 msgstr ""
 
-#: option.c:262
+#: option.c:294
 msgid "Return self-pointing MX records for local hosts."
 msgstr ""
 
-#: option.c:263
+#: option.c:295
 msgid "Expand simple names in /etc/hosts with domain-suffix."
 msgstr ""
 
-#: option.c:264
+#: option.c:296
 msgid "Don't forward spurious DNS requests from Windows hosts."
 msgstr ""
 
-#: option.c:265
+#: option.c:297
 msgid "Enable DHCP in the range given with lease duration."
 msgstr ""
 
-#: option.c:266
+#: option.c:298
 #, c-format
 msgid "Change to this group after startup (defaults to %s)."
 msgstr ""
 
-#: option.c:267
+#: option.c:299
 msgid "Set address or hostname for a specified machine."
 msgstr ""
 
-#: option.c:268
+#: option.c:300
 msgid "Read DHCP host specs from file."
 msgstr ""
 
-#: option.c:269
+#: option.c:301
 msgid "Read DHCP option specs from file."
 msgstr ""
 
-#: option.c:270
+#: option.c:302
 msgid "Evaluate conditional tag expression."
 msgstr ""
 
-#: option.c:271
+#: option.c:303
 #, c-format
 msgid "Do NOT load %s file."
 msgstr ""
 
-#: option.c:272
+#: option.c:304
 #, c-format
 msgid "Specify a hosts file to be read in addition to %s."
 msgstr ""
 
-#: option.c:273
+#: option.c:305
 msgid "Specify interface(s) to listen on."
 msgstr ""
 
-#: option.c:274
+#: option.c:306
 msgid "Specify interface(s) NOT to listen on."
 msgstr ""
 
-#: option.c:275
+#: option.c:307
 msgid "Map DHCP user class to tag."
 msgstr ""
 
-#: option.c:276
+#: option.c:308
 msgid "Map RFC3046 circuit-id to tag."
 msgstr ""
 
-#: option.c:277
+#: option.c:309
 msgid "Map RFC3046 remote-id to tag."
 msgstr ""
 
-#: option.c:278
+#: option.c:310
 msgid "Map RFC3993 subscriber-id to tag."
 msgstr ""
 
-#: option.c:279
+#: option.c:311
 msgid "Don't do DHCP for hosts with tag set."
 msgstr ""
 
-#: option.c:280
+#: option.c:312
 msgid "Force broadcast replies for hosts with tag set."
 msgstr ""
 
-#: option.c:281
+#: option.c:313
 msgid "Do NOT fork into the background, do NOT run in debug mode."
 msgstr ""
 
-#: option.c:282
+#: option.c:314
 msgid "Assume we are the only DHCP server on the local network."
 msgstr ""
 
-#: option.c:283
+#: option.c:315
 #, c-format
 msgid "Specify where to store DHCP leases (defaults to %s)."
 msgstr ""
 
-#: option.c:284
+#: option.c:316
 msgid "Return MX records for local hosts."
 msgstr ""
 
-#: option.c:285
+#: option.c:317
 msgid "Specify an MX record."
 msgstr ""
 
-#: option.c:286
+#: option.c:318
 msgid "Specify BOOTP options to DHCP server."
 msgstr ""
 
-#: option.c:287
+#: option.c:319
 #, c-format
 msgid "Do NOT poll %s file, reload only on SIGHUP."
 msgstr ""
 
-#: option.c:288
+#: option.c:320
 msgid "Do NOT cache failed search results."
 msgstr ""
 
-#: option.c:289
+#: option.c:321
 #, c-format
 msgid "Use nameservers strictly in the order given in %s."
 msgstr ""
 
-#: option.c:290
+#: option.c:322
 msgid "Specify options to be sent to DHCP clients."
 msgstr ""
 
-#: option.c:291
+#: option.c:323
 msgid "DHCP option sent even if the client does not request it."
 msgstr ""
 
-#: option.c:292
+#: option.c:324
 msgid "Specify port to listen for DNS requests on (defaults to 53)."
 msgstr ""
 
-#: option.c:293
+#: option.c:325
 #, c-format
 msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)."
 msgstr ""
 
-#: option.c:294
+#: option.c:326
 msgid "Log DNS queries."
 msgstr ""
 
-#: option.c:295
+#: option.c:327
 msgid "Force the originating port for upstream DNS queries."
 msgstr ""
 
-#: option.c:296
+#: option.c:328
 msgid "Do NOT read resolv.conf."
 msgstr ""
 
-#: option.c:297
+#: option.c:329
 #, c-format
 msgid "Specify path to resolv.conf (defaults to %s)."
 msgstr ""
 
-#: option.c:298
+#: option.c:330
 msgid "Specify address(es) of upstream servers with optional domains."
 msgstr ""
 
-#: option.c:299
+#: option.c:331
 msgid "Never forward queries to specified domains."
 msgstr ""
 
-#: option.c:300
+#: option.c:332
 msgid "Specify the domain to be assigned in DHCP leases."
 msgstr ""
 
-#: option.c:301
+#: option.c:333
 msgid "Specify default target in an MX record."
 msgstr ""
 
-#: option.c:302
+#: option.c:334
 msgid "Specify time-to-live in seconds for replies from /etc/hosts."
 msgstr ""
 
-#: option.c:303
+#: option.c:335
 msgid "Specify time-to-live in seconds for negative caching."
 msgstr ""
 
-#: option.c:304
+#: option.c:336
 msgid "Specify time-to-live in seconds for maximum TTL to send to clients."
 msgstr ""
 
-#: option.c:305
+#: option.c:337
 #, c-format
 msgid "Change to this user after startup. (defaults to %s)."
 msgstr ""
 
-#: option.c:306
+#: option.c:338
 msgid "Map DHCP vendor class to tag."
 msgstr ""
 
-#: option.c:307
+#: option.c:339
 msgid "Display dnsmasq version and copyright information."
 msgstr ""
 
-#: option.c:308
+#: option.c:340
 msgid "Translate IPv4 addresses from upstream servers."
 msgstr ""
 
-#: option.c:309
+#: option.c:341
 msgid "Specify a SRV record."
 msgstr ""
 
-#: option.c:310
+#: option.c:342
 msgid "Display this message. Use --help dhcp for known DHCP options."
 msgstr ""
 
-#: option.c:311
+#: option.c:343
 #, c-format
 msgid "Specify path of PID file (defaults to %s)."
 msgstr ""
 
-#: option.c:312
+#: option.c:344
 #, c-format
 msgid "Specify maximum number of DHCP leases (defaults to %s)."
 msgstr ""
 
-#: option.c:313
+#: option.c:345
 msgid "Answer DNS queries based on the interface a query was sent to."
 msgstr ""
 
-#: option.c:314
+#: option.c:346
 msgid "Specify TXT DNS record."
 msgstr ""
 
-#: option.c:315
+#: option.c:347
 msgid "Specify PTR DNS record."
 msgstr ""
 
-#: option.c:316
+#: option.c:348
 msgid "Give DNS name to IPv4 address of interface."
 msgstr ""
 
-#: option.c:317
+#: option.c:349
 msgid "Bind only to interfaces in use."
 msgstr ""
 
-#: option.c:318
+#: option.c:350
 #, c-format
 msgid "Read DHCP static host information from %s."
 msgstr ""
 
-#: option.c:319
+#: option.c:351
 msgid "Enable the DBus interface for setting upstream servers, etc."
 msgstr ""
 
-#: option.c:320
+#: option.c:352
 msgid "Do not provide DHCP on this interface, only provide DNS."
 msgstr ""
 
-#: option.c:321
+#: option.c:353
 msgid "Enable dynamic address allocation for bootp."
 msgstr ""
 
-#: option.c:322
+#: option.c:354
 msgid "Map MAC address (with wildcards) to option set."
 msgstr ""
 
-#: option.c:323
+#: option.c:355
 msgid "Treat DHCP requests on aliases as arriving from interface."
 msgstr ""
 
-#: option.c:324
+#: option.c:356
 msgid "Disable ICMP echo address checking in the DHCP server."
 msgstr ""
 
-#: option.c:325
+#: option.c:357
 msgid "Shell script to run on DHCP lease creation and destruction."
 msgstr ""
 
-#: option.c:326
+#: option.c:358
 msgid "Lua script to run on DHCP lease creation and destruction."
 msgstr ""
 
-#: option.c:327
+#: option.c:359
 msgid "Run lease-change scripts as this user."
 msgstr ""
 
-#: option.c:328
+#: option.c:360
 msgid "Read configuration from all the files in this directory."
 msgstr ""
 
-#: option.c:329
+#: option.c:361
 msgid "Log to this syslog facility or file. (defaults to DAEMON)"
 msgstr ""
 
-#: option.c:330
+#: option.c:362
 msgid "Do not use leasefile."
 msgstr ""
 
-#: option.c:331
+#: option.c:363
 #, c-format
 msgid "Maximum number of concurrent DNS queries. (defaults to %s)"
 msgstr ""
 
-#: option.c:332
+#: option.c:364
 #, c-format
 msgid "Clear DNS cache when reloading %s."
 msgstr ""
 
-#: option.c:333
+#: option.c:365
 msgid "Ignore hostnames provided by DHCP clients."
 msgstr ""
 
-#: option.c:334
+#: option.c:366
 msgid "Do NOT reuse filename and server fields for extra DHCP options."
 msgstr ""
 
-#: option.c:335
+#: option.c:367
 msgid "Enable integrated read-only TFTP server."
 msgstr ""
 
-#: option.c:336
+#: option.c:368
 msgid "Export files by TFTP only from the specified subtree."
 msgstr ""
 
-#: option.c:337
+#: option.c:369
 msgid "Add client IP address to tftp-root."
 msgstr ""
 
-#: option.c:338
+#: option.c:370
 msgid "Allow access only to files owned by the user running dnsmasq."
 msgstr ""
 
-#: option.c:339
+#: option.c:371
 #, c-format
 msgid "Maximum number of conncurrent TFTP transfers (defaults to %s)."
 msgstr ""
 
-#: option.c:340
+#: option.c:372
 msgid "Disable the TFTP blocksize extension."
 msgstr ""
 
-#: option.c:341
+#: option.c:373
+msgid "Convert TFTP filenames to lowercase"
+msgstr ""
+
+#: option.c:374
 msgid "Ephemeral port range for use by TFTP transfers."
 msgstr ""
 
-#: option.c:342
+#: option.c:375
 msgid "Extra logging for DHCP."
 msgstr ""
 
-#: option.c:343
+#: option.c:376
 msgid "Enable async. logging; optionally set queue length."
 msgstr ""
 
-#: option.c:344
+#: option.c:377
 msgid "Stop DNS rebinding. Filter private IP ranges when resolving."
 msgstr ""
 
-#: option.c:345
+#: option.c:378
 msgid "Allow rebinding of 127.0.0.0/8, for RBL servers."
 msgstr ""
 
-#: option.c:346
+#: option.c:379
 msgid "Inhibit DNS-rebind protection on this domain."
 msgstr ""
 
-#: option.c:347
+#: option.c:380
 msgid "Always perform DNS queries to all servers."
 msgstr ""
 
-#: option.c:348
+#: option.c:381
 msgid "Set tag if client includes matching option in request."
 msgstr ""
 
-#: option.c:349
+#: option.c:382
 msgid "Use alternative ports for DHCP."
 msgstr ""
 
-#: option.c:350
+#: option.c:383
 msgid "Specify NAPTR DNS record."
 msgstr ""
 
-#: option.c:351
+#: option.c:384
 msgid "Specify lowest port available for DNS query transmission."
 msgstr ""
 
-#: option.c:352
+#: option.c:385
 msgid "Use only fully qualified domain names for DHCP clients."
 msgstr ""
 
-#: option.c:353
+#: option.c:386
 msgid "Generate hostnames based on MAC address for nameless clients."
 msgstr ""
 
-#: option.c:354
+#: option.c:387
 msgid "Use these DHCP relays as full proxies."
 msgstr ""
 
-#: option.c:355
+#: option.c:388
 msgid "Specify alias name for LOCAL DNS name."
 msgstr ""
 
-#: option.c:356
+#: option.c:389
 msgid "Prompt to send to PXE clients."
 msgstr ""
 
-#: option.c:357
+#: option.c:390
 msgid "Boot service for PXE menu."
 msgstr ""
 
-#: option.c:358
+#: option.c:391
 msgid "Check configuration syntax."
 msgstr ""
 
-#: option.c:359
+#: option.c:392
 msgid "Add requestor's MAC address to forwarded DNS queries."
 msgstr ""
 
-#: option.c:360
+#: option.c:393
 msgid "Proxy DNSSEC validation results from upstream nameservers."
 msgstr ""
 
-#: option.c:361
+#: option.c:394
 msgid "Attempt to allocate sequential IP addresses to DHCP clients."
 msgstr ""
 
-#: option.c:362
+#: option.c:395
 msgid "Copy connection-track mark from queries to upstream connections."
 msgstr ""
 
-#: option.c:363
+#: option.c:396
 msgid "Allow DHCP clients to do their own DDNS updates."
 msgstr ""
 
-#: option.c:364
+#: option.c:397
 msgid "Send router-advertisements for interfaces doing DHCPv6"
 msgstr ""
 
-#: option.c:782
+#: option.c:398
+msgid "Specify DUID_EN-type DHCPv6 server DUID"
+msgstr ""
+
+#: option.c:399
+msgid "Specify host (A/AAAA and PTR) records"
+msgstr ""
+
+#: option.c:400
+msgid "Specify arbitrary DNS resource record"
+msgstr ""
+
+#: option.c:401
+msgid "Bind to interfaces in use - check for new interfaces"
+msgstr ""
+
+#: option.c:402
+msgid "Export local names to global DNS"
+msgstr ""
+
+#: option.c:403
+msgid "Domain to export to global DNS"
+msgstr ""
+
+#: option.c:404
+msgid "Set TTL for authoritative replies"
+msgstr ""
+
+#: option.c:405
+msgid "Set authoritive zone information"
+msgstr ""
+
+#: option.c:406
+msgid "Secondary authoritative nameservers for forward domains"
+msgstr ""
+
+#: option.c:407
+msgid "Peers which are allowed to do zone transfer"
+msgstr ""
+
+#: option.c:408
+msgid "Specify ipsets to which matching domains should be added"
+msgstr ""
+
+#: option.c:410
+msgid "Specify DHCPv6 prefix class"
+msgstr ""
+
+#: option.c:596
 #, c-format
 msgid ""
 "Usage: dnsmasq [options]\n"
 "\n"
 msgstr ""
 
-#: option.c:784
+#: option.c:598
 #, c-format
 msgid "Use short options only on the command line.\n"
 msgstr ""
 
-#: option.c:786
+#: option.c:600
 #, c-format
 msgid "Valid options are:\n"
 msgstr ""
 
-#: option.c:827
-#, c-format
-msgid "Known DHCP options:\n"
+#: option.c:650 option.c:654
+msgid "bad port"
 msgstr ""
 
-#: option.c:838
-#, c-format
-msgid "Known DHCPv6 options:\n"
+#: option.c:681 option.c:713
+msgid "interface binding not supported"
 msgstr ""
 
-#: option.c:973
+#: option.c:690 option.c:3179
+msgid "bad interface name"
+msgstr ""
+
+#: option.c:720
+msgid "bad address"
+msgstr ""
+
+#: option.c:847
 msgid "unsupported encapsulation for IPv6 option"
 msgstr ""
 
-#: option.c:1001
+#: option.c:861
 msgid "bad dhcp-option"
 msgstr ""
 
-#: option.c:1068
+#: option.c:929
 msgid "bad IP address"
 msgstr ""
 
-#: option.c:1071 option.c:1177 option.c:2511
+#: option.c:932 option.c:1070 option.c:2549
 msgid "bad IPv6 address"
 msgstr ""
 
-#: option.c:1205
+#: option.c:1097 option.c:1191
 msgid "bad domain in dhcp-option"
 msgstr ""
 
-#: option.c:1329
+#: option.c:1229
 msgid "dhcp-option too long"
 msgstr ""
 
-#: option.c:1338
+#: option.c:1236
 msgid "illegal dhcp-match"
 msgstr ""
 
-#: option.c:1392
+#: option.c:1298
 msgid "illegal repeated flag"
 msgstr ""
 
-#: option.c:1400
+#: option.c:1306
 msgid "illegal repeated keyword"
 msgstr ""
 
-#: option.c:1452 option.c:3536
+#: option.c:1358 option.c:3702
 #, c-format
 msgid "cannot access directory %s: %s"
 msgstr ""
 
-#: option.c:1483 tftp.c:464
+#: option.c:1390 tftp.c:474
 #, c-format
 msgid "cannot access %s: %s"
 msgstr ""
 
-#: option.c:1512
+#: option.c:1426
 msgid "setting log facility is not possible under Android"
 msgstr ""
 
-#: option.c:1521
+#: option.c:1435
 msgid "bad log facility"
 msgstr ""
 
-#: option.c:1570
+#: option.c:1484
 msgid "bad MX preference"
 msgstr ""
 
-#: option.c:1575
+#: option.c:1489
 msgid "bad MX name"
 msgstr ""
 
-#: option.c:1589
+#: option.c:1503
 msgid "bad MX target"
 msgstr ""
 
-#: option.c:1601
+#: option.c:1515
 msgid "cannot run scripts under uClinux"
 msgstr ""
 
-#: option.c:1603
+#: option.c:1517
 msgid "recompile with HAVE_SCRIPT defined to enable lease-change scripts"
 msgstr ""
 
-#: option.c:1607
+#: option.c:1521
 msgid "recompile with HAVE_LUASCRIPT defined to enable Lua scripts"
 msgstr ""
 
-#: option.c:1988 option.c:1992
-msgid "bad port"
+#: option.c:1631
+msgid "bad prefix"
 msgstr ""
 
-#: option.c:2015 option.c:2046
-msgid "interface binding not supported"
+#: option.c:2043
+msgid "recompile with HAVE_IPSET defined to enable ipset directives"
 msgstr ""
 
-#: option.c:2026 option.c:3088
-msgid "bad interface name"
-msgstr ""
-
-#: option.c:2191
+#: option.c:2223
 msgid "bad port range"
 msgstr ""
 
-#: option.c:2208
+#: option.c:2239
 msgid "bad bridge-interface"
 msgstr ""
 
-#: option.c:2242
-msgid "bad dhcp-range"
-msgstr ""
-
-#: option.c:2272
+#: option.c:2297
 msgid "only one tag allowed"
 msgstr ""
 
-#: option.c:2323
+#: option.c:2317 option.c:2329 option.c:2461
+msgid "bad dhcp-range"
+msgstr ""
+
+#: option.c:2344
 msgid "inconsistent DHCP range"
 msgstr ""
 
-#: option.c:2374
+#: option.c:2402
+msgid "prefix must be exactly 64 for RA subnets"
+msgstr ""
+
+#: option.c:2404
+msgid "prefix must be exactly 64 for subnet constructors"
+msgstr ""
+
+#: option.c:2407
 msgid "prefix must be at least 64"
 msgstr ""
 
-#: option.c:2378
+#: option.c:2412
 msgid "inconsistent DHCPv6 range"
 msgstr ""
 
-#: option.c:2481 option.c:2521
+#: option.c:2519 option.c:2567
 msgid "bad hex constant"
 msgstr ""
 
-#: option.c:2503
+#: option.c:2541
 msgid "cannot match tags in --dhcp-host"
 msgstr ""
 
-#: option.c:2583
+#: option.c:2589
+#, c-format
+msgid "duplicate dhcp-host IP address %s"
+msgstr ""
+
+#: option.c:2645
 msgid "bad DHCP host name"
 msgstr ""
 
-#: option.c:2664
+#: option.c:2727
 msgid "bad tag-if"
 msgstr ""
 
-#: option.c:2973 option.c:3258
+#: option.c:3051 option.c:3379
 msgid "invalid port number"
 msgstr ""
 
-#: option.c:3035
+#: option.c:3113
 msgid "bad dhcp-proxy address"
 msgstr ""
 
-#: option.c:3075
+#: option.c:3124
+msgid "bad DUID"
+msgstr ""
+
+#: option.c:3166
 msgid "invalid alias range"
 msgstr ""
 
-#: option.c:3113
+#: option.c:3205
 msgid "bad CNAME"
 msgstr ""
 
-#: option.c:3118
+#: option.c:3210
 msgid "duplicate CNAME"
 msgstr ""
 
-#: option.c:3138
+#: option.c:3230
 msgid "bad PTR record"
 msgstr ""
 
-#: option.c:3169
+#: option.c:3261
 msgid "bad NAPTR record"
 msgstr ""
 
-#: option.c:3201
+#: option.c:3295
+msgid "bad RR record"
+msgstr ""
+
+#: option.c:3324
 msgid "bad TXT record"
 msgstr ""
 
-#: option.c:3244
+#: option.c:3365
 msgid "bad SRV record"
 msgstr ""
 
-#: option.c:3251
+#: option.c:3372
 msgid "bad SRV target"
 msgstr ""
 
-#: option.c:3265
+#: option.c:3386
 msgid "invalid priority"
 msgstr ""
 
-#: option.c:3272
+#: option.c:3393
 msgid "invalid weight"
 msgstr ""
 
-#: option.c:3291
+#: option.c:3417
+msgid "Bad host-record"
+msgstr ""
+
+#: option.c:3434
+msgid "Bad name in host-record"
+msgstr ""
+
+#: option.c:3464
 msgid "unsupported option (check that dnsmasq was compiled with DHCP/TFTP/DBus support)"
 msgstr ""
 
-#: option.c:3355
+#: option.c:3522
 msgid "missing \""
 msgstr ""
 
-#: option.c:3414
+#: option.c:3579
 msgid "bad option"
 msgstr ""
 
-#: option.c:3416
+#: option.c:3581
 msgid "extraneous parameter"
 msgstr ""
 
-#: option.c:3418
+#: option.c:3583
 msgid "missing parameter"
 msgstr ""
 
-#: option.c:3422
+#: option.c:3590
 msgid "error"
 msgstr ""
 
-#: option.c:3427
+#: option.c:3592
 #, c-format
-msgid "%s at line %d of %%s"
+msgid " at line %d of %s"
 msgstr ""
 
-#: option.c:3491 tftp.c:627
+#: option.c:3656 tftp.c:648
 #, c-format
 msgid "cannot read %s: %s"
 msgstr ""
 
-#: option.c:3657 option.c:3693
+#: option.c:3823 option.c:3859
 #, c-format
 msgid "read %s"
 msgstr ""
 
-#: option.c:3745
+#: option.c:3915
 msgid "junk found in command line"
 msgstr ""
 
-#: option.c:3780
+#: option.c:3950
 #, c-format
 msgid "Dnsmasq version %s  %s\n"
 msgstr ""
 
-#: option.c:3781
+#: option.c:3951
 #, c-format
 msgid ""
 "Compile time options: %s\n"
 "\n"
 msgstr ""
 
-#: option.c:3782
+#: option.c:3952
 #, c-format
 msgid "This software comes with ABSOLUTELY NO WARRANTY.\n"
 msgstr ""
 
-#: option.c:3783
+#: option.c:3953
 #, c-format
 msgid "Dnsmasq is free software, and you are welcome to redistribute it\n"
 msgstr ""
 
-#: option.c:3784
+#: option.c:3954
 #, c-format
 msgid "under the terms of the GNU General Public License, version 2 or 3.\n"
 msgstr ""
 
-#: option.c:3795
+#: option.c:3965
 msgid "try --help"
 msgstr ""
 
-#: option.c:3797
+#: option.c:3967
 msgid "try -w"
 msgstr ""
 
-#: option.c:3800
+#: option.c:3969
 #, c-format
 msgid "bad command line options: %s"
 msgstr ""
 
-#: option.c:3841
+#: option.c:4018
 #, c-format
 msgid "cannot get host-name: %s"
 msgstr ""
 
-#: option.c:3869
+#: option.c:4046
 msgid "only one resolv.conf file allowed in no-poll mode."
 msgstr ""
 
-#: option.c:3879
+#: option.c:4056
 msgid "must have exactly one resolv.conf to read domain from."
 msgstr ""
 
-#: option.c:3882 network.c:822 dhcp.c:804
+#: option.c:4059 network.c:1039 dhcp.c:794
 #, c-format
 msgid "failed to read %s: %s"
 msgstr ""
 
-#: option.c:3899
+#: option.c:4076
 #, c-format
 msgid "no search directive found in %s"
 msgstr ""
 
-#: option.c:3920
+#: option.c:4097
 msgid "there must be a default domain when --dhcp-fqdn is set"
 msgstr ""
 
-#: option.c:3924
+#: option.c:4101
 msgid "syntax check OK"
 msgstr ""
 
-#: forward.c:113
+#: forward.c:107
 #, c-format
 msgid "failed to send packet: %s"
 msgstr ""
 
-#: forward.c:474
+#: forward.c:490
 #, c-format
 msgid "nameserver %s refused to do a recursive query"
 msgstr ""
 
-#: forward.c:502
+#: forward.c:518
 #, c-format
 msgid "possible DNS-rebind attack detected: %s"
 msgstr ""
 
-#: network.c:355
+#: network.c:414
 #, c-format
 msgid "failed to create listening socket for %s: %s"
 msgstr ""
 
-#: network.c:720
+#: network.c:743
+#, c-format
+msgid "interface %s failed to join DHCPv6 multicast group: %s"
+msgstr ""
+
+#: network.c:937
 #, c-format
 msgid "failed to bind server socket for %s: %s"
 msgstr ""
 
-#: network.c:757
+#: network.c:974
 #, c-format
 msgid "ignoring nameserver %s - local interface"
 msgstr ""
 
-#: network.c:768
+#: network.c:985
 #, c-format
 msgid "ignoring nameserver %s - cannot make/bind socket: %s"
 msgstr ""
 
-#: network.c:785
+#: network.c:1002
 msgid "unqualified"
 msgstr ""
 
-#: network.c:785
+#: network.c:1002
 msgid "names"
 msgstr ""
 
-#: network.c:787
+#: network.c:1004
 msgid "default"
 msgstr ""
 
-#: network.c:789
+#: network.c:1006
 msgid "domain"
 msgstr ""
 
-#: network.c:792
+#: network.c:1009
 #, c-format
 msgid "using local addresses only for %s %s"
 msgstr ""
 
-#: network.c:794
+#: network.c:1011
 #, c-format
 msgid "using standard nameservers for %s %s"
 msgstr ""
 
-#: network.c:796
+#: network.c:1013
 #, c-format
 msgid "using nameserver %s#%d for %s %s"
 msgstr ""
 
-#: network.c:799
+#: network.c:1016
 #, c-format
 msgid "using nameserver %s#%d(via %s)"
 msgstr ""
 
-#: network.c:801
+#: network.c:1018
 #, c-format
 msgid "using nameserver %s#%d"
 msgstr ""
 
-#: dnsmasq.c:123
+#: dnsmasq.c:131
 msgid "TFTP server not available: set HAVE_TFTP in src/config.h"
 msgstr ""
 
-#: dnsmasq.c:128
+#: dnsmasq.c:136
 msgid "Cannot use --conntrack AND --query-port"
 msgstr ""
 
-#: dnsmasq.c:131
+#: dnsmasq.c:139
 msgid "Conntrack support not available: set HAVE_CONNTRACK in src/config.h"
 msgstr ""
 
-#: dnsmasq.c:136
+#: dnsmasq.c:144
 msgid "asychronous logging is not available under Solaris"
 msgstr ""
 
-#: dnsmasq.c:141
+#: dnsmasq.c:149
 msgid "asychronous logging is not available under Android"
 msgstr ""
 
-#: dnsmasq.c:190
+#: dnsmasq.c:154
+msgid "authoritative DNS not available: set HAVE_AUTH in src/config.h"
+msgstr ""
+
+#: dnsmasq.c:164
+msgid "zone serial must be configured in --auth-soa"
+msgstr ""
+
+#: dnsmasq.c:186
+msgid "dhcp-range constructor not available on this platform"
+msgstr ""
+
+#: dnsmasq.c:225
+msgid "cannot set --bind-interfaces and --bind-dynamic"
+msgstr ""
+
+#: dnsmasq.c:229
 #, c-format
 msgid "failed to find list of interfaces: %s"
 msgstr ""
 
-#: dnsmasq.c:198
+#: dnsmasq.c:238
 #, c-format
 msgid "unknown interface %s"
 msgstr ""
 
-#: dnsmasq.c:204
-#, c-format
-msgid "no interface with address %s"
-msgstr ""
-
-#: dnsmasq.c:220 dnsmasq.c:770
+#: dnsmasq.c:274 dnsmasq.c:860
 #, c-format
 msgid "DBus error: %s"
 msgstr ""
 
-#: dnsmasq.c:223
+#: dnsmasq.c:277
 msgid "DBus not available: set HAVE_DBUS in src/config.h"
 msgstr ""
 
-#: dnsmasq.c:251
+#: dnsmasq.c:305
 #, c-format
 msgid "unknown user or group: %s"
 msgstr ""
 
-#: dnsmasq.c:306
+#: dnsmasq.c:360
 #, c-format
 msgid "cannot chdir to filesystem root: %s"
 msgstr ""
 
-#: dnsmasq.c:481
+#: dnsmasq.c:597
 #, c-format
 msgid "started, version %s DNS disabled"
 msgstr ""
 
-#: dnsmasq.c:483
+#: dnsmasq.c:599
 #, c-format
 msgid "started, version %s cachesize %d"
 msgstr ""
 
-#: dnsmasq.c:485
+#: dnsmasq.c:601
 #, c-format
 msgid "started, version %s cache disabled"
 msgstr ""
 
-#: dnsmasq.c:487
+#: dnsmasq.c:603
 #, c-format
 msgid "compile time options: %s"
 msgstr ""
 
-#: dnsmasq.c:493
+#: dnsmasq.c:609
 msgid "DBus support enabled: connected to system bus"
 msgstr ""
 
-#: dnsmasq.c:495
+#: dnsmasq.c:611
 msgid "DBus support enabled: bus connection pending"
 msgstr ""
 
-#: dnsmasq.c:500
-#, c-format
-msgid "warning: failed to change owner of %s: %s"
-msgstr ""
-
-#: dnsmasq.c:504
-msgid "setting --bind-interfaces option because of OS limitations"
-msgstr ""
-
-#: dnsmasq.c:509
-#, c-format
-msgid "warning: interface %s does not currently exist"
-msgstr ""
-
-#: dnsmasq.c:514
-msgid "warning: ignoring resolv-file flag because no-resolv is set"
-msgstr ""
-
-#: dnsmasq.c:517
-msgid "warning: no upstream servers configured"
-msgstr ""
-
-#: dnsmasq.c:521
-#, c-format
-msgid "asynchronous logging enabled, queue limit is %d messages"
-msgstr ""
-
-#: dnsmasq.c:524
-msgid "IPv6 router advertisement enabled"
-msgstr ""
-
-#: dnsmasq.c:554
-#, c-format
-msgid "DHCP, static leases only on %.0s%s, lease time %s"
-msgstr ""
-
-#: dnsmasq.c:556
-#, c-format
-msgid "router advertisement only on %.0s%s, lifetime %s"
-msgstr ""
-
-#: dnsmasq.c:558
-#, c-format
-msgid "DHCP, proxy on subnet %.0s%s%.0s"
-msgstr ""
-
-#: dnsmasq.c:559
-#, c-format
-msgid "DHCP, IP range %s -- %s, lease time %s"
-msgstr ""
-
-#: dnsmasq.c:588
-msgid "root is "
-msgstr ""
-
-#: dnsmasq.c:588
-msgid "enabled"
-msgstr ""
-
-#: dnsmasq.c:590
-msgid "secure mode"
-msgstr ""
-
 #: dnsmasq.c:616
 #, c-format
+msgid "warning: failed to change owner of %s: %s"
+msgstr ""
+
+#: dnsmasq.c:620
+msgid "setting --bind-interfaces option because of OS limitations"
+msgstr ""
+
+#: dnsmasq.c:625
+#, c-format
+msgid "warning: interface %s does not currently exist"
+msgstr ""
+
+#: dnsmasq.c:630
+msgid "warning: ignoring resolv-file flag because no-resolv is set"
+msgstr ""
+
+#: dnsmasq.c:633
+msgid "warning: no upstream servers configured"
+msgstr ""
+
+#: dnsmasq.c:637
+#, c-format
+msgid "asynchronous logging enabled, queue limit is %d messages"
+msgstr ""
+
+#: dnsmasq.c:652
+msgid "IPv6 router advertisement enabled"
+msgstr ""
+
+#: dnsmasq.c:669
+msgid "root is "
+msgstr ""
+
+#: dnsmasq.c:669
+msgid "enabled"
+msgstr ""
+
+#: dnsmasq.c:671
+msgid "secure mode"
+msgstr ""
+
+#: dnsmasq.c:697
+#, c-format
 msgid "restricting maximum simultaneous TFTP transfers to %d"
 msgstr ""
 
-#: dnsmasq.c:772
+#: dnsmasq.c:862
 msgid "connected to system DBus"
 msgstr ""
 
-#: dnsmasq.c:912
+#: dnsmasq.c:1007
 #, c-format
 msgid "cannot fork into background: %s"
 msgstr ""
 
-#: dnsmasq.c:915
+#: dnsmasq.c:1010
 #, c-format
 msgid "failed to create helper: %s"
 msgstr ""
 
-#: dnsmasq.c:918
+#: dnsmasq.c:1013
 #, c-format
 msgid "setting capabilities failed: %s"
 msgstr ""
 
-#: dnsmasq.c:921
+#: dnsmasq.c:1016
 #, c-format
 msgid "failed to change user-id to %s: %s"
 msgstr ""
 
-#: dnsmasq.c:924
+#: dnsmasq.c:1019
 #, c-format
 msgid "failed to change group-id to %s: %s"
 msgstr ""
 
-#: dnsmasq.c:927
+#: dnsmasq.c:1022
 #, c-format
 msgid "failed to open pidfile %s: %s"
 msgstr ""
 
-#: dnsmasq.c:930
+#: dnsmasq.c:1025
 #, c-format
 msgid "cannot open log %s: %s"
 msgstr ""
 
-#: dnsmasq.c:933
+#: dnsmasq.c:1028
 #, c-format
 msgid "failed to load Lua script: %s"
 msgstr ""
 
-#: dnsmasq.c:1002
+#: dnsmasq.c:1031
+#, c-format
+msgid "TFTP directory %s inaccessible: %s"
+msgstr ""
+
+#: dnsmasq.c:1095
 #, c-format
 msgid "script process killed by signal %d"
 msgstr ""
 
-#: dnsmasq.c:1006
+#: dnsmasq.c:1099
 #, c-format
 msgid "script process exited with status %d"
 msgstr ""
 
-#: dnsmasq.c:1010
+#: dnsmasq.c:1103
 #, c-format
 msgid "failed to execute %s: %s"
 msgstr ""
 
-#: dnsmasq.c:1055
+#: dnsmasq.c:1148
 msgid "exiting on receipt of SIGTERM"
 msgstr ""
 
-#: dnsmasq.c:1083
+#: dnsmasq.c:1176
 #, c-format
 msgid "failed to access %s: %s"
 msgstr ""
 
-#: dnsmasq.c:1113
+#: dnsmasq.c:1206
 #, c-format
 msgid "reading %s"
 msgstr ""
 
-#: dnsmasq.c:1124
+#: dnsmasq.c:1217
 #, c-format
 msgid "no servers found in %s, will retry"
 msgstr ""
@@ -1215,27 +1300,27 @@
 msgid "cannot create ICMP raw socket: %s."
 msgstr ""
 
-#: dhcp.c:227
+#: dhcp.c:225
 #, c-format
 msgid "unknown interface %s in bridge-interface"
 msgstr ""
 
-#: dhcp.c:252
+#: dhcp.c:250
 #, c-format
 msgid "DHCP packet received on %s which has no address"
 msgstr ""
 
-#: dhcp.c:467
+#: dhcp.c:457
 #, c-format
 msgid "DHCP range %s -- %s is not consistent with netmask %s"
 msgstr ""
 
-#: dhcp.c:842
+#: dhcp.c:832
 #, c-format
 msgid "bad line at %s line %d"
 msgstr ""
 
-#: dhcp.c:885
+#: dhcp.c:875
 #, c-format
 msgid "ignoring %s line %d, duplicate name or IP address"
 msgstr ""
@@ -1245,26 +1330,26 @@
 msgid "cannot open or create lease file %s: %s"
 msgstr ""
 
-#: lease.c:132
+#: lease.c:133
 msgid "too many stored leases"
 msgstr ""
 
-#: lease.c:163
+#: lease.c:164
 #, c-format
 msgid "cannot run lease-init script %s: %s"
 msgstr ""
 
-#: lease.c:169
+#: lease.c:170
 #, c-format
 msgid "lease-init script returned exit code %s"
 msgstr ""
 
-#: lease.c:334
+#: lease.c:339
 #, c-format
 msgid "failed to write %s: %s (retry in %us)"
 msgstr ""
 
-#: lease.c:693
+#: lease.c:843
 #, c-format
 msgid "Ignoring domain %s for DHCP host name %s"
 msgstr ""
@@ -1287,7 +1372,7 @@
 msgid "%u available DHCP subnet: %s/%s"
 msgstr ""
 
-#: rfc2131.c:353 rfc3315.c:209
+#: rfc2131.c:353 rfc3315.c:272
 #, c-format
 msgid "%u available DHCP range: %s -- %s"
 msgstr ""
@@ -1296,19 +1381,20 @@
 msgid "disabled"
 msgstr ""
 
-#: rfc2131.c:423 rfc2131.c:941 rfc2131.c:1341
+#: 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:1179
+#: rfc2131.c:438 rfc2131.c:1191 rfc3315.c:814
 msgid "address in use"
 msgstr ""
 
-#: rfc2131.c:452 rfc2131.c:995
+#: rfc2131.c:452 rfc2131.c:1007
 msgid "no address available"
 msgstr ""
 
-#: rfc2131.c:459 rfc2131.c:1142
+#: rfc2131.c:459 rfc2131.c:1154
 msgid "wrong network"
 msgstr ""
 
@@ -1316,181 +1402,181 @@
 msgid "no address configured"
 msgstr ""
 
-#: rfc2131.c:480 rfc2131.c:1192
+#: rfc2131.c:480 rfc2131.c:1204
 msgid "no leases left"
 msgstr ""
 
-#: rfc2131.c:564 rfc3315.c:362
+#: rfc2131.c:576 rfc3315.c:428
 #, c-format
 msgid "%u client provides name: %s"
 msgstr ""
 
-#: rfc2131.c:719
+#: rfc2131.c:731
 #, c-format
 msgid "%u vendor class: %s"
 msgstr ""
 
-#: rfc2131.c:721
+#: rfc2131.c:733
 #, c-format
 msgid "%u user class: %s"
 msgstr ""
 
-#: rfc2131.c:780
+#: rfc2131.c:792
 msgid "PXE BIS not supported"
 msgstr ""
 
-#: rfc2131.c:911 rfc3315.c:1098
+#: rfc2131.c:923 rfc3315.c:1111
 #, c-format
 msgid "disabling DHCP static address %s for %s"
 msgstr ""
 
-#: rfc2131.c:932
+#: rfc2131.c:944
 msgid "unknown lease"
 msgstr ""
 
-#: rfc2131.c:964 rfc3315.c:556
+#: rfc2131.c:976
 #, c-format
 msgid "not using configured address %s because it is leased to %s"
 msgstr ""
 
-#: rfc2131.c:974
+#: rfc2131.c:986
 #, c-format
 msgid "not using configured address %s because it is in use by the server or relay"
 msgstr ""
 
-#: rfc2131.c:977 rfc3315.c:560
+#: rfc2131.c:989
 #, c-format
 msgid "not using configured address %s because it was previously declined"
 msgstr ""
 
-#: rfc2131.c:993 rfc2131.c:1185
+#: rfc2131.c:1005 rfc2131.c:1197
 msgid "no unique-id"
 msgstr ""
 
-#: rfc2131.c:1080
+#: rfc2131.c:1092
 msgid "wrong server-ID"
 msgstr ""
 
-#: rfc2131.c:1099
+#: rfc2131.c:1111
 msgid "wrong address"
 msgstr ""
 
-#: rfc2131.c:1117
+#: rfc2131.c:1129 rfc3315.c:911
 msgid "lease not found"
 msgstr ""
 
-#: rfc2131.c:1150
+#: rfc2131.c:1162
 msgid "address not available"
 msgstr ""
 
-#: rfc2131.c:1161
+#: rfc2131.c:1173
 msgid "static lease available"
 msgstr ""
 
-#: rfc2131.c:1165
+#: rfc2131.c:1177
 msgid "address reserved"
 msgstr ""
 
-#: rfc2131.c:1173
+#: rfc2131.c:1185
 #, c-format
 msgid "abandoning lease to %s of %s"
 msgstr ""
 
-#: rfc2131.c:1658
+#: rfc2131.c:1679
 #, c-format
 msgid "%u bootfile name: %s"
 msgstr ""
 
-#: rfc2131.c:1667
+#: rfc2131.c:1688
 #, c-format
 msgid "%u server name: %s"
 msgstr ""
 
-#: rfc2131.c:1675
+#: rfc2131.c:1696
 #, c-format
 msgid "%u next server: %s"
 msgstr ""
 
-#: rfc2131.c:1678
+#: rfc2131.c:1699
 #, c-format
 msgid "%u broadcast response"
 msgstr ""
 
-#: rfc2131.c:1741
+#: rfc2131.c:1762
 #, c-format
 msgid "cannot send DHCP/BOOTP option %d: no space left in packet"
 msgstr ""
 
-#: rfc2131.c:1981
+#: rfc2131.c:2002
 msgid "PXE menu too large"
 msgstr ""
 
-#: rfc2131.c:2117 rfc3315.c:1294
+#: rfc2131.c:2139 rfc3315.c:1332
 #, c-format
 msgid "%u requested options: %s"
 msgstr ""
 
-#: rfc2131.c:2392
+#: rfc2131.c:2415
 #, c-format
 msgid "cannot send RFC3925 option: too many options for enterprise number %d"
 msgstr ""
 
-#: netlink.c:71
+#: netlink.c:78
 #, c-format
 msgid "cannot create netlink socket: %s"
 msgstr ""
 
-#: netlink.c:323
+#: netlink.c:354
 #, c-format
 msgid "netlink returns error: %s"
 msgstr ""
 
-#: dbus.c:150
+#: dbus.c:259
 msgid "attempt to set an IPv6 server address via DBus - no IPv6 support"
 msgstr ""
 
-#: dbus.c:286
+#: dbus.c:308 dbus.c:504
 msgid "setting upstream servers from DBus"
 msgstr ""
 
-#: dbus.c:324
+#: dbus.c:561
 msgid "could not register a DBus message handler"
 msgstr ""
 
-#: bpf.c:239
+#: bpf.c:197
 #, c-format
 msgid "cannot create DHCP BPF socket: %s"
 msgstr ""
 
-#: bpf.c:267
+#: bpf.c:225
 #, c-format
 msgid "DHCP request for unsupported hardware type (%d) received on %s"
 msgstr ""
 
-#: helper.c:140
+#: helper.c:145
 msgid "lease() function missing in Lua script"
 msgstr ""
 
-#: tftp.c:285
+#: tftp.c:290
 msgid "unable to get free port for TFTP"
 msgstr ""
 
-#: tftp.c:300
+#: tftp.c:306
 #, c-format
 msgid "unsupported request from %s"
 msgstr ""
 
-#: tftp.c:410
+#: tftp.c:420
 #, c-format
 msgid "file %s not found"
 msgstr ""
 
-#: tftp.c:525
+#: tftp.c:529
 #, c-format
 msgid "error %d %s received from %s"
 msgstr ""
 
-#: tftp.c:557
+#: tftp.c:571
 #, c-format
 msgid "failed sending %s to %s"
 msgstr ""
@@ -1519,67 +1605,176 @@
 msgid "Conntrack connection mark retrieval failed: %s"
 msgstr ""
 
-#: dhcp6.c:46
+#: dhcp6.c:49
 #, c-format
 msgid "cannot create DHCPv6 socket: %s"
 msgstr ""
 
-#: dhcp6.c:57
+#: dhcp6.c:62
+#, c-format
+msgid "failed to set SO_REUSE{ADDR|PORT} on DHCPv6 socket: %s"
+msgstr ""
+
+#: dhcp6.c:74
 #, c-format
 msgid "failed to bind DHCPv6 server socket: %s"
 msgstr ""
 
-#: rfc3315.c:94
+#: rfc3315.c:135
 #, c-format
 msgid "no address range available for DHCPv6 request from relay at %s"
 msgstr ""
 
-#: rfc3315.c:103
+#: rfc3315.c:144
 #, c-format
 msgid "no address range available for DHCPv6 request via %s"
 msgstr ""
 
-#: rfc3315.c:206
+#: rfc3315.c:269
 #, c-format
 msgid "%u available DHCPv6 subnet: %s/%d"
 msgstr ""
 
-#: dhcp-common.c:138
+#: rfc3315.c:350
+#, c-format
+msgid "%u vendor class: %u"
+msgstr ""
+
+#: rfc3315.c:609
+#, c-format
+msgid "unknown prefix-class %d"
+msgstr ""
+
+#: rfc3315.c:741 rfc3315.c:854
+msgid "success"
+msgstr ""
+
+#: rfc3315.c:756 rfc3315.c:758 rfc3315.c:862 rfc3315.c:864
+msgid "no addresses available"
+msgstr ""
+
+#: rfc3315.c:806
+msgid "address unavailable"
+msgstr ""
+
+#: rfc3315.c:841
+msgid "not on link"
+msgstr ""
+
+#: rfc3315.c:915 rfc3315.c:1073 rfc3315.c:1150
+msgid "no binding found"
+msgstr ""
+
+#: rfc3315.c:948
+msgid "deprecated"
+msgstr ""
+
+#: rfc3315.c:951
+msgid "address invalid"
+msgstr ""
+
+#: rfc3315.c:992
+msgid "confirm failed"
+msgstr ""
+
+#: rfc3315.c:1003
+msgid "all addresses still on link"
+msgstr ""
+
+#: rfc3315.c:1082
+msgid "release received"
+msgstr ""
+
+#: dhcp-common.c:145
 #, c-format
 msgid "Ignoring duplicate dhcp-option %d"
 msgstr ""
 
-#: dhcp-common.c:208
+#: dhcp-common.c:215
 #, 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
+#: dhcp-common.c:296
 #, c-format
 msgid "%s has more than one address in hostsfile, using %s for DHCP"
 msgstr ""
 
-#: dhcp-common.c:344
+#: dhcp-common.c:319
 #, c-format
 msgid "duplicate IP address %s (%s) in dhcp-config directive"
 msgstr ""
 
-#: dhcp-common.c:443
+#: dhcp-common.c:367
 #, c-format
-msgid "failed to join DHCPv6 multicast group: %s"
+msgid "failed to set SO_BINDTODEVICE on DHCP socket: %s"
 msgstr ""
 
-#: radv.c:76
+#: dhcp-common.c:489
+#, c-format
+msgid "Known DHCP options:\n"
+msgstr ""
+
+#: dhcp-common.c:500
+#, c-format
+msgid "Known DHCPv6 options:\n"
+msgstr ""
+
+#: dhcp-common.c:693
+msgid ", prefix deprecated"
+msgstr ""
+
+#: dhcp-common.c:696
+#, c-format
+msgid ", lease time "
+msgstr ""
+
+#: dhcp-common.c:727
+#, c-format
+msgid "%s stateless on %s%.0s%.0s%s"
+msgstr ""
+
+#: dhcp-common.c:729
+#, c-format
+msgid "%s, static leases only on %.0s%s%s%.0s"
+msgstr ""
+
+#: dhcp-common.c:731
+#, c-format
+msgid "%s, proxy on subnet %.0s%s%.0s%.0s"
+msgstr ""
+
+#: dhcp-common.c:732
+#, c-format
+msgid "%s, IP range %s -- %s%s%.0s"
+msgstr ""
+
+#: dhcp-common.c:739
+#, c-format
+msgid "DHCPv4-derived IPv6 names on %s%s"
+msgstr ""
+
+#: dhcp-common.c:742
+#, c-format
+msgid "router advertisement on %s%s"
+msgstr ""
+
+#: radv.c:87
 #, c-format
 msgid "cannot create ICMPv6 socket: %s"
 msgstr ""
+
+#: auth.c:402
+#, c-format
+msgid "ignoring zone transfer request from %s"
+msgstr ""
+
+#: ipset.c:71
+#, c-format
+msgid "failed to find kernel version: %s"
+msgstr ""
+
+#: ipset.c:90
+#, c-format
+msgid "failed to create IPset control socket: %s"
+msgstr ""