Wiking branch, master, updated. 9a1c6531480b1d96aa96e4c49f614c2385a08a3f

Boris Dusek dusek at devel.brailcom.org
Sat Oct 16 13:58:05 CEST 2010


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Wiking".

The branch, master has been updated
       via  9a1c6531480b1d96aa96e4c49f614c2385a08a3f (commit)
       via  1245ab705f0f44c888ea4ac3132c65e244c38adb (commit)
       via  80a459b2f75fe796c534a84709c1dbff2f09443b (commit)
      from  5cef8510f00caac59cd055e20d59800182d3527f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9a1c6531480b1d96aa96e4c49f614c2385a08a3f
Author: Boris Dusek <dusek at brailcom.org>
Date:   Sat Oct 16 13:51:17 2010 +0200

    Update Czech translations.

commit 1245ab705f0f44c888ea4ac3132c65e244c38adb
Author: Boris Dusek <dusek at brailcom.org>
Date:   Sat Oct 16 13:44:59 2010 +0200

    Regenerated translations.

commit 80a459b2f75fe796c534a84709c1dbff2f09443b
Author: Boris Dusek <dusek at brailcom.org>
Date:   Sat Oct 16 13:19:43 2010 +0200

    Adjust messages used after registration form.

-----------------------------------------------------------------------

Summary of changes:
 lib/wiking/cms/users.py       |    9 +-
 translations/wiking-cms.cs.po |  783 +++++++++++++++++++++--------------------
 translations/wiking-cms.de.po |  599 ++++++++++++++++----------------
 translations/wiking-cms.es.po |  716 +++++++++++++++++++-------------------
 translations/wiking-cms.fr.po |  738 ++++++++++++++++++++-------------------
 translations/wiking-cms.hu.po |  728 ++++++++++++++++++++-------------------
 translations/wiking-cms.it.po |  718 +++++++++++++++++++-------------------
 translations/wiking-cms.no.po |  709 +++++++++++++++++++------------------
 translations/wiking-cms.pl.po |  730 ++++++++++++++++++++-------------------
 translations/wiking-cms.po.po |  723 +++++++++++++++++++------------------
 translations/wiking-cms.ro.po |  742 ++++++++++++++++++++-------------------
 translations/wiking-cms.sk.po |  716 +++++++++++++++++++------------------
 12 files changed, 4033 insertions(+), 3878 deletions(-)

diff --git a/lib/wiking/cms/users.py b/lib/wiking/cms/users.py
index 662bfed..b0c310b 100644
--- a/lib/wiking/cms/users.py
+++ b/lib/wiking/cms/users.py
@@ -770,10 +770,7 @@ class Users(UserManagementModule):
 
     def _redirect_after_insert(self, req, record):
         if self._send_registration_email(req, record):
-            content = (lcg.p(_("To finish registration, please confirm the "
-                               "activation code that was sent to your email "
-                               "address.")),)
-            
+            content = ()
         else:
             self._data.delete(record['uid'])
             content = lcg.p(_("Registration cancelled."))
@@ -790,7 +787,9 @@ class Users(UserManagementModule):
             return False
         else:
             # Translators: Follows an email addres, e.g. ``Activation code was sent to joe at brailcom.org''
-            req.message(_("Activation code was sent to %s.", record['email'].value()))
+            req.message(_("To finish registration, please confirm the "
+                               "activation code that was sent to your email "
+                               "address at %(email)s.", record['email'].value()))
             return True
 
     def _check_registration_code(self, req):
diff --git a/translations/wiking-cms.cs.po b/translations/wiking-cms.cs.po
index 0b6afaf..5b1e74e 100644
--- a/translations/wiking-cms.cs.po
+++ b/translations/wiking-cms.cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-16 19:35+0200\n"
+"POT-Creation-Date: 2010-10-16 13:26+0200\n"
 "PO-Revision-Date: 2010-09-16 19:37+0200\n"
 "Last-Translator: Hynek Hanke <hanke at brailcom.org>\n"
 "Language-Team: Czech <wiking at lists.freebsoft.org>\n"
@@ -15,132 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/wiking/configuration.py:194
-msgid "Webmaster's e-mail address"
-msgstr "E-mailová adresa správce"
-
-#: ../lib/wiking/configuration.py:205
-msgid "Default sender address"
-msgstr "Výchozí adresa odesílatele"
-
-#: ../lib/wiking/configuration.py:222
-msgid "Force HTTPS login"
-msgstr "Vynutit HTTPS pro přihlášení"
-
-#: ../lib/wiking/configuration.py:223
-msgid ""
-"If enabled, the login form will always be redirected to an HTTPS address to "
-"ensure the security of the submitted credentials.  This, however, requires "
-"your server to be setup to accept HTTPS requests for the same virtual host "
-"and pass them to Wiking."
-msgstr ""
-"Pokud je povoleno, přihlašovací formulář bude vždy přesměrován na HTTPS "
-"adresu aby byla zajištěna bezpečnost přenášených přihlašovacích údajů.  To "
-"ovšem vyžaduje, aby byl server zkonfigurován pro obsluhu HTTPS požadavků pro "
-"stejný virtuální server a aby tyto požadavky byly předávány systému Wiking."
-
-#. Translators: Site means a webpage or web application.
-#: ../lib/wiking/configuration.py:276
-msgid "Site title"
-msgstr "Název portálu"
-
-#: ../lib/wiking/configuration.py:277
-msgid ""
-"Site title is a short and (hopefully) unique title of the whole website. It "
-"will appear at the top of every page."
-msgstr ""
-"Tento název by měl krátce a pokud možno jednoznačně označovat celý portál.  "
-"Název bude zobrazen v záhlaví každé stránky."
-
-#. Translators: Site means a webpage or web application. Subtitle as in ,,title -- subtitle''.
-#: ../lib/wiking/configuration.py:283
-msgid "Site subtitle"
-msgstr "Podtitul portálu"
-
-#: ../lib/wiking/configuration.py:284
-msgid ""
-"Site subtitle is an optional more descriptive title of the website.  It will "
-"appear at the top of every page together with site title, but where brevity "
-"matters, only title will be used."
-msgstr ""
-"Podtitul je nepovinný podrobnější popis portálu.  Bude také zobrazen v "
-"záhlaví každé stránky, ale v situacích, kde je nutná stručnost bude vynechán."
-
-#. Translators: Web page or web application specific image.
-#: ../lib/wiking/configuration.py:291
-msgid "Site icon"
-msgstr "Ikona portálu"
-
-#: ../lib/wiking/configuration.py:305
-msgid "Default language"
-msgstr "Výchozí jazyk"
-
-#. Translators: Language negotiation means the process where the server is trying
-#. to find a language that matches with what the users internet browser asks for.
-#: ../lib/wiking/configuration.py:308
-msgid ""
-"Defines the language (lowercase ISO 639-1 Alpha-2 code) to be used when "
-"content language negotiation fails. If not set (which is the default), the "
-"server will issue a 606 HTTP error (Not acceptable) when the document is not "
-"available in any of the requested languages. The error page will contain a "
-"description of the problem and a list of available language variants of the "
-"requested document. The negotiation is based on the browser setting of "
-"user's language preference passed through the 'Accept-Language' HTTP header. "
-"If set, Wiking will automatically serve given language variant instead of "
-"issuing the error if that variant is available.  If unavailable, the 606 "
-"error is raised anyway, so you need to make sure that all documents are "
-"available at least in the default language variant if you want to avoid 606 "
-"errors completely."
-msgstr ""
-"Definuje jazyk (kód ISO 639-1 Alpha-2 psaný malými písmeny), který se bude "
-"používat, pokud selže automatické přepínání jazyka obsahu. Pokud není "
-"nastaveno (což je defaultní hodnota) a požadovaný dokument není dostupný v "
-"některém z požadovaných jazyků, server odešle HTTP chybu 606 (Not "
-"acceptable). Chybová stránka obsahuje popis problému a seznam dostupných "
-"jazykových variant požadovaného dokumentu. Automatické přepínání jazyka "
-"obsahuje je založeno na nastavení jazyka internetového prohlížeče uživatelem "
-"předávaného pomocí  HTTP hlavičky 'Accept-Language'. Pokud je toto "
-"nastaveno, Wiking automaticky poskytne tuto jazykovou variantu, pokud je "
-"dostupná, a chybu nezobrazí. Pokud toto není nastaveno, ke vzniku chyby 606 "
-"dojde stejně. Pokud se tedy chybě 606 chcete úplně vyhnout, ujistěte se, že "
-"jsou všechny dokumenty dostupné alespoň v defaultním jazyku."
-
-#. Translators: Yes/No configuration option label. Should the login panel display user role (as Admin, Student, Tutor etc.)
-#: ../lib/wiking/configuration.py:378
-msgid "Display role in login panel"
-msgstr "Zobrazit roli v panelu přihlášení"
-
-#: ../lib/wiking/configuration.py:379
-msgid ""
-"If enabled, the login panel on each page will not display only the current "
-"username, but also his current user role, which affects his permissions."
-msgstr ""
-"Pokud je povoleno, přihlašovací panel na každé stránce bude mimo jména "
-"uživatele zobrazovat i popis jeho uživatelské role v systému, která určuje "
-"oprávnění."
-
-#: ../lib/wiking/configuration.py:397
-msgid "Whether to use e-mails as login names"
-msgstr "Použít e-mailové adresy jako přihlašovací jméno"
-
-#: ../lib/wiking/configuration.py:398
-msgid "Iff true, users must use e-mail addresses as their login names."
-msgstr ""
-"Je-li nastaveno, uživatelé musí jako svá přihlašovací jména používat e-"
-"mailové adresy."
-
-#: ../lib/wiking/configuration.py:412
-msgid ""
-"If set, the newly registered users will be automatically approved without "
-"any administrator's action.  The adminstrator may still need to asign users "
-"to groups to grant them further privileges, but the accounts are enabled "
-"right after the user confirms the registration code."
-msgstr ""
-"Pokud je nastaveno, nově registrovaní uživatelé budou automaticky schválení "
-"bez zásahu administrátora.  Pro přidělení následných přístupových práv může "
-"být přesto zásah správce zapotřebí, ale účet bude plně aktivní ihned po "
-"uživatelově potvrzení registračního kódu."
-
 #: ../lib/wiking/cms/appl.py:53
 msgid "Manage this site"
 msgstr "Správa obsahu"
@@ -157,161 +31,6 @@ msgstr "Opustit rozhraní správy obsahu"
 msgid "Wiking Management Interface"
 msgstr "Rozhraní správy obsahu"
 
-#. Translators: Yes/No configuration option label. Should the login panel be visible?
-#: ../lib/wiking/cms/configuration.py:36
-msgid "Allow login panel"
-msgstr "Zobrazit panel přihlášení"
-
-#: ../lib/wiking/cms/configuration.py:37
-msgid ""
-"If enabled, the information about the currently logged user and login/logout "
-"controls will be present on each page as a separate panel.  This panel will "
-"always be the first panel on the page."
-msgstr ""
-"Pokud tuto volbu povolíte, informace o právě přihlášeném uživateli a "
-"ovládací prvky pro přihlášení/odhlášení budou zobrazeny v samostatném "
-"panelu.  Tento panel bude vždy zobrazen jako první z panelů."
-
-#. Translators: Yes/No configuration option label. Should link to WMI be visible?  "WMI"
-#. stands for Wiking Management Interface.  Don't feel obliged to use an abbreviation.  Use
-#. whatever brief form obviously referning to whatever translation you used for "Wiking
-#. Management Interface".
-#: ../lib/wiking/cms/configuration.py:47
-msgid "Allow WMI link"
-msgstr "Povolit odkaz do správcovského rozhraní"
-
-#. Translators: Yes/no configuration label. Can new users register to this
-#. website/application?
-#: ../lib/wiking/cms/configuration.py:55
-msgid "Allow new user registration"
-msgstr "Umožnit registraci nových uživatelů"
-
-#: ../lib/wiking/cms/configuration.py:56
-msgid ""
-"If enabled, all visitors are allowed to create a user account.  If disabled, "
-"new user accounts must be created by administrator.  Note, that the newly "
-"created accounts are inactive (at least with the default implementation of "
-"the user management module), so the creation of the account doesn't give the "
-"user any actual privileges."
-msgstr ""
-"Pokud je povoleno, všem návštěvníkům je umožněno se zaregistrovat jako "
-"uživatel a vytvořit tak uživatelský účet.  Pokud tuto možnost zakážete, "
-"budou všechy účty vytvářeny administrátorem.  Nově vytvořené účty jsou vždy "
-"neaktivní (alespoň ve výchozí implementaci modulu správy uživatelů), takže "
-"vytvoření účtu ještě samo o sobě uživateli nedává žádná práva."
-
-#. Translators: Maximal size an uploaded file can have.
-#: ../lib/wiking/cms/configuration.py:65
-msgid "Maximal upload size"
-msgstr "Maximální velikost pro upload"
-
-#: ../lib/wiking/cms/configuration.py:66
-msgid ""
-"The maximal size of uploaded files in bytes.  The server needs to be "
-"relaoded for the changes in this option to take effect."
-msgstr ""
-"Maximální velikost souborů přenášených na server (celé číslo v bajtech).  "
-"Pozor, aby se změny této volby uplatnily, je nutné server restartovat."
-
-#. Translators: Web form label (account in the meaning of user account)
-#: ../lib/wiking/cms/texts.py:29
-msgid "Information about a locked account"
-msgstr "Informace o zablokovaném účtu"
-
-#. Translators: Text presented to a user in a web page
-#: ../lib/wiking/cms/texts.py:31
-msgid ""
-"Your account is currently disabled.\n"
-"\n"
-"The protected services are not available to you.\n"
-"Contact the application administrator to get the account enabled."
-msgstr ""
-"Váš účet je momentálně zablokován.\n"
-"\n"
-"Chráněné služby Vám nejsou dostupné.\n"
-"Kontaktujte správce aplikace pro opěovné povolení Vašeho účtu."
-
-#. Translators: Web form label
-#: ../lib/wiking/cms/texts.py:39
-msgid "Information about an account waiting for activation code confirmation"
-msgstr "Informace o účtu čekajícím na potvrzení aktivačního kódu"
-
-#. Translators: Text presented to a user in a web page
-#: ../lib/wiking/cms/texts.py:41
-msgid ""
-"Your account is inactive because\n"
-"you have not yet confirmed the activation code sent to you by e-mail.\n"
-"\n"
-"Please, check your e-mail and follow the provided link or enter the\n"
-"activation code into the field below.\n"
-"\n"
-"You can also continue without entering the activation code, but\n"
-"the protected services will not be available to you."
-msgstr ""
-"Váš účet je neaktivní, protože zatím nebyl potvzen aktivační kód, který\n"
-"Vám byl zaslán e-mailem.\n"
-"\n"
-"Zkontrolujte, prosím, svou došlou poštu a následujte tam uvedený odkaz, "
-"nebo\n"
-"zadejte aktivační kód přímo do políčka níže.\n"
-"\n"
-"Můžete také pokračovat bez zadání aktivačního kódu, ale chráněné služby Vám\n"
-"nebudou dostupné."
-
-#. Translators: Web form label
-#: ../lib/wiking/cms/texts.py:53
-msgid "Information about an account waiting for admin approval"
-msgstr "Informace o účtu čekajícím na schválení správcem"
-
-#. Translators: Text presented to a user in a web page
-#: ../lib/wiking/cms/texts.py:55
-msgid ""
-"Your account is waiting for approval by the administrator.\n"
-"                  \n"
-"The protected services are not available until the account gets approved.\n"
-"If the account remains unapproved for a long time, contact the application "
-"administrator."
-msgstr ""
-"Váš účet čeká na schválení správcem.\n"
-"\n"
-"Chráněné služby Vám nejsou dostupné dokud účet nebude povolen.\n"
-"Kontaktujte správce aplikace pokud Váš účet zůstává nepotvrzen delší dobu."
-
-#: ../lib/wiking/cms/texts.py:62
-msgid "Introductory text displayed above the registration form"
-msgstr "Úvodní text zobrazený nad registračním formulářem"
-
-#: ../lib/wiking/cms/texts.py:67
-msgid "Text displayed after successful user registration"
-msgstr "Text zobrazený po úspěšné registraci nového uživatele"
-
-#: ../lib/wiking/cms/texts.py:69
-msgid ""
-"Registration completed successfuly. Your account is now fully functional but "
-"you may need to get futher privileges by the administrator to access certain "
-"restricted services."
-msgstr ""
-"Registrace proběhla úspěšně.  Váš účet je nyní aktivní.  Pro přístup k "
-"některým chráněným službám může být zapotřebí přidělení přístupových práv "
-"správcem."
-
-#: ../lib/wiking/cms/texts.py:74
-msgid ""
-"Registration completed successfuly. Your account now awaits administrator's "
-"approval."
-msgstr ""
-"Registrace proběhla úspěšně.  Váš účet nyní čeká na schválení "
-"administrátorem."
-
-#: ../lib/wiking/cms/texts.py:79
-msgid ""
-"Information displayed above the checkbox for confirmation of site specific "
-"conditions during registration (if empty, no confirmation is required)"
-msgstr ""
-"Informace zobrazená nad zaškrtávacím políčkem pro potvrzení souhlasu se "
-"specifickými podmínkami registrace (pokud není vyplněno, potvrzení není "
-"vyžadováno)"
-
 #: ../lib/wiking/cms/cms.py:61
 msgid "formatting manual"
 msgstr "příručka formátování"
@@ -412,7 +131,7 @@ msgstr "Zadejte aktivační kód:"
 
 #. Translators: Button name. Computer terminology. Use an appropriate term common
 #. for submitting forms in a computer application.
-#: ../lib/wiking/cms/cms.py:496 ../lib/wiking/cms/users.py:1142
+#: ../lib/wiking/cms/cms.py:496 ../lib/wiking/cms/users.py:1171
 msgid "Submit"
 msgstr "Odeslat"
 
@@ -424,7 +143,7 @@ msgstr "Pokračovat bez aktivace"
 msgid "Account disabled"
 msgstr "Účet neaktivní"
 
-#: ../lib/wiking/cms/cms.py:533 ../lib/wiking/cms/users.py:814
+#: ../lib/wiking/cms/cms.py:533 ../lib/wiking/cms/users.py:819
 msgid "Account not activated"
 msgstr "Účet neaktivní"
 
@@ -766,7 +485,7 @@ msgstr "Správa dostupných barevných motivů."
 
 #. Translators: Table column heading. Whether the account is active. Values are yes/no.
 #: ../lib/wiking/cms/cms.py:897 ../lib/wiking/cms/cms.py:1987
-#: ../lib/wiking/cms/users.py:1262
+#: ../lib/wiking/cms/users.py:1291
 msgid "Active"
 msgstr "Aktivní"
 
@@ -1060,7 +779,7 @@ msgstr ""
 #. Translators: Button label. Use standard computer terminology.
 #. Translators: Back button label. Standard computer terminology.
 #: ../lib/wiking/cms/cms.py:1212 ../lib/wiking/cms/cms.py:1572
-#: ../lib/wiking/cms/users.py:900
+#: ../lib/wiking/cms/users.py:905
 msgid "Back"
 msgstr "Zpět"
 
@@ -1519,6 +1238,161 @@ msgstr "Použít jako vzor"
 msgid "Edit this mail for repeated use"
 msgstr "Upravit tento mail pro nové použití"
 
+#. Translators: Yes/No configuration option label. Should the login panel be visible?
+#: ../lib/wiking/cms/configuration.py:36
+msgid "Allow login panel"
+msgstr "Zobrazit panel přihlášení"
+
+#: ../lib/wiking/cms/configuration.py:37
+msgid ""
+"If enabled, the information about the currently logged user and login/logout "
+"controls will be present on each page as a separate panel.  This panel will "
+"always be the first panel on the page."
+msgstr ""
+"Pokud tuto volbu povolíte, informace o právě přihlášeném uživateli a "
+"ovládací prvky pro přihlášení/odhlášení budou zobrazeny v samostatném "
+"panelu.  Tento panel bude vždy zobrazen jako první z panelů."
+
+#. Translators: Yes/No configuration option label. Should link to WMI be visible?  "WMI"
+#. stands for Wiking Management Interface.  Don't feel obliged to use an abbreviation.  Use
+#. whatever brief form obviously referning to whatever translation you used for "Wiking
+#. Management Interface".
+#: ../lib/wiking/cms/configuration.py:47
+msgid "Allow WMI link"
+msgstr "Povolit odkaz do správcovského rozhraní"
+
+#. Translators: Yes/no configuration label. Can new users register to this
+#. website/application?
+#: ../lib/wiking/cms/configuration.py:55
+msgid "Allow new user registration"
+msgstr "Umožnit registraci nových uživatelů"
+
+#: ../lib/wiking/cms/configuration.py:56
+msgid ""
+"If enabled, all visitors are allowed to create a user account.  If disabled, "
+"new user accounts must be created by administrator.  Note, that the newly "
+"created accounts are inactive (at least with the default implementation of "
+"the user management module), so the creation of the account doesn't give the "
+"user any actual privileges."
+msgstr ""
+"Pokud je povoleno, všem návštěvníkům je umožněno se zaregistrovat jako "
+"uživatel a vytvořit tak uživatelský účet.  Pokud tuto možnost zakážete, "
+"budou všechy účty vytvářeny administrátorem.  Nově vytvořené účty jsou vždy "
+"neaktivní (alespoň ve výchozí implementaci modulu správy uživatelů), takže "
+"vytvoření účtu ještě samo o sobě uživateli nedává žádná práva."
+
+#. Translators: Maximal size an uploaded file can have.
+#: ../lib/wiking/cms/configuration.py:65
+msgid "Maximal upload size"
+msgstr "Maximální velikost pro upload"
+
+#: ../lib/wiking/cms/configuration.py:66
+msgid ""
+"The maximal size of uploaded files in bytes.  The server needs to be "
+"relaoded for the changes in this option to take effect."
+msgstr ""
+"Maximální velikost souborů přenášených na server (celé číslo v bajtech).  "
+"Pozor, aby se změny této volby uplatnily, je nutné server restartovat."
+
+#. Translators: Web form label (account in the meaning of user account)
+#: ../lib/wiking/cms/texts.py:29
+msgid "Information about a locked account"
+msgstr "Informace o zablokovaném účtu"
+
+#. Translators: Text presented to a user in a web page
+#: ../lib/wiking/cms/texts.py:31
+msgid ""
+"Your account is currently disabled.\n"
+"\n"
+"The protected services are not available to you.\n"
+"Contact the application administrator to get the account enabled."
+msgstr ""
+"Váš účet je momentálně zablokován.\n"
+"\n"
+"Chráněné služby Vám nejsou dostupné.\n"
+"Kontaktujte správce aplikace pro opěovné povolení Vašeho účtu."
+
+#. Translators: Web form label
+#: ../lib/wiking/cms/texts.py:39
+msgid "Information about an account waiting for activation code confirmation"
+msgstr "Informace o účtu čekajícím na potvrzení aktivačního kódu"
+
+#. Translators: Text presented to a user in a web page
+#: ../lib/wiking/cms/texts.py:41
+msgid ""
+"Your account is inactive because\n"
+"you have not yet confirmed the activation code sent to you by e-mail.\n"
+"\n"
+"Please, check your e-mail and follow the provided link or enter the\n"
+"activation code into the field below.\n"
+"\n"
+"You can also continue without entering the activation code, but\n"
+"the protected services will not be available to you."
+msgstr ""
+"Váš účet je neaktivní, protože zatím nebyl potvzen aktivační kód, který\n"
+"Vám byl zaslán e-mailem.\n"
+"\n"
+"Zkontrolujte, prosím, svou došlou poštu a následujte tam uvedený odkaz, "
+"nebo\n"
+"zadejte aktivační kód přímo do políčka níže.\n"
+"\n"
+"Můžete také pokračovat bez zadání aktivačního kódu, ale chráněné služby Vám\n"
+"nebudou dostupné."
+
+#. Translators: Web form label
+#: ../lib/wiking/cms/texts.py:53
+msgid "Information about an account waiting for admin approval"
+msgstr "Informace o účtu čekajícím na schválení správcem"
+
+#. Translators: Text presented to a user in a web page
+#: ../lib/wiking/cms/texts.py:55
+msgid ""
+"Your account is waiting for approval by the administrator.\n"
+"                  \n"
+"The protected services are not available until the account gets approved.\n"
+"If the account remains unapproved for a long time, contact the application "
+"administrator."
+msgstr ""
+"Váš účet čeká na schválení správcem.\n"
+"\n"
+"Chráněné služby Vám nejsou dostupné dokud účet nebude povolen.\n"
+"Kontaktujte správce aplikace pokud Váš účet zůstává nepotvrzen delší dobu."
+
+#: ../lib/wiking/cms/texts.py:62
+msgid "Introductory text displayed above the registration form"
+msgstr "Úvodní text zobrazený nad registračním formulářem"
+
+#: ../lib/wiking/cms/texts.py:67
+msgid "Text displayed after successful user registration"
+msgstr "Text zobrazený po úspěšné registraci nového uživatele"
+
+#: ../lib/wiking/cms/texts.py:69
+msgid ""
+"Registration completed successfuly. Your account is now fully functional but "
+"you may need to get futher privileges by the administrator to access certain "
+"restricted services."
+msgstr ""
+"Registrace proběhla úspěšně.  Váš účet je nyní aktivní.  Pro přístup k "
+"některým chráněným službám může být zapotřebí přidělení přístupových práv "
+"správcem."
+
+#: ../lib/wiking/cms/texts.py:74
+msgid ""
+"Registration completed successfuly. Your account now awaits administrator's "
+"approval."
+msgstr ""
+"Registrace proběhla úspěšně.  Váš účet nyní čeká na schválení "
+"administrátorem."
+
+#: ../lib/wiking/cms/texts.py:79
+msgid ""
+"Information displayed above the checkbox for confirmation of site specific "
+"conditions during registration (if empty, no confirmation is required)"
+msgstr ""
+"Informace zobrazená nad zaškrtávacím políčkem pro potvrzení souhlasu se "
+"specifickými podmínkami registrace (pokud není vyplněno, potvrzení není "
+"vyžadováno)"
+
 #: ../lib/wiking/cms/users.py:57 ../lib/wiking/cms/users.py:148
 msgid "Group"
 msgstr "Skupina"
@@ -1544,7 +1418,7 @@ msgid "User Roles"
 msgstr "Role uživatele"
 
 #: ../lib/wiking/cms/users.py:149 ../lib/wiking/cms/users.py:434
-#: ../lib/wiking/cms/users.py:1252
+#: ../lib/wiking/cms/users.py:1281
 msgid "User"
 msgstr "Uživatel"
 
@@ -1577,7 +1451,10 @@ msgid ""
 "automatically which users belong into the group. Thus you can not manage "
 "their membership manually. You can, however, still manage the contained "
 "groups."
-msgstr "Toto je speciální systémová skupina, která nemá žádné přímé členy. Systém automaticky rozhoduje kteří uživatelé do ní patří. Proto není možné členství uživatelů spravovat ručně. Nicméně je možné určit obsažené skupiny."
+msgstr ""
+"Toto je speciální systémová skupina, která nemá žádné přímé členy. Systém "
+"automaticky rozhoduje kteří uživatelé do ní patří. Proto není možné členství "
+"uživatelů spravovat ručně. Nicméně je možné určit obsažené skupiny."
 
 #: ../lib/wiking/cms/users.py:273
 msgid ""
@@ -1631,7 +1508,7 @@ msgid "Manage registered users and their privileges."
 msgstr "Správa registrovaných uživatelů a jejich oprávnění."
 
 #. Translators: Login name for a website. Registration form field.
-#: ../lib/wiking/cms/users.py:408 ../lib/wiking/cms/users.py:1210
+#: ../lib/wiking/cms/users.py:408 ../lib/wiking/cms/users.py:1239
 msgid "Login name"
 msgstr "Přihlašovací jméno"
 
@@ -1643,7 +1520,7 @@ msgstr ""
 "Platné přihlašovací jméno obsahuje pouze písmena bez diakritiky, číslice, "
 "tečky, pomlčky a případně i podtržítka a musí začínat písmenem."
 
-#: ../lib/wiking/cms/users.py:413 ../lib/wiking/cms/users.py:1211
+#: ../lib/wiking/cms/users.py:413 ../lib/wiking/cms/users.py:1240
 msgid "Password"
 msgstr "Heslo"
 
@@ -1844,12 +1721,12 @@ msgid "User's Groups"
 msgstr "Skupiny uživatele"
 
 #. Translators: Heading for an overview when and how the user has accessed the application.
-#: ../lib/wiking/cms/users.py:530 ../lib/wiking/cms/users.py:1247
+#: ../lib/wiking/cms/users.py:530 ../lib/wiking/cms/users.py:1276
 msgid "Login History"
 msgstr "Historie přihlášení"
 
 #. Translators: Name of group of users who have full access to the system.
-#: ../lib/wiking/cms/users.py:538 ../lib/wiking/cms/users.py:1110
+#: ../lib/wiking/cms/users.py:538 ../lib/wiking/cms/users.py:1130
 msgid "Active users"
 msgstr "Aktivní uživatelé"
 
@@ -1939,156 +1816,136 @@ msgid "Active account"
 msgstr "Aktivní účet"
 
 #. Translators: Personal data -- first name, surname, nickname ...
-#: ../lib/wiking/cms/users.py:648 ../lib/wiking/cms/users.py:654
-#: ../lib/wiking/cms/users.py:675
+#: ../lib/wiking/cms/users.py:658 ../lib/wiking/cms/users.py:664
+#: ../lib/wiking/cms/users.py:685
 msgid "Personal data"
 msgstr "Osobní údaje"
 
 #. Translators: Contact information -- email, phone, address...
-#: ../lib/wiking/cms/users.py:650 ../lib/wiking/cms/users.py:655
-#: ../lib/wiking/cms/users.py:676
+#: ../lib/wiking/cms/users.py:660 ../lib/wiking/cms/users.py:665
+#: ../lib/wiking/cms/users.py:686
 msgid "Contact information"
 msgstr "Kontaktní údaje"
 
 #. Translators: Others is a label for a group of unspecified form fields
 #. (as in Personal data, Contact information, Others).
-#: ../lib/wiking/cms/users.py:653 ../lib/wiking/cms/users.py:656
-#: ../lib/wiking/cms/users.py:681
+#: ../lib/wiking/cms/users.py:663 ../lib/wiking/cms/users.py:666
+#: ../lib/wiking/cms/users.py:691
 msgid "Others"
 msgstr "Ostatní"
 
-#: ../lib/wiking/cms/users.py:657
+#: ../lib/wiking/cms/users.py:667
 msgid "Account state"
 msgstr "Stav účtu"
 
 #. Translators: Button label.
-#: ../lib/wiking/cms/users.py:662
+#: ../lib/wiking/cms/users.py:672
 msgid "New user"
 msgstr "Nový uživatel"
 
 #. Translators: Button label.
-#: ../lib/wiking/cms/users.py:664
+#: ../lib/wiking/cms/users.py:674
 msgid "Edit profile"
 msgstr "Upravit profil"
 
 #. Translators: Button label. Modify the users data (email, address...)
-#: ../lib/wiking/cms/users.py:666
+#: ../lib/wiking/cms/users.py:676
 msgid "Modify user's record"
 msgstr "Změnit údaje o uživateli"
 
-#: ../lib/wiking/cms/users.py:679
+#: ../lib/wiking/cms/users.py:689
 msgid "Login information"
 msgstr "Přihlašovací údaje"
 
-#: ../lib/wiking/cms/users.py:712
+#: ../lib/wiking/cms/users.py:722
 msgid "Enter your current password."
 msgstr "Zadejte své současné heslo."
 
-#: ../lib/wiking/cms/users.py:716
+#: ../lib/wiking/cms/users.py:726
 msgid "Invalid password."
 msgstr "Neplatné heslo."
 
-#: ../lib/wiking/cms/users.py:720
+#: ../lib/wiking/cms/users.py:730
 msgid "Enter the new password."
 msgstr "Zadejte nové heslo."
 
-#: ../lib/wiking/cms/users.py:728
+#: ../lib/wiking/cms/users.py:738
 msgid "The new password is the same as the old one."
 msgstr "Nové heslo je stejné jako staré."
 
-#: ../lib/wiking/cms/users.py:753
+#: ../lib/wiking/cms/users.py:763
 #, python-format
 msgid ""
-"The first step of your registration at %(server_hostname)s was successfully "
-"completed.\n"
-"\n"
-"For the next step visit the following URL and follow the instructions "
-"there:\n"
+"To finish your registration at %(server_hostname)s, click on the following "
+"link:\n"
 "%(uri)s\n"
 "\n"
-"If the above link fails, you will be prompted for your activation code when\n"
-"you attempt to log in.\n"
-"\n"
-"Your activation code is: %(code)s\n"
 msgstr ""
-"První krok vaší registrace na %(server_hostname)s byl úspěšně dokončen.\n"
-"\n"
-"Pro pokračování navštivte uvedenou webovou adresu a následujte instrukce:\n"
+"Pro dokončení Vaší registrace na %(server_hostname)s klikněte na následující odkaz:\n"
 "%(uri)s\n"
 "\n"
-"Pokud výše uvedený odkaz selže, budete při pokusu o přihlášení k serveru\n"
-"dotázáni na aktivační kód.\n"
-"\n"
-"Váš aktivační kód je: %(code)s\n"
 
-#: ../lib/wiking/cms/users.py:768
-msgid "Registration accepted."
-msgstr "Registrace přijata."
-
-#: ../lib/wiking/cms/users.py:769
-msgid "Please, check your mailbox for instructions how to proceed."
-msgstr ""
-"Zkontrolujte si, prosím, přijatou poštu, kde najdete informace jak "
-"pokračovat."
-
-#: ../lib/wiking/cms/users.py:773
+#: ../lib/wiking/cms/users.py:776
 msgid "Registration cancelled."
 msgstr "Registrace zrušena."
 
-#: ../lib/wiking/cms/users.py:779
+#: ../lib/wiking/cms/users.py:782
 #, python-format
 msgid "Your registration at %s"
 msgstr "Vaše registrace na %s"
 
-#: ../lib/wiking/cms/users.py:783 ../lib/wiking/cms/users.py:835
-#: ../lib/wiking/cms/users.py:885 ../lib/wiking/cms/users.py:1218
+#: ../lib/wiking/cms/users.py:786 ../lib/wiking/cms/users.py:840
+#: ../lib/wiking/cms/users.py:890 ../lib/wiking/cms/users.py:1247
 msgid "Failed sending e-mail notification:"
 msgstr "Nepodařilo se odeslat e-mailové upozornění:"
 
 #. Translators: Follows an email addres, e.g. ``Activation code was sent to joe at brailcom.org''
-#: ../lib/wiking/cms/users.py:787
-#, python-format
-msgid "Activation code was sent to %s."
-msgstr "Aktivační kód byl odeslán na adresu %s."
+#: ../lib/wiking/cms/users.py:790
+#, fuzzy, python-format
+msgid ""
+"To finish registration, please confirm the activation code that was sent to "
+"your email address at %(email)s."
+msgstr ""
+"Pro dokončení registrace prosím potvrďte aktivační kód zaslaný na Vaši emailovou adresu %(email)s."
 
-#: ../lib/wiking/cms/users.py:810
+#: ../lib/wiking/cms/users.py:815
 msgid "User registration already confirmed."
 msgstr "Registrace uživatele již byla dříve potvrzena."
 
-#: ../lib/wiking/cms/users.py:813
+#: ../lib/wiking/cms/users.py:818
 msgid "Invalid activation code."
 msgstr "Neplatný aktivační kód."
 
-#: ../lib/wiking/cms/users.py:821
+#: ../lib/wiking/cms/users.py:826
 #, python-format
 msgid "New user %(fullname)s registered at %(server_hostname)s."
 msgstr "Nový uživatel %(fullname)s se registroval na %(server_hostname)s."
 
-#: ../lib/wiking/cms/users.py:825
+#: ../lib/wiking/cms/users.py:830
 msgid "The account was approved automatically according to server setup."
 msgstr "Účet byl schválen automaticky na základě nastavení serveru."
 
-#: ../lib/wiking/cms/users.py:828
+#: ../lib/wiking/cms/users.py:833
 msgid "Please approve the account:"
 msgstr "Proveďte, prosím, potvrzení registrace:"
 
-#: ../lib/wiking/cms/users.py:832
+#: ../lib/wiking/cms/users.py:837
 msgid "New user registration:"
 msgstr "Registrace nového uživatele:"
 
-#: ../lib/wiking/cms/users.py:838
+#: ../lib/wiking/cms/users.py:843
 msgid "E-mail notification has been sent to server administrator."
 msgstr "E-mailové upozornění bylo odesláno správci serveru."
 
-#: ../lib/wiking/cms/users.py:866
+#: ../lib/wiking/cms/users.py:871
 msgid "Registration confirmed"
 msgstr "Registrace potvrzena"
 
-#: ../lib/wiking/cms/users.py:877
+#: ../lib/wiking/cms/users.py:882
 msgid "The account was enabled."
 msgstr "Účet byl povolen."
 
-#: ../lib/wiking/cms/users.py:879
+#: ../lib/wiking/cms/users.py:884
 #, python-format
 msgid ""
 "Your account at %(uri)s has been enabled. Please log in with username '%"
@@ -2097,32 +1954,32 @@ msgstr ""
 "Váš účet na %(uri)s byl povolen. Přihlašte se, prosím, s Vaším uživatelským "
 "jménem „%(login)s“ a heslem zvoleným při registraci."
 
-#: ../lib/wiking/cms/users.py:882
+#: ../lib/wiking/cms/users.py:887
 msgid "Your account has been enabled."
 msgstr "Váš účet byl povolen."
 
-#: ../lib/wiking/cms/users.py:887
+#: ../lib/wiking/cms/users.py:892
 msgid "E-mail notification has been sent to:"
 msgstr "E-mailové upozornění bylo odesláno na:"
 
-#: ../lib/wiking/cms/users.py:889
+#: ../lib/wiking/cms/users.py:894
 msgid "The account was disabled."
 msgstr "Účet byl zakázán."
 
-#: ../lib/wiking/cms/users.py:895
+#: ../lib/wiking/cms/users.py:900
 #, python-format
 msgid "The registration expired on %(date)s."
 msgstr "Registrace vypršela %(date)s."
 
-#: ../lib/wiking/cms/users.py:898
+#: ../lib/wiking/cms/users.py:903
 msgid "Continue"
 msgstr "Pokračovat"
 
-#: ../lib/wiking/cms/users.py:902
+#: ../lib/wiking/cms/users.py:907
 msgid "The registration code was not confirmed by the user!"
 msgstr "Registrační kód nebyl uživatelem potvrzen!"
 
-#: ../lib/wiking/cms/users.py:903
+#: ../lib/wiking/cms/users.py:908
 msgid ""
 "Please enable the account only if you are sure that the e-mail address "
 "belongs to given user."
@@ -2130,43 +1987,47 @@ msgstr ""
 "Potvrďte, prosím, účet pouze tehdy, pokud jste si jisti, že e-mailová adresa "
 "skutečně patří danému uživateli."
 
-#: ../lib/wiking/cms/users.py:1111
+#: ../lib/wiking/cms/users.py:1131
 msgid "Listing of all active user accounts."
 msgstr "Výpis všech aktivních uživatelských účtů."
 
-#: ../lib/wiking/cms/users.py:1138
+#: ../lib/wiking/cms/users.py:1142
+msgid "Users who have `confirm' flag set"
+msgstr ""
+
+#: ../lib/wiking/cms/users.py:1167
 msgid "Enter your login name or e-mail address"
 msgstr "Zadejte své přihlašovací jméno, nebo e-mailovou adresu"
 
-#: ../lib/wiking/cms/users.py:1173
+#: ../lib/wiking/cms/users.py:1202
 msgid "Password reminder"
 msgstr "Pomocník zapomenutého hesla"
 
-#: ../lib/wiking/cms/users.py:1186
+#: ../lib/wiking/cms/users.py:1215
 msgid "Multiple user accounts found for given email address."
 msgstr "Pro zadanou e-mailovou adresu bylo nalezeno více uživatelských účtů."
 
-#: ../lib/wiking/cms/users.py:1187
+#: ../lib/wiking/cms/users.py:1216
 msgid "Please, select the account for which you want to remind:"
 msgstr "Zvolte prosím účet, pro který chcete použít funkci připomenutí:"
 
 #. Translators: Credentials such as password...
-#: ../lib/wiking/cms/users.py:1200
+#: ../lib/wiking/cms/users.py:1229
 msgid "Your credentials were reset to:"
 msgstr "Vaše přihlašovací údaje byly nastaveny na:"
 
 #. Translators: Credentials such as password...
-#: ../lib/wiking/cms/users.py:1204
+#: ../lib/wiking/cms/users.py:1233
 msgid "Your credentials are:"
 msgstr "Vaše přihlašovací údaje jsou:"
 
-#: ../lib/wiking/cms/users.py:1206
+#: ../lib/wiking/cms/users.py:1235
 #, python-format
 msgid "A password reminder request has been made at %(server_uri)s."
 msgstr ""
 "Na serveru %(server_uri)s byl zadán požadavek na zaslání zapomenutého hesla."
 
-#: ../lib/wiking/cms/users.py:1213
+#: ../lib/wiking/cms/users.py:1242
 msgid ""
 "We strongly recommend you change your password at nearest occassion, since "
 "it has been exposed to an unsecure channel."
@@ -2174,63 +2035,225 @@ msgstr ""
 "Silně doporučujeme heslo změnit při nejbližší možné příležitosti, neboť "
 "během přenosu e-mailem mohlo být lehce zachyceno neoprávněnou osobou."
 
-#: ../lib/wiking/cms/users.py:1219
+#: ../lib/wiking/cms/users.py:1248
 msgid "Please try repeating your request later or contact the administrator!"
 msgstr "Zopakujte prosím požadavek později, nebo kontaktujte správce serveru!"
 
-#: ../lib/wiking/cms/users.py:1221
+#: ../lib/wiking/cms/users.py:1250
 msgid "E-mail information has been sent to your email address."
 msgstr "E-mailové upozornění bylo odesláno na Vaši e-mailovou adresu."
 
-#: ../lib/wiking/cms/users.py:1224
+#: ../lib/wiking/cms/users.py:1253
 msgid "No user account for your query."
 msgstr "Žádný uživatelský účet neodpovídá zadání"
 
-#: ../lib/wiking/cms/users.py:1248
+#: ../lib/wiking/cms/users.py:1277
 msgid "History of successful login sessions and unsuccessful login attempts."
 msgstr "Historie úspěšných sezení i neúspěšných pokusů o přihlášení."
 
 #. Translators: Login name.
-#: ../lib/wiking/cms/users.py:1254
+#: ../lib/wiking/cms/users.py:1283
 msgid "Login"
 msgstr "Přihlašovací jméno"
 
 #. Translators: Form field saying whether the users attempt was succesful. Values are Yes/No.
-#: ../lib/wiking/cms/users.py:1256
+#: ../lib/wiking/cms/users.py:1285
 msgid "Success"
 msgstr "Úspěch"
 
 #. Translators: Table column heading. Time of the start of user session, followed by a date and time.
-#: ../lib/wiking/cms/users.py:1258
+#: ../lib/wiking/cms/users.py:1287
 msgid "Start time"
 msgstr "Začátek"
 
 #. Translators: Table column heading. The length of user session. Contains time.
-#: ../lib/wiking/cms/users.py:1260
+#: ../lib/wiking/cms/users.py:1289
 msgid "Duration"
 msgstr "Trvání"
 
-#: ../lib/wiking/cms/users.py:1263
+#: ../lib/wiking/cms/users.py:1292
 msgid "IP address"
 msgstr "IP Adresa"
 
 #. Translators: Internet name of the remote computer (computer terminology).
-#: ../lib/wiking/cms/users.py:1265
+#: ../lib/wiking/cms/users.py:1294
 msgid "Hostname"
 msgstr "Jméno počítače"
 
 #. Translators: "User agent" is a generalized name for browser or more precisely the
 #. software which produced the HTTP request (was used to access the website).
-#: ../lib/wiking/cms/users.py:1268
+#: ../lib/wiking/cms/users.py:1297
 msgid "User agent"
 msgstr "Prohlížeč"
 
 #. Translators: Meaning where the user came from. Computer terminology. Do not translate
 #. "HTTP" and if unsure, don't translate at all (it is a very technical term).
-#: ../lib/wiking/cms/users.py:1271
+#: ../lib/wiking/cms/users.py:1300
 msgid "HTTP Referer"
 msgstr "HTTP Referer"
 
+#: ../lib/wiking/configuration.py:194
+msgid "Webmaster's e-mail address"
+msgstr "E-mailová adresa správce"
+
+#: ../lib/wiking/configuration.py:205
+msgid "Default sender address"
+msgstr "Výchozí adresa odesílatele"
+
+#: ../lib/wiking/configuration.py:222
+msgid "Force HTTPS login"
+msgstr "Vynutit HTTPS pro přihlášení"
+
+#: ../lib/wiking/configuration.py:223
+msgid ""
+"If enabled, the login form will always be redirected to an HTTPS address to "
+"ensure the security of the submitted credentials.  This, however, requires "
+"your server to be setup to accept HTTPS requests for the same virtual host "
+"and pass them to Wiking."
+msgstr ""
+"Pokud je povoleno, přihlašovací formulář bude vždy přesměrován na HTTPS "
+"adresu aby byla zajištěna bezpečnost přenášených přihlašovacích údajů.  To "
+"ovšem vyžaduje, aby byl server zkonfigurován pro obsluhu HTTPS požadavků pro "
+"stejný virtuální server a aby tyto požadavky byly předávány systému Wiking."
+
+#. Translators: Site means a webpage or web application.
+#: ../lib/wiking/configuration.py:276
+msgid "Site title"
+msgstr "Název portálu"
+
+#: ../lib/wiking/configuration.py:277
+msgid ""
+"Site title is a short and (hopefully) unique title of the whole website. It "
+"will appear at the top of every page."
+msgstr ""
+"Tento název by měl krátce a pokud možno jednoznačně označovat celý portál.  "
+"Název bude zobrazen v záhlaví každé stránky."
+
+#. Translators: Site means a webpage or web application. Subtitle as in ,,title -- subtitle''.
+#: ../lib/wiking/configuration.py:283
+msgid "Site subtitle"
+msgstr "Podtitul portálu"
+
+#: ../lib/wiking/configuration.py:284
+msgid ""
+"Site subtitle is an optional more descriptive title of the website.  It will "
+"appear at the top of every page together with site title, but where brevity "
+"matters, only title will be used."
+msgstr ""
+"Podtitul je nepovinný podrobnější popis portálu.  Bude také zobrazen v "
+"záhlaví každé stránky, ale v situacích, kde je nutná stručnost bude vynechán."
+
+#. Translators: Web page or web application specific image.
+#: ../lib/wiking/configuration.py:291
+msgid "Site icon"
+msgstr "Ikona portálu"
+
+#: ../lib/wiking/configuration.py:305
+msgid "Default language"
+msgstr "Výchozí jazyk"
+
+#. Translators: Language negotiation means the process where the server is trying
+#. to find a language that matches with what the users internet browser asks for.
+#: ../lib/wiking/configuration.py:308
+msgid ""
+"Defines the language (lowercase ISO 639-1 Alpha-2 code) to be used when "
+"content language negotiation fails. If not set (which is the default), the "
+"server will issue a 606 HTTP error (Not acceptable) when the document is not "
+"available in any of the requested languages. The error page will contain a "
+"description of the problem and a list of available language variants of the "
+"requested document. The negotiation is based on the browser setting of "
+"user's language preference passed through the 'Accept-Language' HTTP header. "
+"If set, Wiking will automatically serve given language variant instead of "
+"issuing the error if that variant is available.  If unavailable, the 606 "
+"error is raised anyway, so you need to make sure that all documents are "
+"available at least in the default language variant if you want to avoid 606 "
+"errors completely."
+msgstr ""
+"Definuje jazyk (kód ISO 639-1 Alpha-2 psaný malými písmeny), který se bude "
+"používat, pokud selže automatické přepínání jazyka obsahu. Pokud není "
+"nastaveno (což je defaultní hodnota) a požadovaný dokument není dostupný v "
+"některém z požadovaných jazyků, server odešle HTTP chybu 606 (Not "
+"acceptable). Chybová stránka obsahuje popis problému a seznam dostupných "
+"jazykových variant požadovaného dokumentu. Automatické přepínání jazyka "
+"obsahuje je založeno na nastavení jazyka internetového prohlížeče uživatelem "
+"předávaného pomocí  HTTP hlavičky 'Accept-Language'. Pokud je toto "
+"nastaveno, Wiking automaticky poskytne tuto jazykovou variantu, pokud je "
+"dostupná, a chybu nezobrazí. Pokud toto není nastaveno, ke vzniku chyby 606 "
+"dojde stejně. Pokud se tedy chybě 606 chcete úplně vyhnout, ujistěte se, že "
+"jsou všechny dokumenty dostupné alespoň v defaultním jazyku."
+
+#. Translators: Yes/No configuration option label. Should the login panel display user role (as Admin, Student, Tutor etc.)
+#: ../lib/wiking/configuration.py:378
+msgid "Display role in login panel"
+msgstr "Zobrazit roli v panelu přihlášení"
+
+#: ../lib/wiking/configuration.py:379
+msgid ""
+"If enabled, the login panel on each page will not display only the current "
+"username, but also his current user role, which affects his permissions."
+msgstr ""
+"Pokud je povoleno, přihlašovací panel na každé stránce bude mimo jména "
+"uživatele zobrazovat i popis jeho uživatelské role v systému, která určuje "
+"oprávnění."
+
+#: ../lib/wiking/configuration.py:397
+msgid "Whether to use e-mails as login names"
+msgstr "Použít e-mailové adresy jako přihlašovací jméno"
+
+#: ../lib/wiking/configuration.py:398
+msgid "Iff true, users must use e-mail addresses as their login names."
+msgstr ""
+"Je-li nastaveno, uživatelé musí jako svá přihlašovací jména používat e-"
+"mailové adresy."
+
+#: ../lib/wiking/configuration.py:412
+msgid ""
+"If set, the newly registered users will be automatically approved without "
+"any administrator's action.  The adminstrator may still need to asign users "
+"to groups to grant them further privileges, but the accounts are enabled "
+"right after the user confirms the registration code."
+msgstr ""
+"Pokud je nastaveno, nově registrovaní uživatelé budou automaticky schválení "
+"bez zásahu administrátora.  Pro přidělení následných přístupových práv může "
+"být přesto zásah správce zapotřebí, ale účet bude plně aktivní ihned po "
+"uživatelově potvrzení registračního kódu."
+
+#~ msgid ""
+#~ "The first step of your registration at %(server_hostname)s was "
+#~ "successfully completed.\n"
+#~ "\n"
+#~ "For the next step visit the following URL and follow the instructions "
+#~ "there:\n"
+#~ "%(uri)s\n"
+#~ "\n"
+#~ "If the above link fails, you will be prompted for your activation code "
+#~ "when\n"
+#~ "you attempt to log in.\n"
+#~ "\n"
+#~ "Your activation code is: %(code)s\n"
+#~ msgstr ""
+#~ "První krok vaší registrace na %(server_hostname)s byl úspěšně dokončen.\n"
+#~ "\n"
+#~ "Pro pokračování navštivte uvedenou webovou adresu a následujte "
+#~ "instrukce:\n"
+#~ "%(uri)s\n"
+#~ "\n"
+#~ "Pokud výše uvedený odkaz selže, budete při pokusu o přihlášení k serveru\n"
+#~ "dotázáni na aktivační kód.\n"
+#~ "\n"
+#~ "Váš aktivační kód je: %(code)s\n"
+
+#~ msgid "Registration accepted."
+#~ msgstr "Registrace přijata."
+
+#~ msgid "Please, check your mailbox for instructions how to proceed."
+#~ msgstr ""
+#~ "Zkontrolujte si, prosím, přijatou poštu, kde najdete informace jak "
+#~ "pokračovat."
+
+#~ msgid "Activation code was sent to %s."
+#~ msgstr "Aktivační kód byl odeslán na adresu %s."
+
 #~ msgid "Private"
 #~ msgstr "Privátní"
 
diff --git a/translations/wiking-cms.de.po b/translations/wiking-cms.de.po
index bd90b10..a1d1565 100644
--- a/translations/wiking-cms.de.po
+++ b/translations/wiking-cms.de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-16 19:35+0200\n"
+"POT-Creation-Date: 2010-10-16 13:26+0200\n"
 "PO-Revision-Date: 2008-10-24 13:19+0200\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: German <wiking at lists.freebsoft.org>\n"
@@ -15,103 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/wiking/configuration.py:194
-msgid "Webmaster's e-mail address"
-msgstr ""
-
-#: ../lib/wiking/configuration.py:205
-msgid "Default sender address"
-msgstr ""
-
-#: ../lib/wiking/configuration.py:222
-msgid "Force HTTPS login"
-msgstr ""
-
-#: ../lib/wiking/configuration.py:223
-msgid ""
-"If enabled, the login form will always be redirected to an HTTPS address to "
-"ensure the security of the submitted credentials.  This, however, requires "
-"your server to be setup to accept HTTPS requests for the same virtual host "
-"and pass them to Wiking."
-msgstr ""
-
-#. Translators: Site means a webpage or web application.
-#: ../lib/wiking/configuration.py:276
-msgid "Site title"
-msgstr ""
-
-#: ../lib/wiking/configuration.py:277
-msgid ""
-"Site title is a short and (hopefully) unique title of the whole website. It "
-"will appear at the top of every page."
-msgstr ""
-
-#. Translators: Site means a webpage or web application. Subtitle as in ,,title -- subtitle''.
-#: ../lib/wiking/configuration.py:283
-msgid "Site subtitle"
-msgstr ""
-
-#: ../lib/wiking/configuration.py:284
-msgid ""
-"Site subtitle is an optional more descriptive title of the website.  It will "
-"appear at the top of every page together with site title, but where brevity "
-"matters, only title will be used."
-msgstr ""
-
-#. Translators: Web page or web application specific image.
-#: ../lib/wiking/configuration.py:291
-msgid "Site icon"
-msgstr ""
-
-#: ../lib/wiking/configuration.py:305
-msgid "Default language"
-msgstr ""
-
-#. Translators: Language negotiation means the process where the server is trying
-#. to find a language that matches with what the users internet browser asks for.
-#: ../lib/wiking/configuration.py:308
-msgid ""
-"Defines the language (lowercase ISO 639-1 Alpha-2 code) to be used when "
-"content language negotiation fails. If not set (which is the default), the "
-"server will issue a 606 HTTP error (Not acceptable) when the document is not "
-"available in any of the requested languages. The error page will contain a "
-"description of the problem and a list of available language variants of the "
-"requested document. The negotiation is based on the browser setting of "
-"user's language preference passed through the 'Accept-Language' HTTP header. "
-"If set, Wiking will automatically serve given language variant instead of "
-"issuing the error if that variant is available.  If unavailable, the 606 "
-"error is raised anyway, so you need to make sure that all documents are "
-"available at least in the default language variant if you want to avoid 606 "
-"errors completely."
-msgstr ""
-
-#. Translators: Yes/No configuration option label. Should the login panel display user role (as Admin, Student, Tutor etc.)
-#: ../lib/wiking/configuration.py:378
-msgid "Display role in login panel"
-msgstr ""
-
-#: ../lib/wiking/configuration.py:379
-msgid ""
-"If enabled, the login panel on each page will not display only the current "
-"username, but also his current user role, which affects his permissions."
-msgstr ""
-
-#: ../lib/wiking/configuration.py:397
-msgid "Whether to use e-mails as login names"
-msgstr ""
-
-#: ../lib/wiking/configuration.py:398
-msgid "Iff true, users must use e-mail addresses as their login names."
-msgstr ""
-
-#: ../lib/wiking/configuration.py:412
-msgid ""
-"If set, the newly registered users will be automatically approved without "
-"any administrator's action.  The adminstrator may still need to asign users "
-"to groups to grant them further privileges, but the accounts are enabled "
-"right after the user confirms the registration code."
-msgstr ""
-
 #: ../lib/wiking/cms/appl.py:53
 msgid "Manage this site"
 msgstr "Inhaltsregime"
@@ -129,126 +32,6 @@ msgstr "Regimeschnittstelle des Inhalts verlassen."
 msgid "Wiking Management Interface"
 msgstr "Zugang zur Regimeschnittstelle des Inhalts Wiking"
 
-#. Translators: Yes/No configuration option label. Should the login panel be visible?
-#: ../lib/wiking/cms/configuration.py:36
-msgid "Allow login panel"
-msgstr ""
-
-#: ../lib/wiking/cms/configuration.py:37
-msgid ""
-"If enabled, the information about the currently logged user and login/logout "
-"controls will be present on each page as a separate panel.  This panel will "
-"always be the first panel on the page."
-msgstr ""
-
-#. Translators: Yes/No configuration option label. Should link to WMI be visible?  "WMI"
-#. stands for Wiking Management Interface.  Don't feel obliged to use an abbreviation.  Use
-#. whatever brief form obviously referning to whatever translation you used for "Wiking
-#. Management Interface".
-#: ../lib/wiking/cms/configuration.py:47
-msgid "Allow WMI link"
-msgstr ""
-
-#. Translators: Yes/no configuration label. Can new users register to this
-#. website/application?
-#: ../lib/wiking/cms/configuration.py:55
-msgid "Allow new user registration"
-msgstr ""
-
-#: ../lib/wiking/cms/configuration.py:56
-msgid ""
-"If enabled, all visitors are allowed to create a user account.  If disabled, "
-"new user accounts must be created by administrator.  Note, that the newly "
-"created accounts are inactive (at least with the default implementation of "
-"the user management module), so the creation of the account doesn't give the "
-"user any actual privileges."
-msgstr ""
-
-#. Translators: Maximal size an uploaded file can have.
-#: ../lib/wiking/cms/configuration.py:65
-msgid "Maximal upload size"
-msgstr ""
-
-#: ../lib/wiking/cms/configuration.py:66
-msgid ""
-"The maximal size of uploaded files in bytes.  The server needs to be "
-"relaoded for the changes in this option to take effect."
-msgstr ""
-
-#. Translators: Web form label (account in the meaning of user account)
-#: ../lib/wiking/cms/texts.py:29
-msgid "Information about a locked account"
-msgstr ""
-
-#. Translators: Text presented to a user in a web page
-#: ../lib/wiking/cms/texts.py:31
-msgid ""
-"Your account is currently disabled.\n"
-"\n"
-"The protected services are not available to you.\n"
-"Contact the application administrator to get the account enabled."
-msgstr ""
-
-#. Translators: Web form label
-#: ../lib/wiking/cms/texts.py:39
-msgid "Information about an account waiting for activation code confirmation"
-msgstr ""
-
-#. Translators: Text presented to a user in a web page
-#: ../lib/wiking/cms/texts.py:41
-msgid ""
-"Your account is inactive because\n"
-"you have not yet confirmed the activation code sent to you by e-mail.\n"
-"\n"
-"Please, check your e-mail and follow the provided link or enter the\n"
-"activation code into the field below.\n"
-"\n"
-"You can also continue without entering the activation code, but\n"
-"the protected services will not be available to you."
-msgstr ""
-
-#. Translators: Web form label
-#: ../lib/wiking/cms/texts.py:53
-msgid "Information about an account waiting for admin approval"
-msgstr ""
-
-#. Translators: Text presented to a user in a web page
-#: ../lib/wiking/cms/texts.py:55
-msgid ""
-"Your account is waiting for approval by the administrator.\n"
-"                  \n"
-"The protected services are not available until the account gets approved.\n"
-"If the account remains unapproved for a long time, contact the application "
-"administrator."
-msgstr ""
-
-#: ../lib/wiking/cms/texts.py:62
-msgid "Introductory text displayed above the registration form"
-msgstr ""
-
-#: ../lib/wiking/cms/texts.py:67
-msgid "Text displayed after successful user registration"
-msgstr ""
-
-#: ../lib/wiking/cms/texts.py:69
-msgid ""
-"Registration completed successfuly. Your account is now fully functional but "
-"you may need to get futher privileges by the administrator to access certain "
-"restricted services."
-msgstr ""
-
-#: ../lib/wiking/cms/texts.py:74
-msgid ""
-"Registration completed successfuly. Your account now awaits administrator's "
-"approval."
-msgstr ""
-
-#: ../lib/wiking/cms/texts.py:79
-msgid ""
-"Information displayed above the checkbox for confirmation of site specific "
-"conditions during registration (if empty, no confirmation is required)"
-msgstr ""
-
 #: ../lib/wiking/cms/cms.py:61
 msgid "formatting manual"
 msgstr ""
@@ -348,7 +131,7 @@ msgstr ""
 
 #. Translators: Button name. Computer terminology. Use an appropriate term common
 #. for submitting forms in a computer application.
-#: ../lib/wiking/cms/cms.py:496 ../lib/wiking/cms/users.py:1142
+#: ../lib/wiking/cms/cms.py:496 ../lib/wiking/cms/users.py:1171
 msgid "Submit"
 msgstr ""
 
@@ -360,7 +143,7 @@ msgstr ""
 msgid "Account disabled"
 msgstr ""
 
-#: ../lib/wiking/cms/cms.py:533 ../lib/wiking/cms/users.py:814
+#: ../lib/wiking/cms/cms.py:533 ../lib/wiking/cms/users.py:819
 msgid "Account not activated"
 msgstr ""
 
@@ -671,7 +454,7 @@ msgstr ""
 
 #. Translators: Table column heading. Whether the account is active. Values are yes/no.
 #: ../lib/wiking/cms/cms.py:897 ../lib/wiking/cms/cms.py:1987
-#: ../lib/wiking/cms/users.py:1262
+#: ../lib/wiking/cms/users.py:1291
 msgid "Active"
 msgstr ""
 
@@ -946,7 +729,7 @@ msgstr ""
 #. Translators: Button label. Use standard computer terminology.
 #. Translators: Back button label. Standard computer terminology.
 #: ../lib/wiking/cms/cms.py:1212 ../lib/wiking/cms/cms.py:1572
-#: ../lib/wiking/cms/users.py:900
+#: ../lib/wiking/cms/users.py:905
 msgid "Back"
 msgstr ""
 
@@ -1376,6 +1159,126 @@ msgstr ""
 msgid "Edit this mail for repeated use"
 msgstr ""
 
+#. Translators: Yes/No configuration option label. Should the login panel be visible?
+#: ../lib/wiking/cms/configuration.py:36
+msgid "Allow login panel"
+msgstr ""
+
+#: ../lib/wiking/cms/configuration.py:37
+msgid ""
+"If enabled, the information about the currently logged user and login/logout "
+"controls will be present on each page as a separate panel.  This panel will "
+"always be the first panel on the page."
+msgstr ""
+
+#. Translators: Yes/No configuration option label. Should link to WMI be visible?  "WMI"
+#. stands for Wiking Management Interface.  Don't feel obliged to use an abbreviation.  Use
+#. whatever brief form obviously referning to whatever translation you used for "Wiking
+#. Management Interface".
+#: ../lib/wiking/cms/configuration.py:47
+msgid "Allow WMI link"
+msgstr ""
+
+#. Translators: Yes/no configuration label. Can new users register to this
+#. website/application?
+#: ../lib/wiking/cms/configuration.py:55
+msgid "Allow new user registration"
+msgstr ""
+
+#: ../lib/wiking/cms/configuration.py:56
+msgid ""
+"If enabled, all visitors are allowed to create a user account.  If disabled, "
+"new user accounts must be created by administrator.  Note, that the newly "
+"created accounts are inactive (at least with the default implementation of "
+"the user management module), so the creation of the account doesn't give the "
+"user any actual privileges."
+msgstr ""
+
+#. Translators: Maximal size an uploaded file can have.
+#: ../lib/wiking/cms/configuration.py:65
+msgid "Maximal upload size"
+msgstr ""
+
+#: ../lib/wiking/cms/configuration.py:66
+msgid ""
+"The maximal size of uploaded files in bytes.  The server needs to be "
+"relaoded for the changes in this option to take effect."
+msgstr ""
+
+#. Translators: Web form label (account in the meaning of user account)
+#: ../lib/wiking/cms/texts.py:29
+msgid "Information about a locked account"
+msgstr ""
+
+#. Translators: Text presented to a user in a web page
+#: ../lib/wiking/cms/texts.py:31
+msgid ""
+"Your account is currently disabled.\n"
+"\n"
+"The protected services are not available to you.\n"
+"Contact the application administrator to get the account enabled."
+msgstr ""
+
+#. Translators: Web form label
+#: ../lib/wiking/cms/texts.py:39
+msgid "Information about an account waiting for activation code confirmation"
+msgstr ""
+
+#. Translators: Text presented to a user in a web page
+#: ../lib/wiking/cms/texts.py:41
+msgid ""
+"Your account is inactive because\n"
+"you have not yet confirmed the activation code sent to you by e-mail.\n"
+"\n"
+"Please, check your e-mail and follow the provided link or enter the\n"
+"activation code into the field below.\n"
+"\n"
+"You can also continue without entering the activation code, but\n"
+"the protected services will not be available to you."
+msgstr ""
+
+#. Translators: Web form label
+#: ../lib/wiking/cms/texts.py:53
+msgid "Information about an account waiting for admin approval"
+msgstr ""
+
+#. Translators: Text presented to a user in a web page
+#: ../lib/wiking/cms/texts.py:55
+msgid ""
+"Your account is waiting for approval by the administrator.\n"
+"                  \n"
+"The protected services are not available until the account gets approved.\n"
+"If the account remains unapproved for a long time, contact the application "
+"administrator."
+msgstr ""
+
+#: ../lib/wiking/cms/texts.py:62
+msgid "Introductory text displayed above the registration form"
+msgstr ""
+
+#: ../lib/wiking/cms/texts.py:67
+msgid "Text displayed after successful user registration"
+msgstr ""
+
+#: ../lib/wiking/cms/texts.py:69
+msgid ""
+"Registration completed successfuly. Your account is now fully functional but "
+"you may need to get futher privileges by the administrator to access certain "
+"restricted services."
+msgstr ""
+
+#: ../lib/wiking/cms/texts.py:74
+msgid ""
+"Registration completed successfuly. Your account now awaits administrator's "
+"approval."
+msgstr ""
+
+#: ../lib/wiking/cms/texts.py:79
+msgid ""
+"Information displayed above the checkbox for confirmation of site specific "
+"conditions during registration (if empty, no confirmation is required)"
+msgstr ""
+
 #: ../lib/wiking/cms/users.py:57 ../lib/wiking/cms/users.py:148
 msgid "Group"
 msgstr ""
@@ -1401,7 +1304,7 @@ msgid "User Roles"
 msgstr ""
 
 #: ../lib/wiking/cms/users.py:149 ../lib/wiking/cms/users.py:434
-#: ../lib/wiking/cms/users.py:1252
+#: ../lib/wiking/cms/users.py:1281
 msgid "User"
 msgstr ""
 
@@ -1480,7 +1383,7 @@ msgid "Manage registered users and their privileges."
 msgstr ""
 
 #. Translators: Login name for a website. Registration form field.
-#: ../lib/wiking/cms/users.py:408 ../lib/wiking/cms/users.py:1210
+#: ../lib/wiking/cms/users.py:408 ../lib/wiking/cms/users.py:1239
 msgid "Login name"
 msgstr ""
 
@@ -1490,7 +1393,7 @@ msgid ""
 "dots and must start with a letter."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:413 ../lib/wiking/cms/users.py:1211
+#: ../lib/wiking/cms/users.py:413 ../lib/wiking/cms/users.py:1240
 msgid "Password"
 msgstr ""
 
@@ -1665,12 +1568,12 @@ msgid "User's Groups"
 msgstr ""
 
 #. Translators: Heading for an overview when and how the user has accessed the application.
-#: ../lib/wiking/cms/users.py:530 ../lib/wiking/cms/users.py:1247
+#: ../lib/wiking/cms/users.py:530 ../lib/wiking/cms/users.py:1276
 msgid "Login History"
 msgstr ""
 
 #. Translators: Name of group of users who have full access to the system.
-#: ../lib/wiking/cms/users.py:538 ../lib/wiking/cms/users.py:1110
+#: ../lib/wiking/cms/users.py:538 ../lib/wiking/cms/users.py:1130
 msgid "Active users"
 msgstr ""
 
@@ -1760,276 +1663,364 @@ msgid "Active account"
 msgstr ""
 
 #. Translators: Personal data -- first name, surname, nickname ...
-#: ../lib/wiking/cms/users.py:648 ../lib/wiking/cms/users.py:654
-#: ../lib/wiking/cms/users.py:675
+#: ../lib/wiking/cms/users.py:658 ../lib/wiking/cms/users.py:664
+#: ../lib/wiking/cms/users.py:685
 msgid "Personal data"
 msgstr ""
 
 #. Translators: Contact information -- email, phone, address...
-#: ../lib/wiking/cms/users.py:650 ../lib/wiking/cms/users.py:655
-#: ../lib/wiking/cms/users.py:676
+#: ../lib/wiking/cms/users.py:660 ../lib/wiking/cms/users.py:665
+#: ../lib/wiking/cms/users.py:686
 msgid "Contact information"
 msgstr ""
 
 #. Translators: Others is a label for a group of unspecified form fields
 #. (as in Personal data, Contact information, Others).
-#: ../lib/wiking/cms/users.py:653 ../lib/wiking/cms/users.py:656
-#: ../lib/wiking/cms/users.py:681
+#: ../lib/wiking/cms/users.py:663 ../lib/wiking/cms/users.py:666
+#: ../lib/wiking/cms/users.py:691
 msgid "Others"
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:657
+#: ../lib/wiking/cms/users.py:667
 msgid "Account state"
 msgstr ""
 
 #. Translators: Button label.
-#: ../lib/wiking/cms/users.py:662
+#: ../lib/wiking/cms/users.py:672
 msgid "New user"
 msgstr ""
 
 #. Translators: Button label.
-#: ../lib/wiking/cms/users.py:664
+#: ../lib/wiking/cms/users.py:674
 msgid "Edit profile"
 msgstr ""
 
 #. Translators: Button label. Modify the users data (email, address...)
-#: ../lib/wiking/cms/users.py:666
+#: ../lib/wiking/cms/users.py:676
 msgid "Modify user's record"
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:679
+#: ../lib/wiking/cms/users.py:689
 msgid "Login information"
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:712
+#: ../lib/wiking/cms/users.py:722
 msgid "Enter your current password."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:716
+#: ../lib/wiking/cms/users.py:726
 msgid "Invalid password."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:720
+#: ../lib/wiking/cms/users.py:730
 msgid "Enter the new password."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:728
+#: ../lib/wiking/cms/users.py:738
 msgid "The new password is the same as the old one."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:753
+#: ../lib/wiking/cms/users.py:763
 #, python-format
 msgid ""
-"The first step of your registration at %(server_hostname)s was successfully "
-"completed.\n"
-"\n"
-"For the next step visit the following URL and follow the instructions "
-"there:\n"
+"To finish your registration at %(server_hostname)s, click on the following "
+"link:\n"
 "%(uri)s\n"
 "\n"
-"If the above link fails, you will be prompted for your activation code when\n"
-"you attempt to log in.\n"
-"\n"
-"Your activation code is: %(code)s\n"
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:768
-msgid "Registration accepted."
-msgstr ""
-
-#: ../lib/wiking/cms/users.py:769
-msgid "Please, check your mailbox for instructions how to proceed."
-msgstr ""
-
-#: ../lib/wiking/cms/users.py:773
+#: ../lib/wiking/cms/users.py:776
 msgid "Registration cancelled."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:779
+#: ../lib/wiking/cms/users.py:782
 #, python-format
 msgid "Your registration at %s"
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:783 ../lib/wiking/cms/users.py:835
-#: ../lib/wiking/cms/users.py:885 ../lib/wiking/cms/users.py:1218
+#: ../lib/wiking/cms/users.py:786 ../lib/wiking/cms/users.py:840
+#: ../lib/wiking/cms/users.py:890 ../lib/wiking/cms/users.py:1247
 msgid "Failed sending e-mail notification:"
 msgstr ""
 
 #. Translators: Follows an email addres, e.g. ``Activation code was sent to joe at brailcom.org''
-#: ../lib/wiking/cms/users.py:787
+#: ../lib/wiking/cms/users.py:790
 #, python-format
-msgid "Activation code was sent to %s."
+msgid ""
+"To finish registration, please confirm the activation code that was sent to "
+"your email address at %(email)s."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:810
+#: ../lib/wiking/cms/users.py:815
 msgid "User registration already confirmed."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:813
+#: ../lib/wiking/cms/users.py:818
 msgid "Invalid activation code."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:821
+#: ../lib/wiking/cms/users.py:826
 #, python-format
 msgid "New user %(fullname)s registered at %(server_hostname)s."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:825
+#: ../lib/wiking/cms/users.py:830
 msgid "The account was approved automatically according to server setup."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:828
+#: ../lib/wiking/cms/users.py:833
 msgid "Please approve the account:"
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:832
+#: ../lib/wiking/cms/users.py:837
 msgid "New user registration:"
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:838
+#: ../lib/wiking/cms/users.py:843
 msgid "E-mail notification has been sent to server administrator."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:866
+#: ../lib/wiking/cms/users.py:871
 msgid "Registration confirmed"
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:877
+#: ../lib/wiking/cms/users.py:882
 msgid "The account was enabled."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:879
+#: ../lib/wiking/cms/users.py:884
 #, python-format
 msgid ""
 "Your account at %(uri)s has been enabled. Please log in with username '%"
 "(login)s' and your password."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:882
+#: ../lib/wiking/cms/users.py:887
 msgid "Your account has been enabled."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:887
+#: ../lib/wiking/cms/users.py:892
 msgid "E-mail notification has been sent to:"
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:889
+#: ../lib/wiking/cms/users.py:894
 msgid "The account was disabled."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:895
+#: ../lib/wiking/cms/users.py:900
 #, python-format
 msgid "The registration expired on %(date)s."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:898
+#: ../lib/wiking/cms/users.py:903
 msgid "Continue"
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:902
+#: ../lib/wiking/cms/users.py:907
 msgid "The registration code was not confirmed by the user!"
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:903
+#: ../lib/wiking/cms/users.py:908
 msgid ""
 "Please enable the account only if you are sure that the e-mail address "
 "belongs to given user."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:1111
+#: ../lib/wiking/cms/users.py:1131
 msgid "Listing of all active user accounts."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:1138
+#: ../lib/wiking/cms/users.py:1142
+msgid "Users who have `confirm' flag set"
+msgstr ""
+
+#: ../lib/wiking/cms/users.py:1167
 msgid "Enter your login name or e-mail address"
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:1173
+#: ../lib/wiking/cms/users.py:1202
 msgid "Password reminder"
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:1186
+#: ../lib/wiking/cms/users.py:1215
 msgid "Multiple user accounts found for given email address."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:1187
+#: ../lib/wiking/cms/users.py:1216
 msgid "Please, select the account for which you want to remind:"
 msgstr ""
 
 #. Translators: Credentials such as password...
-#: ../lib/wiking/cms/users.py:1200
+#: ../lib/wiking/cms/users.py:1229
 msgid "Your credentials were reset to:"
 msgstr ""
 
 #. Translators: Credentials such as password...
-#: ../lib/wiking/cms/users.py:1204
+#: ../lib/wiking/cms/users.py:1233
 msgid "Your credentials are:"
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:1206
+#: ../lib/wiking/cms/users.py:1235
 #, python-format
 msgid "A password reminder request has been made at %(server_uri)s."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:1213
+#: ../lib/wiking/cms/users.py:1242
 msgid ""
 "We strongly recommend you change your password at nearest occassion, since "
 "it has been exposed to an unsecure channel."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:1219
+#: ../lib/wiking/cms/users.py:1248
 msgid "Please try repeating your request later or contact the administrator!"
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:1221
+#: ../lib/wiking/cms/users.py:1250
 msgid "E-mail information has been sent to your email address."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:1224
+#: ../lib/wiking/cms/users.py:1253
 msgid "No user account for your query."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:1248
+#: ../lib/wiking/cms/users.py:1277
 msgid "History of successful login sessions and unsuccessful login attempts."
 msgstr ""
 
 #. Translators: Login name.
-#: ../lib/wiking/cms/users.py:1254
+#: ../lib/wiking/cms/users.py:1283
 msgid "Login"
 msgstr ""
 
 #. Translators: Form field saying whether the users attempt was succesful. Values are Yes/No.
-#: ../lib/wiking/cms/users.py:1256
+#: ../lib/wiking/cms/users.py:1285
 msgid "Success"
 msgstr ""
 
 #. Translators: Table column heading. Time of the start of user session, followed by a date and time.
-#: ../lib/wiking/cms/users.py:1258
+#: ../lib/wiking/cms/users.py:1287
 msgid "Start time"
 msgstr ""
 
 #. Translators: Table column heading. The length of user session. Contains time.
-#: ../lib/wiking/cms/users.py:1260
+#: ../lib/wiking/cms/users.py:1289
 msgid "Duration"
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:1263
+#: ../lib/wiking/cms/users.py:1292
 msgid "IP address"
 msgstr ""
 
 #. Translators: Internet name of the remote computer (computer terminology).
-#: ../lib/wiking/cms/users.py:1265
+#: ../lib/wiking/cms/users.py:1294
 msgid "Hostname"
 msgstr ""
 
 #. Translators: "User agent" is a generalized name for browser or more precisely the
 #. software which produced the HTTP request (was used to access the website).
-#: ../lib/wiking/cms/users.py:1268
+#: ../lib/wiking/cms/users.py:1297
 msgid "User agent"
 msgstr ""
 
 #. Translators: Meaning where the user came from. Computer terminology. Do not translate
 #. "HTTP" and if unsure, don't translate at all (it is a very technical term).
-#: ../lib/wiking/cms/users.py:1271
+#: ../lib/wiking/cms/users.py:1300
 msgid "HTTP Referer"
 msgstr ""
+
+#: ../lib/wiking/configuration.py:194
+msgid "Webmaster's e-mail address"
+msgstr ""
+
+#: ../lib/wiking/configuration.py:205
+msgid "Default sender address"
+msgstr ""
+
+#: ../lib/wiking/configuration.py:222
+msgid "Force HTTPS login"
+msgstr ""
+
+#: ../lib/wiking/configuration.py:223
+msgid ""
+"If enabled, the login form will always be redirected to an HTTPS address to "
+"ensure the security of the submitted credentials.  This, however, requires "
+"your server to be setup to accept HTTPS requests for the same virtual host "
+"and pass them to Wiking."
+msgstr ""
+
+#. Translators: Site means a webpage or web application.
+#: ../lib/wiking/configuration.py:276
+msgid "Site title"
+msgstr ""
+
+#: ../lib/wiking/configuration.py:277
+msgid ""
+"Site title is a short and (hopefully) unique title of the whole website. It "
+"will appear at the top of every page."
+msgstr ""
+
+#. Translators: Site means a webpage or web application. Subtitle as in ,,title -- subtitle''.
+#: ../lib/wiking/configuration.py:283
+msgid "Site subtitle"
+msgstr ""
+
+#: ../lib/wiking/configuration.py:284
+msgid ""
+"Site subtitle is an optional more descriptive title of the website.  It will "
+"appear at the top of every page together with site title, but where brevity "
+"matters, only title will be used."
+msgstr ""
+
+#. Translators: Web page or web application specific image.
+#: ../lib/wiking/configuration.py:291
+msgid "Site icon"
+msgstr ""
+
+#: ../lib/wiking/configuration.py:305
+msgid "Default language"
+msgstr ""
+
+#. Translators: Language negotiation means the process where the server is trying
+#. to find a language that matches with what the users internet browser asks for.
+#: ../lib/wiking/configuration.py:308
+msgid ""
+"Defines the language (lowercase ISO 639-1 Alpha-2 code) to be used when "
+"content language negotiation fails. If not set (which is the default), the "
+"server will issue a 606 HTTP error (Not acceptable) when the document is not "
+"available in any of the requested languages. The error page will contain a "
+"description of the problem and a list of available language variants of the "
+"requested document. The negotiation is based on the browser setting of "
+"user's language preference passed through the 'Accept-Language' HTTP header. "
+"If set, Wiking will automatically serve given language variant instead of "
+"issuing the error if that variant is available.  If unavailable, the 606 "
+"error is raised anyway, so you need to make sure that all documents are "
+"available at least in the default language variant if you want to avoid 606 "
+"errors completely."
+msgstr ""
+
+#. Translators: Yes/No configuration option label. Should the login panel display user role (as Admin, Student, Tutor etc.)
+#: ../lib/wiking/configuration.py:378
+msgid "Display role in login panel"
+msgstr ""
+
+#: ../lib/wiking/configuration.py:379
+msgid ""
+"If enabled, the login panel on each page will not display only the current "
+"username, but also his current user role, which affects his permissions."
+msgstr ""
+
+#: ../lib/wiking/configuration.py:397
+msgid "Whether to use e-mails as login names"
+msgstr ""
+
+#: ../lib/wiking/configuration.py:398
+msgid "Iff true, users must use e-mail addresses as their login names."
+msgstr ""
+
+#: ../lib/wiking/configuration.py:412
+msgid ""
+"If set, the newly registered users will be automatically approved without "
+"any administrator's action.  The adminstrator may still need to asign users "
+"to groups to grant them further privileges, but the accounts are enabled "
+"right after the user confirms the registration code."
+msgstr ""
diff --git a/translations/wiking-cms.es.po b/translations/wiking-cms.es.po
index e83a8e5..81aa232 100644
--- a/translations/wiking-cms.es.po
+++ b/translations/wiking-cms.es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-16 19:35+0200\n"
+"POT-Creation-Date: 2010-10-16 13:26+0200\n"
 "PO-Revision-Date: 2009-09-14 07:46+0100\n"
 "Last-Translator: Petr Topiarz <topiarz at post.cz>\n"
 "Language-Team: Spanish <wiking at lists.freebsoft.org>\n"
@@ -16,127 +16,6 @@ msgstr ""
 "X-Poedit-Language: Spanish\n"
 "X-Poedit-Country: SPAIN\n"
 
-#: ../lib/wiking/configuration.py:194
-msgid "Webmaster's e-mail address"
-msgstr "Dirección de correo electrónico del administrador"
-
-#: ../lib/wiking/configuration.py:205
-msgid "Default sender address"
-msgstr "Dirección predeterminada del remitente"
-
-#: ../lib/wiking/configuration.py:222
-msgid "Force HTTPS login"
-msgstr "Forzar el inicio de sesión HTTPS"
-
-#: ../lib/wiking/configuration.py:223
-msgid ""
-"If enabled, the login form will always be redirected to an HTTPS address to "
-"ensure the security of the submitted credentials.  This, however, requires "
-"your server to be setup to accept HTTPS requests for the same virtual host "
-"and pass them to Wiking."
-msgstr ""
-"Si está activado, el formulario de acceso siempre será remitido a una "
-"dirección HTTPS para garantizar la seguridad de los datos presentados. Esto, "
-"sin embargo, requiere que su servidor esté configurado para aceptar "
-"peticiones HTTPS para la misma máquina virtual y pasar a Wiking."
-
-#. Translators: Site means a webpage or web application.
-#: ../lib/wiking/configuration.py:276
-msgid "Site title"
-msgstr "Título del sitio"
-
-#: ../lib/wiking/configuration.py:277
-msgid ""
-"Site title is a short and (hopefully) unique title of the whole website. It "
-"will appear at the top of every page."
-msgstr ""
-"El título corto de toda la web. Aparece en la parte superior de cada página."
-
-#. Translators: Site means a webpage or web application. Subtitle as in ,,title -- subtitle''.
-#: ../lib/wiking/configuration.py:283
-msgid "Site subtitle"
-msgstr "Subtítulo del sitio"
-
-#: ../lib/wiking/configuration.py:284
-msgid ""
-"Site subtitle is an optional more descriptive title of the website.  It will "
-"appear at the top of every page together with site title, but where brevity "
-"matters, only title will be used."
-msgstr ""
-"Opcional. Sirve para ofrecer una descripción más detallada de la página web. "
-"Aparece en la parte superior de cada página junto con el título corto, pero "
-"para asuntos breves sólo se usa el título corto."
-
-#. Translators: Web page or web application specific image.
-#: ../lib/wiking/configuration.py:291
-#, fuzzy
-msgid "Site icon"
-msgstr "Título del sitio"
-
-#: ../lib/wiking/configuration.py:305
-msgid "Default language"
-msgstr "Idioma predeterminado"
-
-#. Translators: Language negotiation means the process where the server is trying
-#. to find a language that matches with what the users internet browser asks for.
-#: ../lib/wiking/configuration.py:308
-msgid ""
-"Defines the language (lowercase ISO 639-1 Alpha-2 code) to be used when "
-"content language negotiation fails. If not set (which is the default), the "
-"server will issue a 606 HTTP error (Not acceptable) when the document is not "
-"available in any of the requested languages. The error page will contain a "
-"description of the problem and a list of available language variants of the "
-"requested document. The negotiation is based on the browser setting of "
-"user's language preference passed through the 'Accept-Language' HTTP header. "
-"If set, Wiking will automatically serve given language variant instead of "
-"issuing the error if that variant is available.  If unavailable, the 606 "
-"error is raised anyway, so you need to make sure that all documents are "
-"available at least in the default language variant if you want to avoid 606 "
-"errors completely."
-msgstr ""
-"Define el idioma (minúsculas ISO 639-1 Código Alfa-2) que se utilizará "
-"cuando el idioma de contenido de negociación fracasa. Si no se establece (el "
-"valor predeterminado), el servidor emitirá un error HTTP 606 (no aceptable) "
-"cuando el documento no está disponible en alguno de los idiomas solicitados. "
-"La página de error contendrá una descripción del problema y una lista de "
-"variantes lingüísticas del documento solicitado. La negociación se basa en "
-"la configuración del navegador del usuario de idioma preferido elegido como "
-"'Accept-Language' para HTTP. Si se establece, Wiking automáticamente "
-"mostrará la variante del idioma si está disponible en lugar de emitir un "
-"error. Si no está disponible, el error 606 se mostrará de todos modos, por "
-"lo que necesita estar seguro de que todos documentos están disponibles al "
-"menos en un idioma predeterminado para evitar completamente los errores 606."
-
-#. Translators: Yes/No configuration option label. Should the login panel display user role (as Admin, Student, Tutor etc.)
-#: ../lib/wiking/configuration.py:378
-#, fuzzy
-msgid "Display role in login panel"
-msgstr "Permitir el panel de iniciar la sesión"
-
-#: ../lib/wiking/configuration.py:379
-msgid ""
-"If enabled, the login panel on each page will not display only the current "
-"username, but also his current user role, which affects his permissions."
-msgstr ""
-
-#: ../lib/wiking/configuration.py:397
-msgid "Whether to use e-mails as login names"
-msgstr "Usar el correo electrónico en lugar del nombre del usuario"
-
-#: ../lib/wiking/configuration.py:398
-msgid "Iff true, users must use e-mail addresses as their login names."
-msgstr ""
-"Si es verdad, los usuarios tienen que usar el correo electrónico como su "
-"nombre del usuario."
-
-#: ../lib/wiking/configuration.py:412
-msgid ""
-"If set, the newly registered users will be automatically approved without "
-"any administrator's action.  The adminstrator may still need to asign users "
-"to groups to grant them further privileges, but the accounts are enabled "
-"right after the user confirms the registration code."
-msgstr ""
-
 #: ../lib/wiking/cms/appl.py:53
 msgid "Manage this site"
 msgstr "Gestionar este sitio"
@@ -153,145 +32,6 @@ msgstr "Salir de Gestión del interfaz"
 msgid "Wiking Management Interface"
 msgstr "Interfaz de Wiking Management "
 
-#. Translators: Yes/No configuration option label. Should the login panel be visible?
-#: ../lib/wiking/cms/configuration.py:36
-msgid "Allow login panel"
-msgstr "Permitir el panel de iniciar la sesión"
-
-#: ../lib/wiking/cms/configuration.py:37
-msgid ""
-"If enabled, the information about the currently logged user and login/logout "
-"controls will be present on each page as a separate panel.  This panel will "
-"always be the first panel on the page."
-msgstr ""
-"Si está habilitada, la información sobre el usuario actual y los controles "
-"de inicio/cierre de sesión estarán presentes en cada página como panel "
-"independiente. Este panel siempre será el primer panel en la página."
-
-#. Translators: Yes/No configuration option label. Should link to WMI be visible?  "WMI"
-#. stands for Wiking Management Interface.  Don't feel obliged to use an abbreviation.  Use
-#. whatever brief form obviously referning to whatever translation you used for "Wiking
-#. Management Interface".
-#: ../lib/wiking/cms/configuration.py:47
-msgid "Allow WMI link"
-msgstr "Permitir enlace WMI"
-
-#. Translators: Yes/no configuration label. Can new users register to this
-#. website/application?
-#: ../lib/wiking/cms/configuration.py:55
-msgid "Allow new user registration"
-msgstr "Permitir registro de usuarios nuevos"
-
-#: ../lib/wiking/cms/configuration.py:56
-msgid ""
-"If enabled, all visitors are allowed to create a user account.  If disabled, "
-"new user accounts must be created by administrator.  Note, that the newly "
-"created accounts are inactive (at least with the default implementation of "
-"the user management module), so the creation of the account doesn't give the "
-"user any actual privileges."
-msgstr ""
-"Si está activada, cualquier visitante puede crear una cuenta de usuario. Si "
-"está desactivada, las nuevas cuentas de usuario deben ser creadas por el "
-"administrador. Tenga en cuenta que las cuentas creadas recientemente están "
-"inactivas (por lo menos con la aplicación predeterminada de módulo de "
-"gestión del usuario), por lo que actualmente la creación de la cuenta no da "
-"al usuario privilegios."
-
-#. Translators: Maximal size an uploaded file can have.
-#: ../lib/wiking/cms/configuration.py:65
-msgid "Maximal upload size"
-msgstr "Máximo tamaño de subida"
-
-#: ../lib/wiking/cms/configuration.py:66
-msgid ""
-"The maximal size of uploaded files in bytes.  The server needs to be "
-"relaoded for the changes in this option to take effect."
-msgstr ""
-"Máximo tamaño de subida: El tamaño máximo de los archivos subidos, en bytes. "
-"El servidor debe ser reiniciado para que los cambios surtan efecto."
-
-#. Translators: Web form label (account in the meaning of user account)
-#: ../lib/wiking/cms/texts.py:29
-msgid "Information about a locked account"
-msgstr ""
-
-#. Translators: Text presented to a user in a web page
-#: ../lib/wiking/cms/texts.py:31
-msgid ""
-"Your account is currently disabled.\n"
-"\n"
-"The protected services are not available to you.\n"
-"Contact the application administrator to get the account enabled."
-msgstr ""
-
-#. Translators: Web form label
-#: ../lib/wiking/cms/texts.py:39
-#, fuzzy
-msgid "Information about an account waiting for activation code confirmation"
-msgstr ""
-"Solicitudes de registro no válido (a la espera de la aprobación de correo "
-"electrónico)"
-
-#. Translators: Text presented to a user in a web page
-#: ../lib/wiking/cms/texts.py:41
-msgid ""
-"Your account is inactive because\n"
-"you have not yet confirmed the activation code sent to you by e-mail.\n"
-"\n"
-"Please, check your e-mail and follow the provided link or enter the\n"
-"activation code into the field below.\n"
-"\n"
-"You can also continue without entering the activation code, but\n"
-"the protected services will not be available to you."
-msgstr ""
-
-#. Translators: Web form label
-#: ../lib/wiking/cms/texts.py:53
-#, fuzzy
-msgid "Information about an account waiting for admin approval"
-msgstr ""
-"Solicitudes de registro no válido (a la espera de la aprobación de correo "
-"electrónico)"
-
-#. Translators: Text presented to a user in a web page
-#: ../lib/wiking/cms/texts.py:55
-msgid ""
-"Your account is waiting for approval by the administrator.\n"
-"                  \n"
-"The protected services are not available until the account gets approved.\n"
-"If the account remains unapproved for a long time, contact the application "
-"administrator."
-msgstr ""
-
-#: ../lib/wiking/cms/texts.py:62
-msgid "Introductory text displayed above the registration form"
-msgstr ""
-
-#: ../lib/wiking/cms/texts.py:67
-msgid "Text displayed after successful user registration"
-msgstr ""
-
-#: ../lib/wiking/cms/texts.py:69
-msgid ""
-"Registration completed successfuly. Your account is now fully functional but "
-"you may need to get futher privileges by the administrator to access certain "
-"restricted services."
-msgstr ""
-
-#: ../lib/wiking/cms/texts.py:74
-msgid ""
-"Registration completed successfuly. Your account now awaits administrator's "
-"approval."
-msgstr ""
-"Registro completado con éxito. Su cuenta ahora espera la aprobación del "
-"administrador."
-
-#: ../lib/wiking/cms/texts.py:79
-msgid ""
-"Information displayed above the checkbox for confirmation of site specific "
-"conditions during registration (if empty, no confirmation is required)"
-msgstr ""
-
 #: ../lib/wiking/cms/cms.py:61
 msgid "formatting manual"
 msgstr "manual de formateo"
@@ -399,7 +139,7 @@ msgstr "Reenviar código de registro"
 
 #. Translators: Button name. Computer terminology. Use an appropriate term common
 #. for submitting forms in a computer application.
-#: ../lib/wiking/cms/cms.py:496 ../lib/wiking/cms/users.py:1142
+#: ../lib/wiking/cms/cms.py:496 ../lib/wiking/cms/users.py:1171
 msgid "Submit"
 msgstr "Confirmar"
 
@@ -411,7 +151,7 @@ msgstr ""
 msgid "Account disabled"
 msgstr "Cuenta desactivada"
 
-#: ../lib/wiking/cms/cms.py:533 ../lib/wiking/cms/users.py:814
+#: ../lib/wiking/cms/cms.py:533 ../lib/wiking/cms/users.py:819
 #, fuzzy
 msgid "Account not activated"
 msgstr "Cuenta desactivada"
@@ -758,7 +498,7 @@ msgstr "Gestionar temas de colores disponibles."
 
 #. Translators: Table column heading. Whether the account is active. Values are yes/no.
 #: ../lib/wiking/cms/cms.py:897 ../lib/wiking/cms/cms.py:1987
-#: ../lib/wiking/cms/users.py:1262
+#: ../lib/wiking/cms/users.py:1291
 msgid "Active"
 msgstr "Activo"
 
@@ -1056,7 +796,7 @@ msgstr ""
 #. Translators: Button label. Use standard computer terminology.
 #. Translators: Back button label. Standard computer terminology.
 #: ../lib/wiking/cms/cms.py:1212 ../lib/wiking/cms/cms.py:1572
-#: ../lib/wiking/cms/users.py:900
+#: ../lib/wiking/cms/users.py:905
 msgid "Back"
 msgstr "Atrás"
 
@@ -1523,6 +1263,145 @@ msgstr "Usar como plantilla"
 msgid "Edit this mail for repeated use"
 msgstr "Editar este correo electrónico para el uso repetitivo"
 
+#. Translators: Yes/No configuration option label. Should the login panel be visible?
+#: ../lib/wiking/cms/configuration.py:36
+msgid "Allow login panel"
+msgstr "Permitir el panel de iniciar la sesión"
+
+#: ../lib/wiking/cms/configuration.py:37
+msgid ""
+"If enabled, the information about the currently logged user and login/logout "
+"controls will be present on each page as a separate panel.  This panel will "
+"always be the first panel on the page."
+msgstr ""
+"Si está habilitada, la información sobre el usuario actual y los controles "
+"de inicio/cierre de sesión estarán presentes en cada página como panel "
+"independiente. Este panel siempre será el primer panel en la página."
+
+#. Translators: Yes/No configuration option label. Should link to WMI be visible?  "WMI"
+#. stands for Wiking Management Interface.  Don't feel obliged to use an abbreviation.  Use
+#. whatever brief form obviously referning to whatever translation you used for "Wiking
+#. Management Interface".
+#: ../lib/wiking/cms/configuration.py:47
+msgid "Allow WMI link"
+msgstr "Permitir enlace WMI"
+
+#. Translators: Yes/no configuration label. Can new users register to this
+#. website/application?
+#: ../lib/wiking/cms/configuration.py:55
+msgid "Allow new user registration"
+msgstr "Permitir registro de usuarios nuevos"
+
+#: ../lib/wiking/cms/configuration.py:56
+msgid ""
+"If enabled, all visitors are allowed to create a user account.  If disabled, "
+"new user accounts must be created by administrator.  Note, that the newly "
+"created accounts are inactive (at least with the default implementation of "
+"the user management module), so the creation of the account doesn't give the "
+"user any actual privileges."
+msgstr ""
+"Si está activada, cualquier visitante puede crear una cuenta de usuario. Si "
+"está desactivada, las nuevas cuentas de usuario deben ser creadas por el "
+"administrador. Tenga en cuenta que las cuentas creadas recientemente están "
+"inactivas (por lo menos con la aplicación predeterminada de módulo de "
+"gestión del usuario), por lo que actualmente la creación de la cuenta no da "
+"al usuario privilegios."
+
+#. Translators: Maximal size an uploaded file can have.
+#: ../lib/wiking/cms/configuration.py:65
+msgid "Maximal upload size"
+msgstr "Máximo tamaño de subida"
+
+#: ../lib/wiking/cms/configuration.py:66
+msgid ""
+"The maximal size of uploaded files in bytes.  The server needs to be "
+"relaoded for the changes in this option to take effect."
+msgstr ""
+"Máximo tamaño de subida: El tamaño máximo de los archivos subidos, en bytes. "
+"El servidor debe ser reiniciado para que los cambios surtan efecto."
+
+#. Translators: Web form label (account in the meaning of user account)
+#: ../lib/wiking/cms/texts.py:29
+msgid "Information about a locked account"
+msgstr ""
+
+#. Translators: Text presented to a user in a web page
+#: ../lib/wiking/cms/texts.py:31
+msgid ""
+"Your account is currently disabled.\n"
+"\n"
+"The protected services are not available to you.\n"
+"Contact the application administrator to get the account enabled."
+msgstr ""
+
+#. Translators: Web form label
+#: ../lib/wiking/cms/texts.py:39
+#, fuzzy
+msgid "Information about an account waiting for activation code confirmation"
+msgstr ""
+"Solicitudes de registro no válido (a la espera de la aprobación de correo "
+"electrónico)"
+
+#. Translators: Text presented to a user in a web page
+#: ../lib/wiking/cms/texts.py:41
+msgid ""
+"Your account is inactive because\n"
+"you have not yet confirmed the activation code sent to you by e-mail.\n"
+"\n"
+"Please, check your e-mail and follow the provided link or enter the\n"
+"activation code into the field below.\n"
+"\n"
+"You can also continue without entering the activation code, but\n"
+"the protected services will not be available to you."
+msgstr ""
+
+#. Translators: Web form label
+#: ../lib/wiking/cms/texts.py:53
+#, fuzzy
+msgid "Information about an account waiting for admin approval"
+msgstr ""
+"Solicitudes de registro no válido (a la espera de la aprobación de correo "
+"electrónico)"
+
+#. Translators: Text presented to a user in a web page
+#: ../lib/wiking/cms/texts.py:55
+msgid ""
+"Your account is waiting for approval by the administrator.\n"
+"                  \n"
+"The protected services are not available until the account gets approved.\n"
+"If the account remains unapproved for a long time, contact the application "
+"administrator."
+msgstr ""
+
+#: ../lib/wiking/cms/texts.py:62
+msgid "Introductory text displayed above the registration form"
+msgstr ""
+
+#: ../lib/wiking/cms/texts.py:67
+msgid "Text displayed after successful user registration"
+msgstr ""
+
+#: ../lib/wiking/cms/texts.py:69
+msgid ""
+"Registration completed successfuly. Your account is now fully functional but "
+"you may need to get futher privileges by the administrator to access certain "
+"restricted services."
+msgstr ""
+
+#: ../lib/wiking/cms/texts.py:74
+msgid ""
+"Registration completed successfuly. Your account now awaits administrator's "
+"approval."
+msgstr ""
+"Registro completado con éxito. Su cuenta ahora espera la aprobación del "
+"administrador."
+
+#: ../lib/wiking/cms/texts.py:79
+msgid ""
+"Information displayed above the checkbox for confirmation of site specific "
+"conditions during registration (if empty, no confirmation is required)"
+msgstr ""
+
 #: ../lib/wiking/cms/users.py:57 ../lib/wiking/cms/users.py:148
 msgid "Group"
 msgstr ""
@@ -1550,7 +1429,7 @@ msgid "User Roles"
 msgstr "Usuarios"
 
 #: ../lib/wiking/cms/users.py:149 ../lib/wiking/cms/users.py:434
-#: ../lib/wiking/cms/users.py:1252
+#: ../lib/wiking/cms/users.py:1281
 msgid "User"
 msgstr "Usuario"
 
@@ -1631,7 +1510,7 @@ msgid "Manage registered users and their privileges."
 msgstr "Gestionar usuarios registrados y sus privilegios."
 
 #. Translators: Login name for a website. Registration form field.
-#: ../lib/wiking/cms/users.py:408 ../lib/wiking/cms/users.py:1210
+#: ../lib/wiking/cms/users.py:408 ../lib/wiking/cms/users.py:1239
 msgid "Login name"
 msgstr "Nombre del usuario"
 
@@ -1643,7 +1522,7 @@ msgstr ""
 "Un nombre de usuario válido sólo puede contener letras, cifras, rayas, "
 "subrayados y puntos y tiene que iniciar con una letra."
 
-#: ../lib/wiking/cms/users.py:413 ../lib/wiking/cms/users.py:1211
+#: ../lib/wiking/cms/users.py:413 ../lib/wiking/cms/users.py:1240
 msgid "Password"
 msgstr "Contraseña"
 
@@ -1824,12 +1703,12 @@ msgid "User's Groups"
 msgstr ""
 
 #. Translators: Heading for an overview when and how the user has accessed the application.
-#: ../lib/wiking/cms/users.py:530 ../lib/wiking/cms/users.py:1247
+#: ../lib/wiking/cms/users.py:530 ../lib/wiking/cms/users.py:1276
 msgid "Login History"
 msgstr "Historial de usuario"
 
 #. Translators: Name of group of users who have full access to the system.
-#: ../lib/wiking/cms/users.py:538 ../lib/wiking/cms/users.py:1110
+#: ../lib/wiking/cms/users.py:538 ../lib/wiking/cms/users.py:1130
 msgid "Active users"
 msgstr "Usuarios activos"
 
@@ -1932,157 +1811,139 @@ msgid "Active account"
 msgstr "Nuevo archivo adjunto"
 
 #. Translators: Personal data -- first name, surname, nickname ...
-#: ../lib/wiking/cms/users.py:648 ../lib/wiking/cms/users.py:654
-#: ../lib/wiking/cms/users.py:675
+#: ../lib/wiking/cms/users.py:658 ../lib/wiking/cms/users.py:664
+#: ../lib/wiking/cms/users.py:685
 msgid "Personal data"
 msgstr "Datos personales"
 
 #. Translators: Contact information -- email, phone, address...
-#: ../lib/wiking/cms/users.py:650 ../lib/wiking/cms/users.py:655
-#: ../lib/wiking/cms/users.py:676
+#: ../lib/wiking/cms/users.py:660 ../lib/wiking/cms/users.py:665
+#: ../lib/wiking/cms/users.py:686
 msgid "Contact information"
 msgstr "Información del contacto"
 
 #. Translators: Others is a label for a group of unspecified form fields
 #. (as in Personal data, Contact information, Others).
-#: ../lib/wiking/cms/users.py:653 ../lib/wiking/cms/users.py:656
-#: ../lib/wiking/cms/users.py:681
+#: ../lib/wiking/cms/users.py:663 ../lib/wiking/cms/users.py:666
+#: ../lib/wiking/cms/users.py:691
 msgid "Others"
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:657
+#: ../lib/wiking/cms/users.py:667
 #, fuzzy
 msgid "Account state"
 msgstr "Cuenta desactivada"
 
 #. Translators: Button label.
-#: ../lib/wiking/cms/users.py:662
+#: ../lib/wiking/cms/users.py:672
 msgid "New user"
 msgstr "Usuario nuevo"
 
 #. Translators: Button label.
-#: ../lib/wiking/cms/users.py:664
+#: ../lib/wiking/cms/users.py:674
 msgid "Edit profile"
 msgstr "Modificar pérfil"
 
 #. Translators: Button label. Modify the users data (email, address...)
-#: ../lib/wiking/cms/users.py:666
+#: ../lib/wiking/cms/users.py:676
 msgid "Modify user's record"
 msgstr "Modificar datos del usuario"
 
-#: ../lib/wiking/cms/users.py:679
+#: ../lib/wiking/cms/users.py:689
 msgid "Login information"
 msgstr "Información de usuario"
 
-#: ../lib/wiking/cms/users.py:712
+#: ../lib/wiking/cms/users.py:722
 msgid "Enter your current password."
 msgstr "Introduzca su contraseña actual."
 
-#: ../lib/wiking/cms/users.py:716
+#: ../lib/wiking/cms/users.py:726
 msgid "Invalid password."
 msgstr "Contraseña no válida."
 
-#: ../lib/wiking/cms/users.py:720
+#: ../lib/wiking/cms/users.py:730
 msgid "Enter the new password."
 msgstr "Introducir contraseña nueva."
 
-#: ../lib/wiking/cms/users.py:728
+#: ../lib/wiking/cms/users.py:738
 msgid "The new password is the same as the old one."
 msgstr "La nueva contraseña es la misma que la vieja."
 
-#: ../lib/wiking/cms/users.py:753
-#, fuzzy, python-format
+#: ../lib/wiking/cms/users.py:763
+#, python-format
 msgid ""
-"The first step of your registration at %(server_hostname)s was successfully "
-"completed.\n"
-"\n"
-"For the next step visit the following URL and follow the instructions "
-"there:\n"
+"To finish your registration at %(server_hostname)s, click on the following "
+"link:\n"
 "%(uri)s\n"
 "\n"
-"If the above link fails, you will be prompted for your activation code when\n"
-"you attempt to log in.\n"
-"\n"
-"Your activation code is: %(code)s\n"
-msgstr ""
-"El primer paso de su inscripción en %(server_hostname)s se completó con "
-"éxito.\n"
-"\n"
-"Para el próximo paso visite la siguiente URL y siga las instrucciones: \n"
-"%(uri)s \n"
-
-#: ../lib/wiking/cms/users.py:768
-msgid "Registration accepted."
-msgstr "Registró aceptado."
-
-#: ../lib/wiking/cms/users.py:769
-msgid "Please, check your mailbox for instructions how to proceed."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:773
+#: ../lib/wiking/cms/users.py:776
 msgid "Registration cancelled."
 msgstr "Registro cancelado."
 
-#: ../lib/wiking/cms/users.py:779
+#: ../lib/wiking/cms/users.py:782
 #, python-format
 msgid "Your registration at %s"
 msgstr "Su registro en %s"
 
-#: ../lib/wiking/cms/users.py:783 ../lib/wiking/cms/users.py:835
-#: ../lib/wiking/cms/users.py:885 ../lib/wiking/cms/users.py:1218
+#: ../lib/wiking/cms/users.py:786 ../lib/wiking/cms/users.py:840
+#: ../lib/wiking/cms/users.py:890 ../lib/wiking/cms/users.py:1247
 msgid "Failed sending e-mail notification:"
 msgstr "Error en el envío de notificación por correo electrónico:"
 
 #. Translators: Follows an email addres, e.g. ``Activation code was sent to joe at brailcom.org''
-#: ../lib/wiking/cms/users.py:787
+#: ../lib/wiking/cms/users.py:790
 #, python-format
-msgid "Activation code was sent to %s."
+msgid ""
+"To finish registration, please confirm the activation code that was sent to "
+"your email address at %(email)s."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:810
+#: ../lib/wiking/cms/users.py:815
 msgid "User registration already confirmed."
 msgstr "Registro de usuario ya confirmado."
 
-#: ../lib/wiking/cms/users.py:813
+#: ../lib/wiking/cms/users.py:818
 #, fuzzy
 msgid "Invalid activation code."
 msgstr " Código de registro no válido."
 
-#: ../lib/wiking/cms/users.py:821
+#: ../lib/wiking/cms/users.py:826
 #, fuzzy, python-format
 msgid "New user %(fullname)s registered at %(server_hostname)s."
 msgstr ""
 "Nuevo usuario %(fullname)s registrado en %(server_hostname)s. Por favor, "
 "aprobar la cuenta: %(uri)s"
 
-#: ../lib/wiking/cms/users.py:825
+#: ../lib/wiking/cms/users.py:830
 msgid "The account was approved automatically according to server setup."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:828
+#: ../lib/wiking/cms/users.py:833
 #, fuzzy
 msgid "Please approve the account:"
 msgstr "Activar esta cuenta"
 
-#: ../lib/wiking/cms/users.py:832
+#: ../lib/wiking/cms/users.py:837
 msgid "New user registration:"
 msgstr "Nuevo usuario registrado:"
 
-#: ../lib/wiking/cms/users.py:838
+#: ../lib/wiking/cms/users.py:843
 msgid "E-mail notification has been sent to server administrator."
 msgstr ""
 "La notificación de correo electrónico se ha enviado al administrador del "
 "servidor."
 
-#: ../lib/wiking/cms/users.py:866
+#: ../lib/wiking/cms/users.py:871
 msgid "Registration confirmed"
 msgstr "Registro confirmado"
 
-#: ../lib/wiking/cms/users.py:877
+#: ../lib/wiking/cms/users.py:882
 msgid "The account was enabled."
 msgstr "La cuenta ha sido activada."
 
-#: ../lib/wiking/cms/users.py:879
+#: ../lib/wiking/cms/users.py:884
 #, python-format
 msgid ""
 "Your account at %(uri)s has been enabled. Please log in with username '%"
@@ -2091,77 +1952,81 @@ msgstr ""
 "Su cuenta en %(uri)s se ha activado. Por favor iniciar la sesión con nombre "
 "de usuario '%(login)s' y su contraseña."
 
-#: ../lib/wiking/cms/users.py:882
+#: ../lib/wiking/cms/users.py:887
 msgid "Your account has been enabled."
 msgstr "Su cuenta ha sido activada."
 
-#: ../lib/wiking/cms/users.py:887
+#: ../lib/wiking/cms/users.py:892
 msgid "E-mail notification has been sent to:"
 msgstr "El correo electrónico de notificación se ha enviado a:"
 
-#: ../lib/wiking/cms/users.py:889
+#: ../lib/wiking/cms/users.py:894
 #, fuzzy
 msgid "The account was disabled."
 msgstr "La cuenta ha sido activada."
 
-#: ../lib/wiking/cms/users.py:895
+#: ../lib/wiking/cms/users.py:900
 #, fuzzy, python-format
 msgid "The registration expired on %(date)s."
 msgstr "Registro de usuario ya confirmado."
 
-#: ../lib/wiking/cms/users.py:898
+#: ../lib/wiking/cms/users.py:903
 #, fuzzy
 msgid "Continue"
 msgstr "Contenido"
 
-#: ../lib/wiking/cms/users.py:902
+#: ../lib/wiking/cms/users.py:907
 #, fuzzy
 msgid "The registration code was not confirmed by the user!"
 msgstr "Registro de usuario ya confirmado."
 
-#: ../lib/wiking/cms/users.py:903
+#: ../lib/wiking/cms/users.py:908
 msgid ""
 "Please enable the account only if you are sure that the e-mail address "
 "belongs to given user."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:1111
+#: ../lib/wiking/cms/users.py:1131
 msgid "Listing of all active user accounts."
 msgstr "Listado de todas las cuentas de usuario activas."
 
-#: ../lib/wiking/cms/users.py:1138
+#: ../lib/wiking/cms/users.py:1142
+msgid "Users who have `confirm' flag set"
+msgstr ""
+
+#: ../lib/wiking/cms/users.py:1167
 msgid "Enter your login name or e-mail address"
 msgstr "Introduzca su nombre de usuario o correo electrónico"
 
-#: ../lib/wiking/cms/users.py:1173
+#: ../lib/wiking/cms/users.py:1202
 msgid "Password reminder"
 msgstr "Recordatorio de contraseña"
 
-#: ../lib/wiking/cms/users.py:1186
+#: ../lib/wiking/cms/users.py:1215
 msgid "Multiple user accounts found for given email address."
 msgstr "Cuentas de usuarios múltiples encontradas."
 
-#: ../lib/wiking/cms/users.py:1187
+#: ../lib/wiking/cms/users.py:1216
 msgid "Please, select the account for which you want to remind:"
 msgstr "Por favor, seleccione la cuenta para la que usted desea reordar:"
 
 #. Translators: Credentials such as password...
-#: ../lib/wiking/cms/users.py:1200
+#: ../lib/wiking/cms/users.py:1229
 msgid "Your credentials were reset to:"
 msgstr "Sus credenciales han sido reconfiguradas :"
 
 #. Translators: Credentials such as password...
-#: ../lib/wiking/cms/users.py:1204
+#: ../lib/wiking/cms/users.py:1233
 msgid "Your credentials are:"
 msgstr "Sus credenciales:"
 
-#: ../lib/wiking/cms/users.py:1206
+#: ../lib/wiking/cms/users.py:1235
 #, python-format
 msgid "A password reminder request has been made at %(server_uri)s."
 msgstr ""
 "La solicitud de recordatorio de contraseña se ha realizado en %(server_uri)s."
 
-#: ../lib/wiking/cms/users.py:1213
+#: ../lib/wiking/cms/users.py:1242
 msgid ""
 "We strongly recommend you change your password at nearest occassion, since "
 "it has been exposed to an unsecure channel."
@@ -2169,66 +2034,211 @@ msgstr ""
 "Le recomendamos que cambie su contraseña próximamente porque ha sido "
 "expuesta a un canal inseguro."
 
-#: ../lib/wiking/cms/users.py:1219
+#: ../lib/wiking/cms/users.py:1248
 msgid "Please try repeating your request later or contact the administrator!"
 msgstr ""
 "Por favor repita la solicitud más tarde o contacte con el administrador!"
 
-#: ../lib/wiking/cms/users.py:1221
+#: ../lib/wiking/cms/users.py:1250
 msgid "E-mail information has been sent to your email address."
 msgstr "La información ha sido enviada a su dirección de correo electrónico."
 
-#: ../lib/wiking/cms/users.py:1224
+#: ../lib/wiking/cms/users.py:1253
 msgid "No user account for your query."
 msgstr "Ningún nombre de usuario para su solicitud."
 
-#: ../lib/wiking/cms/users.py:1248
+#: ../lib/wiking/cms/users.py:1277
 msgid "History of successful login sessions and unsuccessful login attempts."
 msgstr ""
 "Historial de las sesiones iniciadas con éxito y tentativas de iniciar sesión "
 "fracasadas."
 
 #. Translators: Login name.
-#: ../lib/wiking/cms/users.py:1254
+#: ../lib/wiking/cms/users.py:1283
 msgid "Login"
 msgstr "Usuario"
 
 #. Translators: Form field saying whether the users attempt was succesful. Values are Yes/No.
-#: ../lib/wiking/cms/users.py:1256
+#: ../lib/wiking/cms/users.py:1285
 msgid "Success"
 msgstr "Éxito"
 
 #. Translators: Table column heading. Time of the start of user session, followed by a date and time.
-#: ../lib/wiking/cms/users.py:1258
+#: ../lib/wiking/cms/users.py:1287
 msgid "Start time"
 msgstr "Tiempo de iniciación"
 
 #. Translators: Table column heading. The length of user session. Contains time.
-#: ../lib/wiking/cms/users.py:1260
+#: ../lib/wiking/cms/users.py:1289
 msgid "Duration"
 msgstr "Duración"
 
-#: ../lib/wiking/cms/users.py:1263
+#: ../lib/wiking/cms/users.py:1292
 msgid "IP address"
 msgstr "Dirección IP"
 
 #. Translators: Internet name of the remote computer (computer terminology).
-#: ../lib/wiking/cms/users.py:1265
+#: ../lib/wiking/cms/users.py:1294
 msgid "Hostname"
 msgstr "Nombre de equipo"
 
 #. Translators: "User agent" is a generalized name for browser or more precisely the
 #. software which produced the HTTP request (was used to access the website).
-#: ../lib/wiking/cms/users.py:1268
+#: ../lib/wiking/cms/users.py:1297
 msgid "User agent"
 msgstr "Agente de usuario"
 
 #. Translators: Meaning where the user came from. Computer terminology. Do not translate
 #. "HTTP" and if unsure, don't translate at all (it is a very technical term).
-#: ../lib/wiking/cms/users.py:1271
+#: ../lib/wiking/cms/users.py:1300
 msgid "HTTP Referer"
 msgstr "HTTP Referer"
 
+#: ../lib/wiking/configuration.py:194
+msgid "Webmaster's e-mail address"
+msgstr "Dirección de correo electrónico del administrador"
+
+#: ../lib/wiking/configuration.py:205
+msgid "Default sender address"
+msgstr "Dirección predeterminada del remitente"
+
+#: ../lib/wiking/configuration.py:222
+msgid "Force HTTPS login"
+msgstr "Forzar el inicio de sesión HTTPS"
+
+#: ../lib/wiking/configuration.py:223
+msgid ""
+"If enabled, the login form will always be redirected to an HTTPS address to "
+"ensure the security of the submitted credentials.  This, however, requires "
+"your server to be setup to accept HTTPS requests for the same virtual host "
+"and pass them to Wiking."
+msgstr ""
+"Si está activado, el formulario de acceso siempre será remitido a una "
+"dirección HTTPS para garantizar la seguridad de los datos presentados. Esto, "
+"sin embargo, requiere que su servidor esté configurado para aceptar "
+"peticiones HTTPS para la misma máquina virtual y pasar a Wiking."
+
+#. Translators: Site means a webpage or web application.
+#: ../lib/wiking/configuration.py:276
+msgid "Site title"
+msgstr "Título del sitio"
+
+#: ../lib/wiking/configuration.py:277
+msgid ""
+"Site title is a short and (hopefully) unique title of the whole website. It "
+"will appear at the top of every page."
+msgstr ""
+"El título corto de toda la web. Aparece en la parte superior de cada página."
+
+#. Translators: Site means a webpage or web application. Subtitle as in ,,title -- subtitle''.
+#: ../lib/wiking/configuration.py:283
+msgid "Site subtitle"
+msgstr "Subtítulo del sitio"
+
+#: ../lib/wiking/configuration.py:284
+msgid ""
+"Site subtitle is an optional more descriptive title of the website.  It will "
+"appear at the top of every page together with site title, but where brevity "
+"matters, only title will be used."
+msgstr ""
+"Opcional. Sirve para ofrecer una descripción más detallada de la página web. "
+"Aparece en la parte superior de cada página junto con el título corto, pero "
+"para asuntos breves sólo se usa el título corto."
+
+#. Translators: Web page or web application specific image.
+#: ../lib/wiking/configuration.py:291
+#, fuzzy
+msgid "Site icon"
+msgstr "Título del sitio"
+
+#: ../lib/wiking/configuration.py:305
+msgid "Default language"
+msgstr "Idioma predeterminado"
+
+#. Translators: Language negotiation means the process where the server is trying
+#. to find a language that matches with what the users internet browser asks for.
+#: ../lib/wiking/configuration.py:308
+msgid ""
+"Defines the language (lowercase ISO 639-1 Alpha-2 code) to be used when "
+"content language negotiation fails. If not set (which is the default), the "
+"server will issue a 606 HTTP error (Not acceptable) when the document is not "
+"available in any of the requested languages. The error page will contain a "
+"description of the problem and a list of available language variants of the "
+"requested document. The negotiation is based on the browser setting of "
+"user's language preference passed through the 'Accept-Language' HTTP header. "
+"If set, Wiking will automatically serve given language variant instead of "
+"issuing the error if that variant is available.  If unavailable, the 606 "
+"error is raised anyway, so you need to make sure that all documents are "
+"available at least in the default language variant if you want to avoid 606 "
+"errors completely."
+msgstr ""
+"Define el idioma (minúsculas ISO 639-1 Código Alfa-2) que se utilizará "
+"cuando el idioma de contenido de negociación fracasa. Si no se establece (el "
+"valor predeterminado), el servidor emitirá un error HTTP 606 (no aceptable) "
+"cuando el documento no está disponible en alguno de los idiomas solicitados. "
+"La página de error contendrá una descripción del problema y una lista de "
+"variantes lingüísticas del documento solicitado. La negociación se basa en "
+"la configuración del navegador del usuario de idioma preferido elegido como "
+"'Accept-Language' para HTTP. Si se establece, Wiking automáticamente "
+"mostrará la variante del idioma si está disponible en lugar de emitir un "
+"error. Si no está disponible, el error 606 se mostrará de todos modos, por "
+"lo que necesita estar seguro de que todos documentos están disponibles al "
+"menos en un idioma predeterminado para evitar completamente los errores 606."
+
+#. Translators: Yes/No configuration option label. Should the login panel display user role (as Admin, Student, Tutor etc.)
+#: ../lib/wiking/configuration.py:378
+#, fuzzy
+msgid "Display role in login panel"
+msgstr "Permitir el panel de iniciar la sesión"
+
+#: ../lib/wiking/configuration.py:379
+msgid ""
+"If enabled, the login panel on each page will not display only the current "
+"username, but also his current user role, which affects his permissions."
+msgstr ""
+
+#: ../lib/wiking/configuration.py:397
+msgid "Whether to use e-mails as login names"
+msgstr "Usar el correo electrónico en lugar del nombre del usuario"
+
+#: ../lib/wiking/configuration.py:398
+msgid "Iff true, users must use e-mail addresses as their login names."
+msgstr ""
+"Si es verdad, los usuarios tienen que usar el correo electrónico como su "
+"nombre del usuario."
+
+#: ../lib/wiking/configuration.py:412
+msgid ""
+"If set, the newly registered users will be automatically approved without "
+"any administrator's action.  The adminstrator may still need to asign users "
+"to groups to grant them further privileges, but the accounts are enabled "
+"right after the user confirms the registration code."
+msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "The first step of your registration at %(server_hostname)s was "
+#~ "successfully completed.\n"
+#~ "\n"
+#~ "For the next step visit the following URL and follow the instructions "
+#~ "there:\n"
+#~ "%(uri)s\n"
+#~ "\n"
+#~ "If the above link fails, you will be prompted for your activation code "
+#~ "when\n"
+#~ "you attempt to log in.\n"
+#~ "\n"
+#~ "Your activation code is: %(code)s\n"
+#~ msgstr ""
+#~ "El primer paso de su inscripción en %(server_hostname)s se completó con "
+#~ "éxito.\n"
+#~ "\n"
+#~ "Para el próximo paso visite la siguiente URL y siga las instrucciones: \n"
+#~ "%(uri)s \n"
+
+#~ msgid "Registration accepted."
+#~ msgstr "Registró aceptado."
+
 #~ msgid "Private"
 #~ msgstr "Privado"
 
diff --git a/translations/wiking-cms.fr.po b/translations/wiking-cms.fr.po
index 9de7eae..245c40f 100644
--- a/translations/wiking-cms.fr.po
+++ b/translations/wiking-cms.fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-16 19:35+0200\n"
+"POT-Creation-Date: 2010-10-16 13:26+0200\n"
 "PO-Revision-Date: 2010-02-02 15:43+0100\n"
 "Last-Translator: Petr Topiarz <topiarz at post.cz>\n"
 "Language-Team: French <wiking at lists.freebsoft.org>\n"
@@ -15,132 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/wiking/configuration.py:194
-msgid "Webmaster's e-mail address"
-msgstr "L'adresse e-mail du webmaster"
-
-#: ../lib/wiking/configuration.py:205
-msgid "Default sender address"
-msgstr "L'adresse de l'expéditeur par défaut "
-
-#: ../lib/wiking/configuration.py:222
-msgid "Force HTTPS login"
-msgstr "Forcer la connexion HTTPS"
-
-#: ../lib/wiking/configuration.py:223
-msgid ""
-"If enabled, the login form will always be redirected to an HTTPS address to "
-"ensure the security of the submitted credentials.  This, however, requires "
-"your server to be setup to accept HTTPS requests for the same virtual host "
-"and pass them to Wiking."
-msgstr ""
-"S'il est activé, le formulaire de connection sera toujours redirigé vers une "
-"adresse HTTPS, pour assurer la sécurité des informations sur l'identité "
-"envoyées. Toutefois, cela exige que votre serveur soit configuré pour "
-"accepter les requêtes HTTPS pour le même hôte virtuel et pour les passer à "
-"Wiking."
-
-#. Translators: Site means a webpage or web application.
-#: ../lib/wiking/configuration.py:276
-msgid "Site title"
-msgstr "Titre du site"
-
-#: ../lib/wiking/configuration.py:277
-msgid ""
-"Site title is a short and (hopefully) unique title of the whole website. It "
-"will appear at the top of every page."
-msgstr ""
-"Le titre du site est un titre court et unique pour tout le site Web. Il "
-"apparaîtra en haut de chaque page."
-
-#. Translators: Site means a webpage or web application. Subtitle as in ,,title -- subtitle''.
-#: ../lib/wiking/configuration.py:283
-msgid "Site subtitle"
-msgstr "Sous-titre du site"
-
-#: ../lib/wiking/configuration.py:284
-msgid ""
-"Site subtitle is an optional more descriptive title of the website.  It will "
-"appear at the top of every page together with site title, but where brevity "
-"matters, only title will be used."
-msgstr ""
-"Le sous-titre du site est un titre facultatif, plus descriptif, du site "
-"Web.  Il apparaîtra en haut de chaque page avec le titre du site, mais là où "
-"la concision est exigée, seul le titre sera utilisé."
-
-#. Translators: Web page or web application specific image.
-#: ../lib/wiking/configuration.py:291
-msgid "Site icon"
-msgstr "Icône du site"
-
-#: ../lib/wiking/configuration.py:305
-msgid "Default language"
-msgstr "Langue par défaut"
-
-#. Translators: Language negotiation means the process where the server is trying
-#. to find a language that matches with what the users internet browser asks for.
-#: ../lib/wiking/configuration.py:308
-msgid ""
-"Defines the language (lowercase ISO 639-1 Alpha-2 code) to be used when "
-"content language negotiation fails. If not set (which is the default), the "
-"server will issue a 606 HTTP error (Not acceptable) when the document is not "
-"available in any of the requested languages. The error page will contain a "
-"description of the problem and a list of available language variants of the "
-"requested document. The negotiation is based on the browser setting of "
-"user's language preference passed through the 'Accept-Language' HTTP header. "
-"If set, Wiking will automatically serve given language variant instead of "
-"issuing the error if that variant is available.  If unavailable, the 606 "
-"error is raised anyway, so you need to make sure that all documents are "
-"available at least in the default language variant if you want to avoid 606 "
-"errors completely."
-msgstr ""
-"Définit la langue (ISO 639-1  Alpha-2 code) à utiliser si le contenu de la "
-"langue demandé échoue. Si elle n'est pas définie (ce qui est la valeur par "
-"défaut), le serveur affichera l'erreur HTTP 606 (Non acceptable) lorsque le "
-"document n'est pas disponible dans aucune des langues demandées. La page "
-"d'erreur contiendra une description du problème et une liste de versions "
-"linguistiques disponibles du document demandé. La négociation dépend de la "
-"configuration du moteur de recherche des préférences linguistiques de "
-"l'utilisateur envoyées par 'Accept-Language' en-tête de HTTP. Si c'est "
-"défini, Wiking affichera automatiquement une version linguistique "
-"disponible, au lieu du message d'erreur. Si cette version n'est pas "
-"disponible, l'erreur 606 est affichée. Il faut alors s'assurer que tous les "
-"documents sont disponibles au moins dans la version linguistique par défaut, "
-"si vous souhaitez complètement éviter les erreurs 606."
-
-#. Translators: Yes/No configuration option label. Should the login panel display user role (as Admin, Student, Tutor etc.)
-#: ../lib/wiking/configuration.py:378
-msgid "Display role in login panel"
-msgstr "Afficher le rôle dans le panneau de connexion"
-
-#: ../lib/wiking/configuration.py:379
-#, fuzzy
-msgid ""
-"If enabled, the login panel on each page will not display only the current "
-"username, but also his current user role, which affects his permissions."
-msgstr ""
-"Si cela est défini, le panneau de connexion n'affichera pas uniquement le "
-"nom d'utilisateur, mais aussi son rôle actuel (p. ex. administrateur, "
-"utilisateur, étudiant, etc.)"
-
-#: ../lib/wiking/configuration.py:397
-msgid "Whether to use e-mails as login names"
-msgstr "Utiliser l'adresse e-mail comme identifiant"
-
-#: ../lib/wiking/configuration.py:398
-msgid "Iff true, users must use e-mail addresses as their login names."
-msgstr ""
-"Si cela est défini, les utilisateurs doivent utiliser leur adresse e-mail "
-"comme identifiant."
-
-#: ../lib/wiking/configuration.py:412
-msgid ""
-"If set, the newly registered users will be automatically approved without "
-"any administrator's action.  The adminstrator may still need to asign users "
-"to groups to grant them further privileges, but the accounts are enabled "
-"right after the user confirms the registration code."
-msgstr ""
-
 #: ../lib/wiking/cms/appl.py:53
 msgid "Manage this site"
 msgstr "Gérer ce site"
@@ -157,142 +31,6 @@ msgstr "Quitter l'interface de gestion"
 msgid "Wiking Management Interface"
 msgstr "L'interface de gestion Wiking"
 
-#. Translators: Yes/No configuration option label. Should the login panel be visible?
-#: ../lib/wiking/cms/configuration.py:36
-msgid "Allow login panel"
-msgstr "Autoriser le panneau de connexion"
-
-#: ../lib/wiking/cms/configuration.py:37
-msgid ""
-"If enabled, the information about the currently logged user and login/logout "
-"controls will be present on each page as a separate panel.  This panel will "
-"always be the first panel on the page."
-msgstr ""
-"Si cela est défini, l'information sur les autres utilisateurs actuellement "
-"connectés et le témoin de connexion / déconnexion sera toujours affiché sur "
-"chaque page comme un  panneau distinct. Ce panneau sera toujours le premier "
-"panneau de la page."
-
-#. Translators: Yes/No configuration option label. Should link to WMI be visible?  "WMI"
-#. stands for Wiking Management Interface.  Don't feel obliged to use an abbreviation.  Use
-#. whatever brief form obviously referning to whatever translation you used for "Wiking
-#. Management Interface".
-#: ../lib/wiking/cms/configuration.py:47
-msgid "Allow WMI link"
-msgstr "Autoriser le lien WMI"
-
-#. Translators: Yes/no configuration label. Can new users register to this
-#. website/application?
-#: ../lib/wiking/cms/configuration.py:55
-msgid "Allow new user registration"
-msgstr "Autoriser l'enregistrement de nouveaux utilisateurs"
-
-#: ../lib/wiking/cms/configuration.py:56
-msgid ""
-"If enabled, all visitors are allowed to create a user account.  If disabled, "
-"new user accounts must be created by administrator.  Note, that the newly "
-"created accounts are inactive (at least with the default implementation of "
-"the user management module), so the creation of the account doesn't give the "
-"user any actual privileges."
-msgstr ""
-"Si cela est défini, tous les visiteurs peuvent créer un compte "
-"d'utilisateur. Si cela n'est pas autorisé, le nouveaux comptes doivent être "
-"créés par l'administrateur. Notez que les comptes nouvellement créés sont "
-"inactifs (au moins avec l'implémentation par défaut du module de gestion des "
-"utilisateurs). Cela signifie que la création du compte ne donne pas aux "
-"utilisateurs de privilèges réels."
-
-#. Translators: Maximal size an uploaded file can have.
-#: ../lib/wiking/cms/configuration.py:65
-msgid "Maximal upload size"
-msgstr "Taille maximale de téléchargement"
-
-#: ../lib/wiking/cms/configuration.py:66
-msgid ""
-"The maximal size of uploaded files in bytes.  The server needs to be "
-"relaoded for the changes in this option to take effect."
-msgstr ""
-"Taille maximale de téléchargement en octets. Pour que les changements "
-"prennent effet, il faut recharger le serveur."
-
-#. Translators: Web form label (account in the meaning of user account)
-#: ../lib/wiking/cms/texts.py:29
-msgid "Information about a locked account"
-msgstr ""
-
-#. Translators: Text presented to a user in a web page
-#: ../lib/wiking/cms/texts.py:31
-msgid ""
-"Your account is currently disabled.\n"
-"\n"
-"The protected services are not available to you.\n"
-"Contact the application administrator to get the account enabled."
-msgstr ""
-
-#. Translators: Web form label
-#: ../lib/wiking/cms/texts.py:39
-#, fuzzy
-msgid "Information about an account waiting for activation code confirmation"
-msgstr "Valider le compte sans vérifier le code d'activation"
-
-#. Translators: Text presented to a user in a web page
-#: ../lib/wiking/cms/texts.py:41
-msgid ""
-"Your account is inactive because\n"
-"you have not yet confirmed the activation code sent to you by e-mail.\n"
-"\n"
-"Please, check your e-mail and follow the provided link or enter the\n"
-"activation code into the field below.\n"
-"\n"
-"You can also continue without entering the activation code, but\n"
-"the protected services will not be available to you."
-msgstr ""
-
-#. Translators: Web form label
-#: ../lib/wiking/cms/texts.py:53
-#, fuzzy
-msgid "Information about an account waiting for admin approval"
-msgstr "Comptes non approuvés (on attend l'approvation de l'administrateur)"
-
-#. Translators: Text presented to a user in a web page
-#: ../lib/wiking/cms/texts.py:55
-msgid ""
-"Your account is waiting for approval by the administrator.\n"
-"                  \n"
-"The protected services are not available until the account gets approved.\n"
-"If the account remains unapproved for a long time, contact the application "
-"administrator."
-msgstr ""
-
-#: ../lib/wiking/cms/texts.py:62
-msgid "Introductory text displayed above the registration form"
-msgstr ""
-
-#: ../lib/wiking/cms/texts.py:67
-msgid "Text displayed after successful user registration"
-msgstr ""
-
-#: ../lib/wiking/cms/texts.py:69
-msgid ""
-"Registration completed successfuly. Your account is now fully functional but "
-"you may need to get futher privileges by the administrator to access certain "
-"restricted services."
-msgstr ""
-
-#: ../lib/wiking/cms/texts.py:74
-msgid ""
-"Registration completed successfuly. Your account now awaits administrator's "
-"approval."
-msgstr ""
-"L'inscription a été effectuée avec succès. Votre compte attend maintenant "
-"l'approbation de l'administrateur."
-
-#: ../lib/wiking/cms/texts.py:79
-msgid ""
-"Information displayed above the checkbox for confirmation of site specific "
-"conditions during registration (if empty, no confirmation is required)"
-msgstr ""
-
 #: ../lib/wiking/cms/cms.py:61
 msgid "formatting manual"
 msgstr "Manuel de formatage"
@@ -402,7 +140,7 @@ msgstr "Renvoyer le code d'activation"
 
 #. Translators: Button name. Computer terminology. Use an appropriate term common
 #. for submitting forms in a computer application.
-#: ../lib/wiking/cms/cms.py:496 ../lib/wiking/cms/users.py:1142
+#: ../lib/wiking/cms/cms.py:496 ../lib/wiking/cms/users.py:1171
 msgid "Submit"
 msgstr "Envoyer"
 
@@ -414,7 +152,7 @@ msgstr ""
 msgid "Account disabled"
 msgstr "Compte désactivé"
 
-#: ../lib/wiking/cms/cms.py:533 ../lib/wiking/cms/users.py:814
+#: ../lib/wiking/cms/cms.py:533 ../lib/wiking/cms/users.py:819
 #, fuzzy
 msgid "Account not activated"
 msgstr "Compte désactivé"
@@ -758,7 +496,7 @@ msgstr "Gérer les thèmes de couleurs disponibles."
 
 #. Translators: Table column heading. Whether the account is active. Values are yes/no.
 #: ../lib/wiking/cms/cms.py:897 ../lib/wiking/cms/cms.py:1987
-#: ../lib/wiking/cms/users.py:1262
+#: ../lib/wiking/cms/users.py:1291
 msgid "Active"
 msgstr "Actif"
 
@@ -1059,7 +797,7 @@ msgstr ""
 #. Translators: Button label. Use standard computer terminology.
 #. Translators: Back button label. Standard computer terminology.
 #: ../lib/wiking/cms/cms.py:1212 ../lib/wiking/cms/cms.py:1572
-#: ../lib/wiking/cms/users.py:900
+#: ../lib/wiking/cms/users.py:905
 msgid "Back"
 msgstr "Page précédente"
 
@@ -1524,6 +1262,142 @@ msgstr "Utiliser comme Modèle"
 msgid "Edit this mail for repeated use"
 msgstr "Modifier ce courriel pour un usage répété"
 
+#. Translators: Yes/No configuration option label. Should the login panel be visible?
+#: ../lib/wiking/cms/configuration.py:36
+msgid "Allow login panel"
+msgstr "Autoriser le panneau de connexion"
+
+#: ../lib/wiking/cms/configuration.py:37
+msgid ""
+"If enabled, the information about the currently logged user and login/logout "
+"controls will be present on each page as a separate panel.  This panel will "
+"always be the first panel on the page."
+msgstr ""
+"Si cela est défini, l'information sur les autres utilisateurs actuellement "
+"connectés et le témoin de connexion / déconnexion sera toujours affiché sur "
+"chaque page comme un  panneau distinct. Ce panneau sera toujours le premier "
+"panneau de la page."
+
+#. Translators: Yes/No configuration option label. Should link to WMI be visible?  "WMI"
+#. stands for Wiking Management Interface.  Don't feel obliged to use an abbreviation.  Use
+#. whatever brief form obviously referning to whatever translation you used for "Wiking
+#. Management Interface".
+#: ../lib/wiking/cms/configuration.py:47
+msgid "Allow WMI link"
+msgstr "Autoriser le lien WMI"
+
+#. Translators: Yes/no configuration label. Can new users register to this
+#. website/application?
+#: ../lib/wiking/cms/configuration.py:55
+msgid "Allow new user registration"
+msgstr "Autoriser l'enregistrement de nouveaux utilisateurs"
+
+#: ../lib/wiking/cms/configuration.py:56
+msgid ""
+"If enabled, all visitors are allowed to create a user account.  If disabled, "
+"new user accounts must be created by administrator.  Note, that the newly "
+"created accounts are inactive (at least with the default implementation of "
+"the user management module), so the creation of the account doesn't give the "
+"user any actual privileges."
+msgstr ""
+"Si cela est défini, tous les visiteurs peuvent créer un compte "
+"d'utilisateur. Si cela n'est pas autorisé, le nouveaux comptes doivent être "
+"créés par l'administrateur. Notez que les comptes nouvellement créés sont "
+"inactifs (au moins avec l'implémentation par défaut du module de gestion des "
+"utilisateurs). Cela signifie que la création du compte ne donne pas aux "
+"utilisateurs de privilèges réels."
+
+#. Translators: Maximal size an uploaded file can have.
+#: ../lib/wiking/cms/configuration.py:65
+msgid "Maximal upload size"
+msgstr "Taille maximale de téléchargement"
+
+#: ../lib/wiking/cms/configuration.py:66
+msgid ""
+"The maximal size of uploaded files in bytes.  The server needs to be "
+"relaoded for the changes in this option to take effect."
+msgstr ""
+"Taille maximale de téléchargement en octets. Pour que les changements "
+"prennent effet, il faut recharger le serveur."
+
+#. Translators: Web form label (account in the meaning of user account)
+#: ../lib/wiking/cms/texts.py:29
+msgid "Information about a locked account"
+msgstr ""
+
+#. Translators: Text presented to a user in a web page
+#: ../lib/wiking/cms/texts.py:31
+msgid ""
+"Your account is currently disabled.\n"
+"\n"
+"The protected services are not available to you.\n"
+"Contact the application administrator to get the account enabled."
+msgstr ""
+
+#. Translators: Web form label
+#: ../lib/wiking/cms/texts.py:39
+#, fuzzy
+msgid "Information about an account waiting for activation code confirmation"
+msgstr "Valider le compte sans vérifier le code d'activation"
+
+#. Translators: Text presented to a user in a web page
+#: ../lib/wiking/cms/texts.py:41
+msgid ""
+"Your account is inactive because\n"
+"you have not yet confirmed the activation code sent to you by e-mail.\n"
+"\n"
+"Please, check your e-mail and follow the provided link or enter the\n"
+"activation code into the field below.\n"
+"\n"
+"You can also continue without entering the activation code, but\n"
+"the protected services will not be available to you."
+msgstr ""
+
+#. Translators: Web form label
+#: ../lib/wiking/cms/texts.py:53
+#, fuzzy
+msgid "Information about an account waiting for admin approval"
+msgstr "Comptes non approuvés (on attend l'approvation de l'administrateur)"
+
+#. Translators: Text presented to a user in a web page
+#: ../lib/wiking/cms/texts.py:55
+msgid ""
+"Your account is waiting for approval by the administrator.\n"
+"                  \n"
+"The protected services are not available until the account gets approved.\n"
+"If the account remains unapproved for a long time, contact the application "
+"administrator."
+msgstr ""
+
+#: ../lib/wiking/cms/texts.py:62
+msgid "Introductory text displayed above the registration form"
+msgstr ""
+
+#: ../lib/wiking/cms/texts.py:67
+msgid "Text displayed after successful user registration"
+msgstr ""
+
+#: ../lib/wiking/cms/texts.py:69
+msgid ""
+"Registration completed successfuly. Your account is now fully functional but "
+"you may need to get futher privileges by the administrator to access certain "
+"restricted services."
+msgstr ""
+
+#: ../lib/wiking/cms/texts.py:74
+msgid ""
+"Registration completed successfuly. Your account now awaits administrator's "
+"approval."
+msgstr ""
+"L'inscription a été effectuée avec succès. Votre compte attend maintenant "
+"l'approbation de l'administrateur."
+
+#: ../lib/wiking/cms/texts.py:79
+msgid ""
+"Information displayed above the checkbox for confirmation of site specific "
+"conditions during registration (if empty, no confirmation is required)"
+msgstr ""
+
 #: ../lib/wiking/cms/users.py:57 ../lib/wiking/cms/users.py:148
 msgid "Group"
 msgstr ""
@@ -1551,7 +1425,7 @@ msgid "User Roles"
 msgstr "Utilisateurs"
 
 #: ../lib/wiking/cms/users.py:149 ../lib/wiking/cms/users.py:434
-#: ../lib/wiking/cms/users.py:1252
+#: ../lib/wiking/cms/users.py:1281
 msgid "User"
 msgstr "Utilisateur"
 
@@ -1632,7 +1506,7 @@ msgid "Manage registered users and their privileges."
 msgstr "Gérer les utilisateurs inscrits et leurs droits."
 
 #. Translators: Login name for a website. Registration form field.
-#: ../lib/wiking/cms/users.py:408 ../lib/wiking/cms/users.py:1210
+#: ../lib/wiking/cms/users.py:408 ../lib/wiking/cms/users.py:1239
 msgid "Login name"
 msgstr "Identifian"
 
@@ -1644,7 +1518,7 @@ msgstr ""
 "Un identifiant valide peut contenir seulement des lettres, des chiffres, des "
 "tirets bas, des tirets et des points et doit commencer par une lettre."
 
-#: ../lib/wiking/cms/users.py:413 ../lib/wiking/cms/users.py:1211
+#: ../lib/wiking/cms/users.py:413 ../lib/wiking/cms/users.py:1240
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -1843,12 +1717,12 @@ msgid "User's Groups"
 msgstr ""
 
 #. Translators: Heading for an overview when and how the user has accessed the application.
-#: ../lib/wiking/cms/users.py:530 ../lib/wiking/cms/users.py:1247
+#: ../lib/wiking/cms/users.py:530 ../lib/wiking/cms/users.py:1276
 msgid "Login History"
 msgstr "Historique des connexions"
 
 #. Translators: Name of group of users who have full access to the system.
-#: ../lib/wiking/cms/users.py:538 ../lib/wiking/cms/users.py:1110
+#: ../lib/wiking/cms/users.py:538 ../lib/wiking/cms/users.py:1130
 msgid "Active users"
 msgstr "Utilisateurs actifs"
 
@@ -1944,157 +1818,138 @@ msgid "Active account"
 msgstr "Nouveau compte"
 
 #. Translators: Personal data -- first name, surname, nickname ...
-#: ../lib/wiking/cms/users.py:648 ../lib/wiking/cms/users.py:654
-#: ../lib/wiking/cms/users.py:675
+#: ../lib/wiking/cms/users.py:658 ../lib/wiking/cms/users.py:664
+#: ../lib/wiking/cms/users.py:685
 msgid "Personal data"
 msgstr "Informations personnelles"
 
 #. Translators: Contact information -- email, phone, address...
-#: ../lib/wiking/cms/users.py:650 ../lib/wiking/cms/users.py:655
-#: ../lib/wiking/cms/users.py:676
+#: ../lib/wiking/cms/users.py:660 ../lib/wiking/cms/users.py:665
+#: ../lib/wiking/cms/users.py:686
 msgid "Contact information"
 msgstr "Coordonnées"
 
 #. Translators: Others is a label for a group of unspecified form fields
 #. (as in Personal data, Contact information, Others).
-#: ../lib/wiking/cms/users.py:653 ../lib/wiking/cms/users.py:656
-#: ../lib/wiking/cms/users.py:681
+#: ../lib/wiking/cms/users.py:663 ../lib/wiking/cms/users.py:666
+#: ../lib/wiking/cms/users.py:691
 msgid "Others"
 msgstr "Autres"
 
-#: ../lib/wiking/cms/users.py:657
+#: ../lib/wiking/cms/users.py:667
 #, fuzzy
 msgid "Account state"
 msgstr "Compte désactivé"
 
 #. Translators: Button label.
-#: ../lib/wiking/cms/users.py:662
+#: ../lib/wiking/cms/users.py:672
 msgid "New user"
 msgstr "Nouvel utilisateur"
 
 #. Translators: Button label.
-#: ../lib/wiking/cms/users.py:664
+#: ../lib/wiking/cms/users.py:674
 msgid "Edit profile"
 msgstr "Modifier le profil"
 
 #. Translators: Button label. Modify the users data (email, address...)
-#: ../lib/wiking/cms/users.py:666
+#: ../lib/wiking/cms/users.py:676
 msgid "Modify user's record"
 msgstr "Modifier le dossier de l'utilisateur"
 
-#: ../lib/wiking/cms/users.py:679
+#: ../lib/wiking/cms/users.py:689
 msgid "Login information"
 msgstr "Informations de connexion"
 
-#: ../lib/wiking/cms/users.py:712
+#: ../lib/wiking/cms/users.py:722
 msgid "Enter your current password."
 msgstr "Entrez votre mot de passe actuel."
 
-#: ../lib/wiking/cms/users.py:716
+#: ../lib/wiking/cms/users.py:726
 msgid "Invalid password."
 msgstr "Le mot de passe est invalide."
 
-#: ../lib/wiking/cms/users.py:720
+#: ../lib/wiking/cms/users.py:730
 msgid "Enter the new password."
 msgstr "Entrez le nouveau mot de passe."
 
-#: ../lib/wiking/cms/users.py:728
+#: ../lib/wiking/cms/users.py:738
 msgid "The new password is the same as the old one."
 msgstr "Le nouveau mot de passe est identique à l'ancien."
 
-#: ../lib/wiking/cms/users.py:753
-#, fuzzy, python-format
+#: ../lib/wiking/cms/users.py:763
+#, python-format
 msgid ""
-"The first step of your registration at %(server_hostname)s was successfully "
-"completed.\n"
-"\n"
-"For the next step visit the following URL and follow the instructions "
-"there:\n"
+"To finish your registration at %(server_hostname)s, click on the following "
+"link:\n"
 "%(uri)s\n"
 "\n"
-"If the above link fails, you will be prompted for your activation code when\n"
-"you attempt to log in.\n"
-"\n"
-"Your activation code is: %(code)s\n"
 msgstr ""
-"La première étape de votre inscription à %(server_hostname)s a été effectuée "
-"avec succès..\n"
-"\n"
-"Pour la prochaine étape consultez l'URL suivante et suivez les "
-"instructions :\n"
-"%(uri)s\n"
 
-#: ../lib/wiking/cms/users.py:768
-msgid "Registration accepted."
-msgstr "Inscription acceptée."
-
-#: ../lib/wiking/cms/users.py:769
-msgid "Please, check your mailbox for instructions how to proceed."
-msgstr ""
-"S'il vous plaît, vérifiez votre boîte de réception pour les instructions "
-"suivantes."
-
-#: ../lib/wiking/cms/users.py:773
+#: ../lib/wiking/cms/users.py:776
 msgid "Registration cancelled."
 msgstr "Inscription annulée."
 
-#: ../lib/wiking/cms/users.py:779
+#: ../lib/wiking/cms/users.py:782
 #, python-format
 msgid "Your registration at %s"
 msgstr "Votre inscription à %s"
 
-#: ../lib/wiking/cms/users.py:783 ../lib/wiking/cms/users.py:835
-#: ../lib/wiking/cms/users.py:885 ../lib/wiking/cms/users.py:1218
+#: ../lib/wiking/cms/users.py:786 ../lib/wiking/cms/users.py:840
+#: ../lib/wiking/cms/users.py:890 ../lib/wiking/cms/users.py:1247
 msgid "Failed sending e-mail notification:"
 msgstr "Échec de l'envoi de l'e-mail de notification :"
 
 #. Translators: Follows an email addres, e.g. ``Activation code was sent to joe at brailcom.org''
-#: ../lib/wiking/cms/users.py:787
-#, python-format
-msgid "Activation code was sent to %s."
-msgstr "Le code d'activation a été envoyé à %s."
+#: ../lib/wiking/cms/users.py:790
+#, fuzzy, python-format
+msgid ""
+"To finish registration, please confirm the activation code that was sent to "
+"your email address at %(email)s."
+msgstr ""
+"L'enregistrement a expiré le %(date)s. L'utilisateur n'a pas validé le code "
+"d'activation envoyé à son adresse e-mail à temps."
 
-#: ../lib/wiking/cms/users.py:810
+#: ../lib/wiking/cms/users.py:815
 msgid "User registration already confirmed."
 msgstr "L'inscription de l'utilisateur a déjà été validée."
 
-#: ../lib/wiking/cms/users.py:813
+#: ../lib/wiking/cms/users.py:818
 msgid "Invalid activation code."
 msgstr "Code d'activation non valide."
 
-#: ../lib/wiking/cms/users.py:821
+#: ../lib/wiking/cms/users.py:826
 #, fuzzy, python-format
 msgid "New user %(fullname)s registered at %(server_hostname)s."
 msgstr ""
 "Un nouvel utilisateur %(fullname)s inscrit à %(server_hostname)s. S'il vous "
 "plaît approuvez le compte : %(uri) s"
 
-#: ../lib/wiking/cms/users.py:825
+#: ../lib/wiking/cms/users.py:830
 msgid "The account was approved automatically according to server setup."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:828
+#: ../lib/wiking/cms/users.py:833
 #, fuzzy
 msgid "Please approve the account:"
 msgstr "Activer ce compte"
 
-#: ../lib/wiking/cms/users.py:832
+#: ../lib/wiking/cms/users.py:837
 msgid "New user registration:"
 msgstr "Inscription de nouveaux membres :"
 
-#: ../lib/wiking/cms/users.py:838
+#: ../lib/wiking/cms/users.py:843
 msgid "E-mail notification has been sent to server administrator."
 msgstr "Un e-mail de notification a été envoyé à l'administrateur."
 
-#: ../lib/wiking/cms/users.py:866
+#: ../lib/wiking/cms/users.py:871
 msgid "Registration confirmed"
 msgstr "Inscription confirmée"
 
-#: ../lib/wiking/cms/users.py:877
+#: ../lib/wiking/cms/users.py:882
 msgid "The account was enabled."
 msgstr "Le compte a été activé."
 
-#: ../lib/wiking/cms/users.py:879
+#: ../lib/wiking/cms/users.py:884
 #, python-format
 msgid ""
 "Your account at %(uri)s has been enabled. Please log in with username '%"
@@ -2103,35 +1958,35 @@ msgstr ""
 "Votre compte %(uri)s a été activé. Connectez-vous avec le nom d'utilisateur "
 "'%(login)s' et votre mot de passe."
 
-#: ../lib/wiking/cms/users.py:882
+#: ../lib/wiking/cms/users.py:887
 msgid "Your account has been enabled."
 msgstr "Votre compte a été activé."
 
-#: ../lib/wiking/cms/users.py:887
+#: ../lib/wiking/cms/users.py:892
 msgid "E-mail notification has been sent to:"
 msgstr "Un e-mail de notification a été envoyé à :"
 
-#: ../lib/wiking/cms/users.py:889
+#: ../lib/wiking/cms/users.py:894
 #, fuzzy
 msgid "The account was disabled."
 msgstr "Le compte a été activé."
 
-#: ../lib/wiking/cms/users.py:895
+#: ../lib/wiking/cms/users.py:900
 #, fuzzy, python-format
 msgid "The registration expired on %(date)s."
 msgstr "L'inscription de l'utilisateur a déjà été validée."
 
-#: ../lib/wiking/cms/users.py:898
+#: ../lib/wiking/cms/users.py:903
 #, fuzzy
 msgid "Continue"
 msgstr "Contenu"
 
-#: ../lib/wiking/cms/users.py:902
+#: ../lib/wiking/cms/users.py:907
 #, fuzzy
 msgid "The registration code was not confirmed by the user!"
 msgstr "L'inscription de l'utilisateur a déjà été validée."
 
-#: ../lib/wiking/cms/users.py:903
+#: ../lib/wiking/cms/users.py:908
 #, fuzzy
 msgid ""
 "Please enable the account only if you are sure that the e-mail address "
@@ -2140,46 +1995,50 @@ msgstr ""
 "S'il vous plaît, confirmez le compte seulement si vous êtes sûr que "
 "l'adresse e-mail appartient à l'utilisateur donné."
 
-#: ../lib/wiking/cms/users.py:1111
+#: ../lib/wiking/cms/users.py:1131
 msgid "Listing of all active user accounts."
 msgstr "Liste de tous les comptes d'utilisateurs actifs."
 
-#: ../lib/wiking/cms/users.py:1138
+#: ../lib/wiking/cms/users.py:1142
+msgid "Users who have `confirm' flag set"
+msgstr ""
+
+#: ../lib/wiking/cms/users.py:1167
 msgid "Enter your login name or e-mail address"
 msgstr "Entrez votre nom d'utilisateur ou adresse e-mail"
 
-#: ../lib/wiking/cms/users.py:1173
+#: ../lib/wiking/cms/users.py:1202
 msgid "Password reminder"
 msgstr "Rappel du mot de passe"
 
-#: ../lib/wiking/cms/users.py:1186
+#: ../lib/wiking/cms/users.py:1215
 msgid "Multiple user accounts found for given email address."
 msgstr ""
 "Plusieurs comptes d'utilisateurs ont été trouvés pour l'adresse e-mail "
 "donnée."
 
-#: ../lib/wiking/cms/users.py:1187
+#: ../lib/wiking/cms/users.py:1216
 msgid "Please, select the account for which you want to remind:"
 msgstr ""
 "Veuillez sélectionner le compte dont le mot de passe vous avez oublié :"
 
 #. Translators: Credentials such as password...
-#: ../lib/wiking/cms/users.py:1200
+#: ../lib/wiking/cms/users.py:1229
 msgid "Your credentials were reset to:"
 msgstr "Vos informations d'indentification ont été remises à :"
 
 #. Translators: Credentials such as password...
-#: ../lib/wiking/cms/users.py:1204
+#: ../lib/wiking/cms/users.py:1233
 msgid "Your credentials are:"
 msgstr "Vos informations d'identification sont :"
 
-#: ../lib/wiking/cms/users.py:1206
+#: ../lib/wiking/cms/users.py:1235
 #, python-format
 msgid "A password reminder request has been made at %(server_uri)s."
 msgstr ""
 "Une demande de rappel de mot de passe a été effectuée sur %(server_uri)s."
 
-#: ../lib/wiking/cms/users.py:1213
+#: ../lib/wiking/cms/users.py:1242
 msgid ""
 "We strongly recommend you change your password at nearest occassion, since "
 "it has been exposed to an unsecure channel."
@@ -2187,67 +2046,226 @@ msgstr ""
 "Nous vous conseillons vivement de changer votre mot de passe au plus vite, "
 "car il a été exposé à un canal non sécurisé."
 
-#: ../lib/wiking/cms/users.py:1219
+#: ../lib/wiking/cms/users.py:1248
 msgid "Please try repeating your request later or contact the administrator!"
 msgstr ""
 "Veuillez renouveler votre demande ultérieurement ou contactez "
 "l'administrateur !"
 
-#: ../lib/wiking/cms/users.py:1221
+#: ../lib/wiking/cms/users.py:1250
 msgid "E-mail information has been sent to your email address."
 msgstr "Un e-mail a été envoyé à votre adresse e-mail."
 
-#: ../lib/wiking/cms/users.py:1224
+#: ../lib/wiking/cms/users.py:1253
 msgid "No user account for your query."
 msgstr "Aucun compte d'utilisateur n'a été trouvé."
 
-#: ../lib/wiking/cms/users.py:1248
+#: ../lib/wiking/cms/users.py:1277
 msgid "History of successful login sessions and unsuccessful login attempts."
 msgstr ""
 "Historique des connexions réussies et des tentatives de connexion "
 "infructueuses."
 
 #. Translators: Login name.
-#: ../lib/wiking/cms/users.py:1254
+#: ../lib/wiking/cms/users.py:1283
 msgid "Login"
 msgstr "Ouverture de session"
 
 #. Translators: Form field saying whether the users attempt was succesful. Values are Yes/No.
-#: ../lib/wiking/cms/users.py:1256
+#: ../lib/wiking/cms/users.py:1285
 msgid "Success"
 msgstr "Succès"
 
 #. Translators: Table column heading. Time of the start of user session, followed by a date and time.
-#: ../lib/wiking/cms/users.py:1258
+#: ../lib/wiking/cms/users.py:1287
 msgid "Start time"
 msgstr "Heure de début"
 
 #. Translators: Table column heading. The length of user session. Contains time.
-#: ../lib/wiking/cms/users.py:1260
+#: ../lib/wiking/cms/users.py:1289
 msgid "Duration"
 msgstr "Durée"
 
-#: ../lib/wiking/cms/users.py:1263
+#: ../lib/wiking/cms/users.py:1292
 msgid "IP address"
 msgstr "Adresse IP"
 
 #. Translators: Internet name of the remote computer (computer terminology).
-#: ../lib/wiking/cms/users.py:1265
+#: ../lib/wiking/cms/users.py:1294
 msgid "Hostname"
 msgstr "Nom d'hôte"
 
 #. Translators: "User agent" is a generalized name for browser or more precisely the
 #. software which produced the HTTP request (was used to access the website).
-#: ../lib/wiking/cms/users.py:1268
+#: ../lib/wiking/cms/users.py:1297
 msgid "User agent"
 msgstr "Agent utilisateur"
 
 #. Translators: Meaning where the user came from. Computer terminology. Do not translate
 #. "HTTP" and if unsure, don't translate at all (it is a very technical term).
-#: ../lib/wiking/cms/users.py:1271
+#: ../lib/wiking/cms/users.py:1300
 msgid "HTTP Referer"
 msgstr "HTTP referer"
 
+#: ../lib/wiking/configuration.py:194
+msgid "Webmaster's e-mail address"
+msgstr "L'adresse e-mail du webmaster"
+
+#: ../lib/wiking/configuration.py:205
+msgid "Default sender address"
+msgstr "L'adresse de l'expéditeur par défaut "
+
+#: ../lib/wiking/configuration.py:222
+msgid "Force HTTPS login"
+msgstr "Forcer la connexion HTTPS"
+
+#: ../lib/wiking/configuration.py:223
+msgid ""
+"If enabled, the login form will always be redirected to an HTTPS address to "
+"ensure the security of the submitted credentials.  This, however, requires "
+"your server to be setup to accept HTTPS requests for the same virtual host "
+"and pass them to Wiking."
+msgstr ""
+"S'il est activé, le formulaire de connection sera toujours redirigé vers une "
+"adresse HTTPS, pour assurer la sécurité des informations sur l'identité "
+"envoyées. Toutefois, cela exige que votre serveur soit configuré pour "
+"accepter les requêtes HTTPS pour le même hôte virtuel et pour les passer à "
+"Wiking."
+
+#. Translators: Site means a webpage or web application.
+#: ../lib/wiking/configuration.py:276
+msgid "Site title"
+msgstr "Titre du site"
+
+#: ../lib/wiking/configuration.py:277
+msgid ""
+"Site title is a short and (hopefully) unique title of the whole website. It "
+"will appear at the top of every page."
+msgstr ""
+"Le titre du site est un titre court et unique pour tout le site Web. Il "
+"apparaîtra en haut de chaque page."
+
+#. Translators: Site means a webpage or web application. Subtitle as in ,,title -- subtitle''.
+#: ../lib/wiking/configuration.py:283
+msgid "Site subtitle"
+msgstr "Sous-titre du site"
+
+#: ../lib/wiking/configuration.py:284
+msgid ""
+"Site subtitle is an optional more descriptive title of the website.  It will "
+"appear at the top of every page together with site title, but where brevity "
+"matters, only title will be used."
+msgstr ""
+"Le sous-titre du site est un titre facultatif, plus descriptif, du site "
+"Web.  Il apparaîtra en haut de chaque page avec le titre du site, mais là où "
+"la concision est exigée, seul le titre sera utilisé."
+
+#. Translators: Web page or web application specific image.
+#: ../lib/wiking/configuration.py:291
+msgid "Site icon"
+msgstr "Icône du site"
+
+#: ../lib/wiking/configuration.py:305
+msgid "Default language"
+msgstr "Langue par défaut"
+
+#. Translators: Language negotiation means the process where the server is trying
+#. to find a language that matches with what the users internet browser asks for.
+#: ../lib/wiking/configuration.py:308
+msgid ""
+"Defines the language (lowercase ISO 639-1 Alpha-2 code) to be used when "
+"content language negotiation fails. If not set (which is the default), the "
+"server will issue a 606 HTTP error (Not acceptable) when the document is not "
+"available in any of the requested languages. The error page will contain a "
+"description of the problem and a list of available language variants of the "
+"requested document. The negotiation is based on the browser setting of "
+"user's language preference passed through the 'Accept-Language' HTTP header. "
+"If set, Wiking will automatically serve given language variant instead of "
+"issuing the error if that variant is available.  If unavailable, the 606 "
+"error is raised anyway, so you need to make sure that all documents are "
+"available at least in the default language variant if you want to avoid 606 "
+"errors completely."
+msgstr ""
+"Définit la langue (ISO 639-1  Alpha-2 code) à utiliser si le contenu de la "
+"langue demandé échoue. Si elle n'est pas définie (ce qui est la valeur par "
+"défaut), le serveur affichera l'erreur HTTP 606 (Non acceptable) lorsque le "
+"document n'est pas disponible dans aucune des langues demandées. La page "
+"d'erreur contiendra une description du problème et une liste de versions "
+"linguistiques disponibles du document demandé. La négociation dépend de la "
+"configuration du moteur de recherche des préférences linguistiques de "
+"l'utilisateur envoyées par 'Accept-Language' en-tête de HTTP. Si c'est "
+"défini, Wiking affichera automatiquement une version linguistique "
+"disponible, au lieu du message d'erreur. Si cette version n'est pas "
+"disponible, l'erreur 606 est affichée. Il faut alors s'assurer que tous les "
+"documents sont disponibles au moins dans la version linguistique par défaut, "
+"si vous souhaitez complètement éviter les erreurs 606."
+
+#. Translators: Yes/No configuration option label. Should the login panel display user role (as Admin, Student, Tutor etc.)
+#: ../lib/wiking/configuration.py:378
+msgid "Display role in login panel"
+msgstr "Afficher le rôle dans le panneau de connexion"
+
+#: ../lib/wiking/configuration.py:379
+#, fuzzy
+msgid ""
+"If enabled, the login panel on each page will not display only the current "
+"username, but also his current user role, which affects his permissions."
+msgstr ""
+"Si cela est défini, le panneau de connexion n'affichera pas uniquement le "
+"nom d'utilisateur, mais aussi son rôle actuel (p. ex. administrateur, "
+"utilisateur, étudiant, etc.)"
+
+#: ../lib/wiking/configuration.py:397
+msgid "Whether to use e-mails as login names"
+msgstr "Utiliser l'adresse e-mail comme identifiant"
+
+#: ../lib/wiking/configuration.py:398
+msgid "Iff true, users must use e-mail addresses as their login names."
+msgstr ""
+"Si cela est défini, les utilisateurs doivent utiliser leur adresse e-mail "
+"comme identifiant."
+
+#: ../lib/wiking/configuration.py:412
+msgid ""
+"If set, the newly registered users will be automatically approved without "
+"any administrator's action.  The adminstrator may still need to asign users "
+"to groups to grant them further privileges, but the accounts are enabled "
+"right after the user confirms the registration code."
+msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "The first step of your registration at %(server_hostname)s was "
+#~ "successfully completed.\n"
+#~ "\n"
+#~ "For the next step visit the following URL and follow the instructions "
+#~ "there:\n"
+#~ "%(uri)s\n"
+#~ "\n"
+#~ "If the above link fails, you will be prompted for your activation code "
+#~ "when\n"
+#~ "you attempt to log in.\n"
+#~ "\n"
+#~ "Your activation code is: %(code)s\n"
+#~ msgstr ""
+#~ "La première étape de votre inscription à %(server_hostname)s a été "
+#~ "effectuée avec succès..\n"
+#~ "\n"
+#~ "Pour la prochaine étape consultez l'URL suivante et suivez les "
+#~ "instructions :\n"
+#~ "%(uri)s\n"
+
+#~ msgid "Registration accepted."
+#~ msgstr "Inscription acceptée."
+
+#~ msgid "Please, check your mailbox for instructions how to proceed."
+#~ msgstr ""
+#~ "S'il vous plaît, vérifiez votre boîte de réception pour les instructions "
+#~ "suivantes."
+
+#~ msgid "Activation code was sent to %s."
+#~ msgstr "Le code d'activation a été envoyé à %s."
+
 #~ msgid "Private"
 #~ msgstr "Privé"
 
diff --git a/translations/wiking-cms.hu.po b/translations/wiking-cms.hu.po
index 8151bed..a35cda4 100644
--- a/translations/wiking-cms.hu.po
+++ b/translations/wiking-cms.hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-16 19:35+0200\n"
+"POT-Creation-Date: 2010-10-16 13:26+0200\n"
 "PO-Revision-Date: 2010-02-04 00:15+0100\n"
 "Last-Translator: Hostomský Károly <khostomsky at gmail.com>\n"
 "Language-Team: Hungarian <wiking at lists.freebsoft.org>\n"
@@ -15,130 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/wiking/configuration.py:194
-msgid "Webmaster's e-mail address"
-msgstr "A webmester email címe"
-
-#: ../lib/wiking/configuration.py:205
-msgid "Default sender address"
-msgstr "Alapértelmezett küldő email cím"
-
-#: ../lib/wiking/configuration.py:222
-msgid "Force HTTPS login"
-msgstr "Fokozott HTTPS bejelentkezés"
-
-#: ../lib/wiking/configuration.py:223
-msgid ""
-"If enabled, the login form will always be redirected to an HTTPS address to "
-"ensure the security of the submitted credentials.  This, however, requires "
-"your server to be setup to accept HTTPS requests for the same virtual host "
-"and pass them to Wiking."
-msgstr ""
-"Ha be van kapcsolva, a bejelentkezési ablak mindig át lesz irányítva egy "
-"HTTPS címre, elősegítendő a felhasználó nagyobb biztonságát. Ehhez "
-"szerverének képesnek kell lennie HTTPS kérést kezelni azonos virtuális "
-"vendég számára és átirányítani a Wikingre."
-
-#. Translators: Site means a webpage or web application.
-#: ../lib/wiking/configuration.py:276
-msgid "Site title"
-msgstr "A webhely főcíme"
-
-#: ../lib/wiking/configuration.py:277
-msgid ""
-"Site title is a short and (hopefully) unique title of the whole website. It "
-"will appear at the top of every page."
-msgstr ""
-"A webhely főcíme rövid és (remélhetőleg) egyedi cím az egész webhely "
-"számára. Minden oldal tetején jelenik meg."
-
-#. Translators: Site means a webpage or web application. Subtitle as in ,,title -- subtitle''.
-#: ../lib/wiking/configuration.py:283
-msgid "Site subtitle"
-msgstr "A webhely alcíme"
-
-#: ../lib/wiking/configuration.py:284
-msgid ""
-"Site subtitle is an optional more descriptive title of the website.  It will "
-"appear at the top of every page together with site title, but where brevity "
-"matters, only title will be used."
-msgstr ""
-"A webhely alcíme tetszőleges és pontosabban írja le az oldal tartalmát. Az "
-"oldal tetején a főcímmel együtt jelenik meg, de ahol indokolt a tömörség ott "
-"csak a cím jelenik meg."
-
-#. Translators: Web page or web application specific image.
-#: ../lib/wiking/configuration.py:291
-msgid "Site icon"
-msgstr "Weboldal logója"
-
-#: ../lib/wiking/configuration.py:305
-msgid "Default language"
-msgstr "Alapbeállított nyelv"
-
-#. Translators: Language negotiation means the process where the server is trying
-#. to find a language that matches with what the users internet browser asks for.
-#: ../lib/wiking/configuration.py:308
-msgid ""
-"Defines the language (lowercase ISO 639-1 Alpha-2 code) to be used when "
-"content language negotiation fails. If not set (which is the default), the "
-"server will issue a 606 HTTP error (Not acceptable) when the document is not "
-"available in any of the requested languages. The error page will contain a "
-"description of the problem and a list of available language variants of the "
-"requested document. The negotiation is based on the browser setting of "
-"user's language preference passed through the 'Accept-Language' HTTP header. "
-"If set, Wiking will automatically serve given language variant instead of "
-"issuing the error if that variant is available.  If unavailable, the 606 "
-"error is raised anyway, so you need to make sure that all documents are "
-"available at least in the default language variant if you want to avoid 606 "
-"errors completely."
-msgstr ""
-"Meghatározza a használandó nyelvet (ISO 639-1 Alpha-2 code), ha a "
-"nyelvfelismerés kudarcot vall. Ha nincs beállítva (ami az alapbeállítás), "
-"akkor a szerver 606 HTTP (Nincs egyezés) hibaüzenetet küld, ha a dokumentum "
-"nem hozzáférhető egyik kívánt nyelven sem. A hibaüzenet tartalmazza a "
-"probléma leírását és egy listát a rendelkezésre álló nyelvekről az adott "
-"dokumentumhoz. A nyelvegyeztetés a böngésző beállításain múlik, a "
-"felhasználó által előnyben részesített nyelv a 'Elfogadott-Nyelv' HTTP "
-"fejlécben. Ha be van állítva, a Wiking automatikusan felajánlja a kívánt "
-"nyelvet a hibaüzenet helyett, ha az adott nyelv rendelkezésre áll. Ha nem "
-"áll rendelkezésre ugyancsak a 606-os hibaüzenet jelenik meg, amennyiben el "
-"szeretné kerülni a ezt a hibaüzenetet, törekednie kell rá, hogy legalább az "
-"alapértelmezett nyelven elérhetőek legyenek a dokumentumok."
-
-#. Translators: Yes/No configuration option label. Should the login panel display user role (as Admin, Student, Tutor etc.)
-#: ../lib/wiking/configuration.py:378
-msgid "Display role in login panel"
-msgstr "Felhasználó szerepének kijelzése"
-
-#: ../lib/wiking/configuration.py:379
-#, fuzzy
-msgid ""
-"If enabled, the login panel on each page will not display only the current "
-"username, but also his current user role, which affects his permissions."
-msgstr ""
-"Ha be van kapcsolva a bejelentkezési panel nem lesz minden oldalon látható, "
-"csak a felhasználói név és a személy szerepe (pl. Rendszergazda, Diák, Tanár "
-"stb.)"
-
-#: ../lib/wiking/configuration.py:397
-msgid "Whether to use e-mails as login names"
-msgstr "E-mail cím használata bejelentkezési névként"
-
-#: ../lib/wiking/configuration.py:398
-msgid "Iff true, users must use e-mail addresses as their login names."
-msgstr ""
-"Ebben az esetben a felhasználónak az e-mail címét kell használia "
-"felhasználói névként."
-
-#: ../lib/wiking/configuration.py:412
-msgid ""
-"If set, the newly registered users will be automatically approved without "
-"any administrator's action.  The adminstrator may still need to asign users "
-"to groups to grant them further privileges, but the accounts are enabled "
-"right after the user confirms the registration code."
-msgstr ""
-
 #: ../lib/wiking/cms/appl.py:53
 msgid "Manage this site"
 msgstr "Karbantartani a weboldalt"
@@ -155,140 +31,6 @@ msgstr "Kilépés a Wiking kezelőfelületből"
 msgid "Wiking Management Interface"
 msgstr "Wiking kezelőfelület"
 
-#. Translators: Yes/No configuration option label. Should the login panel be visible?
-#: ../lib/wiking/cms/configuration.py:36
-msgid "Allow login panel"
-msgstr "Látható a bejelentkezési panel"
-
-#: ../lib/wiking/cms/configuration.py:37
-msgid ""
-"If enabled, the information about the currently logged user and login/logout "
-"controls will be present on each page as a separate panel.  This panel will "
-"always be the first panel on the page."
-msgstr ""
-"Ha be van kapcsolva, az éppen bejelentkezett felhasználó információi és a be/"
-"kijelentkezési ablak minden oldalon külön táblában megjelenik. Ez a "
-"dialógusablak mindig az oldal első eleme lesz."
-
-#. Translators: Yes/No configuration option label. Should link to WMI be visible?  "WMI"
-#. stands for Wiking Management Interface.  Don't feel obliged to use an abbreviation.  Use
-#. whatever brief form obviously referning to whatever translation you used for "Wiking
-#. Management Interface".
-#: ../lib/wiking/cms/configuration.py:47
-msgid "Allow WMI link"
-msgstr "WMI link mutatása"
-
-#. Translators: Yes/no configuration label. Can new users register to this
-#. website/application?
-#: ../lib/wiking/cms/configuration.py:55
-msgid "Allow new user registration"
-msgstr "Új felhasználó regisztrációjának engedélyezése"
-
-#: ../lib/wiking/cms/configuration.py:56
-msgid ""
-"If enabled, all visitors are allowed to create a user account.  If disabled, "
-"new user accounts must be created by administrator.  Note, that the newly "
-"created accounts are inactive (at least with the default implementation of "
-"the user management module), so the creation of the account doesn't give the "
-"user any actual privileges."
-msgstr ""
-"Ha be van kapcsolva, minden látogató létrehozhat felhasználói fiókot. Ha ki "
-"van kapcsolva, az új felhasználói fiókokat a rendszergazda hozza létre. Az "
-"újonnan létesült felhasználói fiókok inaktívak (a felhasználói irányítómodul "
-"alapbeállításai alapján), így új fiók létrehozása nem ad azonnal a "
-"felhasználónak semmilyen plusz kiváltságot."
-
-#. Translators: Maximal size an uploaded file can have.
-#: ../lib/wiking/cms/configuration.py:65
-msgid "Maximal upload size"
-msgstr "Maximálisan feltölthető fájl mérete"
-
-#: ../lib/wiking/cms/configuration.py:66
-msgid ""
-"The maximal size of uploaded files in bytes.  The server needs to be "
-"relaoded for the changes in this option to take effect."
-msgstr ""
-"A maximális nagyságú feltölthető állomány nagysága bájtban. A szerver "
-"újraindítást igényel a változtatások életbelépéséhez."
-
-#. Translators: Web form label (account in the meaning of user account)
-#: ../lib/wiking/cms/texts.py:29
-msgid "Information about a locked account"
-msgstr ""
-
-#. Translators: Text presented to a user in a web page
-#: ../lib/wiking/cms/texts.py:31
-msgid ""
-"Your account is currently disabled.\n"
-"\n"
-"The protected services are not available to you.\n"
-"Contact the application administrator to get the account enabled."
-msgstr ""
-
-#. Translators: Web form label
-#: ../lib/wiking/cms/texts.py:39
-#, fuzzy
-msgid "Information about an account waiting for activation code confirmation"
-msgstr "Fiók megerősítése aktivációs kód ellenőrzése nélkül"
-
-#. Translators: Text presented to a user in a web page
-#: ../lib/wiking/cms/texts.py:41
-msgid ""
-"Your account is inactive because\n"
-"you have not yet confirmed the activation code sent to you by e-mail.\n"
-"\n"
-"Please, check your e-mail and follow the provided link or enter the\n"
-"activation code into the field below.\n"
-"\n"
-"You can also continue without entering the activation code, but\n"
-"the protected services will not be available to you."
-msgstr ""
-
-#. Translators: Web form label
-#: ../lib/wiking/cms/texts.py:53
-#, fuzzy
-msgid "Information about an account waiting for admin approval"
-msgstr "Nem jóváhagyott fiókok (függőben levő jóváhagyások az adminnál)"
-
-#. Translators: Text presented to a user in a web page
-#: ../lib/wiking/cms/texts.py:55
-msgid ""
-"Your account is waiting for approval by the administrator.\n"
-"                  \n"
-"The protected services are not available until the account gets approved.\n"
-"If the account remains unapproved for a long time, contact the application "
-"administrator."
-msgstr ""
-
-#: ../lib/wiking/cms/texts.py:62
-msgid "Introductory text displayed above the registration form"
-msgstr ""
-
-#: ../lib/wiking/cms/texts.py:67
-msgid "Text displayed after successful user registration"
-msgstr ""
-
-#: ../lib/wiking/cms/texts.py:69
-msgid ""
-"Registration completed successfuly. Your account is now fully functional but "
-"you may need to get futher privileges by the administrator to access certain "
-"restricted services."
-msgstr ""
-
-#: ../lib/wiking/cms/texts.py:74
-msgid ""
-"Registration completed successfuly. Your account now awaits administrator's "
-"approval."
-msgstr ""
-"A regisztráció sikeresen befejeződött. A fiókja most a rendszergazda "
-"jóváhagyását várja."
-
-#: ../lib/wiking/cms/texts.py:79
-msgid ""
-"Information displayed above the checkbox for confirmation of site specific "
-"conditions during registration (if empty, no confirmation is required)"
-msgstr ""
-
 #: ../lib/wiking/cms/cms.py:61
 msgid "formatting manual"
 msgstr "formázó kézikönyv"
@@ -396,7 +138,7 @@ msgstr "Aktivációs kód újraküldése"
 
 #. Translators: Button name. Computer terminology. Use an appropriate term common
 #. for submitting forms in a computer application.
-#: ../lib/wiking/cms/cms.py:496 ../lib/wiking/cms/users.py:1142
+#: ../lib/wiking/cms/cms.py:496 ../lib/wiking/cms/users.py:1171
 msgid "Submit"
 msgstr "Elküld"
 
@@ -408,7 +150,7 @@ msgstr ""
 msgid "Account disabled"
 msgstr "Fiók kikapcsolva"
 
-#: ../lib/wiking/cms/cms.py:533 ../lib/wiking/cms/users.py:814
+#: ../lib/wiking/cms/cms.py:533 ../lib/wiking/cms/users.py:819
 #, fuzzy
 msgid "Account not activated"
 msgstr "Fiók kikapcsolva"
@@ -749,7 +491,7 @@ msgstr "Elérhető színsémák szerkesztése."
 
 #. Translators: Table column heading. Whether the account is active. Values are yes/no.
 #: ../lib/wiking/cms/cms.py:897 ../lib/wiking/cms/cms.py:1987
-#: ../lib/wiking/cms/users.py:1262
+#: ../lib/wiking/cms/users.py:1291
 msgid "Active"
 msgstr "Aktív"
 
@@ -1045,7 +787,7 @@ msgstr ""
 #. Translators: Button label. Use standard computer terminology.
 #. Translators: Back button label. Standard computer terminology.
 #: ../lib/wiking/cms/cms.py:1212 ../lib/wiking/cms/cms.py:1572
-#: ../lib/wiking/cms/users.py:900
+#: ../lib/wiking/cms/users.py:905
 msgid "Back"
 msgstr "Vissza"
 
@@ -1502,6 +1244,140 @@ msgstr "Mentsd el sablonként"
 msgid "Edit this mail for repeated use"
 msgstr "Mentsd el a mailt sablonként"
 
+#. Translators: Yes/No configuration option label. Should the login panel be visible?
+#: ../lib/wiking/cms/configuration.py:36
+msgid "Allow login panel"
+msgstr "Látható a bejelentkezési panel"
+
+#: ../lib/wiking/cms/configuration.py:37
+msgid ""
+"If enabled, the information about the currently logged user and login/logout "
+"controls will be present on each page as a separate panel.  This panel will "
+"always be the first panel on the page."
+msgstr ""
+"Ha be van kapcsolva, az éppen bejelentkezett felhasználó információi és a be/"
+"kijelentkezési ablak minden oldalon külön táblában megjelenik. Ez a "
+"dialógusablak mindig az oldal első eleme lesz."
+
+#. Translators: Yes/No configuration option label. Should link to WMI be visible?  "WMI"
+#. stands for Wiking Management Interface.  Don't feel obliged to use an abbreviation.  Use
+#. whatever brief form obviously referning to whatever translation you used for "Wiking
+#. Management Interface".
+#: ../lib/wiking/cms/configuration.py:47
+msgid "Allow WMI link"
+msgstr "WMI link mutatása"
+
+#. Translators: Yes/no configuration label. Can new users register to this
+#. website/application?
+#: ../lib/wiking/cms/configuration.py:55
+msgid "Allow new user registration"
+msgstr "Új felhasználó regisztrációjának engedélyezése"
+
+#: ../lib/wiking/cms/configuration.py:56
+msgid ""
+"If enabled, all visitors are allowed to create a user account.  If disabled, "
+"new user accounts must be created by administrator.  Note, that the newly "
+"created accounts are inactive (at least with the default implementation of "
+"the user management module), so the creation of the account doesn't give the "
+"user any actual privileges."
+msgstr ""
+"Ha be van kapcsolva, minden látogató létrehozhat felhasználói fiókot. Ha ki "
+"van kapcsolva, az új felhasználói fiókokat a rendszergazda hozza létre. Az "
+"újonnan létesült felhasználói fiókok inaktívak (a felhasználói irányítómodul "
+"alapbeállításai alapján), így új fiók létrehozása nem ad azonnal a "
+"felhasználónak semmilyen plusz kiváltságot."
+
+#. Translators: Maximal size an uploaded file can have.
+#: ../lib/wiking/cms/configuration.py:65
+msgid "Maximal upload size"
+msgstr "Maximálisan feltölthető fájl mérete"
+
+#: ../lib/wiking/cms/configuration.py:66
+msgid ""
+"The maximal size of uploaded files in bytes.  The server needs to be "
+"relaoded for the changes in this option to take effect."
+msgstr ""
+"A maximális nagyságú feltölthető állomány nagysága bájtban. A szerver "
+"újraindítást igényel a változtatások életbelépéséhez."
+
+#. Translators: Web form label (account in the meaning of user account)
+#: ../lib/wiking/cms/texts.py:29
+msgid "Information about a locked account"
+msgstr ""
+
+#. Translators: Text presented to a user in a web page
+#: ../lib/wiking/cms/texts.py:31
+msgid ""
+"Your account is currently disabled.\n"
+"\n"
+"The protected services are not available to you.\n"
+"Contact the application administrator to get the account enabled."
+msgstr ""
+
+#. Translators: Web form label
+#: ../lib/wiking/cms/texts.py:39
+#, fuzzy
+msgid "Information about an account waiting for activation code confirmation"
+msgstr "Fiók megerősítése aktivációs kód ellenőrzése nélkül"
+
+#. Translators: Text presented to a user in a web page
+#: ../lib/wiking/cms/texts.py:41
+msgid ""
+"Your account is inactive because\n"
+"you have not yet confirmed the activation code sent to you by e-mail.\n"
+"\n"
+"Please, check your e-mail and follow the provided link or enter the\n"
+"activation code into the field below.\n"
+"\n"
+"You can also continue without entering the activation code, but\n"
+"the protected services will not be available to you."
+msgstr ""
+
+#. Translators: Web form label
+#: ../lib/wiking/cms/texts.py:53
+#, fuzzy
+msgid "Information about an account waiting for admin approval"
+msgstr "Nem jóváhagyott fiókok (függőben levő jóváhagyások az adminnál)"
+
+#. Translators: Text presented to a user in a web page
+#: ../lib/wiking/cms/texts.py:55
+msgid ""
+"Your account is waiting for approval by the administrator.\n"
+"                  \n"
+"The protected services are not available until the account gets approved.\n"
+"If the account remains unapproved for a long time, contact the application "
+"administrator."
+msgstr ""
+
+#: ../lib/wiking/cms/texts.py:62
+msgid "Introductory text displayed above the registration form"
+msgstr ""
+
+#: ../lib/wiking/cms/texts.py:67
+msgid "Text displayed after successful user registration"
+msgstr ""
+
+#: ../lib/wiking/cms/texts.py:69
+msgid ""
+"Registration completed successfuly. Your account is now fully functional but "
+"you may need to get futher privileges by the administrator to access certain "
+"restricted services."
+msgstr ""
+
+#: ../lib/wiking/cms/texts.py:74
+msgid ""
+"Registration completed successfuly. Your account now awaits administrator's "
+"approval."
+msgstr ""
+"A regisztráció sikeresen befejeződött. A fiókja most a rendszergazda "
+"jóváhagyását várja."
+
+#: ../lib/wiking/cms/texts.py:79
+msgid ""
+"Information displayed above the checkbox for confirmation of site specific "
+"conditions during registration (if empty, no confirmation is required)"
+msgstr ""
+
 #: ../lib/wiking/cms/users.py:57 ../lib/wiking/cms/users.py:148
 msgid "Group"
 msgstr ""
@@ -1529,7 +1405,7 @@ msgid "User Roles"
 msgstr "Felhasználók"
 
 #: ../lib/wiking/cms/users.py:149 ../lib/wiking/cms/users.py:434
-#: ../lib/wiking/cms/users.py:1252
+#: ../lib/wiking/cms/users.py:1281
 msgid "User"
 msgstr "Felhasználó"
 
@@ -1610,7 +1486,7 @@ msgid "Manage registered users and their privileges."
 msgstr "Regisztrált felhasználók és jogaik kezelése."
 
 #. Translators: Login name for a website. Registration form field.
-#: ../lib/wiking/cms/users.py:408 ../lib/wiking/cms/users.py:1210
+#: ../lib/wiking/cms/users.py:408 ../lib/wiking/cms/users.py:1239
 msgid "Login name"
 msgstr "Felhasználói név"
 
@@ -1622,7 +1498,7 @@ msgstr ""
 "Az érvényes felhasználói név csak betűket, számjegyeket, aláhúzást, "
 "kötőjelet és pontot tartalmazat, miközben betűvel kell kezdődnie."
 
-#: ../lib/wiking/cms/users.py:413 ../lib/wiking/cms/users.py:1211
+#: ../lib/wiking/cms/users.py:413 ../lib/wiking/cms/users.py:1240
 msgid "Password"
 msgstr "Jelszó"
 
@@ -1815,12 +1691,12 @@ msgid "User's Groups"
 msgstr ""
 
 #. Translators: Heading for an overview when and how the user has accessed the application.
-#: ../lib/wiking/cms/users.py:530 ../lib/wiking/cms/users.py:1247
+#: ../lib/wiking/cms/users.py:530 ../lib/wiking/cms/users.py:1276
 msgid "Login History"
 msgstr "Bejelentkezési napló"
 
 #. Translators: Name of group of users who have full access to the system.
-#: ../lib/wiking/cms/users.py:538 ../lib/wiking/cms/users.py:1110
+#: ../lib/wiking/cms/users.py:538 ../lib/wiking/cms/users.py:1130
 msgid "Active users"
 msgstr "Aktív felhasználók"
 
@@ -1917,156 +1793,138 @@ msgid "Active account"
 msgstr "Új fiók"
 
 #. Translators: Personal data -- first name, surname, nickname ...
-#: ../lib/wiking/cms/users.py:648 ../lib/wiking/cms/users.py:654
-#: ../lib/wiking/cms/users.py:675
+#: ../lib/wiking/cms/users.py:658 ../lib/wiking/cms/users.py:664
+#: ../lib/wiking/cms/users.py:685
 msgid "Personal data"
 msgstr "Személyes adatok"
 
 #. Translators: Contact information -- email, phone, address...
-#: ../lib/wiking/cms/users.py:650 ../lib/wiking/cms/users.py:655
-#: ../lib/wiking/cms/users.py:676
+#: ../lib/wiking/cms/users.py:660 ../lib/wiking/cms/users.py:665
+#: ../lib/wiking/cms/users.py:686
 msgid "Contact information"
 msgstr "Elérhetőségek"
 
 #. Translators: Others is a label for a group of unspecified form fields
 #. (as in Personal data, Contact information, Others).
-#: ../lib/wiking/cms/users.py:653 ../lib/wiking/cms/users.py:656
-#: ../lib/wiking/cms/users.py:681
+#: ../lib/wiking/cms/users.py:663 ../lib/wiking/cms/users.py:666
+#: ../lib/wiking/cms/users.py:691
 msgid "Others"
 msgstr "Egyéb"
 
-#: ../lib/wiking/cms/users.py:657
+#: ../lib/wiking/cms/users.py:667
 #, fuzzy
 msgid "Account state"
 msgstr "Fiók kikapcsolva"
 
 #. Translators: Button label.
-#: ../lib/wiking/cms/users.py:662
+#: ../lib/wiking/cms/users.py:672
 msgid "New user"
 msgstr "Új felhasználó"
 
 #. Translators: Button label.
-#: ../lib/wiking/cms/users.py:664
+#: ../lib/wiking/cms/users.py:674
 msgid "Edit profile"
 msgstr "Profil szerkesztése"
 
 #. Translators: Button label. Modify the users data (email, address...)
-#: ../lib/wiking/cms/users.py:666
+#: ../lib/wiking/cms/users.py:676
 msgid "Modify user's record"
 msgstr "Személyes adatok módosítása"
 
-#: ../lib/wiking/cms/users.py:679
+#: ../lib/wiking/cms/users.py:689
 msgid "Login information"
 msgstr "Belépési információk"
 
-#: ../lib/wiking/cms/users.py:712
+#: ../lib/wiking/cms/users.py:722
 msgid "Enter your current password."
 msgstr "Írd be az érvényes jelszavat."
 
-#: ../lib/wiking/cms/users.py:716
+#: ../lib/wiking/cms/users.py:726
 msgid "Invalid password."
 msgstr "Érvénytelen jelszó."
 
-#: ../lib/wiking/cms/users.py:720
+#: ../lib/wiking/cms/users.py:730
 msgid "Enter the new password."
 msgstr "Írd be az új jelszavat."
 
-#: ../lib/wiking/cms/users.py:728
+#: ../lib/wiking/cms/users.py:738
 msgid "The new password is the same as the old one."
 msgstr "Az új jelszó megegyezik a régivel."
 
-#: ../lib/wiking/cms/users.py:753
-#, fuzzy, python-format
+#: ../lib/wiking/cms/users.py:763
+#, python-format
 msgid ""
-"The first step of your registration at %(server_hostname)s was successfully "
-"completed.\n"
-"\n"
-"For the next step visit the following URL and follow the instructions "
-"there:\n"
+"To finish your registration at %(server_hostname)s, click on the following "
+"link:\n"
 "%(uri)s\n"
 "\n"
-"If the above link fails, you will be prompted for your activation code when\n"
-"you attempt to log in.\n"
-"\n"
-"Your activation code is: %(code)s\n"
 msgstr ""
-"Az első lépése a regisztrációjának a %(server_hostname)s sikeresen "
-"végbement.\n"
-"\n"
-"A következő lépésben látogasson el a következő oldalra és járjon el az "
-"utasítások szerint:\n"
-"%(uri)s\n"
 
-#: ../lib/wiking/cms/users.py:768
-msgid "Registration accepted."
-msgstr "Regisztráció elfogadva."
-
-#: ../lib/wiking/cms/users.py:769
-msgid "Please, check your mailbox for instructions how to proceed."
-msgstr ""
-"Kérem a további lépésekhez járjon el a mailben kapott utasítások szerint."
-
-#: ../lib/wiking/cms/users.py:773
+#: ../lib/wiking/cms/users.py:776
 msgid "Registration cancelled."
 msgstr "Regisztráció érvénytelenítve."
 
-#: ../lib/wiking/cms/users.py:779
+#: ../lib/wiking/cms/users.py:782
 #, python-format
 msgid "Your registration at %s"
 msgstr "Az Ön regisztrációja %s"
 
-#: ../lib/wiking/cms/users.py:783 ../lib/wiking/cms/users.py:835
-#: ../lib/wiking/cms/users.py:885 ../lib/wiking/cms/users.py:1218
+#: ../lib/wiking/cms/users.py:786 ../lib/wiking/cms/users.py:840
+#: ../lib/wiking/cms/users.py:890 ../lib/wiking/cms/users.py:1247
 msgid "Failed sending e-mail notification:"
 msgstr "E-mail figyelmeztetés küldése sikertelen:"
 
 #. Translators: Follows an email addres, e.g. ``Activation code was sent to joe at brailcom.org''
-#: ../lib/wiking/cms/users.py:787
-#, python-format
-msgid "Activation code was sent to %s."
-msgstr "Aktivációs kód elküldve: %s."
+#: ../lib/wiking/cms/users.py:790
+#, fuzzy, python-format
+msgid ""
+"To finish registration, please confirm the activation code that was sent to "
+"your email address at %(email)s."
+msgstr ""
+"A regisztráció ekkor veszti érvényét: %(date)s. A felhasználó nem hagyta "
+"jóvá az aktivációs kódot, amelyet a megadott e-mail címére küldtünk."
 
-#: ../lib/wiking/cms/users.py:810
+#: ../lib/wiking/cms/users.py:815
 msgid "User registration already confirmed."
 msgstr "A regisztráció sikeresen meg lett erősítve."
 
-#: ../lib/wiking/cms/users.py:813
+#: ../lib/wiking/cms/users.py:818
 msgid "Invalid activation code."
 msgstr "Hibás aktivációs kód."
 
-#: ../lib/wiking/cms/users.py:821
+#: ../lib/wiking/cms/users.py:826
 #, fuzzy, python-format
 msgid "New user %(fullname)s registered at %(server_hostname)s."
 msgstr ""
 "Új felhasználó %(fullname)s regisztrálva lett a %(server_hostname)s. Kérem "
 "hagyja jóvá a fiókot: %(uri)s"
 
-#: ../lib/wiking/cms/users.py:825
+#: ../lib/wiking/cms/users.py:830
 msgid "The account was approved automatically according to server setup."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:828
+#: ../lib/wiking/cms/users.py:833
 #, fuzzy
 msgid "Please approve the account:"
 msgstr "Fiók beindítása"
 
-#: ../lib/wiking/cms/users.py:832
+#: ../lib/wiking/cms/users.py:837
 msgid "New user registration:"
 msgstr "Új felhasználó regisztrációja:"
 
-#: ../lib/wiking/cms/users.py:838
+#: ../lib/wiking/cms/users.py:843
 msgid "E-mail notification has been sent to server administrator."
 msgstr "E-mailes értesítés elküldve az szerveradminisztrátorhoz."
 
-#: ../lib/wiking/cms/users.py:866
+#: ../lib/wiking/cms/users.py:871
 msgid "Registration confirmed"
 msgstr "Regisztráció megerősítve"
 
-#: ../lib/wiking/cms/users.py:877
+#: ../lib/wiking/cms/users.py:882
 msgid "The account was enabled."
 msgstr "A fiók megnyílt."
 
-#: ../lib/wiking/cms/users.py:879
+#: ../lib/wiking/cms/users.py:884
 #, python-format
 msgid ""
 "Your account at %(uri)s has been enabled. Please log in with username '%"
@@ -2075,35 +1933,35 @@ msgstr ""
 "Az Ön fiókja a %(uri)s-n elindult. Kérem jelentkezzen be a felhasználói "
 "nevével '%(login)s' és jelszavával."
 
-#: ../lib/wiking/cms/users.py:882
+#: ../lib/wiking/cms/users.py:887
 msgid "Your account has been enabled."
 msgstr "Az Ön felhasználói fiókja létrejött."
 
-#: ../lib/wiking/cms/users.py:887
+#: ../lib/wiking/cms/users.py:892
 msgid "E-mail notification has been sent to:"
 msgstr "E-mail értesítő el lett küldve:"
 
-#: ../lib/wiking/cms/users.py:889
+#: ../lib/wiking/cms/users.py:894
 #, fuzzy
 msgid "The account was disabled."
 msgstr "A fiók megnyílt."
 
-#: ../lib/wiking/cms/users.py:895
+#: ../lib/wiking/cms/users.py:900
 #, fuzzy, python-format
 msgid "The registration expired on %(date)s."
 msgstr "A regisztráció sikeresen meg lett erősítve."
 
-#: ../lib/wiking/cms/users.py:898
+#: ../lib/wiking/cms/users.py:903
 #, fuzzy
 msgid "Continue"
 msgstr "Tartalom"
 
-#: ../lib/wiking/cms/users.py:902
+#: ../lib/wiking/cms/users.py:907
 #, fuzzy
 msgid "The registration code was not confirmed by the user!"
 msgstr "A regisztráció sikeresen meg lett erősítve."
 
-#: ../lib/wiking/cms/users.py:903
+#: ../lib/wiking/cms/users.py:908
 #, fuzzy
 msgid ""
 "Please enable the account only if you are sure that the e-mail address "
@@ -2112,42 +1970,46 @@ msgstr ""
 "Kérem csak abban az esetben hagyja jóvá a fiókot, ha biztos benne, hogy az e-"
 "mail cím az adott felhasználóhoz tartozik."
 
-#: ../lib/wiking/cms/users.py:1111
+#: ../lib/wiking/cms/users.py:1131
 msgid "Listing of all active user accounts."
 msgstr "Az összes aktív felhasználói fiók listája."
 
-#: ../lib/wiking/cms/users.py:1138
+#: ../lib/wiking/cms/users.py:1142
+msgid "Users who have `confirm' flag set"
+msgstr ""
+
+#: ../lib/wiking/cms/users.py:1167
 msgid "Enter your login name or e-mail address"
 msgstr "Add meg a felhasználóneved vagy e-mail címed"
 
-#: ../lib/wiking/cms/users.py:1173
+#: ../lib/wiking/cms/users.py:1202
 msgid "Password reminder"
 msgstr "Jelszó emlékeztető"
 
-#: ../lib/wiking/cms/users.py:1186
+#: ../lib/wiking/cms/users.py:1215
 msgid "Multiple user accounts found for given email address."
 msgstr "Több felhasználói fiók tartozik a megadott e-mail címhez."
 
-#: ../lib/wiking/cms/users.py:1187
+#: ../lib/wiking/cms/users.py:1216
 msgid "Please, select the account for which you want to remind:"
 msgstr "Kérem válassza ki a fiókot, amelyhez emlékeztetőt kér:"
 
 #. Translators: Credentials such as password...
-#: ../lib/wiking/cms/users.py:1200
+#: ../lib/wiking/cms/users.py:1229
 msgid "Your credentials were reset to:"
 msgstr "Az Ön bejelentkezési adatai vissza lettek állítva a következőre:"
 
 #. Translators: Credentials such as password...
-#: ../lib/wiking/cms/users.py:1204
+#: ../lib/wiking/cms/users.py:1233
 msgid "Your credentials are:"
 msgstr "Az Ön bejelentkezési adatai:"
 
-#: ../lib/wiking/cms/users.py:1206
+#: ../lib/wiking/cms/users.py:1235
 #, python-format
 msgid "A password reminder request has been made at %(server_uri)s."
 msgstr "A jelszóemlékeztető kérés a %(server_uri)s-n történt."
 
-#: ../lib/wiking/cms/users.py:1213
+#: ../lib/wiking/cms/users.py:1242
 msgid ""
 "We strongly recommend you change your password at nearest occassion, since "
 "it has been exposed to an unsecure channel."
@@ -2155,65 +2017,221 @@ msgstr ""
 "Erősen javasoljuk, hogy amint lehet változtassa meg a jelszavát, mivel "
 "veszélyes csatorna környékezte."
 
-#: ../lib/wiking/cms/users.py:1219
+#: ../lib/wiking/cms/users.py:1248
 msgid "Please try repeating your request later or contact the administrator!"
 msgstr ""
 "Kérem, próbálja meg a kérését megismételni, vagy lépjen érintkezésbe az "
 "adminisztátorral!"
 
-#: ../lib/wiking/cms/users.py:1221
+#: ../lib/wiking/cms/users.py:1250
 msgid "E-mail information has been sent to your email address."
 msgstr "E-mail információ el lett küldve az e-mail címére."
 
-#: ../lib/wiking/cms/users.py:1224
+#: ../lib/wiking/cms/users.py:1253
 msgid "No user account for your query."
 msgstr "Az Ön kérésének nem felel meg egy felhasználói fiók sem."
 
-#: ../lib/wiking/cms/users.py:1248
+#: ../lib/wiking/cms/users.py:1277
 msgid "History of successful login sessions and unsuccessful login attempts."
 msgstr "A sikeres belépések és sikertelen próbálkozások naplója."
 
 #. Translators: Login name.
-#: ../lib/wiking/cms/users.py:1254
+#: ../lib/wiking/cms/users.py:1283
 msgid "Login"
 msgstr "Felhasználói név"
 
 #. Translators: Form field saying whether the users attempt was succesful. Values are Yes/No.
-#: ../lib/wiking/cms/users.py:1256
+#: ../lib/wiking/cms/users.py:1285
 msgid "Success"
 msgstr "Belépés"
 
 #. Translators: Table column heading. Time of the start of user session, followed by a date and time.
-#: ../lib/wiking/cms/users.py:1258
+#: ../lib/wiking/cms/users.py:1287
 msgid "Start time"
 msgstr "Belépés ideje"
 
 #. Translators: Table column heading. The length of user session. Contains time.
-#: ../lib/wiking/cms/users.py:1260
+#: ../lib/wiking/cms/users.py:1289
 msgid "Duration"
 msgstr "Eltöltött idő"
 
-#: ../lib/wiking/cms/users.py:1263
+#: ../lib/wiking/cms/users.py:1292
 msgid "IP address"
 msgstr "IP cím"
 
 #. Translators: Internet name of the remote computer (computer terminology).
-#: ../lib/wiking/cms/users.py:1265
+#: ../lib/wiking/cms/users.py:1294
 msgid "Hostname"
 msgstr "Hostnév"
 
 #. Translators: "User agent" is a generalized name for browser or more precisely the
 #. software which produced the HTTP request (was used to access the website).
-#: ../lib/wiking/cms/users.py:1268
+#: ../lib/wiking/cms/users.py:1297
 msgid "User agent"
 msgstr "User agent"
 
 #. Translators: Meaning where the user came from. Computer terminology. Do not translate
 #. "HTTP" and if unsure, don't translate at all (it is a very technical term).
-#: ../lib/wiking/cms/users.py:1271
+#: ../lib/wiking/cms/users.py:1300
 msgid "HTTP Referer"
 msgstr "HTTP Referer"
 
+#: ../lib/wiking/configuration.py:194
+msgid "Webmaster's e-mail address"
+msgstr "A webmester email címe"
+
+#: ../lib/wiking/configuration.py:205
+msgid "Default sender address"
+msgstr "Alapértelmezett küldő email cím"
+
+#: ../lib/wiking/configuration.py:222
+msgid "Force HTTPS login"
+msgstr "Fokozott HTTPS bejelentkezés"
+
+#: ../lib/wiking/configuration.py:223
+msgid ""
+"If enabled, the login form will always be redirected to an HTTPS address to "
+"ensure the security of the submitted credentials.  This, however, requires "
+"your server to be setup to accept HTTPS requests for the same virtual host "
+"and pass them to Wiking."
+msgstr ""
+"Ha be van kapcsolva, a bejelentkezési ablak mindig át lesz irányítva egy "
+"HTTPS címre, elősegítendő a felhasználó nagyobb biztonságát. Ehhez "
+"szerverének képesnek kell lennie HTTPS kérést kezelni azonos virtuális "
+"vendég számára és átirányítani a Wikingre."
+
+#. Translators: Site means a webpage or web application.
+#: ../lib/wiking/configuration.py:276
+msgid "Site title"
+msgstr "A webhely főcíme"
+
+#: ../lib/wiking/configuration.py:277
+msgid ""
+"Site title is a short and (hopefully) unique title of the whole website. It "
+"will appear at the top of every page."
+msgstr ""
+"A webhely főcíme rövid és (remélhetőleg) egyedi cím az egész webhely "
+"számára. Minden oldal tetején jelenik meg."
+
+#. Translators: Site means a webpage or web application. Subtitle as in ,,title -- subtitle''.
+#: ../lib/wiking/configuration.py:283
+msgid "Site subtitle"
+msgstr "A webhely alcíme"
+
+#: ../lib/wiking/configuration.py:284
+msgid ""
+"Site subtitle is an optional more descriptive title of the website.  It will "
+"appear at the top of every page together with site title, but where brevity "
+"matters, only title will be used."
+msgstr ""
+"A webhely alcíme tetszőleges és pontosabban írja le az oldal tartalmát. Az "
+"oldal tetején a főcímmel együtt jelenik meg, de ahol indokolt a tömörség ott "
+"csak a cím jelenik meg."
+
+#. Translators: Web page or web application specific image.
+#: ../lib/wiking/configuration.py:291
+msgid "Site icon"
+msgstr "Weboldal logója"
+
+#: ../lib/wiking/configuration.py:305
+msgid "Default language"
+msgstr "Alapbeállított nyelv"
+
+#. Translators: Language negotiation means the process where the server is trying
+#. to find a language that matches with what the users internet browser asks for.
+#: ../lib/wiking/configuration.py:308
+msgid ""
+"Defines the language (lowercase ISO 639-1 Alpha-2 code) to be used when "
+"content language negotiation fails. If not set (which is the default), the "
+"server will issue a 606 HTTP error (Not acceptable) when the document is not "
+"available in any of the requested languages. The error page will contain a "
+"description of the problem and a list of available language variants of the "
+"requested document. The negotiation is based on the browser setting of "
+"user's language preference passed through the 'Accept-Language' HTTP header. "
+"If set, Wiking will automatically serve given language variant instead of "
+"issuing the error if that variant is available.  If unavailable, the 606 "
+"error is raised anyway, so you need to make sure that all documents are "
+"available at least in the default language variant if you want to avoid 606 "
+"errors completely."
+msgstr ""
+"Meghatározza a használandó nyelvet (ISO 639-1 Alpha-2 code), ha a "
+"nyelvfelismerés kudarcot vall. Ha nincs beállítva (ami az alapbeállítás), "
+"akkor a szerver 606 HTTP (Nincs egyezés) hibaüzenetet küld, ha a dokumentum "
+"nem hozzáférhető egyik kívánt nyelven sem. A hibaüzenet tartalmazza a "
+"probléma leírását és egy listát a rendelkezésre álló nyelvekről az adott "
+"dokumentumhoz. A nyelvegyeztetés a böngésző beállításain múlik, a "
+"felhasználó által előnyben részesített nyelv a 'Elfogadott-Nyelv' HTTP "
+"fejlécben. Ha be van állítva, a Wiking automatikusan felajánlja a kívánt "
+"nyelvet a hibaüzenet helyett, ha az adott nyelv rendelkezésre áll. Ha nem "
+"áll rendelkezésre ugyancsak a 606-os hibaüzenet jelenik meg, amennyiben el "
+"szeretné kerülni a ezt a hibaüzenetet, törekednie kell rá, hogy legalább az "
+"alapértelmezett nyelven elérhetőek legyenek a dokumentumok."
+
+#. Translators: Yes/No configuration option label. Should the login panel display user role (as Admin, Student, Tutor etc.)
+#: ../lib/wiking/configuration.py:378
+msgid "Display role in login panel"
+msgstr "Felhasználó szerepének kijelzése"
+
+#: ../lib/wiking/configuration.py:379
+#, fuzzy
+msgid ""
+"If enabled, the login panel on each page will not display only the current "
+"username, but also his current user role, which affects his permissions."
+msgstr ""
+"Ha be van kapcsolva a bejelentkezési panel nem lesz minden oldalon látható, "
+"csak a felhasználói név és a személy szerepe (pl. Rendszergazda, Diák, Tanár "
+"stb.)"
+
+#: ../lib/wiking/configuration.py:397
+msgid "Whether to use e-mails as login names"
+msgstr "E-mail cím használata bejelentkezési névként"
+
+#: ../lib/wiking/configuration.py:398
+msgid "Iff true, users must use e-mail addresses as their login names."
+msgstr ""
+"Ebben az esetben a felhasználónak az e-mail címét kell használia "
+"felhasználói névként."
+
+#: ../lib/wiking/configuration.py:412
+msgid ""
+"If set, the newly registered users will be automatically approved without "
+"any administrator's action.  The adminstrator may still need to asign users "
+"to groups to grant them further privileges, but the accounts are enabled "
+"right after the user confirms the registration code."
+msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "The first step of your registration at %(server_hostname)s was "
+#~ "successfully completed.\n"
+#~ "\n"
+#~ "For the next step visit the following URL and follow the instructions "
+#~ "there:\n"
+#~ "%(uri)s\n"
+#~ "\n"
+#~ "If the above link fails, you will be prompted for your activation code "
+#~ "when\n"
+#~ "you attempt to log in.\n"
+#~ "\n"
+#~ "Your activation code is: %(code)s\n"
+#~ msgstr ""
+#~ "Az első lépése a regisztrációjának a %(server_hostname)s sikeresen "
+#~ "végbement.\n"
+#~ "\n"
+#~ "A következő lépésben látogasson el a következő oldalra és járjon el az "
+#~ "utasítások szerint:\n"
+#~ "%(uri)s\n"
+
+#~ msgid "Registration accepted."
+#~ msgstr "Regisztráció elfogadva."
+
+#~ msgid "Please, check your mailbox for instructions how to proceed."
+#~ msgstr ""
+#~ "Kérem a további lépésekhez járjon el a mailben kapott utasítások szerint."
+
+#~ msgid "Activation code was sent to %s."
+#~ msgstr "Aktivációs kód elküldve: %s."
+
 #~ msgid "Private"
 #~ msgstr "Bizalmas"
 
diff --git a/translations/wiking-cms.it.po b/translations/wiking-cms.it.po
index dfad70e..bb0e0e6 100644
--- a/translations/wiking-cms.it.po
+++ b/translations/wiking-cms.it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-16 19:35+0200\n"
+"POT-Creation-Date: 2010-10-16 13:26+0200\n"
 "PO-Revision-Date: 2009-09-01 13:56+0100\n"
 "Last-Translator: Hynek Hanke <hanke at brailcom.org>\n"
 "Language-Team: Czech <wiking at lists.freebsoft.org>\n"
@@ -15,131 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/wiking/configuration.py:194
-msgid "Webmaster's e-mail address"
-msgstr "Indirizzo e-mail dell'amministratore"
-
-#: ../lib/wiking/configuration.py:205
-msgid "Default sender address"
-msgstr "Indirizzo di riferimento del mittente"
-
-#: ../lib/wiking/configuration.py:222
-msgid "Force HTTPS login"
-msgstr "Richiedi HTTPS per la connessione"
-
-#: ../lib/wiking/configuration.py:223
-msgid ""
-"If enabled, the login form will always be redirected to an HTTPS address to "
-"ensure the security of the submitted credentials.  This, however, requires "
-"your server to be setup to accept HTTPS requests for the same virtual host "
-"and pass them to Wiking."
-msgstr ""
-"Se attivato, il modulo d'accesso sarà sempre reindirizzato a un indirizzo "
-"HTTPS per garantire la sicurezza dei dati di connessione trasmessi. Questo, "
-"però, richiede la configurazione del server per la manipolazione delle "
-"richieste HTTPS per lo stesso server virtuale e per far passare queste "
-"richieste al sistema Wiking."
-
-#. Translators: Site means a webpage or web application.
-#: ../lib/wiking/configuration.py:276
-msgid "Site title"
-msgstr "Titolo del portale"
-
-#: ../lib/wiking/configuration.py:277
-msgid ""
-"Site title is a short and (hopefully) unique title of the whole website. It "
-"will appear at the top of every page."
-msgstr ""
-"Questo titolo dovrebbe indicare brevemente e possibilmente senza equivoci "
-"l'intero portale. Il titolo verrà visualizzato nell'intestazione di ogni "
-"pagina."
-
-#. Translators: Site means a webpage or web application. Subtitle as in ,,title -- subtitle''.
-#: ../lib/wiking/configuration.py:283
-msgid "Site subtitle"
-msgstr "Sottotitolo del portale"
-
-#: ../lib/wiking/configuration.py:284
-msgid ""
-"Site subtitle is an optional more descriptive title of the website.  It will "
-"appear at the top of every page together with site title, but where brevity "
-"matters, only title will be used."
-msgstr ""
-"Il sottotitolo è una definizione del portale più dettagliata ma non "
-"obbligatoria. Verrà visualizzato nell'intestazione di ogni pagina ma lì, "
-"dove necessiterà la brevità, verrà tralasciato."
-
-#. Translators: Web page or web application specific image.
-#: ../lib/wiking/configuration.py:291
-#, fuzzy
-msgid "Site icon"
-msgstr "Titolo del portale"
-
-#: ../lib/wiking/configuration.py:305
-msgid "Default language"
-msgstr "Lingua di riferimento"
-
-#. Translators: Language negotiation means the process where the server is trying
-#. to find a language that matches with what the users internet browser asks for.
-#: ../lib/wiking/configuration.py:308
-msgid ""
-"Defines the language (lowercase ISO 639-1 Alpha-2 code) to be used when "
-"content language negotiation fails. If not set (which is the default), the "
-"server will issue a 606 HTTP error (Not acceptable) when the document is not "
-"available in any of the requested languages. The error page will contain a "
-"description of the problem and a list of available language variants of the "
-"requested document. The negotiation is based on the browser setting of "
-"user's language preference passed through the 'Accept-Language' HTTP header. "
-"If set, Wiking will automatically serve given language variant instead of "
-"issuing the error if that variant is available.  If unavailable, the 606 "
-"error is raised anyway, so you need to make sure that all documents are "
-"available at least in the default language variant if you want to avoid 606 "
-"errors completely."
-msgstr ""
-"Definisce il linguaggio (minuscolo ISO 639-1 Alpha-2 code) da usare se "
-"falisce la negoziazione della lingua dei contenuti. Se non impostato (il ciò "
-"è predefinito), il server invierà un errore al 606 HTTP  (non accettabile) "
-"quando il documento non è disponibile in nessuna delle lingue richieste. La "
-"pagina di errore dovrà contenere una descrizione del problema e un elenco "
-"delle varianti della lingua a disposizione del documento richiesto. Il "
-"negoziato è basato sulla configurazione del browser della lingua preferita "
-"dell'utente inviata attraverso il 'Accept-Language' HTTP testo. Se "
-"impostato, Wiking utilizza automaticamente la versione della lingua "
-"prescelta invece di creare un errore, se tale versione è disponibile. Se non "
-"è accessibile, l'errore 606 viene generato comunque, quindi è necessario "
-"assicurarsi che tutti i documenti sono disponibili, almeno nella variante di "
-"lingua predefinita, se si vuole evitare gli errori 606 completamente."
-
-#. Translators: Yes/No configuration option label. Should the login panel display user role (as Admin, Student, Tutor etc.)
-#: ../lib/wiking/configuration.py:378
-#, fuzzy
-msgid "Display role in login panel"
-msgstr "Visualizza il pannello d'accesso"
-
-#: ../lib/wiking/configuration.py:379
-msgid ""
-"If enabled, the login panel on each page will not display only the current "
-"username, but also his current user role, which affects his permissions."
-msgstr ""
-
-#: ../lib/wiking/configuration.py:397
-msgid "Whether to use e-mails as login names"
-msgstr "Usa indirizzo e-mail come il nome utente"
-
-#: ../lib/wiking/configuration.py:398
-msgid "Iff true, users must use e-mail addresses as their login names."
-msgstr ""
-"Se è predefinito gli utenti devono usare indirizzi e-mail come i loro nomi "
-"d'accesso."
-
-#: ../lib/wiking/configuration.py:412
-msgid ""
-"If set, the newly registered users will be automatically approved without "
-"any administrator's action.  The adminstrator may still need to asign users "
-"to groups to grant them further privileges, but the accounts are enabled "
-"right after the user confirms the registration code."
-msgstr ""
-
 #: ../lib/wiking/cms/appl.py:53
 msgid "Manage this site"
 msgstr "Amministrazione del contenuto"
@@ -156,142 +31,6 @@ msgstr "Esci dall'interfaccia dell'amministrazione del contenuto"
 msgid "Wiking Management Interface"
 msgstr "Interfaccia dell'amministrazione del contenuto"
 
-#. Translators: Yes/No configuration option label. Should the login panel be visible?
-#: ../lib/wiking/cms/configuration.py:36
-msgid "Allow login panel"
-msgstr "Visualizza il pannello d'accesso"
-
-#: ../lib/wiking/cms/configuration.py:37
-msgid ""
-"If enabled, the information about the currently logged user and login/logout "
-"controls will be present on each page as a separate panel.  This panel will "
-"always be the first panel on the page."
-msgstr ""
-"Se attivato, l'informazione relativa all'utente attualmente connesso e "
-"controlli di login / logout  saranno presenti su ogni pagina come un "
-"pannello separato. Questo pannello sarà sempre il primo pannello della "
-"pagina."
-
-#. Translators: Yes/No configuration option label. Should link to WMI be visible?  "WMI"
-#. stands for Wiking Management Interface.  Don't feel obliged to use an abbreviation.  Use
-#. whatever brief form obviously referning to whatever translation you used for "Wiking
-#. Management Interface".
-#: ../lib/wiking/cms/configuration.py:47
-msgid "Allow WMI link"
-msgstr "Accetta il link WMI"
-
-#. Translators: Yes/no configuration label. Can new users register to this
-#. website/application?
-#: ../lib/wiking/cms/configuration.py:55
-msgid "Allow new user registration"
-msgstr "Permetti la registrazione ai nuovi utenti"
-
-#: ../lib/wiking/cms/configuration.py:56
-msgid ""
-"If enabled, all visitors are allowed to create a user account.  If disabled, "
-"new user accounts must be created by administrator.  Note, that the newly "
-"created accounts are inactive (at least with the default implementation of "
-"the user management module), so the creation of the account doesn't give the "
-"user any actual privileges."
-msgstr ""
-"Se attivato, tutti i visitatori sono autorizzati a creare un account "
-"d'utente. Se disabilitato, tutti i nuovi conti devono essere creati "
-"dall'amministratore. Nota che tutti i nuovi account creati sono inattivi "
-"(almeno con l'implementazione predefinita del modulo di gestione degli "
-"utenti), quindi la creazione del conto non da all'utente eventuali privilegi "
-"reali."
-
-#. Translators: Maximal size an uploaded file can have.
-#: ../lib/wiking/cms/configuration.py:65
-msgid "Maximal upload size"
-msgstr "Massima dimensione per upload"
-
-#: ../lib/wiking/cms/configuration.py:66
-msgid ""
-"The maximal size of uploaded files in bytes.  The server needs to be "
-"relaoded for the changes in this option to take effect."
-msgstr ""
-"Massima dimensione dei file trasmessi al server (in byte). Attenzione, per "
-"validare le modifiche effettuate, bisogna fare il restart del sistema."
-
-#. Translators: Web form label (account in the meaning of user account)
-#: ../lib/wiking/cms/texts.py:29
-msgid "Information about a locked account"
-msgstr ""
-
-#. Translators: Text presented to a user in a web page
-#: ../lib/wiking/cms/texts.py:31
-msgid ""
-"Your account is currently disabled.\n"
-"\n"
-"The protected services are not available to you.\n"
-"Contact the application administrator to get the account enabled."
-msgstr ""
-
-#. Translators: Web form label
-#: ../lib/wiking/cms/texts.py:39
-msgid "Information about an account waiting for activation code confirmation"
-msgstr ""
-
-#. Translators: Text presented to a user in a web page
-#: ../lib/wiking/cms/texts.py:41
-msgid ""
-"Your account is inactive because\n"
-"you have not yet confirmed the activation code sent to you by e-mail.\n"
-"\n"
-"Please, check your e-mail and follow the provided link or enter the\n"
-"activation code into the field below.\n"
-"\n"
-"You can also continue without entering the activation code, but\n"
-"the protected services will not be available to you."
-msgstr ""
-
-#. Translators: Web form label
-#: ../lib/wiking/cms/texts.py:53
-#, fuzzy
-msgid "Information about an account waiting for admin approval"
-msgstr ""
-"Richieste di registrazione non valide (in attesa della conferma via e-mail)"
-
-#. Translators: Text presented to a user in a web page
-#: ../lib/wiking/cms/texts.py:55
-msgid ""
-"Your account is waiting for approval by the administrator.\n"
-"                  \n"
-"The protected services are not available until the account gets approved.\n"
-"If the account remains unapproved for a long time, contact the application "
-"administrator."
-msgstr ""
-
-#: ../lib/wiking/cms/texts.py:62
-msgid "Introductory text displayed above the registration form"
-msgstr ""
-
-#: ../lib/wiking/cms/texts.py:67
-msgid "Text displayed after successful user registration"
-msgstr ""
-
-#: ../lib/wiking/cms/texts.py:69
-msgid ""
-"Registration completed successfuly. Your account is now fully functional but "
-"you may need to get futher privileges by the administrator to access certain "
-"restricted services."
-msgstr ""
-
-#: ../lib/wiking/cms/texts.py:74
-msgid ""
-"Registration completed successfuly. Your account now awaits administrator's "
-"approval."
-msgstr ""
-"Registrazione è stata accettata con successo. Il tuo account è in attesa "
-"d'approvazione da parte dell'amministratore."
-
-#: ../lib/wiking/cms/texts.py:79
-msgid ""
-"Information displayed above the checkbox for confirmation of site specific "
-"conditions during registration (if empty, no confirmation is required)"
-msgstr ""
-
 #: ../lib/wiking/cms/cms.py:61
 msgid "formatting manual"
 msgstr "manuale di formatazzione"
@@ -399,7 +138,7 @@ msgstr "Invia di nuovo il codice di registrazione"
 
 #. Translators: Button name. Computer terminology. Use an appropriate term common
 #. for submitting forms in a computer application.
-#: ../lib/wiking/cms/cms.py:496 ../lib/wiking/cms/users.py:1142
+#: ../lib/wiking/cms/cms.py:496 ../lib/wiking/cms/users.py:1171
 msgid "Submit"
 msgstr "Invia"
 
@@ -411,7 +150,7 @@ msgstr ""
 msgid "Account disabled"
 msgstr "Conto inattivo"
 
-#: ../lib/wiking/cms/cms.py:533 ../lib/wiking/cms/users.py:814
+#: ../lib/wiking/cms/cms.py:533 ../lib/wiking/cms/users.py:819
 #, fuzzy
 msgid "Account not activated"
 msgstr "Conto inattivo"
@@ -759,7 +498,7 @@ msgstr "Gestisci i motivi colorati disponibili."
 
 #. Translators: Table column heading. Whether the account is active. Values are yes/no.
 #: ../lib/wiking/cms/cms.py:897 ../lib/wiking/cms/cms.py:1987
-#: ../lib/wiking/cms/users.py:1262
+#: ../lib/wiking/cms/users.py:1291
 msgid "Active"
 msgstr "Attivo"
 
@@ -1063,7 +802,7 @@ msgstr ""
 #. Translators: Button label. Use standard computer terminology.
 #. Translators: Back button label. Standard computer terminology.
 #: ../lib/wiking/cms/cms.py:1212 ../lib/wiking/cms/cms.py:1572
-#: ../lib/wiking/cms/users.py:900
+#: ../lib/wiking/cms/users.py:905
 msgid "Back"
 msgstr "Indietro"
 
@@ -1533,6 +1272,142 @@ msgstr "Usa come modello"
 msgid "Edit this mail for repeated use"
 msgstr "Insersci quest'e-mail per l'uso ripetuto"
 
+#. Translators: Yes/No configuration option label. Should the login panel be visible?
+#: ../lib/wiking/cms/configuration.py:36
+msgid "Allow login panel"
+msgstr "Visualizza il pannello d'accesso"
+
+#: ../lib/wiking/cms/configuration.py:37
+msgid ""
+"If enabled, the information about the currently logged user and login/logout "
+"controls will be present on each page as a separate panel.  This panel will "
+"always be the first panel on the page."
+msgstr ""
+"Se attivato, l'informazione relativa all'utente attualmente connesso e "
+"controlli di login / logout  saranno presenti su ogni pagina come un "
+"pannello separato. Questo pannello sarà sempre il primo pannello della "
+"pagina."
+
+#. Translators: Yes/No configuration option label. Should link to WMI be visible?  "WMI"
+#. stands for Wiking Management Interface.  Don't feel obliged to use an abbreviation.  Use
+#. whatever brief form obviously referning to whatever translation you used for "Wiking
+#. Management Interface".
+#: ../lib/wiking/cms/configuration.py:47
+msgid "Allow WMI link"
+msgstr "Accetta il link WMI"
+
+#. Translators: Yes/no configuration label. Can new users register to this
+#. website/application?
+#: ../lib/wiking/cms/configuration.py:55
+msgid "Allow new user registration"
+msgstr "Permetti la registrazione ai nuovi utenti"
+
+#: ../lib/wiking/cms/configuration.py:56
+msgid ""
+"If enabled, all visitors are allowed to create a user account.  If disabled, "
+"new user accounts must be created by administrator.  Note, that the newly "
+"created accounts are inactive (at least with the default implementation of "
+"the user management module), so the creation of the account doesn't give the "
+"user any actual privileges."
+msgstr ""
+"Se attivato, tutti i visitatori sono autorizzati a creare un account "
+"d'utente. Se disabilitato, tutti i nuovi conti devono essere creati "
+"dall'amministratore. Nota che tutti i nuovi account creati sono inattivi "
+"(almeno con l'implementazione predefinita del modulo di gestione degli "
+"utenti), quindi la creazione del conto non da all'utente eventuali privilegi "
+"reali."
+
+#. Translators: Maximal size an uploaded file can have.
+#: ../lib/wiking/cms/configuration.py:65
+msgid "Maximal upload size"
+msgstr "Massima dimensione per upload"
+
+#: ../lib/wiking/cms/configuration.py:66
+msgid ""
+"The maximal size of uploaded files in bytes.  The server needs to be "
+"relaoded for the changes in this option to take effect."
+msgstr ""
+"Massima dimensione dei file trasmessi al server (in byte). Attenzione, per "
+"validare le modifiche effettuate, bisogna fare il restart del sistema."
+
+#. Translators: Web form label (account in the meaning of user account)
+#: ../lib/wiking/cms/texts.py:29
+msgid "Information about a locked account"
+msgstr ""
+
+#. Translators: Text presented to a user in a web page
+#: ../lib/wiking/cms/texts.py:31
+msgid ""
+"Your account is currently disabled.\n"
+"\n"
+"The protected services are not available to you.\n"
+"Contact the application administrator to get the account enabled."
+msgstr ""
+
+#. Translators: Web form label
+#: ../lib/wiking/cms/texts.py:39
+msgid "Information about an account waiting for activation code confirmation"
+msgstr ""
+
+#. Translators: Text presented to a user in a web page
+#: ../lib/wiking/cms/texts.py:41
+msgid ""
+"Your account is inactive because\n"
+"you have not yet confirmed the activation code sent to you by e-mail.\n"
+"\n"
+"Please, check your e-mail and follow the provided link or enter the\n"
+"activation code into the field below.\n"
+"\n"
+"You can also continue without entering the activation code, but\n"
+"the protected services will not be available to you."
+msgstr ""
+
+#. Translators: Web form label
+#: ../lib/wiking/cms/texts.py:53
+#, fuzzy
+msgid "Information about an account waiting for admin approval"
+msgstr ""
+"Richieste di registrazione non valide (in attesa della conferma via e-mail)"
+
+#. Translators: Text presented to a user in a web page
+#: ../lib/wiking/cms/texts.py:55
+msgid ""
+"Your account is waiting for approval by the administrator.\n"
+"                  \n"
+"The protected services are not available until the account gets approved.\n"
+"If the account remains unapproved for a long time, contact the application "
+"administrator."
+msgstr ""
+
+#: ../lib/wiking/cms/texts.py:62
+msgid "Introductory text displayed above the registration form"
+msgstr ""
+
+#: ../lib/wiking/cms/texts.py:67
+msgid "Text displayed after successful user registration"
+msgstr ""
+
+#: ../lib/wiking/cms/texts.py:69
+msgid ""
+"Registration completed successfuly. Your account is now fully functional but "
+"you may need to get futher privileges by the administrator to access certain "
+"restricted services."
+msgstr ""
+
+#: ../lib/wiking/cms/texts.py:74
+msgid ""
+"Registration completed successfuly. Your account now awaits administrator's "
+"approval."
+msgstr ""
+"Registrazione è stata accettata con successo. Il tuo account è in attesa "
+"d'approvazione da parte dell'amministratore."
+
+#: ../lib/wiking/cms/texts.py:79
+msgid ""
+"Information displayed above the checkbox for confirmation of site specific "
+"conditions during registration (if empty, no confirmation is required)"
+msgstr ""
+
 #: ../lib/wiking/cms/users.py:57 ../lib/wiking/cms/users.py:148
 msgid "Group"
 msgstr ""
@@ -1560,7 +1435,7 @@ msgid "User Roles"
 msgstr "Utenti"
 
 #: ../lib/wiking/cms/users.py:149 ../lib/wiking/cms/users.py:434
-#: ../lib/wiking/cms/users.py:1252
+#: ../lib/wiking/cms/users.py:1281
 msgid "User"
 msgstr "Utente"
 
@@ -1641,7 +1516,7 @@ msgid "Manage registered users and their privileges."
 msgstr "Gestisci gli utenti registrati e le loro autorizzazioni."
 
 #. Translators: Login name for a website. Registration form field.
-#: ../lib/wiking/cms/users.py:408 ../lib/wiking/cms/users.py:1210
+#: ../lib/wiking/cms/users.py:408 ../lib/wiking/cms/users.py:1239
 msgid "Login name"
 msgstr "Nome utente"
 
@@ -1653,7 +1528,7 @@ msgstr ""
 "Un nome utente valido può contenere solo lettere, cifre, underscore, "
 "trattini e punti e deve iniziare con una lettera."
 
-#: ../lib/wiking/cms/users.py:413 ../lib/wiking/cms/users.py:1211
+#: ../lib/wiking/cms/users.py:413 ../lib/wiking/cms/users.py:1240
 msgid "Password"
 msgstr "Password"
 
@@ -1838,12 +1713,12 @@ msgid "User's Groups"
 msgstr ""
 
 #. Translators: Heading for an overview when and how the user has accessed the application.
-#: ../lib/wiking/cms/users.py:530 ../lib/wiking/cms/users.py:1247
+#: ../lib/wiking/cms/users.py:530 ../lib/wiking/cms/users.py:1276
 msgid "Login History"
 msgstr "Storia degli accessi"
 
 #. Translators: Name of group of users who have full access to the system.
-#: ../lib/wiking/cms/users.py:538 ../lib/wiking/cms/users.py:1110
+#: ../lib/wiking/cms/users.py:538 ../lib/wiking/cms/users.py:1130
 msgid "Active users"
 msgstr "Utenti attivi"
 
@@ -1945,155 +1820,137 @@ msgid "Active account"
 msgstr "Nuovo allegato"
 
 #. Translators: Personal data -- first name, surname, nickname ...
-#: ../lib/wiking/cms/users.py:648 ../lib/wiking/cms/users.py:654
-#: ../lib/wiking/cms/users.py:675
+#: ../lib/wiking/cms/users.py:658 ../lib/wiking/cms/users.py:664
+#: ../lib/wiking/cms/users.py:685
 msgid "Personal data"
 msgstr "Dati personali"
 
 #. Translators: Contact information -- email, phone, address...
-#: ../lib/wiking/cms/users.py:650 ../lib/wiking/cms/users.py:655
-#: ../lib/wiking/cms/users.py:676
+#: ../lib/wiking/cms/users.py:660 ../lib/wiking/cms/users.py:665
+#: ../lib/wiking/cms/users.py:686
 msgid "Contact information"
 msgstr "Contatti"
 
 #. Translators: Others is a label for a group of unspecified form fields
 #. (as in Personal data, Contact information, Others).
-#: ../lib/wiking/cms/users.py:653 ../lib/wiking/cms/users.py:656
-#: ../lib/wiking/cms/users.py:681
+#: ../lib/wiking/cms/users.py:663 ../lib/wiking/cms/users.py:666
+#: ../lib/wiking/cms/users.py:691
 msgid "Others"
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:657
+#: ../lib/wiking/cms/users.py:667
 #, fuzzy
 msgid "Account state"
 msgstr "Conto inattivo"
 
 #. Translators: Button label.
-#: ../lib/wiking/cms/users.py:662
+#: ../lib/wiking/cms/users.py:672
 msgid "New user"
 msgstr "Nuovo utente"
 
 #. Translators: Button label.
-#: ../lib/wiking/cms/users.py:664
+#: ../lib/wiking/cms/users.py:674
 msgid "Edit profile"
 msgstr "Modifica il profilo"
 
 #. Translators: Button label. Modify the users data (email, address...)
-#: ../lib/wiking/cms/users.py:666
+#: ../lib/wiking/cms/users.py:676
 msgid "Modify user's record"
 msgstr "Modifica i dati dell'utente"
 
-#: ../lib/wiking/cms/users.py:679
+#: ../lib/wiking/cms/users.py:689
 msgid "Login information"
 msgstr "Dati d'accesso"
 
-#: ../lib/wiking/cms/users.py:712
+#: ../lib/wiking/cms/users.py:722
 msgid "Enter your current password."
 msgstr "Inserisci la tua password attuale."
 
-#: ../lib/wiking/cms/users.py:716
+#: ../lib/wiking/cms/users.py:726
 msgid "Invalid password."
 msgstr "Password non valida."
 
-#: ../lib/wiking/cms/users.py:720
+#: ../lib/wiking/cms/users.py:730
 msgid "Enter the new password."
 msgstr "Inserirsci la nuova password."
 
-#: ../lib/wiking/cms/users.py:728
+#: ../lib/wiking/cms/users.py:738
 msgid "The new password is the same as the old one."
 msgstr "La nuova password è identica a quella vecchia."
 
-#: ../lib/wiking/cms/users.py:753
-#, fuzzy, python-format
+#: ../lib/wiking/cms/users.py:763
+#, python-format
 msgid ""
-"The first step of your registration at %(server_hostname)s was successfully "
-"completed.\n"
-"\n"
-"For the next step visit the following URL and follow the instructions "
-"there:\n"
+"To finish your registration at %(server_hostname)s, click on the following "
+"link:\n"
 "%(uri)s\n"
 "\n"
-"If the above link fails, you will be prompted for your activation code when\n"
-"you attempt to log in.\n"
-"\n"
-"Your activation code is: %(code)s\n"
-msgstr ""
-"Il primo passo della tua registrazione al  %(server_hostname)s è stato "
-"completato con successo.\n"
-"\n"
-"Per continuare visita il seguente indirizzo e segui le istruzioni :\n"
-"%(uri)s\n"
-
-#: ../lib/wiking/cms/users.py:768
-msgid "Registration accepted."
-msgstr "Registrazione accettata."
-
-#: ../lib/wiking/cms/users.py:769
-msgid "Please, check your mailbox for instructions how to proceed."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:773
+#: ../lib/wiking/cms/users.py:776
 msgid "Registration cancelled."
 msgstr "Registrazione annullata."
 
-#: ../lib/wiking/cms/users.py:779
+#: ../lib/wiking/cms/users.py:782
 #, python-format
 msgid "Your registration at %s"
 msgstr "La tua registrazione su %s"
 
-#: ../lib/wiking/cms/users.py:783 ../lib/wiking/cms/users.py:835
-#: ../lib/wiking/cms/users.py:885 ../lib/wiking/cms/users.py:1218
+#: ../lib/wiking/cms/users.py:786 ../lib/wiking/cms/users.py:840
+#: ../lib/wiking/cms/users.py:890 ../lib/wiking/cms/users.py:1247
 msgid "Failed sending e-mail notification:"
 msgstr "Invio dell'e-mail fallito:"
 
 #. Translators: Follows an email addres, e.g. ``Activation code was sent to joe at brailcom.org''
-#: ../lib/wiking/cms/users.py:787
+#: ../lib/wiking/cms/users.py:790
 #, python-format
-msgid "Activation code was sent to %s."
+msgid ""
+"To finish registration, please confirm the activation code that was sent to "
+"your email address at %(email)s."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:810
+#: ../lib/wiking/cms/users.py:815
 msgid "User registration already confirmed."
 msgstr "La registrazione dell'utente è già precedentemente confermata."
 
-#: ../lib/wiking/cms/users.py:813
+#: ../lib/wiking/cms/users.py:818
 #, fuzzy
 msgid "Invalid activation code."
 msgstr "Codice di registrazione non valido."
 
-#: ../lib/wiking/cms/users.py:821
+#: ../lib/wiking/cms/users.py:826
 #, fuzzy, python-format
 msgid "New user %(fullname)s registered at %(server_hostname)s."
 msgstr ""
 "Nuovo utente %(fullname)s  è stato registrato su %(server_hostname)s. Ti "
 "preghiamo di confermare la registrazione : %(uri)s"
 
-#: ../lib/wiking/cms/users.py:825
+#: ../lib/wiking/cms/users.py:830
 msgid "The account was approved automatically according to server setup."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:828
+#: ../lib/wiking/cms/users.py:833
 #, fuzzy
 msgid "Please approve the account:"
 msgstr "Consenti questo account"
 
-#: ../lib/wiking/cms/users.py:832
+#: ../lib/wiking/cms/users.py:837
 msgid "New user registration:"
 msgstr "Registrazione del nuovo utente:"
 
-#: ../lib/wiking/cms/users.py:838
+#: ../lib/wiking/cms/users.py:843
 msgid "E-mail notification has been sent to server administrator."
 msgstr "E-mail di notifica è stata inviata all'amministratore del server."
 
-#: ../lib/wiking/cms/users.py:866
+#: ../lib/wiking/cms/users.py:871
 msgid "Registration confirmed"
 msgstr "Registrazione è stata confermata"
 
-#: ../lib/wiking/cms/users.py:877
+#: ../lib/wiking/cms/users.py:882
 msgid "The account was enabled."
 msgstr "Account è stato abilitato."
 
-#: ../lib/wiking/cms/users.py:879
+#: ../lib/wiking/cms/users.py:884
 #, python-format
 msgid ""
 "Your account at %(uri)s has been enabled. Please log in with username '%"
@@ -2102,80 +1959,84 @@ msgstr ""
 "Tuo account su %(uri)s è stato abilitato. Accedi con il tuo nome utente „%"
 "(login)s“ e la tua password."
 
-#: ../lib/wiking/cms/users.py:882
+#: ../lib/wiking/cms/users.py:887
 msgid "Your account has been enabled."
 msgstr "Tuo account è stato abilitato."
 
-#: ../lib/wiking/cms/users.py:887
+#: ../lib/wiking/cms/users.py:892
 msgid "E-mail notification has been sent to:"
 msgstr "E-mail di notifica è stata inviata a:"
 
-#: ../lib/wiking/cms/users.py:889
+#: ../lib/wiking/cms/users.py:894
 #, fuzzy
 msgid "The account was disabled."
 msgstr "Account è stato abilitato."
 
-#: ../lib/wiking/cms/users.py:895
+#: ../lib/wiking/cms/users.py:900
 #, fuzzy, python-format
 msgid "The registration expired on %(date)s."
 msgstr "La registrazione dell'utente è già precedentemente confermata."
 
-#: ../lib/wiking/cms/users.py:898
+#: ../lib/wiking/cms/users.py:903
 #, fuzzy
 msgid "Continue"
 msgstr "Contenuto"
 
-#: ../lib/wiking/cms/users.py:902
+#: ../lib/wiking/cms/users.py:907
 #, fuzzy
 msgid "The registration code was not confirmed by the user!"
 msgstr "La registrazione dell'utente è già precedentemente confermata."
 
-#: ../lib/wiking/cms/users.py:903
+#: ../lib/wiking/cms/users.py:908
 msgid ""
 "Please enable the account only if you are sure that the e-mail address "
 "belongs to given user."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:1111
+#: ../lib/wiking/cms/users.py:1131
 msgid "Listing of all active user accounts."
 msgstr "Lista di tutti gli utenti attivi."
 
-#: ../lib/wiking/cms/users.py:1138
+#: ../lib/wiking/cms/users.py:1142
+msgid "Users who have `confirm' flag set"
+msgstr ""
+
+#: ../lib/wiking/cms/users.py:1167
 msgid "Enter your login name or e-mail address"
 msgstr "Digita il tuo nome utente oppure il tuo indirizzo e-mail."
 
-#: ../lib/wiking/cms/users.py:1173
+#: ../lib/wiking/cms/users.py:1202
 msgid "Password reminder"
 msgstr "Aiuto per la password dimenticata."
 
-#: ../lib/wiking/cms/users.py:1186
+#: ../lib/wiking/cms/users.py:1215
 msgid "Multiple user accounts found for given email address."
 msgstr "Per questo indirizzo e-mail sono stati trovati altri utenti."
 
-#: ../lib/wiking/cms/users.py:1187
+#: ../lib/wiking/cms/users.py:1216
 msgid "Please, select the account for which you want to remind:"
 msgstr ""
 "Ti preghiamo di selezionare l'account per il quale vuoi usufruire della "
 "funzione di reminder:"
 
 #. Translators: Credentials such as password...
-#: ../lib/wiking/cms/users.py:1200
+#: ../lib/wiking/cms/users.py:1229
 msgid "Your credentials were reset to:"
 msgstr "I tuoi dati d'accesso sono stato predefiniti a:"
 
 #. Translators: Credentials such as password...
-#: ../lib/wiking/cms/users.py:1204
+#: ../lib/wiking/cms/users.py:1233
 msgid "Your credentials are:"
 msgstr "I tuoi dati d'acccesso sono:"
 
-#: ../lib/wiking/cms/users.py:1206
+#: ../lib/wiking/cms/users.py:1235
 #, python-format
 msgid "A password reminder request has been made at %(server_uri)s."
 msgstr ""
 "Al server %(server_uri)s è stata inviata la richiesta d'invio della password "
 "dimenticata."
 
-#: ../lib/wiking/cms/users.py:1213
+#: ../lib/wiking/cms/users.py:1242
 msgid ""
 "We strongly recommend you change your password at nearest occassion, since "
 "it has been exposed to an unsecure channel."
@@ -2183,65 +2044,214 @@ msgstr ""
 "Ti consigliamo fortemente di cambiare la tua password al più presto "
 "possibile, dal momento che è stata esposta a un canale non protetto."
 
-#: ../lib/wiking/cms/users.py:1219
+#: ../lib/wiking/cms/users.py:1248
 msgid "Please try repeating your request later or contact the administrator!"
 msgstr ""
 "Ti preghiamo di riprovare più tardi oppure di contattare l'amministratore "
 "del server!"
 
-#: ../lib/wiking/cms/users.py:1221
+#: ../lib/wiking/cms/users.py:1250
 msgid "E-mail information has been sent to your email address."
 msgstr "E-mail di notifica è stato inviato al tuo indirizzo e-mail."
 
-#: ../lib/wiking/cms/users.py:1224
+#: ../lib/wiking/cms/users.py:1253
 msgid "No user account for your query."
 msgstr "Alcun account corrisponde alla tua richiesta."
 
-#: ../lib/wiking/cms/users.py:1248
+#: ../lib/wiking/cms/users.py:1277
 msgid "History of successful login sessions and unsuccessful login attempts."
 msgstr "Storia degli accessi con sucesso e dei tentativi d'accesso falliti."
 
 #. Translators: Login name.
-#: ../lib/wiking/cms/users.py:1254
+#: ../lib/wiking/cms/users.py:1283
 msgid "Login"
 msgstr "Nome utente"
 
 #. Translators: Form field saying whether the users attempt was succesful. Values are Yes/No.
-#: ../lib/wiking/cms/users.py:1256
+#: ../lib/wiking/cms/users.py:1285
 msgid "Success"
 msgstr "Successo"
 
 #. Translators: Table column heading. Time of the start of user session, followed by a date and time.
-#: ../lib/wiking/cms/users.py:1258
+#: ../lib/wiking/cms/users.py:1287
 msgid "Start time"
 msgstr "Inizio"
 
 #. Translators: Table column heading. The length of user session. Contains time.
-#: ../lib/wiking/cms/users.py:1260
+#: ../lib/wiking/cms/users.py:1289
 msgid "Duration"
 msgstr "Durata"
 
-#: ../lib/wiking/cms/users.py:1263
+#: ../lib/wiking/cms/users.py:1292
 msgid "IP address"
 msgstr "Indirizzo IP"
 
 #. Translators: Internet name of the remote computer (computer terminology).
-#: ../lib/wiking/cms/users.py:1265
+#: ../lib/wiking/cms/users.py:1294
 msgid "Hostname"
 msgstr "Nome del computer"
 
 #. Translators: "User agent" is a generalized name for browser or more precisely the
 #. software which produced the HTTP request (was used to access the website).
-#: ../lib/wiking/cms/users.py:1268
+#: ../lib/wiking/cms/users.py:1297
 msgid "User agent"
 msgstr "Browser"
 
 #. Translators: Meaning where the user came from. Computer terminology. Do not translate
 #. "HTTP" and if unsure, don't translate at all (it is a very technical term).
-#: ../lib/wiking/cms/users.py:1271
+#: ../lib/wiking/cms/users.py:1300
 msgid "HTTP Referer"
 msgstr "Origine"
 
+#: ../lib/wiking/configuration.py:194
+msgid "Webmaster's e-mail address"
+msgstr "Indirizzo e-mail dell'amministratore"
+
+#: ../lib/wiking/configuration.py:205
+msgid "Default sender address"
+msgstr "Indirizzo di riferimento del mittente"
+
+#: ../lib/wiking/configuration.py:222
+msgid "Force HTTPS login"
+msgstr "Richiedi HTTPS per la connessione"
+
+#: ../lib/wiking/configuration.py:223
+msgid ""
+"If enabled, the login form will always be redirected to an HTTPS address to "
+"ensure the security of the submitted credentials.  This, however, requires "
+"your server to be setup to accept HTTPS requests for the same virtual host "
+"and pass them to Wiking."
+msgstr ""
+"Se attivato, il modulo d'accesso sarà sempre reindirizzato a un indirizzo "
+"HTTPS per garantire la sicurezza dei dati di connessione trasmessi. Questo, "
+"però, richiede la configurazione del server per la manipolazione delle "
+"richieste HTTPS per lo stesso server virtuale e per far passare queste "
+"richieste al sistema Wiking."
+
+#. Translators: Site means a webpage or web application.
+#: ../lib/wiking/configuration.py:276
+msgid "Site title"
+msgstr "Titolo del portale"
+
+#: ../lib/wiking/configuration.py:277
+msgid ""
+"Site title is a short and (hopefully) unique title of the whole website. It "
+"will appear at the top of every page."
+msgstr ""
+"Questo titolo dovrebbe indicare brevemente e possibilmente senza equivoci "
+"l'intero portale. Il titolo verrà visualizzato nell'intestazione di ogni "
+"pagina."
+
+#. Translators: Site means a webpage or web application. Subtitle as in ,,title -- subtitle''.
+#: ../lib/wiking/configuration.py:283
+msgid "Site subtitle"
+msgstr "Sottotitolo del portale"
+
+#: ../lib/wiking/configuration.py:284
+msgid ""
+"Site subtitle is an optional more descriptive title of the website.  It will "
+"appear at the top of every page together with site title, but where brevity "
+"matters, only title will be used."
+msgstr ""
+"Il sottotitolo è una definizione del portale più dettagliata ma non "
+"obbligatoria. Verrà visualizzato nell'intestazione di ogni pagina ma lì, "
+"dove necessiterà la brevità, verrà tralasciato."
+
+#. Translators: Web page or web application specific image.
+#: ../lib/wiking/configuration.py:291
+#, fuzzy
+msgid "Site icon"
+msgstr "Titolo del portale"
+
+#: ../lib/wiking/configuration.py:305
+msgid "Default language"
+msgstr "Lingua di riferimento"
+
+#. Translators: Language negotiation means the process where the server is trying
+#. to find a language that matches with what the users internet browser asks for.
+#: ../lib/wiking/configuration.py:308
+msgid ""
+"Defines the language (lowercase ISO 639-1 Alpha-2 code) to be used when "
+"content language negotiation fails. If not set (which is the default), the "
+"server will issue a 606 HTTP error (Not acceptable) when the document is not "
+"available in any of the requested languages. The error page will contain a "
+"description of the problem and a list of available language variants of the "
+"requested document. The negotiation is based on the browser setting of "
+"user's language preference passed through the 'Accept-Language' HTTP header. "
+"If set, Wiking will automatically serve given language variant instead of "
+"issuing the error if that variant is available.  If unavailable, the 606 "
+"error is raised anyway, so you need to make sure that all documents are "
+"available at least in the default language variant if you want to avoid 606 "
+"errors completely."
+msgstr ""
+"Definisce il linguaggio (minuscolo ISO 639-1 Alpha-2 code) da usare se "
+"falisce la negoziazione della lingua dei contenuti. Se non impostato (il ciò "
+"è predefinito), il server invierà un errore al 606 HTTP  (non accettabile) "
+"quando il documento non è disponibile in nessuna delle lingue richieste. La "
+"pagina di errore dovrà contenere una descrizione del problema e un elenco "
+"delle varianti della lingua a disposizione del documento richiesto. Il "
+"negoziato è basato sulla configurazione del browser della lingua preferita "
+"dell'utente inviata attraverso il 'Accept-Language' HTTP testo. Se "
+"impostato, Wiking utilizza automaticamente la versione della lingua "
+"prescelta invece di creare un errore, se tale versione è disponibile. Se non "
+"è accessibile, l'errore 606 viene generato comunque, quindi è necessario "
+"assicurarsi che tutti i documenti sono disponibili, almeno nella variante di "
+"lingua predefinita, se si vuole evitare gli errori 606 completamente."
+
+#. Translators: Yes/No configuration option label. Should the login panel display user role (as Admin, Student, Tutor etc.)
+#: ../lib/wiking/configuration.py:378
+#, fuzzy
+msgid "Display role in login panel"
+msgstr "Visualizza il pannello d'accesso"
+
+#: ../lib/wiking/configuration.py:379
+msgid ""
+"If enabled, the login panel on each page will not display only the current "
+"username, but also his current user role, which affects his permissions."
+msgstr ""
+
+#: ../lib/wiking/configuration.py:397
+msgid "Whether to use e-mails as login names"
+msgstr "Usa indirizzo e-mail come il nome utente"
+
+#: ../lib/wiking/configuration.py:398
+msgid "Iff true, users must use e-mail addresses as their login names."
+msgstr ""
+"Se è predefinito gli utenti devono usare indirizzi e-mail come i loro nomi "
+"d'accesso."
+
+#: ../lib/wiking/configuration.py:412
+msgid ""
+"If set, the newly registered users will be automatically approved without "
+"any administrator's action.  The adminstrator may still need to asign users "
+"to groups to grant them further privileges, but the accounts are enabled "
+"right after the user confirms the registration code."
+msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "The first step of your registration at %(server_hostname)s was "
+#~ "successfully completed.\n"
+#~ "\n"
+#~ "For the next step visit the following URL and follow the instructions "
+#~ "there:\n"
+#~ "%(uri)s\n"
+#~ "\n"
+#~ "If the above link fails, you will be prompted for your activation code "
+#~ "when\n"
+#~ "you attempt to log in.\n"
+#~ "\n"
+#~ "Your activation code is: %(code)s\n"
+#~ msgstr ""
+#~ "Il primo passo della tua registrazione al  %(server_hostname)s è stato "
+#~ "completato con successo.\n"
+#~ "\n"
+#~ "Per continuare visita il seguente indirizzo e segui le istruzioni :\n"
+#~ "%(uri)s\n"
+
+#~ msgid "Registration accepted."
+#~ msgstr "Registrazione accettata."
+
 #~ msgid "Private"
 #~ msgstr "Privato"
 
diff --git a/translations/wiking-cms.no.po b/translations/wiking-cms.no.po
index 0791407..764229b 100644
--- a/translations/wiking-cms.no.po
+++ b/translations/wiking-cms.no.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-16 19:35+0200\n"
+"POT-Creation-Date: 2010-10-16 13:26+0200\n"
 "PO-Revision-Date: 2009-09-08 09:23+0100\n"
 "Last-Translator: Jostein Sand Nilsen <nistonasneslin at gmail.com>\n"
 "Language-Team: Czech <wiking at lists.freebsoft.org>\n"
@@ -15,128 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/wiking/configuration.py:194
-msgid "Webmaster's e-mail address"
-msgstr "Vevadministratorens e-postadresse"
-
-#: ../lib/wiking/configuration.py:205
-msgid "Default sender address"
-msgstr "Standard avsenderadresse"
-
-#: ../lib/wiking/configuration.py:222
-msgid "Force HTTPS login"
-msgstr "Fremtving HTTPS logginn"
-
-#: ../lib/wiking/configuration.py:223
-msgid ""
-"If enabled, the login form will always be redirected to an HTTPS address to "
-"ensure the security of the submitted credentials.  This, however, requires "
-"your server to be setup to accept HTTPS requests for the same virtual host "
-"and pass them to Wiking."
-msgstr ""
-"Hvis tillatt, vil påloggingsskjemaet alltid videresendes til en HTTPS-"
-"adresse for å ivareta sikkerheten. Dette krever at serveren din er "
-"konfigurert til å håndtere HTTPS-forespørsler for den samme virtuelle "
-"serveren, og at disse sendes videre til Wiking."
-
-#. Translators: Site means a webpage or web application.
-#: ../lib/wiking/configuration.py:276
-msgid "Site title"
-msgstr "Nettstedets tittel"
-
-#: ../lib/wiking/configuration.py:277
-msgid ""
-"Site title is a short and (hopefully) unique title of the whole website. It "
-"will appear at the top of every page."
-msgstr ""
-"Nettstedets tittel er et kort og (forhåpentligvis) unikt navn på hele "
-"nettstedet. Det vises på toppen av hver side."
-
-#. Translators: Site means a webpage or web application. Subtitle as in ,,title -- subtitle''.
-#: ../lib/wiking/configuration.py:283
-msgid "Site subtitle"
-msgstr "Nettstedets undertittel"
-
-#: ../lib/wiking/configuration.py:284
-msgid ""
-"Site subtitle is an optional more descriptive title of the website.  It will "
-"appear at the top of every page together with site title, but where brevity "
-"matters, only title will be used."
-msgstr ""
-"Nettstedets undertittel er et valgfritt, mer beskrivende navn på nettsiden. "
-"Det vises på toppen av hver side, sammen med nettstedstittelen; men hvor det "
-"er viktig å fatte seg i korthet, vil bare tittelen brukes."
-
-#. Translators: Web page or web application specific image.
-#: ../lib/wiking/configuration.py:291
-#, fuzzy
-msgid "Site icon"
-msgstr "Nettstedets tittel"
-
-#: ../lib/wiking/configuration.py:305
-msgid "Default language"
-msgstr "Standardspråk"
-
-#. Translators: Language negotiation means the process where the server is trying
-#. to find a language that matches with what the users internet browser asks for.
-#: ../lib/wiking/configuration.py:308
-msgid ""
-"Defines the language (lowercase ISO 639-1 Alpha-2 code) to be used when "
-"content language negotiation fails. If not set (which is the default), the "
-"server will issue a 606 HTTP error (Not acceptable) when the document is not "
-"available in any of the requested languages. The error page will contain a "
-"description of the problem and a list of available language variants of the "
-"requested document. The negotiation is based on the browser setting of "
-"user's language preference passed through the 'Accept-Language' HTTP header. "
-"If set, Wiking will automatically serve given language variant instead of "
-"issuing the error if that variant is available.  If unavailable, the 606 "
-"error is raised anyway, so you need to make sure that all documents are "
-"available at least in the default language variant if you want to avoid 606 "
-"errors completely."
-msgstr ""
-"Definerer språket (ISO 639-1 Alpha-2 code) som skal brukes når ingen av de "
-"foretrukne språkene er tilgjengelige. Hvis det ikke er satt (som er "
-"standard), vil serveren utstede en 606 HTTP-feil (Ikke akseptabelt) når "
-"dokumentet ikke er tilgjengelig i noen av de forespurte språkene. Feilsiden "
-"inneholder en beskrivelse av problemet og en liste over hvilke "
-"språkvarianter det dokumentet du ville ha, er tilgjengelig i. Forhandlingene "
-"er baserte på nettleserens innstillinger for brukerspråk gjennom 'Accept-"
-"Language' HTTP-overskriften. Hvis brukerspråket er angitt, vil Wiking "
-"automatisk vise gitt språkvariant i stedet for å utstede feilen så lenge "
-"varianten er tilgjengelig. Hvis den ikke er det, vil 606-feilen uansett "
-"komme, så du må passe på at alle dokumenter er tilgjengelige i det minste i "
-"standardspråket hvis du vil helt unngå 606-feilen."
-
-#. Translators: Yes/No configuration option label. Should the login panel display user role (as Admin, Student, Tutor etc.)
-#: ../lib/wiking/configuration.py:378
-#, fuzzy
-msgid "Display role in login panel"
-msgstr "Tillat innloggingspanel"
-
-#: ../lib/wiking/configuration.py:379
-msgid ""
-"If enabled, the login panel on each page will not display only the current "
-"username, but also his current user role, which affects his permissions."
-msgstr ""
-
-#: ../lib/wiking/configuration.py:397
-msgid "Whether to use e-mails as login names"
-msgstr "Om e-post skal brukes som innloggingsnavn"
-
-#: ../lib/wiking/configuration.py:398
-msgid "Iff true, users must use e-mail addresses as their login names."
-msgstr ""
-"Hvis og bare hvis det er angitt, må brukerne bruke e-postadressen som "
-"innloggingsnavn."
-
-#: ../lib/wiking/configuration.py:412
-msgid ""
-"If set, the newly registered users will be automatically approved without "
-"any administrator's action.  The adminstrator may still need to asign users "
-"to groups to grant them further privileges, but the accounts are enabled "
-"right after the user confirms the registration code."
-msgstr ""
-
 #: ../lib/wiking/cms/appl.py:53
 msgid "Manage this site"
 msgstr "Administrer dette nettstedet"
@@ -153,141 +31,6 @@ msgstr "Forlat Management Interface"
 msgid "Wiking Management Interface"
 msgstr "Wiking Management Interface"
 
-#. Translators: Yes/No configuration option label. Should the login panel be visible?
-#: ../lib/wiking/cms/configuration.py:36
-msgid "Allow login panel"
-msgstr "Tillat innloggingspanel"
-
-#: ../lib/wiking/cms/configuration.py:37
-msgid ""
-"If enabled, the information about the currently logged user and login/logout "
-"controls will be present on each page as a separate panel.  This panel will "
-"always be the first panel on the page."
-msgstr ""
-"Hvis aktivert, vil informasjonen om den påloggede brukeren og inn/"
-"utloggingskontrollene finnes på hver side som et eget panel. Dette panelet "
-"vil alltid være det første panelet på siden."
-
-#. Translators: Yes/No configuration option label. Should link to WMI be visible?  "WMI"
-#. stands for Wiking Management Interface.  Don't feel obliged to use an abbreviation.  Use
-#. whatever brief form obviously referning to whatever translation you used for "Wiking
-#. Management Interface".
-#: ../lib/wiking/cms/configuration.py:47
-msgid "Allow WMI link"
-msgstr "Tillat WMI-lenke"
-
-#. Translators: Yes/no configuration label. Can new users register to this
-#. website/application?
-#: ../lib/wiking/cms/configuration.py:55
-msgid "Allow new user registration"
-msgstr "Tillat registreringen av ny bruker"
-
-#: ../lib/wiking/cms/configuration.py:56
-msgid ""
-"If enabled, all visitors are allowed to create a user account.  If disabled, "
-"new user accounts must be created by administrator.  Note, that the newly "
-"created accounts are inactive (at least with the default implementation of "
-"the user management module), so the creation of the account doesn't give the "
-"user any actual privileges."
-msgstr ""
-"Hvis aktivert, kan alle besøkere opprette en brukerkonto. Hvis deaktivert, "
-"må nye brukerkontoer være laget av administrator. Merk at de nyopprettede "
-"kontoene er inaktive (i det minste med standardimplementasjonen av "
-"brukeradministrasjonsmodulen), det vil si at etableringen av kontoen ikke "
-"gir brukeren noen reelle privilegier."
-
-#. Translators: Maximal size an uploaded file can have.
-#: ../lib/wiking/cms/configuration.py:65
-msgid "Maximal upload size"
-msgstr "Maximal opplastinngsstørrelse"
-
-#: ../lib/wiking/cms/configuration.py:66
-msgid ""
-"The maximal size of uploaded files in bytes.  The server needs to be "
-"relaoded for the changes in this option to take effect."
-msgstr ""
-"Den maksimale størrelsen på opplastede filer i byte. Serveren må laste på "
-"nytt for at endringene i denne valgmuligheten trer i kraft."
-
-#. Translators: Web form label (account in the meaning of user account)
-#: ../lib/wiking/cms/texts.py:29
-msgid "Information about a locked account"
-msgstr ""
-
-#. Translators: Text presented to a user in a web page
-#: ../lib/wiking/cms/texts.py:31
-msgid ""
-"Your account is currently disabled.\n"
-"\n"
-"The protected services are not available to you.\n"
-"Contact the application administrator to get the account enabled."
-msgstr ""
-
-#. Translators: Web form label
-#: ../lib/wiking/cms/texts.py:39
-#, fuzzy
-msgid "Information about an account waiting for activation code confirmation"
-msgstr ""
-"Ugyldige registreringforespørsler (enda ikke avgjort e-postgodkjenning)"
-
-#. Translators: Text presented to a user in a web page
-#: ../lib/wiking/cms/texts.py:41
-msgid ""
-"Your account is inactive because\n"
-"you have not yet confirmed the activation code sent to you by e-mail.\n"
-"\n"
-"Please, check your e-mail and follow the provided link or enter the\n"
-"activation code into the field below.\n"
-"\n"
-"You can also continue without entering the activation code, but\n"
-"the protected services will not be available to you."
-msgstr ""
-
-#. Translators: Web form label
-#: ../lib/wiking/cms/texts.py:53
-#, fuzzy
-msgid "Information about an account waiting for admin approval"
-msgstr ""
-"Ugyldige registreringforespørsler (enda ikke avgjort e-postgodkjenning)"
-
-#. Translators: Text presented to a user in a web page
-#: ../lib/wiking/cms/texts.py:55
-msgid ""
-"Your account is waiting for approval by the administrator.\n"
-"                  \n"
-"The protected services are not available until the account gets approved.\n"
-"If the account remains unapproved for a long time, contact the application "
-"administrator."
-msgstr ""
-
-#: ../lib/wiking/cms/texts.py:62
-msgid "Introductory text displayed above the registration form"
-msgstr ""
-
-#: ../lib/wiking/cms/texts.py:67
-msgid "Text displayed after successful user registration"
-msgstr ""
-
-#: ../lib/wiking/cms/texts.py:69
-msgid ""
-"Registration completed successfuly. Your account is now fully functional but "
-"you may need to get futher privileges by the administrator to access certain "
-"restricted services."
-msgstr ""
-
-#: ../lib/wiking/cms/texts.py:74
-msgid ""
-"Registration completed successfuly. Your account now awaits administrator's "
-"approval."
-msgstr ""
-"Registrering avsluttet. Din konto nå venter på administratorens godkjenning."
-
-#: ../lib/wiking/cms/texts.py:79
-msgid ""
-"Information displayed above the checkbox for confirmation of site specific "
-"conditions during registration (if empty, no confirmation is required)"
-msgstr ""
-
 #: ../lib/wiking/cms/cms.py:61
 msgid "formatting manual"
 msgstr "formateringsmanual"
@@ -393,7 +136,7 @@ msgstr "Send registreringskode på nytt"
 
 #. Translators: Button name. Computer terminology. Use an appropriate term common
 #. for submitting forms in a computer application.
-#: ../lib/wiking/cms/cms.py:496 ../lib/wiking/cms/users.py:1142
+#: ../lib/wiking/cms/cms.py:496 ../lib/wiking/cms/users.py:1171
 msgid "Submit"
 msgstr "Send"
 
@@ -405,7 +148,7 @@ msgstr ""
 msgid "Account disabled"
 msgstr "Konto deaktivert"
 
-#: ../lib/wiking/cms/cms.py:533 ../lib/wiking/cms/users.py:814
+#: ../lib/wiking/cms/cms.py:533 ../lib/wiking/cms/users.py:819
 #, fuzzy
 msgid "Account not activated"
 msgstr "Konto deaktivert"
@@ -749,7 +492,7 @@ msgstr "Administrer tilgjengelige fargetemaer."
 
 #. Translators: Table column heading. Whether the account is active. Values are yes/no.
 #: ../lib/wiking/cms/cms.py:897 ../lib/wiking/cms/cms.py:1987
-#: ../lib/wiking/cms/users.py:1262
+#: ../lib/wiking/cms/users.py:1291
 msgid "Active"
 msgstr "Aktiv"
 
@@ -1041,7 +784,7 @@ msgstr ""
 #. Translators: Button label. Use standard computer terminology.
 #. Translators: Back button label. Standard computer terminology.
 #: ../lib/wiking/cms/cms.py:1212 ../lib/wiking/cms/cms.py:1572
-#: ../lib/wiking/cms/users.py:900
+#: ../lib/wiking/cms/users.py:905
 msgid "Back"
 msgstr "Tilbake"
 
@@ -1500,6 +1243,141 @@ msgstr "Bruk som mal"
 msgid "Edit this mail for repeated use"
 msgstr "Rediger e-posten for gjentatt bruk"
 
+#. Translators: Yes/No configuration option label. Should the login panel be visible?
+#: ../lib/wiking/cms/configuration.py:36
+msgid "Allow login panel"
+msgstr "Tillat innloggingspanel"
+
+#: ../lib/wiking/cms/configuration.py:37
+msgid ""
+"If enabled, the information about the currently logged user and login/logout "
+"controls will be present on each page as a separate panel.  This panel will "
+"always be the first panel on the page."
+msgstr ""
+"Hvis aktivert, vil informasjonen om den påloggede brukeren og inn/"
+"utloggingskontrollene finnes på hver side som et eget panel. Dette panelet "
+"vil alltid være det første panelet på siden."
+
+#. Translators: Yes/No configuration option label. Should link to WMI be visible?  "WMI"
+#. stands for Wiking Management Interface.  Don't feel obliged to use an abbreviation.  Use
+#. whatever brief form obviously referning to whatever translation you used for "Wiking
+#. Management Interface".
+#: ../lib/wiking/cms/configuration.py:47
+msgid "Allow WMI link"
+msgstr "Tillat WMI-lenke"
+
+#. Translators: Yes/no configuration label. Can new users register to this
+#. website/application?
+#: ../lib/wiking/cms/configuration.py:55
+msgid "Allow new user registration"
+msgstr "Tillat registreringen av ny bruker"
+
+#: ../lib/wiking/cms/configuration.py:56
+msgid ""
+"If enabled, all visitors are allowed to create a user account.  If disabled, "
+"new user accounts must be created by administrator.  Note, that the newly "
+"created accounts are inactive (at least with the default implementation of "
+"the user management module), so the creation of the account doesn't give the "
+"user any actual privileges."
+msgstr ""
+"Hvis aktivert, kan alle besøkere opprette en brukerkonto. Hvis deaktivert, "
+"må nye brukerkontoer være laget av administrator. Merk at de nyopprettede "
+"kontoene er inaktive (i det minste med standardimplementasjonen av "
+"brukeradministrasjonsmodulen), det vil si at etableringen av kontoen ikke "
+"gir brukeren noen reelle privilegier."
+
+#. Translators: Maximal size an uploaded file can have.
+#: ../lib/wiking/cms/configuration.py:65
+msgid "Maximal upload size"
+msgstr "Maximal opplastinngsstørrelse"
+
+#: ../lib/wiking/cms/configuration.py:66
+msgid ""
+"The maximal size of uploaded files in bytes.  The server needs to be "
+"relaoded for the changes in this option to take effect."
+msgstr ""
+"Den maksimale størrelsen på opplastede filer i byte. Serveren må laste på "
+"nytt for at endringene i denne valgmuligheten trer i kraft."
+
+#. Translators: Web form label (account in the meaning of user account)
+#: ../lib/wiking/cms/texts.py:29
+msgid "Information about a locked account"
+msgstr ""
+
+#. Translators: Text presented to a user in a web page
+#: ../lib/wiking/cms/texts.py:31
+msgid ""
+"Your account is currently disabled.\n"
+"\n"
+"The protected services are not available to you.\n"
+"Contact the application administrator to get the account enabled."
+msgstr ""
+
+#. Translators: Web form label
+#: ../lib/wiking/cms/texts.py:39
+#, fuzzy
+msgid "Information about an account waiting for activation code confirmation"
+msgstr ""
+"Ugyldige registreringforespørsler (enda ikke avgjort e-postgodkjenning)"
+
+#. Translators: Text presented to a user in a web page
+#: ../lib/wiking/cms/texts.py:41
+msgid ""
+"Your account is inactive because\n"
+"you have not yet confirmed the activation code sent to you by e-mail.\n"
+"\n"
+"Please, check your e-mail and follow the provided link or enter the\n"
+"activation code into the field below.\n"
+"\n"
+"You can also continue without entering the activation code, but\n"
+"the protected services will not be available to you."
+msgstr ""
+
+#. Translators: Web form label
+#: ../lib/wiking/cms/texts.py:53
+#, fuzzy
+msgid "Information about an account waiting for admin approval"
+msgstr ""
+"Ugyldige registreringforespørsler (enda ikke avgjort e-postgodkjenning)"
+
+#. Translators: Text presented to a user in a web page
+#: ../lib/wiking/cms/texts.py:55
+msgid ""
+"Your account is waiting for approval by the administrator.\n"
+"                  \n"
+"The protected services are not available until the account gets approved.\n"
+"If the account remains unapproved for a long time, contact the application "
+"administrator."
+msgstr ""
+
+#: ../lib/wiking/cms/texts.py:62
+msgid "Introductory text displayed above the registration form"
+msgstr ""
+
+#: ../lib/wiking/cms/texts.py:67
+msgid "Text displayed after successful user registration"
+msgstr ""
+
+#: ../lib/wiking/cms/texts.py:69
+msgid ""
+"Registration completed successfuly. Your account is now fully functional but "
+"you may need to get futher privileges by the administrator to access certain "
+"restricted services."
+msgstr ""
+
+#: ../lib/wiking/cms/texts.py:74
+msgid ""
+"Registration completed successfuly. Your account now awaits administrator's "
+"approval."
+msgstr ""
+"Registrering avsluttet. Din konto nå venter på administratorens godkjenning."
+
+#: ../lib/wiking/cms/texts.py:79
+msgid ""
+"Information displayed above the checkbox for confirmation of site specific "
+"conditions during registration (if empty, no confirmation is required)"
+msgstr ""
+
 #: ../lib/wiking/cms/users.py:57 ../lib/wiking/cms/users.py:148
 msgid "Group"
 msgstr ""
@@ -1527,7 +1405,7 @@ msgid "User Roles"
 msgstr "Brukere"
 
 #: ../lib/wiking/cms/users.py:149 ../lib/wiking/cms/users.py:434
-#: ../lib/wiking/cms/users.py:1252
+#: ../lib/wiking/cms/users.py:1281
 msgid "User"
 msgstr "Bruker"
 
@@ -1608,7 +1486,7 @@ msgid "Manage registered users and their privileges."
 msgstr "Administrer registrerte brukere og deres privilegier."
 
 #. Translators: Login name for a website. Registration form field.
-#: ../lib/wiking/cms/users.py:408 ../lib/wiking/cms/users.py:1210
+#: ../lib/wiking/cms/users.py:408 ../lib/wiking/cms/users.py:1239
 msgid "Login name"
 msgstr "Innloggingsnavn"
 
@@ -1620,7 +1498,7 @@ msgstr ""
 "En gyldig innloggingsnavn kan bare inneholde bokstaver, tall, understreking, "
 "streker og prikker, og må begynne med en bokstav."
 
-#: ../lib/wiking/cms/users.py:413 ../lib/wiking/cms/users.py:1211
+#: ../lib/wiking/cms/users.py:413 ../lib/wiking/cms/users.py:1240
 msgid "Password"
 msgstr "Passord"
 
@@ -1802,12 +1680,12 @@ msgid "User's Groups"
 msgstr ""
 
 #. Translators: Heading for an overview when and how the user has accessed the application.
-#: ../lib/wiking/cms/users.py:530 ../lib/wiking/cms/users.py:1247
+#: ../lib/wiking/cms/users.py:530 ../lib/wiking/cms/users.py:1276
 msgid "Login History"
 msgstr "Innloggingshistorikk"
 
 #. Translators: Name of group of users who have full access to the system.
-#: ../lib/wiking/cms/users.py:538 ../lib/wiking/cms/users.py:1110
+#: ../lib/wiking/cms/users.py:538 ../lib/wiking/cms/users.py:1130
 msgid "Active users"
 msgstr "Aktive brukere"
 
@@ -1909,154 +1787,137 @@ msgid "Active account"
 msgstr "Nytt vedlegg"
 
 #. Translators: Personal data -- first name, surname, nickname ...
-#: ../lib/wiking/cms/users.py:648 ../lib/wiking/cms/users.py:654
-#: ../lib/wiking/cms/users.py:675
+#: ../lib/wiking/cms/users.py:658 ../lib/wiking/cms/users.py:664
+#: ../lib/wiking/cms/users.py:685
 msgid "Personal data"
 msgstr "Personlige data"
 
 #. Translators: Contact information -- email, phone, address...
-#: ../lib/wiking/cms/users.py:650 ../lib/wiking/cms/users.py:655
-#: ../lib/wiking/cms/users.py:676
+#: ../lib/wiking/cms/users.py:660 ../lib/wiking/cms/users.py:665
+#: ../lib/wiking/cms/users.py:686
 msgid "Contact information"
 msgstr "Kontaktinformasjon"
 
 #. Translators: Others is a label for a group of unspecified form fields
 #. (as in Personal data, Contact information, Others).
-#: ../lib/wiking/cms/users.py:653 ../lib/wiking/cms/users.py:656
-#: ../lib/wiking/cms/users.py:681
+#: ../lib/wiking/cms/users.py:663 ../lib/wiking/cms/users.py:666
+#: ../lib/wiking/cms/users.py:691
 msgid "Others"
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:657
+#: ../lib/wiking/cms/users.py:667
 #, fuzzy
 msgid "Account state"
 msgstr "Konto deaktivert"
 
 #. Translators: Button label.
-#: ../lib/wiking/cms/users.py:662
+#: ../lib/wiking/cms/users.py:672
 msgid "New user"
 msgstr "Ny bruker"
 
 #. Translators: Button label.
-#: ../lib/wiking/cms/users.py:664
+#: ../lib/wiking/cms/users.py:674
 msgid "Edit profile"
 msgstr "Rediger profil"
 
 #. Translators: Button label. Modify the users data (email, address...)
-#: ../lib/wiking/cms/users.py:666
+#: ../lib/wiking/cms/users.py:676
 msgid "Modify user's record"
 msgstr "Endre brukerinformasjon"
 
-#: ../lib/wiking/cms/users.py:679
+#: ../lib/wiking/cms/users.py:689
 msgid "Login information"
 msgstr "Innloggingsinformasjon"
 
-#: ../lib/wiking/cms/users.py:712
+#: ../lib/wiking/cms/users.py:722
 msgid "Enter your current password."
 msgstr "Skriv inn ditt nåværende passord."
 
-#: ../lib/wiking/cms/users.py:716
+#: ../lib/wiking/cms/users.py:726
 msgid "Invalid password."
 msgstr "Ugyldig passord."
 
-#: ../lib/wiking/cms/users.py:720
+#: ../lib/wiking/cms/users.py:730
 msgid "Enter the new password."
 msgstr "Skriv inn det nye passordet."
 
-#: ../lib/wiking/cms/users.py:728
+#: ../lib/wiking/cms/users.py:738
 msgid "The new password is the same as the old one."
 msgstr "Det nye passordet er det samme som det gamle."
 
-#: ../lib/wiking/cms/users.py:753
-#, fuzzy, python-format
+#: ../lib/wiking/cms/users.py:763
+#, python-format
 msgid ""
-"The first step of your registration at %(server_hostname)s was successfully "
-"completed.\n"
-"\n"
-"For the next step visit the following URL and follow the instructions "
-"there:\n"
+"To finish your registration at %(server_hostname)s, click on the following "
+"link:\n"
 "%(uri)s\n"
 "\n"
-"If the above link fails, you will be prompted for your activation code when\n"
-"you attempt to log in.\n"
-"\n"
-"Your activation code is: %(code)s\n"
-msgstr ""
-"Det første trinnet av registreringen på %(server_hostname)s ble avsluttet. \n"
-"\n"
-"For neste trinn gå til følgende URL og følge instruksjonene der:\n"
-"%(uri)s\n"
-
-#: ../lib/wiking/cms/users.py:768
-msgid "Registration accepted."
-msgstr "Registrering tillatt."
-
-#: ../lib/wiking/cms/users.py:769
-msgid "Please, check your mailbox for instructions how to proceed."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:773
+#: ../lib/wiking/cms/users.py:776
 msgid "Registration cancelled."
 msgstr "Registrering kansellert."
 
-#: ../lib/wiking/cms/users.py:779
+#: ../lib/wiking/cms/users.py:782
 #, python-format
 msgid "Your registration at %s"
 msgstr "Din registrering på %s"
 
-#: ../lib/wiking/cms/users.py:783 ../lib/wiking/cms/users.py:835
-#: ../lib/wiking/cms/users.py:885 ../lib/wiking/cms/users.py:1218
+#: ../lib/wiking/cms/users.py:786 ../lib/wiking/cms/users.py:840
+#: ../lib/wiking/cms/users.py:890 ../lib/wiking/cms/users.py:1247
 msgid "Failed sending e-mail notification:"
 msgstr "Klarte ikke å sende e-postmelding:"
 
 #. Translators: Follows an email addres, e.g. ``Activation code was sent to joe at brailcom.org''
-#: ../lib/wiking/cms/users.py:787
+#: ../lib/wiking/cms/users.py:790
 #, python-format
-msgid "Activation code was sent to %s."
+msgid ""
+"To finish registration, please confirm the activation code that was sent to "
+"your email address at %(email)s."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:810
+#: ../lib/wiking/cms/users.py:815
 msgid "User registration already confirmed."
 msgstr "Brukerregistrering allerede bekreftet."
 
-#: ../lib/wiking/cms/users.py:813
+#: ../lib/wiking/cms/users.py:818
 #, fuzzy
 msgid "Invalid activation code."
 msgstr "Ugyldig registreringkode."
 
-#: ../lib/wiking/cms/users.py:821
+#: ../lib/wiking/cms/users.py:826
 #, fuzzy, python-format
 msgid "New user %(fullname)s registered at %(server_hostname)s."
 msgstr ""
 "Ny bruker %(fullname)s er registrert i %(server_hostname)s. Godkjenn "
 "kontoen: %(uri)s"
 
-#: ../lib/wiking/cms/users.py:825
+#: ../lib/wiking/cms/users.py:830
 msgid "The account was approved automatically according to server setup."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:828
+#: ../lib/wiking/cms/users.py:833
 #, fuzzy
 msgid "Please approve the account:"
 msgstr "Aktiver denne konto"
 
-#: ../lib/wiking/cms/users.py:832
+#: ../lib/wiking/cms/users.py:837
 msgid "New user registration:"
 msgstr "Registrering av ny bruker:"
 
-#: ../lib/wiking/cms/users.py:838
+#: ../lib/wiking/cms/users.py:843
 msgid "E-mail notification has been sent to server administrator."
 msgstr "E-postmelding ble sendt til serveradministrator."
 
-#: ../lib/wiking/cms/users.py:866
+#: ../lib/wiking/cms/users.py:871
 msgid "Registration confirmed"
 msgstr "Registrering bekreftet"
 
-#: ../lib/wiking/cms/users.py:877
+#: ../lib/wiking/cms/users.py:882
 msgid "The account was enabled."
 msgstr "Kontoen ble aktivert."
 
-#: ../lib/wiking/cms/users.py:879
+#: ../lib/wiking/cms/users.py:884
 #, python-format
 msgid ""
 "Your account at %(uri)s has been enabled. Please log in with username '%"
@@ -2065,76 +1926,80 @@ msgstr ""
 "Kontoen din på %(uri)s er aktivert. Vennligst logg inn med brukernavn '%"
 "(login)s ' og passordet ditt."
 
-#: ../lib/wiking/cms/users.py:882
+#: ../lib/wiking/cms/users.py:887
 msgid "Your account has been enabled."
 msgstr "Din konto ble aktivert."
 
-#: ../lib/wiking/cms/users.py:887
+#: ../lib/wiking/cms/users.py:892
 msgid "E-mail notification has been sent to:"
 msgstr "E-postmelding ble sendt til:"
 
-#: ../lib/wiking/cms/users.py:889
+#: ../lib/wiking/cms/users.py:894
 #, fuzzy
 msgid "The account was disabled."
 msgstr "Kontoen ble aktivert."
 
-#: ../lib/wiking/cms/users.py:895
+#: ../lib/wiking/cms/users.py:900
 #, fuzzy, python-format
 msgid "The registration expired on %(date)s."
 msgstr "Brukerregistrering allerede bekreftet."
 
-#: ../lib/wiking/cms/users.py:898
+#: ../lib/wiking/cms/users.py:903
 #, fuzzy
 msgid "Continue"
 msgstr "Innhold"
 
-#: ../lib/wiking/cms/users.py:902
+#: ../lib/wiking/cms/users.py:907
 #, fuzzy
 msgid "The registration code was not confirmed by the user!"
 msgstr "Brukerregistrering allerede bekreftet."
 
-#: ../lib/wiking/cms/users.py:903
+#: ../lib/wiking/cms/users.py:908
 msgid ""
 "Please enable the account only if you are sure that the e-mail address "
 "belongs to given user."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:1111
+#: ../lib/wiking/cms/users.py:1131
 msgid "Listing of all active user accounts."
 msgstr "Liste over alle aktive brukerkontoer."
 
-#: ../lib/wiking/cms/users.py:1138
+#: ../lib/wiking/cms/users.py:1142
+msgid "Users who have `confirm' flag set"
+msgstr ""
+
+#: ../lib/wiking/cms/users.py:1167
 msgid "Enter your login name or e-mail address"
 msgstr "Angi innloggingsnavn eller e-postadresse"
 
-#: ../lib/wiking/cms/users.py:1173
+#: ../lib/wiking/cms/users.py:1202
 msgid "Password reminder"
 msgstr "Passordpåminnelse"
 
-#: ../lib/wiking/cms/users.py:1186
+#: ../lib/wiking/cms/users.py:1215
 msgid "Multiple user accounts found for given email address."
 msgstr "Flere brukerkontoer funnet for gitt e-postadresse."
 
-#: ../lib/wiking/cms/users.py:1187
+#: ../lib/wiking/cms/users.py:1216
 msgid "Please, select the account for which you want to remind:"
 msgstr "Vennligst velg kontoen du vil ha påminnelse for:"
 
 #. Translators: Credentials such as password...
-#: ../lib/wiking/cms/users.py:1200
+#: ../lib/wiking/cms/users.py:1229
 msgid "Your credentials were reset to:"
 msgstr "Dine legitimasjonsbeskrivelser ble tilbakestilt til:"
 
 #. Translators: Credentials such as password...
-#: ../lib/wiking/cms/users.py:1204
+#: ../lib/wiking/cms/users.py:1233
 msgid "Your credentials are:"
 msgstr "Dine legitimasjonsbeskrivelser er:"
 
-#: ../lib/wiking/cms/users.py:1206
+#: ../lib/wiking/cms/users.py:1235
 #, python-format
 msgid "A password reminder request has been made at %(server_uri)s."
 msgstr "En forespørsel om passordpåminnelse har blitt gjort på %(server_uri)s."
 
-#: ../lib/wiking/cms/users.py:1213
+#: ../lib/wiking/cms/users.py:1242
 msgid ""
 "We strongly recommend you change your password at nearest occassion, since "
 "it has been exposed to an unsecure channel."
@@ -2142,64 +2007,210 @@ msgstr ""
 "Vi anbefaler sterkt at du endrer passordet ved første anledning, det har "
 "blitt sendt deg på en ubeskyttet måte."
 
-#: ../lib/wiking/cms/users.py:1219
+#: ../lib/wiking/cms/users.py:1248
 msgid "Please try repeating your request later or contact the administrator!"
 msgstr "Prøv å gjenta forespørselen senere, eller kontakt administrator!"
 
-#: ../lib/wiking/cms/users.py:1221
+#: ../lib/wiking/cms/users.py:1250
 msgid "E-mail information has been sent to your email address."
 msgstr "E-postinformasjon har blitt sendt til din e-postadresse."
 
-#: ../lib/wiking/cms/users.py:1224
+#: ../lib/wiking/cms/users.py:1253
 msgid "No user account for your query."
 msgstr "Ingen brukerkonto svarer til ditt søk."
 
-#: ../lib/wiking/cms/users.py:1248
+#: ../lib/wiking/cms/users.py:1277
 msgid "History of successful login sessions and unsuccessful login attempts."
 msgstr ""
 "Historikk over vellykkede påloggingsøkter og mislykkede påloggingsforsøk."
 
 #. Translators: Login name.
-#: ../lib/wiking/cms/users.py:1254
+#: ../lib/wiking/cms/users.py:1283
 msgid "Login"
 msgstr "Innlogget"
 
 #. Translators: Form field saying whether the users attempt was succesful. Values are Yes/No.
-#: ../lib/wiking/cms/users.py:1256
+#: ../lib/wiking/cms/users.py:1285
 msgid "Success"
 msgstr "Vellykket"
 
 #. Translators: Table column heading. Time of the start of user session, followed by a date and time.
-#: ../lib/wiking/cms/users.py:1258
+#: ../lib/wiking/cms/users.py:1287
 msgid "Start time"
 msgstr "Starttid"
 
 #. Translators: Table column heading. The length of user session. Contains time.
-#: ../lib/wiking/cms/users.py:1260
+#: ../lib/wiking/cms/users.py:1289
 msgid "Duration"
 msgstr "Varighet"
 
-#: ../lib/wiking/cms/users.py:1263
+#: ../lib/wiking/cms/users.py:1292
 msgid "IP address"
 msgstr "IP-adresse"
 
 #. Translators: Internet name of the remote computer (computer terminology).
-#: ../lib/wiking/cms/users.py:1265
+#: ../lib/wiking/cms/users.py:1294
 msgid "Hostname"
 msgstr "Hostnavn"
 
 #. Translators: "User agent" is a generalized name for browser or more precisely the
 #. software which produced the HTTP request (was used to access the website).
-#: ../lib/wiking/cms/users.py:1268
+#: ../lib/wiking/cms/users.py:1297
 msgid "User agent"
 msgstr "User agent"
 
 #. Translators: Meaning where the user came from. Computer terminology. Do not translate
 #. "HTTP" and if unsure, don't translate at all (it is a very technical term).
-#: ../lib/wiking/cms/users.py:1271
+#: ../lib/wiking/cms/users.py:1300
 msgid "HTTP Referer"
 msgstr "HTTP-refererer"
 
+#: ../lib/wiking/configuration.py:194
+msgid "Webmaster's e-mail address"
+msgstr "Vevadministratorens e-postadresse"
+
+#: ../lib/wiking/configuration.py:205
+msgid "Default sender address"
+msgstr "Standard avsenderadresse"
+
+#: ../lib/wiking/configuration.py:222
+msgid "Force HTTPS login"
+msgstr "Fremtving HTTPS logginn"
+
+#: ../lib/wiking/configuration.py:223
+msgid ""
+"If enabled, the login form will always be redirected to an HTTPS address to "
+"ensure the security of the submitted credentials.  This, however, requires "
+"your server to be setup to accept HTTPS requests for the same virtual host "
+"and pass them to Wiking."
+msgstr ""
+"Hvis tillatt, vil påloggingsskjemaet alltid videresendes til en HTTPS-"
+"adresse for å ivareta sikkerheten. Dette krever at serveren din er "
+"konfigurert til å håndtere HTTPS-forespørsler for den samme virtuelle "
+"serveren, og at disse sendes videre til Wiking."
+
+#. Translators: Site means a webpage or web application.
+#: ../lib/wiking/configuration.py:276
+msgid "Site title"
+msgstr "Nettstedets tittel"
+
+#: ../lib/wiking/configuration.py:277
+msgid ""
+"Site title is a short and (hopefully) unique title of the whole website. It "
+"will appear at the top of every page."
+msgstr ""
+"Nettstedets tittel er et kort og (forhåpentligvis) unikt navn på hele "
+"nettstedet. Det vises på toppen av hver side."
+
+#. Translators: Site means a webpage or web application. Subtitle as in ,,title -- subtitle''.
+#: ../lib/wiking/configuration.py:283
+msgid "Site subtitle"
+msgstr "Nettstedets undertittel"
+
+#: ../lib/wiking/configuration.py:284
+msgid ""
+"Site subtitle is an optional more descriptive title of the website.  It will "
+"appear at the top of every page together with site title, but where brevity "
+"matters, only title will be used."
+msgstr ""
+"Nettstedets undertittel er et valgfritt, mer beskrivende navn på nettsiden. "
+"Det vises på toppen av hver side, sammen med nettstedstittelen; men hvor det "
+"er viktig å fatte seg i korthet, vil bare tittelen brukes."
+
+#. Translators: Web page or web application specific image.
+#: ../lib/wiking/configuration.py:291
+#, fuzzy
+msgid "Site icon"
+msgstr "Nettstedets tittel"
+
+#: ../lib/wiking/configuration.py:305
+msgid "Default language"
+msgstr "Standardspråk"
+
+#. Translators: Language negotiation means the process where the server is trying
+#. to find a language that matches with what the users internet browser asks for.
+#: ../lib/wiking/configuration.py:308
+msgid ""
+"Defines the language (lowercase ISO 639-1 Alpha-2 code) to be used when "
+"content language negotiation fails. If not set (which is the default), the "
+"server will issue a 606 HTTP error (Not acceptable) when the document is not "
+"available in any of the requested languages. The error page will contain a "
+"description of the problem and a list of available language variants of the "
+"requested document. The negotiation is based on the browser setting of "
+"user's language preference passed through the 'Accept-Language' HTTP header. "
+"If set, Wiking will automatically serve given language variant instead of "
+"issuing the error if that variant is available.  If unavailable, the 606 "
+"error is raised anyway, so you need to make sure that all documents are "
+"available at least in the default language variant if you want to avoid 606 "
+"errors completely."
+msgstr ""
+"Definerer språket (ISO 639-1 Alpha-2 code) som skal brukes når ingen av de "
+"foretrukne språkene er tilgjengelige. Hvis det ikke er satt (som er "
+"standard), vil serveren utstede en 606 HTTP-feil (Ikke akseptabelt) når "
+"dokumentet ikke er tilgjengelig i noen av de forespurte språkene. Feilsiden "
+"inneholder en beskrivelse av problemet og en liste over hvilke "
+"språkvarianter det dokumentet du ville ha, er tilgjengelig i. Forhandlingene "
+"er baserte på nettleserens innstillinger for brukerspråk gjennom 'Accept-"
+"Language' HTTP-overskriften. Hvis brukerspråket er angitt, vil Wiking "
+"automatisk vise gitt språkvariant i stedet for å utstede feilen så lenge "
+"varianten er tilgjengelig. Hvis den ikke er det, vil 606-feilen uansett "
+"komme, så du må passe på at alle dokumenter er tilgjengelige i det minste i "
+"standardspråket hvis du vil helt unngå 606-feilen."
+
+#. Translators: Yes/No configuration option label. Should the login panel display user role (as Admin, Student, Tutor etc.)
+#: ../lib/wiking/configuration.py:378
+#, fuzzy
+msgid "Display role in login panel"
+msgstr "Tillat innloggingspanel"
+
+#: ../lib/wiking/configuration.py:379
+msgid ""
+"If enabled, the login panel on each page will not display only the current "
+"username, but also his current user role, which affects his permissions."
+msgstr ""
+
+#: ../lib/wiking/configuration.py:397
+msgid "Whether to use e-mails as login names"
+msgstr "Om e-post skal brukes som innloggingsnavn"
+
+#: ../lib/wiking/configuration.py:398
+msgid "Iff true, users must use e-mail addresses as their login names."
+msgstr ""
+"Hvis og bare hvis det er angitt, må brukerne bruke e-postadressen som "
+"innloggingsnavn."
+
+#: ../lib/wiking/configuration.py:412
+msgid ""
+"If set, the newly registered users will be automatically approved without "
+"any administrator's action.  The adminstrator may still need to asign users "
+"to groups to grant them further privileges, but the accounts are enabled "
+"right after the user confirms the registration code."
+msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "The first step of your registration at %(server_hostname)s was "
+#~ "successfully completed.\n"
+#~ "\n"
+#~ "For the next step visit the following URL and follow the instructions "
+#~ "there:\n"
+#~ "%(uri)s\n"
+#~ "\n"
+#~ "If the above link fails, you will be prompted for your activation code "
+#~ "when\n"
+#~ "you attempt to log in.\n"
+#~ "\n"
+#~ "Your activation code is: %(code)s\n"
+#~ msgstr ""
+#~ "Det første trinnet av registreringen på %(server_hostname)s ble "
+#~ "avsluttet. \n"
+#~ "\n"
+#~ "For neste trinn gå til følgende URL og følge instruksjonene der:\n"
+#~ "%(uri)s\n"
+
+#~ msgid "Registration accepted."
+#~ msgstr "Registrering tillatt."
+
 #~ msgid "Private"
 #~ msgstr "Privat"
 
diff --git a/translations/wiking-cms.pl.po b/translations/wiking-cms.pl.po
index be1763e..04edfa8 100644
--- a/translations/wiking-cms.pl.po
+++ b/translations/wiking-cms.pl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-16 19:35+0200\n"
+"POT-Creation-Date: 2010-10-16 13:26+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Petr Topiarz <topiarz at post.cz>\n"
 "Language-Team: \n"
@@ -10,129 +10,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/wiking/configuration.py:194
-msgid "Webmaster's e-mail address"
-msgstr "Webmaster's e-mail address"
-
-#: ../lib/wiking/configuration.py:205
-msgid "Default sender address"
-msgstr "Domyślny adres nadawcy"
-
-#: ../lib/wiking/configuration.py:222
-#, fuzzy
-msgid "Force HTTPS login"
-msgstr "Force HTTPS login"
-
-#: ../lib/wiking/configuration.py:223
-msgid ""
-"If enabled, the login form will always be redirected to an HTTPS address to "
-"ensure the security of the submitted credentials.  This, however, requires "
-"your server to be setup to accept HTTPS requests for the same virtual host "
-"and pass them to Wiking."
-msgstr ""
-"Jeśli opcja jest włączona, formularz logowania zawsze będzie przekierowany "
-"na adres HTTPS w celu zapewnienia bezpieczeństwa środkom weryfikacji "
-"tożsamości. To jednak wymaga, aby serwer jest ustawiony tak, aby akceptować "
-"żądań HTTPS na tym samym serwerze wirtualnym i przekazać je do Wiking."
-
-#. Translators: Site means a webpage or web application.
-#: ../lib/wiking/configuration.py:276
-msgid "Site title"
-msgstr "nAZWA STRONY"
-
-#: ../lib/wiking/configuration.py:277
-msgid ""
-"Site title is a short and (hopefully) unique title of the whole website. It "
-"will appear at the top of every page."
-msgstr ""
-"Nazwa strony jest krótka  i (miejmy nadzieję) unikalnym tytułem całej strony "
-"internetowej. Będzie on wyświetlany na górze każdej strony."
-
-#. Translators: Site means a webpage or web application. Subtitle as in ,,title -- subtitle''.
-#: ../lib/wiking/configuration.py:283
-msgid "Site subtitle"
-msgstr "Podtytuł witryny"
-
-#: ../lib/wiking/configuration.py:284
-#, fuzzy
-msgid ""
-"Site subtitle is an optional more descriptive title of the website.  It will "
-"appear at the top of every page together with site title, but where brevity "
-"matters, only title will be used."
-msgstr ""
-"Podtytuł jest alternatywnym bardziej opisowym tytułem strony internetowej. "
-"Będzie on wyświetlany na górze każdej strony wraz z tytułem strony, ale "
-"generalnie, używany będzie tylko tytuł."
-
-#. Translators: Web page or web application specific image.
-#: ../lib/wiking/configuration.py:291
-msgid "Site icon"
-msgstr "Ikona na stronie"
-
-#: ../lib/wiking/configuration.py:305
-msgid "Default language"
-msgstr "Domyślny język"
-
-#. Translators: Language negotiation means the process where the server is trying
-#. to find a language that matches with what the users internet browser asks for.
-#: ../lib/wiking/configuration.py:308
-msgid ""
-"Defines the language (lowercase ISO 639-1 Alpha-2 code) to be used when "
-"content language negotiation fails. If not set (which is the default), the "
-"server will issue a 606 HTTP error (Not acceptable) when the document is not "
-"available in any of the requested languages. The error page will contain a "
-"description of the problem and a list of available language variants of the "
-"requested document. The negotiation is based on the browser setting of "
-"user's language preference passed through the 'Accept-Language' HTTP header. "
-"If set, Wiking will automatically serve given language variant instead of "
-"issuing the error if that variant is available.  If unavailable, the 606 "
-"error is raised anyway, so you need to make sure that all documents are "
-"available at least in the default language variant if you want to avoid 606 "
-"errors completely."
-msgstr ""
-"Definiuje język (małe ISO 639-1 Alfa-2 kod)do użycia kiedy serwer nie "
-"potrafi znaleźć odpowiedniego języka. Jeśli nie zostało ustwanione, (co jest "
-"domyślnie), serwer będzie miał problem HTTP 606 (Niedozwolony), gdy dokument "
-"nie jest dostępny w żadnym z wymaganych języków. Strona błędu może zawierać "
-"opis problemu i listę dostępnych wariantów językowych wymaganych dokumentów. "
-"Poszukiwania są oparte na ustawieniach  przeglądarki użytkownika języka "
-"przejdź do \"Accept-Language header\" HTTP. Jeśli jest ustawiona, Wiking "
-"automatycznie ustawi język zamiast pokazywać błąd, jeśli ten wariant jest "
-"dostępny. Jeśli jest to  niemożliwe, błąd  606 będzie występował tak czy "
-"inaczej, tak, więc trzeba się upewnić, że wszystkie dokumenty są dostępne  w "
-"wariancie języka domyślnego, jeżeli chcesz uniknąć błędów 606 całkowicie."
-
-#. Translators: Yes/No configuration option label. Should the login panel display user role (as Admin, Student, Tutor etc.)
-#: ../lib/wiking/configuration.py:378
-msgid "Display role in login panel"
-msgstr "Pokaż pozycje użytkownika"
-
-#: ../lib/wiking/configuration.py:379
-#, fuzzy
-msgid ""
-"If enabled, the login panel on each page will not display only the current "
-"username, but also his current user role, which affects his permissions."
-msgstr ""
-"Po włączeniu, panel logowania będzie wyświetlać zarówno obeceną nazwe "
-"użytkownika, ale również jego role (np. administrator, użytkownik, student "
-"itd.)"
-
-#: ../lib/wiking/configuration.py:397
-msgid "Whether to use e-mails as login names"
-msgstr "Czy używać e-mailu jako loginu"
-
-#: ../lib/wiking/configuration.py:398
-msgid "Iff true, users must use e-mail addresses as their login names."
-msgstr "Jeśli prawdziwy, użytkownicy muszą użyć adresu e-mail jako loginu."
-
-#: ../lib/wiking/configuration.py:412
-msgid ""
-"If set, the newly registered users will be automatically approved without "
-"any administrator's action.  The adminstrator may still need to asign users "
-"to groups to grant them further privileges, but the accounts are enabled "
-"right after the user confirms the registration code."
-msgstr ""
-
 #: ../lib/wiking/cms/appl.py:53
 msgid "Manage this site"
 msgstr "ZarzÄ…dzanie witrynÄ…"
@@ -149,142 +26,6 @@ msgstr "Zostaw Management Interface"
 msgid "Wiking Management Interface"
 msgstr "Wiking Management Interface"
 
-#. Translators: Yes/No configuration option label. Should the login panel be visible?
-#: ../lib/wiking/cms/configuration.py:36
-#, fuzzy
-msgid "Allow login panel"
-msgstr "Pozwól login panel być widocznym"
-
-#: ../lib/wiking/cms/configuration.py:37
-msgid ""
-"If enabled, the information about the currently logged user and login/logout "
-"controls will be present on each page as a separate panel.  This panel will "
-"always be the first panel on the page."
-msgstr ""
-"Jeśli opcja jest włączona, informacje na temat aktualnie zalogowanego "
-"użytkownika i panelu logowania będą obecne na każdej stronie jako osobny "
-"panel. Będzie on zawsze pierwszym panelem na stronie."
-
-#. Translators: Yes/No configuration option label. Should link to WMI be visible?  "WMI"
-#. stands for Wiking Management Interface.  Don't feel obliged to use an abbreviation.  Use
-#. whatever brief form obviously referning to whatever translation you used for "Wiking
-#. Management Interface".
-#: ../lib/wiking/cms/configuration.py:47
-#, fuzzy
-msgid "Allow WMI link"
-msgstr "Pozwól WMI link być widocznym"
-
-#. Translators: Yes/no configuration label. Can new users register to this
-#. website/application?
-#: ../lib/wiking/cms/configuration.py:55
-msgid "Allow new user registration"
-msgstr "Zgoda na rejestrację nowego użytkownika"
-
-#: ../lib/wiking/cms/configuration.py:56
-msgid ""
-"If enabled, all visitors are allowed to create a user account.  If disabled, "
-"new user accounts must be created by administrator.  Note, that the newly "
-"created accounts are inactive (at least with the default implementation of "
-"the user management module), so the creation of the account doesn't give the "
-"user any actual privileges."
-msgstr ""
-"Po włączoneniu, wszyscy użytkownicy mogą tworzyć konta użytkownika. Po "
-"wyłączeniu, nowe konta użytkowników muszą być tworzone przez administratora. "
-"Zwróć uwagę, że nowo utworzone konta są nieaktywne (przynajmniej w domyślnej "
-"implementacji modułu zarządzania użytkownikami), więc tworzenie konta nie "
-"dają użytkownikowi żadnych rzeczywistych uprawnień."
-
-#. Translators: Maximal size an uploaded file can have.
-#: ../lib/wiking/cms/configuration.py:65
-msgid "Maximal upload size"
-msgstr "Maksymalny rozmiar przesyłanych plików"
-
-#: ../lib/wiking/cms/configuration.py:66
-msgid ""
-"The maximal size of uploaded files in bytes.  The server needs to be "
-"relaoded for the changes in this option to take effect."
-msgstr ""
-"Maksymalny rozmiar przesłanych plików w bajtach. Serwer musi być załadowany "
-"ponownie aby zmiany zostały zatwierdzone."
-
-#. Translators: Web form label (account in the meaning of user account)
-#: ../lib/wiking/cms/texts.py:29
-msgid "Information about a locked account"
-msgstr ""
-
-#. Translators: Text presented to a user in a web page
-#: ../lib/wiking/cms/texts.py:31
-msgid ""
-"Your account is currently disabled.\n"
-"\n"
-"The protected services are not available to you.\n"
-"Contact the application administrator to get the account enabled."
-msgstr ""
-
-#. Translators: Web form label
-#: ../lib/wiking/cms/texts.py:39
-#, fuzzy
-msgid "Information about an account waiting for activation code confirmation"
-msgstr "Potwierdź swoje konto bez sprawdzania kodu aktywacji"
-
-#. Translators: Text presented to a user in a web page
-#: ../lib/wiking/cms/texts.py:41
-msgid ""
-"Your account is inactive because\n"
-"you have not yet confirmed the activation code sent to you by e-mail.\n"
-"\n"
-"Please, check your e-mail and follow the provided link or enter the\n"
-"activation code into the field below.\n"
-"\n"
-"You can also continue without entering the activation code, but\n"
-"the protected services will not be available to you."
-msgstr ""
-
-#. Translators: Web form label
-#: ../lib/wiking/cms/texts.py:53
-#, fuzzy
-msgid "Information about an account waiting for admin approval"
-msgstr "Niezatwierdzone konta (do czasu zatwierdzenia administracyjnego)"
-
-#. Translators: Text presented to a user in a web page
-#: ../lib/wiking/cms/texts.py:55
-msgid ""
-"Your account is waiting for approval by the administrator.\n"
-"                  \n"
-"The protected services are not available until the account gets approved.\n"
-"If the account remains unapproved for a long time, contact the application "
-"administrator."
-msgstr ""
-
-#: ../lib/wiking/cms/texts.py:62
-msgid "Introductory text displayed above the registration form"
-msgstr ""
-
-#: ../lib/wiking/cms/texts.py:67
-msgid "Text displayed after successful user registration"
-msgstr ""
-
-#: ../lib/wiking/cms/texts.py:69
-msgid ""
-"Registration completed successfuly. Your account is now fully functional but "
-"you may need to get futher privileges by the administrator to access certain "
-"restricted services."
-msgstr ""
-
-#: ../lib/wiking/cms/texts.py:74
-msgid ""
-"Registration completed successfuly. Your account now awaits administrator's "
-"approval."
-msgstr ""
-"Rejestracja przebiegła pomyślnie. Twoje konto oczekuje potwierdzenia "
-"administratora."
-
-#: ../lib/wiking/cms/texts.py:79
-msgid ""
-"Information displayed above the checkbox for confirmation of site specific "
-"conditions during registration (if empty, no confirmation is required)"
-msgstr ""
-
 #: ../lib/wiking/cms/cms.py:61
 msgid "formatting manual"
 msgstr "Instrukcja formatowania"
@@ -393,7 +134,7 @@ msgstr "Wyślij ponownie kod aktywacji"
 
 #. Translators: Button name. Computer terminology. Use an appropriate term common
 #. for submitting forms in a computer application.
-#: ../lib/wiking/cms/cms.py:496 ../lib/wiking/cms/users.py:1142
+#: ../lib/wiking/cms/cms.py:496 ../lib/wiking/cms/users.py:1171
 msgid "Submit"
 msgstr "Przesyłanie"
 
@@ -405,7 +146,7 @@ msgstr ""
 msgid "Account disabled"
 msgstr "Konto wyłączone"
 
-#: ../lib/wiking/cms/cms.py:533 ../lib/wiking/cms/users.py:814
+#: ../lib/wiking/cms/cms.py:533 ../lib/wiking/cms/users.py:819
 #, fuzzy
 msgid "Account not activated"
 msgstr "Konto wyłączone"
@@ -747,7 +488,7 @@ msgstr "Zarządzaj stylami kolorów."
 
 #. Translators: Table column heading. Whether the account is active. Values are yes/no.
 #: ../lib/wiking/cms/cms.py:897 ../lib/wiking/cms/cms.py:1987
-#: ../lib/wiking/cms/users.py:1262
+#: ../lib/wiking/cms/users.py:1291
 msgid "Active"
 msgstr "Aktywny"
 
@@ -1043,7 +784,7 @@ msgstr ""
 #. Translators: Button label. Use standard computer terminology.
 #. Translators: Back button label. Standard computer terminology.
 #: ../lib/wiking/cms/cms.py:1212 ../lib/wiking/cms/cms.py:1572
-#: ../lib/wiking/cms/users.py:900
+#: ../lib/wiking/cms/users.py:905
 msgid "Back"
 msgstr "Wstecz"
 
@@ -1501,6 +1242,142 @@ msgstr "Użyj jako szablonu"
 msgid "Edit this mail for repeated use"
 msgstr "Edytuj mail do ponownego użycia."
 
+#. Translators: Yes/No configuration option label. Should the login panel be visible?
+#: ../lib/wiking/cms/configuration.py:36
+#, fuzzy
+msgid "Allow login panel"
+msgstr "Pozwól login panel być widocznym"
+
+#: ../lib/wiking/cms/configuration.py:37
+msgid ""
+"If enabled, the information about the currently logged user and login/logout "
+"controls will be present on each page as a separate panel.  This panel will "
+"always be the first panel on the page."
+msgstr ""
+"Jeśli opcja jest włączona, informacje na temat aktualnie zalogowanego "
+"użytkownika i panelu logowania będą obecne na każdej stronie jako osobny "
+"panel. Będzie on zawsze pierwszym panelem na stronie."
+
+#. Translators: Yes/No configuration option label. Should link to WMI be visible?  "WMI"
+#. stands for Wiking Management Interface.  Don't feel obliged to use an abbreviation.  Use
+#. whatever brief form obviously referning to whatever translation you used for "Wiking
+#. Management Interface".
+#: ../lib/wiking/cms/configuration.py:47
+#, fuzzy
+msgid "Allow WMI link"
+msgstr "Pozwól WMI link być widocznym"
+
+#. Translators: Yes/no configuration label. Can new users register to this
+#. website/application?
+#: ../lib/wiking/cms/configuration.py:55
+msgid "Allow new user registration"
+msgstr "Zgoda na rejestrację nowego użytkownika"
+
+#: ../lib/wiking/cms/configuration.py:56
+msgid ""
+"If enabled, all visitors are allowed to create a user account.  If disabled, "
+"new user accounts must be created by administrator.  Note, that the newly "
+"created accounts are inactive (at least with the default implementation of "
+"the user management module), so the creation of the account doesn't give the "
+"user any actual privileges."
+msgstr ""
+"Po włączoneniu, wszyscy użytkownicy mogą tworzyć konta użytkownika. Po "
+"wyłączeniu, nowe konta użytkowników muszą być tworzone przez administratora. "
+"Zwróć uwagę, że nowo utworzone konta są nieaktywne (przynajmniej w domyślnej "
+"implementacji modułu zarządzania użytkownikami), więc tworzenie konta nie "
+"dają użytkownikowi żadnych rzeczywistych uprawnień."
+
+#. Translators: Maximal size an uploaded file can have.
+#: ../lib/wiking/cms/configuration.py:65
+msgid "Maximal upload size"
+msgstr "Maksymalny rozmiar przesyłanych plików"
+
+#: ../lib/wiking/cms/configuration.py:66
+msgid ""
+"The maximal size of uploaded files in bytes.  The server needs to be "
+"relaoded for the changes in this option to take effect."
+msgstr ""
+"Maksymalny rozmiar przesłanych plików w bajtach. Serwer musi być załadowany "
+"ponownie aby zmiany zostały zatwierdzone."
+
+#. Translators: Web form label (account in the meaning of user account)
+#: ../lib/wiking/cms/texts.py:29
+msgid "Information about a locked account"
+msgstr ""
+
+#. Translators: Text presented to a user in a web page
+#: ../lib/wiking/cms/texts.py:31
+msgid ""
+"Your account is currently disabled.\n"
+"\n"
+"The protected services are not available to you.\n"
+"Contact the application administrator to get the account enabled."
+msgstr ""
+
+#. Translators: Web form label
+#: ../lib/wiking/cms/texts.py:39
+#, fuzzy
+msgid "Information about an account waiting for activation code confirmation"
+msgstr "Potwierdź swoje konto bez sprawdzania kodu aktywacji"
+
+#. Translators: Text presented to a user in a web page
+#: ../lib/wiking/cms/texts.py:41
+msgid ""
+"Your account is inactive because\n"
+"you have not yet confirmed the activation code sent to you by e-mail.\n"
+"\n"
+"Please, check your e-mail and follow the provided link or enter the\n"
+"activation code into the field below.\n"
+"\n"
+"You can also continue without entering the activation code, but\n"
+"the protected services will not be available to you."
+msgstr ""
+
+#. Translators: Web form label
+#: ../lib/wiking/cms/texts.py:53
+#, fuzzy
+msgid "Information about an account waiting for admin approval"
+msgstr "Niezatwierdzone konta (do czasu zatwierdzenia administracyjnego)"
+
+#. Translators: Text presented to a user in a web page
+#: ../lib/wiking/cms/texts.py:55
+msgid ""
+"Your account is waiting for approval by the administrator.\n"
+"                  \n"
+"The protected services are not available until the account gets approved.\n"
+"If the account remains unapproved for a long time, contact the application "
+"administrator."
+msgstr ""
+
+#: ../lib/wiking/cms/texts.py:62
+msgid "Introductory text displayed above the registration form"
+msgstr ""
+
+#: ../lib/wiking/cms/texts.py:67
+msgid "Text displayed after successful user registration"
+msgstr ""
+
+#: ../lib/wiking/cms/texts.py:69
+msgid ""
+"Registration completed successfuly. Your account is now fully functional but "
+"you may need to get futher privileges by the administrator to access certain "
+"restricted services."
+msgstr ""
+
+#: ../lib/wiking/cms/texts.py:74
+msgid ""
+"Registration completed successfuly. Your account now awaits administrator's "
+"approval."
+msgstr ""
+"Rejestracja przebiegła pomyślnie. Twoje konto oczekuje potwierdzenia "
+"administratora."
+
+#: ../lib/wiking/cms/texts.py:79
+msgid ""
+"Information displayed above the checkbox for confirmation of site specific "
+"conditions during registration (if empty, no confirmation is required)"
+msgstr ""
+
 #: ../lib/wiking/cms/users.py:57 ../lib/wiking/cms/users.py:148
 msgid "Group"
 msgstr ""
@@ -1528,7 +1405,7 @@ msgid "User Roles"
 msgstr "Użytkownicy"
 
 #: ../lib/wiking/cms/users.py:149 ../lib/wiking/cms/users.py:434
-#: ../lib/wiking/cms/users.py:1252
+#: ../lib/wiking/cms/users.py:1281
 msgid "User"
 msgstr "Użytkownik"
 
@@ -1609,7 +1486,7 @@ msgid "Manage registered users and their privileges."
 msgstr "Zarządzanie zarejestrowanymi użytkownikami i ich uprawnieniami."
 
 #. Translators: Login name for a website. Registration form field.
-#: ../lib/wiking/cms/users.py:408 ../lib/wiking/cms/users.py:1210
+#: ../lib/wiking/cms/users.py:408 ../lib/wiking/cms/users.py:1239
 msgid "Login name"
 msgstr "Login"
 
@@ -1621,7 +1498,7 @@ msgstr ""
 "Poprawna nazwa użytkownika może zawierać tylko litery, cyfry, podkreślenia, "
 "myślniki i kropki i musi zaczynać się od litery."
 
-#: ../lib/wiking/cms/users.py:413 ../lib/wiking/cms/users.py:1211
+#: ../lib/wiking/cms/users.py:413 ../lib/wiking/cms/users.py:1240
 msgid "Password"
 msgstr "Hasło"
 
@@ -1817,12 +1694,12 @@ msgid "User's Groups"
 msgstr ""
 
 #. Translators: Heading for an overview when and how the user has accessed the application.
-#: ../lib/wiking/cms/users.py:530 ../lib/wiking/cms/users.py:1247
+#: ../lib/wiking/cms/users.py:530 ../lib/wiking/cms/users.py:1276
 msgid "Login History"
 msgstr "Historia logowania"
 
 #. Translators: Name of group of users who have full access to the system.
-#: ../lib/wiking/cms/users.py:538 ../lib/wiking/cms/users.py:1110
+#: ../lib/wiking/cms/users.py:538 ../lib/wiking/cms/users.py:1130
 msgid "Active users"
 msgstr "Aktywni użytkownicy"
 
@@ -1919,156 +1796,138 @@ msgid "Active account"
 msgstr "Nowe konto"
 
 #. Translators: Personal data -- first name, surname, nickname ...
-#: ../lib/wiking/cms/users.py:648 ../lib/wiking/cms/users.py:654
-#: ../lib/wiking/cms/users.py:675
+#: ../lib/wiking/cms/users.py:658 ../lib/wiking/cms/users.py:664
+#: ../lib/wiking/cms/users.py:685
 msgid "Personal data"
 msgstr "Dane osobowe"
 
 #. Translators: Contact information -- email, phone, address...
-#: ../lib/wiking/cms/users.py:650 ../lib/wiking/cms/users.py:655
-#: ../lib/wiking/cms/users.py:676
+#: ../lib/wiking/cms/users.py:660 ../lib/wiking/cms/users.py:665
+#: ../lib/wiking/cms/users.py:686
 msgid "Contact information"
 msgstr "Informacje kontaktowe"
 
 #. Translators: Others is a label for a group of unspecified form fields
 #. (as in Personal data, Contact information, Others).
-#: ../lib/wiking/cms/users.py:653 ../lib/wiking/cms/users.py:656
-#: ../lib/wiking/cms/users.py:681
+#: ../lib/wiking/cms/users.py:663 ../lib/wiking/cms/users.py:666
+#: ../lib/wiking/cms/users.py:691
 msgid "Others"
 msgstr "Inne"
 
-#: ../lib/wiking/cms/users.py:657
+#: ../lib/wiking/cms/users.py:667
 #, fuzzy
 msgid "Account state"
 msgstr "Konto wyłączone"
 
 #. Translators: Button label.
-#: ../lib/wiking/cms/users.py:662
+#: ../lib/wiking/cms/users.py:672
 msgid "New user"
 msgstr "Nowy użytkownik "
 
 #. Translators: Button label.
-#: ../lib/wiking/cms/users.py:664
+#: ../lib/wiking/cms/users.py:674
 msgid "Edit profile"
 msgstr "Edytuj profil"
 
 #. Translators: Button label. Modify the users data (email, address...)
-#: ../lib/wiking/cms/users.py:666
+#: ../lib/wiking/cms/users.py:676
 msgid "Modify user's record"
 msgstr "Modyfikuj dane użytkownika"
 
-#: ../lib/wiking/cms/users.py:679
+#: ../lib/wiking/cms/users.py:689
 msgid "Login information"
 msgstr "Informacje o logowaniu"
 
-#: ../lib/wiking/cms/users.py:712
+#: ../lib/wiking/cms/users.py:722
 msgid "Enter your current password."
 msgstr "Wprowadź swoje aktualne hasło."
 
-#: ../lib/wiking/cms/users.py:716
+#: ../lib/wiking/cms/users.py:726
 msgid "Invalid password."
 msgstr "Nie ważne hasło."
 
-#: ../lib/wiking/cms/users.py:720
+#: ../lib/wiking/cms/users.py:730
 msgid "Enter the new password."
 msgstr "Wprowadź nowe hasło."
 
-#: ../lib/wiking/cms/users.py:728
+#: ../lib/wiking/cms/users.py:738
 msgid "The new password is the same as the old one."
 msgstr "Nowe hasło jest takie samo jak stare."
 
-#: ../lib/wiking/cms/users.py:753
-#, fuzzy, python-format
+#: ../lib/wiking/cms/users.py:763
+#, python-format
 msgid ""
-"The first step of your registration at %(server_hostname)s was successfully "
-"completed.\n"
-"\n"
-"For the next step visit the following URL and follow the instructions "
-"there:\n"
+"To finish your registration at %(server_hostname)s, click on the following "
+"link:\n"
 "%(uri)s\n"
 "\n"
-"If the above link fails, you will be prompted for your activation code when\n"
-"you attempt to log in.\n"
-"\n"
-"Your activation code is: %(code)s\n"
 msgstr ""
-"Pierwszy etap rejestracji w %(server_hostname)s został pomyślnie "
-"zakończony.\n"
-"\n"
-"Odwiedź następujący adres URL i postępuj zgodnie z instrukcjami:\n"
-"%(uri)s\n"
-
-#: ../lib/wiking/cms/users.py:768
-msgid "Registration accepted."
-msgstr "Rejestracja przebiegła pomyślnie."
 
-#: ../lib/wiking/cms/users.py:769
-msgid "Please, check your mailbox for instructions how to proceed."
-msgstr ""
-"Sprawdź swoją skrzynkę pocztową i postępuj zgodnie z instrukcją którą tam "
-"znajdziesz."
-
-#: ../lib/wiking/cms/users.py:773
+#: ../lib/wiking/cms/users.py:776
 msgid "Registration cancelled."
 msgstr "Rejestracja została anulowana."
 
-#: ../lib/wiking/cms/users.py:779
+#: ../lib/wiking/cms/users.py:782
 #, python-format
 msgid "Your registration at %s"
 msgstr "Postęp twojej rejestracji %s"
 
-#: ../lib/wiking/cms/users.py:783 ../lib/wiking/cms/users.py:835
-#: ../lib/wiking/cms/users.py:885 ../lib/wiking/cms/users.py:1218
+#: ../lib/wiking/cms/users.py:786 ../lib/wiking/cms/users.py:840
+#: ../lib/wiking/cms/users.py:890 ../lib/wiking/cms/users.py:1247
 msgid "Failed sending e-mail notification:"
 msgstr "Wysyłanie e-mail zakończyło się niepowodzeniem:"
 
 #. Translators: Follows an email addres, e.g. ``Activation code was sent to joe at brailcom.org''
-#: ../lib/wiking/cms/users.py:787
-#, python-format
-msgid "Activation code was sent to %s."
-msgstr "Kod aktywacyjny został wysłany do %s."
+#: ../lib/wiking/cms/users.py:790
+#, fuzzy, python-format
+msgid ""
+"To finish registration, please confirm the activation code that was sent to "
+"your email address at %(email)s."
+msgstr ""
+"Rejestracji upłynął %(date)s. Użytkownik nie potwierdził kodu aktywacyjnego "
+"wysłanego do zadeklarowanego adresu e-mail."
 
-#: ../lib/wiking/cms/users.py:810
+#: ../lib/wiking/cms/users.py:815
 msgid "User registration already confirmed."
 msgstr "Rejestracja została potwierdzona."
 
-#: ../lib/wiking/cms/users.py:813
+#: ../lib/wiking/cms/users.py:818
 msgid "Invalid activation code."
 msgstr "Nie ważny kod aktywacji."
 
-#: ../lib/wiking/cms/users.py:821
+#: ../lib/wiking/cms/users.py:826
 #, fuzzy, python-format
 msgid "New user %(fullname)s registered at %(server_hostname)s."
 msgstr ""
 "Nowy użytkownik %(fullname) s zarejestrowany %(server_hostname)s. Zatwierdź "
 "konto: %(uri)s "
 
-#: ../lib/wiking/cms/users.py:825
+#: ../lib/wiking/cms/users.py:830
 msgid "The account was approved automatically according to server setup."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:828
+#: ../lib/wiking/cms/users.py:833
 #, fuzzy
 msgid "Please approve the account:"
 msgstr "Włącz to konto"
 
-#: ../lib/wiking/cms/users.py:832
+#: ../lib/wiking/cms/users.py:837
 msgid "New user registration:"
 msgstr "Rejestracja nowego użytkownika:"
 
-#: ../lib/wiking/cms/users.py:838
+#: ../lib/wiking/cms/users.py:843
 msgid "E-mail notification has been sent to server administrator."
 msgstr "Powiadomienia e-mail został wysłany do serwera administratora."
 
-#: ../lib/wiking/cms/users.py:866
+#: ../lib/wiking/cms/users.py:871
 msgid "Registration confirmed"
 msgstr "Rejestracja została potwierdzona."
 
-#: ../lib/wiking/cms/users.py:877
+#: ../lib/wiking/cms/users.py:882
 msgid "The account was enabled."
 msgstr "Konto zostało uaktywnione."
 
-#: ../lib/wiking/cms/users.py:879
+#: ../lib/wiking/cms/users.py:884
 #, python-format
 msgid ""
 "Your account at %(uri)s has been enabled. Please log in with username '%"
@@ -2077,77 +1936,81 @@ msgstr ""
 "Twoje konto w  %(uri)s zostało uaktualnione. Zaloguj się z loginem '%(login)"
 "s' i twoim hasłem."
 
-#: ../lib/wiking/cms/users.py:882
+#: ../lib/wiking/cms/users.py:887
 msgid "Your account has been enabled."
 msgstr "Twoje konto jest aktywne."
 
-#: ../lib/wiking/cms/users.py:887
+#: ../lib/wiking/cms/users.py:892
 msgid "E-mail notification has been sent to:"
 msgstr "Powiadomienia e-mail został wysłany do:"
 
-#: ../lib/wiking/cms/users.py:889
+#: ../lib/wiking/cms/users.py:894
 #, fuzzy
 msgid "The account was disabled."
 msgstr "Konto zostało uaktywnione."
 
-#: ../lib/wiking/cms/users.py:895
+#: ../lib/wiking/cms/users.py:900
 #, fuzzy, python-format
 msgid "The registration expired on %(date)s."
 msgstr "Rejestracja została potwierdzona."
 
-#: ../lib/wiking/cms/users.py:898
+#: ../lib/wiking/cms/users.py:903
 #, fuzzy
 msgid "Continue"
 msgstr "Zawartość"
 
-#: ../lib/wiking/cms/users.py:902
+#: ../lib/wiking/cms/users.py:907
 #, fuzzy
 msgid "The registration code was not confirmed by the user!"
 msgstr "Rejestracja została potwierdzona."
 
-#: ../lib/wiking/cms/users.py:903
+#: ../lib/wiking/cms/users.py:908
 #, fuzzy
 msgid ""
 "Please enable the account only if you are sure that the e-mail address "
 "belongs to given user."
 msgstr "Potwierdź konto, jeśli jesteś pewien że e-mail adres należy do ciebie."
 
-#: ../lib/wiking/cms/users.py:1111
+#: ../lib/wiking/cms/users.py:1131
 msgid "Listing of all active user accounts."
 msgstr "Lista wszystkich aktywnych kont użytkowników."
 
-#: ../lib/wiking/cms/users.py:1138
+#: ../lib/wiking/cms/users.py:1142
+msgid "Users who have `confirm' flag set"
+msgstr ""
+
+#: ../lib/wiking/cms/users.py:1167
 msgid "Enter your login name or e-mail address"
 msgstr "Wprowadź swój login alub adres e-mail"
 
-#: ../lib/wiking/cms/users.py:1173
+#: ../lib/wiking/cms/users.py:1202
 msgid "Password reminder"
 msgstr "Przypomnienie hasła"
 
-#: ../lib/wiking/cms/users.py:1186
+#: ../lib/wiking/cms/users.py:1215
 msgid "Multiple user accounts found for given email address."
 msgstr "Wiele kont użytkownika dla danego adresu e-mail."
 
-#: ../lib/wiking/cms/users.py:1187
+#: ../lib/wiking/cms/users.py:1216
 msgid "Please, select the account for which you want to remind:"
 msgstr "Wybierz konto do którego potrzebujesz przypomnienia:"
 
 #. Translators: Credentials such as password...
-#: ../lib/wiking/cms/users.py:1200
+#: ../lib/wiking/cms/users.py:1229
 msgid "Your credentials were reset to:"
 msgstr "Twoje dokumenty potwierdzające tożsamość zostały zresetowane do:"
 
 #. Translators: Credentials such as password...
-#: ../lib/wiking/cms/users.py:1204
+#: ../lib/wiking/cms/users.py:1233
 msgid "Your credentials are:"
 msgstr "Twoje dokumenty potwierdzające tożsamość to:"
 
-#: ../lib/wiking/cms/users.py:1206
+#: ../lib/wiking/cms/users.py:1235
 #, python-format
 msgid "A password reminder request has been made at %(server_uri)s."
 msgstr "Przypomnienie hasła wniosek został wsłany do %(server_uri)s."
 
-#: ../lib/wiking/cms/users.py:1213
+#: ../lib/wiking/cms/users.py:1242
 msgid ""
 "We strongly recommend you change your password at nearest occassion, since "
 "it has been exposed to an unsecure channel."
@@ -2155,63 +2018,218 @@ msgstr ""
 "Zalecamy zmianę hasła na najbliższej okazji, gdyż był miał styczność z "
 "niezabezpieczonym kanałem."
 
-#: ../lib/wiking/cms/users.py:1219
+#: ../lib/wiking/cms/users.py:1248
 msgid "Please try repeating your request later or contact the administrator!"
 msgstr "Powtórz żądanie później lub skontaktuj się z administratorem!"
 
-#: ../lib/wiking/cms/users.py:1221
+#: ../lib/wiking/cms/users.py:1250
 msgid "E-mail information has been sent to your email address."
 msgstr "Informacja została przesłana na twojego emaila."
 
-#: ../lib/wiking/cms/users.py:1224
+#: ../lib/wiking/cms/users.py:1253
 msgid "No user account for your query."
 msgstr "Brak użytkownika odpowiadającego Twojemu zapytaniu."
 
-#: ../lib/wiking/cms/users.py:1248
+#: ../lib/wiking/cms/users.py:1277
 msgid "History of successful login sessions and unsuccessful login attempts."
 msgstr "Historia logowań zakończonych sukcesem i nieudanych prób logowania."
 
 #. Translators: Login name.
-#: ../lib/wiking/cms/users.py:1254
+#: ../lib/wiking/cms/users.py:1283
 msgid "Login"
 msgstr "Login"
 
 #. Translators: Form field saying whether the users attempt was succesful. Values are Yes/No.
-#: ../lib/wiking/cms/users.py:1256
+#: ../lib/wiking/cms/users.py:1285
 msgid "Success"
 msgstr "Pomyślnie"
 
 #. Translators: Table column heading. Time of the start of user session, followed by a date and time.
-#: ../lib/wiking/cms/users.py:1258
+#: ../lib/wiking/cms/users.py:1287
 msgid "Start time"
 msgstr "Czas rozpoczęcia"
 
 #. Translators: Table column heading. The length of user session. Contains time.
-#: ../lib/wiking/cms/users.py:1260
+#: ../lib/wiking/cms/users.py:1289
 msgid "Duration"
 msgstr "Czas trwania"
 
-#: ../lib/wiking/cms/users.py:1263
+#: ../lib/wiking/cms/users.py:1292
 msgid "IP address"
 msgstr "IP adres"
 
 #. Translators: Internet name of the remote computer (computer terminology).
-#: ../lib/wiking/cms/users.py:1265
+#: ../lib/wiking/cms/users.py:1294
 msgid "Hostname"
 msgstr "Nazwa hosta"
 
 #. Translators: "User agent" is a generalized name for browser or more precisely the
 #. software which produced the HTTP request (was used to access the website).
-#: ../lib/wiking/cms/users.py:1268
+#: ../lib/wiking/cms/users.py:1297
 msgid "User agent"
 msgstr "agent użytkownika"
 
 #. Translators: Meaning where the user came from. Computer terminology. Do not translate
 #. "HTTP" and if unsure, don't translate at all (it is a very technical term).
-#: ../lib/wiking/cms/users.py:1271
+#: ../lib/wiking/cms/users.py:1300
 msgid "HTTP Referer"
 msgstr "HTTP Referer"
 
+#: ../lib/wiking/configuration.py:194
+msgid "Webmaster's e-mail address"
+msgstr "Webmaster's e-mail address"
+
+#: ../lib/wiking/configuration.py:205
+msgid "Default sender address"
+msgstr "Domyślny adres nadawcy"
+
+#: ../lib/wiking/configuration.py:222
+#, fuzzy
+msgid "Force HTTPS login"
+msgstr "Force HTTPS login"
+
+#: ../lib/wiking/configuration.py:223
+msgid ""
+"If enabled, the login form will always be redirected to an HTTPS address to "
+"ensure the security of the submitted credentials.  This, however, requires "
+"your server to be setup to accept HTTPS requests for the same virtual host "
+"and pass them to Wiking."
+msgstr ""
+"Jeśli opcja jest włączona, formularz logowania zawsze będzie przekierowany "
+"na adres HTTPS w celu zapewnienia bezpieczeństwa środkom weryfikacji "
+"tożsamości. To jednak wymaga, aby serwer jest ustawiony tak, aby akceptować "
+"żądań HTTPS na tym samym serwerze wirtualnym i przekazać je do Wiking."
+
+#. Translators: Site means a webpage or web application.
+#: ../lib/wiking/configuration.py:276
+msgid "Site title"
+msgstr "nAZWA STRONY"
+
+#: ../lib/wiking/configuration.py:277
+msgid ""
+"Site title is a short and (hopefully) unique title of the whole website. It "
+"will appear at the top of every page."
+msgstr ""
+"Nazwa strony jest krótka  i (miejmy nadzieję) unikalnym tytułem całej strony "
+"internetowej. Będzie on wyświetlany na górze każdej strony."
+
+#. Translators: Site means a webpage or web application. Subtitle as in ,,title -- subtitle''.
+#: ../lib/wiking/configuration.py:283
+msgid "Site subtitle"
+msgstr "Podtytuł witryny"
+
+#: ../lib/wiking/configuration.py:284
+#, fuzzy
+msgid ""
+"Site subtitle is an optional more descriptive title of the website.  It will "
+"appear at the top of every page together with site title, but where brevity "
+"matters, only title will be used."
+msgstr ""
+"Podtytuł jest alternatywnym bardziej opisowym tytułem strony internetowej. "
+"Będzie on wyświetlany na górze każdej strony wraz z tytułem strony, ale "
+"generalnie, używany będzie tylko tytuł."
+
+#. Translators: Web page or web application specific image.
+#: ../lib/wiking/configuration.py:291
+msgid "Site icon"
+msgstr "Ikona na stronie"
+
+#: ../lib/wiking/configuration.py:305
+msgid "Default language"
+msgstr "Domyślny język"
+
+#. Translators: Language negotiation means the process where the server is trying
+#. to find a language that matches with what the users internet browser asks for.
+#: ../lib/wiking/configuration.py:308
+msgid ""
+"Defines the language (lowercase ISO 639-1 Alpha-2 code) to be used when "
+"content language negotiation fails. If not set (which is the default), the "
+"server will issue a 606 HTTP error (Not acceptable) when the document is not "
+"available in any of the requested languages. The error page will contain a "
+"description of the problem and a list of available language variants of the "
+"requested document. The negotiation is based on the browser setting of "
+"user's language preference passed through the 'Accept-Language' HTTP header. "
+"If set, Wiking will automatically serve given language variant instead of "
+"issuing the error if that variant is available.  If unavailable, the 606 "
+"error is raised anyway, so you need to make sure that all documents are "
+"available at least in the default language variant if you want to avoid 606 "
+"errors completely."
+msgstr ""
+"Definiuje język (małe ISO 639-1 Alfa-2 kod)do użycia kiedy serwer nie "
+"potrafi znaleźć odpowiedniego języka. Jeśli nie zostało ustwanione, (co jest "
+"domyślnie), serwer będzie miał problem HTTP 606 (Niedozwolony), gdy dokument "
+"nie jest dostępny w żadnym z wymaganych języków. Strona błędu może zawierać "
+"opis problemu i listę dostępnych wariantów językowych wymaganych dokumentów. "
+"Poszukiwania są oparte na ustawieniach  przeglądarki użytkownika języka "
+"przejdź do \"Accept-Language header\" HTTP. Jeśli jest ustawiona, Wiking "
+"automatycznie ustawi język zamiast pokazywać błąd, jeśli ten wariant jest "
+"dostępny. Jeśli jest to  niemożliwe, błąd  606 będzie występował tak czy "
+"inaczej, tak, więc trzeba się upewnić, że wszystkie dokumenty są dostępne  w "
+"wariancie języka domyślnego, jeżeli chcesz uniknąć błędów 606 całkowicie."
+
+#. Translators: Yes/No configuration option label. Should the login panel display user role (as Admin, Student, Tutor etc.)
+#: ../lib/wiking/configuration.py:378
+msgid "Display role in login panel"
+msgstr "Pokaż pozycje użytkownika"
+
+#: ../lib/wiking/configuration.py:379
+#, fuzzy
+msgid ""
+"If enabled, the login panel on each page will not display only the current "
+"username, but also his current user role, which affects his permissions."
+msgstr ""
+"Po włączeniu, panel logowania będzie wyświetlać zarówno obeceną nazwe "
+"użytkownika, ale również jego role (np. administrator, użytkownik, student "
+"itd.)"
+
+#: ../lib/wiking/configuration.py:397
+msgid "Whether to use e-mails as login names"
+msgstr "Czy używać e-mailu jako loginu"
+
+#: ../lib/wiking/configuration.py:398
+msgid "Iff true, users must use e-mail addresses as their login names."
+msgstr "Jeśli prawdziwy, użytkownicy muszą użyć adresu e-mail jako loginu."
+
+#: ../lib/wiking/configuration.py:412
+msgid ""
+"If set, the newly registered users will be automatically approved without "
+"any administrator's action.  The adminstrator may still need to asign users "
+"to groups to grant them further privileges, but the accounts are enabled "
+"right after the user confirms the registration code."
+msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "The first step of your registration at %(server_hostname)s was "
+#~ "successfully completed.\n"
+#~ "\n"
+#~ "For the next step visit the following URL and follow the instructions "
+#~ "there:\n"
+#~ "%(uri)s\n"
+#~ "\n"
+#~ "If the above link fails, you will be prompted for your activation code "
+#~ "when\n"
+#~ "you attempt to log in.\n"
+#~ "\n"
+#~ "Your activation code is: %(code)s\n"
+#~ msgstr ""
+#~ "Pierwszy etap rejestracji w %(server_hostname)s został pomyślnie "
+#~ "zakończony.\n"
+#~ "\n"
+#~ "Odwiedź następujący adres URL i postępuj zgodnie z instrukcjami:\n"
+#~ "%(uri)s\n"
+
+#~ msgid "Registration accepted."
+#~ msgstr "Rejestracja przebiegła pomyślnie."
+
+#~ msgid "Please, check your mailbox for instructions how to proceed."
+#~ msgstr ""
+#~ "Sprawdź swoją skrzynkę pocztową i postępuj zgodnie z instrukcją którą tam "
+#~ "znajdziesz."
+
+#~ msgid "Activation code was sent to %s."
+#~ msgstr "Kod aktywacyjny został wysłany do %s."
+
 #~ msgid "Private"
 #~ msgstr "Prywatny"
 
diff --git a/translations/wiking-cms.po.po b/translations/wiking-cms.po.po
index becea91..5c9eade 100644
--- a/translations/wiking-cms.po.po
+++ b/translations/wiking-cms.po.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-16 19:35+0200\n"
+"POT-Creation-Date: 2010-10-16 13:26+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Petr Topiarz <topiarz at post.cz>\n"
 "Language-Team: \n"
@@ -10,129 +10,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/wiking/configuration.py:194
-msgid "Webmaster's e-mail address"
-msgstr "Endereço de email do administrador"
-
-#: ../lib/wiking/configuration.py:205
-msgid "Default sender address"
-msgstr "Endereço de email do utente"
-
-#: ../lib/wiking/configuration.py:222
-msgid "Force HTTPS login"
-msgstr "Pede HTTPS para fazer login"
-
-#: ../lib/wiking/configuration.py:223
-msgid ""
-"If enabled, the login form will always be redirected to an HTTPS address to "
-"ensure the security of the submitted credentials.  This, however, requires "
-"your server to be setup to accept HTTPS requests for the same virtual host "
-"and pass them to Wiking."
-msgstr ""
-"Se activado, o login de acesso será sempre dirigido a um endereço HTTPS para "
-"garantir a segurança dos dados de conexão transmitida. Este, no entanto, "
-"pede a configuração do servidor para manipulação de pedidos HTTPS pelo mesmo "
-"servidor e para passar os pedidos ao sistema Wiking."
-
-#. Translators: Site means a webpage or web application.
-#: ../lib/wiking/configuration.py:276
-msgid "Site title"
-msgstr "Título do site"
-
-#: ../lib/wiking/configuration.py:277
-msgid ""
-"Site title is a short and (hopefully) unique title of the whole website. It "
-"will appear at the top of every page."
-msgstr ""
-"Este título deveria indicat brevemente o interior do site. O título será "
-"visualizato no inicio de cada página."
-
-#. Translators: Site means a webpage or web application. Subtitle as in ,,title -- subtitle''.
-#: ../lib/wiking/configuration.py:283
-msgid "Site subtitle"
-msgstr "Site legendado"
-
-#: ../lib/wiking/configuration.py:284
-msgid ""
-"Site subtitle is an optional more descriptive title of the website.  It will "
-"appear at the top of every page together with site title, but where brevity "
-"matters, only title will be used."
-msgstr ""
-"A legendagem é uma definição do site mais detalhada mas não obrigatória. "
-"Será visualizado no ínicio de cada página, mas se houver problemas, só o "
-"título será usado."
-
-#. Translators: Web page or web application specific image.
-#: ../lib/wiking/configuration.py:291
-msgid "Site icon"
-msgstr "Título do site"
-
-#: ../lib/wiking/configuration.py:305
-msgid "Default language"
-msgstr "Lingua de referimento"
-
-#. Translators: Language negotiation means the process where the server is trying
-#. to find a language that matches with what the users internet browser asks for.
-#: ../lib/wiking/configuration.py:308
-msgid ""
-"Defines the language (lowercase ISO 639-1 Alpha-2 code) to be used when "
-"content language negotiation fails. If not set (which is the default), the "
-"server will issue a 606 HTTP error (Not acceptable) when the document is not "
-"available in any of the requested languages. The error page will contain a "
-"description of the problem and a list of available language variants of the "
-"requested document. The negotiation is based on the browser setting of "
-"user's language preference passed through the 'Accept-Language' HTTP header. "
-"If set, Wiking will automatically serve given language variant instead of "
-"issuing the error if that variant is available.  If unavailable, the 606 "
-"error is raised anyway, so you need to make sure that all documents are "
-"available at least in the default language variant if you want to avoid 606 "
-"errors completely."
-msgstr ""
-"Define a linguagem (minusculo ISO 639-1 Alpha-2 code) a usar se a negociação "
-"da língua falhar. Se não for predefinido, o servidor enviará um erro ao 606  "
-"HTTO (não aceite) quando o documento não está disponível em nenhuma das "
-"línguas pedidas. A pagina de erro deverá conter uma descrição do problema e "
-"uma lista das variantes de língua e disponibilidade do documento pedido. O "
-"negociação é baseada na configuração do browser da língua selecionada pelo "
-"utente enviada através do 'Accept-Language' HTTP texto\". Se aceite, "
-"predefinido, o Wiking utiliza automaticamente a versão da língua escolhida, "
-"em vez de fazer erro, se a versão estiver disponível. Se não estiver, o erro "
-"606 surgirá, e será necessário certificar-se que todos os documentos estão "
-"disponíveis em alguma língua, para evitar completamente o erro."
-
-#. Translators: Yes/No configuration option label. Should the login panel display user role (as Admin, Student, Tutor etc.)
-#: ../lib/wiking/configuration.py:378
-msgid "Display role in login panel"
-msgstr "Visualiza o papel no painel control "
-
-#: ../lib/wiking/configuration.py:379
-#, fuzzy
-msgid ""
-"If enabled, the login panel on each page will not display only the current "
-"username, but also his current user role, which affects his permissions."
-msgstr ""
-"Se permitido, o painel control do longin será visualizado em cada página "
-"para além do nome de utente e a descrição do seu papel no sistema, terá "
-"efeitos na utilização do mesmo"
-
-#: ../lib/wiking/configuration.py:397
-msgid "Whether to use e-mails as login names"
-msgstr "Utiliza endereço de email como nome de utente"
-
-#: ../lib/wiking/configuration.py:398
-msgid "Iff true, users must use e-mail addresses as their login names."
-msgstr ""
-"Em caso de verdade, os utentes devem usar o endereço de email e os seus "
-"nomes de acesso."
-
-#: ../lib/wiking/configuration.py:412
-msgid ""
-"If set, the newly registered users will be automatically approved without "
-"any administrator's action.  The adminstrator may still need to asign users "
-"to groups to grant them further privileges, but the accounts are enabled "
-"right after the user confirms the registration code."
-msgstr ""
-
 #: ../lib/wiking/cms/appl.py:53
 msgid "Manage this site"
 msgstr "Administradores do site "
@@ -149,140 +26,6 @@ msgstr "Deixa a administração do site"
 msgid "Wiking Management Interface"
 msgstr "Administração do site"
 
-#. Translators: Yes/No configuration option label. Should the login panel be visible?
-#: ../lib/wiking/cms/configuration.py:36
-msgid "Allow login panel"
-msgstr "Visualiza painel de acesso"
-
-#: ../lib/wiking/cms/configuration.py:37
-msgid ""
-"If enabled, the information about the currently logged user and login/logout "
-"controls will be present on each page as a separate panel.  This panel will "
-"always be the first panel on the page."
-msgstr ""
-"Se activa, a informação relativa ao utente actualmente conectado e login/"
-"logout serão visualizadas em cada pagina como um quadro separado. Este "
-"quadro será sempre o primeiro da página."
-
-#. Translators: Yes/No configuration option label. Should link to WMI be visible?  "WMI"
-#. stands for Wiking Management Interface.  Don't feel obliged to use an abbreviation.  Use
-#. whatever brief form obviously referning to whatever translation you used for "Wiking
-#. Management Interface".
-#: ../lib/wiking/cms/configuration.py:47
-msgid "Allow WMI link"
-msgstr "Aceita o link WMI"
-
-#. Translators: Yes/no configuration label. Can new users register to this
-#. website/application?
-#: ../lib/wiking/cms/configuration.py:55
-msgid "Allow new user registration"
-msgstr "Permitir registro de novos utentes"
-
-#: ../lib/wiking/cms/configuration.py:56
-msgid ""
-"If enabled, all visitors are allowed to create a user account.  If disabled, "
-"new user accounts must be created by administrator.  Note, that the newly "
-"created accounts are inactive (at least with the default implementation of "
-"the user management module), so the creation of the account doesn't give the "
-"user any actual privileges."
-msgstr ""
-"Se activo, todos os visitantes estão autorizados a criar uma conta de "
-"utente. Se desactivo, todas as novas contas devem ser criadas pelo "
-"administrador. Atenção, todas as novas contas criadas serão desativadas ( a "
-"menos que predefinida no módulo de gestão do utente) ou seja a criação de "
-"uma nova conta não dá eventuais privilégios ao utente."
-
-#. Translators: Maximal size an uploaded file can have.
-#: ../lib/wiking/cms/configuration.py:65
-msgid "Maximal upload size"
-msgstr "Dimensão máxima para upload"
-
-#: ../lib/wiking/cms/configuration.py:66
-msgid ""
-"The maximal size of uploaded files in bytes.  The server needs to be "
-"relaoded for the changes in this option to take effect."
-msgstr ""
-"Dimensão máxima dos ficheiros no site em bytes. Atenção para validar as "
-"modificações efectuadas, precisa reiniciar o sistema."
-
-#. Translators: Web form label (account in the meaning of user account)
-#: ../lib/wiking/cms/texts.py:29
-msgid "Information about a locked account"
-msgstr ""
-
-#. Translators: Text presented to a user in a web page
-#: ../lib/wiking/cms/texts.py:31
-msgid ""
-"Your account is currently disabled.\n"
-"\n"
-"The protected services are not available to you.\n"
-"Contact the application administrator to get the account enabled."
-msgstr ""
-
-#. Translators: Web form label
-#: ../lib/wiking/cms/texts.py:39
-#, fuzzy
-msgid "Information about an account waiting for activation code confirmation"
-msgstr "Confirma a conta sem verificar o código de activação"
-
-#. Translators: Text presented to a user in a web page
-#: ../lib/wiking/cms/texts.py:41
-msgid ""
-"Your account is inactive because\n"
-"you have not yet confirmed the activation code sent to you by e-mail.\n"
-"\n"
-"Please, check your e-mail and follow the provided link or enter the\n"
-"activation code into the field below.\n"
-"\n"
-"You can also continue without entering the activation code, but\n"
-"the protected services will not be available to you."
-msgstr ""
-
-#. Translators: Web form label
-#: ../lib/wiking/cms/texts.py:53
-#, fuzzy
-msgid "Information about an account waiting for admin approval"
-msgstr "Registos não aprovados (pendentes da decisao do administrador)"
-
-#. Translators: Text presented to a user in a web page
-#: ../lib/wiking/cms/texts.py:55
-msgid ""
-"Your account is waiting for approval by the administrator.\n"
-"                  \n"
-"The protected services are not available until the account gets approved.\n"
-"If the account remains unapproved for a long time, contact the application "
-"administrator."
-msgstr ""
-
-#: ../lib/wiking/cms/texts.py:62
-msgid "Introductory text displayed above the registration form"
-msgstr ""
-
-#: ../lib/wiking/cms/texts.py:67
-msgid "Text displayed after successful user registration"
-msgstr ""
-
-#: ../lib/wiking/cms/texts.py:69
-msgid ""
-"Registration completed successfuly. Your account is now fully functional but "
-"you may need to get futher privileges by the administrator to access certain "
-"restricted services."
-msgstr ""
-
-#: ../lib/wiking/cms/texts.py:74
-msgid ""
-"Registration completed successfuly. Your account now awaits administrator's "
-"approval."
-msgstr ""
-"Registo concuído com êxito! A sua conta precisa de ser aprovada pelo "
-"administrador."
-
-#: ../lib/wiking/cms/texts.py:79
-msgid ""
-"Information displayed above the checkbox for confirmation of site specific "
-"conditions during registration (if empty, no confirmation is required)"
-msgstr ""
-
 #: ../lib/wiking/cms/cms.py:61
 msgid "formatting manual"
 msgstr "Manual de formatação"
@@ -390,7 +133,7 @@ msgstr "Envia de novo o código de activação"
 
 #. Translators: Button name. Computer terminology. Use an appropriate term common
 #. for submitting forms in a computer application.
-#: ../lib/wiking/cms/cms.py:496 ../lib/wiking/cms/users.py:1142
+#: ../lib/wiking/cms/cms.py:496 ../lib/wiking/cms/users.py:1171
 msgid "Submit"
 msgstr "Entrar"
 
@@ -402,7 +145,7 @@ msgstr ""
 msgid "Account disabled"
 msgstr "Conta desactiva"
 
-#: ../lib/wiking/cms/cms.py:533 ../lib/wiking/cms/users.py:814
+#: ../lib/wiking/cms/cms.py:533 ../lib/wiking/cms/users.py:819
 #, fuzzy
 msgid "Account not activated"
 msgstr "Conta desactiva"
@@ -744,7 +487,7 @@ msgstr "Gere os motivos de cores disponíveis."
 
 #. Translators: Table column heading. Whether the account is active. Values are yes/no.
 #: ../lib/wiking/cms/cms.py:897 ../lib/wiking/cms/cms.py:1987
-#: ../lib/wiking/cms/users.py:1262
+#: ../lib/wiking/cms/users.py:1291
 msgid "Active"
 msgstr "Activo"
 
@@ -1042,7 +785,7 @@ msgstr ""
 #. Translators: Button label. Use standard computer terminology.
 #. Translators: Back button label. Standard computer terminology.
 #: ../lib/wiking/cms/cms.py:1212 ../lib/wiking/cms/cms.py:1572
-#: ../lib/wiking/cms/users.py:900
+#: ../lib/wiking/cms/users.py:905
 msgid "Back"
 msgstr "Atrás"
 
@@ -1493,6 +1236,140 @@ msgstr "Usa como modelo"
 msgid "Edit this mail for repeated use"
 msgstr "Insere este email para uso contínuo"
 
+#. Translators: Yes/No configuration option label. Should the login panel be visible?
+#: ../lib/wiking/cms/configuration.py:36
+msgid "Allow login panel"
+msgstr "Visualiza painel de acesso"
+
+#: ../lib/wiking/cms/configuration.py:37
+msgid ""
+"If enabled, the information about the currently logged user and login/logout "
+"controls will be present on each page as a separate panel.  This panel will "
+"always be the first panel on the page."
+msgstr ""
+"Se activa, a informação relativa ao utente actualmente conectado e login/"
+"logout serão visualizadas em cada pagina como um quadro separado. Este "
+"quadro será sempre o primeiro da página."
+
+#. Translators: Yes/No configuration option label. Should link to WMI be visible?  "WMI"
+#. stands for Wiking Management Interface.  Don't feel obliged to use an abbreviation.  Use
+#. whatever brief form obviously referning to whatever translation you used for "Wiking
+#. Management Interface".
+#: ../lib/wiking/cms/configuration.py:47
+msgid "Allow WMI link"
+msgstr "Aceita o link WMI"
+
+#. Translators: Yes/no configuration label. Can new users register to this
+#. website/application?
+#: ../lib/wiking/cms/configuration.py:55
+msgid "Allow new user registration"
+msgstr "Permitir registro de novos utentes"
+
+#: ../lib/wiking/cms/configuration.py:56
+msgid ""
+"If enabled, all visitors are allowed to create a user account.  If disabled, "
+"new user accounts must be created by administrator.  Note, that the newly "
+"created accounts are inactive (at least with the default implementation of "
+"the user management module), so the creation of the account doesn't give the "
+"user any actual privileges."
+msgstr ""
+"Se activo, todos os visitantes estão autorizados a criar uma conta de "
+"utente. Se desactivo, todas as novas contas devem ser criadas pelo "
+"administrador. Atenção, todas as novas contas criadas serão desativadas ( a "
+"menos que predefinida no módulo de gestão do utente) ou seja a criação de "
+"uma nova conta não dá eventuais privilégios ao utente."
+
+#. Translators: Maximal size an uploaded file can have.
+#: ../lib/wiking/cms/configuration.py:65
+msgid "Maximal upload size"
+msgstr "Dimensão máxima para upload"
+
+#: ../lib/wiking/cms/configuration.py:66
+msgid ""
+"The maximal size of uploaded files in bytes.  The server needs to be "
+"relaoded for the changes in this option to take effect."
+msgstr ""
+"Dimensão máxima dos ficheiros no site em bytes. Atenção para validar as "
+"modificações efectuadas, precisa reiniciar o sistema."
+
+#. Translators: Web form label (account in the meaning of user account)
+#: ../lib/wiking/cms/texts.py:29
+msgid "Information about a locked account"
+msgstr ""
+
+#. Translators: Text presented to a user in a web page
+#: ../lib/wiking/cms/texts.py:31
+msgid ""
+"Your account is currently disabled.\n"
+"\n"
+"The protected services are not available to you.\n"
+"Contact the application administrator to get the account enabled."
+msgstr ""
+
+#. Translators: Web form label
+#: ../lib/wiking/cms/texts.py:39
+#, fuzzy
+msgid "Information about an account waiting for activation code confirmation"
+msgstr "Confirma a conta sem verificar o código de activação"
+
+#. Translators: Text presented to a user in a web page
+#: ../lib/wiking/cms/texts.py:41
+msgid ""
+"Your account is inactive because\n"
+"you have not yet confirmed the activation code sent to you by e-mail.\n"
+"\n"
+"Please, check your e-mail and follow the provided link or enter the\n"
+"activation code into the field below.\n"
+"\n"
+"You can also continue without entering the activation code, but\n"
+"the protected services will not be available to you."
+msgstr ""
+
+#. Translators: Web form label
+#: ../lib/wiking/cms/texts.py:53
+#, fuzzy
+msgid "Information about an account waiting for admin approval"
+msgstr "Registos não aprovados (pendentes da decisao do administrador)"
+
+#. Translators: Text presented to a user in a web page
+#: ../lib/wiking/cms/texts.py:55
+msgid ""
+"Your account is waiting for approval by the administrator.\n"
+"                  \n"
+"The protected services are not available until the account gets approved.\n"
+"If the account remains unapproved for a long time, contact the application "
+"administrator."
+msgstr ""
+
+#: ../lib/wiking/cms/texts.py:62
+msgid "Introductory text displayed above the registration form"
+msgstr ""
+
+#: ../lib/wiking/cms/texts.py:67
+msgid "Text displayed after successful user registration"
+msgstr ""
+
+#: ../lib/wiking/cms/texts.py:69
+msgid ""
+"Registration completed successfuly. Your account is now fully functional but "
+"you may need to get futher privileges by the administrator to access certain "
+"restricted services."
+msgstr ""
+
+#: ../lib/wiking/cms/texts.py:74
+msgid ""
+"Registration completed successfuly. Your account now awaits administrator's "
+"approval."
+msgstr ""
+"Registo concuído com êxito! A sua conta precisa de ser aprovada pelo "
+"administrador."
+
+#: ../lib/wiking/cms/texts.py:79
+msgid ""
+"Information displayed above the checkbox for confirmation of site specific "
+"conditions during registration (if empty, no confirmation is required)"
+msgstr ""
+
 #: ../lib/wiking/cms/users.py:57 ../lib/wiking/cms/users.py:148
 msgid "Group"
 msgstr ""
@@ -1520,7 +1397,7 @@ msgid "User Roles"
 msgstr "Utentes"
 
 #: ../lib/wiking/cms/users.py:149 ../lib/wiking/cms/users.py:434
-#: ../lib/wiking/cms/users.py:1252
+#: ../lib/wiking/cms/users.py:1281
 msgid "User"
 msgstr "Utente"
 
@@ -1601,7 +1478,7 @@ msgid "Manage registered users and their privileges."
 msgstr "Gere os utentes registados e a sua autorização."
 
 #. Translators: Login name for a website. Registration form field.
-#: ../lib/wiking/cms/users.py:408 ../lib/wiking/cms/users.py:1210
+#: ../lib/wiking/cms/users.py:408 ../lib/wiking/cms/users.py:1239
 msgid "Login name"
 msgstr "Nome utente"
 
@@ -1613,7 +1490,7 @@ msgstr ""
 "Um nome de utente válido pode conter letras, números, traços, underscore, "
 "pontos  mas deve começar por uma letra."
 
-#: ../lib/wiking/cms/users.py:413 ../lib/wiking/cms/users.py:1211
+#: ../lib/wiking/cms/users.py:413 ../lib/wiking/cms/users.py:1240
 msgid "Password"
 msgstr "Palavra-passe"
 
@@ -1808,12 +1685,12 @@ msgid "User's Groups"
 msgstr ""
 
 #. Translators: Heading for an overview when and how the user has accessed the application.
-#: ../lib/wiking/cms/users.py:530 ../lib/wiking/cms/users.py:1247
+#: ../lib/wiking/cms/users.py:530 ../lib/wiking/cms/users.py:1276
 msgid "Login History"
 msgstr "Historial de acessos"
 
 #. Translators: Name of group of users who have full access to the system.
-#: ../lib/wiking/cms/users.py:538 ../lib/wiking/cms/users.py:1110
+#: ../lib/wiking/cms/users.py:538 ../lib/wiking/cms/users.py:1130
 msgid "Active users"
 msgstr "Utentes activos"
 
@@ -1909,154 +1786,138 @@ msgid "Active account"
 msgstr "Nova Conta"
 
 #. Translators: Personal data -- first name, surname, nickname ...
-#: ../lib/wiking/cms/users.py:648 ../lib/wiking/cms/users.py:654
-#: ../lib/wiking/cms/users.py:675
+#: ../lib/wiking/cms/users.py:658 ../lib/wiking/cms/users.py:664
+#: ../lib/wiking/cms/users.py:685
 msgid "Personal data"
 msgstr "Dados pessoais"
 
 #. Translators: Contact information -- email, phone, address...
-#: ../lib/wiking/cms/users.py:650 ../lib/wiking/cms/users.py:655
-#: ../lib/wiking/cms/users.py:676
+#: ../lib/wiking/cms/users.py:660 ../lib/wiking/cms/users.py:665
+#: ../lib/wiking/cms/users.py:686
 msgid "Contact information"
 msgstr "Informação contactos"
 
 #. Translators: Others is a label for a group of unspecified form fields
 #. (as in Personal data, Contact information, Others).
-#: ../lib/wiking/cms/users.py:653 ../lib/wiking/cms/users.py:656
-#: ../lib/wiking/cms/users.py:681
+#: ../lib/wiking/cms/users.py:663 ../lib/wiking/cms/users.py:666
+#: ../lib/wiking/cms/users.py:691
 msgid "Others"
 msgstr "Outros"
 
-#: ../lib/wiking/cms/users.py:657
+#: ../lib/wiking/cms/users.py:667
 #, fuzzy
 msgid "Account state"
 msgstr "Conta desactiva"
 
 #. Translators: Button label.
-#: ../lib/wiking/cms/users.py:662
+#: ../lib/wiking/cms/users.py:672
 msgid "New user"
 msgstr "Novo utlizador"
 
 #. Translators: Button label.
-#: ../lib/wiking/cms/users.py:664
+#: ../lib/wiking/cms/users.py:674
 msgid "Edit profile"
 msgstr "Editar perfil "
 
 #. Translators: Button label. Modify the users data (email, address...)
-#: ../lib/wiking/cms/users.py:666
+#: ../lib/wiking/cms/users.py:676
 msgid "Modify user's record"
 msgstr "Modificar registro utente"
 
-#: ../lib/wiking/cms/users.py:679
+#: ../lib/wiking/cms/users.py:689
 msgid "Login information"
 msgstr "Login informação"
 
-#: ../lib/wiking/cms/users.py:712
+#: ../lib/wiking/cms/users.py:722
 msgid "Enter your current password."
 msgstr "Insere a actual palavra-passe."
 
-#: ../lib/wiking/cms/users.py:716
+#: ../lib/wiking/cms/users.py:726
 msgid "Invalid password."
 msgstr "Palavra-passe inválida."
 
-#: ../lib/wiking/cms/users.py:720
+#: ../lib/wiking/cms/users.py:730
 msgid "Enter the new password."
 msgstr "Insere nova palavra-passe."
 
-#: ../lib/wiking/cms/users.py:728
+#: ../lib/wiking/cms/users.py:738
 msgid "The new password is the same as the old one."
 msgstr "A nova palavra-passe é a mesma da antiga."
 
-#: ../lib/wiking/cms/users.py:753
-#, fuzzy, python-format
+#: ../lib/wiking/cms/users.py:763
+#, python-format
 msgid ""
-"The first step of your registration at %(server_hostname)s was successfully "
-"completed.\n"
-"\n"
-"For the next step visit the following URL and follow the instructions "
-"there:\n"
+"To finish your registration at %(server_hostname)s, click on the following "
+"link:\n"
 "%(uri)s\n"
 "\n"
-"If the above link fails, you will be prompted for your activation code when\n"
-"you attempt to log in.\n"
-"\n"
-"Your activation code is: %(code)s\n"
 msgstr ""
-"O primeiro passo para o teu registo em %(server_hostname)s foi concluído com "
-"êxito..\n"
-"\n"
-"Para o passo seguinte consulte o seguinte URL e siga as intruções em :\n"
-"%(uri)s\n"
-
-#: ../lib/wiking/cms/users.py:768
-msgid "Registration accepted."
-msgstr "Registo aceite."
 
-#: ../lib/wiking/cms/users.py:769
-msgid "Please, check your mailbox for instructions how to proceed."
-msgstr "Por favor, consulte o seu email para mais instruçoes e como proceder."
-
-#: ../lib/wiking/cms/users.py:773
+#: ../lib/wiking/cms/users.py:776
 msgid "Registration cancelled."
 msgstr "Registro cancelado."
 
-#: ../lib/wiking/cms/users.py:779
+#: ../lib/wiking/cms/users.py:782
 #, python-format
 msgid "Your registration at %s"
 msgstr "O seu registo em %s"
 
-#: ../lib/wiking/cms/users.py:783 ../lib/wiking/cms/users.py:835
-#: ../lib/wiking/cms/users.py:885 ../lib/wiking/cms/users.py:1218
+#: ../lib/wiking/cms/users.py:786 ../lib/wiking/cms/users.py:840
+#: ../lib/wiking/cms/users.py:890 ../lib/wiking/cms/users.py:1247
 msgid "Failed sending e-mail notification:"
 msgstr "Envio de email falhou:"
 
 #. Translators: Follows an email addres, e.g. ``Activation code was sent to joe at brailcom.org''
-#: ../lib/wiking/cms/users.py:787
-#, python-format
-msgid "Activation code was sent to %s."
-msgstr "O código de activação foi enviado para %s."
+#: ../lib/wiking/cms/users.py:790
+#, fuzzy, python-format
+msgid ""
+"To finish registration, please confirm the activation code that was sent to "
+"your email address at %(email)s."
+msgstr ""
+"O registo expira em %(date)s. O utente não confirmou a activação do código "
+"para o email solicitado, a tempo."
 
-#: ../lib/wiking/cms/users.py:810
+#: ../lib/wiking/cms/users.py:815
 msgid "User registration already confirmed."
 msgstr "Registo do utente já foi confirmado."
 
-#: ../lib/wiking/cms/users.py:813
+#: ../lib/wiking/cms/users.py:818
 msgid "Invalid activation code."
 msgstr "Código de activação inválido."
 
-#: ../lib/wiking/cms/users.py:821
+#: ../lib/wiking/cms/users.py:826
 #, fuzzy, python-format
 msgid "New user %(fullname)s registered at %(server_hostname)s."
 msgstr ""
 "Novo utente %(fullname)s registado em  %(server_hostname)s. Por favor, "
 "confirme a seu registo: %(uri)s"
 
-#: ../lib/wiking/cms/users.py:825
+#: ../lib/wiking/cms/users.py:830
 msgid "The account was approved automatically according to server setup."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:828
+#: ../lib/wiking/cms/users.py:833
 #, fuzzy
 msgid "Please approve the account:"
 msgstr "Permitir esta conta"
 
-#: ../lib/wiking/cms/users.py:832
+#: ../lib/wiking/cms/users.py:837
 msgid "New user registration:"
 msgstr "Registro de novo utente:"
 
-#: ../lib/wiking/cms/users.py:838
+#: ../lib/wiking/cms/users.py:843
 msgid "E-mail notification has been sent to server administrator."
 msgstr "Email de notificação foi enviado para o adminstrador."
 
-#: ../lib/wiking/cms/users.py:866
+#: ../lib/wiking/cms/users.py:871
 msgid "Registration confirmed"
 msgstr "Registro confirmado"
 
-#: ../lib/wiking/cms/users.py:877
+#: ../lib/wiking/cms/users.py:882
 msgid "The account was enabled."
 msgstr "A conta foi permitida."
 
-#: ../lib/wiking/cms/users.py:879
+#: ../lib/wiking/cms/users.py:884
 #, python-format
 msgid ""
 "Your account at %(uri)s has been enabled. Please log in with username '%"
@@ -2065,35 +1926,35 @@ msgstr ""
 "A tua conta em  %(uri)s foi criada. Acede com o teu nome de utente '%(login)"
 "s' e a tua password."
 
-#: ../lib/wiking/cms/users.py:882
+#: ../lib/wiking/cms/users.py:887
 msgid "Your account has been enabled."
 msgstr "A tua conta foi criada."
 
-#: ../lib/wiking/cms/users.py:887
+#: ../lib/wiking/cms/users.py:892
 msgid "E-mail notification has been sent to:"
 msgstr "O email de notificação foi enviado para:"
 
-#: ../lib/wiking/cms/users.py:889
+#: ../lib/wiking/cms/users.py:894
 #, fuzzy
 msgid "The account was disabled."
 msgstr "A conta foi permitida."
 
-#: ../lib/wiking/cms/users.py:895
+#: ../lib/wiking/cms/users.py:900
 #, fuzzy, python-format
 msgid "The registration expired on %(date)s."
 msgstr "Registo do utente já foi confirmado."
 
-#: ../lib/wiking/cms/users.py:898
+#: ../lib/wiking/cms/users.py:903
 #, fuzzy
 msgid "Continue"
 msgstr "Conteúdo"
 
-#: ../lib/wiking/cms/users.py:902
+#: ../lib/wiking/cms/users.py:907
 #, fuzzy
 msgid "The registration code was not confirmed by the user!"
 msgstr "Registo do utente já foi confirmado."
 
-#: ../lib/wiking/cms/users.py:903
+#: ../lib/wiking/cms/users.py:908
 #, fuzzy
 msgid ""
 "Please enable the account only if you are sure that the e-mail address "
@@ -2102,44 +1963,48 @@ msgstr ""
 "Por favor confirme a conta, mas só se tem a certeza que esse email pertence "
 "a esse utente."
 
-#: ../lib/wiking/cms/users.py:1111
+#: ../lib/wiking/cms/users.py:1131
 msgid "Listing of all active user accounts."
 msgstr "Mostrar lista de utentes activos."
 
-#: ../lib/wiking/cms/users.py:1138
+#: ../lib/wiking/cms/users.py:1142
+msgid "Users who have `confirm' flag set"
+msgstr ""
+
+#: ../lib/wiking/cms/users.py:1167
 msgid "Enter your login name or e-mail address"
 msgstr "Insere o teu nome de utente e o teu endereço de email "
 
-#: ../lib/wiking/cms/users.py:1173
+#: ../lib/wiking/cms/users.py:1202
 msgid "Password reminder"
 msgstr "Esqueceu palavra-passe? "
 
-#: ../lib/wiking/cms/users.py:1186
+#: ../lib/wiking/cms/users.py:1215
 msgid "Multiple user accounts found for given email address."
 msgstr "Para este email foram encontrados outros utentes."
 
-#: ../lib/wiking/cms/users.py:1187
+#: ../lib/wiking/cms/users.py:1216
 msgid "Please, select the account for which you want to remind:"
 msgstr ""
 "Por favor, selecione a conta para a qual quer usufruir das funçoes de "
 "reminder:"
 
 #. Translators: Credentials such as password...
-#: ../lib/wiking/cms/users.py:1200
+#: ../lib/wiking/cms/users.py:1229
 msgid "Your credentials were reset to:"
 msgstr "Os teus dados de acesso foram predefinidos a:"
 
 #. Translators: Credentials such as password...
-#: ../lib/wiking/cms/users.py:1204
+#: ../lib/wiking/cms/users.py:1233
 msgid "Your credentials are:"
 msgstr "Os teus dados de acesso são:"
 
-#: ../lib/wiking/cms/users.py:1206
+#: ../lib/wiking/cms/users.py:1235
 #, python-format
 msgid "A password reminder request has been made at %(server_uri)s."
 msgstr "Foi enviado um pedido de palavra passe esquecida para %(server_uri)s."
 
-#: ../lib/wiking/cms/users.py:1213
+#: ../lib/wiking/cms/users.py:1242
 msgid ""
 "We strongly recommend you change your password at nearest occassion, since "
 "it has been exposed to an unsecure channel."
@@ -2147,64 +2012,218 @@ msgstr ""
 "Aconselhamos-te a mudar rapidamente a tua palavra passe, a partir do momento "
 "que foi exposta num canal não protegido."
 
-#: ../lib/wiking/cms/users.py:1219
+#: ../lib/wiking/cms/users.py:1248
 msgid "Please try repeating your request later or contact the administrator!"
 msgstr "Por favor, tente o seu pedido mais tarde, ou contacte o administrador!"
 
-#: ../lib/wiking/cms/users.py:1221
+#: ../lib/wiking/cms/users.py:1250
 msgid "E-mail information has been sent to your email address."
 msgstr "Email de notificação foi enviado para o teu endereço de email."
 
-#: ../lib/wiking/cms/users.py:1224
+#: ../lib/wiking/cms/users.py:1253
 msgid "No user account for your query."
 msgstr "Nennhuma conta corresponde ao teu pedido."
 
-#: ../lib/wiking/cms/users.py:1248
+#: ../lib/wiking/cms/users.py:1277
 msgid "History of successful login sessions and unsuccessful login attempts."
 msgstr ""
 "Historial de acessos conseguidos com êxito e tentativas de acesso falhado."
 
 #. Translators: Login name.
-#: ../lib/wiking/cms/users.py:1254
+#: ../lib/wiking/cms/users.py:1283
 msgid "Login"
 msgstr "Login"
 
 #. Translators: Form field saying whether the users attempt was succesful. Values are Yes/No.
-#: ../lib/wiking/cms/users.py:1256
+#: ../lib/wiking/cms/users.py:1285
 msgid "Success"
 msgstr "Êxito"
 
 #. Translators: Table column heading. Time of the start of user session, followed by a date and time.
-#: ../lib/wiking/cms/users.py:1258
+#: ../lib/wiking/cms/users.py:1287
 msgid "Start time"
 msgstr "Hora de início"
 
 #. Translators: Table column heading. The length of user session. Contains time.
-#: ../lib/wiking/cms/users.py:1260
+#: ../lib/wiking/cms/users.py:1289
 msgid "Duration"
 msgstr "Duração"
 
-#: ../lib/wiking/cms/users.py:1263
+#: ../lib/wiking/cms/users.py:1292
 msgid "IP address"
 msgstr "Morada do IP"
 
 #. Translators: Internet name of the remote computer (computer terminology).
-#: ../lib/wiking/cms/users.py:1265
+#: ../lib/wiking/cms/users.py:1294
 msgid "Hostname"
 msgstr "Nome do computador"
 
 #. Translators: "User agent" is a generalized name for browser or more precisely the
 #. software which produced the HTTP request (was used to access the website).
-#: ../lib/wiking/cms/users.py:1268
+#: ../lib/wiking/cms/users.py:1297
 msgid "User agent"
 msgstr "Nome do agebnte"
 
 #. Translators: Meaning where the user came from. Computer terminology. Do not translate
 #. "HTTP" and if unsure, don't translate at all (it is a very technical term).
-#: ../lib/wiking/cms/users.py:1271
+#: ../lib/wiking/cms/users.py:1300
 msgid "HTTP Referer"
 msgstr "Original"
 
+#: ../lib/wiking/configuration.py:194
+msgid "Webmaster's e-mail address"
+msgstr "Endereço de email do administrador"
+
+#: ../lib/wiking/configuration.py:205
+msgid "Default sender address"
+msgstr "Endereço de email do utente"
+
+#: ../lib/wiking/configuration.py:222
+msgid "Force HTTPS login"
+msgstr "Pede HTTPS para fazer login"
+
+#: ../lib/wiking/configuration.py:223
+msgid ""
+"If enabled, the login form will always be redirected to an HTTPS address to "
+"ensure the security of the submitted credentials.  This, however, requires "
+"your server to be setup to accept HTTPS requests for the same virtual host "
+"and pass them to Wiking."
+msgstr ""
+"Se activado, o login de acesso será sempre dirigido a um endereço HTTPS para "
+"garantir a segurança dos dados de conexão transmitida. Este, no entanto, "
+"pede a configuração do servidor para manipulação de pedidos HTTPS pelo mesmo "
+"servidor e para passar os pedidos ao sistema Wiking."
+
+#. Translators: Site means a webpage or web application.
+#: ../lib/wiking/configuration.py:276
+msgid "Site title"
+msgstr "Título do site"
+
+#: ../lib/wiking/configuration.py:277
+msgid ""
+"Site title is a short and (hopefully) unique title of the whole website. It "
+"will appear at the top of every page."
+msgstr ""
+"Este título deveria indicat brevemente o interior do site. O título será "
+"visualizato no inicio de cada página."
+
+#. Translators: Site means a webpage or web application. Subtitle as in ,,title -- subtitle''.
+#: ../lib/wiking/configuration.py:283
+msgid "Site subtitle"
+msgstr "Site legendado"
+
+#: ../lib/wiking/configuration.py:284
+msgid ""
+"Site subtitle is an optional more descriptive title of the website.  It will "
+"appear at the top of every page together with site title, but where brevity "
+"matters, only title will be used."
+msgstr ""
+"A legendagem é uma definição do site mais detalhada mas não obrigatória. "
+"Será visualizado no ínicio de cada página, mas se houver problemas, só o "
+"título será usado."
+
+#. Translators: Web page or web application specific image.
+#: ../lib/wiking/configuration.py:291
+msgid "Site icon"
+msgstr "Título do site"
+
+#: ../lib/wiking/configuration.py:305
+msgid "Default language"
+msgstr "Lingua de referimento"
+
+#. Translators: Language negotiation means the process where the server is trying
+#. to find a language that matches with what the users internet browser asks for.
+#: ../lib/wiking/configuration.py:308
+msgid ""
+"Defines the language (lowercase ISO 639-1 Alpha-2 code) to be used when "
+"content language negotiation fails. If not set (which is the default), the "
+"server will issue a 606 HTTP error (Not acceptable) when the document is not "
+"available in any of the requested languages. The error page will contain a "
+"description of the problem and a list of available language variants of the "
+"requested document. The negotiation is based on the browser setting of "
+"user's language preference passed through the 'Accept-Language' HTTP header. "
+"If set, Wiking will automatically serve given language variant instead of "
+"issuing the error if that variant is available.  If unavailable, the 606 "
+"error is raised anyway, so you need to make sure that all documents are "
+"available at least in the default language variant if you want to avoid 606 "
+"errors completely."
+msgstr ""
+"Define a linguagem (minusculo ISO 639-1 Alpha-2 code) a usar se a negociação "
+"da língua falhar. Se não for predefinido, o servidor enviará um erro ao 606  "
+"HTTO (não aceite) quando o documento não está disponível em nenhuma das "
+"línguas pedidas. A pagina de erro deverá conter uma descrição do problema e "
+"uma lista das variantes de língua e disponibilidade do documento pedido. O "
+"negociação é baseada na configuração do browser da língua selecionada pelo "
+"utente enviada através do 'Accept-Language' HTTP texto\". Se aceite, "
+"predefinido, o Wiking utiliza automaticamente a versão da língua escolhida, "
+"em vez de fazer erro, se a versão estiver disponível. Se não estiver, o erro "
+"606 surgirá, e será necessário certificar-se que todos os documentos estão "
+"disponíveis em alguma língua, para evitar completamente o erro."
+
+#. Translators: Yes/No configuration option label. Should the login panel display user role (as Admin, Student, Tutor etc.)
+#: ../lib/wiking/configuration.py:378
+msgid "Display role in login panel"
+msgstr "Visualiza o papel no painel control "
+
+#: ../lib/wiking/configuration.py:379
+#, fuzzy
+msgid ""
+"If enabled, the login panel on each page will not display only the current "
+"username, but also his current user role, which affects his permissions."
+msgstr ""
+"Se permitido, o painel control do longin será visualizado em cada página "
+"para além do nome de utente e a descrição do seu papel no sistema, terá "
+"efeitos na utilização do mesmo"
+
+#: ../lib/wiking/configuration.py:397
+msgid "Whether to use e-mails as login names"
+msgstr "Utiliza endereço de email como nome de utente"
+
+#: ../lib/wiking/configuration.py:398
+msgid "Iff true, users must use e-mail addresses as their login names."
+msgstr ""
+"Em caso de verdade, os utentes devem usar o endereço de email e os seus "
+"nomes de acesso."
+
+#: ../lib/wiking/configuration.py:412
+msgid ""
+"If set, the newly registered users will be automatically approved without "
+"any administrator's action.  The adminstrator may still need to asign users "
+"to groups to grant them further privileges, but the accounts are enabled "
+"right after the user confirms the registration code."
+msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "The first step of your registration at %(server_hostname)s was "
+#~ "successfully completed.\n"
+#~ "\n"
+#~ "For the next step visit the following URL and follow the instructions "
+#~ "there:\n"
+#~ "%(uri)s\n"
+#~ "\n"
+#~ "If the above link fails, you will be prompted for your activation code "
+#~ "when\n"
+#~ "you attempt to log in.\n"
+#~ "\n"
+#~ "Your activation code is: %(code)s\n"
+#~ msgstr ""
+#~ "O primeiro passo para o teu registo em %(server_hostname)s foi concluído "
+#~ "com êxito..\n"
+#~ "\n"
+#~ "Para o passo seguinte consulte o seguinte URL e siga as intruções em :\n"
+#~ "%(uri)s\n"
+
+#~ msgid "Registration accepted."
+#~ msgstr "Registo aceite."
+
+#~ msgid "Please, check your mailbox for instructions how to proceed."
+#~ msgstr ""
+#~ "Por favor, consulte o seu email para mais instruçoes e como proceder."
+
+#~ msgid "Activation code was sent to %s."
+#~ msgstr "O código de activação foi enviado para %s."
+
 #~ msgid "Private"
 #~ msgstr "Privado"
 
diff --git a/translations/wiking-cms.ro.po b/translations/wiking-cms.ro.po
index 8b313b2..4fb794d 100644
--- a/translations/wiking-cms.ro.po
+++ b/translations/wiking-cms.ro.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-16 19:35+0200\n"
+"POT-Creation-Date: 2010-10-16 13:26+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Petr Topiarz <topiarz at post.cz>\n"
 "Language-Team: \n"
@@ -10,132 +10,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/wiking/configuration.py:194
-msgid "Webmaster's e-mail address"
-msgstr "Adresa de e-mail a administratorului"
-
-#: ../lib/wiking/configuration.py:205
-msgid "Default sender address"
-msgstr "Implicit adresa expeditorului"
-
-#: ../lib/wiking/configuration.py:222
-msgid "Force HTTPS login"
-msgstr "Forţează HTTPS pentru autentificare"
-
-#: ../lib/wiking/configuration.py:223
-msgid ""
-"If enabled, the login form will always be redirected to an HTTPS address to "
-"ensure the security of the submitted credentials.  This, however, requires "
-"your server to be setup to accept HTTPS requests for the same virtual host "
-"and pass them to Wiking."
-msgstr ""
-"Dacă este permis, formularul de autentificare va fi întotdeauna "
-"redirecţionat către adresa de HTTPS pentru a asigura securitatea "
-"informaţiilor de autentificare. Aceasta cere, bineînţeles, ca server-ul să "
-"fie configurat pentru a accepta cererile HTTPS pentru aceleaÅŸi server "
-"virtual ÅŸi pentru a preda aceste cereri sistemului Wiking."
-
-#. Translators: Site means a webpage or web application.
-#: ../lib/wiking/configuration.py:276
-msgid "Site title"
-msgstr "Titlul site-ului"
-
-#: ../lib/wiking/configuration.py:277
-msgid ""
-"Site title is a short and (hopefully) unique title of the whole website. It "
-"will appear at the top of every page."
-msgstr ""
-"Acest titlu ar trebui să fie scurt şi pe cât posibil să redea univoc tot "
-"site-ul. Titlul va fi afişat pe partea de sus a fiecărei pagini."
-
-#. Translators: Site means a webpage or web application. Subtitle as in ,,title -- subtitle''.
-#: ../lib/wiking/configuration.py:283
-msgid "Site subtitle"
-msgstr "Subtitlul site-ului"
-
-#: ../lib/wiking/configuration.py:284
-msgid ""
-"Site subtitle is an optional more descriptive title of the website.  It will "
-"appear at the top of every page together with site title, but where brevity "
-"matters, only title will be used."
-msgstr ""
-"Subtitlul este o descriere mai detaliată şi opţională a site-ului. Acesta va "
-"apărea în partea de sus a fiecărei pagini, împreună cu titlu site-ul, dar în "
-"cazul în care este necesară concizia, va fi omis."
-
-#. Translators: Web page or web application specific image.
-#: ../lib/wiking/configuration.py:291
-msgid "Site icon"
-msgstr "Icoana site-ului"
-
-#: ../lib/wiking/configuration.py:305
-msgid "Default language"
-msgstr "Limba de plecare"
-
-#. Translators: Language negotiation means the process where the server is trying
-#. to find a language that matches with what the users internet browser asks for.
-#: ../lib/wiking/configuration.py:308
-msgid ""
-"Defines the language (lowercase ISO 639-1 Alpha-2 code) to be used when "
-"content language negotiation fails. If not set (which is the default), the "
-"server will issue a 606 HTTP error (Not acceptable) when the document is not "
-"available in any of the requested languages. The error page will contain a "
-"description of the problem and a list of available language variants of the "
-"requested document. The negotiation is based on the browser setting of "
-"user's language preference passed through the 'Accept-Language' HTTP header. "
-"If set, Wiking will automatically serve given language variant instead of "
-"issuing the error if that variant is available.  If unavailable, the 606 "
-"error is raised anyway, so you need to make sure that all documents are "
-"available at least in the default language variant if you want to avoid 606 "
-"errors completely."
-msgstr ""
-"DefineÅŸte limba (cod ISO 639-1 Alpha-2 scris cu litere mici) pentru a fi "
-"utilizată atunci când eşuează comutarea automată a limbii cuprinsului. Dacă "
-"nu este setat (ceea ce reprezintă valoarea implicită) şi documentul "
-"solicitat nu este disponibil în oricare dintre limbile solicitate, serverul "
-"va emite o eroare HTTP 606 (Not acceptable). Pagină de eroare va conţine o "
-"descriere a problemei şi o listă de variante lingvistice disponibile din "
-"documentul solicitat. Comutarea automată a limbii se bazează pe setarea "
-"limbii browser-ului de internet de către utilizator, predat de capul HTTP "
-"'Accept-Language'. Dacă este setată, Wiking va servi în mod automat această "
-"variantă de limbă dacă este disponibilă şi nu va afişa eroarea. Dacă nu este "
-"setată, se va ajunge oricum la eroarea 606, deci trebuie să vă asiguraţi că "
-"toate documentele sunt disponibile, cel puţin în varianta limbii de plecare, "
-"asta dacă doriţi să evitaţi integral erorile 606."
-
-#. Translators: Yes/No configuration option label. Should the login panel display user role (as Admin, Student, Tutor etc.)
-#: ../lib/wiking/configuration.py:378
-msgid "Display role in login panel"
-msgstr "AfiÅŸeazp panoul de autentificare"
-
-#: ../lib/wiking/configuration.py:379
-#, fuzzy
-msgid ""
-"If enabled, the login panel on each page will not display only the current "
-"username, but also his current user role, which affects his permissions."
-msgstr ""
-"Dacă permiteţi această opţiune, la panoul de autentificare pe fiecare pagină "
-"nu se va afişa doar numele de utilizator curent, dar, de asemenea, rolul său "
-"actual (de exemplu, administrator, utilizator, Student, etc)"
-
-#: ../lib/wiking/configuration.py:397
-msgid "Whether to use e-mails as login names"
-msgstr "FoloseÅŸte adresele de e-mail ca nume de autentificare"
-
-#: ../lib/wiking/configuration.py:398
-msgid "Iff true, users must use e-mail addresses as their login names."
-msgstr ""
-"Dacă este astfel configurat, utilizatorii trebuie să folosească în locul "
-"numelor de autentificare adresele de e-mail."
-
-#: ../lib/wiking/configuration.py:412
-msgid ""
-"If set, the newly registered users will be automatically approved without "
-"any administrator's action.  The adminstrator may still need to asign users "
-"to groups to grant them further privileges, but the accounts are enabled "
-"right after the user confirms the registration code."
-msgstr ""
-
 #: ../lib/wiking/cms/appl.py:53
 msgid "Manage this site"
 msgstr "Administrează acest site"
@@ -152,145 +26,6 @@ msgstr "Părăseşte interfaţa administrării cuprinsului"
 msgid "Wiking Management Interface"
 msgstr "Interfaţa administrării cuprinsului"
 
-#. Translators: Yes/No configuration option label. Should the login panel be visible?
-#: ../lib/wiking/cms/configuration.py:36
-msgid "Allow login panel"
-msgstr "Afişează panelul de autentificare"
-
-#: ../lib/wiking/cms/configuration.py:37
-msgid ""
-"If enabled, the information about the currently logged user and login/logout "
-"controls will be present on each page as a separate panel.  This panel will "
-"always be the first panel on the page."
-msgstr ""
-"Dacă permiteţi această opţiune, informaţiile despre utilizatorul tocmai "
-"autentificat ÅŸi elementele pentru logare / ieÅŸire se vor afiÅŸa pe un panou "
-"separat. Acest panou va fi întotdeauna primul care se va afişa dintre "
-"celelalte panouri."
-
-#. Translators: Yes/No configuration option label. Should link to WMI be visible?  "WMI"
-#. stands for Wiking Management Interface.  Don't feel obliged to use an abbreviation.  Use
-#. whatever brief form obviously referning to whatever translation you used for "Wiking
-#. Management Interface".
-#: ../lib/wiking/cms/configuration.py:47
-msgid "Allow WMI link"
-msgstr "Permite trimitere la interfaţa de administrare"
-
-#. Translators: Yes/no configuration label. Can new users register to this
-#. website/application?
-#: ../lib/wiking/cms/configuration.py:55
-msgid "Allow new user registration"
-msgstr "Permite înregistrarea noilor utilizatori"
-
-#: ../lib/wiking/cms/configuration.py:56
-msgid ""
-"If enabled, all visitors are allowed to create a user account.  If disabled, "
-"new user accounts must be created by administrator.  Note, that the newly "
-"created accounts are inactive (at least with the default implementation of "
-"the user management module), so the creation of the account doesn't give the "
-"user any actual privileges."
-msgstr ""
-"Dacă este permis, tuturor vizitatorilor este permisă înregistrarea şi "
-"crearea unui cont de utilizator. Dacă nu permiteţi această opţiune, toate "
-"conturile de utilizator trebuie să fie create de către administrator. "
-"Reţineţi, că conturile nou create sunt inactive (cel puţin la punerea în "
-"aplicare a modulului de gestiune al utilizatorilor), astfel încât crearea de "
-"cont nu-i dă utilizatorului nici un privilegiu."
-
-#. Translators: Maximal size an uploaded file can have.
-#: ../lib/wiking/cms/configuration.py:65
-msgid "Maximal upload size"
-msgstr "Mărimea maximă pentru upload"
-
-#: ../lib/wiking/cms/configuration.py:66
-msgid ""
-"The maximal size of uploaded files in bytes.  The server needs to be "
-"relaoded for the changes in this option to take effect."
-msgstr ""
-"Mărimea maximă a fişierelor transmise pe server (toată cifra în bytes). "
-"Atenţie, pentru ca modificările acestei opţiuni să fie aplicabile, trebuie "
-"să se facă  restartul serverului."
-
-#. Translators: Web form label (account in the meaning of user account)
-#: ../lib/wiking/cms/texts.py:29
-msgid "Information about a locked account"
-msgstr ""
-
-#. Translators: Text presented to a user in a web page
-#: ../lib/wiking/cms/texts.py:31
-msgid ""
-"Your account is currently disabled.\n"
-"\n"
-"The protected services are not available to you.\n"
-"Contact the application administrator to get the account enabled."
-msgstr ""
-
-#. Translators: Web form label
-#: ../lib/wiking/cms/texts.py:39
-#, fuzzy
-msgid "Information about an account waiting for activation code confirmation"
-msgstr "Confirmă contul fără a controla codul de activare"
-
-#. Translators: Text presented to a user in a web page
-#: ../lib/wiking/cms/texts.py:41
-msgid ""
-"Your account is inactive because\n"
-"you have not yet confirmed the activation code sent to you by e-mail.\n"
-"\n"
-"Please, check your e-mail and follow the provided link or enter the\n"
-"activation code into the field below.\n"
-"\n"
-"You can also continue without entering the activation code, but\n"
-"the protected services will not be available to you."
-msgstr ""
-
-#. Translators: Web form label
-#: ../lib/wiking/cms/texts.py:53
-#, fuzzy
-msgid "Information about an account waiting for admin approval"
-msgstr ""
-"Conturile neaprobate ( în aşteptarea aprobării de acces de către "
-"administrator)"
-
-#. Translators: Text presented to a user in a web page
-#: ../lib/wiking/cms/texts.py:55
-msgid ""
-"Your account is waiting for approval by the administrator.\n"
-"                  \n"
-"The protected services are not available until the account gets approved.\n"
-"If the account remains unapproved for a long time, contact the application "
-"administrator."
-msgstr ""
-
-#: ../lib/wiking/cms/texts.py:62
-msgid "Introductory text displayed above the registration form"
-msgstr ""
-
-#: ../lib/wiking/cms/texts.py:67
-msgid "Text displayed after successful user registration"
-msgstr ""
-
-#: ../lib/wiking/cms/texts.py:69
-msgid ""
-"Registration completed successfuly. Your account is now fully functional but "
-"you may need to get futher privileges by the administrator to access certain "
-"restricted services."
-msgstr ""
-
-#: ../lib/wiking/cms/texts.py:74
-msgid ""
-"Registration completed successfuly. Your account now awaits administrator's "
-"approval."
-msgstr ""
-"Înregistrarea s-a efectuat cu succes. Contul aşteaptă aprobarea "
-"administratorului."
-
-#: ../lib/wiking/cms/texts.py:79
-msgid ""
-"Information displayed above the checkbox for confirmation of site specific "
-"conditions during registration (if empty, no confirmation is required)"
-msgstr ""
-
 #: ../lib/wiking/cms/cms.py:61
 msgid "formatting manual"
 msgstr "manual de formatare"
@@ -400,7 +135,7 @@ msgstr "Trimite codul de activare"
 
 #. Translators: Button name. Computer terminology. Use an appropriate term common
 #. for submitting forms in a computer application.
-#: ../lib/wiking/cms/cms.py:496 ../lib/wiking/cms/users.py:1142
+#: ../lib/wiking/cms/cms.py:496 ../lib/wiking/cms/users.py:1171
 msgid "Submit"
 msgstr "Trimite"
 
@@ -412,7 +147,7 @@ msgstr ""
 msgid "Account disabled"
 msgstr "Cont inactiv"
 
-#: ../lib/wiking/cms/cms.py:533 ../lib/wiking/cms/users.py:814
+#: ../lib/wiking/cms/cms.py:533 ../lib/wiking/cms/users.py:819
 #, fuzzy
 msgid "Account not activated"
 msgstr "Cont inactiv"
@@ -761,7 +496,7 @@ msgstr "Administrarea motivelor coloristice accesibile."
 
 #. Translators: Table column heading. Whether the account is active. Values are yes/no.
 #: ../lib/wiking/cms/cms.py:897 ../lib/wiking/cms/cms.py:1987
-#: ../lib/wiking/cms/users.py:1262
+#: ../lib/wiking/cms/users.py:1291
 msgid "Active"
 msgstr "Activ"
 
@@ -1062,7 +797,7 @@ msgstr ""
 #. Translators: Button label. Use standard computer terminology.
 #. Translators: Back button label. Standard computer terminology.
 #: ../lib/wiking/cms/cms.py:1212 ../lib/wiking/cms/cms.py:1572
-#: ../lib/wiking/cms/users.py:900
+#: ../lib/wiking/cms/users.py:905
 msgid "Back"
 msgstr "ÃŽnapoi"
 
@@ -1530,6 +1265,145 @@ msgstr "FoloseÅŸte ca model"
 msgid "Edit this mail for repeated use"
 msgstr "Editează acest mail pentru o utilizare repetată"
 
+#. Translators: Yes/No configuration option label. Should the login panel be visible?
+#: ../lib/wiking/cms/configuration.py:36
+msgid "Allow login panel"
+msgstr "Afişează panelul de autentificare"
+
+#: ../lib/wiking/cms/configuration.py:37
+msgid ""
+"If enabled, the information about the currently logged user and login/logout "
+"controls will be present on each page as a separate panel.  This panel will "
+"always be the first panel on the page."
+msgstr ""
+"Dacă permiteţi această opţiune, informaţiile despre utilizatorul tocmai "
+"autentificat ÅŸi elementele pentru logare / ieÅŸire se vor afiÅŸa pe un panou "
+"separat. Acest panou va fi întotdeauna primul care se va afişa dintre "
+"celelalte panouri."
+
+#. Translators: Yes/No configuration option label. Should link to WMI be visible?  "WMI"
+#. stands for Wiking Management Interface.  Don't feel obliged to use an abbreviation.  Use
+#. whatever brief form obviously referning to whatever translation you used for "Wiking
+#. Management Interface".
+#: ../lib/wiking/cms/configuration.py:47
+msgid "Allow WMI link"
+msgstr "Permite trimitere la interfaţa de administrare"
+
+#. Translators: Yes/no configuration label. Can new users register to this
+#. website/application?
+#: ../lib/wiking/cms/configuration.py:55
+msgid "Allow new user registration"
+msgstr "Permite înregistrarea noilor utilizatori"
+
+#: ../lib/wiking/cms/configuration.py:56
+msgid ""
+"If enabled, all visitors are allowed to create a user account.  If disabled, "
+"new user accounts must be created by administrator.  Note, that the newly "
+"created accounts are inactive (at least with the default implementation of "
+"the user management module), so the creation of the account doesn't give the "
+"user any actual privileges."
+msgstr ""
+"Dacă este permis, tuturor vizitatorilor este permisă înregistrarea şi "
+"crearea unui cont de utilizator. Dacă nu permiteţi această opţiune, toate "
+"conturile de utilizator trebuie să fie create de către administrator. "
+"Reţineţi, că conturile nou create sunt inactive (cel puţin la punerea în "
+"aplicare a modulului de gestiune al utilizatorilor), astfel încât crearea de "
+"cont nu-i dă utilizatorului nici un privilegiu."
+
+#. Translators: Maximal size an uploaded file can have.
+#: ../lib/wiking/cms/configuration.py:65
+msgid "Maximal upload size"
+msgstr "Mărimea maximă pentru upload"
+
+#: ../lib/wiking/cms/configuration.py:66
+msgid ""
+"The maximal size of uploaded files in bytes.  The server needs to be "
+"relaoded for the changes in this option to take effect."
+msgstr ""
+"Mărimea maximă a fişierelor transmise pe server (toată cifra în bytes). "
+"Atenţie, pentru ca modificările acestei opţiuni să fie aplicabile, trebuie "
+"să se facă  restartul serverului."
+
+#. Translators: Web form label (account in the meaning of user account)
+#: ../lib/wiking/cms/texts.py:29
+msgid "Information about a locked account"
+msgstr ""
+
+#. Translators: Text presented to a user in a web page
+#: ../lib/wiking/cms/texts.py:31
+msgid ""
+"Your account is currently disabled.\n"
+"\n"
+"The protected services are not available to you.\n"
+"Contact the application administrator to get the account enabled."
+msgstr ""
+
+#. Translators: Web form label
+#: ../lib/wiking/cms/texts.py:39
+#, fuzzy
+msgid "Information about an account waiting for activation code confirmation"
+msgstr "Confirmă contul fără a controla codul de activare"
+
+#. Translators: Text presented to a user in a web page
+#: ../lib/wiking/cms/texts.py:41
+msgid ""
+"Your account is inactive because\n"
+"you have not yet confirmed the activation code sent to you by e-mail.\n"
+"\n"
+"Please, check your e-mail and follow the provided link or enter the\n"
+"activation code into the field below.\n"
+"\n"
+"You can also continue without entering the activation code, but\n"
+"the protected services will not be available to you."
+msgstr ""
+
+#. Translators: Web form label
+#: ../lib/wiking/cms/texts.py:53
+#, fuzzy
+msgid "Information about an account waiting for admin approval"
+msgstr ""
+"Conturile neaprobate ( în aşteptarea aprobării de acces de către "
+"administrator)"
+
+#. Translators: Text presented to a user in a web page
+#: ../lib/wiking/cms/texts.py:55
+msgid ""
+"Your account is waiting for approval by the administrator.\n"
+"                  \n"
+"The protected services are not available until the account gets approved.\n"
+"If the account remains unapproved for a long time, contact the application "
+"administrator."
+msgstr ""
+
+#: ../lib/wiking/cms/texts.py:62
+msgid "Introductory text displayed above the registration form"
+msgstr ""
+
+#: ../lib/wiking/cms/texts.py:67
+msgid "Text displayed after successful user registration"
+msgstr ""
+
+#: ../lib/wiking/cms/texts.py:69
+msgid ""
+"Registration completed successfuly. Your account is now fully functional but "
+"you may need to get futher privileges by the administrator to access certain "
+"restricted services."
+msgstr ""
+
+#: ../lib/wiking/cms/texts.py:74
+msgid ""
+"Registration completed successfuly. Your account now awaits administrator's "
+"approval."
+msgstr ""
+"Înregistrarea s-a efectuat cu succes. Contul aşteaptă aprobarea "
+"administratorului."
+
+#: ../lib/wiking/cms/texts.py:79
+msgid ""
+"Information displayed above the checkbox for confirmation of site specific "
+"conditions during registration (if empty, no confirmation is required)"
+msgstr ""
+
 #: ../lib/wiking/cms/users.py:57 ../lib/wiking/cms/users.py:148
 msgid "Group"
 msgstr ""
@@ -1557,7 +1431,7 @@ msgid "User Roles"
 msgstr "Utilizatori"
 
 #: ../lib/wiking/cms/users.py:149 ../lib/wiking/cms/users.py:434
-#: ../lib/wiking/cms/users.py:1252
+#: ../lib/wiking/cms/users.py:1281
 msgid "User"
 msgstr "Utilizator"
 
@@ -1638,7 +1512,7 @@ msgid "Manage registered users and their privileges."
 msgstr "Administrarea utilizatorilor înregistraţi şi drepturile acestora."
 
 #. Translators: Login name for a website. Registration form field.
-#: ../lib/wiking/cms/users.py:408 ../lib/wiking/cms/users.py:1210
+#: ../lib/wiking/cms/users.py:408 ../lib/wiking/cms/users.py:1239
 msgid "Login name"
 msgstr "Nume de autentificare"
 
@@ -1651,7 +1525,7 @@ msgstr ""
 "cratime şi puncte, eventual liniuţe de subliniat şi trebuie să înceapă cu o "
 "literă."
 
-#: ../lib/wiking/cms/users.py:413 ../lib/wiking/cms/users.py:1211
+#: ../lib/wiking/cms/users.py:413 ../lib/wiking/cms/users.py:1240
 msgid "Password"
 msgstr "Parolă"
 
@@ -1849,12 +1723,12 @@ msgid "User's Groups"
 msgstr ""
 
 #. Translators: Heading for an overview when and how the user has accessed the application.
-#: ../lib/wiking/cms/users.py:530 ../lib/wiking/cms/users.py:1247
+#: ../lib/wiking/cms/users.py:530 ../lib/wiking/cms/users.py:1276
 msgid "Login History"
 msgstr "Istoria autentificării"
 
 #. Translators: Name of group of users who have full access to the system.
-#: ../lib/wiking/cms/users.py:538 ../lib/wiking/cms/users.py:1110
+#: ../lib/wiking/cms/users.py:538 ../lib/wiking/cms/users.py:1130
 msgid "Active users"
 msgstr "Utilizatori activi"
 
@@ -1953,155 +1827,138 @@ msgid "Active account"
 msgstr "Cont nou"
 
 #. Translators: Personal data -- first name, surname, nickname ...
-#: ../lib/wiking/cms/users.py:648 ../lib/wiking/cms/users.py:654
-#: ../lib/wiking/cms/users.py:675
+#: ../lib/wiking/cms/users.py:658 ../lib/wiking/cms/users.py:664
+#: ../lib/wiking/cms/users.py:685
 msgid "Personal data"
 msgstr "Date personale"
 
 #. Translators: Contact information -- email, phone, address...
-#: ../lib/wiking/cms/users.py:650 ../lib/wiking/cms/users.py:655
-#: ../lib/wiking/cms/users.py:676
+#: ../lib/wiking/cms/users.py:660 ../lib/wiking/cms/users.py:665
+#: ../lib/wiking/cms/users.py:686
 msgid "Contact information"
 msgstr "Informaţii de contact"
 
 #. Translators: Others is a label for a group of unspecified form fields
 #. (as in Personal data, Contact information, Others).
-#: ../lib/wiking/cms/users.py:653 ../lib/wiking/cms/users.py:656
-#: ../lib/wiking/cms/users.py:681
+#: ../lib/wiking/cms/users.py:663 ../lib/wiking/cms/users.py:666
+#: ../lib/wiking/cms/users.py:691
 msgid "Others"
 msgstr "Altele"
 
-#: ../lib/wiking/cms/users.py:657
+#: ../lib/wiking/cms/users.py:667
 #, fuzzy
 msgid "Account state"
 msgstr "Cont inactiv"
 
 #. Translators: Button label.
-#: ../lib/wiking/cms/users.py:662
+#: ../lib/wiking/cms/users.py:672
 msgid "New user"
 msgstr "Utilizator nou"
 
 #. Translators: Button label.
-#: ../lib/wiking/cms/users.py:664
+#: ../lib/wiking/cms/users.py:674
 msgid "Edit profile"
 msgstr "Editează profilul"
 
 #. Translators: Button label. Modify the users data (email, address...)
-#: ../lib/wiking/cms/users.py:666
+#: ../lib/wiking/cms/users.py:676
 msgid "Modify user's record"
 msgstr "Modifică datele utilizatorului"
 
-#: ../lib/wiking/cms/users.py:679
+#: ../lib/wiking/cms/users.py:689
 msgid "Login information"
 msgstr "Informaţii de autentificare"
 
-#: ../lib/wiking/cms/users.py:712
+#: ../lib/wiking/cms/users.py:722
 msgid "Enter your current password."
 msgstr "Introduceţi parola actuală."
 
-#: ../lib/wiking/cms/users.py:716
+#: ../lib/wiking/cms/users.py:726
 msgid "Invalid password."
 msgstr "Parola invalidă."
 
-#: ../lib/wiking/cms/users.py:720
+#: ../lib/wiking/cms/users.py:730
 msgid "Enter the new password."
 msgstr "Itroduceţi parola nouă."
 
-#: ../lib/wiking/cms/users.py:728
+#: ../lib/wiking/cms/users.py:738
 msgid "The new password is the same as the old one."
 msgstr "Noua parolă este aceeaşi ca şi cea veche."
 
-#: ../lib/wiking/cms/users.py:753
-#, fuzzy, python-format
+#: ../lib/wiking/cms/users.py:763
+#, python-format
 msgid ""
-"The first step of your registration at %(server_hostname)s was successfully "
-"completed.\n"
-"\n"
-"For the next step visit the following URL and follow the instructions "
-"there:\n"
+"To finish your registration at %(server_hostname)s, click on the following "
+"link:\n"
 "%(uri)s\n"
 "\n"
-"If the above link fails, you will be prompted for your activation code when\n"
-"you attempt to log in.\n"
-"\n"
-"Your activation code is: %(code)s\n"
 msgstr ""
-"Primul pas de înregistrare la %(server_hostname)s fost finalizat cu succes.\n"
-"\n"
-"Pentru următoarea etapă vizitaţi adresa de web indicată şi urmaţi "
-"instrucţiunile de acolo:\n"
-"%(uri)s\n"
-
-#: ../lib/wiking/cms/users.py:768
-msgid "Registration accepted."
-msgstr "Înregistrarea acceptată."
 
-#: ../lib/wiking/cms/users.py:769
-msgid "Please, check your mailbox for instructions how to proceed."
-msgstr ""
-"Vă rugăm, să verificaţi căsuţa poştală pentru instrucţiuni cum să procedaţi."
-
-#: ../lib/wiking/cms/users.py:773
+#: ../lib/wiking/cms/users.py:776
 msgid "Registration cancelled."
 msgstr "Înregistrarea anulată."
 
-#: ../lib/wiking/cms/users.py:779
+#: ../lib/wiking/cms/users.py:782
 #, python-format
 msgid "Your registration at %s"
 msgstr "Înregistrarea dumneavoastră la %s"
 
-#: ../lib/wiking/cms/users.py:783 ../lib/wiking/cms/users.py:835
-#: ../lib/wiking/cms/users.py:885 ../lib/wiking/cms/users.py:1218
+#: ../lib/wiking/cms/users.py:786 ../lib/wiking/cms/users.py:840
+#: ../lib/wiking/cms/users.py:890 ../lib/wiking/cms/users.py:1247
 msgid "Failed sending e-mail notification:"
 msgstr "Trimiterea notificării prin e-mail a eşuat:"
 
 #. Translators: Follows an email addres, e.g. ``Activation code was sent to joe at brailcom.org''
-#: ../lib/wiking/cms/users.py:787
-#, python-format
-msgid "Activation code was sent to %s."
-msgstr "Codul de activare a fost trimis la %s."
+#: ../lib/wiking/cms/users.py:790
+#, fuzzy, python-format
+msgid ""
+"To finish registration, please confirm the activation code that was sent to "
+"your email address at %(email)s."
+msgstr ""
+"ÃŽnregistrarea a expirat la %(date)s. Utilizatorul nu a confirmat la timp "
+"codul trimis la adresa de e-mail introdusă."
 
-#: ../lib/wiking/cms/users.py:810
+#: ../lib/wiking/cms/users.py:815
 msgid "User registration already confirmed."
 msgstr "Înregistrarea utilizatorului a mai fost cândva confirmată."
 
-#: ../lib/wiking/cms/users.py:813
+#: ../lib/wiking/cms/users.py:818
 msgid "Invalid activation code."
 msgstr "Codul de activare inactiv."
 
-#: ../lib/wiking/cms/users.py:821
+#: ../lib/wiking/cms/users.py:826
 #, fuzzy, python-format
 msgid "New user %(fullname)s registered at %(server_hostname)s."
 msgstr ""
 "Noul utilizator %(fullname)s s-a înregistrat la %(server_hostname)s. Vă "
 "rugăm să confirmaţi înregistrarea: %(uri)s"
 
-#: ../lib/wiking/cms/users.py:825
+#: ../lib/wiking/cms/users.py:830
 msgid "The account was approved automatically according to server setup."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:828
+#: ../lib/wiking/cms/users.py:833
 #, fuzzy
 msgid "Please approve the account:"
 msgstr "Permite acest cont"
 
-#: ../lib/wiking/cms/users.py:832
+#: ../lib/wiking/cms/users.py:837
 msgid "New user registration:"
 msgstr "ÃŽnregistrare utilizator nou:"
 
-#: ../lib/wiking/cms/users.py:838
+#: ../lib/wiking/cms/users.py:843
 msgid "E-mail notification has been sent to server administrator."
 msgstr "Notificarea de e-mail a fost trimisă administratorului serverului."
 
-#: ../lib/wiking/cms/users.py:866
+#: ../lib/wiking/cms/users.py:871
 msgid "Registration confirmed"
 msgstr "Înregistrarea confirmată"
 
-#: ../lib/wiking/cms/users.py:877
+#: ../lib/wiking/cms/users.py:882
 msgid "The account was enabled."
 msgstr "Contul a fost permis."
 
-#: ../lib/wiking/cms/users.py:879
+#: ../lib/wiking/cms/users.py:884
 #, python-format
 msgid ""
 "Your account at %(uri)s has been enabled. Please log in with username '%"
@@ -2110,35 +1967,35 @@ msgstr ""
 "Contul dumneavoastră la %(uri)s a fost permis. Vă rugăm să vă autentificaţi "
 "cu numele de utilizator „%(login)s“ şi cu parola aleasă la înregistrare."
 
-#: ../lib/wiking/cms/users.py:882
+#: ../lib/wiking/cms/users.py:887
 msgid "Your account has been enabled."
 msgstr "Contul a fost permis."
 
-#: ../lib/wiking/cms/users.py:887
+#: ../lib/wiking/cms/users.py:892
 msgid "E-mail notification has been sent to:"
 msgstr "Notificarea a fost trimisă la adresa de e-mail:"
 
-#: ../lib/wiking/cms/users.py:889
+#: ../lib/wiking/cms/users.py:894
 #, fuzzy
 msgid "The account was disabled."
 msgstr "Contul a fost permis."
 
-#: ../lib/wiking/cms/users.py:895
+#: ../lib/wiking/cms/users.py:900
 #, fuzzy, python-format
 msgid "The registration expired on %(date)s."
 msgstr "Înregistrarea utilizatorului a mai fost cândva confirmată."
 
-#: ../lib/wiking/cms/users.py:898
+#: ../lib/wiking/cms/users.py:903
 #, fuzzy
 msgid "Continue"
 msgstr "Conţinut"
 
-#: ../lib/wiking/cms/users.py:902
+#: ../lib/wiking/cms/users.py:907
 #, fuzzy
 msgid "The registration code was not confirmed by the user!"
 msgstr "Înregistrarea utilizatorului a mai fost cândva confirmată."
 
-#: ../lib/wiking/cms/users.py:903
+#: ../lib/wiking/cms/users.py:908
 #, fuzzy
 msgid ""
 "Please enable the account only if you are sure that the e-mail address "
@@ -2147,47 +2004,51 @@ msgstr ""
 "Vă rugăm să confirmaţi contul, numai atunci când sunteţi siguri, că adresa "
 "introdusă aparţine utilizatorului în cauză."
 
-#: ../lib/wiking/cms/users.py:1111
+#: ../lib/wiking/cms/users.py:1131
 msgid "Listing of all active user accounts."
 msgstr "Lista tuturor conturilor active de utilizatori."
 
-#: ../lib/wiking/cms/users.py:1138
+#: ../lib/wiking/cms/users.py:1142
+msgid "Users who have `confirm' flag set"
+msgstr ""
+
+#: ../lib/wiking/cms/users.py:1167
 msgid "Enter your login name or e-mail address"
 msgstr "Introduceţi numele de autentificare sau adresa de e-mail"
 
-#: ../lib/wiking/cms/users.py:1173
+#: ../lib/wiking/cms/users.py:1202
 msgid "Password reminder"
 msgstr "Reamintirea parolei"
 
-#: ../lib/wiking/cms/users.py:1186
+#: ../lib/wiking/cms/users.py:1215
 msgid "Multiple user accounts found for given email address."
 msgstr ""
 "Pentru adresa de e-mail introdusă au fost găsite mai multe conturi de "
 "utilizatori."
 
-#: ../lib/wiking/cms/users.py:1187
+#: ../lib/wiking/cms/users.py:1216
 msgid "Please, select the account for which you want to remind:"
 msgstr ""
 "Vă rugăm, selectaţi contul pentru care doriţi să folosiţi funcţia de "
 "reamintire:"
 
 #. Translators: Credentials such as password...
-#: ../lib/wiking/cms/users.py:1200
+#: ../lib/wiking/cms/users.py:1229
 msgid "Your credentials were reset to:"
 msgstr "Datele dumneavoastră de autentificare au fost setate astfel:"
 
 #. Translators: Credentials such as password...
-#: ../lib/wiking/cms/users.py:1204
+#: ../lib/wiking/cms/users.py:1233
 msgid "Your credentials are:"
 msgstr "Datele dumneavoastră de autentificare sunt:"
 
-#: ../lib/wiking/cms/users.py:1206
+#: ../lib/wiking/cms/users.py:1235
 #, python-format
 msgid "A password reminder request has been made at %(server_uri)s."
 msgstr ""
 "Pe serverul %(server_uri)s a fost introdusă o cerere de reamintire parolă."
 
-#: ../lib/wiking/cms/users.py:1213
+#: ../lib/wiking/cms/users.py:1242
 msgid ""
 "We strongly recommend you change your password at nearest occassion, since "
 "it has been exposed to an unsecure channel."
@@ -2195,68 +2056,227 @@ msgstr ""
 "Vă recomandăm insistent să vă schimbaţi parola, cu cea mai apropiată ocazie, "
 "deoarece transmiterea prin e-maill a fost expusă unui canal nesigur."
 
-#: ../lib/wiking/cms/users.py:1219
+#: ../lib/wiking/cms/users.py:1248
 msgid "Please try repeating your request later or contact the administrator!"
 msgstr ""
 "Vă rugăm să repetaţi cererea mai târziu, sau contactaţi administratorul "
 "serverului!"
 
-#: ../lib/wiking/cms/users.py:1221
+#: ../lib/wiking/cms/users.py:1250
 msgid "E-mail information has been sent to your email address."
 msgstr ""
 "Informaţia prin e-mail a fost trimisă la adresa dumneavoastră de e-mail."
 
-#: ../lib/wiking/cms/users.py:1224
+#: ../lib/wiking/cms/users.py:1253
 msgid "No user account for your query."
 msgstr "Nici un cont de utilizator nu corespunde căutării."
 
-#: ../lib/wiking/cms/users.py:1248
+#: ../lib/wiking/cms/users.py:1277
 msgid "History of successful login sessions and unsuccessful login attempts."
 msgstr ""
 "Istoria de sesiuni de autentificare cu succes şi încercări de autentificare "
 "nereuÅŸite."
 
 #. Translators: Login name.
-#: ../lib/wiking/cms/users.py:1254
+#: ../lib/wiking/cms/users.py:1283
 msgid "Login"
 msgstr "Autentificare"
 
 #. Translators: Form field saying whether the users attempt was succesful. Values are Yes/No.
-#: ../lib/wiking/cms/users.py:1256
+#: ../lib/wiking/cms/users.py:1285
 msgid "Success"
 msgstr "Succes"
 
 #. Translators: Table column heading. Time of the start of user session, followed by a date and time.
-#: ../lib/wiking/cms/users.py:1258
+#: ../lib/wiking/cms/users.py:1287
 msgid "Start time"
 msgstr "ÃŽnceput"
 
 #. Translators: Table column heading. The length of user session. Contains time.
-#: ../lib/wiking/cms/users.py:1260
+#: ../lib/wiking/cms/users.py:1289
 msgid "Duration"
 msgstr "Durata"
 
-#: ../lib/wiking/cms/users.py:1263
+#: ../lib/wiking/cms/users.py:1292
 msgid "IP address"
 msgstr "Adresa IP"
 
 #. Translators: Internet name of the remote computer (computer terminology).
-#: ../lib/wiking/cms/users.py:1265
+#: ../lib/wiking/cms/users.py:1294
 msgid "Hostname"
 msgstr "Numele calculatorului"
 
 #. Translators: "User agent" is a generalized name for browser or more precisely the
 #. software which produced the HTTP request (was used to access the website).
-#: ../lib/wiking/cms/users.py:1268
+#: ../lib/wiking/cms/users.py:1297
 msgid "User agent"
 msgstr "Browser"
 
 #. Translators: Meaning where the user came from. Computer terminology. Do not translate
 #. "HTTP" and if unsure, don't translate at all (it is a very technical term).
-#: ../lib/wiking/cms/users.py:1271
+#: ../lib/wiking/cms/users.py:1300
 msgid "HTTP Referer"
 msgstr "HTTP Referer"
 
+#: ../lib/wiking/configuration.py:194
+msgid "Webmaster's e-mail address"
+msgstr "Adresa de e-mail a administratorului"
+
+#: ../lib/wiking/configuration.py:205
+msgid "Default sender address"
+msgstr "Implicit adresa expeditorului"
+
+#: ../lib/wiking/configuration.py:222
+msgid "Force HTTPS login"
+msgstr "Forţează HTTPS pentru autentificare"
+
+#: ../lib/wiking/configuration.py:223
+msgid ""
+"If enabled, the login form will always be redirected to an HTTPS address to "
+"ensure the security of the submitted credentials.  This, however, requires "
+"your server to be setup to accept HTTPS requests for the same virtual host "
+"and pass them to Wiking."
+msgstr ""
+"Dacă este permis, formularul de autentificare va fi întotdeauna "
+"redirecţionat către adresa de HTTPS pentru a asigura securitatea "
+"informaţiilor de autentificare. Aceasta cere, bineînţeles, ca server-ul să "
+"fie configurat pentru a accepta cererile HTTPS pentru aceleaÅŸi server "
+"virtual ÅŸi pentru a preda aceste cereri sistemului Wiking."
+
+#. Translators: Site means a webpage or web application.
+#: ../lib/wiking/configuration.py:276
+msgid "Site title"
+msgstr "Titlul site-ului"
+
+#: ../lib/wiking/configuration.py:277
+msgid ""
+"Site title is a short and (hopefully) unique title of the whole website. It "
+"will appear at the top of every page."
+msgstr ""
+"Acest titlu ar trebui să fie scurt şi pe cât posibil să redea univoc tot "
+"site-ul. Titlul va fi afişat pe partea de sus a fiecărei pagini."
+
+#. Translators: Site means a webpage or web application. Subtitle as in ,,title -- subtitle''.
+#: ../lib/wiking/configuration.py:283
+msgid "Site subtitle"
+msgstr "Subtitlul site-ului"
+
+#: ../lib/wiking/configuration.py:284
+msgid ""
+"Site subtitle is an optional more descriptive title of the website.  It will "
+"appear at the top of every page together with site title, but where brevity "
+"matters, only title will be used."
+msgstr ""
+"Subtitlul este o descriere mai detaliată şi opţională a site-ului. Acesta va "
+"apărea în partea de sus a fiecărei pagini, împreună cu titlu site-ul, dar în "
+"cazul în care este necesară concizia, va fi omis."
+
+#. Translators: Web page or web application specific image.
+#: ../lib/wiking/configuration.py:291
+msgid "Site icon"
+msgstr "Icoana site-ului"
+
+#: ../lib/wiking/configuration.py:305
+msgid "Default language"
+msgstr "Limba de plecare"
+
+#. Translators: Language negotiation means the process where the server is trying
+#. to find a language that matches with what the users internet browser asks for.
+#: ../lib/wiking/configuration.py:308
+msgid ""
+"Defines the language (lowercase ISO 639-1 Alpha-2 code) to be used when "
+"content language negotiation fails. If not set (which is the default), the "
+"server will issue a 606 HTTP error (Not acceptable) when the document is not "
+"available in any of the requested languages. The error page will contain a "
+"description of the problem and a list of available language variants of the "
+"requested document. The negotiation is based on the browser setting of "
+"user's language preference passed through the 'Accept-Language' HTTP header. "
+"If set, Wiking will automatically serve given language variant instead of "
+"issuing the error if that variant is available.  If unavailable, the 606 "
+"error is raised anyway, so you need to make sure that all documents are "
+"available at least in the default language variant if you want to avoid 606 "
+"errors completely."
+msgstr ""
+"DefineÅŸte limba (cod ISO 639-1 Alpha-2 scris cu litere mici) pentru a fi "
+"utilizată atunci când eşuează comutarea automată a limbii cuprinsului. Dacă "
+"nu este setat (ceea ce reprezintă valoarea implicită) şi documentul "
+"solicitat nu este disponibil în oricare dintre limbile solicitate, serverul "
+"va emite o eroare HTTP 606 (Not acceptable). Pagină de eroare va conţine o "
+"descriere a problemei şi o listă de variante lingvistice disponibile din "
+"documentul solicitat. Comutarea automată a limbii se bazează pe setarea "
+"limbii browser-ului de internet de către utilizator, predat de capul HTTP "
+"'Accept-Language'. Dacă este setată, Wiking va servi în mod automat această "
+"variantă de limbă dacă este disponibilă şi nu va afişa eroarea. Dacă nu este "
+"setată, se va ajunge oricum la eroarea 606, deci trebuie să vă asiguraţi că "
+"toate documentele sunt disponibile, cel puţin în varianta limbii de plecare, "
+"asta dacă doriţi să evitaţi integral erorile 606."
+
+#. Translators: Yes/No configuration option label. Should the login panel display user role (as Admin, Student, Tutor etc.)
+#: ../lib/wiking/configuration.py:378
+msgid "Display role in login panel"
+msgstr "AfiÅŸeazp panoul de autentificare"
+
+#: ../lib/wiking/configuration.py:379
+#, fuzzy
+msgid ""
+"If enabled, the login panel on each page will not display only the current "
+"username, but also his current user role, which affects his permissions."
+msgstr ""
+"Dacă permiteţi această opţiune, la panoul de autentificare pe fiecare pagină "
+"nu se va afişa doar numele de utilizator curent, dar, de asemenea, rolul său "
+"actual (de exemplu, administrator, utilizator, Student, etc)"
+
+#: ../lib/wiking/configuration.py:397
+msgid "Whether to use e-mails as login names"
+msgstr "FoloseÅŸte adresele de e-mail ca nume de autentificare"
+
+#: ../lib/wiking/configuration.py:398
+msgid "Iff true, users must use e-mail addresses as their login names."
+msgstr ""
+"Dacă este astfel configurat, utilizatorii trebuie să folosească în locul "
+"numelor de autentificare adresele de e-mail."
+
+#: ../lib/wiking/configuration.py:412
+msgid ""
+"If set, the newly registered users will be automatically approved without "
+"any administrator's action.  The adminstrator may still need to asign users "
+"to groups to grant them further privileges, but the accounts are enabled "
+"right after the user confirms the registration code."
+msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "The first step of your registration at %(server_hostname)s was "
+#~ "successfully completed.\n"
+#~ "\n"
+#~ "For the next step visit the following URL and follow the instructions "
+#~ "there:\n"
+#~ "%(uri)s\n"
+#~ "\n"
+#~ "If the above link fails, you will be prompted for your activation code "
+#~ "when\n"
+#~ "you attempt to log in.\n"
+#~ "\n"
+#~ "Your activation code is: %(code)s\n"
+#~ msgstr ""
+#~ "Primul pas de înregistrare la %(server_hostname)s fost finalizat cu "
+#~ "succes.\n"
+#~ "\n"
+#~ "Pentru următoarea etapă vizitaţi adresa de web indicată şi urmaţi "
+#~ "instrucţiunile de acolo:\n"
+#~ "%(uri)s\n"
+
+#~ msgid "Registration accepted."
+#~ msgstr "Înregistrarea acceptată."
+
+#~ msgid "Please, check your mailbox for instructions how to proceed."
+#~ msgstr ""
+#~ "Vă rugăm, să verificaţi căsuţa poştală pentru instrucţiuni cum să "
+#~ "procedaţi."
+
+#~ msgid "Activation code was sent to %s."
+#~ msgstr "Codul de activare a fost trimis la %s."
+
 #~ msgid "Private"
 #~ msgstr "Privat"
 
diff --git a/translations/wiking-cms.sk.po b/translations/wiking-cms.sk.po
index 7274067..09a2818 100644
--- a/translations/wiking-cms.sk.po
+++ b/translations/wiking-cms.sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-16 19:35+0200\n"
+"POT-Creation-Date: 2010-10-16 13:26+0200\n"
 "PO-Revision-Date: 2009-09-14 15:18+0100\n"
 "Last-Translator: Petr Topiarz <topiarz at post.cz>\n"
 "Language-Team: Slovak <wiking at lists.freebsoft.org>\n"
@@ -15,129 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/wiking/configuration.py:194
-msgid "Webmaster's e-mail address"
-msgstr "Emailová adresa webmastera"
-
-#: ../lib/wiking/configuration.py:205
-msgid "Default sender address"
-msgstr "Prednastavená adresa odosielateľa"
-
-#: ../lib/wiking/configuration.py:222
-msgid "Force HTTPS login"
-msgstr "Účinnosť HTTP prihlásení"
-
-#: ../lib/wiking/configuration.py:223
-msgid ""
-"If enabled, the login form will always be redirected to an HTTPS address to "
-"ensure the security of the submitted credentials.  This, however, requires "
-"your server to be setup to accept HTTPS requests for the same virtual host "
-"and pass them to Wiking."
-msgstr ""
-"Ak je aktivovaný, prihlasovací formulár bude vždy presmerovaný na adresu "
-"HTTPS, aby bola zaistená bezpečnosť vložených osobných údajov. To však "
-"vyžaduje, aby bol váš server konfigurovaný pre obsluhu HTTPS požiadaviek pre "
-"rovnaký virtuálny server a aby tieto požiadavky boli odovzdávané systému "
-"Wiking."
-
-#. Translators: Site means a webpage or web application.
-#: ../lib/wiking/configuration.py:276
-msgid "Site title"
-msgstr "Názov portálu"
-
-#: ../lib/wiking/configuration.py:277
-msgid ""
-"Site title is a short and (hopefully) unique title of the whole website. It "
-"will appear at the top of every page."
-msgstr ""
-"Tento názov by mal byť krátky a ak je to možné, mal by byť jediným názvom "
-"internetového portálu. Názov sa bude zobrazovať v záhlaví každej stránky."
-
-#. Translators: Site means a webpage or web application. Subtitle as in ,,title -- subtitle''.
-#: ../lib/wiking/configuration.py:283
-msgid "Site subtitle"
-msgstr "Podnázov portálu"
-
-#: ../lib/wiking/configuration.py:284
-msgid ""
-"Site subtitle is an optional more descriptive title of the website.  It will "
-"appear at the top of every page together with site title, but where brevity "
-"matters, only title will be used."
-msgstr ""
-"Podnázov je nepovinný podrobnejší popis portálu. Bude tiež zobrazený v "
-"záhlaví každej stránky, ale v situáciách, ktoré vyžadujú stručnosť, bude "
-"vynechaný."
-
-#. Translators: Web page or web application specific image.
-#: ../lib/wiking/configuration.py:291
-#, fuzzy
-msgid "Site icon"
-msgstr "Názov portálu"
-
-#: ../lib/wiking/configuration.py:305
-msgid "Default language"
-msgstr "Východzí jazyk"
-
-#. Translators: Language negotiation means the process where the server is trying
-#. to find a language that matches with what the users internet browser asks for.
-#: ../lib/wiking/configuration.py:308
-msgid ""
-"Defines the language (lowercase ISO 639-1 Alpha-2 code) to be used when "
-"content language negotiation fails. If not set (which is the default), the "
-"server will issue a 606 HTTP error (Not acceptable) when the document is not "
-"available in any of the requested languages. The error page will contain a "
-"description of the problem and a list of available language variants of the "
-"requested document. The negotiation is based on the browser setting of "
-"user's language preference passed through the 'Accept-Language' HTTP header. "
-"If set, Wiking will automatically serve given language variant instead of "
-"issuing the error if that variant is available.  If unavailable, the 606 "
-"error is raised anyway, so you need to make sure that all documents are "
-"available at least in the default language variant if you want to avoid 606 "
-"errors completely."
-msgstr ""
-"Definuje jazyk (ISO 639-1 Alpha-2 kód), ktorý má byť použitý, ak obsah "
-"zvoleného jazyk zlyhá. Ak nie je nastavený (čo je predvolená hodnota), "
-"server vygeneruje chybu 606 HTTP (Nie je prijateľné), ak dokument nebude k "
-"dispozícii v žiadnom z požadovaných jazykov. Stránka o chybách bude "
-"obsahovať popis problému a zoznam dostupných jazykových variánt k "
-"požadovanému dokumentu. Zobrazenie závisí na nastavení prehliadača "
-"používateľa a na jeho jazykových preferenciách odosielaných cez HTTP "
-"záhlavie 'Akceptovať-Jazyk'. Ak je to nastavené, Wiking automaticky zobrazí "
-"dostupnú jazykovú variantu namiesto zobrazenia hlásenia o chybe. Ak nie je "
-"dostupná, bude zobrazené hlásenie o chybe 606, takže ak mu chcete úplne "
-"predísť, uistite sa, že všetky dokumenty sú dostupné aspoň vo východzom "
-"jazyku."
-
-#. Translators: Yes/No configuration option label. Should the login panel display user role (as Admin, Student, Tutor etc.)
-#: ../lib/wiking/configuration.py:378
-#, fuzzy
-msgid "Display role in login panel"
-msgstr "Zobraziť panel prihlásenia"
-
-#: ../lib/wiking/configuration.py:379
-msgid ""
-"If enabled, the login panel on each page will not display only the current "
-"username, but also his current user role, which affects his permissions."
-msgstr ""
-
-#: ../lib/wiking/configuration.py:397
-msgid "Whether to use e-mails as login names"
-msgstr "Použiť emailovú adresu ako prihlasovacie meno"
-
-#: ../lib/wiking/configuration.py:398
-msgid "Iff true, users must use e-mail addresses as their login names."
-msgstr ""
-"Ak je to tak nastavené, používatelia musia používať emailovú adresu ako "
-"prihlasovacie meno."
-
-#: ../lib/wiking/configuration.py:412
-msgid ""
-"If set, the newly registered users will be automatically approved without "
-"any administrator's action.  The adminstrator may still need to asign users "
-"to groups to grant them further privileges, but the accounts are enabled "
-"right after the user confirms the registration code."
-msgstr ""
-
 #: ../lib/wiking/cms/appl.py:53
 msgid "Manage this site"
 msgstr "Správa obsahu"
@@ -155,139 +32,6 @@ msgstr "Opustiť rozhranie správy obsahu"
 msgid "Wiking Management Interface"
 msgstr "Vstúpiť do rozhrania správy obsahu"
 
-#. Translators: Yes/No configuration option label. Should the login panel be visible?
-#: ../lib/wiking/cms/configuration.py:36
-msgid "Allow login panel"
-msgstr "Zobraziť panel prihlásenia"
-
-#: ../lib/wiking/cms/configuration.py:37
-msgid ""
-"If enabled, the information about the currently logged user and login/logout "
-"controls will be present on each page as a separate panel.  This panel will "
-"always be the first panel on the page."
-msgstr ""
-"Ak túto voľbu povolíte, informácie o práve prihlásenom používateľovi a "
-"ovládacie prvky na prihlásenie/odhlásenie budú zobrazené v samostatnom "
-"paneli.  Tento panel bude vždy zobrazený ako prvý z panelov."
-
-#. Translators: Yes/No configuration option label. Should link to WMI be visible?  "WMI"
-#. stands for Wiking Management Interface.  Don't feel obliged to use an abbreviation.  Use
-#. whatever brief form obviously referning to whatever translation you used for "Wiking
-#. Management Interface".
-#: ../lib/wiking/cms/configuration.py:47
-msgid "Allow WMI link"
-msgstr "Povoliť odkaz do správcovského rozhrania"
-
-#. Translators: Yes/no configuration label. Can new users register to this
-#. website/application?
-#: ../lib/wiking/cms/configuration.py:55
-msgid "Allow new user registration"
-msgstr "Povoliť registráciu nových používateľov"
-
-#: ../lib/wiking/cms/configuration.py:56
-msgid ""
-"If enabled, all visitors are allowed to create a user account.  If disabled, "
-"new user accounts must be created by administrator.  Note, that the newly "
-"created accounts are inactive (at least with the default implementation of "
-"the user management module), so the creation of the account doesn't give the "
-"user any actual privileges."
-msgstr ""
-"Ak je to povolené, všetkým návštevníkom je umožnené vytvoriť si "
-"používateľský účet.  Ak túto možnosť zakážete, budú všetky účty vytvárané "
-"správcom.  Novo vytvorené účty sú vždy neaktívne (aspoň vo východzej "
-"implementácii modulu správy užívateľov), takže vytvorenie účtu ešte samo o "
-"sebe nedáva užívateľovi žiadne práva."
-
-#. Translators: Maximal size an uploaded file can have.
-#: ../lib/wiking/cms/configuration.py:65
-msgid "Maximal upload size"
-msgstr "Maximálna veľkosť pre upload"
-
-#: ../lib/wiking/cms/configuration.py:66
-msgid ""
-"The maximal size of uploaded files in bytes.  The server needs to be "
-"relaoded for the changes in this option to take effect."
-msgstr ""
-"Maximálna veľkosť pre uploadované súbory v bajtoch. Pozor, aby sa zmeny "
-"uplatnili, je nutné server reštartovať."
-
-#. Translators: Web form label (account in the meaning of user account)
-#: ../lib/wiking/cms/texts.py:29
-msgid "Information about a locked account"
-msgstr ""
-
-#. Translators: Text presented to a user in a web page
-#: ../lib/wiking/cms/texts.py:31
-msgid ""
-"Your account is currently disabled.\n"
-"\n"
-"The protected services are not available to you.\n"
-"Contact the application administrator to get the account enabled."
-msgstr ""
-
-#. Translators: Web form label
-#: ../lib/wiking/cms/texts.py:39
-#, fuzzy
-msgid "Information about an account waiting for activation code confirmation"
-msgstr "Neplatná žiadosť o registráciu (čaká sa na emailové potvrdenie)"
-
-#. Translators: Text presented to a user in a web page
-#: ../lib/wiking/cms/texts.py:41
-msgid ""
-"Your account is inactive because\n"
-"you have not yet confirmed the activation code sent to you by e-mail.\n"
-"\n"
-"Please, check your e-mail and follow the provided link or enter the\n"
-"activation code into the field below.\n"
-"\n"
-"You can also continue without entering the activation code, but\n"
-"the protected services will not be available to you."
-msgstr ""
-
-#. Translators: Web form label
-#: ../lib/wiking/cms/texts.py:53
-#, fuzzy
-msgid "Information about an account waiting for admin approval"
-msgstr "Neplatná žiadosť o registráciu (čaká sa na emailové potvrdenie)"
-
-#. Translators: Text presented to a user in a web page
-#: ../lib/wiking/cms/texts.py:55
-msgid ""
-"Your account is waiting for approval by the administrator.\n"
-"                  \n"
-"The protected services are not available until the account gets approved.\n"
-"If the account remains unapproved for a long time, contact the application "
-"administrator."
-msgstr ""
-
-#: ../lib/wiking/cms/texts.py:62
-msgid "Introductory text displayed above the registration form"
-msgstr ""
-
-#: ../lib/wiking/cms/texts.py:67
-msgid "Text displayed after successful user registration"
-msgstr ""
-
-#: ../lib/wiking/cms/texts.py:69
-msgid ""
-"Registration completed successfuly. Your account is now fully functional but "
-"you may need to get futher privileges by the administrator to access certain "
-"restricted services."
-msgstr ""
-
-#: ../lib/wiking/cms/texts.py:74
-msgid ""
-"Registration completed successfuly. Your account now awaits administrator's "
-"approval."
-msgstr ""
-"Registrácia prebehla úspešne. Váš účet teraz čaká na schválenie správcom."
-
-#: ../lib/wiking/cms/texts.py:79
-msgid ""
-"Information displayed above the checkbox for confirmation of site specific "
-"conditions during registration (if empty, no confirmation is required)"
-msgstr ""
-
 #: ../lib/wiking/cms/cms.py:61
 msgid "formatting manual"
 msgstr "príručka o formátovaní"
@@ -394,7 +138,7 @@ msgstr "Znovu poslať registračný kód"
 
 #. Translators: Button name. Computer terminology. Use an appropriate term common
 #. for submitting forms in a computer application.
-#: ../lib/wiking/cms/cms.py:496 ../lib/wiking/cms/users.py:1142
+#: ../lib/wiking/cms/cms.py:496 ../lib/wiking/cms/users.py:1171
 msgid "Submit"
 msgstr "Odoslať"
 
@@ -406,7 +150,7 @@ msgstr ""
 msgid "Account disabled"
 msgstr "Neaktívy účet"
 
-#: ../lib/wiking/cms/cms.py:533 ../lib/wiking/cms/users.py:814
+#: ../lib/wiking/cms/cms.py:533 ../lib/wiking/cms/users.py:819
 #, fuzzy
 msgid "Account not activated"
 msgstr "Neaktívy účet"
@@ -749,7 +493,7 @@ msgstr "Správa dostupných farebných motívov."
 
 #. Translators: Table column heading. Whether the account is active. Values are yes/no.
 #: ../lib/wiking/cms/cms.py:897 ../lib/wiking/cms/cms.py:1987
-#: ../lib/wiking/cms/users.py:1262
+#: ../lib/wiking/cms/users.py:1291
 msgid "Active"
 msgstr "Aktívne"
 
@@ -1046,7 +790,7 @@ msgstr ""
 #. Translators: Button label. Use standard computer terminology.
 #. Translators: Back button label. Standard computer terminology.
 #: ../lib/wiking/cms/cms.py:1212 ../lib/wiking/cms/cms.py:1572
-#: ../lib/wiking/cms/users.py:900
+#: ../lib/wiking/cms/users.py:905
 msgid "Back"
 msgstr "Späť"
 
@@ -1514,6 +1258,139 @@ msgstr ""
 msgid "Edit this mail for repeated use"
 msgstr ""
 
+#. Translators: Yes/No configuration option label. Should the login panel be visible?
+#: ../lib/wiking/cms/configuration.py:36
+msgid "Allow login panel"
+msgstr "Zobraziť panel prihlásenia"
+
+#: ../lib/wiking/cms/configuration.py:37
+msgid ""
+"If enabled, the information about the currently logged user and login/logout "
+"controls will be present on each page as a separate panel.  This panel will "
+"always be the first panel on the page."
+msgstr ""
+"Ak túto voľbu povolíte, informácie o práve prihlásenom používateľovi a "
+"ovládacie prvky na prihlásenie/odhlásenie budú zobrazené v samostatnom "
+"paneli.  Tento panel bude vždy zobrazený ako prvý z panelov."
+
+#. Translators: Yes/No configuration option label. Should link to WMI be visible?  "WMI"
+#. stands for Wiking Management Interface.  Don't feel obliged to use an abbreviation.  Use
+#. whatever brief form obviously referning to whatever translation you used for "Wiking
+#. Management Interface".
+#: ../lib/wiking/cms/configuration.py:47
+msgid "Allow WMI link"
+msgstr "Povoliť odkaz do správcovského rozhrania"
+
+#. Translators: Yes/no configuration label. Can new users register to this
+#. website/application?
+#: ../lib/wiking/cms/configuration.py:55
+msgid "Allow new user registration"
+msgstr "Povoliť registráciu nových používateľov"
+
+#: ../lib/wiking/cms/configuration.py:56
+msgid ""
+"If enabled, all visitors are allowed to create a user account.  If disabled, "
+"new user accounts must be created by administrator.  Note, that the newly "
+"created accounts are inactive (at least with the default implementation of "
+"the user management module), so the creation of the account doesn't give the "
+"user any actual privileges."
+msgstr ""
+"Ak je to povolené, všetkým návštevníkom je umožnené vytvoriť si "
+"používateľský účet.  Ak túto možnosť zakážete, budú všetky účty vytvárané "
+"správcom.  Novo vytvorené účty sú vždy neaktívne (aspoň vo východzej "
+"implementácii modulu správy užívateľov), takže vytvorenie účtu ešte samo o "
+"sebe nedáva užívateľovi žiadne práva."
+
+#. Translators: Maximal size an uploaded file can have.
+#: ../lib/wiking/cms/configuration.py:65
+msgid "Maximal upload size"
+msgstr "Maximálna veľkosť pre upload"
+
+#: ../lib/wiking/cms/configuration.py:66
+msgid ""
+"The maximal size of uploaded files in bytes.  The server needs to be "
+"relaoded for the changes in this option to take effect."
+msgstr ""
+"Maximálna veľkosť pre uploadované súbory v bajtoch. Pozor, aby sa zmeny "
+"uplatnili, je nutné server reštartovať."
+
+#. Translators: Web form label (account in the meaning of user account)
+#: ../lib/wiking/cms/texts.py:29
+msgid "Information about a locked account"
+msgstr ""
+
+#. Translators: Text presented to a user in a web page
+#: ../lib/wiking/cms/texts.py:31
+msgid ""
+"Your account is currently disabled.\n"
+"\n"
+"The protected services are not available to you.\n"
+"Contact the application administrator to get the account enabled."
+msgstr ""
+
+#. Translators: Web form label
+#: ../lib/wiking/cms/texts.py:39
+#, fuzzy
+msgid "Information about an account waiting for activation code confirmation"
+msgstr "Neplatná žiadosť o registráciu (čaká sa na emailové potvrdenie)"
+
+#. Translators: Text presented to a user in a web page
+#: ../lib/wiking/cms/texts.py:41
+msgid ""
+"Your account is inactive because\n"
+"you have not yet confirmed the activation code sent to you by e-mail.\n"
+"\n"
+"Please, check your e-mail and follow the provided link or enter the\n"
+"activation code into the field below.\n"
+"\n"
+"You can also continue without entering the activation code, but\n"
+"the protected services will not be available to you."
+msgstr ""
+
+#. Translators: Web form label
+#: ../lib/wiking/cms/texts.py:53
+#, fuzzy
+msgid "Information about an account waiting for admin approval"
+msgstr "Neplatná žiadosť o registráciu (čaká sa na emailové potvrdenie)"
+
+#. Translators: Text presented to a user in a web page
+#: ../lib/wiking/cms/texts.py:55
+msgid ""
+"Your account is waiting for approval by the administrator.\n"
+"                  \n"
+"The protected services are not available until the account gets approved.\n"
+"If the account remains unapproved for a long time, contact the application "
+"administrator."
+msgstr ""
+
+#: ../lib/wiking/cms/texts.py:62
+msgid "Introductory text displayed above the registration form"
+msgstr ""
+
+#: ../lib/wiking/cms/texts.py:67
+msgid "Text displayed after successful user registration"
+msgstr ""
+
+#: ../lib/wiking/cms/texts.py:69
+msgid ""
+"Registration completed successfuly. Your account is now fully functional but "
+"you may need to get futher privileges by the administrator to access certain "
+"restricted services."
+msgstr ""
+
+#: ../lib/wiking/cms/texts.py:74
+msgid ""
+"Registration completed successfuly. Your account now awaits administrator's "
+"approval."
+msgstr ""
+"Registrácia prebehla úspešne. Váš účet teraz čaká na schválenie správcom."
+
+#: ../lib/wiking/cms/texts.py:79
+msgid ""
+"Information displayed above the checkbox for confirmation of site specific "
+"conditions during registration (if empty, no confirmation is required)"
+msgstr ""
+
 #: ../lib/wiking/cms/users.py:57 ../lib/wiking/cms/users.py:148
 msgid "Group"
 msgstr ""
@@ -1541,7 +1418,7 @@ msgid "User Roles"
 msgstr "Používatelia"
 
 #: ../lib/wiking/cms/users.py:149 ../lib/wiking/cms/users.py:434
-#: ../lib/wiking/cms/users.py:1252
+#: ../lib/wiking/cms/users.py:1281
 msgid "User"
 msgstr "Používateľ"
 
@@ -1622,7 +1499,7 @@ msgid "Manage registered users and their privileges."
 msgstr "Správa registrovaných používateľov a ich oprávnenia."
 
 #. Translators: Login name for a website. Registration form field.
-#: ../lib/wiking/cms/users.py:408 ../lib/wiking/cms/users.py:1210
+#: ../lib/wiking/cms/users.py:408 ../lib/wiking/cms/users.py:1239
 msgid "Login name"
 msgstr "Prihlasovacie meno"
 
@@ -1634,7 +1511,7 @@ msgstr ""
 "Platné prihlasovacie meno obsahuje iba písmená bez diakritiky, číslice, "
 "bodky, pomlčky a prípadne podčiarkovníky a musí začínať písmenom."
 
-#: ../lib/wiking/cms/users.py:413 ../lib/wiking/cms/users.py:1211
+#: ../lib/wiking/cms/users.py:413 ../lib/wiking/cms/users.py:1240
 msgid "Password"
 msgstr "Heslo"
 
@@ -1814,13 +1691,13 @@ msgid "User's Groups"
 msgstr ""
 
 #. Translators: Heading for an overview when and how the user has accessed the application.
-#: ../lib/wiking/cms/users.py:530 ../lib/wiking/cms/users.py:1247
+#: ../lib/wiking/cms/users.py:530 ../lib/wiking/cms/users.py:1276
 #, fuzzy
 msgid "Login History"
 msgstr "Prihlasovacie údaje"
 
 #. Translators: Name of group of users who have full access to the system.
-#: ../lib/wiking/cms/users.py:538 ../lib/wiking/cms/users.py:1110
+#: ../lib/wiking/cms/users.py:538 ../lib/wiking/cms/users.py:1130
 msgid "Active users"
 msgstr "Aktívni používatelia"
 
@@ -1921,154 +1798,137 @@ msgid "Active account"
 msgstr "Nová príloha"
 
 #. Translators: Personal data -- first name, surname, nickname ...
-#: ../lib/wiking/cms/users.py:648 ../lib/wiking/cms/users.py:654
-#: ../lib/wiking/cms/users.py:675
+#: ../lib/wiking/cms/users.py:658 ../lib/wiking/cms/users.py:664
+#: ../lib/wiking/cms/users.py:685
 msgid "Personal data"
 msgstr "Osobné údaje"
 
 #. Translators: Contact information -- email, phone, address...
-#: ../lib/wiking/cms/users.py:650 ../lib/wiking/cms/users.py:655
-#: ../lib/wiking/cms/users.py:676
+#: ../lib/wiking/cms/users.py:660 ../lib/wiking/cms/users.py:665
+#: ../lib/wiking/cms/users.py:686
 msgid "Contact information"
 msgstr "Kontaktné údaje"
 
 #. Translators: Others is a label for a group of unspecified form fields
 #. (as in Personal data, Contact information, Others).
-#: ../lib/wiking/cms/users.py:653 ../lib/wiking/cms/users.py:656
-#: ../lib/wiking/cms/users.py:681
+#: ../lib/wiking/cms/users.py:663 ../lib/wiking/cms/users.py:666
+#: ../lib/wiking/cms/users.py:691
 msgid "Others"
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:657
+#: ../lib/wiking/cms/users.py:667
 #, fuzzy
 msgid "Account state"
 msgstr "Neaktívy účet"
 
 #. Translators: Button label.
-#: ../lib/wiking/cms/users.py:662
+#: ../lib/wiking/cms/users.py:672
 msgid "New user"
 msgstr "Nový používateľ"
 
 #. Translators: Button label.
-#: ../lib/wiking/cms/users.py:664
+#: ../lib/wiking/cms/users.py:674
 msgid "Edit profile"
 msgstr "Upraviť profil"
 
 #. Translators: Button label. Modify the users data (email, address...)
-#: ../lib/wiking/cms/users.py:666
+#: ../lib/wiking/cms/users.py:676
 msgid "Modify user's record"
 msgstr "Zmeniť údaje o používateľovi"
 
-#: ../lib/wiking/cms/users.py:679
+#: ../lib/wiking/cms/users.py:689
 msgid "Login information"
 msgstr "Prihlasovacie údaje"
 
-#: ../lib/wiking/cms/users.py:712
+#: ../lib/wiking/cms/users.py:722
 msgid "Enter your current password."
 msgstr "Zadajte svoje súčasné heslo."
 
-#: ../lib/wiking/cms/users.py:716
+#: ../lib/wiking/cms/users.py:726
 msgid "Invalid password."
 msgstr "Neplatné heslo."
 
-#: ../lib/wiking/cms/users.py:720
+#: ../lib/wiking/cms/users.py:730
 msgid "Enter the new password."
 msgstr "Vložte nové heslo."
 
-#: ../lib/wiking/cms/users.py:728
+#: ../lib/wiking/cms/users.py:738
 msgid "The new password is the same as the old one."
 msgstr "Nové heslo je rovnaké ako staré."
 
-#: ../lib/wiking/cms/users.py:753
-#, fuzzy, python-format
+#: ../lib/wiking/cms/users.py:763
+#, python-format
 msgid ""
-"The first step of your registration at %(server_hostname)s was successfully "
-"completed.\n"
-"\n"
-"For the next step visit the following URL and follow the instructions "
-"there:\n"
+"To finish your registration at %(server_hostname)s, click on the following "
+"link:\n"
 "%(uri)s\n"
 "\n"
-"If the above link fails, you will be prompted for your activation code when\n"
-"you attempt to log in.\n"
-"\n"
-"Your activation code is: %(code)s\n"
 msgstr ""
-"Prvý krok vašej registrácie na %(server_hostname)s bol úspešne dokončený.\n"
-"\n"
-"Na ďalšie kroky navštívte webovú adresu a riaďte sa inštrukciami:\n"
-"%(uri)s\n"
-
-#: ../lib/wiking/cms/users.py:768
-msgid "Registration accepted."
-msgstr "Registrácia prijatá."
-
-#: ../lib/wiking/cms/users.py:769
-msgid "Please, check your mailbox for instructions how to proceed."
-msgstr "Prosím, prečítajte si ďalšie inštrukcie vo vašej emailovej schránke."
 
-#: ../lib/wiking/cms/users.py:773
+#: ../lib/wiking/cms/users.py:776
 msgid "Registration cancelled."
 msgstr "Registrácia zrušená."
 
-#: ../lib/wiking/cms/users.py:779
+#: ../lib/wiking/cms/users.py:782
 #, python-format
 msgid "Your registration at %s"
 msgstr "Vaša registrácia na %s"
 
-#: ../lib/wiking/cms/users.py:783 ../lib/wiking/cms/users.py:835
-#: ../lib/wiking/cms/users.py:885 ../lib/wiking/cms/users.py:1218
+#: ../lib/wiking/cms/users.py:786 ../lib/wiking/cms/users.py:840
+#: ../lib/wiking/cms/users.py:890 ../lib/wiking/cms/users.py:1247
 msgid "Failed sending e-mail notification:"
 msgstr "Nepodarilo sa odoslať emailové upozornenie:"
 
 #. Translators: Follows an email addres, e.g. ``Activation code was sent to joe at brailcom.org''
-#: ../lib/wiking/cms/users.py:787
+#: ../lib/wiking/cms/users.py:790
 #, python-format
-msgid "Activation code was sent to %s."
-msgstr "Aktivačný kód bol zaslaný na  %s."
+msgid ""
+"To finish registration, please confirm the activation code that was sent to "
+"your email address at %(email)s."
+msgstr ""
 
-#: ../lib/wiking/cms/users.py:810
+#: ../lib/wiking/cms/users.py:815
 msgid "User registration already confirmed."
 msgstr "Registrácia používateľa už bola potvrdená."
 
-#: ../lib/wiking/cms/users.py:813
+#: ../lib/wiking/cms/users.py:818
 #, fuzzy
 msgid "Invalid activation code."
 msgstr "Neplatný registračný kód."
 
-#: ../lib/wiking/cms/users.py:821
+#: ../lib/wiking/cms/users.py:826
 #, fuzzy, python-format
 msgid "New user %(fullname)s registered at %(server_hostname)s."
 msgstr ""
 "Nový používateľ %(fullname)s sa registroval na %(server_hostname)s. Učiňte "
 "prosím potvrdenie registrácie: %(uri)s"
 
-#: ../lib/wiking/cms/users.py:825
+#: ../lib/wiking/cms/users.py:830
 msgid "The account was approved automatically according to server setup."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:828
+#: ../lib/wiking/cms/users.py:833
 #, fuzzy
 msgid "Please approve the account:"
 msgstr "Povoliť tento účet"
 
-#: ../lib/wiking/cms/users.py:832
+#: ../lib/wiking/cms/users.py:837
 msgid "New user registration:"
 msgstr "Registrácia nového používateľa:"
 
-#: ../lib/wiking/cms/users.py:838
+#: ../lib/wiking/cms/users.py:843
 msgid "E-mail notification has been sent to server administrator."
 msgstr "Emailové upozornenie bolo zaslané správcovi serveru."
 
-#: ../lib/wiking/cms/users.py:866
+#: ../lib/wiking/cms/users.py:871
 msgid "Registration confirmed"
 msgstr "Registrácia potvrdená"
 
-#: ../lib/wiking/cms/users.py:877
+#: ../lib/wiking/cms/users.py:882
 msgid "The account was enabled."
 msgstr "Účet bol povolený."
 
-#: ../lib/wiking/cms/users.py:879
+#: ../lib/wiking/cms/users.py:884
 #, python-format
 msgid ""
 "Your account at %(uri)s has been enabled. Please log in with username '%"
@@ -2077,77 +1937,81 @@ msgstr ""
 "Váš účet na %(uri)s bol povolený. Prihláste sa prosím pomocou vášho "
 "používateľského mena '%(login)s' a vášho hesla."
 
-#: ../lib/wiking/cms/users.py:882
+#: ../lib/wiking/cms/users.py:887
 msgid "Your account has been enabled."
 msgstr "Váš účet bol povolený."
 
-#: ../lib/wiking/cms/users.py:887
+#: ../lib/wiking/cms/users.py:892
 msgid "E-mail notification has been sent to:"
 msgstr "Emailové upozornenie bolo odoslané na:"
 
-#: ../lib/wiking/cms/users.py:889
+#: ../lib/wiking/cms/users.py:894
 #, fuzzy
 msgid "The account was disabled."
 msgstr "Účet bol povolený."
 
-#: ../lib/wiking/cms/users.py:895
+#: ../lib/wiking/cms/users.py:900
 #, fuzzy, python-format
 msgid "The registration expired on %(date)s."
 msgstr "Registrácia používateľa už bola potvrdená."
 
-#: ../lib/wiking/cms/users.py:898
+#: ../lib/wiking/cms/users.py:903
 #, fuzzy
 msgid "Continue"
 msgstr "Obsah"
 
-#: ../lib/wiking/cms/users.py:902
+#: ../lib/wiking/cms/users.py:907
 #, fuzzy
 msgid "The registration code was not confirmed by the user!"
 msgstr "Registrácia používateľa už bola potvrdená."
 
-#: ../lib/wiking/cms/users.py:903
+#: ../lib/wiking/cms/users.py:908
 msgid ""
 "Please enable the account only if you are sure that the e-mail address "
 "belongs to given user."
 msgstr ""
 
-#: ../lib/wiking/cms/users.py:1111
+#: ../lib/wiking/cms/users.py:1131
 msgid "Listing of all active user accounts."
 msgstr "Výpis všetkých aktívnych používateľských účtov."
 
-#: ../lib/wiking/cms/users.py:1138
+#: ../lib/wiking/cms/users.py:1142
+msgid "Users who have `confirm' flag set"
+msgstr ""
+
+#: ../lib/wiking/cms/users.py:1167
 msgid "Enter your login name or e-mail address"
 msgstr "Zadajte svoje prihlasovacie meno alebo emailovú adresu"
 
-#: ../lib/wiking/cms/users.py:1173
+#: ../lib/wiking/cms/users.py:1202
 msgid "Password reminder"
 msgstr "Pomocník zabudnutého hesla"
 
-#: ../lib/wiking/cms/users.py:1186
+#: ../lib/wiking/cms/users.py:1215
 msgid "Multiple user accounts found for given email address."
 msgstr "Pre zadanú emailovú adresu bolo nájdených viac používateľských účtov."
 
-#: ../lib/wiking/cms/users.py:1187
+#: ../lib/wiking/cms/users.py:1216
 msgid "Please, select the account for which you want to remind:"
 msgstr "Zvoľte prosím účet, pre ktorý chcete použiť funkciu pripomenutia:"
 
 #. Translators: Credentials such as password...
-#: ../lib/wiking/cms/users.py:1200
+#: ../lib/wiking/cms/users.py:1229
 msgid "Your credentials were reset to:"
 msgstr "Vaše prihlasovacie údaje boli nastavené na:"
 
 #. Translators: Credentials such as password...
-#: ../lib/wiking/cms/users.py:1204
+#: ../lib/wiking/cms/users.py:1233
 msgid "Your credentials are:"
 msgstr "Vaše prihlasovacie údaje sú:"
 
-#: ../lib/wiking/cms/users.py:1206
+#: ../lib/wiking/cms/users.py:1235
 #, python-format
 msgid "A password reminder request has been made at %(server_uri)s."
 msgstr ""
 "Na serveri %(server_uri)s bola zadaná žiadosť o zaslanie zabudnutého hesla."
 
-#: ../lib/wiking/cms/users.py:1213
+#: ../lib/wiking/cms/users.py:1242
 msgid ""
 "We strongly recommend you change your password at nearest occassion, since "
 "it has been exposed to an unsecure channel."
@@ -2155,69 +2019,223 @@ msgstr ""
 "Silne vám doporučujeme zmeniť si heslo pri najbližšej možnej príležitosti, "
 "pretože počas prenosu emailom mohlo byť zachytené neoprávnenou osobou."
 
-#: ../lib/wiking/cms/users.py:1219
+#: ../lib/wiking/cms/users.py:1248
 msgid "Please try repeating your request later or contact the administrator!"
 msgstr "Zopakujte prosím svoju žiadosť neskôr alebo kontaktujte správcu!"
 
-#: ../lib/wiking/cms/users.py:1221
+#: ../lib/wiking/cms/users.py:1250
 msgid "E-mail information has been sent to your email address."
 msgstr "Emailové upozornenie bolo odoslané na vašu emailovú adresu."
 
-#: ../lib/wiking/cms/users.py:1224
+#: ../lib/wiking/cms/users.py:1253
 msgid "No user account for your query."
 msgstr "Zadaniu nezodpovedá žiadny používateľský účet."
 
-#: ../lib/wiking/cms/users.py:1248
+#: ../lib/wiking/cms/users.py:1277
 msgid "History of successful login sessions and unsuccessful login attempts."
 msgstr ""
 
 #. Translators: Login name.
-#: ../lib/wiking/cms/users.py:1254
+#: ../lib/wiking/cms/users.py:1283
 #, fuzzy
 msgid "Login"
 msgstr "Prihlasovacie meno"
 
 #. Translators: Form field saying whether the users attempt was succesful. Values are Yes/No.
-#: ../lib/wiking/cms/users.py:1256
+#: ../lib/wiking/cms/users.py:1285
 msgid "Success"
 msgstr ""
 
 #. Translators: Table column heading. Time of the start of user session, followed by a date and time.
-#: ../lib/wiking/cms/users.py:1258
+#: ../lib/wiking/cms/users.py:1287
 #, fuzzy
 msgid "Start time"
 msgstr "Názov portálu"
 
 #. Translators: Table column heading. The length of user session. Contains time.
-#: ../lib/wiking/cms/users.py:1260
+#: ../lib/wiking/cms/users.py:1289
 #, fuzzy
 msgid "Duration"
 msgstr "Popis"
 
-#: ../lib/wiking/cms/users.py:1263
+#: ../lib/wiking/cms/users.py:1292
 #, fuzzy
 msgid "IP address"
 msgstr "Adresa"
 
 #. Translators: Internet name of the remote computer (computer terminology).
-#: ../lib/wiking/cms/users.py:1265
+#: ../lib/wiking/cms/users.py:1294
 #, fuzzy
 msgid "Hostname"
 msgstr "Meno"
 
 #. Translators: "User agent" is a generalized name for browser or more precisely the
 #. software which produced the HTTP request (was used to access the website).
-#: ../lib/wiking/cms/users.py:1268
+#: ../lib/wiking/cms/users.py:1297
 #, fuzzy
 msgid "User agent"
 msgstr "Správa používateľov"
 
 #. Translators: Meaning where the user came from. Computer terminology. Do not translate
 #. "HTTP" and if unsure, don't translate at all (it is a very technical term).
-#: ../lib/wiking/cms/users.py:1271
+#: ../lib/wiking/cms/users.py:1300
 msgid "HTTP Referer"
 msgstr ""
 
+#: ../lib/wiking/configuration.py:194
+msgid "Webmaster's e-mail address"
+msgstr "Emailová adresa webmastera"
+
+#: ../lib/wiking/configuration.py:205
+msgid "Default sender address"
+msgstr "Prednastavená adresa odosielateľa"
+
+#: ../lib/wiking/configuration.py:222
+msgid "Force HTTPS login"
+msgstr "Účinnosť HTTP prihlásení"
+
+#: ../lib/wiking/configuration.py:223
+msgid ""
+"If enabled, the login form will always be redirected to an HTTPS address to "
+"ensure the security of the submitted credentials.  This, however, requires "
+"your server to be setup to accept HTTPS requests for the same virtual host "
+"and pass them to Wiking."
+msgstr ""
+"Ak je aktivovaný, prihlasovací formulár bude vždy presmerovaný na adresu "
+"HTTPS, aby bola zaistená bezpečnosť vložených osobných údajov. To však "
+"vyžaduje, aby bol váš server konfigurovaný pre obsluhu HTTPS požiadaviek pre "
+"rovnaký virtuálny server a aby tieto požiadavky boli odovzdávané systému "
+"Wiking."
+
+#. Translators: Site means a webpage or web application.
+#: ../lib/wiking/configuration.py:276
+msgid "Site title"
+msgstr "Názov portálu"
+
+#: ../lib/wiking/configuration.py:277
+msgid ""
+"Site title is a short and (hopefully) unique title of the whole website. It "
+"will appear at the top of every page."
+msgstr ""
+"Tento názov by mal byť krátky a ak je to možné, mal by byť jediným názvom "
+"internetového portálu. Názov sa bude zobrazovať v záhlaví každej stránky."
+
+#. Translators: Site means a webpage or web application. Subtitle as in ,,title -- subtitle''.
+#: ../lib/wiking/configuration.py:283
+msgid "Site subtitle"
+msgstr "Podnázov portálu"
+
+#: ../lib/wiking/configuration.py:284
+msgid ""
+"Site subtitle is an optional more descriptive title of the website.  It will "
+"appear at the top of every page together with site title, but where brevity "
+"matters, only title will be used."
+msgstr ""
+"Podnázov je nepovinný podrobnejší popis portálu. Bude tiež zobrazený v "
+"záhlaví každej stránky, ale v situáciách, ktoré vyžadujú stručnosť, bude "
+"vynechaný."
+
+#. Translators: Web page or web application specific image.
+#: ../lib/wiking/configuration.py:291
+#, fuzzy
+msgid "Site icon"
+msgstr "Názov portálu"
+
+#: ../lib/wiking/configuration.py:305
+msgid "Default language"
+msgstr "Východzí jazyk"
+
+#. Translators: Language negotiation means the process where the server is trying
+#. to find a language that matches with what the users internet browser asks for.
+#: ../lib/wiking/configuration.py:308
+msgid ""
+"Defines the language (lowercase ISO 639-1 Alpha-2 code) to be used when "
+"content language negotiation fails. If not set (which is the default), the "
+"server will issue a 606 HTTP error (Not acceptable) when the document is not "
+"available in any of the requested languages. The error page will contain a "
+"description of the problem and a list of available language variants of the "
+"requested document. The negotiation is based on the browser setting of "
+"user's language preference passed through the 'Accept-Language' HTTP header. "
+"If set, Wiking will automatically serve given language variant instead of "
+"issuing the error if that variant is available.  If unavailable, the 606 "
+"error is raised anyway, so you need to make sure that all documents are "
+"available at least in the default language variant if you want to avoid 606 "
+"errors completely."
+msgstr ""
+"Definuje jazyk (ISO 639-1 Alpha-2 kód), ktorý má byť použitý, ak obsah "
+"zvoleného jazyk zlyhá. Ak nie je nastavený (čo je predvolená hodnota), "
+"server vygeneruje chybu 606 HTTP (Nie je prijateľné), ak dokument nebude k "
+"dispozícii v žiadnom z požadovaných jazykov. Stránka o chybách bude "
+"obsahovať popis problému a zoznam dostupných jazykových variánt k "
+"požadovanému dokumentu. Zobrazenie závisí na nastavení prehliadača "
+"používateľa a na jeho jazykových preferenciách odosielaných cez HTTP "
+"záhlavie 'Akceptovať-Jazyk'. Ak je to nastavené, Wiking automaticky zobrazí "
+"dostupnú jazykovú variantu namiesto zobrazenia hlásenia o chybe. Ak nie je "
+"dostupná, bude zobrazené hlásenie o chybe 606, takže ak mu chcete úplne "
+"predísť, uistite sa, že všetky dokumenty sú dostupné aspoň vo východzom "
+"jazyku."
+
+#. Translators: Yes/No configuration option label. Should the login panel display user role (as Admin, Student, Tutor etc.)
+#: ../lib/wiking/configuration.py:378
+#, fuzzy
+msgid "Display role in login panel"
+msgstr "Zobraziť panel prihlásenia"
+
+#: ../lib/wiking/configuration.py:379
+msgid ""
+"If enabled, the login panel on each page will not display only the current "
+"username, but also his current user role, which affects his permissions."
+msgstr ""
+
+#: ../lib/wiking/configuration.py:397
+msgid "Whether to use e-mails as login names"
+msgstr "Použiť emailovú adresu ako prihlasovacie meno"
+
+#: ../lib/wiking/configuration.py:398
+msgid "Iff true, users must use e-mail addresses as their login names."
+msgstr ""
+"Ak je to tak nastavené, používatelia musia používať emailovú adresu ako "
+"prihlasovacie meno."
+
+#: ../lib/wiking/configuration.py:412
+msgid ""
+"If set, the newly registered users will be automatically approved without "
+"any administrator's action.  The adminstrator may still need to asign users "
+"to groups to grant them further privileges, but the accounts are enabled "
+"right after the user confirms the registration code."
+msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "The first step of your registration at %(server_hostname)s was "
+#~ "successfully completed.\n"
+#~ "\n"
+#~ "For the next step visit the following URL and follow the instructions "
+#~ "there:\n"
+#~ "%(uri)s\n"
+#~ "\n"
+#~ "If the above link fails, you will be prompted for your activation code "
+#~ "when\n"
+#~ "you attempt to log in.\n"
+#~ "\n"
+#~ "Your activation code is: %(code)s\n"
+#~ msgstr ""
+#~ "Prvý krok vašej registrácie na %(server_hostname)s bol úspešne "
+#~ "dokončený.\n"
+#~ "\n"
+#~ "Na ďalšie kroky navštívte webovú adresu a riaďte sa inštrukciami:\n"
+#~ "%(uri)s\n"
+
+#~ msgid "Registration accepted."
+#~ msgstr "Registrácia prijatá."
+
+#~ msgid "Please, check your mailbox for instructions how to proceed."
+#~ msgstr ""
+#~ "Prosím, prečítajte si ďalšie inštrukcie vo vašej emailovej schránke."
+
+#~ msgid "Activation code was sent to %s."
+#~ msgstr "Aktivačný kód bol zaslaný na  %s."
+
 #~ msgid "Private"
 #~ msgstr "Privátne"
 


hooks/post-receive
-- 
Wiking



More information about the Wiking-cvs mailing list