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

diff --git a/interface/web/admin/lib/lang/hr_users.lng b/interface/web/admin/lib/lang/hr_users.lng
index 4f0f1e9..15e12a5 100644
--- a/interface/web/admin/lib/lang/hr_users.lng
+++ b/interface/web/admin/lib/lang/hr_users.lng
@@ -7,7 +7,7 @@
 $wb['password_strength_txt'] = 'Jačina šifre';
 $wb['modules_txt'] = 'Modul';
 $wb['startmodule_txt'] = 'Početni modul';
-$wb['app_theme_txt'] = 'Izgled';
+$wb['app_theme_txt'] = 'Tema';
 $wb['typ_txt'] = 'Vrsta';
 $wb['active_txt'] = 'Aktivno';
 $wb['language_txt'] = 'Jezik';
@@ -25,9 +25,11 @@
 $wb['groups_txt'] = 'Grupe';
 $wb['default_group_txt'] = 'Standardna grupa';
 $wb['startmodule_err'] = 'Početni modul nije u izabranim modulima.';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"';
+$wb['generate_password_txt'] = 'Generiraj šifru';
+$wb['repeat_password_txt'] = 'Ponovi šifru';
+$wb['password_mismatch_txt'] = 'Šifre nisu identične.';
+$wb['password_match_txt'] = 'Šifre su identične.';
+$wb['username_error_collision'] = 'Korisničko ime ne može biti web ili web sa brojem.\\"';
+$wb['client_not_admin_err'] = 'Korisnik koji je u grupi klijenti ne može biti admin';
+$wb['lost_password_function_txt'] = 'Forgot password function is available';
 ?>

--
Gitblit v1.9.1