From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [IPv6:::1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4f6zSl6YQ2z2xyW for ; Fri, 06 Feb 2026 16:05:11 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (secp384r1 raw public key) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R12" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4f6zSl6CN3z2xRF for ; Fri, 06 Feb 2026 16:05:11 +0000 (UTC) Received: from people01.haj.ipfire.org (people01.haj.ipfire.org [IPv6:2001:678:b28::161]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "people01.haj.ipfire.org", Issuer "E7" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4f6zSl1V18z9Z for ; Fri, 06 Feb 2026 16:05:11 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1770393911; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=lLsW9Cop+bx/dw3dpEVWkF3opYruNwT/WAtgTCqdTdg=; b=TbaXsiTNst5ttflAP1RA9K5FGOWvTiRmT+cFKq5EiEd7cJF50HkFxezhjC5feDb1gs6Cry 3QDsqTG5BODKzYDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1770393911; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=lLsW9Cop+bx/dw3dpEVWkF3opYruNwT/WAtgTCqdTdg=; b=FBkFQkGeE+rHFXVZc5ObC0Ta02m5RsCw0Zu4ip9HjEuKwdC0H7xeYpTFxMh4f4xNP8pttb 0ErlsMtlxS9g90yuH4u9szqFeXegwsIb6Axkjirbjq2P1RKseEauPuHWG+eG+pysL8WbpC Z1nPZ98z3t475vo33c28EvCEil8dG45TQtl9OTaZ2MIFBOJc8rs5XY9AEcYRxEZmGaMMor W1sj0jx4vrxpjkmlgYSaeSYeTFJi5GZYjnOu2FYURVfYAD4NfSfaeCJa6D+ojRskn0C1uk ida9bVNsDcIVxqQ9Xzz3wvwi6VnBXjHM9x9w9skZh5SiUAKsMKT3y32ufjAAEQ== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4f6zSk1RZLz2xVq; Fri, 06 Feb 2026 16:05:10 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. b4d0ec551ecac33487f7ec34240e46520d2941a8 X-Git-Refname: refs/heads/next X-Git-Reftype: branch X-Git-Oldrev: 5eb3380fb78459fa85e573fc739a74ff2c990bc9 X-Git-Newrev: b4d0ec551ecac33487f7ec34240e46520d2941a8 Message-Id: <4f6zSk1RZLz2xVq@people01.haj.ipfire.org> Date: Fri, 06 Feb 2026 16:05:10 +0000 (UTC) From: Michael Tremer Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: 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 b4d0ec551ecac33487f7ec34240e46520d2941a8 (commit) via 30ed9d0e2cf97141f690bcc10d0e99209cbb1cac (commit) from 5eb3380fb78459fa85e573fc739a74ff2c990bc9 (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 b4d0ec551ecac33487f7ec34240e46520d2941a8 Author: Michael Tremer Date: Fri Feb 6 16:04:36 2026 +0000 langs: Fix word order in German translation Signed-off-by: Michael Tremer commit 30ed9d0e2cf97141f690bcc10d0e99209cbb1cac Author: Adolf Belka Date: Fri Feb 6 16:00:19 2026 +0100 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 Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: doc/language_issues.en | 2 +- doc/language_issues.it | 2 +- doc/language_issues.nl | 2 +- doc/language_issues.pl | 2 +- doc/language_issues.ru | 2 +- doc/language_issues.tr | 2 +- doc/language_issues.tw | 2 ++ doc/language_issues.zh | 2 ++ doc/language_missings | 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/tw/cgi-bin/tw.pl | 2 -- langs/zh/cgi-bin/zh.pl | 2 -- 15 files changed, 18 insertions(+), 14 deletions(-) Difference in files: diff --git a/doc/language_issues.en b/doc/language_issues.en index 30e2fbcce..c53843b37 100644 --- 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 10e77143f..2e5110092 100644 --- 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 5d56a5ca2..68dfe7332 100644 --- 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 7a1128c20..c9816a3a4 100644 --- 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 b6320fd30..2c372b409 100644 --- 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 2ad1bf054..44ddc016d 100644 --- 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 c676ffa52..b8e378859 100644 --- 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 c676ffa52..b8e378859 100644 --- 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 268add65b..b69295bb5 100644 --- 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 deca00171..7d74b0079 100644 --- 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' => 'Nachbarschaftsscan deaktivieren', '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 dda3e8d5b..890624796 100644 --- 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 63ad68aa6..ed244e1fc 100644 --- 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 af960b4e9..804e1adcf 100644 --- 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 ea6646c45..9940111c1 100644 --- 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 9a37533e9..b4fe5a512 100644 --- 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' => '通知', hooks/post-receive -- IPFire 2.x development tree