Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

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

@@ -2,10 +2,10 @@
$wb['list_head_txt'] = 'Datenbank';
$wb['active_txt'] = 'Aktiv';
$wb['remote_access_txt'] = 'Remotezugriff';
$wb['type_txt'] = 'Typ';
$wb['server_id_txt'] = 'Server';
$wb['database_name_txt'] = 'Datenbank Name';
$wb['add_new_record_txt'] = 'Neue Datenbank hinzufügen';
$wb['database_user_txt'] = 'Datenbank Benutzer';
$wb['parent_domain_id_txt'] = 'Domain';
?>