--- Begin Message ---
Package: release.debian.org
User: release.debian.org@packages.debian.org
Usertags: freeze-exception
Severity: normal
Please allow uploading of ejabberd-2.1.10-3 into Wheezy which fixes
three important bugs.
One of this bugs, #654853 has been fixed upstream in 2.1.11, and
the fixes for #664034 and #670307 have been integrated into the
Debian package for 2.1.11, so we intended to fix them all by uploading
that Debian package. Unfortunately, the upload did not happen before
the freeze, so we're stuck with 2.1.10. Since all these important
important bugs apply to 2.1.10, I've implemented fixes for them in the
existing 2.1.10 package and hereby ask for the permission to upload the
new package.
diff -u ejabberd-2.1.10/debian/changelog ejabberd-2.1.10/debian/changelog
--- ejabberd-2.1.10/debian/changelog
+++ ejabberd-2.1.10/debian/changelog
@@ -1,3 +1,16 @@
+ejabberd (2.1.10-3) unstable; urgency=low
+
+ [ Konstantin Khomoutov ]
+ * Provide custom implementation of xmerl_regexp:sh_to_awk/1
+ (closes: #670307).
+ * Add use_dpkg_buildflags.patch (thanks to Simon Ruderich,
+ closes: #664034).
+ * Add relax-digest-uri-handling.patch (closes: #654853).
+ * Add Slovak translation (thanks to Slavko, closes: #647115).
+ * Add Italian translation (thanks to Beatrice Torracca, closes: #682987).
+
+ -- Konstantin Khomoutov <flatworm@users.sourceforge.net> Sun, 20 May 2012 14:51:12 +0400
+
ejabberd (2.1.10-2) unstable; urgency=low
[ Gerfried Fuchs ]
diff -u ejabberd-2.1.10/debian/patches/series ejabberd-2.1.10/debian/patches/series
--- ejabberd-2.1.10/debian/patches/series
+++ ejabberd-2.1.10/debian/patches/series
@@ -1,4 +1,7 @@
+use_dpkg_buildflags.patch
+ejabberd_regexp.patch
mod_admin_extra.patch
captcha.patch
fix_examples.patch
reopen-log.patch
+relax-digest-uri-handling.patch
only in patch2:
unchanged:
--- ejabberd-2.1.10.orig/debian/patches/ejabberd_regexp.patch
+++ ejabberd-2.1.10/debian/patches/ejabberd_regexp.patch
@@ -0,0 +1,95 @@
+Description: Provide custom replacement for xmerl_regexp:sh_to_awk/1
+ Erlang R15 dropped support for its old regular expressions library
+ (implemented as the "regexp" module) and replaced it with a new,
+ PCRE-based, implementation (implemented as the "re" module).
+ This transition lost the regexp:sh_to_awk/1 function which, given
+ a "glob-style expression" commonly used in POSIX shells to match
+ filenames, would produce a regular expression specification with
+ the equivalent semantics. The ejabberd upstream tried to combat
+ this situation [1] by using xmerl_regexp:sh_to_awk/1.
+ This introduced an implicit dependency on the erlang-xmerl library
+ which has been the cause for a Debian bug #670307.
+ Depending on erlang-xmerl has two problems:
+ 1) It's a 1.5M library otherwise not used by ejabberd code while
+ the function itself is rather straightforward to implement.
+ 2) The implementation of xmerl_regexp:sh_to_awk/1 has certain
+ flaws (incorrect parsing of bracketed expressions, not escaping
+ match repetition counts).
+ As a result, a custom implementation of sh_to_awk/1 is provided,
+ which works almost like xmerl_regexp:sh_to_awk/1 but fixes its flaws.
+ 1. https://support.process-one.net/browse/EJAB-921
+Author: Konstantin Khomoutov <flatworm@users.sourceforge.net>
+Forwarded: no
+Last-Update: 2012-06-04
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/ejabberd_regexp.erl
++++ b/src/ejabberd_regexp.erl
+@@ -26,6 +26,7 @@
+
+ -module(ejabberd_regexp).
+ -compile([export_all]).
++-import(lists, [reverse/1, member/2]).
+
+ exec(ReM, ReF, ReA, RgM, RgF, RgA) ->
+ try apply(ReM, ReF, ReA)
+@@ -66,7 +67,56 @@
+ A -> A
+ end.
+
+-sh_to_awk(ShRegExp) ->
+- case exec(xmerl_regexp, sh_to_awk, [ShRegExp], regexp, sh_to_awk, [ShRegExp]) of
+- A -> A
++sh_to_awk(Pattern) when is_list(Pattern) ->
++ fnmatch_char(Pattern, [$(,$^]).
++
++fnmatch_char([], Acc) ->
++ lists:reverse([$$,$)|Acc]);
++fnmatch_char([Ch|Tail], Acc) ->
++ case Ch of
++ $\\ ->
++ fnmatch_char(Tail, [$\\,$\\|Acc]);
++ $[ ->
++ fnmatch_bexp_first(Tail, [Ch|Acc]);
++ $? ->
++ fnmatch_char(Tail, [$.|Acc]);
++ $* ->
++ fnmatch_char(Tail, [$*,$.|Acc]);
++ _ ->
++ case lists:member(Ch, "^.+{}()$|\\") of
++ true ->
++ fnmatch_char(Tail, [Ch,$\\|Acc]);
++ false ->
++ fnmatch_char(Tail, [Ch|Acc])
++ end
++ end.
++
++fnmatch_bexp_first([], _) ->
++ {error, unclosed_be};
++fnmatch_bexp_first([Ch|Tail], Acc) ->
++ case Ch of
++ $] ->
++ {error, empty_be};
++ $! ->
++ fnmatch_bexp_next(Tail, false, [$^|Acc]);
++ $\\ ->
++ fnmatch_bexp_next(Tail, true, Acc);
++ _ ->
++ fnmatch_bexp_next(Tail, false, [Ch|Acc])
++ end.
++
++fnmatch_bexp_next([], _, _) ->
++ {error, unclosed_be};
++fnmatch_bexp_next([Ch|Tail], true, Acc) ->
++ fnmatch_bexp_next(Tail, false, [Ch,$\\|Acc]);
++fnmatch_bexp_next([Ch|Tail], false, Acc) ->
++ case Ch of
++ $] ->
++ fnmatch_char(Tail, [Ch|Acc]);
++ $\\ ->
++ fnmatch_bexp_next(Tail, true, Acc);
++ _ ->
++ fnmatch_bexp_next(Tail, false, [Ch|Acc])
+ end.
++
++%% vim:ts=8:sw=4:sts=4:noet
only in patch2:
unchanged:
--- ejabberd-2.1.10.orig/debian/patches/use_dpkg_buildflags.patch
+++ ejabberd-2.1.10/debian/patches/use_dpkg_buildflags.patch
@@ -0,0 +1,70 @@
+Description: Use CPPFLAGS from environment (dpkg-buildflags).
+ Necessary for hardening flags.
+Author: Simon Ruderich <simon@ruderich.org>
+Last-Update: 2012-03-15
+
+Index: ejabberd-2.1.10/src/configure
+===================================================================
+--- ejabberd-2.1.10.orig/src/configure 2012-03-15 00:20:28.288591657 +0100
++++ ejabberd-2.1.10/src/configure 2012-03-15 00:22:09.780595520 +0100
+@@ -4479,7 +4479,7 @@
+ fi
+ zlib_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $ZLIB_CFLAGS"
+- zlib_save_CPPFLAGS="$CFLAGS"
++ zlib_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS"
+ for ac_header in zlib.h
+ do :
+Index: ejabberd-2.1.10/src/acinclude.m4
+===================================================================
+--- ejabberd-2.1.10.orig/src/acinclude.m4 2012-03-15 00:20:28.288591657 +0100
++++ ejabberd-2.1.10/src/acinclude.m4 2012-03-15 00:22:09.784595520 +0100
+@@ -54,7 +54,7 @@
+ fi
+ zlib_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $ZLIB_CFLAGS"
+- zlib_save_CPPFLAGS="$CFLAGS"
++ zlib_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS"
+ AC_CHECK_HEADERS(zlib.h, , zlib_found=no)
+ if test $zlib_found = no; then
+Index: ejabberd-2.1.10/src/Makefile.in
+===================================================================
+--- ejabberd-2.1.10.orig/src/Makefile.in 2012-03-15 00:20:28.288591657 +0100
++++ ejabberd-2.1.10/src/Makefile.in 2012-03-15 00:22:09.784595520 +0100
+@@ -168,7 +168,7 @@
+ @ERLC@ -W $(EFLAGS) $*.erl
+
+ $(ERLSHLIBS): %.so: %.c
+- $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) \
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(LIBS) \
+ $(subst ../,,$(subst .so,.c,$@)) \
+ $(EXPAT_LIBS) \
+ $(EXPAT_CFLAGS) \
+Index: ejabberd-2.1.10/src/mod_irc/Makefile.in
+===================================================================
+--- ejabberd-2.1.10.orig/src/mod_irc/Makefile.in 2012-03-15 00:20:28.288591657 +0100
++++ ejabberd-2.1.10/src/mod_irc/Makefile.in 2012-03-15 00:22:09.784595520 +0100
+@@ -41,7 +41,7 @@
+ # erl -s make all report "{outdir, \"..\"}" -noinput -s erlang halt
+
+ $(ERLSHLIBS): ../%.so: %.c
+- $(CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) \
++ $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) \
+ $(subst ../,,$(subst .so,.c,$@)) \
+ $(LIBS) \
+ $(ERLANG_CFLAGS) \
+Index: ejabberd-2.1.10/src/stringprep/Makefile.in
+===================================================================
+--- ejabberd-2.1.10.orig/src/stringprep/Makefile.in 2012-03-15 00:22:43.904596819 +0100
++++ ejabberd-2.1.10/src/stringprep/Makefile.in 2012-03-15 00:22:58.844597386 +0100
+@@ -42,7 +42,7 @@
+ # erl -s make all report "{outdir, \"..\"}" -noinput -s erlang halt
+
+ $(ERLSHLIBS): ../%.so: %.c uni_data.c uni_norm.c
+- $(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDES) \
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(INCLUDES) \
+ $(subst ../,,$(subst .so,.c,$@)) $(LIBS) \
+ $(ERLANG_LIBS) \
+ $(ERLANG_CFLAGS) \
only in patch2:
unchanged:
--- ejabberd-2.1.10.orig/debian/patches/relax-digest-uri-handling.patch
+++ ejabberd-2.1.10/debian/patches/relax-digest-uri-handling.patch
@@ -0,0 +1,129 @@
+Description: Relax digest-uri handling
+ This patch introduces a new config option - fqdn - to set the fully
+ qualified domain name of the host:
+ {fqdn, "foo.example.com"}.
+ This fixes a problem with Pidgin not being able to log in on a server
+ that used SRV records.
+Origin: upstream, https://github.com/processone/ejabberd/commit/983da9c887d6cb64812087cba961dc85f349e1f9
+Bug-ProcessOne: https://support.process-one.net/browse/EJAB-1529
+Applied-Upstream: 2.1.11
+Last-Update: 2012-08-15
+--- a/doc/guide.tex
++++ b/doc/guide.tex
+@@ -1226,6 +1226,12 @@
+ If the client uses old Jabber Non-SASL authentication (\xepref{0078}),
+ then this option is not respected, and the action performed is \term{closeold}.
+
++The option \option{fqdn} allows you to define the Fully Qualified Domain Name
++of the machine, in case it isn't detected automatically.
++The FQDN is used to authenticate some clients that use the DIGEST-MD5 SASL mechanism.
++The option syntax is:
++\esyntax{\{fqdn, undefined|FqdnString\}.}
++
+ \makesubsubsection{internalauth}{Internal}
+ \ind{internal authentication}\ind{Mnesia}
+
+--- a/src/cyrsasl_digest.erl
++++ b/src/cyrsasl_digest.erl
+@@ -37,9 +37,11 @@
+ -behaviour(cyrsasl).
+
+ -record(state, {step, nonce, username, authzid, get_password, check_password, auth_module,
+- host}).
++ host, hostfqdn}).
+
+ start(_Opts) ->
++ Fqdn = get_local_fqdn(),
++ ?INFO_MSG("FQDN used to check DIGEST-MD5 SASL authentication: ~p", [Fqdn]),
+ cyrsasl:register_mechanism("DIGEST-MD5", ?MODULE, digest).
+
+ stop() ->
+@@ -49,6 +51,7 @@
+ {ok, #state{step = 1,
+ nonce = randoms:get_string(),
+ host = Host,
++ hostfqdn = get_local_fqdn(),
+ get_password = GetPassword,
+ check_password = CheckPasswordDigest}}.
+
+@@ -64,10 +67,11 @@
+ KeyVals ->
+ DigestURI = xml:get_attr_s("digest-uri", KeyVals),
+ UserName = xml:get_attr_s("username", KeyVals),
+- case is_digesturi_valid(DigestURI, State#state.host) of
++ case is_digesturi_valid(DigestURI, State#state.host, State#state.hostfqdn) of
+ false ->
+ ?DEBUG("User login not authorized because digest-uri "
+- "seems invalid: ~p", [DigestURI]),
++ "seems invalid: ~p (checking for Host ~p, FQDN ~p)", [DigestURI,
++ State#state.host, State#state.hostfqdn]),
+ {error, "not-authorized", UserName};
+ true ->
+ AuthzId = xml:get_attr_s("authzid", KeyVals),
+@@ -154,21 +158,35 @@
+ %% however ejabberd doesn't allow that.
+ %% If the service (for example jabber.example.org)
+ %% is provided by several hosts (being one of them server3.example.org),
+-%% then digest-uri can be like xmpp/server3.example.org/jabber.example.org
+-%% In that case, ejabberd only checks the service name, not the host.
+-is_digesturi_valid(DigestURICase, JabberHost) ->
++%% then acceptable digest-uris would be:
++%% xmpp/server3.example.org/jabber.example.org, xmpp/server3.example.org and
++%% xmpp/jabber.example.org
++%% The last version is not actually allowed by the RFC, but implemented by popular clients
++is_digesturi_valid(DigestURICase, JabberDomain, JabberFQDN) ->
+ DigestURI = stringprep:tolower(DigestURICase),
+ case catch string:tokens(DigestURI, "/") of
+- ["xmpp", Host] when Host == JabberHost ->
++ ["xmpp", Host] when (Host == JabberDomain) or (Host == JabberFQDN) ->
+ true;
+- ["xmpp", _Host, ServName] when ServName == JabberHost ->
++ ["xmpp", Host, ServName] when (ServName == JabberDomain) and (Host == JabberFQDN) ->
+ true;
+ _ ->
+ false
+ end.
+
+-
+-
++get_local_fqdn() ->
++ case (catch get_local_fqdn2()) of
++ Str when is_list(Str) -> Str;
++ _ -> "unknown-fqdn, please configure fqdn option in ejabberd.cfg!"
++ end.
++get_local_fqdn2() ->
++ case ejabberd_config:get_local_option(fqdn) of
++ ConfiguredFqdn when is_list(ConfiguredFqdn) ->
++ ConfiguredFqdn;
++ _undefined ->
++ {ok, Hostname} = inet:gethostname(),
++ {ok, {hostent, Fqdn, _, _, _, _}} = inet:gethostbyname(Hostname),
++ Fqdn
++ end.
+
+ digit_to_xchar(D) when (D >= 0) and (D < 10) ->
+ D + 48;
+--- a/src/ejabberd.cfg.example
++++ b/src/ejabberd.cfg.example
+@@ -222,6 +222,9 @@
+ %% Store the plain passwords or hashed for SCRAM:
+ %%{auth_password_format, plain}.
+ %%{auth_password_format, scram}.
++%%
++%% Define the FQDN if ejabberd doesn't detect it:
++%%{fqdn, "server3.example.com"}.
+
+ %%
+ %% Authentication using external script
+--- a/src/ejabberd_config.erl
++++ b/src/ejabberd_config.erl
+@@ -374,6 +374,9 @@
+ State;
+ {hosts, _Hosts} ->
+ State;
++ {fqdn, HostFQDN} ->
++ ?DEBUG("FQDN set to: ~p", [HostFQDN]),
++ add_option(fqdn, HostFQDN, State);
+ {host_config, Host, Terms} ->
+ lists:foldl(fun(T, S) -> process_host_term(T, Host, S) end,
+ State, Terms);
only in patch2:
unchanged:
--- ejabberd-2.1.10.orig/debian/po/it.po
+++ ejabberd-2.1.10/debian/po/it.po
@@ -0,0 +1,104 @@
+# Italian translation of ejabberd debconf messages.
+# Copyright (C) 2012, ejabberd package copyright holder.
+# This file is distributed under the same license as the ejabberd package.
+# Beatrice Torracca <beatricet@libero.it>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ejabberd\n"
+"Report-Msgid-Bugs-To: twerner@debian.org\n"
+"POT-Creation-Date: 2008-02-15 10:37+0300\n"
+"PO-Revision-Date: 2012-07-22 13:11+0200\n"
+"Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
+"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.7.1\n"
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid "The name of the host ejabberd will serve:"
+msgstr "Il nome dell'host per cui ejabberd farà da server:"
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid "Please enter the hostname of your Jabber server (in lowercase)."
+msgstr "Inserire il nome host del server Jabber (in lettere minuscole)."
+
+#. Type: string
+#. Description
+#: ../templates:2001
+msgid "The username of an admin account for ejabberd:"
+msgstr "Il nome utente di un account di amministrazione per ejabberd:"
+
+#. Type: string
+#. Description
+#: ../templates:2001
+msgid ""
+"Please provide the name of an account to administrate the ejabberd server. "
+"After the installation of ejabberd you can use this account to log in with "
+"any Jabber client to do administrative tasks or go to http://";
+"${hostname}:5280/admin/ and log in with this account to enter the admin "
+"interface. Enter the username part here (e.g. ${user}), but use the full "
+"Jabber ID (e.g. ${user}@${hostname}) to log into ejabberd web interface; "
+"otherwise it will fail."
+msgstr ""
+"Inserire il nome di un account per amministrare il server ejabberd. Dopo "
+"l'installazione di ejabberd sarà possibile usare questo account per fare il "
+"login con qualsiasi client Jabber per svolgere compiti di amministrazione "
+"oppure si potrà andare all'indirizzo http://${hostname}:5280/admin/ e fare "
+"il login con questo account per entrare nell'interfaccia di amministrazione. "
+"Inserire qui la parte del nome utente (ad esempio ${user}), ma usare l'ID "
+"Jabber completo (ad esempio ${user}@${hostname}) per fare il login "
+"nell'interfaccia web, altrimenti non riuscirà ."
+
+#. Type: string
+#. Description
+#: ../templates:2001
+msgid "Leave empty if you don't want to create an admin account automatically."
+msgstr ""
+"Lasciare vuoto se non si desidera creare automaticamente un account di "
+"amministrazione."
+
+#. Type: password
+#. Description
+#: ../templates:3001
+msgid "The password for the admin account:"
+msgstr "La password per l'account di amministrazione:"
+
+#. Type: password
+#. Description
+#: ../templates:3001
+msgid "Please enter the password for the administrative user."
+msgstr "Inserire la password dell'utente amministratore."
+
+#. Type: password
+#. Description
+#: ../templates:4001
+msgid "The password for the admin account again for verification:"
+msgstr ""
+"Inserire nuovamente la password per l'account di amministrazione per "
+"verifica:"
+
+#. Type: password
+#. Description
+#: ../templates:4001
+msgid ""
+"Please reenter the password for the administrative user for verification."
+msgstr "Reinserire la password per l'utente amministratore per verifica."
+
+#. Type: error
+#. Description
+#: ../templates:5001
+msgid "The passwords do not match!"
+msgstr "Le password non corrispondono."
+
+#. Type: error
+#. Description
+#: ../templates:5001
+msgid "The passwords you have typed do not match. Please try again."
+msgstr "Le password inserite non corrispondono. Riprovare."
only in patch2:
unchanged:
--- ejabberd-2.1.10.orig/debian/po/sk.po
+++ ejabberd-2.1.10/debian/po/sk.po
@@ -0,0 +1,104 @@
+# Slovak translations for ejabberd package
+# Slovenské preklady pre balÃk ejabberd.
+# Copyright (C) 2011 THE ejabberd'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the ejabberd package.
+# Automatically generated, 2011.
+# Slavko <linux@slavino.sk>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ejabberd 2.1.9-1\n"
+"Report-Msgid-Bugs-To: twerner@debian.org\n"
+"POT-Creation-Date: 2008-02-15 10:37+0300\n"
+"PO-Revision-Date: 2011-10-30 15:15+0100\n"
+"Last-Translator: Slavko <linux@slavino.sk>\n"
+"Language-Team: slovenÄ?ina <debian-l10n-slovak@lists.debian.org>\n"
+"Language: sk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-POFile-SpellExtra: admin hostname Jabber ejabberd administraÄ?ného\n"
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid "The name of the host ejabberd will serve:"
+msgstr "Meno hostiteľa, ktoré bude ejabberd poskytovať:"
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid "Please enter the hostname of your Jabber server (in lowercase)."
+msgstr "ProsÃm, zadajte meno hostiteľa servera Jabber (malými pÃsmenami)."
+
+#. Type: string
+#. Description
+#: ../templates:2001
+msgid "The username of an admin account for ejabberd:"
+msgstr "Meno použÃvateľa úÄ?tu administrátora pre ejabberd:"
+
+#. Type: string
+#. Description
+#: ../templates:2001
+msgid ""
+"Please provide the name of an account to administrate the ejabberd server. "
+"After the installation of ejabberd you can use this account to log in with "
+"any Jabber client to do administrative tasks or go to http://";
+"${hostname}:5280/admin/ and log in with this account to enter the admin "
+"interface. Enter the username part here (e.g. ${user}), but use the full "
+"Jabber ID (e.g. ${user}@${hostname}) to log into ejabberd web interface; "
+"otherwise it will fail."
+msgstr ""
+"ProsÃm, zadajte meno úÄ?tu administrátora servera ejabberd. Po inÅ¡talácii "
+"ejabberd môžete tento úÄ?et použiÅ¥ na prihlásenie sa pomocou ktoréhokoľvek "
+"klienta Jabber a vykonávanie administratÃvnych úloh alebo použiÅ¥ http://";
+"${hostname}:5280/admin/ a prihlásiÅ¥ sa pomocou tohoto úÄ?tu do "
+"administraÄ?ného rozhrania. Tu zadajte len Ä?asÅ¥ s použÃvateľským menom (napr. "
+"${user}), ale na prihlásenie do webového rozhrania ejabberd použite úplný "
+"identifikátor Jabber (napr. ${user}@${hostname}); inak prihlásenie zlyhá."
+
+#. Type: string
+#. Description
+#: ../templates:2001
+msgid "Leave empty if you don't want to create an admin account automatically."
+msgstr ""
+"Nechajte prázdne, ak nechcete aby bol úÄ?et administrátora vytvorený "
+"automaticky."
+
+#. Type: password
+#. Description
+#: ../templates:3001
+msgid "The password for the admin account:"
+msgstr "Heslo úÄ?tu administrátora:"
+
+#. Type: password
+#. Description
+#: ../templates:3001
+msgid "Please enter the password for the administrative user."
+msgstr "ProsÃm, zadajte heslo administraÄ?ného použÃvateľa."
+
+#. Type: password
+#. Description
+#: ../templates:4001
+msgid "The password for the admin account again for verification:"
+msgstr "Heslo administrátora znova, kvôli overeniu:"
+
+#. Type: password
+#. Description
+#: ../templates:4001
+msgid ""
+"Please reenter the password for the administrative user for verification."
+msgstr "ProsÃm, zdajte znova heslo administrátora, kvôli overeniu."
+
+#. Type: error
+#. Description
+#: ../templates:5001
+msgid "The passwords do not match!"
+msgstr "Heslá sa nezhodujú!"
+
+#. Type: error
+#. Description
+#: ../templates:5001
+msgid "The passwords you have typed do not match. Please try again."
+msgstr "Heslá, ktoré ste zadali sa nezhodujú. ProsÃm, skúste znova."
--- End Message ---