From 37b29231e47a0c4458dc1c15d98588f16f07e1e2 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 06 Aug 2015 03:18:44 -0400
Subject: [PATCH] - don't set password via remoting if field is empty

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

diff --git a/interface/web/admin/lib/lang/hr_language_complete.lng b/interface/web/admin/lib/lang/hr_language_complete.lng
index db7c05b..1f7cb8e 100644
--- a/interface/web/admin/lib/lang/hr_language_complete.lng
+++ b/interface/web/admin/lib/lang/hr_language_complete.lng
@@ -1,7 +1,9 @@
 <?php
-$wb['list_head_txt'] = 'Merge language';
-$wb['list_desc_txt'] = 'Merge the selected language file with the english master language file. <br />This adds missing strings from the english master language files to the selected language.';
-$wb['language_select_txt'] = 'Select language';
-$wb['btn_save_txt'] = 'Merge files now';
-$wb['btn_cancel_txt'] = 'Back';
+$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';
+$wb['btn_cancel_txt'] = 'Natrag';
 ?>
+
+

--
Gitblit v1.9.1