Merged revisions 2681-2739 from 3.0.4 stable branch.

tbrehm

2011-10-21 8ab3cdc09cfbac3157e996664616c229214f6c8d

 interface/web/vm/lib/lang/en_openvz_template.lng

@@ -30,7 +30,7 @@
$wb["ram_txt"] = 'RAM (guaranteed)';
$wb["ram_burst_txt"] = 'RAM (burst)';
$wb["cpu_units_txt"] = 'CPU units';
$wb["cpu_num_txt"] = 'CPU cores';
$wb["cpu_num_txt"] = 'CPU number';
$wb["cpu_limit_txt"] = 'CPU limit %';
$wb["io_priority_txt"] = 'I/O priority';
$wb["active_txt"] = 'Active';