Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

1
2
3
4
5
6
<?php
$wb['name_txt'] = 'Meno';
$wb['fields_txt'] = 'Polia';
$wb['template_txt'] = 'Šablóna';
$wb['visible_txt'] = 'Viditeľné';
?>