Merge remote-tracking branch 'ms/iptables-conntrack' into next

This commit is contained in:
Michael Tremer
2016-01-22 00:54:14 +00:00
15 changed files with 122 additions and 21 deletions

View File

@@ -367,6 +367,7 @@
'alt vpn' => 'VPNs',
'and' => 'Und',
'apcupsd' => 'APC-UPS Status',
'application layer gateways' => 'Application-Layer-Gateways',
'apply' => 'Jetzt anwenden',
'april' => 'April',
'archive not exist' => 'Konfigurationsarchiv existiert nicht',

View File

@@ -369,6 +369,7 @@
'and' => 'And',
'ansi t1.483' => 'TO BE REMOVED',
'apcupsd' => 'APC-UPS status',
'application layer gateways' => 'Application Layer Gateways',
'apply' => 'Apply now',
'april' => 'April',
'archive not exist' => 'Configuration archive does not exist',