[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c72171403609ca7109b6f293be3f9f771ab4abba
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 c72171403609ca7109b6f293be3f9f771ab4abba (commit) via 5cf4aba470b1ec92fef30e527f5f2ce53bce82d2 (commit) via 49ef32d164f3fcd8acf1aae03ae68a648f3ba87d (commit) from dc850cb32fdfad60f669f4834f4b4b4b5af770a8 (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 c72171403609ca7109b6f293be3f9f771ab4abba Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Apr 24 11:31:28 2019 +0100
hostap: Translate configuration settings
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 5cf4aba470b1ec92fef30e527f5f2ce53bce82d2 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Apr 24 11:24:33 2019 +0100
hostap: Fix wiring of checkboxes for client isolation
The checkboxes were swapped which lead to client isolation being enabled when the UI said disabled and vice-versa.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 49ef32d164f3fcd8acf1aae03ae68a648f3ba87d Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Apr 24 11:08:36 2019 +0100
hostap: Remove deprecated directive
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: doc/language_issues.en | 3 +++ doc/language_issues.es | 3 +++ doc/language_issues.fr | 3 +++ doc/language_issues.it | 3 +++ doc/language_issues.nl | 3 +++ doc/language_issues.pl | 3 +++ doc/language_issues.ru | 3 +++ doc/language_issues.tr | 3 +++ doc/language_missings | 21 +++++++++++++++++++++ html/cgi-bin/wlanap.cgi | 7 +++---- langs/de/cgi-bin/de.pl | 3 +++ langs/en/cgi-bin/en.pl | 3 +++ 12 files changed, 54 insertions(+), 4 deletions(-)
Difference in files: diff --git a/doc/language_issues.en b/doc/language_issues.en index 60df810d7..498bf4078 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -2165,7 +2165,9 @@ WARNING: untranslated string: wlan client wpa mode tkip tkip = TKIP-TKIP WARNING: untranslated string: wlan clients = Wireless clients WARNING: untranslated string: wlanap = Access Point WARNING: untranslated string: wlanap auto = Automatic Channel Selection +WARNING: untranslated string: wlanap broadcast ssid = Broadcast SSID WARNING: untranslated string: wlanap channel = Channel +WARNING: untranslated string: wlanap client isolation = Client Isolation WARNING: untranslated string: wlanap configuration = Access Point Configuration WARNING: untranslated string: wlanap country = Country Code WARNING: untranslated string: wlanap debugging = Debugging @@ -2183,6 +2185,7 @@ WARNING: untranslated string: wlanap no interface = Selected interface is not a WARNING: untranslated string: wlanap none = none WARNING: untranslated string: wlanap notifications = Notifications WARNING: untranslated string: wlanap select interface = Please select the wireless lan interface. +WARNING: untranslated string: wlanap ssid = SSID WARNING: untranslated string: wlanap verbose = Verbose WARNING: untranslated string: wlanap warnings = Warnings WARNING: untranslated string: wlanap wlan card = WLan Card diff --git a/doc/language_issues.es b/doc/language_issues.es index 439b1f546..f3b695f24 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -1363,8 +1363,11 @@ WARNING: untranslated string: wlan client wpa mode tkip tkip = TKIP-TKIP WARNING: untranslated string: wlan clients = Wireless clients WARNING: untranslated string: wlanap = Access Point WARNING: untranslated string: wlanap auto = Automatic Channel Selection +WARNING: untranslated string: wlanap broadcast ssid = Broadcast SSID +WARNING: untranslated string: wlanap client isolation = Client Isolation WARNING: untranslated string: wlanap configuration = Access Point Configuration WARNING: untranslated string: wlanap country = Country Code WARNING: untranslated string: wlanap management frame protection = Management Frame Protection (802.11w) WARNING: untranslated string: wlanap neighbor scan = Neighborhood scan WARNING: untranslated string: wlanap neighbor scan warning = Warning! Disabling may violate regulatory rules! +WARNING: untranslated string: wlanap ssid = SSID diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 97cb27147..af1f15ab7 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -881,4 +881,7 @@ WARNING: untranslated string: transport mode does not support vti = VTI is not s WARNING: untranslated string: update ruleset = Update ruleset WARNING: untranslated string: vpn statistics n2n = unknown string WARNING: untranslated string: wlanap auto = Automatic Channel Selection +WARNING: untranslated string: wlanap broadcast ssid = Broadcast SSID +WARNING: untranslated string: wlanap client isolation = Client Isolation WARNING: untranslated string: wlanap management frame protection = Management Frame Protection (802.11w) +WARNING: untranslated string: wlanap ssid = SSID diff --git a/doc/language_issues.it b/doc/language_issues.it index a5923b3dd..5da8a8dd7 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -1031,7 +1031,10 @@ WARNING: untranslated string: wlan client tls cipher = TLS Cipher WARNING: untranslated string: wlan client tls version = TLS Version WARNING: untranslated string: wlanap = Access Point WARNING: untranslated string: wlanap auto = Automatic Channel Selection +WARNING: untranslated string: wlanap broadcast ssid = Broadcast SSID +WARNING: untranslated string: wlanap client isolation = Client Isolation WARNING: untranslated string: wlanap configuration = Access Point Configuration WARNING: untranslated string: wlanap management frame protection = Management Frame Protection (802.11w) WARNING: untranslated string: wlanap neighbor scan = Neighborhood scan WARNING: untranslated string: wlanap neighbor scan warning = Warning! Disabling may violate regulatory rules! +WARNING: untranslated string: wlanap ssid = SSID diff --git a/doc/language_issues.nl b/doc/language_issues.nl index a180b675d..6be2cb6b2 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -1077,7 +1077,10 @@ WARNING: untranslated string: wlan client tls cipher = TLS Cipher WARNING: untranslated string: wlan client tls version = TLS Version WARNING: untranslated string: wlanap = Access Point WARNING: untranslated string: wlanap auto = Automatic Channel Selection +WARNING: untranslated string: wlanap broadcast ssid = Broadcast SSID +WARNING: untranslated string: wlanap client isolation = Client Isolation WARNING: untranslated string: wlanap configuration = Access Point Configuration WARNING: untranslated string: wlanap management frame protection = Management Frame Protection (802.11w) WARNING: untranslated string: wlanap neighbor scan = Neighborhood scan WARNING: untranslated string: wlanap neighbor scan warning = Warning! Disabling may violate regulatory rules! +WARNING: untranslated string: wlanap ssid = SSID diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 439b1f546..f3b695f24 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -1363,8 +1363,11 @@ WARNING: untranslated string: wlan client wpa mode tkip tkip = TKIP-TKIP WARNING: untranslated string: wlan clients = Wireless clients WARNING: untranslated string: wlanap = Access Point WARNING: untranslated string: wlanap auto = Automatic Channel Selection +WARNING: untranslated string: wlanap broadcast ssid = Broadcast SSID +WARNING: untranslated string: wlanap client isolation = Client Isolation WARNING: untranslated string: wlanap configuration = Access Point Configuration WARNING: untranslated string: wlanap country = Country Code WARNING: untranslated string: wlanap management frame protection = Management Frame Protection (802.11w) WARNING: untranslated string: wlanap neighbor scan = Neighborhood scan WARNING: untranslated string: wlanap neighbor scan warning = Warning! Disabling may violate regulatory rules! +WARNING: untranslated string: wlanap ssid = SSID diff --git a/doc/language_issues.ru b/doc/language_issues.ru index d832d5560..53a655c99 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -1358,8 +1358,11 @@ WARNING: untranslated string: wlan client wpa mode tkip tkip = TKIP-TKIP WARNING: untranslated string: wlan clients = Wireless clients WARNING: untranslated string: wlanap = Access Point WARNING: untranslated string: wlanap auto = Automatic Channel Selection +WARNING: untranslated string: wlanap broadcast ssid = Broadcast SSID +WARNING: untranslated string: wlanap client isolation = Client Isolation WARNING: untranslated string: wlanap configuration = Access Point Configuration WARNING: untranslated string: wlanap country = Country Code WARNING: untranslated string: wlanap management frame protection = Management Frame Protection (802.11w) WARNING: untranslated string: wlanap neighbor scan = Neighborhood scan WARNING: untranslated string: wlanap neighbor scan warning = Warning! Disabling may violate regulatory rules! +WARNING: untranslated string: wlanap ssid = SSID diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 1419af4b9..88baad746 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -895,6 +895,9 @@ WARNING: untranslated string: vpn start action add = Wait for connection initiat WARNING: untranslated string: vpn statistics n2n = unknown string WARNING: untranslated string: vpn wait = WAITING WARNING: untranslated string: wlanap auto = Automatic Channel Selection +WARNING: untranslated string: wlanap broadcast ssid = Broadcast SSID +WARNING: untranslated string: wlanap client isolation = Client Isolation WARNING: untranslated string: wlanap management frame protection = Management Frame Protection (802.11w) WARNING: untranslated string: wlanap neighbor scan = Neighborhood scan WARNING: untranslated string: wlanap neighbor scan warning = Warning! Disabling may violate regulatory rules! +WARNING: untranslated string: wlanap ssid = SSID diff --git a/doc/language_missings b/doc/language_missings index e41d14fb2..354dbb32f 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -793,11 +793,14 @@ < wireless network < wlanap < wlanap auto +< wlanap broadcast ssid +< wlanap client isolation < wlanap configuration < wlanap country < wlanap management frame protection < wlanap neighbor scan < wlanap neighbor scan warning +< wlanap ssid < wlan client < wlan client advanced settings < wlan client and @@ -905,7 +908,10 @@ < update ruleset < Weekly < wlanap auto +< wlanap broadcast ssid +< wlanap client isolation < wlanap management frame protection +< wlanap ssid ############################################################################ # Checking cgi-bin translations for language: it # ############################################################################ @@ -1162,10 +1168,13 @@ < wireless network < wlanap < wlanap auto +< wlanap broadcast ssid +< wlanap client isolation < wlanap configuration < wlanap management frame protection < wlanap neighbor scan < wlanap neighbor scan warning +< wlanap ssid < wlan client anonymous identity < wlan client auth auto < wlan client authentication settings @@ -1494,10 +1503,13 @@ < wireless network < wlanap < wlanap auto +< wlanap broadcast ssid +< wlanap client isolation < wlanap configuration < wlanap management frame protection < wlanap neighbor scan < wlanap neighbor scan warning +< wlanap ssid < wlan client anonymous identity < wlan client auth auto < wlan client authentication settings @@ -2234,11 +2246,14 @@ < wireless network < wlanap < wlanap auto +< wlanap broadcast ssid +< wlanap client isolation < wlanap configuration < wlanap country < wlanap management frame protection < wlanap neighbor scan < wlanap neighbor scan warning +< wlanap ssid < wlan client < wlan client advanced settings < wlan client and @@ -3012,11 +3027,14 @@ < wireless network < wlanap < wlanap auto +< wlanap broadcast ssid +< wlanap client isolation < wlanap configuration < wlanap country < wlanap management frame protection < wlanap neighbor scan < wlanap neighbor scan warning +< wlanap ssid < wlan client < wlan client advanced settings < wlan client and @@ -3139,6 +3157,9 @@ < vpn wait < Weekly < wlanap auto +< wlanap broadcast ssid +< wlanap client isolation < wlanap management frame protection < wlanap neighbor scan < wlanap neighbor scan warning +< wlanap ssid diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi index a85e3e98e..06ce05bfb 100644 --- a/html/cgi-bin/wlanap.cgi +++ b/html/cgi-bin/wlanap.cgi @@ -384,10 +384,10 @@ print <<END <table width='80%' cellspacing='0' class='tbl' border='0'> <tr><th bgcolor='$color{'color20'}' colspan='4' align='left'><strong>$Lang::tr{'wlanap wlan settings'}</strong></th></tr> <tr><td colspan='4'><br></td></tr> -<tr><td width='25%' class='base'>SSID: </td><td class='base' colspan='3'><input type='text' name='SSID' size='30' value='$wlanapsettings{'SSID'}' /></td></tr> +<tr><td width='25%' class='base'>$Lang::tr{'wlanap ssid'}: </td><td class='base' colspan='3'><input type='text' name='SSID' size='30' value='$wlanapsettings{'SSID'}' /></td></tr> <!--SSID Broadcast: on => HIDESSID: off --> -<tr><td width='25%' class='base'>SSID Broadcast: </td><td class='base' colspan='3'>on <input type='radio' name='HIDESSID' value='off' $checked{'HIDESSID'}{'off'} /> | <input type='radio' name='HIDESSID' value='on' $checked{'HIDESSID'}{'on'} /> off</td></tr> -<tr><td width='25%' class='base'>Client Isolation: </td><td class='base' colspan='3'>on <input type='radio' name='CLIENTISOLATION' value='off' $checked{'CLIENTISOLATION'}{'off'} /> | <input type='radio' name='CLIENTISOLATION' value='on' $checked{'CLIENTISOLATION'}{'on'} /> off</td></tr> +<tr><td width='25%' class='base'>$Lang::tr{'wlanap broadcast ssid'}: </td><td class='base' colspan='3'>$Lang::tr{'on'} <input type='radio' name='HIDESSID' value='off' $checked{'HIDESSID'}{'off'} /> | <input type='radio' name='HIDESSID' value='on' $checked{'HIDESSID'}{'on'} /> $Lang::tr{'off'}</td></tr> +<tr><td width='25%' class='base'>$Lang::tr{'wlanap client isolation'}: </td><td class='base' colspan='3'>$Lang::tr{'on'} <input type='radio' name='CLIENTISOLATION' value='on' $checked{'CLIENTISOLATION'}{'on'} /> | <input type='radio' name='CLIENTISOLATION' value='off' $checked{'CLIENTISOLATION'}{'off'} /> $Lang::tr{'off'}</td></tr>
<tr><td width='25%' class='base'>$Lang::tr{'wlanap country'}: </td><td class='base' colspan='3'> @@ -639,7 +639,6 @@ logger_syslog=-1 logger_syslog_level=$wlanapsettings{'SYSLOGLEVEL'} logger_stdout=-1 logger_stdout_level=$wlanapsettings{'DEBUG'} -dump_file=/tmp/hostapd.dump auth_algs=1 ctrl_interface=/var/run/hostapd ctrl_interface_group=0 diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 8b5723a12..0fc1ecf85 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -2840,7 +2840,9 @@ 'wlan clients' => 'WLAN-Clients', 'wlanap' => 'Access Point', 'wlanap auto' => 'Automatic Channel Selection', +'wlanap broadcast ssid' => 'SSID übertragen', 'wlanap channel' => 'Kanal', +'wlanap client isolation' => 'Client-Isolierung', 'wlanap configuration' => 'Access Point Konfiguration', 'wlanap country' => 'Ländercode', 'wlanap debugging' => 'Debugging', @@ -2858,6 +2860,7 @@ 'wlanap none' => 'keine', 'wlanap notifications' => 'Hinweise', 'wlanap select interface' => 'Bitte das WLAN-Interface auswählen.', +'wlanap ssid' => 'SSID', 'wlanap verbose' => 'Alle Informationen', 'wlanap warnings' => 'Warnungen', 'wlanap wlan card' => 'WLAN-Karte', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 8ae154247..d14a860f3 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -2889,7 +2889,9 @@ 'wlan clients' => 'Wireless clients', 'wlanap' => 'Access Point', 'wlanap auto' => 'Automatic Channel Selection', +'wlanap broadcast ssid' => 'Broadcast SSID', 'wlanap channel' => 'Channel', +'wlanap client isolation' => 'Client Isolation', 'wlanap configuration' => 'Access Point Configuration', 'wlanap country' => 'Country Code', 'wlanap debugging' => 'Debugging', @@ -2907,6 +2909,7 @@ 'wlanap none' => 'none', 'wlanap notifications' => 'Notifications', 'wlanap select interface' => 'Please select the wireless lan interface.', +'wlanap ssid' => 'SSID', 'wlanap verbose' => 'Verbose', 'wlanap warnings' => 'Warnings', 'wlanap wlan card' => 'WLan Card',
hooks/post-receive -- IPFire 2.x development tree
-
Michael Tremer