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

This commit is contained in:
Michael Tremer
2015-10-21 13:50:07 +01:00
14 changed files with 208 additions and 5 deletions

View File

@@ -99,6 +99,7 @@ WARNING: translation string unused: cache management
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
@@ -674,6 +675,11 @@ 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
@@ -729,6 +735,7 @@ 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