Merge messages files prior to rc1.
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5631721..e1646d3 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -83,7 +83,7 @@
 msgid "failed to allocate memory"
 msgstr ""
 
-#: util.c:227 option.c:714
+#: util.c:227 option.c:717
 msgid "could not get memory"
 msgstr ""
 
@@ -102,792 +102,801 @@
 msgid "infinite"
 msgstr ""
 
-#: option.c:252
+#: option.c:254
 msgid "Specify local address(es) to listen on."
 msgstr ""
 
-#: option.c:253
+#: option.c:255
 msgid "Return ipaddr for all hosts in specified domains."
 msgstr ""
 
-#: option.c:254
+#: option.c:256
 msgid "Fake reverse lookups for RFC1918 private address ranges."
 msgstr ""
 
-#: option.c:255
+#: option.c:257
 msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)."
 msgstr ""
 
-#: option.c:256
+#: option.c:258
 #, c-format
 msgid "Specify the size of the cache in entries (defaults to %s)."
 msgstr ""
 
-#: option.c:257
+#: option.c:259
 #, c-format
 msgid "Specify configuration file (defaults to %s)."
 msgstr ""
 
-#: option.c:258
+#: option.c:260
 msgid "Do NOT fork into the background: run in debug mode."
 msgstr ""
 
-#: option.c:259
+#: option.c:261
 msgid "Do NOT forward queries with no domain part."
 msgstr ""
 
-#: option.c:260
+#: option.c:262
 msgid "Return self-pointing MX records for local hosts."
 msgstr ""
 
-#: option.c:261
+#: option.c:263
 msgid "Expand simple names in /etc/hosts with domain-suffix."
 msgstr ""
 
-#: option.c:262
+#: option.c:264
 msgid "Don't forward spurious DNS requests from Windows hosts."
 msgstr ""
 
-#: option.c:263
+#: option.c:265
 msgid "Enable DHCP in the range given with lease duration."
 msgstr ""
 
-#: option.c:264
+#: option.c:266
 #, c-format
 msgid "Change to this group after startup (defaults to %s)."
 msgstr ""
 
-#: option.c:265
+#: option.c:267
 msgid "Set address or hostname for a specified machine."
 msgstr ""
 
-#: option.c:266
+#: option.c:268
 msgid "Read DHCP host specs from file."
 msgstr ""
 
-#: option.c:267
+#: option.c:269
 msgid "Read DHCP option specs from file."
 msgstr ""
 
-#: option.c:268
+#: option.c:270
 msgid "Evaluate conditional tag expression."
 msgstr ""
 
-#: option.c:269
+#: option.c:271
 #, c-format
 msgid "Do NOT load %s file."
 msgstr ""
 
-#: option.c:270
+#: option.c:272
 #, c-format
 msgid "Specify a hosts file to be read in addition to %s."
 msgstr ""
 
-#: option.c:271
+#: option.c:273
 msgid "Specify interface(s) to listen on."
 msgstr ""
 
-#: option.c:272
+#: option.c:274
 msgid "Specify interface(s) NOT to listen on."
 msgstr ""
 
-#: option.c:273
+#: option.c:275
 msgid "Map DHCP user class to tag."
 msgstr ""
 
-#: option.c:274
+#: option.c:276
 msgid "Map RFC3046 circuit-id to tag."
 msgstr ""
 
-#: option.c:275
+#: option.c:277
 msgid "Map RFC3046 remote-id to tag."
 msgstr ""
 
-#: option.c:276
+#: option.c:278
 msgid "Map RFC3993 subscriber-id to tag."
 msgstr ""
 
-#: option.c:277
+#: option.c:279
 msgid "Don't do DHCP for hosts with tag set."
 msgstr ""
 
-#: option.c:278
+#: option.c:280
 msgid "Force broadcast replies for hosts with tag set."
 msgstr ""
 
-#: option.c:279
+#: option.c:281
 msgid "Do NOT fork into the background, do NOT run in debug mode."
 msgstr ""
 
-#: option.c:280
+#: option.c:282
 msgid "Assume we are the only DHCP server on the local network."
 msgstr ""
 
-#: option.c:281
+#: option.c:283
 #, c-format
 msgid "Specify where to store DHCP leases (defaults to %s)."
 msgstr ""
 
-#: option.c:282
+#: option.c:284
 msgid "Return MX records for local hosts."
 msgstr ""
 
-#: option.c:283
+#: option.c:285
 msgid "Specify an MX record."
 msgstr ""
 
-#: option.c:284
-msgid "Specify BOOTP options to DHCP server."
-msgstr ""
-
-#: option.c:285
-#, c-format
-msgid "Do NOT poll %s file, reload only on SIGHUP."
-msgstr ""
-
 #: option.c:286
-msgid "Do NOT cache failed search results."
+msgid "Specify BOOTP options to DHCP server."
 msgstr ""
 
 #: option.c:287
 #, c-format
-msgid "Use nameservers strictly in the order given in %s."
+msgid "Do NOT poll %s file, reload only on SIGHUP."
 msgstr ""
 
 #: option.c:288
-msgid "Specify options to be sent to DHCP clients."
+msgid "Do NOT cache failed search results."
 msgstr ""
 
 #: option.c:289
-msgid "DHCP option sent even if the client does not request it."
+#, c-format
+msgid "Use nameservers strictly in the order given in %s."
 msgstr ""
 
 #: option.c:290
-msgid "Specify port to listen for DNS requests on (defaults to 53)."
+msgid "Specify options to be sent to DHCP clients."
 msgstr ""
 
 #: option.c:291
+msgid "DHCP option sent even if the client does not request it."
+msgstr ""
+
+#: option.c:292
+msgid "Specify port to listen for DNS requests on (defaults to 53)."
+msgstr ""
+
+#: option.c:293
 #, c-format
 msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)."
 msgstr ""
 
-#: option.c:292
+#: option.c:294
 msgid "Log DNS queries."
 msgstr ""
 
-#: option.c:293
+#: option.c:295
 msgid "Force the originating port for upstream DNS queries."
 msgstr ""
 
-#: option.c:294
+#: option.c:296
 msgid "Do NOT read resolv.conf."
 msgstr ""
 
-#: option.c:295
+#: option.c:297
 #, c-format
 msgid "Specify path to resolv.conf (defaults to %s)."
 msgstr ""
 
-#: option.c:296
+#: option.c:298
 msgid "Specify address(es) of upstream servers with optional domains."
 msgstr ""
 
-#: option.c:297
+#: option.c:299
 msgid "Never forward queries to specified domains."
 msgstr ""
 
-#: option.c:298
+#: option.c:300
 msgid "Specify the domain to be assigned in DHCP leases."
 msgstr ""
 
-#: option.c:299
+#: option.c:301
 msgid "Specify default target in an MX record."
 msgstr ""
 
-#: option.c:300
+#: option.c:302
 msgid "Specify time-to-live in seconds for replies from /etc/hosts."
 msgstr ""
 
-#: option.c:301
+#: option.c:303
 msgid "Specify time-to-live in seconds for negative caching."
 msgstr ""
 
-#: option.c:302
+#: option.c:304
 msgid "Specify time-to-live in seconds for maximum TTL to send to clients."
 msgstr ""
 
-#: option.c:303
+#: option.c:305
 #, c-format
 msgid "Change to this user after startup. (defaults to %s)."
 msgstr ""
 
-#: option.c:304
+#: option.c:306
 msgid "Map DHCP vendor class to tag."
 msgstr ""
 
-#: option.c:305
+#: option.c:307
 msgid "Display dnsmasq version and copyright information."
 msgstr ""
 
-#: option.c:306
+#: option.c:308
 msgid "Translate IPv4 addresses from upstream servers."
 msgstr ""
 
-#: option.c:307
+#: option.c:309
 msgid "Specify a SRV record."
 msgstr ""
 
-#: option.c:308
+#: option.c:310
 msgid "Display this message. Use --help dhcp for known DHCP options."
 msgstr ""
 
-#: option.c:309
+#: option.c:311
 #, c-format
 msgid "Specify path of PID file (defaults to %s)."
 msgstr ""
 
-#: option.c:310
+#: option.c:312
 #, c-format
 msgid "Specify maximum number of DHCP leases (defaults to %s)."
 msgstr ""
 
-#: option.c:311
+#: option.c:313
 msgid "Answer DNS queries based on the interface a query was sent to."
 msgstr ""
 
-#: option.c:312
+#: option.c:314
 msgid "Specify TXT DNS record."
 msgstr ""
 
-#: option.c:313
+#: option.c:315
 msgid "Specify PTR DNS record."
 msgstr ""
 
-#: option.c:314
+#: option.c:316
 msgid "Give DNS name to IPv4 address of interface."
 msgstr ""
 
-#: option.c:315
+#: option.c:317
 msgid "Bind only to interfaces in use."
 msgstr ""
 
-#: option.c:316
+#: option.c:318
 #, c-format
 msgid "Read DHCP static host information from %s."
 msgstr ""
 
-#: option.c:317
+#: option.c:319
 msgid "Enable the DBus interface for setting upstream servers, etc."
 msgstr ""
 
-#: option.c:318
+#: option.c:320
 msgid "Do not provide DHCP on this interface, only provide DNS."
 msgstr ""
 
-#: option.c:319
+#: option.c:321
 msgid "Enable dynamic address allocation for bootp."
 msgstr ""
 
-#: option.c:320
+#: option.c:322
 msgid "Map MAC address (with wildcards) to option set."
 msgstr ""
 
-#: option.c:321
+#: option.c:323
 msgid "Treat DHCP requests on aliases as arriving from interface."
 msgstr ""
 
-#: option.c:322
+#: option.c:324
 msgid "Disable ICMP echo address checking in the DHCP server."
 msgstr ""
 
-#: option.c:323
+#: option.c:325
 msgid "Shell script to run on DHCP lease creation and destruction."
 msgstr ""
 
-#: option.c:324
+#: option.c:326
 msgid "Lua script to run on DHCP lease creation and destruction."
 msgstr ""
 
-#: option.c:325
+#: option.c:327
 msgid "Run lease-change scripts as this user."
 msgstr ""
 
-#: option.c:326
+#: option.c:328
 msgid "Read configuration from all the files in this directory."
 msgstr ""
 
-#: option.c:327
+#: option.c:329
 msgid "Log to this syslog facility or file. (defaults to DAEMON)"
 msgstr ""
 
-#: option.c:328
+#: option.c:330
 msgid "Do not use leasefile."
 msgstr ""
 
-#: option.c:329
+#: option.c:331
 #, c-format
 msgid "Maximum number of concurrent DNS queries. (defaults to %s)"
 msgstr ""
 
-#: option.c:330
+#: option.c:332
 #, c-format
 msgid "Clear DNS cache when reloading %s."
 msgstr ""
 
-#: option.c:331
+#: option.c:333
 msgid "Ignore hostnames provided by DHCP clients."
 msgstr ""
 
-#: option.c:332
+#: option.c:334
 msgid "Do NOT reuse filename and server fields for extra DHCP options."
 msgstr ""
 
-#: option.c:333
+#: option.c:335
 msgid "Enable integrated read-only TFTP server."
 msgstr ""
 
-#: option.c:334
+#: option.c:336
 msgid "Export files by TFTP only from the specified subtree."
 msgstr ""
 
-#: option.c:335
+#: option.c:337
 msgid "Add client IP address to tftp-root."
 msgstr ""
 
-#: option.c:336
+#: option.c:338
 msgid "Allow access only to files owned by the user running dnsmasq."
 msgstr ""
 
-#: option.c:337
+#: option.c:339
 #, c-format
 msgid "Maximum number of conncurrent TFTP transfers (defaults to %s)."
 msgstr ""
 
-#: option.c:338
+#: option.c:340
 msgid "Disable the TFTP blocksize extension."
 msgstr ""
 
-#: option.c:339
+#: option.c:341
 msgid "Ephemeral port range for use by TFTP transfers."
 msgstr ""
 
-#: option.c:340
+#: option.c:342
 msgid "Extra logging for DHCP."
 msgstr ""
 
-#: option.c:341
+#: option.c:343
 msgid "Enable async. logging; optionally set queue length."
 msgstr ""
 
-#: option.c:342
+#: option.c:344
 msgid "Stop DNS rebinding. Filter private IP ranges when resolving."
 msgstr ""
 
-#: option.c:343
+#: option.c:345
 msgid "Allow rebinding of 127.0.0.0/8, for RBL servers."
 msgstr ""
 
-#: option.c:344
+#: option.c:346
 msgid "Inhibit DNS-rebind protection on this domain."
 msgstr ""
 
-#: option.c:345
+#: option.c:347
 msgid "Always perform DNS queries to all servers."
 msgstr ""
 
-#: option.c:346
+#: option.c:348
 msgid "Set tag if client includes matching option in request."
 msgstr ""
 
-#: option.c:347
+#: option.c:349
 msgid "Use alternative ports for DHCP."
 msgstr ""
 
-#: option.c:348
+#: option.c:350
 msgid "Specify NAPTR DNS record."
 msgstr ""
 
-#: option.c:349
+#: option.c:351
 msgid "Specify lowest port available for DNS query transmission."
 msgstr ""
 
-#: option.c:350
+#: option.c:352
 msgid "Use only fully qualified domain names for DHCP clients."
 msgstr ""
 
-#: option.c:351
+#: option.c:353
 msgid "Generate hostnames based on MAC address for nameless clients."
 msgstr ""
 
-#: option.c:352
+#: option.c:354
 msgid "Use these DHCP relays as full proxies."
 msgstr ""
 
-#: option.c:353
+#: option.c:355
 msgid "Specify alias name for LOCAL DNS name."
 msgstr ""
 
-#: option.c:354
+#: option.c:356
 msgid "Prompt to send to PXE clients."
 msgstr ""
 
-#: option.c:355
+#: option.c:357
 msgid "Boot service for PXE menu."
 msgstr ""
 
-#: option.c:356
+#: option.c:358
 msgid "Check configuration syntax."
 msgstr ""
 
-#: option.c:357
+#: option.c:359
 msgid "Add requestor's MAC address to forwarded DNS queries."
 msgstr ""
 
-#: option.c:358
+#: option.c:360
 msgid "Proxy DNSSEC validation results from upstream nameservers."
 msgstr ""
 
-#: option.c:359
+#: option.c:361
 msgid "Attempt to allocate sequential IP addresses to DHCP clients."
 msgstr ""
 
-#: option.c:360
+#: option.c:362
 msgid "Copy connection-track mark from queries to upstream connections."
 msgstr ""
 
-#: option.c:361
+#: option.c:363
 msgid "Allow DHCP clients to do their own DDNS updates."
 msgstr ""
 
-#: option.c:779
+#: option.c:364
+msgid "Send router-advertisements for interfaces doing DHCPv6"
+msgstr ""
+
+#: option.c:782
 #, c-format
 msgid ""
 "Usage: dnsmasq [options]\n"
 "\n"
 msgstr ""
 
-#: option.c:781
+#: option.c:784
 #, c-format
 msgid "Use short options only on the command line.\n"
 msgstr ""
 
-#: option.c:783
+#: option.c:786
 #, c-format
 msgid "Valid options are:\n"
 msgstr ""
 
-#: option.c:824
+#: option.c:827
 #, c-format
 msgid "Known DHCP options:\n"
 msgstr ""
 
-#: option.c:835
+#: option.c:838
 #, c-format
 msgid "Known DHCPv6 options:\n"
 msgstr ""
 
-#: option.c:970
+#: option.c:973
 msgid "unsupported encapsulation for IPv6 option"
 msgstr ""
 
-#: option.c:998
+#: option.c:1001
 msgid "bad dhcp-option"
 msgstr ""
 
-#: option.c:1065
+#: option.c:1068
 msgid "bad IP address"
 msgstr ""
 
-#: option.c:1068 option.c:1174 option.c:2484
+#: option.c:1071 option.c:1177 option.c:2511
 msgid "bad IPv6 address"
 msgstr ""
 
-#: option.c:1202
+#: option.c:1205
 msgid "bad domain in dhcp-option"
 msgstr ""
 
-#: option.c:1326
+#: option.c:1329
 msgid "dhcp-option too long"
 msgstr ""
 
-#: option.c:1335
+#: option.c:1338
 msgid "illegal dhcp-match"
 msgstr ""
 
-#: option.c:1389
+#: option.c:1392
 msgid "illegal repeated flag"
 msgstr ""
 
-#: option.c:1397
+#: option.c:1400
 msgid "illegal repeated keyword"
 msgstr ""
 
-#: option.c:1449 option.c:3509
+#: option.c:1452 option.c:3536
 #, c-format
 msgid "cannot access directory %s: %s"
 msgstr ""
 
-#: option.c:1480 tftp.c:464
+#: option.c:1483 tftp.c:464
 #, c-format
 msgid "cannot access %s: %s"
 msgstr ""
 
-#: option.c:1509
+#: option.c:1512
 msgid "setting log facility is not possible under Android"
 msgstr ""
 
-#: option.c:1518
+#: option.c:1521
 msgid "bad log facility"
 msgstr ""
 
-#: option.c:1567
+#: option.c:1570
 msgid "bad MX preference"
 msgstr ""
 
-#: option.c:1572
+#: option.c:1575
 msgid "bad MX name"
 msgstr ""
 
-#: option.c:1586
+#: option.c:1589
 msgid "bad MX target"
 msgstr ""
 
-#: option.c:1598
+#: option.c:1601
 msgid "cannot run scripts under uClinux"
 msgstr ""
 
-#: option.c:1600
+#: option.c:1603
 msgid "recompile with HAVE_SCRIPT defined to enable lease-change scripts"
 msgstr ""
 
-#: option.c:1604
+#: option.c:1607
 msgid "recompile with HAVE_LUASCRIPT defined to enable Lua scripts"
 msgstr ""
 
-#: option.c:1986 option.c:1990
+#: option.c:1988 option.c:1992
 msgid "bad port"
 msgstr ""
 
-#: option.c:2013 option.c:2044
+#: option.c:2015 option.c:2046
 msgid "interface binding not supported"
 msgstr ""
 
-#: option.c:2024 option.c:3061
+#: option.c:2026 option.c:3088
 msgid "bad interface name"
 msgstr ""
 
-#: option.c:2189
+#: option.c:2191
 msgid "bad port range"
 msgstr ""
 
-#: option.c:2206
+#: option.c:2208
 msgid "bad bridge-interface"
 msgstr ""
 
-#: option.c:2240
+#: option.c:2242
 msgid "bad dhcp-range"
 msgstr ""
 
-#: option.c:2270
+#: option.c:2272
 msgid "only one tag allowed"
 msgstr ""
 
-#: option.c:2321
+#: option.c:2323
 msgid "inconsistent DHCP range"
 msgstr ""
 
-#: option.c:2357
+#: option.c:2374
 msgid "prefix must be at least 64"
 msgstr ""
 
-#: option.c:2361
+#: option.c:2378
 msgid "inconsistent DHCPv6 range"
 msgstr ""
 
-#: option.c:2454 option.c:2494
+#: option.c:2481 option.c:2521
 msgid "bad hex constant"
 msgstr ""
 
-#: option.c:2476
+#: option.c:2503
 msgid "cannot match tags in --dhcp-host"
 msgstr ""
 
-#: option.c:2556
+#: option.c:2583
 msgid "bad DHCP host name"
 msgstr ""
 
-#: option.c:2637
+#: option.c:2664
 msgid "bad tag-if"
 msgstr ""
 
-#: option.c:2946 option.c:3231
+#: option.c:2973 option.c:3258
 msgid "invalid port number"
 msgstr ""
 
-#: option.c:3008
+#: option.c:3035
 msgid "bad dhcp-proxy address"
 msgstr ""
 
-#: option.c:3048
+#: option.c:3075
 msgid "invalid alias range"
 msgstr ""
 
-#: option.c:3086
+#: option.c:3113
 msgid "bad CNAME"
 msgstr ""
 
-#: option.c:3091
+#: option.c:3118
 msgid "duplicate CNAME"
 msgstr ""
 
-#: option.c:3111
+#: option.c:3138
 msgid "bad PTR record"
 msgstr ""
 
-#: option.c:3142
+#: option.c:3169
 msgid "bad NAPTR record"
 msgstr ""
 
-#: option.c:3174
+#: option.c:3201
 msgid "bad TXT record"
 msgstr ""
 
-#: option.c:3217
+#: option.c:3244
 msgid "bad SRV record"
 msgstr ""
 
-#: option.c:3224
+#: option.c:3251
 msgid "bad SRV target"
 msgstr ""
 
-#: option.c:3238
+#: option.c:3265
 msgid "invalid priority"
 msgstr ""
 
-#: option.c:3245
+#: option.c:3272
 msgid "invalid weight"
 msgstr ""
 
-#: option.c:3264
+#: option.c:3291
 msgid "unsupported option (check that dnsmasq was compiled with DHCP/TFTP/DBus support)"
 msgstr ""
 
-#: option.c:3328
+#: option.c:3355
 msgid "missing \""
 msgstr ""
 
-#: option.c:3387
+#: option.c:3414
 msgid "bad option"
 msgstr ""
 
-#: option.c:3389
+#: option.c:3416
 msgid "extraneous parameter"
 msgstr ""
 
-#: option.c:3391
+#: option.c:3418
 msgid "missing parameter"
 msgstr ""
 
-#: option.c:3395
+#: option.c:3422
 msgid "error"
 msgstr ""
 
-#: option.c:3400
+#: option.c:3427
 #, c-format
 msgid "%s at line %d of %%s"
 msgstr ""
 
-#: option.c:3464 tftp.c:627
+#: option.c:3491 tftp.c:627
 #, c-format
 msgid "cannot read %s: %s"
 msgstr ""
 
-#: option.c:3630 option.c:3666
+#: option.c:3657 option.c:3693
 #, c-format
 msgid "read %s"
 msgstr ""
 
-#: option.c:3718
+#: option.c:3745
 msgid "junk found in command line"
 msgstr ""
 
-#: option.c:3753
+#: option.c:3780
 #, c-format
 msgid "Dnsmasq version %s  %s\n"
 msgstr ""
 
-#: option.c:3754
+#: option.c:3781
 #, c-format
 msgid ""
 "Compile time options: %s\n"
 "\n"
 msgstr ""
 
-#: option.c:3755
+#: option.c:3782
 #, c-format
 msgid "This software comes with ABSOLUTELY NO WARRANTY.\n"
 msgstr ""
 
-#: option.c:3756
+#: option.c:3783
 #, c-format
 msgid "Dnsmasq is free software, and you are welcome to redistribute it\n"
 msgstr ""
 
-#: option.c:3757
+#: option.c:3784
 #, c-format
 msgid "under the terms of the GNU General Public License, version 2 or 3.\n"
 msgstr ""
 
-#: option.c:3768
+#: option.c:3795
 msgid "try --help"
 msgstr ""
 
-#: option.c:3770
+#: option.c:3797
 msgid "try -w"
 msgstr ""
 
-#: option.c:3773
+#: option.c:3800
 #, c-format
 msgid "bad command line options: %s"
 msgstr ""
 
-#: option.c:3814
+#: option.c:3841
 #, c-format
 msgid "cannot get host-name: %s"
 msgstr ""
 
-#: option.c:3842
+#: option.c:3869
 msgid "only one resolv.conf file allowed in no-poll mode."
 msgstr ""
 
-#: option.c:3852
+#: option.c:3879
 msgid "must have exactly one resolv.conf to read domain from."
 msgstr ""
 
-#: option.c:3855 network.c:822 dhcp.c:804
+#: option.c:3882 network.c:822 dhcp.c:804
 #, c-format
 msgid "failed to read %s: %s"
 msgstr ""
 
-#: option.c:3872
+#: option.c:3899
 #, c-format
 msgid "no search directive found in %s"
 msgstr ""
 
-#: option.c:3893
+#: option.c:3920
 msgid "there must be a default domain when --dhcp-fqdn is set"
 msgstr ""
 
-#: option.c:3897
+#: option.c:3924
 msgid "syntax check OK"
 msgstr ""
 
-#: forward.c:471
+#: forward.c:113
+#, c-format
+msgid "failed to send packet: %s"
+msgstr ""
+
+#: forward.c:474
 #, c-format
 msgid "nameserver %s refused to do a recursive query"
 msgstr ""
 
-#: forward.c:499
+#: forward.c:502
 #, c-format
 msgid "possible DNS-rebind attack detected: %s"
 msgstr ""
@@ -973,201 +982,210 @@
 msgid "asychronous logging is not available under Android"
 msgstr ""
 
-#: dnsmasq.c:167
+#: dnsmasq.c:190
 #, c-format
 msgid "failed to find list of interfaces: %s"
 msgstr ""
 
-#: dnsmasq.c:175
+#: dnsmasq.c:198
 #, c-format
 msgid "unknown interface %s"
 msgstr ""
 
-#: dnsmasq.c:181
+#: dnsmasq.c:204
 #, c-format
 msgid "no interface with address %s"
 msgstr ""
 
-#: dnsmasq.c:197 dnsmasq.c:732
+#: dnsmasq.c:220 dnsmasq.c:770
 #, c-format
 msgid "DBus error: %s"
 msgstr ""
 
-#: dnsmasq.c:200
+#: dnsmasq.c:223
 msgid "DBus not available: set HAVE_DBUS in src/config.h"
 msgstr ""
 
-#: dnsmasq.c:227
+#: dnsmasq.c:251
 #, c-format
 msgid "unknown user or group: %s"
 msgstr ""
 
-#: dnsmasq.c:282
+#: dnsmasq.c:306
 #, c-format
 msgid "cannot chdir to filesystem root: %s"
 msgstr ""
 
-#: dnsmasq.c:457
+#: dnsmasq.c:481
 #, c-format
 msgid "started, version %s DNS disabled"
 msgstr ""
 
-#: dnsmasq.c:459
+#: dnsmasq.c:483
 #, c-format
 msgid "started, version %s cachesize %d"
 msgstr ""
 
-#: dnsmasq.c:461
+#: dnsmasq.c:485
 #, c-format
 msgid "started, version %s cache disabled"
 msgstr ""
 
-#: dnsmasq.c:463
+#: dnsmasq.c:487
 #, c-format
 msgid "compile time options: %s"
 msgstr ""
 
-#: dnsmasq.c:469
+#: dnsmasq.c:493
 msgid "DBus support enabled: connected to system bus"
 msgstr ""
 
-#: dnsmasq.c:471
+#: dnsmasq.c:495
 msgid "DBus support enabled: bus connection pending"
 msgstr ""
 
-#: dnsmasq.c:476
+#: dnsmasq.c:500
 #, c-format
 msgid "warning: failed to change owner of %s: %s"
 msgstr ""
 
-#: dnsmasq.c:480
+#: dnsmasq.c:504
 msgid "setting --bind-interfaces option because of OS limitations"
 msgstr ""
 
-#: dnsmasq.c:485
+#: dnsmasq.c:509
 #, c-format
 msgid "warning: interface %s does not currently exist"
 msgstr ""
 
-#: dnsmasq.c:490
+#: dnsmasq.c:514
 msgid "warning: ignoring resolv-file flag because no-resolv is set"
 msgstr ""
 
-#: dnsmasq.c:493
+#: dnsmasq.c:517
 msgid "warning: no upstream servers configured"
 msgstr ""
 
-#: dnsmasq.c:497
+#: dnsmasq.c:521
 #, c-format
 msgid "asynchronous logging enabled, queue limit is %d messages"
 msgstr ""
 
-#: dnsmasq.c:527
+#: 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:529
+#: 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:530
+#: dnsmasq.c:559
 #, c-format
 msgid "DHCP, IP range %s -- %s, lease time %s"
 msgstr ""
 
-#: dnsmasq.c:556
+#: dnsmasq.c:588
 msgid "root is "
 msgstr ""
 
-#: dnsmasq.c:556
+#: dnsmasq.c:588
 msgid "enabled"
 msgstr ""
 
-#: dnsmasq.c:558
+#: dnsmasq.c:590
 msgid "secure mode"
 msgstr ""
 
-#: dnsmasq.c:584
+#: dnsmasq.c:616
 #, c-format
 msgid "restricting maximum simultaneous TFTP transfers to %d"
 msgstr ""
 
-#: dnsmasq.c:734
+#: dnsmasq.c:772
 msgid "connected to system DBus"
 msgstr ""
 
-#: dnsmasq.c:866
+#: dnsmasq.c:912
 #, c-format
 msgid "cannot fork into background: %s"
 msgstr ""
 
-#: dnsmasq.c:869
+#: dnsmasq.c:915
 #, c-format
 msgid "failed to create helper: %s"
 msgstr ""
 
-#: dnsmasq.c:872
+#: dnsmasq.c:918
 #, c-format
 msgid "setting capabilities failed: %s"
 msgstr ""
 
-#: dnsmasq.c:875
+#: dnsmasq.c:921
 #, c-format
 msgid "failed to change user-id to %s: %s"
 msgstr ""
 
-#: dnsmasq.c:878
+#: dnsmasq.c:924
 #, c-format
 msgid "failed to change group-id to %s: %s"
 msgstr ""
 
-#: dnsmasq.c:881
+#: dnsmasq.c:927
 #, c-format
 msgid "failed to open pidfile %s: %s"
 msgstr ""
 
-#: dnsmasq.c:884
+#: dnsmasq.c:930
 #, c-format
 msgid "cannot open log %s: %s"
 msgstr ""
 
-#: dnsmasq.c:887
+#: dnsmasq.c:933
 #, c-format
 msgid "failed to load Lua script: %s"
 msgstr ""
 
-#: dnsmasq.c:946
+#: dnsmasq.c:1002
 #, c-format
 msgid "script process killed by signal %d"
 msgstr ""
 
-#: dnsmasq.c:950
+#: dnsmasq.c:1006
 #, c-format
 msgid "script process exited with status %d"
 msgstr ""
 
-#: dnsmasq.c:954
+#: dnsmasq.c:1010
 #, c-format
 msgid "failed to execute %s: %s"
 msgstr ""
 
-#: dnsmasq.c:999
+#: dnsmasq.c:1055
 msgid "exiting on receipt of SIGTERM"
 msgstr ""
 
-#: dnsmasq.c:1027
+#: dnsmasq.c:1083
 #, c-format
 msgid "failed to access %s: %s"
 msgstr ""
 
-#: dnsmasq.c:1057
+#: dnsmasq.c:1113
 #, c-format
 msgid "reading %s"
 msgstr ""
 
-#: dnsmasq.c:1068
+#: dnsmasq.c:1124
 #, c-format
 msgid "no servers found in %s, will retry"
 msgstr ""
@@ -1241,12 +1259,12 @@
 msgid "lease-init script returned exit code %s"
 msgstr ""
 
-#: lease.c:326
+#: lease.c:334
 #, c-format
 msgid "failed to write %s: %s (retry in %us)"
 msgstr ""
 
-#: lease.c:662
+#: lease.c:693
 #, c-format
 msgid "Ignoring domain %s for DHCP host name %s"
 msgstr ""
@@ -1269,7 +1287,7 @@
 msgid "%u available DHCP subnet: %s/%s"
 msgstr ""
 
-#: rfc2131.c:353 rfc3315.c:219
+#: rfc2131.c:353 rfc3315.c:209
 #, c-format
 msgid "%u available DHCP range: %s -- %s"
 msgstr ""
@@ -1302,7 +1320,7 @@
 msgid "no leases left"
 msgstr ""
 
-#: rfc2131.c:564 rfc3315.c:372
+#: rfc2131.c:564 rfc3315.c:362
 #, c-format
 msgid "%u client provides name: %s"
 msgstr ""
@@ -1321,7 +1339,7 @@
 msgid "PXE BIS not supported"
 msgstr ""
 
-#: rfc2131.c:911 rfc3315.c:1057
+#: rfc2131.c:911 rfc3315.c:1098
 #, c-format
 msgid "disabling DHCP static address %s for %s"
 msgstr ""
@@ -1330,7 +1348,7 @@
 msgid "unknown lease"
 msgstr ""
 
-#: rfc2131.c:964 rfc3315.c:552
+#: rfc2131.c:964 rfc3315.c:556
 #, c-format
 msgid "not using configured address %s because it is leased to %s"
 msgstr ""
@@ -1340,7 +1358,7 @@
 msgid "not using configured address %s because it is in use by the server or relay"
 msgstr ""
 
-#: rfc2131.c:977 rfc3315.c:556
+#: rfc2131.c:977 rfc3315.c:560
 #, c-format
 msgid "not using configured address %s because it was previously declined"
 msgstr ""
@@ -1407,12 +1425,12 @@
 msgid "PXE menu too large"
 msgstr ""
 
-#: rfc2131.c:2116 rfc3315.c:1245
+#: rfc2131.c:2117 rfc3315.c:1294
 #, c-format
 msgid "%u requested options: %s"
 msgstr ""
 
-#: rfc2131.c:2391
+#: rfc2131.c:2392
 #, c-format
 msgid "cannot send RFC3925 option: too many options for enterprise number %d"
 msgstr ""
@@ -1422,7 +1440,7 @@
 msgid "cannot create netlink socket: %s"
 msgstr ""
 
-#: netlink.c:322
+#: netlink.c:323
 #, c-format
 msgid "netlink returns error: %s"
 msgstr ""
@@ -1439,12 +1457,12 @@
 msgid "could not register a DBus message handler"
 msgstr ""
 
-#: bpf.c:238
+#: bpf.c:239
 #, c-format
 msgid "cannot create DHCP BPF socket: %s"
 msgstr ""
 
-#: bpf.c:266
+#: bpf.c:267
 #, c-format
 msgid "DHCP request for unsupported hardware type (%d) received on %s"
 msgstr ""
@@ -1501,32 +1519,27 @@
 msgid "Conntrack connection mark retrieval failed: %s"
 msgstr ""
 
-#: dhcp6.c:54
+#: dhcp6.c:46
 #, c-format
 msgid "cannot create DHCPv6 socket: %s"
 msgstr ""
 
-#: dhcp6.c:65
+#: dhcp6.c:57
 #, c-format
 msgid "failed to bind DHCPv6 server socket: %s"
 msgstr ""
 
-#: dhcp6.c:71
-#, c-format
-msgid "failed to join DHCPv6 multicast group: %s"
-msgstr ""
-
-#: rfc3315.c:104
+#: rfc3315.c:94
 #, c-format
 msgid "no address range available for DHCPv6 request from relay at %s"
 msgstr ""
 
-#: rfc3315.c:113
+#: rfc3315.c:103
 #, c-format
 msgid "no address range available for DHCPv6 request via %s"
 msgstr ""
 
-#: rfc3315.c:216
+#: rfc3315.c:206
 #, c-format
 msgid "%u available DHCPv6 subnet: %s/%d"
 msgstr ""
@@ -1560,3 +1573,13 @@
 #, c-format
 msgid "duplicate IP address %s (%s) in dhcp-config directive"
 msgstr ""
+
+#: dhcp-common.c:443
+#, c-format
+msgid "failed to join DHCPv6 multicast group: %s"
+msgstr ""
+
+#: radv.c:76
+#, c-format
+msgid "cannot create ICMPv6 socket: %s"
+msgstr ""