From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. f57a228c4bed2b7f680b929a511634d21f2007e6 Date: Mon, 19 Jan 2015 17:05:51 +0100 Message-ID: <20150119160551.9EC7821658@argus.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5242144294546111769==" List-Id: --===============5242144294546111769== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via f57a228c4bed2b7f680b929a511634d21f2007e6 (commit) from 97af8b2b85abaa381b668ff20ddd6b41fc8f1827 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f57a228c4bed2b7f680b929a511634d21f2007e6 Author: Michael Tremer Date: Mon Jan 19 17:04:37 2015 +0100 ipsec: Allow IKE lifetime of up to 24 hours =20 Requested in #10722 =20 The recommended time has not been changed, but it is often stated that 24 hours is a common lifetime for IKE. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/vpnmain.cgi | 4 ++-- langs/de/cgi-bin/de.pl | 2 +- langs/en/cgi-bin/en.pl | 2 +- langs/es/cgi-bin/es.pl | 2 +- langs/fr/cgi-bin/fr.pl | 2 +- langs/it/cgi-bin/it.pl | 2 +- langs/nl/cgi-bin/nl.pl | 2 +- langs/pl/cgi-bin/pl.pl | 2 +- langs/ru/cgi-bin/ru.pl | 2 +- langs/tr/cgi-bin/tr.pl | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) Difference in files: diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index f5ec500..380ae26 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -2168,8 +2168,8 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || $errormessage =3D $Lang::tr{'invalid input for ike lifetime'}; goto ADVANCED_ERROR; } - if ($cgiparams{'IKE_LIFETIME'} < 1 || $cgiparams{'IKE_LIFETIME'} > 8) { - $errormessage =3D $Lang::tr{'ike lifetime should be between 1 and 8 hou= rs'}; + if ($cgiparams{'IKE_LIFETIME'} < 1 || $cgiparams{'IKE_LIFETIME'} > 24) { + $errormessage =3D $Lang::tr{'ike lifetime should be between 1 and 24 ho= urs'}; goto ADVANCED_ERROR; } @temp =3D split('\|', $cgiparams{'ESP_ENCRYPTION'}); diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 7ad94f5..eb29b5f 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1232,7 +1232,7 @@ 'ike grouptype' =3D> 'IKE Gruppentyp:', 'ike integrity' =3D> 'IKE Integrit=C3=A4t:', 'ike lifetime' =3D> 'IKE Lebensdauer:', -'ike lifetime should be between 1 and 8 hours' =3D> 'IKE Lebensdauer sollte = zwischen 1 und 8 Stunden betragen.', +'ike lifetime should be between 1 and 24 hours' =3D> 'IKE Lebensdauer sollte= zwischen 1 und 24 Stunden betragen.', 'imei' =3D> 'IMEI', 'import' =3D> 'Import', 'importkey' =3D> 'PSK importieren', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index d34e6c7..8c049ff 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1261,7 +1261,7 @@ 'ike grouptype' =3D> 'IKE Grouptype:', 'ike integrity' =3D> 'IKE Integrity:', 'ike lifetime' =3D> 'IKE Lifetime:', -'ike lifetime should be between 1 and 8 hours' =3D> 'IKE lifetime should be = between 1 and 8 hours.', +'ike lifetime should be between 1 and 24 hours' =3D> 'IKE lifetime should be= between 1 and 24 hours.', 'imei' =3D> 'IMEI', 'import' =3D> 'Import', 'importkey' =3D> 'Import PSK', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index 8c757a9..b7c50ff 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -934,7 +934,7 @@ 'ike grouptype' =3D> 'Tipo de grupo IKE:', 'ike integrity' =3D> 'Integridad IKE:', 'ike lifetime' =3D> 'Tiempo de vida IKE:', -'ike lifetime should be between 1 and 8 hours' =3D> 'Tiempo de vida IKE entr= e 1 y 8 horas.', +'ike lifetime should be between 1 and 24 hours' =3D> 'Tiempo de vida IKE ent= re 1 y 24 horas.', 'import' =3D> 'Importar', 'importkey' =3D> 'Importar PSK', 'in' =3D> 'En', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index ccd61cb..8b4d63a 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -935,7 +935,7 @@ 'ike grouptype' =3D> 'Type de groupe IKE :', 'ike integrity' =3D> 'Int=C3=A9grit=C3=A9 IKE :', 'ike lifetime' =3D> 'Dur=C3=A9e de vie IKE :', -'ike lifetime should be between 1 and 8 hours' =3D> 'La dur=C3=A9e de vie IK= E devrait =C3=AAtre comprise entre 1 et 8 heures.', +'ike lifetime should be between 1 and 24 hours' =3D> 'La dur=C3=A9e de vie I= KE devrait =C3=AAtre comprise entre 1 et 8 heures.', 'import' =3D> 'Importer', 'importkey' =3D> 'Importer PSK', 'in' =3D> 'Dans', diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl index 0b5e786..4fde313 100644 --- a/langs/it/cgi-bin/it.pl +++ b/langs/it/cgi-bin/it.pl @@ -1247,7 +1247,7 @@ 'ike grouptype' =3D> 'IKE Grouptype:', 'ike integrity' =3D> 'IKE Integrity:', 'ike lifetime' =3D> 'IKE Lifetime:', -'ike lifetime should be between 1 and 8 hours' =3D> 'IKE lifetime should be = between 1 and 8 hours.', +'ike lifetime should be between 1 and 24 hours' =3D> 'IKE lifetime should be= between 1 and 24 hours.', 'imei' =3D> 'IMEI', 'import' =3D> 'Import', 'importkey' =3D> 'Import PSK', diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl index fdad1d3..7468eb9 100644 --- a/langs/nl/cgi-bin/nl.pl +++ b/langs/nl/cgi-bin/nl.pl @@ -1227,7 +1227,7 @@ 'ike grouptype' =3D> 'IKE Groepstype:', 'ike integrity' =3D> 'IKE Integriteit:', 'ike lifetime' =3D> 'IKE Levensduur:', -'ike lifetime should be between 1 and 8 hours' =3D> 'IKE levensduur moet tus= sen 1 en 8 uur liggen.', +'ike lifetime should be between 1 and 24 hours' =3D> 'IKE levensduur moet tu= ssen 1 en 24 uur liggen.', 'import' =3D> 'Importeer', 'importkey' =3D> 'Importeer PSK', 'in' =3D> 'In', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index 5a205e1..02fb531 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -943,7 +943,7 @@ 'ike grouptype' =3D> 'Typ grupy IKE:', 'ike integrity' =3D> 'Sp=C3=B3jno=C5=9B=C4=87 IKE:', 'ike lifetime' =3D> 'Czas wa=C5=BCno=C5=9Bci IKE:', -'ike lifetime should be between 1 and 8 hours' =3D> 'Czas wa=C5=BCno=C5=9Bci= IKE powinien wynosi=C4=87 od 1 do 8 godzin.', +'ike lifetime should be between 1 and 24 hours' =3D> 'Czas wa=C5=BCno=C5=9Bc= i IKE powinien wynosi=C4=87 od 1 do 24 godzin.', 'import' =3D> 'Import', 'importkey' =3D> 'Import PSK', 'in' =3D> 'W', diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl index 38b8441..a2a3693 100644 --- a/langs/ru/cgi-bin/ru.pl +++ b/langs/ru/cgi-bin/ru.pl @@ -937,7 +937,7 @@ 'ike grouptype' =3D> 'IKE Grouptype:', 'ike integrity' =3D> 'IKE Integrity:', 'ike lifetime' =3D> 'IKE Lifetime:', -'ike lifetime should be between 1 and 8 hours' =3D> 'IKE lifetime should be = between 1 and 8 hours.', +'ike lifetime should be between 1 and 24 hours' =3D> 'IKE lifetime should be= between 1 and 24 hours.', 'import' =3D> 'Import', 'importkey' =3D> 'Import PSK', 'in' =3D> 'In', diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl index ca199bf..89f753e 100644 --- a/langs/tr/cgi-bin/tr.pl +++ b/langs/tr/cgi-bin/tr.pl @@ -1261,7 +1261,7 @@ 'ike grouptype' =3D> 'IKE Grup T=C3=BCr=C3=BC:', 'ike integrity' =3D> 'IKE B=C3=BCt=C3=BCnl=C3=BC=C4=9F=C3=BC:', 'ike lifetime' =3D> 'IKE Ya=C5=9Fam S=C3=BCresi:', -'ike lifetime should be between 1 and 8 hours' =3D> 'IKE ya=C5=9Fam s=C3=BCr= esi 1 ila 8 saat aras=C4=B1nda olmal=C4=B1d=C4=B1r.', +'ike lifetime should be between 1 and 24 hours' =3D> 'IKE ya=C5=9Fam s=C3=BC= resi 1 ila 24 saat aras=C4=B1nda olmal=C4=B1d=C4=B1r.', 'imei' =3D> 'IMEI', 'import' =3D> 'Al', 'importkey' =3D> 'PSK Al', hooks/post-receive -- IPFire 2.x development tree --===============5242144294546111769==--