Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-04-25 8ec5ab5eb9627b5968e6b52a98ff47d228de864a

1
2
3
4
5
6
7
<?php
$wb['mailbox_spamfilter_txt'] = 'Spamfilter';
$wb['spamfilter_txt'] = 'Spamfilter';
$wb['email_txt'] = 'Courriel';
$wb['no_policy'] = '- not enabled -';
$wb['policy_txt'] = 'Policy';
?>