import of dnsmasq-2.28.tar.gz
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5aa8a7e..defe423 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: dnsmasq 2.26\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-16 20:04+0000\n"
+"POT-Creation-Date: 2006-04-17 11:36+0100\n"
 "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"
@@ -15,56 +15,58 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: cache.c:565
+#: cache.c:570
 #, c-format
 msgid "failed to load names from %s: %m"
 msgstr ""
 
-#: cache.c:601 dhcp.c:754
+#: cache.c:606 dhcp.c:654
 #, c-format
 msgid "bad address at %s line %d"
 msgstr ""
 
-#: cache.c:628 dhcp.c:768
+#: cache.c:633 dhcp.c:668
 #, c-format
 msgid "bad name at %s line %d"
 msgstr ""
 
-#: cache.c:634 dhcp.c:822
+#: cache.c:639 dhcp.c:722
 #, c-format
 msgid "read %s - %d addresses"
 msgstr ""
 
-#: cache.c:670
+#: cache.c:675
 msgid "cleared cache"
 msgstr ""
 
-#: cache.c:723
+#: cache.c:728
 #, 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:767
+#: cache.c:772
 #, c-format
-msgid "cache size %d, %d/%d cache insertions re-used unexpired cache entries."
+msgid ""
+"time %lu, cache size %d, %d/%d cache insertions re-used unexpired cache "
+"entries."
 msgstr ""
 
-#: util.c:149 option.c:1302
+#: util.c:153 option.c:1298
 msgid "could not get memory"
 msgstr ""
 
-#: util.c:172
+#: util.c:176
 #, c-format
 msgid "%s at line %d of %%s"
 msgstr ""
 
-#: util.c:179
+#: util.c:183
 msgid "FAILED to start up"
 msgstr ""
 
-#: util.c:305
+#: util.c:304
 #, c-format
 msgid "infinite"
 msgstr ""
@@ -311,6 +313,10 @@
 msgid "Map MAC address (with wildcards) to option set."
 msgstr ""
 
+#: option.c:182
+msgid "Disable ICMP echo address checking in the DHCP server."
+msgstr ""
+
 #: option.c:396
 msgid "missing \""
 msgstr ""
@@ -392,468 +398,481 @@
 msgid "bad MX target"
 msgstr ""
 
-#: option.c:805 option.c:816
+#: option.c:806 option.c:817
 msgid "bad port"
 msgstr ""
 
-#: option.c:957
+#: option.c:959
 msgid "bad dhcp-range"
 msgstr ""
 
-#: option.c:986
+#: option.c:988
 msgid "only one netid tag allowed"
 msgstr ""
 
-#: option.c:1031
+#: option.c:1033
 msgid "inconsistent DHCP range"
 msgstr ""
 
-#: option.c:1219
+#: option.c:1218
 msgid "bad dhcp-host"
 msgstr ""
 
-#: option.c:1279
+#: option.c:1275
 msgid "bad dhcp-option"
 msgstr ""
 
-#: option.c:1297
+#: option.c:1293
 msgid "bad domain in dhcp-option"
 msgstr ""
 
-#: option.c:1467
+#: option.c:1463
 msgid "dhcp-option too long"
 msgstr ""
 
-#: option.c:1664
+#: option.c:1660
 msgid "bad TXT record"
 msgstr ""
 
-#: option.c:1696
+#: option.c:1692
 msgid "TXT record string too long"
 msgstr ""
 
-#: option.c:1735
+#: option.c:1731
 msgid "bad SRV record"
 msgstr ""
 
-#: option.c:1748
+#: option.c:1744
 msgid "bad SRV target"
 msgstr ""
 
-#: option.c:1760
+#: option.c:1756
 msgid "invalid port number"
 msgstr ""
 
-#: option.c:1771
+#: option.c:1767
 msgid "invalid priority"
 msgstr ""
 
-#: option.c:1782
+#: option.c:1778
 msgid "invalid weight"
 msgstr ""
 
-#: option.c:1807
+#: option.c:1803
 msgid "error"
 msgstr ""
 
-#: option.c:1809
+#: option.c:1805
 #, c-format
 msgid "bad command line options: %s."
 msgstr ""
 
-#: option.c:1853
+#: option.c:1807
+msgid "try --help"
+msgstr ""
+
+#: option.c:1809
+msgid "try -w"
+msgstr ""
+
+#: option.c:1849
 #, c-format
 msgid "cannot get host-name: %s"
 msgstr ""
 
-#: option.c:1882
+#: option.c:1878
 msgid "only one resolv.conf file allowed in no-poll mode."
 msgstr ""
 
-#: option.c:1889
+#: option.c:1885
 msgid "must have exactly one resolv.conf to read domain from."
 msgstr ""
 
-#: option.c:1892 network.c:591
+#: option.c:1888 network.c:513
 #, c-format
 msgid "failed to read %s: %m"
 msgstr ""
 
-#: option.c:1910
+#: option.c:1906
 #, c-format
 msgid "no search directive found in %s"
 msgstr ""
 
-#: forward.c:383
+#: forward.c:381
 #, c-format
 msgid "nameserver %s refused to do a recursive query"
 msgstr ""
 
-#: forward.c:914
+#: forward.c:888
 msgid "forwarding table overflow: check for server loops."
 msgstr ""
 
-#: isc.c:71 dnsmasq.c:482
+#: isc.c:73 dnsmasq.c:446
 #, c-format
 msgid "failed to access %s: %m"
 msgstr ""
 
-#: isc.c:87
+#: isc.c:89
 #, c-format
 msgid "failed to load %s: %m"
 msgstr ""
 
-#: isc.c:91 network.c:595
+#: isc.c:93 network.c:517
 #, c-format
 msgid "reading %s"
 msgstr ""
 
-#: isc.c:113
+#: isc.c:115
 #, c-format
 msgid "bad name in %s"
 msgstr ""
 
-#: isc.c:175
+#: isc.c:177
 #, c-format
 msgid "Ignoring DHCP lease for %s because it has an illegal domain part"
 msgstr ""
 
-#: network.c:418
+#: network.c:340
 #, c-format
 msgid "failed to create listening socket: %s"
 msgstr ""
 
-#: network.c:425
+#: network.c:347
 #, c-format
 msgid "failed to set IPV6 options on listening socket: %s"
 msgstr ""
 
-#: network.c:444
+#: network.c:365
 #, c-format
 msgid "failed to bind listening socket for %s: %s"
 msgstr ""
 
-#: network.c:451
+#: network.c:373
 #, c-format
 msgid "failed to listen on socket: %s"
 msgstr ""
 
-#: network.c:521
+#: network.c:443
 #, c-format
 msgid "ignoring nameserver %s - local interface"
 msgstr ""
 
-#: network.c:530
+#: network.c:452
 #, c-format
 msgid "ignoring nameserver %s - cannot make/bind socket: %m"
 msgstr ""
 
-#: network.c:544
+#: network.c:466
 msgid "domain"
 msgstr ""
 
-#: network.c:546
+#: network.c:468
 msgid "unqualified"
 msgstr ""
 
-#: network.c:546
+#: network.c:468
 msgid "domains"
 msgstr ""
 
-#: network.c:549
+#: network.c:471
 #, c-format
 msgid "using local addresses only for %s %s"
 msgstr ""
 
-#: network.c:551
+#: network.c:473
 #, c-format
 msgid "using nameserver %s#%d for %s %s"
 msgstr ""
 
-#: network.c:554
+#: network.c:476
 #, c-format
 msgid "using nameserver %s#%d"
 msgstr ""
 
-#: dnsmasq.c:115
+#: dnsmasq.c:93
 msgid ""
 "ISC dhcpd integration not available: set HAVE_ISC_READER in src/config.h"
 msgstr ""
 
-#: dnsmasq.c:119
+#: dnsmasq.c:102
 #, c-format
 msgid "failed to find list of interfaces: %s"
 msgstr ""
 
-#: dnsmasq.c:134
+#: dnsmasq.c:117
 #, c-format
 msgid "unknown interface %s"
 msgstr ""
 
-#: dnsmasq.c:140
+#: dnsmasq.c:123
 #, c-format
 msgid "no interface with address %s"
 msgstr ""
 
-#: dnsmasq.c:149
-#, c-format
-msgid "cannot open %s:%s"
-msgstr ""
-
-#: dnsmasq.c:163
+#: dnsmasq.c:141
 msgid "must set exactly one interface on broken systems without IP_RECVIF"
 msgstr ""
 
-#: dnsmasq.c:176 dnsmasq.c:520
+#: dnsmasq.c:154 dnsmasq.c:522
 #, c-format
 msgid "DBus error: %s"
 msgstr ""
 
-#: dnsmasq.c:179
+#: dnsmasq.c:157
 msgid "DBus not available: set HAVE_DBUS in src/config.h"
 msgstr ""
 
-#: dnsmasq.c:292
+#: dnsmasq.c:192
+#, c-format
+msgid "cannot create pipe: %s"
+msgstr ""
+
+#: dnsmasq.c:225
+#, c-format
+msgid "Cannot set capabilities: %s"
+msgstr ""
+
+#: dnsmasq.c:324
 #, c-format
 msgid "started, version %s cachesize %d"
 msgstr ""
 
-#: dnsmasq.c:294
+#: dnsmasq.c:326
 #, c-format
 msgid "started, version %s cache disabled"
 msgstr ""
 
-#: dnsmasq.c:296
+#: dnsmasq.c:328
 #, c-format
 msgid "compile time options: %s"
 msgstr ""
 
-#: dnsmasq.c:302
+#: dnsmasq.c:334
 msgid "DBus support enabled: connected to system bus"
 msgstr ""
 
-#: dnsmasq.c:304
+#: dnsmasq.c:336
 msgid "DBus support enabled: bus connection pending"
 msgstr ""
 
-#: dnsmasq.c:309
+#: dnsmasq.c:341
 msgid "setting --bind-interfaces option because of OS limitations"
 msgstr ""
 
-#: dnsmasq.c:314
+#: dnsmasq.c:346
 #, c-format
 msgid "warning: interface %s does not currently exist"
 msgstr ""
 
-#: dnsmasq.c:331
+#: dnsmasq.c:358
 #, c-format
 msgid "DHCP, static leases only on %.0s%s, lease time %s"
 msgstr ""
 
-#: dnsmasq.c:332
+#: dnsmasq.c:359
 #, c-format
 msgid "DHCP, IP range %s -- %s, lease time %s"
 msgstr ""
 
-#: dnsmasq.c:343
-#, c-format
-msgid "DHCP, %s will be written every %s"
-msgstr ""
-
-#: dnsmasq.c:348
+#: dnsmasq.c:365
 msgid "running as root"
 msgstr ""
 
-#: dnsmasq.c:522
-msgid "connected to system DBus"
-msgstr ""
-
-#: dnsmasq.c:533
+#: dnsmasq.c:497
 msgid "exiting on receipt of SIGTERM"
 msgstr ""
 
-#: dhcp.c:25
+#: dnsmasq.c:524
+msgid "connected to system DBus"
+msgstr ""
+
+#: dhcp.c:32
 #, c-format
 msgid "cannot create DHCP socket : %s"
 msgstr ""
 
-#: dhcp.c:35
+#: dhcp.c:42
 #, c-format
 msgid "failed to set options on DHCP socket: %s"
 msgstr ""
 
-#: dhcp.c:42
+#: dhcp.c:49
 #, c-format
 msgid "failed to set SO_REUSEADDR on DHCP socket: %s"
 msgstr ""
 
-#: dhcp.c:52
+#: dhcp.c:59
 #, c-format
 msgid "failed to bind DHCP server socket: %s"
 msgstr ""
 
-#: dhcp.c:61
+#: dhcp.c:72
 #, c-format
 msgid "cannot create ICMP raw socket: %s."
 msgstr ""
 
-#: dhcp.c:75
-#, c-format
-msgid "cannot create DHCP BPF socket: %s"
-msgstr ""
-
-#: dhcp.c:86
-#, c-format
-msgid ""
-"cannot create DHCP packet socket: %s. Is CONFIG_PACKET enabled in your "
-"kernel?"
-msgstr ""
-
-#: dhcp.c:98
+#: dhcp.c:84
 #, c-format
 msgid "duplicate IP address %s in dhcp-config directive."
 msgstr ""
 
-#: dhcp.c:234
-msgid "Cannot use RTnetlink socket, falling back to ioctl API"
-msgstr ""
-
-#: dhcp.c:345
-#, c-format
-msgid "DHCP request for unsupported hardware type (%d) recieved on %s"
-msgstr ""
-
-#: dhcp.c:413
+#: dhcp.c:306
 #, c-format
 msgid "DHCP range %s -- %s is not consistent with netmask %s"
 msgstr ""
 
-#: dhcp.c:722
+#: dhcp.c:622
 #, c-format
 msgid "failed to read %s:%m"
 msgstr ""
 
-#: dhcp.c:741
+#: dhcp.c:641
 #, c-format
 msgid "bad line at %s line %d"
 msgstr ""
 
-#: dhcp.c:845
+#: dhcp.c:745
 #, c-format
 msgid "duplicate IP address %s (%s) in dhcp-config directive"
 msgstr ""
 
-#: dhcp.c:881
+#: dhcp.c:781
 #, c-format
 msgid "Ignoring DHCP host name %s because it has an illegal domain part"
 msgstr ""
 
-#: lease.c:38
+#: lease.c:34
 #, c-format
 msgid "cannot open or create leases file: %s"
 msgstr ""
 
-#: lease.c:80
+#: lease.c:71
 msgid "too many stored leases"
 msgstr ""
 
-#: lease.c:179
-msgid "failed to write"
+#: lease.c:118
+#, c-format
+msgid "failed to write %s: %m (retry in %ds)"
 msgstr ""
 
-#: rfc2131.c:218
+#: rfc2131.c:247
 #, c-format
 msgid "no address range available for DHCP request %s %s"
 msgstr ""
 
-#: rfc2131.c:219
+#: rfc2131.c:248
 msgid "with subnet selector"
 msgstr ""
 
-#: rfc2131.c:219
+#: rfc2131.c:248
 msgid "via"
 msgstr ""
 
-#: rfc2131.c:240 rfc2131.c:264
+#: rfc2131.c:274 rfc2131.c:298
 msgid "disabled"
 msgstr ""
 
-#: rfc2131.c:275 rfc2131.c:674
+#: rfc2131.c:310 rfc2131.c:731
 msgid "address in use"
 msgstr ""
 
-#: rfc2131.c:278
+#: rfc2131.c:313
 msgid "no address configured"
 msgstr ""
 
-#: rfc2131.c:291 rfc2131.c:546
+#: rfc2131.c:326 rfc2131.c:605
 msgid "no address available"
 msgstr ""
 
-#: rfc2131.c:298 rfc2131.c:677
+#: rfc2131.c:333 rfc2131.c:734
 msgid "no leases left"
 msgstr ""
 
-#: rfc2131.c:301 rfc2131.c:650
+#: rfc2131.c:336 rfc2131.c:707
 msgid "wrong network"
 msgstr ""
 
-#: rfc2131.c:505
+#: rfc2131.c:540
 #, c-format
 msgid "disabling DHCP static address %s"
 msgstr ""
 
-#: rfc2131.c:523
+#: rfc2131.c:558
 msgid "unknown lease"
 msgstr ""
 
-#: rfc2131.c:536 rfc2131.c:749
+#: rfc2131.c:567 rfc2131.c:799
 msgid "ignored"
 msgstr ""
 
-#: rfc2131.c:619
+#: rfc2131.c:581
+#, c-format
+msgid "not using configured address %s because it is leased to %s"
+msgstr ""
+
+#: rfc2131.c:590
+#, c-format
+msgid "not using configured address %s because it is in use by the server"
+msgstr ""
+
+#: rfc2131.c:670
 msgid "wrong address"
 msgstr ""
 
-#: rfc2131.c:632
+#: rfc2131.c:683
 msgid "lease not found"
 msgstr ""
 
-#: rfc2131.c:658
+#: rfc2131.c:715
 msgid "address not available"
 msgstr ""
 
-#: rfc2131.c:667
+#: rfc2131.c:724
 msgid "static lease available"
 msgstr ""
 
-#: rfc2131.c:671
+#: rfc2131.c:728
 msgid "address reserved"
 msgstr ""
 
-#: rfc2131.c:871
+#: rfc2131.c:946
 #, c-format
 msgid "cannot send DHCP option %d: no space left in packet"
 msgstr ""
 
-#: rfc2131.c:1174
+#: rfc2131.c:1247
 #, c-format
 msgid "More than one vendor class matches, using %s"
 msgstr ""
 
 #: netlink.c:41
 #, c-format
-msgid "cannot bind netlink socket: %s"
+msgid "cannot create RTnetlink socket: %s"
+msgstr ""
+
+#: netlink.c:208
+#, c-format
+msgid "RTnetlink returns error: %s"
 msgstr ""
 
 #: dbus.c:112
 msgid "attempt to set an IPv6 server address via DBus - no IPv6 support"
 msgstr ""
 
-#: dbus.c:237
+#: dbus.c:238
 msgid "setting upstream servers from DBus"
 msgstr ""
 
-#: dbus.c:273
+#: dbus.c:274
 msgid "could not register a DBus message handler"
 msgstr ""
+
+#: bpf.c:54
+#, c-format
+msgid "cannot create DHCP BPF socket: %s"
+msgstr ""
+
+#: bpf.c:74
+#, c-format
+msgid "DHCP request for unsupported hardware type (%d) received on %s"
+msgstr ""