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/sk_users.lng |   31 +++++++++++++++++++------------
 1 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/interface/web/admin/lib/lang/sk_users.lng b/interface/web/admin/lib/lang/sk_users.lng
index 4376aa1..9ba84d4 100644
--- a/interface/web/admin/lib/lang/sk_users.lng
+++ b/interface/web/admin/lib/lang/sk_users.lng
@@ -1,28 +1,35 @@
 <?php
-$wb['username_txt'] = 'U��vate?sk� meno';
-$wb['username_err'] = 'U��vate?sk� meno je pr�li� dlh� alebo obsahuje neplatn� znaky.';
-$wb['username_empty'] = 'U��vate?sk� meno je pr�zdne.';
-$wb['username_unique'] = 'V s�?asnosti u� existuje u��vate? s t�mto u��vate?sk�m menom.';
+$wb['username_txt'] = 'Užívateľské meno';
+$wb['username_err'] = 'Užívateľské meno je príliš dlhá alebo obsahuje neplatné znaky.';
+$wb['username_empty'] = 'Užívateľské meno je prázdne.';
+$wb['username_unique'] = 'V súčasnosti už existuje užívateľ s týmto užívateľským menom.';
 $wb['passwort_txt'] = 'Heslo';
-$wb['password_strength_txt'] = 'Pevnos? hesla';
+$wb['password_strength_txt'] = 'Pevnosť hesla';
 $wb['modules_txt'] = 'Modul';
 $wb['startmodule_txt'] = 'Startmodul';
 $wb['app_theme_txt'] = 'Design';
 $wb['typ_txt'] = 'Typ';
-$wb['active_txt'] = 'Akt�vne';
+$wb['active_txt'] = 'Aktívne';
 $wb['language_txt'] = 'Jazyk';
 $wb['name_txt'] = 'Meno';
-$wb['vorname_txt'] = 'Krstn� meno';
-$wb['unternehmen_txt'] = 'Spolo?nos?';
+$wb['vorname_txt'] = 'Krstné meno';
+$wb['unternehmen_txt'] = 'Spoločnosť';
 $wb['strasse_txt'] = 'Ulica';
 $wb['ort_txt'] = 'Mesto';
-$wb['plz_txt'] = 'PS?';
+$wb['plz_txt'] = 'PSČ';
 $wb['land_txt'] = 'Krajina';
 $wb['email_txt'] = 'Email';
 $wb['url_txt'] = 'Url';
-$wb['telefon_txt'] = 'Telef�n';
+$wb['telefon_txt'] = 'Telefón';
 $wb['fax_txt'] = 'Fax';
 $wb['groups_txt'] = 'Skupiny';
-$wb['default_group_txt'] = 'Z�kladn� Skupina';
-$wb['startmodule_err'] = '�tart modul nie je v moduloch.';
+$wb['default_group_txt'] = 'Základná Skupina';
+$wb['startmodule_err'] = 'Štart modul nie je v moduloch.';
+$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['client_not_admin_err'] = 'A user that belongs to a client can not be set to type: admin';
+$wb['lost_password_function_txt'] = 'Forgot password function is available';
 ?>

--
Gitblit v1.9.1