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/tools/lib/lang/hr_usersettings.lng |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/interface/web/tools/lib/lang/hr_usersettings.lng b/interface/web/tools/lib/lang/hr_usersettings.lng
index 7d50939..50759d4 100644
--- a/interface/web/tools/lib/lang/hr_usersettings.lng
+++ b/interface/web/tools/lib/lang/hr_usersettings.lng
@@ -1,8 +1,12 @@
 <?php
-$wb['passwort_txt'] = 'Šifra';
+$wb['password_txt'] = 'Šifra';
 $wb['password_strength_txt'] = 'Jačina šifre';
 $wb['language_txt'] = 'Jezik';
 $wb['password_mismatch'] = 'Šifra u drugom polju ne odgovara šifri iz prvog polja.';
 $wb['Form to edit the user password and language.'] = 'Formular za izmjenu šifre i jezika.';
 $wb['Settings'] = 'Postavke';
+$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.';
 ?>

--
Gitblit v1.9.1