From f686264ad6d82cfaf4e401da2e259880f57bfade Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sat, 30 Jan 2016 07:44:29 -0500
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'

---
 interface/web/mail/lib/lang/sk_mail_alias.lng |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/interface/web/mail/lib/lang/sk_mail_alias.lng b/interface/web/mail/lib/lang/sk_mail_alias.lng
index 9bc1f12..bfd67e5 100644
--- a/interface/web/mail/lib/lang/sk_mail_alias.lng
+++ b/interface/web/mail/lib/lang/sk_mail_alias.lng
@@ -1,11 +1,15 @@
 <?php
 $wb['email_txt'] = 'Email';
-$wb['destination_txt'] = 'Cie?';
-$wb['active_txt'] = 'Akt�vne';
-$wb['email_error_isemail'] = 'E-mailov� adresa je neplatn�.';
-$wb['email_error_unique'] = 'Duplicitn� email adresa.';
-$wb['no_domain_perm'] = 'Nem�te �iadne povolenie pre t�to dom�nu.';
-$wb['destination_error_isemail'] = 'Cie?ov� E-mailov� adresa je neplatn�.';
-$wb['limit_mailalias_txt'] = 'Max. po?et e-mailov�ch aliasov na v� �?et je dosiahnut�.';
-$wb['duplicate_mailbox_txt'] = 'Existuje u� schr�nka s touto e-mailov� adresu';
+$wb['destination_txt'] = 'Cieľ';
+$wb['active_txt'] = 'Aktívne';
+$wb['email_error_isemail'] = 'E-mailová adresa je neplatná.';
+$wb['email_error_unique'] = 'Duplicitná email adresa.';
+$wb['no_domain_perm'] = 'Nemáte žiadne povolenie pre túto doménu.';
+$wb['destination_error_isemail'] = 'Cieľová E-mailová adresa je neplatná.';
+$wb['limit_mailalias_txt'] = 'Max. počet e-mailových aliasov na váš účet je dosiahnutý.';
+$wb['duplicate_mailbox_txt'] = 'Existuje už schránka s touto e-mailovú adresu';
+$wb['domain_txt'] = 'Domain';
+$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
+$wb['source_txt'] = 'Alias';
+$wb['greylisting_txt'] = 'Enable greylisting';
 ?>

--
Gitblit v1.9.1