Merge branch 'next' into firewall

Conflicts:
	src/initscripts/init.d/tor

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
Simple merge

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

diff --cc src/initscripts/init.d/tor
index 863b420d3a44a83b9747bbc960d59563a436daca,4fef577ac7fb2aee0118f0dad1b4643898c65061..d631e867f915e123e918383b3c9caa86af1e5a71
--- 1/src/initscripts/init.d/tor
--- 2/src/initscripts/init.d/tor
+++ b/src/initscripts/init.d/tor
@@@ -9,9 -9,13 +9,13 @@@
  . /etc/sysconfig/rc
  . ${rc_functions}
  
 +eval $(/usr/local/bin/readhash /var/ipfire/tor/settings)
 +
+ function tor_is_enabled() {
+       [ "${TOR_ENABLED}" = "on" ] || [ "${TOR_RELAY_ENABLED}" = "on" ]
+ }
+ 
  function setup_firewall() {
 -      eval $(/usr/local/bin/readhash /var/ipfire/tor/settings)
 -
        # Flush all rules.
        flush_firewall