From: Alexander Marx <amarx@ipfire.org>
Date: Thu, 9 Jan 2014 09:15:29 +0000 (+0100)
Subject: Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen-layout
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=943a96faed4fb515259c18d04b330ba622490b7b

Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen-layout
---

943a96faed4fb515259c18d04b330ba622490b7b
diff --cc langs/de/cgi-bin/de.pl
index ee69c98a6,ddc008809..2dd6f0252
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@@ -1269,9 -1269,9 +1269,10 @@@
  'ipfire side is invalid' => 'IPFire Seite ist ungültig.',
  'ipfires hostname' => 'IPFire\'s Hostname',
  'ipinfo' => 'IP-Info',
+ 'ipsec network' => 'IPsec-Netzwerke',
  'iptable rules' => 'IPTable-Regeln',
  'iptmangles' => 'IPTable Mangles',
 +'ipsec network' => 'IPsec-Netzwerke',
  'iptnats' => 'IPTable Network Address Translation',
  'ipts' => 'iptables',
  'isdn' => 'ISDN',