From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 26 Mar 2014 22:43:04 +0000 (+0100)
Subject: Merge branch 'ppp-update' into beyond-next
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=41dfa08d2a9be671a48d4e0cd33f1e89541ae0d8

Merge branch 'ppp-update' into beyond-next
---

41dfa08d2a9be671a48d4e0cd33f1e89541ae0d8
diff --cc langs/de/cgi-bin/de.pl
index 5288baaa3,977dbacb4..3fbdd2072
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@@ -32,8 -33,9 +32,10 @@@
  'Level7 Rule' => 'Level7-Regel',
  'Level7 rule' => 'Level7-Regel',
  'Local VPN IP' => 'Internes Netzwerk (GREEN)',
+ 'MB read' => 'MB gelesen',
+ 'MB written' => 'MB geschrieben',
  'MTU' => 'MTU Size',
 +'Number of Countries for the pie chart' => 'Anzahl der angezeigten Länder im Diagramm',
  'Number of IPs for the pie chart' => 'Anzahl der angezeigten IPs im Diagramm',
  'Number of Ports for the pie chart' => 'Anzahl der angezeigten Ports im Diagramm',
  'OVPN' => 'OpenVPN',
diff --cc langs/en/cgi-bin/en.pl
index ab85ab6e6,42dea0e53..46f5625c1
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@@ -32,8 -33,9 +32,10 @@@
  'Level7 Rule' => 'Level7-Rule',
  'Level7 rule' => 'Level7 rule',
  'Local VPN IP' => 'Internal Network (GREEN):',
+ 'MB read' => 'MB read',
+ 'MB written' => 'MB written',
  'MTU' => 'MTU size:',
 +'Number of Countries for the pie chart' => 'Number of Countries for the pie chart',
  'Number of IPs for the pie chart' => 'Number of IPs for the pie chart',
  'Number of Ports for the pie chart' => 'Number of ports for the pie chart',
  'OVPN' => 'OpenVPN',