Merge branch 'spamfilter-delete-fix' into 'stable-3.1'

Till Brehm

2016-07-11 a62af307fd9bf33b34df292120cb73e37d8223da

 interface/web/admin/lib/lang/ja_software_package_list.lng

@@ -7,4 +7,7 @@
$wb['toolsarea_head_txt'] = 'Packages';
$wb['repoupdate_txt'] = 'Update package list';
$wb['package_id_txt'] = 'local App-ID';
$wb['no_packages_txt'] = 'No packages available';
$wb['edit_txt'] = 'Edit';
$wb['delete_txt'] = 'Delete';
?>