Merge branch 'next' into fifteen

This commit is contained in:
Michael Tremer
2013-10-14 14:12:04 +02:00
14 changed files with 72 additions and 15 deletions

View File

@@ -551,6 +551,8 @@ WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: advproxy cache-digest
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: age second
WARNING: untranslated string: age seconds
WARNING: untranslated string: age shour