import of dnsmasq-2.47.tar.gz
diff --git a/po/it.po b/po/it.po
index 13d060e..0eaf7e8 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: dnsmasq 2.32\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-13 20:23+0000\n"
+"POT-Creation-Date: 2009-02-02 14:07+0000\n"
 "PO-Revision-Date: 2006-05-22 11:09+0100\n"
 "Last-Translator: Simon Kelley <simon@thekelleys.org.uk>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -20,17 +20,17 @@
 msgid "failed to load names from %s: %s"
 msgstr ""
 
-#: cache.c:795 dhcp.c:768
+#: cache.c:795 dhcp.c:780
 #, c-format
 msgid "bad address at %s line %d"
 msgstr ""
 
-#: cache.c:850 dhcp.c:782
+#: cache.c:850 dhcp.c:794
 #, c-format
 msgid "bad name at %s line %d"
 msgstr ""
 
-#: cache.c:857 dhcp.c:848
+#: cache.c:857 dhcp.c:860
 #, c-format
 msgid "read %s - %d addresses"
 msgstr ""
@@ -64,26 +64,26 @@
 msgid "server %s#%d: queries sent %u, retried or failed %u"
 msgstr ""
 
-#: util.c:58
+#: util.c:56
 #, c-format
 msgid "failed to seed the random number generator: %s"
 msgstr ""
 
-#: util.c:166
+#: util.c:164
 msgid "could not get memory"
 msgstr ""
 
-#: util.c:176
+#: util.c:174
 #, c-format
 msgid "cannot create pipe: %s"
 msgstr ""
 
-#: util.c:184
+#: util.c:182
 #, c-format
 msgid "failed to allocate %d bytes"
 msgstr ""
 
-#: util.c:289
+#: util.c:287
 #, c-format
 msgid "infinite"
 msgstr ""
@@ -458,7 +458,7 @@
 msgstr ""
 
 #: option.c:313
-msgid "Set tag if client includes option in request."
+msgid "Set tag if client includes matching option in request."
 msgstr ""
 
 #: option.c:314
@@ -485,266 +485,274 @@
 msgid "Specify alias name for LOCAL DNS name."
 msgstr ""
 
-#: option.c:580
+#: option.c:589
 #, c-format
 msgid ""
 "Usage: dnsmasq [options]\n"
 "\n"
 msgstr ""
 
-#: option.c:582
+#: option.c:591
 #, c-format
 msgid "Use short options only on the command line.\n"
 msgstr ""
 
-#: option.c:584
+#: option.c:593
 #, c-format
 msgid "Valid options are:\n"
 msgstr ""
 
-#: option.c:624
+#: option.c:633
 #, c-format
 msgid "Known DHCP options:\n"
 msgstr ""
 
-#: option.c:697
+#: option.c:710
 msgid "bad dhcp-option"
 msgstr ""
 
-#: option.c:753
+#: option.c:767
 msgid "bad IP address"
 msgstr ""
 
-#: option.c:851
+#: option.c:865
 msgid "bad domain in dhcp-option"
 msgstr ""
 
-#: option.c:909
+#: option.c:923
 msgid "dhcp-option too long"
 msgstr ""
 
-#: option.c:938
+#: option.c:932
+msgid "illegal dhcp-match"
+msgstr ""
+
+#: option.c:967
 msgid "illegal repeated flag"
 msgstr ""
 
-#: option.c:946
+#: option.c:975
 msgid "illegal repeated keyword"
 msgstr ""
 
-#: option.c:983
+#: option.c:1012
 #, c-format
 msgid "cannot access directory %s: %s"
 msgstr ""
 
-#: option.c:1002 tftp.c:348
+#: option.c:1031 tftp.c:348
 #, c-format
 msgid "cannot access %s: %s"
 msgstr ""
 
-#: option.c:1040
+#: option.c:1069
 msgid "only one dhcp-hostsfile allowed"
 msgstr ""
 
-#: option.c:1047
+#: option.c:1076
 msgid "only one dhcp-optsfile allowed"
 msgstr ""
 
-#: option.c:1091
+#: option.c:1120
 msgid "bad MX preference"
 msgstr ""
 
-#: option.c:1095
+#: option.c:1124
 msgid "bad MX name"
 msgstr ""
 
-#: option.c:1109
+#: option.c:1138
 msgid "bad MX target"
 msgstr ""
 
-#: option.c:1120
+#: option.c:1149
 msgid "cannot run scripts under uClinux"
 msgstr ""
 
-#: option.c:1352 option.c:1360
+#: option.c:1375 option.c:1379
 msgid "bad port"
 msgstr ""
 
-#: option.c:1380 option.c:1405
+#: option.c:1398 option.c:1423
 msgid "interface binding not supported"
 msgstr ""
 
-#: option.c:1523
+#: option.c:1541
 msgid "bad port range"
 msgstr ""
 
-#: option.c:1540
+#: option.c:1558
 msgid "bad bridge-interface"
 msgstr ""
 
-#: option.c:1581
+#: option.c:1599
 msgid "bad dhcp-range"
 msgstr ""
 
-#: option.c:1607
+#: option.c:1625
 msgid "only one netid tag allowed"
 msgstr ""
 
-#: option.c:1647
+#: option.c:1665
 msgid "inconsistent DHCP range"
 msgstr ""
 
-#: option.c:1819
+#: option.c:1837
 msgid "bad DHCP host name"
 msgstr ""
 
-#: option.c:1998 option.c:2270
+#: option.c:2012 option.c:2283
 msgid "invalid port number"
 msgstr ""
 
-#: option.c:2093
+#: option.c:2094
+msgid "invalid alias range"
+msgstr ""
+
+#: option.c:2106
 msgid "bad interface name"
 msgstr ""
 
-#: option.c:2116
+#: option.c:2129
 msgid "duplicate CNAME"
 msgstr ""
 
-#: option.c:2133
+#: option.c:2146
 msgid "bad PTR record"
 msgstr ""
 
-#: option.c:2163
+#: option.c:2176
 msgid "bad NAPTR record"
 msgstr ""
 
-#: option.c:2189
+#: option.c:2202
 msgid "TXT record string too long"
 msgstr ""
 
-#: option.c:2193
+#: option.c:2206
 msgid "bad TXT record"
 msgstr ""
 
-#: option.c:2253
+#: option.c:2266
 msgid "bad SRV record"
 msgstr ""
 
-#: option.c:2262
+#: option.c:2275
 msgid "bad SRV target"
 msgstr ""
 
-#: option.c:2277
+#: option.c:2290
 msgid "invalid priority"
 msgstr ""
 
-#: option.c:2284
+#: option.c:2297
 msgid "invalid weight"
 msgstr ""
 
-#: option.c:2320
+#: option.c:2333
 #, c-format
 msgid "files nested too deep in %s"
 msgstr ""
 
-#: option.c:2328 tftp.c:503
+#: option.c:2341 tftp.c:503
 #, c-format
 msgid "cannot read %s: %s"
 msgstr ""
 
-#: option.c:2389
+#: option.c:2402
 msgid "missing \""
 msgstr ""
 
-#: option.c:2436
+#: option.c:2449
 msgid "bad option"
 msgstr ""
 
-#: option.c:2438
+#: option.c:2451
 msgid "extraneous parameter"
 msgstr ""
 
-#: option.c:2440
+#: option.c:2453
 msgid "missing parameter"
 msgstr ""
 
-#: option.c:2448
+#: option.c:2461
 msgid "error"
 msgstr ""
 
-#: option.c:2454
+#: option.c:2467
 #, c-format
 msgid "%s at line %d of %%s"
 msgstr ""
 
-#: option.c:2502 option.c:2532
+#: option.c:2515 option.c:2546
 #, c-format
 msgid "read %s"
 msgstr ""
 
-#: option.c:2599
+#: option.c:2613
 #, c-format
 msgid "Dnsmasq version %s  %s\n"
 msgstr ""
 
-#: option.c:2600
+#: option.c:2614
 #, c-format
 msgid ""
 "Compile time options %s\n"
 "\n"
 msgstr ""
 
-#: option.c:2601
+#: option.c:2615
 #, c-format
 msgid "This software comes with ABSOLUTELY NO WARRANTY.\n"
 msgstr ""
 
-#: option.c:2602
+#: option.c:2616
 #, c-format
 msgid "Dnsmasq is free software, and you are welcome to redistribute it\n"
 msgstr ""
 
-#: option.c:2603
+#: option.c:2617
 #, c-format
 msgid "under the terms of the GNU General Public License, version 2 or 3.\n"
 msgstr ""
 
-#: option.c:2614
+#: option.c:2628
 msgid "try --help"
 msgstr ""
 
-#: option.c:2616
+#: option.c:2630
 msgid "try -w"
 msgstr ""
 
-#: option.c:2619
+#: option.c:2633
 #, c-format
 msgid "bad command line options: %s"
 msgstr ""
 
-#: option.c:2660
+#: option.c:2674
 #, c-format
 msgid "cannot get host-name: %s"
 msgstr ""
 
-#: option.c:2688
+#: option.c:2702
 msgid "only one resolv.conf file allowed in no-poll mode."
 msgstr ""
 
-#: option.c:2698
+#: option.c:2712
 msgid "must have exactly one resolv.conf to read domain from."
 msgstr ""
 
-#: option.c:2701 network.c:721
+#: option.c:2715 network.c:730
 #, c-format
 msgid "failed to read %s: %s"
 msgstr ""
 
-#: option.c:2719
+#: option.c:2733
 #, c-format
 msgid "no search directive found in %s"
 msgstr ""
 
-#: option.c:2740
+#: option.c:2754
 msgid "there must be a default domain when --dhcp-fqdn is set"
 msgstr ""
 
@@ -762,78 +770,78 @@
 msgid "unknown interface %s in bridge-interface"
 msgstr ""
 
-#: network.c:389 dnsmasq.c:186
+#: network.c:393 dnsmasq.c:186
 #, c-format
 msgid "failed to create listening socket: %s"
 msgstr ""
 
-#: network.c:396
+#: network.c:400
 #, c-format
 msgid "failed to set IPV6 options on listening socket: %s"
 msgstr ""
 
-#: network.c:415
+#: network.c:426
 #, c-format
 msgid "failed to bind listening socket for %s: %s"
 msgstr ""
 
-#: network.c:420
+#: network.c:431
 #, c-format
 msgid "failed to listen on socket: %s"
 msgstr ""
 
-#: network.c:432
+#: network.c:443
 #, c-format
 msgid "failed to create TFTP socket: %s"
 msgstr ""
 
-#: network.c:628
+#: network.c:637
 #, c-format
 msgid "failed to bind server socket for %s: %s"
 msgstr ""
 
-#: network.c:661
+#: network.c:670
 #, c-format
 msgid "ignoring nameserver %s - local interface"
 msgstr ""
 
-#: network.c:672
+#: network.c:681
 #, c-format
 msgid "ignoring nameserver %s - cannot make/bind socket: %s"
 msgstr ""
 
-#: network.c:687
+#: network.c:696
 msgid "unqualified"
 msgstr ""
 
-#: network.c:687
+#: network.c:696
 msgid "names"
 msgstr ""
 
-#: network.c:689
+#: network.c:698
 msgid "default"
 msgstr ""
 
-#: network.c:691
+#: network.c:700
 msgid "domain"
 msgstr ""
 
-#: network.c:694
+#: network.c:703
 #, c-format
 msgid "using local addresses only for %s %s"
 msgstr ""
 
-#: network.c:696
+#: network.c:705
 #, c-format
 msgid "using nameserver %s#%d for %s %s"
 msgstr ""
 
-#: network.c:699
+#: network.c:708
 #, c-format
 msgid "using nameserver %s#%d(via %s)"
 msgstr ""
 
-#: network.c:701
+#: network.c:710
 #, c-format
 msgid "using nameserver %s#%d"
 msgstr ""
@@ -1020,21 +1028,21 @@
 msgid "failed to execute %s: %s"
 msgstr ""
 
-#: dnsmasq.c:860
+#: dnsmasq.c:863
 msgid "exiting on receipt of SIGTERM"
 msgstr ""
 
-#: dnsmasq.c:878
+#: dnsmasq.c:881
 #, c-format
 msgid "failed to access %s: %s"
 msgstr ""
 
-#: dnsmasq.c:900
+#: dnsmasq.c:903
 #, c-format
 msgid "reading %s"
 msgstr ""
 
-#: dnsmasq.c:911
+#: dnsmasq.c:914
 #, c-format
 msgid "no servers found in %s, will retry"
 msgstr ""
@@ -1069,37 +1077,37 @@
 msgid "DHCP packet received on %s which has no address"
 msgstr ""
 
-#: dhcp.c:382
+#: dhcp.c:387
 #, c-format
 msgid "DHCP range %s -- %s is not consistent with netmask %s"
 msgstr ""
 
-#: dhcp.c:719
+#: dhcp.c:731
 #, c-format
 msgid "failed to read %s:%s"
 msgstr ""
 
-#: dhcp.c:755
+#: dhcp.c:767
 #, c-format
 msgid "bad line at %s line %d"
 msgstr ""
 
-#: dhcp.c:870
+#: dhcp.c:882
 #, c-format
 msgid "duplicate IP address %s in dhcp-config directive."
 msgstr ""
 
-#: dhcp.c:873
+#: dhcp.c:885
 #, c-format
 msgid "duplicate IP address %s in %s."
 msgstr ""
 
-#: dhcp.c:916
+#: dhcp.c:928
 #, c-format
 msgid "%s has more than one address in hostsfile, using %s for DHCP"
 msgstr ""
 
-#: dhcp.c:921
+#: dhcp.c:933
 #, c-format
 msgid "duplicate IP address %s (%s) in dhcp-config directive"
 msgstr ""
@@ -1128,160 +1136,160 @@
 msgid "failed to write %s: %s (retry in %us)"
 msgstr ""
 
-#: rfc2131.c:315
+#: rfc2131.c:316
 #, c-format
 msgid "no address range available for DHCP request %s %s"
 msgstr ""
 
-#: rfc2131.c:316
+#: rfc2131.c:317
 msgid "with subnet selector"
 msgstr ""
 
-#: rfc2131.c:316
+#: rfc2131.c:317
 msgid "via"
 msgstr ""
 
-#: rfc2131.c:327
+#: rfc2131.c:328
 #, c-format
 msgid "DHCP packet: transaction-id is %u"
 msgstr ""
 
-#: rfc2131.c:332
+#: rfc2131.c:333
 #, c-format
 msgid "Available DHCP subnet: %s/%s"
 msgstr ""
 
-#: rfc2131.c:334
+#: rfc2131.c:335
 #, c-format
 msgid "Available DHCP range: %s -- %s"
 msgstr ""
 
-#: rfc2131.c:362 rfc2131.c:396
+#: rfc2131.c:363 rfc2131.c:397
 msgid "disabled"
 msgstr ""
 
-#: rfc2131.c:411 rfc2131.c:928
+#: rfc2131.c:412 rfc2131.c:960
 msgid "address in use"
 msgstr ""
 
-#: rfc2131.c:425 rfc2131.c:765
+#: rfc2131.c:426 rfc2131.c:797
 msgid "no address available"
 msgstr ""
 
-#: rfc2131.c:432 rfc2131.c:891
+#: rfc2131.c:433 rfc2131.c:923
 msgid "wrong network"
 msgstr ""
 
-#: rfc2131.c:445
+#: rfc2131.c:446
 msgid "no address configured"
 msgstr ""
 
-#: rfc2131.c:451 rfc2131.c:941
+#: rfc2131.c:452 rfc2131.c:973
 msgid "no leases left"
 msgstr ""
 
-#: rfc2131.c:640
+#: rfc2131.c:672
 #, c-format
 msgid "Vendor class: %s"
 msgstr ""
 
-#: rfc2131.c:642
+#: rfc2131.c:674
 #, c-format
 msgid "User class: %s"
 msgstr ""
 
-#: rfc2131.c:683
+#: rfc2131.c:715
 #, c-format
 msgid "disabling DHCP static address %s for %s"
 msgstr ""
 
-#: rfc2131.c:704
+#: rfc2131.c:736
 msgid "unknown lease"
 msgstr ""
 
-#: rfc2131.c:713 rfc2131.c:1058
+#: rfc2131.c:745 rfc2131.c:1089
 msgid "ignored"
 msgstr ""
 
-#: rfc2131.c:736
+#: rfc2131.c:768
 #, c-format
 msgid "not using configured address %s because it is leased to %s"
 msgstr ""
 
-#: rfc2131.c:746
+#: rfc2131.c:778
 #, c-format
 msgid "not using configured address %s because it is in use by the server or relay"
 msgstr ""
 
-#: rfc2131.c:749
+#: rfc2131.c:781
 #, c-format
 msgid "not using configured address %s because it was previously declined"
 msgstr ""
 
-#: rfc2131.c:763 rfc2131.c:934
+#: rfc2131.c:795 rfc2131.c:966
 msgid "no unique-id"
 msgstr ""
 
-#: rfc2131.c:831
+#: rfc2131.c:863
 msgid "wrong server-ID"
 msgstr ""
 
-#: rfc2131.c:850
+#: rfc2131.c:882
 msgid "wrong address"
 msgstr ""
 
-#: rfc2131.c:867
+#: rfc2131.c:899
 msgid "lease not found"
 msgstr ""
 
-#: rfc2131.c:899
+#: rfc2131.c:931
 msgid "address not available"
 msgstr ""
 
-#: rfc2131.c:910
+#: rfc2131.c:942
 msgid "static lease available"
 msgstr ""
 
-#: rfc2131.c:914
+#: rfc2131.c:946
 msgid "address reserved"
 msgstr ""
 
-#: rfc2131.c:922
+#: rfc2131.c:954
 #, c-format
 msgid "abandoning lease to %s of %s"
 msgstr ""
 
-#: rfc2131.c:1356
+#: rfc2131.c:1391
 #, c-format
 msgid "tags: %s"
 msgstr ""
 
-#: rfc2131.c:1443
+#: rfc2131.c:1478
 #, c-format
 msgid "cannot send DHCP/BOOTP option %d: no space left in packet"
 msgstr ""
 
-#: rfc2131.c:1599
+#: rfc2131.c:1678
 #, c-format
 msgid "Ignoring domain %s for DHCP host name %s"
 msgstr ""
 
-#: rfc2131.c:1617
+#: rfc2131.c:1696
 #, c-format
 msgid "requested options: %s"
 msgstr ""
 
-#: rfc2131.c:1666
+#: rfc2131.c:1746
 #, c-format
 msgid "next server: %s"
 msgstr ""
 
-#: rfc2131.c:1690
+#: rfc2131.c:1770
 #, c-format
 msgid "bootfile name: %s"
 msgstr ""
 
-#: rfc2131.c:1693
+#: rfc2131.c:1773
 #, c-format
 msgid "server name: %s"
 msgstr ""
@@ -1296,24 +1304,24 @@
 msgid "netlink returns error: %s"
 msgstr ""
 
-#: dbus.c:115
+#: dbus.c:151
 msgid "attempt to set an IPv6 server address via DBus - no IPv6 support"
 msgstr ""
 
-#: dbus.c:243
+#: dbus.c:287
 msgid "setting upstream servers from DBus"
 msgstr ""
 
-#: dbus.c:281
+#: dbus.c:325
 msgid "could not register a DBus message handler"
 msgstr ""
 
-#: bpf.c:146
+#: bpf.c:150
 #, c-format
 msgid "cannot create DHCP BPF socket: %s"
 msgstr ""
 
-#: bpf.c:174
+#: bpf.c:178
 #, c-format
 msgid "DHCP request for unsupported hardware type (%d) received on %s"
 msgstr ""