Merge remote-tracking branch 'stevee/dnsforward' into next

diff --combined langs/de/cgi-bin/de.pl
index 1ed9ccdf87e1b3ea9dc7058d1e00dbef98606f31,6de84e455b976e0920ccf482c306740b682530ac..d1ad7b0fc010d5e3f8f4b0f6caf24b8e750dbdb0
--- 1/langs/de/cgi-bin/de.pl
--- 2/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@@ -526,6 -526,7 +526,6 @@@
  'clock last synchronized at' => 'Die Uhr wurde zuletzt synchronisiert um',
  'comment' => 'Kommentar',
  'common name' => 'Gemeinsamer Name',
 -'community rules' => 'Emergingthreats.net Community Rules',
  'comp-lzo' => 'LZO-Kompression',
  'compression' => 'Kompression:',
  'computer to modem rate' => 'Übertragungsrate zwischen Computer und Modem:',
@@@ -714,6 -715,13 +714,13 @@@
  'dns saved txt' => 'Die beiden eingegebenen DNS-Server-Adressen wurde erfolgreich gespeichert.<br/>Um die Änderung wirksam zu machen, müssen Sie neustarten oder wiederverbinden!',
  'dns server' => 'DNS Server',
  'dns title' => 'Domain Name System',
+ 'dnsforward' => 'DNS-Weiterleitung',
+ 'dnsforward add a new entry' => 'Neuen Eintrag hinzufügen:',
+ 'dnsforward configuration' => 'Einstellungen für DNS Weiterleitung',
+ 'dnsforward edit an entry' => 'Existierenden Eintrag bearbeiten:',
+ 'dnsforward entries' => 'Aktuelle Einträge:',
+ 'dnsforward forward_server' => 'DNS-Server',
+ 'dnsforward zone' => 'Zone',
  'do not log this port list' => 'Verwerfe diese Port-Liste kurz bevor sie protokolliert werden (reduziert Protokollgröße)',
  'dod' => 'Dial-on-Demand-Modus',
  'dod for dns' => 'Dial-on-Demand für DNS:',

diff --combined langs/en/cgi-bin/en.pl
index cdca4621b850337f89ff98fb7e92c2600474ea71,7b92b7e9b0c6655a843bd001956346d4d729ad7a..30d07345dbaefbb21a8dd91a67658171e963fcad
--- 1/langs/en/cgi-bin/en.pl
--- 2/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@@ -545,7 -545,7 +545,7 @@@
  'clock last synchronized at' => 'Clock was last synchronized at',
  'comment' => 'Description:',
  'common name' => 'Common name',
 -'community rules' => 'Emergingthreats.net Community Rules',
 +'community rules' => 'Snort/VRT GPLv2 Community Rules',
  'comp-lzo' => 'LZO-Compression:',
  'compression' => 'Compression:',
  'computer to modem rate' => 'Computer to modem rate:',
@@@ -737,6 -737,13 +737,13 @@@
  'dns saved txt' => 'The two entered DNS server addresses have been saved successfully.<br />You have to reboot or reconnect that the changes have effect!',
  'dns server' => 'DNS Server',
  'dns title' => 'Domain Name System',
+ 'dnsforward' => 'DNS forwarding',
+ 'dnsforward add a new entry' => 'Add a new entry:',
+ 'dnsforward configuration' => 'DNS forward configuration',
+ 'dnsforward edit an entry' => 'Edit an existing entry:',
+ 'dnsforward entries' => 'Current entries:',
+ 'dnsforward forward_server' => 'Nameserver',
+ 'dnsforward zone' => 'Zone',
  'do not log this port list' => 'Drop this port list just before they are logged (reduces log size)',
  'dod' => 'Dial on Demand',
  'dod for dns' => 'Dial on Demand for DNS:',
@@@ -801,7 -808,6 +808,7 @@@
  'eg' => 'e.g.:',
  'email server can not be empty' => 'E-mail server can not be empty',
  'emailreportlevel' => 'E-mailreportlevel',
 +'emerging rules' => 'Emergingthreats.net Community Rules',
  'empty' => 'This field may be left blank',
  'empty profile' => 'empty',
  'enable ignore filter' => 'Enable ignore filter',