Merge remote-tracking branch 'amarx/firewall-fifteen' into fifteen

diff --combined langs/de/cgi-bin/de.pl
index ed6afcece07d7e3808a5d87d2f1528a79147a6e0,14322c01b9b0169f88ecd5b61e931e3306d55bb9..6b38be8de47ad405535773edf8af240312a53b4d
--- 1/langs/de/cgi-bin/de.pl
--- 2/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@@ -949,7 -949,9 +949,9 @@@
  'fwdfw from' => 'Von:',
  'fwdfw hint ip1' => 'Die zuletzt erzeugte Regel mag eventuell niemals zutreffen, da sich Quelle und Ziel überlappen.',
  'fwdfw hint ip2' => 'Bitte überprüfen Sie, ob diese Regel Sinn macht: ',
+ 'fwdfw iface' => 'Interface',
  'fwdfw ipsec network' => 'IPsec-Netzwerke:',
+ 'fwdfw log' => 'Log',
  'fwdfw log rule' => 'Logging aktivieren',
  'fwdfw man port' => 'Port(s):',
  'fwdfw menu' => 'Firewallregeln',
@@@ -1487,7 -1489,6 +1489,7 @@@
  'not present' => '<B>Nicht</B> vorhanden',
  'not running' => 'nicht gestartet',
  'not set' => 'nicht gesetzt',
 +'notice' => 'Hinweis',
  'november' => 'November',
  'ntp common settings' => 'Allgemeine Einstellungen',
  'ntp configuration' => 'NTP-Konfiguration',
@@@ -1610,7 -1611,6 +1612,7 @@@
  'ovpnstatus log' => 'OVPN-Status-Log',
  'ovpnsys log' => 'OVPN-System-Log',
  'p2p block' => 'P2P-Block',
 +'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 --combined langs/en/cgi-bin/en.pl
index f14eb50158503b58bfd21c36d79fce30c898e81e,bfa2d6c63c3f05471ff009ea126b1a55cc375457..af5baca49b6fe7743786ece3787af81a7e2001f1
--- 1/langs/en/cgi-bin/en.pl
--- 2/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@@ -974,7 -974,9 +974,9 @@@
  'fwdfw from' => 'From:',
  'fwdfw hint ip1' => 'The last generated rule may never match, because source and destination subnets may overlap.',
  'fwdfw hint ip2' => 'Please double-check if this rule makes sense: ',
+ 'fwdfw iface' => 'Interface',
  'fwdfw ipsec network' => 'IPsec networks:',
+ 'fwdfw log' => 'Log',
  'fwdfw log rule' => 'Log rule',
  'fwdfw man port' => 'Port(s):',
  'fwdfw menu' => 'Firewall Rules',
@@@ -1516,7 -1518,6 +1518,7 @@@
  'not running' => 'not running',
  'not set' => 'not set',
  'notes' => 'Notes',
 +'notice' => 'Notice',
  'november' => 'November',
  'ntp common settings' => 'Common settings',
  'ntp configuration' => 'NTP configuration',
@@@ -1639,7 -1640,6 +1641,7 @@@
  'ovpnstatus log' => 'OVPN-Status-Log',
  'ovpnsys log' => 'OVPN-System-Log',
  'p2p block' => 'P2P block',
 +'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?',