Merge remote-tracking branch 'ummeegge/langs' into next

diff --combined langs/en/cgi-bin/en.pl
index b12ae7d2ec367453c827e54a288f2e9eecea0996,0a634d1b7a2538e81bd9d26562e43acec8f5b9a0..b84c6bbbf30c1efd78a8beae551368e82ff84db6
--- 1/langs/en/cgi-bin/en.pl
--- 2/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@@ -897,7 -897,7 +897,7 @@@
  'firewall log' => 'Firewall log',
  'firewall log viewer' => 'Firewall Log Viewer',
  'firewall logs' => 'Firewall Logs',
- 'firewall logs ip' => 'Fw-Logdgraphs (IP)',
+ 'firewall logs ip' => 'Fw-Loggraphs (IP)',
  'firewall logs port' => 'Fw-Loggraphs (Port)',
  'firewallhits' => 'firewallhits',
  'firmware' => 'Firmware',
@@@ -1831,56 -1831,6 +1831,56 @@@
  'tone' => 'Tone',
  'tone dial' => 'Tone dial:',
  'too long 80 char max' => ' is too long, maximum allowed is 80 characters',
 +'tor' => 'Tor',
 +'tor accounting' => 'Accounting',
 +'tor accounting bytes' => 'Traffic (read/written)',
 +'tor accounting bytes left' => 'left',
 +'tor accounting interval' => 'Interval (UTC)',
 +'tor accounting limit' => 'Accounting limit (MB)',
 +'tor accounting period' => 'Accounting period',
 +'tor accounting period daily' => 'daily',
 +'tor accounting period monthly' => 'monthly',
 +'tor accounting period weekly' => 'weekly',
 +'tor acls' => 'Access Control',
 +'tor allowed subnets' => 'Allowed subnets (one per line)',
 +'tor bandwidth burst' => 'Max. burst',
 +'tor bandwidth rate' => 'Max. rate',
 +'tor bandwidth settings' => 'Bandwidth Settings',
 +'tor bandwidth unlimited' => 'unlimited',
 +'tor bridge enabled' => 'Enable Tor bridge',
 +'tor common settings' => 'Common Settings',
 +'tor configuration' => 'Tor Configuration',
 +'tor connected relays' => 'Connected relays',
 +'tor contact info' => 'Contact Info',
 +'tor enabled' => 'Enable Tor',
 +'tor errmsg invalid accounting limit' => 'Invalid accounting limit',
 +'tor errmsg invalid ip or mask' => 'Invalid IP subnet',
 +'tor errmsg invalid node id' => 'Invalid node ID',
 +'tor errmsg invalid relay address' => 'Invalid relay address',
 +'tor errmsg invalid relay name' => 'Invalid relay nickname',
 +'tor errmsg invalid relay port' => 'Invalid relay port',
 +'tor errmsg invalid socks port' => 'Invalid SOCKS port',
 +'tor exit country' => 'Exit country',
 +'tor exit country any' => 'Any country',
 +'tor exit nodes' => 'Exit Nodes',
 +'tor relay address' => 'Relay address',
 +'tor relay configuration' => 'Tor Relay Configuration',
 +'tor relay enabled' => 'Enable Tor Relay',
 +'tor relay external address' => 'Relay external address',
 +'tor relay fingerprint' => 'Relay fingerprint',
 +'tor relay mode' => 'Relay mode',
 +'tor relay mode bridge' => 'Bridge',
 +'tor relay mode exit' => 'Exit-Node',
 +'tor relay mode private bridge' => 'Private bridge',
 +'tor relay mode relay' => 'Relay only',
 +'tor relay nickname' => 'Relay nickname',
 +'tor relay port' => 'Relay port',
 +'tor socks port' => 'SOCKS port',
 +'tor stats' => 'Statistics',
 +'tor traffic limit hard' => 'Traffic limit has been reached.',
 +'tor traffic limit soft' => 'Traffic limit almost reached. Not accepting any new connections.',
 +'tor traffic read written' => 'Total traffic (read/written)',
 +'tor use exit nodes' => 'Use only these exit nodes (one per line)',
  'total connection time' => 'Total connection time',
  'total hits for log section' => 'Total hits for log section',
  'traffic back' => 'Back',