Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-04-26 6c189dba224d1e1de138e763d8146fea21bc6a2f

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

@@ -8,5 +8,7 @@
$wb['db_server_txt'] = 'Banco de Dados';
$wb['vserver_server_txt'] = 'VServer';
$wb['add_new_record_txt'] = 'Adicionar novo Servidor';
$wb['proxy_server_txt'] = 'Proxy';
$wb['firewall_server_txt'] = 'Firewall';
$wb['xmpp_server_txt'] = 'XMPP';
?>