[PATCH 2/2] Changed notification for reloading firewall rules

[Matthias Fischer <matthias.fischer@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 7636 bytes --]

I think 'fw rules reload...' is more logical.

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
---
 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(-)

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();
 
-	# Assign reload notice. We directly can use
-	# the notice from p2p block.
-	$notice = $Lang::tr{'p2p block save notice'};
+	# Assign reload notice.
+	$notice = $Lang::tr{'fw rules reload notice'};
 }
 
 &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' => 'Firewallrichtlinie',
 'fw logging' => 'Firewallprotokollierung',
 'fw red' => 'Firewalloptionen für das rote Interface',
+'fw rules reload notice' => 'Bitte lesen Sie die Firewallregeln neu ein, damit die Änderungen aktiv werden.',
 'fw settings' => 'Firewalleinstellungen',
 'fw settings color' => 'Farben in Regeltabelle anzeigen',
 'fw settings dropdown' => 'Alle Netzwerke auf Regelerstellungsseite anzeigen',
@@ -1975,7 +1976,6 @@
 'ovpn_processprioVH' => 'Sehr Hoch',
 'ovpnstatus log' => 'OVPN-Status-Protokoll',
 'ovpnsys log' => 'OVPN-System-Protokoll',
-'p2p block save notice' => 'Bitte lesen Sie die Firewallregeln neu ein, damit die Änderungen aktiv werden.',
 'package failed to install' => 'Programmpaket konnte nicht installiert werden.',
 'pagerefresh' => 'Seite wird aktualisiert. Bitte warten.',
 'pakfire accept all' => 'Möchten 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' => 'Firewall policy',
 'fw logging' => 'Firewall logging',
 'fw red' => 'Firewall options for RED interface',
+'fw rules reload notice' => 'Please reload the firewall ruleset in order to apply your changes.',
 'fw settings' => 'Firewall settings',
 'fw settings color' => 'Show colors in ruletable',
 'fw settings dropdown' => 'Show all networks on rulecreation site',
@@ -2026,7 +2027,6 @@
 'ovpn_processprioVH' => 'Very high',
 'ovpnstatus log' => 'OVPN-Status-Log',
 'ovpnsys log' => 'OVPN-System-Log',
-'p2p block save notice' => 'Please reload the firewall ruleset in order to apply your changes.',
 'package failed to install' => 'Package failed to install.',
 'pagerefresh' => 'Page is beeing refreshed, please wait.',
 'pakfire accept all' => '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' => 'Stratégie de pare-feu',
 'fw logging' => 'Journalisation du pare-feu',
 'fw red' => 'Options de pare-feu pour l\'interface ROUGE',
+'fw rules reload notice' => 'Veuillez recharger le jeu de règles du pare-feu afin d\'appliquer vos modifications.',
 'fw settings' => 'Paramètres pare-feu',
 'fw settings color' => 'Afficher les couleurs dans la table de règles',
 'fw settings dropdown' => 'Afficher tous les réseaux sur le site de création de règles',
@@ -2035,7 +2036,6 @@
 'ovpn_processprioVH' => 'Très haute',
 'ovpnstatus log' => 'Journal statut OVPN',
 'ovpnsys log' => 'Journal système OVPN',
-'p2p block save notice' => 'Veuillez recharger le jeu de règles du pare-feu afin d\'appliquer vos modifications.',
 'package failed to install' => 'L\'installation du paquet a échoué.',
 'pagerefresh' => 'La page est en cours d\'actualisation, veuillez patienter.',
 'pakfire accept all' => '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' => 'Firewall options for Blu interface',
 'fw default drop' => 'Firewall policy',
 'fw logging' => 'Log Firewall',
+'fw rules reload notice' => 'Ricarica le regole del firewall per applicare le modifiche.',
 'fw settings' => 'Firewall settings',
 'fw settings color' => 'Show colors in ruletable',
 'fw settings dropdown' => 'Show all networks on rulecreation site',
@@ -1731,7 +1732,6 @@
 'ovpn_processprioVH' => 'Very high',
 'ovpnstatus log' => 'OVPN-Status-Log',
 'ovpnsys log' => 'OVPN-System-Log',
-'p2p block save notice' => 'Ricarica le regole del firewall per applicare le modifiche.',
 'package failed to install' => 'Package failed to install.',
 'pagerefresh' => 'Page is beeing refreshed, please wait.',
 'pakfire accept all' => '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' => 'Firewallopties voor de BLAUWE interface',
 'fw default drop' => 'Firewallbeleid',
 'fw logging' => 'Firewall logging',
+'fw rules reload notice' => 'De firewallregels moeten opnieuw geladen worden om uw wijzigingen actief te maken.',
 'fw settings' => 'Firewall instellingen',
 'fw settings color' => 'Toon gekleurde regels in tabel',
 'fw settings dropdown' => 'Toon alle netwerken op omgeving van aangemaakte regels',
@@ -1687,7 +1688,6 @@
 'ovpn_processprioVH' => 'Zeer hoog',
 'ovpnstatus log' => 'OVPN-Status-Log',
 'ovpnsys log' => 'OVPN-Systeem-Log',
-'p2p block save notice' => 'De firewallregels moeten opnieuw geladen worden om uw wijzigingen actief te maken.',
 'package failed to install' => 'Pakket kon niet worden geïnstalleerd.',
 'pagerefresh' => 'Pagina wordt ververst, wacht even a.u.b.',
 'pakfire accept all' => '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' => 'MAVİ arabirim için güvenlik duvarı seçenekleri',
 'fw default drop' => 'Güvenlik duvarı yöntemleri',
 'fw logging' => 'Güvenlik duvarı günlüğü',
+'fw rules reload notice' => 'Yaptığınız değişiklikleri uygulamak için güvenlik duvarı kuralı ayarlarını lütfen yeniden yükleyin.',
 'fw settings' => 'Güvenlik duvarı ayarları',
 'fw settings color' => 'Kural tablosunda renkleri göster',
 'fw settings dropdown' => 'Kural oluşturulan sitedeki tüm ağları göster',
@@ -1875,7 +1876,6 @@
 'ovpn_processprioVH' => 'Çok yüksek',
 'ovpnstatus log' => 'OVPN-Durum-Günlük',
 'ovpnsys log' => 'OVPN-Durum-Günlük',
-'p2p block save notice' => 'Yaptığınız değişiklikleri uygulamak için güvenlik duvarı kuralı ayarlarını lütfen yeniden yükleyin.',
 'package failed to install' => 'Paket yüklenemedi.',
 'pagerefresh' => 'Sayfa yenileniyor. Lütfen bekleyin.',
 'pakfire accept all' => 'Tüm paketleri yüklemek istiyor musunuz?',
-- 
2.25.1