From af6c5929b0034f0d9e802acaf83bfa36a7cea901 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 17 Oct 2017 15:05:53 +0200 Subject: [PATCH] captive: Simplify coupon time selection Signed-off-by: Michael Tremer --- doc/language_issues.de | 1 + doc/language_issues.en | 1 + doc/language_issues.es | 8 +- doc/language_issues.fr | 8 +- doc/language_issues.it | 8 +- doc/language_issues.nl | 8 +- doc/language_issues.pl | 8 +- doc/language_issues.ru | 8 +- doc/language_issues.tr | 8 +- doc/language_missings | 28 +++++- html/cgi-bin/captive.cgi | 193 +++++++++++++++------------------------ langs/de/cgi-bin/de.pl | 7 +- langs/en/cgi-bin/en.pl | 7 +- 13 files changed, 153 insertions(+), 140 deletions(-) diff --git a/doc/language_issues.de b/doc/language_issues.de index f5d6d36751..0443130156 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -14,6 +14,7 @@ WARNING: translation string unused: Captive ip WARNING: translation string unused: Captive logo_set WARNING: translation string unused: Captive logo_upload WARNING: translation string unused: Captive logo_upload1 +WARNING: translation string unused: Captive noexpiretime WARNING: translation string unused: Captive nr WARNING: translation string unused: Captive time WARNING: translation string unused: Captive voactive diff --git a/doc/language_issues.en b/doc/language_issues.en index 1a22e2836f..eebb5d6dc6 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -14,6 +14,7 @@ WARNING: translation string unused: Captive invalid logosize WARNING: translation string unused: Captive invalid_voucher WARNING: translation string unused: Captive ip WARNING: translation string unused: Captive logo_set +WARNING: translation string unused: Captive noexpiretime WARNING: translation string unused: Captive nr WARNING: translation string unused: Captive please enter a coupon code WARNING: translation string unused: Captive time diff --git a/doc/language_issues.es b/doc/language_issues.es index 38cf21080c..4ade5d5cd6 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -635,12 +635,12 @@ WARNING: untranslated string: Captive config WARNING: untranslated string: Captive coupon WARNING: untranslated string: Captive expiry time WARNING: untranslated string: Captive export coupons -WARNING: untranslated string: Captive generate coupon +WARNING: untranslated string: Captive generate coupons +WARNING: untranslated string: Captive generated coupon no WARNING: untranslated string: Captive issued coupons WARNING: untranslated string: Captive logo uploaded WARNING: untranslated string: Captive mac WARNING: untranslated string: Captive menu -WARNING: untranslated string: Captive noexpiretime WARNING: untranslated string: Captive nolimit WARNING: untranslated string: Captive please accept the terms and conditions WARNING: untranslated string: Captive portal @@ -813,6 +813,7 @@ WARNING: untranslated string: firewall logs country WARNING: untranslated string: firewall rules WARNING: untranslated string: first WARNING: untranslated string: flag +WARNING: untranslated string: four hours WARNING: untranslated string: fw default drop WARNING: untranslated string: fw settings WARNING: untranslated string: fw settings color @@ -1059,6 +1060,7 @@ WARNING: untranslated string: notice WARNING: untranslated string: one hour WARNING: untranslated string: one month WARNING: untranslated string: one week +WARNING: untranslated string: one year WARNING: untranslated string: openvpn default WARNING: untranslated string: openvpn destination port used WARNING: untranslated string: openvpn fragment allowed with udp @@ -1180,6 +1182,8 @@ WARNING: untranslated string: tor traffic limit hard WARNING: untranslated string: tor traffic limit soft WARNING: untranslated string: tor traffic read written WARNING: untranslated string: tor use exit nodes +WARNING: untranslated string: twelve hours +WARNING: untranslated string: two weeks WARNING: untranslated string: unblock WARNING: untranslated string: unblock all WARNING: untranslated string: uncheck all diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 351d8a2ef9..eae0337a67 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -644,12 +644,12 @@ WARNING: untranslated string: Captive config WARNING: untranslated string: Captive coupon WARNING: untranslated string: Captive expiry time WARNING: untranslated string: Captive export coupons -WARNING: untranslated string: Captive generate coupon +WARNING: untranslated string: Captive generate coupons +WARNING: untranslated string: Captive generated coupon no WARNING: untranslated string: Captive issued coupons WARNING: untranslated string: Captive logo uploaded WARNING: untranslated string: Captive mac WARNING: untranslated string: Captive menu -WARNING: untranslated string: Captive noexpiretime WARNING: untranslated string: Captive nolimit WARNING: untranslated string: Captive please accept the terms and conditions WARNING: untranslated string: Captive portal @@ -822,6 +822,7 @@ WARNING: untranslated string: firewall logs country WARNING: untranslated string: firewall rules WARNING: untranslated string: first WARNING: untranslated string: flag +WARNING: untranslated string: four hours WARNING: untranslated string: fw default drop WARNING: untranslated string: fw settings WARNING: untranslated string: fw settings color @@ -1077,6 +1078,7 @@ WARNING: untranslated string: ntp sync WARNING: untranslated string: one hour WARNING: untranslated string: one month WARNING: untranslated string: one week +WARNING: untranslated string: one year WARNING: untranslated string: openvpn default WARNING: untranslated string: openvpn destination port used WARNING: untranslated string: openvpn fragment allowed with udp @@ -1193,6 +1195,8 @@ WARNING: untranslated string: tor traffic limit hard WARNING: untranslated string: tor traffic limit soft WARNING: untranslated string: tor traffic read written WARNING: untranslated string: tor use exit nodes +WARNING: untranslated string: twelve hours +WARNING: untranslated string: two weeks WARNING: untranslated string: unblock WARNING: untranslated string: unblock all WARNING: untranslated string: uncheck all diff --git a/doc/language_issues.it b/doc/language_issues.it index 36af273231..13508b61e0 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -712,12 +712,12 @@ WARNING: untranslated string: Captive config WARNING: untranslated string: Captive coupon WARNING: untranslated string: Captive expiry time WARNING: untranslated string: Captive export coupons -WARNING: untranslated string: Captive generate coupon +WARNING: untranslated string: Captive generate coupons +WARNING: untranslated string: Captive generated coupon no WARNING: untranslated string: Captive issued coupons WARNING: untranslated string: Captive logo uploaded WARNING: untranslated string: Captive mac WARNING: untranslated string: Captive menu -WARNING: untranslated string: Captive noexpiretime WARNING: untranslated string: Captive nolimit WARNING: untranslated string: Captive please accept the terms and conditions WARNING: untranslated string: Captive portal @@ -774,6 +774,7 @@ WARNING: untranslated string: firewall graph port WARNING: untranslated string: firewall log country WARNING: untranslated string: firewall log ip WARNING: untranslated string: firewall log port +WARNING: untranslated string: four hours WARNING: untranslated string: fwdfw err concon WARNING: untranslated string: fwdfw err ratecon WARNING: untranslated string: fwdfw limitconcon @@ -848,6 +849,7 @@ WARNING: untranslated string: none WARNING: untranslated string: one hour WARNING: untranslated string: one month WARNING: untranslated string: one week +WARNING: untranslated string: one year WARNING: untranslated string: outgoing compression in bytes per second WARNING: untranslated string: outgoing overhead in bytes per second WARNING: untranslated string: ovpn add conf @@ -862,6 +864,8 @@ 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: twelve hours +WARNING: untranslated string: two weeks WARNING: untranslated string: unblock WARNING: untranslated string: unblock all WARNING: untranslated string: uncheck all diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 91fca78476..74590a27a7 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -708,12 +708,12 @@ WARNING: untranslated string: Captive config WARNING: untranslated string: Captive coupon WARNING: untranslated string: Captive expiry time WARNING: untranslated string: Captive export coupons -WARNING: untranslated string: Captive generate coupon +WARNING: untranslated string: Captive generate coupons +WARNING: untranslated string: Captive generated coupon no WARNING: untranslated string: Captive issued coupons WARNING: untranslated string: Captive logo uploaded WARNING: untranslated string: Captive mac WARNING: untranslated string: Captive menu -WARNING: untranslated string: Captive noexpiretime WARNING: untranslated string: Captive nolimit WARNING: untranslated string: Captive please accept the terms and conditions WARNING: untranslated string: Captive portal @@ -787,6 +787,7 @@ WARNING: untranslated string: firewall log country WARNING: untranslated string: firewall log ip WARNING: untranslated string: firewall log port WARNING: untranslated string: firewall logs country +WARNING: untranslated string: four hours WARNING: untranslated string: fwdfw err concon WARNING: untranslated string: fwdfw err ratecon WARNING: untranslated string: fwdfw limitconcon @@ -880,6 +881,7 @@ WARNING: untranslated string: not a valid dh key WARNING: untranslated string: one hour WARNING: untranslated string: one month WARNING: untranslated string: one week +WARNING: untranslated string: one year WARNING: untranslated string: outgoing compression in bytes per second WARNING: untranslated string: outgoing overhead in bytes per second WARNING: untranslated string: ovpn add conf @@ -908,6 +910,8 @@ WARNING: untranslated string: show tls-auth key WARNING: untranslated string: software version WARNING: untranslated string: source ip country WARNING: untranslated string: ta key +WARNING: untranslated string: twelve hours +WARNING: untranslated string: two weeks WARNING: untranslated string: unblock WARNING: untranslated string: unblock all WARNING: untranslated string: uncheck all diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 38cf21080c..4ade5d5cd6 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -635,12 +635,12 @@ WARNING: untranslated string: Captive config WARNING: untranslated string: Captive coupon WARNING: untranslated string: Captive expiry time WARNING: untranslated string: Captive export coupons -WARNING: untranslated string: Captive generate coupon +WARNING: untranslated string: Captive generate coupons +WARNING: untranslated string: Captive generated coupon no WARNING: untranslated string: Captive issued coupons WARNING: untranslated string: Captive logo uploaded WARNING: untranslated string: Captive mac WARNING: untranslated string: Captive menu -WARNING: untranslated string: Captive noexpiretime WARNING: untranslated string: Captive nolimit WARNING: untranslated string: Captive please accept the terms and conditions WARNING: untranslated string: Captive portal @@ -813,6 +813,7 @@ WARNING: untranslated string: firewall logs country WARNING: untranslated string: firewall rules WARNING: untranslated string: first WARNING: untranslated string: flag +WARNING: untranslated string: four hours WARNING: untranslated string: fw default drop WARNING: untranslated string: fw settings WARNING: untranslated string: fw settings color @@ -1059,6 +1060,7 @@ WARNING: untranslated string: notice WARNING: untranslated string: one hour WARNING: untranslated string: one month WARNING: untranslated string: one week +WARNING: untranslated string: one year WARNING: untranslated string: openvpn default WARNING: untranslated string: openvpn destination port used WARNING: untranslated string: openvpn fragment allowed with udp @@ -1180,6 +1182,8 @@ WARNING: untranslated string: tor traffic limit hard WARNING: untranslated string: tor traffic limit soft WARNING: untranslated string: tor traffic read written WARNING: untranslated string: tor use exit nodes +WARNING: untranslated string: twelve hours +WARNING: untranslated string: two weeks WARNING: untranslated string: unblock WARNING: untranslated string: unblock all WARNING: untranslated string: uncheck all diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 25227c4c4a..6468d5fc0f 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -637,12 +637,12 @@ WARNING: untranslated string: Captive config WARNING: untranslated string: Captive coupon WARNING: untranslated string: Captive expiry time WARNING: untranslated string: Captive export coupons -WARNING: untranslated string: Captive generate coupon +WARNING: untranslated string: Captive generate coupons +WARNING: untranslated string: Captive generated coupon no WARNING: untranslated string: Captive issued coupons WARNING: untranslated string: Captive logo uploaded WARNING: untranslated string: Captive mac WARNING: untranslated string: Captive menu -WARNING: untranslated string: Captive noexpiretime WARNING: untranslated string: Captive nolimit WARNING: untranslated string: Captive please accept the terms and conditions WARNING: untranslated string: Captive portal @@ -807,6 +807,7 @@ WARNING: untranslated string: firewall logs country WARNING: untranslated string: firewall rules WARNING: untranslated string: first WARNING: untranslated string: flag +WARNING: untranslated string: four hours WARNING: untranslated string: fw default drop WARNING: untranslated string: fw settings WARNING: untranslated string: fw settings color @@ -1061,6 +1062,7 @@ WARNING: untranslated string: notice WARNING: untranslated string: one hour WARNING: untranslated string: one month WARNING: untranslated string: one week +WARNING: untranslated string: one year WARNING: untranslated string: openvpn default WARNING: untranslated string: openvpn destination port used WARNING: untranslated string: openvpn fragment allowed with udp @@ -1175,6 +1177,8 @@ WARNING: untranslated string: tor traffic limit hard WARNING: untranslated string: tor traffic limit soft WARNING: untranslated string: tor traffic read written WARNING: untranslated string: tor use exit nodes +WARNING: untranslated string: twelve hours +WARNING: untranslated string: two weeks WARNING: untranslated string: unblock WARNING: untranslated string: unblock all WARNING: untranslated string: uncheck all diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 733c664113..ade6c89f8b 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -720,12 +720,12 @@ WARNING: untranslated string: Captive config WARNING: untranslated string: Captive coupon WARNING: untranslated string: Captive expiry time WARNING: untranslated string: Captive export coupons -WARNING: untranslated string: Captive generate coupon +WARNING: untranslated string: Captive generate coupons +WARNING: untranslated string: Captive generated coupon no WARNING: untranslated string: Captive issued coupons WARNING: untranslated string: Captive logo uploaded WARNING: untranslated string: Captive mac WARNING: untranslated string: Captive menu -WARNING: untranslated string: Captive noexpiretime WARNING: untranslated string: Captive nolimit WARNING: untranslated string: Captive please accept the terms and conditions WARNING: untranslated string: Captive portal @@ -750,6 +750,7 @@ WARNING: untranslated string: firewall graph port WARNING: untranslated string: firewall log country WARNING: untranslated string: firewall log ip WARNING: untranslated string: firewall log port +WARNING: untranslated string: four hours WARNING: untranslated string: fwhost cust geoipgrp WARNING: untranslated string: fwhost err hostip WARNING: untranslated string: guardian @@ -795,10 +796,13 @@ WARNING: untranslated string: no data WARNING: untranslated string: one hour WARNING: untranslated string: one month WARNING: untranslated string: one week +WARNING: untranslated string: one year 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: twelve hours +WARNING: untranslated string: two weeks WARNING: untranslated string: unlimited WARNING: untranslated string: uplink bit rate WARNING: untranslated string: vpn broken diff --git a/doc/language_missings b/doc/language_missings index 64c184dbf5..2fc918cec3 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -58,7 +58,8 @@ < Captive expiry time < Captive export coupons < Captive GAIN ACCESS -< Captive generate coupon +< Captive generate coupons +< Captive generated coupon no < Captive genvoucher < Captive invalid logosize < Captive invalid_voucher @@ -230,6 +231,7 @@ < first < flag < forward firewall +< four hours < fw default drop < fwdfw ACCEPT < fwdfw action @@ -490,6 +492,7 @@ < ntp common settings < ntp sync < Number of Countries for the pie chart +< one year < openvpn default < openvpn destination port used < openvpn disabled @@ -610,6 +613,8 @@ < tor traffic limit soft < tor traffic read written < tor use exit nodes +< twelve hours +< two weeks < unblock < unblock all < uncheck all @@ -755,7 +760,8 @@ < Captive expiry time < Captive export coupons < Captive GAIN ACCESS -< Captive generate coupon +< Captive generate coupons +< Captive generated coupon no < Captive genvoucher < Captive invalid logosize < Captive invalid_voucher @@ -926,6 +932,7 @@ < first < flag < forward firewall +< four hours < fw default drop < fwdfw ACCEPT < fwdfw action @@ -1174,6 +1181,7 @@ < not a valid dh key < notice < Number of Countries for the pie chart +< one year < openvpn default < openvpn destination port used < openvpn disabled @@ -1312,6 +1320,8 @@ < tor traffic limit soft < tor traffic read written < tor use exit nodes +< twelve hours +< two weeks < unblock < unblock all < uncheck all @@ -1434,7 +1444,8 @@ < Captive expiry time < Captive export coupons < Captive GAIN ACCESS -< Captive generate coupon +< Captive generate coupons +< Captive generated coupon no < Captive genvoucher < Captive invalid logosize < Captive invalid_voucher @@ -1597,6 +1608,7 @@ < first < flag < forward firewall +< four hours < fw default drop < fwdfw ACCEPT < fwdfw action @@ -1855,6 +1867,7 @@ < not a valid dh key < notice < Number of Countries for the pie chart +< one year < openvpn default < openvpn destination port used < openvpn disabled @@ -1977,6 +1990,8 @@ < tor traffic limit soft < tor traffic read written < tor use exit nodes +< twelve hours +< two weeks < unblock < unblock all < uncheck all @@ -2100,7 +2115,8 @@ < Captive expiry time < Captive export coupons < Captive GAIN ACCESS -< Captive generate coupon +< Captive generate coupons +< Captive generated coupon no < Captive genvoucher < Captive invalid logosize < Captive invalid_voucher @@ -2266,6 +2282,7 @@ < first < flag < forward firewall +< four hours < frequency < fw default drop < fwdfw ACCEPT @@ -2528,6 +2545,7 @@ < not a valid dh key < notice < Number of Countries for the pie chart +< one year < openvpn default < openvpn destination port used < openvpn disabled @@ -2647,6 +2665,8 @@ < tor traffic limit soft < tor traffic read written < tor use exit nodes +< twelve hours +< two weeks < unblock < unblock all < uncheck all diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi index 629acaee2b..242549d33f 100755 --- a/html/cgi-bin/captive.cgi +++ b/html/cgi-bin/captive.cgi @@ -34,6 +34,19 @@ require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; +my %session_times = ( + 3600 => $Lang::tr{'one hour'}, + 14400 => $Lang::tr{'four hours'}, + 28800 => $Lang::tr{'eight hours'}, + 43200 => $Lang::tr{'twelve hours'}, + 86400 => $Lang::tr{'24 hours'}, + 604800 => $Lang::tr{'one week'}, + 1209600 => $Lang::tr{'two weeks'}, + 18144000 => $Lang::tr{'one month'}, + 31536000 => $Lang::tr{'one year'}, + 0 => "- $Lang::tr{'unlimited'} -", +); + my %selected = (); my $coupons = "${General::swroot}/captive/coupons"; @@ -129,12 +142,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) { } } -if ($cgiparams{'ACTION'} eq "$Lang::tr{'Captive generate coupon'}") { - # Check expiry time - if ($cgiparams{'EXP_HOUR'} + $cgiparams{'EXP_DAY'} + $cgiparams{'EXP_WEEK'} + $cgiparams{'EXP_MONTH'} == 0 && $cgiparams{'UNLIMITED'} == '') { - $errormessage = $Lang::tr{'Captive noexpiretime'}; - } - +if ($cgiparams{'ACTION'} eq "$Lang::tr{'Captive generate coupons'}") { #check valid remark if ($cgiparams{'REMARK'} ne '' && !&validremark($cgiparams{'REMARK'})){ $errormessage=$Lang::tr{'fwhost err remark'}; @@ -142,7 +150,7 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'Captive generate coupon'}") { if (!$errormessage) { # Remember selected values - foreach my $val (("UNLIMITED", "EXP_HOUR", "EXP_DAY", "EXP_WEEK", "EXP_MONTH")) { + foreach my $val (("SESSION_TIME", "COUNT", "REMARK")) { $settings{$val} = $cgiparams{$val}; } &General::writehash($settingsfile, \%settings); @@ -150,17 +158,10 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'Captive generate coupon'}") { &General::readhasharray($coupons, \%couponhash) if (-e $coupons); my $now = time(); - # Calculate expiry time in seconds - my $expires = 0; - - if ($settings{'UNLIMITED'} ne 'on') { - $expires += $settings{'EXP_HOUR'}; - $expires += $settings{'EXP_DAY'}; - $expires += $settings{'EXP_WEEK'}; - $expires += $settings{'EXP_MONTH'}; - } + # Expiry time in seconds + my $expires = $settings{'SESSION_TIME'}; - my $count = $cgiparams{'COUNT'} || 1; + my $count = $settings{'COUNT'} || 1; while($count-- > 0) { # Generate a new code my $code = &gencode(); @@ -186,7 +187,7 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'Captive generate coupon'}") { $couponhash{$key}[0] = $now; $couponhash{$key}[1] = $code; $couponhash{$key}[2] = $expires; - $couponhash{$key}[3] = $cgiparams{'REMARK'}; + $couponhash{$key}[3] = $settings{'REMARK'}; } # Save everything to disk @@ -317,12 +318,9 @@ END if ($settings{'AUTH'} eq 'TERMS') { $selected{'SESSION_TIME'} = (); - $selected{'SESSION_TIME'}{'0'} = ""; - $selected{'SESSION_TIME'}{'3600'} = ""; - $selected{'SESSION_TIME'}{'28800'} = ""; - $selected{'SESSION_TIME'}{'86400'} = ""; - $selected{'SESSION_TIME'}{'604800'} = ""; - $selected{'SESSION_TIME'}{'18144000'} = ""; + foreach my $session_time (keys %session_times) { + $selected{'SESSION_TIME'}{$session_time} = ""; + } $selected{'SESSION_TIME'}{$settings{'SESSION_TIME'}} = "selected"; print <$Lang::tr{'Captive client session expiry time'} END - #print hour-dropdownbox - my $hrs=3600; - print ""; - print ""; - for (my $i = 1; $i<8; $i++){ - my $exp_sec = $i * $days; - print ""; - } - print ""; - - #print week-dropdownbox - my $week=3600*24*7; - print ""; - print ""; - for (my $i = 1; $i<13; $i++){ - my $exp_sec = $i * $month; - print ""; - } + foreach my $session_time (sort { $a <=> $b } keys %session_times) { print < - - - - - + +END + } + + print < $Lang::tr{'remark'} - + + + + + $Lang::tr{'Captive generated coupon no'} + +
- - - +
END diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 1398329d35..65af2bd187 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -30,7 +30,8 @@ 'Captive expire' => 'Ablauf', 'Captive expiry time' => 'Ablaufzeit', 'Captive export coupons' => 'Coupons exportieren', -'Captive generate coupon' => 'Coupon generieren', +'Captive generate coupons' => 'Coupons generieren', +'Captive generated coupon no' => 'Anzahl der generierten Coupons', 'Captive genvoucher' => 'Gutschein generieren', 'Captive invalid logosize' => 'Die hochgeladene Datei entspricht nicht der vorgegeben Auflösung von mindestens 1280x400 und maximal 1920x800 Pixeln', 'Captive invalid_voucher' => 'Dieser Code ist ungültig. Bitte versuchen Sie es erneut', @@ -1030,6 +1031,7 @@ 'forwarding rule added' => 'Weiterleitungsregel hinzugefügt. Starte Weiterleitung neu', 'forwarding rule removed' => 'Weiterleitungsregel entfernt. Starte Weiterleitung neu', 'forwarding rule updated' => 'Weiterleitungsregel aktualisiert; starte Weiterleitung neu', +'four hours' => '4 Stunden', 'free' => 'Frei', 'free memory' => 'Freier Speicher ', 'free swap' => 'Freier Swap', @@ -1722,6 +1724,7 @@ 'ok' => 'OK', 'older' => 'Älter', 'on' => 'on', +'one year' => 'Ein Jahr', 'online help en' => 'Online-Hilfe (auf Deutsch)', 'only digits allowed in holdoff field' => 'Im Holdoff-Feld sind nur Ziffern erlaubt', 'only digits allowed in max retries field' => 'Im Feld "Maximale Wiederholversuche" sind nur Ziffern erlaubt.', @@ -2312,6 +2315,8 @@ 'tripwirewarningkeys' => 'ACHTUNG - Sie löschen hiermit ihre bestehenden Schlüssel, ihre Konfiguration und Datenbank und legen alles neu an.', 'tripwirewarningpolicy' => 'ACHTUNG - Ihr Policy wird neu erzeugt, anschließen wird die Datenbank neu initialisiert. Hierfür wird der Site-Key und Local-Key benötigt.', 'tuesday' => 'Dienstag', +'twelve hours' => '12 Stunden', +'two weeks' => 'Zwei Wochen', 'type' => 'Typ', 'umount' => 'Abmelden', 'umount removable media before to unplug' => 'Wechselmedien vor dem Entfernen unbedingt abmelden', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 29c87dbd40..915cb5dae9 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -30,7 +30,8 @@ 'Captive expire' => 'Expire', 'Captive expiry time' => 'Expiry Time', 'Captive export coupons' => 'Export Coupons', -'Captive generate coupon' => 'Generate Coupon', +'Captive generate coupons' => 'Generate Coupons', +'Captive generated coupon no' => 'Number of coupons', 'Captive heading terms' => 'Terms & Conditions', 'Captive heading voucher' => 'Voucher or Access Code', 'Captive invalid coupon' => 'You entered an invalid coupon code. Please try again.', @@ -1058,6 +1059,7 @@ 'forwarding rule added' => 'Forwarding rule added; restarting forwarder', 'forwarding rule removed' => 'Forwarding rule removed; restarting forwarder', 'forwarding rule updated' => 'Forwarding rule updated; restarting forwarder', +'four hours' => '4 Hours', 'free' => 'Free', 'free memory' => 'Free Memory ', 'free swap' => 'Free Swap', @@ -1759,6 +1761,7 @@ 'one hour' => 'One Hour', 'one month' => 'One Month', 'one week' => 'One Week', +'one year' => 'One Year', 'online help en' => 'Online help (in english)', 'only digits allowed in holdoff field' => 'Only digits allowed in holdoff field', 'only digits allowed in max retries field' => 'Only digits allowed in max retries field.', @@ -2357,6 +2360,8 @@ 'tripwirewarningkeys' => 'WARNING - This will erase your current keys, config, and database and generate them new.', 'tripwirewarningpolicy' => 'WARNING - Your policy will be rebuild, after that your database will be reinitalised. Therefor the site-key and the local-key are neeeded.', 'tuesday' => 'Tuesday', +'twelve hours' => '12 Hours', +'two weeks' => 'Two Weeks', 'type' => 'Type', 'umount' => 'Umount', 'umount removable media before to unplug' => 'Umount removable media before unplugging the device', -- 2.39.2