From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter =?utf-8?q?M=C3=BCller?= To: development@lists.ipfire.org Subject: Re: [PATCH 2/2] Changed notification for reloading firewall rules Date: Sun, 03 Apr 2022 08:50:12 +0000 Message-ID: In-Reply-To: <20220402201121.4639-2-matthias.fischer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5175166135336986485==" List-Id: --===============5175166135336986485== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Reviewed-by: Peter M=C3=BCller > I think 'fw rules reload...' is more logical. >=20 > Signed-off-by: Matthias Fischer > --- > html/cgi-bin/location-block.cgi | 5 ++--- > langs/de/cgi-bin/de.pl | 2 +- > langs/en/cgi-bin/en.pl | 2 +- > langs/fr/cgi-bin/fr.pl | 2 +- > langs/it/cgi-bin/it.pl | 2 +- > langs/nl/cgi-bin/nl.pl | 2 +- > langs/tr/cgi-bin/tr.pl | 2 +- > 7 files changed, 8 insertions(+), 9 deletions(-) >=20 > diff --git a/html/cgi-bin/location-block.cgi b/html/cgi-bin/location-block.= cgi > index df3f397a6..98965db88 100644 > --- a/html/cgi-bin/location-block.cgi > +++ b/html/cgi-bin/location-block.cgi > @@ -76,9 +76,8 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) { > # Mark the firewall config as changed. > &General::firewall_config_changed(); > =20 > - # Assign reload notice. We directly can use > - # the notice from p2p block. > - $notice =3D $Lang::tr{'p2p block save notice'}; > + # Assign reload notice. > + $notice =3D $Lang::tr{'fw rules reload notice'}; > } > =20 > &Header::openpage($Lang::tr{'locationblock configuration'}, 1, ''); > diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl > index 6d4743e28..2d6fd7dd1 100644 > --- a/langs/de/cgi-bin/de.pl > +++ b/langs/de/cgi-bin/de.pl > @@ -1112,6 +1112,7 @@ > 'fw default drop' =3D> 'Firewallrichtlinie', > 'fw logging' =3D> 'Firewallprotokollierung', > 'fw red' =3D> 'Firewalloptionen f=C3=BCr das rote Interface', > +'fw rules reload notice' =3D> 'Bitte lesen Sie die Firewallregeln neu ein,= damit die =C3=84nderungen aktiv werden.', > 'fw settings' =3D> 'Firewalleinstellungen', > 'fw settings color' =3D> 'Farben in Regeltabelle anzeigen', > 'fw settings dropdown' =3D> 'Alle Netzwerke auf Regelerstellungsseite anze= igen', > @@ -1975,7 +1976,6 @@ > 'ovpn_processprioVH' =3D> 'Sehr Hoch', > 'ovpnstatus log' =3D> 'OVPN-Status-Protokoll', > 'ovpnsys log' =3D> 'OVPN-System-Protokoll', > -'p2p block save notice' =3D> 'Bitte lesen Sie die Firewallregeln neu ein, = damit die =C3=84nderungen aktiv werden.', > 'package failed to install' =3D> 'Programmpaket konnte nicht installiert w= erden.', > 'pagerefresh' =3D> 'Seite wird aktualisiert. Bitte warten.', > 'pakfire accept all' =3D> 'M=C3=B6chten Sie der Installation aller Pakete = zustimmen?', > diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl > index b9f99a82e..eca408e04 100644 > --- a/langs/en/cgi-bin/en.pl > +++ b/langs/en/cgi-bin/en.pl > @@ -1154,6 +1154,7 @@ > 'fw default drop' =3D> 'Firewall policy', > 'fw logging' =3D> 'Firewall logging', > 'fw red' =3D> 'Firewall options for RED interface', > +'fw rules reload notice' =3D> 'Please reload the firewall ruleset in order= to apply your changes.', > 'fw settings' =3D> 'Firewall settings', > 'fw settings color' =3D> 'Show colors in ruletable', > 'fw settings dropdown' =3D> 'Show all networks on rulecreation site', > @@ -2026,7 +2027,6 @@ > 'ovpn_processprioVH' =3D> 'Very high', > 'ovpnstatus log' =3D> 'OVPN-Status-Log', > 'ovpnsys log' =3D> 'OVPN-System-Log', > -'p2p block save notice' =3D> 'Please reload the firewall ruleset in order = to apply your changes.', > 'package failed to install' =3D> 'Package failed to install.', > 'pagerefresh' =3D> 'Page is beeing refreshed, please wait.', > 'pakfire accept all' =3D> 'Do you want to install all packages?', > diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl > index ca3baac49..03fc754df 100644 > --- a/langs/fr/cgi-bin/fr.pl > +++ b/langs/fr/cgi-bin/fr.pl > @@ -1160,6 +1160,7 @@ > 'fw default drop' =3D> 'Strat=C3=A9gie de pare-feu', > 'fw logging' =3D> 'Journalisation du pare-feu', > 'fw red' =3D> 'Options de pare-feu pour l\'interface ROUGE', > +'fw rules reload notice' =3D> 'Veuillez recharger le jeu de r=C3=A8gles du= pare-feu afin d\'appliquer vos modifications.', > 'fw settings' =3D> 'Param=C3=A8tres pare-feu', > 'fw settings color' =3D> 'Afficher les couleurs dans la table de r=C3=A8gl= es', > 'fw settings dropdown' =3D> 'Afficher tous les r=C3=A9seaux sur le site de= cr=C3=A9ation de r=C3=A8gles', > @@ -2035,7 +2036,6 @@ > 'ovpn_processprioVH' =3D> 'Tr=C3=A8s haute', > 'ovpnstatus log' =3D> 'Journal statut OVPN', > 'ovpnsys log' =3D> 'Journal syst=C3=A8me OVPN', > -'p2p block save notice' =3D> 'Veuillez recharger le jeu de r=C3=A8gles du = pare-feu afin d\'appliquer vos modifications.', > 'package failed to install' =3D> 'L\'installation du paquet a =C3=A9chou= =C3=A9.', > 'pagerefresh' =3D> 'La page est en cours d\'actualisation, veuillez patien= ter.', > 'pakfire accept all' =3D> 'Voulez-vous installer ce(s) paquet(s) ?', > diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl > index 89f4ff8c5..cb669931f 100644 > --- a/langs/it/cgi-bin/it.pl > +++ b/langs/it/cgi-bin/it.pl > @@ -972,6 +972,7 @@ > 'fw blue' =3D> 'Firewall options for Blu interface', > 'fw default drop' =3D> 'Firewall policy', > 'fw logging' =3D> 'Log Firewall', > +'fw rules reload notice' =3D> 'Ricarica le regole del firewall per applica= re le modifiche.', > 'fw settings' =3D> 'Firewall settings', > 'fw settings color' =3D> 'Show colors in ruletable', > 'fw settings dropdown' =3D> 'Show all networks on rulecreation site', > @@ -1731,7 +1732,6 @@ > 'ovpn_processprioVH' =3D> 'Very high', > 'ovpnstatus log' =3D> 'OVPN-Status-Log', > 'ovpnsys log' =3D> 'OVPN-System-Log', > -'p2p block save notice' =3D> 'Ricarica le regole del firewall per applicar= e le modifiche.', > 'package failed to install' =3D> 'Package failed to install.', > 'pagerefresh' =3D> 'Page is beeing refreshed, please wait.', > 'pakfire accept all' =3D> 'Vuoi installare tutti i pacchetti?', > diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl > index 87799549f..5979873bb 100644 > --- a/langs/nl/cgi-bin/nl.pl > +++ b/langs/nl/cgi-bin/nl.pl > @@ -957,6 +957,7 @@ > 'fw blue' =3D> 'Firewallopties voor de BLAUWE interface', > 'fw default drop' =3D> 'Firewallbeleid', > 'fw logging' =3D> 'Firewall logging', > +'fw rules reload notice' =3D> 'De firewallregels moeten opnieuw geladen wo= rden om uw wijzigingen actief te maken.', > 'fw settings' =3D> 'Firewall instellingen', > 'fw settings color' =3D> 'Toon gekleurde regels in tabel', > 'fw settings dropdown' =3D> 'Toon alle netwerken op omgeving van aangemaak= te regels', > @@ -1687,7 +1688,6 @@ > 'ovpn_processprioVH' =3D> 'Zeer hoog', > 'ovpnstatus log' =3D> 'OVPN-Status-Log', > 'ovpnsys log' =3D> 'OVPN-Systeem-Log', > -'p2p block save notice' =3D> 'De firewallregels moeten opnieuw geladen wor= den om uw wijzigingen actief te maken.', > 'package failed to install' =3D> 'Pakket kon niet worden ge=C3=AFnstalleer= d.', > 'pagerefresh' =3D> 'Pagina wordt ververst, wacht even a.u.b.', > 'pakfire accept all' =3D> 'Wilt u alle pakketten installeren?', > diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl > index b996104fb..eecd52417 100644 > --- a/langs/tr/cgi-bin/tr.pl > +++ b/langs/tr/cgi-bin/tr.pl > @@ -1072,6 +1072,7 @@ > 'fw blue' =3D> 'MAV=C4=B0 arabirim i=C3=A7in g=C3=BCvenlik duvar=C4=B1 se= =C3=A7enekleri', > 'fw default drop' =3D> 'G=C3=BCvenlik duvar=C4=B1 y=C3=B6ntemleri', > 'fw logging' =3D> 'G=C3=BCvenlik duvar=C4=B1 g=C3=BCnl=C3=BC=C4=9F=C3=BC', > +'fw rules reload notice' =3D> 'Yapt=C4=B1=C4=9F=C4=B1n=C4=B1z de=C4=9Fi=C5= =9Fiklikleri uygulamak i=C3=A7in g=C3=BCvenlik duvar=C4=B1 kural=C4=B1 ayarla= r=C4=B1n=C4=B1 l=C3=BCtfen yeniden y=C3=BCkleyin.', > 'fw settings' =3D> 'G=C3=BCvenlik duvar=C4=B1 ayarlar=C4=B1', > 'fw settings color' =3D> 'Kural tablosunda renkleri g=C3=B6ster', > 'fw settings dropdown' =3D> 'Kural olu=C5=9Fturulan sitedeki t=C3=BCm a=C4= =9Flar=C4=B1 g=C3=B6ster', > @@ -1875,7 +1876,6 @@ > 'ovpn_processprioVH' =3D> '=C3=87ok y=C3=BCksek', > 'ovpnstatus log' =3D> 'OVPN-Durum-G=C3=BCnl=C3=BCk', > 'ovpnsys log' =3D> 'OVPN-Durum-G=C3=BCnl=C3=BCk', > -'p2p block save notice' =3D> 'Yapt=C4=B1=C4=9F=C4=B1n=C4=B1z de=C4=9Fi=C5= =9Fiklikleri uygulamak i=C3=A7in g=C3=BCvenlik duvar=C4=B1 kural=C4=B1 ayarla= r=C4=B1n=C4=B1 l=C3=BCtfen yeniden y=C3=BCkleyin.', > 'package failed to install' =3D> 'Paket y=C3=BCklenemedi.', > 'pagerefresh' =3D> 'Sayfa yenileniyor. L=C3=BCtfen bekleyin.', > 'pakfire accept all' =3D> 'T=C3=BCm paketleri y=C3=BCklemek istiyor musunu= z?', --===============5175166135336986485==--