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

This commit is contained in:
Alexander Marx
2014-01-09 10:15:29 +01:00
45 changed files with 961 additions and 1542 deletions

View File

@@ -1269,6 +1269,7 @@
'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',