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/sk_usersettings.lng |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/interface/web/tools/lib/lang/sk_usersettings.lng b/interface/web/tools/lib/lang/sk_usersettings.lng
index d2e1b89..4c8bcb9 100644
--- a/interface/web/tools/lib/lang/sk_usersettings.lng
+++ b/interface/web/tools/lib/lang/sk_usersettings.lng
@@ -1,9 +1,12 @@
-<?php
-$wb['passwort_txt'] = 'Heslo';
-$wb['password_strength_txt'] = 'Pevnosť hesla';
-$wb['language_txt'] = 'Jazyk';
-$wb['password_mismatch'] = 'Heslo v overovacom poli nezodpovedá prvému heslu.';
-$wb['Form to edit the user password and language.'] = 'Formulár pre úpravu Užívateľského hesla a jazyka.';
-$wb['Settings'] = 'Nastavenia';
-?>
-
+<?php
+$wb['password_txt'] = 'Heslo';
+$wb['password_strength_txt'] = 'Pevnosť hesla';
+$wb['language_txt'] = 'Jazyk';
+$wb['password_mismatch'] = 'Heslo v overovacom poli nezodpovedá prvému heslu.';
+$wb['Form to edit the user password and language.'] = 'Formulár pre úpravu Užívateľského hesla a jazyka.';
+$wb['Settings'] = 'Nastavenia';
+$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.';
+?>

--
Gitblit v1.9.1