Merge remote-tracking branch 'amarx/vpn-statistic1' into next

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

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

diff --cc langs/de/cgi-bin/de.pl
index 3f96a60f1c9617f183f67f225c7846687458626b,1e75e3ab4a8391921074ce40851ced69358005d9..bf0165129c2a7b1a392dbd2fdfbda71ef995222f
--- 1/langs/de/cgi-bin/de.pl
--- 2/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@@ -1688,9 -1683,10 +1690,11 @@@
  'outgoing firewall view group' => 'Gruppe anzeigen',
  'outgoing firewall warning' => 'Nur die Auswahl Quell IP / MAC aktiviert diese',
  'outgoing traffic in bytes per second' => 'Abgehender Verkehr',
+ 'outgoing overhead in bytes per second' => 'Abgehender Overhead',
+ 'outgoing compression in bytes per second' => 'Abgehende Kompression',
  'override mtu' => 'Überschreibe Standard MTU',
  'ovpn' => 'OpenVPN',
 +'ovpn add conf' => 'Erweiterte Konfiguration',
  'ovpn con stat' => 'OpenVPN Verbindungs-Statistik',
  'ovpn config' => 'OVPN-Konfiguration',
  'ovpn crypt options' => 'Kryptografieoptionen',

diff --cc langs/en/cgi-bin/en.pl
index ad331b20e26cae54b9ad8e4eeb43600790b25030,4cbe5024137a7cf3c8a4dfcc1f09026b254d5933..3ae4797764e445962cc0d18ba0be5742e2f867d1
--- 1/langs/en/cgi-bin/en.pl
--- 2/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@@ -1719,9 -1714,10 +1721,11 @@@
  'outgoing firewall view group' => 'View group',
  'outgoing firewall warning' => 'Not selecting source ip or mac ignores them',
  'outgoing traffic in bytes per second' => 'Outgoing Traffic',
+ 'outgoing overhead in bytes per second' => 'Outgoing Overhead',
+ 'outgoing compression in bytes per second' => 'Outgoing compression',
  'override mtu' => 'Override default MTU',
  'ovpn' => 'OpenVPN',
 +'ovpn add conf' => 'Additional configuration',
  'ovpn con stat' => 'OpenVPN Connection Statistics',
  'ovpn config' => 'OVPN-Config',
  'ovpn crypt options' => 'Cryptographic options',

diff --cc lfs/openvpn
Simple merge