Merge branch 'next-geoip' into core-90-geoip

This commit is contained in:
Stefan Schantl
2015-04-15 17:10:49 +02:00
28 changed files with 1669 additions and 24 deletions

View File

@@ -435,6 +435,7 @@
'bit' => 'bit',
'bitrate' => 'Bitrate',
'bleeding rules' => 'Bleeding Edge Snort Rules',
'block' => 'Block',
'blue' => 'BLUE',
'blue access' => 'Blue Access',
'blue access use hint' => 'You have to enter the MAC or the IP Address for a device. To enter both is also possible',
@@ -550,6 +551,7 @@
'chain' => 'Chain',
'change passwords' => 'Change passwords',
'change share' => 'edit share options',
'check all' =>'Check all',
'check for net traffic update' => 'Check for Net-Traffic updates',
'check vpn lr' => 'Check',
'choose config' => 'Choose config',
@@ -1094,6 +1096,7 @@
'fwhost OpenVPN static host' => 'OpenVPN static host',
'fwhost OpenVPN static network' => 'OpenVPN static network',
'fwhost Standard Network' => 'Standard network',
'fwhost addgeoipgrp' => 'Add new GeoIP group',
'fwhost addgrp' => 'Add new network/host group',
'fwhost addgrpname' => 'Group name:',
'fwhost addhost' => 'Add new host',
@@ -1109,6 +1112,9 @@
'fwhost change' => 'Modify',
'fwhost changeremark' => 'You modified just the remark',
'fwhost cust addr' => 'Hosts',
'fwhost cust geoip' => 'GeoIP Groups',
'fwhost cust geoipgroup' => 'GeoIP Groups',
'fwhost cust geoiplocation' => 'GeoIP Locations',
'fwhost cust grp' => 'Network/Host Groups',
'fwhost cust net' => 'Networks',
'fwhost cust service' => 'Services',
@@ -1155,6 +1161,7 @@
'fwhost ipsec net' => 'IPsec networks:',
'fwhost menu' => 'Firewall Groups',
'fwhost netaddress' => 'Network address',
'fwhost newgeoipgrp' => 'GeoIP Groups',
'fwhost newgrp' => 'Network/Host Groups',
'fwhost newhost' => 'Hosts',
'fwhost newnet' => 'Networks',
@@ -1191,6 +1198,16 @@
'generating the root and host certificates may take a long time. it can take up to several minutes on older hardware. please be patient' => 'Generating the root and host certificates may take a long time. It can take up to several minutes on older hardware. Please be patient.',
'genkey' => 'Generate PSK',
'genre' => 'Genre',
'geoip' => 'GeoIP',
'geoipblock' => 'GeoIP Block',
'geoipblock block countries' => 'Block countries',
'geoipblock configuration' => 'GeoIP Configuration',
'geoipblock country code' => 'Country Code',
'geoipblock country is allowed' => 'Incoming traffic from this country is allowed',
'geoipblock country is blocked' => 'Incoming traffic from this country will be blocked',
'geoipblock country name' => 'Country Name',
'geoipblock enable feature' => 'Enable GeoIP based blocking:',
'geoipblock flag' => 'Flag',
'global settings' => 'Global Settings',
'gpl i accept these terms and conditions' => 'I accept these terms and conditions',
'gpl license agreement' => 'License Agreement',
@@ -2253,8 +2270,11 @@
'type' => 'Type',
'umount' => 'Umount',
'umount removable media before to unplug' => 'Umount removable media before unplugging the device',
'uncheck all' => 'Uncheck all',
'unable to alter profiles while red is active' => 'Unable to alter profiles while RED is active.',
'unable to contact' => 'Unable to contact',
'unblock' => 'Unblock',
'unblock all' => 'Unblock all',
'unencrypted' => 'Unencrypted',
'uninstall' => 'Uninstall',
'unix charset' => 'UNIX Charset',