Merged revisions 3845-3876 and 3879-3918 from stable branch.

hellkat

2013-03-26 cc65688b3da3e16729a1f73dd50fd975bd1ff741

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

@@ -1,6 +1,10 @@
<?php

$wb["server_id_txt"] = 'Hostserver';

$wb["ip_address_txt"] = 'IP address';

$wb["vm_id_txt"] = 'Virtual server';

$wb["reserved_txt"] = 'Reserved';

?>
<?php
$wb['server_id_txt'] = 'Hostserver';
$wb['ip_address_txt'] = 'IP address';
$wb['vm_id_txt'] = 'Virtual server';
$wb['reserved_txt'] = 'Reserved';
$wb['ip_error_wrong'] = 'Please fill in a valid IPv4 address.';
$wb['ip_error_unique'] = 'This IP address does already exist.';
$wb['IP address'] = 'IP address';
?>