Merge branch 'master' into next

[people/pmueller/ipfire-2.x.git] / langs / en / cgi-bin / en.pl

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index c774168bdaa03b99ee3c358f8582d3b552fe6ba8..851d3c6a8a3de12e9a2c52d5d824286c7e7429cf 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1,11 +1,11 @@
 %tr = ( 
 %tr,
-'vpn keyexchange' => 'Keyexchange'
-'Act as' => 'Act as:',
+
 'Act as' => 'Act as:',
 'Add Level7 rule' => 'Add Level7 rule',
 'Add Port Rule' => 'Add port rule',
 'Add Rule' => 'Add rule',
+'Add a route' => 'Add a route',
 'Async logging enabled' => 'Enable asynchronous writing of the syslog file',
 'Choose Rule' => 'Choose <u>one</u> of the following rules.',
 'Class' => 'Class',
@@ -25,6 +25,7 @@
 'ConnSched time' => 'Time:',
 'ConnSched up' => 'Up',
 'ConnSched weekdays' => 'Days of the week:',
+'Edit an existing route' => 'Edit an existing route',
 'Enter TOS' => 'Activate or deactivate TOS-bits <br /> and then press <i>Save</i>.',
 'Existing Files' => 'Files in database',
 'HDD temperature' => 'HDD temperature',
@@ -799,16 +800,16 @@
 'external access rule removed' => ' External access rule removed; restarting access controller',
 'external aliases configuration' => 'External aliases configuration',
 'extrahd' => 'ExtraHD',
+'extrahd because there is already a device mounted' => ', because there is already a device mounted',
+'extrahd cant umount' => 'Can\'t umount',
 'extrahd detected drives' => 'detected drives',
+'extrahd install or load driver' => 'If your device isn\'t listed here, you need to install or load the driver.<br />If you can see your device but no partitions you have to create them first.',
+'extrahd maybe the device is in use' => '. Maybe the device is in use',
+'extrahd to' => 'to',
+'extrahd to root' => 'to root',
 'extrahd unable to read' => 'Unable to read',
 'extrahd unable to write' => 'Unable to write',
 'extrahd you cant mount' => 'You can\'t mount',
-'extrahd to' => 'to',
-'extrahd to root' => 'to root',
-'extrahd because there is already a device mounted' => ', because there is already a device mounted',
-'extrahd cant umount' => 'Can\'t umount',
-'extrahd maybe the device is in use' => '. Maybe the device is in use',
-'extrahd install or load driver' => 'If your device isn\'t listed here, you need to install or load the driver.<br />If you can see your device but no partitions you have to create them first.',
 'false classnumber' => 'The Class-Number does not match the interface.',
 'false max bandwith' => 'Maximum bandwith is false.',
 'false min bandwith' => 'Minimum bandwith is false.',
@@ -1187,6 +1188,7 @@
 'min delay' => 'Minimum delay',
 'min size' => 'Min object size (KB):',
 'minimal' => 'Minimal',
+'minute' => 'Minute',
 'minutes' => 'Minutes',
 'misc-options' => 'Miscellaneous options',
 'missing dat' => 'Encrypted archive not found',
@@ -2121,6 +2123,7 @@
 'vpn delayed start' => 'Delay before launching VPN (seconds)',
 'vpn delayed start help' => 'If required, this delay can be used to allow dynamic DNS updates to propagate properly. 60 is a common value when RED is a dynamic IP.',
 'vpn incompatible use of defaultroute' => 'hostname=%defaultroute not allowed',
+'vpn keyexchange' => 'Keyexchange',
 'vpn local id' => 'Local ID',
 'vpn missing remote id' => 'You must specify a correct Distinguished Name (DN) for this authentication.',
 'vpn mtu invalid' => 'MTU must be a numeric value!',