From 6028e4692d172b63f8af79c4460f9dbff5a9a01c Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Thu, 26 May 2016 02:21:05 -0400
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'

---
 interface/web/admin/lib/lang/hr_language_complete.lng |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/interface/web/admin/lib/lang/hr_language_complete.lng b/interface/web/admin/lib/lang/hr_language_complete.lng
index 8562ced..e9ce1e5 100644
--- a/interface/web/admin/lib/lang/hr_language_complete.lng
+++ b/interface/web/admin/lib/lang/hr_language_complete.lng
@@ -2,6 +2,6 @@
 $wb['list_head_txt'] = 'Spoji jezike';
 $wb['list_desc_txt'] = 'Spoji izabrani jezik sa glavnim datotekom engleskog jezika. <br />Ovime ćete dodati podatke iz datoteke engleskog jezika koji nedostaju u izabrani jezik.';
 $wb['language_select_txt'] = 'Izaberi jezik';
-$wb['btn_save_txt'] = 'Spoji jezike sada';
+$wb['btn_save_txt'] = 'Spoji jezike';
 $wb['btn_cancel_txt'] = 'Natrag';
 ?>

--
Gitblit v1.9.1