Merge branch 'master' into next

Conflicts:
	doc/language_missings

diff --combined doc/language_issues.de
index 52324ceba559b0ccf4851ba17ae002de600d1a83,d59f1f3ddc5df04230300aa7ab1f076ec9c5094a..0f1b918b1c72ee0041842073ac4893ec4a4dd70d
--- 1/doc/language_issues.de
--- 2/doc/language_issues.de
+++ b/doc/language_issues.de
@@@ -144,8 -144,6 +144,8 @@@ WARNING: translation string unused: err
  WARNING: translation string unused: expected
  WARNING: translation string unused: exportkey
  WARNING: translation string unused: external access rule changed
 +WARNING: translation string unused: extrahd unable to read
 +WARNING: translation string unused: extrahd unable to write
  WARNING: translation string unused: filename
  WARNING: translation string unused: firewall graphs
  WARNING: translation string unused: firewall log viewer
@@@ -309,6 -307,6 +309,7 @@@ WARNING: translation string unused: ovp
  WARNING: translation string unused: ovpnstatus log
  WARNING: translation string unused: ovpnsys log
  WARNING: translation string unused: package failed to install
++WARNING: translation string unused: pakfire core update auto
  WARNING: translation string unused: pakfire updates
  WARNING: translation string unused: password contains illegal characters
  WARNING: translation string unused: password crypting key
@@@ -464,7 -462,3 +465,7 @@@ WARNING: untranslated string: byte
  WARNING: untranslated string: new
  WARNING: untranslated string: outgoing firewall reserved groupname
  WARNING: untranslated string: qos add subclass
 +WARNING: untranslated string: route config changed
 +WARNING: untranslated string: routing config added
 +WARNING: untranslated string: routing config changed
 +WARNING: untranslated string: routing table

diff --combined doc/language_issues.en
index 14e47d99560d5a3468b8291611fea9c4e52ef285,3df8ad27256978651873a1af477bcd50379b0bb7..bffff8044c7533316d14d67d12224113f3766fd8
--- 1/doc/language_issues.en
--- 2/doc/language_issues.en
+++ b/doc/language_issues.en
@@@ -168,8 -168,6 +168,8 @@@ WARNING: translation string unused: err
  WARNING: translation string unused: expected
  WARNING: translation string unused: exportkey
  WARNING: translation string unused: external access rule changed
 +WARNING: translation string unused: extrahd unable to read
 +WARNING: translation string unused: extrahd unable to write
  WARNING: translation string unused: filename
  WARNING: translation string unused: firewall graphs
  WARNING: translation string unused: firewall log viewer
@@@ -337,6 -335,6 +337,7 @@@ WARNING: translation string unused: ovp
  WARNING: translation string unused: ovpnstatus log
  WARNING: translation string unused: ovpnsys log
  WARNING: translation string unused: package failed to install
++WARNING: translation string unused: pakfire core update auto
  WARNING: translation string unused: pakfire updates
  WARNING: translation string unused: password contains illegal characters
  WARNING: translation string unused: password crypting key
@@@ -496,7 -494,3 +497,7 @@@ WARNING: untranslated string: Scan for 
  WARNING: untranslated string: bytes
  WARNING: untranslated string: new
  WARNING: untranslated string: outgoing firewall reserved groupname
 +WARNING: untranslated string: route config changed
 +WARNING: untranslated string: routing config added
 +WARNING: untranslated string: routing config changed
 +WARNING: untranslated string: routing table

diff --combined doc/language_issues.es
index 456eb1f28c38c6100ffa1088ead4f79d1c160d25,ae69c6faba5513ed1ba082f5191e3e367dcbdf7c..21aecaec7fc83ddbad4cbc60337399ad03271300
--- 1/doc/language_issues.es
--- 2/doc/language_issues.es
+++ b/doc/language_issues.es
@@@ -168,8 -168,6 +168,8 @@@ WARNING: translation string unused: err
  WARNING: translation string unused: expected
  WARNING: translation string unused: exportkey
  WARNING: translation string unused: external access rule changed
 +WARNING: translation string unused: extrahd unable to read
 +WARNING: translation string unused: extrahd unable to write
  WARNING: translation string unused: filename
  WARNING: translation string unused: firewall graphs
  WARNING: translation string unused: firewall log viewer
@@@ -338,6 -336,6 +338,7 @@@ WARNING: translation string unused: ovp
  WARNING: translation string unused: ovpnstatus log
  WARNING: translation string unused: ovpnsys log
  WARNING: translation string unused: package failed to install
++WARNING: translation string unused: pakfire core update auto
  WARNING: translation string unused: pakfire updates
  WARNING: translation string unused: password contains illegal characters
  WARNING: translation string unused: password crypting key
@@@ -532,9 -530,4 +533,9 @@@ WARNING: untranslated string: outgoing 
  WARNING: untranslated string: outgoing firewall reserved groupname
  WARNING: untranslated string: outgoing firewall view group
  WARNING: untranslated string: pakfire ago
 +WARNING: untranslated string: route config changed
 +WARNING: untranslated string: routing config added
 +WARNING: untranslated string: routing config changed
 +WARNING: untranslated string: routing table
  WARNING: untranslated string: system information
 +WARNING: untranslated string: vpn keyexchange

diff --combined doc/language_issues.fr
index 784bf382c21a2ba814523cd58e0a2a1cd2b8bae9,cb58f420224b688884bbedddc97fac5e22adc945..3b5f3f3beda412bef3c9061f40e450361e8b0e67
--- 1/doc/language_issues.fr
--- 2/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@@ -168,8 -168,7 +168,8 @@@ WARNING: translation string unused: err
  WARNING: translation string unused: expected
  WARNING: translation string unused: exportkey
  WARNING: translation string unused: external access rule changed
 -WARNING: translation string unused: extrahd founded drives
 +WARNING: translation string unused: extrahd unable to read
 +WARNING: translation string unused: extrahd unable to write
  WARNING: translation string unused: filename
  WARNING: translation string unused: firewall graphs
  WARNING: translation string unused: firewall log viewer
@@@ -337,6 -336,6 +337,7 @@@ WARNING: translation string unused: ovp
  WARNING: translation string unused: ovpnstatus log
  WARNING: translation string unused: ovpnsys log
  WARNING: translation string unused: package failed to install
++WARNING: translation string unused: pakfire core update auto
  WARNING: translation string unused: pakfire updates
  WARNING: translation string unused: password contains illegal characters
  WARNING: translation string unused: password crypting key
@@@ -497,6 -496,7 +498,6 @@@ WARNING: translation string unused: yea
  WARNING: untranslated string: Scan for Songs
  WARNING: untranslated string: bytes
  WARNING: untranslated string: dns address deleted txt
 -WARNING: untranslated string: extrahd detected drives
  WARNING: untranslated string: fireinfo ipfire version
  WARNING: untranslated string: fireinfo is disabled
  WARNING: untranslated string: fireinfo is enabled
@@@ -520,16 -520,11 +521,16 @@@ WARNING: untranslated string: ntp commo
  WARNING: untranslated string: ntp sync
  WARNING: untranslated string: outgoing firewall reserved groupname
  WARNING: untranslated string: pakfire ago
 +WARNING: untranslated string: route config changed
 +WARNING: untranslated string: routing config added
 +WARNING: untranslated string: routing config changed
 +WARNING: untranslated string: routing table
  WARNING: untranslated string: snort working
  WARNING: untranslated string: system information
  WARNING: untranslated string: upload new ruleset
  WARNING: untranslated string: urlfilter file ext block
  WARNING: untranslated string: urlfilter mode block
 +WARNING: untranslated string: vpn keyexchange
  WARNING: untranslated string: wlanap access point
  WARNING: untranslated string: wlanap channel
  WARNING: untranslated string: wlanap debugging

diff --combined doc/language_issues.pl
index 456eb1f28c38c6100ffa1088ead4f79d1c160d25,ae69c6faba5513ed1ba082f5191e3e367dcbdf7c..21aecaec7fc83ddbad4cbc60337399ad03271300
--- 1/doc/language_issues.pl
--- 2/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@@ -168,8 -168,6 +168,8 @@@ WARNING: translation string unused: err
  WARNING: translation string unused: expected
  WARNING: translation string unused: exportkey
  WARNING: translation string unused: external access rule changed
 +WARNING: translation string unused: extrahd unable to read
 +WARNING: translation string unused: extrahd unable to write
  WARNING: translation string unused: filename
  WARNING: translation string unused: firewall graphs
  WARNING: translation string unused: firewall log viewer
@@@ -338,6 -336,6 +338,7 @@@ WARNING: translation string unused: ovp
  WARNING: translation string unused: ovpnstatus log
  WARNING: translation string unused: ovpnsys log
  WARNING: translation string unused: package failed to install
++WARNING: translation string unused: pakfire core update auto
  WARNING: translation string unused: pakfire updates
  WARNING: translation string unused: password contains illegal characters
  WARNING: translation string unused: password crypting key
@@@ -532,9 -530,4 +533,9 @@@ WARNING: untranslated string: outgoing 
  WARNING: untranslated string: outgoing firewall reserved groupname
  WARNING: untranslated string: outgoing firewall view group
  WARNING: untranslated string: pakfire ago
 +WARNING: untranslated string: route config changed
 +WARNING: untranslated string: routing config added
 +WARNING: untranslated string: routing config changed
 +WARNING: untranslated string: routing table
  WARNING: untranslated string: system information
 +WARNING: untranslated string: vpn keyexchange

diff --combined doc/language_issues.ru
index 0000000000000000000000000000000000000000,f6cdbb95c33d991b3287c1eb91ed04da0677d1aa..cf1f645cdccd3d09fdb61523be209e112468caf1
mode 000000,100644..100644
--- /dev/null
--- 2/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@@ -1,0 -1,497 +1,512 @@@
+ WARNING: translation string unused: Act as
+ WARNING: translation string unused: Client status and controlc
+ WARNING: translation string unused: ConnSched scheduler
+ WARNING: translation string unused: ConnSched select profile
+ WARNING: translation string unused: HDD temperature
+ WARNING: translation string unused: Level7 rule
+ WARNING: translation string unused: Local VPN IP
+ WARNING: translation string unused: Ping
+ WARNING: translation string unused: Remote IP
+ WARNING: translation string unused: Remote VPN IP
+ WARNING: translation string unused: Resolv
+ WARNING: translation string unused: TOS Bits
+ WARNING: translation string unused: Verbose
+ WARNING: translation string unused: access refused with this oinkcode
+ WARNING: translation string unused: add network
+ WARNING: translation string unused: add new ovpn
+ WARNING: translation string unused: add service
+ WARNING: translation string unused: add-route
+ WARNING: translation string unused: admin user password has been changed
+ WARNING: translation string unused: administrator user password
+ WARNING: translation string unused: advproxy LDAP auth
+ WARNING: translation string unused: advproxy NTLM auth
+ WARNING: translation string unused: advproxy advanced proxy
+ WARNING: translation string unused: advproxy chgwebpwd ERROR
+ WARNING: translation string unused: advproxy chgwebpwd SUCCESS
+ WARNING: translation string unused: advproxy chgwebpwd change password
+ WARNING: translation string unused: advproxy chgwebpwd change web password
+ WARNING: translation string unused: advproxy chgwebpwd new password
+ WARNING: translation string unused: advproxy chgwebpwd new password confirm
+ WARNING: translation string unused: advproxy chgwebpwd old password
+ WARNING: translation string unused: advproxy chgwebpwd username
+ WARNING: translation string unused: advproxy cre disabled
+ WARNING: translation string unused: advproxy errmsg change fail
+ WARNING: translation string unused: advproxy errmsg change success
+ WARNING: translation string unused: advproxy errmsg invalid user
+ WARNING: translation string unused: advproxy errmsg no password
+ WARNING: translation string unused: advproxy errmsg password incorrect
+ WARNING: translation string unused: advproxy no cre groups
+ WARNING: translation string unused: advproxy ssadvanced proxy
+ WARNING: translation string unused: advproxy update information
+ WARNING: translation string unused: advproxy update notification
+ WARNING: translation string unused: alcatelusb help
+ WARNING: translation string unused: alcatelusb upload
+ WARNING: translation string unused: all interfaces
+ WARNING: translation string unused: all updates installed
+ WARNING: translation string unused: allmsg
+ WARNING: translation string unused: alt information
+ WARNING: translation string unused: alt ovpn
+ WARNING: translation string unused: and
+ WARNING: translation string unused: ansi t1.483
+ WARNING: translation string unused: apply
+ WARNING: translation string unused: archive not exist
+ WARNING: translation string unused: available updates
+ WARNING: translation string unused: backup archive
+ WARNING: translation string unused: backup clear archive
+ WARNING: translation string unused: backup config floppy
+ WARNING: translation string unused: backup configuration
+ WARNING: translation string unused: backup erase key
+ WARNING: translation string unused: backup explain key
+ WARNING: translation string unused: backup explain key li1
+ WARNING: translation string unused: backup explain key li2
+ WARNING: translation string unused: backup explain key li3
+ WARNING: translation string unused: backup explain key no1
+ WARNING: translation string unused: backup explain key no2
+ WARNING: translation string unused: backup export key
+ WARNING: translation string unused: backup extract key
+ WARNING: translation string unused: backup generate key
+ WARNING: translation string unused: backup import dat file
+ WARNING: translation string unused: backup import key
+ WARNING: translation string unused: backup key
+ WARNING: translation string unused: backup key file
+ WARNING: translation string unused: backup key info
+ WARNING: translation string unused: backup media info
+ WARNING: translation string unused: backup missing key
+ WARNING: translation string unused: backup password
+ WARNING: translation string unused: backup protect key password
+ WARNING: translation string unused: backup sets
+ WARNING: translation string unused: backup to floppy
+ WARNING: translation string unused: bad characters in
+ WARNING: translation string unused: bewan adsl pci st
+ WARNING: translation string unused: bewan adsl usb
+ WARNING: translation string unused: bitrate
+ WARNING: translation string unused: bleeding rules
+ WARNING: translation string unused: blue access use hint
+ WARNING: translation string unused: blue interface
+ WARNING: translation string unused: cache management
+ WARNING: translation string unused: cache size
+ WARNING: translation string unused: calamaris report interval (in minutes)
+ WARNING: translation string unused: calc traffic all x minutes
+ WARNING: translation string unused: capsinactive
+ WARNING: translation string unused: cfg restart
+ WARNING: translation string unused: check for net traffic update
+ WARNING: translation string unused: choose config
+ WARNING: translation string unused: choose media
+ WARNING: translation string unused: clear cache
+ WARNING: translation string unused: compression
+ WARNING: translation string unused: connect
+ WARNING: translation string unused: connect the modem
+ WARNING: translation string unused: core notice 1
+ WARNING: translation string unused: core notice 2
+ WARNING: translation string unused: core notice 3
+ WARNING: translation string unused: could not connect to
+ WARNING: translation string unused: could not connect to www ipcop org
+ WARNING: translation string unused: could not connect to www ipfire org
+ WARNING: translation string unused: could not create directory
+ WARNING: translation string unused: could not download latest patch list
+ WARNING: translation string unused: could not download the available updates list
+ WARNING: translation string unused: could not open available updates file
+ WARNING: translation string unused: could not open installed updates file
+ WARNING: translation string unused: could not open update information file
+ WARNING: translation string unused: create
+ WARNING: translation string unused: create new backup
+ WARNING: translation string unused: current dynamic leases
+ WARNING: translation string unused: current media
+ WARNING: translation string unused: current ovpn
+ WARNING: translation string unused: current profile
+ WARNING: translation string unused: custom networks
+ WARNING: translation string unused: custom services
+ WARNING: translation string unused: daily firewallhits
+ WARNING: translation string unused: dat without key
+ WARNING: translation string unused: dbfile
+ WARNING: translation string unused: ddns help dnsmadeeasy
+ WARNING: translation string unused: ddns help freedns
+ WARNING: translation string unused: ddns help plus
+ WARNING: translation string unused: debugme
+ WARNING: translation string unused: deep scan directories
+ WARNING: translation string unused: default networks
+ WARNING: translation string unused: default services
+ WARNING: translation string unused: dhcp base ip fixed lease
+ WARNING: translation string unused: dhcp create fixed leases
+ WARNING: translation string unused: dhcp fixed lease err1
+ WARNING: translation string unused: dhcp fixed lease help1
+ WARNING: translation string unused: dhcp mode
+ WARNING: translation string unused: dhcp server disabled on blue interface
+ WARNING: translation string unused: dhcp server enabled on blue interface
+ WARNING: translation string unused: dial user password
+ WARNING: translation string unused: dial user password has been changed
+ WARNING: translation string unused: dialup settings
+ WARNING: translation string unused: disconnect
+ WARNING: translation string unused: display traffic at home
+ WARNING: translation string unused: dns server
+ WARNING: translation string unused: do not log this port list
+ WARNING: translation string unused: done
+ WARNING: translation string unused: driver
+ WARNING: translation string unused: dynamic dns client
+ WARNING: translation string unused: eciadsl help
+ WARNING: translation string unused: eciadsl upload
+ WARNING: translation string unused: edit network
+ WARNING: translation string unused: edit service
+ WARNING: translation string unused: editor
+ WARNING: translation string unused: email server can not be empty
+ WARNING: translation string unused: enable javascript
+ WARNING: translation string unused: enabled on
+ WARNING: translation string unused: enabledtitle
+ WARNING: translation string unused: encrypted
+ WARNING: translation string unused: err bk 1
+ WARNING: translation string unused: err bk 10 password
+ WARNING: translation string unused: err bk 2 key
+ WARNING: translation string unused: err bk 3 tar
+ WARNING: translation string unused: err bk 4 gz
+ WARNING: translation string unused: err bk 5 encrypt
+ WARNING: translation string unused: err rs 1
+ WARNING: translation string unused: err rs 6 decrypt
+ WARNING: translation string unused: err rs 7 untartst
+ WARNING: translation string unused: err rs 8 untar
+ WARNING: translation string unused: error config
+ WARNING: translation string unused: error external access
+ WARNING: translation string unused: expected
+ WARNING: translation string unused: exportkey
+ WARNING: translation string unused: external access rule changed
+ WARNING: translation string unused: filename
+ WARNING: translation string unused: firewall graphs
+ WARNING: translation string unused: firewall log viewer
+ WARNING: translation string unused: firmware
+ WARNING: translation string unused: firmware upload
+ WARNING: translation string unused: force update
+ WARNING: translation string unused: frequency
+ WARNING: translation string unused: fritzdsl help
+ WARNING: translation string unused: fritzdsl upload
+ WARNING: translation string unused: from email adr
+ WARNING: translation string unused: from email pw
+ WARNING: translation string unused: from email server
+ WARNING: translation string unused: from email user
+ WARNING: translation string unused: from warn email bad
+ WARNING: translation string unused: g.dtm
+ WARNING: translation string unused: g.lite
+ WARNING: translation string unused: gen static key
+ WARNING: translation string unused: generate
+ WARNING: translation string unused: genkey
+ WARNING: translation string unused: green interface
+ WARNING: translation string unused: gz with key
+ WARNING: translation string unused: hint
+ WARNING: translation string unused: host
+ WARNING: translation string unused: host configuration
+ WARNING: translation string unused: hostname and domain already in use
+ WARNING: translation string unused: hours2
+ WARNING: translation string unused: ibod for dual isdn only
+ WARNING: translation string unused: icmp selected but no type
+ WARNING: translation string unused: icmp type
+ WARNING: translation string unused: id
+ WARNING: translation string unused: ids preprocessor
+ WARNING: translation string unused: import
+ WARNING: translation string unused: importkey
+ WARNING: translation string unused: in
+ WARNING: translation string unused: incorrect password
+ WARNING: translation string unused: insert floppy
+ WARNING: translation string unused: insert removable device
+ WARNING: translation string unused: install new update
+ WARNING: translation string unused: installed
+ WARNING: translation string unused: installed updates
+ WARNING: translation string unused: intrusion detection system log viewer
+ WARNING: translation string unused: invalid cache size
+ WARNING: translation string unused: invalid date entered
+ WARNING: translation string unused: invalid downlink speed
+ WARNING: translation string unused: invalid loaded file
+ WARNING: translation string unused: invalid md5sum
+ WARNING: translation string unused: invalid port list
+ WARNING: translation string unused: invalid time entered
+ WARNING: translation string unused: invalid uplink speed
+ WARNING: translation string unused: invalid upstream proxy username or password setting
+ WARNING: translation string unused: invert
+ WARNING: translation string unused: ip address in use
+ WARNING: translation string unused: ipfire side
+ WARNING: translation string unused: ipfire side is invalid
+ WARNING: translation string unused: iptable rules
+ WARNING: translation string unused: isdn
+ WARNING: translation string unused: isdn settings
+ WARNING: translation string unused: isdn1
+ WARNING: translation string unused: isdn2
+ WARNING: translation string unused: javascript menu error1
+ WARNING: translation string unused: javascript menu error2
+ WARNING: translation string unused: kernel version
+ WARNING: translation string unused: key stuff
+ WARNING: translation string unused: lateprompting
+ WARNING: translation string unused: length
+ WARNING: translation string unused: line
+ WARNING: translation string unused: loaded modules
+ WARNING: translation string unused: local hard disk
+ WARNING: translation string unused: localkeyfile
+ WARNING: translation string unused: log enabled
+ WARNING: translation string unused: log viewer
+ WARNING: translation string unused: loosedirectorychecking
+ WARNING: translation string unused: ls_dhcpd
+ WARNING: translation string unused: ls_disk space
+ WARNING: translation string unused: ls_free/swan
+ WARNING: translation string unused: ls_httpd
+ WARNING: translation string unused: ls_init
+ WARNING: translation string unused: ls_kernel
+ WARNING: translation string unused: ls_modprobe
+ WARNING: translation string unused: ls_pam_unix
+ WARNING: translation string unused: ls_sshd
+ WARNING: translation string unused: ls_syslogd
+ WARNING: translation string unused: mac address error not 00
+ WARNING: translation string unused: manage ovpn
+ WARNING: translation string unused: manual control and status
+ WARNING: translation string unused: marked
+ WARNING: translation string unused: max incoming size
+ WARNING: translation string unused: max outgoing size
+ WARNING: translation string unused: max size
+ WARNING: translation string unused: mbmon fan in
+ WARNING: translation string unused: mbmon graphs
+ WARNING: translation string unused: mbmon temp in
+ WARNING: translation string unused: mbmon value
+ WARNING: translation string unused: min size
+ WARNING: translation string unused: missing dat
+ WARNING: translation string unused: missing gz
+ WARNING: translation string unused: modem on com1
+ WARNING: translation string unused: modem on com2
+ WARNING: translation string unused: modem on com3
+ WARNING: translation string unused: modem on com4
+ WARNING: translation string unused: modem on com5
+ WARNING: translation string unused: modulation
+ WARNING: translation string unused: monthly firewallhits
+ WARNING: translation string unused: monthly start day bad
+ WARNING: translation string unused: monthly traffic bad
+ WARNING: translation string unused: monthly volume
+ WARNING: translation string unused: monthly volume start day
+ WARNING: translation string unused: monthly volume start day short
+ WARNING: translation string unused: mount
+ WARNING: translation string unused: nat-traversal
+ WARNING: translation string unused: net address
+ WARNING: translation string unused: net config type
+ WARNING: translation string unused: net config type help
+ WARNING: translation string unused: net-traffic configuration
+ WARNING: translation string unused: network added
+ WARNING: translation string unused: network configuration
+ WARNING: translation string unused: network removed
+ WARNING: translation string unused: network status information
+ WARNING: translation string unused: network traffic graphs
+ WARNING: translation string unused: network updated
+ WARNING: translation string unused: networks settings
+ WARNING: translation string unused: new optionsfw must boot
+ WARNING: translation string unused: no alcatelusb firmware
+ WARNING: translation string unused: no cfg upload
+ WARNING: translation string unused: no eciadsl synch.bin file
+ WARNING: translation string unused: no fritzdsl driver
+ WARNING: translation string unused: no information available
+ WARNING: translation string unused: no modem selected
+ WARNING: translation string unused: no set selected
+ WARNING: translation string unused: nonetworkname
+ WARNING: translation string unused: noservicename
+ WARNING: translation string unused: notes
+ WARNING: translation string unused: o-no
+ WARNING: translation string unused: o-yes
+ WARNING: translation string unused: online help en
+ WARNING: translation string unused: only red
+ WARNING: translation string unused: openvpn client
+ WARNING: translation string unused: openvpn server
+ WARNING: translation string unused: optional data
+ WARNING: translation string unused: optionsfw portlist hint
+ WARNING: translation string unused: optionsfw warning
+ WARNING: translation string unused: or
+ WARNING: translation string unused: original
+ WARNING: translation string unused: other countries
+ WARNING: translation string unused: out
+ WARNING: translation string unused: outgoing firewall outgoing firewall reserved groupname
+ WARNING: translation string unused: ovpn
+ WARNING: translation string unused: ovpn config
+ WARNING: translation string unused: ovpn dl
+ WARNING: translation string unused: ovpn log
+ WARNING: translation string unused: ovpn_fastio
+ WARNING: translation string unused: ovpn_fragment
+ WARNING: translation string unused: ovpn_mssfix
+ WARNING: translation string unused: ovpn_mtudisc
+ WARNING: translation string unused: ovpn_processprio
+ WARNING: translation string unused: ovpn_processprioD
+ WARNING: translation string unused: ovpn_processprioED
+ WARNING: translation string unused: ovpn_processprioEH
+ WARNING: translation string unused: ovpn_processprioEN
+ WARNING: translation string unused: ovpn_processprioH
+ WARNING: translation string unused: ovpn_processprioLN
+ WARNING: translation string unused: ovpn_processprioN
+ WARNING: translation string unused: ovpn_processprioVD
+ WARNING: translation string unused: ovpn_processprioVH
+ WARNING: translation string unused: ovpnstatus log
+ WARNING: translation string unused: ovpnsys log
+ WARNING: translation string unused: package failed to install
++WARNING: translation string unused: pakfire core update auto
+ WARNING: translation string unused: pakfire updates
+ WARNING: translation string unused: password contains illegal characters
+ WARNING: translation string unused: password crypting key
+ WARNING: translation string unused: passwords must be at least 6 characters in length
+ WARNING: translation string unused: phonebook entry
+ WARNING: translation string unused: ping disabled
+ WARNING: translation string unused: polfile
+ WARNING: translation string unused: ports
+ WARNING: translation string unused: pots
+ WARNING: translation string unused: pppoe
+ WARNING: translation string unused: present
+ WARNING: translation string unused: profiles
+ WARNING: translation string unused: proxy access graphs
+ WARNING: translation string unused: proxy no proxy extend
+ WARNING: translation string unused: proxy no proxy local
+ WARNING: translation string unused: proxy port
+ WARNING: translation string unused: psk
+ WARNING: translation string unused: quick control
+ WARNING: translation string unused: reboot schedule
+ WARNING: translation string unused: rebooting
+ WARNING: translation string unused: refresh update list
+ WARNING: translation string unused: released
+ WARNING: translation string unused: removable device advice
+ WARNING: translation string unused: reportfile
+ WARNING: translation string unused: requested data
+ WARNING: translation string unused: restore hardware settings
+ WARNING: translation string unused: root
+ WARNING: translation string unused: root path
+ WARNING: translation string unused: root user password
+ WARNING: translation string unused: route subnet is invalid
+ WARNING: translation string unused: router ip
+ WARNING: translation string unused: rules already up to date
+ WARNING: translation string unused: safe removal of umounted device
+ WARNING: translation string unused: save error
+ WARNING: translation string unused: select media
+ WARNING: translation string unused: selecttraffic
+ WARNING: translation string unused: send email notification
+ WARNING: translation string unused: send test mail
+ WARNING: translation string unused: server reserved
+ WARNING: translation string unused: service added
+ WARNING: translation string unused: service removed
+ WARNING: translation string unused: service updated
+ WARNING: translation string unused: servicename
+ WARNING: translation string unused: services settings
+ WARNING: translation string unused: shaping add options
+ WARNING: translation string unused: shaping list options
+ WARNING: translation string unused: show areas
+ WARNING: translation string unused: show lines
+ WARNING: translation string unused: shutdown control
+ WARNING: translation string unused: shutdown2
+ WARNING: translation string unused: shutting down
+ WARNING: translation string unused: sitekeyfile
+ WARNING: translation string unused: smbreload
+ WARNING: translation string unused: sort ascending
+ WARNING: translation string unused: sort descending
+ WARNING: translation string unused: squid extension methods
+ WARNING: translation string unused: squid extension methods invalid
+ WARNING: translation string unused: squid fix cache
+ WARNING: translation string unused: ssh access tip
+ WARNING: translation string unused: ssh1 disabled
+ WARNING: translation string unused: ssh1 enabled
+ WARNING: translation string unused: ssh1 support
+ WARNING: translation string unused: ssnetwork status
+ WARNING: translation string unused: sspasswords
+ WARNING: translation string unused: ssproxy graphs
+ WARNING: translation string unused: sssystem status
+ WARNING: translation string unused: sstraffic graphs
+ WARNING: translation string unused: subject test
+ WARNING: translation string unused: subject warn
+ WARNING: translation string unused: subnet
+ WARNING: translation string unused: subnet is invalid
+ WARNING: translation string unused: successfully refreshed updates list
+ WARNING: translation string unused: system graphs
+ WARNING: translation string unused: system log viewer
+ WARNING: translation string unused: system status information
+ WARNING: translation string unused: test
+ WARNING: translation string unused: test email could not be sent
+ WARNING: translation string unused: test email was sent
+ WARNING: translation string unused: the following update was successfully installed
+ WARNING: translation string unused: there are updates
+ WARNING: translation string unused: there are updates available
+ WARNING: translation string unused: this feature has been sponsored by
+ WARNING: translation string unused: this is not a valid archive
+ WARNING: translation string unused: this is not an authorised update
+ WARNING: translation string unused: this months volume
+ WARNING: translation string unused: this update is already installed
+ WARNING: translation string unused: this weeks volume
+ WARNING: translation string unused: time date manually reset
+ WARNING: translation string unused: to email adr
+ WARNING: translation string unused: to install an update
+ WARNING: translation string unused: to warn email bad
+ WARNING: translation string unused: too long 80 char max
+ WARNING: translation string unused: traffic back
+ WARNING: translation string unused: traffic calc time
+ WARNING: translation string unused: traffic calc time bad
+ WARNING: translation string unused: traffic info messages
+ WARNING: translation string unused: traffic monitor
+ WARNING: translation string unused: traffic shaping
+ WARNING: translation string unused: traffic shaping settings
+ WARNING: translation string unused: traffic warn level bad
+ WARNING: translation string unused: trafficblue
+ WARNING: translation string unused: trafficdate
+ WARNING: translation string unused: trafficfrom
+ WARNING: translation string unused: trafficgreen
+ WARNING: translation string unused: trafficin
+ WARNING: translation string unused: trafficorange
+ WARNING: translation string unused: trafficout
+ WARNING: translation string unused: trafficred
+ WARNING: translation string unused: trafficsum
+ WARNING: translation string unused: trafficto
+ WARNING: translation string unused: transfer limits
+ WARNING: translation string unused: transparent on
+ WARNING: translation string unused: umount
+ WARNING: translation string unused: umount removable media before to unplug
+ WARNING: translation string unused: unencrypted
+ WARNING: translation string unused: unknown
+ WARNING: translation string unused: update transcript
+ WARNING: translation string unused: updates
+ WARNING: translation string unused: updates is old1
+ WARNING: translation string unused: updates is old2
+ WARNING: translation string unused: updxlrtr children
+ WARNING: translation string unused: updxlrtr invalid num of children
+ WARNING: translation string unused: updxlrtr unknown
+ WARNING: translation string unused: updxlrtr update information
+ WARNING: translation string unused: updxlrtr update notification
+ WARNING: translation string unused: upload fcdsl.o
+ WARNING: translation string unused: upload file
+ WARNING: translation string unused: upload static key
+ WARNING: translation string unused: upload successful
+ WARNING: translation string unused: upload synch.bin
+ WARNING: translation string unused: upload update file
+ WARNING: translation string unused: upstream password
+ WARNING: translation string unused: upstream proxy host:port
+ WARNING: translation string unused: upstream username
+ WARNING: translation string unused: uptime and users
+ WARNING: translation string unused: urlfilter background image
+ WARNING: translation string unused: urlfilter background text
+ WARNING: translation string unused: urlfilter enable jpeg
+ WARNING: translation string unused: urlfilter update information
+ WARNING: translation string unused: urlfilter update notification
+ WARNING: translation string unused: urlfilter update results
+ WARNING: translation string unused: urlfilter upload background
+ WARNING: translation string unused: use
+ WARNING: translation string unused: use dov
+ WARNING: translation string unused: use ibod
+ WARNING: translation string unused: view log
+ WARNING: translation string unused: vpn aggrmode
+ WARNING: translation string unused: vpn on blue
+ WARNING: translation string unused: vpn on green
+ WARNING: translation string unused: vpn on orange
+ WARNING: translation string unused: warn when traffic reaches
+ WARNING: translation string unused: web proxy configuration
+ WARNING: translation string unused: weekly firewallhits
+ WARNING: translation string unused: xtaccess bad transfert
+ WARNING: translation string unused: yearly firewallhits
++WARNING: untranslated string: Add a route
++WARNING: untranslated string: Edit an existing route
+ WARNING: untranslated string: Scan for Songs
+ WARNING: untranslated string: bytes
++WARNING: untranslated string: extrahd because there is already a device mounted
++WARNING: untranslated string: extrahd cant umount
++WARNING: untranslated string: extrahd install or load driver
++WARNING: untranslated string: extrahd maybe the device is in use
++WARNING: untranslated string: extrahd to
++WARNING: untranslated string: extrahd to root
++WARNING: untranslated string: extrahd you cant mount
+ WARNING: untranslated string: minute
+ WARNING: untranslated string: new
+ WARNING: untranslated string: outgoing firewall reserved groupname
++WARNING: untranslated string: route config changed
++WARNING: untranslated string: routing config added
++WARNING: untranslated string: routing config changed
++WARNING: untranslated string: routing table
++WARNING: untranslated string: vpn keyexchange

diff --combined doc/language_missings
index 3de5aec9e05eb3a993dc8ebdf2ed150e1908992e,ed4494223b51acc6d986e193d69e80bf09f87e7d..229c8a3f504f311ae855eb109717f373bc58dd07
--- 1/doc/language_missings
--- 2/doc/language_missings
+++ b/doc/language_missings
@@@ -11,6 -11,7 +11,6 @@@
  # Checking cgi-bin translations for language: fr                           #
  ############################################################################
  < dns address deleted txt
 -< extrahd detected drives
  < fireinfo ipfire version
  < fireinfo is disabled
  < fireinfo is enabled
@@@ -36,7 -37,6 +36,7 @@@
  < upload new ruleset
  < urlfilter file ext block
  < urlfilter mode block
 +< vpn keyexchange
  < wlanap access point
  < wlanap channel
  < wlanap debugging
@@@ -98,21 -98,17 +98,40 @@@
  < outgoing firewall view group
  < Set time on boot
  < system information
 +< vpn keyexchange
  ############################################################################
  # Checking install/setup translations for language: pl                     #
  ############################################################################
  ############################################################################
  # Checking cgi-bin translations for language: pl                           #
  ############################################################################
 +< extrahd because there is already a device mounted
 +< extrahd cant umount
 +< extrahd install or load driver
 +< extrahd maybe the device is in use
 +< extrahd to
 +< extrahd to root
 +< extrahd unable to read
 +< extrahd unable to write
 +< extrahd you cant mount
  < minute
 +< vpn keyexchange
+ ############################################################################
+ # Checking install/setup translations for language: ru                     #
+ ############################################################################
+ ############################################################################
+ # Checking cgi-bin translations for language: ru                           #
+ ############################################################################
++< Add a route
++< Edit an existing route
++< extrahd because there is already a device mounted
++< extrahd cant umount
++< extrahd install or load driver
++< extrahd maybe the device is in use
++< extrahd to
++< extrahd to root
++< extrahd unable to read
++< extrahd unable to write
++< extrahd you cant mount
+ < minute
++< vpn keyexchange

diff --combined make.sh
index 178fd7184e85ae88b5ed6828f613a006e1816e6e,45185ba5d09a0aff21020847cc3892b2e9eee6c0..af884716983617250e1aeb4f7b4d594a960e1838
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -24,7 -24,7 +24,7 @@@
  
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
 -VERSION="2.9"                                                 # Version number
 +VERSION="2.10"                                                        # Version number
  CORE="52"                                                     # Core Level (Filename)
  PAKFIRE_CORE="51"                                             # Core Level (PAKFIRE)
  GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`            # Git Branch
@@@ -615,6 -615,7 +615,7 @@@ buildipfire() 
    ipfiremake phpSANE
    ipfiremake tunctl
    ipfiremake nagios
+   ipfiremake nagios_nrpe
    ipfiremake ebtables
    ipfiremake fontconfig
    ipfiremake freefont
@@@ -692,7 -693,8 +693,7 @@@
    ipfiremake python-m2crypto
    ipfiremake wireless-regdb
    ipfiremake crda
 -  ipfiremake libsatsolver
 -  ipfiremake python-satsolver
 +  ipfiremake libsolv
    ipfiremake python-distutils-extra
    ipfiremake python-lzma
    ipfiremake python-progressbar
@@@ -708,7 -710,7 +709,7 @@@
    echo >> $BASEDIR/build/var/ipfire/firebuild
    cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild
    echo $PAKFIRE_CORE > $BASEDIR/build/opt/pakfire/db/core/mine
 -  if [ "$GIT_BRANCH" = "master" ]; then
 +  if [ "$GIT_BRANCH" = "next" ]; then
        echo "$NAME $VERSION - (Development Build: $GIT_LASTCOMMIT)" > $BASEDIR/build/etc/system-release
    else
        echo "$NAME $VERSION - $GIT_BRANCH" > $BASEDIR/build/etc/system-release