Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x

diff --combined doc/language_issues.es
index 17920311a1b704e398fd2a3931ca9fbc52f95e42,32e688c77900edb974cf986c5fa8c14a89f8a3b3..b854a2b7a661cd648cc7d7e9ca4df61b2ea563c9
--- 1/doc/language_issues.es
--- 2/doc/language_issues.es
+++ b/doc/language_issues.es
@@@ -588,6 -588,7 +588,7 @@@ WARNING: untranslated string: advproxy 
  WARNING: untranslated string: advproxy errmsg invalid upstream proxy
  WARNING: untranslated string: advproxy errmsg proxy ports equal
  WARNING: untranslated string: advproxy proxy port transparent
+ WARNING: untranslated string: atm device
  WARNING: untranslated string: attention
  WARNING: untranslated string: bit
  WARNING: untranslated string: bytes
@@@ -873,7 -874,6 +874,7 @@@ WARNING: untranslated string: proxy rep
  WARNING: untranslated string: proxy reports today
  WARNING: untranslated string: proxy reports weekly
  WARNING: untranslated string: qos enter bandwidths
 +WARNING: untranslated string: random number generator daemon
  WARNING: untranslated string: red1
  WARNING: untranslated string: route config changed
  WARNING: untranslated string: routing config added

diff --combined doc/language_issues.fr
index 889f9034426d1b18ebe0459d67440b0a1e40d8d3,a5a15c9162433ee6dc67fa8bb50a1b3b4b8bf4ae..6ab29e8bb64b4f8e67d1eb0895f72668dd7244f2
--- 1/doc/language_issues.fr
--- 2/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@@ -598,6 -598,7 +598,7 @@@ WARNING: untranslated string: advproxy 
  WARNING: untranslated string: advproxy errmsg invalid upstream proxy
  WARNING: untranslated string: advproxy errmsg proxy ports equal
  WARNING: untranslated string: advproxy proxy port transparent
+ WARNING: untranslated string: atm device
  WARNING: untranslated string: attention
  WARNING: untranslated string: bit
  WARNING: untranslated string: bytes
@@@ -880,7 -881,6 +881,7 @@@ WARNING: untranslated string: proxy rep
  WARNING: untranslated string: proxy reports today
  WARNING: untranslated string: proxy reports weekly
  WARNING: untranslated string: qos enter bandwidths
 +WARNING: untranslated string: random number generator daemon
  WARNING: untranslated string: red1
  WARNING: untranslated string: route config changed
  WARNING: untranslated string: routing config added

diff --combined doc/language_issues.nl
index ace5ffd7f56aea5dbab0fd9db40ced07d0a07f1f,b64920020c86ffe86201be4b9d64769545801b35..1fa7b18739d5b4a7ba77c31dc4337dc1ba498b7a
--- 1/doc/language_issues.nl
--- 2/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@@ -600,6 -600,7 +600,7 @@@ WARNING: untranslated string: addon
  WARNING: untranslated string: advproxy cache-digest
  WARNING: untranslated string: advproxy errmsg proxy ports equal
  WARNING: untranslated string: advproxy proxy port transparent
+ WARNING: untranslated string: atm device
  WARNING: untranslated string: bit
  WARNING: untranslated string: bytes
  WARNING: untranslated string: ccd err isipsecrw
@@@ -802,7 -803,6 +803,7 @@@ WARNING: untranslated string: ovpn por
  WARNING: untranslated string: p2p block
  WARNING: untranslated string: p2p block save notice
  WARNING: untranslated string: qos enter bandwidths
 +WARNING: untranslated string: random number generator daemon
  WARNING: untranslated string: red1
  WARNING: untranslated string: route config changed
  WARNING: untranslated string: routing config added

diff --combined doc/language_issues.pl
index 17920311a1b704e398fd2a3931ca9fbc52f95e42,32e688c77900edb974cf986c5fa8c14a89f8a3b3..b854a2b7a661cd648cc7d7e9ca4df61b2ea563c9
--- 1/doc/language_issues.pl
--- 2/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@@ -588,6 -588,7 +588,7 @@@ WARNING: untranslated string: advproxy 
  WARNING: untranslated string: advproxy errmsg invalid upstream proxy
  WARNING: untranslated string: advproxy errmsg proxy ports equal
  WARNING: untranslated string: advproxy proxy port transparent
+ WARNING: untranslated string: atm device
  WARNING: untranslated string: attention
  WARNING: untranslated string: bit
  WARNING: untranslated string: bytes
@@@ -873,7 -874,6 +874,7 @@@ WARNING: untranslated string: proxy rep
  WARNING: untranslated string: proxy reports today
  WARNING: untranslated string: proxy reports weekly
  WARNING: untranslated string: qos enter bandwidths
 +WARNING: untranslated string: random number generator daemon
  WARNING: untranslated string: red1
  WARNING: untranslated string: route config changed
  WARNING: untranslated string: routing config added

diff --combined doc/language_issues.ru
index 3e0748027005088f2130994084c23a6998db3e52,7c1b5f87da517ff76da506d175a1afe3e770c707..4058098609168fbc2f48ed489da08ac8929b9e24
--- 1/doc/language_issues.ru
--- 2/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@@ -591,6 -591,7 +591,7 @@@ WARNING: untranslated string: advproxy 
  WARNING: untranslated string: advproxy errmsg invalid upstream proxy
  WARNING: untranslated string: advproxy errmsg proxy ports equal
  WARNING: untranslated string: advproxy proxy port transparent
+ WARNING: untranslated string: atm device
  WARNING: untranslated string: attention
  WARNING: untranslated string: bit
  WARNING: untranslated string: bytes
@@@ -863,7 -864,6 +864,7 @@@ WARNING: untranslated string: proxy rep
  WARNING: untranslated string: proxy reports today
  WARNING: untranslated string: proxy reports weekly
  WARNING: untranslated string: qos enter bandwidths
 +WARNING: untranslated string: random number generator daemon
  WARNING: untranslated string: red1
  WARNING: untranslated string: route config changed
  WARNING: untranslated string: routing config added

diff --combined doc/language_issues.tr
index d5576f3438ce461b6b93b49a80865a248a3fd48f,93166e621f91e74fe8cf0a832529d64b35d85367..96c38538add04d228e995225c787d01efb3c3e4f
--- 1/doc/language_issues.tr
--- 2/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@@ -641,9 -641,9 +641,10 @@@ WARNING: translation string unused: xta
  WARNING: translation string unused: year-graph
  WARNING: translation string unused: yearly firewallhits
  WARNING: untranslated string: Scan for Songs
+ WARNING: untranslated string: atm device
  WARNING: untranslated string: bytes
  WARNING: untranslated string: fwhost err hostip
 +WARNING: untranslated string: random number generator daemon
  WARNING: untranslated string: route config changed
  WARNING: untranslated string: routing config added
  WARNING: untranslated string: routing config changed

diff --combined doc/language_missings
index f6b033925daeaa5d6730c033078c84b9a17094f0,601c9c799026327c7a9de13c259a0b5b7acc6547..1a386c19c23e1affcf211fec821fc91c669d8013
--- 1/doc/language_missings
--- 2/doc/language_missings
+++ b/doc/language_missings
@@@ -23,6 -23,7 +23,7 @@@
  < age shour
  < age sminute
  < age ssecond
+ < atm device
  < attention
  < bit
  < ccd add
@@@ -356,7 -357,6 +357,7 @@@
  < proxy reports today
  < proxy reports weekly
  < qos enter bandwidths
 +< random number generator daemon
  < red1
  < server restart
  < snat new source ip address
@@@ -501,6 -501,7 +502,7 @@@
  < age sminute
  < age ssecond
  < Async logging enabled
+ < atm device
  < attention
  < bit
  < ccd add
@@@ -849,7 -850,6 +851,7 @@@
  < proxy reports today
  < proxy reports weekly
  < qos enter bandwidths
 +< random number generator daemon
  < red1
  < server restart
  < Set time on boot
@@@ -970,6 -970,7 +972,7 @@@
  < age shour
  < age sminute
  < age ssecond
+ < atm device
  < attention
  < bit
  < ccd add
@@@ -1296,7 -1297,6 +1299,7 @@@
  < proxy reports today
  < proxy reports weekly
  < qos enter bandwidths
 +< random number generator daemon
  < red1
  < server restart
  < snat new source ip address
@@@ -1416,6 -1416,7 +1419,7 @@@
  < age shour
  < age sminute
  < age ssecond
+ < atm device
  < attention
  < bit
  < ccd add
@@@ -1746,7 -1747,6 +1750,7 @@@
  < proxy reports today
  < proxy reports weekly
  < qos enter bandwidths
 +< random number generator daemon
  < red1
  < server restart
  < snat new source ip address

diff --combined langs/de/cgi-bin/de.pl
index 8457fff9518b8fb7cb47cb48c295e204b1fff24f,2dd87d224cb7362060a4cd910da0c2b20cac536c..090510fe398552a1c6721b742ae676785e12b723
--- 1/langs/de/cgi-bin/de.pl
--- 2/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@@ -99,7 -99,6 +99,6 @@@
  'admin user password has been changed' => 'Passwort für Benutzer admin wurde geändert.',
  'admin users' => 'Liste der Benutzer mit Super User Rechten',
  'administrator user password' => 'Passwort für Benutzer "admin":',
- 'adsl settings' => 'ADSL-Einstellungen',
  'advanced' => 'Erweitert',
  'advanced server' => 'Erweiterte Server-Optionen',
  'advproxy AUTH always required' => 'Authentifizierung für uneingeschränkte Quelladressen erforderlich',
@@@ -366,6 -365,8 +365,8 @@@
  'are you sure' => 'Sind Sie sicher?',
  'arp table entries' => 'Einträge der ARP-Tabelle',
  'artist' => 'Künstler',
+ 'atm device' => 'Device:',
+ 'atm settings' => 'ATM-Einstellungen',
  'attemps' => 'Versuche',
  'attention' => 'ACHTUNG',
  'august' => 'August',
@@@ -1782,7 -1783,6 +1783,7 @@@
  'qos warning' => 'Die Regel <strong>muss</strong> wieder gespeichert werden, ansonsten wird sie verworfen!',
  'quick playlist' => 'Quick Playlist',
  'ram' => 'RAM-Speicher',
 +'random number generator daemon' => 'Random Number Generator Daemon',
  'read bytes' => 'Gelesene Bytes',
  'read list' => 'Liste der Leseberechtigten',
  'real address' => 'Reale Addresse',

diff --combined langs/en/cgi-bin/en.pl
index f87f32675c93e02160f23bffd734e1617c5e18eb,67f4269963b2e143d7009cfaa01f47345953c67e..de29f34ec48c4a6c6ce1f5c2a303f97ddb291827
--- 1/langs/en/cgi-bin/en.pl
--- 2/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@@ -99,7 -99,6 +99,6 @@@
  'admin user password has been changed' => 'Admin user password has been changed.',
  'admin users' => 'User with superuser rights',
  'administrator user password' => 'Admin user password:',
- 'adsl settings' => 'ADSL settings',
  'advanced' => 'Advanced',
  'advanced server' => 'Advanced server options',
  'advproxy AUTH always required' => 'Require authentication for unrestricted source addresses',
@@@ -368,6 -367,8 +367,8 @@@
  'are you sure' => 'Are you sure?',
  'arp table entries' => 'ARP Table Entries',
  'artist' => 'Artist',
+ 'atm device' => 'Device:',
+ 'atm settings' => 'ATM settings',
  'attemps' => 'Attempts',
  'attention' => 'ATTENTION',
  'august' => 'August',
@@@ -1814,7 -1815,6 +1815,7 @@@
  'quick control' => 'Quick Control',
  'quick playlist' => 'Quick Playlist',
  'ram' => 'RAM',
 +'random number generator daemon' => 'Random Number Generator Daemon',
  'read bytes' => 'Read Bytes',
  'read list' => 'list with readonly hosts',
  'real address' => 'Real Address',