updated master, resolved conflicts

A. Täffner

2016-01-22 ce6e1ddfd09c47fc3f80e4fccc238894cf560ddb

1
2
3
4
5
6
7
<?php
$wb['mailbox_spamfilter_txt'] = 'Filtro de spam';
$wb['spamfilter_txt'] = 'Filtro de spam';
$wb['email_txt'] = 'Correo';
$wb['no_policy'] = '- no habilitado -';
$wb['policy_txt'] = 'Directiva';
?>