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

This commit is contained in:
Stefan Schantl
2016-06-21 10:08:07 +02:00
99 changed files with 11731 additions and 1627 deletions

View File

@@ -65,20 +65,22 @@ my %sections = (
'ipsec' => '(ipsec_[\w_]+: |pluto\[.*\]: |charon: |vpnwatch: )',
'openvpn' => '(openvpnserver\[.*\]: |.*n2n\[.*\]: )',
'pakfire' => '(pakfire:) ',
'wireless' => '(hostapd:|kernel: ath.*:|kernel: wifi[0-9]:) '
'wireless' => '(hostapd:|kernel: ath.*:|kernel: wifi[0-9]:) ',
'squid' => '(squid\[.*\]: |squid: )',
'snort' => '(snort\[.*\]: )'
);
# Translations for the %sections array.
my %trsections = (
'ipfire' => 'IPFire',
'red' => 'RED',
'ddns' => $Lang::tr{'dynamic dns'},
'ddns' => "$Lang::tr{'dynamic dns'}",
'dns' => 'DNS',
'dma' => 'Mail',
'dhcp' => "$Lang::tr{'dhcp server'}",
'cron' => 'Cron',
'collectd' => 'Collectd',
'clamav' => 'ClamAV',
'clamav' => 'ClamAV',
'ntp' => 'NTP',
'ssh' => 'SSH',
'auth' => "$Lang::tr{'loginlogout'}",
@@ -86,7 +88,9 @@ my %trsections = (
'ipsec' => 'IPSec',
'openvpn' => 'OpenVPN',
'pakfire' => 'Pakfire',
'wireless' => 'Wireless'
'wireless' => 'Wireless',
'squid' => "$Lang::tr{'web proxy'}",
'snort' => "$Lang::tr{'intrusion detection'}"
);