Merge branch 'master' into 'master'

Marius Cramer

2015-01-05 dee987b263b021b990ea4c62cb15be47c6d61fb5

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

@@ -10,5 +10,6 @@
$wb['active_txt'] = 'Ativado';
$wb['mirror_server_id_txt'] = 'É um espelho de servidor';
$wb['- None -'] = '- Não -';
$wb['proxy_server_txt'] = 'Proxy-Server';
$wb['firewall_server_txt'] = 'Firewall-Server';
?>