[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7fd560d81fb0041d292445fff194f40dd5dbbd23 - IPFire-SCM

16 Jan 2020

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
       via  7fd560d81fb0041d292445fff194f40dd5dbbd23 (commit)
       via  889388116048b44a1e3a8b28e2933af9191d34d5 (commit)
       via  dd5e20120e1fdd49106b3c3847e01c5a3be4aac5 (commit)
       via  c835011d6ec0018892ed1ee69e8e32c7b2c4dc64 (commit)
       via  f9f79c662c5ba57d2b297be2069f84fb9bd75e12 (commit)
       via  03d559964c6cee18533fbd6e414f9f70c13741e3 (commit)
       via  87bee81c561562c61324769313414fcff5704176 (commit)
       via  bcf318fbd0cde846c053d9d0a9c36f8ceda28d40 (commit)
       via  c919b15c34e6fd25dadd4990bf86f8709a084c37 (commit)
       via  b48379d5ba9ea0cdffe6c0994d43f7213b5a830b (commit)
      from  e4c19cc91c23fb9f08b2b993133565670312a8e0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7fd560d81fb0041d292445fff194f40dd5dbbd23
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Thu Jan 16 18:28:26 2020 +0000
core140: add lvm2 to core updater
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 889388116048b44a1e3a8b28e2933af9191d34d5
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Jan 15 15:20:12 2020 +0000
lvm2: Add initscript for lvmetad
This daemon needs to be launched in order to use LVM
    devices in IPFire.
It will run on all installations after this patch has been
    merged but only consumes very little memory.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit dd5e20120e1fdd49106b3c3847e01c5a3be4aac5
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Jan 15 15:20:11 2020 +0000
lvm2: Create lock files in /run/lvm
The default is /var/lock which is not mounted at the time
    when udev is initialising the volumes. Therefore after a
    reboot, LVM devices won't show up unless pvscan is executed
    manually.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit c835011d6ec0018892ed1ee69e8e32c7b2c4dc64
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Jan 15 15:20:10 2020 +0000
lvm2: Enable lvmetad
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit f9f79c662c5ba57d2b297be2069f84fb9bd75e12
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Jan 15 15:20:09 2020 +0000
lvm2: Build with support for udev
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 03d559964c6cee18533fbd6e414f9f70c13741e3
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Jan 15 15:20:08 2020 +0000
lvm2: Ship with core system
This was requested by some users to mount devices
    with LVM.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 87bee81c561562c61324769313414fcff5704176
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Jan 15 11:28:01 2020 +0000
Update list of contributors
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit bcf318fbd0cde846c053d9d0a9c36f8ceda28d40
Author: Stéphane Pautrel stephane.pautrel@gmail.com
Date:   Wed Jan 15 11:26:47 2020 +0000
Many improvements for the French translation
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit c919b15c34e6fd25dadd4990bf86f8709a084c37
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Thu Jan 16 17:18:13 2020 +0100
DNS: Defaults to use the ISP nameservers.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
    Reviewed-by: Michael Tremer michael.tremer@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit b48379d5ba9ea0cdffe6c0994d43f7213b5a830b
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Thu Jan 16 17:18:12 2020 +0100
configroot: Create /var/ipfire/dns/servers file
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
    Reviewed-by: Michael Tremer michael.tremer@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes:
 config/rootfiles/common/aarch64/initscripts        |   2 +
 config/rootfiles/common/armv5tel/initscripts       |   2 +
 config/rootfiles/common/configroot                 |   1 +
 config/rootfiles/common/i586/initscripts           |   2 +
 config/rootfiles/common/lvm2                       | 109 ++++++-------
 config/rootfiles/common/x86_64/initscripts         |   2 +
 config/rootfiles/core/140/filelists/files          |   2 +
 .../{oldcore/125 => core/140}/filelists/lvm2       |   0
 doc/language_issues.de                             |   6 +-
 doc/language_issues.en                             |  11 +-
 doc/language_issues.es                             |   7 +-
 doc/language_issues.fr                             |   6 +-
 doc/language_issues.it                             |   7 +-
 doc/language_issues.nl                             |   7 +-
 doc/language_issues.pl                             |   7 +-
 doc/language_issues.ru                             |   7 +-
 doc/language_issues.tr                             |   7 +-
 doc/language_missings                              |  38 +++++
 html/cgi-bin/credits.cgi                           |   4 +-
 langs/en/cgi-bin/en.pl                             |   2 +-
 langs/fr/cgi-bin/fr.pl                             | 169 +++++++++++----------
 lfs/configroot                                     |   3 +-
 lfs/initscripts                                    |   1 +
 lfs/lvm2                                           |   7 +-
 src/initscripts/{packages/monit => system/lvmetad} |  20 +--
 25 files changed, 264 insertions(+), 165 deletions(-)
 copy config/rootfiles/{oldcore/125 => core/140}/filelists/lvm2 (100%)
 copy src/initscripts/{packages/monit => system/lvmetad} (52%)
 mode change 100644 => 100755
Difference in files:

diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts
index 202da7372..ddf098ed4 100644
--- a/config/rootfiles/common/aarch64/initscripts
+++ b/config/rootfiles/common/aarch64/initscripts
@@ -26,6 +26,7 @@ etc/rc.d/init.d/functions
 etc/rc.d/init.d/halt
 etc/rc.d/init.d/ipsec
 etc/rc.d/init.d/leds
+etc/rc.d/init.d/lvmetad
 etc/rc.d/init.d/localnet
 etc/rc.d/init.d/modules
 etc/rc.d/init.d/mountfs
@@ -180,6 +181,7 @@ etc/rc.d/rc6.d/S99reboot
 etc/rc.d/rcsysinit.d/S00mountkernfs
 etc/rc.d/rcsysinit.d/S01sysctl
 etc/rc.d/rcsysinit.d/S05modules
+etc/rc.d/rcsysinit.d/S09lvmetad
 etc/rc.d/rcsysinit.d/S10udev
 etc/rc.d/rcsysinit.d/S19waitdrives
 etc/rc.d/rcsysinit.d/S20swap
diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts
index 202da7372..ddf098ed4 100644
--- a/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
@@ -26,6 +26,7 @@ etc/rc.d/init.d/functions
 etc/rc.d/init.d/halt
 etc/rc.d/init.d/ipsec
 etc/rc.d/init.d/leds
+etc/rc.d/init.d/lvmetad
 etc/rc.d/init.d/localnet
 etc/rc.d/init.d/modules
 etc/rc.d/init.d/mountfs
@@ -180,6 +181,7 @@ etc/rc.d/rc6.d/S99reboot
 etc/rc.d/rcsysinit.d/S00mountkernfs
 etc/rc.d/rcsysinit.d/S01sysctl
 etc/rc.d/rcsysinit.d/S05modules
+etc/rc.d/rcsysinit.d/S09lvmetad
 etc/rc.d/rcsysinit.d/S10udev
 etc/rc.d/rcsysinit.d/S19waitdrives
 etc/rc.d/rcsysinit.d/S20swap
diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index 56b0257bc..67c4abc75 100644
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -41,6 +41,7 @@ var/ipfire/dhcp
 var/ipfire/dhcpc
 var/ipfire/dns
 #var/ipfire/dns/settings
+#var/ipfire/dns/servers
 var/ipfire/dnsforward
 #var/ipfire/dnsforward/config
 var/ipfire/ethernet
diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts
index 9d4f7e5f3..e666ed84e 100644
--- a/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
@@ -26,6 +26,7 @@ etc/rc.d/init.d/functions
 etc/rc.d/init.d/halt
 etc/rc.d/init.d/ipsec
 etc/rc.d/init.d/leds
+etc/rc.d/init.d/lvmetad
 etc/rc.d/init.d/localnet
 etc/rc.d/init.d/modules
 etc/rc.d/init.d/mountfs
@@ -179,6 +180,7 @@ etc/rc.d/rc6.d/S99reboot
 etc/rc.d/rcsysinit.d/S00mountkernfs
 etc/rc.d/rcsysinit.d/S01sysctl
 etc/rc.d/rcsysinit.d/S05modules
+etc/rc.d/rcsysinit.d/S09lvmetad
 etc/rc.d/rcsysinit.d/S10udev
 etc/rc.d/rcsysinit.d/S19waitdrives
 etc/rc.d/rcsysinit.d/S20swap
diff --git a/config/rootfiles/common/lvm2 b/config/rootfiles/common/lvm2
index db7f304e5..258f3201f 100644
--- a/config/rootfiles/common/lvm2
+++ b/config/rootfiles/common/lvm2
@@ -1,5 +1,5 @@
 #etc/lvm
-#etc/lvm/lvm.conf
+etc/lvm/lvm.conf
 #etc/lvm/lvmlocal.conf
 #etc/lvm/profile
 #etc/lvm/profile/cache-mq.profile
@@ -9,60 +9,66 @@
 #etc/lvm/profile/metadata_profile_template.profile
 #etc/lvm/profile/thin-generic.profile
 #etc/lvm/profile/thin-performance.profile
+lib/udev/rules.d/10-dm.rules
+lib/udev/rules.d/11-dm-lvm.rules
+lib/udev/rules.d/13-dm-disk.rules
+lib/udev/rules.d/69-dm-lvm-metad.rules
+lib/udev/rules.d/95-dm-notify.rules
 #usr/include/libdevmapper.h
 #usr/lib/libdevmapper.so
 usr/lib/libdevmapper.so.1.02
 #usr/lib/pkgconfig/devmapper.pc
-#usr/sbin/blkdeactivate
-#usr/sbin/dmsetup
-#usr/sbin/dmstats
-#usr/sbin/fsadm
-#usr/sbin/lvchange
-#usr/sbin/lvconvert
-#usr/sbin/lvcreate
-#usr/sbin/lvdisplay
-#usr/sbin/lvextend
-#usr/sbin/lvm
-#usr/sbin/lvmconf
-#usr/sbin/lvmconfig
-#usr/sbin/lvmdiskscan
-#usr/sbin/lvmdump
-#usr/sbin/lvmsadc
-#usr/sbin/lvmsar
-#usr/sbin/lvreduce
-#usr/sbin/lvremove
-#usr/sbin/lvrename
-#usr/sbin/lvresize
-#usr/sbin/lvs
-#usr/sbin/lvscan
-#usr/sbin/pvchange
-#usr/sbin/pvck
-#usr/sbin/pvcreate
-#usr/sbin/pvdisplay
-#usr/sbin/pvmove
-#usr/sbin/pvremove
-#usr/sbin/pvresize
-#usr/sbin/pvs
-#usr/sbin/pvscan
-#usr/sbin/vgcfgbackup
-#usr/sbin/vgcfgrestore
-#usr/sbin/vgchange
-#usr/sbin/vgck
-#usr/sbin/vgconvert
-#usr/sbin/vgcreate
-#usr/sbin/vgdisplay
-#usr/sbin/vgexport
-#usr/sbin/vgextend
-#usr/sbin/vgimport
-#usr/sbin/vgimportclone
-#usr/sbin/vgmerge
-#usr/sbin/vgmknodes
-#usr/sbin/vgreduce
-#usr/sbin/vgremove
-#usr/sbin/vgrename
-#usr/sbin/vgs
-#usr/sbin/vgscan
-#usr/sbin/vgsplit
+usr/sbin/blkdeactivate
+usr/sbin/dmsetup
+usr/sbin/dmstats
+usr/sbin/fsadm
+usr/sbin/lvchange
+usr/sbin/lvconvert
+usr/sbin/lvcreate
+usr/sbin/lvdisplay
+usr/sbin/lvextend
+usr/sbin/lvm
+usr/sbin/lvmconf
+usr/sbin/lvmconfig
+usr/sbin/lvmdiskscan
+usr/sbin/lvmdump
+usr/sbin/lvmetad
+usr/sbin/lvmsadc
+usr/sbin/lvmsar
+usr/sbin/lvreduce
+usr/sbin/lvremove
+usr/sbin/lvrename
+usr/sbin/lvresize
+usr/sbin/lvs
+usr/sbin/lvscan
+usr/sbin/pvchange
+usr/sbin/pvck
+usr/sbin/pvcreate
+usr/sbin/pvdisplay
+usr/sbin/pvmove
+usr/sbin/pvremove
+usr/sbin/pvresize
+usr/sbin/pvs
+usr/sbin/pvscan
+usr/sbin/vgcfgbackup
+usr/sbin/vgcfgrestore
+usr/sbin/vgchange
+usr/sbin/vgck
+usr/sbin/vgconvert
+usr/sbin/vgcreate
+usr/sbin/vgdisplay
+usr/sbin/vgexport
+usr/sbin/vgextend
+usr/sbin/vgimport
+usr/sbin/vgimportclone
+usr/sbin/vgmerge
+usr/sbin/vgmknodes
+usr/sbin/vgreduce
+usr/sbin/vgremove
+usr/sbin/vgrename
+usr/sbin/vgs
+usr/sbin/vgscan
+usr/sbin/vgsplit
 #usr/share/man/man5/lvm.conf.5
 #usr/share/man/man7/lvmcache.7
 #usr/share/man/man7/lvmraid.7
@@ -87,6 +93,7 @@ usr/lib/libdevmapper.so.1.02
 #usr/share/man/man8/lvmconfig.8
 #usr/share/man/man8/lvmdiskscan.8
 #usr/share/man/man8/lvmdump.8
+#usr/share/man/man8/lvmetad.8
 #usr/share/man/man8/lvmsadc.8
 #usr/share/man/man8/lvmsar.8
 #usr/share/man/man8/lvreduce.8
diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts
index 9d4f7e5f3..e666ed84e 100644
--- a/config/rootfiles/common/x86_64/initscripts
+++ b/config/rootfiles/common/x86_64/initscripts
@@ -26,6 +26,7 @@ etc/rc.d/init.d/functions
 etc/rc.d/init.d/halt
 etc/rc.d/init.d/ipsec
 etc/rc.d/init.d/leds
+etc/rc.d/init.d/lvmetad
 etc/rc.d/init.d/localnet
 etc/rc.d/init.d/modules
 etc/rc.d/init.d/mountfs
@@ -179,6 +180,7 @@ etc/rc.d/rc6.d/S99reboot
 etc/rc.d/rcsysinit.d/S00mountkernfs
 etc/rc.d/rcsysinit.d/S01sysctl
 etc/rc.d/rcsysinit.d/S05modules
+etc/rc.d/rcsysinit.d/S09lvmetad
 etc/rc.d/rcsysinit.d/S10udev
 etc/rc.d/rcsysinit.d/S19waitdrives
 etc/rc.d/rcsysinit.d/S20swap
diff --git a/config/rootfiles/core/140/filelists/files b/config/rootfiles/core/140/filelists/files
index 4cb92f0d3..c4d07f279 100644
--- a/config/rootfiles/core/140/filelists/files
+++ b/config/rootfiles/core/140/filelists/files
@@ -2,11 +2,13 @@ etc/system-release
 etc/issue
 srv/web/ipfire/cgi-bin/credits.cgi
 var/ipfire/langs
+etc/rc.d/init.d/lvmetad
 etc/rc.d/init.d/networking/dhcpcd.exe
 etc/rc.d/init.d/networking/red
 etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders
 etc/rc.d/init.d/unbound
 etc/rc.d/init.d/suricata
+etc/rc.d/rcsysinit.d/S09lvmetad
 etc/ppp/ip-down
 etc/ppp/ip-up
 etc/unbound/unbound.conf
diff --git a/config/rootfiles/core/140/filelists/lvm2 b/config/rootfiles/core/140/filelists/lvm2
new file mode 120000
index 000000000..d640870b7
--- /dev/null
+++ b/config/rootfiles/core/140/filelists/lvm2
@@ -0,0 +1 @@
+../../../common/lvm2
\ No newline at end of file
diff --git a/doc/language_issues.de b/doc/language_issues.de
index d3539dd98..89a703fcb 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -219,6 +219,7 @@ WARNING: translation string unused: dns new 1
 WARNING: translation string unused: dns saved
 WARNING: translation string unused: dns saved txt
 WARNING: translation string unused: dns server
+WARNING: translation string unused: dns servers
 WARNING: translation string unused: dnssec information
 WARNING: translation string unused: do not log this port list
 WARNING: translation string unused: domain not set
@@ -777,11 +778,13 @@ WARNING: untranslated string: dangerous = Dangerous
 WARNING: untranslated string: dead peer detection = Dead Peer Detection
 WARNING: untranslated string: default IP address = Default IP Address
 WARNING: untranslated string: dns = unknown string
+WARNING: untranslated string: dns check servers = Check DNS Servers
 WARNING: untranslated string: dns configuration = DNS Configuration
-WARNING: untranslated string: dns could not add server = Could not add server - Reason:
 WARNING: untranslated string: dns enable safe-search = Enable Safe Search
 WARNING: untranslated string: dns isp assigned nameserver = ISP-assigned DNS server
+WARNING: untranslated string: dns isp nameservers and tls not allowed = ISP-assigned DNS servers and TLS cannot be used at the same time.
 WARNING: untranslated string: dns mode for qname minimisation = QNAME Minimisation
+WARNING: untranslated string: dns no address given = No IP Address given.
 WARNING: untranslated string: dns no tls hostname given = No TLS hostname given.
 WARNING: untranslated string: dns tls hostname = TLS Hostname
 WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers
@@ -835,3 +838,4 @@ WARNING: untranslated string: standard = Standard
 WARNING: untranslated string: strict = Strict
 WARNING: untranslated string: taa zombieload2 = TSX Async Abort / ZombieLoad v2
 WARNING: untranslated string: vpn statistics n2n = unknown string
+WARNING: untranslated string: working = Working
diff --git a/doc/language_issues.en b/doc/language_issues.en
index eea6a9b7c..4986317f8 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -610,16 +610,17 @@ WARNING: untranslated string: dmz = DMZ
 WARNING: untranslated string: dnat address = Firewall Interface
 WARNING: untranslated string: dns = unknown string
 WARNING: untranslated string: dns check failed = DNS check failed
+WARNING: untranslated string: dns check servers = Check DNS Servers
 WARNING: untranslated string: dns configuration = DNS Configuration
-WARNING: untranslated string: dns could not add server = Could not add server - Reason:
 WARNING: untranslated string: dns enable safe-search = Enable Safe Search
 WARNING: untranslated string: dns forward disable dnssec = Disable DNSSEC (dangerous)
 WARNING: untranslated string: dns forwarding dnssec disabled notice = (DNSSEC disabled)
 WARNING: untranslated string: dns isp assigned nameserver = ISP-assigned DNS server
+WARNING: untranslated string: dns isp nameservers and tls not allowed = ISP-assigned DNS servers and TLS cannot be used at the same time.
 WARNING: untranslated string: dns mode for qname minimisation = QNAME Minimisation
+WARNING: untranslated string: dns no address given = No IP Address given.
 WARNING: untranslated string: dns no tls hostname given = No TLS hostname given.
 WARNING: untranslated string: dns proxy server = DNS Proxy Server
-WARNING: untranslated string: dns servers = DNS Servers
 WARNING: untranslated string: dns title = Domain Name System
 WARNING: untranslated string: dns tls hostname = TLS Hostname
 WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers
@@ -1028,7 +1029,7 @@ WARNING: untranslated string: host deny = list with denied hosts
 WARNING: untranslated string: host ip = Host IP address
 WARNING: untranslated string: host to net vpn = Host-to-Net Virtual Private Network (RoadWarrior)
 WARNING: untranslated string: hostname = Hostname
-WARNING: untranslated string: hostname cant be empty = Hostname can't be empty.
+WARNING: untranslated string: hostname cant be empty = Hostname cannot be empty.
 WARNING: untranslated string: hostname not set = Hostname not set.
 WARNING: untranslated string: hosts config added = Hosts config added
 WARNING: untranslated string: hosts config changed = Hosts config changed
@@ -2104,7 +2105,8 @@ WARNING: untranslated string: vpn start action start = Always On
 WARNING: untranslated string: vpn statistic n2n = VPN: Net-to-Net Statistics
 WARNING: untranslated string: vpn statistic rw = VPN: Roadwarrior Statistics
 WARNING: untranslated string: vpn statistics n2n = unknown string
-WARNING: untranslated string: vpn subjectaltname = Subject Alt Name
+WARNING: untranslated string: vpn subjectaltname = SubjectAlternativeName
+WARNING: untranslated string: vpn subjectaltname missing = SubjectAlternativeName cannot be emtpy.
 WARNING: untranslated string: vpn wait = WAITING
 WARNING: untranslated string: vpn weak = Weak
 WARNING: untranslated string: vulnerability = Vulnerability
@@ -2202,6 +2204,7 @@ WARNING: untranslated string: wlanap wlan settings = WLan Settings
 WARNING: untranslated string: wlanap wlan status = WLan Status
 WARNING: untranslated string: wol wakeup = WakeUp
 WARNING: untranslated string: workgroup = Workgroup
+WARNING: untranslated string: working = Working
 WARNING: untranslated string: written bytes = Bytes Written
 WARNING: untranslated string: year = Year
 WARNING: untranslated string: yes = Yes
diff --git a/doc/language_issues.es b/doc/language_issues.es
index 0c9853d12..4ea707702 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -822,15 +822,16 @@ WARNING: untranslated string: dhcp dns update secret = Secret
 WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip)
 WARNING: untranslated string: dnat address = Firewall Interface
 WARNING: untranslated string: dns = unknown string
+WARNING: untranslated string: dns check servers = Check DNS Servers
 WARNING: untranslated string: dns configuration = DNS Configuration
-WARNING: untranslated string: dns could not add server = Could not add server - Reason:
 WARNING: untranslated string: dns enable safe-search = Enable Safe Search
 WARNING: untranslated string: dns forward disable dnssec = Disable DNSSEC (dangerous)
 WARNING: untranslated string: dns forwarding dnssec disabled notice = (DNSSEC disabled)
 WARNING: untranslated string: dns isp assigned nameserver = ISP-assigned DNS server
+WARNING: untranslated string: dns isp nameservers and tls not allowed = ISP-assigned DNS servers and TLS cannot be used at the same time.
 WARNING: untranslated string: dns mode for qname minimisation = QNAME Minimisation
+WARNING: untranslated string: dns no address given = No IP Address given.
 WARNING: untranslated string: dns no tls hostname given = No TLS hostname given.
-WARNING: untranslated string: dns servers = DNS Servers
 WARNING: untranslated string: dns tls hostname = TLS Hostname
 WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers
 WARNING: untranslated string: dns use protocol for dns queries = Protocol for DNS queries
@@ -1362,6 +1363,7 @@ WARNING: untranslated string: vpn start action start = Always On
 WARNING: untranslated string: vpn statistic n2n = VPN: Net-to-Net Statistics
 WARNING: untranslated string: vpn statistic rw = VPN: Roadwarrior Statistics
 WARNING: untranslated string: vpn statistics n2n = unknown string
+WARNING: untranslated string: vpn subjectaltname missing = SubjectAlternativeName cannot be emtpy.
 WARNING: untranslated string: vpn wait = WAITING
 WARNING: untranslated string: vpn weak = Weak
 WARNING: untranslated string: vulnerability = Vulnerability
@@ -1422,5 +1424,6 @@ WARNING: untranslated string: wlanap management frame protection = Management Fr
 WARNING: untranslated string: wlanap neighbor scan = Neighborhood scan
 WARNING: untranslated string: wlanap neighbor scan warning = Warning! Disabling may violate regulatory rules!
 WARNING: untranslated string: wlanap ssid = SSID
+WARNING: untranslated string: working = Working
 WARNING: untranslated string: zoneconf notice reboot = Please reboot to apply your changes.
 WARNING: untranslated string: zoneconf title = Zone Configuration
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index c600be801..f5f67243a 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -243,6 +243,7 @@ WARNING: translation string unused: dns new 1
 WARNING: translation string unused: dns saved
 WARNING: translation string unused: dns saved txt
 WARNING: translation string unused: dns server
+WARNING: translation string unused: dns servers
 WARNING: translation string unused: dnssec information
 WARNING: translation string unused: do not log this port list
 WARNING: translation string unused: domain not set
@@ -812,11 +813,13 @@ WARNING: untranslated string: Scan for Songs = unknown string
 WARNING: untranslated string: broken = Broken
 WARNING: untranslated string: bytes = unknown string
 WARNING: untranslated string: dns = unknown string
+WARNING: untranslated string: dns check servers = Check DNS Servers
 WARNING: untranslated string: dns configuration = DNS Configuration
-WARNING: untranslated string: dns could not add server = Could not add server - Reason:
 WARNING: untranslated string: dns enable safe-search = Enable Safe Search
 WARNING: untranslated string: dns isp assigned nameserver = ISP-assigned DNS server
+WARNING: untranslated string: dns isp nameservers and tls not allowed = ISP-assigned DNS servers and TLS cannot be used at the same time.
 WARNING: untranslated string: dns mode for qname minimisation = QNAME Minimisation
+WARNING: untranslated string: dns no address given = No IP Address given.
 WARNING: untranslated string: dns no tls hostname given = No TLS hostname given.
 WARNING: untranslated string: dns tls hostname = TLS Hostname
 WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers
@@ -864,3 +867,4 @@ WARNING: untranslated string: routing table = unknown string
 WARNING: untranslated string: standard = Standard
 WARNING: untranslated string: strict = Strict
 WARNING: untranslated string: vpn statistics n2n = unknown string
+WARNING: untranslated string: working = Working
diff --git a/doc/language_issues.it b/doc/language_issues.it
index 96feb3a3e..b83cdde9a 100644
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -220,6 +220,7 @@ WARNING: translation string unused: dns new 1
 WARNING: translation string unused: dns saved
 WARNING: translation string unused: dns saved txt
 WARNING: translation string unused: dns server
+WARNING: translation string unused: dns servers
 WARNING: translation string unused: dnsforward forward_server
 WARNING: translation string unused: dnssec information
 WARNING: translation string unused: do not log this port list
@@ -844,13 +845,15 @@ WARNING: untranslated string: dhcp dns update algo = Algorithm
 WARNING: untranslated string: dhcp dns update secret = Secret
 WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip)
 WARNING: untranslated string: dns = unknown string
+WARNING: untranslated string: dns check servers = Check DNS Servers
 WARNING: untranslated string: dns configuration = DNS Configuration
-WARNING: untranslated string: dns could not add server = Could not add server - Reason:
 WARNING: untranslated string: dns enable safe-search = Enable Safe Search
 WARNING: untranslated string: dns forward disable dnssec = Disable DNSSEC (dangerous)
 WARNING: untranslated string: dns forwarding dnssec disabled notice = (DNSSEC disabled)
 WARNING: untranslated string: dns isp assigned nameserver = ISP-assigned DNS server
+WARNING: untranslated string: dns isp nameservers and tls not allowed = ISP-assigned DNS servers and TLS cannot be used at the same time.
 WARNING: untranslated string: dns mode for qname minimisation = QNAME Minimisation
+WARNING: untranslated string: dns no address given = No IP Address given.
 WARNING: untranslated string: dns no tls hostname given = No TLS hostname given.
 WARNING: untranslated string: dns tls hostname = TLS Hostname
 WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers
@@ -1065,6 +1068,7 @@ WARNING: untranslated string: vpn start action start = Always On
 WARNING: untranslated string: vpn statistic n2n = VPN: Net-to-Net Statistics
 WARNING: untranslated string: vpn statistic rw = VPN: Roadwarrior Statistics
 WARNING: untranslated string: vpn statistics n2n = unknown string
+WARNING: untranslated string: vpn subjectaltname missing = SubjectAlternativeName cannot be emtpy.
 WARNING: untranslated string: vpn wait = WAITING
 WARNING: untranslated string: vpn weak = Weak
 WARNING: untranslated string: vulnerability = Vulnerability
@@ -1093,5 +1097,6 @@ WARNING: untranslated string: wlanap management frame protection = Management Fr
 WARNING: untranslated string: wlanap neighbor scan = Neighborhood scan
 WARNING: untranslated string: wlanap neighbor scan warning = Warning! Disabling may violate regulatory rules!
 WARNING: untranslated string: wlanap ssid = SSID
+WARNING: untranslated string: working = Working
 WARNING: untranslated string: zoneconf notice reboot = Please reboot to apply your changes.
 WARNING: untranslated string: zoneconf title = Zone Configuration
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index ab7c2e81e..003c9b6fe 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -845,15 +845,16 @@ WARNING: untranslated string: dhcp dns update algo = Algorithm
 WARNING: untranslated string: dhcp dns update secret = Secret
 WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip)
 WARNING: untranslated string: dns = unknown string
+WARNING: untranslated string: dns check servers = Check DNS Servers
 WARNING: untranslated string: dns configuration = DNS Configuration
-WARNING: untranslated string: dns could not add server = Could not add server - Reason:
 WARNING: untranslated string: dns enable safe-search = Enable Safe Search
 WARNING: untranslated string: dns forward disable dnssec = Disable DNSSEC (dangerous)
 WARNING: untranslated string: dns forwarding dnssec disabled notice = (DNSSEC disabled)
 WARNING: untranslated string: dns isp assigned nameserver = ISP-assigned DNS server
+WARNING: untranslated string: dns isp nameservers and tls not allowed = ISP-assigned DNS servers and TLS cannot be used at the same time.
 WARNING: untranslated string: dns mode for qname minimisation = QNAME Minimisation
+WARNING: untranslated string: dns no address given = No IP Address given.
 WARNING: untranslated string: dns no tls hostname given = No TLS hostname given.
-WARNING: untranslated string: dns servers = DNS Servers
 WARNING: untranslated string: dns tls hostname = TLS Hostname
 WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers
 WARNING: untranslated string: dns use protocol for dns queries = Protocol for DNS queries
@@ -1107,6 +1108,7 @@ WARNING: untranslated string: vpn start action start = Always On
 WARNING: untranslated string: vpn statistic n2n = VPN: Net-to-Net Statistics
 WARNING: untranslated string: vpn statistic rw = VPN: Roadwarrior Statistics
 WARNING: untranslated string: vpn statistics n2n = unknown string
+WARNING: untranslated string: vpn subjectaltname missing = SubjectAlternativeName cannot be emtpy.
 WARNING: untranslated string: vpn wait = WAITING
 WARNING: untranslated string: vpn weak = Weak
 WARNING: untranslated string: vulnerability = Vulnerability
@@ -1135,5 +1137,6 @@ WARNING: untranslated string: wlanap management frame protection = Management Fr
 WARNING: untranslated string: wlanap neighbor scan = Neighborhood scan
 WARNING: untranslated string: wlanap neighbor scan warning = Warning! Disabling may violate regulatory rules!
 WARNING: untranslated string: wlanap ssid = SSID
+WARNING: untranslated string: working = Working
 WARNING: untranslated string: zoneconf notice reboot = Please reboot to apply your changes.
 WARNING: untranslated string: zoneconf title = Zone Configuration
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 0c9853d12..4ea707702 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -822,15 +822,16 @@ WARNING: untranslated string: dhcp dns update secret = Secret
 WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip)
 WARNING: untranslated string: dnat address = Firewall Interface
 WARNING: untranslated string: dns = unknown string
+WARNING: untranslated string: dns check servers = Check DNS Servers
 WARNING: untranslated string: dns configuration = DNS Configuration
-WARNING: untranslated string: dns could not add server = Could not add server - Reason:
 WARNING: untranslated string: dns enable safe-search = Enable Safe Search
 WARNING: untranslated string: dns forward disable dnssec = Disable DNSSEC (dangerous)
 WARNING: untranslated string: dns forwarding dnssec disabled notice = (DNSSEC disabled)
 WARNING: untranslated string: dns isp assigned nameserver = ISP-assigned DNS server
+WARNING: untranslated string: dns isp nameservers and tls not allowed = ISP-assigned DNS servers and TLS cannot be used at the same time.
 WARNING: untranslated string: dns mode for qname minimisation = QNAME Minimisation
+WARNING: untranslated string: dns no address given = No IP Address given.
 WARNING: untranslated string: dns no tls hostname given = No TLS hostname given.
-WARNING: untranslated string: dns servers = DNS Servers
 WARNING: untranslated string: dns tls hostname = TLS Hostname
 WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers
 WARNING: untranslated string: dns use protocol for dns queries = Protocol for DNS queries
@@ -1362,6 +1363,7 @@ WARNING: untranslated string: vpn start action start = Always On
 WARNING: untranslated string: vpn statistic n2n = VPN: Net-to-Net Statistics
 WARNING: untranslated string: vpn statistic rw = VPN: Roadwarrior Statistics
 WARNING: untranslated string: vpn statistics n2n = unknown string
+WARNING: untranslated string: vpn subjectaltname missing = SubjectAlternativeName cannot be emtpy.
 WARNING: untranslated string: vpn wait = WAITING
 WARNING: untranslated string: vpn weak = Weak
 WARNING: untranslated string: vulnerability = Vulnerability
@@ -1422,5 +1424,6 @@ WARNING: untranslated string: wlanap management frame protection = Management Fr
 WARNING: untranslated string: wlanap neighbor scan = Neighborhood scan
 WARNING: untranslated string: wlanap neighbor scan warning = Warning! Disabling may violate regulatory rules!
 WARNING: untranslated string: wlanap ssid = SSID
+WARNING: untranslated string: working = Working
 WARNING: untranslated string: zoneconf notice reboot = Please reboot to apply your changes.
 WARNING: untranslated string: zoneconf title = Zone Configuration
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index dfea6d4cd..b783639a0 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -826,15 +826,16 @@ WARNING: untranslated string: disk access per = Disk Access per
 WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip)
 WARNING: untranslated string: dnat address = Firewall Interface
 WARNING: untranslated string: dns = unknown string
+WARNING: untranslated string: dns check servers = Check DNS Servers
 WARNING: untranslated string: dns configuration = DNS Configuration
-WARNING: untranslated string: dns could not add server = Could not add server - Reason:
 WARNING: untranslated string: dns enable safe-search = Enable Safe Search
 WARNING: untranslated string: dns forward disable dnssec = Disable DNSSEC (dangerous)
 WARNING: untranslated string: dns forwarding dnssec disabled notice = (DNSSEC disabled)
 WARNING: untranslated string: dns isp assigned nameserver = ISP-assigned DNS server
+WARNING: untranslated string: dns isp nameservers and tls not allowed = ISP-assigned DNS servers and TLS cannot be used at the same time.
 WARNING: untranslated string: dns mode for qname minimisation = QNAME Minimisation
+WARNING: untranslated string: dns no address given = No IP Address given.
 WARNING: untranslated string: dns no tls hostname given = No TLS hostname given.
-WARNING: untranslated string: dns servers = DNS Servers
 WARNING: untranslated string: dns tls hostname = TLS Hostname
 WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers
 WARNING: untranslated string: dns use protocol for dns queries = Protocol for DNS queries
@@ -1357,6 +1358,7 @@ WARNING: untranslated string: vpn start action start = Always On
 WARNING: untranslated string: vpn statistic n2n = VPN: Net-to-Net Statistics
 WARNING: untranslated string: vpn statistic rw = VPN: Roadwarrior Statistics
 WARNING: untranslated string: vpn statistics n2n = unknown string
+WARNING: untranslated string: vpn subjectaltname missing = SubjectAlternativeName cannot be emtpy.
 WARNING: untranslated string: vpn wait = WAITING
 WARNING: untranslated string: vpn weak = Weak
 WARNING: untranslated string: vulnerability = Vulnerability
@@ -1417,5 +1419,6 @@ WARNING: untranslated string: wlanap management frame protection = Management Fr
 WARNING: untranslated string: wlanap neighbor scan = Neighborhood scan
 WARNING: untranslated string: wlanap neighbor scan warning = Warning! Disabling may violate regulatory rules!
 WARNING: untranslated string: wlanap ssid = SSID
+WARNING: untranslated string: working = Working
 WARNING: untranslated string: zoneconf notice reboot = Please reboot to apply your changes.
 WARNING: untranslated string: zoneconf title = Zone Configuration
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index a65712e9f..08702c67d 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -242,6 +242,7 @@ WARNING: translation string unused: dns new 1
 WARNING: translation string unused: dns saved
 WARNING: translation string unused: dns saved txt
 WARNING: translation string unused: dns server
+WARNING: translation string unused: dns servers
 WARNING: translation string unused: dnsforward forward_server
 WARNING: translation string unused: dnssec information
 WARNING: translation string unused: do not log this port list
@@ -821,13 +822,15 @@ WARNING: untranslated string: crypto warning = Cryptographic warning
 WARNING: untranslated string: dangerous = Dangerous
 WARNING: untranslated string: default IP address = Default IP Address
 WARNING: untranslated string: dns = unknown string
+WARNING: untranslated string: dns check servers = Check DNS Servers
 WARNING: untranslated string: dns configuration = DNS Configuration
-WARNING: untranslated string: dns could not add server = Could not add server - Reason:
 WARNING: untranslated string: dns enable safe-search = Enable Safe Search
 WARNING: untranslated string: dns forward disable dnssec = Disable DNSSEC (dangerous)
 WARNING: untranslated string: dns forwarding dnssec disabled notice = (DNSSEC disabled)
 WARNING: untranslated string: dns isp assigned nameserver = ISP-assigned DNS server
+WARNING: untranslated string: dns isp nameservers and tls not allowed = ISP-assigned DNS servers and TLS cannot be used at the same time.
 WARNING: untranslated string: dns mode for qname minimisation = QNAME Minimisation
+WARNING: untranslated string: dns no address given = No IP Address given.
 WARNING: untranslated string: dns no tls hostname given = No TLS hostname given.
 WARNING: untranslated string: dns tls hostname = TLS Hostname
 WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers
@@ -946,6 +949,7 @@ WARNING: untranslated string: transport mode does not support vti = VTI is not s
 WARNING: untranslated string: update ruleset = Update ruleset
 WARNING: untranslated string: vpn start action add = Wait for connection initiation
 WARNING: untranslated string: vpn statistics n2n = unknown string
+WARNING: untranslated string: vpn subjectaltname missing = SubjectAlternativeName cannot be emtpy.
 WARNING: untranslated string: vpn wait = WAITING
 WARNING: untranslated string: vulnerability = Vulnerability
 WARNING: untranslated string: vulnerable = Vulnerable
@@ -956,5 +960,6 @@ WARNING: untranslated string: wlanap management frame protection = Management Fr
 WARNING: untranslated string: wlanap neighbor scan = Neighborhood scan
 WARNING: untranslated string: wlanap neighbor scan warning = Warning! Disabling may violate regulatory rules!
 WARNING: untranslated string: wlanap ssid = SSID
+WARNING: untranslated string: working = Working
 WARNING: untranslated string: zoneconf notice reboot = Please reboot to apply your changes.
 WARNING: untranslated string: zoneconf title = Zone Configuration
diff --git a/doc/language_missings b/doc/language_missings
index 6283a5ed4..379eb9f61 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -36,11 +36,14 @@
 < dhcp server disabled on blue interface
 < dhcp server enabled on blue interface
 < dh name is invalid
+< dns check servers
 < dns configuration
 < dns could not add server
 < dns enable safe-search
 < dns isp assigned nameserver
+< dns isp nameservers and tls not allowed
 < dns mode for qname minimisation
+< dns no address given
 < dns no tls hostname given
 < dns tls hostname
 < dns use isp assigned nameservers
@@ -74,6 +77,7 @@
 < updxlrtr used by
 < upload fcdsl.o
 < vpn configuration main
+< working
 ############################################################################
 # Checking cgi-bin translations for language: es                           #
 ############################################################################
@@ -240,6 +244,7 @@
 < Disabled
 < dl client arch insecure
 < dnat address
+< dns check servers
 < dns configuration
 < dns could not add server
 < dns enable safe-search
@@ -254,7 +259,9 @@
 < dns forwarding dnssec disabled notice
 < dnsforward zone
 < dns isp assigned nameserver
+< dns isp nameservers and tls not allowed
 < dns mode for qname minimisation
+< dns no address given
 < dns no tls hostname given
 < dnssec aware
 < dnssec disabled warning
@@ -838,6 +845,7 @@
 < vpn start action start
 < vpn statistic n2n
 < vpn statistic rw
+< vpn subjectaltname missing
 < vpn wait
 < vpn weak
 < vulnerability
@@ -899,6 +907,7 @@
 < wlan client wpa mode ccmp ccmp
 < wlan client wpa mode ccmp tkip
 < wlan client wpa mode tkip tkip
+< working
 < zoneconf access native
 < zoneconf access none
 < zoneconf access vlan
@@ -917,11 +926,14 @@
 # Checking cgi-bin translations for language: fr                           #
 ############################################################################
 < broken
+< dns check servers
 < dns configuration
 < dns could not add server
 < dns enable safe-search
 < dns isp assigned nameserver
+< dns isp nameservers and tls not allowed
 < dns mode for qname minimisation
+< dns no address given
 < dns no tls hostname given
 < dns tls hostname
 < dns use isp assigned nameservers
@@ -930,6 +942,7 @@
 < okay
 < standard
 < strict
+< working
 ############################################################################
 # Checking cgi-bin translations for language: it                           #
 ############################################################################
@@ -1020,6 +1033,7 @@
 < dhcp dns update secret
 < Disabled
 < dl client arch insecure
+< dns check servers
 < dns configuration
 < dns could not add server
 < dns enable safe-search
@@ -1028,7 +1042,9 @@
 < dnsforward forward_servers
 < dns forwarding dnssec disabled notice
 < dns isp assigned nameserver
+< dns isp nameservers and tls not allowed
 < dns mode for qname minimisation
+< dns no address given
 < dns no tls hostname given
 < dnssec disabled warning
 < dns tls hostname
@@ -1215,6 +1231,7 @@
 < vpn start action start
 < vpn statistic n2n
 < vpn statistic rw
+< vpn subjectaltname missing
 < vpn wait
 < vpn weak
 < vulnerability
@@ -1244,6 +1261,7 @@
 < wlan client password
 < wlan client tls cipher
 < wlan client tls version
+< working
 < zoneconf access native
 < zoneconf access none
 < zoneconf access vlan
@@ -1358,6 +1376,7 @@
 < dh parameter
 < Disabled
 < dl client arch insecure
+< dns check servers
 < dns configuration
 < dns could not add server
 < dns enable safe-search
@@ -1366,7 +1385,9 @@
 < dnsforward forward_servers
 < dns forwarding dnssec disabled notice
 < dns isp assigned nameserver
+< dns isp nameservers and tls not allowed
 < dns mode for qname minimisation
+< dns no address given
 < dns no tls hostname given
 < dnssec aware
 < dnssec disabled warning
@@ -1600,6 +1621,7 @@
 < vpn start action start
 < vpn statistic n2n
 < vpn statistic rw
+< vpn subjectaltname missing
 < vpn wait
 < vpn weak
 < vulnerability
@@ -1629,6 +1651,7 @@
 < wlan client password
 < wlan client tls cipher
 < wlan client tls version
+< working
 < zoneconf access native
 < zoneconf access none
 < zoneconf access vlan
@@ -1809,6 +1832,7 @@
 < Disabled
 < dl client arch insecure
 < dnat address
+< dns check servers
 < dns configuration
 < dns could not add server
 < dns enable safe-search
@@ -1823,7 +1847,9 @@
 < dns forwarding dnssec disabled notice
 < dnsforward zone
 < dns isp assigned nameserver
+< dns isp nameservers and tls not allowed
 < dns mode for qname minimisation
+< dns no address given
 < dns no tls hostname given
 < dnssec aware
 < dnssec disabled warning
@@ -2393,6 +2419,7 @@
 < vpn start action start
 < vpn statistic n2n
 < vpn statistic rw
+< vpn subjectaltname missing
 < vpn wait
 < vpn weak
 < vulnerability
@@ -2454,6 +2481,7 @@
 < wlan client wpa mode ccmp ccmp
 < wlan client wpa mode ccmp tkip
 < wlan client wpa mode tkip tkip
+< working
 < zoneconf access native
 < zoneconf access none
 < zoneconf access vlan
@@ -2637,6 +2665,7 @@
 < disk access per
 < dl client arch insecure
 < dnat address
+< dns check servers
 < dns configuration
 < dns could not add server
 < dns enable safe-search
@@ -2651,7 +2680,9 @@
 < dns forwarding dnssec disabled notice
 < dnsforward zone
 < dns isp assigned nameserver
+< dns isp nameservers and tls not allowed
 < dns mode for qname minimisation
+< dns no address given
 < dns no tls hostname given
 < dnssec aware
 < dnssec disabled warning
@@ -3223,6 +3254,7 @@
 < vpn start action start
 < vpn statistic n2n
 < vpn statistic rw
+< vpn subjectaltname missing
 < vpn wait
 < vpn weak
 < vulnerability
@@ -3285,6 +3317,7 @@
 < wlan client wpa mode ccmp ccmp
 < wlan client wpa mode ccmp tkip
 < wlan client wpa mode tkip tkip
+< working
 < year-graph
 < zoneconf access native
 < zoneconf access none
@@ -3320,6 +3353,7 @@
 < dangerous
 < default IP address
 < Disabled
+< dns check servers
 < dns configuration
 < dns could not add server
 < dns enable safe-search
@@ -3328,7 +3362,9 @@
 < dnsforward forward_servers
 < dns forwarding dnssec disabled notice
 < dns isp assigned nameserver
+< dns isp nameservers and tls not allowed
 < dns mode for qname minimisation
+< dns no address given
 < dns no tls hostname given
 < dns tls hostname
 < dns use isp assigned nameservers
@@ -3409,6 +3445,7 @@
 < transport mode does not support vti
 < update ruleset
 < vpn start action add
+< vpn subjectaltname missing
 < vpn wait
 < vulnerability
 < vulnerable
@@ -3420,6 +3457,7 @@
 < wlanap neighbor scan
 < wlanap neighbor scan warning
 < wlanap ssid
+< working
 < zoneconf access native
 < zoneconf access none
 < zoneconf access vlan
diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index a132b0a4a..6eb7f1e49 100644
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -66,8 +66,8 @@ Christian Schmidt,
 Alexander Marx,
 Stefan Schantl,
 Matthias Fischer,
-Jan Paul Tücking,
 Peter Müller,
+Jan Paul Tücking,
 Jonatan Schlag,
 Erik Kapfer,
 Dirk Wagner,
@@ -86,11 +86,11 @@ Stephan Feddersen,
 Joern-Ingo Weigert,
 Alexander Koch,
 Wolfgang Apolinarski,
+Stéphane Pautrel,
 Alfred Haas,
 Lars Schuhmacher,
 Rene Zingel,
 Sascha Kilian,
-Stéphane Pautrel,
 Ronald Wiesinger,
 Florian Bührle,
 Bernhard Bitsch,
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index cec76c8db..c0a69cffe 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -852,8 +852,8 @@
 'dns forward disable dnssec' => 'Disable DNSSEC (dangerous)',
 'dns forwarding dnssec disabled notice' => '(DNSSEC disabled)',
 'dns header' => 'Assign DNS server addresses only for DHCP on red0',
-'dns isp nameservers and tls not allowed' => 'ISP-assigned DNS servers and TLS cannot be used at the same time.',
 'dns isp assigned nameserver' => 'ISP-assigned DNS server',
+'dns isp nameservers and tls not allowed' => 'ISP-assigned DNS servers and TLS cannot be used at the same time.',
 'dns list' => 'List of free public DNS servers',
 'dns menu' => 'Assign DNS Server',
 'dns mode for qname minimisation' => 'QNAME Minimisation',
diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index 8c4e4d8a4..6729cd6c5 100644
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -17,7 +17,7 @@
 'Captive activate' => 'Activation',
 'Captive activated' => 'Activé',
 'Captive active on' => 'Activée sur',
-'Captive agree tac' => 'Je suis d'accord avec les termes et conditions ci-dessous.',
+'Captive agree tac' => 'Je suis en accord avec les termes et conditions ci-dessous.',
 'Captive auth_lic' => 'Licence',
 'Captive auth_vou' => 'Reçu',
 'Captive authentication' => 'Type d'accès',
@@ -80,7 +80,7 @@
 'ConnSched scheduler' => 'Planificateur',
 'ConnSched select profile' => 'Sélectionner profil',
 'ConnSched shutdown' => 'Extinction',
-'ConnSched time' => 'Temps :',
+'ConnSched time' => 'Heure :',
 'ConnSched up' => 'Actif',
 'ConnSched weekdays' => 'Jours de la semaine :',
 'Daily' => 'Quotidienne',
@@ -177,13 +177,13 @@
 'advproxy AUTH method radius' => 'RADIUS',
 'advproxy AUTH no auth' => 'Domaines sans authentification (un par ligne)',
 'advproxy AUTH number of auth processes' => 'Nombre de processus d'authentification',
-'advproxy AUTH realm' => 'Authentification du royaume invité',
+'advproxy AUTH realm' => 'Invite du domaine d'authentification',
 'advproxy AUTH user IP cache TTL' => 'Cache utilisateur/IP TTL (en minutes)',
 'advproxy IDENT authorized users' => 'Utilisateurs autorisés (un par ligne)',
 'advproxy IDENT aware hosts' => 'Identification des hôtes courants (un par ligne)',
 'advproxy IDENT identd settings' => 'Paramètres communs identd',
 'advproxy IDENT required' => 'Exiger l'authentification identd',
-'advproxy IDENT timeout' => 'Temps d'identification limite (en secondes)',
+'advproxy IDENT timeout' => 'Limite de temps d'identification (en secondes)',
 'advproxy IDENT unauthorized users' => 'Utilisateurs non autorisés (un par ligne)',
 'advproxy IDENT use negative access list' => 'Utilisation négative du contrôle d'accès',
 'advproxy IDENT use positive access list' => 'Utilisation positive du contrôle d'accès',
@@ -215,7 +215,7 @@
 'advproxy NCSA min password length' => 'Longueur minimale du mot de passe',
 'advproxy NCSA no accounts' => 'Aucun compte utilisateur disponible',
 'advproxy NCSA password' => 'Mot de passe',
-'advproxy NCSA password confirm' => 'Mot de passe (confirmez)',
+'advproxy NCSA password confirm' => 'Mot de passe (confirmation) ',
 'advproxy NCSA redirector bypass' => 'Redirection par contournement pour les membres du groupe',
 'advproxy NCSA update user' => 'Mise à jour utilisateur',
 'advproxy NCSA user accounts' => 'Comptes utilisateurs',
@@ -251,7 +251,7 @@
 'advproxy advanced web proxy configuration' => 'Configuration avancée du proxy web',
 'advproxy allowed subnets' => 'Sous-réseaux autorisés (un par ligne) ',
 'advproxy allowed web browsers' => 'Clients autorisés pour l'accès web',
-'advproxy back to main page' => 'Retour à l'accueil',
+'advproxy back to main page' => 'Retour à la page principale',
 'advproxy banned ip clients' => 'Adresses IP interdites (une par ligne) ',
 'advproxy banned mac clients' => 'Adresses MAC interdites (une par ligne) ',
 'advproxy basic authentication' => 'Autoriser l'authentification HTTP basique',
@@ -263,7 +263,7 @@
 'advproxy chgwebpwd change password' => 'Modifier mot de passe',
 'advproxy chgwebpwd change web password' => 'C h a n g e r &nbsp; l e &nbsp; m o t &nbsp; p a s s e &nbsp;w e b',
 'advproxy chgwebpwd new password' => 'Nouveau mot de passe',
-'advproxy chgwebpwd new password confirm' => 'Nouveau mot de passe (confirmez)',
+'advproxy chgwebpwd new password confirm' => 'Nouveau mot de passe (confirmation)',
 'advproxy chgwebpwd old password' => 'Mot de passe actuel',
 'advproxy chgwebpwd username' => 'Nom utilisateur',
 'advproxy classroom extensions' => 'Extensions des classes',
@@ -423,7 +423,7 @@
 'all services' => 'Tous les services',
 'all updates installed' => 'Toutes les mises à jour sont installées',
 'allmsg' => 'tout montrer',
-'alt dialup' => 'Messages',
+'alt dialup' => 'Connexion',
 'alt home' => 'Accueil',
 'alt information' => 'Information',
 'alt logs' => 'Journaux',
@@ -481,7 +481,7 @@
 'backup sets' => 'Configuration des sauvegardes',
 'backup to floppy' => 'Sauvegarder sur disquettes',
 'backupaddon' => 'Sauvegarde additionnelle',
-'backupprofile' => 'Dans le cas ou la reconnexion échouerait, changez de profil',
+'backupprofile' => 'Dans le cas ou la reconnexion échouerait, changer de profil ',
 'backups' => 'Sauvegardes',
 'backupwarning' => 'Veuillez restaurer votre sauvegarde principale et ensuite vos sauvegardes additionnelles. Veuillez conserver le nom de fichier fourni lors du téléchargement.',
 'bad characters in' => 'Mauvais caractères dans ',
@@ -508,7 +508,7 @@
 'blue access use hint' => 'Vous devez saisir l'adresse IP ou MAC de votre périphérique. Vous pouvez également saisir les deux',
 'blue interface' => 'Interface BLEUE',
 'broadcast' => 'Diffusion',
-'broken pipe' => 'Broken pipe',
+'broken pipe' => 'Lien rompu',
 'buffered memory' => 'Mémoire tampon',
 'buffers' => 'tampons',
 'bytes per second' => 'Octets par seconde',
@@ -639,17 +639,17 @@
 'community rules' => 'Règles communautaires GPL de Snort',
 'comp-lzo' => 'Compression-LZO :',
 'compression' => 'Compression :',
-'computer to modem rate' => 'Taux de l'ordinateur au modem :',
+'computer to modem rate' => 'Vitesse entre l'ordinateur et le modem :',
 'concentrator name' => 'Nom de concentrateur :',
 'confirmation' => 'confirmation',
 'connect' => 'Démarrage / Connexion OVPN',
 'connect the modem' => 'Connexion au modem',
-'connect timeout' => 'Temps de connexion dépassé :',
+'connect timeout' => 'Délai de connexion dépassé :',
 'connected' => 'Connecté',
 'connecting' => 'Connexion en cours...',
 'connection' => 'Connexion',
 'connection closed' => 'Non connecté...',
-'connection debugging' => 'Déboggage de la connexion',
+'connection debugging' => 'Déboggage de la connexion ',
 'connection status and controlc' => 'Etat et contrôle de connexion :',
 'connection tracking' => 'Surveillance des connexions tables IP',
 'connection type' => 'Type de connexion',
@@ -812,8 +812,8 @@
 'dial profile' => 'Contact avec le profil',
 'dial user password' => 'Mot de passe de l'utilisateur connecté :',
 'dial user password has been changed' => 'Le mot de passe de l'utilisateur connecté a été changé.',
-'dialing mode' => 'Mode connecté :',
-'dialup red not ppp' => 'Les profils de connexion peuvent seulement être utilisés si <b>ROUGE</b> est positionné sur <b>Connexion PPP</b><BR>Vérifiez les réglages du réseau.',
+'dialing mode' => 'Mode de numérotation :',
+'dialup red not ppp' => 'Les profils de connexion peuvent seulement être utilisés si <b>ROUGE</b> est positionné sur <b>Connexion PPP</b><BR>Veuillez vérifier les réglages du réseau.',
 'dialup settings' => 'Réglage de connexion',
 'directory mask' => 'Droits des répertoires UNIX',
 'directory writeable' => 'Ecriture possible dans ce répertoire',
@@ -823,7 +823,7 @@
 'disk access per' => 'Accès disque par',
 'disk usage' => 'Utilisation disque',
 'display' => 'Réglages',
-'display charset' => 'Afficher Charset',
+'display charset' => 'Afficher jeu de car.',
 'display hostname in window title' => 'Afficher le nom d'hôte dans le titre de la fenêtre',
 'display traffic at home' => 'Afficher les statistiques du trafic en page de démarrage',
 'display webinterface effects' => 'Activer les effets',
@@ -883,10 +883,10 @@
 'donation' => 'Faire un don',
 'donation-link' => 'https://www.paypal.com/fr_fr/fr/i/btn/btn_donateCC_LG.gif',
 'donation-text' => '<strong>IPFire</strong> est développé et maintenu par des volontaires durant leur temps libre.<br>Afin d'assurer les coûts du projet et nous encourager, vous pouvez effectuer un don.',
-'done' => 'Faites le',
-'dos charset' => 'DOS Charset',
+'done' => 'Fait',
+'dos charset' => 'Jeu de car. DOS',
 'down and up speed' => 'Entrez votre débit descendant et montant <br /> et cliquez sur <i>Sauvegarder</i>.',
-'downlink' => 'Downlink',
+'downlink' => 'Liaison descendante',
 'downlink speed' => 'Débit descendant - download (kbit/sec) ',
 'downlink std class' => 'Classe standard de téléchargement ',
 'download' => 'Téléchargement ',
@@ -898,7 +898,7 @@
 'download pkcs12 file' => 'Télécharger le fichier PKCS12',
 'download root certificate' => 'Télécharger le certificat Root',
 'download tls-auth key' => 'Télécharger la clé tls-auth',
-'dpd action' => 'Détection du peer mort',
+'dpd action' => 'Détection du pair mort',
 'dpd delay' => 'Retard',
 'dpd timeout' => 'Délai dépassé',
 'driver' => 'Pilote',
@@ -927,8 +927,8 @@
 'e-mail address too long' => 'L'adresse email est trop longue ; Elle ne doit pas dépasser 40 caractères.',
 'eciadsl help' => 'Pour utiliser le modem ECI ADSL, vous devez charger un fichier synch.bin sur votre machine IPFire. Veuillez télécharger le fichier depuis le site web d'ECIADSL et chargez le fichier <b>synch.bin</b> en utilisant le formulaire ci-dessous.',
 'eciadsl upload' => 'Charger le fichier ECI ADSL synch.bin',
-'edit' => 'Editer',
-'edit a rule' => 'Editer une règle existante :',
+'edit' => 'Modifier',
+'edit a rule' => 'Modifier une règle existante :',
 'edit advanced settings when done' => 'Modifier les paramètres avancés lorsque vous avez terminé.',
 'edit an existing alias' => 'Modifier un alias existant',
 'edit an existing host' => 'Modifer un hôte existant',
@@ -970,14 +970,14 @@
 'empty profile' => 'vide',
 'enable ignore filter' => 'Activer le filtre d'exclusion ',
 'enable javascript' => 'Activer Javascript',
-'enable smt' => 'Activer multithreading simultané (SMT)',
+'enable smt' => 'Activer le partage d'un cœur de processeur (SMT)',
 'enable wildcards' => 'Activer les cartes d'invitations :',
 'enabled' => 'Activé :',
 'enabled on' => 'Activé sur',
 'enabledtitle' => 'Activé',
 'encapsulation' => 'Encapsulation',
 'encrypted' => 'Chiffré',
-'encryption' => 'Encryption :',
+'encryption' => 'Chiffrement :',
 'end address' => 'Adresse de fin :',
 'enter ack class' => 'Entrez la classe ACK <br /> et cliquez sur <i>Sauvegarder</i>.',
 'enter data' => 'Entrez vos réglages <br /> et cliquez sur <i>Sauvegarder</i>.',
@@ -996,7 +996,7 @@
 'error' => 'Erreur',
 'error config' => 'Impossible d'ouvrir /var/ipcop/ovpn/config/ZERINA.ovpn !',
 'error external access' => 'Impossible d'ouvrir /var/ipcop/xtaccess/config (l'accès externe ne peut pas être garanti) !',
-'error messages' => 'Messages d'erreurs :',
+'error messages' => 'Remarque :',
 'esp encryption' => 'Chiffrement ESP :',
 'esp grouptype' => 'Type de groupe ESP :',
 'esp integrity' => 'Intégrité ESP :',
@@ -1163,7 +1163,7 @@
 'fwdfw menu' => 'Pare-feu',
 'fwdfw movedown' => 'Descendre',
 'fwdfw moveup' => 'Monter',
-'fwdfw natport used' => 'Le port donné pour NAPT est déjà utilisé par une autre règle DNAT.',
+'fwdfw natport used' => 'Le port proposé pour NAPT est déjà utilisé par une autre règle DNAT.',
 'fwdfw newrule' => 'Nouvelle règle',
 'fwdfw numcon' => 'Nombre de connexions ',
 'fwdfw p2p txt' => 'Accorder / refuser l'accès aux réseaux P2P.',
@@ -1353,7 +1353,7 @@
 'high' => 'Haut',
 'high memory usage' => 'Utilisation mémoire importante',
 'hint' => 'Remarque :',
-'holdoff' => 'Temps d'inactivité (en secondes)',
+'holdoff' => 'Temps d'inactivité (en secondes) ',
 'host' => 'Hôte',
 'host allow' => 'Liste des hôtes autorisés',
 'host certificate' => 'Certificat hôte',
@@ -1376,7 +1376,7 @@
 'icmp type' => 'Type ICMP',
 'id' => 'ID',
 'idle' => 'Inactif',
-'idle timeout' => 'Délai d'inactivité (minutes ; 0 pour désactiver) :',
+'idle timeout' => 'Délai d'inactivité (en minutes ; 0 pour désactiver) :',
 'idle timeout not set' => 'Délai d'inactivité non défini.',
 'ids apply' => 'Appliquer',
 'ids apply ruleset changes' => 'Les modifications du jeu de règles sont appliquées. Veuillez patienter jusqu'à ce que toutes les opérations soient terminées avec succès...',
@@ -1404,7 +1404,7 @@
 'ike grouptype' => 'Type de groupe IKE :',
 'ike integrity' => 'Intégrité IKE :',
 'ike lifetime' => 'Durée de vie IKE :',
-'ike lifetime should be between 1 and 24 hours' => 'La durée de vie IKE devrait être comprise entre 1 et 24 heures.',
+'ike lifetime should be between 1 and 24 hours' => 'La durée de vie IKE doit être comprise entre 1 et 24 heures.',
 'imei' => 'IMEI',
 'import' => 'Importer',
 'importkey' => 'Importer PSK',
@@ -1562,7 +1562,7 @@
 'lateprompting' => 'Dernière action',
 'lease expires' => 'Bail expiré',
 'least preferred' => 'le moins apprécié',
-'legend' => 'Légende',
+'legend' => 'Légende ',
 'length' => 'Longueur',
 'lifetime' => 'Durée de vie :',
 'line' => 'Ligne',
@@ -1691,7 +1691,7 @@
 'misc-options' => 'Options supplémentaires',
 'missing dat' => 'Archive chiffrée introuvable',
 'missing gz' => 'Archive déchiffrée introuvable',
-'mitigated' => 'Mitigé',
+'mitigated' => 'Modéré',
 'mode' => 'Mode',
 'model' => 'Modèle',
 'modem' => 'Modem',
@@ -1718,7 +1718,7 @@
 'modify' => 'Modifier',
 'modulation' => 'Modulation',
 'monday' => 'Lundi',
-'monitor interface' => 'Monitor Interface',
+'monitor interface' => 'Interface de gestion ',
 'month' => 'Mois ',
 'month-graph' => 'Mois',
 'monthly firewallhits' => 'Contacts mensuels avec le pare-feu',
@@ -1816,7 +1816,7 @@
 'ntp syncro disabled' => 'Synchronisation NTP désactivee',
 'ntp syncro enabled' => 'Synchronisation NTP activee',
 'ntpd restarted' => 'ntpd redemarre',
-'number' => 'Nombre :',
+'number' => 'Numéro de téléphone :',
 'o-no' => 'Inactif',
 'o-yes' => 'Actif',
 'october' => 'Octobre',
@@ -1897,16 +1897,16 @@
 'outgoing traffic in bytes per second' => 'Trafic sortant',
 'override mtu' => 'Outrepasser le MTU par défaut',
 'ovpn' => 'OpenVPN',
-'ovpn add conf' => 'Configuration addtionnelle',
+'ovpn add conf' => 'Configuration additionnelle',
 'ovpn con stat' => 'Statistiques de connexions OpenVPN',
-'ovpn config' => 'OVPN-Config',
+'ovpn config' => 'Config OVPN',
 'ovpn crypt options' => 'Options cryptographiques',
 'ovpn device' => 'Périphérique OpenVPN :',
 'ovpn dh' => 'Longueur de paramètres Diffie-Hellman ',
 'ovpn dh new key' => 'Générer de nouveaux paramètres Diffie-Hellman ',
 'ovpn dh parameters' => 'Options de paramètres Diffie-Hellman',
 'ovpn dh upload' => 'Mettre à jour de nouveaux paramètres Diffie-Hellman ',
-'ovpn dl' => 'Télécharger OVPN-Config',
+'ovpn dl' => 'Télécharger Config OVPN',
 'ovpn engines' => 'Moteur Crypto',
 'ovpn errmsg green already pushed' => 'La route pour le réseau VERT est toujours activée',
 'ovpn errmsg invalid ip or mask' => 'Adresse ou masque de sous-r?seau invalide',
@@ -1914,7 +1914,7 @@
 'ovpn error md5' => 'Votre certificat hôte utilise MD5 pour la signature qui n'est plus acceptée. <br>Veuillez mettre à jour la dernière version d'IPFire et générez un nouveau certificat racine et hôte..</br><br>Tous les clients OpenVPN doivent ensuite être renouvelés!</br>',
 'ovpn generating the root and host certificates' => 'La génération du certificat racine et hôte peut prendre du temps.',
 'ovpn ha' => 'Algorithme de hashage',
-'ovpn log' => 'OVPN-Log',
+'ovpn log' => 'Log OVPN',
 'ovpn mgmt in root range' => 'Un numéro de port de 1024 ou plus est requis.',
 'ovpn mtu-disc' => 'Découverte du chemin MTU',
 'ovpn mtu-disc and mtu not 1500' => 'Path MTU Discovery nécessite un MTU de 1500.',
@@ -1941,19 +1941,19 @@
 'ovpn_mssfix' => 'Taille MSSFIX',
 'ovpn_mtudisc' => 'Découverte MTU',
 'ovpn_processprio' => 'Priorité du processus',
-'ovpn_processprioD' => 'Profond',
-'ovpn_processprioED' => 'Extrêmement profondément',
+'ovpn_processprioD' => 'Profonde',
+'ovpn_processprioED' => 'Extrêmement profonde',
 'ovpn_processprioEH' => 'Extrêmement haute',
 'ovpn_processprioEN' => 'Plus haute que la normale',
 'ovpn_processprioH' => 'Elevé',
-'ovpn_processprioLN' => 'Plus profondément que la normale',
+'ovpn_processprioLN' => 'Plus profonde que la normale',
 'ovpn_processprioN' => 'Normal',
-'ovpn_processprioVD' => 'Très profondément',
+'ovpn_processprioVD' => 'Très profonde',
 'ovpn_processprioVH' => 'Très haute',
 'ovpnstatus log' => 'Journal statut OVPN',
 'ovpnsys log' => 'Journal système OVPN',
 'p2p block' => 'Réseaux P2P',
-'p2p block save notice' => 'Veuillez recharger le jeu de règles de pare-feu afin d'appliquer vos modifications.',
+'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 de rafraichissement, veuillez patienter.',
 'pakfire accept all' => 'Voulez-vous installer tous les paquets ?',
@@ -1961,7 +1961,7 @@
 'pakfire available addons' => 'Modules disponibles :',
 'pakfire configuration' => 'Configuration Pakfire',
 'pakfire core update auto' => 'Installer automatiquement les mises à jour du noyau et des modules :',
-'pakfire core update level' => 'Niveau de mise à jour du noyau ',
+'pakfire core update level' => 'Version de mise à jour du noyau ',
 'pakfire health check' => 'Vérifier si le miroir est accessible (ping) :',
 'pakfire install description' => 'Veuillez choisir un ou plusieurs modules dans la liste ci-dessous<br>et cliquer sur le signe PLUS pour le(s) installer.',
 'pakfire install package' => 'Vous souhaitez installer les paquets suivants : ',
@@ -1993,8 +1993,8 @@
 'pc add' => 'ajouter PC',
 'pdc options' => 'Options PDC',
 'percentage' => 'Pourcentage',
-'persistent' => 'Persistant',
-'pfs yes no' => 'Perfect Forward Secrecy (PFS)',
+'persistent' => 'Persistante',
+'pfs yes no' => 'Confidentialité persistante parfaite (PFS)',
 'phase1 group' => 'Groupe phase 1',
 'phonebook entry' => 'Entrée du répertoire :',
 'ping disabled' => 'Désactiver la réponse au ping',
@@ -2008,11 +2008,11 @@
 'ports' => 'Ports',
 'portscans' => 'Scans de ports',
 'pots' => 'Entrée ligne analogique classique',
-'ppp setup' => 'Installation PPP',
+'ppp setup' => 'Paramètres point à point (PPP)',
 'pppoe' => 'PPPoE',
 'pppoe settings' => 'Paramètres supplémentaires PPPoE :',
 'pptp netconfig' => 'Ma config réseau',
-'pptp peer' => 'Peer',
+'pptp peer' => 'Pair',
 'pptp route' => 'Route PPTP',
 'pptp settings' => 'Paramètres supplémentaires PPTP :',
 'pre-shared key is too short' => 'La clef partagée préliminaire est trop courte.',
@@ -2029,10 +2029,10 @@
 'printing options' => 'Options d'impression',
 'priority' => 'Priorité',
 'processes' => 'Processus',
-'processor vulnerability mitigations' => 'Atténuations de la vulnérabilité du processeur',
+'processor vulnerability mitigations' => 'Atténuation de la vulnérabilité du processeur',
 'profile' => 'Profil',
 'profile deleted' => 'Profil supprimé : ',
-'profile has errors' => 'Le profil contient des erreurs',
+'profile has errors' => 'Le profil de connexion contient des erreurs',
 'profile made current' => 'Profil en cours : ',
 'profile name' => 'Nom du profil :',
 'profile name not given' => 'Le profil n'a pas de nom.',
@@ -2081,7 +2081,7 @@
 'rebooting' => 'Redémarrage en cours...',
 'rebooting ipfire' => 'Redemarrage d'IPFire',
 'reconnect' => 'Reconnecter',
-'reconnection' => 'Reconnexion',
+'reconnection' => 'Reconnexion ',
 'red' => 'Internet',
 'red1' => 'ROUGE',
 'references' => 'Références',
@@ -2155,7 +2155,7 @@
 'secondary wins server address' => 'Serveur WINS secondaire ',
 'seconds' => 'Secondes',
 'section' => 'Section ',
-'secure shell server' => 'Secure shell server',
+'secure shell server' => 'Serveur Shell Sécurisé',
 'security' => 'Sécurité',
 'security options' => 'Options de sécurité',
 'select' => 'Sélectionner',
@@ -2203,7 +2203,7 @@
 'shuffle' => 'Mélanger',
 'shutdown' => 'Arrêter',
 'shutdown ask' => 'Arrêter ?',
-'shutdown control' => 'Contrôle de l'arrêt d'IPFire',
+'shutdown control' => 'Contrôle l'arrêt d'IPFire',
 'shutdown sure' => 'Etes-vous sûr de vouloir arrêter ?',
 'shutdown2' => 'Arrêt :',
 'shutting down' => 'Arrêter',
@@ -2219,9 +2219,9 @@
 'smbrestart' => 'Redémarrer Samba',
 'smbstart' => 'Démarrer Samba',
 'smbstop' => 'Arrêter Samba',
-'smt disabled' => 'Le MultiThreading Simultané (SMT) est désactivé',
-'smt enabled' => 'Le MultiThreading Simultané(SMT) est activé',
-'smt not supported' => 'Le MultiThreading Simultané (SMT) n'est pas supporté',
+'smt disabled' => 'Le partage d'un cœur de processeur (SMT) est désactivé',
+'smt enabled' => 'Le partage d'un cœur de processeur (SMT) est activé',
+'smt not supported' => 'Le partage d'un cœur de processeur (SMT) n'est pas supporté',
 'smtphost' => 'Hôte SMTP',
 'smtpport' => 'Port SMTP',
 'snat new source ip address' => 'Nouvelle adresse IP source',
@@ -2260,7 +2260,7 @@
 'ssh access tip' => 'IPFire n'utilise pas le port par défaut 22 pour le SSH !',
 'ssh active sessions' => 'Connexions actives',
 'ssh agent forwarding' => 'Autoriser le transfert d'agent SSH',
-'ssh fingerprint' => 'Empreinte digitale',
+'ssh fingerprint' => 'Empreinte numérique',
 'ssh host keys' => 'Clef SSH de l'hôte',
 'ssh is disabled' => 'SSH est desactive. Arret.',
 'ssh is enabled' => 'SSH est active. Redemarrage.',
@@ -2325,7 +2325,7 @@
 'ta key' => 'Clé d'authentification TLS',
 'taa zombieload2' => 'TSX Async Abort / ZombieLoad v2',
 'tcp more reliable' => 'TCP (plus fiable)',
-'telephone not set' => 'Téléphone non défini.',
+'telephone not set' => 'Numéro de téléphone non défini.',
 'template' => 'Préétabli',
 'template warning' => 'Vous avez deux options pour établir la Qos : La première, vous cliquez sur le bouton de sauvegarde et générez les classes et règles qui vous conviennent.<br>La seconde, vous cliquez sur le bouton préétabli et les classes et règles seront mises en place par un modèle.',
 'ten minutes' => '10 minutes',
@@ -2363,19 +2363,19 @@
 'too long 80 char max' => ' est trop long, le maximum autorisé est de 80 caractères',
 'tor' => 'Tor',
 'tor 0 = disabled' => '0 = désactivé',
-'tor accounting' => 'Accounting',
+'tor accounting' => 'Comptage',
 'tor accounting bytes' => 'Trafic (lu / écrit)',
 'tor accounting bytes left' => 'restant',
 'tor accounting interval' => 'Interval (UTC)',
-'tor accounting limit' => 'Accounting limit (Mo)',
-'tor accounting period' => 'Accounting period',
+'tor accounting limit' => 'Limite de comptage (Mo)',
+'tor accounting period' => 'Période de comptage',
 'tor accounting period daily' => 'Quotidienne',
 'tor accounting period monthly' => 'Mensuelle',
 'tor accounting period weekly' => 'Hebdomadaire',
 'tor acls' => 'Contrôle d'accès',
 'tor allowed subnets' => 'Sous-réseaux alloués (un par ligne)',
-'tor bandwidth burst' => 'Max. burst',
-'tor bandwidth rate' => 'Max. rate',
+'tor bandwidth burst' => 'Eclatement max.',
+'tor bandwidth rate' => 'Taux max.',
 'tor bandwidth settings' => 'Paramètres de bande passante',
 'tor bandwidth unlimited' => 'illimité',
 'tor bridge enabled' => 'Activer le pont Tor',
@@ -2383,28 +2383,28 @@
 'tor configuration' => 'Configuration Tor',
 'tor connected relays' => 'Relais connectés',
 'tor contact info' => 'Info contact',
-'tor daemon' => 'Service',
+'tor daemon' => 'Statut du service',
 'tor directory port' => 'Port répertoire',
 'tor enabled' => 'Activer Tor',
-'tor errmsg invalid accounting limit' => 'Invalid accounting limit',
-'tor errmsg invalid directory port' => 'Invalid directory port',
-'tor errmsg invalid ip or mask' => 'Sous-réseau ou IP non valide',
+'tor errmsg invalid accounting limit' => 'Limite de comptage invalide',
+'tor errmsg invalid directory port' => 'Port répertoire invalide',
+'tor errmsg invalid ip or mask' => 'Sous-réseau ou IP invalide',
 'tor errmsg invalid node id' => 'ID noeud invalide',
 'tor errmsg invalid relay address' => 'Adresse relais invalide',
 'tor errmsg invalid relay name' => 'Surnom relais invalide',
 'tor errmsg invalid relay port' => 'Port relais invalide',
 'tor errmsg invalid socks port' => 'Port SOCKS invalide',
-'tor exit country' => 'Exit country',
-'tor exit country any' => 'Any country',
-'tor exit nodes' => 'Exit Nodes',
+'tor exit country' => 'Pays de sortie',
+'tor exit country any' => 'N'importe quel pays',
+'tor exit nodes' => 'Noeuds de sortie',
 'tor relay address' => 'Adresse relais',
 'tor relay configuration' => 'Configuration relais Tor',
 'tor relay enabled' => 'Activer relais Tor',
 'tor relay external address' => 'Adresse externe relais',
-'tor relay fingerprint' => 'Relay fingerprint',
+'tor relay fingerprint' => 'Empreinte numérique relais',
 'tor relay mode' => 'Mode relais',
 'tor relay mode bridge' => 'Pont',
-'tor relay mode exit' => 'Exit-Node',
+'tor relay mode exit' => 'Noeud de sortie',
 'tor relay mode private bridge' => 'Pont privé',
 'tor relay mode relay' => 'Relais seul',
 'tor relay nickname' => 'Surnom relais',
@@ -2596,7 +2596,7 @@
 'urlfilter background text' => 'Afin d'avoir une image de fond personnalisée pour les pages bloquées, envoyez le fichier .jpg',
 'urlfilter backup' => 'Créer un fichier de sauvegarde',
 'urlfilter backup error' => 'Impossible de créer un fichier de sauvegarde',
-'urlfilter backup settings' => 'Sauvegarder les réglages du filtre d'URL',
+'urlfilter backup settings' => 'Sauvegarder les paramètres du filtre URL',
 'urlfilter banned clients' => 'Adresses IP bannies',
 'urlfilter blacklist age 1' => 'La dernière mise à jour de la liste noire a eu lieu il y a',
 'urlfilter blacklist age 2' => 'jours',
@@ -2628,7 +2628,7 @@
 'urlfilter constraint outside' => 'Hors',
 'urlfilter constraint within' => 'Avec',
 'urlfilter copy rule' => 'Copie',
-'urlfilter current files' => 'Fichiers courant du dépôt local ',
+'urlfilter current files' => 'Fichier(s) actuel(s) du dépôt local ',
 'urlfilter custom blacklist' => 'Liste noire perso',
 'urlfilter custom expression list' => 'Liste de mots clés perso',
 'urlfilter custom url' => 'Source URL perso ',
@@ -2644,7 +2644,7 @@
 'urlfilter edit time constraint rule' => 'Modifier une règle existante de contrainte de temps',
 'urlfilter edit user quota rule' => 'Modifier une règle de quota utilisateur',
 'urlfilter empty ads' => 'Bloquer "pubs" avec fenêtre vide ',
-'urlfilter empty repository' => 'Fichier du dépot local est vide',
+'urlfilter empty repository' => 'Le dossier du dépot local est vide',
 'urlfilter enable automatic blacklist update' => 'Activer la mise à jour automatique ',
 'urlfilter enable custom blacklist' => 'Activer liste noire perso ',
 'urlfilter enable custom expression list' => 'Activer la liste d'expressions personnalisées ',
@@ -2697,11 +2697,11 @@
 'urlfilter msg text 3' => 'Message ligne 3 ',
 'urlfilter network access control' => 'Contrôle d'accès réseau en fonction',
 'urlfilter no categories' => 'Aucune catégorie disponible',
-'urlfilter not enabled' => 'Filtre URL n'est pas activé sur le proxy page web',
+'urlfilter not enabled' => 'Le filtre URL n'est pas activé sur la page du proxy web',
 'urlfilter quota restart message' => 'Note : Les compteurs seront remis à zéro pour tous les utilisateurs au redémarrage du filtre URL',
-'urlfilter quota time error' => 'Valeur non valide pour quota de temps',
+'urlfilter quota time error' => 'Valeur invalide pour le quota de temps',
 'urlfilter quota user error' => 'Au moins un nom d'utilisateur est requis',
-'urlfilter redirect template' => 'Redirection modèle de page',
+'urlfilter redirect template' => 'Modèle de page de redirection',
 'urlfilter redirectpage' => 'Redirige vers cette URL ',
 'urlfilter remove file' => 'Supprime le fichier du dépôt',
 'urlfilter renewal' => 'Renouvellement',
@@ -2713,7 +2713,7 @@
 'urlfilter restart notification' => 'Activer règles modifiées',
 'urlfilter restore' => 'Importer fichier de sauvegarde',
 'urlfilter restore results' => 'Restaurer résultats',
-'urlfilter restore settings' => 'Restaurer paramètres filtre URL',
+'urlfilter restore settings' => 'Restaurer les paramètres du filtre URL',
 'urlfilter restore success' => 'Configuration filtre URL restaurée. Filtre URL doit être redémarré pour activer les nouveaux paramètres.',
 'urlfilter restore text' => 'Pour restaurer une configuration précédemment sauvée, charger le fichier de sauvegarde .tar.gz suivant ',
 'urlfilter safesearch' => 'Activer SafeSearch ',
@@ -2727,7 +2727,7 @@
 'urlfilter set time constraints' => 'Fixer les contraintes horaires',
 'urlfilter set user quota' => 'Fixer les quotas utilisateur',
 'urlfilter show category' => 'Montrer la catégorie de page bloquée ',
-'urlfilter show dnserror' => 'Utiliser "Erreur DNS" pour les url bloquées ',
+'urlfilter show dnserror' => 'Utiliser "Erreur DNS" pour url bloquées ',
 'urlfilter show ip' => 'Montrer adresse IP page bloquée ',
 'urlfilter show url' => 'Montrer adresse url page bloquée ',
 'urlfilter source' => 'Hôte(s) ou réseau(x) source(s)',
@@ -2762,7 +2762,7 @@
 'urlfilter upload success' => 'Chargement liste noire complété avec succès.',
 'urlfilter upload text' => 'Pour installer une mise à jour, uploader le fichier .tar.gz suivant ',
 'urlfilter url filter' => 'Filtre d'URL',
-'urlfilter urlfilter blacklist editor' => 'Editeur de la liste noire du filtre d'URL ',
+'urlfilter urlfilter blacklist editor' => 'Editeur de la liste noire du filtre URL ',
 'urlfilter urls' => 'URLs (une par ligne)',
 'urlfilter user time quota' => 'Quota de temps (en minutes) ',
 'urlfilter username' => 'Nom d'utilisateur',
@@ -2835,7 +2835,8 @@
 'vpn start action start' => 'Toujours démarré',
 'vpn statistic n2n' => 'Stats OpenVPN (site-à-site)',
 'vpn statistic rw' => 'Stats OpenVPN (client nomade)',
-'vpn subjectaltname' => 'Subject Alt Name',
+'vpn subjectaltname' => 'Nom de l'objet',
+'vpn subjectaltname missing' => 'Le nom de l'objet ne peut être vide.',
 'vpn wait' => 'ATTENTE',
 'vpn watch' => 'Redémarrer le VPN site-à-site si l'IP hôte distant change (dyndns).',
 'vpn weak' => 'Faible',
@@ -2881,7 +2882,7 @@
 'wlan client eap phase2 method' => 'Méthode phase 2 EAP',
 'wlan client eap state' => 'Statut EAP',
 'wlan client edit entry' => 'Modifier la configuration du client sans fil',
-'wlan client encryption' => 'Encryption',
+'wlan client encryption' => 'Chiffrement',
 'wlan client encryption eap' => 'EAP',
 'wlan client encryption none' => 'Aucun',
 'wlan client encryption wep' => 'WEP',
@@ -2911,14 +2912,14 @@
 'wlan clients' => 'Clients sans fil',
 'wlanap' => 'Point d'accès',
 'wlanap auto' => 'Sélection automatique du canal',
-'wlanap broadcast ssid' => 'Broadcast SSID',
+'wlanap broadcast ssid' => 'Diffusion du SSID',
 'wlanap channel' => 'Canal',
 'wlanap client isolation' => 'Isolation du client',
 'wlanap configuration' => 'Configuration du point d'accès',
 'wlanap country' => 'Code pays',
 'wlanap debugging' => 'Débogage',
 'wlanap del interface' => 'Supprimer l'interface sélectionnée ?',
-'wlanap encryption' => 'Encryption',
+'wlanap encryption' => 'Chiffrement',
 'wlanap informations' => 'Informations',
 'wlanap interface' => 'Choisir interface',
 'wlanap invalid wpa' => 'Longueur non valide dans la Passphrase WPA. Doit comporter entre 8 et 63 caractères.',
diff --git a/lfs/configroot b/lfs/configroot
index 227d09239..6092f889b 100644
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -63,7 +63,7 @@ $(TARGET) :
    # Touch empty files
    for i in auth/users backup/include.user backup/exclude.user \
        captive/settings captive/agb.txt captive/clients captive/voucher_out certs/index.txt certs/index.txt.attr ddns/config ddns/settings ddns/ipcache dhcp/settings \
-	    dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dns/settings dnsforward/config ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \
+	    dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dns/settings dns/servers dnsforward/config ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \
        ethernet/wireless extrahd/scan extrahd/devices extrahd/partitions extrahd/settings firewall/settings firewall/config firewall/geoipblock firewall/input firewall/outgoing \
        fwhosts/customnetworks fwhosts/customhosts fwhosts/customgroups fwhosts/customservicegrp fwhosts/customgeoipgrp fwlogs/ipsettings fwlogs/portsettings \
        isdn/settings mac/settings main/hosts main/routing main/security main/settings optionsfw/settings \
@@ -132,6 +132,7 @@ $(TARGET) :
    echo  "DROPWIRELESSFORWARD=on"	>> $(CONFIG_ROOT)/optionsfw/settings
    echo  "POLICY=MODE2"		>> $(CONFIG_ROOT)/firewall/settings
    echo  "POLICY1=MODE2"		>> $(CONFIG_ROOT)/firewall/settings
+	echo  "USE_ISP_NAMESERVERS=on"  >> $(CONFIG_ROOT)/dns/settings
# Install snort to suricata converter.
    cp $(DIR_SRC)/config/suricata/convert-snort	/usr/sbin/convert-snort
diff --git a/lfs/initscripts b/lfs/initscripts
index d74e0c650..3a769bd99 100644
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -161,6 +161,7 @@ $(TARGET) :
    ln -sf ../init.d/mountkernfs /etc/rc.d/rcsysinit.d/S00mountkernfs
    ln -sf ../init.d/sysctl      /etc/rc.d/rcsysinit.d/S01sysctl
    ln -sf ../init.d/modules     /etc/rc.d/rcsysinit.d/S05modules
+	ln -sf ../init.d/lvmetad     /etc/rc.d/rcsysinit.d/S09lvmetad
    ln -sf ../init.d/udev        /etc/rc.d/rcsysinit.d/S10udev
    ln -sf ../init.d/waitdrives  /etc/rc.d/rcsysinit.d/S19waitdrives
    ln -sf ../init.d/swap        /etc/rc.d/rcsysinit.d/S20swap
diff --git a/lfs/lvm2 b/lfs/lvm2
index fe6974279..a9e02b692 100644
--- a/lfs/lvm2
+++ b/lfs/lvm2
@@ -78,7 +78,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    	./configure \
    		--prefix=/usr \
    		--with-usrlibdir=/usr/lib \
-			--enable-pkgconfig
+			--enable-pkgconfig \
+			--with-udevdir=/lib/udev/rules.d \
+			--with-default-locking-dir=/run/lvm \
+			--enable-lvmetad \
+			--enable-udev_rules \
+			--enable-udev_sync
    cd $(DIR_APP) && make $(MAKETUNING)
    cd $(DIR_APP) && make install
    @rm -rf $(DIR_APP)
diff --git a/src/initscripts/system/lvmetad b/src/initscripts/system/lvmetad
new file mode 100755
index 000000000..fdae39fd9
--- /dev/null
+++ b/src/initscripts/system/lvmetad
@@ -0,0 +1,41 @@
+#!/bin/sh
+########################################################################
+# Begin $rc_base/init.d/lvmeta2
+#
+# Description : LVM2 Metadata Daemon
+########################################################################
+
+. /etc/sysconfig/rc
+. ${rc_functions}
+
+case "${1}" in
+	start)
+		# Create diretory for control socket
+		mkdir -p /run/lvm
+
+		boot_mesg "Starting LVM2 Metadata Daemon..."
+		loadproc /usr/sbin/lvmetad
+		;;
+
+	stop)
+		boot_mesg "Stopping LVM2 Metadata Daemon..."
+		killproc /usr/sbin/lvmetad
+		;;
+
+	restart)
+		${0} stop
+		sleep 1
+		${0} start
+		;;
+
+	status)
+		statusproc /usr/sbin/lvmetad
+		;;
+
+	*)
+		echo "Usage: ${0} {start|stop|restart|status}"
+		exit 1
+		;;
+esac
+
+# End $rc_base/init.d/lvmetad
hooks/post-receive
--
IPFire 2.x development tree

    