From: Lukasz <lukasz@anwajler.com>
Date: Tue, 11 May 2010 07:33:43 +0000 (+0200)
Subject: Merge branch 'master' of http://github.com/fnp/wolnelektury
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/3ac9cb26acd9b7c5ba421dac123ba8f75b782bd2?hp=e432f8579852df4ffc3010bc54bbabe452591956

Merge branch 'master' of github.com/fnp/wolnelektury
---

diff --git a/wolnelektury/locale/pl/LC_MESSAGES/django.mo b/wolnelektury/locale/pl/LC_MESSAGES/django.mo
deleted file mode 100644
index d0ea820cd..000000000
Binary files a/wolnelektury/locale/pl/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/wolnelektury/locale/pl/LC_MESSAGES/django.po b/wolnelektury/locale/pl/LC_MESSAGES/django.po
index 493474566..018768517 100644
--- a/wolnelektury/locale/pl/LC_MESSAGES/django.po
+++ b/wolnelektury/locale/pl/LC_MESSAGES/django.po
@@ -3,11 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-04 06:17-0500\n"
+"POT-Creation-Date: 2010-05-04 14:30+0200\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"
@@ -15,140 +16,45 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: catalogue/models.py:15
-msgid "author"
-msgstr "autor"
-
-#: catalogue/models.py:16
-msgid "epoch"
-msgstr "epoka"
-
-#: catalogue/models.py:17
-msgid "kind"
-msgstr "rodzaj"
-
-#: catalogue/models.py:18
-msgid "genre"
-msgstr "gatunek"
-
-#: catalogue/models.py:19
-msgid "theme"
-msgstr "motyw"
-
-#: catalogue/models.py:20
-msgid "set"
-msgstr "zestaw"
-
-#: catalogue/models.py:34
-msgid "name"
-msgstr "nazwa"
-
-#: catalogue/models.py:35 catalogue/models.py:71
-msgid "slug"
-msgstr "slug"
-
-#: catalogue/models.py:36
-msgid "sort key"
-msgstr "klucz sortowania"
-
-#: catalogue/models.py:37
-msgid "category"
-msgstr "kategoria"
-
-#: catalogue/models.py:45 catalogue/models.py:72 catalogue/models.py:86
-#: chunks/models.py:11
-msgid "description"
-msgstr "opis"
-
-#: catalogue/models.py:54 newtagging/models.py:470
-msgid "tag"
-msgstr "tag"
-
-#: catalogue/models.py:55 newtagging/admin.py:38
-msgid "tags"
-msgstr "tagi"
-
-#: catalogue/models.py:70
-msgid "title"
-msgstr "tytuł"
-
-#: catalogue/models.py:73
-msgid "creation date"
-msgstr "data utworzenia"
-
-#: catalogue/models.py:76
-msgid "XML file"
-msgstr "plik XML"
-
-#: catalogue/models.py:77
-msgid "PDF file"
-msgstr "plik PDF"
-
-#: catalogue/models.py:78
-msgid "ODT file"
-msgstr "plik ODT"
-
-#: catalogue/models.py:79
-msgid "HTML file"
-msgstr "plik HTML"
-
-#: catalogue/models.py:162
-msgid "book"
-msgstr "książka"
-
-#: catalogue/models.py:163
-msgid "books"
-msgstr "książki"
-
-#: catalogue/models.py:180
-msgid "fragment"
-msgstr "fragment"
-
-#: catalogue/models.py:181
-msgid "fragments"
-msgstr "fragmenty"
-
-#: chunks/models.py:10
-msgid "key"
-msgstr "klucz"
-
-#: chunks/models.py:10
-msgid "A unique name for this chunk of content"
-msgstr "Unikalna nazwa dla tego kawałka treści"
+#: templates/base.html:19
+msgid ""
+"Internet Explorer cannot display this site properly. Click here to read "
+"more..."
+msgstr ""
 
-#: chunks/models.py:12
-msgid "content"
-msgstr "zawartość"
+#: templates/base.html:27
+msgid "See more"
+msgstr ""
 
-#: chunks/models.py:16
-msgid "chunk"
-msgstr "kawałek"
+#: templates/base.html:36
+msgid "Welcome"
+msgstr ""
 
-#: chunks/models.py:17
-msgid "chunks"
-msgstr "kawałki"
+#: templates/base.html:37
+msgid "Your shelf"
+msgstr ""
 
-#: newtagging/models.py:471
-msgid "content type"
-msgstr "typ zawartości"
+#: templates/base.html:39
+msgid "Administration"
+msgstr ""
 
-#: newtagging/models.py:472
-msgid "object id"
-msgstr "id obiektu"
+#: templates/base.html:41
+msgid "Logout"
+msgstr ""
 
-#: newtagging/views.py:29
-msgid "tagged_object_list must be called with a queryset or a model."
+#: templates/base.html:44 templates/base.html.py:76 templates/base.html:80
+#: templates/base.html.py:84
+msgid "Sign in"
 msgstr ""
 
-#: newtagging/views.py:31
-msgid "tagged_object_list must be called with a tag model."
+#: templates/base.html:73 templates/base.html.py:94
+msgid "Close"
 msgstr ""
 
-#: newtagging/views.py:33
-msgid "tagged_object_list must be called with a tag."
+#: templates/base.html:76 templates/base.html.py:84 templates/base.html:88
+msgid "Register"
 msgstr ""
 
-#: newtagging/views.py:37
-#, python-format
-msgid "No tags found matching \"%s\"."
-msgstr "Nie znaleziono tagów zgodnych z \"%s\"."
+#: templates/base.html:96
+msgid "Loading"
+msgstr ""
diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py
index eb6b88e35..62a2c9e23 100644
--- a/wolnelektury/settings.py
+++ b/wolnelektury/settings.py
@@ -3,7 +3,7 @@ from os import path
 
 PROJECT_DIR = path.abspath(path.dirname(__file__))
 
-DEBUG = False
+DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 
 ADMINS = [
@@ -75,6 +75,7 @@ MIDDLEWARE_CLASSES = [
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.middleware.doc.XViewMiddleware',
     'pagination.middleware.PaginationMiddleware',
+    'django.middleware.locale.LocaleMiddleware',
 ]
 
 ROOT_URLCONF = 'wolnelektury.urls'
diff --git a/wolnelektury/templates/1percent.html b/wolnelektury/templates/1percent.html
index 7ecb7a235..2e4c5576b 100644
--- a/wolnelektury/templates/1percent.html
+++ b/wolnelektury/templates/1percent.html
@@ -1,3 +1,4 @@
+{% load i18n %}
 {% extends 'base.html' %}
 
 {% block title %}1% podatku na WolneLektury.pl{% endblock title %}
diff --git a/wolnelektury/templates/404.html b/wolnelektury/templates/404.html
index e51ec8216..b4968a248 100644
--- a/wolnelektury/templates/404.html
+++ b/wolnelektury/templates/404.html
@@ -1,8 +1,9 @@
+{% load i18n %}
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="pl" xml:lang="pl">
 <head>
-<title>404 - Zagubiona strona w WolneLektury.pl</title>
+<title>404 - {% trans "Site does not exist" %} - WolneLektury.pl</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.5.2/build/reset/reset-min.css"> 
 <link rel="stylesheet" href="/static/css/error.css" type="text/css" />
@@ -11,9 +12,9 @@
 <body>
 
 <a href="/"><img src="/static/img/logo.png" /></a>
-<p class="haj" style="font-weight: bold">Podana strona nie istnieje</p>
+<p class="haj" style="font-weight: bold">{% trans "Site does not exist" %}</p>
 <p>
-Przepraszamy, ale ta strona nie istnieje. Sprawdź czy podałeś dobry adres, lub przejdź do <a href="/">strony głównej</a>.
+{% trans "We are sorry, but this site does not exist. Please check if you entered correct address or go to "%} <a href="/">{% trans "homepage" %}</a>.
 </p>
 
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
diff --git a/wolnelektury/templates/500.html b/wolnelektury/templates/500.html
index 8346afe29..e778d4fbd 100644
--- a/wolnelektury/templates/500.html
+++ b/wolnelektury/templates/500.html
@@ -1,8 +1,9 @@
+{% load i18n %}
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="pl" xml:lang="pl">
 <head>
-<title>500 - Błąd serwera w WolneLektury.pl</title>
+<title>500 - {% trans "Server error" %} WolneLektury.pl</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.5.2/build/reset/reset-min.css"> 
 <link rel="stylesheet" href="/static/css/error.css" type="text/css" />
@@ -11,9 +12,9 @@
 <body>
 
 <a href="/"><img src="/static/img/logo.png" /></a>
-<p class="haj" style="font-weight: bold">Błąd serwera</p>
+<p class="haj" style="font-weight: bold">{% trans "Server error" %}</p>
 <p>
-Przepraszamy, ale wystąpił błąd serwera. Na pewno już się nim zajmujemy i postaramy się naprawić tak szybko jak to tylko możliwe. Do tego czasu proponujemy żebyś przeszedł do <a href="/">strony głównej</a>.
+{% trans "We are sorry for your inconvenience, but server error occured. We are working on fixing it as soon as possible. Meanwhile, please go to " %}<a href="/">{% trans "homepage" %}</a>.
 </p>
 
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
diff --git a/wolnelektury/templates/admin/base_site.html b/wolnelektury/templates/admin/base_site.html
index d0ca937a0..087a3bb32 100644
--- a/wolnelektury/templates/admin/base_site.html
+++ b/wolnelektury/templates/admin/base_site.html
@@ -1,9 +1,10 @@
+{% load i18n %}
 {% extends "admin/base.html" %}
 
-{% block title %}{{ title }} | Administracja stroną WolneLektury.pl{% endblock %}
+{% block title %}{{ title }} | {% trans "Site administration" %} - WolneLektury.pl{% endblock %}
 
 {% block branding %}
-<h1 id="site-name">Administracja stroną WolneLektury.pl</h1>
+<h1 id="site-name">{% trans "Site administration" %} - WolneLektury.pl</h1>
 {% endblock %}
 
 {% block nav-global %}{% endblock %}
\ No newline at end of file
diff --git a/wolnelektury/templates/admin/catalogue/book/change_list.html b/wolnelektury/templates/admin/catalogue/book/change_list.html
index 3ded50367..ee2b43f39 100644
--- a/wolnelektury/templates/admin/catalogue/book/change_list.html
+++ b/wolnelektury/templates/admin/catalogue/book/change_list.html
@@ -1,8 +1,9 @@
+{% load i18n %}
 {% extends "admin/change_list.html" %}
 
 {% block content %}
     <form action="{% url import_book %}" method="post" enctype="multipart/form-data">
-        <p><input type="file" id="id_book_xml_file" name="book_xml_file" /> <input type="submit" value="Importuj książkę"/></p>
+        <p><input type="file" id="id_book_xml_file" name="book_xml_file" /> <input type="submit" value="{% trans "Import book" %}"/></p>
     </form>
     {{ block.super }}
 {% endblock content %}
\ No newline at end of file
diff --git a/wolnelektury/templates/auth/login.html b/wolnelektury/templates/auth/login.html
index 6db94aa22..733314dac 100644
--- a/wolnelektury/templates/auth/login.html
+++ b/wolnelektury/templates/auth/login.html
@@ -1,24 +1,25 @@
+{% load i18n %}
 {% extends "base.html" %}
 
-{% block title %}Zaloguj / Zarejestruj się w WolneLektury.pl{% endblock %}
+{% block title %}{% trans "Sign in" %} / {% trans "Register on"%} WolneLektury.pl{% endblock %}
 
 {% block body %}
-    <h1>Zaloguj się / Załóż konto</h1>
+    <h1>{% trans "Sign in" %} / {% trans "Register"%}</h1>
     <form action="." method="get" accept-charset="utf-8" id="search-form">
-        <p><li>{{ search_form.q }} <input type="submit" value="Szukaj" /></li> <strong>lub</strong> <a href="{% url main_page %}">wróć do strony głównej</a></p>
+        <p><li>{{ search_form.q }} <input type="submit" value="{% trans "Search" %}" /></li> <strong>{% trans "or" %}</strong> <a href="{% url main_page %}">{% trans "return to main page" %}</a></p>
     </form>
     <form method="post" action="." id="login-form" class="cuteform">
-        <h2>Zaloguj się</h2>
+        <h2>{% trans "Sign in" %}</h2>
         <ol>
             {{ form.as_ul }}
-            <li><input type="submit" value="Zaloguj się" /></li>
+            <li><input type="submit" value="{% trans "Sign in" %}" /></li>
         </ol>
         <p><input type="hidden" name="next" value="{{ next }}" /></p>
     </form>
     
     <form action="." method="post" accept-charset="utf-8" id="registration-form">
-        <h2>Załóż konto</h2>
+        <h2>{% trans "Register" %}</h2>
 
-        <p><input type="submit" value="Załóż konto"/></p>
+        <p><input type="submit" value="{% trans "Register" %}"/></p>
     </form>
 {% endblock %}
diff --git a/wolnelektury/templates/base.html b/wolnelektury/templates/base.html
index f62f41d7e..7538206cf 100644
--- a/wolnelektury/templates/base.html
+++ b/wolnelektury/templates/base.html
@@ -1,3 +1,4 @@
+{% load i18n %}
 {% load chunks compressed catalogue_tags sponsor_tags %}
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -15,7 +16,7 @@
     <body id="{% block bodyid %}base{% endblock %}">
         <!--[if lt IE 7]><link href=/static/infobar/infobar.css rel=stylesheet>
         <div id=infobar><a href=http://browsehappy.pl/infobar>
-        Internet Explorer nie potrafi poprawnie wyświetlić tej strony. Kliknij tutaj, aby dowiedzieć się więcej...
+        {% trans "Internet Explorer cannot display this site properly. Click here to read more..." %}
         </a></div><div id=viewplot><script src=/static/infobar/infobar.js></script><![endif]-->
         {% block bodycontent %}
         <div id="top-message">
@@ -23,7 +24,7 @@
         </div>
         <div id="onepercent-banner" style="display:none">
             <a href="{% url 1percent %}" id="onepercent-text"></a>
-            <a href="{% url 1percent %}" id="onepercent-see-more">Zobacz więcej</a>
+            <a href="{% url 1percent %}" id="onepercent-see-more">{% trans "See more" %}</a>
         </div>
         <div id="header">
             <div id="logo">
@@ -32,15 +33,15 @@
             <div id="user-info" style="display:none">
                 {% if user.is_authenticated %}
                     <p>
-                        Witaj, <strong>{{ user.username }}</strong>
-                        | <a href="{% url user_shelves %}" id="user-shelves-link">Twoje półki</a>
+                        {% trans "Welcome" %},<strong>{{ user.username }}</strong>
+                        | <a href="{% url user_shelves %}" id="user-shelves-link">{% trans "Your shelves" %}</a>
                         {% if user.is_staff %}
-                        | <a href="/admin/">Administracja</a>
+                        | <a href="/admin/">{% trans "Administration" %}</a>
                         {% endif %}
-                        | <a href="{% url logout %}?next={{ request.get_full_path }}">Wyloguj</a>
+                        | <a href="{% url logout %}?next={{ request.get_full_path }}">{% trans "Logout" %}</a>
                     </p>
                 {% else %}
-                    <p><a href="{% url login %}" class="login-register-link">Zaloguj się / Załóż konto</a></p>
+                    <p><a href="{% url login %}" class="login-register-link">{% trans "Sign in" %} / {% trans "Register" %}</a></p>
                 {% endif %}
             </div>
             <div class="social-links" style="float:right">
@@ -69,30 +70,30 @@
 			{% sponsor_page "footer" %}
         </div>
         <div id="login-register-window">
-            <div class="header"><a href="#" class="jqmClose">Zamknij</a></div>
+            <div class="header"><a href="#" class="jqmClose">{% trans "Close" %}</a></div>
             <div class="target">
                 <form method="post" action="{% url login %}" id="login-form" class="cuteform">
-                    <h2>Zaloguj się / <a href="#" id="show-registration-form" style="font-size: 0.85em; font-weight: normal">Załóż konto</a></h2>
+                    <h2>{% trans "Sign in" %} / <a href="#" id="show-registration-form" style="font-size: 0.85em; font-weight: normal">{% trans "Register" %}</a></h2>
                     <p><span id="id_login-__all__"></span></p>
                     <ol>
                         {% authentication_form %}
-                        <li><input type="submit" value="Zaloguj się" /></li>
+                        <li><input type="submit" value="{% trans "Sign in" %}" /></li>
                     </ol>
                 </form>
                 <form method="post" action="{% url register %}" id="registration-form" class="cuteform" style="display: none;">
-                    <h2><a href="#" id="show-login-form" style="font-size: 0.85em; font-weight: normal">Zaloguj się</a> / Załóż konto</h2>
+                    <h2><a href="#" id="show-login-form" style="font-size: 0.85em; font-weight: normal">{% trans "Sign in" %}</a> / {% trans "Register" %}</h2>
                     <p><span id="id_registration-__all__"></span></p>
                     <ol>
                         {% user_creation_form %}
-                        <li><input type="submit" value="Załóż konto" /></li>
+                        <li><input type="submit" value="{% trans "Register" %}" /></li>
                     </ol>
                 </form>
             </div>
         </div>
         <div id="user-shelves-window">
-            <div class="header"><a href="#" class="jqmClose">Zamknij</a></div>
+            <div class="header"><a href="#" class="jqmClose">{% trans "Close" %}</a></div>
             <div class="target">
-                <p><img src="/static/img/indicator.gif" alt="*"/> Ładowanie</p>
+                <p><img src="/static/img/indicator.gif" alt="*"/> {% trans "Loading" %}</p>
             </div>
         </div>
         {% endblock bodycontent %}
diff --git a/wolnelektury/templates/catalogue/book_detail.html b/wolnelektury/templates/catalogue/book_detail.html
index 089922b29..4cc4ea82a 100644
--- a/wolnelektury/templates/catalogue/book_detail.html
+++ b/wolnelektury/templates/catalogue/book_detail.html
@@ -1,52 +1,53 @@
+{% load i18n %}
 {% extends "base.html" %}
 {% load catalogue_tags pagination_tags %}
 
-{% block title %}Lektura {{ book.title }} w WolneLektury.pl{% endblock %}
+{% block title %}{{ book.title }} w WolneLektury.pl{% endblock %}
 
 {% block bodyid %}book-detail{% endblock %}
 
 {% block body %}
     <h1>{{ book.title }}, {{ categories.author|join:", " }}</h1>
     <form action="{% url search %}" method="get" accept-charset="utf-8" id="search-form">
-        <p>{{ form.q }} <input type="submit" value="Szukaj" /> <strong>lub</strong> <a href="{% url main_page %}">wróć do strony głównej</a></p>
+        <p>{{ form.q }} <input type="submit" value="{% trans "Search" %}" /> <strong>{% trans "or" %}</strong> <a href="{% url main_page %}">{% trans "return to homepage" %}</a></p>
     </form>
     
     <div id="books-list">
         {% if extra_info.license %}
-        <p>Utwór jest udostępniony na licencji <a href="{{ extra_info.license }}">{{ extra_info.license_description }}</a>.</p>
+        <p>{% trans "Work is licensed under " %}<a href="{{ extra_info.license }}">{{ extra_info.license_description }}</a>.</p>
         {% endif %}
-        <p>Na podstawie: {{ extra_info.source_name }}</p>
+        <p>{% trans "Based on" %}: {{ extra_info.source_name }}</p>
         {% if book.has_description %}
             <div id="description">
                 {{ book.description|safe }}
             </div>
-            <div id="toggle-description"><p>Zwiń opis ▲</p></div>
+            <div id="toggle-description"><p>{% trans "Toggle description" %} ▲</p></div>
         {% endif %}
         <div id="formats">
-            <p class="change-sets">Wrzuć lekturę <span><a href="{% url catalogue.views.book_sets book.slug %}" class="jqm-trigger">na półkę!</a></span></p>
+            <p class="change-sets">{% trans "Put a book" %} <span><a href="{% url catalogue.views.book_sets book.slug %}" class="jqm-trigger">{% trans "on the shelf!" %}</a></span></p>
             <div class="clearboth"></div>
             <div class="wrap">
             {% if book.html_file %}
-                <a href="{% url book_text book.slug %}">Czytaj online</a>
+                <a href="{% url book_text book.slug %}">{% trans "Read online" %}</a>
             {% endif %}
             {% if book.pdf_file %}
-                <a href="{{ book.pdf_file.url }}">Pobierz plik PDF</a>
+                <a href="{{ book.pdf_file.url }}">{% trans "Download PDF" %}</a>
             {% endif %}
             {% if book.odt_file %}
-                <a href="{{ book.odt_file.url }}">Pobierz plik ODT</a>
+                <a href="{{ book.odt_file.url }}">{% trans "Download ODT %}</a>
             {% endif %}
             {% if book.txt_file %}
-                <a href="{{ book.txt_file.url }}">Pobierz plik TXT</a>
+                <a href="{{ book.txt_file.url }}">{% trans "Download TXT %}</a>
             {% endif %}
             {% if book.mp3_file %}
                 <div id="czytamy-sluchajac-info">
                     <a href="http://czytamysluchajac.pl/" id="czytamysluchajac-logo"><img src="/static/img/czytamysluchajac-logo-small.png" /></a>     
-                    <p>Czyta: {{ book.get_extra_info_value.artist_name }}</p>
-                    <p>Reżyseruje: {{ book.get_extra_info_value.director_name }}</p>
+                    <p>{% trans "Artist" %}: {{ book.get_extra_info_value.artist_name }}</p>
+                    <p>{% trans "Director" %}: {{ book.get_extra_info_value.director_name }}</p>
                 </div>
             {% endif %}
-            {% if book.mp3_file %}<a href="{{ book.mp3_file.url }}">Pobierz plik MP3</a>{% endif %}
-            {% if book.ogg_file %}<a href="{{ book.ogg_file.url }}">Pobierz plik Ogg Vorbis</a>{% endif %}
+            {% if book.mp3_file %}<a href="{{ book.mp3_file.url }}">{% trans "Download MP3" %}</a>{% endif %}
+            {% if book.ogg_file %}<a href="{{ book.ogg_file.url }}">{% trans "Download Ogg Vorbis" %}</a>{% endif %}
             {% if book.mp3_file %}
             <object type="application/x-shockwave-flash" style="margin-top: 0.5em" data="/static/player.swf" width="426" height="20">
                 <param name="movie" value="/static/player.swf" />
@@ -73,47 +74,47 @@
         
     <div id="tags-list">
         <div id="book-info">
-            <h2>O utworze</h2>
+            <h2>{% trans "Details" %}</h2>
             <ul>
                 <li>
-                    Autor: 
+                    {% trans "Author" %}: 
                     {% for tag in categories.author %}
                     <a href="{{ tag.get_absolute_url }}">{{ tag }}</a>
                     {% endfor %}
                 </li>
                 <li>
-                    Epoka:
+                    {% trans "Epoch" %}:
                     {% for tag in categories.epoch %}
                     <a href="{{ tag.get_absolute_url }}">{{ tag }}</a>
                     {% endfor %}
                 </li>
                 <li>
-                    Rodzaj:
+                    {% trans "Kind" %}:
                     {% for tag in categories.kind %}
                     <a href="{{ tag.get_absolute_url }}">{{ tag }}</a>
                     {% endfor %}
                 </li>
                 <li>
-                    Gatunek:
+                    {% trans "Genre" %}:
                     {% for tag in categories.genre %}
                     <a href="{{ tag.get_absolute_url }}">{{ tag }}</a>
                     {% endfor %}
                 </li>
             </ul>
-            <h2>W innych miejscach</h2>
+            <h2>{% trans "Other resources" %}</h2>
             <ul>
-                <li><a href="{{ extra_info.about }}">Lektura na wiki projektu</a></li>
-                <li><a href="{{ extra_info.source_url }}">Lektura w CBN Polona</a></li>
+                <li><a href="{{ extra_info.about }}">{% trans "Book on project's wiki" %}</a></li>
+                <li><a href="{{ extra_info.source_url }}">{% trans "Book in CBN Polona" %}</a></li>
                 {% if book.gazeta_link %}
-                <li><a href="{{ book.gazeta_link }}">Opis lektury w Lektury.Gazeta.pl</a></li>
+                <li><a href="{{ book.gazeta_link }}">{% trans "Book description on Lektury.Gazeta.pl" %}</a></li>
                 {% endif %}
                 {% if book.wiki_link %}
-                <li><a href="{{ book.wiki_link }}">Opis lektury w Wikipedii</a></li>
+                <li><a href="{{ book.wiki_link }}">{% trans "Book description on Wikipedia" %}</a></li>
                 {% endif %}
             </ul>
         </div>
         <div id="themes-list">
-            <h2>Motywy w utworze</h2>
+            <h2>{% trans "Work's themes " %}</h2>
             <ul>
             {% for theme in book_themes %}
                 <li><a href="{% url book_fragments book.slug,theme.slug %}">{{ theme }} ({{ theme.count }})</a></li>
@@ -123,9 +124,9 @@
         <div class="clearboth"></div>
     </div>
     <div id="set-window">
-        <div class="header"><a href="#" class="jqmClose">Zamknij</a></div>
+        <div class="header"><a href="#" class="jqmClose">{% trans "Close" %}</a></div>
         <div class="target">
-            <p><img src="/static/img/indicator.gif" alt="*"/> Ładowanie</p>
+            <p><img src="/static/img/indicator.gif" alt="*"/> {% trans "Loading" %}</p>
         </div>
     </div>
 {% endblock %}
\ No newline at end of file
diff --git a/wolnelektury/templates/catalogue/book_fragments.html b/wolnelektury/templates/catalogue/book_fragments.html
index f21b1a806..bb5fba2b8 100644
--- a/wolnelektury/templates/catalogue/book_fragments.html
+++ b/wolnelektury/templates/catalogue/book_fragments.html
@@ -1,14 +1,15 @@
+{% load i18n %}
 {% extends "base.html" %}
 {% load catalogue_tags pagination_tags %}
 
-{% block title %}Motyw {{ theme }} w utworze {{ book }} w WolneLektury.pl{% endblock %}
+{% block title %}{% trans "Theme" %} {{ theme }} {% trans "in work " %} {{ book }} {% "on " %} WolneLektury.pl{% endblock %}
 
 {% block bodyid %}tagged-object-list{% endblock %}
 
 {% block body %}
-    <h1>Motyw {{ theme }} w utworze {{ book }}</h1>
+    <h1>{% trans "Theme" %} {{ theme }} {% trans "in work " %} {{ book }} </h1>
     <form action="{% url search %}" method="get" accept-charset="utf-8" id="search-form">
-        <p>{{ form.q }} <input type="submit" value="Szukaj" /> <strong>lub</strong> <a href="{{ book.get_absolute_url }}">wróć do strony utworu</a></p>
+        <p>{{ form.q }} <input type="submit" value="{% trans "Search" %}" /> <strong>{% trans "or" %}</strong> <a href="{{ book.get_absolute_url }}">{% trans "return to book's page" %}</a></p>
     </form>
 
     {% autopaginate fragments 10 %}
@@ -22,16 +23,16 @@
     </div>
     <div id="tags-list">
         <div id="categories-list">
-            Zobacz opis <a href="{{ book.get_absolute_url }}">utworu {{ book }}</a>
+            {% trans "See description" %} <a href="{{ book.get_absolute_url }}">{% trans "of the book "%} {{ book }}</a>
         </div>
         <div id="themes-list">
         </div>
         <div class="clearboth"></div>
     </div>
     <div id="set-window">
-        <div class="header"><a href="#" class="jqmClose">Zamknij</a></div>
+        <div class="header"><a href="#" class="jqmClose">{% trans "Close" %}</a></div>
         <div class="target">
-            <p><img src="/static/img/indicator.gif" alt="*"/> Ładowanie</p>
+            <p><img src="/static/img/indicator.gif" alt="*"/> {% trans "Loading" %}</p>
         </div>
     </div>
 {% endblock %}
\ No newline at end of file
diff --git a/wolnelektury/templates/catalogue/book_list.html b/wolnelektury/templates/catalogue/book_list.html
index 1f87217a6..47567f3eb 100644
--- a/wolnelektury/templates/catalogue/book_list.html
+++ b/wolnelektury/templates/catalogue/book_list.html
@@ -1,14 +1,15 @@
+{% load i18n %}
 {% extends "base.html" %}
 {% load catalogue_tags chunks %}
 
 {% block bodyid %}book-a-list{% endblock %}
 
-{% block title %}Alfabetyczny spis utworów w WolneLektury.pl{% endblock %}
+{% block title %}{% trans "Alphabetical listing of works on" %}Alfabetyczny spis utworów w WolneLektury.pl{% endblock %}
 
 {% block body %}
     <h1>Alfabetyczny spis utworów</h1>
     <form action="{% url search %}" method="GET" accept-charset="utf-8" id="search-form">
-        <p>{{ form.q }} <input type="submit" value="Szukaj" /> <strong>lub</strong> <a href="{% url main_page %}">wróć do strony głównej</a></p>
+        <p>{{ form.q }} <input type="submit" value="{% trans "Search" %}" /> <strong>{% trans "or" %}</strong> <a href="{% url main_page %}">{% trans "return to main page" %}</a></p>
     </form>
     
     <div id="book-list">
@@ -23,4 +24,4 @@
         </div>
         {% endfor %}    
     </div>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/wolnelektury/templates/catalogue/book_sets.html b/wolnelektury/templates/catalogue/book_sets.html
index fb5f6ae47..602dd21ec 100644
--- a/wolnelektury/templates/catalogue/book_sets.html
+++ b/wolnelektury/templates/catalogue/book_sets.html
@@ -1,17 +1,18 @@
-<h2>Wrzuć lekturę na półkę</h2>
+{% load i18n %}
+<h2>{% trans "Put a book on the shelf" %}</h2>
 {% if not user.tag_set.count %}
-    <p>Nie posiadasz żadnych półek. Jeśli chcesz, możesz utworzyć nową półkę poniżej.</p>
+    <p>{% trans "You do not have any shelves. You can create one below, if you want to."%}</p>
 {% else %}
     <form action="{% url catalogue.views.book_sets book.slug %}" method="POST" accept-charset="utf-8" class="cuteform">
     <ol>
         <li>{{ form.set_ids }}</li>
-        <li><input type="submit" value="Wrzuć na półkę"/></li>
+        <li><input type="submit" value="{% trans "Put on the shelf" %}"/></li>
     </ol>
     </form>
 {% endif %}
 <hr />
 <form action="{% url catalogue.views.new_set %}" method="POST" accept-charset="utf-8" class="cuteform">
 <ol>
-    <li>{{ new_set_form.name }} <input type="submit" value="Utwórz nową półkę"/></li>
+    <li>{{ new_set_form.name }} <input type="submit" value="{% trans "Create new shelf" %}"/></li>
 </ol>
 </form>
\ No newline at end of file
diff --git a/wolnelektury/templates/catalogue/book_short.html b/wolnelektury/templates/catalogue/book_short.html
index 3012069f9..2cc8328f5 100644
--- a/wolnelektury/templates/catalogue/book_short.html
+++ b/wolnelektury/templates/catalogue/book_short.html
@@ -1,6 +1,7 @@
+{% load i18n %}
 <div class="book">
     <div class="change-sets">
-        <a href="{% url catalogue.views.book_sets book.slug %}" class="jqm-trigger">Na półkę!</a>
+        <a href="{% url catalogue.views.book_sets book.slug %}" class="jqm-trigger">{% trans "Put on the shelf!" %}</a>
     </div>
     {% if book.children.all|length %}
         <div class="book-parent-thumbnail"></div>
@@ -10,8 +11,8 @@
     <div class="book-description">
         <h2><a href="{{ book.get_absolute_url }}">{{ book.title }}</a></h2>
         {% if formats %}
-            <p style="margin: 0">Na skróty: {{ formats|join:", " }}</p>
+            <p style="margin: 0">{% trans "Jump to" %}: {{ formats|join:", " }}</p>
         {% endif %}
-        <p style="margin: 0">Utwór w kategoriach: {{ tags|join:", " }}</p>
+        <p style="margin: 0">{% trans "Categories" %}: {{ tags|join:", " }}</p>
     </div>
 </div>
diff --git a/wolnelektury/templates/catalogue/book_text.html b/wolnelektury/templates/catalogue/book_text.html
index b3d18ea4d..55eef8ebd 100644
--- a/wolnelektury/templates/catalogue/book_text.html
+++ b/wolnelektury/templates/catalogue/book_text.html
@@ -1,3 +1,4 @@
+{% load i18n %}
 {% load chunks compressed catalogue_tags %}
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -13,8 +14,8 @@
     <body>
         <div id="menu">
             <ul>
-                <li><a href="#toc">Spis treści</a></li>
-                <li><a href="#themes">Motywy</a></li>
+                <li><a href="#toc">{% trans "Table of content" %}</a></li>
+                <li><a href="#themes">{% trans "Themes" %}</a></li>
             </ul>
         </div>
         <div id="header">
diff --git a/wolnelektury/templates/catalogue/breadcrumbs.html b/wolnelektury/templates/catalogue/breadcrumbs.html
index ecf8dbafa..000625b69 100644
--- a/wolnelektury/templates/catalogue/breadcrumbs.html
+++ b/wolnelektury/templates/catalogue/breadcrumbs.html
@@ -1,3 +1,4 @@
+{% load i18n %}
 {% load catalogue_tags %}
 <form action="{% url search %}" method="get" accept-charset="utf-8" id="search-form">
     <ol>
@@ -5,7 +6,7 @@
         <li class="category"><a href="{% catalogue_url tag %}">{{ tag }}</a> | <a href="{% catalogue_url tag_list -tag %}">x</a></li>
         {% endfor %}
         {% if search_form %}
-            <li>{{ search_form.q }} {{ search_form.tags }} <input type="submit" value="Szukaj"/></li>
+            <li>{{ search_form.q }} {{ search_form.tags }} <input type="submit" value="{% trans "Search" %}"/></li>
         {% endif %}
     </ol>
     <div class="clearboth"></div>
diff --git a/wolnelektury/templates/catalogue/folded_tag_list.html b/wolnelektury/templates/catalogue/folded_tag_list.html
index 62896fc05..62a582006 100644
--- a/wolnelektury/templates/catalogue/folded_tag_list.html
+++ b/wolnelektury/templates/catalogue/folded_tag_list.html
@@ -1,6 +1,7 @@
+{% load i18n %}
 {% load catalogue_tags %}
 {% if one_tag %}
-    <p>Zobacz całą kategorię <a href="{% catalogue_url one_tag %}">{{ one_tag }}</a>.</p>
+    <p>{% trans "Show full category" %} <a href="{% catalogue_url one_tag %}">{{ one_tag }}</a>.</p>
 {% else %}
     <div class="shown-tags">
         <ul class="shown-tags">
@@ -9,7 +10,7 @@
             {% endfor %}
         </ul>
         {% if some_tags_hidden %}
-            <p><a href="#" class="show-all-tags">Zobacz więcej</a></p>
+            <p><a href="#" class="show-all-tags">{% trans "See more" %}</a></p>
         {% endif %}
     </div>
     <div class="all-tags">
@@ -18,6 +19,6 @@
                 <li><a href="{% catalogue_url choices tag %}">{{ tag }}&nbsp;({{ tag.count }})</a></li>
             {% endfor %}
         </ul>    
-        <p><a href="#" class="hide-all-tags">Zwiń</a></p>
+        <p><a href="#" class="hide-all-tags">{% trans "Hide" %}</a></p>
     </div>
 {% endif %}
diff --git a/wolnelektury/templates/catalogue/fragment_sets.html b/wolnelektury/templates/catalogue/fragment_sets.html
index c7d641ca2..b270636e9 100644
--- a/wolnelektury/templates/catalogue/fragment_sets.html
+++ b/wolnelektury/templates/catalogue/fragment_sets.html
@@ -1,17 +1,18 @@
-<h2>Półki zawierające fragment</h2>
+{% load i18n %}
+<h2>{% trans "Shelves containing fragment" %}</h2>
 {% if not user.tag_set.count %}
-    <p>Nie posiadasz żadnych półek. Jeśli chcesz, możesz utworzyć nową półkę poniżej.</p>
+    <p>{% trans "You do not own any shelves. You can create one below, if you want to." %}</p>
 {% else %}
     <form action="{% url catalogue.views.fragment_sets fragment.id %}" method="POST" accept-charset="utf-8" class="cuteform">
     <ol>
         <li>{{ form.set_ids }}</li>
-        <li><input type="submit" value="Zapisz półki"/></li>
+        <li><input type="submit" value="{% trans "Save all shelves" %}"/></li>
     </ol>
     </form>
 {% endif %}
 <hr />
 <form action="{% url catalogue.views.new_set %}" method="POST" accept-charset="utf-8" class="cuteform">
 <ol>
-    <li>{{ new_set_form.name }} <input type="submit" value="Utwórz nową półkę"/></li>
+    <li>{{ new_set_form.name }} <input type="submit" value="{% trans "Create new shelf" %}"/></li>
 </ol>
 </form>
\ No newline at end of file
diff --git a/wolnelektury/templates/catalogue/fragment_short.html b/wolnelektury/templates/catalogue/fragment_short.html
index aaab2bfd3..24eeef336 100644
--- a/wolnelektury/templates/catalogue/fragment_short.html
+++ b/wolnelektury/templates/catalogue/fragment_short.html
@@ -1,3 +1,4 @@
+{% load i18n %}
 <div class="fragment">
     {# <div class="change-sets"> #}
     {#     <a href="{% url catalogue.views.fragment_sets fragment.id %}" class="jqm-trigger">Półki</a> #}
@@ -5,18 +6,18 @@
     {% if fragment.short_text %}
     <div class='fragment-short-text'>
         {{ fragment.short_text|safe }}
-        <a href="#">↓ Rozwiń fragment ↓</a>
+        <a href="#">↓ {% trans "Expand fragment" %} ↓</a>
     </div>
     {% endif %}
     <div class="fragment-text" {% if fragment.short_text %}style="display:none;"{% endif %}>
         {{ fragment.text|safe }}
         {% if fragment.short_text %}
-            <a href="#">↑ Zwiń fragment ↑</a>
+            <a href="#">↑ {% trans "Hide fragment" %} ↑</a>
         {% endif %}
     </div>
     <div class="fragment-metadata">
         <p><a href="{{ book.get_absolute_url }}">{{ book.title }}</a>, {{ book_authors|join:"," }}
-           <a href="{{ fragment.get_absolute_url }}">(Zobacz w utworze)</a></p>
+           <a href="{{ fragment.get_absolute_url }}">({% trans "See in a book" %})</a></p>
     </div>
     <div class="clearboth"></div>
 </div>
diff --git a/wolnelektury/templates/catalogue/main_page.html b/wolnelektury/templates/catalogue/main_page.html
index 756bd74a9..be6d9004f 100644
--- a/wolnelektury/templates/catalogue/main_page.html
+++ b/wolnelektury/templates/catalogue/main_page.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load i18n %}
 {% load catalogue_tags chunks cache %}
 
 {% block bodyid %}main-page{% endblock %}
@@ -9,69 +10,69 @@
     </div>
     <div class="clearboth"></div>
     <form action="{% url search %}" method="get" accept-charset="utf-8" id="search-form">
-        <p>{{ form.q }} {{ form.tags }} <input type="submit" value="Szukaj" /> <strong>lub</strong> <a href="{% url catalogue.views.book_list %}">zobacz spis utworów</a> w naszym zbiorze</p>
+        <p>{{ form.q }} {{ form.tags }} <input type="submit" value="{% trans "Search" %}" /> <strong>{% trans "or" %}</strong> <a href="{% url catalogue.views.book_list %}">{% trans "check list of books" %}</a> {% trans "in our repository" %}</p>
     </form>
     
     <div id="intro">
-        <p id="tags-description">↓ Przeglądaj lektury według wybranych kategorii ↓</p>
+        <p id="tags-description">↓ {% trans "Browse books by categories" %} ↓</p>
         <div id="propaganda">
-            <h2>Twoje półki z lekturami</h2>
+            <h2>{% trans "Your shelves with books" %}</h2>
             {% if user.is_authenticated %}
                 {% if shelves %}
                 <ul class="shelf-list">
                 {% for shelf in shelves %}
-                    <li><a href="{% url delete_shelf shelf.slug %}" class="delete-shelf">usuń</a> <a href="{{ shelf.get_absolute_url }}" class="visit-shelf">{{ shelf.name }} ({{ shelf.book_count }})</a></li>
+                    <li><a href="{% url delete_shelf shelf.slug %}" class="delete-shelf">{% trans "delete" %}</a> <a href="{{ shelf.get_absolute_url }}" class="visit-shelf">{{ shelf.name }} ({{ shelf.book_count }})</a></li>
                 {% endfor %}
                 </ul>
                 {% else %}
-                <p>Nie posiadasz żadnych półek. Jeśli chcesz, możesz utworzyć półkę poniżej.</p>
+                <p>{% trans "You do not own any shelves. You can create one below, if you want to." %}</p>
                 {% endif %}
                 <hr />
                 <form action="{% url catalogue.views.new_set %}" method="post" accept-charset="utf-8" class="cuteform">
                 <ol>
-                    <li>{{ new_set_form.name }} <input type="submit" value="Utwórz półkę"/></li>
+                    <li>{{ new_set_form.name }} <input type="submit" value="{% trans "Create shelf" %}"/></li>
                 </ol>
                 </form>
             {% else %}
-                <p>Stwórz własny zestaw lektur. Możesz się nim później podzielić z innymi, przesyłając im link do Twojej półki.</p>
-                <p>Aby zarządzać swoimi półkami, musisz się <a class="login-register-link" href="#">zalogować</a>.</p>
+                <p>{% trans "Create your own book set. You can share it with friends by sending them link to your shelf." %}</p>
+                <p>{% trans "You need to " %}<a class="login-register-link" href="#">{% trans "sign in" %}</a> {% trans "to manage your shelves." %}</p>
             {% endif %}
             <div id="lessons">
-                <h2><a href="{% url lessons_document_list %}">Materiały pomocnicze dla nauczycieli</a></h2>
-                <p>Scenariusze lekcji i inne pomysły na wykorzytanie serwisu WolneLektury.pl podczas nauczania.</p>
-                <p class="see-more"><a href="{% url lessons_document_list %}">Zobacz więcej ⇒</a></p>
+                <h2><a href="{% url lessons_document_list %}">{% trans "Hand-outs for teachers" %}</a></h2>
+                <p>{% trans "Lessons' prospects and other ideas for using Wolnelektury.pl for teaching." %}</p>
+                <p class="see-more"><a href="{% url lessons_document_list %}">{% trans " See more" %} ⇒</a></p>
             </div>
             <div id="czytamysluchajac">
                 <a href="http://czytamysluchajac.pl/"><img src="/static/img/czytamysluchajac-logo-small.png" /></a>
-                <p><a href="http://czytamysluchajac.pl/">Czytamy Słuchając</a> to profesjonalne nagrania tekstów literackich z naszego zbioru dostępne na wolnej licencji w formatach MP3, Ogg Vorbis oraz w systemie DAISY.</p>
-                <p class="see-more"><a href="http://czytamysluchajac.pl/index.php/o-projekcie/">Zobacz więcej ⇒</a></p>
+                <p><a href="http://czytamysluchajac.pl/">Czytamy Słuchając</a> {% trans "are professional recordings of literary texts from our repository, available on free license in MP3 and Ogg Vorbis formats as well as in DAISY system." %}</p>
+                <p class="see-more"><a href="http://czytamysluchajac.pl/index.php/o-projekcie/">{% trans "See more" %} ⇒</a></p>
             </div>
         </div>
         <div id="tags-list">
             <div id="categories-list">
                 {% if categories.author %}
-                    <h2>Autorzy</h2>
+                    <h2>{% trans "Authors" %}</h2>
                     {% folded_tag_list categories.author %}
                 {% endif %}
                 {% if categories.kind %}
-                    <h2>Rodzaje</h2>
+                    <h2>{% trans "Kinds" %}</h2>
                     {% folded_tag_list categories.kind %}
                 {% endif %}
                 {% if categories.genre %}
-                    <h2>Gatunki</h2>
+                    <h2>{% trans "Genres" %}</h2>
                     {% folded_tag_list categories.genre %}
                 {% endif %}
                 {% if categories.epoch %}
-                    <h2>Epoki</h2>
+                    <h2>{% trans "Epochs" %}</h2>
                     {% folded_tag_list categories.epoch %}
                 {% endif %}
             </div>
             <div id="themes-list">
                 {% if fragment_tags %}
-                    <h2>Motywy i tematy</h2>
+                    <h2>{% trans "Themes and topics" %}</h2>
                     {% folded_tag_list fragment_tags %}
                 {% endif %}
-                <h2>Rodziny motywów</h2>
+                <h2>{% trans "Themes groups" %}</h2>
                 <div class="shown-tags">
                     <ol>
                         <li>środowisko miejskie i wiejskie
@@ -83,7 +84,7 @@
                         <li>przyroda
                         <span class="subcategories"><a href="/katalog/natura/">Natura</a>, <a href="/katalog/zywioly/">Żywioły</a>, <a href="/katalog/ogien/">Ogień</a>, <a href="/katalog/ziemia/">Ziemia</a>, <a href="/katalog/wiatr/">Wiatr</a>, <a href="/katalog/woda/">Woda</a>, <a href="/katalog/wiosna/">Wiosna</a>, <a href="/katalog/lato/">Lato</a>, <a href="/katalog/jesien/">Jesień</a>, <a href="/katalog/zima/">Zima</a>, <a href="/katalog/przemijanie/">Przemijanie</a>, <a href="/katalog/slonce/">Słońce</a>, <a href="/katalog/ksiezyc/">Księżyc</a>, <a href="/katalog/gwiazda/">Gwiazda</a>, <a href="/katalog/oblok/">Obłok</a>, <a href="/katalog/noc/">Noc</a>, <a href="/katalog/swiatlo/">Światło</a>, <a href="/katalog/gora/">Góra</a>, <a href="/katalog/rzeka/">Rzeka</a>, <a href="/katalog/morze/">Morze</a>, <a href="/katalog/burza/">Burza</a>, <a href="/katalog/deszcz/">Deszcz</a>, <a href="/katalog/bloto/">Błoto</a>, <a href="/katalog/przyroda-nieozywiona/">Przyroda nieożywiona</a>, <a href="/katalog/rosliny/">Rośliny</a>, <a href="/katalog/kwiaty/">Kwiaty</a>, <a href="/katalog/ogrod/">Ogród</a>, <a href="/katalog/sielanka/">Sielanka</a>, <a href="/katalog/raj/">Raj</a>, <a href="/katalog/jablko/">Jabłko</a>, <a href="/katalog/drzewo/">Drzewo</a>, <a href="/katalog/zwierzeta/">Zwierzęta</a>, <a href="/katalog/ptak/">Ptak</a>, <a href="/katalog/motyl/">Motyl</a>, <a href="/katalog/kot/">Kot</a>, <a href="/katalog/kon/">Koń</a>, <a href="/katalog/pies/">Pies</a>, <a href="/katalog/waz/">Wąż</a>, <a href="/katalog/potwor/">Potwór</a></span></li>
                     </ol>
-                    <p><a href="#" class="show-all-tags">Zobacz więcej</a></p>
+                    <p><a href="#" class="show-all-tags">{% trans "See more" %}</a></p>
                 </div>
                 <div class="all-tags">
                     <ol>
@@ -246,7 +247,7 @@
                     <li>żywioły
                     <span class="subcategories"><a href="/katalog/zywioly/">Żywioły</a>, <a href="/katalog/ogien/">Ogień</a>, <a href="/katalog/ziemia/">Ziemia</a>, <a href="/katalog/wiatr/">Wiatr</a>, <a href="/katalog/woda/">Woda</a>, <a href="/katalog/przestrzen/">Przestrzeń</a></span></li>
                     </ol>
-                    <p><a href="#" class="hide-all-tags">Zwiń</a></p>
+                    <p><a href="#" class="hide-all-tags">{% trans "Hide" %}</a></p>
                 </div>
             </div>
             <div class="clearboth"></div>
@@ -256,15 +257,15 @@
     
     <div id="site-info">
         <div id="latest-blog-posts">
-            <h2>Aktualności</h2>
+            <h2>{% trans "News" %}</h2>
             {% cache 1800 latest-blog-posts %}
             {% latest_blog_posts "http://www.nowoczesnapolska.org.pl/tematy/wolne-lektury/feed/" %}
             {% endcache %}
-            <p class="see-more"><a href="http://www.nowoczesnapolska.org.pl/">Zobacz nasz blog ⇒</a></p>
+            <p class="see-more"><a href="http://www.nowoczesnapolska.org.pl/">{% trans "See our blog" %} ⇒</a></p>
         </div>
         <div id="you-can-help">
-            <h2>Możesz nam pomóc!</h2>
-            <p>Utwory włączane sukcesywnie do naszej biblioteki staramy się opracowywać jak najdokładniej. Jest to możliwe tylko dzięki współpracującym z nami wolontariuszom.</p>
+            <h2>{% trans "You can help us!" %}</h2>
+            <p>{% trans "Works appended constantly to " %}Utwory włączane sukcesywnie do naszej biblioteki staramy się opracowywać jak najdokładniej. Jest to możliwe tylko dzięki współpracującym z nami wolontariuszom.</p>
             <p>Zapraszamy wszystkie osoby, które chcą współtworzyć szkolną bibliotekę internetową Wolne Lektury.</p>
             <p class="see-more"><a href="{% url help_us %}">Zobacz więcej ⇒</a></p>
         </div>
diff --git a/wolnelektury/templates/catalogue/tag_list.html b/wolnelektury/templates/catalogue/tag_list.html
index 673135c19..aa273c860 100644
--- a/wolnelektury/templates/catalogue/tag_list.html
+++ b/wolnelektury/templates/catalogue/tag_list.html
@@ -1,3 +1,4 @@
+{% load i18n %}
 {% load catalogue_tags %}
 {% if one_tag %}
     <p>Zobacz całą kategorię <a href="{% catalogue_url one_tag %}">{{ one_tag }}</a></p>
diff --git a/wolnelektury/templates/catalogue/tagged_object_list.html b/wolnelektury/templates/catalogue/tagged_object_list.html
index 3539ebea2..d5cb775f3 100644
--- a/wolnelektury/templates/catalogue/tagged_object_list.html
+++ b/wolnelektury/templates/catalogue/tagged_object_list.html
@@ -1,3 +1,4 @@
+{% load i18n %}
 {% extends "base.html" %}
 {% load catalogue_tags pagination_tags %}
 
diff --git a/wolnelektury/templates/catalogue/user_shelves.html b/wolnelektury/templates/catalogue/user_shelves.html
index ab34fe497..cd5b86196 100644
--- a/wolnelektury/templates/catalogue/user_shelves.html
+++ b/wolnelektury/templates/catalogue/user_shelves.html
@@ -1,3 +1,4 @@
+{% load i18n %}
 <h2>Twoje półki z lekturami</h2>
 {% if shelves %}
 <ul class="shelf-list">
diff --git a/wolnelektury/templates/lessons/ajax_document_detail.html b/wolnelektury/templates/lessons/ajax_document_detail.html
index 93bccb397..699b50f07 100644
--- a/wolnelektury/templates/lessons/ajax_document_detail.html
+++ b/wolnelektury/templates/lessons/ajax_document_detail.html
@@ -1,5 +1,6 @@
+{% load i18n %}
 <div>
-    <p class="download"><a href="{{ object.file.url }}">Pobierz</a> {% if object.author %}(autor: {{ object.author }}){% endif %}</p>
+    <p class="download"><a href="{{ object.file.url }}">{% trans "Download" %}</a> {% if object.author %}({% trans "author" %}: {{ object.author }}){% endif %}</p>
     <h2>{{ object.title }}</h2>
     {% if object.slideshare_id %}
     <object style="margin:0px" width="480" height="400">
diff --git a/wolnelektury/templates/lessons/document_detail.html b/wolnelektury/templates/lessons/document_detail.html
index 9ee604e90..17faaea48 100644
--- a/wolnelektury/templates/lessons/document_detail.html
+++ b/wolnelektury/templates/lessons/document_detail.html
@@ -1,3 +1,4 @@
+{% load i18n %}
 {% extends 'base.html' %}
 
 {% block title %}{{ object.title }} w WolneLektury.pl{% endblock %}
@@ -5,11 +6,11 @@
 {% block body %}
     <h1>{{ object.title }}</h1>
     <form action="{% url search %}" method="GET" accept-charset="utf-8" id="search-form">
-        <p>{{ form.q }} <input type="submit" value="Szukaj" /> <strong>lub</strong> <a href="{% url lessons_document_list %}">wróć do listy materiałów</a></p>
+        <p>{{ form.q }} <input type="submit" value="{% trans "Szukaj" %}" /> <strong>{% trans "or" %}</strong> <a href="{% url lessons_document_list %}">{% trans "return to list of materials" %}</a></p>
     </form>
     
     <div id="document-detail">
-        <p class="download"><a href="{{ object.file.url }}">Pobierz</a> {% if object.author %}(autor: {{ object.author }}){% endif %}</p>
+        <p class="download"><a href="{{ object.file.url }}">{% trans "Download" %}</a> {% if object.author %}({% trans "author" %}: {{ object.author }}){% endif %}</p>
         {% if object.slideshare_id %}
         <object style="margin:0px" width="480" height="400">
             <param name="movie" value="http://static.slidesharecdn.com/swf/{{ object.slideshare_player }}?doc={{ object.slideshare_id }}&rel=0&stripped_title={{ object.name|slugify }}" /><param name="allowFullScreen" value="true"/><param name="allowScriptAccess" value="always"/><embed src="http://static.slidesharecdn.com/swf/{{ object.slideshare_player }}?doc={{ object.slideshare_id }}&rel=0&stripped_title={{ object.name|slugify }}" type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="true" width="480" height="400"></embed></object>
diff --git a/wolnelektury/templates/lessons/document_list.html b/wolnelektury/templates/lessons/document_list.html
index 1a5ab01d4..9d30d519e 100644
--- a/wolnelektury/templates/lessons/document_list.html
+++ b/wolnelektury/templates/lessons/document_list.html
@@ -1,9 +1,10 @@
+{% load i18n %}
 {% extends "base.html" %}
 {% load catalogue_tags chunks %}
 
 {% block bodyid %}document-list-body{% endblock %}
 
-{% block title %}Materiały pomocnicze dla nauczycieli w WolneLektury.pl{% endblock %}
+{% block title %}{% trans "Hand-outs for teachers on " %}WolneLektury.pl{% endblock %}
 
 {% block extrahead %}
     <script type="text/javascript" charset="utf-8">
@@ -45,9 +46,9 @@
     </script>
 {% endblock extrahead %}
 {% block body %}
-    <h1>Materiały pomocnicze dla nauczycieli</h1>
+    <h1>{% trans "Hand-outs for teachers" %}</h1>
     <form action="{% url search %}" method="GET" accept-charset="utf-8" id="search-form">
-        <p>{{ form.q }} <input type="submit" value="Szukaj" /> <strong>lub</strong> <a href="{% url main_page %}">wróć do strony głównej</a></p>
+        <p>{{ form.q }} <input type="submit" value="{% trans "Search" %}" /> <strong>{% trans "or" %}</strong> <a href="{% url main_page %}">{% trans "return to homepage" %}</a></p>
     </form>
     
     <div id="document-list">
diff --git a/wolnelektury/templates/pagination/pagination.html b/wolnelektury/templates/pagination/pagination.html
index 36c297bc1..7489d4a55 100644
--- a/wolnelektury/templates/pagination/pagination.html
+++ b/wolnelektury/templates/pagination/pagination.html
@@ -1,9 +1,10 @@
+{% load i18n %}
 {% if is_paginated %}
 <div class="pagination">
     {% if page_obj.has_previous %}
-        <a href="?page={{ page_obj.previous_page_number }}{{ getvars }}" class="prev">&lsaquo;&lsaquo; poprzedni</a>
+        <a href="?page={{ page_obj.previous_page_number }}{{ getvars }}" class="prev">&lsaquo;&lsaquo; {% trans "previous" %}</a>
     {% else %}
-        <span class="disabled prev">&lsaquo;&lsaquo; poprzedni</span>
+        <span class="disabled prev">&lsaquo;&lsaquo; {% trans "previous" %}</span>
     {% endif %}
     {% for page in pages %}
         {% if page %}
@@ -17,9 +18,9 @@
         {% endif %}
     {% endfor %}
     {% if page_obj.has_next %}
-        <a href="?page={{ page_obj.next_page_number }}{{ getvars }}" class="next">następny &rsaquo;&rsaquo;</a>
+        <a href="?page={{ page_obj.next_page_number }}{{ getvars }}" class="next">{% trans "next" %} &rsaquo;&rsaquo;</a>
     {% else %}
-        <span class="disabled next">następny &rsaquo;&rsaquo;</span>
+        <span class="disabled next">{% trans "next" %} &rsaquo;&rsaquo;</span>
     {% endif %}
 </div>
 {% endif %}