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;hp=-c Merge remote-tracking branch 'ms/dhcp-rfc2136-broken-down' into next --- 364452506fcc7170c000d2ac7fe7ae67351a6241 diff --combined doc/language_issues.de index 54d9de9928,e41f48b777..6c47184041 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@@ -75,13 -75,12 +75,14 @@@ WARNING: translation string unused: ba WARNING: translation string unused: behind a proxy WARNING: translation string unused: bitrate WARNING: translation string unused: bleeding rules +WARNING: translation string unused: block WARNING: translation string unused: blue access use hint WARNING: translation string unused: blue interface 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 @@@ -164,11 -163,7 +165,11 @@@ WARNING: translation string unused: edi WARNING: translation string unused: edit service WARNING: translation string unused: editor WARNING: translation string unused: eg +WARNING: translation string unused: email error WARNING: translation string unused: email server can not be empty +WARNING: translation string unused: email subject +WARNING: translation string unused: email success +WARNING: translation string unused: email text WARNING: translation string unused: enable javascript WARNING: translation string unused: enable wildcards WARNING: translation string unused: enabled on @@@ -248,7 -243,6 +249,7 @@@ WARNING: translation string unused: fwh WARNING: translation string unused: fwhost attention WARNING: translation string unused: fwhost blue WARNING: translation string unused: fwhost changeremark +WARNING: translation string unused: fwhost cust geoip WARNING: translation string unused: fwhost err addrgrp WARNING: translation string unused: fwhost err hostorip WARNING: translation string unused: fwhost err mac @@@ -264,9 -258,6 +265,9 @@@ WARNING: translation string unused: fwh WARNING: translation string unused: gen static key WARNING: translation string unused: generate WARNING: translation string unused: genkey +WARNING: translation string unused: geoipblock country code +WARNING: translation string unused: geoipblock country name +WARNING: translation string unused: geoipblock flag WARNING: translation string unused: green interface WARNING: translation string unused: gz with key WARNING: translation string unused: hint @@@ -284,7 -275,6 +285,7 @@@ WARNING: translation string unused: ik WARNING: translation string unused: ike grouptype WARNING: translation string unused: ike integrity WARNING: translation string unused: ike lifetime +WARNING: translation string unused: ike lifetime should be between 1 and 24 hours WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@@ -427,7 -417,6 +428,7 @@@ WARNING: translation string unused: out WARNING: translation string unused: outgoing firewall warning WARNING: translation string unused: override mtu WARNING: translation string unused: ovpn config +WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn engines WARNING: translation string unused: ovpn log @@@ -586,8 -575,6 +587,8 @@@ WARNING: translation string unused: tra WARNING: translation string unused: transparent on WARNING: translation string unused: umount WARNING: translation string unused: umount removable media before to unplug +WARNING: translation string unused: unblock +WARNING: translation string unused: unblock all WARNING: translation string unused: unencrypted WARNING: translation string unused: update transcript WARNING: translation string unused: updates @@@ -644,17 -631,11 +645,17 @@@ WARNING: untranslated string: byte WARNING: untranslated string: community rules WARNING: untranslated string: dead peer detection WARNING: untranslated string: emerging rules +WARNING: untranslated string: fwhost cust geoipgrp WARNING: untranslated string: fwhost err hostip +WARNING: untranslated string: ike lifetime should be between 1 and 8 hours +WARNING: untranslated string: info messages WARNING: untranslated string: no data +WARNING: untranslated string: none WARNING: untranslated string: qos add subclass WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: show tls-auth key +WARNING: untranslated string: vpn force mobike +WARNING: untranslated string: vpn statistics n2n diff --combined doc/language_issues.en index 95477de8b8,290da0275e..68e351cab2 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@@ -93,13 -93,12 +93,14 @@@ WARNING: translation string unused: bew WARNING: translation string unused: bewan adsl usb WARNING: translation string unused: bitrate WARNING: translation string unused: bleeding rules +WARNING: translation string unused: block WARNING: translation string unused: blue access use hint WARNING: translation string unused: blue interface 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 @@@ -187,11 -186,7 +188,11 @@@ WARNING: translation string unused: edi WARNING: translation string unused: edit service WARNING: translation string unused: editor WARNING: translation string unused: eg +WARNING: translation string unused: email error WARNING: translation string unused: email server can not be empty +WARNING: translation string unused: email subject +WARNING: translation string unused: email success +WARNING: translation string unused: email text WARNING: translation string unused: enable javascript WARNING: translation string unused: enable wildcards WARNING: translation string unused: enabled on @@@ -271,7 -266,6 +272,7 @@@ WARNING: translation string unused: fwh WARNING: translation string unused: fwhost attention WARNING: translation string unused: fwhost blue WARNING: translation string unused: fwhost changeremark +WARNING: translation string unused: fwhost cust geoip WARNING: translation string unused: fwhost err addrgrp WARNING: translation string unused: fwhost err hostorip WARNING: translation string unused: fwhost err mac @@@ -289,9 -283,6 +290,9 @@@ WARNING: translation string unused: g.l WARNING: translation string unused: gen static key WARNING: translation string unused: generate WARNING: translation string unused: genkey +WARNING: translation string unused: geoipblock country code +WARNING: translation string unused: geoipblock country name +WARNING: translation string unused: geoipblock flag WARNING: translation string unused: green interface WARNING: translation string unused: gz with key WARNING: translation string unused: hint @@@ -309,7 -300,6 +310,7 @@@ WARNING: translation string unused: ik WARNING: translation string unused: ike grouptype WARNING: translation string unused: ike integrity WARNING: translation string unused: ike lifetime +WARNING: translation string unused: ike lifetime should be between 1 and 24 hours WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@@ -454,7 -444,6 +455,7 @@@ WARNING: translation string unused: out WARNING: translation string unused: outgoing firewall warning WARNING: translation string unused: override mtu WARNING: translation string unused: ovpn config +WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn engines WARNING: translation string unused: ovpn log @@@ -619,8 -608,6 +620,8 @@@ WARNING: translation string unused: tra WARNING: translation string unused: transparent on WARNING: translation string unused: umount WARNING: translation string unused: umount removable media before to unplug +WARNING: translation string unused: unblock +WARNING: translation string unused: unblock all WARNING: translation string unused: unencrypted WARNING: translation string unused: update transcript WARNING: translation string unused: updates @@@ -676,13 -663,9 +677,13 @@@ WARNING: translation string unused: yea WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Scan for Songs WARNING: untranslated string: bytes +WARNING: untranslated string: fwhost cust geoipgrp WARNING: untranslated string: fwhost err hostip +WARNING: untranslated string: ike lifetime should be between 1 and 8 hours +WARNING: untranslated string: info messages WARNING: untranslated string: no data WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table +WARNING: untranslated string: vpn statistics n2n diff --combined 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 @@@ -233,9 -233,6 +234,9 @@@ WARNING: translation string unused: g.l WARNING: translation string unused: gen static key WARNING: translation string unused: generate WARNING: translation string unused: genkey +WARNING: translation string unused: geoipblock country code +WARNING: translation string unused: geoipblock country name +WARNING: translation string unused: geoipblock flag WARNING: translation string unused: green interface WARNING: translation string unused: gz with key WARNING: translation string unused: hint @@@ -253,7 -250,6 +254,7 @@@ WARNING: translation string unused: ik WARNING: translation string unused: ike grouptype WARNING: translation string unused: ike integrity WARNING: translation string unused: ike lifetime +WARNING: translation string unused: ike lifetime should be between 1 and 24 hours WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@@ -382,7 -378,6 +383,7 @@@ WARNING: translation string unused: out WARNING: translation string unused: outgoing firewall warning WARNING: translation string unused: override mtu WARNING: translation string unused: ovpn config +WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn log WARNING: translation string unused: ovpn_fastio @@@ -654,7 -649,6 +655,7 @@@ WARNING: untranslated string: ccd non WARNING: untranslated string: ccd routes WARNING: untranslated string: ccd subnet WARNING: untranslated string: ccd used +WARNING: untranslated string: check all WARNING: untranslated string: count WARNING: untranslated string: countries WARNING: untranslated string: country codes and flags @@@ -668,6 -662,11 +669,11 @@@ WARNING: untranslated string: dh key mo WARNING: untranslated string: dh key warn WARNING: untranslated string: dh key warn1 WARNING: untranslated string: dh parameter + 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: dnat address WARNING: untranslated string: dns servers WARNING: untranslated string: dnsforward @@@ -690,22 -689,6 +696,22 @@@ WARNING: untranslated string: drop acti WARNING: untranslated string: drop action2 WARNING: untranslated string: drop forward WARNING: untranslated string: drop outgoing +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: emerging rules WARNING: untranslated string: encryption WARNING: untranslated string: entropy @@@ -815,7 -798,6 +821,7 @@@ WARNING: untranslated string: fwdfw wd_ WARNING: untranslated string: fwdfw wd_tue WARNING: untranslated string: fwdfw wd_wed WARNING: untranslated string: fwhost OpenVPN N-2-N +WARNING: untranslated string: fwhost addgeoipgrp WARNING: untranslated string: fwhost addgrp WARNING: untranslated string: fwhost addgrpname WARNING: untranslated string: fwhost addhost @@@ -828,9 -810,6 +834,9 @@@ WARNING: untranslated string: fwhost cc WARNING: untranslated string: fwhost ccdnet WARNING: untranslated string: fwhost change WARNING: untranslated string: fwhost cust addr +WARNING: untranslated string: fwhost cust geoipgroup +WARNING: untranslated string: fwhost cust geoipgrp +WARNING: untranslated string: fwhost cust geoiplocation WARNING: untranslated string: fwhost cust grp WARNING: untranslated string: fwhost cust net WARNING: untranslated string: fwhost cust service @@@ -870,7 -849,6 +876,7 @@@ WARNING: untranslated string: fwhost ip WARNING: untranslated string: fwhost ipsec net WARNING: untranslated string: fwhost menu WARNING: untranslated string: fwhost netaddress +WARNING: untranslated string: fwhost newgeoipgrp WARNING: untranslated string: fwhost newgrp WARNING: untranslated string: fwhost newhost WARNING: untranslated string: fwhost newnet @@@ -889,13 -867,11 +895,13 @@@ WARNING: untranslated string: gen d WARNING: untranslated string: generate dh key WARNING: untranslated string: grouptype WARNING: untranslated string: hardware support +WARNING: untranslated string: ike lifetime should be between 1 and 8 hours WARNING: untranslated string: imei WARNING: untranslated string: imsi WARNING: untranslated string: incoming compression in bytes per second WARNING: untranslated string: incoming firewall access WARNING: untranslated string: incoming overhead in bytes per second +WARNING: untranslated string: info messages WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout @@@ -934,7 -910,6 +940,7 @@@ WARNING: untranslated string: most pref WARNING: untranslated string: nameserver WARNING: untranslated string: no data WARNING: untranslated string: no hardware random number generator +WARNING: untranslated string: none WARNING: untranslated string: not a valid dh key WARNING: untranslated string: notice WARNING: untranslated string: openvpn default @@@ -978,9 -953,6 +984,9 @@@ WARNING: untranslated string: ovpn rout WARNING: untranslated string: p2p block WARNING: untranslated string: p2p block save notice WARNING: untranslated string: pakfire ago +WARNING: untranslated string: pptp netconfig +WARNING: untranslated string: pptp peer +WARNING: untranslated string: pptp route WARNING: untranslated string: proxy reports WARNING: untranslated string: proxy reports daily WARNING: untranslated string: proxy reports monthly @@@ -989,13 -961,12 +995,14 @@@ 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 WARNING: untranslated string: routing table WARNING: untranslated string: samba join a domain WARNING: untranslated string: samba join domain +WARNING: untranslated string: search WARNING: untranslated string: server restart WARNING: untranslated string: show dh WARNING: untranslated string: show tls-auth key @@@ -1057,18 -1028,13 +1064,18 @@@ WARNING: untranslated string: tor traff WARNING: untranslated string: tor traffic limit soft WARNING: untranslated string: tor traffic read written WARNING: untranslated string: tor use exit nodes +WARNING: untranslated string: uncheck all WARNING: untranslated string: uplink WARNING: untranslated string: upload dh key WARNING: untranslated string: uptime load average WARNING: untranslated string: urlfilter redirect template WARNING: untranslated string: vendor WARNING: untranslated string: visit us at +WARNING: untranslated string: vpn force mobike WARNING: untranslated string: vpn keyexchange +WARNING: untranslated string: vpn statistic n2n +WARNING: untranslated string: vpn statistic rw +WARNING: untranslated string: vpn statistics n2n WARNING: untranslated string: wlan client WARNING: untranslated string: wlan client advanced settings WARNING: untranslated string: wlan client and diff --combined 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 @@@ -250,7 -250,6 +251,7 @@@ WARNING: translation string unused: ik WARNING: translation string unused: ike grouptype WARNING: translation string unused: ike integrity WARNING: translation string unused: ike lifetime +WARNING: translation string unused: ike lifetime should be between 1 and 24 hours WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@@ -390,7 -389,6 +391,7 @@@ WARNING: translation string unused: out WARNING: translation string unused: outgoing firewall warning WARNING: translation string unused: override mtu WARNING: translation string unused: ovpn config +WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn log WARNING: translation string unused: ovpn_fastio @@@ -661,7 -659,6 +662,7 @@@ WARNING: untranslated string: ccd non WARNING: untranslated string: ccd routes WARNING: untranslated string: ccd subnet WARNING: untranslated string: ccd used +WARNING: untranslated string: check all WARNING: untranslated string: count WARNING: untranslated string: countries WARNING: untranslated string: country codes and flags @@@ -675,6 -672,11 +676,11 @@@ WARNING: untranslated string: dh key mo WARNING: untranslated string: dh key warn WARNING: untranslated string: dh key warn1 WARNING: untranslated string: dh parameter + 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: dnat address WARNING: untranslated string: dns address deleted txt WARNING: untranslated string: dns servers @@@ -698,22 -700,6 +704,22 @@@ WARNING: untranslated string: drop acti WARNING: untranslated string: drop action2 WARNING: untranslated string: drop forward WARNING: untranslated string: drop outgoing +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: emerging rules WARNING: untranslated string: encryption WARNING: untranslated string: entropy @@@ -823,7 -809,6 +829,7 @@@ WARNING: untranslated string: fwdfw wd_ WARNING: untranslated string: fwdfw wd_tue WARNING: untranslated string: fwdfw wd_wed WARNING: untranslated string: fwhost OpenVPN N-2-N +WARNING: untranslated string: fwhost addgeoipgrp WARNING: untranslated string: fwhost addgrp WARNING: untranslated string: fwhost addgrpname WARNING: untranslated string: fwhost addhost @@@ -836,9 -821,6 +842,9 @@@ WARNING: untranslated string: fwhost cc WARNING: untranslated string: fwhost ccdnet WARNING: untranslated string: fwhost change WARNING: untranslated string: fwhost cust addr +WARNING: untranslated string: fwhost cust geoipgroup +WARNING: untranslated string: fwhost cust geoipgrp +WARNING: untranslated string: fwhost cust geoiplocation WARNING: untranslated string: fwhost cust grp WARNING: untranslated string: fwhost cust net WARNING: untranslated string: fwhost cust service @@@ -878,7 -860,6 +884,7 @@@ WARNING: untranslated string: fwhost ip WARNING: untranslated string: fwhost ipsec net WARNING: untranslated string: fwhost menu WARNING: untranslated string: fwhost netaddress +WARNING: untranslated string: fwhost newgeoipgrp WARNING: untranslated string: fwhost newgrp WARNING: untranslated string: fwhost newhost WARNING: untranslated string: fwhost newnet @@@ -895,22 -876,13 +901,22 @@@ WARNING: untranslated string: fwhost us WARNING: untranslated string: fwhost welcome WARNING: untranslated string: gen dh WARNING: untranslated string: generate dh key +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: grouptype WARNING: untranslated string: hardware support +WARNING: untranslated string: ike lifetime should be between 1 and 8 hours WARNING: untranslated string: imei WARNING: untranslated string: imsi WARNING: untranslated string: incoming compression in bytes per second WARNING: untranslated string: incoming firewall access WARNING: untranslated string: incoming overhead in bytes per second +WARNING: untranslated string: info messages WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout @@@ -949,7 -921,6 +955,7 @@@ WARNING: untranslated string: most pref WARNING: untranslated string: nameserver WARNING: untranslated string: no data WARNING: untranslated string: no hardware random number generator +WARNING: untranslated string: none WARNING: untranslated string: not a valid dh key WARNING: untranslated string: notice WARNING: untranslated string: ntp common settings @@@ -989,9 -960,6 +995,9 @@@ WARNING: untranslated string: ovpn por WARNING: untranslated string: p2p block WARNING: untranslated string: p2p block save notice WARNING: untranslated string: pakfire ago +WARNING: untranslated string: pptp netconfig +WARNING: untranslated string: pptp peer +WARNING: untranslated string: pptp route WARNING: untranslated string: proxy reports WARNING: untranslated string: proxy reports daily WARNING: untranslated string: proxy reports monthly @@@ -1000,13 -968,12 +1006,14 @@@ 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 WARNING: untranslated string: routing table WARNING: untranslated string: samba join a domain WARNING: untranslated string: samba join domain +WARNING: untranslated string: search WARNING: untranslated string: server restart WARNING: untranslated string: show dh WARNING: untranslated string: show tls-auth key @@@ -1069,7 -1036,6 +1076,7 @@@ WARNING: untranslated string: tor traff WARNING: untranslated string: tor traffic limit soft WARNING: untranslated string: tor traffic read written WARNING: untranslated string: tor use exit nodes +WARNING: untranslated string: uncheck all WARNING: untranslated string: uplink WARNING: untranslated string: upload dh key WARNING: untranslated string: upload new ruleset @@@ -1079,11 -1045,7 +1086,11 @@@ WARNING: untranslated string: urlfilte WARNING: untranslated string: urlfilter redirect template WARNING: untranslated string: vendor WARNING: untranslated string: visit us at +WARNING: untranslated string: vpn force mobike WARNING: untranslated string: vpn keyexchange +WARNING: untranslated string: vpn statistic n2n +WARNING: untranslated string: vpn statistic rw +WARNING: untranslated string: vpn statistics n2n WARNING: untranslated string: wlan client WARNING: untranslated string: wlan client advanced settings WARNING: untranslated string: wlan client and diff --combined 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 @@@ -300,7 -300,6 +301,7 @@@ WARNING: translation string unused: ik WARNING: translation string unused: ike grouptype WARNING: translation string unused: ike integrity WARNING: translation string unused: ike lifetime +WARNING: translation string unused: ike lifetime should be between 1 and 24 hours WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@@ -445,7 -444,6 +446,7 @@@ WARNING: translation string unused: out WARNING: translation string unused: outgoing firewall warning WARNING: translation string unused: override mtu WARNING: translation string unused: ovpn config +WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn engines WARNING: translation string unused: ovpn log @@@ -673,46 -671,20 +674,51 @@@ 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 WARNING: untranslated string: fwdfw maxconcon WARNING: untranslated string: fwdfw numcon WARNING: untranslated string: fwdfw ratelimit +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: masquerade blue WARNING: untranslated string: masquerade green @@@ -722,22 -694,12 +728,23 @@@ WARNING: untranslated string: masquerad WARNING: untranslated string: masquerading enabled WARNING: untranslated string: messages 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 WARNING: untranslated string: routing table WARNING: untranslated string: samba join a domain WARNING: untranslated string: samba join domain +WARNING: untranslated string: search +WARNING: untranslated string: uncheck all +WARNING: untranslated string: vpn force mobike +WARNING: untranslated string: vpn statistic n2n +WARNING: untranslated string: vpn statistic rw +WARNING: untranslated string: vpn statistics n2n diff --combined 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 @@@ -299,7 -299,6 +300,7 @@@ WARNING: translation string unused: ik WARNING: translation string unused: ike grouptype WARNING: translation string unused: ike integrity WARNING: translation string unused: ike lifetime +WARNING: translation string unused: ike lifetime should be between 1 and 24 hours WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@@ -443,7 -442,6 +444,7 @@@ WARNING: translation string unused: out WARNING: translation string unused: outgoing firewall warning WARNING: translation string unused: override mtu WARNING: translation string unused: ovpn config +WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn log WARNING: translation string unused: ovpn_fastio @@@ -672,13 -670,17 +673,18 @@@ WARNING: untranslated string: advproxy WARNING: untranslated string: atm device WARNING: untranslated string: bytes WARNING: untranslated string: capabilities +WARNING: untranslated string: check all WARNING: untranslated string: default WARNING: untranslated string: dh WARNING: untranslated string: dh key move failed WARNING: untranslated string: dh key warn WARNING: untranslated string: dh key warn1 WARNING: untranslated string: dh parameter + 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: dns servers WARNING: untranslated string: dnssec aware WARNING: untranslated string: dnssec information @@@ -686,22 -688,6 +692,22 @@@ WARNING: untranslated string: dnssec no WARNING: untranslated string: dnssec validating WARNING: untranslated string: download tls-auth key WARNING: untranslated string: drop outgoing +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: firewall logs country WARNING: untranslated string: fwdfw err concon WARNING: untranslated string: fwdfw err ratecon @@@ -709,27 -695,13 +715,27 @@@ WARNING: untranslated string: fwdfw lim WARNING: untranslated string: fwdfw maxconcon WARNING: untranslated string: fwdfw numcon WARNING: untranslated string: fwdfw ratelimit +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: gen dh WARNING: untranslated string: generate dh key +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: imei WARNING: untranslated string: imsi 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: masquerade blue WARNING: untranslated string: masquerade green @@@ -754,7 -726,6 +760,7 @@@ WARNING: untranslated string: modem sta WARNING: untranslated string: monitor interface WARNING: untranslated string: nameserver WARNING: untranslated string: no data +WARNING: untranslated string: none WARNING: untranslated string: not a valid dh key WARNING: untranslated string: outgoing compression in bytes per second WARNING: untranslated string: outgoing overhead in bytes per second @@@ -767,26 -738,17 +773,27 @@@ 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 WARNING: untranslated string: routing table WARNING: untranslated string: samba join a domain WARNING: untranslated string: samba join domain +WARNING: untranslated string: search WARNING: untranslated string: show dh WARNING: untranslated string: show tls-auth key WARNING: untranslated string: software version WARNING: untranslated string: source ip country WARNING: untranslated string: ta key +WARNING: untranslated string: uncheck all WARNING: untranslated string: upload dh key WARNING: untranslated string: vendor +WARNING: untranslated string: vpn force mobike +WARNING: untranslated string: vpn statistic n2n +WARNING: untranslated string: vpn statistic rw +WARNING: untranslated string: vpn statistics n2n diff --combined 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 @@@ -233,9 -233,6 +234,9 @@@ WARNING: translation string unused: g.l WARNING: translation string unused: gen static key WARNING: translation string unused: generate WARNING: translation string unused: genkey +WARNING: translation string unused: geoipblock country code +WARNING: translation string unused: geoipblock country name +WARNING: translation string unused: geoipblock flag WARNING: translation string unused: green interface WARNING: translation string unused: gz with key WARNING: translation string unused: hint @@@ -253,7 -250,6 +254,7 @@@ WARNING: translation string unused: ik WARNING: translation string unused: ike grouptype WARNING: translation string unused: ike integrity WARNING: translation string unused: ike lifetime +WARNING: translation string unused: ike lifetime should be between 1 and 24 hours WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@@ -382,7 -378,6 +383,7 @@@ WARNING: translation string unused: out WARNING: translation string unused: outgoing firewall warning WARNING: translation string unused: override mtu WARNING: translation string unused: ovpn config +WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn log WARNING: translation string unused: ovpn_fastio @@@ -654,7 -649,6 +655,7 @@@ WARNING: untranslated string: ccd non WARNING: untranslated string: ccd routes WARNING: untranslated string: ccd subnet WARNING: untranslated string: ccd used +WARNING: untranslated string: check all WARNING: untranslated string: count WARNING: untranslated string: countries WARNING: untranslated string: country codes and flags @@@ -668,6 -662,11 +669,11 @@@ WARNING: untranslated string: dh key mo WARNING: untranslated string: dh key warn WARNING: untranslated string: dh key warn1 WARNING: untranslated string: dh parameter + 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: dnat address WARNING: untranslated string: dns servers WARNING: untranslated string: dnsforward @@@ -690,22 -689,6 +696,22 @@@ WARNING: untranslated string: drop acti WARNING: untranslated string: drop action2 WARNING: untranslated string: drop forward WARNING: untranslated string: drop outgoing +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: emerging rules WARNING: untranslated string: encryption WARNING: untranslated string: entropy @@@ -815,7 -798,6 +821,7 @@@ WARNING: untranslated string: fwdfw wd_ WARNING: untranslated string: fwdfw wd_tue WARNING: untranslated string: fwdfw wd_wed WARNING: untranslated string: fwhost OpenVPN N-2-N +WARNING: untranslated string: fwhost addgeoipgrp WARNING: untranslated string: fwhost addgrp WARNING: untranslated string: fwhost addgrpname WARNING: untranslated string: fwhost addhost @@@ -828,9 -810,6 +834,9 @@@ WARNING: untranslated string: fwhost cc WARNING: untranslated string: fwhost ccdnet WARNING: untranslated string: fwhost change WARNING: untranslated string: fwhost cust addr +WARNING: untranslated string: fwhost cust geoipgroup +WARNING: untranslated string: fwhost cust geoipgrp +WARNING: untranslated string: fwhost cust geoiplocation WARNING: untranslated string: fwhost cust grp WARNING: untranslated string: fwhost cust net WARNING: untranslated string: fwhost cust service @@@ -870,7 -849,6 +876,7 @@@ WARNING: untranslated string: fwhost ip WARNING: untranslated string: fwhost ipsec net WARNING: untranslated string: fwhost menu WARNING: untranslated string: fwhost netaddress +WARNING: untranslated string: fwhost newgeoipgrp WARNING: untranslated string: fwhost newgrp WARNING: untranslated string: fwhost newhost WARNING: untranslated string: fwhost newnet @@@ -889,13 -867,11 +895,13 @@@ WARNING: untranslated string: gen d WARNING: untranslated string: generate dh key WARNING: untranslated string: grouptype WARNING: untranslated string: hardware support +WARNING: untranslated string: ike lifetime should be between 1 and 8 hours WARNING: untranslated string: imei WARNING: untranslated string: imsi WARNING: untranslated string: incoming compression in bytes per second WARNING: untranslated string: incoming firewall access WARNING: untranslated string: incoming overhead in bytes per second +WARNING: untranslated string: info messages WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout @@@ -934,7 -910,6 +940,7 @@@ WARNING: untranslated string: most pref WARNING: untranslated string: nameserver WARNING: untranslated string: no data WARNING: untranslated string: no hardware random number generator +WARNING: untranslated string: none WARNING: untranslated string: not a valid dh key WARNING: untranslated string: notice WARNING: untranslated string: openvpn default @@@ -978,9 -953,6 +984,9 @@@ WARNING: untranslated string: ovpn rout WARNING: untranslated string: p2p block WARNING: untranslated string: p2p block save notice WARNING: untranslated string: pakfire ago +WARNING: untranslated string: pptp netconfig +WARNING: untranslated string: pptp peer +WARNING: untranslated string: pptp route WARNING: untranslated string: proxy reports WARNING: untranslated string: proxy reports daily WARNING: untranslated string: proxy reports monthly @@@ -989,13 -961,12 +995,14 @@@ 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 WARNING: untranslated string: routing table WARNING: untranslated string: samba join a domain WARNING: untranslated string: samba join domain +WARNING: untranslated string: search WARNING: untranslated string: server restart WARNING: untranslated string: show dh WARNING: untranslated string: show tls-auth key @@@ -1057,18 -1028,13 +1064,18 @@@ WARNING: untranslated string: tor traff WARNING: untranslated string: tor traffic limit soft WARNING: untranslated string: tor traffic read written WARNING: untranslated string: tor use exit nodes +WARNING: untranslated string: uncheck all WARNING: untranslated string: uplink WARNING: untranslated string: upload dh key WARNING: untranslated string: uptime load average WARNING: untranslated string: urlfilter redirect template WARNING: untranslated string: vendor WARNING: untranslated string: visit us at +WARNING: untranslated string: vpn force mobike WARNING: untranslated string: vpn keyexchange +WARNING: untranslated string: vpn statistic n2n +WARNING: untranslated string: vpn statistic rw +WARNING: untranslated string: vpn statistics n2n WARNING: untranslated string: wlan client WARNING: untranslated string: wlan client advanced settings WARNING: untranslated string: wlan client and diff --combined 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 @@@ -245,7 -245,6 +246,7 @@@ WARNING: translation string unused: ik WARNING: translation string unused: ike grouptype WARNING: translation string unused: ike integrity WARNING: translation string unused: ike lifetime +WARNING: translation string unused: ike lifetime should be between 1 and 24 hours WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@@ -384,7 -383,6 +385,7 @@@ WARNING: translation string unused: out WARNING: translation string unused: outgoing firewall warning WARNING: translation string unused: override mtu WARNING: translation string unused: ovpn config +WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn log WARNING: translation string unused: ovpn_fastio @@@ -654,7 -652,6 +655,7 @@@ WARNING: untranslated string: ccd non WARNING: untranslated string: ccd routes WARNING: untranslated string: ccd subnet WARNING: untranslated string: ccd used +WARNING: untranslated string: check all WARNING: untranslated string: community rules WARNING: untranslated string: count WARNING: untranslated string: countries @@@ -669,6 -666,11 +670,11 @@@ WARNING: untranslated string: dh key mo WARNING: untranslated string: dh key warn WARNING: untranslated string: dh key warn1 WARNING: untranslated string: dh parameter + 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: disk access per WARNING: untranslated string: dnat address WARNING: untranslated string: dns servers @@@ -692,22 -694,6 +698,22 @@@ WARNING: untranslated string: drop acti WARNING: untranslated string: drop action2 WARNING: untranslated string: drop forward WARNING: untranslated string: drop outgoing +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: emerging rules WARNING: untranslated string: encryption WARNING: untranslated string: entropy @@@ -807,7 -793,6 +813,7 @@@ WARNING: untranslated string: fwdfw wd_ WARNING: untranslated string: fwdfw wd_tue WARNING: untranslated string: fwdfw wd_wed WARNING: untranslated string: fwhost OpenVPN N-2-N +WARNING: untranslated string: fwhost addgeoipgrp WARNING: untranslated string: fwhost addgrp WARNING: untranslated string: fwhost addgrpname WARNING: untranslated string: fwhost addhost @@@ -820,9 -805,6 +826,9 @@@ WARNING: untranslated string: fwhost cc WARNING: untranslated string: fwhost ccdnet WARNING: untranslated string: fwhost change WARNING: untranslated string: fwhost cust addr +WARNING: untranslated string: fwhost cust geoipgroup +WARNING: untranslated string: fwhost cust geoipgrp +WARNING: untranslated string: fwhost cust geoiplocation WARNING: untranslated string: fwhost cust grp WARNING: untranslated string: fwhost cust net WARNING: untranslated string: fwhost cust service @@@ -862,7 -844,6 +868,7 @@@ WARNING: untranslated string: fwhost ip WARNING: untranslated string: fwhost ipsec net WARNING: untranslated string: fwhost menu WARNING: untranslated string: fwhost netaddress +WARNING: untranslated string: fwhost newgeoipgrp WARNING: untranslated string: fwhost newgrp WARNING: untranslated string: fwhost newhost WARNING: untranslated string: fwhost newnet @@@ -879,23 -860,14 +885,23 @@@ WARNING: untranslated string: fwhost us WARNING: untranslated string: fwhost welcome WARNING: untranslated string: gen dh WARNING: untranslated string: generate dh key +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: grouptype WARNING: untranslated string: hardware support +WARNING: untranslated string: ike lifetime should be between 1 and 8 hours WARNING: untranslated string: imei WARNING: untranslated string: imsi WARNING: untranslated string: incoming compression in bytes per second WARNING: untranslated string: incoming firewall access WARNING: untranslated string: incoming overhead in bytes per second WARNING: untranslated string: incoming traffic in bytes per second +WARNING: untranslated string: info messages WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout @@@ -934,7 -906,6 +940,7 @@@ WARNING: untranslated string: most pref WARNING: untranslated string: nameserver WARNING: untranslated string: no data WARNING: untranslated string: no hardware random number generator +WARNING: untranslated string: none WARNING: untranslated string: not a valid dh key WARNING: untranslated string: notice WARNING: untranslated string: openvpn default @@@ -972,9 -943,6 +978,9 @@@ WARNING: untranslated string: ovpn no c WARNING: untranslated string: ovpn port in root range WARNING: untranslated string: p2p block WARNING: untranslated string: p2p block save notice +WARNING: untranslated string: pptp netconfig +WARNING: untranslated string: pptp peer +WARNING: untranslated string: pptp route WARNING: untranslated string: proxy reports WARNING: untranslated string: proxy reports daily WARNING: untranslated string: proxy reports monthly @@@ -983,13 -951,12 +989,14 @@@ 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 WARNING: untranslated string: routing table WARNING: untranslated string: samba join a domain WARNING: untranslated string: samba join domain +WARNING: untranslated string: search WARNING: untranslated string: server restart WARNING: untranslated string: show dh WARNING: untranslated string: show tls-auth key @@@ -1050,18 -1017,13 +1057,18 @@@ WARNING: untranslated string: tor traff WARNING: untranslated string: tor traffic limit soft WARNING: untranslated string: tor traffic read written WARNING: untranslated string: tor use exit nodes +WARNING: untranslated string: uncheck all WARNING: untranslated string: uplink WARNING: untranslated string: upload dh key WARNING: untranslated string: uptime load average WARNING: untranslated string: urlfilter redirect template WARNING: untranslated string: vendor WARNING: untranslated string: visit us at +WARNING: untranslated string: vpn force mobike WARNING: untranslated string: vpn keyexchange +WARNING: untranslated string: vpn statistic n2n +WARNING: untranslated string: vpn statistic rw +WARNING: untranslated string: vpn statistics n2n WARNING: untranslated string: wlan client WARNING: untranslated string: wlan client advanced settings WARNING: untranslated string: wlan client and diff --combined 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 @@@ -300,7 -300,6 +301,7 @@@ WARNING: translation string unused: ik WARNING: translation string unused: ike grouptype WARNING: translation string unused: ike integrity WARNING: translation string unused: ike lifetime +WARNING: translation string unused: ike lifetime should be between 1 and 24 hours WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@@ -445,7 -444,6 +446,7 @@@ WARNING: translation string unused: out WARNING: translation string unused: outgoing firewall warning WARNING: translation string unused: override mtu WARNING: translation string unused: ovpn config +WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn engines WARNING: translation string unused: ovpn log @@@ -665,56 -663,20 +666,62 @@@ 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 WARNING: untranslated string: routing table +WARNING: untranslated string: search +WARNING: untranslated string: uncheck all +WARNING: untranslated string: vpn force mobike +WARNING: untranslated string: vpn statistic n2n +WARNING: untranslated string: vpn statistic rw +WARNING: untranslated string: vpn statistics n2n diff --combined doc/language_missings index 97e2d1832d,cb6afdb810..9da01227d7 --- a/doc/language_missings +++ b/doc/language_missings @@@ -29,7 -29,6 +29,7 @@@ < atm device < attention < bit +< block < capabilities < ccd add < ccd choose net @@@ -71,7 -70,6 +71,7 @@@ < ccd routes < ccd subnet < ccd used +< check all < ConnSched dial < ConnSched hangup < ConnSched reboot @@@ -85,6 -83,11 +85,11 @@@ < deprecated fs warn < details < dh + < dhcp dns enable update + < dhcp dns key name + < dhcp dns update + < dhcp dns update algo + < dhcp dns update secret < dh key move failed < dh key warn < dh key warn1 @@@ -113,26 -116,6 +118,26 @@@ < drop action2 < drop forward < drop outgoing +< email config +< email empty field +< email error +< email invalid +< email invalid mailfqdn +< email invalid mailip +< email invalid mailport +< email mailaddr +< email mailpass +< email mailport +< email mailrcpt +< email mailsender +< email mailuser +< email settings +< email subject +< email success +< email testmail +< email text +< email tls +< email usemail < encryption < entropy < entropy graphs @@@ -255,7 -238,6 +260,7 @@@ < fwdfw wd_tue < fwdfw wd_wed < fwdfw xt access +< fwhost addgeoipgrp < fwhost addgrp < fwhost addgrpname < fwhost addhost @@@ -271,9 -253,6 +276,9 @@@ < fwhost change < fwhost changeremark < fwhost cust addr +< fwhost cust geoip +< fwhost cust geoipgroup +< fwhost cust geoiplocation < fwhost cust grp < fwhost cust net < fwhost Custom Host @@@ -324,7 -303,6 +329,7 @@@ < fwhost IpSec Network < fwhost menu < fwhost netaddress +< fwhost newgeoipgrp < fwhost newgrp < fwhost newhost < fwhost newnet @@@ -354,16 -332,6 +359,16 @@@ < fw settings ruletable < gen dh < generate dh key +< geoip +< geoipblock +< geoipblock block countries +< geoipblock configuration +< geoipblock country code +< geoipblock country is allowed +< geoipblock country is blocked +< geoipblock country name +< geoipblock enable feature +< geoipblock flag < grouptype < hardware support < imei @@@ -457,9 -425,6 +462,9 @@@ < ovpn reneg sec < p2p block < p2p block save notice +< pptp netconfig +< pptp peer +< pptp route < proxy reports < proxy reports daily < proxy reports monthly @@@ -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 @@@ -537,9 -501,6 +543,9 @@@ < tor traffic limit soft < tor traffic read written < tor use exit nodes +< unblock +< unblock all +< uncheck all < updxlrtr sources < updxlrtr standard view < uplink @@@ -553,8 -514,6 +559,8 @@@ < vendor < visit us at < vpn keyexchange +< vpn statistic n2n +< vpn statistic rw < wlanap access point < wlanap channel < wlanap country @@@ -633,7 -592,6 +639,7 @@@ < atm device < attention < bit +< block < capabilities < ccd add < ccd choose net @@@ -675,7 -633,6 +681,7 @@@ < ccd routes < ccd subnet < ccd used +< check all < ConnSched dial < ConnSched hangup < ConnSched reboot @@@ -689,6 -646,11 +695,11 @@@ < deprecated fs warn < details < dh + < dhcp dns enable update + < dhcp dns key name + < dhcp dns update + < dhcp dns update algo + < dhcp dns update secret < dh key move failed < dh key warn < dh key warn1 @@@ -716,26 -678,6 +727,26 @@@ < drop action2 < drop forward < drop outgoing +< email config +< email empty field +< email error +< email invalid +< email invalid mailfqdn +< email invalid mailip +< email invalid mailport +< email mailaddr +< email mailpass +< email mailport +< email mailrcpt +< email mailsender +< email mailuser +< email settings +< email subject +< email success +< email testmail +< email text +< email tls +< email usemail < encryption < entropy < entropy graphs @@@ -858,7 -800,6 +869,7 @@@ < fwdfw wd_tue < fwdfw wd_wed < fwdfw xt access +< fwhost addgeoipgrp < fwhost addgrp < fwhost addgrpname < fwhost addhost @@@ -874,9 -815,6 +885,9 @@@ < fwhost change < fwhost changeremark < fwhost cust addr +< fwhost cust geoip +< fwhost cust geoipgroup +< fwhost cust geoiplocation < fwhost cust grp < fwhost cust net < fwhost Custom Host @@@ -927,7 -865,6 +938,7 @@@ < fwhost IpSec Network < fwhost menu < fwhost netaddress +< fwhost newgeoipgrp < fwhost newgrp < fwhost newhost < fwhost newnet @@@ -1066,9 -1003,6 +1077,9 @@@ < ovpn routes push options < p2p block < p2p block save notice +< pptp netconfig +< pptp peer +< pptp route < proxy reports < proxy reports daily < proxy reports monthly @@@ -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 @@@ -1146,9 -1079,6 +1158,9 @@@ < tor traffic limit soft < tor traffic read written < tor use exit nodes +< unblock +< unblock all +< uncheck all < updxlrtr sources < updxlrtr standard view < uplink @@@ -1159,8 -1089,6 +1171,8 @@@ < vendor < visit us at < vpn keyexchange +< vpn statistic n2n +< vpn statistic rw < wlanap country < wlan client < wlan client advanced settings @@@ -1218,7 -1146,6 +1230,7 @@@ < atm device < attention < bit +< block < capabilities < ccd add < ccd choose net @@@ -1260,7 -1187,6 +1272,7 @@@ < ccd routes < ccd subnet < ccd used +< check all < ConnSched dial < ConnSched hangup < ConnSched reboot @@@ -1274,6 -1200,11 +1286,11 @@@ < deprecated fs warn < details < dh + < dhcp dns enable update + < dhcp dns key name + < dhcp dns update + < dhcp dns update algo + < dhcp dns update secret < dh key move failed < dh key warn < dh key warn1 @@@ -1301,26 -1232,6 +1318,26 @@@ < drop action2 < drop forward < drop outgoing +< email config +< email empty field +< email error +< email invalid +< email invalid mailfqdn +< email invalid mailip +< email invalid mailport +< email mailaddr +< email mailpass +< email mailport +< email mailrcpt +< email mailsender +< email mailuser +< email settings +< email subject +< email success +< email testmail +< email text +< email tls +< email usemail < encryption < entropy < entropy graphs @@@ -1435,7 -1346,6 +1452,7 @@@ < fwdfw wd_tue < fwdfw wd_wed < fwdfw xt access +< fwhost addgeoipgrp < fwhost addgrp < fwhost addgrpname < fwhost addhost @@@ -1451,9 -1361,6 +1468,9 @@@ < fwhost change < fwhost changeremark < fwhost cust addr +< fwhost cust geoip +< fwhost cust geoipgroup +< fwhost cust geoiplocation < fwhost cust grp < fwhost cust net < fwhost Custom Host @@@ -1504,7 -1411,6 +1521,7 @@@ < fwhost IpSec Network < fwhost menu < fwhost netaddress +< fwhost newgeoipgrp < fwhost newgrp < fwhost newhost < fwhost newnet @@@ -1534,16 -1440,6 +1551,16 @@@ < fw settings ruletable < gen dh < generate dh key +< geoip +< geoipblock +< geoipblock block countries +< geoipblock configuration +< geoipblock country code +< geoipblock country is allowed +< geoipblock country is blocked +< geoipblock country name +< geoipblock enable feature +< geoipblock flag < grouptype < hardware support < imei @@@ -1639,9 -1535,6 +1656,9 @@@ < ovpn routes push options < p2p block < p2p block save notice +< pptp netconfig +< pptp peer +< pptp route < proxy reports < proxy reports daily < proxy reports monthly @@@ -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 @@@ -1717,9 -1609,6 +1735,9 @@@ < tor traffic limit soft < tor traffic read written < tor use exit nodes +< unblock +< unblock all +< uncheck all < updxlrtr sources < updxlrtr standard view < uplink @@@ -1730,8 -1619,6 +1748,8 @@@ < vendor < visit us at < vpn keyexchange +< vpn statistic n2n +< vpn statistic rw < wlanap country < wlan client < wlan client advanced settings @@@ -1790,7 -1677,6 +1808,7 @@@ < atm device < attention < bit +< block < capabilities < ccd add < ccd choose net @@@ -1832,7 -1718,6 +1850,7 @@@ < ccd routes < ccd subnet < ccd used +< check all < ConnSched dial < ConnSched hangup < ConnSched reboot @@@ -1847,6 -1732,11 +1865,11 @@@ < deprecated fs warn < details < dh + < dhcp dns enable update + < dhcp dns key name + < dhcp dns update + < dhcp dns update algo + < dhcp dns update secret < dh key move failed < dh key warn < dh key warn1 @@@ -1876,26 -1766,6 +1899,26 @@@ < drop forward < drop outgoing < Edit an existing route +< email config +< email empty field +< email error +< email invalid +< email invalid mailfqdn +< email invalid mailip +< email invalid mailport +< email mailaddr +< email mailpass +< email mailport +< email mailrcpt +< email mailsender +< email mailuser +< email settings +< email subject +< email success +< email testmail +< email text +< email tls +< email usemail < encryption < entropy < entropy graphs @@@ -2011,7 -1881,6 +2034,7 @@@ < fwdfw wd_tue < fwdfw wd_wed < fwdfw xt access +< fwhost addgeoipgrp < fwhost addgrp < fwhost addgrpname < fwhost addhost @@@ -2027,9 -1896,6 +2050,9 @@@ < fwhost change < fwhost changeremark < fwhost cust addr +< fwhost cust geoip +< fwhost cust geoipgroup +< fwhost cust geoiplocation < fwhost cust grp < fwhost cust net < fwhost Custom Host @@@ -2080,7 -1946,6 +2103,7 @@@ < fwhost IpSec Network < fwhost menu < fwhost netaddress +< fwhost newgeoipgrp < fwhost newgrp < fwhost newhost < fwhost newnet @@@ -2110,16 -1975,6 +2133,16 @@@ < fw settings ruletable < gen dh < generate dh key +< geoip +< geoipblock +< geoipblock block countries +< geoipblock configuration +< geoipblock country code +< geoipblock country is allowed +< geoipblock country is blocked +< geoipblock country name +< geoipblock enable feature +< geoipblock flag < grouptype < hardware support < hour-graph @@@ -2215,9 -2070,6 +2238,9 @@@ < ovpn reneg sec < p2p block < p2p block save notice +< pptp netconfig +< pptp peer +< pptp route < proxy reports < proxy reports daily < proxy reports monthly @@@ -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 @@@ -2293,9 -2144,6 +2317,9 @@@ < tor traffic limit soft < tor traffic read written < tor use exit nodes +< unblock +< unblock all +< uncheck all < updxlrtr sources < updxlrtr standard view < uplink @@@ -2306,8 -2154,6 +2330,8 @@@ < vendor < visit us at < vpn keyexchange +< vpn statistic n2n +< vpn statistic rw < week-graph < wlanap country < wlan client diff --combined html/cgi-bin/dhcp.cgi index a22bcd4ebd,9326aabda0..4a9da07d58 --- a/html/cgi-bin/dhcp.cgi +++ b/html/cgi-bin/dhcp.cgi @@@ -70,11 -70,17 +70,17 @@@ foreach my $itf (@ITFs) $dhcpsettings{"NTP2_${itf}"} = ''; $dhcpsettings{"NEXT_${itf}"} = ''; $dhcpsettings{"FILE_${itf}"} = ''; + $dhcpsettings{"DNS_UPDATE_KEY_NAME_${itf}"} = ''; + $dhcpsettings{"DNS_UPDATE_KEY_SECRET_${itf}"} = ''; + $dhcpsettings{"DNS_UPDATE_KEY_ALGO_${itf}"} = ''; } $dhcpsettings{'SORT_FLEASELIST'} = 'FIPADDR'; $dhcpsettings{'SORT_LEASELIST'} = 'IPADDR'; + # DNS Update settings + $dhcpsettings{'DNS_UPDATE_ENABLED'} = 'off'; + #Settings2 for editing the multi-line list #Must not be saved with writehash ! $dhcpsettings{'FIX_MAC'} = ''; @@@ -244,7 -250,7 +250,7 @@@ if ($dhcpsettings{'ACTION'} eq $Lang::t } # enabled }#loop interface verify - map (delete ($dhcpsettings{$_}) ,@nosaved,'ACTION','KEY1','KEY2'); # Must not be saved + map (delete ($dhcpsettings{$_}) ,@nosaved,'ACTION','KEY1','KEY2','q'); # Must not be saved &General::writehash($setting, \%dhcpsettings); # Save good settings $dhcpsettings{'ACTION'} = $Lang::tr{'save'}; # create an 'ACTION' map ($dhcpsettings{$_} = '',@nosaved,'KEY1','KEY2'); # and reinit vars to empty @@@ -267,7 -273,7 +273,7 @@@ if ($ENV{'QUERY_STRING'} =~ /^FETHER|^F $newsort.=$Rev; } $dhcpsettings{'SORT_FLEASELIST'}=$newsort; - map (delete ($dhcpsettings{$_}) ,@nosaved,'ACTION','KEY1','KEY2'); # Must never be saved + map (delete ($dhcpsettings{$_}) ,@nosaved,'ACTION','KEY1','KEY2', 'q'); # Must never be saved &General::writehash($setting, \%dhcpsettings); &sortcurrent2; $dhcpsettings{'ACTION'} = 'SORT'; # create an 'ACTION' @@@ -438,9 -444,6 +444,9 @@@ if ($dhcpsettings{'ACTION'} eq $Lang::t if ($dhcpsettings{'KEY2'} eq '') { #add or edit ? unshift (@current2, "$dhcpsettings{'FIX_MAC'},$dhcpsettings{'FIX_ADDR'},$dhcpsettings{'FIX_ENABLED'},$dhcpsettings{'FIX_NEXTADDR'},$dhcpsettings{'FIX_FILENAME'},$dhcpsettings{'FIX_ROOTPATH'},$dhcpsettings{'FIX_REMARK'}\n"); &General::log($Lang::tr{'fixed ip lease added'}); + + # Enter edit mode + $dhcpsettings{'KEY2'} = $key; } else { @current2[$dhcpsettings{'KEY2'}] = "$dhcpsettings{'FIX_MAC'},$dhcpsettings{'FIX_ADDR'},$dhcpsettings{'FIX_ENABLED'},$dhcpsettings{'FIX_NEXTADDR'},$dhcpsettings{'FIX_FILENAME'},$dhcpsettings{'FIX_ROOTPATH'},$dhcpsettings{'FIX_REMARK'}\n"; $dhcpsettings{'KEY2'} = ''; # End edit mode @@@ -547,39 -550,39 +553,39 @@@ print < $Lang::tr{'ip address'}
$Lang::tr{'netmask'}:$netsettings{"${itf}_ADDRESS"}
$netsettings{"${itf}_NETMASK"} - $Lang::tr{'start address'} + $Lang::tr{'start address'} * - $Lang::tr{'end address'} + $Lang::tr{'end address'} * - $Lang::tr{'default lease time'} + $Lang::tr{'default lease time'} * - $Lang::tr{'max lease time'} + $Lang::tr{'max lease time'} * - $Lang::tr{'domain name suffix'} * + $Lang::tr{'domain name suffix'} $Lang::tr{'dhcp allow bootp'}: - $Lang::tr{'primary dns'} + $Lang::tr{'primary dns'} * - $Lang::tr{'secondary dns'} * + $Lang::tr{'secondary dns'} - $Lang::tr{'primary ntp server'}: * + $Lang::tr{'primary ntp server'}: - $Lang::tr{'secondary ntp server'}: * + $Lang::tr{'secondary ntp server'}: - $Lang::tr{'primary wins server address'}: * + $Lang::tr{'primary wins server address'}: - $Lang::tr{'secondary wins server address'}: * + $Lang::tr{'secondary wins server address'}: - next-server: * + next-server: - filename: * + filename: @@@ -591,11 -594,83 +597,83 @@@ EN print < - * $Lang::tr{'this field may be blank'} + * $Lang::tr{'required field'} $warnNTPmessage + END + ; + &Header::closebox(); + + # DHCP DNS update support (RFC2136) + &Header::openbox('100%', 'left', $Lang::tr{'dhcp dns update'}); + + my %checked = (); + $checked{'DNS_UPDATE_ENABLED'}{'on'} = ( $dhcpsettings{'DNS_UPDATE_ENABLED'} ne 'on') ? '' : "checked='checked'"; + + print < + + $Lang::tr{'dhcp dns enable update'} + + + + + + + END + ; + my @domains = (); + + # Print options for each interface. + foreach my $itf (@ITFs) { + # Check if DHCP for this interface is enabled. + if ($dhcpsettings{"ENABLE_${itf}"} eq 'on') { + # Check for same domain name. + next if ($dhcpsettings{"DOMAIN_NAME_${itf}"} ~~ @domains); + my $lc_itf = lc($itf); + + # Select previously configured update algorithm. + my %selected = (); + $selected{'DNS_UPDATE_ALGO_${inf}'}{$dhcpsettings{'DNS_UPDATE_ALGO_${inf}'}} = 'selected'; + + print < + + + + + + + + + + + + + + END + ; + } + + # Store configured domain based on the interface + # in the temporary variable. + push(@domains, $dhcpsettings{"DOMAIN_NAME_${itf}"}); + } + print < +
+
 
$dhcpsettings{"DOMAIN_NAME_${itf}"}
$Lang::tr{'dhcp dns key name'}:$Lang::tr{'dhcp dns update secret'}:  $Lang::tr{'dhcp dns update algo'}:   + +
+ + + +
END ; @@@ -625,13 -700,13 +703,13 @@@ if ($opt ne '') } print < - $Lang::tr{'dhcp advopt name'}: + $Lang::tr{'dhcp advopt name'}: * - $Lang::tr{'dhcp advopt value'}: + $Lang::tr{'dhcp advopt value'}: * $opt $Lang::tr{'enabled'} - $Lang::tr{'dhcp advopt scope'}: * + $Lang::tr{'dhcp advopt scope'}: END ; @@@ -652,7 -727,7 +730,7 @@@ print < - + + - + - + - + - + - +
* $Lang::tr{'dhcp advopt scope help'}$Lang::tr{'dhcp advopt scope help'} @@@ -830,29 -905,29 +908,29 @@@ if ($dhcpsettings{'KEY2'} ne '') } print < - $Lang::tr{'mac address'}:$Lang::tr{'mac address'}: * $Lang::tr{'ip address'}:$Lang::tr{'ip address'}: * $Lang::tr{'remark'}: *$Lang::tr{'remark'}:
$Lang::tr{'enabled'}
$Lang::tr{'dhcp bootp pxe data'}
next-server: *next-server: filename: *filename: root path: *root path:
- +
* $Lang::tr{'this field may be blank'}* $Lang::tr{'required field'} @@@ -864,26 -939,8 +942,26 @@@ EN ; #Edited line number (KEY2) passed until cleared by 'save' or 'remove' or 'new sort order' +# Search for static leases +my $search_query = $dhcpsettings{'q'}; + +if (scalar @current2 >= 10) { + print < + + + + + +
+ + +
+ +END +} + print < @@@ -939,14 -996,6 +1017,14 @@@ foreach my $line (@current2) $gdesc = $Lang::tr{'click to enable'}; } + # Skip all entries that do not match the search query + if ($search_query ne "") { + if (!grep(/$search_query/, @temp)) { + $key++; + next; + } + } + if ($dhcpsettings{'KEY2'} eq $key) { print ""; $col="bgcolor='${Header::colouryellow}'"; @@@ -1131,9 -1180,19 +1209,19 @@@ sub buildconf flock(FILE, 2); # Global settings - print FILE "ddns-update-style none;\n"; print FILE "deny bootp; #default\n"; print FILE "authoritative;\n"; + + # DNS Update settings + if ($dhcpsettings{'DNS_UPDATE_ENABLED'} eq 'on') { + print FILE "ddns-updates on;\n"; + print FILE "ddns-update-style interim;\n"; + print FILE "ddns-ttl 60; # 1 min\n"; + print FILE "ignore client-updates;\n"; + print FILE "update-static-leases on;\n"; + } else { + print FILE "ddns-update-style none;\n"; + } # Write first new option definition foreach my $line (@current1) { @@@ -1162,12 -1221,13 +1250,13 @@@ } }# on }# foreach line + print FILE "\n"; #Subnet range definition foreach my $itf (@ITFs) { my $lc_itf=lc($itf); if ($dhcpsettings{"ENABLE_${itf}"} eq 'on' ){ - print FILE "\nsubnet " . $netsettings{"${itf}_NETADDRESS"} . " netmask ". $netsettings{"${itf}_NETMASK"} . " #$itf\n"; + print FILE "subnet " . $netsettings{"${itf}_NETADDRESS"} . " netmask ". $netsettings{"${itf}_NETMASK"} . " #$itf\n"; print FILE "{\n"; print FILE "\trange " . $dhcpsettings{"START_ADDR_${itf}"} . ' ' . $dhcpsettings{"END_ADDR_${itf}"}.";\n" if ($dhcpsettings{"START_ADDR_${itf}"}); print FILE "\toption subnet-mask " . $netsettings{"${itf}_NETMASK"} . ";\n"; @@@ -1204,7 -1264,18 +1293,18 @@@ } }# on }# foreach line - print FILE "} #$itf\n"; + print FILE "} #$itf\n\n"; + + if (($dhcpsettings{"DNS_UPDATE_ENABLED"} eq "on") && ($dhcpsettings{"DNS_UPDATE_KEY_NAME_${itf}"} ne "")) { + print FILE "key " . $dhcpsettings{"DNS_UPDATE_KEY_NAME_${itf}"} . " {\n"; + print FILE "\talgorithm " . $dhcpsettings{"DNS_UPDATE_KEY_ALGO_${itf}"} . ";\n"; + print FILE "\tsecret \"" . $dhcpsettings{"DNS_UPDATE_KEY_SECRET_${itf}"} . "\";\n"; + print FILE "};\n\n"; + + print FILE "zone " . $dhcpsettings{"DOMAIN_NAME_${itf}"} . ". {\n"; + print FILE "\tkey " . $dhcpsettings{"DNS_UPDATE_KEY_NAME_${itf}"} . ";\n"; + print FILE "}\n\n"; + } system ('/usr/bin/touch', "${General::swroot}/dhcp/enable_${lc_itf}"); &General::log("DHCP on ${itf}: " . $Lang::tr{'dhcp server enabled'}) diff --combined langs/de/cgi-bin/de.pl index e952de27f2,ea92d806cb..cf04d3d5a8 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@@ -416,7 -416,6 +416,7 @@@ 'bit' => 'Bit', 'bitrate' => 'Bitrate', 'bleeding rules' => 'Bleeding Edge Snort Rules', +'block' => 'Blocken', 'blue' => 'BLAU', 'blue access' => 'Zugriff auf Blau', 'blue access use hint' => 'Sie müssen mindestens die MAC- oder die IP-Adresse für ein Gerät angeben. Optional können Sie sowohl MAC- als auch IP-Adresse angeben.', @@@ -533,7 -532,6 +533,7 @@@ 'chain' => 'Verknüpfung', 'change passwords' => 'Passwörter Ã¤ndern', 'change share' => 'Freigabeeinstellungen ändern', +'check all' => 'Alle auswählen', 'check for net traffic update' => 'Prüfe auf Net-Traffic-Updates', 'check vpn lr' => 'Überprüfen', 'choose config' => 'Konfiguration auswählen', @@@ -691,7 -689,7 +691,7 @@@ 'dhcp advopt removed' => 'DHCP Option entfernt', 'dhcp advopt scope' => 'Options-Wertebereich', 'dhcp advopt scope global' => 'Global', -'dhcp advopt scope help' => 'Globaler Bereich oder begenze Bereich auf überprüfte Schnittstellen', +'dhcp advopt scope help' => 'Globaler Bereich oder begrenze Bereich auf überprüfte Schnittstellen', 'dhcp advopt unknown' => 'Name der DHCP Option wurde nicht erkannt', 'dhcp advopt value' => 'Optionswert', 'dhcp allow bootp' => 'BOOTP Clients zulassen', @@@ -699,6 -697,11 +699,11 @@@ 'dhcp bootp pxe data' => 'Geben Sie optionale BOOTP PXE-Daten für diese feste Zuordnung ein', 'dhcp configuration' => 'DHCP-Konfiguration', 'dhcp create fixed leases' => 'Feste Zuordnungen erzeugen', + 'dhcp dns enable update' => 'DNS-Update (RFC2136) aktivieren:', + 'dhcp dns key name' => 'Schlüsselname:', + 'dhcp dns update' => 'DNS-Update', + 'dhcp dns update algo' => 'Algorithmus:', + 'dhcp dns update secret' => 'Schlüssel:', 'dhcp fixed lease err1' => 'Für eine feste Zuordnung müssen entweder die Hardware Adresse (MAC-Adresse) oder der Hostname oder beide eingetragen werden.', 'dhcp fixed lease help1' => 'IP Adressen können als FQDN angegeben werden.', 'dhcp mode' => 'DHCP', @@@ -833,27 -836,7 +838,27 @@@ 'edit share' => 'Freigabe bearbeiten', 'editor' => 'Editor', 'eg' => 'z.B.:', +'email config' => 'Konfiguration', +'email empty field' => 'Leeres Feld', +'email error' => 'ERROR: Testmail konnte nicht versendet werden', +'email invalid' => 'Ungültiges Feld', +'email invalid mailfqdn' => 'Ungültiger FQDN für Mailserver', +'email invalid mailip' => 'Ungültige IP-Adresse für Mailserver', +'email invalid mailport' => 'Ungültiger Port für Mailserver', +'email mailaddr' => 'Mailserver-Adresse', +'email mailpass' => 'Passwort', +'email mailport' => 'Mailserver-Port', +'email mailrcpt' => 'E-Mail-Empfänger', +'email mailsender' => 'E-Mail Absender', +'email mailuser' => 'Benutzername', 'email server can not be empty' => 'Email-Server darf nicht leer sein', +'email settings' => 'Mailversand', +'email subject' => 'IPFire Testmail', +'email success' => 'Testmail erfolgreich versendet', +'email testmail' => 'Testnachricht senden', +'email text' => 'Testnachricht vom IPFire Mailversand.', +'email tls' => 'TLS aktivieren', +'email usemail' => 'Mailversand aktivieren', 'emailreportlevel' => 'Email-Reportlevel', 'empty' => 'Dieses Feld kann leer bleiben', 'empty profile' => 'Unbenannt', @@@ -1089,7 -1072,6 +1094,7 @@@ 'fwhost OpenVPN static host' => 'OpenVPN statischer Host', 'fwhost OpenVPN static network' => 'OpenVPN statisches Netzwerk', 'fwhost Standard Network' => 'Standard-Netzwerk', +'fwhost addgeoipgrp' => 'Neue GeoIP-Gruppe hinzufügen', 'fwhost addgrp' => 'Neue Gruppe hinzufügen', 'fwhost addgrpname' => 'Gruppenname:', 'fwhost addhost' => 'Neuen Host hinzufügen', @@@ -1105,9 -1087,6 +1110,9 @@@ 'fwhost change' => 'Ändern', 'fwhost changeremark' => 'Es wurde nur die Bemerkung angepasst.', 'fwhost cust addr' => 'Hosts', +'fwhost cust geoip' => 'GeoIP-Gruppen', +'fwhost cust geoipgroup' => 'GeoIP-Gruppen', +'fwhost cust geoiplocation' => 'GeoIP Ländercodes', 'fwhost cust grp' => 'Gruppen', 'fwhost cust net' => 'Netzwerke', 'fwhost cust service' => 'Dienste', @@@ -1154,7 -1133,6 +1159,7 @@@ 'fwhost ipsec net' => 'IPsec-Netzwerke:', 'fwhost menu' => 'Firewallgruppen', 'fwhost netaddress' => 'Netzwerkadresse', +'fwhost newgeoipgrp' => 'GeoIP-Gruppen', 'fwhost newgrp' => 'Netzwerk-/Hostgruppen', 'fwhost newhost' => 'Hosts', 'fwhost newnet' => 'Netzwerke', @@@ -1189,16 -1167,6 +1194,16 @@@ 'generating the root and host certificates may take a long time. it can take up to several minutes on older hardware. please be patient' => 'Die Erzeugung der Root- und Host-Zertifikate kann lange Zeit dauern. Auf älterer Hardware kann es mehrere Minuten lang dauern. Bitte haben Sie etwas Geduld.', 'genkey' => 'PSK erzeugen', 'genre' => 'Genre', +'geoip' => 'GeoIP', +'geoipblock' => 'GeoIP Block', +'geoipblock block countries' => 'Länderfilter', +'geoipblock configuration' => 'GeoIP Konfiguration', +'geoipblock country code' => 'Ländercode', +'geoipblock country is allowed' => 'Eingehende Verbindungen aus diesem Land sind erlaubt.', +'geoipblock country is blocked' => 'Eingehende Verbindungen aus diesem Land werden blockiert.', +'geoipblock country name' => 'Ländername', +'geoipblock enable feature' => 'GeoIP basierte Filterung aktivieren:', +'geoipblock flag' => 'Flagge', 'global settings' => 'Globale Einstellungen', 'gpl i accept these terms and conditions' => 'Ich akzeptiere diese Bedingungen und Konditionen', 'gpl license agreement' => 'Lizenz-Vereinbarung', @@@ -1842,9 -1810,6 +1847,9 @@@ 'ppp setup' => 'PPP-Einstellungen', 'pppoe' => 'PPPoE', 'pppoe settings' => 'Zusätzliche PPPoE-Einstellungen:', +'pptp netconfig' => 'Eigene Netzkonfiguration', +'pptp peer' => 'Gegenstelle', +'pptp route' => 'PPTP-Route', 'pptp settings' => 'Zusätzliche PPTP-Einstellungen:', 'pre-shared key is too short' => 'Pre-shared Schlüsel ist zu kurz', 'prefered master' => 'Prefered Master', @@@ -1935,7 -1900,6 +1940,7 @@@ 'reportlevel' => 'Report Level', 'request' => 'Abfrage', 'requested data' => '1. Verbindungs-Einstellungen', +'required field' => 'Pflichtfeld', 'reserved dst port' => 'Dieser Zielport ist für die ausschließliche Benutzung durch IPFire reserviert:', 'reserved src port' => 'Dieser Quellport ist für die ausschließliche Benutzung durch IPFire reserviert:', 'reset' => 'Zurücksetzen', @@@ -1974,7 -1938,6 +1979,7 @@@ 'save settings' => 'Einstellungen speichern', 'save-adv-options' => 'Erweiterte Optionen speichern', 'script name' => 'Skriptname:', +'search' => 'Suchen', 'secondary dns' => 'Sekundärer DNS:', 'secondary ntp server' => 'Sekundärer NTP-Server', 'secondary wins server address' => 'Sekundäre WINS-Server Adresse', @@@ -2146,6 -2109,7 +2151,6 @@@ 'there are updates available' => 'Für Ihr System sind Programm-Updates verfügbar. Es wird dringend empfohlen, daß Sie Ihr System baldmöglichst aktualisieren.', 'there was no file upload' => 'Es wurde keine Datei hochgeladen', 'this feature has been sponsored by' => 'Diese Funktion wurde gesponsort von', -'this field may be blank' => 'Dieses Feld kann leer bleiben.', 'this is not a valid archive' => 'Dies ist kein gültiges Archiv.', 'this is not an authorised update' => 'Dies ist kein autorisiertes Update.', 'this months volume' => 'Diesen Monat', @@@ -2257,9 -2221,6 +2262,9 @@@ 'umount removable media before to unplug' => 'Wechselmedien vor dem Entfernen unbedingt abmelden', 'unable to alter profiles while red is active' => 'Profile können nicht geändert werden, solange ROT aktiv ist.', 'unable to contact' => 'Kann nicht erreicht werden', +'unblock' => 'Entblocken', +'unblock all' => 'Alle entblocken', +'uncheck all' => 'Alle abwählen', 'unencrypted' => 'Nicht verschlüsselt', 'uninstall' => 'Deinstallieren', 'unix charset' => 'UNIX-Charset', @@@ -2569,11 -2530,11 +2574,11 @@@ 'urlfilter whitelist always allowed' => 'Erlaube angepasste Whitelist für gesperrte Clients', 'urlfilter wrong filetype' => 'Die Datei hat nicht die Erweiterung .tar.gz', 'use' => 'Einsatz', -'use a pre-shared key' => 'Verwenden Sie einen Pre-Shared Schlüssel:', +'use a pre-shared key' => 'Pre-Shared-Key verwenden:', 'use dov' => 'DOV (Data Over Voice) benutzen:', 'use ibod' => 'Bandwidth on Demand (iBOD) benutzen:', 'use ipfire red ip' => 'Die klassische ROTE IP, welche von IPFire während der Verbindung verwendet wird', -'use only proposed settings' => 'Verwenden Sie nur die vorgeschlagenen Einstellungen.', +'use only proposed settings' => 'Nur die vorgeschlagenen Einstellungen verwenden', 'used' => 'Benutzt', 'used memory' => 'Genutzter Speicher', 'used swap' => 'Genutzter Swap', @@@ -2617,9 -2578,8 +2622,9 @@@ 'vpn payload compression' => 'Datennutzlast-Kompression aushandeln', 'vpn red name' => 'Öffentliche IP oder FQDN für das rote Interface oder <%defaultroute>', 'vpn remote id' => 'Remote ID', +'vpn statistic n2n' => 'OpenVPN-Netz-zu-Netz-Statistik', +'vpn statistic rw' => 'OpenVPN-Roadwarrior-Statistik', 'vpn subjectaltname' => 'Subjekt Alternativer Name', -'vpn vhost' => 'Roadwarrior virtuelle IP (manchmal auch Inner-IP genannt)', 'vpn watch' => 'Netz-zu-Netz VPN neu starten, wenn sich Remote-IP ändert (DynDNS).', 'waiting to synchronize clock' => 'Bitte warten, die Uhr wird synchronisiert', 'warn when traffic reaches' => 'Warnen wenn Traffic x % erreicht', diff --combined langs/en/cgi-bin/en.pl index 55cf22802c,c788866450..56238ed3e1 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@@ -435,7 -435,6 +435,7 @@@ 'bit' => 'bit', 'bitrate' => 'Bitrate', 'bleeding rules' => 'Bleeding Edge Snort Rules', +'block' => 'Block', 'blue' => 'BLUE', 'blue access' => 'Blue Access', 'blue access use hint' => 'You have to enter the MAC or the IP Address for a device. To enter both is also possible', @@@ -551,7 -550,6 +551,7 @@@ 'chain' => 'Chain', 'change passwords' => 'Change passwords', 'change share' => 'edit share options', +'check all' => 'Check all', 'check for net traffic update' => 'Check for Net-Traffic updates', 'check vpn lr' => 'Check', 'choose config' => 'Choose config', @@@ -722,6 -720,11 +722,11 @@@ 'dhcp bootp pxe data' => 'Enter optional bootp pxe data for this fixed lease', 'dhcp configuration' => 'DHCP configuration', 'dhcp create fixed leases' => 'Create fixed leases', + 'dhcp dns enable update' => 'Enable DNS Update (RFC2136):', + 'dhcp dns key name' => 'Key Name:', + 'dhcp dns update' => 'DNS Update', + 'dhcp dns update algo' => 'Algorithm:', + 'dhcp dns update secret' => 'Secret:', 'dhcp fixed lease err1' => 'For a fix lease you have to enter the MAC address or the hostname, or you enter both.', 'dhcp fixed lease help1' => 'IP Addresses might be entered as FQDN', 'dhcp mode' => 'DHCP', @@@ -859,27 -862,7 +864,27 @@@ 'edit share' => 'Edit share', 'editor' => 'Editor', 'eg' => 'e.g.:', +'email config' => 'Configuration', +'email empty field' => 'Empty field', +'email error' => 'ERROR: Testmail could not be sent', +'email invalid' => 'Invalid field', +'email invalid mailfqdn' => 'Invalid mailserver fqdn', +'email invalid mailip' => 'Invalid mailserver IP address', +'email invalid mailport' => 'Invalid mailserver port', +'email mailaddr' => 'Mailserver address', +'email mailpass' => 'Password', +'email mailport' => 'Mailserver port', +'email mailrcpt' => 'Mail recipient', +'email mailsender' => 'Mail sender', +'email mailuser' => 'Username', 'email server can not be empty' => 'E-mail server can not be empty', +'email settings' => 'Mailservice', +'email subject' => 'IPFire Testmail', +'email success' => 'Testmail successfully sent', +'email testmail' => 'Send testmail', +'email text' => 'Testmail from IPFire Mailservice.', +'email tls' => 'Use TLS', +'email usemail' => 'Activate Mailservice', 'emailreportlevel' => 'E-mailreportlevel', 'emerging rules' => 'Emergingthreats.net Community Rules', 'empty' => 'This field may be left blank', @@@ -1116,7 -1099,6 +1121,7 @@@ 'fwhost OpenVPN static host' => 'OpenVPN static host', 'fwhost OpenVPN static network' => 'OpenVPN static network', 'fwhost Standard Network' => 'Standard network', +'fwhost addgeoipgrp' => 'Add new GeoIP group', 'fwhost addgrp' => 'Add new network/host group', 'fwhost addgrpname' => 'Group name:', 'fwhost addhost' => 'Add new host', @@@ -1132,9 -1114,6 +1137,9 @@@ 'fwhost change' => 'Modify', 'fwhost changeremark' => 'You modified just the remark', 'fwhost cust addr' => 'Hosts', +'fwhost cust geoip' => 'GeoIP Groups', +'fwhost cust geoipgroup' => 'GeoIP Groups', +'fwhost cust geoiplocation' => 'GeoIP Locations', 'fwhost cust grp' => 'Network/Host Groups', 'fwhost cust net' => 'Networks', 'fwhost cust service' => 'Services', @@@ -1181,7 -1160,6 +1186,7 @@@ 'fwhost ipsec net' => 'IPsec networks:', 'fwhost menu' => 'Firewall Groups', 'fwhost netaddress' => 'Network address', +'fwhost newgeoipgrp' => 'GeoIP Groups', 'fwhost newgrp' => 'Network/Host Groups', 'fwhost newhost' => 'Hosts', 'fwhost newnet' => 'Networks', @@@ -1218,16 -1196,6 +1223,16 @@@ 'generating the root and host certificates may take a long time. it can take up to several minutes on older hardware. please be patient' => 'Generating the root and host certificates may take a long time. It can take up to several minutes on older hardware. Please be patient.', 'genkey' => 'Generate PSK', 'genre' => 'Genre', +'geoip' => 'GeoIP', +'geoipblock' => 'GeoIP Block', +'geoipblock block countries' => 'Block countries', +'geoipblock configuration' => 'GeoIP Configuration', +'geoipblock country code' => 'Country Code', +'geoipblock country is allowed' => 'Incoming traffic from this country is allowed', +'geoipblock country is blocked' => 'Incoming traffic from this country will be blocked', +'geoipblock country name' => 'Country Name', +'geoipblock enable feature' => 'Enable GeoIP based blocking:', +'geoipblock flag' => 'Flag', 'global settings' => 'Global Settings', 'gpl i accept these terms and conditions' => 'I accept these terms and conditions', 'gpl license agreement' => 'License Agreement', @@@ -1665,7 -1633,6 +1670,7 @@@ 'no modem selected' => 'No modem selected', 'no set selected' => 'No set was selected', 'no time limit' => 'unlimited time', +'none' => 'none', 'none found' => 'none found', 'nonetworkname' => 'No Network Name entered', 'noservicename' => 'No Service Name entered', @@@ -1873,9 -1840,6 +1878,9 @@@ 'ppp setup' => 'PPP setup', 'pppoe' => 'PPPoE', 'pppoe settings' => 'Additional PPPoE settings:', +'pptp netconfig' => 'My Net Config', +'pptp peer' => 'Peer', +'pptp route' => 'PPTP Route', 'pptp settings' => 'Additional PPTP settings:', 'pre-shared key is too short' => 'Pre-shared key is too short.', 'prefered master' => 'Prefered Master', @@@ -1968,7 -1932,6 +1973,7 @@@ 'reportlevel' => 'Reportlevel', 'request' => 'Request', 'requested data' => '1. Connection Settings:', +'required field' => 'Required field', 'reserved dst port' => 'Destination port is reserved for IPFire use only:', 'reserved src port' => 'Source port is reserved for IPFire use only:', 'reset' => 'Reset', @@@ -2007,7 -1970,6 +2012,7 @@@ 'save settings' => 'Save settings', 'save-adv-options' => 'Save advanced options', 'script name' => 'Script name:', +'search' => 'Search', 'secondary dns' => 'Secondary DNS:', 'secondary ntp server' => 'Secondary NTP server', 'secondary wins server address' => 'Secondary WINS server address', @@@ -2184,6 -2146,7 +2189,6 @@@ 'there are updates available' => 'There are updates available for your system. It is strongly urged that you install them as soon as possible.', 'there was no file upload' => 'There was no file upload.', 'this feature has been sponsored by' => 'This feature has been sponsored by', -'this field may be blank' => 'This field may be blank.', 'this is not a valid archive' => 'This is not a valid archive.', 'this is not an authorised update' => 'This is not an authorised update.', 'this months volume' => 'This months volume', @@@ -2297,9 -2260,6 +2302,9 @@@ 'umount removable media before to unplug' => 'Umount removable media before unplugging the device', 'unable to alter profiles while red is active' => 'Unable to alter profiles while RED is active.', 'unable to contact' => 'Unable to contact', +'unblock' => 'Unblock', +'unblock all' => 'Unblock all', +'uncheck all' => 'Uncheck all', 'unencrypted' => 'Unencrypted', 'uninstall' => 'Uninstall', 'unix charset' => 'UNIX Charset', @@@ -2648,7 -2608,6 +2653,7 @@@ 'vpn configuration main' => 'VPN Configuration', 'vpn delayed start' => 'Delay before launching VPN (seconds)', 'vpn delayed start help' => 'If required, this delay can be used to allow dynamic DNS updates to propagate properly. 60 is a common value when RED is a dynamic IP.', +'vpn force mobike' => 'Force using MOBIKE (only IKEv2)', 'vpn incompatible use of defaultroute' => 'hostname=%defaultroute not allowed', 'vpn keyexchange' => 'Keyexchange', 'vpn local id' => 'Local ID', @@@ -2661,9 -2620,8 +2666,9 @@@ 'vpn payload compression' => 'Negotiate payload compression', 'vpn red name' => 'Public IP or FQDN for RED interface or <%defaultroute>', 'vpn remote id' => 'Remote ID', +'vpn statistic n2n' => 'OpenVPN Net-to-Net Statistics', +'vpn statistic rw' => 'OpenVPN Roadwarrior Statistics', 'vpn subjectaltname' => 'Subject Alt Name', -'vpn vhost' => 'Roadwarrior virtual IP (sometimes called Inner-IP)', 'vpn watch' => 'Restart net-to-net vpn when remote peer IP changes (dyndns).', 'waiting to synchronize clock' => 'Waiting to synchronize clock', 'warn when traffic reaches' => 'Warn when traffic reaches x %', diff --combined src/initscripts/init.d/dnsmasq index ce7689f4e1,b033e2b4c8..059ffacdd8 --- a/src/initscripts/init.d/dnsmasq +++ b/src/initscripts/init.d/dnsmasq @@@ -15,19 -15,18 +15,19 @@@ . /etc/sysconfig/rc . ${rc_functions} -# Pull custom configuration file -if [ -e "/etc/sysconfig/dnsmasq" ]; then - . /etc/sysconfig/dnsmasq -fi - CACHE_SIZE=2500 ENABLE_DNSSEC=1 SHOW_SRV=1 TRUST_ANCHOR=".,19036,8,2,49AAC11D7B6F6446702E54A1607371607A1A41855200FD2CE1CDDE32F24E8FB5" +TIMESTAMP_FILE="/var/ipfire/dns/dnssec-timestamp" + +# Pull custom configuration file +if [ -e "/etc/sysconfig/dnsmasq" ]; then + . /etc/sysconfig/dnsmasq +fi function dnssec_args() { - local cmdline="--dnssec --dnssec-timestamp" + local cmdline="--dnssec --dnssec-timestamp ${TIMESTAMP_FILE}" if [ -n "${TRUST_ANCHOR}" ]; then cmdline="${cmdline} --trust-anchor=${TRUST_ANCHOR}" @@@ -55,6 -54,21 +55,21 @@@ function dns_forward_args() echo "${cmdline}" } + function dns_leases_args() { + eval $(/usr/local/bin/readhash /var/ipfire/dhcp/settings) + + # If the DHCP server is enabled and DNS Update (RFC2136) is + # enabled, too, we won't overlay the internal domain with + # the dynamic/static leases. + + if ([ "${ENABLE_GREEN}" = "on" ] || [ "${ENABLE_BLUE}" = "on" ]) \ + && [ "${DNS_UPDATE_ENABLED}" = "on" ]; then + return + fi + + echo "-l /var/state/dhcp/dhcpd.leases" + } + case "${1}" in start) # kill already running copy of dnsmasq... @@@ -65,7 -79,10 +80,10 @@@ eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) ARGS="$CUSTOM_ARGS" [ "$DOMAIN_NAME_GREEN" != "" ] && ARGS="$ARGS -s $DOMAIN_NAME_GREEN" - + + # DHCP configuration + ARGS="${ARGS} $(dns_leases_args)" + echo > /var/ipfire/red/resolv.conf # Clear it if [ -e "/var/ipfire/red/dns1" ]; then DNS1=$(cat /var/ipfire/red/dns1 2>/dev/null) @@@ -95,7 -112,7 +113,7 @@@ ARGS="${ARGS} --cache-size=${CACHE_SIZE}" fi - loadproc /usr/sbin/dnsmasq -l /var/state/dhcp/dhcpd.leases $ARGS + loadproc /usr/sbin/dnsmasq ${ARGS} if [ "${SHOW_SRV}" -eq 1 ] && [ "${DNS1}" != "" -o "${DNS2}" != "" ]; then boot_mesg "Using DNS server(s): ${DNS1} ${DNS2}"
$Lang::tr{'mac address'}