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 595d86de051a0b55323e448130f32706c6dc050d (commit) via 237f3ab7d35facc6ab53bbde05b448e7e61b4cd3 (commit) from b50b9521fb2d5405b651a717155fe487350c85a1 (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 595d86de051a0b55323e448130f32706c6dc050d Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jun 13 15:49:22 2018 +0100

Update translations

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 237f3ab7d35facc6ab53bbde05b448e7e61b4cd3 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jun 13 15:47:57 2018 +0100

IPsec: Allow to configure a connection in waiting state

This allows to create an IPsec connection that will never actively try to reach the other peer. It helps in environments where this is not desired or impossible because of NAT.

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

-----------------------------------------------------------------------

Summary of changes: doc/language_issues.de | 2 ++ doc/language_issues.en | 2 ++ doc/language_issues.es | 9 +++++++-- doc/language_issues.fr | 9 +++++++-- doc/language_issues.it | 9 +++++++++ doc/language_issues.nl | 9 +++++++++ doc/language_issues.pl | 9 +++++++-- doc/language_issues.ru | 9 +++++++-- doc/language_issues.tr | 9 +++++++++ doc/language_missings | 49 ++++++++++++++++++++++++++++++++++++++++++++++++ html/cgi-bin/index.cgi | 3 +++ html/cgi-bin/vpnmain.cgi | 5 +++++ langs/de/cgi-bin/de.pl | 2 ++ langs/en/cgi-bin/en.pl | 2 ++ 14 files changed, 120 insertions(+), 8 deletions(-)

Difference in files: diff --git a/doc/language_issues.de b/doc/language_issues.de index 45a536238..ecc53d749 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -424,6 +424,7 @@ WARNING: translation string unused: no alcatelusb firmware WARNING: translation string unused: no cfg upload WARNING: translation string unused: no eciadsl synch.bin file WARNING: translation string unused: no fritzdsl driver +WARNING: translation string unused: no hardware random number generator WARNING: translation string unused: no information available WARNING: translation string unused: no modem selected WARNING: translation string unused: no set selected @@ -587,6 +588,7 @@ WARNING: translation string unused: subnet WARNING: translation string unused: subnet is invalid WARNING: translation string unused: successfully refreshed updates list WARNING: translation string unused: system graphs +WARNING: translation string unused: system has hwrng WARNING: translation string unused: system log viewer WARNING: translation string unused: system status information WARNING: translation string unused: test diff --git a/doc/language_issues.en b/doc/language_issues.en index ce218c092..27cacec22 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -451,6 +451,7 @@ WARNING: translation string unused: no alcatelusb firmware WARNING: translation string unused: no cfg upload WARNING: translation string unused: no eciadsl synch.bin file WARNING: translation string unused: no fritzdsl driver +WARNING: translation string unused: no hardware random number generator WARNING: translation string unused: no information available WARNING: translation string unused: no modem selected WARNING: translation string unused: no set selected @@ -618,6 +619,7 @@ WARNING: translation string unused: subnet WARNING: translation string unused: subnet is invalid WARNING: translation string unused: successfully refreshed updates list WARNING: translation string unused: system graphs +WARNING: translation string unused: system has hwrng WARNING: translation string unused: system log viewer WARNING: translation string unused: system status information WARNING: translation string unused: teovpn_fragment diff --git a/doc/language_issues.es b/doc/language_issues.es index a71988875..93396ec02 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -829,6 +829,7 @@ WARNING: untranslated string: fwdfw REJECT WARNING: untranslated string: fwdfw action WARNING: untranslated string: fwdfw additional WARNING: untranslated string: fwdfw all icmp +WARNING: untranslated string: fwdfw all subnets WARNING: untranslated string: fwdfw change WARNING: untranslated string: fwdfw copy WARNING: untranslated string: fwdfw delete @@ -1059,7 +1060,6 @@ WARNING: untranslated string: monitor interface WARNING: untranslated string: most preferred WARNING: untranslated string: nameserver WARNING: untranslated string: no data -WARNING: untranslated string: no hardware random number generator WARNING: untranslated string: none WARNING: untranslated string: not a valid dh key WARNING: untranslated string: notice @@ -1129,9 +1129,12 @@ WARNING: untranslated string: snat new source ip address WARNING: untranslated string: software version WARNING: untranslated string: source ip country WARNING: untranslated string: ssh +WARNING: untranslated string: ssh active sessions +WARNING: untranslated string: ssh login time +WARNING: untranslated string: ssh no active logins +WARNING: untranslated string: ssh username WARNING: untranslated string: static routes WARNING: untranslated string: support donation -WARNING: untranslated string: system has hwrng WARNING: untranslated string: system has rdrand WARNING: untranslated string: system information WARNING: untranslated string: ta key @@ -1207,11 +1210,13 @@ WARNING: untranslated string: vpn inactivity timeout WARNING: untranslated string: vpn keyexchange WARNING: untranslated string: vpn on-demand WARNING: untranslated string: vpn start action +WARNING: untranslated string: vpn start action add WARNING: untranslated string: vpn start action route WARNING: untranslated string: vpn start action start WARNING: untranslated string: vpn statistic n2n WARNING: untranslated string: vpn statistic rw WARNING: untranslated string: vpn statistics n2n +WARNING: untranslated string: vpn wait WARNING: untranslated string: vpn weak WARNING: untranslated string: wireless network WARNING: untranslated string: wlan client diff --git a/doc/language_issues.fr b/doc/language_issues.fr index d15b92665..376fa2146 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -838,6 +838,7 @@ WARNING: untranslated string: fwdfw REJECT WARNING: untranslated string: fwdfw action WARNING: untranslated string: fwdfw additional WARNING: untranslated string: fwdfw all icmp +WARNING: untranslated string: fwdfw all subnets WARNING: untranslated string: fwdfw change WARNING: untranslated string: fwdfw copy WARNING: untranslated string: fwdfw delete @@ -1075,7 +1076,6 @@ WARNING: untranslated string: monitor interface WARNING: untranslated string: most preferred WARNING: untranslated string: nameserver WARNING: untranslated string: no data -WARNING: untranslated string: no hardware random number generator WARNING: untranslated string: none WARNING: untranslated string: not a valid dh key WARNING: untranslated string: notice @@ -1142,9 +1142,12 @@ WARNING: untranslated string: snort working WARNING: untranslated string: software version WARNING: untranslated string: source ip country WARNING: untranslated string: ssh +WARNING: untranslated string: ssh active sessions +WARNING: untranslated string: ssh login time +WARNING: untranslated string: ssh no active logins +WARNING: untranslated string: ssh username WARNING: untranslated string: static routes WARNING: untranslated string: support donation -WARNING: untranslated string: system has hwrng WARNING: untranslated string: system has rdrand WARNING: untranslated string: system information WARNING: untranslated string: ta key @@ -1223,11 +1226,13 @@ WARNING: untranslated string: vpn inactivity timeout WARNING: untranslated string: vpn keyexchange WARNING: untranslated string: vpn on-demand WARNING: untranslated string: vpn start action +WARNING: untranslated string: vpn start action add WARNING: untranslated string: vpn start action route WARNING: untranslated string: vpn start action start WARNING: untranslated string: vpn statistic n2n WARNING: untranslated string: vpn statistic rw WARNING: untranslated string: vpn statistics n2n +WARNING: untranslated string: vpn wait WARNING: untranslated string: vpn weak WARNING: untranslated string: wireless network WARNING: untranslated string: wlan client diff --git a/doc/language_issues.it b/doc/language_issues.it index b5daf564e..c8382ad0f 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -423,6 +423,7 @@ WARNING: translation string unused: no alcatelusb firmware WARNING: translation string unused: no cfg upload WARNING: translation string unused: no eciadsl synch.bin file WARNING: translation string unused: no fritzdsl driver +WARNING: translation string unused: no hardware random number generator WARNING: translation string unused: no information available WARNING: translation string unused: no modem selected WARNING: translation string unused: no set selected @@ -590,6 +591,7 @@ WARNING: translation string unused: subnet WARNING: translation string unused: subnet is invalid WARNING: translation string unused: successfully refreshed updates list WARNING: translation string unused: system graphs +WARNING: translation string unused: system has hwrng WARNING: translation string unused: system log viewer WARNING: translation string unused: system status information WARNING: translation string unused: teovpn_fragment @@ -784,6 +786,7 @@ WARNING: untranslated string: firewall log ip WARNING: untranslated string: firewall log port WARNING: untranslated string: five minutes WARNING: untranslated string: four hours +WARNING: untranslated string: fwdfw all subnets WARNING: untranslated string: fwdfw err concon WARNING: untranslated string: fwdfw err ratecon WARNING: untranslated string: fwdfw limitconcon @@ -877,6 +880,10 @@ WARNING: untranslated string: routing table WARNING: untranslated string: samba join a domain WARNING: untranslated string: samba join domain WARNING: untranslated string: search +WARNING: untranslated string: ssh active sessions +WARNING: untranslated string: ssh login time +WARNING: untranslated string: ssh no active logins +WARNING: untranslated string: ssh username WARNING: untranslated string: tcp more reliable WARNING: untranslated string: ten minutes WARNING: untranslated string: thirty minutes @@ -894,11 +901,13 @@ WARNING: untranslated string: vpn force mobike WARNING: untranslated string: vpn inactivity timeout WARNING: untranslated string: vpn on-demand WARNING: untranslated string: vpn start action +WARNING: untranslated string: vpn start action add WARNING: untranslated string: vpn start action route WARNING: untranslated string: vpn start action start WARNING: untranslated string: vpn statistic n2n WARNING: untranslated string: vpn statistic rw WARNING: untranslated string: vpn statistics n2n +WARNING: untranslated string: vpn wait WARNING: untranslated string: vpn weak WARNING: untranslated string: wireless network WARNING: untranslated string: wlan client anonymous identity diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 0a31ec4d1..4eb22c477 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -421,6 +421,7 @@ WARNING: translation string unused: no alcatelusb firmware WARNING: translation string unused: no cfg upload WARNING: translation string unused: no eciadsl synch.bin file WARNING: translation string unused: no fritzdsl driver +WARNING: translation string unused: no hardware random number generator WARNING: translation string unused: no information available WARNING: translation string unused: no modem selected WARNING: translation string unused: no set selected @@ -587,6 +588,7 @@ WARNING: translation string unused: subnet WARNING: translation string unused: subnet is invalid WARNING: translation string unused: successfully refreshed updates list WARNING: translation string unused: system graphs +WARNING: translation string unused: system has hwrng WARNING: translation string unused: system log viewer WARNING: translation string unused: system status information WARNING: translation string unused: test @@ -797,6 +799,7 @@ WARNING: untranslated string: firewall log port WARNING: untranslated string: firewall logs country WARNING: untranslated string: five minutes WARNING: untranslated string: four hours +WARNING: untranslated string: fwdfw all subnets WARNING: untranslated string: fwdfw err concon WARNING: untranslated string: fwdfw err ratecon WARNING: untranslated string: fwdfw limitconcon @@ -922,6 +925,10 @@ WARNING: untranslated string: show dh WARNING: untranslated string: show tls-auth key WARNING: untranslated string: software version WARNING: untranslated string: source ip country +WARNING: untranslated string: ssh active sessions +WARNING: untranslated string: ssh login time +WARNING: untranslated string: ssh no active logins +WARNING: untranslated string: ssh username WARNING: untranslated string: ta key WARNING: untranslated string: tcp more reliable WARNING: untranslated string: ten minutes @@ -942,11 +949,13 @@ WARNING: untranslated string: vpn force mobike WARNING: untranslated string: vpn inactivity timeout WARNING: untranslated string: vpn on-demand WARNING: untranslated string: vpn start action +WARNING: untranslated string: vpn start action add WARNING: untranslated string: vpn start action route WARNING: untranslated string: vpn start action start WARNING: untranslated string: vpn statistic n2n WARNING: untranslated string: vpn statistic rw WARNING: untranslated string: vpn statistics n2n +WARNING: untranslated string: vpn wait WARNING: untranslated string: vpn weak WARNING: untranslated string: wireless network WARNING: untranslated string: wlan client anonymous identity diff --git a/doc/language_issues.pl b/doc/language_issues.pl index a71988875..93396ec02 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -829,6 +829,7 @@ WARNING: untranslated string: fwdfw REJECT WARNING: untranslated string: fwdfw action WARNING: untranslated string: fwdfw additional WARNING: untranslated string: fwdfw all icmp +WARNING: untranslated string: fwdfw all subnets WARNING: untranslated string: fwdfw change WARNING: untranslated string: fwdfw copy WARNING: untranslated string: fwdfw delete @@ -1059,7 +1060,6 @@ WARNING: untranslated string: monitor interface WARNING: untranslated string: most preferred WARNING: untranslated string: nameserver WARNING: untranslated string: no data -WARNING: untranslated string: no hardware random number generator WARNING: untranslated string: none WARNING: untranslated string: not a valid dh key WARNING: untranslated string: notice @@ -1129,9 +1129,12 @@ WARNING: untranslated string: snat new source ip address WARNING: untranslated string: software version WARNING: untranslated string: source ip country WARNING: untranslated string: ssh +WARNING: untranslated string: ssh active sessions +WARNING: untranslated string: ssh login time +WARNING: untranslated string: ssh no active logins +WARNING: untranslated string: ssh username WARNING: untranslated string: static routes WARNING: untranslated string: support donation -WARNING: untranslated string: system has hwrng WARNING: untranslated string: system has rdrand WARNING: untranslated string: system information WARNING: untranslated string: ta key @@ -1207,11 +1210,13 @@ WARNING: untranslated string: vpn inactivity timeout WARNING: untranslated string: vpn keyexchange WARNING: untranslated string: vpn on-demand WARNING: untranslated string: vpn start action +WARNING: untranslated string: vpn start action add WARNING: untranslated string: vpn start action route WARNING: untranslated string: vpn start action start WARNING: untranslated string: vpn statistic n2n WARNING: untranslated string: vpn statistic rw WARNING: untranslated string: vpn statistics n2n +WARNING: untranslated string: vpn wait WARNING: untranslated string: vpn weak WARNING: untranslated string: wireless network WARNING: untranslated string: wlan client diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 4305cf566..11fc67e66 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -823,6 +823,7 @@ WARNING: untranslated string: fwdfw REJECT WARNING: untranslated string: fwdfw action WARNING: untranslated string: fwdfw additional WARNING: untranslated string: fwdfw all icmp +WARNING: untranslated string: fwdfw all subnets WARNING: untranslated string: fwdfw change WARNING: untranslated string: fwdfw copy WARNING: untranslated string: fwdfw delete @@ -1061,7 +1062,6 @@ WARNING: untranslated string: monitor interface WARNING: untranslated string: most preferred WARNING: untranslated string: nameserver WARNING: untranslated string: no data -WARNING: untranslated string: no hardware random number generator WARNING: untranslated string: none WARNING: untranslated string: not a valid dh key WARNING: untranslated string: notice @@ -1125,9 +1125,12 @@ WARNING: untranslated string: snat new source ip address WARNING: untranslated string: software version WARNING: untranslated string: source ip country WARNING: untranslated string: ssh +WARNING: untranslated string: ssh active sessions +WARNING: untranslated string: ssh login time +WARNING: untranslated string: ssh no active logins +WARNING: untranslated string: ssh username WARNING: untranslated string: static routes WARNING: untranslated string: support donation -WARNING: untranslated string: system has hwrng WARNING: untranslated string: system has rdrand WARNING: untranslated string: ta key WARNING: untranslated string: tcp more reliable @@ -1202,11 +1205,13 @@ WARNING: untranslated string: vpn inactivity timeout WARNING: untranslated string: vpn keyexchange WARNING: untranslated string: vpn on-demand WARNING: untranslated string: vpn start action +WARNING: untranslated string: vpn start action add WARNING: untranslated string: vpn start action route WARNING: untranslated string: vpn start action start WARNING: untranslated string: vpn statistic n2n WARNING: untranslated string: vpn statistic rw WARNING: untranslated string: vpn statistics n2n +WARNING: untranslated string: vpn wait WARNING: untranslated string: vpn weak WARNING: untranslated string: wireless network WARNING: untranslated string: wlan client diff --git a/doc/language_issues.tr b/doc/language_issues.tr index ce218c092..85212e18d 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -451,6 +451,7 @@ WARNING: translation string unused: no alcatelusb firmware WARNING: translation string unused: no cfg upload WARNING: translation string unused: no eciadsl synch.bin file WARNING: translation string unused: no fritzdsl driver +WARNING: translation string unused: no hardware random number generator WARNING: translation string unused: no information available WARNING: translation string unused: no modem selected WARNING: translation string unused: no set selected @@ -618,6 +619,7 @@ WARNING: translation string unused: subnet WARNING: translation string unused: subnet is invalid WARNING: translation string unused: successfully refreshed updates list WARNING: translation string unused: system graphs +WARNING: translation string unused: system has hwrng WARNING: translation string unused: system log viewer WARNING: translation string unused: system status information WARNING: translation string unused: teovpn_fragment @@ -734,6 +736,7 @@ WARNING: untranslated string: Captive clients WARNING: untranslated string: Scan for Songs WARNING: untranslated string: bytes WARNING: untranslated string: captive +WARNING: untranslated string: fwdfw all subnets WARNING: untranslated string: fwhost cust geoipgrp WARNING: untranslated string: fwhost err hostip WARNING: untranslated string: guardian block a host @@ -779,4 +782,10 @@ WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table +WARNING: untranslated string: ssh active sessions +WARNING: untranslated string: ssh login time +WARNING: untranslated string: ssh no active logins +WARNING: untranslated string: ssh username +WARNING: untranslated string: vpn start action add WARNING: untranslated string: vpn statistics n2n +WARNING: untranslated string: vpn wait diff --git a/doc/language_missings b/doc/language_missings index 12929851d..7b2f04941 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -288,6 +288,7 @@ < fwdfw additional < fwdfw addrule < fwdfw all icmp +< fwdfw all subnets < fwdfw change < fwdfw copy < fwdfw delete @@ -620,6 +621,10 @@ < software version < source ip country < ssh +< ssh active sessions +< ssh login time +< ssh no active logins +< ssh username < static routes < support donation < system has hwrng @@ -710,10 +715,12 @@ < vpn keyexchange < vpn on-demand < vpn start action +< vpn start action add < vpn start action route < vpn start action start < vpn statistic n2n < vpn statistic rw +< vpn wait < vpn weak < wireless network < wlanap @@ -999,6 +1006,7 @@ < fwdfw additional < fwdfw addrule < fwdfw all icmp +< fwdfw all subnets < fwdfw change < fwdfw copy < fwdfw delete @@ -1325,6 +1333,10 @@ < software version < source ip country < ssh +< ssh active sessions +< ssh login time +< ssh no active logins +< ssh username < static routes < support donation < system has hwrng @@ -1418,10 +1430,12 @@ < vpn keyexchange < vpn on-demand < vpn start action +< vpn start action add < vpn start action route < vpn start action start < vpn statistic n2n < vpn statistic rw +< vpn wait < vpn weak < wireless network < wlanap @@ -1596,6 +1610,7 @@ < firewall log port < five minutes < four hours +< fwdfw all subnets < fwdfw err concon < fwdfw err ratecon < fwdfw limitconcon @@ -1650,6 +1665,10 @@ < samba join a domain < samba join domain < search +< ssh active sessions +< ssh login time +< ssh no active logins +< ssh username < tcp more reliable < ten minutes < thirty minutes @@ -1667,10 +1686,12 @@ < vpn inactivity timeout < vpn on-demand < vpn start action +< vpn start action add < vpn start action route < vpn start action start < vpn statistic n2n < vpn statistic rw +< vpn wait < vpn weak < wireless network < wlanap @@ -1813,6 +1834,7 @@ < firewall logs country < five minutes < four hours +< fwdfw all subnets < fwdfw err concon < fwdfw err ratecon < fwdfw limitconcon @@ -1902,6 +1924,10 @@ < show tls-auth key < software version < source ip country +< ssh active sessions +< ssh login time +< ssh no active logins +< ssh username < ta key < tcp more reliable < ten minutes @@ -1923,10 +1949,12 @@ < vpn inactivity timeout < vpn on-demand < vpn start action +< vpn start action add < vpn start action route < vpn start action start < vpn statistic n2n < vpn statistic rw +< vpn wait < vpn weak < wireless network < wlanap @@ -2172,6 +2200,7 @@ < fwdfw additional < fwdfw addrule < fwdfw all icmp +< fwdfw all subnets < fwdfw change < fwdfw copy < fwdfw delete @@ -2499,6 +2528,10 @@ < software version < source ip country < ssh +< ssh active sessions +< ssh login time +< ssh no active logins +< ssh username < static routes < support donation < system has hwrng @@ -2588,10 +2621,12 @@ < vpn keyexchange < vpn on-demand < vpn start action +< vpn start action add < vpn start action route < vpn start action start < vpn statistic n2n < vpn statistic rw +< vpn wait < vpn weak < wireless network < wlanap @@ -2874,6 +2909,7 @@ < fwdfw additional < fwdfw addrule < fwdfw all icmp +< fwdfw all subnets < fwdfw change < fwdfw copy < fwdfw delete @@ -3201,6 +3237,10 @@ < software version < source ip country < ssh +< ssh active sessions +< ssh login time +< ssh no active logins +< ssh username < static routes < support donation < system has hwrng @@ -3290,10 +3330,12 @@ < vpn keyexchange < vpn on-demand < vpn start action +< vpn start action add < vpn start action route < vpn start action start < vpn statistic n2n < vpn statistic rw +< vpn wait < vpn weak < week-graph < wireless network @@ -3349,3 +3391,10 @@ ############################################################################ # Checking cgi-bin translations for language: tr # ############################################################################ +< fwdfw all subnets +< ssh active sessions +< ssh login time +< ssh no active logins +< ssh username +< vpn start action add +< vpn wait diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index 580671b71..ef9da2389 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -479,6 +479,9 @@ END } elsif ($line =~ /$vpnconfig{$key}[1]{.*ROUTED/) { $activecolor = $Header::colourorange; $activestatus = $Lang::tr{'vpn on-demand'}; + } elsif ($vpnconfig{$key}[33] eq "add") { + $activecolor = ${Header::colourorange}; + $activestatus = $Lang::tr{'vpn wait'}; } } } diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 378acb326..eefe97599 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -2439,6 +2439,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || $selected{'DPD_ACTION'}{'none'} = ''; $selected{'DPD_ACTION'}{$cgiparams{'DPD_ACTION'}} = "selected='selected'";

+ $selected{'START_ACTION'}{'add'} = ''; $selected{'START_ACTION'}{'route'} = ''; $selected{'START_ACTION'}{'start'} = ''; $selected{'START_ACTION'}{$cgiparams{'START_ACTION'}} = "selected='selected'"; @@ -2664,6 +2665,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || <select name="START_ACTION"> <option value="route" $selected{'START_ACTION'}{'route'}>$Lang::tr{'vpn start action route'}</option> <option value="start" $selected{'START_ACTION'}{'start'}>$Lang::tr{'vpn start action start'}</option> + <option value="add" $selected{'START_ACTION'}{'add'} >$Lang::tr{'vpn start action add'}</option> </select> </td> </tr> @@ -2861,6 +2863,9 @@ END } elsif ($line =~ /$confighash{$key}[1]{.*ROUTED/) { $col1="bgcolor='${Header::colourorange}'"; $active = "<b><font color='#FFFFFF'>$Lang::tr{'vpn on-demand'}</font></b>"; + } elsif ($confighash{$key}[33] eq "add") { + $col1="bgcolor='${Header::colourorange}'"; + $active = "<b><font color='#FFFFFF'>$Lang::tr{'vpn wait'}</font></b>"; } } # move to blue if really down diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index edff684ea..630d9b2f0 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -2708,11 +2708,13 @@ 'vpn red name' => 'Öffentliche IP oder FQDN für das rote Interface oder <%defaultroute>', 'vpn remote id' => 'Remote ID', 'vpn start action' => 'Startaktion', +'vpn start action add' => 'Auf Verbindungseingang warten', 'vpn start action route' => 'Bei Bedarf', 'vpn start action start' => 'Immer An', 'vpn statistic n2n' => 'OpenVPN-Netz-zu-Netz-Statistik', 'vpn statistic rw' => 'OpenVPN-Roadwarrior-Statistik', 'vpn subjectaltname' => 'Subjekt Alternativer Name', +'vpn wait' => 'WARTE', 'vpn watch' => 'Netz-zu-Netz VPN neu starten, wenn sich Remote-IP ändert (DynDNS).', 'vpn weak' => 'schwach', 'waiting to synchronize clock' => 'Bitte warten, die Uhr wird synchronisiert', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 0c77ce4b2..8ec5bf486 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -2753,11 +2753,13 @@ 'vpn red name' => 'Public IP or FQDN for RED interface or <%defaultroute>', 'vpn remote id' => 'Remote ID', 'vpn start action' => 'Start Action', +'vpn start action add' => 'Wait for connection initiation', 'vpn start action route' => 'On Demand', 'vpn start action start' => 'Always On', 'vpn statistic n2n' => 'OpenVPN Net-to-Net Statistics', 'vpn statistic rw' => 'OpenVPN Roadwarrior Statistics', 'vpn subjectaltname' => 'Subject Alt Name', +'vpn wait' => 'WAITING', 'vpn watch' => 'Restart net-to-net vpn when remote peer IP changes (dyndns).', 'vpn weak' => 'Weak', 'waiting to synchronize clock' => 'Waiting to synchronize clock',

hooks/post-receive -- IPFire 2.x development tree