Merge remote-tracking branch 'origin/next' into install-raid

This commit is contained in:
Michael Tremer
2014-08-20 21:46:49 +02:00
273 changed files with 32959 additions and 2113 deletions

View File

@@ -101,7 +101,6 @@
'advproxy AUTH method ldap' => 'LDAP',
'advproxy AUTH method ncsa' => 'Локальный',
'advproxy AUTH method none' => 'Нет',
'advproxy AUTH method ntlm' => 'Windows',
'advproxy AUTH method radius' => 'RADIUS',
'advproxy AUTH no auth' => 'Домен без аутентификации (один на строчку)',
'advproxy AUTH number of auth processes' => 'Кол-во процессов аутентификации',