import of dnsmasq-2.58.tar.gz
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5fe209e..d341025 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -20,17 +20,17 @@
msgid "failed to load names from %s: %s"
msgstr ""
-#: cache.c:795 dhcp.c:865
+#: cache.c:795 dhcp.c:874
#, c-format
msgid "bad address at %s line %d"
msgstr ""
-#: cache.c:853 dhcp.c:881
+#: cache.c:853 dhcp.c:890
#, c-format
msgid "bad name at %s line %d"
msgstr ""
-#: cache.c:860 dhcp.c:956
+#: cache.c:860 dhcp.c:965
#, c-format
msgid "read %s - %d addresses"
msgstr ""
@@ -39,32 +39,37 @@
msgid "cleared cache"
msgstr ""
-#: cache.c:960
+#: cache.c:934
+#, c-format
+msgid "No IPv4 address found for %s"
+msgstr ""
+
+#: cache.c:975
#, c-format
msgid "%s is a CNAME, not giving it to the DHCP lease of %s"
msgstr ""
-#: cache.c:966
+#: cache.c:981
#, 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:1039
+#: cache.c:1054
#, c-format
msgid "time %lu"
msgstr ""
-#: cache.c:1040
+#: cache.c:1055
#, c-format
msgid "cache size %d, %d/%d cache insertions re-used unexpired cache entries."
msgstr ""
-#: cache.c:1042
+#: cache.c:1057
#, c-format
msgid "queries forwarded %u, queries answered locally %u"
msgstr ""
-#: cache.c:1068
+#: cache.c:1083
#, c-format
msgid "server %s#%d: queries sent %u, retried or failed %u"
msgstr ""
@@ -78,7 +83,7 @@
msgid "failed to allocate memory"
msgstr ""
-#: util.c:227 option.c:573
+#: util.c:227 option.c:579
msgid "could not get memory"
msgstr ""
@@ -92,752 +97,764 @@
msgid "failed to allocate %d bytes"
msgstr ""
-#: util.c:350
+#: util.c:358
#, c-format
msgid "infinite"
msgstr ""
-#: option.c:244
+#: option.c:248
msgid "Specify local address(es) to listen on."
msgstr ""
-#: option.c:245
+#: option.c:249
msgid "Return ipaddr for all hosts in specified domains."
msgstr ""
-#: option.c:246
+#: option.c:250
msgid "Fake reverse lookups for RFC1918 private address ranges."
msgstr ""
-#: option.c:247
+#: option.c:251
msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)."
msgstr ""
-#: option.c:248
+#: option.c:252
#, c-format
msgid "Specify the size of the cache in entries (defaults to %s)."
msgstr ""
-#: option.c:249
+#: option.c:253
#, c-format
msgid "Specify configuration file (defaults to %s)."
msgstr ""
-#: option.c:250
+#: option.c:254
msgid "Do NOT fork into the background: run in debug mode."
msgstr ""
-#: option.c:251
+#: option.c:255
msgid "Do NOT forward queries with no domain part."
msgstr ""
-#: option.c:252
+#: option.c:256
msgid "Return self-pointing MX records for local hosts."
msgstr ""
-#: option.c:253
+#: option.c:257
msgid "Expand simple names in /etc/hosts with domain-suffix."
msgstr ""
-#: option.c:254
+#: option.c:258
msgid "Don't forward spurious DNS requests from Windows hosts."
msgstr ""
-#: option.c:255
+#: option.c:259
msgid "Enable DHCP in the range given with lease duration."
msgstr ""
-#: option.c:256
+#: option.c:260
#, c-format
msgid "Change to this group after startup (defaults to %s)."
msgstr ""
-#: option.c:257
+#: option.c:261
msgid "Set address or hostname for a specified machine."
msgstr ""
-#: option.c:258
+#: option.c:262
msgid "Read DHCP host specs from file."
msgstr ""
-#: option.c:259
+#: option.c:263
msgid "Read DHCP option specs from file."
msgstr ""
-#: option.c:260
+#: option.c:264
msgid "Evaluate conditional tag expression."
msgstr ""
-#: option.c:261
+#: option.c:265
#, c-format
msgid "Do NOT load %s file."
msgstr ""
-#: option.c:262
+#: option.c:266
#, c-format
msgid "Specify a hosts file to be read in addition to %s."
msgstr ""
-#: option.c:263
+#: option.c:267
msgid "Specify interface(s) to listen on."
msgstr ""
-#: option.c:264
+#: option.c:268
msgid "Specify interface(s) NOT to listen on."
msgstr ""
-#: option.c:265
+#: option.c:269
msgid "Map DHCP user class to tag."
msgstr ""
-#: option.c:266
+#: option.c:270
msgid "Map RFC3046 circuit-id to tag."
msgstr ""
-#: option.c:267
+#: option.c:271
msgid "Map RFC3046 remote-id to tag."
msgstr ""
-#: option.c:268
+#: option.c:272
msgid "Map RFC3993 subscriber-id to tag."
msgstr ""
-#: option.c:269
+#: option.c:273
msgid "Don't do DHCP for hosts with tag set."
msgstr ""
-#: option.c:270
+#: option.c:274
msgid "Force broadcast replies for hosts with tag set."
msgstr ""
-#: option.c:271
+#: option.c:275
msgid "Do NOT fork into the background, do NOT run in debug mode."
msgstr ""
-#: option.c:272
-msgid "Assume we are the only DHCP server on the local network."
-msgstr ""
-
-#: option.c:273
-#, c-format
-msgid "Specify where to store DHCP leases (defaults to %s)."
-msgstr ""
-
-#: option.c:274
-msgid "Return MX records for local hosts."
-msgstr ""
-
-#: option.c:275
-msgid "Specify an MX record."
-msgstr ""
-
#: option.c:276
-msgid "Specify BOOTP options to DHCP server."
+msgid "Assume we are the only DHCP server on the local network."
msgstr ""
#: option.c:277
#, c-format
-msgid "Do NOT poll %s file, reload only on SIGHUP."
+msgid "Specify where to store DHCP leases (defaults to %s)."
msgstr ""
#: option.c:278
-msgid "Do NOT cache failed search results."
+msgid "Return MX records for local hosts."
msgstr ""
#: option.c:279
-#, c-format
-msgid "Use nameservers strictly in the order given in %s."
+msgid "Specify an MX record."
msgstr ""
#: option.c:280
-msgid "Specify options to be sent to DHCP clients."
+msgid "Specify BOOTP options to DHCP server."
msgstr ""
#: option.c:281
-msgid "DHCP option sent even if the client does not request it."
+#, c-format
+msgid "Do NOT poll %s file, reload only on SIGHUP."
msgstr ""
#: option.c:282
-msgid "Specify port to listen for DNS requests on (defaults to 53)."
+msgid "Do NOT cache failed search results."
msgstr ""
#: option.c:283
#, c-format
-msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)."
+msgid "Use nameservers strictly in the order given in %s."
msgstr ""
#: option.c:284
-msgid "Log DNS queries."
+msgid "Specify options to be sent to DHCP clients."
msgstr ""
#: option.c:285
-msgid "Force the originating port for upstream DNS queries."
+msgid "DHCP option sent even if the client does not request it."
msgstr ""
#: option.c:286
-msgid "Do NOT read resolv.conf."
+msgid "Specify port to listen for DNS requests on (defaults to 53)."
msgstr ""
#: option.c:287
#, c-format
-msgid "Specify path to resolv.conf (defaults to %s)."
+msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)."
msgstr ""
#: option.c:288
-msgid "Specify address(es) of upstream servers with optional domains."
+msgid "Log DNS queries."
msgstr ""
#: option.c:289
-msgid "Never forward queries to specified domains."
+msgid "Force the originating port for upstream DNS queries."
msgstr ""
#: option.c:290
-msgid "Specify the domain to be assigned in DHCP leases."
+msgid "Do NOT read resolv.conf."
msgstr ""
#: option.c:291
-msgid "Specify default target in an MX record."
+#, c-format
+msgid "Specify path to resolv.conf (defaults to %s)."
msgstr ""
#: option.c:292
-msgid "Specify time-to-live in seconds for replies from /etc/hosts."
+msgid "Specify address(es) of upstream servers with optional domains."
msgstr ""
#: option.c:293
-msgid "Specify time-to-live in seconds for negative caching."
+msgid "Never forward queries to specified domains."
msgstr ""
#: option.c:294
-msgid "Specify time-to-live in seconds for maximum TTL to send to clients."
+msgid "Specify the domain to be assigned in DHCP leases."
msgstr ""
#: option.c:295
+msgid "Specify default target in an MX record."
+msgstr ""
+
+#: option.c:296
+msgid "Specify time-to-live in seconds for replies from /etc/hosts."
+msgstr ""
+
+#: option.c:297
+msgid "Specify time-to-live in seconds for negative caching."
+msgstr ""
+
+#: option.c:298
+msgid "Specify time-to-live in seconds for maximum TTL to send to clients."
+msgstr ""
+
+#: option.c:299
#, c-format
msgid "Change to this user after startup. (defaults to %s)."
msgstr ""
-#: option.c:296
+#: option.c:300
msgid "Map DHCP vendor class to tag."
msgstr ""
-#: option.c:297
+#: option.c:301
msgid "Display dnsmasq version and copyright information."
msgstr ""
-#: option.c:298
+#: option.c:302
msgid "Translate IPv4 addresses from upstream servers."
msgstr ""
-#: option.c:299
+#: option.c:303
msgid "Specify a SRV record."
msgstr ""
-#: option.c:300
+#: option.c:304
msgid "Display this message. Use --help dhcp for known DHCP options."
msgstr ""
-#: option.c:301
+#: option.c:305
#, c-format
msgid "Specify path of PID file (defaults to %s)."
msgstr ""
-#: option.c:302
+#: option.c:306
#, c-format
msgid "Specify maximum number of DHCP leases (defaults to %s)."
msgstr ""
-#: option.c:303
+#: option.c:307
msgid "Answer DNS queries based on the interface a query was sent to."
msgstr ""
-#: option.c:304
+#: option.c:308
msgid "Specify TXT DNS record."
msgstr ""
-#: option.c:305
+#: option.c:309
msgid "Specify PTR DNS record."
msgstr ""
-#: option.c:306
+#: option.c:310
msgid "Give DNS name to IPv4 address of interface."
msgstr ""
-#: option.c:307
+#: option.c:311
msgid "Bind only to interfaces in use."
msgstr ""
-#: option.c:308
+#: option.c:312
#, c-format
msgid "Read DHCP static host information from %s."
msgstr ""
-#: option.c:309
+#: option.c:313
msgid "Enable the DBus interface for setting upstream servers, etc."
msgstr ""
-#: option.c:310
+#: option.c:314
msgid "Do not provide DHCP on this interface, only provide DNS."
msgstr ""
-#: option.c:311
+#: option.c:315
msgid "Enable dynamic address allocation for bootp."
msgstr ""
-#: option.c:312
+#: option.c:316
msgid "Map MAC address (with wildcards) to option set."
msgstr ""
-#: option.c:313
+#: option.c:317
msgid "Treat DHCP requests on aliases as arriving from interface."
msgstr ""
-#: option.c:314
+#: option.c:318
msgid "Disable ICMP echo address checking in the DHCP server."
msgstr ""
-#: option.c:315
+#: option.c:319
msgid "Script to run on DHCP lease creation and destruction."
msgstr ""
-#: option.c:316
+#: option.c:320
msgid "Read configuration from all the files in this directory."
msgstr ""
-#: option.c:317
+#: option.c:321
msgid "Log to this syslog facility or file. (defaults to DAEMON)"
msgstr ""
-#: option.c:318
+#: option.c:322
msgid "Do not use leasefile."
msgstr ""
-#: option.c:319
+#: option.c:323
#, c-format
msgid "Maximum number of concurrent DNS queries. (defaults to %s)"
msgstr ""
-#: option.c:320
+#: option.c:324
#, c-format
msgid "Clear DNS cache when reloading %s."
msgstr ""
-#: option.c:321
+#: option.c:325
msgid "Ignore hostnames provided by DHCP clients."
msgstr ""
-#: option.c:322
+#: option.c:326
msgid "Do NOT reuse filename and server fields for extra DHCP options."
msgstr ""
-#: option.c:323
+#: option.c:327
msgid "Enable integrated read-only TFTP server."
msgstr ""
-#: option.c:324
+#: option.c:328
msgid "Export files by TFTP only from the specified subtree."
msgstr ""
-#: option.c:325
+#: option.c:329
msgid "Add client IP address to tftp-root."
msgstr ""
-#: option.c:326
+#: option.c:330
msgid "Allow access only to files owned by the user running dnsmasq."
msgstr ""
-#: option.c:327
+#: option.c:331
#, c-format
msgid "Maximum number of conncurrent TFTP transfers (defaults to %s)."
msgstr ""
-#: option.c:328
+#: option.c:332
msgid "Disable the TFTP blocksize extension."
msgstr ""
-#: option.c:329
+#: option.c:333
msgid "Ephemeral port range for use by TFTP transfers."
msgstr ""
-#: option.c:330
+#: option.c:334
msgid "Extra logging for DHCP."
msgstr ""
-#: option.c:331
+#: option.c:335
msgid "Enable async. logging; optionally set queue length."
msgstr ""
-#: option.c:332
+#: option.c:336
msgid "Stop DNS rebinding. Filter private IP ranges when resolving."
msgstr ""
-#: option.c:333
+#: option.c:337
msgid "Allow rebinding of 127.0.0.0/8, for RBL servers."
msgstr ""
-#: option.c:334
+#: option.c:338
msgid "Inhibit DNS-rebind protection on this domain."
msgstr ""
-#: option.c:335
+#: option.c:339
msgid "Always perform DNS queries to all servers."
msgstr ""
-#: option.c:336
+#: option.c:340
msgid "Set tag if client includes matching option in request."
msgstr ""
-#: option.c:337
+#: option.c:341
msgid "Use alternative ports for DHCP."
msgstr ""
-#: option.c:338
+#: option.c:342
msgid "Run lease-change script as this user."
msgstr ""
-#: option.c:339
+#: option.c:343
msgid "Specify NAPTR DNS record."
msgstr ""
-#: option.c:340
+#: option.c:344
msgid "Specify lowest port available for DNS query transmission."
msgstr ""
-#: option.c:341
+#: option.c:345
msgid "Use only fully qualified domain names for DHCP clients."
msgstr ""
-#: option.c:342
+#: option.c:346
msgid "Generate hostnames based on MAC address for nameless clients."
msgstr ""
-#: option.c:343
+#: option.c:347
msgid "Use these DHCP relays as full proxies."
msgstr ""
-#: option.c:344
+#: option.c:348
msgid "Specify alias name for LOCAL DNS name."
msgstr ""
-#: option.c:345
+#: option.c:349
msgid "Prompt to send to PXE clients."
msgstr ""
-#: option.c:346
+#: option.c:350
msgid "Boot service for PXE menu."
msgstr ""
-#: option.c:347
+#: option.c:351
msgid "Check configuration syntax."
msgstr ""
-#: option.c:348
-msgid "Add requestor's MAC address to forwarded DNS queries"
+#: option.c:352
+msgid "Add requestor's MAC address to forwarded DNS queries."
msgstr ""
-#: option.c:349
-msgid "Proxy DNSSEC validation results from upstream nameservers"
+#: option.c:353
+msgid "Proxy DNSSEC validation results from upstream nameservers."
msgstr ""
-#: option.c:638
+#: option.c:354
+msgid "Attempt to allocate sequential IP addresses to DHCP clients."
+msgstr ""
+
+#: option.c:355
+msgid "Copy connection-track mark from queries to upstream connections."
+msgstr ""
+
+#: option.c:644
#, c-format
msgid ""
"Usage: dnsmasq [options]\n"
"\n"
msgstr ""
-#: option.c:640
+#: option.c:646
#, c-format
msgid "Use short options only on the command line.\n"
msgstr ""
-#: option.c:642
+#: option.c:648
#, c-format
msgid "Valid options are:\n"
msgstr ""
-#: option.c:683
+#: option.c:689
#, c-format
msgid "Known DHCP options:\n"
msgstr ""
-#: option.c:798
+#: option.c:804
msgid "bad dhcp-option"
msgstr ""
-#: option.c:860
+#: option.c:866
msgid "bad IP address"
msgstr ""
-#: option.c:968
+#: option.c:974
msgid "bad domain in dhcp-option"
msgstr ""
-#: option.c:1034
+#: option.c:1040
msgid "dhcp-option too long"
msgstr ""
-#: option.c:1043
+#: option.c:1049
msgid "illegal dhcp-match"
msgstr ""
-#: option.c:1087
+#: option.c:1093
msgid "illegal repeated flag"
msgstr ""
-#: option.c:1095
+#: option.c:1101
msgid "illegal repeated keyword"
msgstr ""
-#: option.c:1147 option.c:3030
+#: option.c:1153 option.c:3062
#, c-format
msgid "cannot access directory %s: %s"
msgstr ""
-#: option.c:1178 tftp.c:460
+#: option.c:1184 tftp.c:465
#, c-format
msgid "cannot access %s: %s"
msgstr ""
-#: option.c:1207
+#: option.c:1213
msgid "setting log facility is not possible under Android"
msgstr ""
-#: option.c:1216
+#: option.c:1222
msgid "bad log facility"
msgstr ""
-#: option.c:1265
+#: option.c:1271
msgid "bad MX preference"
msgstr ""
-#: option.c:1270
+#: option.c:1276
msgid "bad MX name"
msgstr ""
-#: option.c:1284
+#: option.c:1290
msgid "bad MX target"
msgstr ""
-#: option.c:1294
+#: option.c:1300
msgid "cannot run scripts under uClinux"
msgstr ""
-#: option.c:1296
+#: option.c:1302
msgid "recompile with HAVE_SCRIPT defined to enable lease-change scripts"
msgstr ""
-#: option.c:1597 option.c:1601
+#: option.c:1607 option.c:1611
msgid "bad port"
msgstr ""
-#: option.c:1620 option.c:1645
+#: option.c:1634 option.c:1665
msgid "interface binding not supported"
msgstr ""
-#: option.c:1791
-msgid "bad port range"
-msgstr ""
-
-#: option.c:1808
-msgid "bad bridge-interface"
-msgstr ""
-
-#: option.c:1850
-msgid "bad dhcp-range"
-msgstr ""
-
-#: option.c:1878
-msgid "only one tag allowed"
-msgstr ""
-
-#: option.c:1925
-msgid "inconsistent DHCP range"
-msgstr ""
-
-#: option.c:2019 option.c:2045
-msgid "bad hex constant"
-msgstr ""
-
-#: option.c:2107
-msgid "bad DHCP host name"
-msgstr ""
-
-#: option.c:2188
-msgid "bad tag-if"
-msgstr ""
-
-#: option.c:2467 option.c:2752
-msgid "invalid port number"
-msgstr ""
-
-#: option.c:2529
-msgid "bad dhcp-proxy address"
-msgstr ""
-
-#: option.c:2569
-msgid "invalid alias range"
-msgstr ""
-
-#: option.c:2582
+#: option.c:1645 option.c:2614
msgid "bad interface name"
msgstr ""
-#: option.c:2607
+#: option.c:1810
+msgid "bad port range"
+msgstr ""
+
+#: option.c:1827
+msgid "bad bridge-interface"
+msgstr ""
+
+#: option.c:1870
+msgid "bad dhcp-range"
+msgstr ""
+
+#: option.c:1898
+msgid "only one tag allowed"
+msgstr ""
+
+#: option.c:1945
+msgid "inconsistent DHCP range"
+msgstr ""
+
+#: option.c:2039 option.c:2067
+msgid "bad hex constant"
+msgstr ""
+
+#: option.c:2061
+msgid "cannot match tags in --dhcp-host"
+msgstr ""
+
+#: option.c:2129
+msgid "bad DHCP host name"
+msgstr ""
+
+#: option.c:2210
+msgid "bad tag-if"
+msgstr ""
+
+#: option.c:2499 option.c:2784
+msgid "invalid port number"
+msgstr ""
+
+#: option.c:2561
+msgid "bad dhcp-proxy address"
+msgstr ""
+
+#: option.c:2601
+msgid "invalid alias range"
+msgstr ""
+
+#: option.c:2639
msgid "bad CNAME"
msgstr ""
-#: option.c:2612
+#: option.c:2644
msgid "duplicate CNAME"
msgstr ""
-#: option.c:2632
+#: option.c:2664
msgid "bad PTR record"
msgstr ""
-#: option.c:2663
+#: option.c:2695
msgid "bad NAPTR record"
msgstr ""
-#: option.c:2695
+#: option.c:2727
msgid "bad TXT record"
msgstr ""
-#: option.c:2738
+#: option.c:2770
msgid "bad SRV record"
msgstr ""
-#: option.c:2745
+#: option.c:2777
msgid "bad SRV target"
msgstr ""
-#: option.c:2759
+#: option.c:2791
msgid "invalid priority"
msgstr ""
-#: option.c:2766
+#: option.c:2798
msgid "invalid weight"
msgstr ""
-#: option.c:2785
+#: option.c:2817
msgid "unsupported option (check that dnsmasq was compiled with DHCP/TFTP/DBus support)"
msgstr ""
-#: option.c:2849
+#: option.c:2881
msgid "missing \""
msgstr ""
-#: option.c:2908
+#: option.c:2940
msgid "bad option"
msgstr ""
-#: option.c:2910
+#: option.c:2942
msgid "extraneous parameter"
msgstr ""
-#: option.c:2912
+#: option.c:2944
msgid "missing parameter"
msgstr ""
-#: option.c:2916
+#: option.c:2948
msgid "error"
msgstr ""
-#: option.c:2921
+#: option.c:2953
#, c-format
msgid "%s at line %d of %%s"
msgstr ""
-#: option.c:2985 tftp.c:624
+#: option.c:3017 tftp.c:629
#, c-format
msgid "cannot read %s: %s"
msgstr ""
-#: option.c:3151 option.c:3187
+#: option.c:3183 option.c:3219
#, c-format
msgid "read %s"
msgstr ""
-#: option.c:3239
+#: option.c:3271
msgid "junk found in command line"
msgstr ""
-#: option.c:3269
+#: option.c:3301
#, c-format
msgid "Dnsmasq version %s %s\n"
msgstr ""
-#: option.c:3270
+#: option.c:3302
#, c-format
msgid ""
"Compile time options %s\n"
"\n"
msgstr ""
-#: option.c:3271
+#: option.c:3303
#, c-format
msgid "This software comes with ABSOLUTELY NO WARRANTY.\n"
msgstr ""
-#: option.c:3272
+#: option.c:3304
#, c-format
msgid "Dnsmasq is free software, and you are welcome to redistribute it\n"
msgstr ""
-#: option.c:3273
+#: option.c:3305
#, c-format
msgid "under the terms of the GNU General Public License, version 2 or 3.\n"
msgstr ""
-#: option.c:3284
+#: option.c:3316
msgid "try --help"
msgstr ""
-#: option.c:3286
+#: option.c:3318
msgid "try -w"
msgstr ""
-#: option.c:3289
+#: option.c:3321
#, c-format
msgid "bad command line options: %s"
msgstr ""
-#: option.c:3330
+#: option.c:3362
#, c-format
msgid "cannot get host-name: %s"
msgstr ""
-#: option.c:3358
+#: option.c:3390
msgid "only one resolv.conf file allowed in no-poll mode."
msgstr ""
-#: option.c:3368
+#: option.c:3400
msgid "must have exactly one resolv.conf to read domain from."
msgstr ""
-#: option.c:3371 network.c:848 dhcp.c:814
+#: option.c:3403 network.c:848 dhcp.c:823
#, c-format
msgid "failed to read %s: %s"
msgstr ""
-#: option.c:3388
+#: option.c:3420
#, c-format
msgid "no search directive found in %s"
msgstr ""
-#: option.c:3409
+#: option.c:3441
msgid "there must be a default domain when --dhcp-fqdn is set"
msgstr ""
-#: option.c:3413
+#: option.c:3445
msgid "syntax check OK"
msgstr ""
-#: forward.c:461
+#: forward.c:471
#, c-format
msgid "nameserver %s refused to do a recursive query"
msgstr ""
-#: forward.c:489
+#: forward.c:499
#, c-format
msgid "possible DNS-rebind attack detected: %s"
msgstr ""
@@ -908,273 +925,281 @@
msgid "using nameserver %s#%d"
msgstr ""
-#: dnsmasq.c:148
+#: dnsmasq.c:152
msgid "TFTP server not available: set HAVE_TFTP in src/config.h"
msgstr ""
-#: dnsmasq.c:153
+#: dnsmasq.c:157
+msgid "Cannot use --conntrack AND --query-port"
+msgstr ""
+
+#: dnsmasq.c:160
+msgid "Conntrack support not available: set HAVE_CONNTRACK in src/config.h"
+msgstr ""
+
+#: dnsmasq.c:165
msgid "asychronous logging is not available under Solaris"
msgstr ""
-#: dnsmasq.c:158
+#: dnsmasq.c:170
msgid "asychronous logging is not available under Android"
msgstr ""
-#: dnsmasq.c:177
+#: dnsmasq.c:189
#, c-format
msgid "failed to find list of interfaces: %s"
msgstr ""
-#: dnsmasq.c:185
+#: dnsmasq.c:197
#, c-format
msgid "unknown interface %s"
msgstr ""
-#: dnsmasq.c:191
+#: dnsmasq.c:203
#, c-format
msgid "no interface with address %s"
msgstr ""
-#: dnsmasq.c:207 dnsmasq.c:678
+#: dnsmasq.c:219 dnsmasq.c:690
#, c-format
msgid "DBus error: %s"
msgstr ""
-#: dnsmasq.c:210
+#: dnsmasq.c:222
msgid "DBus not available: set HAVE_DBUS in src/config.h"
msgstr ""
-#: dnsmasq.c:236
+#: dnsmasq.c:248
#, c-format
msgid "unknown user or group: %s"
msgstr ""
-#: dnsmasq.c:291
+#: dnsmasq.c:303
#, c-format
msgid "cannot chdir to filesystem root: %s"
msgstr ""
-#: dnsmasq.c:455
+#: dnsmasq.c:467
#, c-format
msgid "started, version %s DNS disabled"
msgstr ""
-#: dnsmasq.c:457
+#: dnsmasq.c:469
#, c-format
msgid "started, version %s cachesize %d"
msgstr ""
-#: dnsmasq.c:459
+#: dnsmasq.c:471
#, c-format
msgid "started, version %s cache disabled"
msgstr ""
-#: dnsmasq.c:461
+#: dnsmasq.c:473
#, c-format
msgid "compile time options: %s"
msgstr ""
-#: dnsmasq.c:467
+#: dnsmasq.c:479
msgid "DBus support enabled: connected to system bus"
msgstr ""
-#: dnsmasq.c:469
+#: dnsmasq.c:481
msgid "DBus support enabled: bus connection pending"
msgstr ""
-#: dnsmasq.c:474
+#: dnsmasq.c:486
#, c-format
msgid "warning: failed to change owner of %s: %s"
msgstr ""
-#: dnsmasq.c:478
+#: dnsmasq.c:490
msgid "setting --bind-interfaces option because of OS limitations"
msgstr ""
-#: dnsmasq.c:483
-#, c-format
-msgid "warning: interface %s does not currently exist"
-msgstr ""
-
-#: dnsmasq.c:488
-msgid "warning: ignoring resolv-file flag because no-resolv is set"
-msgstr ""
-
-#: dnsmasq.c:491
-msgid "warning: no upstream servers configured"
-msgstr ""
-
#: dnsmasq.c:495
#, c-format
+msgid "warning: interface %s does not currently exist"
+msgstr ""
+
+#: dnsmasq.c:500
+msgid "warning: ignoring resolv-file flag because no-resolv is set"
+msgstr ""
+
+#: dnsmasq.c:503
+msgid "warning: no upstream servers configured"
+msgstr ""
+
+#: dnsmasq.c:507
+#, c-format
msgid "asynchronous logging enabled, queue limit is %d messages"
msgstr ""
-#: dnsmasq.c:508
+#: dnsmasq.c:520
#, c-format
msgid "DHCP, static leases only on %.0s%s, lease time %s"
msgstr ""
-#: dnsmasq.c:510
+#: dnsmasq.c:522
#, c-format
msgid "DHCP, proxy on subnet %.0s%s%.0s"
msgstr ""
-#: dnsmasq.c:511
+#: dnsmasq.c:523
#, c-format
msgid "DHCP, IP range %s -- %s, lease time %s"
msgstr ""
-#: dnsmasq.c:526
+#: dnsmasq.c:538
msgid "root is "
msgstr ""
-#: dnsmasq.c:526
+#: dnsmasq.c:538
msgid "enabled"
msgstr ""
-#: dnsmasq.c:528
+#: dnsmasq.c:540
msgid "secure mode"
msgstr ""
-#: dnsmasq.c:554
+#: dnsmasq.c:566
#, c-format
msgid "restricting maximum simultaneous TFTP transfers to %d"
msgstr ""
-#: dnsmasq.c:680
+#: dnsmasq.c:692
msgid "connected to system DBus"
msgstr ""
-#: dnsmasq.c:775
+#: dnsmasq.c:787
#, c-format
msgid "cannot fork into background: %s"
msgstr ""
-#: dnsmasq.c:778
+#: dnsmasq.c:790
#, c-format
msgid "failed to create helper: %s"
msgstr ""
-#: dnsmasq.c:781
+#: dnsmasq.c:793
#, c-format
msgid "setting capabilities failed: %s"
msgstr ""
-#: dnsmasq.c:785
+#: dnsmasq.c:797
#, c-format
msgid "failed to change user-id to %s: %s"
msgstr ""
-#: dnsmasq.c:790
+#: dnsmasq.c:802
#, c-format
msgid "failed to change group-id to %s: %s"
msgstr ""
-#: dnsmasq.c:793
+#: dnsmasq.c:805
#, c-format
msgid "failed to open pidfile %s: %s"
msgstr ""
-#: dnsmasq.c:796
+#: dnsmasq.c:808
#, c-format
msgid "cannot open %s: %s"
msgstr ""
-#: dnsmasq.c:851
+#: dnsmasq.c:863
#, c-format
msgid "child process killed by signal %d"
msgstr ""
-#: dnsmasq.c:855
+#: dnsmasq.c:867
#, c-format
msgid "child process exited with status %d"
msgstr ""
-#: dnsmasq.c:859
+#: dnsmasq.c:871
#, c-format
msgid "failed to execute %s: %s"
msgstr ""
-#: dnsmasq.c:903
+#: dnsmasq.c:915
msgid "exiting on receipt of SIGTERM"
msgstr ""
-#: dnsmasq.c:931
+#: dnsmasq.c:943
#, c-format
msgid "failed to access %s: %s"
msgstr ""
-#: dnsmasq.c:961
+#: dnsmasq.c:973
#, c-format
msgid "reading %s"
msgstr ""
-#: dnsmasq.c:972
+#: dnsmasq.c:984
#, c-format
msgid "no servers found in %s, will retry"
msgstr ""
-#: dhcp.c:40
+#: dhcp.c:39
#, c-format
msgid "cannot create DHCP socket: %s"
msgstr ""
-#: dhcp.c:52
+#: dhcp.c:51
#, c-format
msgid "failed to set options on DHCP socket: %s"
msgstr ""
-#: dhcp.c:65
+#: dhcp.c:64
#, c-format
msgid "failed to set SO_REUSE{ADDR|PORT} on DHCP socket: %s"
msgstr ""
-#: dhcp.c:77
+#: dhcp.c:76
#, c-format
msgid "failed to bind DHCP server socket: %s"
msgstr ""
-#: dhcp.c:103
+#: dhcp.c:102
#, c-format
msgid "cannot create ICMP raw socket: %s."
msgstr ""
-#: dhcp.c:281
+#: dhcp.c:278
#, c-format
msgid "DHCP packet received on %s which has no address"
msgstr ""
-#: dhcp.c:445
+#: dhcp.c:442
#, c-format
msgid "DHCP range %s -- %s is not consistent with netmask %s"
msgstr ""
-#: dhcp.c:852
+#: dhcp.c:861
#, c-format
msgid "bad line at %s line %d"
msgstr ""
-#: dhcp.c:895
+#: dhcp.c:904
#, c-format
msgid "ignoring %s line %d, duplicate name or IP address"
msgstr ""
-#: dhcp.c:978
+#: dhcp.c:987
#, c-format
msgid "duplicate IP address %s in dhcp-config directive."
msgstr ""
-#: dhcp.c:981
+#: dhcp.c:990
#, c-format
msgid "duplicate IP address %s in %s."
msgstr ""
-#: dhcp.c:1024
+#: dhcp.c:1033
#, c-format
msgid "%s has more than one address in hostsfile, using %s for DHCP"
msgstr ""
-#: dhcp.c:1029
+#: dhcp.c:1038
#, c-format
msgid "duplicate IP address %s (%s) in dhcp-config directive"
msgstr ""
@@ -1203,178 +1228,183 @@
msgid "failed to write %s: %s (retry in %us)"
msgstr ""
-#: rfc2131.c:315
+#: rfc2131.c:342
#, c-format
msgid "no address range available for DHCP request %s %s"
msgstr ""
-#: rfc2131.c:316
+#: rfc2131.c:343
msgid "with subnet selector"
msgstr ""
-#: rfc2131.c:316
+#: rfc2131.c:343
msgid "via"
msgstr ""
-#: rfc2131.c:331
+#: rfc2131.c:355
#, c-format
msgid "%u available DHCP subnet: %s/%s"
msgstr ""
-#: rfc2131.c:334
+#: rfc2131.c:358
#, c-format
msgid "%u available DHCP range: %s -- %s"
msgstr ""
-#: rfc2131.c:363
+#: rfc2131.c:387
msgid "disabled"
msgstr ""
-#: rfc2131.c:404 rfc2131.c:916 rfc2131.c:1288
+#: rfc2131.c:428 rfc2131.c:945 rfc2131.c:1337
msgid "ignored"
msgstr ""
-#: rfc2131.c:419 rfc2131.c:1135
+#: rfc2131.c:443 rfc2131.c:1183
msgid "address in use"
msgstr ""
-#: rfc2131.c:433 rfc2131.c:970
+#: rfc2131.c:457 rfc2131.c:999
msgid "no address available"
msgstr ""
-#: rfc2131.c:440 rfc2131.c:1098
+#: rfc2131.c:464 rfc2131.c:1146
msgid "wrong network"
msgstr ""
-#: rfc2131.c:454
+#: rfc2131.c:479
msgid "no address configured"
msgstr ""
-#: rfc2131.c:460 rfc2131.c:1148
+#: rfc2131.c:485 rfc2131.c:1196
msgid "no leases left"
msgstr ""
-#: rfc2131.c:545
+#: rfc2131.c:570
#, c-format
msgid "%u client provides name: %s"
msgstr ""
-#: rfc2131.c:700
+#: rfc2131.c:725
#, c-format
msgid "%u vendor class: %s"
msgstr ""
-#: rfc2131.c:702
+#: rfc2131.c:727
#, c-format
msgid "%u user class: %s"
msgstr ""
-#: rfc2131.c:761
+#: rfc2131.c:786
msgid "PXE BIS not supported"
msgstr ""
-#: rfc2131.c:886
+#: rfc2131.c:915
#, c-format
msgid "disabling DHCP static address %s for %s"
msgstr ""
-#: rfc2131.c:907
+#: rfc2131.c:936
msgid "unknown lease"
msgstr ""
-#: rfc2131.c:939
+#: rfc2131.c:968
#, c-format
msgid "not using configured address %s because it is leased to %s"
msgstr ""
-#: rfc2131.c:949
+#: rfc2131.c:978
#, c-format
msgid "not using configured address %s because it is in use by the server or relay"
msgstr ""
-#: rfc2131.c:952
+#: rfc2131.c:981
#, c-format
msgid "not using configured address %s because it was previously declined"
msgstr ""
-#: rfc2131.c:968 rfc2131.c:1141
+#: rfc2131.c:997 rfc2131.c:1189
msgid "no unique-id"
msgstr ""
-#: rfc2131.c:1037
+#: rfc2131.c:1084
msgid "wrong server-ID"
msgstr ""
-#: rfc2131.c:1055
+#: rfc2131.c:1103
msgid "wrong address"
msgstr ""
-#: rfc2131.c:1073
+#: rfc2131.c:1121
msgid "lease not found"
msgstr ""
-#: rfc2131.c:1106
+#: rfc2131.c:1154
msgid "address not available"
msgstr ""
-#: rfc2131.c:1117
+#: rfc2131.c:1165
msgid "static lease available"
msgstr ""
-#: rfc2131.c:1121
+#: rfc2131.c:1169
msgid "address reserved"
msgstr ""
-#: rfc2131.c:1129
+#: rfc2131.c:1177
#, c-format
msgid "abandoning lease to %s of %s"
msgstr ""
-#: rfc2131.c:1710
+#: rfc2131.c:1746
#, c-format
msgid "%u tags: %s"
msgstr ""
-#: rfc2131.c:1723
+#: rfc2131.c:1774
#, c-format
msgid "%u bootfile name: %s"
msgstr ""
-#: rfc2131.c:1732
+#: rfc2131.c:1783
#, c-format
msgid "%u server name: %s"
msgstr ""
-#: rfc2131.c:1746
+#: rfc2131.c:1791
#, c-format
msgid "%u next server: %s"
msgstr ""
-#: rfc2131.c:1749
+#: rfc2131.c:1794
#, c-format
msgid "%u broadcast response"
msgstr ""
-#: rfc2131.c:1812
+#: rfc2131.c:1857
#, c-format
msgid "cannot send DHCP/BOOTP option %d: no space left in packet"
msgstr ""
-#: rfc2131.c:2058
+#: rfc2131.c:2097
msgid "PXE menu too large"
msgstr ""
-#: rfc2131.c:2171
+#: rfc2131.c:2253
+#, c-format
+msgid "Ignoring duplicate dhcp-option %d"
+msgstr ""
+
+#: rfc2131.c:2257
#, c-format
msgid "Ignoring domain %s for DHCP host name %s"
msgstr ""
-#: rfc2131.c:2189
+#: rfc2131.c:2275
#, c-format
msgid "%u requested options: %s"
msgstr ""
-#: rfc2131.c:2456
+#: rfc2131.c:2550
#, c-format
msgid "cannot send RFC3925 option: too many options for enterprise number %d"
msgstr ""
@@ -1401,55 +1431,60 @@
msgid "could not register a DBus message handler"
msgstr ""
-#: bpf.c:217
+#: bpf.c:224
#, c-format
msgid "cannot create DHCP BPF socket: %s"
msgstr ""
-#: bpf.c:245
+#: bpf.c:252
#, c-format
msgid "DHCP request for unsupported hardware type (%d) received on %s"
msgstr ""
-#: tftp.c:281
+#: tftp.c:286
msgid "unable to get free port for TFTP"
msgstr ""
-#: tftp.c:296
+#: tftp.c:301
#, c-format
msgid "unsupported request from %s"
msgstr ""
-#: tftp.c:406
+#: tftp.c:411
#, c-format
msgid "file %s not found"
msgstr ""
-#: tftp.c:522
+#: tftp.c:527
#, c-format
msgid "error %d %s received from %s"
msgstr ""
-#: tftp.c:554
+#: tftp.c:559
#, c-format
msgid "failed sending %s to %s"
msgstr ""
-#: tftp.c:568
+#: tftp.c:573
#, c-format
msgid "sent %s to %s"
msgstr ""
-#: log.c:177
+#: log.c:190
#, c-format
msgid "overflow: %d log entries lost"
msgstr ""
-#: log.c:254
+#: log.c:267
#, c-format
msgid "log failed: %s"
msgstr ""
-#: log.c:462
+#: log.c:471
msgid "FAILED to start up"
msgstr ""
+
+#: conntrack.c:65
+#, c-format
+msgid "Conntrack connection mark retrieval failed: %s"
+msgstr ""