Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

1
2
3
4
5
6
<?php
$wb['list_head_txt'] = 'Folder User';
$wb['active_txt'] = 'Active';
$wb['web_folder_id_txt'] = 'Folder';
$wb['username_txt'] = 'Username';
?>