Merge changes from upstream

I'm a little angry
This commit is contained in:
ZonD Eighty 2012-12-28 23:31:02 +04:00
commit 2b16d9bd83
254 changed files with 24485 additions and 24094 deletions

View file

@ -144,6 +144,8 @@ $LANG = array(
'IP Addresses'=>'IP адреса',
'RRD Graphics'=>'Графики',
'jobs'=>'Задания',
'Reset Code'=>'Код сброса'
'Reset Code'=>'Код сброса',
'disk'=>'Место',
'traffic'=>'Трафик',
);