Merge branch 'stable-3.1'

Marius Burkard

2016-04-20 4569cae57f127afd093794310ccd290d2d9fdf36

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

@@ -37,4 +37,9 @@
$wb["template_nameserver_error_empty"] = 'Nameserver(s) is empty.';
$wb["Virtual server"] = 'Virtual server';
$wb["Advanced"] = 'Advanced';
?>
$wb['features_txt'] = 'Features';
$wb["iptables_txt"] = "IP Tables";
$wb["custom_txt"] = "Custom settings";
$wb["bootorder_txt"] = "Boot order priority";
$wb["bootorder_error_notpositive"] = "Only positive integers are allowed for Boot order priority";
?>