Merge remote-tracking branch 'origin/next'

[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 4efff6e65fcd25553e421779c05a1217850d78c9..3940d7b7c776c7dcda238d1b0951c8a4fbcf1c19 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1011,6 +1011,7 @@
 'false min bandwith' => 'Minimum bandwith is false.',
 'february' => 'February',
 'fetch ip from' => 'Guess the real public IP with help of an external server',
+'fifteen minutes' => '15 Minutes',
 'filename' => 'Filename',
 'filesystem full' => 'Filesystem full',
 'fireinfo ipfire version' => 'IPFire version',
@@ -1049,6 +1050,7 @@
 'firmware' => 'Firmware',
 'firmware upload' => 'Upload Firmware/Drivers',
 'first' => 'First',
+'five minutes' => '5 Minutes',
 'fixed ip lease added' => 'Fixed IP lease added',
 'fixed ip lease modified' => 'Fixed IP lease modified',
 'fixed ip lease removed' => 'Fixed IP lease removed',
@@ -1419,6 +1421,7 @@
 'invalid input for esp keylife' => 'Invalid input for ESP Keylife',
 'invalid input for hostname' => 'Invalid input for hostname.',
 'invalid input for ike lifetime' => 'Invalid input for IKE lifetime',
+'invalid input for inactivity timeout' => 'Invalid input for Inactivity Timeout',
 'invalid input for keepalive 1' => 'Invalid input for Keepalive ping',
 'invalid input for keepalive 1:2' => 'Invalid input for Keepalive use at least a ratio of 1:2',
 'invalid input for keepalive 2' => 'Invalid input for Keepalive ping-restart',
@@ -1435,6 +1438,7 @@
 'invalid loaded file' => 'Invalid loaded file',
 'invalid local-remote id' => 'local & remote id must not be equal and begin with a "@" sign. These are leftid and rightid in strongswan terminology.',
 'invalid logserver address' => 'Invalid syslogd server address',
+'invalid logserver protocol' => 'Invalid syslogd server protocol',
 'invalid mac address' => 'Invalid MAC address',
 'invalid max lease time' => 'Invalid max lease time.',
 'invalid maximum incoming size' => 'Invalid maximum incoming size.',
@@ -1522,6 +1526,7 @@
 'log level' => 'Log Level',
 'log lines per page' => 'Lines per page',
 'log server address' => 'Syslog server:',
+'log server protocol' => 'protocol:',
 'log settings' => 'Log Settings',
 'log summaries' => 'Log summaries',
 'log summary' => 'Log Summary',
@@ -1997,6 +2002,7 @@
 'quick playlist' => 'Quick Playlist',
 'ram' => 'RAM',
 'random number generator daemon' => 'Random Number Generator Daemon',
+'rdns' => 'rDNS',
 'read bytes' => 'Read Bytes',
 'read list' => 'list with readonly hosts',
 'real address' => 'Real Address',
@@ -2238,9 +2244,11 @@
 'system logs' => 'System Logs',
 'system status information' => 'System Status Information',
 'ta key' => 'TLS-Authentification-Key',
+'tcp more reliable' => 'TCP (more reliable)',
 'telephone not set' => 'Telephone not set.',
 'template' => 'Preset',
 'template warning' => 'You have two options to set up Qos. The First, you press the save button and generate the classes and rules on your own. The second, you press the preset button and classes and rules will be set up by a template.',
+'ten minutes' => '10 Minutes',
 'teovpn_fragment' => 'Fragmentsize',
 'test' => 'test',
 'test email could not be sent' => 'Could not sent Testemail',
@@ -2251,6 +2259,7 @@
 'there are updates' => 'There are updates available for your system. Please go to the "updates" section for more information.',
 'there are updates available' => 'There are updates available for your system. It is strongly urged that you install them as soon as possible.',
 'there was no file upload' => 'There was no file upload.',
+'thirty minutes' => '30 Minutes',
 'this feature has been sponsored by' => 'This feature has been sponsored by',
 'this is not a valid archive' => 'This is not a valid archive.',
 'this is not an authorised update' => 'This is not an authorised update.',
@@ -2363,6 +2372,7 @@
 'twelve hours' => '12 Hours',
 'two weeks' => 'Two Weeks',
 'type' => 'Type',
+'udp less overhead' => 'UDP (less overhead)',
 'umount' => 'Umount',
 'umount removable media before to unplug' => 'Umount removable media before unplugging the device',
 'unable to alter profiles while red is active' => 'Unable to alter profiles while RED is active.',
@@ -2723,6 +2733,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 force mobike' => 'Force using MOBIKE (only IKEv2)',
+'vpn inactivity timeout' => 'Inactivity Timeout',
 'vpn incompatible use of defaultroute' => 'hostname=%defaultroute not allowed',
 'vpn keyexchange' => 'Keyexchange',
 'vpn local id' => 'Local ID',