From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

---
 interface/web/admin/lib/lang/br_server.lng |   29 ++++++++++++++++-------------
 1 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/interface/web/admin/lib/lang/br_server.lng b/interface/web/admin/lib/lang/br_server.lng
index c228fc1..43e8334 100644
--- a/interface/web/admin/lib/lang/br_server.lng
+++ b/interface/web/admin/lib/lang/br_server.lng
@@ -1,13 +1,16 @@
-<?php
-$wb['config_txt'] = 'Configuração';
-$wb['server_name_txt'] = 'Nome do Servidor';
-$wb['mail_server_txt'] = 'Servidor de Mail';
-$wb['web_server_txt'] = 'Servidor Web';
-$wb['dns_server_txt'] = 'Servidor DNS';
-$wb['file_server_txt'] = 'Servidor de Arquivo';
-$wb['db_server_txt'] = 'Servidor de Banco de Dados';
-$wb['vserver_server_txt'] = 'Servidor VServer';
-$wb['active_txt'] = 'Ativado';
-$wb['mirror_server_id_txt'] = 'É um espelho do servidor';
-$wb['- None -'] = '- Sem -';
-?>
+<?php
+$wb['config_txt'] = 'Configuração';
+$wb['server_name_txt'] = 'Nome do Servidor';
+$wb['mail_server_txt'] = 'Servidor de Mail';
+$wb['web_server_txt'] = 'Servidor Web';
+$wb['dns_server_txt'] = 'Servidor DNS';
+$wb['file_server_txt'] = 'Servidor de Arquivo';
+$wb['db_server_txt'] = 'Servidor de Banco de Dados';
+$wb['vserver_server_txt'] = 'Servidor VServer';
+$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';
+$wb['xmpp_server_txt'] = 'XMPP Server';
+?>

--
Gitblit v1.9.1