From: Michael Tremer Date: Fri, 22 Jan 2016 00:54:14 +0000 (+0000) Subject: Merge remote-tracking branch 'ms/iptables-conntrack' into next X-Git-Tag: v2.19-core100~70 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=8a1a3bf3934c8a92c605135ee13db466ea3dcbf4 Merge remote-tracking branch 'ms/iptables-conntrack' into next --- 8a1a3bf3934c8a92c605135ee13db466ea3dcbf4 diff --cc doc/language_issues.it index 65643e8757,c369e6c97e..fd64d95641 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@@ -700,30 -672,9 +700,31 @@@ WARNING: untranslated string: advproxy WARNING: untranslated string: advproxy basic authentication WARNING: untranslated string: advproxy group access control WARNING: untranslated string: advproxy group required + WARNING: untranslated string: application layer gateways 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: dl client arch insecure +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 diff --cc doc/language_issues.tr index a419afa9d3,c692a46e5b..b701bdf93f --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@@ -703,12 -664,30 +703,13 @@@ WARNING: translation string unused: xta WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Scan for Songs + WARNING: untranslated string: application layer gateways WARNING: untranslated string: bytes -WARNING: untranslated string: check all -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: invalid input for valid till days +WARNING: untranslated string: info messages WARNING: untranslated string: no data -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: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed