From: Michael Tremer Date: Wed, 21 Oct 2015 12:50:07 +0000 (+0100) Subject: Merge remote-tracking branch 'ms/dhcp-rfc2136-broken-down' into next X-Git-Tag: v2.17-core95~40^2~2 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=364452506fcc7170c000d2ac7fe7ae67351a6241 Merge remote-tracking branch 'ms/dhcp-rfc2136-broken-down' into next --- 364452506fcc7170c000d2ac7fe7ae67351a6241 diff --cc doc/language_issues.de index 54d9de9928,e41f48b777..6c47184041 --- a/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 95477de8b8,290da0275e..68e351cab2 --- a/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 91945ffb71,481289a055..84298f4c60 --- a/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 344ef07a32,ae94c2f597..e9915c85be --- a/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 38614d69f5,2109e92651..420a46c8a5 --- a/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 2d3c78b985,efee6ad458..c8769872bc --- a/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 91945ffb71,481289a055..84298f4c60 --- a/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 45316709d7,630bf1ae77..a03f300728 --- a/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 672a49d743,4d048fe69b..5d1ceb7078 --- a/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 97e2d1832d,cb6afdb810..9da01227d7 --- a/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