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

diff --cc doc/language_issues.es
Simple merge

diff --cc doc/language_issues.fr
Simple merge

diff --cc doc/language_issues.nl
Simple merge

diff --cc doc/language_issues.pl
Simple merge

diff --cc doc/language_issues.ru
Simple merge

diff --cc 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 --cc doc/language_missings
Simple merge

diff --cc langs/de/cgi-bin/de.pl
Simple merge

diff --cc langs/en/cgi-bin/en.pl
Simple merge