Merge branch 'master' into 'master'

Marius Cramer

2014-05-19 9b4702d833708415d0cf05a98a00aac1bc850ff7

 interface/web/sites/lib/lang/fr_web_folder_list.lng

@@ -1,7 +1,7 @@
<?php
$wb['list_head_txt'] = 'Folder';
$wb['active_txt'] = 'Active';
$wb['server_id_txt'] = 'Server';
$wb['parent_domain_id_txt'] = 'Website';
$wb['path_txt'] = 'Path';
$wb['list_head_txt'] = 'Dossier';
$wb['active_txt'] = 'Actif';
$wb['server_id_txt'] = 'Serveur';
$wb['parent_domain_id_txt'] = 'Site web';
$wb['path_txt'] = 'Chemin';
?>