Signed-off-by: Michael Tremer michael.tremer@ipfire.org --- doc/language_issues.de | 1 - doc/language_issues.en | 2 +- doc/language_issues.es | 2 -- doc/language_issues.fr | 2 -- doc/language_issues.it | 2 -- doc/language_issues.nl | 2 -- doc/language_issues.pl | 2 -- doc/language_issues.ru | 2 -- doc/language_issues.tr | 2 -- html/cgi-bin/vpnmain.cgi | 4 ++-- langs/de/cgi-bin/de.pl | 1 - 11 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/doc/language_issues.de b/doc/language_issues.de index 361133708..aae1da012 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -360,7 +360,6 @@ WARNING: translation string unused: ike encryption WARNING: translation string unused: ike grouptype WARNING: translation string unused: ike integrity WARNING: translation string unused: ike lifetime -WARNING: translation string unused: ike lifetime should be between 1 and 24 hours WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in diff --git a/doc/language_issues.en b/doc/language_issues.en index 2fd69f430..6efc42719 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -1061,7 +1061,7 @@ WARNING: untranslated string: ids show = Show WARNING: untranslated string: ids working = Changes are being applied. Please wait until all operations have completed successfully... WARNING: untranslated string: iface = Iface WARNING: untranslated string: ignore filter = Ignore filter -WARNING: untranslated string: ike lifetime should be between 1 and 8 hours = unknown string +WARNING: untranslated string: ike lifetime should be between 1 and 24 hours = IKE lifetime should be between 1 and 24 hours. WARNING: untranslated string: imei = IMEI WARNING: untranslated string: imsi = IMSI WARNING: untranslated string: inactive = inactive diff --git a/doc/language_issues.es b/doc/language_issues.es index af006fcdf..4f89a2bf3 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -311,7 +311,6 @@ WARNING: translation string unused: ike encryption WARNING: translation string unused: ike grouptype WARNING: translation string unused: ike integrity WARNING: translation string unused: ike lifetime -WARNING: translation string unused: ike lifetime should be between 1 and 24 hours WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@ -1121,7 +1120,6 @@ WARNING: untranslated string: ids ruleset autoupdate in progress = Ruleset updat WARNING: untranslated string: ids ruleset settings = Ruleset Settings WARNING: untranslated string: ids show = Show WARNING: untranslated string: ids working = Changes are being applied. Please wait until all operations have completed successfully... -WARNING: untranslated string: ike lifetime should be between 1 and 8 hours = unknown string WARNING: untranslated string: imei = IMEI WARNING: untranslated string: imsi = IMSI WARNING: untranslated string: incoming compression in bytes per second = Incoming Compression diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 3edee88df..a4ac4ecef 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -388,7 +388,6 @@ WARNING: translation string unused: ike encryption WARNING: translation string unused: ike grouptype WARNING: translation string unused: ike integrity WARNING: translation string unused: ike lifetime -WARNING: translation string unused: ike lifetime should be between 1 and 24 hours WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@ -845,7 +844,6 @@ WARNING: untranslated string: guardian logtarget_file = unknown string WARNING: untranslated string: guardian logtarget_syslog = unknown string WARNING: untranslated string: guardian no entries = unknown string WARNING: untranslated string: guardian service = unknown string -WARNING: untranslated string: ike lifetime should be between 1 and 8 hours = unknown string WARNING: untranslated string: info messages = unknown string WARNING: untranslated string: no data = unknown string WARNING: untranslated string: pakfire ago = ago. diff --git a/doc/language_issues.it b/doc/language_issues.it index 6471e0d41..e5c85551f 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -364,7 +364,6 @@ WARNING: translation string unused: ike encryption WARNING: translation string unused: ike grouptype WARNING: translation string unused: ike integrity WARNING: translation string unused: ike lifetime -WARNING: translation string unused: ike lifetime should be between 1 and 24 hours WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@ -964,7 +963,6 @@ WARNING: untranslated string: ids ruleset autoupdate in progress = Ruleset updat WARNING: untranslated string: ids ruleset settings = Ruleset Settings WARNING: untranslated string: ids show = Show WARNING: untranslated string: ids working = Changes are being applied. Please wait until all operations have completed successfully... -WARNING: untranslated string: ike lifetime should be between 1 and 8 hours = unknown string WARNING: untranslated string: incoming compression in bytes per second = Incoming Compression WARNING: untranslated string: incoming overhead in bytes per second = Incoming Overhead WARNING: untranslated string: info messages = unknown string diff --git a/doc/language_issues.nl b/doc/language_issues.nl index cc6cbe966..d5c3a0aea 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -360,7 +360,6 @@ WARNING: translation string unused: ike encryption WARNING: translation string unused: ike grouptype WARNING: translation string unused: ike integrity WARNING: translation string unused: ike lifetime -WARNING: translation string unused: ike lifetime should be between 1 and 24 hours WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@ -971,7 +970,6 @@ WARNING: untranslated string: ids ruleset autoupdate in progress = Ruleset updat WARNING: untranslated string: ids ruleset settings = Ruleset Settings WARNING: untranslated string: ids show = Show WARNING: untranslated string: ids working = Changes are being applied. Please wait until all operations have completed successfully... -WARNING: untranslated string: ike lifetime should be between 1 and 8 hours = unknown string WARNING: untranslated string: imei = IMEI WARNING: untranslated string: imsi = IMSI WARNING: untranslated string: incoming compression in bytes per second = Incoming Compression diff --git a/doc/language_issues.pl b/doc/language_issues.pl index af006fcdf..4f89a2bf3 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -311,7 +311,6 @@ WARNING: translation string unused: ike encryption WARNING: translation string unused: ike grouptype WARNING: translation string unused: ike integrity WARNING: translation string unused: ike lifetime -WARNING: translation string unused: ike lifetime should be between 1 and 24 hours WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@ -1121,7 +1120,6 @@ WARNING: untranslated string: ids ruleset autoupdate in progress = Ruleset updat WARNING: untranslated string: ids ruleset settings = Ruleset Settings WARNING: untranslated string: ids show = Show WARNING: untranslated string: ids working = Changes are being applied. Please wait until all operations have completed successfully... -WARNING: untranslated string: ike lifetime should be between 1 and 8 hours = unknown string WARNING: untranslated string: imei = IMEI WARNING: untranslated string: imsi = IMSI WARNING: untranslated string: incoming compression in bytes per second = Incoming Compression diff --git a/doc/language_issues.ru b/doc/language_issues.ru index a8cdef8b4..21629f28a 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -304,7 +304,6 @@ WARNING: translation string unused: ike encryption WARNING: translation string unused: ike grouptype WARNING: translation string unused: ike integrity WARNING: translation string unused: ike lifetime -WARNING: translation string unused: ike lifetime should be between 1 and 24 hours WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@ -1122,7 +1121,6 @@ WARNING: untranslated string: ids ruleset autoupdate in progress = Ruleset updat WARNING: untranslated string: ids ruleset settings = Ruleset Settings WARNING: untranslated string: ids show = Show WARNING: untranslated string: ids working = Changes are being applied. Please wait until all operations have completed successfully... -WARNING: untranslated string: ike lifetime should be between 1 and 8 hours = unknown string WARNING: untranslated string: imei = IMEI WARNING: untranslated string: imsi = IMSI WARNING: untranslated string: incoming compression in bytes per second = Incoming Compression diff --git a/doc/language_issues.tr b/doc/language_issues.tr index c6c6ad599..cee9e768c 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -392,7 +392,6 @@ WARNING: translation string unused: ike encryption WARNING: translation string unused: ike grouptype WARNING: translation string unused: ike integrity WARNING: translation string unused: ike lifetime -WARNING: translation string unused: ike lifetime should be between 1 and 24 hours WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@ -895,7 +894,6 @@ WARNING: untranslated string: ids ruleset autoupdate in progress = Ruleset updat WARNING: untranslated string: ids ruleset settings = Ruleset Settings WARNING: untranslated string: ids show = Show WARNING: untranslated string: ids working = Changes are being applied. Please wait until all operations have completed successfully... -WARNING: untranslated string: ike lifetime should be between 1 and 8 hours = unknown string WARNING: untranslated string: info messages = unknown string WARNING: untranslated string: interface mode = Interface WARNING: untranslated string: invalid input for interface address = Invalid input for interface address diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 43cdc5aa0..e0f2c7a5e 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -2384,8 +2384,8 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || $errormessage = $Lang::tr{'invalid input for ike lifetime'}; goto ADVANCED_ERROR; } - if ($cgiparams{'IKE_LIFETIME'} < 1 || $cgiparams{'IKE_LIFETIME'} > 8) { - $errormessage = $Lang::tr{'ike lifetime should be between 1 and 8 hours'}; + if ($cgiparams{'IKE_LIFETIME'} < 1 || $cgiparams{'IKE_LIFETIME'} > 24) { + $errormessage = $Lang::tr{'ike lifetime should be between 1 and 24 hours'}; goto ADVANCED_ERROR; } @temp = split('|', $cgiparams{'ESP_ENCRYPTION'}); diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 80579e7cc..1b1f52e22 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1369,7 +1369,6 @@ 'ike integrity' => 'IKE Integrität:', 'ike lifetime' => 'IKE Lebensdauer:', 'ike lifetime should be between 1 and 24 hours' => 'IKE Lebensdauer sollte zwischen 1 und 24 Stunden betragen.', -'ike lifetime should be between 1 and 8 hours' => 'Die IKE-Laufzeit sollte zwischen einer und acht Stunden betragen', 'imei' => 'IMEI', 'import' => 'Import', 'importkey' => 'PSK importieren',