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

diff --cc langs/de/cgi-bin/de.pl
index ee69c98a698a9c6965bb3a765be2c85668972aa5,ddc00880907b93a8bfe5292b83e950bf2ba55dc3..2dd6f02523f4a0ea55dfc4724a41c17062d933b0
--- 1/langs/de/cgi-bin/de.pl
--- 2/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',