Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty

diff --git a/apps/ajaxable/locale/pl/LC_MESSAGES/django.mo b/apps/ajaxable/locale/pl/LC_MESSAGES/django.mo
new file mode 100644 (file)
index 0000000..c03914c
Binary files /dev/null and b/apps/ajaxable/locale/pl/LC_MESSAGES/django.mo differ

diff --git a/apps/ajaxable/locale/pl/LC_MESSAGES/django.po b/apps/ajaxable/locale/pl/LC_MESSAGES/django.po
new file mode 100644 (file)
index 0000000..360db00
--- /dev/null
+++ b/apps/ajaxable/locale/pl/LC_MESSAGES/django.po
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-01-27 16:36+0100\n"
+"PO-Revision-Date: 2012-01-27 16:36+0100\n"
+"Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: utils.py:72
+msgid "Send"
+msgstr "Wyślij"
+

diff --git a/apps/ajaxable/templates/ajaxable/form.html b/apps/ajaxable/templates/ajaxable/form.html
index 1658b9b..84e86e1 100755 (executable)
--- a/apps/ajaxable/templates/ajaxable/form.html
+++ b/apps/ajaxable/templates/ajaxable/form.html
@@ -1,7 +1,8 @@
 {% load i18n %}
 <h1>{{ title }}</h1>
 
-<form action="{{ request.get_full_path }}" method="post" accept-charset="utf-8" class="cuteform">
+<form action="{{ request.get_full_path }}" method="post" accept-charset="utf-8"
+       class="cuteform{% if placeholdize %} hidelabels{% endif %}">
 <ol>
     <div id="id_{% if form_prefix %}{{ form_prefix }}-{% endif %}__all__"></div>
     {{ form.as_ul }}

diff --git a/apps/ajaxable/utils.py b/apps/ajaxable/utils.py
index e32356a..ac8d5c6 100755 (executable)
--- a/apps/ajaxable/utils.py
+++ b/apps/ajaxable/utils.py
@@ -53,6 +53,12 @@ def require_login(request):
         return HttpResponseRedirect('/uzytkownicy/zaloguj')# next?=request.build_full_path())
 
 
+def placeholdized(form):
+    for field in form.fields.values():
+        field.widget.attrs['placeholder'] = field.label
+    return form
+
+
 class AjaxableFormView(object):
     """Subclass this to create an ajaxable view for any form.
 
@@ -60,6 +66,7 @@ class AjaxableFormView(object):
 
     """
     form_class = None
+    placeholdize = False
     # override to customize form look
     template = "ajaxable/form.html"
     submit = _('Send')
@@ -74,6 +81,7 @@ class AjaxableFormView(object):
     @method_decorator(vary_on_headers('X-Requested-With'))
     def __call__(self, request, *args, **kwargs):
         """A view displaying a form, or JSON if request is AJAX."""
+        #form_class = placeholdized(self.form_class) if self.placeholdize else self.form_class
         form_args, form_kwargs = self.form_args(request, *args, **kwargs)
         if self.form_prefix:
             form_kwargs['prefix'] = self.form_prefix
@@ -104,6 +112,8 @@ class AjaxableFormView(object):
                 else:
                     errors = form.errors
                 response_data = {'success': False, 'errors': errors}
+            else:
+                response_data = None
             if request.is_ajax():
                 return HttpResponse(LazyEncoder(ensure_ascii=False).encode(response_data))
         else:
@@ -115,9 +125,12 @@ class AjaxableFormView(object):
             response_data = None
 
         template = self.template if request.is_ajax() else self.full_template
+        if self.placeholdize:
+            form = placeholdized(form)
         context = {
                 self.formname: form, 
                 "title": self.title,
+                "placeholdize": self.placeholdize,
                 "submit": self.submit,
                 "response_data": response_data,
                 "ajax_template": self.template,

diff --git a/apps/catalogue/locale/pl/LC_MESSAGES/django.mo b/apps/catalogue/locale/pl/LC_MESSAGES/django.mo
index 3184920..faaf79f 100644 (file)
Binary files a/apps/catalogue/locale/pl/LC_MESSAGES/django.mo and b/apps/catalogue/locale/pl/LC_MESSAGES/django.mo differ

diff --git a/apps/catalogue/locale/pl/LC_MESSAGES/django.po b/apps/catalogue/locale/pl/LC_MESSAGES/django.po
index ca4f243..0981950 100644 (file)
--- a/apps/catalogue/locale/pl/LC_MESSAGES/django.po
+++ b/apps/catalogue/locale/pl/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-11 15:44+0200\n"
-"PO-Revision-Date: 2011-10-11 15:44+0100\n"
+"POT-Creation-Date: 2012-01-27 16:32+0100\n"
+"PO-Revision-Date: 2012-01-27 16:36+0100\n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -17,223 +17,218 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Translated-Using: django-rosetta 0.5.6\n"
 
-#: fields.py:48
+#: fields.py:42
 #, python-format
 msgid "Enter a valid JSON value. Error: %s"
 msgstr "Wprowadź prawidłową wartość JSON. Błąd: %s"
 
-#: forms.py:25
+#: forms.py:23
 msgid "Please supply an XML."
 msgstr "Proszę podać XML."
 
-#: forms.py:39
-msgid "title, author, theme/topic, epoch, kind, genre"
-msgstr "tytuł, autor, motyw/temat, epoka, rodzaj, gatunek"
+#: forms.py:42
+msgid "A4"
+msgstr "A4"
 
-#: forms.py:56
-msgid "Shelves"
-msgstr "Półki"
+#: forms.py:43
+msgid "A5"
+msgstr "A5"
 
-#: forms.py:69
-msgid "Name of the new shelf"
-msgstr "nazwa nowej półki"
+#: forms.py:48
+msgid "Normal leading"
+msgstr "Zwykła interlinia"
 
-#: models.py:35
+#: forms.py:49
+msgid "One and a half leading"
+msgstr "Powiększona interlinia"
+
+#: forms.py:50
+msgid "Double leading"
+msgstr "Podwójna interlinia"
+
+#: forms.py:54
+msgid "Default"
+msgstr "Domyślnie"
+
+#: forms.py:55
+msgid "Big"
+msgstr "Duży"
+
+#: forms.py:60
+msgid "Don't show footnotes"
+msgstr "Bez przypisów"
+
+#: forms.py:61
+msgid "Don't disply themes"
+msgstr "Bez motywów"
+
+#: forms.py:62
+msgid "Don't use our custom font"
+msgstr "Bez naszego kroju pisma"
+
+#: forms.py:64
+msgid "Leading"
+msgstr "Interlinia"
+
+#: forms.py:65
+msgid "Font size"
+msgstr "Rozmiar tekstu"
+
+#: models.py:38
 msgid "author"
 msgstr "autor"
 
-#: models.py:36
+#: models.py:39
 msgid "epoch"
 msgstr "epoka"
 
-#: models.py:37
+#: models.py:40
 msgid "kind"
 msgstr "rodzaj"
 
-#: models.py:38
+#: models.py:41
 msgid "genre"
 msgstr "gatunek"
 
-#: models.py:39
+#: models.py:42
 msgid "theme"
 msgstr "motyw"
 
-#: models.py:40
+#: models.py:43
 msgid "set"
 msgstr "półka"
 
-#: models.py:41 models.py:314
+#: models.py:44
+#: models.py:390
 msgid "book"
 msgstr "książka"
 
-#: models.py:45
-msgid "ODT file"
-msgstr "Plik ODT"
-
-#: models.py:46
-msgid "MP3 file"
-msgstr "Plik MP3"
-
-#: models.py:47
-msgid "OGG file"
-msgstr "Plik OGG"
-
-#: models.py:48
-msgid "DAISY file"
-msgstr "Plik DAISY"
-
-#: models.py:65 models.py:198
+#: models.py:61
+#: models.py:253
 msgid "name"
 msgstr "nazwa"
 
-#: models.py:66 models.py:287 models.py:876
+#: models.py:62
+#: models.py:355
+#: models.py:357
+#: models.py:1028
+#: models.py:1031
 msgid "slug"
 msgstr "slug"
 
-#: models.py:67 models.py:286
+#: models.py:63
+#: models.py:354
 msgid "sort key"
 msgstr "klucz sortowania"
 
-#: models.py:68
+#: models.py:64
 msgid "category"
 msgstr "kategoria"
 
-#: models.py:70 models.py:112 models.py:288 models.py:469
+#: models.py:66
+#: models.py:107
+#: models.py:360
+#: models.py:463
+#: models.py:1029
 msgid "description"
 msgstr "opis"
 
-#: models.py:71
-msgid "main page"
-msgstr "strona główna"
-
-#: models.py:71
-msgid "Show tag on main page"
-msgstr "Pokazuj tag na stronie głównej"
-
-#: models.py:74
+#: models.py:69
 msgid "book count"
 msgstr "liczba książek"
 
-#: models.py:78 models.py:79 models.py:200 models.py:289 models.py:290
+#: models.py:73
+#: models.py:74
+#: models.py:255
+#: models.py:361
+#: models.py:362
 msgid "creation date"
 msgstr "data utworzenia"
 
-#: models.py:96
+#: models.py:91
 msgid "tag"
 msgstr "tag"
 
-#: models.py:97
+#: models.py:92
 msgid "tags"
 msgstr "tagi"
 
-#: models.py:197 models.py:877
+#: models.py:249
+#: models.py:971
+#, python-format
+msgid "%s file"
+msgstr "plik %s"
+
+#: models.py:252
 msgid "type"
 msgstr "typ"
 
-#: models.py:199
+#: models.py:254
 msgid "file"
 msgstr "plik"
 
-#: models.py:201 models.py:292
+#: models.py:256
+#: models.py:364
 msgid "extra information"
 msgstr "dodatkowe informacje"
 
-#: models.py:210 models.py:211
+#: models.py:265
+#: models.py:266
 msgid "book media"
 msgstr "media książki"
 
-#: models.py:285
+#: models.py:353
+#: models.py:1027
 msgid "title"
 msgstr "tytuł"
 
-#: models.py:291
+#: models.py:358
+msgid "language code"
+msgstr "Kod języka"
+
+#: models.py:363
 msgid "parent number"
 msgstr "numer rodzica"
 
-#: models.py:296
-msgid "XML file"
-msgstr "Plik XML"
+#: models.py:369
+msgid "cover"
+msgstr "okładka"
 
-#: models.py:297
-msgid "HTML file"
-msgstr "Plik HTML"
-
-#: models.py:298
-msgid "PDF file"
-msgstr "Plik PDF"
-
-#: models.py:299
-msgid "EPUB file"
-msgstr "Plik EPUB"
-
-#: models.py:300
-msgid "TXT file"
-msgstr "Plik TXT"
-
-#: models.py:315
+#: models.py:391
 msgid "books"
 msgstr "książki"
 
-#: models.py:435
-msgid "Read online"
-msgstr "Czytaj online"
-
-#: models.py:656
+#: models.py:689
 #, python-format
-msgid "Book with slug = \"%s\" does not exist."
-msgstr "Książki ο slug = \"%s\" nie istnieje."
+msgid "Book \"%s\" does not exist."
+msgstr "Utwór \"%s\" nie istnieje."
 
-#: models.py:669
+#: models.py:703
 #, python-format
 msgid "Book %s already exists"
 msgstr "Książka %s już istnieje"
 
-#: models.py:844
+#: models.py:990
 msgid "fragment"
 msgstr "fragment"
 
-#: models.py:845
+#: models.py:991
 msgid "fragments"
 msgstr "fragmenty"
 
-#: models.py:878
-msgid "sha-1 hash"
-msgstr "hash sha-1"
-
-#: models.py:879
-msgid "time"
-msgstr "czas"
+#: models.py:1032
+msgid "book slugs"
+msgstr "slugi utworów"
 
-#: models.py:883
-msgid "file record"
-msgstr ""
+#: models.py:1036
+msgid "collection"
+msgstr "kolekcja"
 
-#: models.py:884
-msgid "file records"
-msgstr ""
+#: models.py:1037
+msgid "collections"
+msgstr "kolekcje"
 
-#: views.py:531
-msgid "<p>To maintain your shelves you need to be logged in.</p>"
-msgstr "<p>Aby zarządzać swoimi półkami, musisz się zalogować.</p>"
-
-#: views.py:553
-msgid "<p>Shelves were sucessfully saved.</p>"
-msgstr "<p>Półki zostały zapisane.</p>"
-
-#: views.py:577
-msgid "Book was successfully removed from the shelf"
-msgstr "Usunięto"
-
-#: views.py:579
-msgid "This book is not on the shelf"
-msgstr "Książki nie ma na półce"
-
-#: views.py:689
-#, python-format
-msgid "<p>Shelf <strong>%s</strong> was successfully removed</p>"
-msgstr "<p>Półka <strong>%s</strong> została usunięta</p>"
-
-#: views.py:748
+#: views.py:497
 #, python-format
 msgid ""
 "An error occurred: %(exception)s\n"
@@ -244,15 +239,97 @@ msgstr ""
 "\n"
 "%(tb)s"
 
-#: views.py:749
+#: views.py:498
 msgid "Book imported successfully"
 msgstr "Książka zaimportowana"
 
-#: views.py:751
+#: views.py:500
 #, python-format
 msgid "Error importing file: %r"
 msgstr "Błąd podczas importowania pliku: %r"
 
+#: views.py:544
+msgid "Incorrect customization options for PDF"
+msgstr "Niepoprawne opcje dla PDF"
+
+#: views.py:546
+msgid "Bad method"
+msgstr "Zła metoda"
+
+#: views.py:551
+msgid "Download custom PDF"
+msgstr "Stwórz własny PDF"
+
+#: views.py:552
+msgid "Download"
+msgstr "Pobierz"
+
+#~ msgid "title, author, theme/topic, epoch, kind, genre"
+#~ msgstr "tytuł, autor, motyw/temat, epoka, rodzaj, gatunek"
+
+#~ msgid "Shelves"
+#~ msgstr "Półki"
+
+#~ msgid "Name of the new shelf"
+#~ msgstr "nazwa nowej półki"
+
+#~ msgid "ODT file"
+#~ msgstr "Plik ODT"
+
+#~ msgid "MP3 file"
+#~ msgstr "Plik MP3"
+
+#~ msgid "OGG file"
+#~ msgstr "Plik OGG"
+
+#~ msgid "DAISY file"
+#~ msgstr "Plik DAISY"
+
+#~ msgid "main page"
+#~ msgstr "strona główna"
+
+#~ msgid "Show tag on main page"
+#~ msgstr "Pokazuj tag na stronie głównej"
+
+#~ msgid "XML file"
+#~ msgstr "Plik XML"
+
+#~ msgid "HTML file"
+#~ msgstr "Plik HTML"
+
+#~ msgid "PDF file"
+#~ msgstr "Plik PDF"
+
+#~ msgid "EPUB file"
+#~ msgstr "Plik EPUB"
+
+#~ msgid "TXT file"
+#~ msgstr "Plik TXT"
+
+#~ msgid "Read online"
+#~ msgstr "Czytaj online"
+
+#~ msgid "sha-1 hash"
+#~ msgstr "hash sha-1"
+
+#~ msgid "time"
+#~ msgstr "czas"
+
+#~ msgid "<p>To maintain your shelves you need to be logged in.</p>"
+#~ msgstr "<p>Aby zarządzać swoimi półkami, musisz się zalogować.</p>"
+
+#~ msgid "<p>Shelves were sucessfully saved.</p>"
+#~ msgstr "<p>Półki zostały zapisane.</p>"
+
+#~ msgid "Book was successfully removed from the shelf"
+#~ msgstr "Usunięto"
+
+#~ msgid "This book is not on the shelf"
+#~ msgstr "Książki nie ma na półce"
+
+#~ msgid "<p>Shelf <strong>%s</strong> was successfully removed</p>"
+#~ msgstr "<p>Półka <strong>%s</strong> została usunięta</p>"
+
 #, fuzzy
 #~ msgid "sort_key"
 #~ msgstr "klucz sortowania"
@@ -275,8 +352,5 @@ msgstr "Błąd podczas importowania pliku: %r"
 #~ msgid "book stub"
 #~ msgstr "zapowiedź książki"
 
-#~ msgid "book stubs"
-#~ msgstr "zapowiedzi książek"
-
 #~ msgid "<p>Shelf <strong>%s</strong> was successfully created</p>"
 #~ msgstr "<p>Półka <strong>%s</strong> została utworzona</p>"

diff --git a/apps/catalogue/templatetags/catalogue_tags.py b/apps/catalogue/templatetags/catalogue_tags.py
index 33eec32..cf80beb 100644 (file)
--- a/apps/catalogue/templatetags/catalogue_tags.py
+++ b/apps/catalogue/templatetags/catalogue_tags.py
@@ -4,17 +4,11 @@
 #
 import datetime
 import feedparser
-import re
 
 from django import template
-from django.template import Node, Variable
-from django.utils.encoding import smart_str
-from django.core.cache import get_cache
+from django.template import Node, Variable, Template, Context
 from django.core.urlresolvers import reverse
 from django.contrib.auth.forms import UserCreationForm, AuthenticationForm
-from django.db.models import Q
-from django.conf import settings
-from django.template.defaultfilters import stringfilter
 from django.utils.translation import ugettext as _
 
 from catalogue import forms
@@ -51,6 +45,15 @@ def capfirst(text):
         return ''
 
 
+@register.simple_tag
+def html_title_from_tags(tags):
+    if len(tags) < 2:
+        return title_from_tags(tags)
+    template = Template("{{ category }}: <a href='{{ tag.get_absolute_url }}'>{{ tag.name }}</a>")
+    return capfirst(",<br/>".join(
+        template.render(Context({'tag': tag, 'category': _(tag.category)})) for tag in tags))
+    
+
 
 def simple_title(tags):
     title = []

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index 9044a80..01600f5 100644 (file)
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -186,6 +186,7 @@ def tagged_object_list(request, tags=''):
             'only_my_shelf': only_my_shelf,
             'formats_form': forms.DownloadFormatsForm(),
             'tags': tags,
+            'theme_is_set': theme_is_set,
         },
         context_instance=RequestContext(request))
 

diff --git a/apps/chunks/locale/pl/LC_MESSAGES/django.po b/apps/chunks/locale/pl/LC_MESSAGES/django.po
index e0a6139..179c5cc 100644 (file)
--- a/apps/chunks/locale/pl/LC_MESSAGES/django.po
+++ b/apps/chunks/locale/pl/LC_MESSAGES/django.po
@@ -2,52 +2,53 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 10:59+0200\n"
+"POT-Creation-Date: 2012-01-27 16:36+0100\n"
 "PO-Revision-Date: 2010-05-19 16:19\n"
 "Last-Translator: <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Translated-Using: django-rosetta 0.5.3\n"
 
-#: models.py:10 models.py:24
+#: models.py:11 models.py:33
 msgid "key"
 msgstr "klucz"
 
-#: models.py:10
+#: models.py:11
 msgid "A unique name for this chunk of content"
 msgstr "Unikalna nazwa dla tego kawałka treści"
 
-#: models.py:11
+#: models.py:12
 msgid "description"
 msgstr "opis"
 
-#: models.py:12
+#: models.py:13
 msgid "content"
 msgstr "zawartość"
 
-#: models.py:16
+#: models.py:17
 msgid "chunk"
 msgstr "kawałek"
 
-#: models.py:17
+#: models.py:18
 msgid "chunks"
 msgstr "kawałki"
 
-#: models.py:24
+#: models.py:33
 msgid "A unique name for this attachment"
 msgstr "Unikalna nazwa dla tego załącznika"
 
-#: models.py:29
+#: models.py:38
 msgid "attachment"
 msgstr "załącznik"
 
-#: models.py:29
+#: models.py:38
 msgid "attachments"
 msgstr "załączniki"

diff --git a/apps/dictionary/locale/pl/LC_MESSAGES/django.po b/apps/dictionary/locale/pl/LC_MESSAGES/django.po
index 4600948..3a18203 100644 (file)
--- a/apps/dictionary/locale/pl/LC_MESSAGES/django.po
+++ b/apps/dictionary/locale/pl/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WolneLektury-dictionary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-16 16:08+0200\n"
+"POT-Creation-Date: 2012-01-27 16:37+0100\n"
 "PO-Revision-Date: 2011-09-16 16:10+0100\n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,26 +15,24 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 
-#: templates/dictionary/note_list.html:8
-msgid "Footnotes on WolneLektury.pl"
-msgstr "Przypisy w WolneLektury.pl"
-
-#: templates/dictionary/note_list.html:12
+#: templates/dictionary/note_list.html:7
+#: templates/dictionary/note_list.html:11
 msgid "Footnotes"
 msgstr "Przypisy"
 
-#: templates/dictionary/note_list.html:17
+#: templates/dictionary/note_list.html:16
 msgid "By first letter"
 msgstr "Pierwsza litera"
 
-#: templates/dictionary/note_list.html:19
-#: templates/dictionary/note_list.html:21
+#: templates/dictionary/note_list.html:18
+#: templates/dictionary/note_list.html:20
 msgid "all"
 msgstr "wszystkie"
 
-#: templates/dictionary/note_list.html:36
+#: templates/dictionary/note_list.html:35
 #, python-format
 msgid "%(c)s footnote found"
 msgid_plural "%(c)s footnotes found"
@@ -42,3 +40,5 @@ msgstr[0] "Znaleziono %(c)s przypis."
 msgstr[1] "Znaleziono %(c)s przypisy."
 msgstr[2] "Znaleziono %(c)s przypisów."
 
+#~ msgid "Footnotes on WolneLektury.pl"
+#~ msgstr "Przypisy w WolneLektury.pl"

diff --git a/apps/infopages/locale/pl/LC_MESSAGES/django.mo b/apps/infopages/locale/pl/LC_MESSAGES/django.mo
new file mode 100644 (file)
index 0000000..39bff7c
Binary files /dev/null and b/apps/infopages/locale/pl/LC_MESSAGES/django.mo differ

diff --git a/apps/infopages/locale/pl/LC_MESSAGES/django.po b/apps/infopages/locale/pl/LC_MESSAGES/django.po
new file mode 100644 (file)
index 0000000..7a89529
--- /dev/null
+++ b/apps/infopages/locale/pl/LC_MESSAGES/django.po
@@ -0,0 +1,47 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-01-27 16:37+0100\n"
+"PO-Revision-Date: 2012-01-27 16:38+0100\n"
+"Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: models.py:11
+msgid "main page priority"
+msgstr "kolejność na stronie głównej"
+
+#: models.py:12
+msgid "slug"
+msgstr "slug"
+
+#: models.py:13
+msgid "title"
+msgstr "tytuł"
+
+#: models.py:14
+msgid "left column"
+msgstr "lewa kolumna"
+
+#: models.py:15
+msgid "right column"
+msgstr "prawa kolumna"
+
+#: models.py:19
+msgid "info page"
+msgstr "strona informacyjna"
+
+#: models.py:20
+msgid "info pages"
+msgstr "strony informacyjne"
+

diff --git a/apps/lesmianator/locale/pl/LC_MESSAGES/django.mo b/apps/lesmianator/locale/pl/LC_MESSAGES/django.mo
new file mode 100644 (file)
index 0000000..038694e
Binary files /dev/null and b/apps/lesmianator/locale/pl/LC_MESSAGES/django.mo differ

diff --git a/apps/lesmianator/locale/pl/LC_MESSAGES/django.po b/apps/lesmianator/locale/pl/LC_MESSAGES/django.po
new file mode 100644 (file)
index 0000000..80211ed
--- /dev/null
+++ b/apps/lesmianator/locale/pl/LC_MESSAGES/django.po
@@ -0,0 +1,47 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-01-27 16:38+0100\n"
+"PO-Revision-Date: 2012-01-27 16:38+0100\n"
+"Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: models.py:26
+msgid "slug"
+msgstr "slug"
+
+#: models.py:27
+msgid "text"
+msgstr "tekst"
+
+#: models.py:29
+msgid "extra information"
+msgstr "dodatkowe informacje"
+
+#: models.py:30
+msgid "creation date"
+msgstr "data utworzenia"
+
+#: models.py:31
+msgid "last view date"
+msgstr "data ostatniego obejrzenia"
+
+#: models.py:32
+msgid "view count"
+msgstr "licznik obejrzeń"
+
+#: models.py:104
+msgid "Continuations file"
+msgstr "plik kontynuacji"
+

diff --git a/apps/pdcounter/locale/pl/LC_MESSAGES/django.mo b/apps/pdcounter/locale/pl/LC_MESSAGES/django.mo
index 96a0333..ba68259 100644 (file)
Binary files a/apps/pdcounter/locale/pl/LC_MESSAGES/django.mo and b/apps/pdcounter/locale/pl/LC_MESSAGES/django.mo differ

diff --git a/apps/pdcounter/locale/pl/LC_MESSAGES/django.po b/apps/pdcounter/locale/pl/LC_MESSAGES/django.po
index 765f7d3..6d3cc84 100644 (file)
--- a/apps/pdcounter/locale/pl/LC_MESSAGES/django.po
+++ b/apps/pdcounter/locale/pl/LC_MESSAGES/django.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-29 13:52+0000\n"
-"PO-Revision-Date: 2010-08-25 11:02\n"
-"Last-Translator: <radek.czajka@gmail.com>\n"
+"POT-Creation-Date: 2012-01-27 16:40+0100\n"
+"PO-Revision-Date: 2012-01-27 16:40+0100\n"
+"Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
@@ -21,15 +21,17 @@ msgstr ""
 msgid "name"
 msgstr "nazwa"
 
-#: models.py:13 models.py:64
+#: models.py:13
+#: models.py:64
 msgid "slug"
-msgstr ""
+msgstr "slug"
 
 #: models.py:14
 msgid "sort key"
 msgstr "klucz sortowania"
 
-#: models.py:15 models.py:41
+#: models.py:15
+#: models.py:41
 msgid "description"
 msgstr "opis"
 
@@ -37,7 +39,8 @@ msgstr "opis"
 msgid "year of death"
 msgstr "rok śmierci"
 
-#: models.py:22 models.py:62
+#: models.py:22
+#: models.py:62
 msgid "author"
 msgstr "autor"
 
@@ -57,15 +60,13 @@ msgstr "trafia do domeny publicznej"
 msgid "translator"
 msgstr "tłumacz"
 
-#: models.py:66
-msgid "year of translator's death"
-msgstr "rok śmierci tłumacza"
-
-#: models.py:70
+#: models.py:69
 msgid "book stub"
 msgstr "zapowiedź książki"
 
-#: models.py:71
+#: models.py:70
 msgid "book stubs"
 msgstr "zapowiedzi książek"
 
+#~ msgid "year of translator's death"
+#~ msgstr "rok śmierci tłumacza"

diff --git a/apps/reporting/locale/pl/LC_MESSAGES/django.mo b/apps/reporting/locale/pl/LC_MESSAGES/django.mo
new file mode 100644 (file)
index 0000000..3ba5614
Binary files /dev/null and b/apps/reporting/locale/pl/LC_MESSAGES/django.mo differ

diff --git a/apps/reporting/locale/pl/LC_MESSAGES/django.po b/apps/reporting/locale/pl/LC_MESSAGES/django.po
new file mode 100644 (file)
index 0000000..52c5eb4
--- /dev/null
+++ b/apps/reporting/locale/pl/LC_MESSAGES/django.po
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-01-27 16:40+0100\n"
+"PO-Revision-Date: 2012-01-27 16:40+0100\n"
+"Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/reporting/main.html:5
+msgid "Reports"
+msgstr "Raporty"
+

diff --git a/apps/search/forms.py b/apps/search/forms.py
index e7051b8..60521f9 100755 (executable)
--- a/apps/search/forms.py
+++ b/apps/search/forms.py
@@ -14,8 +14,8 @@ class SearchForm(forms.Form):
     def __init__(self, source, *args, **kwargs):
         kwargs['auto_id'] = False
         super(SearchForm, self).__init__(*args, **kwargs)
-        self.fields['q'].widget.attrs['id'] = _('search')
-        self.fields['q'].widget.attrs['autocomplete'] = _('off')
-        self.fields['q'].widget.attrs['data-source'] = _(source)
+        self.fields['q'].widget.attrs['id'] = 'search'
+        self.fields['q'].widget.attrs['autocomplete'] = 'off'
+        self.fields['q'].widget.attrs['data-source'] = source
         if not 'q' in self.data:
             self.fields['q'].widget.attrs['title'] = _('title, author, theme/topic, epoch, kind, genre, phrase')

diff --git a/apps/search/locale/pl/LC_MESSAGES/django.mo b/apps/search/locale/pl/LC_MESSAGES/django.mo
new file mode 100644 (file)
index 0000000..22cb19f
Binary files /dev/null and b/apps/search/locale/pl/LC_MESSAGES/django.mo differ

diff --git a/apps/search/locale/pl/LC_MESSAGES/django.po b/apps/search/locale/pl/LC_MESSAGES/django.po
new file mode 100644 (file)
index 0000000..40e82f5
--- /dev/null
+++ b/apps/search/locale/pl/LC_MESSAGES/django.po
@@ -0,0 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-01-27 16:41+0100\n"
+"PO-Revision-Date: 2012-01-27 16:41+0100\n"
+"Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: forms.py:17
+msgid "search"
+msgstr "szukaj"
+
+#: forms.py:18
+msgid "off"
+msgstr "wył."
+
+#: forms.py:21
+msgid "title, author, theme/topic, epoch, kind, genre, phrase"
+msgstr "tytuł, autor, motyw/temat, epoka, rodzaj, gatunek, cytat"
+
+#: views.py:84
+msgid "book"
+msgstr "utwór"
+

diff --git a/apps/social/locale/pl/LC_MESSAGES/django.mo b/apps/social/locale/pl/LC_MESSAGES/django.mo
new file mode 100644 (file)
index 0000000..ac4f492
Binary files /dev/null and b/apps/social/locale/pl/LC_MESSAGES/django.mo differ

diff --git a/apps/social/locale/pl/LC_MESSAGES/django.po b/apps/social/locale/pl/LC_MESSAGES/django.po
new file mode 100644 (file)
index 0000000..28b468c
--- /dev/null
+++ b/apps/social/locale/pl/LC_MESSAGES/django.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-01-27 16:42+0100\n"
+"PO-Revision-Date: 2012-01-27 16:43+0100\n"
+"Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: forms.py:22
+msgid "Tags (comma-separated)"
+msgstr "Tagi (rozdzielone przecinkami)"
+
+#: forms.py:45
+msgid "Name of the new shelf"
+msgstr ""
+
+#: models.py:14
+msgid "text"
+msgstr "tekst"
+
+#: models.py:15
+msgid "small"
+msgstr "mały"
+
+#: models.py:15
+msgid "Make this cite display smaller."
+msgstr "Sprawia, że cytat wyświetla się mniejszym fontem."
+
+#: models.py:16
+msgid "VIP"
+msgstr ""
+
+#: models.py:17
+msgid "link"
+msgstr ""
+
+#: templates/social/cite_promo.html:6
+msgid "recommends"
+msgstr "poleca"
+
+#: templates/social/my_shelf.html:5
+#: templates/social/my_shelf.html.py:11
+msgid "My shelf"
+msgstr "Moja półka"
+
+#: templates/social/sets_form.html:6
+msgid "Remove from my shelf"
+msgstr "Usuń z mojej półki"
+

diff --git a/apps/social/templates/social/sets_form.html b/apps/social/templates/social/sets_form.html
index eff951e..ab982fe 100755 (executable)
--- a/apps/social/templates/social/sets_form.html
+++ b/apps/social/templates/social/sets_form.html
@@ -1,7 +1,8 @@
 {% load i18n %}
 <h1>{{ title }}</h1>
 
-<form action="{% url social_unlike_book view_kwargs.slug %}" method="post" accept-charset="utf-8" class="cuteform">
+<form action="{% url social_unlike_book view_kwargs.slug %}" method="post" accept-charset="utf-8"
+       class="cuteform{% if placeholdize %} hidelabels{% endif %}">
     <input type="submit" value="{% trans "Remove from my shelf" %}"/>
 </form>
 

diff --git a/apps/social/views.py b/apps/social/views.py
index 6ded289..d5362a4 100644 (file)
--- a/apps/social/views.py
+++ b/apps/social/views.py
@@ -46,6 +46,7 @@ def my_shelf(request):
 
 class ObjectSetsFormView(AjaxableFormView):
     form_class = forms.ObjectSetsForm
+    placeholdize = True
     template = 'social/sets_form.html'
     ajax_redirect = True
     POST_login = True

diff --git a/apps/suggest/locale/pl/LC_MESSAGES/django.po b/apps/suggest/locale/pl/LC_MESSAGES/django.po
index 7fdcbb5..1c2ed8f 100644 (file)
--- a/apps/suggest/locale/pl/LC_MESSAGES/django.po
+++ b/apps/suggest/locale/pl/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-09 13:06+0200\n"
+"POT-Creation-Date: 2012-01-27 16:43+0100\n"
 "PO-Revision-Date: 2011-06-09 13:06+0100\n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,36 +17,19 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Translated-Using: django-rosetta 0.5.3\n"
 
-#: forms.py:15
-#: forms.py:20
+#: forms.py:16 forms.py:57
 msgid "Contact"
 msgstr "Kontakt"
 
-#: forms.py:16
+#: forms.py:17
 msgid "Description"
 msgstr "Opis"
 
-#: forms.py:21
-#: models.py:27
-msgid "books"
-msgstr "książki"
-
-#: forms.py:22
-#: models.py:28
-msgid "audiobooks"
-msgstr "audiobooki"
-
-#: forms.py:26
-msgid "One of these fields is required."
-msgstr "Proszę wypełnić co najmniej jedno z tych pól."
-
-#: forms.py:62
-#: views.py:95
+#: forms.py:45 forms.py:100
 msgid "Thank you for your suggestion."
 msgstr "Dziękujemy za zgłoszenie."
 
-#: forms.py:63
-#: views.py:96
+#: forms.py:46 forms.py:101
 msgid ""
 "Thank you for your comment on WolneLektury.pl.\n"
 "The suggestion has been referred to the project coordinator."
@@ -54,13 +37,23 @@ msgstr ""
 "Dziękujemy za zgłoszenie uwag do serwisu Wolne Lektury.\n"
 "Sugestia została przekazana koordynatorce projektu."
 
-#: forms.py:69
-#: views.py:102
+#: forms.py:52 forms.py:107
 msgid "Message sent automatically. Please do not reply."
 msgstr "Wiadomość wysłana automatycznie. Proszę nie odpowiadać."
 
-#: models.py:10
-#: models.py:26
+#: forms.py:58 models.py:27
+msgid "books"
+msgstr "książki"
+
+#: forms.py:59 models.py:28
+msgid "audiobooks"
+msgstr "audiobooki"
+
+#: forms.py:63
+msgid "One of these fields is required."
+msgstr "Proszę wypełnić co najmniej jedno z tych pól."
+
+#: models.py:10 models.py:26
 msgid "contact"
 msgstr "kontakt"
 
@@ -68,13 +61,11 @@ msgstr "kontakt"
 msgid "description"
 msgstr "opis"
 
-#: models.py:12
-#: models.py:29
+#: models.py:12 models.py:29
 msgid "creation date"
 msgstr "data utworzenia"
 
-#: models.py:13
-#: models.py:30
+#: models.py:13 models.py:30
 msgid "IP address"
 msgstr "adres IP"
 
@@ -94,37 +85,22 @@ msgstr "sugestia publikacji"
 msgid "publishing suggestions"
 msgstr "sugestie publikacji"
 
-#: views.py:40
-#: views.py:105
+#: views.py:14 views.py:22
+msgid "Report a bug or suggestion"
+msgstr "Zgłoś błąd lub sugestię"
+
+#: views.py:16 views.py:24
 msgid "Report was sent successfully."
 msgstr "Zgłoszenie zostało wysłane."
 
+#: views.py:23 templates/publishing_suggest.html:15
+msgid "Send report"
+msgstr "Wyślij zgłoszenie"
+
 #: templates/publishing_suggest.html:2
 msgid "Didn't find a book? Make a suggestion."
 msgstr "Nie znalazłeś utworu na stronie? Zgłoś sugestię."
 
-#: templates/publishing_suggest.html:7
+#: templates/publishing_suggest.html:9
 msgid "I'd like to find in WolneLektury.pl these…"
 msgstr "Chciałabym/chciałbym znaleźć w bibliotece Wolne Lektury następujące"
-
-#: templates/publishing_suggest.html:13
-#: templates/suggest.html:7
-msgid "Send report"
-msgstr "Wyślij zgłoszenie"
-
-#: templates/publishing_suggest_full.html:12
-msgid "Search"
-msgstr ""
-
-#: templates/publishing_suggest_full.html:12
-msgid "or"
-msgstr ""
-
-#: templates/publishing_suggest_full.html:12
-msgid "return to main page"
-msgstr ""
-
-#: templates/suggest.html:2
-msgid "Report a bug or suggestion"
-msgstr "Zgłoś błąd lub sugestię"
-

diff --git a/apps/suggest/views.py b/apps/suggest/views.py
index 15b65f2..8a8df5b 100644 (file)
--- a/apps/suggest/views.py
+++ b/apps/suggest/views.py
@@ -18,6 +18,7 @@ class PublishingSuggestionFormView(AjaxableFormView):
 
 class SuggestionFormView(AjaxableFormView):
     form_class = forms.SuggestForm
+    placeholdize = True
     title = _('Report a bug or suggestion')
     submit = _('Send report')
     success_message = _('Report was sent successfully.')

diff --git a/wolnelektury/locale/pl/LC_MESSAGES/django.mo b/wolnelektury/locale/pl/LC_MESSAGES/django.mo
index 1326a31..9bbf29f 100644 (file)
Binary files a/wolnelektury/locale/pl/LC_MESSAGES/django.mo and b/wolnelektury/locale/pl/LC_MESSAGES/django.mo differ

diff --git a/wolnelektury/locale/pl/LC_MESSAGES/django.po b/wolnelektury/locale/pl/LC_MESSAGES/django.po
index 15a5dcc..c8c614b 100644 (file)
--- a/wolnelektury/locale/pl/LC_MESSAGES/django.po
+++ b/wolnelektury/locale/pl/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WolneLektury\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-11 15:45+0200\n"
-"PO-Revision-Date: 2011-10-11 15:46+0100\n"
+"POT-Creation-Date: 2012-01-27 15:26+0100\n"
+"PO-Revision-Date: 2012-01-27 16:30+0100\n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: pl\n"
@@ -19,16 +19,36 @@ msgstr ""
 "X-Poedit-Language: Polish\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: templates/404.html:6
-#: templates/404.html.py:15
+#: views.py:30
+#: views.py:31
+#: templates/base.html:56
+msgid "Sign in"
+msgstr "Zaloguj się"
+
+#: views.py:46
+#: views.py:47
+#: views.py:72
+#: templates/base.html:60
+msgid "Register"
+msgstr "Załóż konto"
+
+#: views.py:67
+msgid "You have to be logged in to continue"
+msgstr "Zaloguj się, aby kontynuować"
+
+#: templates/404.html:5
 msgid "Page does not exist"
 msgstr "Podana strona nie istnieje"
 
-#: templates/404.html:17
+#: templates/404.html:10
+msgid "Page not found"
+msgstr "Strona nie znaleziona"
+
+#: templates/404.html:14
 msgid "We are sorry, but this page does not exist. Please check if you entered correct address or go to "
 msgstr "Przepraszamy, ale ta strona nie istnieje. Sprawdź czy podałeś dobry adres, lub przejdź do"
 
-#: templates/404.html:17
+#: templates/404.html:14
 msgid "main page"
 msgstr "strony głównej"
 
@@ -52,57 +72,65 @@ msgstr "Serwis niedostępny"
 msgid "The Wolnelektury.pl site is currently unavailable due to maintainance."
 msgstr "Serwis Wolnelektury.pl jest obecnie niedostępny z powodu prac konserwacyjnych."
 
-#: templates/base.html:23
-msgid "Internet Explorer cannot display this site properly. Click here to read more..."
-msgstr "Internet Explorer nie potrafi poprawnie wyświetlić tej strony. Kliknij tutaj, aby dowiedzieć się więcej..."
+#: templates/base.html:9
+#: templates/catalogue/player.html:10
+msgid "Wolne Lektury"
+msgstr "Wolne Lektury"
 
-#: templates/base.html:38
+#: templates/base.html:36
+#, python-format
+msgid ""
+"\n"
+"                    <a href='%(b)s'>%(c)s</a> free reading you have <a href='%(r)s'>right to</a>\n"
+"                    "
+msgid_plural ""
+"\n"
+"                    <a href='%(b)s'>%(c)s</a> free readings you have <a href='%(r)s'>right to</a>\n"
+"                    "
+msgstr[0] ""
+"\n"
+"                    <a href='%(b)s'>%(c)s</a> darmowa lektura do której <a href='%(r)s'>masz prawo</a>\n"
+"                    "
+msgstr[1] ""
+"\n"
+"                    <a href='%(b)s'>%(c)s</a> darmowe lektury do których <a href='%(r)s'>masz prawo</a>\n"
+"                    "
+msgstr[2] ""
+"\n"
+"                    <a href='%(b)s'>%(c)s</a> darmowych lektur do których <a href='%(r)s'>masz prawo</a>\n"
+"                    "
+
+#: templates/base.html:47
 msgid "Welcome"
 msgstr "Witaj"
 
-#: templates/base.html:39
-msgid "Your shelves"
-msgstr "Twoje półki"
+#: templates/base.html:48
+msgid "My shelf"
+msgstr "Moja półka"
 
-#: templates/base.html:41
+#: templates/base.html:50
 msgid "Administration"
 msgstr "Administracja"
 
-#: templates/base.html:43
-#: templates/base.html.py:47
-msgid "Report a bug"
-msgstr "Zgłoś błąd"
-
-#: templates/base.html:44
+#: templates/base.html:52
 msgid "Logout"
 msgstr "Wyloguj"
 
-#: templates/base.html:48
-#: templates/base.html.py:102
-#: templates/base.html:106
-#: templates/base.html.py:110
-#: templates/auth/login.html:4
-#: templates/auth/login.html.py:7
-#: templates/auth/login.html:12
-#: templates/auth/login.html.py:15
-msgid "Sign in"
-msgstr "Zaloguj się"
-
-#: templates/base.html:48
-#: templates/base.html.py:102
-#: templates/base.html:110
-#: templates/base.html.py:114
-#: templates/auth/login.html:7
-#: templates/auth/login.html.py:21
-#: templates/auth/login.html:23
-msgid "Register"
-msgstr "Załóż konto"
+#: templates/base.html:81
+#: templates/catalogue/search_multiple_hits.html:5
+#: templates/catalogue/search_no_hits.html:5
+#: templates/catalogue/search_no_hits.html:10
+#: templates/catalogue/search_too_short.html:5
+#: templates/catalogue/search_too_short.html:10
+#: templates/newsearch/search.html:16
+msgid "Search"
+msgstr "Szukaj"
 
-#: templates/base.html:69
-msgid "Didn't find a book? Make a suggestion."
-msgstr "Nie znalazłeś utworu na stronie? Zgłoś sugestię."
+#: templates/base.html:104
+msgid "Language versions"
+msgstr "Wersje językowe"
 
-#: templates/base.html:81
+#: templates/base.html:134
 msgid ""
 "\n"
 "\t\t\t\tWolne Lektury is a project lead by <a href=\"http://nowoczesnapolska.org.pl/\">Modern Poland Foundation</a>.\n"
@@ -115,7 +143,7 @@ msgstr ""
 "Reprodukcje cyfrowe wykonane przez <a href=\"http://www.bn.org.pl/\">Bibliotekę Narodową</a>, <a href=\"http://www.bs.katowice.pl/\">Bibliotekę Śląską</a> i <a href=\"http://www.bibliotekaelblaska.pl/\">Bibliotekę Elbląską</a> z egzemplarzy pochodzących ze zbiorów BN, BŚ i BE.\n"
 "Hosting: <a href=\"http://www.icm.edu.pl/\">ICM</a>."
 
-#: templates/base.html:88
+#: templates/base.html:141
 msgid ""
 "\n"
 "\t\t\t\tModern Poland Foundation, 00-514 Warsaw, ul. Marszałkowska 84/92 lok. 125, tel/fax: (22) 621-30-17\n"
@@ -125,31 +153,44 @@ msgstr ""
 "\n"
 "Fundacja Nowoczesna Polska, 00-514 Warszawa, ul. Marszałkowska 84/92 lok. 125, tel/fax: (22) 621-30-17, e-mail: <a href=\"mailto:fundacja@nowoczesnapolska.org.pl\">fundacja@nowoczesnapolska.org.pl</a>"
 
-#: templates/base.html:99
-#: templates/base.html.py:120
-#: templates/base.html:126
-#: templates/base.html.py:132
-#: templates/catalogue/book_detail.html:208
-#: templates/catalogue/book_fragments.html:33
-#: templates/catalogue/differentiate_tags.html:23
-#: templates/catalogue/search_multiple_hits.html:29
-#: templates/catalogue/search_too_short.html:19
-#: templates/catalogue/tagged_object_list.html:142
+#: templates/base.html:157
 msgid "Close"
 msgstr "Zamknij"
 
-#: templates/base.html:122
-#: templates/base.html.py:128
-#: templates/base.html:134
-#: templates/catalogue/book_detail.html:210
-#: templates/catalogue/book_fragments.html:35
-#: templates/catalogue/differentiate_tags.html:25
-#: templates/catalogue/search_multiple_hits.html:31
-#: templates/catalogue/search_too_short.html:21
-#: templates/catalogue/tagged_object_list.html:144
+#: templates/base.html:159
 msgid "Loading"
 msgstr "Ładowanie"
 
+#: templates/main_page.html:5
+msgid "Wolne Lektury internet library"
+msgstr "Biblioteka internetowa Wolne Lektury"
+
+#: templates/main_page.html:42
+msgid "Report a bug or suggestion"
+msgstr "Zgłoś błąd lub sugestię"
+
+#: templates/main_page.html:45
+msgid "Mobile app"
+msgstr "Aplikacja mobilna"
+
+#: templates/main_page.html:46
+msgid "Widget"
+msgstr "Widget"
+
+#: templates/main_page.html:47
+msgid "Missing a book?"
+msgstr "Nie znalazłeś/-aś utworu?"
+
+#: templates/main_page.html:48
+#: templates/publish_plan.html:4
+#: templates/publish_plan.html.py:8
+msgid "Publishing plan"
+msgstr "Plan publikacji"
+
+#: templates/main_page.html:74
+msgid "Image used:"
+msgstr "Użyto obrazu:"
+
 #: templates/admin/base_site.html:4
 #: templates/admin/base_site.html.py:7
 msgid "Site administration"
@@ -172,52 +213,14 @@ msgstr "uproszczone"
 msgid "Import book"
 msgstr "Importuj książkę"
 
-#: templates/auth/login.html:4
-msgid "Register on"
-msgstr "Zarejestruj się w"
-
-#: templates/auth/login.html:9
-#: templates/catalogue/book_detail.html:14
-#: templates/catalogue/book_fragments.html:12
-#: templates/catalogue/book_list.html:12
-#: templates/catalogue/breadcrumbs.html:21
-#: templates/catalogue/main_page.html:30
-#: templates/catalogue/search_form.html:3
-#: templates/info/base.html:12
-#: templates/lesmianator/lesmianator.html:14
-#: templates/lessons/document_list.html:34
-#: templates/pdcounter/author_detail.html:13
-#: templates/pdcounter/book_stub_detail.html:13
-msgid "Search"
-msgstr "Szukaj"
-
-#: templates/auth/login.html:9
-#: templates/catalogue/book_detail.html:14
-#: templates/catalogue/book_fragments.html:12
-#: templates/catalogue/book_list.html:13
-#: templates/catalogue/main_page.html:31
-#: templates/catalogue/search_form.html:3
-#: templates/catalogue/tagged_object_list.html:44
-#: templates/info/base.html:12
-#: templates/lesmianator/lesmianator.html:14
-#: templates/lessons/document_list.html:34
-#: templates/pdcounter/author_detail.html:13
-#: templates/pdcounter/book_stub_detail.html:13
-msgid "or"
-msgstr "lub"
-
-#: templates/auth/login.html:9
-#: templates/catalogue/book_detail.html:14
-#: templates/lesmianator/lesmianator.html:14
-#: templates/lessons/document_list.html:34
-#: templates/pdcounter/author_detail.html:13
-#: templates/pdcounter/book_stub_detail.html:13
-msgid "return to main page"
-msgstr "wróć do strony głównej"
+#: templates/auth/login_register.html:7
+msgid "or register"
+msgstr "albo załóż konto"
 
 #: templates/catalogue/audiobook_list.html:6
-msgid "Listing of all audiobooks on WolneLektury.pl"
-msgstr "Spis wszystkich audiobooków w WolneLektury.pl"
+#: templates/catalogue/audiobook_list.html:15
+msgid "Listing of all audiobooks"
+msgstr "Spis wszystkich audiobooków"
 
 #: templates/catalogue/audiobook_list.html:11
 msgid "Latest MP3 audiobooks"
@@ -227,10 +230,6 @@ msgstr "Ostatnio dodane audiobooki w formacie MP3"
 msgid "Latest Ogg Vorbis audiobooks"
 msgstr "Ostatnio dodane audiobooki w formacie Ogg Vorbis"
 
-#: templates/catalogue/audiobook_list.html:15
-msgid "Listing of all audiobooks"
-msgstr "Spis wszystkich audiobooków"
-
 #: templates/catalogue/audiobook_list.html:18
 msgid ""
 "Audioteka lektur szkolnych fundacji Nowoczesna Polska.\n"
@@ -241,155 +240,10 @@ msgstr ""
 "Możecie z niej korzystać bezpłatnie i bez ograniczeń.\n"
 "Audiobooki nagrywają znani aktorzy, wśród nich Danuta Stenka i Jan Peszek."
 
-#: templates/catalogue/book_detail.html:5
-msgid "on WolneLektury.pl"
-msgstr "w WolneLektury.pl"
-
-#: templates/catalogue/book_detail.html:31
-msgid "Work is licensed under "
-msgstr "Utwór jest udostępniony na licencji"
-
-#: templates/catalogue/book_detail.html:33
-msgid "Based on"
-msgstr "Na podstawie"
-
-#: templates/catalogue/book_detail.html:42
-msgid "Put a book"
-msgstr "Wrzuć lekturę"
-
-#: templates/catalogue/book_detail.html:42
-msgid "on the shelf!"
-msgstr "na półkę!"
-
-#: templates/catalogue/book_detail.html:46
-msgid "Read online"
-msgstr "Czytaj online"
-
-#: templates/catalogue/book_detail.html:50
-msgid "Download PDF"
-msgstr "Pobierz plik PDF"
-
-#: templates/catalogue/book_detail.html:50
-#: templates/catalogue/book_detail.html:53
-#: templates/catalogue/book_detail.html:56
-#: templates/catalogue/book_detail.html:59
-#: templates/catalogue/tagged_object_list.html:37
-#: templates/catalogue/tagged_object_list.html:38
-#: templates/catalogue/tagged_object_list.html:39
-#: templates/catalogue/tagged_object_list.html:40
-msgid "for reading"
-msgstr "do czytania"
-
-#: templates/catalogue/book_detail.html:50
-#: templates/catalogue/tagged_object_list.html:37
-msgid "and printing using"
-msgstr "i drukowania przy pomocy"
-
-#: templates/catalogue/book_detail.html:53
-msgid "Download EPUB"
-msgstr "Pobierz plik EPUB"
-
-#: templates/catalogue/book_detail.html:53
-#: templates/catalogue/tagged_object_list.html:38
-msgid "on mobile devices"
-msgstr "na urządzeniach mobilnych"
-
-#: templates/catalogue/book_detail.html:56
-msgid "Download TXT"
-msgstr "Pobierz plik TXT"
-
-#: templates/catalogue/book_detail.html:56
-#: templates/catalogue/tagged_object_list.html:40
-msgid "on small displays, for example mobile phones"
-msgstr "na małych ekranach, np. na komórce"
-
-#: templates/catalogue/book_detail.html:59
-msgid "Download ODT"
-msgstr "Pobierz plik ODT"
-
-#: templates/catalogue/book_detail.html:59
-#: templates/catalogue/tagged_object_list.html:39
-msgid "and editing using"
-msgstr "i edytowania przy pomocy"
-
-#: templates/catalogue/book_detail.html:64
-msgid "Audiobooks"
-msgstr "Audiobooki"
-
-#: templates/catalogue/book_detail.html:78
-msgid "Artist"
-msgstr "Czyta"
-
-#: templates/catalogue/book_detail.html:79
-msgid "Director"
-msgstr "Reżyseruje"
-
-#: templates/catalogue/book_detail.html:107
-msgid "Audiobooks were prepared as a part of the projects:"
-msgstr "Audiobooki przygotowane w ramach projektów:"
-
-#: templates/catalogue/book_detail.html:112
-#, python-format
-msgid "%(cs)s, funded by %(fb)s"
-msgstr "%(cs)s, finansowanego przez %(fb)s"
-
-#: templates/catalogue/book_detail.html:124
-#, python-format
-msgid "Audiobooks were prepared as a part of the %(cs)s project funded by %(fb)s."
-msgstr "Audiobooki przygotowane w ramach projektu %(cs)s finansowanego przez %(fb)s."
-
-#: templates/catalogue/book_detail.html:126
-#, python-format
-msgid "Audiobooks were prepared as a part of the %(cs)s project."
-msgstr "Audiobooki przygotowane w ramach projektu %(cs)s."
-
-#: templates/catalogue/book_detail.html:152
-msgid "Details"
-msgstr "O utworze"
-
-#: templates/catalogue/book_detail.html:155
-msgid "Author"
-msgstr "Autor"
-
-#: templates/catalogue/book_detail.html:161
-msgid "Epoch"
-msgstr "Epoka"
-
-#: templates/catalogue/book_detail.html:167
-msgid "Kind"
-msgstr "Rodzaj"
-
-#: templates/catalogue/book_detail.html:173
-msgid "Genre"
-msgstr "Gatunek"
-
-#: templates/catalogue/book_detail.html:179
-msgid "Other resources"
-msgstr "W innych miejscach"
-
-#: templates/catalogue/book_detail.html:182
-msgid "Source of the book"
-msgstr "Źródło lektury"
-
-#: templates/catalogue/book_detail.html:185
-msgid "Book on the Editor's Platform"
-msgstr "Utwór na Platformie Redakcyjnej"
-
-#: templates/catalogue/book_detail.html:188
-msgid "Book description on Lektury.Gazeta.pl"
-msgstr "Opis lektury w Lektury.Gazeta.pl"
-
-#: templates/catalogue/book_detail.html:191
-msgid "Book description on Wikipedia"
-msgstr "Opis lektury w Wikipedii"
-
-#: templates/catalogue/book_detail.html:194
-msgid "View XML source"
-msgstr "Źródłowy plik XML"
-
-#: templates/catalogue/book_detail.html:198
-msgid "Work's themes "
-msgstr "Motywy w utworze"
+#: templates/catalogue/book_detail.html:18
+#: templates/catalogue/tagged_object_list.html:80
+msgid "See also"
+msgstr "Zobacz też"
 
 #: templates/catalogue/book_fragments.html:5
 #: templates/catalogue/book_fragments.html:10
@@ -401,19 +255,11 @@ msgstr "Motyw"
 msgid "in work "
 msgstr "w utworze"
 
-#: templates/catalogue/book_fragments.html:5
-msgid "on"
-msgstr "w"
-
-#: templates/catalogue/book_fragments.html:12
-msgid "return to book's page"
-msgstr "wróć do strony utworu"
-
-#: templates/catalogue/book_fragments.html:26
+#: templates/catalogue/book_fragments.html:23
 msgid "See description"
 msgstr "Zobacz opis"
 
-#: templates/catalogue/book_fragments.html:26
+#: templates/catalogue/book_fragments.html:23
 msgid "of the book "
 msgstr "utworu"
 
@@ -441,34 +287,11 @@ msgid "Edited and annotated by:"
 msgstr "Opracowanie redakcyjne i przypisy:"
 
 #: templates/catalogue/book_list.html:7
-msgid "Listing of all works on WolneLektury.pl"
-msgstr "Spis wszystkich utworów w WolneLektury.pl"
-
 #: templates/catalogue/book_list.html:10
 msgid "Listing of all works"
 msgstr "Spis wszystkich utworów"
 
-#: templates/catalogue/book_list.html:13
-#: templates/catalogue/main_page.html:31
-msgid "see"
-msgstr "zobacz"
-
-#: templates/catalogue/book_list.html:15
-#: templates/catalogue/main_page.html:33
-msgid "all books"
-msgstr "wszystkie utwory"
-
-#: templates/catalogue/book_list.html:16
-#: templates/catalogue/main_page.html:34
-msgid "audiobooks"
-msgstr "audiobooki"
-
-#: templates/catalogue/book_list.html:17
-#: templates/catalogue/main_page.html:35
-msgid "DAISY"
-msgstr "DAISY"
-
-#: templates/catalogue/book_list.html:23
+#: templates/catalogue/book_list.html:21
 msgid "Table of Content"
 msgstr "Spis treści"
 
@@ -491,24 +314,45 @@ msgid "You do not have any shelves. You can create one below, if you want to."
 msgstr "Nie posiadasz żadnych półek. Jeśli chcesz, możesz utworzyć nową półkę poniżej."
 
 #: templates/catalogue/book_sets.html:15
-#: templates/catalogue/book_short.html:4
 msgid "Put on the shelf!"
 msgstr "Wrzuć na półkę"
 
-#: templates/catalogue/book_short.html:14
-msgid "Jump to"
-msgstr "Na skróty"
+#: templates/catalogue/book_short.html:49
+#: templates/catalogue/picture_detail.html:54
+#: templates/picture/picture_short.html:22
+msgid "Epoch"
+msgstr "Epoka"
+
+#: templates/catalogue/book_short.html:56
+#: templates/catalogue/picture_detail.html:60
+#: templates/picture/picture_short.html:29
+msgid "Kind"
+msgstr "Rodzaj"
+
+#: templates/catalogue/book_short.html:63
+msgid "Genre"
+msgstr "Gatunek"
 
-#: templates/catalogue/book_short.html:16
-msgid "Categories"
-msgstr "Utwór w kategoriach"
+#: templates/catalogue/book_short.html:77
+msgid "Read online"
+msgstr "Czytaj online"
+
+#: templates/catalogue/book_short.html:81
+#: templates/catalogue/book_wide.html:53
+#: templates/lessons/ajax_document_detail.html:3
+msgid "Download"
+msgstr "Pobierz"
+
+#: templates/catalogue/book_short.html:99
+msgid "Listen"
+msgstr "Słuchaj"
 
 #: templates/catalogue/book_text.html:21
 msgid "Table of contents"
 msgstr "Spis treści"
 
 #: templates/catalogue/book_text.html:22
-#: templates/catalogue/tagged_object_list.html:133
+#: templates/catalogue/menu.html:27
 msgid "Themes"
 msgstr "Motywy"
 
@@ -520,18 +364,101 @@ msgstr "Nota red."
 msgid "Infobox"
 msgstr "Informacje"
 
-#: templates/catalogue/daisy_list.html:6
-msgid "Listing of all DAISY files on WolneLektury.pl"
-msgstr "Spis wszystkich plików DAISY w WolneLektury.pl"
+#: templates/catalogue/book_wide.html:14
+#: templates/catalogue/tagged_object_list.html:61
+msgid "Motifs and themes"
+msgstr "Motywy i tematy"
 
-#: templates/catalogue/daisy_list.html:9
-msgid "Latest DAISY audiobooks"
-msgstr "Ostatnio dodane audiobooki w formacie DAISY"
+#: templates/catalogue/book_wide.html:34
+msgid "See"
+msgstr "Zobacz"
+
+#: templates/catalogue/book_wide.html:37
+msgid "Source"
+msgstr "Źródło"
+
+#: templates/catalogue/book_wide.html:37
+msgid "of the book"
+msgstr "utworu"
+
+#: templates/catalogue/book_wide.html:39
+msgid "Source XML file"
+msgstr "Źródłowy plik XML"
+
+#: templates/catalogue/book_wide.html:41
+msgid "Book on"
+msgstr "Utwór na"
+
+#: templates/catalogue/book_wide.html:41
+msgid "Editor's Platform"
+msgstr "Platformie Redakcyjnej"
+
+#: templates/catalogue/book_wide.html:44
+msgid "Book description on Lektury.Gazeta.pl"
+msgstr "Opis lektury w Lektury.Gazeta.pl"
+
+#: templates/catalogue/book_wide.html:47
+msgid "Book description on Wikipedia"
+msgstr "Opis lektury w Wikipedii"
+
+#: templates/catalogue/book_wide.html:49
+msgid "Mix this book"
+msgstr "Miksuj treść utworu"
+
+#: templates/catalogue/book_wide.html:57
+msgid "Download all audiobooks for this book"
+msgstr "Pobierz wszystkie audiobooki tego utworu"
+
+#: templates/catalogue/book_wide.html:63
+msgid "Download a custom PDF"
+msgstr "Pobierz własny plik PDF"
+
+#: templates/catalogue/catalogue.html:6
+#: templates/catalogue/catalogue.html:11
+msgid "Catalogue"
+msgstr "Katalog"
+
+#: templates/catalogue/catalogue.html:16
+msgid "Download the catalogue in PDF format."
+msgstr "Pobierz katalog w formacie PDF."
 
+#: templates/catalogue/catalogue.html:19
+#: templates/catalogue/menu.html:7
+#: templates/catalogue/tagged_object_list.html:26
+msgid "Authors"
+msgstr "Autorzy"
+
+#: templates/catalogue/catalogue.html:22
+#: templates/catalogue/menu.html:17
+#: templates/catalogue/tagged_object_list.html:34
+msgid "Kinds"
+msgstr "Rodzaje"
+
+#: templates/catalogue/catalogue.html:25
+#: templates/catalogue/menu.html:12
+#: templates/catalogue/tagged_object_list.html:42
+msgid "Genres"
+msgstr "Gatunki"
+
+#: templates/catalogue/catalogue.html:28
+#: templates/catalogue/menu.html:22
+#: templates/catalogue/tagged_object_list.html:50
+msgid "Epochs"
+msgstr "Epoki"
+
+#: templates/catalogue/catalogue.html:31
+msgid "Themes and topics"
+msgstr "Motywy i tematy"
+
+#: templates/catalogue/daisy_list.html:6
 #: templates/catalogue/daisy_list.html:12
 msgid "Listing of all DAISY files"
 msgstr "Spis wszystkich plików DAISY"
 
+#: templates/catalogue/daisy_list.html:9
+msgid "Latest DAISY audiobooks"
+msgstr "Ostatnio dodane audiobooki w formacie DAISY"
+
 #: templates/catalogue/daisy_list.html:15
 msgid ""
 "System DAISY to uznany na całym świecie format udostępniania książek\n"
@@ -542,33 +469,15 @@ msgstr ""
 "dostosowany do potrzeb osób słabowidzących, niewidomych oraz innych osób\n"
 "mających trudności z czytaniem. Możecie z nich korzystać bezpłatnie i bez ograniczeń."
 
-#: templates/catalogue/differentiate_tags.html:13
+#: templates/catalogue/differentiate_tags.html:12
 msgid "The criteria are ambiguous. Please select one of the following options:"
 msgstr "Podane kryteria są niejednoznaczne. Proszę wybrać jedną z następujących możliwości:"
 
-#: templates/catalogue/folded_tag_list.html:4
-msgid "Show full category"
-msgstr "Zobacz całą kategorię"
-
-#: templates/catalogue/folded_tag_list.html:13
-#: templates/catalogue/main_page.html:111
-#: templates/catalogue/main_page.html:116
-#: templates/catalogue/main_page.html:155
-#: templates/catalogue/main_page.html:350
-msgid "See more"
-msgstr "Zobacz więcej"
-
-#: templates/catalogue/folded_tag_list.html:22
-#: templates/catalogue/main_page.html:318
-msgid "Hide"
-msgstr "Zwiń"
-
 #: templates/catalogue/fragment_sets.html:2
 msgid "Shelves containing fragment"
 msgstr "Półki zawierające fragment"
 
 #: templates/catalogue/fragment_sets.html:4
-#: templates/catalogue/main_page.html:85
 msgid "You do not own any shelves. You can create one below, if you want to."
 msgstr "Nie posiadasz żadnych półek. Jeśli chcesz, możesz utworzyć nową półkę poniżej."
 
@@ -576,343 +485,150 @@ msgstr "Nie posiadasz żadnych półek. Jeśli chcesz, możesz utworzyć nową p
 msgid "Save all shelves"
 msgstr "Zapisz półki"
 
-#: templates/catalogue/fragment_short.html:7
+#: templates/catalogue/fragment_short.html:11
 msgid "Expand fragment"
 msgstr "Rozwiń fragment"
 
-#: templates/catalogue/fragment_short.html:13
+#: templates/catalogue/fragment_short.html:21
 msgid "Hide fragment"
 msgstr "Zwiń fragment"
 
-#: templates/catalogue/fragment_short.html:18
-msgid "See in a book"
-msgstr "Zobacz w utworze"
-
-#: templates/catalogue/main_page.html:10
-#, python-format
-msgid ""
-"\n"
-"%(c)s book from <a href='http://domenapubliczna.org'>public domain</a> or under\n"
-"a <a href='http://creativecommons.org/licenses/by-sa/3.0/deed.pl'>free license</a>.\n"
-msgid_plural ""
-"\n"
-"%(c)s books from <a href='http://domenapubliczna.org'>public domain</a> or under\n"
-"a <a href='http://creativecommons.org/licenses/by-sa/3.0/deed.pl'>free license</a>.\n"
-msgstr[0] ""
-"\n"
-"%(c)s lektura z <a href='http://domenapubliczna.org'>domeny publicznej</a>\n"
-"lub na <a href='http://creativecommons.org/licenses/by-sa/3.0/deed.pl'>wolnej licencji</a>.\n"
-msgstr[1] ""
-"\n"
-"%(c)s lektury z <a href='http://domenapubliczna.org'>domeny publicznej</a>\n"
-"i na <a href='http://creativecommons.org/licenses/by-sa/3.0/deed.pl'>wolnej licencji</a>.\n"
-msgstr[2] ""
-"\n"
-"%(c)s lektur z <a href='http://domenapubliczna.org'>domeny publicznej</a>\n"
-"i na <a href='http://creativecommons.org/licenses/by-sa/3.0/deed.pl'>wolnej licencji</a>.\n"
-
-#: templates/catalogue/main_page.html:40
-msgid "Browse books by categories"
-msgstr "Przeglądaj lektury według wybranych kategorii"
-
-#: templates/catalogue/main_page.html:69
-msgid "Books for every school level"
-msgstr "Lektury na każdy poziom edukacji"
-
-#: templates/catalogue/main_page.html:71
-msgid "primary school"
-msgstr "szkoła podstawowa"
-
-#: templates/catalogue/main_page.html:72
-msgid "gymnasium"
-msgstr "gimnazjum"
-
-#: templates/catalogue/main_page.html:73
-msgid "high school"
-msgstr "szkoła średnia"
-
-#: templates/catalogue/main_page.html:76
-#: templates/catalogue/user_shelves.html:2
-msgid "Your shelves with books"
-msgstr "Twoje półki z lekturami"
-
-#: templates/catalogue/main_page.html:81
-msgid "delete"
-msgstr "usuń"
-
-#: templates/catalogue/main_page.html:90
-#: templates/catalogue/user_shelves.html:15
-msgid "Create shelf"
-msgstr "Utwórz półkę"
-
-#: templates/catalogue/main_page.html:94
-msgid "Create your own book set. You can share it with friends by sending them link to your shelf."
-msgstr "Stwórz własny zestaw lektur. Możesz się nim później podzielić z innymi, przesyłając im link do Twojej półki."
-
-#: templates/catalogue/main_page.html:95
-msgid "You need to "
-msgstr "Aby zarządzać swoimi półkami, musisz się"
-
-#: templates/catalogue/main_page.html:95
-msgid "sign in"
-msgstr "zalogować"
-
-#: templates/catalogue/main_page.html:95
-msgid "to manage your shelves."
-msgstr "."
+#: templates/catalogue/inline_tag_list.html:4
+#: templates/catalogue/tag_list.html:4
+msgid "See full category"
+msgstr "Zobacz całą kategorię"
 
-#: templates/catalogue/main_page.html:101
-msgid "Twórzże się!"
-msgstr ""
+#: templates/catalogue/menu.html:32
+msgid "All books"
+msgstr "Wszystkie utwory"
 
-#: templates/catalogue/main_page.html:103
-#: templates/catalogue/main_page.html:111
-msgid "Wolne Lektury Widget"
-msgstr "Widżet Wolne Lektury"
+#: templates/catalogue/menu.html:36
+msgid "Audiobooks"
+msgstr "Audiobooki"
 
-#: templates/catalogue/main_page.html:104
-msgid "Place our widget - search engine for Wolne Lektury which gives access to free books and audiobooks - on your homepage! Just copy the HTML code below onto your page:"
-msgstr "Umieść widżet – wyszukiwarkę Wolnych Lektur umożliwiającą dostęp do darmowych lektur i audiobooków – na swojej stronie WWW! Po prostu skopiuj poniższy kod HTML na swoją stronę:"
+#: templates/catalogue/menu.html:40
+msgid "DAISY"
+msgstr "DAISY"
 
-#: templates/catalogue/main_page.html:105
-msgid "Insert this element in place where you want display the widget"
-msgstr "Umieść ten element w miejscu gdzie chcesz wyświetlić widżet"
+#: templates/catalogue/picture_detail.html:29
+msgid "Work is licensed under "
+msgstr "Utwór jest udostępniony na licencji"
 
-#: templates/catalogue/main_page.html:108
-msgid "Place this element just before closing body tag: &lt;/body&gt;"
-msgstr "Umieść ten element tuż przed zamknięciem taga body: &lt;/body&gt;"
+#: templates/catalogue/picture_detail.html:31
+msgid "Based on"
+msgstr "Na podstawie"
 
-#: templates/catalogue/main_page.html:114
-#: templates/catalogue/main_page.html:116
-#: templates/lessons/document_list.html:32
-msgid "Hand-outs for teachers"
-msgstr "Materiały pomocnicze dla nauczycieli"
+#: templates/catalogue/picture_detail.html:45
+msgid "Details"
+msgstr "O utworze"
 
-#: templates/catalogue/main_page.html:115
-msgid "Lessons' prospects and other ideas for using Wolnelektury.pl for teaching."
-msgstr "Scenariusze lekcji i inne pomysły na wykorzytanie serwisu WolneLektury.pl podczas nauczania."
+#: templates/catalogue/picture_detail.html:48
+msgid "Author"
+msgstr "Autor"
 
-#: templates/catalogue/main_page.html:122
-#: templates/catalogue/tagged_object_list.html:112
-msgid "Authors"
-msgstr "Autorzy"
+#: templates/catalogue/picture_detail.html:66
+msgid "Other resources"
+msgstr "W innych miejscach"
 
-#: templates/catalogue/main_page.html:126
-#: templates/catalogue/tagged_object_list.html:116
-msgid "Kinds"
-msgstr "Rodzaje"
+#: templates/catalogue/picture_detail.html:69
+msgid "Source of the image"
+msgstr "Źródło obrazu"
 
-#: templates/catalogue/main_page.html:130
-#: templates/catalogue/tagged_object_list.html:120
-msgid "Genres"
-msgstr "Gatunki"
+#: templates/catalogue/picture_detail.html:72
+msgid "Image on the Editor's Platform"
+msgstr "Obraz na Platformie Redakcyjnej"
 
-#: templates/catalogue/main_page.html:134
-#: templates/catalogue/tagged_object_list.html:124
-msgid "Epochs"
-msgstr "Epoki"
-
-#: templates/catalogue/main_page.html:140
-#: templates/catalogue/main_page.html:155
-msgid "Themes and topics"
-msgstr "Motywy i tematy"
+#: templates/catalogue/picture_detail.html:83
+msgid "View XML source"
+msgstr "Źródłowy plik XML"
 
-#: templates/catalogue/main_page.html:143
-msgid "Themes groups"
-msgstr "Rodziny motywów"
+#: templates/catalogue/picture_detail.html:86
+msgid "Work's themes "
+msgstr "Motywy w utworze"
 
-#: templates/catalogue/main_page.html:328
-msgid "News"
-msgstr "Aktualności"
+#: templates/catalogue/picture_list.html:8
+#: templates/catalogue/picture_list.html:10
+msgid "Listing of all pictures"
+msgstr "Spis wszystkich obrazów"
 
-#: templates/catalogue/main_page.html:332
-msgid "See our blog"
-msgstr "Zobacz nasz blog"
+#: templates/catalogue/player.html:61
+msgid "Artist"
+msgstr "Czyta"
 
-#: templates/catalogue/main_page.html:335
-#: templates/catalogue/main_page.html:341
-msgid "You can help us!"
-msgstr "Możesz nam pomóc!"
+#: templates/catalogue/player.html:62
+msgid "Director"
+msgstr "Reżyseruje"
 
-#: templates/catalogue/main_page.html:337
-msgid "Become a volunteer &ndash; an editor, developer or translator."
-msgstr "Zostań naszym redaktorem, programistą lub tłumaczem – wolontariuszem."
+#: templates/catalogue/player.html:79
+msgid "Download as"
+msgstr "Pobierz jako"
 
-#: templates/catalogue/main_page.html:338
-msgid "Gain new skills and experience."
-msgstr "Zdobądź nowe umiejętności i doświadczenie."
+#: templates/catalogue/player.html:96
+msgid "Audiobooks were prepared as a part of the projects:"
+msgstr "Audiobooki przygotowane w ramach projektów:"
 
-#: templates/catalogue/main_page.html:339
-msgid "Join an open project of creating an innovative online library."
-msgstr "Weź udział w otwartym projekcie i twórz innowacyjną bibliotekę internetową."
+#: templates/catalogue/player.html:101
+#, python-format
+msgid "%(cs)s, funded by %(fb)s"
+msgstr "%(cs)s, finansowanego przez %(fb)s"
 
-#: templates/catalogue/main_page.html:344
-#: templates/catalogue/main_page.html:350
-msgid "About us"
-msgstr "O projekcie"
+#: templates/catalogue/player.html:113
+#, python-format
+msgid "Audiobooks were prepared as a part of the %(cs)s project funded by %(fb)s."
+msgstr "Audiobooki przygotowane w ramach projektu %(cs)s finansowanego przez %(fb)s."
 
-#: templates/catalogue/main_page.html:346
-msgid ""
-"\n"
-"\t\t\tInternet library with school readings “Wolne Lektury” (<a href=\"http://wolnelektury.pl\">www.wolnelektury.pl</a>) is a project made by Modern Poland Foundation. It started in 2007 and shares school readings, which are recommended by Ministry of National Education and are in public domain.\n"
-"\t\t\t"
-msgstr ""
-"\n"
-"Biblioteka internetowa z lekturami szkolnymi „Wolne Lektury” (<a href=\"http://wolnelektury.pl\">www.wolnelektury.pl</a>) to projekt realizowany przez fundację Nowoczesna Polska. Działa od 2007 roku i udostępnia w swoich zbiorach lektury szkolne, które są zalecane do użytku przez Ministerstwo Edukacji Narodowej i które trafiły już do domeny publicznej."
+#: templates/catalogue/player.html:115
+#, python-format
+msgid "Audiobooks were prepared as a part of the %(cs)s project."
+msgstr "Audiobooki przygotowane w ramach projektu %(cs)s."
 
-#: templates/catalogue/main_page.html:359
-msgid ""
-"\n"
-"Portions of this page are modifications based on work created and <a href=\"http://code.google.com/policies.html\">shared by Google</a> and used\n"
-"according to terms described in the <a href=\"http://creativecommons.org/licenses/by/3.0/\">Creative Commons\n"
-"3.0 Attribution License</a>.\n"
-msgstr ""
-"\n"
-"Strona zawiera zmodyfikowane logo Androida, stworzone i <a href=\"http://code.google.com/policies.html\">udostępnione przez Google</a>\n"
-"na warunkach licencji <a href=\"http://creativecommons.org/licenses/by/3.0/\">Creative Commons 3.0 Uznanie Autorstwa</a>.\n"
+#: templates/catalogue/search_multiple_hits.html:11
+#: templates/catalogue/search_no_hits.html:16
+msgid "Did you mean"
+msgstr "Czy chodziło Ci o"
 
-#: templates/catalogue/search_form.html:3
-#: templates/info/base.html:12
-msgid "return to the main page"
-msgstr "wróć do strony głównej"
+#: templates/catalogue/search_multiple_hits.html:19
+msgid "Results by authors"
+msgstr "Znalezieni autorzy"
 
-#: templates/catalogue/search_multiple_hits.html:5
-#: templates/catalogue/search_too_short.html:5
-msgid "Searching in"
-msgstr "Wyszukiwanie w"
+#: templates/catalogue/search_multiple_hits.html:36
+msgid "Results by title"
+msgstr "Znalezione w tytułach"
 
-#: templates/catalogue/search_multiple_hits.html:14
-msgid "More than one result matching the criteria found."
-msgstr "Znaleziono więcej niż jeden wynik wyszukiwania."
+#: templates/catalogue/search_multiple_hits.html:53
+msgid "Results in text"
+msgstr "Znalezione w treści"
 
-#: templates/catalogue/search_no_hits.html:5
-msgid "Search in WolneLektury.pl"
-msgstr "Wyszukiwanie w WolneLektury.pl"
+#: templates/catalogue/search_multiple_hits.html:70
+msgid "Other results"
+msgstr "Inne wyniki"
 
-#: templates/catalogue/search_no_hits.html:14
-#: templates/catalogue/tagged_object_list.html:101
+#: templates/catalogue/search_no_hits.html:19
+#: templates/catalogue/tagged_object_list.html:122
 msgid "Sorry! Search cirteria did not match any resources."
 msgstr "Przepraszamy! Brak wyników spełniających kryteria podane w zapytaniu."
 
-#: templates/catalogue/search_no_hits.html:16
+#: templates/catalogue/search_no_hits.html:21
 msgid ""
 "Search engine supports following criteria: title, author, theme/topic, epoch, kind and genre.\n"
 "\t\tAs for now we do not support full text search."
 msgstr "Wyszukiwarka obsługuje takie kryteria jak tytuł, autor, motyw/temat, epoka, rodzaj i gatunek utworu. Obecnie nie obsługujemy wyszukiwania fraz w tekstach utworów."
 
-#: templates/catalogue/search_too_short.html:14
+#: templates/catalogue/search_too_short.html:13
 msgid "Sorry! Search query must have at least two characters."
 msgstr "Przepraszamy! Zapytanie musi zawierać co najmniej dwa znaki."
 
-#: templates/catalogue/tag_list.html:4
-msgid "See full category"
-msgstr "Zobacz całą kategorię"
-
-#: templates/catalogue/tagged_object_list.html:15
-msgid "Your shelf is empty"
-msgstr "Twoja półka jest pusta"
-
-#: templates/catalogue/tagged_object_list.html:16
-msgid "You can put a book on a shelf by entering page of the reading and clicking 'Put on the shelf'."
-msgstr "Możesz wrzucić książkę na półkę, wchodząc na stronę danej lektury i klikając na przycisk „Na półkę!”."
+#: templates/catalogue/tagged_object_list.html:84
+msgid "in Lektury.Gazeta.pl"
+msgstr "w serwisie Lektury.Gazeta.pl"
 
-#: templates/catalogue/tagged_object_list.html:32
-msgid "Download all books from this shelf"
-msgstr "Pobierz wszystkie książki z tej półki"
-
-#: templates/catalogue/tagged_object_list.html:36
-msgid "Choose books' formats which you want to download:"
-msgstr "Wybierz formaty książek, które chcesz pobrać:"
-
-#: templates/catalogue/tagged_object_list.html:41
-#: templates/catalogue/tagged_object_list.html:42
-msgid "for listening"
-msgstr "do słuchania"
+#: templates/catalogue/tagged_object_list.html:89
+msgid "in Wikipedia"
+msgstr "w Wikipedii"
 
-#: templates/catalogue/tagged_object_list.html:41
-msgid "on favourite MP3 player"
-msgstr "w ulubionym odtwarzaczu MP3"
-
-#: templates/catalogue/tagged_object_list.html:42
-msgid "open format"
-msgstr "otwarty format"
-
-#: templates/catalogue/tagged_object_list.html:42
-msgid "Xiph.org Foundation"
-msgstr "fundacji Xiph.Org"
-
-#: templates/catalogue/tagged_object_list.html:44
-#: templates/lessons/ajax_document_detail.html:3
-msgid "Download"
-msgstr "Pobierz"
-
-#: templates/catalogue/tagged_object_list.html:44
-msgid "Updating list of books' formats on the shelf"
-msgstr "Uaktualnianie listy formatów książek na półce."
-
-#: templates/catalogue/tagged_object_list.html:44
-msgid "cancel"
-msgstr "anuluj"
-
-#: templates/catalogue/tagged_object_list.html:49
-msgid "Share this shelf"
-msgstr "Podziel się tą półką"
-
-#: templates/catalogue/tagged_object_list.html:51
-msgid "Copy this link and share it with other people to let them see your shelf."
-msgstr "Skopiuj ten link i przekaż go osobom, z którymi chcesz się podzielić tą półką."
-
-#: templates/catalogue/tagged_object_list.html:61
-#: templates/pdcounter/author_detail.html:27
-msgid "Read work's study of this author on Lektury.Gazeta.pl"
-msgstr "Przeczytaj omówienia utworów autora w serwisie Lektury.Gazeta.pl"
-
-#: templates/catalogue/tagged_object_list.html:63
-#, python-format
-msgid "Read study of epoch %(last_tag)s on Lektury.Gazeta.pl"
-msgstr "Przeczytaj omówienia z epoki %(last_tag)s w serwisie Lektury.Gazeta.pl"
-
-#: templates/catalogue/tagged_object_list.html:65
-#, python-format
-msgid "Read study of kind %(last_tag)s on Lektury.Gazeta.pl"
-msgstr "Przeczytaj omówienia z rodzaju %(last_tag)s w serwisie Lektury.Gazeta.pl"
-
-#: templates/catalogue/tagged_object_list.html:67
-#, python-format
-msgid "Read study of genre %(last_tag)s on Lektury.Gazeta.pl"
-msgstr "Przeczytaj omówienia z gatunku %(last_tag)s w serwisie Lektury.Gazeta.pl"
-
-#: templates/catalogue/tagged_object_list.html:69
-msgid "Read related study on Lektury.Gazeta.pl"
-msgstr "Przeczytaj powiązane omówienia w serwisie Lektury.Gazeta.pl"
-
-#: templates/catalogue/tagged_object_list.html:77
-#: templates/pdcounter/author_detail.html:32
-msgid "Read article about this author on Wikipedia"
-msgstr "Przeczytaj artykuł o autorze w Wikipedii"
-
-#: templates/catalogue/tagged_object_list.html:79
-#, python-format
-msgid "Read article about epoch %(last_tag)s on Wikipedia"
-msgstr "Przeczytaj artykuł o epoce %(last_tag)s w Wikipedii"
-
-#: templates/catalogue/tagged_object_list.html:81
-#, python-format
-msgid "Read article about kind %(last_tag)s on Wikipedia"
-msgstr "Przeczytaj artykuł o rodzaju %(last_tag)s w Wikipedii"
-
-#: templates/catalogue/tagged_object_list.html:83
-#, python-format
-msgid "Read article about genre %(last_tag)s on Wikipedia"
-msgstr "Przeczytaj artykuł o gatunku %(last_tag)s w Wikipedii"
-
-#: templates/catalogue/tagged_object_list.html:85
-msgid "Read related article on Wikipedia"
-msgstr "Przeczytaj powiązany artykuł w Wikipedii"
-
-#: templates/catalogue/tagged_object_list.html:95
-msgid "Delete"
-msgstr "Usuń"
+#: templates/catalogue/user_shelves.html:2
+msgid "Your shelves with books"
+msgstr "Twoje półki z lekturami"
 
 #: templates/catalogue/user_shelves.html:6
 msgid "remove"
@@ -922,6 +638,10 @@ msgstr "usuń"
 msgid "You do not own any shelves. You can create one below if you want to"
 msgstr "Nie posiadasz żadnych półek. Jeśli chcesz, możesz utworzyć półkę poniżej."
 
+#: templates/catalogue/user_shelves.html:15
+msgid "Create shelf"
+msgstr "Utwórz półkę"
+
 #: templates/info/join_us.html:6
 #, python-format
 msgid ""
@@ -946,25 +666,25 @@ msgstr[2] ""
 "\n"
 "W serwisie Wolne Lektury już teraz opublikowanych jest %(c)s utworów! Pomóż w rozwijaniu biblioteki i uwalnianiu nowych lektur <a href=\"http://nowoczesnapolska.org.pl/wesprzyj_nas/\">przekazując nam darowiznę lub 1&#37; podatku</a>.\n"
 
-#: templates/info/join_us.html:17
-#: templates/info/join_us.html.py:22
-msgid "More..."
-msgstr "Więcej..."
-
-#: templates/info/join_us.html:19
+#: templates/info/join_us.html:20
 msgid ""
 "Become an editor of Wolne Lektury! Find out if\n"
 "we're currently working on a reading you're looking for and prepare\n"
 "a publication by yourself by logging into the Editorial Platform."
 msgstr "Zostań redaktorem lub redaktorką Wolnych Lektur! Sprawdź, czy obecnie pracujemy nad publikacją wyszukiwanej przez ciebie lektury i samodzielnie przygotuj publikację logując się na Platformie Redakcyjnej."
 
+#: templates/info/join_us.html:23
+msgid "More..."
+msgstr "Więcej..."
+
 #: templates/lessons/ajax_document_detail.html:3
 msgid "author"
 msgstr "autor"
 
 #: templates/lessons/document_list.html:7
-msgid "Hand-outs for teachers on "
-msgstr "Materiały pomocnicze dla nauczycieli w "
+#: templates/lessons/document_list.html:32
+msgid "Hand-outs for teachers"
+msgstr "Materiały pomocnicze dla nauczycieli"
 
 #: templates/pagination/pagination.html:5
 #: templates/pagination/pagination.html:7
@@ -976,37 +696,45 @@ msgstr "poprzedni"
 msgid "next"
 msgstr "następny"
 
-#: templates/pdcounter/author_detail.html:37
+#: templates/pdcounter/author_detail.html:25
+msgid "Read work's study of this author on Lektury.Gazeta.pl"
+msgstr "Przeczytaj omówienia utworów autora w serwisie Lektury.Gazeta.pl"
+
+#: templates/pdcounter/author_detail.html:30
+msgid "Read article about this author on Wikipedia"
+msgstr "Przeczytaj artykuł o autorze w Wikipedii"
+
+#: templates/pdcounter/author_detail.html:35
 msgid "This author's works are copyrighted."
 msgstr "Dzieła tego autora objęte są prawem autorskim."
 
-#: templates/pdcounter/author_detail.html:38
-#: templates/pdcounter/author_detail.html:46
+#: templates/pdcounter/author_detail.html:36
+#: templates/pdcounter/author_detail.html:44
 msgid "<a href='http://domenapubliczna.org/co-to-jest-domena-publiczna/'>Find out</a> why Internet libraries can't publish this author's works."
 msgstr "<a href='http://domenapubliczna.org/co-to-jest-domena-publiczna/'>Dowiedz się</a>, dlaczego biblioteki internetowe nie mogą udostępniać dzieł tego autora."
 
-#: templates/pdcounter/author_detail.html:41
+#: templates/pdcounter/author_detail.html:39
 msgid "This author's works are in public domain and will be published on Internet school library of Wolne Lektury soon."
 msgstr "Dzieła tego autora znajdują się w domenie publicznej i niedługo zostaną opublikowane w szkolnej bibliotece internetowej Wolne Lektury."
 
-#: templates/pdcounter/author_detail.html:44
+#: templates/pdcounter/author_detail.html:42
 msgid "This author's works will become part of public domain and will be allowed to be published without restrictions in"
 msgstr "Dzieła tego autora przejdą do zasobów domeny publicznej i będą mogły być publikowane bez żadnych ograniczeń za"
 
-#: templates/pdcounter/book_stub_detail.html:18
+#: templates/pdcounter/book_stub_detail.html:16
 msgid "This work is in public domain and will be published on Internet school library of Wolne Lektury soon."
 msgstr "To dzieło znajduje się w domenie publicznej i niedługo zostanie opublikowane w szkolnej bibliotece internetowej Wolne Lektury."
 
-#: templates/pdcounter/book_stub_detail.html:21
+#: templates/pdcounter/book_stub_detail.html:19
 msgid "This work will become part of public domain and will be allowed to be published without restrictions in"
 msgstr "To dzieło przejdzie do zasobów domeny publicznej i będzie mogło być publikowane bez żadnych ograniczeń za"
 
-#: templates/pdcounter/book_stub_detail.html:23
-#: templates/pdcounter/book_stub_detail.html:26
+#: templates/pdcounter/book_stub_detail.html:21
+#: templates/pdcounter/book_stub_detail.html:24
 msgid "<a href='http://domenapubliczna.org/co-to-jest-domena-publiczna/'>Find out</a> why Internet libraries can't publish this work."
 msgstr "<a href='http://domenapubliczna.org/co-to-jest-domena-publiczna/'>Dowiedz się</a>, dlaczego biblioteki internetowe nie mogą udostępniać tego dzieła."
 
-#: templates/pdcounter/book_stub_detail.html:25
+#: templates/pdcounter/book_stub_detail.html:23
 msgid "This work is copyrighted."
 msgstr "To dzieło objęte jest prawem autorskim."
 
@@ -1029,6 +757,321 @@ msgstr "Zaloguj się do Wolnych Lektur"
 msgid "Login"
 msgstr "Zaloguj się"
 
+#~ msgid ""
+#~ "Internet Explorer cannot display this site properly. Click here to read "
+#~ "more..."
+#~ msgstr ""
+#~ "Internet Explorer nie potrafi poprawnie wyświetlić tej strony. Kliknij "
+#~ "tutaj, aby dowiedzieć się więcej..."
+
+#~ msgid "Your shelves"
+#~ msgstr "Twoje półki"
+
+#~ msgid "Didn't find a book? Make a suggestion."
+#~ msgstr "Nie znalazłeś utworu na stronie? Zgłoś sugestię."
+
+#~ msgid "Register on"
+#~ msgstr "Zarejestruj się w"
+
+#~ msgid "or"
+#~ msgstr "lub"
+
+#~ msgid "return to main page"
+#~ msgstr "wróć do strony głównej"
+
+#~ msgid "Listing of all audiobooks on WolneLektury.pl"
+#~ msgstr "Spis wszystkich audiobooków w WolneLektury.pl"
+
+#~ msgid "on WolneLektury.pl"
+#~ msgstr "w WolneLektury.pl"
+
+#~ msgid "Put a book"
+#~ msgstr "Wrzuć lekturę"
+
+#~ msgid "on the shelf!"
+#~ msgstr "na półkę!"
+
+#~ msgid "for reading"
+#~ msgstr "do czytania"
+
+#~ msgid "and printing using"
+#~ msgstr "i drukowania przy pomocy"
+
+#~ msgid "Download EPUB"
+#~ msgstr "Pobierz plik EPUB"
+
+#~ msgid "on mobile devices"
+#~ msgstr "na urządzeniach mobilnych"
+
+#~ msgid "Download TXT"
+#~ msgstr "Pobierz plik TXT"
+
+#~ msgid "on small displays, for example mobile phones"
+#~ msgstr "na małych ekranach, np. na komórce"
+
+#~ msgid "Download ODT"
+#~ msgstr "Pobierz plik ODT"
+
+#~ msgid "and editing using"
+#~ msgstr "i edytowania przy pomocy"
+
+#~ msgid "on"
+#~ msgstr "w"
+
+#~ msgid "return to book's page"
+#~ msgstr "wróć do strony utworu"
+
+#~ msgid "Listing of all works on WolneLektury.pl"
+#~ msgstr "Spis wszystkich utworów w WolneLektury.pl"
+
+#~ msgid "audiobooks"
+#~ msgstr "audiobooki"
+
+#~ msgid "Jump to"
+#~ msgstr "Na skróty"
+
+#~ msgid "Categories"
+#~ msgstr "Utwór w kategoriach"
+
+#~ msgid "Listing of all DAISY files on WolneLektury.pl"
+#~ msgstr "Spis wszystkich plików DAISY w WolneLektury.pl"
+
+#~ msgid "Show full category"
+#~ msgstr "Zobacz całą kategorię"
+
+#~ msgid "Hide"
+#~ msgstr "Zwiń"
+
+#~ msgid ""
+#~ "\n"
+#~ "%(c)s book from <a href='http://domenapubliczna.org'>public domain</a> or "
+#~ "under\n"
+#~ "a <a href='http://creativecommons.org/licenses/by-sa/3.0/deed.pl'>free "
+#~ "license</a>.\n"
+
+#~ msgid_plural ""
+#~ "\n"
+#~ "%(c)s books from <a href='http://domenapubliczna.org'>public domain</a> "
+#~ "or under\n"
+#~ "a <a href='http://creativecommons.org/licenses/by-sa/3.0/deed.pl'>free "
+#~ "license</a>.\n"
+#~ msgstr[0] ""
+#~ "\n"
+#~ "%(c)s lektura z <a href='http://domenapubliczna.org'>domeny publicznej</"
+#~ "a>\n"
+#~ "lub na <a href='http://creativecommons.org/licenses/by-sa/3.0/deed."
+#~ "pl'>wolnej licencji</a>.\n"
+#~ msgstr[1] ""
+#~ "\n"
+#~ "%(c)s lektury z <a href='http://domenapubliczna.org'>domeny publicznej</"
+#~ "a>\n"
+#~ "i na <a href='http://creativecommons.org/licenses/by-sa/3.0/deed."
+#~ "pl'>wolnej licencji</a>.\n"
+#~ msgstr[2] ""
+#~ "\n"
+#~ "%(c)s lektur z <a href='http://domenapubliczna.org'>domeny publicznej</"
+#~ "a>\n"
+#~ "i na <a href='http://creativecommons.org/licenses/by-sa/3.0/deed."
+#~ "pl'>wolnej licencji</a>.\n"
+
+#~ msgid "Browse books by categories"
+#~ msgstr "Przeglądaj lektury według wybranych kategorii"
+
+#~ msgid "Books for every school level"
+#~ msgstr "Lektury na każdy poziom edukacji"
+
+#~ msgid "primary school"
+#~ msgstr "szkoła podstawowa"
+
+#~ msgid "gymnasium"
+#~ msgstr "gimnazjum"
+
+#~ msgid "high school"
+#~ msgstr "szkoła średnia"
+
+#~ msgid "delete"
+#~ msgstr "usuń"
+
+#~ msgid ""
+#~ "Create your own book set. You can share it with friends by sending them "
+#~ "link to your shelf."
+#~ msgstr ""
+#~ "Stwórz własny zestaw lektur. Możesz się nim później podzielić z innymi, "
+#~ "przesyłając im link do Twojej półki."
+
+#~ msgid "You need to "
+#~ msgstr "Aby zarządzać swoimi półkami, musisz się"
+
+#~ msgid "sign in"
+#~ msgstr "zalogować"
+
+#~ msgid "to manage your shelves."
+#~ msgstr "."
+
+#~ msgid ""
+#~ "Place our widget - search engine for Wolne Lektury which gives access to "
+#~ "free books and audiobooks - on your homepage! Just copy the HTML code "
+#~ "below onto your page:"
+#~ msgstr ""
+#~ "Umieść widżet – wyszukiwarkę Wolnych Lektur umożliwiającą dostęp do "
+#~ "darmowych lektur i audiobooków – na swojej stronie WWW! Po prostu skopiuj "
+#~ "poniższy kod HTML na swoją stronę:"
+
+#~ msgid "Insert this element in place where you want display the widget"
+#~ msgstr "Umieść ten element w miejscu gdzie chcesz wyświetlić widżet"
+
+#~ msgid "Place this element just before closing body tag: &lt;/body&gt;"
+#~ msgstr "Umieść ten element tuż przed zamknięciem taga body: &lt;/body&gt;"
+
+#~ msgid ""
+#~ "Lessons' prospects and other ideas for using Wolnelektury.pl for teaching."
+#~ msgstr ""
+#~ "Scenariusze lekcji i inne pomysły na wykorzytanie serwisu WolneLektury.pl "
+#~ "podczas nauczania."
+
+#~ msgid "Themes groups"
+#~ msgstr "Rodziny motywów"
+
+#~ msgid "News"
+#~ msgstr "Aktualności"
+
+#~ msgid "See our blog"
+#~ msgstr "Zobacz nasz blog"
+
+#~ msgid "You can help us!"
+#~ msgstr "Możesz nam pomóc!"
+
+#~ msgid "Become a volunteer &ndash; an editor, developer or translator."
+#~ msgstr ""
+#~ "Zostań naszym redaktorem, programistą lub tłumaczem – wolontariuszem."
+
+#~ msgid "Gain new skills and experience."
+#~ msgstr "Zdobądź nowe umiejętności i doświadczenie."
+
+#~ msgid "Join an open project of creating an innovative online library."
+#~ msgstr ""
+#~ "Weź udział w otwartym projekcie i twórz innowacyjną bibliotekę "
+#~ "internetową."
+
+#~ msgid "About us"
+#~ msgstr "O projekcie"
+
+#~ msgid ""
+#~ "\n"
+#~ "\t\t\tInternet library with school readings “Wolne Lektury” (<a href="
+#~ "\"http://wolnelektury.pl\">www.wolnelektury.pl</a>) is a project made by "
+#~ "Modern Poland Foundation. It started in 2007 and shares school readings, "
+#~ "which are recommended by Ministry of National Education and are in public "
+#~ "domain.\n"
+#~ "\t\t\t"
+#~ msgstr ""
+#~ "\n"
+#~ "Biblioteka internetowa z lekturami szkolnymi „Wolne Lektury” (<a href="
+#~ "\"http://wolnelektury.pl\">www.wolnelektury.pl</a>) to projekt "
+#~ "realizowany przez fundację Nowoczesna Polska. Działa od 2007 roku i "
+#~ "udostępnia w swoich zbiorach lektury szkolne, które są zalecane do użytku "
+#~ "przez Ministerstwo Edukacji Narodowej i które trafiły już do domeny "
+#~ "publicznej."
+
+#~ msgid ""
+#~ "\n"
+#~ "Portions of this page are modifications based on work created and <a href="
+#~ "\"http://code.google.com/policies.html\">shared by Google</a> and used\n"
+#~ "according to terms described in the <a href=\"http://creativecommons.org/"
+#~ "licenses/by/3.0/\">Creative Commons\n"
+#~ "3.0 Attribution License</a>.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Strona zawiera zmodyfikowane logo Androida, stworzone i <a href=\"http://"
+#~ "code.google.com/policies.html\">udostępnione przez Google</a>\n"
+#~ "na warunkach licencji <a href=\"http://creativecommons.org/licenses/"
+#~ "by/3.0/\">Creative Commons 3.0 Uznanie Autorstwa</a>.\n"
+
+#~ msgid "return to the main page"
+#~ msgstr "wróć do strony głównej"
+
+#~ msgid "Searching in"
+#~ msgstr "Wyszukiwanie w"
+
+#~ msgid "More than one result matching the criteria found."
+#~ msgstr "Znaleziono więcej niż jeden wynik wyszukiwania."
+
+#~ msgid "Search in WolneLektury.pl"
+#~ msgstr "Wyszukiwanie w WolneLektury.pl"
+
+#~ msgid "Your shelf is empty"
+#~ msgstr "Twoja półka jest pusta"
+
+#~ msgid ""
+#~ "You can put a book on a shelf by entering page of the reading and "
+#~ "clicking 'Put on the shelf'."
+#~ msgstr ""
+#~ "Możesz wrzucić książkę na półkę, wchodząc na stronę danej lektury i "
+#~ "klikając na przycisk „Na półkę!”."
+
+#~ msgid "Choose books' formats which you want to download:"
+#~ msgstr "Wybierz formaty książek, które chcesz pobrać:"
+
+#~ msgid "for listening"
+#~ msgstr "do słuchania"
+
+#~ msgid "on favourite MP3 player"
+#~ msgstr "w ulubionym odtwarzaczu MP3"
+
+#~ msgid "open format"
+#~ msgstr "otwarty format"
+
+#~ msgid "Xiph.org Foundation"
+#~ msgstr "fundacji Xiph.Org"
+
+#~ msgid "Updating list of books' formats on the shelf"
+#~ msgstr "Uaktualnianie listy formatów książek na półce."
+
+#~ msgid "cancel"
+#~ msgstr "anuluj"
+
+#~ msgid "Share this shelf"
+#~ msgstr "Podziel się tą półką"
+
+#~ msgid ""
+#~ "Copy this link and share it with other people to let them see your shelf."
+#~ msgstr ""
+#~ "Skopiuj ten link i przekaż go osobom, z którymi chcesz się podzielić tą "
+#~ "półką."
+
+#~ msgid "Read study of epoch %(last_tag)s on Lektury.Gazeta.pl"
+#~ msgstr ""
+#~ "Przeczytaj omówienia z epoki %(last_tag)s w serwisie Lektury.Gazeta.pl"
+
+#~ msgid "Read study of kind %(last_tag)s on Lektury.Gazeta.pl"
+#~ msgstr ""
+#~ "Przeczytaj omówienia z rodzaju %(last_tag)s w serwisie Lektury.Gazeta.pl"
+
+#~ msgid "Read study of genre %(last_tag)s on Lektury.Gazeta.pl"
+#~ msgstr ""
+#~ "Przeczytaj omówienia z gatunku %(last_tag)s w serwisie Lektury.Gazeta.pl"
+
+#~ msgid "Read related study on Lektury.Gazeta.pl"
+#~ msgstr "Przeczytaj powiązane omówienia w serwisie Lektury.Gazeta.pl"
+
+#~ msgid "Read article about epoch %(last_tag)s on Wikipedia"
+#~ msgstr "Przeczytaj artykuł o epoce %(last_tag)s w Wikipedii"
+
+#~ msgid "Read article about kind %(last_tag)s on Wikipedia"
+#~ msgstr "Przeczytaj artykuł o rodzaju %(last_tag)s w Wikipedii"
+
+#~ msgid "Read article about genre %(last_tag)s on Wikipedia"
+#~ msgstr "Przeczytaj artykuł o gatunku %(last_tag)s w Wikipedii"
+
+#~ msgid "Read related article on Wikipedia"
+#~ msgstr "Przeczytaj powiązany artykuł w Wikipedii"
+
+#~ msgid "Delete"
+#~ msgstr "Usuń"
+
+#~ msgid "Hand-outs for teachers on "
+#~ msgstr "Materiały pomocnicze dla nauczycieli w "
+
 #~ msgid ""
 #~ "We try our best to elaborate works appended to our library. It is "
 #~ "possible only due to support of our volunteers."

diff --git a/wolnelektury/static/css/base.css b/wolnelektury/static/css/base.css
index 7b1c9ef..b6395e5 100755 (executable)
--- a/wolnelektury/static/css/base.css
+++ b/wolnelektury/static/css/base.css
@@ -34,6 +34,9 @@ h1 {
     font-weight: normal;
     margin-top: .4em
 }
+h1 a {
+       color: inherit;
+}
 
 ul.plain {
     list-style:none;
@@ -137,7 +140,7 @@ h2 {
     position: absolute;
     display: none;
     border: 1px solid #ddd;
-    padding: 1em;
+    padding: 1em 1em .5em 1em;
     background: #fff;
     -moz-box-shadow: 2px 2px 2px #ddd;
     -webkit-box-shadow: 2px 2px 2px #ddd;
@@ -152,6 +155,9 @@ h2 {
     -moz-column-width: 12em;
     width: 48em;
 }
+.hidden-box li {
+       margin-bottom: .5em;
+}
 
 
 .see-also {
@@ -178,6 +184,12 @@ h2 {
     font-size: 1.1em;
 }
 
+.pagination {
+       display: block;
+       font-size: 1.2em;
+       padding: .5em;
+       text-align:center;
+}
 
 #footer {
     color: #767676;

diff --git a/wolnelektury/static/css/book_box.css b/wolnelektury/static/css/book_box.css
index b9ef8f2..0ba168c 100755 (executable)
--- a/wolnelektury/static/css/book_box.css
+++ b/wolnelektury/static/css/book_box.css
@@ -124,7 +124,7 @@
 
 .book-box-body {
     height: 17em;
-    overflow: hidden;
+    overflow:hidden;
     position: relative;
 }
 
@@ -134,7 +134,7 @@
 
 .book-box-head {
     min-height: 7em;
-    margin-top: 1.4em;
+    padding-top: 1.4em;
     margin-bottom: 1em;
 }
 .book-box-head a {
@@ -146,6 +146,8 @@
 }
 .book-box-head .title {
     font-size: 2.4em;
+    height: 2.4em;
+    overflow:hidden;
     margin-top: .3em;
 }
 .book-box-body .tags {
@@ -161,7 +163,7 @@
 
 .book-box-download a {
     position: relative;
-    z-index: 1;
+    z-index: 101;
 }
 
 .book-box-formats {
@@ -176,7 +178,7 @@
     -webkit-box-shadow: 2px 2px 2px #ddd;
     box-shadow: 2px 2px 2px #ddd;
 
-    z-index: 0;
+    z-index: 100;
     top: -1.454em;
     left: -1.727em;
 }
@@ -194,15 +196,18 @@
 }
 
 .book-box-tools {
+       width: 46em;
     font-size: 1.1em;
 }
 
 .book-wide-box .book-box-tools {
     margin-left: 14em;
+    width: 32em;
 }
 
 .book-wide-box #theme-list-wrapper {
     margin-left: 15.4em;
+       width: 30em;
 }
 
 
@@ -270,15 +275,22 @@ ul.inline-items li {
 .book-wide-box .other-tools {
     float: left;
     width: 14.5em;
-    margin: 6em 0 0 1.5em;
+    margin: 5em 0 0 1.5em;
     
 }
 
 .book-wide-box .other-download {
     float: left;
     width: 22em;
-    margin: 6em 1.5em 0em 1.5em;
+    margin: 5em 1.5em 0em 1.5em;
 }
+.book-wide-box .other-tools h2,
+.book-wide-box .other-download h2,
+.book-wide-box .other-tools ul,
+.book-wide-box .other-download ul {
+       font-size: 1.1em;
+}
+
 
 
 .star {

diff --git a/wolnelektury/static/css/catalogue.css b/wolnelektury/static/css/catalogue.css
index b08d99b..1f19669 100755 (executable)
--- a/wolnelektury/static/css/catalogue.css
+++ b/wolnelektury/static/css/catalogue.css
@@ -71,4 +71,53 @@
 }
 .catalogue-catalogue ul {
     -moz-column-width: 30em;
-}
\ No newline at end of file
+}
+
+
+#description {
+       margin-bottom: 2em;
+}
+#description dl {
+       margin-top: 0;
+}
+#description dt {
+       display: inline;
+       font-weight: bold;
+       margin: 0;
+}
+#description dd {
+       display: inline;
+       margin: 0;
+}
+#description .meta {
+       list-style: none;
+       padding: 0;
+       margin: 0;
+}
+#description .meta li {
+       text-align:right;
+       color: #666;
+       font-size: .9em;
+}
+
+.inline-header {
+       display: inline-block;
+       vertical-align: top;
+       width: 7em;
+}
+.inline-body {
+       width: 35em;
+       display: inline-block;
+       vertical-align: top;
+       margin-bottom: .5em;
+}
+.inline-body ul {
+       a-moz-column-width: 11em;
+       list-style: none;
+       padding: 0;
+       margin: 0;
+}
+.inline-body li {
+       display: inline;
+       margin-right: 1em;
+}

diff --git a/wolnelektury/static/css/cite.css b/wolnelektury/static/css/cite.css
index 4335f2e..2067f47 100755 (executable)
--- a/wolnelektury/static/css/cite.css
+++ b/wolnelektury/static/css/cite.css
@@ -1,4 +1,4 @@
-a.cite {
+.cite {
     display: block;
     color: black;
     background: white;
@@ -32,7 +32,7 @@ a.cite {
 
 
 #big-cite {
-    background-color: #5f3e1c; /* average image color */
+    background-color: #45321f; /* average image color */
     color: white;
     padding: 0;
     margin: 0;
@@ -95,7 +95,7 @@ a.cite {
     margin: 1.6em 0.2em 1.6em 17.5em;
 }
 #big-cite .source span {
-    font-size: 1.1em;
+    font-size: 1.2em;
 }
 
 
@@ -121,3 +121,17 @@ a.cite {
     margin: 0;
     padding: 1em;
 }
+
+
+.Fragment-item .fragment {
+       color: black;
+       display: block;
+}
+.Fragment-item .toggle {
+       font-size: 1.1em;
+       display:block;
+       padding: .5em 0;
+}
+.Fragment-item {
+       margin-bottom: 2em;
+}

diff --git a/wolnelektury/static/css/dialogs.css b/wolnelektury/static/css/dialogs.css
index c3b968b..08255d3 100755 (executable)
--- a/wolnelektury/static/css/dialogs.css
+++ b/wolnelektury/static/css/dialogs.css
@@ -73,12 +73,23 @@
     width: 100%;
 }
 
+.hidelabels label {
+       width: 1px;
+       height: 1px;
+       overflow:hidden;
+}
+
+
+
 #login-window {
     width: 26em;
 }
 #register-window {
     width: 26em;
 }
+#context-login-window {
+       width: 26em;
+}
 
 #suggest-window {
     width: 26em;

diff --git a/wolnelektury/static/css/header.css b/wolnelektury/static/css/header.css
index 018b9a3..3fe0edd 100755 (executable)
--- a/wolnelektury/static/css/header.css
+++ b/wolnelektury/static/css/header.css
@@ -53,7 +53,12 @@
     margin-left: 25.5em;
 }
 #tagline span {
-    font-size: 1.1em;
+    font-size: 1.3em;
+    color: #ccc;
+}
+#tagline a,
+#user-info a {
+       color: #17cfdb;
 }
 
 #search-area {
@@ -142,6 +147,7 @@ ul#menu {
     padding: 0;
     margin: 0 0 0 .6em;
 }
+
 li.menu {
     background-color: #e2e2e2;
     float: left;

diff --git a/wolnelektury/static/css/main_page.css b/wolnelektury/static/css/main_page.css
index b32655b..e4daf54 100755 (executable)
--- a/wolnelektury/static/css/main_page.css
+++ b/wolnelektury/static/css/main_page.css
@@ -14,8 +14,7 @@
     color: white;
 }
 #promo-box-header h2 {
-    font-size: 1.1em;
-    padding-top: .1em;
+    font-size: 1.3em;
 }
 #promo-box-body {
     border-bottom: 2px solid #efefef;

diff --git a/wolnelektury/static/css/social/shelf_tags.css b/wolnelektury/static/css/social/shelf_tags.css
index b963b1c..812a1c9 100755 (executable)
--- a/wolnelektury/static/css/social/shelf_tags.css
+++ b/wolnelektury/static/css/social/shelf_tags.css
@@ -2,11 +2,21 @@
     list-style: none;
     padding: 0;
     margin: 1em 0;
+    width: 30em;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    position:absolute;
+    margin-left: 15.4em;
+    top: 13.5em;
+    padding: .5em 0;
+    background: #fff;
 }
 
 .social-shelf-tags li {
     display: inline-block;
     margin-right:1em;
+    margin-bottom: .5em;
 }
 
 .social-shelf-tags a {
@@ -16,3 +26,11 @@
     color: #0b838d;
     border-radius: 1em;
 }
+
+
+.social-shelf-tags:hover {
+    overflow: visible;
+    text-overflow: ellipsis;
+    white-space: normal;
+    z-index: 1000;
+}

diff --git a/wolnelektury/static/img/backdrop/boltron-3212284622.jpg b/wolnelektury/static/img/backdrop/boltron-3212284622.jpg
index 3fa342d..7fe148c 100644 (file)
Binary files a/wolnelektury/static/img/backdrop/boltron-3212284622.jpg and b/wolnelektury/static/img/backdrop/boltron-3212284622.jpg differ

diff --git a/wolnelektury/static/js/base.js b/wolnelektury/static/js/base.js
index 7af0370..8225a1f 100755 (executable)
--- a/wolnelektury/static/js/base.js
+++ b/wolnelektury/static/js/base.js
@@ -35,27 +35,23 @@
             $(this).addClass('short');
 
             if (button && short_text) button.html(short_text);
-            if (button) button.hover(
-                function() { $(this).css({background: '#F3F3F3', cursor: 'pointer'}); },
-                function() { $(this).css({background: '#EEE'}); }
-            ).click(toggle_fun(cont, short_el, long_el, button, short_text, long_text));
-            short_el.hover(
-                function() { $(this).css({background: '#F3F3F3', cursor: 'pointer'}); },
-                function() { $(this).css({background: '#FFF'}); }
-            ).click(toggle_fun(cont, short_el, long_el, button, short_text, long_text));
-            long_el.hover(
-                function() { $(this).css({background: '#F3F3F3', cursor: 'pointer'}); },
-                function() { $(this).css({background: '#FFF'}); }
-            ).click(toggle_fun(cont, short_el, long_el, button, short_text, long_text));
+            if (button) button.click(toggle_fun(cont, short_el, long_el, button, short_text, long_text));
         };
 
 
         // Fragments
-        $('.fragment-short-text').each(function() {
-            var fragment = $(this).closest('.fragment');
-            fragment.toggle_slide({
-                short_el: $(this),
-                long_el: fragment.find('.fragment-text')
+        $('.fragment-with-short').each(function() {
+            $(this).toggle_slide({
+                short_el: $('.fragment-short-text', this),
+                long_el: $('.fragment-long-text', this),
+                button: $('.toggle', this)
+            })
+        });
+        $('#description').each(function() {
+            $(this).toggle_slide({
+                short_el: $('#description-short', this),
+                long_el: $('#description-long', this),
+                button: $(this)
             })
         });
 

diff --git a/wolnelektury/templates/auth/login_register.html b/wolnelektury/templates/auth/login_register.html
index e262e2e..ecaeaf4 100755 (executable)
--- a/wolnelektury/templates/auth/login_register.html
+++ b/wolnelektury/templates/auth/login_register.html
@@ -6,7 +6,8 @@
 
 <h1>{% trans "or register" %}:</h1>
 
-<form action="{% url register %}" method="post" accept-charset="utf-8" class="cuteform">
+<form action="{% url register %}" method="post" accept-charset="utf-8"
+       class="cuteform hidelabels">
 <ol>
     <div id="id_register-__all__"></div>
     {{ register_form.as_ul }}

diff --git a/wolnelektury/templates/base.html b/wolnelektury/templates/base.html
index 2477726..c9cfe15 100644 (file)
--- a/wolnelektury/templates/base.html
+++ b/wolnelektury/templates/base.html
@@ -1,11 +1,9 @@
-<!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">
+<!DOCTYPE html>
+<html>
        {% load cache compressed i18n %}
     {% load catalogue_tags reporting_stats sponsor_tags %}
     <head>
         <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-        <meta http-equiv="Content-Style-Type" content="text/css" />
         <meta name="description" 
             content="{% block metadescription %}Darmowe opracowane, pełne teksty lektur, e-booki, audiobooki i pliki DAISY na wolnej licencji.{% endblock %}" />
         <title>{% block title %}{% trans "Wolne Lektury" %} :: 
@@ -76,12 +74,12 @@
 
             <form id="search-area" action="/fullsearch/">
                 
-                <span id="search-field" class="grid-line">
+                <div id="search-field" class="grid-line">
                  {{search_form.q}}
 <!--                    <input title="np. Leśmian" name="q" autocomplete="off" data-source="/fullsearch/hint/">-->
-                </span><span id="search-button">
+                </div><div id="search-button">
                     <button type='submit'><span class="mono">{% trans "Search" %}</span></button>
-                </span>
+                </div>
                 
                 <div class="clearboth"></div>
             </form>

diff --git a/wolnelektury/templates/catalogue/book_short.html b/wolnelektury/templates/catalogue/book_short.html
index 6173d7c..304cdc6 100644 (file)
--- a/wolnelektury/templates/catalogue/book_short.html
+++ b/wolnelektury/templates/catalogue/book_short.html
@@ -44,6 +44,7 @@
             </div>
             <div class="title"><a href="{{ main_link }}">{{ book.title }}</a></div>
         </div>
+
         <div class="tags">
             <span class="mono"> {% trans "Epoch" %}:</span>&nbsp;<span class="book-box-tag">
                {% for name, slug in related.tags.epoch %}
@@ -66,9 +67,9 @@
                 {% endfor %}
             </span>
 
-            {% shelf_tags book %}
         </div>
     </div>
+    {% shelf_tags book %}
 
     <ul class="book-box-tools">
         <li class="book-box-read">

diff --git a/wolnelektury/templates/catalogue/book_wide.html b/wolnelektury/templates/catalogue/book_wide.html
index 1507f36..c778caa 100644 (file)
--- a/wolnelektury/templates/catalogue/book_wide.html
+++ b/wolnelektury/templates/catalogue/book_wide.html
@@ -11,7 +11,7 @@
 {% if themes %}
     <div class="hidden-box-wrapper" id="theme-list-wrapper">
         <p><a class="mono hidden-box-trigger theme-list-link"
-                href="#">{% trans "motifs and themes" %}</a></p>
+                href="#">{% trans "Motifs and themes" %}</a></p>
         <div class="hidden-box">
             <ul>
             {% for theme in themes %}

diff --git a/wolnelektury/templates/catalogue/fragment_short.html b/wolnelektury/templates/catalogue/fragment_short.html
index 4526857..9fbe0cb 100644 (file)
--- a/wolnelektury/templates/catalogue/fragment_short.html
+++ b/wolnelektury/templates/catalogue/fragment_short.html
@@ -1,4 +1,34 @@
 {% load i18n %}
+
+<div class="cite {% if fragment.short_text %}fragment-with-short{% endif %}">
+       {% if fragment.short_text %}
+       <div class="fragment-short-text">
+       <blockquote class="cite-body">
+                       <a href="{{ fragment.get_absolute_url }}" class="fragment">
+                       {{ fragment.short_text|safe }}
+                       </a>
+           </blockquote>
+               <a href="#" class="toggle mono">↓ {% trans "Expand fragment" %} ↓</a>
+    </div>
+    {% endif %}
+       <div class="fragment-long-text" {% if fragment.short_text %}style="display:none;"{% endif %}>
+    <blockquote class="cite-body fragment-text">
+               <a href="{{ fragment.get_absolute_url }}" class="fragment">
+        {{ fragment.text|safe }}
+               </a>
+    </blockquote>
+               {% if fragment.short_text %}
+               <a href="#" class="toggle mono">↑ {% trans "Hide fragment" %} ↑</a>
+               {% endif %}
+    </div>
+<p class="mono source">{{ fragment.book.pretty_title }}</p>
+</div>
+
+
+
+
+
+{% comment %}
 {% load catalogue_tags %}
 <div class="fragment">
     {% if fragment.short_text %}
@@ -19,3 +49,4 @@
     </div>
     <div class="clearboth"></div>
 </div>
+{% endcomment %}

diff --git a/wolnelektury/templates/catalogue/inline_tag_list.html b/wolnelektury/templates/catalogue/inline_tag_list.html
index d42f3f9..52e92c4 100755 (executable)
--- a/wolnelektury/templates/catalogue/inline_tag_list.html
+++ b/wolnelektury/templates/catalogue/inline_tag_list.html
@@ -3,7 +3,9 @@
 {% if one_tag %}
     {% trans "See full category" %} <a href="{% catalogue_url one_tag %}">{{ one_tag }}</a>
 {% else %}
+       <ul>
     {% for tag in tags %}
-        <a href="{% catalogue_url choices tag %}">{{ tag }}&nbsp;({{ tag.book_count }})</a>
+        <li><a href="{% catalogue_url choices tag %}">{{ tag }}&nbsp;({{ tag.book_count }})</a></li>
     {% endfor %}
+    </ul>
 {% endif %}

diff --git a/wolnelektury/templates/catalogue/tagged_object_list.html b/wolnelektury/templates/catalogue/tagged_object_list.html
index 1a6843a..c7898d5 100644 (file)
--- a/wolnelektury/templates/catalogue/tagged_object_list.html
+++ b/wolnelektury/templates/catalogue/tagged_object_list.html
@@ -9,45 +9,55 @@
 {% block body %}
     <div class="left-column">
     <div class="page-desc">
-    <h1>{% title_from_tags tags %}</h1>
+    <h1>{% html_title_from_tags tags %}</h1>
 
     {% with tags|last as last_tag %}
     {% if last_tag.has_description %}
-        <div id="description">
-            <div id='description-long'>{{ last_tag.description|safe }}</div>
-            <div id='description-short'>{{ last_tag.description|safe|truncatewords_html:30 }}</div>
+        <div id="description" class="normal-text">
+            <div id='description-long' style="diplay:none">{{ last_tag.description|safe }}</div>
+            <div id='description-short'>{{ last_tag.description|safe|truncatewords_html:40 }}</div>
         </div>
-        <div class="clearboth"></div>
-        <div id="toggle-description"><p></p></div>
     {% endif %}
 
 
     <div class="inline-tag-lists">
     {% if categories.author %}
-        <p><span class="mono">{% trans "Authors" %}:</span>
-        {% inline_tag_list categories.author tags %}
-        </p>
+       <div>
+               <div class="mono inline-header">{% trans "Authors" %}:</div>
+           <div class="inline-body">
+                           {% inline_tag_list categories.author tags %}
+               </div>
+        </div>
     {% endif %}
     {% if categories.kind %}
-        <p><span class="mono">{% trans "Kinds" %}:</span>
-        {% inline_tag_list categories.kind tags %}
-        </p>
+       <div>
+               <div class="mono inline-header">{% trans "Kinds" %}:</div>
+           <div class="inline-body">
+                           {% inline_tag_list categories.kind tags %}
+               </div>
+        </div>
     {% endif %}
     {% if categories.genre %}
-        <p><span class="mono">{% trans "Genres" %}:</span>
-        {% inline_tag_list categories.genre tags %}
-        </p>
+       <div>
+               <div class="mono inline-header">{% trans "Genres" %}:</div>
+           <div class="inline-body">
+                           {% inline_tag_list categories.genre tags %}
+               </div>
+        </div>
     {% endif %}
     {% if categories.epoch %}
-        <p><span class="mono">{% trans "Epochs" %}:</span>
-        {% inline_tag_list categories.epoch tags %}
-        </p>
+       <div class="inline-tag-list">
+               <div class="mono inline-header">{% trans "Epochs" %}:</div>
+           <div class="inline-body">
+                           {% inline_tag_list categories.epoch tags %}
+               </div>
+        </div>
     {% endif %}
     </div>
 
     {% if categories.theme %}
         <div class="hidden-box-wrapper">
-            <p><a href="#" class="hidden-box-trigger theme-list-link" class="mono">
+            <p><a href="#" class="hidden-box-trigger theme-list-link mono">
                {% trans "Motifs and themes" %}</a></p>
             <div class="hidden-box">
                 {% tag_list categories.theme tags %}
@@ -60,6 +70,9 @@
 
 
     <div class="right-column">
+        {% if theme_is_set %}
+            {% work_list object_list %}
+        {% else %}
         {% cite_promo tags 1 %}
 
         <div class="see-also">
@@ -68,34 +81,12 @@
             <ul>
         {% if last_tag.gazeta_link %}
         <li><a href="{{ last_tag.gazeta_link }}">
-            {% switch last_tag.category %}
-                {% case "author" %}
-                    {% trans "Read work's study of this author on Lektury.Gazeta.pl" %}
-                {% case "epoch" %}
-                    {% blocktrans %}Read study of epoch {{ last_tag }} on Lektury.Gazeta.pl{% endblocktrans %}
-                {% case "kind" %}
-                    {% blocktrans %}Read study of kind {{ last_tag }} on Lektury.Gazeta.pl{% endblocktrans %}
-                {% case "genre" %}
-                    {% blocktrans %}Read study of genre {{ last_tag }} on Lektury.Gazeta.pl{% endblocktrans %}
-                {% else %}
-                    {% trans "Read related study on Lektury.Gazeta.pl" %}
-            {% endswitch %}
+               {% trans "in Lektury.Gazeta.pl" %}
         </a></li>
         {% endif %}
         {% if last_tag.wiki_link %}
         <li><a href="{{ last_tag.wiki_link }}">
-               {% switch last_tag.category %}
-                           {% case "author" %}
-                                   {% trans "Read article about this author on Wikipedia" %}
-                               {% case "epoch" %}
-                    {% blocktrans %}Read article about epoch {{ last_tag }} on Wikipedia{% endblocktrans %}
-                               {% case "kind" %}
-                    {% blocktrans %}Read article about kind {{ last_tag }} on Wikipedia{% endblocktrans %}
-                               {% case "genre" %}
-                    {% blocktrans %}Read article about genre {{ last_tag }} on Wikipedia{% endblocktrans %}
-                               {% else %}
-                                   {% trans "Read related article on Wikipedia" %}
-                       {% endswitch %}
+                       {% trans "in Wikipedia" %}
         </a></li>
         {% endif %}
 
@@ -114,6 +105,7 @@
             </ul>
             {% endcomment %}
         </div>
+        {% endif %}
 
     </div>
 
@@ -121,7 +113,7 @@
 
 
 
-
+    {% if not theme_is_set %}
     <div id="books-list">
         {% if object_list %}
             {% work_list object_list %}
@@ -129,6 +121,7 @@
             {% trans "Sorry! Search cirteria did not match any resources." %}
             {% include "info/join_us.html" %}
         {% endif %}
-        {% endwith %}
     </div>
+    {% endif %}
+    {% endwith %}
 {% endblock %}

diff --git a/wolnelektury/templates/main_page.html b/wolnelektury/templates/main_page.html
index c126746..f591863 100755 (executable)
--- a/wolnelektury/templates/main_page.html
+++ b/wolnelektury/templates/main_page.html
@@ -42,8 +42,7 @@
             <li><a href="{% url suggest %}" id="suggest" class="ajaxable">{% trans "Report a bug or suggestion" %}</a></li>
             <li><a href="http://turniej.wolnelektury.pl">Turniej Elektrybałtów</a></li>
             <li><a href="{% url lesmianator %}">Leśmianator</a></li>
-            <li><a href="{% url infopage "mobilna" %}">{% trans "Mobile app" %}</a></li>
-            <li><a href="{% url infopage "widget" %}">{% trans "Widget" %}</a></li>
+            <!--li><a href="{% url infopage "widget" %}">{% trans "Widget" %}</a></li-->
             <li><a href="{% url suggest_publishing %}" id="suggest-publishing" class="ajaxable">{% trans "Missing a book?" %}</a></li>
             <li><a href="{% url publish_plan %}">{% trans "Publishing plan" %}</a></li>
         </ul>

diff --git a/wolnelektury/views.py b/wolnelektury/views.py
index 8732079..555b732 100755 (executable)
--- a/wolnelektury/views.py
+++ b/wolnelektury/views.py
@@ -14,6 +14,7 @@ from django.views.decorators.cache import never_cache
 from django.conf import settings
 from ajaxable.utils import AjaxableFormView
 from catalogue.models import Book
+from ajaxable.utils import placeholdized
 
 
 def main_page(request):
@@ -25,6 +26,7 @@ def main_page(request):
 
 class LoginFormView(AjaxableFormView):
     form_class = AuthenticationForm
+    placeholdize = True
     title = _('Sign in')
     submit = _('Sign in')
     ajax_redirect = True
@@ -40,6 +42,7 @@ class LoginFormView(AjaxableFormView):
 
 class RegisterFormView(AjaxableFormView):
     form_class = UserCreationForm
+    placeholdize = True
     title = _('Register')
     submit = _('Register')
     ajax_redirect = True
@@ -51,7 +54,7 @@ class RegisterFormView(AjaxableFormView):
         return super(RegisterFormView, self).__call__(request)
 
     def success(self, form, request):
-        user = form.save()
+        form.save()
         user = auth.authenticate(
             username=form.cleaned_data['username'],
             password=form.cleaned_data['password1']
@@ -61,10 +64,11 @@ class RegisterFormView(AjaxableFormView):
 
 class LoginRegisterFormView(LoginFormView):
     template = 'auth/login_register.html'
+    title = _('You have to be logged in to continue')
 
     def extra_context(self):
         return {
-            "register_form": UserCreationForm(prefix='register'),
+            "register_form": placeholdized(UserCreationForm(prefix='register')),
             "register_submit": _('Register'),
         }