Merge branch 'next' of https://github.com/ipfire/ipfire-2.x into feature_firewalllog_first_last

This commit is contained in:
Alf Høgemark
2014-02-15 15:13:16 +01:00
27 changed files with 3648 additions and 7129 deletions

View File

@@ -188,6 +188,7 @@
'advproxy banned mac clients' => 'Gesperrte MAC-Adressen (eine pro Zeile)',
'advproxy cache management' => 'Cacheverwaltung',
'advproxy cache replacement policy' => 'Cache Ersetzungsrichtlinie',
'advproxy cache-digest' => 'Cache-Digest-Erstellung aktivieren',
'advproxy chgwebpwd ERROR' => 'F E H L E R :',
'advproxy chgwebpwd SUCCESS' => 'E R F O L G :',
'advproxy chgwebpwd change password' => 'Passwort ändern',