From: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Date: Tue, 13 Mar 2012 16:26:34 +0000 (+0100)
Subject: working social auth
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/451f7b0e0ee3bfdab38cfa9c98a297c5320b52ad?ds=inline

working social auth
---

diff --git a/babel.cfg b/babel.cfg
new file mode 100644
index 000000000..d7e179da9
--- /dev/null
+++ b/babel.cfg
@@ -0,0 +1,5 @@
+[extractors]
+django = babeldjango.extract:extract_django
+
+[django: **/templates/**.*]
+[python: **.py]
diff --git a/locale-contrib/django.pot b/locale-contrib/django.pot
new file mode 100644
index 000000000..1bb323827
--- /dev/null
+++ b/locale-contrib/django.pot
@@ -0,0 +1,539 @@
+# Translations template for PROJECT.
+# Copyright (C) 2012 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PROJECT VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2012-03-13 15:12+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:36
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:167
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:341
+msgid "Password"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:40
+msgid "Remember Me"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:52
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:113
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:284
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:363
+msgid "E-mail"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:57
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:104
+msgid "Username"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:85
+msgid "This account is currently inactive."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:88
+msgid "The e-mail address and/or password you specified are not correct."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:90
+msgid "The username and/or password you specified are not correct."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:116
+msgid "E-mail (optional)"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:127
+msgid "Usernames can only contain letters, numbers and underscores."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:133
+msgid "This username is already taken. Please choose another."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:141
+msgid "A user is registered with this e-mail address."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:171
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:345
+msgid "Password (again)"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:198
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:330
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:352
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:428
+msgid "You must type the same password each time."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:234
+msgid "Your e-mail address has already been verified"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:244
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/utils.py:93
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/views.py:101
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/views.py:117
+#, python-format
+msgid "Confirmation e-mail sent to %(email)s"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:292
+msgid "This e-mail address already associated with this account."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:293
+msgid "This e-mail address already associated with another account."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:310
+msgid "Current Password"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:314
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:411
+msgid "New Password"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:318
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:415
+msgid "New Password (again)"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:324
+msgid "Please type your current password."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:373
+msgid "The e-mail address is not assigned to any user account"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:393
+msgid "Password Reset E-mail"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/utils.py:72
+#, python-format
+msgid "Successfully signed in as %(user)s."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/views.py:133
+#, python-format
+msgid "Removed e-mail address %(email)s"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/views.py:147
+msgid "Primary e-mail address set"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/views.py:168
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/views.py:241
+msgid "Password successfully changed."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/views.py:191
+msgid "Password successfully set."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/views.py:255
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/logout.html:10
+msgid "You have signed out."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/openid/forms.py:6
+msgid "OpenID"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/socialaccount/forms.py:32
+msgid "Your local account has no password setup."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/socialaccount/forms.py:36
+msgid "Your local account has no verified e-mail address."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/socialaccount/helpers.py:112
+msgid "The social account has been connected to your existing account"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/socialaccount/oauth.py:89
+#, python-format
+msgid "Invalid response while obtaining request token from \"%s\"."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/socialaccount/oauth.py:111
+#, python-format
+msgid "Invalid response while obtaining access token from \"%s\"."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/socialaccount/oauth.py:124
+#, python-format
+msgid "No request token saved for \"%s\"."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/socialaccount/oauth.py:172
+#, python-format
+msgid "No access token saved for \"%s\"."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/socialaccount/oauth.py:192
+#, python-format
+msgid "No access to private resources at \"%s\"."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/socialaccount/views.py:68
+msgid "The social account has been disconnected"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:6
+msgid "Account"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:9
+msgid "E-mail Addresses"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:12
+msgid "The following e-mail addresses are associated to your account:"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:26
+msgid "Verified"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:28
+msgid "Unverified"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:30
+msgid "Primary"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:36
+msgid "Make Primary"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:37
+msgid "Re-send Verification"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:38
+msgid "Remove"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:45
+msgid "Warning:"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:45
+msgid ""
+"You currently do not have any e-mail address set up. You should really "
+"add an e-mail address so you can receive notifications, reset your "
+"password, etc."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:50
+msgid "Add E-mail Address"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:57
+msgid "Add E-mail"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:69
+msgid "Do you really want to remove the selected e-mail address?"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/language_change.html:6
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/language_change.html:9
+msgid "Language"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/language_change.html:11
+msgid "Pinax can be used in your preferred language."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/language_change.html:18
+msgid "Change my language"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/login.html:7
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/login.html:12
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/login.html:47
+msgid "Sign In"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/login.html:20
+#, python-format
+msgid ""
+"Please sign in with one\n"
+"of your existing third party accounts. Or, <a \n"
+"href=\"%(signup_url)s\">sign up</a> for a %(site_name)s account and sign "
+"in\n"
+"below:"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/login.html:28
+msgid "or"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/login.html:45
+msgid "Forgot Password?"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/logout.html:5
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/logout.html:8
+msgid "Signed Out"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_change.html:5
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_change.html:8
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_change.html:15
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset_from_key.html:5
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset_from_key.html:8
+msgid "Change Password"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_delete.html:5
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_delete.html:8
+msgid "Delete Password"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_delete.html:9
+msgid ""
+"You may delete your password since you are currently logged in using "
+"OpenID."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_delete.html:12
+msgid "delete my password"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_delete_done.html:5
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_delete_done.html:8
+msgid "Password Deleted"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_delete_done.html:9
+msgid "Your password has been deleted."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset.html:7
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset.html:11
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset_done.html:6
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset_done.html:9
+msgid "Password Reset"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset.html:16
+msgid ""
+"Forgotten your password? Enter your e-mail address below, and we'll send "
+"you an e-mail allowing you to reset it."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset.html:23
+msgid "Reset My Password"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset.html:28
+#, python-format
+msgid ""
+"If you have any trouble resetting your password, contact us at <a "
+"href=\"mailto:%(CONTACT_EMAIL)s\">%(CONTACT_EMAIL)s</a>."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset_done.html:15
+#, python-format
+msgid ""
+"We have sent you an e-mail. If you do not receive it within a few "
+"minutes, contact us at <a "
+"href=\"mailto:%(CONTACT_EMAIL)s\">%(CONTACT_EMAIL)s</a>."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset_from_key.html:8
+msgid "Bad Token"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset_from_key.html:12
+#, python-format
+msgid ""
+"The password reset link was invalid, possibly because it has already been"
+" used.  Please request a <a href=\"%(passwd_reset_url)s\">new password "
+"reset</a>."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset_from_key.html:20
+msgid "change password"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset_from_key.html:25
+msgid "Your password is now changed."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset_key_message.txt:9
+#, python-format
+msgid ""
+"You're receiving this e-mail because you or someone else has requested a "
+"password for your user account at %(site_domain)s.\n"
+"It can be safely ignored if you did not request a password reset. Click "
+"the link below to reset your password.\n"
+"\n"
+"%(password_reset_url)s\n"
+"\n"
+"In case you forgot, your username is %(username)s.\n"
+"\n"
+"Thanks for using our site!\n"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_set.html:6
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_set.html:9
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_set.html:16
+msgid "Set Password"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/signup.html:6
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/signup.html:6
+msgid "Signup"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/signup.html:9
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/signup.html:24
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/signup.html:9
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/signup.html:22
+msgid "Sign Up"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/signup.html:14
+msgid "Already have an account?"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/signup.html:14
+msgid "Sign in"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/timezone_change.html:6
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/timezone_change.html:9
+msgid "Timezone"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/timezone_change.html:11
+msgid ""
+"Pinax can localize all times into your preferred timezone. Change your "
+"timezone below."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/timezone_change.html:18
+msgid "Change my timezone"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/verification_sent.html:5
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/verification_sent.html:8
+msgid "Verify Your E-mail Address"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/verification_sent.html:10
+#, python-format
+msgid ""
+"We have sent you an e-mail to <b>%(email)s</b> for verification. Follow "
+"the link provided to finalize the signup process. If you do not receive "
+"it within a few minutes, contact us at <a "
+"href=\"mailto:%(CONTACT_EMAIL)s\">%(CONTACT_EMAIL)s</a>."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/snippets/already_logged_in.html:5
+msgid "Note"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/snippets/already_logged_in.html:5
+#, python-format
+msgid "you are already logged in as %(user_display)s."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/emailconfirmation/confirm_email.html:5
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/emailconfirmation/confirm_email.html:8
+msgid "E-mail Address Confirmation"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/emailconfirmation/confirm_email.html:11
+#, python-format
+msgid ""
+"You have confirmed that <a href=\"mailto:%(email)s\">%(email)s</a> is an "
+"e-mail address for user '%(user)s'."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/emailconfirmation/confirm_email.html:13
+msgid "Invalid confirmation key."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/openid/login.html:10
+msgid "OpenID Sign In"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/account_inactive.html:5
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/account_inactive.html:8
+msgid "Account Inactive"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/account_inactive.html:10
+msgid "This account is inactive."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/authentication_error.html:5
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/authentication_error.html:8
+msgid "Social Network Login Failure"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/authentication_error.html:10
+msgid ""
+"An error occured while attempting to login via your social network "
+"account."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/connections.html:5
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/connections.html:8
+msgid "Account Connections"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/connections.html:11
+msgid ""
+"You can sign in to your account using any of the following third party "
+"accounts:"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/connections.html:46
+msgid "Add a 3rd Party Account"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/login_cancelled.html:5
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/login_cancelled.html:9
+msgid "Login Cancelled"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/login_cancelled.html:13
+#, python-format
+msgid ""
+"You decided to cancel logging in to our site using one of your exisiting "
+"accounts. If this was a mistake, please proceed to <a "
+"href=\"%(login_url)s\">sign in</a>."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/signup.html:12
+#, python-format
+msgid ""
+"You are about to use your %(provider_name)s account to login to \n"
+"%(site_name)s. As a final step, please complete the following form:"
+msgstr ""
+
diff --git a/locale-contrib/pl/LC_MESSAGES/django.mo b/locale-contrib/pl/LC_MESSAGES/django.mo
new file mode 100644
index 000000000..ffc92c398
Binary files /dev/null and b/locale-contrib/pl/LC_MESSAGES/django.mo differ
diff --git a/locale-contrib/pl/LC_MESSAGES/django.po b/locale-contrib/pl/LC_MESSAGES/django.po
new file mode 100644
index 000000000..071599ce9
--- /dev/null
+++ b/locale-contrib/pl/LC_MESSAGES/django.po
@@ -0,0 +1,518 @@
+# Polish translations for PROJECT.
+# Copyright (C) 2012 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PROJECT VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2012-03-13 15:12+0100\n"
+"PO-Revision-Date: 2012-03-13 15:39+0100\n"
+"Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
+"Language-Team: pl <LL@li.org>\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:36
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:167
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:341
+msgid "Password"
+msgstr "Hasło"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:40
+msgid "Remember Me"
+msgstr "Zapamiętaj mnie"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:52
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:113
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:284
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:363
+msgid "E-mail"
+msgstr "E-mail"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:57
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:104
+msgid "Username"
+msgstr "Login"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:85
+msgid "This account is currently inactive."
+msgstr "Konto jest nieaktywne."
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:88
+msgid "The e-mail address and/or password you specified are not correct."
+msgstr "Podany e-mail i/lub hasło są niepoprawne."
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:90
+msgid "The username and/or password you specified are not correct."
+msgstr "Podany login i/lub hasło są niepoprawne."
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:116
+msgid "E-mail (optional)"
+msgstr "E-mail (opcjonalnie)"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:127
+msgid "Usernames can only contain letters, numbers and underscores."
+msgstr "Login może zawierać tylko litery, cyfry i znaki podkreślenia."
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:133
+msgid "This username is already taken. Please choose another."
+msgstr "Ten login jest zajęty. Proszę wybrać inny."
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:141
+msgid "A user is registered with this e-mail address."
+msgstr "Istnieje użytkownik o tym adresie e-mail."
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:171
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:345
+msgid "Password (again)"
+msgstr "Hasło (ponownie)"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:198
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:330
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:352
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:428
+msgid "You must type the same password each time."
+msgstr "Proszę wpisać dwa razy to samo hasło."
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:234
+msgid "Your e-mail address has already been verified"
+msgstr "Adres e-mail jest już zweryfikowany."
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:244
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/utils.py:93
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/views.py:101
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/views.py:117
+#, python-format
+msgid "Confirmation e-mail sent to %(email)s"
+msgstr "E-mail potwierdzający wysłany do %(email)s"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:292
+msgid "This e-mail address already associated with this account."
+msgstr "Ten adres e-mail jest już używany przez to konto."
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:293
+msgid "This e-mail address already associated with another account."
+msgstr "Ten adres e-mail jest już używany przez inne konto."
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:310
+msgid "Current Password"
+msgstr "Aktualne hasło"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:314
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:411
+msgid "New Password"
+msgstr "Nowe hasło"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:318
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:415
+msgid "New Password (again)"
+msgstr "Nowe hasło (ponownie)"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:324
+msgid "Please type your current password."
+msgstr "Proszę wpisać swoje aktualne hasło."
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:373
+msgid "The e-mail address is not assigned to any user account"
+msgstr "Ten adres e-mail nie jest używany przez żadne konto."
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:393
+msgid "Password Reset E-mail"
+msgstr "E-mail resetujący hasło"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/utils.py:72
+#, python-format
+msgid "Successfully signed in as %(user)s."
+msgstr "Zalogowano jako  %(user)s."
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/views.py:133
+#, python-format
+msgid "Removed e-mail address %(email)s"
+msgstr "Usunięto adres e-mail %(email)s"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/views.py:147
+msgid "Primary e-mail address set"
+msgstr "Ustawiono główny adres e-mail"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/views.py:168
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/views.py:241
+msgid "Password successfully changed."
+msgstr "Hasło zostało zmienione."
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/views.py:191
+msgid "Password successfully set."
+msgstr "Hasło zostało ustawione."
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/views.py:255
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/logout.html:10
+msgid "You have signed out."
+msgstr "Wylogowano."
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/openid/forms.py:6
+msgid "OpenID"
+msgstr "OpenID"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/socialaccount/forms.py:32
+msgid "Your local account has no password setup."
+msgstr "Twoje konto nie ma ustawionego hasła."
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/socialaccount/forms.py:36
+msgid "Your local account has no verified e-mail address."
+msgstr "Twoje konto nie ma potwierdzonego adresu e-mail."
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/socialaccount/helpers.py:112
+msgid "The social account has been connected to your existing account"
+msgstr "Konto społecznościowe zostało podłączone do Twojego konta."
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/socialaccount/oauth.py:89
+#, python-format
+msgid "Invalid response while obtaining request token from \"%s\"."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/socialaccount/oauth.py:111
+#, python-format
+msgid "Invalid response while obtaining access token from \"%s\"."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/socialaccount/oauth.py:124
+#, python-format
+msgid "No request token saved for \"%s\"."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/socialaccount/oauth.py:172
+#, python-format
+msgid "No access token saved for \"%s\"."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/socialaccount/oauth.py:192
+#, python-format
+msgid "No access to private resources at \"%s\"."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/socialaccount/views.py:68
+msgid "The social account has been disconnected"
+msgstr "Konto społecznościowe zostało odłączone."
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:6
+msgid "Account"
+msgstr "Konto"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:9
+msgid "E-mail Addresses"
+msgstr "Adresy e-mail"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:12
+msgid "The following e-mail addresses are associated to your account:"
+msgstr "Z Twoim kontem są związane następujące adresy e-mail:"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:26
+msgid "Verified"
+msgstr "Potwierdzony"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:28
+msgid "Unverified"
+msgstr "Nie potwierdzony"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:30
+msgid "Primary"
+msgstr "Główny"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:36
+msgid "Make Primary"
+msgstr "Ustaw główny"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:37
+msgid "Re-send Verification"
+msgstr "Ponownie prześlij link potwierdzający"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:38
+msgid "Remove"
+msgstr "Usuń"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:45
+msgid "Warning:"
+msgstr "Uwaga:"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:45
+msgid "You currently do not have any e-mail address set up. You should really add an e-mail address so you can receive notifications, reset your password, etc."
+msgstr "Nie masz ustawionego żadnego adresu e-mail. Dodanie adresu e-mail umożliwi odzyskanie konta w przypadku utraty hasła."
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:50
+msgid "Add E-mail Address"
+msgstr "Dodaj adres e-mail"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:57
+msgid "Add E-mail"
+msgstr "Dodaj e-mail"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:69
+msgid "Do you really want to remove the selected e-mail address?"
+msgstr "Czy na pewno usunąć wybrany adres e-mail?"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/language_change.html:6
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/language_change.html:9
+msgid "Language"
+msgstr "Język"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/language_change.html:11
+msgid "Pinax can be used in your preferred language."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/language_change.html:18
+msgid "Change my language"
+msgstr "Zmień język"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/login.html:7
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/login.html:12
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/login.html:47
+msgid "Sign In"
+msgstr "Zaloguj"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/login.html:20
+#, python-format
+msgid ""
+"Please sign in with one\n"
+"of your existing third party accounts. Or, <a \n"
+"href=\"%(signup_url)s\">sign up</a> for a %(site_name)s account and sign in\n"
+"below:"
+msgstr ""
+"Zaloguj za pomocą konta zewnętrznego, albo <a \n"
+"href=\"%(signup_url)s\">zarejestruj się</a> w serwisie %(site_name)s i zaloguj poniżej:"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/login.html:28
+msgid "or"
+msgstr "lub"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/login.html:45
+msgid "Forgot Password?"
+msgstr "Nie pamiętasz hasła?"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/logout.html:5
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/logout.html:8
+msgid "Signed Out"
+msgstr "Wylogowano"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_change.html:5
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_change.html:8
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_change.html:15
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset_from_key.html:5
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset_from_key.html:8
+msgid "Change Password"
+msgstr "Zmień hasło"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_delete.html:5
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_delete.html:8
+msgid "Delete Password"
+msgstr "Usuń hasło"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_delete.html:9
+msgid "You may delete your password since you are currently logged in using OpenID."
+msgstr "Możesz usunąć hasło, ponieważ jesteś zalogowany/-a za pomocą OpenID."
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_delete.html:12
+msgid "delete my password"
+msgstr "usuń moje hasło"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_delete_done.html:5
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_delete_done.html:8
+msgid "Password Deleted"
+msgstr "Hasło usunięte"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_delete_done.html:9
+msgid "Your password has been deleted."
+msgstr "Twoje hasło zostało usunięte."
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset.html:7
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset.html:11
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset_done.html:6
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset_done.html:9
+msgid "Password Reset"
+msgstr "Odzyskiwanie hasła"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset.html:16
+msgid "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it."
+msgstr "Nie pamiętasz swojego hasła? Wpisz adres e-mail, a wyślemy Ci e-mail umożliwiający zresetowanie go."
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset.html:23
+msgid "Reset My Password"
+msgstr "Odzyskaj hasło"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset.html:28
+#, python-format
+msgid "If you have any trouble resetting your password, contact us at <a href=\"mailto:%(CONTACT_EMAIL)s\">%(CONTACT_EMAIL)s</a>."
+msgstr "Jeśli masz problem z odzyskaniem hasła, napisz do nas pod <a href=\"mailto:%(CONTACT_EMAIL)s\">%(CONTACT_EMAIL)s</a>."
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset_done.html:15
+#, python-format
+msgid "We have sent you an e-mail. If you do not receive it within a few minutes, contact us at <a href=\"mailto:%(CONTACT_EMAIL)s\">%(CONTACT_EMAIL)s</a>."
+msgstr "E-mail został wysłany. Jeśli nie otrzymasz go w ciągu kilku minut, napisz do nas pod <a href=\"mailto:%(CONTACT_EMAIL)s\">%(CONTACT_EMAIL)s</a>."
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset_from_key.html:8
+msgid "Bad Token"
+msgstr "Błędny klucz"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset_from_key.html:12
+#, python-format
+msgid "The password reset link was invalid, possibly because it has already been used.  Please request a <a href=\"%(passwd_reset_url)s\">new password reset</a>."
+msgstr "Link resetujący hasło jest nieprawidłowy, być może ponieważ został już wcześniej użyty. Spróbuj <a href=\"%(passwd_reset_url)s\">zresetować hasło ponownie</a>."
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset_from_key.html:20
+msgid "change password"
+msgstr "zmień hasło"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset_from_key.html:25
+msgid "Your password is now changed."
+msgstr "Hasło zostało zmienione."
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset_key_message.txt:9
+#, python-format
+msgid ""
+"You're receiving this e-mail because you or someone else has requested a password for your user account at %(site_domain)s.\n"
+"It can be safely ignored if you did not request a password reset. Click the link below to reset your password.\n"
+"\n"
+"%(password_reset_url)s\n"
+"\n"
+"In case you forgot, your username is %(username)s.\n"
+"\n"
+"Thanks for using our site!\n"
+msgstr ""
+"Otrzymujesz tego e-maila, ponieważ zostaliśmy poproszeni o zresetowanie hasła dla konta w serwisie %(site_domain)s.\n"
+"Możesz go zignorować, jeśli prośba nie pochodzi od Ciebie. Wejdź pod poniższy link, aby zresetować swoje hasło.\n"
+"\n"
+"%(password_reset_url)s\n"
+"\n"
+"W razie czego, Twój login to: %(username)s.\n"
+"\n"
+"Miłego czytania!\n"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_set.html:6
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_set.html:9
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_set.html:16
+msgid "Set Password"
+msgstr "Ustaw hasło"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/signup.html:6
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/signup.html:6
+msgid "Signup"
+msgstr "Rejestracja"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/signup.html:9
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/signup.html:24
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/signup.html:9
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/signup.html:22
+msgid "Sign Up"
+msgstr "Zarejestruj się"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/signup.html:14
+msgid "Already have an account?"
+msgstr "Masz już konto?"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/signup.html:14
+msgid "Sign in"
+msgstr "Zaloguj się"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/timezone_change.html:6
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/timezone_change.html:9
+msgid "Timezone"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/timezone_change.html:11
+msgid "Pinax can localize all times into your preferred timezone. Change your timezone below."
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/timezone_change.html:18
+msgid "Change my timezone"
+msgstr ""
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/verification_sent.html:5
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/verification_sent.html:8
+msgid "Verify Your E-mail Address"
+msgstr "Potwierdź swój adres e-mail"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/verification_sent.html:10
+#, python-format
+msgid "We have sent you an e-mail to <b>%(email)s</b> for verification. Follow the link provided to finalize the signup process. If you do not receive it within a few minutes, contact us at <a href=\"mailto:%(CONTACT_EMAIL)s\">%(CONTACT_EMAIL)s</a>."
+msgstr "Na adres <b>%(email)s</b> został wysłany e-mail w celu potwierdzenia konta. W treści e-maila znajduje się link, pod który trzeba przejść w celu dokończenia rejestracji. Jeśli nie dostaniesz go w ciągu kilku minut, napisz do nas pod <a href=\"mailto:%(CONTACT_EMAIL)s\">%(CONTACT_EMAIL)s</a>."
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/snippets/already_logged_in.html:5
+msgid "Note"
+msgstr "Zwróć uwagę"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/snippets/already_logged_in.html:5
+#, python-format
+msgid "you are already logged in as %(user_display)s."
+msgstr "jesteś już zalogowany/-a jako %(user_display)s."
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/emailconfirmation/confirm_email.html:5
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/emailconfirmation/confirm_email.html:8
+msgid "E-mail Address Confirmation"
+msgstr "Potwierdzenie adresu e-mail"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/emailconfirmation/confirm_email.html:11
+#, python-format
+msgid "You have confirmed that <a href=\"mailto:%(email)s\">%(email)s</a> is an e-mail address for user '%(user)s'."
+msgstr "Adres <a href=\"mailto:%(email)s\">%(email)s</a> został właśnie powierdzony jako e-mail dla użytkownika '%(user)s'."
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/emailconfirmation/confirm_email.html:13
+msgid "Invalid confirmation key."
+msgstr "Niepoprawny klucz potwierdzający."
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/openid/login.html:10
+msgid "OpenID Sign In"
+msgstr "Logowanie przy użyciu OpenID"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/account_inactive.html:5
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/account_inactive.html:8
+msgid "Account Inactive"
+msgstr "Konto nieaktywne"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/account_inactive.html:10
+msgid "This account is inactive."
+msgstr "To konto jest nieaktywne."
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/authentication_error.html:5
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/authentication_error.html:8
+msgid "Social Network Login Failure"
+msgstr "Błąd podczas logowania przy użyciu sieci społecznościowej."
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/authentication_error.html:10
+msgid "An error occured while attempting to login via your social network account."
+msgstr "Podczas próby zalogowania za pośrednictwej konta w sieci społecznościowej wystąpił błąd."
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/connections.html:5
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/connections.html:8
+msgid "Account Connections"
+msgstr "Powiązania konta"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/connections.html:11
+msgid "You can sign in to your account using any of the following third party accounts:"
+msgstr "Możesz zalogować się na swoje konto używając następujących kont zewnętrznych:"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/connections.html:46
+msgid "Add a 3rd Party Account"
+msgstr "Dodaj konto zewnętrzne"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/login_cancelled.html:5
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/login_cancelled.html:9
+msgid "Login Cancelled"
+msgstr "Logowanie anulowane"
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/login_cancelled.html:13
+#, python-format
+msgid "You decided to cancel logging in to our site using one of your exisiting accounts. If this was a mistake, please proceed to <a href=\"%(login_url)s\">sign in</a>."
+msgstr "Logowanie do serwisu za pomocą istniejącego konta zostało anulowane. Jeśli był to błąd, przejdź do <a href=\"%(login_url)s\">strony logowania</a>."
+
+#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/signup.html:12
+#, python-format
+msgid ""
+"You are about to use your %(provider_name)s account to login to \n"
+"%(site_name)s. As a final step, please complete the following form:"
+msgstr ""
+"Za chwilę użyjesz konta w serwisie %(provider_name)s aby zalogować się \n"
+"do serwisu %(site_name)s. Zanim to nastąpi, wypełnij proszę ten krótki formularz:"
+
diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py
index 599e7fb08..3f842e7a9 100644
--- a/wolnelektury/settings.py
+++ b/wolnelektury/settings.py
@@ -220,6 +220,7 @@ COMPRESS_CSS = {
             'css/catalogue.css',
             'css/sponsors.css',
             'css/logo.css',
+            'css/auth.css',
 
             'css/social/shelf_tags.css',
             'css/ui-lightness/jquery-ui-1.8.16.custom.css',
@@ -342,6 +343,10 @@ BROKER_VHOST = "/"
 
 CELERY_EAGER_PROPAGATES_EXCEPTIONS = True
 
+LOCALE_PATHS = [
+    path.join(PROJECT_DIR, '../locale-contrib')
+]
+
 # Load localsettings, if they exist
 try:
     from localsettings import *
diff --git a/wolnelektury/static/css/auth.css b/wolnelektury/static/css/auth.css
new file mode 100644
index 000000000..756c8d8e0
--- /dev/null
+++ b/wolnelektury/static/css/auth.css
@@ -0,0 +1,67 @@
+#auth-page p {
+	font-size: 1.2em;
+}
+#auth-page h2 {
+	font-size: 2em;
+	margin-top: 1em;
+}
+
+.uniForm {
+	font-size: 1.2em;
+}
+.uniForm fieldset {
+	border: none;
+	margin: .5em 0;
+}
+.uniForm .ctrlHolder {
+	margin: .5em 0;
+}
+
+.inlineLabels label {
+	width: 8em;
+	display: inline-block;
+}
+.inlineLabels .buttonHolder, .inlineLabels .formHint {
+	margin-left: 8em;
+}
+
+
+
+.email_list .verified {
+	display: inline-block;
+	margin-left: 2em;
+	font-style: italic;
+}
+.email_list .unverified {
+	display: inline-block;
+	margin-left: 2em;
+	color: #717171;
+	font-style: italic;
+}
+.email_list .primary {
+	display: inline-block;
+	margin-left: 2em;
+	font-weight: bold;
+}
+.socialaccount_provider {
+	display: inline-block;
+	background-repeat: no-repeat;
+	color: transparent;
+	height: 40px;
+	width: 40px;
+	vertical-align: middle;
+}
+.socialaccount_provider.google {
+	background-image: url(/static/img/auth/google.png);
+}
+
+
+.socialaccount_providers {
+	margin: 1em 0;
+	padding: 0;
+}
+.socialaccount_providers li {
+	display: inline;
+	list-style: none;
+	margin-right: 1em;
+}
\ No newline at end of file
diff --git a/wolnelektury/static/css/dialogs.css b/wolnelektury/static/css/dialogs.css
index 803c14d39..d83116ba6 100755
--- a/wolnelektury/static/css/dialogs.css
+++ b/wolnelektury/static/css/dialogs.css
@@ -115,14 +115,3 @@
 #custom-pdf-window label {
     display: inline;
 }
-
-
-.socialauth {
-	margin: 1em 0;
-	padding: 0;
-}
-.socialauth li {
-	display: inline;
-	list-style: none;
-	margin-right: 1em;
-}
diff --git a/wolnelektury/static/css/header.css b/wolnelektury/static/css/header.css
index 320fa8931..5a196769b 100755
--- a/wolnelektury/static/css/header.css
+++ b/wolnelektury/static/css/header.css
@@ -241,6 +241,7 @@ a.menu span {
 	left: 0;
 	top: 2em;
 	width: 15em;
+	line-height:1.6em;
 }
 #user-menu a {
 	color: #0D7E85;
diff --git a/wolnelektury/templates/account/email.html b/wolnelektury/templates/account/email.html
deleted file mode 100644
index 1f0710bad..000000000
--- a/wolnelektury/templates/account/email.html
+++ /dev/null
@@ -1,65 +0,0 @@
-{% extends "account/base.html" %}
-{% load i18n %}
-{% load ajaxable_tags %}
-
-{% block titleextra %}{% trans "Account" %}{% endblock %}
-
-{% block body %}
-    <h1>{% trans "E-mail Addresses" %}</h1>
-
-{% if user.emailaddress_set.all %}
-<p class="normal-text">{% trans 'The following e-mail addresses are associated to your account:' %}</p>
-    
-<form action="{% url account_email %}" class="cuteform" method="post">
-{% csrf_token %}
-  {% for emailaddress in user.emailaddress_set.all %}
-      <label for="email_radio_{{forloop.counter}}" class="{% if emailaddress.primary %}primary_email{%endif%}">
-      <input id="email_radio_{{forloop.counter}}" type="radio" name="email" {% if emailaddress.primary %}checked="checked"{%endif %} value="{{emailaddress.email}}"/>
-
-{{ emailaddress.email }}
-    {% if emailaddress.verified %}
-    <span class="verified">{% trans "Verified" %}</span>
-    {% else %}
-    <span class="unverified">{% trans "Unverified" %}</span>
-    {% endif %}
-      {% if emailaddress.primary %}<span class="primary">{% trans "Primary" %}</span>{% endif %}
-</label>
-{% endfor %}
-
-<div style="margin-top:1em;">
-      <button class="secondaryAction" type="submit" name="action_primary" >{% trans 'Make Primary' %}</button>
-      <button class="secondaryAction" type="submit" name="action_send" >{% trans 'Re-send Verification' %}</button>
-      <button class="primaryAction" type="submit" name="action_remove" >{% trans 'Remove' %}</button>
-</div>
-</form>
-
-{% else %} 
-<p class="normal-text"><strong>{% trans 'Warning:'%}</strong> {% trans "You currently do not have any e-mail address set up. You should really add an e-mail address so you can receive notifications, reset your password, etc." %}</p>
-{% endif %}
-
-
-    <h1>{% trans "Add E-mail Address" %}</h1>
-    
-    <form method="post" action="" class="cuteform hidelabels">
-    <ul>
-        {% csrf_token %}
-		{{ add_email_form|placeholdized_ul }}
-        <li><button name="action_add" type="submit">{% trans "Add E-mail" %}</button></li>
-    </ul>
-    </form>
-    
-{% endblock %}
-
-
-{% block extrabody %}
-<script type="text/javascript">
-$(function(){
-$("button[name='action_remove']").click(function(){
-if (confirm("{% trans 'Do you really want to remove the selected e-mail address?' %}")) {
-return true;
-}
-return false;
-});
-});
-</script>
-{% endblock %}
diff --git a/wolnelektury/templates/account/password_change.html b/wolnelektury/templates/account/password_change.html
deleted file mode 100644
index 6abc0a9e0..000000000
--- a/wolnelektury/templates/account/password_change.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-{% load ajaxable_tags %}
-
-{% block titleextra %}{% trans "Change Password" %}{% endblock %}
-
-{% block body %}
-    <h1>{% trans "Change Password" %}</h1>
-    
-    <form method="POST" action="" class="cuteform hidelabels">
-        {% csrf_token %}
-      	<ul>
-            {{ password_change_form|placeholdized_ul }}
-            <li><input type="submit" name="action" value="{% trans "Change Password" %}"/></li>
-        </ul>
-    </form>
-{% endblock %}
diff --git a/wolnelektury/templates/account/password_reset.html b/wolnelektury/templates/account/password_reset.html
deleted file mode 100644
index 9a8bc1975..000000000
--- a/wolnelektury/templates/account/password_reset.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-{% load ajaxable_tags %}
-{% load account_tags %}
-
-{% block titleextra %}{% trans "Password Reset" %}{% endblock %}
-
-{% block body %}
-
-    <h1>{% trans "Password Reset" %}</h1>
-    <p class="normal-text">{% trans "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it." %}</p>
-    
-    <form method="POST" action="" class="cuteform hidelabels">
-        {% csrf_token %}
-    	<ul>
-    		{{ password_reset_form|placeholdized_ul }}
-            <li><input type="submit" value="{% trans "Reset My Password" %}" /></li>
-         </ul>
-    </form>
-{% endblock %}
diff --git a/wolnelektury/templates/account/password_reset_done.html b/wolnelektury/templates/account/password_reset_done.html
deleted file mode 100644
index 9447109de..000000000
--- a/wolnelektury/templates/account/password_reset_done.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-
-{% block titleextra %}{% trans "Password Reset" %}{% endblock %}
-
-{% block body %}
-    <h1>{% trans "Password Reset" %}</h1>
-    <p class="normal-text">{% trans "We have sent you an e-mail. You should receive it within a few minutes." %}</p>
-{% endblock %}
diff --git a/wolnelektury/templates/account/password_reset_from_key.html b/wolnelektury/templates/account/password_reset_from_key.html
deleted file mode 100644
index 5cdd68e3a..000000000
--- a/wolnelektury/templates/account/password_reset_from_key.html
+++ /dev/null
@@ -1,26 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-{% load ajaxable_tags %}
-
-{% block titleextra %}{% trans "Change Password" %}{% endblock %}
-
-{% block body %}
-    <h1>{% if token_fail %}{% trans "Bad Token" %}{% else %}{% trans "Change Password" %}{% endif %}</h1>
-    
-    {% if token_fail %}
-        {% url account_reset_password as passwd_reset_url %}
-        <p class="normal-text">{% blocktrans %}The password reset link was invalid, possibly because it has already been used.  Please request a <a href="{{ passwd_reset_url }}">new password reset</a>.{% endblocktrans %}</p>
-    {% else %}
-        {% if form %}
-            <form method="POST" action="" class="cuteform hidelabels">
-                {% csrf_token %}
-                <ul>
-	    			{{ form|placeholdized_ul }}
-    				<li><input type="submit" name="action" value="{% trans "change password" %}"/></li>
-                </ul>
-            </form>
-        {% else %}
-            <p class="normal-text">{% trans 'Your password is now changed.' %}</p>
-        {% endif %}
-    {% endif %}
-{% endblock %}
diff --git a/wolnelektury/templates/account/password_reset_key_message.txt b/wolnelektury/templates/account/password_reset_key_message.txt
deleted file mode 100644
index 23db17a57..000000000
--- a/wolnelektury/templates/account/password_reset_key_message.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-{% load i18n %}{% blocktrans with site.domain as site_domain and user.username as username %}You're receiving this e-mail because you or someone else has requested a password for your user account at {{site_domain}}.
-It can be safely ignored if you did not request a password reset. Click the link below to reset your password.
-
-{{password_reset_url}}
-
-In case you forgot, your username is {{username}}.
-
-Thanks for using our site!
-{% endblocktrans %}
\ No newline at end of file
diff --git a/wolnelektury/templates/account/password_set.html b/wolnelektury/templates/account/password_set.html
deleted file mode 100644
index d061a46e4..000000000
--- a/wolnelektury/templates/account/password_set.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-{% load ajaxable_tags %}
-
-{% block head_title %}{% trans "Set Password" %}{% endblock %}
-
-{% block body %}
-    <h1>{% trans "Set Password" %}</h1>
-    
-    <form method="POST" action="" class="cuteform hidelabels">
-        {% csrf_token %}
-      	<ul>
-            {{ password_set_form|placeholdized_ul }}
-            <li><input type="submit" name="action" value="{% trans "Set Password" %}"/></li>
-        </ul>
-    </form>
-{% endblock %}
\ No newline at end of file
diff --git a/wolnelektury/templates/auth/login.html b/wolnelektury/templates/auth/login.html
index ba5385a13..caa0aea2c 100644
--- a/wolnelektury/templates/auth/login.html
+++ b/wolnelektury/templates/auth/login.html
@@ -6,12 +6,15 @@
 <ol>
     <div id="id_{% if form_prefix %}{{ form_prefix }}-{% endif %}__all__"></div>
     {{ form.as_ul }}
-    <li><a href="{% url account_reset_password %}">{% trans "Forgot your password?" %}</a></li>
+    <li><a href="{% url account_reset_password %}">{% trans "Forgot Password?" %}</a></li>
     <li><input type="submit" value="{{ submit }}"/></li>
 </ol>
 </form>
 
-<h1>{% trans "or merge accounts:" %}</h1>
+<h1>{% trans "Sign in using:" %}</h1>
 
+<ul class="socialaccount_providers">
 {% include "socialaccount/snippets/provider_list.html" %}
+</ul>
 
+{% include "socialaccount/snippets/login_extra.html" %}
diff --git a/wolnelektury/templates/emailconfirmation/confirm_email.html b/wolnelektury/templates/emailconfirmation/confirm_email.html
deleted file mode 100644
index 0b74c11ff..000000000
--- a/wolnelektury/templates/emailconfirmation/confirm_email.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-
-{% block titleextra %}{% trans "E-mail Address Confirmation" %}{% endblock %}
-
-{% block body %}
-    <h1>{% trans "E-mail Address Confirmation" %}</h1>
-    {% if email_address %}
-        <p class="normal-text">{% blocktrans with email_address.email as email and email_address.user as user %}You have confirmed that <a href="mailto:{{email}}">{{ email }}</a> is an e-mail address for user '{{ user }}'.{% endblocktrans %}</p>
-    {% else %}
-        <p class="normal-text">{% trans "Invalid confirmation key." %}</p>
-    {% endif %}
-{% endblock %}
\ No newline at end of file
diff --git a/wolnelektury/templates/openid/login.html b/wolnelektury/templates/openid/login.html
index 47413977f..05037a369 100644
--- a/wolnelektury/templates/openid/login.html
+++ b/wolnelektury/templates/openid/login.html
@@ -1,22 +1,32 @@
-{% extends "base.html" %}
-{% load i18n %}
-{% load ajaxable_tags %}
-
+{% extends "site_base.html" %}
 
-{% block titleextra %}{% trans "OpenID Sign In" %}{% endblock %}
+{% load i18n %}
+{% load uni_form_tags %}
 
+{% block head_title %}{% trans "OpenID Sign In" %}{% endblock %}
 
 {% block body %}
 
 <h1>{% trans 'OpenID Sign In' %}</h1>
 
 
-<form class="cuteform hidelabels" method="post" action="{% url openid_login %}">
-<ul>
-	{% csrf_token %}
-	{{ form|placeholdized_ul }}
-    <li><input type="submit" value='{% trans "Login" %}' /></li>
-</ul>
+<form id="openid_login_form" class="openid_login uniForm" method="post" action="{% url openid_login %}">
+{% csrf_token %}
+<fieldset class="inlineLabels">
+
+{#{form|as_uni_form}#}
+<div id="div_id_openid" class="ctrlHolder">
+<label for="id_openid" class="requiredField">
+OpenID<span class="asteriskField">*</span>
+</label>
+<input id="id_openid" type="text" class="textInput textinput" name="openid" />
+</div>
+
+
+<div class="buttonHolder">
+<button type="submit">{% trans "Sign In" %}</button>
+</div>
+</fieldset>
 </form>
 
 {% endblock %}
diff --git a/wolnelektury/templates/site_base.html b/wolnelektury/templates/site_base.html
new file mode 100644
index 000000000..b0c2ca524
--- /dev/null
+++ b/wolnelektury/templates/site_base.html
@@ -0,0 +1,5 @@
+{% extends "base.html" %}
+{# This is for allauth templates. #}
+
+{% block bodyid %}auth-page{% endblock %}
+{% block titleextra %}{% block head_title %}{% endblock %}{% endblock %}
diff --git a/wolnelektury/templates/socialaccount/base.html b/wolnelektury/templates/socialaccount/base.html
deleted file mode 100644
index 94d9808cc..000000000
--- a/wolnelektury/templates/socialaccount/base.html
+++ /dev/null
@@ -1 +0,0 @@
-{% extends "base.html" %}
diff --git a/wolnelektury/templates/socialaccount/connections.html b/wolnelektury/templates/socialaccount/connections.html
new file mode 100644
index 000000000..0446fd921
--- /dev/null
+++ b/wolnelektury/templates/socialaccount/connections.html
@@ -0,0 +1,56 @@
+{% extends "site_base.html" %}
+
+{% load i18n %}
+
+{% block head_title %}{% trans "Account Connections" %}{% endblock %}
+
+{% block body %}
+<h1>{% trans "Account Connections" %}</h1>
+
+{% if form.accounts %}
+<p>{% blocktrans %}You can sign in to your account using any of the following third party accounts:{% endblocktrans %}</p>
+
+
+<form class="uniForm" method="post">
+{% csrf_token %}
+
+<fieldset class="blockLabels">
+{% if form.non_field_errors %}
+<div id="errorMsg">{{form.non_field_errors}}</div>
+{% endif %}
+
+{% for base_account in form.accounts %}
+{% with base_account.get_provider_account as account %}
+<div class="ctrlHolder">
+<label for="id_account_{{base_account.id}}">
+<input id="id_account_{{base_account.id}}" type="radio" name="account" value="{{base_account.id}}"/>
+<span class="socialaccount_provider {{account.get_provider}}">{{account.get_provider}}</span>
+{{account}}
+</label>
+</div>
+{% endwith %}
+{% endfor %}
+
+<div class="buttonHolder">
+<button type="submit">{% trans "Remove" %}</button>
+</div>
+
+</fieldset>
+
+</form>
+
+{% else %}
+<p>{% trans "You currently have no social network accounts connected to this account." %}</p>
+{% endif %}
+
+<h2>{% trans 'Add a 3rd Party Account' %}</h2>
+
+<ul class="socialaccount_providers">
+{% include "socialaccount/snippets/provider_list.html" %}
+</ul>
+
+{% include "socialaccount/snippets/login_extra.html" %}
+
+{% endblock %}
+
+
diff --git a/wolnelektury/templates/socialaccount/snippets/provider_list.html b/wolnelektury/templates/socialaccount/snippets/provider_list.html
index 45b740c25..85bf0bcc0 100644
--- a/wolnelektury/templates/socialaccount/snippets/provider_list.html
+++ b/wolnelektury/templates/socialaccount/snippets/provider_list.html
@@ -1,11 +1,6 @@
 {% load allauth_tags %}
 {% load catalogue_tags %}
 
-{% if allauth.facebook_enabled %}
-{% fbconnect %}
-{% endif %}
-
-<ul class="socialauth">
 {% if allauth.openid_enabled %}
 <li><a title="Google" class="socialaccount_provider google" href="{% openid_login_url openid="https://www.google.com/accounts/o8/id" %}">
 	<img alt="Google" src="{{ STATIC_URL }}img/auth/google.png" /></a></li>
@@ -27,4 +22,3 @@
 	<img alt="OpenID" src="{{ STATIC_URL }}img/auth/openid.png" /></a></li>
 <!--li><a title="Hyves" class="socialaccount_provider hyves" href="{% openid_login_url openid="http://hyves.nl" %}">Hyves</a></li-->
 {% endif %}
-</ul>