updated master, resolved conflicts

A. Täffner

2016-01-22 ce6e1ddfd09c47fc3f80e4fccc238894cf560ddb

1
2
3
4
5
6
<?php
$wb['name_txt'] = 'Nom';
$wb['fields_txt'] = 'Champs';
$wb['template_txt'] = 'Modèle';
$wb['visible_txt'] = 'Visible';
?>