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

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
This commit is contained in:
Stefan Schantl
2018-12-12 09:27:59 +01:00
284 changed files with 26196 additions and 21390 deletions

View File

@@ -2197,7 +2197,7 @@
'ssdmz pinholes' => 'DMZ Pinholes',
'ssh' => 'SSH',
'ssh access' => 'SSH Access',
'ssh access tip' => 'IPFire SSH is not using default port 222!',
'ssh access tip' => 'IPFire SSH is not using default port 22!',
'ssh active sessions' => 'Active logins',
'ssh fingerprint' => 'Fingerprint',
'ssh host keys' => 'SSH Host Keys',
@@ -2210,7 +2210,7 @@
'ssh no active logins' => 'No active logins',
'ssh no auth' => 'You have not allowed any authentication methods; this will stop you logging in',
'ssh passwords' => 'Allow password based authentication',
'ssh port' => 'SSH port set to 22 (default is 222)',
'ssh port' => 'SSH port set to 222 (default is 22)',
'ssh portfw' => 'Allow TCP forwarding',
'ssh tempstart15' => 'Stop SSH demon in 15 minutes',
'ssh tempstart30' => 'Stop SSH demon in 30 minutes',
@@ -2853,6 +2853,8 @@
'wlanap invalid wpa' => 'Invalid length in WPA Passphrase. Must be between 8 and 63 characters.',
'wlanap link dhcp' => 'Wireless lan DHCP configuration',
'wlanap link wireless' => 'Activate wireless lan clients',
'wlanap neighbor scan' => 'Neighborhood scan',
'wlanap neighbor scan warning' => 'Warning! Disabling may violate regulatory rules!',
'wlanap no interface' => 'Selected interface is not a wirless lan card!',
'wlanap none' => 'none',
'wlanap notifications' => 'Notifications',