updated master, resolved conflicts

A. Täffner

2016-01-22 ce6e1ddfd09c47fc3f80e4fccc238894cf560ddb

1
2
3
4
5
6
7
<?php
$wb['interface_head_txt'] = 'Interface Settings';
$wb['interface_desc_txt'] = 'Modify your interface';
$wb['language_txt'] = 'Language';
$wb['startmodule_txt'] = 'Startmodule';
$wb['app_theme_txt'] = 'Design';
?>