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

This commit is contained in:
Stefan Schantl
2018-12-28 07:36:59 +01:00
48 changed files with 729 additions and 321 deletions

View File

@@ -846,7 +846,7 @@
'dnsforward configuration' => 'DNS forward configuration',
'dnsforward edit an entry' => 'Edit an existing entry',
'dnsforward entries' => 'Current entries',
'dnsforward forward_server' => 'Nameserver',
'dnsforward forward_servers' => 'Nameservers',
'dnsforward zone' => 'Zone',
'dnssec aware' => 'DNSSEC Aware',
'dnssec disabled warning' => 'WARNING: DNSSEC has been disabled',
@@ -1446,6 +1446,7 @@
'invalid input for state or province' => 'Invalid input for state or province.',
'invalid input for valid till days' => 'Invalid input for Valid till (days).',
'invalid ip' => 'Invalid IP Address',
'invalid ip or hostname' => 'Invalid IP Address or Hostname',
'invalid keep time' => 'Keep time must be a valid number',
'invalid key' => 'Invalid key.',
'invalid loaded file' => 'Invalid loaded file',