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/hr_server_list.lng |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/interface/web/admin/lib/lang/hr_server_list.lng b/interface/web/admin/lib/lang/hr_server_list.lng
index 320b45f..61dedb7 100644
--- a/interface/web/admin/lib/lang/hr_server_list.lng
+++ b/interface/web/admin/lib/lang/hr_server_list.lng
@@ -1,6 +1,6 @@
 <?php
 $wb['list_head_txt'] = 'Server';
-$wb['server_name_txt'] = 'Ime';
+$wb['server_name_txt'] = 'Naziv';
 $wb['mail_server_txt'] = 'Mail';
 $wb['web_server_txt'] = 'Web';
 $wb['dns_server_txt'] = 'DNS';
@@ -9,5 +9,6 @@
 $wb['vserver_server_txt'] = 'VServer';
 $wb['add_new_record_txt'] = 'Dodaj novi server';
 $wb['proxy_server_txt'] = 'Proxy';
-$wb['firewall_server_txt'] = 'Firewall';
+$wb['firewall_server_txt'] = 'Vatrozid';
+$wb['xmpp_server_txt'] = 'XMPP';
 ?>

--
Gitblit v1.9.1