Merge remote-tracking branch 'ms/dhcp-rfc2136-broken-down' into next

diff --cc doc/language_issues.de
index 54d9de99280afdc7674c2060f7696c579eb89b62,e41f48b7771daaac8759099ea634f2a21e7867ea..6c471840410b312fa064b3817a224cae59a7c128
--- 1/doc/language_issues.de
--- 2/doc/language_issues.de
+++ b/doc/language_issues.de
@@@ -82,6 -81,6 +82,7 @@@ WARNING: translation string unused: cac
  WARNING: translation string unused: cache size
  WARNING: translation string unused: calamaris report interval (in minutes)
  WARNING: translation string unused: calc traffic all x minutes
++WARNING: translation string unused: cannot enable both nat traversal and compression
  WARNING: translation string unused: cant enable xtaccess
  WARNING: translation string unused: capsinactive
  WARNING: translation string unused: ccd err iroute

diff --cc doc/language_issues.en
index 95477de8b8867e14e91b401eee8e1680eaf3638d,290da0275e9423f74c88a5aaaf8f465df65f94a4..68e351cab212c41420982c73e0554b316cb764a7
--- 1/doc/language_issues.en
--- 2/doc/language_issues.en
+++ b/doc/language_issues.en
@@@ -100,6 -99,6 +100,7 @@@ WARNING: translation string unused: cac
  WARNING: translation string unused: cache size
  WARNING: translation string unused: calamaris report interval (in minutes)
  WARNING: translation string unused: calc traffic all x minutes
++WARNING: translation string unused: cannot enable both nat traversal and compression
  WARNING: translation string unused: cant enable xtaccess
  WARNING: translation string unused: capsinactive
  WARNING: translation string unused: ccd err iroute

diff --cc doc/language_issues.es
index 91945ffb713843e2d1f9c3f3ebbe801c90bb282c,481289a055b359d208021a818fd6540b77a7e1ae..84298f4c60280835a7af9dc7e0f570503dfd7f80
--- 1/doc/language_issues.es
--- 2/doc/language_issues.es
+++ b/doc/language_issues.es
@@@ -95,6 -95,6 +95,7 @@@ WARNING: translation string unused: cac
  WARNING: translation string unused: cache size
  WARNING: translation string unused: calamaris report interval (in minutes)
  WARNING: translation string unused: calc traffic all x minutes
++WARNING: translation string unused: cannot enable both nat traversal and compression
  WARNING: translation string unused: cant enable xtaccess
  WARNING: translation string unused: capsinactive
  WARNING: translation string unused: cfg restart
@@@ -989,6 -961,6 +995,7 @@@ WARNING: untranslated string: proxy rep
  WARNING: untranslated string: qos enter bandwidths
  WARNING: untranslated string: random number generator daemon
  WARNING: untranslated string: red1
++WARNING: untranslated string: required field
  WARNING: untranslated string: route config changed
  WARNING: untranslated string: routing config added
  WARNING: untranslated string: routing config changed

diff --cc doc/language_issues.fr
index 344ef07a3284b24eca362e06025c7ac9d00eebd4,ae94c2f597d268ffa410e52eb3887ba18dfcee96..e9915c85be893411357b22169d27ef6975c63d26
--- 1/doc/language_issues.fr
--- 2/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@@ -95,6 -95,6 +95,7 @@@ WARNING: translation string unused: cac
  WARNING: translation string unused: cache size
  WARNING: translation string unused: calamaris report interval (in minutes)
  WARNING: translation string unused: calc traffic all x minutes
++WARNING: translation string unused: cannot enable both nat traversal and compression
  WARNING: translation string unused: cant enable xtaccess
  WARNING: translation string unused: capsinactive
  WARNING: translation string unused: cfg restart
@@@ -1000,6 -968,6 +1006,7 @@@ WARNING: untranslated string: proxy rep
  WARNING: untranslated string: qos enter bandwidths
  WARNING: untranslated string: random number generator daemon
  WARNING: untranslated string: red1
++WARNING: untranslated string: required field
  WARNING: untranslated string: route config changed
  WARNING: untranslated string: routing config added
  WARNING: untranslated string: routing config changed

diff --cc doc/language_issues.it
index 38614d69f521f25325797c7649f9375b4a935350,2109e9265117b8b068944b0696257a2586987c22..420a46c8a5b5df50f87eaf557555770cf1d7470b
--- 1/doc/language_issues.it
--- 2/doc/language_issues.it
+++ b/doc/language_issues.it
@@@ -99,6 -99,6 +99,7 @@@ WARNING: translation string unused: cac
  WARNING: translation string unused: cache size
  WARNING: translation string unused: calamaris report interval (in minutes)
  WARNING: translation string unused: calc traffic all x minutes
++WARNING: translation string unused: cannot enable both nat traversal and compression
  WARNING: translation string unused: cant enable xtaccess
  WARNING: translation string unused: capsinactive
  WARNING: translation string unused: ccd err iroute
@@@ -673,23 -671,11 +674,28 @@@ WARNING: untranslated string: advproxy 
  WARNING: untranslated string: advproxy group access control
  WARNING: untranslated string: advproxy group required
  WARNING: untranslated string: bytes
 +WARNING: untranslated string: check all
+ WARNING: untranslated string: dhcp dns enable update
+ WARNING: untranslated string: dhcp dns key name
+ WARNING: untranslated string: dhcp dns update
+ WARNING: untranslated string: dhcp dns update algo
+ WARNING: untranslated string: dhcp dns update secret
 +WARNING: untranslated string: email config
 +WARNING: untranslated string: email empty field
 +WARNING: untranslated string: email invalid
 +WARNING: untranslated string: email invalid mailfqdn
 +WARNING: untranslated string: email invalid mailip
 +WARNING: untranslated string: email invalid mailport
 +WARNING: untranslated string: email mailaddr
 +WARNING: untranslated string: email mailpass
 +WARNING: untranslated string: email mailport
 +WARNING: untranslated string: email mailrcpt
 +WARNING: untranslated string: email mailsender
 +WARNING: untranslated string: email mailuser
 +WARNING: untranslated string: email settings
 +WARNING: untranslated string: email testmail
 +WARNING: untranslated string: email tls
 +WARNING: untranslated string: email usemail
  WARNING: untranslated string: fwdfw err concon
  WARNING: untranslated string: fwdfw err ratecon
  WARNING: untranslated string: fwdfw limitconcon
@@@ -726,9 -697,6 +732,10 @@@ WARNING: untranslated string: non
  WARNING: untranslated string: outgoing compression in bytes per second
  WARNING: untranslated string: outgoing overhead in bytes per second
  WARNING: untranslated string: ovpn add conf
 +WARNING: untranslated string: pptp netconfig
 +WARNING: untranslated string: pptp peer
 +WARNING: untranslated string: pptp route
++WARNING: untranslated string: required field
  WARNING: untranslated string: route config changed
  WARNING: untranslated string: routing config added
  WARNING: untranslated string: routing config changed

diff --cc doc/language_issues.nl
index 2d3c78b985f790de599df397853b10da921f4f81,efee6ad458cb4260a343a6983ad8247db3a889f3..c8769872bc7fbd27c79a1628da1ada180169b464
--- 1/doc/language_issues.nl
--- 2/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@@ -99,6 -99,6 +99,7 @@@ WARNING: translation string unused: cac
  WARNING: translation string unused: cache size
  WARNING: translation string unused: calamaris report interval (in minutes)
  WARNING: translation string unused: calc traffic all x minutes
++WARNING: translation string unused: cannot enable both nat traversal and compression
  WARNING: translation string unused: cant enable xtaccess
  WARNING: translation string unused: capsinactive
  WARNING: translation string unused: ccd err iroute
@@@ -767,10 -738,7 +773,11 @@@ WARNING: untranslated string: ovpn dh u
  WARNING: untranslated string: ovpn generating the root and host certificates
  WARNING: untranslated string: ovpn ha
  WARNING: untranslated string: ovpn hmac
 +WARNING: untranslated string: pptp netconfig
 +WARNING: untranslated string: pptp peer
 +WARNING: untranslated string: pptp route
  WARNING: untranslated string: random number generator daemon
++WARNING: untranslated string: required field
  WARNING: untranslated string: route config changed
  WARNING: untranslated string: routing config added
  WARNING: untranslated string: routing config changed

diff --cc doc/language_issues.pl
index 91945ffb713843e2d1f9c3f3ebbe801c90bb282c,481289a055b359d208021a818fd6540b77a7e1ae..84298f4c60280835a7af9dc7e0f570503dfd7f80
--- 1/doc/language_issues.pl
--- 2/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@@ -95,6 -95,6 +95,7 @@@ WARNING: translation string unused: cac
  WARNING: translation string unused: cache size
  WARNING: translation string unused: calamaris report interval (in minutes)
  WARNING: translation string unused: calc traffic all x minutes
++WARNING: translation string unused: cannot enable both nat traversal and compression
  WARNING: translation string unused: cant enable xtaccess
  WARNING: translation string unused: capsinactive
  WARNING: translation string unused: cfg restart
@@@ -989,6 -961,6 +995,7 @@@ WARNING: untranslated string: proxy rep
  WARNING: untranslated string: qos enter bandwidths
  WARNING: untranslated string: random number generator daemon
  WARNING: untranslated string: red1
++WARNING: untranslated string: required field
  WARNING: untranslated string: route config changed
  WARNING: untranslated string: routing config added
  WARNING: untranslated string: routing config changed

diff --cc doc/language_issues.ru
index 45316709d799369127372b8cb2a5198decda04a1,630bf1ae77dff1d41ed954d1e705505f625077aa..a03f30072889eee82c5596e50a776f2dd6deb891
--- 1/doc/language_issues.ru
--- 2/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@@ -95,6 -95,6 +95,7 @@@ WARNING: translation string unused: cac
  WARNING: translation string unused: cache size
  WARNING: translation string unused: calamaris report interval (in minutes)
  WARNING: translation string unused: calc traffic all x minutes
++WARNING: translation string unused: cannot enable both nat traversal and compression
  WARNING: translation string unused: cant enable xtaccess
  WARNING: translation string unused: capsinactive
  WARNING: translation string unused: cfg restart
@@@ -983,6 -951,6 +989,7 @@@ WARNING: untranslated string: proxy rep
  WARNING: untranslated string: qos enter bandwidths
  WARNING: untranslated string: random number generator daemon
  WARNING: untranslated string: red1
++WARNING: untranslated string: required field
  WARNING: untranslated string: route config changed
  WARNING: untranslated string: routing config added
  WARNING: untranslated string: routing config changed

diff --cc doc/language_issues.tr
index 672a49d7434d15ac4896a88ef7492c8b74fbde76,4d048fe69baad99a072ff8b561434189acf6982b..5d1ceb70787c58b1da579f7c35921b50fbb9f510
--- 1/doc/language_issues.tr
--- 2/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@@ -99,6 -99,6 +99,7 @@@ WARNING: translation string unused: cac
  WARNING: translation string unused: cache size
  WARNING: translation string unused: calamaris report interval (in minutes)
  WARNING: translation string unused: calc traffic all x minutes
++WARNING: translation string unused: cannot enable both nat traversal and compression
  WARNING: translation string unused: cant enable xtaccess
  WARNING: translation string unused: capsinactive
  WARNING: translation string unused: ccd err iroute
@@@ -665,49 -663,19 +666,55 @@@ WARNING: translation string unused: yea
  WARNING: translation string unused: yearly firewallhits
  WARNING: untranslated string: Scan for Songs
  WARNING: untranslated string: bytes
 +WARNING: untranslated string: check all
+ WARNING: untranslated string: dhcp dns enable update
+ WARNING: untranslated string: dhcp dns key name
+ WARNING: untranslated string: dhcp dns update
+ WARNING: untranslated string: dhcp dns update algo
+ WARNING: untranslated string: dhcp dns update secret
 +WARNING: untranslated string: email config
 +WARNING: untranslated string: email empty field
 +WARNING: untranslated string: email invalid
 +WARNING: untranslated string: email invalid mailfqdn
 +WARNING: untranslated string: email invalid mailip
 +WARNING: untranslated string: email invalid mailport
 +WARNING: untranslated string: email mailaddr
 +WARNING: untranslated string: email mailpass
 +WARNING: untranslated string: email mailport
 +WARNING: untranslated string: email mailrcpt
 +WARNING: untranslated string: email mailsender
 +WARNING: untranslated string: email mailuser
 +WARNING: untranslated string: email settings
 +WARNING: untranslated string: email testmail
 +WARNING: untranslated string: email tls
 +WARNING: untranslated string: email usemail
 +WARNING: untranslated string: fwhost addgeoipgrp
 +WARNING: untranslated string: fwhost cust geoipgroup
 +WARNING: untranslated string: fwhost cust geoipgrp
 +WARNING: untranslated string: fwhost cust geoiplocation
  WARNING: untranslated string: fwhost err hostip
 +WARNING: untranslated string: fwhost newgeoipgrp
 +WARNING: untranslated string: geoip
 +WARNING: untranslated string: geoipblock
 +WARNING: untranslated string: geoipblock block countries
 +WARNING: untranslated string: geoipblock configuration
 +WARNING: untranslated string: geoipblock country is allowed
 +WARNING: untranslated string: geoipblock country is blocked
 +WARNING: untranslated string: geoipblock enable feature
 +WARNING: untranslated string: ike lifetime should be between 1 and 8 hours
  WARNING: untranslated string: incoming compression in bytes per second
  WARNING: untranslated string: incoming overhead in bytes per second
 +WARNING: untranslated string: info messages
  WARNING: untranslated string: invalid input for valid till days
  WARNING: untranslated string: no data
 +WARNING: untranslated string: none
  WARNING: untranslated string: outgoing compression in bytes per second
  WARNING: untranslated string: outgoing overhead in bytes per second
  WARNING: untranslated string: ovpn add conf
 +WARNING: untranslated string: pptp netconfig
 +WARNING: untranslated string: pptp peer
 +WARNING: untranslated string: pptp route
++WARNING: untranslated string: required field
  WARNING: untranslated string: route config changed
  WARNING: untranslated string: routing config added
  WARNING: untranslated string: routing config changed

diff --cc doc/language_missings
index 97e2d1832d34807ac04d1e85888463192256ea0d,cb6afdb810144fb71dc0620f78346c976fe1a0bc..9da01227d7fbd927b53e7da8509dfb9d51ae425e
--- 1/doc/language_missings
--- 2/doc/language_missings
+++ b/doc/language_missings
@@@ -468,9 -433,8 +473,10 @@@
  < qos enter bandwidths
  < random number generator daemon
  < red1
++< required field
  < samba join a domain
  < samba join domain
 +< search
  < server restart
  < show dh
  < snat new source ip address
@@@ -1077,9 -1011,8 +1088,10 @@@
  < qos enter bandwidths
  < random number generator daemon
  < red1
++< required field
  < samba join a domain
  < samba join domain
 +< search
  < server restart
  < Set time on boot
  < show dh
@@@ -1650,9 -1543,8 +1667,10 @@@
  < qos enter bandwidths
  < random number generator daemon
  < red1
++< required field
  < samba join a domain
  < samba join domain
 +< search
  < server restart
  < show dh
  < snat new source ip address
@@@ -2226,9 -2078,8 +2249,10 @@@
  < qos enter bandwidths
  < random number generator daemon
  < red1
++< required field
  < samba join a domain
  < samba join domain
 +< search
  < server restart
  < show dh
  < snat new source ip address

diff --cc html/cgi-bin/dhcp.cgi
Simple merge

diff --cc langs/de/cgi-bin/de.pl
Simple merge

diff --cc langs/en/cgi-bin/en.pl
Simple merge

diff --cc src/initscripts/init.d/dnsmasq
Simple merge