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.lng |   26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/interface/web/admin/lib/lang/hr_server.lng b/interface/web/admin/lib/lang/hr_server.lng
index ead87e4..3fb4f5d 100644
--- a/interface/web/admin/lib/lang/hr_server.lng
+++ b/interface/web/admin/lib/lang/hr_server.lng
@@ -1,14 +1,16 @@
 <?php
-$wb['config_txt'] = "konfiguracija";
-$wb['server_name_txt'] = "Ime servera";
-$wb['mail_server_txt'] = "Mailserver";
-$wb['web_server_txt'] = "Webserver";
-$wb['dns_server_txt'] = "DNS-Server";
-$wb['file_server_txt'] = "Fileserver";
-$wb['db_server_txt'] = "DB-Server";
-$wb['vserver_server_txt'] = "VServer-Server";
-$wb['active_txt'] = "Aktivan";
-$wb['mirror_server_id_txt'] = "je kopija servera";
-$wb['- None -'] = "- izaberi server -";
+$wb['config_txt'] = 'konfiguracija';
+$wb['server_name_txt'] = 'Ime servera';
+$wb['mail_server_txt'] = 'Mail server';
+$wb['web_server_txt'] = 'Web server';
+$wb['dns_server_txt'] = 'DNS server';
+$wb['file_server_txt'] = 'File server';
+$wb['db_server_txt'] = 'DB server';
+$wb['vserver_server_txt'] = 'VServer';
+$wb['active_txt'] = 'Aktivan';
+$wb['mirror_server_id_txt'] = 'je kopija servera';
+$wb['- None -'] = '- izaberi server -';
+$wb['proxy_server_txt'] = 'Proxy server';
+$wb['firewall_server_txt'] = 'Vatrozid server';
+$wb['xmpp_server_txt'] = 'XMPP Server';
 ?>
-

--
Gitblit v1.9.1