From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 2/3] en.pl: Update to explicitly mention single quotation mark being invalid Date: Fri, 05 Jul 2024 19:18:55 +0200 Message-ID: <20240705171856.3471127-2-adolf.belka@ipfire.org> In-Reply-To: <20240705171856.3471127-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3974138607756408510==" List-Id: --===============3974138607756408510== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable - As all characters, except for the single quotation mark, are now allowed in= the PSK with the base64 encoding implemented then the error message in the English= Lang file has been changed to explicitly mention the single quotation mark rather th= an characters as a generic message. Fixes: Bug13029 Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- doc/language_issues.de | 2 +- doc/language_issues.en | 6 ++++-- doc/language_issues.es | 2 +- doc/language_issues.fr | 2 +- doc/language_issues.it | 4 ++-- doc/language_issues.nl | 4 +++- doc/language_issues.pl | 4 +++- doc/language_issues.ru | 4 +++- doc/language_issues.tr | 4 ++-- doc/language_missings | 8 ++++++++ langs/en/cgi-bin/en.pl | 2 +- 11 files changed, 29 insertions(+), 13 deletions(-) diff --git a/doc/language_issues.de b/doc/language_issues.de index 79b21fe24..757b566e6 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -517,7 +517,6 @@ WARNING: translation string unused: network time WARNING: translation string unused: network traffic graphs WARNING: translation string unused: network updated WARNING: translation string unused: networks settings -WARNING: translation string unused: never WARNING: translation string unused: new optionsfw must boot WARNING: translation string unused: no alcatelusb firmware WARNING: translation string unused: no cfg upload @@ -942,6 +941,7 @@ WARNING: untranslated string: netbios nameserver daemon = =3D NetBIOS Nameserver Dae WARNING: untranslated string: no entries =3D No entries at the moment. WARNING: untranslated string: optional =3D Optional WARNING: untranslated string: pakfire invalid tree =3D Invalid repository se= lected +WARNING: untranslated string: reg_file_data_sampling =3D Register File Data = Sampling (RFDS) WARNING: untranslated string: regenerate host certificate =3D Renew Host Cer= tificate WARNING: untranslated string: reiserfs warning1 =3D Reiserfs is deprecated a= nd scheduled to be removed from the kernel in 2025. WARNING: untranslated string: reiserfs warning2 =3D Ensure a fresh installat= ion is made using either ext4 or xfs filesystems before that date. diff --git a/doc/language_issues.en b/doc/language_issues.en index 2541ccf88..a20121638 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -680,7 +680,7 @@ WARNING: untranslated string: drop action =3D Default beh= aviour of (forward) firew WARNING: untranslated string: drop action1 =3D Default behaviour of (outgoin= g) firewall in mode "Blocked" WARNING: untranslated string: drop action2 =3D Default behaviour of (input) = firewall WARNING: untranslated string: drop forward =3D Log dropped forward packets -WARNING: untranslated string: drop hostile =3D Drop packets from and to host= ile networks (listed at Spamhaus DROP, etc.) +WARNING: untranslated string: drop hostile =3D Drop packets from and to host= ile networks (listed at Spamhaus DROP, etc.) WARNING: untranslated string: drop input =3D Log dropped input packets WARNING: untranslated string: drop newnotsyn =3D Log dropped new not SYN pac= kets WARNING: untranslated string: drop outgoing =3D Log dropped outgoing packets @@ -1116,7 +1116,7 @@ WARNING: untranslated string: intrusion detection =3D I= ntrusion Prevention WARNING: untranslated string: intrusion detection system =3D Intrusion Preve= ntion System WARNING: untranslated string: intrusion detection system rules =3D Ruleset WARNING: untranslated string: invalid broadcast ip =3D Invalid broadcast IP -WARNING: untranslated string: invalid characters found in pre-shared key =3D= Invalid characters found in pre-shared key. +WARNING: untranslated string: invalid characters found in pre-shared key =3D= Invalid single quotation mark found in pre-shared key. WARNING: untranslated string: invalid default lease time =3D Invalid default= lease time. WARNING: untranslated string: invalid domain name =3D Invalid domain name. WARNING: untranslated string: invalid end address =3D Invalid end address. @@ -1382,6 +1382,7 @@ WARNING: untranslated string: network time from =3D Obt= ain time from a network tim WARNING: untranslated string: network traffic graphs external =3D Net-Traffi= c graphs (external) WARNING: untranslated string: network traffic graphs internal =3D Net-Traffi= c graphs (internal) WARNING: untranslated string: network traffic graphs others =3D Network (oth= ers) +WARNING: untranslated string: never =3D Never WARNING: untranslated string: new optionsfw later =3D Some options need a re= boot to take effect WARNING: untranslated string: newer =3D Newer WARNING: untranslated string: next =3D next @@ -1584,6 +1585,7 @@ WARNING: untranslated string: red1 =3D RED WARNING: untranslated string: references =3D References WARNING: untranslated string: refresh =3D Refresh WARNING: untranslated string: refresh index page while connected =3D Refresh= index.cgi page while connected +WARNING: untranslated string: reg_file_data_sampling =3D Register File Data = Sampling (RFDS) WARNING: untranslated string: regenerate host certificate =3D Renew Host Cer= tificate WARNING: untranslated string: reiserfs warning1 =3D Reiserfs is deprecated a= nd scheduled to be removed from the kernel in 2025. WARNING: untranslated string: reiserfs warning2 =3D Ensure a fresh installat= ion is made using either ext4 or xfs filesystems before that date. diff --git a/doc/language_issues.es b/doc/language_issues.es index 4949d9335..b124927aa 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -566,7 +566,6 @@ WARNING: translation string unused: network time WARNING: translation string unused: network traffic graphs WARNING: translation string unused: network updated WARNING: translation string unused: networks settings -WARNING: translation string unused: never WARNING: translation string unused: new optionsfw must boot WARNING: translation string unused: no alcatelusb firmware WARNING: translation string unused: no cfg upload @@ -1003,6 +1002,7 @@ WARNING: untranslated string: no data =3D unknown string WARNING: untranslated string: openvpn cert expires soon =3D Expires Soon WARNING: untranslated string: openvpn cert has expired =3D Expired WARNING: untranslated string: pakfire ago =3D ago. +WARNING: untranslated string: reg_file_data_sampling =3D Register File Data = Sampling (RFDS) WARNING: untranslated string: regenerate host certificate =3D Renew Host Cer= tificate WARNING: untranslated string: reiserfs warning1 =3D Reiserfs is deprecated a= nd scheduled to be removed from the kernel in 2025. WARNING: untranslated string: reiserfs warning2 =3D Ensure a fresh installat= ion is made using either ext4 or xfs filesystems before that date. diff --git a/doc/language_issues.fr b/doc/language_issues.fr index fb29de25c..9a290fb58 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -545,7 +545,6 @@ WARNING: translation string unused: network time WARNING: translation string unused: network traffic graphs WARNING: translation string unused: network updated WARNING: translation string unused: networks settings -WARNING: translation string unused: never WARNING: translation string unused: new optionsfw must boot WARNING: translation string unused: no alcatelusb firmware WARNING: translation string unused: no cfg upload @@ -947,6 +946,7 @@ WARNING: untranslated string: guardian service =3D unknow= n string WARNING: untranslated string: hostile networks total =3D Total Hostile Netwo= rks WARNING: untranslated string: ids provider eol =3D (EOL) WARNING: untranslated string: pakfire ago =3D ago. +WARNING: untranslated string: reg_file_data_sampling =3D Register File Data = Sampling (RFDS) WARNING: untranslated string: routing config added =3D unknown string WARNING: untranslated string: routing config changed =3D unknown string WARNING: untranslated string: system time =3D System Time (as of last page l= oad) diff --git a/doc/language_issues.it b/doc/language_issues.it index 680cc5f4e..b85041c74 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -504,7 +504,6 @@ WARNING: translation string unused: network time WARNING: translation string unused: network traffic graphs WARNING: translation string unused: network updated WARNING: translation string unused: networks settings -WARNING: translation string unused: never WARNING: translation string unused: new optionsfw must boot WARNING: translation string unused: no alcatelusb firmware WARNING: translation string unused: no cfg upload @@ -972,7 +971,7 @@ WARNING: untranslated string: dnsforward dnssec disabled = =3D DNSSEC Validation is WARNING: untranslated string: dnsforward forward_servers =3D Nameservers WARNING: untranslated string: downfall gather data sampling =3D Downfall/Gat= her Data Sampling WARNING: untranslated string: download apple profile =3D Download Apple Conf= iguration Profile -WARNING: untranslated string: drop hostile =3D Drop packets from and to host= ile networks (listed at Spamhaus DROP, etc.) +WARNING: untranslated string: drop hostile =3D Drop packets from and to host= ile networks (listed at Spamhaus DROP, etc.) WARNING: untranslated string: drop spoofed martians =3D Log dropped spoofed = packets and martians WARNING: untranslated string: duration =3D Duration WARNING: untranslated string: eight hours =3D 8 Hours @@ -1221,6 +1220,7 @@ WARNING: untranslated string: rdns =3D rDNS WARNING: untranslated string: reboot fsck =3D Reboot & run ‘fsck’ WARNING: untranslated string: rebooting ipfire fsck =3D Rebooting IPFire, fo= rcing filesystem check WARNING: untranslated string: received =3D Received +WARNING: untranslated string: reg_file_data_sampling =3D Register File Data = Sampling (RFDS) WARNING: untranslated string: regenerate host certificate =3D Renew Host Cer= tificate WARNING: untranslated string: reiserfs warning1 =3D Reiserfs is deprecated a= nd scheduled to be removed from the kernel in 2025. WARNING: untranslated string: reiserfs warning2 =3D Ensure a fresh installat= ion is made using either ext4 or xfs filesystems before that date. diff --git a/doc/language_issues.nl b/doc/language_issues.nl index de9dc112a..adf28c036 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -976,7 +976,7 @@ WARNING: untranslated string: dnssec validating =3D DNSSE= C Validating WARNING: untranslated string: downfall gather data sampling =3D Downfall/Gat= her Data Sampling WARNING: untranslated string: download apple profile =3D Download Apple Conf= iguration Profile WARNING: untranslated string: download tls-auth key =3D Download tls-auth key -WARNING: untranslated string: drop hostile =3D Drop packets from and to host= ile networks (listed at Spamhaus DROP, etc.) +WARNING: untranslated string: drop hostile =3D Drop packets from and to host= ile networks (listed at Spamhaus DROP, etc.) WARNING: untranslated string: drop outgoing =3D Log dropped outgoing packets WARNING: untranslated string: drop spoofed martians =3D Log dropped spoofed = packets and martians WARNING: untranslated string: duration =3D Duration @@ -1201,6 +1201,7 @@ WARNING: untranslated string: monitor interface =3D Mon= itor Interface WARNING: untranslated string: mtu =3D MTU WARNING: untranslated string: nameserver =3D Nameserver WARNING: untranslated string: netbios nameserver daemon =3D NetBIOS Nameserv= er Daemon +WARNING: untranslated string: never =3D Never WARNING: untranslated string: no data =3D unknown string WARNING: untranslated string: no entries =3D No entries at the moment. WARNING: untranslated string: none =3D none @@ -1243,6 +1244,7 @@ WARNING: untranslated string: ptr =3D PTR WARNING: untranslated string: rdns =3D rDNS WARNING: untranslated string: rebooting ipfire fsck =3D Rebooting IPFire, fo= rcing filesystem check WARNING: untranslated string: received =3D Received +WARNING: untranslated string: reg_file_data_sampling =3D Register File Data = Sampling (RFDS) WARNING: untranslated string: regenerate host certificate =3D Renew Host Cer= tificate WARNING: untranslated string: reiserfs warning1 =3D Reiserfs is deprecated a= nd scheduled to be removed from the kernel in 2025. WARNING: untranslated string: reiserfs warning2 =3D Ensure a fresh installat= ion is made using either ext4 or xfs filesystems before that date. diff --git a/doc/language_issues.pl b/doc/language_issues.pl index d52c29f6b..d15f00f91 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -963,7 +963,7 @@ WARNING: untranslated string: drop action =3D Default beh= aviour of (forward) firew WARNING: untranslated string: drop action1 =3D Default behaviour of (outgoin= g) firewall in mode "Blocked" WARNING: untranslated string: drop action2 =3D Default behaviour of (input) = firewall WARNING: untranslated string: drop forward =3D Log dropped forward packets -WARNING: untranslated string: drop hostile =3D Drop packets from and to host= ile networks (listed at Spamhaus DROP, etc.) +WARNING: untranslated string: drop hostile =3D Drop packets from and to host= ile networks (listed at Spamhaus DROP, etc.) WARNING: untranslated string: drop outgoing =3D Log dropped outgoing packets WARNING: untranslated string: drop spoofed martians =3D Log dropped spoofed = packets and martians WARNING: untranslated string: duration =3D Duration @@ -1355,6 +1355,7 @@ WARNING: untranslated string: most preferred =3D most p= referred WARNING: untranslated string: mtu =3D MTU WARNING: untranslated string: nameserver =3D Nameserver WARNING: untranslated string: netbios nameserver daemon =3D NetBIOS Nameserv= er Daemon +WARNING: untranslated string: never =3D Never WARNING: untranslated string: no data =3D unknown string WARNING: untranslated string: no entries =3D No entries at the moment. WARNING: untranslated string: none =3D none @@ -1424,6 +1425,7 @@ WARNING: untranslated string: reboot fsck =3D Reboot & = run ‘fsck’ WARNING: untranslated string: rebooting ipfire fsck =3D Rebooting IPFire, fo= rcing filesystem check WARNING: untranslated string: received =3D Received WARNING: untranslated string: red1 =3D RED +WARNING: untranslated string: reg_file_data_sampling =3D Register File Data = Sampling (RFDS) WARNING: untranslated string: regenerate host certificate =3D Renew Host Cer= tificate WARNING: untranslated string: reiserfs warning1 =3D Reiserfs is deprecated a= nd scheduled to be removed from the kernel in 2025. WARNING: untranslated string: reiserfs warning2 =3D Ensure a fresh installat= ion is made using either ext4 or xfs filesystems before that date. diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 3436c4a6e..d052eefac 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -960,7 +960,7 @@ WARNING: untranslated string: drop action =3D Default beh= aviour of (forward) firew WARNING: untranslated string: drop action1 =3D Default behaviour of (outgoin= g) firewall in mode "Blocked" WARNING: untranslated string: drop action2 =3D Default behaviour of (input) = firewall WARNING: untranslated string: drop forward =3D Log dropped forward packets -WARNING: untranslated string: drop hostile =3D Drop packets from and to host= ile networks (listed at Spamhaus DROP, etc.) +WARNING: untranslated string: drop hostile =3D Drop packets from and to host= ile networks (listed at Spamhaus DROP, etc.) WARNING: untranslated string: drop outgoing =3D Log dropped outgoing packets WARNING: untranslated string: drop spoofed martians =3D Log dropped spoofed = packets and martians WARNING: untranslated string: duration =3D Duration @@ -1353,6 +1353,7 @@ WARNING: untranslated string: most preferred =3D most p= referred WARNING: untranslated string: mtu =3D MTU WARNING: untranslated string: nameserver =3D Nameserver WARNING: untranslated string: netbios nameserver daemon =3D NetBIOS Nameserv= er Daemon +WARNING: untranslated string: never =3D Never WARNING: untranslated string: no data =3D unknown string WARNING: untranslated string: no entries =3D No entries at the moment. WARNING: untranslated string: none =3D none @@ -1419,6 +1420,7 @@ WARNING: untranslated string: reboot fsck =3D Reboot & = run ‘fsck’ WARNING: untranslated string: rebooting ipfire fsck =3D Rebooting IPFire, fo= rcing filesystem check WARNING: untranslated string: received =3D Received WARNING: untranslated string: red1 =3D RED +WARNING: untranslated string: reg_file_data_sampling =3D Register File Data = Sampling (RFDS) WARNING: untranslated string: regenerate host certificate =3D Renew Host Cer= tificate WARNING: untranslated string: reiserfs warning1 =3D Reiserfs is deprecated a= nd scheduled to be removed from the kernel in 2025. WARNING: untranslated string: reiserfs warning2 =3D Ensure a fresh installat= ion is made using either ext4 or xfs filesystems before that date. diff --git a/doc/language_issues.tr b/doc/language_issues.tr index ca57075b1..6e077d586 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -533,7 +533,6 @@ WARNING: translation string unused: network time WARNING: translation string unused: network traffic graphs WARNING: translation string unused: network updated WARNING: translation string unused: networks settings -WARNING: translation string unused: never WARNING: translation string unused: new optionsfw must boot WARNING: translation string unused: no alcatelusb firmware WARNING: translation string unused: no cfg upload @@ -952,7 +951,7 @@ WARNING: untranslated string: dnsforward dnssec disabled = =3D DNSSEC Validation is WARNING: untranslated string: dnsforward forward_servers =3D Nameservers WARNING: untranslated string: downfall gather data sampling =3D Downfall/Gat= her Data Sampling WARNING: untranslated string: download apple profile =3D Download Apple Conf= iguration Profile -WARNING: untranslated string: drop hostile =3D Drop packets from and to host= ile networks (listed at Spamhaus DROP, etc.) +WARNING: untranslated string: drop hostile =3D Drop packets from and to host= ile networks (listed at Spamhaus DROP, etc.) WARNING: untranslated string: drop spoofed martians =3D Log dropped spoofed = packets and martians WARNING: untranslated string: duration =3D Duration WARNING: untranslated string: email recipient invalid =3D Invalid email reci= pient @@ -1131,6 +1130,7 @@ WARNING: untranslated string: ptr =3D PTR WARNING: untranslated string: reboot fsck =3D Reboot & run ‘fsck’ WARNING: untranslated string: rebooting ipfire fsck =3D Rebooting IPFire, fo= rcing filesystem check WARNING: untranslated string: received =3D Received +WARNING: untranslated string: reg_file_data_sampling =3D Register File Data = Sampling (RFDS) WARNING: untranslated string: regenerate host certificate =3D Renew Host Cer= tificate WARNING: untranslated string: reiserfs warning1 =3D Reiserfs is deprecated a= nd scheduled to be removed from the kernel in 2025. WARNING: untranslated string: reiserfs warning2 =3D Ensure a fresh installat= ion is made using either ext4 or xfs filesystems before that date. diff --git a/doc/language_missings b/doc/language_missings index a214b8f9a..4c657f099 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -81,6 +81,7 @@ < quick control < random number generator daemon < regenerate host certificate +< reg_file_data_sampling < reiserfs warning1 < reiserfs warning2 < required @@ -134,6 +135,7 @@ < openvpn cert expires soon < openvpn cert has expired < regenerate host certificate +< reg_file_data_sampling < reiserfs warning1 < reiserfs warning2 < service boot setting unavailable @@ -156,6 +158,7 @@ < hostile networks total < ids provider eol < ids unsupported provider +< reg_file_data_sampling < system time < timeformat < upload fcdsl.o @@ -548,6 +551,7 @@ < rebooting ipfire fsck < received < regenerate host certificate +< reg_file_data_sampling < reiserfs warning1 < reiserfs warning2 < release @@ -1098,6 +1102,7 @@ < rebooting ipfire fsck < received < regenerate host certificate +< reg_file_data_sampling < reiserfs warning1 < reiserfs warning2 < required @@ -1988,6 +1993,7 @@ < received < red1 < regenerate host certificate +< reg_file_data_sampling < reiserfs warning1 < reiserfs warning2 < release @@ -2989,6 +2995,7 @@ < received < red1 < regenerate host certificate +< reg_file_data_sampling < reiserfs warning1 < reiserfs warning2 < release @@ -3470,6 +3477,7 @@ < rebooting ipfire fsck < received < regenerate host certificate +< reg_file_data_sampling < reiserfs warning1 < reiserfs warning2 < release diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index a9fb3a6f7..40753cf62 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1515,7 +1515,7 @@ 'intrusion prevention system' =3D> 'Intrusion Prevention System', 'invalid broadcast ip' =3D> 'Invalid broadcast IP', 'invalid cache size' =3D> 'Invalid cache size.', -'invalid characters found in pre-shared key' =3D> 'Invalid characters found = in pre-shared key.', +'invalid characters found in pre-shared key' =3D> 'Invalid single quotation = mark found in pre-shared key.', 'invalid date entered' =3D> 'Invalid date entered.', 'invalid default lease time' =3D> 'Invalid default lease time.', 'invalid domain name' =3D> 'Invalid domain name.', --=20 2.45.2 --===============3974138607756408510==--