Merge branch 'master' into next

Conflicts:
	doc/language_issues.nl
	doc/language_issues.tr
This commit is contained in:
Michael Tremer
2014-05-09 01:31:43 +02:00
92 changed files with 7609 additions and 3886 deletions

View File

@@ -588,6 +588,7 @@ WARNING: untranslated string: advproxy errmsg cache
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
@@ -903,6 +904,7 @@ WARNING: untranslated string: proxy reports monthly
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