Merge branch 'stable-3.1' into 'stable-3.1'

Marius Burkard

2016-07-05 3cc04cc5219bfd72d83b58d2f6ae83092e0c9fb6

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

@@ -1,6 +1,7 @@
<?php
$wb['list_head_txt'] = 'OpenVZ IP addresses';
$wb['server_id_txt'] = 'Server';
$wb['ip_address_txt'] = 'IP address';
$wb['reserved_txt'] = 'Reserved';
$wb['list_head_txt'] = 'Adresses IP OpenVZ';
$wb['server_id_txt'] = 'Serveur';
$wb['ip_address_txt'] = 'Adresse IP';
$wb['reserved_txt'] = 'Reservé';
$wb['vm_id_txt'] = 'VM';
?>