From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 13 Jan 2015 16:37:18 +0000 (+0100)
Subject: Merge remote-tracking branch 'amarx/vpn-statistic1' into next
X-Git-Tag: v2.17-core89~77
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3906cf7e852872556728191a234152acf213db05;p=ipfire-2.x.git

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

3906cf7e852872556728191a234152acf213db05
diff --cc langs/de/cgi-bin/de.pl
index 3f96a60f1c,1e75e3ab4a..bf0165129c
--- a/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 ad331b20e2,4cbe502413..3ae4797764
--- a/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',