langs: Fix bug13935 - Neighbourhood scan meaning is inverted

- In the wlanap.cgi code the NOSCAN variable is on when the checkbox has been checked
   but the wording is Neighborhood Scan so users check this to ensure that Neighborhood
   Scanning is enabled but in fact NOSCAN=on is taken as being disabled.
- To stay matched with the NOSCAN meanings in hostapd initscript this patch changes the
   wording from Neighborhood Scan to Disable Neighborhood Scan.
- For the English, German, Spanish and French language files, I took the Disable word in
   the warning text and added it to the displayed wording for Neighborhood Scan.
- For the two Chinese language files I was unable to do that as I could not determine
   which characters were the required ones. So for those two language files I removed
   the two entries for the Neighborhood Scan and the warning. This makes them the same
   as the Italian, Netherlands, Polish, Russian and Turkish language files as they have
   no entries for this and therefore the English language version is automatically used.

Fixes: Bug13935
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 30e2fbcce2affda0a70f4454e70783da3670793e..c53843b371ae52121686b67a04eebca566707cde 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -2443,7 +2443,7 @@ WARNING: untranslated string: wlanap invalid band = Invalid band
 WARNING: untranslated string: wlanap invalid mode = Invalid mode
 WARNING: untranslated string: wlanap invalid wpa = Invalid length in WPA passphrase. Must be between 8 and 63 characters.
 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 = Disable Neighborhood Scan
 WARNING: untranslated string: wlanap neighbor scan warning = Warning: Disabling may violate regulatory rules
 WARNING: untranslated string: wlanap none = none
 WARNING: untranslated string: wlanap psk = Pre-Shared Key

diff --git a/doc/language_issues.it b/doc/language_issues.it
index 10e77143f635fbb29aac0a1371b3327acfbdc1a3..2e5110092176fa55c909948bd7af6eb002cf51a8 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -1682,7 +1682,7 @@ WARNING: untranslated string: wlanap hide ssid = Hide SSID
 WARNING: untranslated string: wlanap invalid band = Invalid band
 WARNING: untranslated string: wlanap invalid mode = Invalid mode
 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 = Disable Neighborhood Scan
 WARNING: untranslated string: wlanap neighbor scan warning = Warning: Disabling may violate regulatory rules
 WARNING: untranslated string: wlanap psk = Pre-Shared Key
 WARNING: untranslated string: wlanap ssid = SSID

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 5d56a5ca27c20cce5df6be95ad8145cc23dcfe68..68dfe733273b21726d2932014b3701bddf6e69b6 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -1702,7 +1702,7 @@ WARNING: untranslated string: wlanap hide ssid = Hide SSID
 WARNING: untranslated string: wlanap invalid band = Invalid band
 WARNING: untranslated string: wlanap invalid mode = Invalid mode
 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 = Disable Neighborhood Scan
 WARNING: untranslated string: wlanap neighbor scan warning = Warning: Disabling may violate regulatory rules
 WARNING: untranslated string: wlanap psk = Pre-Shared Key
 WARNING: untranslated string: wlanap ssid = SSID

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 7a1128c20b2202aaeb1edb449e2ff121af9591b8..c9816a3a457f16c3e7ef2e215b0a28acf3db1161 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -1951,7 +1951,7 @@ WARNING: untranslated string: wlanap hide ssid = Hide SSID
 WARNING: untranslated string: wlanap invalid band = Invalid band
 WARNING: untranslated string: wlanap invalid mode = Invalid mode
 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 = Disable Neighborhood Scan
 WARNING: untranslated string: wlanap neighbor scan warning = Warning: Disabling may violate regulatory rules
 WARNING: untranslated string: wlanap psk = Pre-Shared Key
 WARNING: untranslated string: wlanap ssid = SSID

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index b6320fd3092686c09b0359d3363b79c2bcd046ce..2c372b4096168060b1364fc1f4172d0fb37ed433 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -1950,7 +1950,7 @@ WARNING: untranslated string: wlanap hide ssid = Hide SSID
 WARNING: untranslated string: wlanap invalid band = Invalid band
 WARNING: untranslated string: wlanap invalid mode = Invalid mode
 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 = Disable Neighborhood Scan
 WARNING: untranslated string: wlanap neighbor scan warning = Warning: Disabling may violate regulatory rules
 WARNING: untranslated string: wlanap psk = Pre-Shared Key
 WARNING: untranslated string: wlanap ssid = SSID

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 2ad1bf0544efed33c810dc60cca7723c8e4f9d18..44ddc016dba400d571009d1a598d9c5cd194355d 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -1551,7 +1551,7 @@ WARNING: untranslated string: wlanap hide ssid = Hide SSID
 WARNING: untranslated string: wlanap invalid band = Invalid band
 WARNING: untranslated string: wlanap invalid mode = Invalid mode
 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 = Disable Neighborhood Scan
 WARNING: untranslated string: wlanap neighbor scan warning = Warning: Disabling may violate regulatory rules
 WARNING: untranslated string: wlanap psk = Pre-Shared Key
 WARNING: untranslated string: wlanap ssid = SSID

diff --git a/doc/language_issues.tw b/doc/language_issues.tw
index c676ffa52063e74ac316d751a52eb15e781ed6dd..b8e378859a21ee6a4408acc7e61e8d2df74fdef4 100644 (file)
--- a/doc/language_issues.tw
+++ b/doc/language_issues.tw
@@ -1290,3 +1290,5 @@ WARNING: untranslated string: wlanap band 5ghz = 5 GHz
 WARNING: untranslated string: wlanap clients = unknown string
 WARNING: untranslated string: wlanap invalid band = Invalid band
 WARNING: untranslated string: wlanap invalid mode = Invalid mode
+WARNING: untranslated string: wlanap neighbor scan = Disable Neighborhood Scan
+WARNING: untranslated string: wlanap neighbor scan warning = Warning: Disabling may violate regulatory rules

diff --git a/doc/language_issues.zh b/doc/language_issues.zh
index c676ffa52063e74ac316d751a52eb15e781ed6dd..b8e378859a21ee6a4408acc7e61e8d2df74fdef4 100644 (file)
--- a/doc/language_issues.zh
+++ b/doc/language_issues.zh
@@ -1290,3 +1290,5 @@ WARNING: untranslated string: wlanap band 5ghz = 5 GHz
 WARNING: untranslated string: wlanap clients = unknown string
 WARNING: untranslated string: wlanap invalid band = Invalid band
 WARNING: untranslated string: wlanap invalid mode = Invalid mode
+WARNING: untranslated string: wlanap neighbor scan = Disable Neighborhood Scan
+WARNING: untranslated string: wlanap neighbor scan warning = Warning: Disabling may violate regulatory rules

diff --git a/doc/language_missings b/doc/language_missings
index 268add65b31b904e55b278472ee087f93796dbb7..b69295bb563b9cadd35e15ea9bd282bed21847b6 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -4764,6 +4764,8 @@
 < wlanap band 5ghz
 < wlanap invalid band
 < wlanap invalid mode
+< wlanap neighbor scan
+< wlanap neighbor scan warning
 ############################################################################
 # Checking cgi-bin translations for language: zh                           #
 ############################################################################
@@ -4867,3 +4869,5 @@
 < wlanap band 5ghz
 < wlanap invalid band
 < wlanap invalid mode
+< wlanap neighbor scan
+< wlanap neighbor scan warning

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index deca001717c26e5eb9cab6948bb20a80c0eacffe..8546bcf9da761cbbedb778749b0f14fde1e42524 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -3115,7 +3115,7 @@
 'wlanap link dhcp' => 'Wireless Lan DHCP-Einstellungen',
 'wlanap link wireless' => 'Wireless Lan Clients freischalten',
 'wlanap management frame protection' => 'Management Frame Protection (802.11w)',
-'wlanap neighbor scan' => 'Nachbarschaftsscan',
+'wlanap neighbor scan' => 'Deaktivieren Nachbarschaftsscan',
 'wlanap neighbor scan warning' => 'Warnung! Deaktivierung kann gegen Funkregeln verstoßen.',
 'wlanap no interface' => 'Ausgewähltes Interface ist keine WLAN-Karte!',
 'wlanap none' => 'keine',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index dda3e8d5b711b6ad551eed8efa74f8b29cfef67f..890624796c8118a459a705887c0f87aef0c946cc 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -3241,7 +3241,7 @@
 'wlanap link dhcp' => 'Wireless LAN DHCP configuration',
 'wlanap link wireless' => 'Activate wireless lan clients',
 'wlanap management frame protection' => 'Management Frame Protection (802.11w)',
-'wlanap neighbor scan' => 'Neighborhood Scan',
+'wlanap neighbor scan' => 'Disable Neighborhood Scan',
 'wlanap neighbor scan warning' => 'Warning: Disabling may violate regulatory rules',
 'wlanap no interface' => 'Selected interface is not a wirless lan card!',
 'wlanap none' => 'none',

diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl
index 63ad68aa65fcad4aaf14f083445f109d410d5476..ed244e1fcc2a6d3cfb315c85d4ce4f57a9f993dd 100644 (file)
--- a/langs/es/cgi-bin/es.pl
+++ b/langs/es/cgi-bin/es.pl
@@ -3171,7 +3171,7 @@
 'wlanap link dhcp' => 'Configuración DHCP de la red inalámbrica.',
 'wlanap link wireless' => 'Activar clientes de red inalámbricos',
 'wlanap management frame protection' => 'Protección de tramas de gestión (802.11w)',
-'wlanap neighbor scan' => 'Escaneo de vecindario',
+'wlanap neighbor scan' => 'Desactivación Escaneo de vecindario',
 'wlanap neighbor scan warning' => '¡Advertencia! ¡La desactivación puede violar las normas reglamentarias!',
 'wlanap no interface' => '¡La interfaz seleccionada no es una tarjeta de red inalámbrica!',
 'wlanap none' => 'ninguno',

diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index af960b4e9330546c54f240e77196b30499ecb0bf..804e1adcf7ef138d5565340a55d85c43ec57b201 100644 (file)
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -3081,7 +3081,7 @@
 'wlanap link dhcp' => 'Configuration DHCP du réseau local sans fil',
 'wlanap link wireless' => 'Activer les clients LAN sans fil',
 'wlanap management frame protection' => 'Protection des trames de gestion (802.11w)',
-'wlanap neighbor scan' => 'Balayage réseaux proches',
+'wlanap neighbor scan' => 'Désactivation Balayage réseaux proches',
 'wlanap neighbor scan warning' => 'Attention ! La désactivation peut enfreindre les règles réglementaires !',
 'wlanap no interface' => 'L\'interface choisie n\'est pas une carte LAN sans fil !',
 'wlanap none' => 'aucun',

diff --git a/langs/tw/cgi-bin/tw.pl b/langs/tw/cgi-bin/tw.pl
index ea6646c4529c0797505f1fb650f99bcaf3a03730..9940111c11cf15660b04a25135f8445073aaf099 100644 (file)
--- a/langs/tw/cgi-bin/tw.pl
+++ b/langs/tw/cgi-bin/tw.pl
@@ -3164,8 +3164,6 @@
 'wlanap link dhcp' => '無線區域網DHCP配置',
 'wlanap link wireless' => '活動的無線區域網客戶端',
 'wlanap management frame protection' => '管理框架保護（802.11w）',
-'wlanap neighbor scan' => '鄰居掃描',
-'wlanap neighbor scan warning' => '警告！ 禁用可能違反監管規則!',
 'wlanap no interface' => '所選接口不是無線區域網卡!',
 'wlanap none' => 'none',
 'wlanap notifications' => '通知',

diff --git a/langs/zh/cgi-bin/zh.pl b/langs/zh/cgi-bin/zh.pl
index 9a37533e984bf521c8b89d647d19d4f611166f97..b4fe5a512dc9dba966a277d227b94d6d773a376f 100644 (file)
--- a/langs/zh/cgi-bin/zh.pl
+++ b/langs/zh/cgi-bin/zh.pl
@@ -3164,8 +3164,6 @@
 'wlanap link dhcp' => '无线局域网DHCP配置',
 'wlanap link wireless' => '活动的无线局域网客户端',
 'wlanap management frame protection' => '管理框架保护（802.11w）',
-'wlanap neighbor scan' => '邻居扫描',
-'wlanap neighbor scan warning' => '警告！ 禁用可能违反监管规则!',
 'wlanap no interface' => '所选接口不是无线局域网卡!',
 'wlanap none' => 'none',
 'wlanap notifications' => '通知',