From: Lukasz Anwajler Date: Fri, 27 Aug 2010 09:43:53 +0000 (-0500) Subject: Merge branch 'master' of git@github.com:fnp/wolnelektury X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/0ee9de179914aa395f4b7475b7b9b6229c42b760?hp=8e2e65fd5f86516e7d15df0c1106a0b861bfb011 Merge branch 'master' of git@github.com:fnp/wolnelektury Conflicts: apps/catalogue/locale/pl/LC_MESSAGES/django.po apps/catalogue/locale/uk/LC_MESSAGES/django.mo apps/catalogue/locale/uk/LC_MESSAGES/django.po wolnelektury/locale/pl/LC_MESSAGES/django.mo wolnelektury/locale/pl/LC_MESSAGES/django.po wolnelektury/locale/uk/LC_MESSAGES/django.mo wolnelektury/locale/uk/LC_MESSAGES/django.po --- diff --git a/apps/catalogue/locale/de/LC_MESSAGES/django.mo b/apps/catalogue/locale/de/LC_MESSAGES/django.mo index b8f7959fb..3e56cd153 100644 Binary files a/apps/catalogue/locale/de/LC_MESSAGES/django.mo and b/apps/catalogue/locale/de/LC_MESSAGES/django.mo differ diff --git a/apps/catalogue/locale/de/LC_MESSAGES/django.po b/apps/catalogue/locale/de/LC_MESSAGES/django.po index 31568a904..575defb5f 100644 --- a/apps/catalogue/locale/de/LC_MESSAGES/django.po +++ b/apps/catalogue/locale/de/LC_MESSAGES/django.po @@ -2,18 +2,19 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 11:21+0200\n" -"PO-Revision-Date: 2010-06-23 12:27+0100\n" -"Last-Translator: Iwona Fiałkowska \n" +"POT-Creation-Date: 2010-08-25 10:24+0000\n" +"PO-Revision-Date: 2010-08-25 10:45\n" +"Last-Translator: \n" "Language-Team: 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.6\n" #: fields.py:47 #, python-format @@ -24,240 +25,232 @@ msgstr "Geben Sie eine gültige JSON-Wert. Fehler:% s" msgid "title, author, theme/topic, epoch, kind, genre" msgstr "Titel, Autor, Motiv/Thema, Epoche, Art, Gattung" -#: forms.py:44 +#: forms.py:45 msgid "Shelves" msgstr "Bücherregale" -#: forms.py:57 +#: forms.py:58 msgid "Name of the new shelf" msgstr "Name für ein neues Bücherregal" -#: models.py:24 -#: models.py:363 +#: models.py:25 models.py:585 msgid "author" msgstr "Autor" -#: models.py:25 +#: models.py:26 msgid "epoch" msgstr "Epoche" -#: models.py:26 +#: models.py:27 msgid "kind" msgstr "Art" -#: models.py:27 +#: models.py:28 msgid "genre" msgstr "Gattung" -#: models.py:28 +#: models.py:29 msgid "theme" msgstr "Motiv" -#: models.py:29 +#: models.py:30 msgid "set" msgstr "Bücherregal" -#: models.py:30 -#: models.py:322 +#: models.py:31 models.py:204 msgid "book" msgstr "Buch" -#: models.py:44 -#: migrations/0001_initial.py:47 +#: models.py:45 msgid "name" msgstr "Name" -#: models.py:45 -#: models.py:103 -#: models.py:365 -#: migrations/0001_initial.py:19 -#: migrations/0001_initial.py:48 +#: models.py:46 models.py:170 models.py:587 models.py:612 msgid "slug" msgstr "slug" -#: models.py:46 -#: migrations/0001_initial.py:49 +#: models.py:47 msgid "sort key" msgstr "Sortierschlüssel" -#: models.py:47 -#: migrations/0001_initial.py:50 +#: models.py:48 msgid "category" msgstr "Kategorie" -#: models.py:49 -#: models.py:60 -#: models.py:104 -#: models.py:185 -#: migrations/0001_initial.py:20 -#: migrations/0001_initial.py:51 +#: models.py:50 models.py:87 models.py:171 models.py:306 msgid "description" msgstr "Beschreibung" -#: models.py:50 -#: migrations/0001_initial.py:52 +#: models.py:51 msgid "main page" msgstr "Startseite" -#: models.py:50 -#: migrations/0001_initial.py:52 +#: models.py:51 msgid "Show tag on main page" msgstr "Tag für die Startseite anzeigen" -#: models.py:53 -#: migrations/0001_initial.py:54 +#: models.py:54 msgid "book count" msgstr "Anzahl der Bücher" -#: models.py:54 +#: models.py:55 msgid "year of death" msgstr "Todesjahr" -#: models.py:80 -#: migrations/0001_initial.py:61 +#: models.py:71 msgid "tag" msgstr "tag" -#: models.py:81 +#: models.py:72 msgid "tags" msgstr "tags" -#: models.py:102 -#: models.py:362 -#: migrations/0001_initial.py:18 +#: models.py:169 models.py:584 msgid "title" msgstr "Titel" -#: models.py:105 -#: migrations/0001_initial.py:21 +#: models.py:172 msgid "creation date" msgstr "Erstellungsdatum" -#: models.py:106 -#: migrations/0001_initial.py:22 +#: models.py:173 msgid "short HTML" msgstr "kurze HTML" -#: models.py:107 -#: migrations/0001_initial.py:23 +#: models.py:174 msgid "parent number" msgstr "Nummer der Eltern" -#: models.py:108 +#: models.py:175 msgid "extra information" msgstr "extra Informationen" -#: models.py:114 -#: migrations/0001_initial.py:24 +#: models.py:181 msgid "XML file" msgstr "XML-Datei" -#: models.py:115 -#: migrations/0001_initial.py:25 +#: models.py:182 msgid "HTML file" msgstr "HTML-Datei" -#: models.py:116 -#: migrations/0001_initial.py:26 +#: models.py:183 msgid "PDF file" msgstr "PDF-Datei" -#: models.py:117 -#: migrations/0001_initial.py:27 +#: models.py:184 +msgid "EPUB file" +msgstr "EPUB-Datei" + +#: models.py:185 msgid "ODT file" msgstr "ODT-Datei" -#: models.py:118 -#: migrations/0001_initial.py:28 +#: models.py:186 msgid "TXT file" msgstr "TXT-Datei" -#: models.py:119 +#: models.py:187 msgid "MP3 file" msgstr "MP3-Datei" -#: models.py:120 +#: models.py:188 msgid "OGG file" msgstr "OGG-Datei" -#: models.py:141 +#: models.py:205 +msgid "books" +msgstr "Bücher" + +#: models.py:263 msgid "Read online" msgstr "Online lesen" -#: models.py:221 +#: models.py:403 #, python-format msgid "Book %s already exists" msgstr "Buch %s bereits vorhanden" -#: models.py:264 +#: models.py:444 #, python-format msgid "Book with slug = \"%s\" does not exist." msgstr "Buch mit slug = \"%s\" nicht vorhanden." -#: models.py:323 -msgid "books" -msgstr "Bücher" - -#: models.py:357 +#: models.py:565 msgid "fragment" msgstr "Auszug" -#: models.py:358 +#: models.py:566 msgid "fragments" msgstr "Auszüge" -#: models.py:364 +#: models.py:586 msgid "goes to public domain" msgstr "gehe zur Public Domain" -#: models.py:366 +#: models.py:588 msgid "translator" msgstr "Übersetzer" -#: models.py:367 +#: models.py:589 msgid "year of translator's death" msgstr "Todesjahr des Übersetzers" -#: models.py:385 +#: models.py:593 msgid "book stub" msgstr "Buch Vorschau" -#: models.py:386 +#: models.py:594 msgid "book stubs" msgstr "Bücher Vorschau" -#: views.py:339 +#: models.py:613 +msgid "type" +msgstr "" + +#: models.py:614 +msgid "sha-1 hash" +msgstr "" + +#: models.py:615 +#, fuzzy +msgid "time" +msgstr "" + +#: models.py:619 +msgid "file record" +msgstr "" + +#: models.py:620 +msgid "file records" +msgstr "" + +#: views.py:452 msgid "

To maintain your shelves you need to be logged in.

" msgstr "

Um die Bücherregale zu verwalten, musst du eingeloggt sein.

" -#: views.py:357 +#: views.py:470 msgid "

Shelves were sucessfully saved.

" msgstr "

Bücherregale wurden erfolgreich gespeichert.

" -#: views.py:381 +#: views.py:494 msgid "Book was successfully removed from the shelf" msgstr "Das Buch wurde erfolgreich entfernt" -#: views.py:383 +#: views.py:496 msgid "This book is not on the shelf" msgstr "Das Buch ist nicht im Regal" -#: views.py:479 +#: views.py:599 #, python-format msgid "

Shelf %s was successfully created

" msgstr "

Büchrregal %s wurde erfolgreich erstellt

" -#: views.py:494 +#: views.py:614 #, python-format msgid "

Shelf %s was successfully removed

" msgstr "

Bücherregal%s wurde erfolgreich entfernt

" -#: views.py:553 -#, python-format -msgid "Today is %(month)s, %(day)s." -msgstr "Heute ist %(month)s, %(day)s." - -#: views.py:554 +#: views.py:673 #, python-format msgid "" "An error occurred: %(exception)s\n" @@ -268,20 +261,20 @@ msgstr "" "\n" "%(tb)s" -#: views.py:555 +#: views.py:674 msgid "Book imported successfully" msgstr "Buch wurde erfolgreich importiert" -#: views.py:557 +#: views.py:676 #, python-format msgid "Error importing file: %r" msgstr "Fehler beim Importieren der Datei: %r" -#: migrations/0001_initial.py:62 -msgid "content type" -msgstr "Inhaltstyp" +#~ msgid "Today is %(month)s, %(day)s." +#~ msgstr "Heute ist %(month)s, %(day)s." -#: migrations/0001_initial.py:63 -msgid "object id" -msgstr "Objekt ID" +#~ msgid "content type" +#~ msgstr "Inhaltstyp" +#~ msgid "object id" +#~ msgstr "Objekt ID" diff --git a/apps/catalogue/locale/en/LC_MESSAGES/django.mo b/apps/catalogue/locale/en/LC_MESSAGES/django.mo index 9409a9ddd..45ddee8f4 100644 Binary files a/apps/catalogue/locale/en/LC_MESSAGES/django.mo and b/apps/catalogue/locale/en/LC_MESSAGES/django.mo differ diff --git a/apps/catalogue/locale/en/LC_MESSAGES/django.po b/apps/catalogue/locale/en/LC_MESSAGES/django.po index bb2d51ccf..fe91865df 100644 --- a/apps/catalogue/locale/en/LC_MESSAGES/django.po +++ b/apps/catalogue/locale/en/LC_MESSAGES/django.po @@ -2,18 +2,19 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 11:21+0200\n" -"PO-Revision-Date: 2010-06-09 16:14+0100\n" -"Last-Translator: K Izdebska \n" +"POT-Creation-Date: 2010-08-25 10:24+0000\n" +"PO-Revision-Date: 2010-08-25 10:45\n" +"Last-Translator: \n" "Language-Team: 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.6\n" #: fields.py:47 #, python-format @@ -24,240 +25,231 @@ msgstr "Enter a valid JSON value. Error: %s" msgid "title, author, theme/topic, epoch, kind, genre" msgstr "title, author, motifs/theme, period, form, genre" -#: forms.py:44 +#: forms.py:45 msgid "Shelves" msgstr "Shelves" -#: forms.py:57 +#: forms.py:58 msgid "Name of the new shelf" msgstr "Name of the new shelf" -#: models.py:24 -#: models.py:363 +#: models.py:25 models.py:585 msgid "author" msgstr "author" -#: models.py:25 +#: models.py:26 msgid "epoch" msgstr "period" -#: models.py:26 +#: models.py:27 msgid "kind" msgstr "form" -#: models.py:27 +#: models.py:28 msgid "genre" msgstr "genre" -#: models.py:28 +#: models.py:29 msgid "theme" msgstr "motif" -#: models.py:29 +#: models.py:30 msgid "set" msgstr "set" -#: models.py:30 -#: models.py:322 +#: models.py:31 models.py:204 msgid "book" msgstr "book" -#: models.py:44 -#: migrations/0001_initial.py:47 +#: models.py:45 msgid "name" msgstr "name" -#: models.py:45 -#: models.py:103 -#: models.py:365 -#: migrations/0001_initial.py:19 -#: migrations/0001_initial.py:48 +#: models.py:46 models.py:170 models.py:587 models.py:612 msgid "slug" msgstr "Slug" -#: models.py:46 -#: migrations/0001_initial.py:49 +#: models.py:47 msgid "sort key" msgstr "Sort key" -#: models.py:47 -#: migrations/0001_initial.py:50 +#: models.py:48 msgid "category" msgstr "Category" -#: models.py:49 -#: models.py:60 -#: models.py:104 -#: models.py:185 -#: migrations/0001_initial.py:20 -#: migrations/0001_initial.py:51 +#: models.py:50 models.py:87 models.py:171 models.py:306 msgid "description" msgstr "Description" -#: models.py:50 -#: migrations/0001_initial.py:52 +#: models.py:51 msgid "main page" msgstr "Main page" -#: models.py:50 -#: migrations/0001_initial.py:52 +#: models.py:51 msgid "Show tag on main page" msgstr "Show tag on main page" -#: models.py:53 -#: migrations/0001_initial.py:54 +#: models.py:54 msgid "book count" msgstr "Number of books" -#: models.py:54 +#: models.py:55 msgid "year of death" msgstr "Year of death" -#: models.py:80 -#: migrations/0001_initial.py:61 +#: models.py:71 msgid "tag" msgstr "tag" -#: models.py:81 +#: models.py:72 msgid "tags" msgstr "tags" -#: models.py:102 -#: models.py:362 -#: migrations/0001_initial.py:18 +#: models.py:169 models.py:584 msgid "title" msgstr "Title" -#: models.py:105 -#: migrations/0001_initial.py:21 +#: models.py:172 msgid "creation date" msgstr "Date of publication" -#: models.py:106 -#: migrations/0001_initial.py:22 +#: models.py:173 msgid "short HTML" msgstr "short HTML" -#: models.py:107 -#: migrations/0001_initial.py:23 +#: models.py:174 msgid "parent number" msgstr "Parent number" -#: models.py:108 +#: models.py:175 msgid "extra information" msgstr "Additional information" -#: models.py:114 -#: migrations/0001_initial.py:24 +#: models.py:181 msgid "XML file" msgstr "XML file" -#: models.py:115 -#: migrations/0001_initial.py:25 +#: models.py:182 msgid "HTML file" msgstr "HTML file" -#: models.py:116 -#: migrations/0001_initial.py:26 +#: models.py:183 msgid "PDF file" msgstr "PDF file" -#: models.py:117 -#: migrations/0001_initial.py:27 +#: models.py:184 +msgid "EPUB file" +msgstr "EPUB file" + +#: models.py:185 msgid "ODT file" msgstr "ODT file" -#: models.py:118 -#: migrations/0001_initial.py:28 +#: models.py:186 msgid "TXT file" msgstr "TXT file" -#: models.py:119 +#: models.py:187 msgid "MP3 file" msgstr "MP3 file" -#: models.py:120 +#: models.py:188 msgid "OGG file" msgstr "OGG file" -#: models.py:141 +#: models.py:205 +msgid "books" +msgstr "Books" + +#: models.py:263 msgid "Read online" msgstr "Read online" -#: models.py:221 +#: models.py:403 #, python-format msgid "Book %s already exists" msgstr "Book %s already exists" -#: models.py:264 +#: models.py:444 #, python-format msgid "Book with slug = \"%s\" does not exist." msgstr "Book with slug = \"%s\" does not exist." -#: models.py:323 -msgid "books" -msgstr "Books" - -#: models.py:357 +#: models.py:565 msgid "fragment" msgstr "Fragment" -#: models.py:358 +#: models.py:566 msgid "fragments" msgstr "Fragments" -#: models.py:364 +#: models.py:586 msgid "goes to public domain" msgstr "Goes to public domain" -#: models.py:366 +#: models.py:588 msgid "translator" msgstr "Translator" -#: models.py:367 +#: models.py:589 msgid "year of translator's death" msgstr "Year of translator's death" -#: models.py:385 +#: models.py:593 msgid "book stub" msgstr "Book stub" -#: models.py:386 +#: models.py:594 msgid "book stubs" msgstr "Book stubs" -#: views.py:339 +#: models.py:613 +msgid "type" +msgstr "" + +#: models.py:614 +msgid "sha-1 hash" +msgstr "" + +#: models.py:615 +msgid "time" +msgstr "time" + +#: models.py:619 +msgid "file record" +msgstr "" + +#: models.py:620 +msgid "file records" +msgstr "" + +#: views.py:452 msgid "

To maintain your shelves you need to be logged in.

" msgstr "

To administer your shelves you need to be logged in.

" -#: views.py:357 +#: views.py:470 msgid "

Shelves were sucessfully saved.

" msgstr "

Shelves were sucessfully saved.

" -#: views.py:381 +#: views.py:494 msgid "Book was successfully removed from the shelf" msgstr "Book was successfully removed from the shelf" -#: views.py:383 +#: views.py:496 msgid "This book is not on the shelf" msgstr "This book is not on the shelf" -#: views.py:479 +#: views.py:599 #, python-format msgid "

Shelf %s was successfully created

" msgstr "

Shelf %s was successfully created

" -#: views.py:494 +#: views.py:614 #, python-format msgid "

Shelf %s was successfully removed

" msgstr "

Shelf %s was successfully removed

" -#: views.py:553 -#, python-format -msgid "Today is %(month)s, %(day)s." -msgstr "Today is %(month)s, %(day)s." - -#: views.py:554 +#: views.py:673 #, python-format msgid "" "An error occurred: %(exception)s\n" @@ -268,20 +260,20 @@ msgstr "" "\n" "%(tb)s" -#: views.py:555 +#: views.py:674 msgid "Book imported successfully" msgstr "Book imported succesfully" -#: views.py:557 +#: views.py:676 #, python-format msgid "Error importing file: %r" msgstr "Error occured while importing file: %r" -#: migrations/0001_initial.py:62 -msgid "content type" -msgstr "content type" +#~ msgid "Today is %(month)s, %(day)s." +#~ msgstr "Today is %(month)s, %(day)s." -#: migrations/0001_initial.py:63 -msgid "object id" -msgstr "object id" +#~ msgid "content type" +#~ msgstr "content type" +#~ msgid "object id" +#~ msgstr "object id" diff --git a/apps/catalogue/locale/es/LC_MESSAGES/django.mo b/apps/catalogue/locale/es/LC_MESSAGES/django.mo index d1cda9cf3..8f94d47d7 100644 Binary files a/apps/catalogue/locale/es/LC_MESSAGES/django.mo and b/apps/catalogue/locale/es/LC_MESSAGES/django.mo differ diff --git a/apps/catalogue/locale/es/LC_MESSAGES/django.po b/apps/catalogue/locale/es/LC_MESSAGES/django.po index 9e7cc32a0..c105555b6 100644 --- a/apps/catalogue/locale/es/LC_MESSAGES/django.po +++ b/apps/catalogue/locale/es/LC_MESSAGES/django.po @@ -2,18 +2,19 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 11:21+0200\n" -"PO-Revision-Date: 2010-08-09 11:31+0100\n" -"Last-Translator: Katarzyna Flis \n" +"POT-Creation-Date: 2010-08-25 10:24+0000\n" +"PO-Revision-Date: 2010-08-25 10:48\n" +"Last-Translator: \n" "Language-Team: 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.6\n" #: fields.py:47 #, python-format @@ -24,241 +25,235 @@ msgstr "Introduce un valor válido de JSON. Error: %s" msgid "title, author, theme/topic, epoch, kind, genre" msgstr "título, autor, tema/motivo, época, género, subgénero" -#: forms.py:44 +#: forms.py:45 msgid "Shelves" msgstr "Estantes" -#: forms.py:57 +#: forms.py:58 msgid "Name of the new shelf" msgstr "Nombre del estante nuevo" -#: models.py:24 -#: models.py:363 +#: models.py:25 models.py:585 msgid "author" msgstr "autor" -#: models.py:25 +#: models.py:26 msgid "epoch" msgstr "época" -#: models.py:26 +#: models.py:27 msgid "kind" msgstr "género" -#: models.py:27 +#: models.py:28 msgid "genre" msgstr "subgénero" -#: models.py:28 +#: models.py:29 msgid "theme" msgstr "tema" -#: models.py:29 +#: models.py:30 msgid "set" msgstr "colección" -#: models.py:30 -#: models.py:322 +#: models.py:31 models.py:204 msgid "book" msgstr "libro" -#: models.py:44 -#: migrations/0001_initial.py:47 +#: models.py:45 msgid "name" msgstr "nombre" -#: models.py:45 -#: models.py:103 -#: models.py:365 -#: migrations/0001_initial.py:19 -#: migrations/0001_initial.py:48 +#: models.py:46 models.py:170 models.py:587 models.py:612 msgid "slug" msgstr "slug" -#: models.py:46 -#: migrations/0001_initial.py:49 +#: models.py:47 msgid "sort key" msgstr "clave de clasificación" -#: models.py:47 -#: migrations/0001_initial.py:50 +#: models.py:48 msgid "category" msgstr "categoría" -#: models.py:49 -#: models.py:60 -#: models.py:104 -#: models.py:185 -#: migrations/0001_initial.py:20 -#: migrations/0001_initial.py:51 +#: models.py:50 models.py:87 models.py:171 models.py:306 msgid "description" msgstr "descripción" -#: models.py:50 -#: migrations/0001_initial.py:52 +#: models.py:51 msgid "main page" msgstr "página principal" -#: models.py:50 -#: migrations/0001_initial.py:52 +#: models.py:51 msgid "Show tag on main page" msgstr "Mostrar tag en la página principal" -#: models.py:53 -#: migrations/0001_initial.py:54 +#: models.py:54 msgid "book count" msgstr "número de los libros" -#: models.py:54 +#: models.py:55 msgid "year of death" msgstr "año de muerte" -#: models.py:80 -#: migrations/0001_initial.py:61 +#: models.py:71 msgid "tag" msgstr "tag" -#: models.py:81 +#: models.py:72 msgid "tags" msgstr "tags" -#: models.py:102 -#: models.py:362 -#: migrations/0001_initial.py:18 +#: models.py:169 models.py:584 msgid "title" msgstr "título" -#: models.py:105 -#: migrations/0001_initial.py:21 +#: models.py:172 msgid "creation date" msgstr "fecha de creación" -#: models.py:106 -#: migrations/0001_initial.py:22 +#: models.py:173 msgid "short HTML" msgstr "HTML corto" -#: models.py:107 -#: migrations/0001_initial.py:23 +#: models.py:174 msgid "parent number" msgstr "cifra matriz" -#: models.py:108 +#: models.py:175 msgid "extra information" msgstr "informacion adiccional" -#: models.py:114 -#: migrations/0001_initial.py:24 +#: models.py:181 msgid "XML file" msgstr "archivo XML" -#: models.py:115 -#: migrations/0001_initial.py:25 +#: models.py:182 msgid "HTML file" msgstr "archivo HTML" -#: models.py:116 -#: migrations/0001_initial.py:26 +#: models.py:183 msgid "PDF file" msgstr "archivo PDF" -#: models.py:117 -#: migrations/0001_initial.py:27 +#: models.py:184 +msgid "EPUB file" +msgstr "archivo EPUB" + +#: models.py:185 msgid "ODT file" msgstr "archivo ODT" -#: models.py:118 -#: migrations/0001_initial.py:28 +#: models.py:186 msgid "TXT file" msgstr "archivo TXT" -#: models.py:119 +#: models.py:187 msgid "MP3 file" msgstr "archivo MP3" -#: models.py:120 +#: models.py:188 msgid "OGG file" msgstr "archivo OGG" -#: models.py:141 +#: models.py:205 +msgid "books" +msgstr "libros" + +#: models.py:263 msgid "Read online" msgstr "Leer online" -#: models.py:221 +#: models.py:403 #, python-format msgid "Book %s already exists" msgstr "Libro %s ya existe" -#: models.py:264 +#: models.py:444 #, python-format msgid "Book with slug = \"%s\" does not exist." msgstr "Libro con slug = \"%s\" no existe." -#: models.py:323 -msgid "books" -msgstr "libros" - -#: models.py:357 +#: models.py:565 msgid "fragment" msgstr "fragmento" -#: models.py:358 +#: models.py:566 msgid "fragments" msgstr "fragmentos" -#: models.py:364 +#: models.py:586 msgid "goes to public domain" msgstr "pasa al dominio público" -#: models.py:366 +#: models.py:588 msgid "translator" msgstr "traductor" -#: models.py:367 +#: models.py:589 msgid "year of translator's death" msgstr "año de la muerte del traductor" -#: models.py:385 +#: models.py:593 msgid "book stub" msgstr "vista previa del libro" -#: models.py:386 +#: models.py:594 msgid "book stubs" msgstr "vista previa de libros" -#: views.py:339 +#: models.py:613 +msgid "type" +msgstr "" + +#: models.py:614 +msgid "sha-1 hash" +msgstr "" + +#: models.py:615 +#, fuzzy +msgid "time" +msgstr "" + +#: models.py:619 +msgid "file record" +msgstr "" + +#: models.py:620 +msgid "file records" +msgstr "" + +#: views.py:452 #, fuzzy msgid "

To maintain your shelves you need to be logged in.

" msgstr "

Para organizar tus estantes tienes que ingresar.

" -#: views.py:357 +#: views.py:470 msgid "

Shelves were sucessfully saved.

" msgstr "

Estantes han sido guardados.

" -#: views.py:381 +#: views.py:494 msgid "Book was successfully removed from the shelf" msgstr "El libro ha sido eliminado del estante." -#: views.py:383 +#: views.py:496 msgid "This book is not on the shelf" msgstr "Este libro no está en el estante" -#: views.py:479 +#: views.py:599 #, python-format msgid "

Shelf %s was successfully created

" msgstr "

Estante %s ha sido creado

" -#: views.py:494 +#: views.py:614 #, python-format msgid "

Shelf %s was successfully removed

" msgstr "

Estante %s ha sido eliminado

" -#: views.py:553 -#, python-format -#msgid "Today is %(month)s, %(day)s." -#msgstr "Hoy es el %(día)s de %(mes)es" - -#: views.py:554 +# msgid "Today is %(month)s, %(day)s." +# msgstr "Hoy es el %(día)s de %(mes)es" +#: views.py:673 #, python-format msgid "" "An error occurred: %(exception)s\n" @@ -269,20 +264,17 @@ msgstr "" "\n" "%(tb)s" -#: views.py:555 +#: views.py:674 msgid "Book imported successfully" msgstr "El libro ha sido importado." -#: views.py:557 +#: views.py:676 #, python-format msgid "Error importing file: %r" msgstr "Ha ocurrido un error al cargar el archivo: %r" -#: migrations/0001_initial.py:62 -msgid "content type" -msgstr "tipo de contenido" - -#: migrations/0001_initial.py:63 -msgid "object id" -msgstr "id de objeto" +#~ msgid "content type" +#~ msgstr "tipo de contenido" +#~ msgid "object id" +#~ msgstr "id de objeto" diff --git a/apps/catalogue/locale/fr/LC_MESSAGES/django.mo b/apps/catalogue/locale/fr/LC_MESSAGES/django.mo index 2acecaf16..5ea1fdc97 100644 Binary files a/apps/catalogue/locale/fr/LC_MESSAGES/django.mo and b/apps/catalogue/locale/fr/LC_MESSAGES/django.mo differ diff --git a/apps/catalogue/locale/fr/LC_MESSAGES/django.po b/apps/catalogue/locale/fr/LC_MESSAGES/django.po index de6c5f350..e4eb2a2ac 100644 --- a/apps/catalogue/locale/fr/LC_MESSAGES/django.po +++ b/apps/catalogue/locale/fr/LC_MESSAGES/django.po @@ -2,18 +2,19 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 11:21+0200\n" -"PO-Revision-Date: 2010-08-02 22:35+0100\n" -"Last-Translator: Natalia Kertyczak \n" +"POT-Creation-Date: 2010-08-25 10:24+0000\n" +"PO-Revision-Date: 2010-08-25 10:50\n" +"Last-Translator: \n" "Language-Team: 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.6\n" #: fields.py:47 #, python-format @@ -24,240 +25,233 @@ msgstr "Entrer une valeur JSON valide. Erreur: %s." msgid "title, author, theme/topic, epoch, kind, genre" msgstr "titre, auteur, thème/sujet, époque, type, genre" -#: forms.py:44 +#: forms.py:45 msgid "Shelves" msgstr "Etagères" -#: forms.py:57 +#: forms.py:58 msgid "Name of the new shelf" msgstr "Nom de l'étagère nouvelle" -#: models.py:24 -#: models.py:363 +#: models.py:25 models.py:585 msgid "author" msgstr "auteur" -#: models.py:25 +#: models.py:26 msgid "epoch" msgstr "époque" -#: models.py:26 +#: models.py:27 msgid "kind" msgstr "type" -#: models.py:27 +#: models.py:28 msgid "genre" msgstr "genre" -#: models.py:28 +#: models.py:29 msgid "theme" msgstr "thème" -#: models.py:29 +#: models.py:30 msgid "set" msgstr "série" -#: models.py:30 -#: models.py:322 +#: models.py:31 models.py:204 msgid "book" msgstr "livre" -#: models.py:44 -#: migrations/0001_initial.py:47 +#: models.py:45 msgid "name" msgstr "nom" -#: models.py:45 -#: models.py:103 -#: models.py:365 -#: migrations/0001_initial.py:19 -#: migrations/0001_initial.py:48 +#: models.py:46 models.py:170 models.py:587 models.py:612 msgid "slug" msgstr "slug" -#: models.py:46 -#: migrations/0001_initial.py:49 +#: models.py:47 msgid "sort key" msgstr "critère de tri" -#: models.py:47 -#: migrations/0001_initial.py:50 +#: models.py:48 msgid "category" msgstr "catégorie" -#: models.py:49 -#: models.py:60 -#: models.py:104 -#: models.py:185 -#: migrations/0001_initial.py:20 -#: migrations/0001_initial.py:51 +#: models.py:50 models.py:87 models.py:171 models.py:306 msgid "description" msgstr "description" -#: models.py:50 -#: migrations/0001_initial.py:52 +#: models.py:51 msgid "main page" msgstr "page d'accueil" -#: models.py:50 -#: migrations/0001_initial.py:52 +#: models.py:51 msgid "Show tag on main page" msgstr "Montrer le tag au page d'accueil" -#: models.py:53 -#: migrations/0001_initial.py:54 +#: models.py:54 msgid "book count" msgstr "nombre des livres" -#: models.py:54 +#: models.py:55 msgid "year of death" msgstr "année de la mort" -#: models.py:80 -#: migrations/0001_initial.py:61 +#: models.py:71 msgid "tag" msgstr "tag" -#: models.py:81 +#: models.py:72 msgid "tags" msgstr "tags" -#: models.py:102 -#: models.py:362 -#: migrations/0001_initial.py:18 +#: models.py:169 models.py:584 msgid "title" msgstr "titre" -#: models.py:105 -#: migrations/0001_initial.py:21 +#: models.py:172 msgid "creation date" msgstr "date de création" -#: models.py:106 -#: migrations/0001_initial.py:22 +#: models.py:173 msgid "short HTML" msgstr "HTML court" -#: models.py:107 -#: migrations/0001_initial.py:23 +#: models.py:174 msgid "parent number" msgstr "nombre de parent" -#: models.py:108 +#: models.py:175 msgid "extra information" msgstr "information supplémentaire" -#: models.py:114 -#: migrations/0001_initial.py:24 +#: models.py:181 msgid "XML file" msgstr "fichier XML" -#: models.py:115 -#: migrations/0001_initial.py:25 +#: models.py:182 msgid "HTML file" msgstr "fichier HTML" -#: models.py:116 -#: migrations/0001_initial.py:26 +#: models.py:183 msgid "PDF file" msgstr "fichier PDF" -#: models.py:117 -#: migrations/0001_initial.py:27 +#: models.py:184 +msgid "EPUB file" +msgstr "fichier EPUB" + +#: models.py:185 msgid "ODT file" msgstr "fichier ODT" -#: models.py:118 -#: migrations/0001_initial.py:28 +#: models.py:186 msgid "TXT file" msgstr "fichier TXT" -#: models.py:119 +#: models.py:187 msgid "MP3 file" msgstr "fichier MP3" -#: models.py:120 +#: models.py:188 msgid "OGG file" msgstr "fichier OGG" -#: models.py:141 +#: models.py:205 +msgid "books" +msgstr "livres" + +#: models.py:263 msgid "Read online" msgstr "Lire en ligne" -#: models.py:221 +#: models.py:403 #, python-format msgid "Book %s already exists" msgstr "Le livre %s existe déjà" -#: models.py:264 +#: models.py:444 #, python-format msgid "Book with slug = \"%s\" does not exist." msgstr "Livre au slug = \"%s\" n'existe pas." -#: models.py:323 -msgid "books" -msgstr "livres" - -#: models.py:357 +#: models.py:565 msgid "fragment" msgstr "extrait" -#: models.py:358 +#: models.py:566 msgid "fragments" msgstr "extraits" -#: models.py:364 +#: models.py:586 msgid "goes to public domain" msgstr "entre dans le domaine public" -#: models.py:366 +#: models.py:588 msgid "translator" msgstr "traducteur" -#: models.py:367 +#: models.py:589 msgid "year of translator's death" msgstr "année de la mort du traducteur" -#: models.py:385 +#: models.py:593 msgid "book stub" msgstr "ébauche du livre" -#: models.py:386 +#: models.py:594 msgid "book stubs" msgstr "ébauches des livres" -#: views.py:339 +#: models.py:613 +msgid "type" +msgstr "" + +#: models.py:614 +msgid "sha-1 hash" +msgstr "" + +#: models.py:615 +msgid "time" +msgstr "" + +#: models.py:619 +msgid "file record" +msgstr "" + +#: models.py:620 +msgid "file records" +msgstr "" + +#: views.py:452 msgid "

To maintain your shelves you need to be logged in.

" msgstr "

Pour gérer vos étagères vous devez vous enregistrer.

" -#: views.py:357 +#: views.py:470 msgid "

Shelves were sucessfully saved.

" msgstr "

Les étagères %sont été enregistrées

" -#: views.py:381 +#: views.py:494 msgid "Book was successfully removed from the shelf" msgstr "Le livre a été supprimé de l'étagère" -#: views.py:383 +#: views.py:496 msgid "This book is not on the shelf" msgstr "Le livre n'est pas sur l'étagère" -#: views.py:479 +#: views.py:599 #, python-format msgid "

Shelf %s was successfully created

" msgstr "

L'étagère %sa été créée

" -#: views.py:494 +#: views.py:614 #, python-format msgid "

Shelf %s was successfully removed

" msgstr "

L'étagère %sa été supprimée

" -#: views.py:553 -#, python-format -#msgid "Today is %(month)s, %(day)s." -#msgstr "Aujourd'hui nous sommes le" - -#: views.py:554 +# msgid "Today is %(month)s, %(day)s." +# msgstr "Aujourd'hui nous sommes le" +#: views.py:673 #, python-format msgid "" "An error occurred: %(exception)s\n" @@ -268,20 +262,17 @@ msgstr "" "\n" "%(tb)s" -#: views.py:555 +#: views.py:674 msgid "Book imported successfully" msgstr "Le livre importé avec succès" -#: views.py:557 +#: views.py:676 #, python-format msgid "Error importing file: %r" msgstr "Erreur dans l'importation du fichier: %r" -#: migrations/0001_initial.py:62 -msgid "content type" -msgstr "type du contenu" - -#: migrations/0001_initial.py:63 -msgid "object id" -msgstr "ID de l'objet" +#~ msgid "content type" +#~ msgstr "type du contenu" +#~ msgid "object id" +#~ msgstr "ID de l'objet" diff --git a/apps/catalogue/locale/lt/LC_MESSAGES/django.mo b/apps/catalogue/locale/lt/LC_MESSAGES/django.mo index 19f5bb775..602cf55e5 100644 Binary files a/apps/catalogue/locale/lt/LC_MESSAGES/django.mo and b/apps/catalogue/locale/lt/LC_MESSAGES/django.mo differ diff --git a/apps/catalogue/locale/lt/LC_MESSAGES/django.po b/apps/catalogue/locale/lt/LC_MESSAGES/django.po index fb35ce3a1..03f79a58b 100644 --- a/apps/catalogue/locale/lt/LC_MESSAGES/django.po +++ b/apps/catalogue/locale/lt/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 11:21+0200\n" +"POT-Creation-Date: 2010-08-25 10:24+0000\n" "PO-Revision-Date: 2010-07-12 19:07+0100\n" "Last-Translator: Alicja Sinkiewicz \n" "Language-Team: LANGUAGE \n" @@ -23,242 +23,237 @@ msgstr "Įvėsk atitinkama vertybę JSON. Klaida: %s" #: forms.py:28 msgid "title, author, theme/topic, epoch, kind, genre" -msgstr "Pavadinimas , autorius, motyvas /tema, gadynė, rūšis, sortas" +msgstr "Pavadinimas , autorius, motyvas /tema, gadynė, \trūšis, sortas" -#: forms.py:44 +#: forms.py:45 msgid "Shelves" msgstr "Lentynos" -#: forms.py:57 +#: forms.py:58 msgid "Name of the new shelf" msgstr "Naujos lentynos pavadinimas" -#: models.py:24 -#: models.py:363 +#: models.py:25 models.py:585 msgid "author" msgstr "autorius" -#: models.py:25 +#: models.py:26 msgid "epoch" msgstr "gadynė" -#: models.py:26 +#: models.py:27 msgid "kind" msgstr "rūšis" -#: models.py:27 +#: models.py:28 msgid "genre" msgstr "sortas" -#: models.py:28 +#: models.py:29 msgid "theme" msgstr "motyvas" -#: models.py:29 +#: models.py:30 msgid "set" msgstr "rinkinys" -#: models.py:30 -#: models.py:322 +#: models.py:31 models.py:204 msgid "book" msgstr "knyga" -#: models.py:44 -#: migrations/0001_initial.py:47 +#: models.py:45 msgid "name" msgstr "pavadinimas" -#: models.py:45 -#: models.py:103 -#: models.py:365 -#: migrations/0001_initial.py:19 -#: migrations/0001_initial.py:48 +#: models.py:46 models.py:170 models.py:587 models.py:612 msgid "slug" msgstr "slugas" -#: models.py:46 -#: migrations/0001_initial.py:49 +#: models.py:47 msgid "sort key" msgstr "rūšiavimo raktas" -#: models.py:47 -#: migrations/0001_initial.py:50 +#: models.py:48 msgid "category" msgstr "kategorija " -#: models.py:49 -#: models.py:60 -#: models.py:104 -#: models.py:185 -#: migrations/0001_initial.py:20 -#: migrations/0001_initial.py:51 +#: models.py:50 models.py:87 models.py:171 models.py:306 msgid "description" msgstr "aprašymas" -#: models.py:50 -#: migrations/0001_initial.py:52 +#: models.py:51 msgid "main page" msgstr "pagrindinis puslapis" -#: models.py:50 -#: migrations/0001_initial.py:52 +#: models.py:51 msgid "Show tag on main page" msgstr "Parodyk tagą pagrindinemę puslapyję" -#: models.py:53 -#: migrations/0001_initial.py:54 +#: models.py:54 msgid "book count" msgstr "knygų skaičius" -#: models.py:54 +#: models.py:55 msgid "year of death" msgstr "mirimo metai" -#: models.py:80 -#: migrations/0001_initial.py:61 +#: models.py:71 msgid "tag" msgstr "tagas" -#: models.py:81 +#: models.py:72 msgid "tags" msgstr "tagai" -#: models.py:102 -#: models.py:362 -#: migrations/0001_initial.py:18 +#: models.py:169 models.py:584 msgid "title" msgstr "pavadinimas" -#: models.py:105 -#: migrations/0001_initial.py:21 +#: models.py:172 msgid "creation date" msgstr "sukūrimo data" -#: models.py:106 -#: migrations/0001_initial.py:22 +#: models.py:173 msgid "short HTML" msgstr "trumpas HTML" -#: models.py:107 -#: migrations/0001_initial.py:23 +#: models.py:174 msgid "parent number" msgstr "vieno iš tėvų numeris " -#: models.py:108 +#: models.py:175 msgid "extra information" msgstr "papildomos informacijos" -#: models.py:114 -#: migrations/0001_initial.py:24 +#: models.py:181 msgid "XML file" msgstr "XML failas " -#: models.py:115 -#: migrations/0001_initial.py:25 +#: models.py:182 msgid "HTML file" msgstr "HTML failas" -#: models.py:116 -#: migrations/0001_initial.py:26 +#: models.py:183 msgid "PDF file" msgstr "PDF failas" -#: models.py:117 -#: migrations/0001_initial.py:27 +#: models.py:184 +#, fuzzy +msgid "EPUB file" +msgstr "PDF failas" + +#: models.py:185 msgid "ODT file" msgstr "ODT failas" -#: models.py:118 -#: migrations/0001_initial.py:28 +#: models.py:186 msgid "TXT file" msgstr "TXT failsa" -#: models.py:119 +#: models.py:187 msgid "MP3 file" msgstr "MP3 failas" -#: models.py:120 +#: models.py:188 msgid "OGG file" msgstr "OGG failas" -#: models.py:141 +#: models.py:205 +msgid "books" +msgstr "knygos" + +#: models.py:263 msgid "Read online" msgstr "Skaityk online" -#: models.py:221 +#: models.py:403 #, python-format msgid "Book %s already exists" msgstr "Knyga %s jau egzistuoja" -#: models.py:264 +#: models.py:444 #, python-format msgid "Book with slug = \"%s\" does not exist." msgstr "Knyga su slug = \"%s\" neegzistuoja." -#: models.py:323 -msgid "books" -msgstr "knygos" - -#: models.py:357 +#: models.py:565 msgid "fragment" msgstr "fragmentas" -#: models.py:358 +#: models.py:566 msgid "fragments" msgstr "fragmentai" -#: models.py:364 +#: models.py:586 msgid "goes to public domain" msgstr "keliauja į viešą tinklapį " -#: models.py:366 +#: models.py:588 msgid "translator" msgstr "vertėjas" -#: models.py:367 +#: models.py:589 msgid "year of translator's death" msgstr "vertėjo mirimo metai" -#: models.py:385 +#: models.py:593 msgid "book stub" msgstr "knygos paskelbimas" -#: models.py:386 +#: models.py:594 msgid "book stubs" msgstr "knygu paskelbimai" -#: views.py:339 +#: models.py:613 +msgid "type" +msgstr "" + +#: models.py:614 +msgid "sha-1 hash" +msgstr "" + +#: models.py:615 +#, fuzzy +msgid "time" +msgstr "motyvas" + +#: models.py:619 +msgid "file record" +msgstr "" + +#: models.py:620 +msgid "file records" +msgstr "" + +#: views.py:452 msgid "

To maintain your shelves you need to be logged in.

" msgstr "

Kad valdyti savo lentynom, turi prisijungti.

" -#: views.py:357 +#: views.py:470 msgid "

Shelves were sucessfully saved.

" msgstr "

Lentynos liko užrašytos.

" -#: views.py:381 +#: views.py:494 msgid "Book was successfully removed from the shelf" msgstr "pašalinta" -#: views.py:383 +#: views.py:496 msgid "This book is not on the shelf" msgstr "Lentynoje trūksta knygos" -#: views.py:479 +#: views.py:599 #, python-format msgid "

Shelf %s was successfully created

" msgstr "

Lentyna %s sukurta

" -#: views.py:494 +#: views.py:614 #, python-format msgid "

Shelf %s was successfully removed

" msgstr "

Lentyna %spašalinta

" -#: views.py:553 -#, python-format -#msgid "Today is %(month)s, %(day)s." -#msgstr "Šiandien yra %(mėnuo), %(diena)." - -#: views.py:554 +# msgid "Today is %(month)s, %(day)s." +# msgstr "Šiandien yra %(mėnuo), %(diena)." +#: views.py:673 #, python-format msgid "" "An error occurred: %(exception)s\n" @@ -269,20 +264,17 @@ msgstr "" "\n" "%(tb)s" -#: views.py:555 +#: views.py:674 msgid "Book imported successfully" msgstr "knygos importavimas" -#: views.py:557 +#: views.py:676 #, python-format msgid "Error importing file: %r" msgstr "Failo klaida imortavimo metu: %r" -#: migrations/0001_initial.py:62 -msgid "content type" -msgstr "turinio rūšis" - -#: migrations/0001_initial.py:63 -msgid "object id" -msgstr "id obiektas" +#~ msgid "content type" +#~ msgstr "turinio rūšis" +#~ msgid "object id" +#~ msgstr "id obiektas" diff --git a/apps/catalogue/locale/pl/LC_MESSAGES/django.mo b/apps/catalogue/locale/pl/LC_MESSAGES/django.mo index a9ea84254..e138c2a8e 100644 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 0bc5ba40f..0fcfc61bd 100644 --- a/apps/catalogue/locale/pl/LC_MESSAGES/django.po +++ b/apps/catalogue/locale/pl/LC_MESSAGES/django.po @@ -2,19 +2,19 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-27 03:58-0500\n" -"PO-Revision-Date: 2010-06-11 15:31\n" +"POT-Creation-Date: 2010-08-25 10:24+0000\n" +"PO-Revision-Date: 2010-08-25 11:02\n" "Last-Translator: \n" "Language-Team: 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" +"X-Translated-Using: django-rosetta 0.5.6\n" #: fields.py:47 #, python-format @@ -33,7 +33,7 @@ msgstr "Półki" msgid "Name of the new shelf" msgstr "nazwa nowej półki" -#: models.py:25 models.py:533 +#: models.py:25 models.py:585 msgid "author" msgstr "autor" @@ -65,7 +65,7 @@ msgstr "książka" msgid "name" msgstr "nazwa" -#: models.py:46 models.py:170 models.py:535 models.py:560 +#: models.py:46 models.py:170 models.py:587 models.py:612 msgid "slug" msgstr "" @@ -77,7 +77,7 @@ msgstr "klucz sortowania" msgid "category" msgstr "kategoria" -#: models.py:50 models.py:87 models.py:171 models.py:294 +#: models.py:50 models.py:87 models.py:171 models.py:306 msgid "description" msgstr "opis" @@ -105,7 +105,7 @@ msgstr "tag" msgid "tags" msgstr "tagi" -#: models.py:169 models.py:532 +#: models.py:169 models.py:584 msgid "title" msgstr "tytuł" @@ -165,62 +165,61 @@ msgstr "książki" msgid "Read online" msgstr "Czytaj online" -#: models.py:348 +#: models.py:403 #, python-format msgid "Book %s already exists" msgstr "Książka %s już istnieje" -#: models.py:389 +#: models.py:444 #, python-format msgid "Book with slug = \"%s\" does not exist." msgstr "Książki ο slug = \"%s\" nie istnieje." -#: models.py:513 +#: models.py:565 msgid "fragment" msgstr "fragment" -#: models.py:514 +#: models.py:566 msgid "fragments" msgstr "fragmenty" -#: models.py:534 +#: models.py:586 msgid "goes to public domain" msgstr "trafia do domeny publicznej" -#: models.py:536 +#: models.py:588 msgid "translator" msgstr "tłumacz" -#: models.py:537 +#: models.py:589 msgid "year of translator's death" msgstr "rok śmierci tłumacza" -#: models.py:541 +#: models.py:593 msgid "book stub" msgstr "zapowiedź książki" -#: models.py:542 +#: models.py:594 msgid "book stubs" msgstr "zapowiedzi książek" -#: models.py:561 +#: models.py:613 msgid "type" msgstr "" -#: models.py:562 +#: models.py:614 msgid "sha-1 hash" msgstr "" -#: models.py:563 -#, fuzzy +#: models.py:615 msgid "time" -msgstr "motyw" +msgstr "czas" -#: models.py:567 +#: models.py:619 msgid "file record" msgstr "" -#: models.py:568 +#: models.py:620 msgid "file records" msgstr "" @@ -240,17 +239,17 @@ msgstr "Usunięto" msgid "This book is not on the shelf" msgstr "Książki nie ma na półce" -#: views.py:597 +#: views.py:599 #, python-format msgid "

Shelf %s was successfully created

" msgstr "

Półka %s została utworzona

" -#: views.py:612 +#: views.py:614 #, python-format msgid "

Shelf %s was successfully removed

" msgstr "

Półka %s została usunięta

" -#: views.py:671 +#: views.py:673 #, python-format msgid "" "An error occurred: %(exception)s\n" @@ -261,11 +260,11 @@ msgstr "" "\n" "%(tb)s" -#: views.py:672 +#: views.py:674 msgid "Book imported successfully" msgstr "Książka zaimportowana" -#: views.py:674 +#: views.py:676 #, python-format msgid "Error importing file: %r" msgstr "Błąd podczas importowania pliku: %r" diff --git a/apps/catalogue/locale/ru/LC_MESSAGES/django.mo b/apps/catalogue/locale/ru/LC_MESSAGES/django.mo index 997f2f8c2..ed1bfbe7d 100644 Binary files a/apps/catalogue/locale/ru/LC_MESSAGES/django.mo and b/apps/catalogue/locale/ru/LC_MESSAGES/django.mo differ diff --git a/apps/catalogue/locale/ru/LC_MESSAGES/django.po b/apps/catalogue/locale/ru/LC_MESSAGES/django.po index 007641a0d..9652781ad 100644 --- a/apps/catalogue/locale/ru/LC_MESSAGES/django.po +++ b/apps/catalogue/locale/ru/LC_MESSAGES/django.po @@ -2,18 +2,19 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 11:21+0200\n" -"PO-Revision-Date: 2010-08-11 20:22+0100\n" -"Last-Translator: I \n" +"POT-Creation-Date: 2010-08-25 10:24+0000\n" +"PO-Revision-Date: 2010-08-25 11:02\n" +"Last-Translator: \n" "Language-Team: 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.6\n" #: fields.py:47 #, python-format @@ -24,240 +25,232 @@ msgstr "Ввести правильное JSON значение. Ошибка: % msgid "title, author, theme/topic, epoch, kind, genre" msgstr "Заглавие, автор, мотив/тема, эпоха, форма, жанр" -#: forms.py:44 +#: forms.py:45 msgid "Shelves" msgstr "Полки" -#: forms.py:57 +#: forms.py:58 msgid "Name of the new shelf" msgstr "Название новой полки" -#: models.py:24 -#: models.py:363 +#: models.py:25 models.py:585 msgid "author" msgstr "автор" -#: models.py:25 +#: models.py:26 msgid "epoch" msgstr "эпоха" -#: models.py:26 +#: models.py:27 msgid "kind" msgstr "форма" -#: models.py:27 +#: models.py:28 msgid "genre" msgstr "жанр" -#: models.py:28 +#: models.py:29 msgid "theme" msgstr "мотив" -#: models.py:29 +#: models.py:30 msgid "set" msgstr "набор" -#: models.py:30 -#: models.py:322 +#: models.py:31 models.py:204 msgid "book" msgstr "книга" -#: models.py:44 -#: migrations/0001_initial.py:47 +#: models.py:45 msgid "name" msgstr "название" -#: models.py:45 -#: models.py:103 -#: models.py:365 -#: migrations/0001_initial.py:19 -#: migrations/0001_initial.py:48 +#: models.py:46 models.py:170 models.py:587 models.py:612 msgid "slug" msgstr "slug" -#: models.py:46 -#: migrations/0001_initial.py:49 +#: models.py:47 msgid "sort key" msgstr "ключ сортировки " -#: models.py:47 -#: migrations/0001_initial.py:50 +#: models.py:48 msgid "category" msgstr "категория" -#: models.py:49 -#: models.py:60 -#: models.py:104 -#: models.py:185 -#: migrations/0001_initial.py:20 -#: migrations/0001_initial.py:51 +#: models.py:50 models.py:87 models.py:171 models.py:306 msgid "description" msgstr "описание" -#: models.py:50 -#: migrations/0001_initial.py:52 +#: models.py:51 msgid "main page" msgstr "главная страница" -#: models.py:50 -#: migrations/0001_initial.py:52 +#: models.py:51 msgid "Show tag on main page" msgstr "Показать таг на главной странице" -#: models.py:53 -#: migrations/0001_initial.py:54 +#: models.py:54 msgid "book count" msgstr "число книг" -#: models.py:54 +#: models.py:55 msgid "year of death" msgstr "год смерти" -#: models.py:80 -#: migrations/0001_initial.py:61 +#: models.py:71 msgid "tag" msgstr "таг" -#: models.py:81 +#: models.py:72 msgid "tags" msgstr "таги" -#: models.py:102 -#: models.py:362 -#: migrations/0001_initial.py:18 +#: models.py:169 models.py:584 msgid "title" msgstr "заглавие" -#: models.py:105 -#: migrations/0001_initial.py:21 +#: models.py:172 msgid "creation date" msgstr "дата создания" -#: models.py:106 -#: migrations/0001_initial.py:22 +#: models.py:173 msgid "short HTML" msgstr "короткий HTML" -#: models.py:107 -#: migrations/0001_initial.py:23 +#: models.py:174 msgid "parent number" msgstr "номер родителя" -#: models.py:108 +#: models.py:175 msgid "extra information" msgstr "дополнительная информация" -#: models.py:114 -#: migrations/0001_initial.py:24 +#: models.py:181 msgid "XML file" msgstr "XML файл" -#: models.py:115 -#: migrations/0001_initial.py:25 +#: models.py:182 msgid "HTML file" msgstr "HTML файл" -#: models.py:116 -#: migrations/0001_initial.py:26 +#: models.py:183 msgid "PDF file" msgstr "PDF файл" -#: models.py:117 -#: migrations/0001_initial.py:27 +#: models.py:184 +msgid "EPUB file" +msgstr "EPUB файл" + +#: models.py:185 msgid "ODT file" msgstr "ODT файл" -#: models.py:118 -#: migrations/0001_initial.py:28 +#: models.py:186 msgid "TXT file" msgstr "TXT файл" -#: models.py:119 +#: models.py:187 msgid "MP3 file" msgstr "MP3 файл" -#: models.py:120 +#: models.py:188 msgid "OGG file" msgstr "OGG файл" -#: models.py:141 +#: models.py:205 +msgid "books" +msgstr "книги" + +#: models.py:263 msgid "Read online" msgstr "Читать онлайн" -#: models.py:221 +#: models.py:403 #, python-format msgid "Book %s already exists" msgstr "Книга %s уже существует" -#: models.py:264 +#: models.py:444 #, python-format msgid "Book with slug = \"%s\" does not exist." msgstr "Книга со slug = \"%s\" не существует." -#: models.py:323 -msgid "books" -msgstr "книги" - -#: models.py:357 +#: models.py:565 msgid "fragment" msgstr "фрагмент" -#: models.py:358 +#: models.py:566 msgid "fragments" msgstr "фрагменты" -#: models.py:364 +#: models.py:586 msgid "goes to public domain" msgstr "идти к публичной домене" -#: models.py:366 +#: models.py:588 msgid "translator" msgstr "переводчик" -#: models.py:367 +#: models.py:589 msgid "year of translator's death" msgstr "год смерти переводчика" -#: models.py:385 +#: models.py:593 msgid "book stub" msgstr "анонс книги" -#: models.py:386 +#: models.py:594 msgid "book stubs" msgstr "анонсы книги" -#: views.py:339 +#: models.py:613 +msgid "type" +msgstr "" + +#: models.py:614 +msgid "sha-1 hash" +msgstr "" + +#: models.py:615 +#, fuzzy +msgid "time" +msgstr "мотив" + +#: models.py:619 +msgid "file record" +msgstr "" + +#: models.py:620 +msgid "file records" +msgstr "" + +#: views.py:452 msgid "

To maintain your shelves you need to be logged in.

" msgstr "

Зарегиструйтесь, чтобы сохранить свои полки.

" -#: views.py:357 +#: views.py:470 msgid "

Shelves were sucessfully saved.

" msgstr "

Полки - удачно сохранены.

" -#: views.py:381 +#: views.py:494 msgid "Book was successfully removed from the shelf" msgstr "Книга была удачно удалена с полки" -#: views.py:383 +#: views.py:496 msgid "This book is not on the shelf" msgstr "Эта книга не находится на полке" -#: views.py:479 +#: views.py:599 #, python-format msgid "

Shelf %s was successfully created

" msgstr "

Полка %sбыла удачно создана

" -#: views.py:494 +#: views.py:614 #, python-format msgid "

Shelf %s was successfully removed

" msgstr "

Полка%sбыла удачно удалена." -#: views.py:553 -#, python-format -msgid "Today is %(month)s, %(day)s." -msgstr "Сегодня %(month)s, %(day)s." - -#: views.py:554 +#: views.py:673 #, python-format msgid "" "An error occurred: %(exception)s\n" @@ -268,20 +261,20 @@ msgstr "" "\n" "%(tb)s" -#: views.py:555 +#: views.py:674 msgid "Book imported successfully" msgstr "Вы удачно заимпортировали книгу" -#: views.py:557 +#: views.py:676 #, python-format msgid "Error importing file: %r" msgstr "Ошибка импорта файла: %r" -#: migrations/0001_initial.py:62 -msgid "content type" -msgstr "тип содержания" +#~ msgid "Today is %(month)s, %(day)s." +#~ msgstr "Сегодня %(month)s, %(day)s." -#: migrations/0001_initial.py:63 -msgid "object id" -msgstr "ID объекта" +#~ msgid "content type" +#~ msgstr "тип содержания" +#~ msgid "object id" +#~ msgstr "ID объекта" diff --git a/apps/catalogue/locale/uk/LC_MESSAGES/django.mo b/apps/catalogue/locale/uk/LC_MESSAGES/django.mo index 68b36b0a7..3edab2dac 100644 Binary files a/apps/catalogue/locale/uk/LC_MESSAGES/django.mo and b/apps/catalogue/locale/uk/LC_MESSAGES/django.mo differ diff --git a/apps/catalogue/locale/uk/LC_MESSAGES/django.po b/apps/catalogue/locale/uk/LC_MESSAGES/django.po index c89e74b38..9ad16402b 100644 --- a/apps/catalogue/locale/uk/LC_MESSAGES/django.po +++ b/apps/catalogue/locale/uk/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 11:21+0200\n" -"PO-Revision-Date: 2010-08-26 15:13+0100\n" +"POT-Creation-Date: 2010-08-25 10:24+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Natalia Kertyczak \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -24,172 +24,150 @@ msgstr "Введіть правильну вартість JSON. Помилка: msgid "title, author, theme/topic, epoch, kind, genre" msgstr "заголовок, автор, тема, епоха, рід, жанр" -#: forms.py:44 +#: forms.py:45 msgid "Shelves" msgstr "Полиці" -#: forms.py:57 +#: forms.py:58 msgid "Name of the new shelf" msgstr "Назва нової полиці" -#: models.py:24 -#: models.py:363 +#: models.py:25 models.py:585 msgid "author" msgstr "автор" -#: models.py:25 +#: models.py:26 msgid "epoch" msgstr "епоха" -#: models.py:26 +#: models.py:27 msgid "kind" msgstr "рід" -#: models.py:27 +#: models.py:28 msgid "genre" msgstr "жанр" -#: models.py:28 +#: models.py:29 msgid "theme" msgstr "тема" -#: models.py:29 +#: models.py:30 msgid "set" msgstr "вибір" -#: models.py:30 -#: models.py:322 +#: models.py:31 models.py:204 msgid "book" msgstr "книжка" -#: models.py:44 -#: migrations/0001_initial.py:47 +#: models.py:45 msgid "name" msgstr "назва" -#: models.py:45 -#: models.py:103 -#: models.py:365 -#: migrations/0001_initial.py:19 -#: migrations/0001_initial.py:48 +#: models.py:46 models.py:170 models.py:587 models.py:612 msgid "slug" msgstr "слуґ" -#: models.py:46 -#: migrations/0001_initial.py:49 +#: models.py:47 msgid "sort key" msgstr "ключ сортування" -#: models.py:47 -#: migrations/0001_initial.py:50 +#: models.py:48 msgid "category" msgstr "категорія" -#: models.py:49 -#: models.py:60 -#: models.py:104 -#: models.py:185 -#: migrations/0001_initial.py:20 -#: migrations/0001_initial.py:51 +#: models.py:50 models.py:87 models.py:171 models.py:306 msgid "description" msgstr "опис" -#: models.py:50 -#: migrations/0001_initial.py:52 + +#: models.py:51 msgid "main page" msgstr "головна сторінка" -#: models.py:50 -#: migrations/0001_initial.py:52 +#: models.py:51 msgid "Show tag on main page" msgstr "Показати теґ на головній сторінці" -#: models.py:53 -#: migrations/0001_initial.py:54 +#: models.py:54 msgid "book count" msgstr "кількість книжок" -#: models.py:54 +#: models.py:55 msgid "year of death" msgstr "дата смерті" -#: models.py:80 -#: migrations/0001_initial.py:61 +#: models.py:71 msgid "tag" msgstr "теґ" -#: models.py:81 +#: models.py:72 msgid "tags" msgstr "теґи" -#: models.py:102 -#: models.py:362 -#: migrations/0001_initial.py:18 +#: models.py:169 models.py:584 msgid "title" msgstr "заголовок" -#: models.py:105 -#: migrations/0001_initial.py:21 +#: models.py:172 msgid "creation date" msgstr "дата створення" -#: models.py:106 -#: migrations/0001_initial.py:22 +#: models.py:173 msgid "short HTML" msgstr "короткий HTML" -#: models.py:107 -#: migrations/0001_initial.py:23 +#: models.py:174 msgid "parent number" msgstr "номер батька" -#: models.py:108 +#: models.py:175 msgid "extra information" msgstr "додаткова інформація" -#: models.py:114 -#: migrations/0001_initial.py:24 +#: models.py:181 msgid "XML file" msgstr "файл XML" -#: models.py:115 -#: migrations/0001_initial.py:25 +#: models.py:182 msgid "HTML file" msgstr "файл HTML" -#: models.py:116 -#: migrations/0001_initial.py:26 +#: models.py:183 msgid "PDF file" msgstr "файл PDF" -#: models.py:117 -#: migrations/0001_initial.py:27 +#: models.py:184 +msgid "EPUB file" +msgstr "" + +#: models.py:185 msgid "ODT file" msgstr "файл ODT" -#: models.py:118 -#: migrations/0001_initial.py:28 +#: models.py:186 msgid "TXT file" msgstr "файл TXT" -#: models.py:119 +#: models.py:187 msgid "MP3 file" msgstr "файл MP3" -#: models.py:120 +#: models.py:188 msgid "OGG file" msgstr "файл OGG" -#: models.py:141 + +#: models.py:263 msgid "Read online" msgstr "Читати онлайн" -#: models.py:221 +#: models.py:403 #, python-format msgid "Book %s already exists" msgstr "Книжка %s вже існує" -#: models.py:264 +#: models.py:444 #, python-format msgid "Book with slug = \"%s\" does not exist." msgstr "Книжки зі слуґом = \"%s\" не існує." @@ -198,66 +176,82 @@ msgstr "Книжки зі слуґом = \"%s\" не існує." msgid "books" msgstr "книжки" -#: models.py:357 +#: models.py:565 msgid "fragment" msgstr "фрагмент" -#: models.py:358 +#: models.py:566 msgid "fragments" msgstr "фрагменти" -#: models.py:364 +#: models.py:586 msgid "goes to public domain" msgstr "входить у суспільне надбання" -#: models.py:366 +#: models.py:588 msgid "translator" msgstr "перекладач" -#: models.py:367 +#: models.py:589 msgid "year of translator's death" msgstr "рік смерті перекладача" -#: models.py:385 +#: models.py:593 msgid "book stub" msgstr "заготовка книжки" -#: models.py:386 +#: models.py:594 msgid "book stubs" msgstr "заготовки книжок" -#: views.py:339 +#: models.py:613 +msgid "type" +msgstr "" + +#: models.py:614 +msgid "sha-1 hash" +msgstr "" + +#: models.py:615 +msgid "time" +msgstr "" + +#: models.py:619 +msgid "file record" +msgstr "" + +#: models.py:620 +msgid "file records" +msgstr "" + +#: views.py:452 msgid "

To maintain your shelves you need to be logged in.

" msgstr "

Щоб управляти своїми полицями, увійдть в акаунт

" -#: views.py:357 +#: views.py:470 msgid "

Shelves were sucessfully saved.

" msgstr "

Полиці успішно збережено.

" -#: views.py:381 +#: views.py:494 msgid "Book was successfully removed from the shelf" msgstr "Книжку було успішно видалено з полиці" -#: views.py:383 +#: views.py:496 msgid "This book is not on the shelf" msgstr "Цієї книжки немає на полиці" -#: views.py:479 +#: views.py:599 #, python-format msgid "

Shelf %s was successfully created

" msgstr "

Полицю %s успішно створено

" -#: views.py:494 +#: views.py:614 #, python-format msgid "

Shelf %s was successfully removed

" msgstr "

Полицю %s успішно видалено

" -#: views.py:553 -#, python-format -#msgid "Today is %(month)s, %(day)s." -#msgstr "Сьогодні %(місяць)s, %(день)s." -#: views.py:554 +#: views.py:673 #, python-format msgid "" "An error occurred: %(exception)s\n" @@ -268,11 +262,11 @@ msgstr "" "\n" "%(tb)s" -#: views.py:555 +#: views.py:674 msgid "Book imported successfully" msgstr "Книжку успіщно завантажено" -#: views.py:557 +#: views.py:676 #, python-format msgid "Error importing file: %r" msgstr "Помилка в завантаженні файла: %r" @@ -284,4 +278,3 @@ msgstr "тип змісту" #: migrations/0001_initial.py:63 msgid "object id" msgstr "ІД об'єкту" - diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py index 4ef0a14e6..d3b24d379 100644 --- a/apps/catalogue/models.py +++ b/apps/catalogue/models.py @@ -263,8 +263,8 @@ class Book(models.Model): formats.append(u'%s' % (reverse('book_text', kwargs={'slug': self.slug}), _('Read online'))) if self.pdf_file: formats.append(u'PDF' % self.pdf_file.url) - if self.epub_file: - formats.append(u'EPUB' % self.epub_file.url) + if self.root_ancestor.epub_file: + formats.append(u'EPUB' % self.root_ancestor.epub_file.url) if self.odt_file: formats.append(u'ODT' % self.odt_file.url) if self.txt_file: @@ -282,6 +282,18 @@ class Book(models.Model): return mark_safe(getattr(self, key)) + @property + def root_ancestor(self): + """ returns the oldest ancestor """ + + if not hasattr(self, '_root_ancestor'): + book = self + while book.parent: + book = book.parent + self._root_ancestor = book + return self._root_ancestor + + def get_mp3_info(self): """Retrieves artist and director names from audio ID3 tags.""" audio = id3.ID3(self.mp3_file.path) @@ -314,6 +326,52 @@ class Book(models.Model): has_html_file.short_description = 'HTML' has_html_file.boolean = True + def build_epub(self, remove_descendants=True): + """ (Re)builds the epub file. + If book has a parent, does nothing. + Unless remove_descendants is False, descendants' epubs are removed. + """ + + from StringIO import StringIO + from hashlib import sha1 + from django.core.files.base import ContentFile + from librarian import DocProvider + + class BookImportDocProvider(DocProvider): + """ used for joined EPUBs """ + + def __init__(self, book): + self.book = book + + def by_slug(self, slug): + if slug == self.book.slug: + return self.book.xml_file + else: + return Book.objects.get(slug=slug).xml_file + + if self.parent: + # don't need an epub + return + + epub_file = StringIO() + try: + epub.transform(BookImportDocProvider(self), self.slug, epub_file) + self.epub_file.save('%s.epub' % self.slug, ContentFile(epub_file.getvalue()), save=False) + self.save() + FileRecord(slug=self.slug, type='epub', sha1=sha1(epub_file.getvalue()).hexdigest()).save() + except NoDublinCore: + pass + + book_descendants = list(self.children.all()) + while len(book_descendants) > 0: + child_book = book_descendants.pop(0) + if remove_descendants and child_book.has_epub_file(): + child_book.epub_file.delete() + # save anyway, to refresh short_html + child_book.save() + book_descendants += list(child_book.children.all()) + + @classmethod def from_xml_file(cls, xml_file, overwrite=False): # use librarian to parse meta-data @@ -332,10 +390,7 @@ class Book(models.Model): from tempfile import NamedTemporaryFile from slughifi import slughifi from markupstring import MarkupString - from hashlib import sha1 - from django.core.files.base import ContentFile from django.core.files.storage import default_storage - from StringIO import StringIO # Read book metadata book_base, book_slug = book_info.url.rsplit('/', 1) @@ -388,15 +443,6 @@ class Book(models.Model): except Book.DoesNotExist, e: raise Book.DoesNotExist(_('Book with slug = "%s" does not exist.') % slug) - book_descendants = list(book.children.all()) - while len(book_descendants) > 0: - child_book = book_descendants.pop(0) - child_book.tags = list(child_book.tags) + [book_tag] - child_book.save() - for fragment in child_book.fragments.all(): - fragment.tags = set(list(fragment.tags) + [book_tag]) - book_descendants += list(child_book.children.all()) - # Save XML and HTML files book.xml_file.save('%s.xml' % book.slug, raw_file, save=False) @@ -404,15 +450,6 @@ class Book(models.Model): if html.transform(book.xml_file.path, html_file, parse_dublincore=False): book.html_file.save('%s.html' % book.slug, File(html_file), save=False) - # Create EPUB - epub_file = StringIO() - try: - epub.transform(book.xml_file, epub_file) - book.epub_file.save('%s.epub' % book.slug, ContentFile(epub_file.getvalue()), save=False) - FileRecord(slug=book.slug, type='epub', sha1=sha1(epub_file.getvalue()).hexdigest()).save() - except NoDublinCore: - pass - # Extract fragments closed_fragments, open_fragments = html.extract_fragments(book.html_file.path) for fragment in closed_fragments.values(): @@ -443,6 +480,21 @@ class Book(models.Model): new_fragment.save() new_fragment.tags = set(book_tags + themes + [book_tag]) + book.build_epub(remove_descendants=False) + + book_descendants = list(book.children.all()) + # add l-tag to descendants and their fragments + # delete unnecessary EPUB files + while len(book_descendants) > 0: + child_book = book_descendants.pop(0) + child_book.tags = list(child_book.tags) + [book_tag] + if child_book.has_epub_file(): + child_book.epub_file.delete() + child_book.save() + for fragment in child_book.fragments.all(): + fragment.tags = set(list(fragment.tags) + [book_tag]) + book_descendants += list(child_book.children.all()) + # refresh cache book.tag_counter book.theme_counter diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py index 0055f522d..556bae1fe 100644 --- a/apps/catalogue/views.py +++ b/apps/catalogue/views.py @@ -529,13 +529,15 @@ def download_shelf(request, slug): temp = tempfile.TemporaryFile() archive = zipfile.ZipFile(temp, 'w') + already = set() for book in collect_books(models.Book.tagged.with_all(shelf)): if 'pdf' in formats and book.pdf_file: filename = book.pdf_file.path archive.write(filename, str('%s.pdf' % book.slug)) - if 'epub' in formats and book.epub_file: - filename = book.epub_file.path - archive.write(filename, str('%s.epub' % book.slug)) + if book.root_ancestor not in already and 'epub' in formats and book.root_ancestor.epub_file: + filename = book.root_ancestor.epub_file.path + archive.write(filename, str('%s.epub' % book.root_ancestor.slug)) + already.add(book.root_ancestor) if 'odt' in formats and book.odt_file: filename = book.odt_file.path archive.write(filename, str('%s.odt' % book.slug)) @@ -571,7 +573,7 @@ def shelf_book_formats(request, shelf): for book in collect_books(models.Book.tagged.with_all(shelf)): if book.pdf_file: formats['pdf'] = True - if book.epub_file: + if book.root_ancestor.epub_file: formats['epub'] = True if book.odt_file: formats['odt'] = True diff --git a/apps/lessons/urls.py b/apps/lessons/urls.py index 6c89e5f6b..1d256374b 100644 --- a/apps/lessons/urls.py +++ b/apps/lessons/urls.py @@ -4,13 +4,11 @@ # from django.conf.urls.defaults import * from catalogue import forms -from lessons import models urlpatterns = patterns('', - url(r'^$', 'django.views.generic.list_detail.object_list', { - 'queryset': models.Document.objects.all(), - 'template_name': 'lessons/document_list.html', + url(r'^$', 'django.views.generic.simple.direct_to_template', { + 'template': 'lessons/document_list.html', 'extra_context': { 'form': forms.SearchForm(), }, diff --git a/apps/sponsors/models.py b/apps/sponsors/models.py index 3c2ca0247..a2e3e0857 100644 --- a/apps/sponsors/models.py +++ b/apps/sponsors/models.py @@ -17,7 +17,7 @@ class Sponsor(models.Model): _('logo'), upload_to='sponsorzy/sponsor/logo', thumbnail={ - 'size': (120, 60), + 'size': (120, 120), 'extension': 'png', 'options': ['pad', 'detail'], }) diff --git a/apps/sponsors/static/sponsors/css/footer_admin.css b/apps/sponsors/static/sponsors/css/footer_admin.css index 0e2a01efc..1277bd2d3 100644 --- a/apps/sponsors/static/sponsors/css/footer_admin.css +++ b/apps/sponsors/static/sponsors/css/footer_admin.css @@ -55,13 +55,13 @@ margin: 0; padding: 2px; list-style: none; - min-height: 320px; + min-height: 400px; } .sponsors-sponsor { margin: 0 40px 2px 0; width: 120px; - height: 60px; + height: 120px; border: 1px solid #CCC; background-color: #EEE; cursor: default; diff --git a/apps/sponsors/templates/sponsors/page.html b/apps/sponsors/templates/sponsors/page.html index c2f534e07..77624fb98 100644 --- a/apps/sponsors/templates/sponsors/page.html +++ b/apps/sponsors/templates/sponsors/page.html @@ -1,11 +1,10 @@ -
+ {% for column in sponsors %} -
-

{{ column.name|default:" " }}

- {% for sponsor in column.sponsors %} -
{% if sponsor.url %}{% endif %}{% if sponsor.url %}{% endif %}
- {% endfor %} -
+ + {{ column.name }} + {% for sponsor in column.sponsors %} + {% if sponsor.url %}{% endif %}{% if sponsor.url %}{% endif %} + {% endfor %} + {% endfor %} -
- + diff --git a/lib/librarian b/lib/librarian index 5b174651e..ae0e673a1 160000 --- a/lib/librarian +++ b/lib/librarian @@ -1 +1 @@ -Subproject commit 5b174651e7cadaa9c353cd247fbfcde41b012f3a +Subproject commit ae0e673a17c3edcdca910fafb84eeff9dfe7b588 diff --git a/wolnelektury/locale/de/LC_MESSAGES/django.mo b/wolnelektury/locale/de/LC_MESSAGES/django.mo index 3e163521f..147a86e75 100644 Binary files a/wolnelektury/locale/de/LC_MESSAGES/django.mo and b/wolnelektury/locale/de/LC_MESSAGES/django.mo differ diff --git a/wolnelektury/locale/de/LC_MESSAGES/django.po b/wolnelektury/locale/de/LC_MESSAGES/django.po index f91d0d455..ea4e22394 100644 --- a/wolnelektury/locale/de/LC_MESSAGES/django.po +++ b/wolnelektury/locale/de/LC_MESSAGES/django.po @@ -2,53 +2,21 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 14:29+0200\n" -"PO-Revision-Date: 2010-08-11 03:13+0100\n" -"Last-Translator: Iwona Fiałkowska \n" +"POT-Creation-Date: 2010-08-25 10:23+0000\n" +"PO-Revision-Date: 2010-08-25 10:43\n" +"Last-Translator: \n" "Language-Team: 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.6\n" -#: settings.py:37 -msgid "Polish" -msgstr "Polnisch" - -#: settings.py:38 -msgid "German" -msgstr "Deutsch" - -#: settings.py:39 -msgid "English" -msgstr "Englisch" - -#: settings.py:40 -msgid "Lithuanian" -msgstr "Litauisch" - -#: settings.py:41 -msgid "French" -msgstr "Französisch" - -#: settings.py:42 -msgid "Russian" -msgstr "Russisch" - -#: settings.py:43 -msgid "Spanish" -msgstr "Spanisch" - -#: settings.py:44 -msgid "Ukrainian" -msgstr "Ukrainisch" - -#: templates/404.html:6 -#: templates/404.html.py:15 +#: templates/404.html:6 templates/404.html.py:15 msgid "Page does not exist" msgstr "Die angeforderte Webseite existiert nicht" @@ -60,8 +28,7 @@ msgstr "Die gesuchte Seite existiert leider nicht mehr. Überprüfen Sie bitte, msgid "main page" msgstr "Startseite" -#: templates/500.html:6 -#: templates/500.html.py:54 +#: templates/500.html:6 templates/500.html.py:54 msgid "Server error" msgstr "Serverfehler" @@ -69,8 +36,7 @@ msgstr "Serverfehler" msgid "

The Wolnelektury.pl site is currently unavailable. Meanwhile, visit our blog.

Inform our administrators about the error.

" msgstr "

Wolnelektury.pl ist zurzeit nicht verfügbar. Besuchen Sie unsere Homepage Blog . Informieren Sie uns Administratoren über den Fehler. " -#: templates/503.html:6 -#: templates/503.html.py:54 +#: templates/503.html:6 templates/503.html.py:54 msgid "Service unavailable" msgstr "Service nicht verfügbar" @@ -78,60 +44,48 @@ msgstr "Service nicht verfügbar" msgid "The Wolnelektury.pl site is currently unavailable due to maintainance." msgstr "Wolnelektury.pl wegen Wartungsarbeiten momentan nicht verfügbar." -#: templates/base.html:20 +#: templates/base.html:19 msgid "Internet Explorer cannot display this site properly. Click here to read more..." msgstr "Diese Seite kann nicht richtig im Internet Explorer angezeigt werden. Klicken Sie hier, um mehr zu lesen..." -#: templates/base.html:33 +#: templates/base.html:32 msgid "Welcome" msgstr "Willkommen" -#: templates/base.html:34 +#: templates/base.html:33 msgid "Your shelves" msgstr "Deine Bücherregale" -#: templates/base.html:36 +#: templates/base.html:35 msgid "Administration" msgstr "Administration" +#: templates/base.html:37 templates/base.html.py:41 +msgid "Report a bug" +msgstr "" + #: templates/base.html:38 msgid "Logout" msgstr "Abmelden" -#: templates/base.html:41 -#: templates/base.html.py:87 -#: templates/base.html:91 -#: templates/base.html.py:95 -#: templates/auth/login.html:4 -#: templates/auth/login.html.py:7 -#: templates/auth/login.html:12 +#: templates/base.html:42 templates/base.html.py:88 templates/base.html:92 +#: templates/base.html.py:96 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 "Anmelden" -#: templates/base.html:41 -#: templates/base.html.py:87 -#: templates/base.html:95 -#: templates/base.html.py:99 -#: templates/auth/login.html:7 -#: templates/auth/login.html.py:21 -#: templates/auth/login.html:23 +#: templates/base.html:42 templates/base.html.py:88 templates/base.html:96 +#: templates/base.html.py:100 templates/auth/login.html:7 +#: templates/auth/login.html.py:21 templates/auth/login.html:23 msgid "Register" msgstr "Registrieren" -#: templates/base.html:51 -msgid "Choose your interface language: " -msgstr "Wählen Sie Ihre Sprache:" - -#: templates/base.html:56 -msgid "Choose language" -msgstr "Sprache wählen" - -#: templates/base.html:68 +#: templates/base.html:69 msgid "" "\n" "\t\t\t\tWolne Lektury is a project lead by Modern Poland Foundation.\n" -"\t\t\t\tDigital reproductions are made by The National Library, based on TNL resources. \n" +"\t\t\t\tDigital reproductions are made by The National Library, based on TNL resources.\n" "\t\t\t\tHosting EO Networks.\n" "\t\t\t\t" msgstr "" @@ -141,7 +95,7 @@ msgstr "" "\t\t\t\tHosting EO Networks.\n" "\t\t\t\t" -#: templates/base.html:75 +#: templates/base.html:76 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" @@ -153,31 +107,31 @@ msgstr "" " e-mail: fundacja@nowoczesnapolska.org.pl\n" "\t\t\t\t" -#: templates/base.html:84 -#: templates/base.html.py:105 -#: templates/catalogue/book_detail.html:129 +#: templates/base.html:85 templates/base.html.py:106 templates/base.html:112 +#: templates/catalogue/book_detail.html:146 #: templates/catalogue/book_fragments.html:33 #: templates/catalogue/book_stub_detail.html:31 -#: templates/catalogue/search_multiple_hits.html:23 +#: templates/catalogue/differentiate_tags.html:23 +#: templates/catalogue/search_multiple_hits.html:29 #: templates/catalogue/search_no_hits.html:22 #: templates/catalogue/search_too_short.html:19 -#: templates/catalogue/tagged_object_list.html:141 +#: templates/catalogue/tagged_object_list.html:155 msgid "Close" msgstr "Schliessen" -#: templates/base.html:107 -#: templates/catalogue/book_detail.html:131 +#: templates/base.html:108 templates/base.html.py:114 +#: templates/catalogue/book_detail.html:148 #: templates/catalogue/book_fragments.html:35 #: templates/catalogue/book_stub_detail.html:33 -#: templates/catalogue/search_multiple_hits.html:25 +#: templates/catalogue/differentiate_tags.html:25 +#: templates/catalogue/search_multiple_hits.html:31 #: templates/catalogue/search_no_hits.html:24 #: templates/catalogue/search_too_short.html:21 -#: templates/catalogue/tagged_object_list.html:143 +#: templates/catalogue/tagged_object_list.html:157 msgid "Loading" msgstr "Herunterladen" -#: templates/admin/base_site.html:4 -#: templates/admin/base_site.html.py:7 +#: templates/admin/base_site.html:4 templates/admin/base_site.html.py:7 msgid "Site administration" msgstr "Webseite-Administration" @@ -193,34 +147,29 @@ msgstr "Buch importieren" msgid "Register on" msgstr "Registrieren" -#: templates/auth/login.html:9 -#: templates/catalogue/book_detail.html:12 +#: templates/auth/login.html:9 templates/catalogue/book_detail.html:12 #: templates/catalogue/book_fragments.html:12 #: templates/catalogue/book_list.html:12 #: templates/catalogue/book_stub_detail.html:12 -#: templates/catalogue/breadcrumbs.html:9 -#: templates/catalogue/main_page.html:13 -#: templates/info/base.html:10 +#: templates/catalogue/breadcrumbs.html:21 +#: templates/catalogue/main_page.html:13 templates/info/base.html:10 #: templates/lessons/document_detail.html:9 #: templates/lessons/document_list.html:51 msgid "Search" msgstr "Suchen" -#: templates/auth/login.html:9 -#: templates/catalogue/book_detail.html:12 +#: templates/auth/login.html:9 templates/catalogue/book_detail.html:12 #: templates/catalogue/book_fragments.html:12 #: templates/catalogue/book_list.html:12 #: templates/catalogue/book_stub_detail.html:12 #: templates/catalogue/main_page.html:13 -#: templates/catalogue/tagged_object_list.html:41 -#: templates/info/base.html:10 +#: templates/catalogue/tagged_object_list.html:43 templates/info/base.html:10 #: templates/lessons/document_detail.html:9 #: templates/lessons/document_list.html:51 msgid "or" msgstr "oder" -#: templates/auth/login.html:9 -#: templates/catalogue/book_detail.html:12 +#: templates/auth/login.html:9 templates/catalogue/book_detail.html:12 #: templates/catalogue/book_list.html:12 #: templates/catalogue/book_stub_detail.html:12 #: templates/lessons/document_list.html:51 @@ -231,100 +180,99 @@ msgstr "Zur Startseite wechseln" msgid "on WolneLektury.pl" msgstr "auf WolneLektury.pl" -#: templates/catalogue/book_detail.html:17 +#: templates/catalogue/book_detail.html:29 msgid "Work is licensed under " msgstr "Das Werk ist unter der Lizenz zugänglich" -#: templates/catalogue/book_detail.html:19 +#: templates/catalogue/book_detail.html:31 msgid "Based on" msgstr "Basierend auf" -#: templates/catalogue/book_detail.html:24 -#: templates/catalogue/tagged_object_list.html:27 -msgid "Hide description" -msgstr "Beschreibung ausblenden" - -#: templates/catalogue/book_detail.html:27 +#: templates/catalogue/book_detail.html:40 msgid "Put a book" msgstr "Buch ablegen" -#: templates/catalogue/book_detail.html:27 +#: templates/catalogue/book_detail.html:40 msgid "on the shelf!" msgstr "aufs Regal!" -#: templates/catalogue/book_detail.html:31 +#: templates/catalogue/book_detail.html:44 msgid "Read online" msgstr "Online lesen" -#: templates/catalogue/book_detail.html:34 +#: templates/catalogue/book_detail.html:47 msgid "Download PDF" msgstr "PDF-Datei herunterladen" -#: templates/catalogue/book_detail.html:37 +#: templates/catalogue/book_detail.html:50 +msgid "Download EPUB" +msgstr "EPUB-Datei herunterladen" + +#: templates/catalogue/book_detail.html:53 msgid "Download ODT" msgstr "ODT-Datei herunterladen" -#: templates/catalogue/book_detail.html:40 +#: templates/catalogue/book_detail.html:56 msgid "Download TXT" msgstr "TXT-Datei herunterladen" -#: templates/catalogue/book_detail.html:45 +#: templates/catalogue/book_detail.html:61 msgid "Artist" msgstr "Liest" -#: templates/catalogue/book_detail.html:47 +#: templates/catalogue/book_detail.html:63 msgid "Director" msgstr "Führt Regie" -#: templates/catalogue/book_detail.html:51 +#: templates/catalogue/book_detail.html:67 msgid "Download MP3" msgstr "MP3-Datei herunterladen" -#: templates/catalogue/book_detail.html:52 +#: templates/catalogue/book_detail.html:68 msgid "Download Ogg Vorbis" msgstr "Ogg Vorbis-Datei herunterladen" -#: templates/catalogue/book_detail.html:79 +#: templates/catalogue/book_detail.html:95 msgid "Details" msgstr "Details" -#: templates/catalogue/book_detail.html:82 +#: templates/catalogue/book_detail.html:99 msgid "Author" msgstr "Autor" -#: templates/catalogue/book_detail.html:88 +#: templates/catalogue/book_detail.html:105 msgid "Epoch" msgstr "Epoche" -#: templates/catalogue/book_detail.html:94 +#: templates/catalogue/book_detail.html:111 msgid "Kind" msgstr "Art" -#: templates/catalogue/book_detail.html:100 +#: templates/catalogue/book_detail.html:117 msgid "Genre" msgstr "Gattung" -#: templates/catalogue/book_detail.html:106 +#: templates/catalogue/book_detail.html:123 msgid "Other resources" msgstr "Andere Ressourcen" -#: templates/catalogue/book_detail.html:108 +#: templates/catalogue/book_detail.html:125 msgid "Book on project's wiki" msgstr "Schullektüre auf WikiProjekt" -#: templates/catalogue/book_detail.html:109 +#: templates/catalogue/book_detail.html:126 msgid "Source of the book" msgstr "Buchquelle" -#: templates/catalogue/book_detail.html:111 +#: templates/catalogue/book_detail.html:128 msgid "Book description on Lektury.Gazeta.pl" msgstr "Buchbeschreibung unter Lektury.Gazeta.pl" -#: templates/catalogue/book_detail.html:114 +#: templates/catalogue/book_detail.html:131 msgid "Book description on Wikipedia" msgstr "Buchbeschreibung auf Wikipedia" -#: templates/catalogue/book_detail.html:119 +#: templates/catalogue/book_detail.html:136 msgid "Work's themes " msgstr "Werkmotive" @@ -351,36 +299,34 @@ msgid "See description" msgstr "Beschreibung ansehen" #: templates/catalogue/book_fragments.html:26 -#, fuzzy msgid "of the book " msgstr "" #: templates/catalogue/book_list.html:7 -msgid "Alphabetical listing of works on WolneLektury.pl" -msgstr "Alphabetisches Werkverzeichnis unter WolneLektury.pl" +msgid "Listing of all works on WolneLektury.pl" +msgstr "Werkverzeichnis unter WolneLektury.pl" #: templates/catalogue/book_list.html:10 -msgid "Alphabetical listing of works" -msgstr "Alphabetisches Werkverzeichnis" +msgid "Listing of all works" +msgstr "Werkverzeichnis" #: templates/catalogue/book_sets.html:2 msgid "Put a book on the shelf!" msgstr "Leg das Buch aufs Regal ab!" -#: templates/catalogue/book_sets.html:4 +#: templates/catalogue/book_sets.html:3 templates/catalogue/book_sets.html:6 +#: templates/catalogue/fragment_sets.html:16 +msgid "Create new shelf" +msgstr "Neues Bücherregal erstellen" + +#: templates/catalogue/book_sets.html:10 msgid "You do not have any shelves. You can create one below, if you want to." msgstr "Keine neue Bücherregale vorhanden. Wenn du willst, kannst du ein neues Bücherregal erstellen." -#: templates/catalogue/book_sets.html:9 -#: templates/catalogue/book_short.html:4 +#: templates/catalogue/book_sets.html:15 templates/catalogue/book_short.html:4 msgid "Put on the shelf!" msgstr "Leg aufs Regal ab!" -#: templates/catalogue/book_sets.html:16 -#: templates/catalogue/fragment_sets.html:16 -msgid "Create new shelf" -msgstr "Neues Bücherregal erstellen" - #: templates/catalogue/book_short.html:14 msgid "Jump to" msgstr "Überspringen" @@ -410,17 +356,20 @@ msgid "Table of contents" msgstr "Inhalt" #: templates/catalogue/book_text.html:18 -#: templates/catalogue/tagged_object_list.html:132 +#: templates/catalogue/tagged_object_list.html:146 msgid "Themes" msgstr "Motive" +#: templates/catalogue/differentiate_tags.html:13 +msgid "The criteria are ambiguous. Please select one of the following options:" +msgstr "" + #: templates/catalogue/folded_tag_list.html:4 msgid "Show full category" msgstr "Alle Kategorien anzeigen" #: templates/catalogue/folded_tag_list.html:13 -#: templates/catalogue/main_page.html:43 -#: templates/catalogue/main_page.html:48 +#: templates/catalogue/main_page.html:43 templates/catalogue/main_page.html:48 #: templates/catalogue/main_page.html:87 #: templates/catalogue/main_page.html:270 #: templates/catalogue/main_page.html:279 @@ -445,15 +394,15 @@ msgstr "Keine neue Bücherregale vorhanden. Wenn du willst, kannst du ein neues msgid "Save all shelves" msgstr "Alle Bücherregale speichern" -#: templates/catalogue/fragment_short.html:6 +#: templates/catalogue/fragment_short.html:7 msgid "Expand fragment" msgstr "Buchauszug aufklappen" -#: templates/catalogue/fragment_short.html:12 +#: templates/catalogue/fragment_short.html:13 msgid "Hide fragment" msgstr "Buchauszug zuklappen" -#: templates/catalogue/fragment_short.html:17 +#: templates/catalogue/fragment_short.html:18 msgid "See in a book" msgstr "Werk ansehen" @@ -513,22 +462,22 @@ msgid "are professional recordings of literary texts from our repository, availa msgstr "sind professionelle Aufnahmen literarischer Texte aus unserer Sammlung, die unter freier Lizenz in folgenden Formaten verfügbar sind: MP3-und Ogg-Vorbis-Formate sowie im DAISY-System." #: templates/catalogue/main_page.html:54 -#: templates/catalogue/tagged_object_list.html:114 +#: templates/catalogue/tagged_object_list.html:128 msgid "Authors" msgstr "Autoren" #: templates/catalogue/main_page.html:58 -#: templates/catalogue/tagged_object_list.html:118 +#: templates/catalogue/tagged_object_list.html:132 msgid "Kinds" msgstr "Arten" #: templates/catalogue/main_page.html:62 -#: templates/catalogue/tagged_object_list.html:122 +#: templates/catalogue/tagged_object_list.html:136 msgid "Genres" msgstr "Gattungen" #: templates/catalogue/main_page.html:66 -#: templates/catalogue/tagged_object_list.html:126 +#: templates/catalogue/tagged_object_list.html:140 msgid "Epochs" msgstr "Epochen" @@ -588,7 +537,7 @@ msgid "Search in WolneLektury.pl" msgstr "Suche unter WolneLektury.pl" #: templates/catalogue/search_no_hits.html:14 -#: templates/catalogue/tagged_object_list.html:102 +#: templates/catalogue/tagged_object_list.html:116 msgid "Sorry! Search cirteria did not match any resources." msgstr "Sorry! Die Suche ergab leider keine Treffer." @@ -616,112 +565,136 @@ msgstr "Dein Bücherregal ist leer" msgid "You can put a book on a shelf by entering page of the reading and clicking 'Put on the shelf'." msgstr "Du kannst das Buch aufs Regal ablegen, indem du \" aufs Regal!\" - Button anklickst." -#: templates/catalogue/tagged_object_list.html:31 +#: templates/catalogue/tagged_object_list.html:32 msgid "Download all books from this shelf" msgstr "Alle Bücher aus diesem Regal herunterladen" -#: templates/catalogue/tagged_object_list.html:35 +#: templates/catalogue/tagged_object_list.html:36 msgid "Choose books' formats which you want to download:" msgstr "Wähle Buchformate aus, die du herunterladen möchtest:" -#: templates/catalogue/tagged_object_list.html:36 #: 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 "zum Lesen" -#: templates/catalogue/tagged_object_list.html:36 +#: templates/catalogue/tagged_object_list.html:37 msgid "and printing using" msgstr "drucken mit" -#: templates/catalogue/tagged_object_list.html:37 +#: templates/catalogue/tagged_object_list.html:39 msgid "and editing using" msgstr "bearbeiten mit" -#: templates/catalogue/tagged_object_list.html:38 +#: templates/catalogue/tagged_object_list.html:40 msgid "on small displays, for example mobile phones" msgstr "auf kleines Display, z. B. Handy" -#: templates/catalogue/tagged_object_list.html:39 -#: templates/catalogue/tagged_object_list.html:40 +#: templates/catalogue/tagged_object_list.html:41 +#: templates/catalogue/tagged_object_list.html:42 msgid "for listening" msgstr "zum Hören" -#: templates/catalogue/tagged_object_list.html:39 +#: templates/catalogue/tagged_object_list.html:41 msgid "on favourite MP3 player" msgstr "auf Lieblings-MP3-Player" -#: templates/catalogue/tagged_object_list.html:40 +#: templates/catalogue/tagged_object_list.html:42 msgid "open format" msgstr "Format öffnen" -#: templates/catalogue/tagged_object_list.html:40 +#: templates/catalogue/tagged_object_list.html:42 msgid "Xiph.org Foundation" msgstr "Xiph.org Stiftung" -#: templates/catalogue/tagged_object_list.html:41 +#: templates/catalogue/tagged_object_list.html:43 #: templates/lessons/ajax_document_detail.html:3 #: templates/lessons/document_detail.html:13 msgid "Download" msgstr "Herunterladen" -#: templates/catalogue/tagged_object_list.html:41 +#: templates/catalogue/tagged_object_list.html:43 msgid "Updating list of books' formats on the shelf" msgstr "Liste der Buchformate auf dem Regal aktualisieren" -#: templates/catalogue/tagged_object_list.html:41 +#: templates/catalogue/tagged_object_list.html:43 msgid "cancel" msgstr "löschen" -#: templates/catalogue/tagged_object_list.html:46 +#: templates/catalogue/tagged_object_list.html:48 msgid "Share this shelf" msgstr "Teile dieses Bücherregal" -#: templates/catalogue/tagged_object_list.html:48 +#: templates/catalogue/tagged_object_list.html:50 msgid "Copy this link and share it with other people to let them see your shelf." msgstr "Kopiere diesen Link und verschicke an Personen, mit denen du dein Bücherregal teilen willst." -#: templates/catalogue/tagged_object_list.html:57 +#: templates/catalogue/tagged_object_list.html:60 msgid "Read work's study of this author on Lektury.Gazeta.pl" msgstr "Lies Werkanalyse dieses Autors unter Lektury.Gazeta.pl" -#: templates/catalogue/tagged_object_list.html:60 -msgid "Read study of epoch" -msgstr "Lies Epochenanalyse" +#: templates/catalogue/tagged_object_list.html:62 +#, fuzzy, python-format +msgid "Read study of epoch %(last_tag)s on Lektury.Gazeta.pl" +msgstr "Lies Werkanalyse dieses Autors unter Lektury.Gazeta.pl" -#: templates/catalogue/tagged_object_list.html:60 -msgid "on Lektury.Gazeta.pl" -msgstr "unter Lektury.Gazeta.pl" +#: templates/catalogue/tagged_object_list.html:64 +#, fuzzy, python-format +msgid "Read study of kind %(last_tag)s on Lektury.Gazeta.pl" +msgstr "Lies Werkanalyse dieses Autors unter Lektury.Gazeta.pl" + +#: templates/catalogue/tagged_object_list.html:66 +#, fuzzy, python-format +msgid "Read study of genre %(last_tag)s on Lektury.Gazeta.pl" +msgstr "Lies Werkanalyse dieses Autors unter Lektury.Gazeta.pl" + +#: templates/catalogue/tagged_object_list.html:68 +#, fuzzy +msgid "Read related study on Lektury.Gazeta.pl" +msgstr "Lies Werkanalyse dieses Autors unter Lektury.Gazeta.pl" -#: templates/catalogue/tagged_object_list.html:67 +#: templates/catalogue/tagged_object_list.html:76 msgid "Read article about this author on Wikipedia" msgstr "Lies den Beitrag über diesen Autor auf Wikipedia" -#: templates/catalogue/tagged_object_list.html:70 -msgid "Read article about epoch" -msgstr "Lies den Beitrag aus dieser Epoche" - -#: templates/catalogue/tagged_object_list.html:70 -msgid "on Wikipedia" -msgstr "auf Wikipedia" +#: templates/catalogue/tagged_object_list.html:78 +#, fuzzy, python-format +msgid "Read article about epoch %(last_tag)s on Wikipedia" +msgstr "Lies den Beitrag über diesen Autor auf Wikipedia" #: templates/catalogue/tagged_object_list.html:80 +#, fuzzy, python-format +msgid "Read article about kind %(last_tag)s on Wikipedia" +msgstr "Lies den Beitrag über diesen Autor auf Wikipedia" + +#: templates/catalogue/tagged_object_list.html:82 +#, fuzzy, python-format +msgid "Read article about genre %(last_tag)s on Wikipedia" +msgstr "Lies den Beitrag über diesen Autor auf Wikipedia" + +#: templates/catalogue/tagged_object_list.html:84 +#, fuzzy +msgid "Read related article on Wikipedia" +msgstr "Lies den Beitrag über diesen Autor auf Wikipedia" + +#: templates/catalogue/tagged_object_list.html:94 msgid "Delete" msgstr "Löschen" -#: templates/catalogue/tagged_object_list.html:88 +#: templates/catalogue/tagged_object_list.html:102 msgid "This author's works are copyrighted." msgstr "Die Werke dieses Autors sind urheberrechtlich geschützt." -#: templates/catalogue/tagged_object_list.html:91 +#: templates/catalogue/tagged_object_list.html:105 msgid "This author's works are in public domain and will be published on Internet school library of Wolne Lektury soon." msgstr "Dieses Werk ist zur öffentlichen Nutzung vorgesehen und wird bald in der Internetbibliothek Wolne Lektury veröffentlicht sein." -#: templates/catalogue/tagged_object_list.html:95 +#: templates/catalogue/tagged_object_list.html:109 msgid "This author's works will become part of public domain and will be allowed to be published without restrictions in" msgstr "Die Werke dieses Autors werden bald zur öffentlichen Nutzung freigestellt und können in der Zukunft ohne weitere Einschränkungen veröffentlicht werden." -#: templates/catalogue/tagged_object_list.html:97 +#: templates/catalogue/tagged_object_list.html:111 msgid "Find out why Internet libraries can't publish this author's works." msgstr "Finde heraus, warum Internet-Bibliotheken zu den Werken dieses Autors den Zugang verwähren." @@ -738,15 +711,13 @@ msgid "return to the main page" msgstr "zur Startseite wechseln" #: templates/info/join_us.html:2 -#, python-format msgid "" "We have over 1000 works published in Wolne Lektury!\n" "Help us expand the library and set new readings free by\n" -"making a donation or transferring 1%% of your income tax." -msgstr "Auf unserer Hompage Wolne Lektury wurden bereits etwa 1000 Werke veröffentlicht! Helfe uns bei der Mitgestaltung und Veröffentlichung neuer Schullektüren, indem du uns eine Spende in Höhe von 1%% deiner Steuerabgaben übergibst." +"making a donation or transferring 1% of your income tax." +msgstr "Auf unserer Hompage Wolne Lektury wurden bereits etwa 1000 Werke veröffentlicht! Helfe uns bei der Mitgestaltung und Veröffentlichung neuer Schullektüren, indem du uns eine Spende in Höhe von 1% deiner Steuerabgaben übergibst." -#: templates/info/join_us.html:5 -#: templates/info/join_us.html.py:10 +#: templates/info/join_us.html:5 templates/info/join_us.html.py:10 msgid "More..." msgstr "Mehr..." @@ -780,3 +751,47 @@ msgstr "zurück" msgid "next" msgstr "vor" +#~ msgid "Polish" +#~ msgstr "Polnisch" + +#~ msgid "German" +#~ msgstr "Deutsch" + +#~ msgid "English" +#~ msgstr "Englisch" + +#~ msgid "Lithuanian" +#~ msgstr "Litauisch" + +#~ msgid "French" +#~ msgstr "Französisch" + +#~ msgid "Russian" +#~ msgstr "Russisch" + +#~ msgid "Spanish" +#~ msgstr "Spanisch" + +#~ msgid "Ukrainian" +#~ msgstr "Ukrainisch" + +#~ msgid "Choose your interface language: " +#~ msgstr "Wählen Sie Ihre Sprache:" + +#~ msgid "Choose language" +#~ msgstr "Sprache wählen" + +#~ msgid "Hide description" +#~ msgstr "Beschreibung ausblenden" + +#~ msgid "Read study of epoch" +#~ msgstr "Lies Epochenanalyse" + +#~ msgid "on Lektury.Gazeta.pl" +#~ msgstr "unter Lektury.Gazeta.pl" + +#~ msgid "Read article about epoch" +#~ msgstr "Lies den Beitrag aus dieser Epoche" + +#~ msgid "on Wikipedia" +#~ msgstr "auf Wikipedia" diff --git a/wolnelektury/locale/en/LC_MESSAGES/django.mo b/wolnelektury/locale/en/LC_MESSAGES/django.mo index 40859fe0e..bc4aa7867 100644 Binary files a/wolnelektury/locale/en/LC_MESSAGES/django.mo and b/wolnelektury/locale/en/LC_MESSAGES/django.mo differ diff --git a/wolnelektury/locale/en/LC_MESSAGES/django.po b/wolnelektury/locale/en/LC_MESSAGES/django.po index e9f78ecec..ac311e467 100644 --- a/wolnelektury/locale/en/LC_MESSAGES/django.po +++ b/wolnelektury/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-11 16:47+0200\n" +"POT-Creation-Date: 2010-08-25 10:23+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,38 +16,6 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: settings.py:37 -msgid "Polish" -msgstr "" - -#: settings.py:38 -msgid "German" -msgstr "" - -#: settings.py:39 -msgid "English" -msgstr "" - -#: settings.py:40 -msgid "Lithuanian" -msgstr "" - -#: settings.py:41 -msgid "French" -msgstr "" - -#: settings.py:42 -msgid "Russian" -msgstr "" - -#: settings.py:43 -msgid "Spanish" -msgstr "" - -#: settings.py:44 -msgid "Ukrainian" -msgstr "" - #: templates/404.html:6 templates/404.html.py:15 msgid "Page does not exist" msgstr "" @@ -82,65 +50,57 @@ msgstr "" msgid "The Wolnelektury.pl site is currently unavailable due to maintainance." msgstr "" -#: templates/base.html:20 +#: templates/base.html:19 msgid "" "Internet Explorer cannot display this site properly. Click here to read " "more..." msgstr "" -#: templates/base.html:33 +#: templates/base.html:32 msgid "Welcome" msgstr "" -#: templates/base.html:34 +#: templates/base.html:33 msgid "Your shelves" msgstr "" -#: templates/base.html:36 +#: templates/base.html:35 msgid "Administration" msgstr "" -#: templates/base.html:38 templates/base.html.py:42 +#: templates/base.html:37 templates/base.html.py:41 msgid "Report a bug" msgstr "" -#: templates/base.html:39 +#: templates/base.html:38 msgid "Logout" msgstr "" -#: templates/base.html:43 templates/base.html.py:89 templates/base.html:93 -#: templates/base.html.py:97 templates/auth/login.html:4 +#: templates/base.html:42 templates/base.html.py:88 templates/base.html:92 +#: templates/base.html.py:96 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 "" -#: templates/base.html:43 templates/base.html.py:89 templates/base.html:97 -#: templates/base.html.py:101 templates/auth/login.html:7 +#: templates/base.html:42 templates/base.html.py:88 templates/base.html:96 +#: templates/base.html.py:100 templates/auth/login.html:7 #: templates/auth/login.html.py:21 templates/auth/login.html:23 msgid "Register" msgstr "" -#: templates/base.html:53 -msgid "Choose your interface language: " -msgstr "" - -#: templates/base.html:58 -msgid "Choose language" -msgstr "" - -#: templates/base.html:70 +#: templates/base.html:69 msgid "" "\n" "\t\t\t\tWolne Lektury is a project lead by Modern Poland Foundation.\n" "\t\t\t\tDigital reproductions are made by The National Library, based on TNL resources. \n" +"\">The National Library, based on TNL resources.\n" "\t\t\t\tHosting EO Networks.\n" "\t\t\t\t" msgstr "" -#: templates/base.html:77 +#: templates/base.html:76 msgid "" "\n" "\t\t\t\tModern Poland Foundation, 00-514 Warsaw, ul. Marszałkowska 84/92 " @@ -150,25 +110,27 @@ msgid "" "\t\t\t\t" msgstr "" -#: templates/base.html:86 templates/base.html.py:107 templates/base.html:113 -#: templates/catalogue/book_detail.html:132 +#: templates/base.html:85 templates/base.html.py:106 templates/base.html:112 +#: templates/catalogue/book_detail.html:146 #: templates/catalogue/book_fragments.html:33 #: templates/catalogue/book_stub_detail.html:31 -#: templates/catalogue/search_multiple_hits.html:23 +#: templates/catalogue/differentiate_tags.html:23 +#: templates/catalogue/search_multiple_hits.html:29 #: templates/catalogue/search_no_hits.html:22 #: templates/catalogue/search_too_short.html:19 -#: templates/catalogue/tagged_object_list.html:154 +#: templates/catalogue/tagged_object_list.html:155 msgid "Close" msgstr "" -#: templates/base.html:109 templates/base.html.py:115 -#: templates/catalogue/book_detail.html:134 +#: templates/base.html:108 templates/base.html.py:114 +#: templates/catalogue/book_detail.html:148 #: templates/catalogue/book_fragments.html:35 #: templates/catalogue/book_stub_detail.html:33 -#: templates/catalogue/search_multiple_hits.html:25 +#: templates/catalogue/differentiate_tags.html:25 +#: templates/catalogue/search_multiple_hits.html:31 #: templates/catalogue/search_no_hits.html:24 #: templates/catalogue/search_too_short.html:21 -#: templates/catalogue/tagged_object_list.html:156 +#: templates/catalogue/tagged_object_list.html:157 msgid "Loading" msgstr "" @@ -192,7 +154,7 @@ msgstr "" #: templates/catalogue/book_fragments.html:12 #: templates/catalogue/book_list.html:12 #: templates/catalogue/book_stub_detail.html:12 -#: templates/catalogue/breadcrumbs.html:9 +#: templates/catalogue/breadcrumbs.html:21 #: templates/catalogue/main_page.html:13 templates/info/base.html:10 #: templates/lessons/document_detail.html:9 #: templates/lessons/document_list.html:51 @@ -204,7 +166,7 @@ msgstr "" #: templates/catalogue/book_list.html:12 #: templates/catalogue/book_stub_detail.html:12 #: templates/catalogue/main_page.html:13 -#: templates/catalogue/tagged_object_list.html:42 templates/info/base.html:10 +#: templates/catalogue/tagged_object_list.html:43 templates/info/base.html:10 #: templates/lessons/document_detail.html:9 #: templates/lessons/document_list.html:51 msgid "or" @@ -221,104 +183,99 @@ msgstr "" msgid "on WolneLektury.pl" msgstr "" -#: templates/catalogue/book_detail.html:17 +#: templates/catalogue/book_detail.html:29 msgid "Work is licensed under " msgstr "" -#: templates/catalogue/book_detail.html:19 +#: templates/catalogue/book_detail.html:31 msgid "Based on" msgstr "" -#: templates/catalogue/book_detail.html:24 -#: templates/catalogue/tagged_object_list.html:27 -msgid "Hide description" -msgstr "" - -#: templates/catalogue/book_detail.html:27 +#: templates/catalogue/book_detail.html:40 msgid "Put a book" msgstr "" -#: templates/catalogue/book_detail.html:27 +#: templates/catalogue/book_detail.html:40 msgid "on the shelf!" msgstr "" -#: templates/catalogue/book_detail.html:31 +#: templates/catalogue/book_detail.html:44 msgid "Read online" msgstr "" -#: templates/catalogue/book_detail.html:34 +#: templates/catalogue/book_detail.html:47 msgid "Download PDF" msgstr "" -#: templates/catalogue/book_detail.html:37 +#: templates/catalogue/book_detail.html:50 msgid "Download EPUB" msgstr "" -#: templates/catalogue/book_detail.html:40 +#: templates/catalogue/book_detail.html:53 msgid "Download ODT" msgstr "" -#: templates/catalogue/book_detail.html:43 +#: templates/catalogue/book_detail.html:56 msgid "Download TXT" msgstr "" -#: templates/catalogue/book_detail.html:48 +#: templates/catalogue/book_detail.html:61 msgid "Artist" msgstr "" -#: templates/catalogue/book_detail.html:50 +#: templates/catalogue/book_detail.html:63 msgid "Director" msgstr "" -#: templates/catalogue/book_detail.html:54 +#: templates/catalogue/book_detail.html:67 msgid "Download MP3" msgstr "" -#: templates/catalogue/book_detail.html:55 +#: templates/catalogue/book_detail.html:68 msgid "Download Ogg Vorbis" msgstr "" -#: templates/catalogue/book_detail.html:82 +#: templates/catalogue/book_detail.html:95 msgid "Details" msgstr "" -#: templates/catalogue/book_detail.html:85 +#: templates/catalogue/book_detail.html:99 msgid "Author" msgstr "" -#: templates/catalogue/book_detail.html:91 +#: templates/catalogue/book_detail.html:105 msgid "Epoch" msgstr "" -#: templates/catalogue/book_detail.html:97 +#: templates/catalogue/book_detail.html:111 msgid "Kind" msgstr "" -#: templates/catalogue/book_detail.html:103 +#: templates/catalogue/book_detail.html:117 msgid "Genre" msgstr "" -#: templates/catalogue/book_detail.html:109 +#: templates/catalogue/book_detail.html:123 msgid "Other resources" msgstr "" -#: templates/catalogue/book_detail.html:111 +#: templates/catalogue/book_detail.html:125 msgid "Book on project's wiki" msgstr "" -#: templates/catalogue/book_detail.html:112 +#: templates/catalogue/book_detail.html:126 msgid "Source of the book" msgstr "" -#: templates/catalogue/book_detail.html:114 +#: templates/catalogue/book_detail.html:128 msgid "Book description on Lektury.Gazeta.pl" msgstr "" -#: templates/catalogue/book_detail.html:117 +#: templates/catalogue/book_detail.html:131 msgid "Book description on Wikipedia" msgstr "" -#: templates/catalogue/book_detail.html:122 +#: templates/catalogue/book_detail.html:136 msgid "Work's themes " msgstr "" @@ -349,28 +306,28 @@ msgid "of the book " msgstr "" #: templates/catalogue/book_list.html:7 -msgid "Alphabetical listing of works on WolneLektury.pl" +msgid "Listing of all works on WolneLektury.pl" msgstr "" #: templates/catalogue/book_list.html:10 -msgid "Alphabetical listing of works" +msgid "Listing of all works" msgstr "" #: templates/catalogue/book_sets.html:2 msgid "Put a book on the shelf!" msgstr "" -#: templates/catalogue/book_sets.html:4 -msgid "You do not have any shelves. You can create one below, if you want to." +#: templates/catalogue/book_sets.html:3 templates/catalogue/book_sets.html:6 +#: templates/catalogue/fragment_sets.html:16 +msgid "Create new shelf" msgstr "" -#: templates/catalogue/book_sets.html:9 templates/catalogue/book_short.html:4 -msgid "Put on the shelf!" +#: templates/catalogue/book_sets.html:10 +msgid "You do not have any shelves. You can create one below, if you want to." msgstr "" -#: templates/catalogue/book_sets.html:16 -#: templates/catalogue/fragment_sets.html:16 -msgid "Create new shelf" +#: templates/catalogue/book_sets.html:15 templates/catalogue/book_short.html:4 +msgid "Put on the shelf!" msgstr "" #: templates/catalogue/book_short.html:14 @@ -406,10 +363,14 @@ msgid "Table of contents" msgstr "" #: templates/catalogue/book_text.html:18 -#: templates/catalogue/tagged_object_list.html:145 +#: templates/catalogue/tagged_object_list.html:146 msgid "Themes" msgstr "" +#: templates/catalogue/differentiate_tags.html:13 +msgid "The criteria are ambiguous. Please select one of the following options:" +msgstr "" + #: templates/catalogue/folded_tag_list.html:4 msgid "Show full category" msgstr "" @@ -440,15 +401,15 @@ msgstr "" msgid "Save all shelves" msgstr "" -#: templates/catalogue/fragment_short.html:6 +#: templates/catalogue/fragment_short.html:7 msgid "Expand fragment" msgstr "" -#: templates/catalogue/fragment_short.html:12 +#: templates/catalogue/fragment_short.html:13 msgid "Hide fragment" msgstr "" -#: templates/catalogue/fragment_short.html:17 +#: templates/catalogue/fragment_short.html:18 msgid "See in a book" msgstr "" @@ -513,22 +474,22 @@ msgid "" msgstr "" #: templates/catalogue/main_page.html:54 -#: templates/catalogue/tagged_object_list.html:127 +#: templates/catalogue/tagged_object_list.html:128 msgid "Authors" msgstr "" #: templates/catalogue/main_page.html:58 -#: templates/catalogue/tagged_object_list.html:131 +#: templates/catalogue/tagged_object_list.html:132 msgid "Kinds" msgstr "" #: templates/catalogue/main_page.html:62 -#: templates/catalogue/tagged_object_list.html:135 +#: templates/catalogue/tagged_object_list.html:136 msgid "Genres" msgstr "" #: templates/catalogue/main_page.html:66 -#: templates/catalogue/tagged_object_list.html:139 +#: templates/catalogue/tagged_object_list.html:140 msgid "Epochs" msgstr "" @@ -593,7 +554,7 @@ msgid "Search in WolneLektury.pl" msgstr "" #: templates/catalogue/search_no_hits.html:14 -#: templates/catalogue/tagged_object_list.html:115 +#: templates/catalogue/tagged_object_list.html:116 msgid "Sorry! Search cirteria did not match any resources." msgstr "" @@ -622,139 +583,139 @@ msgid "" "'Put on the shelf'." msgstr "" -#: templates/catalogue/tagged_object_list.html:31 +#: templates/catalogue/tagged_object_list.html:32 msgid "Download all books from this shelf" msgstr "" -#: templates/catalogue/tagged_object_list.html:35 +#: templates/catalogue/tagged_object_list.html:36 msgid "Choose books' formats which you want to download:" msgstr "" -#: templates/catalogue/tagged_object_list.html:36 -#: templates/catalogue/tagged_object_list.html:38 +#: templates/catalogue/tagged_object_list.html:37 #: templates/catalogue/tagged_object_list.html:39 +#: templates/catalogue/tagged_object_list.html:40 msgid "for reading" msgstr "" -#: templates/catalogue/tagged_object_list.html:36 +#: templates/catalogue/tagged_object_list.html:37 msgid "and printing using" msgstr "" -#: templates/catalogue/tagged_object_list.html:38 +#: templates/catalogue/tagged_object_list.html:39 msgid "and editing using" msgstr "" -#: templates/catalogue/tagged_object_list.html:39 +#: templates/catalogue/tagged_object_list.html:40 msgid "on small displays, for example mobile phones" msgstr "" -#: templates/catalogue/tagged_object_list.html:40 #: templates/catalogue/tagged_object_list.html:41 +#: templates/catalogue/tagged_object_list.html:42 msgid "for listening" msgstr "" -#: templates/catalogue/tagged_object_list.html:40 +#: templates/catalogue/tagged_object_list.html:41 msgid "on favourite MP3 player" msgstr "" -#: templates/catalogue/tagged_object_list.html:41 +#: templates/catalogue/tagged_object_list.html:42 msgid "open format" msgstr "" -#: templates/catalogue/tagged_object_list.html:41 +#: templates/catalogue/tagged_object_list.html:42 msgid "Xiph.org Foundation" msgstr "" -#: templates/catalogue/tagged_object_list.html:42 +#: templates/catalogue/tagged_object_list.html:43 #: templates/lessons/ajax_document_detail.html:3 #: templates/lessons/document_detail.html:13 msgid "Download" msgstr "" -#: templates/catalogue/tagged_object_list.html:42 +#: templates/catalogue/tagged_object_list.html:43 msgid "Updating list of books' formats on the shelf" msgstr "" -#: templates/catalogue/tagged_object_list.html:42 +#: templates/catalogue/tagged_object_list.html:43 msgid "cancel" msgstr "" -#: templates/catalogue/tagged_object_list.html:47 +#: templates/catalogue/tagged_object_list.html:48 msgid "Share this shelf" msgstr "" -#: templates/catalogue/tagged_object_list.html:49 +#: templates/catalogue/tagged_object_list.html:50 msgid "" "Copy this link and share it with other people to let them see your shelf." msgstr "" -#: templates/catalogue/tagged_object_list.html:59 +#: templates/catalogue/tagged_object_list.html:60 msgid "Read work's study of this author on Lektury.Gazeta.pl" msgstr "" -#: templates/catalogue/tagged_object_list.html:61 +#: templates/catalogue/tagged_object_list.html:62 #, python-format msgid "Read study of epoch %(last_tag)s on Lektury.Gazeta.pl" msgstr "" -#: templates/catalogue/tagged_object_list.html:63 +#: templates/catalogue/tagged_object_list.html:64 #, python-format msgid "Read study of kind %(last_tag)s on Lektury.Gazeta.pl" msgstr "" -#: templates/catalogue/tagged_object_list.html:65 +#: templates/catalogue/tagged_object_list.html:66 #, python-format msgid "Read study of genre %(last_tag)s on Lektury.Gazeta.pl" msgstr "" -#: templates/catalogue/tagged_object_list.html:67 +#: templates/catalogue/tagged_object_list.html:68 msgid "Read related study on Lektury.Gazeta.pl" msgstr "" -#: templates/catalogue/tagged_object_list.html:75 +#: templates/catalogue/tagged_object_list.html:76 msgid "Read article about this author on Wikipedia" msgstr "" -#: templates/catalogue/tagged_object_list.html:77 +#: templates/catalogue/tagged_object_list.html:78 #, python-format msgid "Read article about epoch %(last_tag)s on Wikipedia" msgstr "" -#: templates/catalogue/tagged_object_list.html:79 +#: templates/catalogue/tagged_object_list.html:80 #, python-format msgid "Read article about kind %(last_tag)s on Wikipedia" msgstr "" -#: templates/catalogue/tagged_object_list.html:81 +#: templates/catalogue/tagged_object_list.html:82 #, python-format msgid "Read article about genre %(last_tag)s on Wikipedia" msgstr "" -#: templates/catalogue/tagged_object_list.html:83 +#: templates/catalogue/tagged_object_list.html:84 msgid "Read related article on Wikipedia" msgstr "" -#: templates/catalogue/tagged_object_list.html:93 +#: templates/catalogue/tagged_object_list.html:94 msgid "Delete" msgstr "" -#: templates/catalogue/tagged_object_list.html:101 +#: templates/catalogue/tagged_object_list.html:102 msgid "This author's works are copyrighted." msgstr "" -#: templates/catalogue/tagged_object_list.html:104 +#: templates/catalogue/tagged_object_list.html:105 msgid "" "This author's works are in public domain and will be published on Internet " "school library of Wolne Lektury soon." msgstr "" -#: templates/catalogue/tagged_object_list.html:108 +#: templates/catalogue/tagged_object_list.html:109 msgid "" "This author's works will become part of public domain and will be allowed to " "be published without restrictions in" msgstr "" -#: templates/catalogue/tagged_object_list.html:110 +#: templates/catalogue/tagged_object_list.html:111 msgid "Find out why Internet libraries can't publish this author's works." msgstr "" @@ -771,6 +732,7 @@ msgid "return to the main page" msgstr "" #: templates/info/join_us.html:2 +#, python-format msgid "" "We have over 1000 works published in Wolne Lektury!\n" "Help us expand the library and set new readings free by\n" diff --git a/wolnelektury/locale/es/LC_MESSAGES/django.mo b/wolnelektury/locale/es/LC_MESSAGES/django.mo index 81f071eea..be4d3ec84 100644 Binary files a/wolnelektury/locale/es/LC_MESSAGES/django.mo and b/wolnelektury/locale/es/LC_MESSAGES/django.mo differ diff --git a/wolnelektury/locale/es/LC_MESSAGES/django.po b/wolnelektury/locale/es/LC_MESSAGES/django.po index af0e4a3f4..4b8669bc4 100644 --- a/wolnelektury/locale/es/LC_MESSAGES/django.po +++ b/wolnelektury/locale/es/LC_MESSAGES/django.po @@ -2,53 +2,21 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 14:29+0200\n" -"PO-Revision-Date: 2010-08-10 17:07+0100\n" -"Last-Translator: Katarzyna Flis \n" +"POT-Creation-Date: 2010-08-25 10:24+0000\n" +"PO-Revision-Date: 2010-08-25 10:49\n" +"Last-Translator: \n" "Language-Team: 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.6\n" -#: settings.py:37 -msgid "Polish" -msgstr "polaco" - -#: settings.py:38 -msgid "German" -msgstr "alemán" - -#: settings.py:39 -msgid "English" -msgstr "inglés" - -#: settings.py:40 -msgid "Lithuanian" -msgstr "lituano" - -#: settings.py:41 -msgid "French" -msgstr "francés" - -#: settings.py:42 -msgid "Russian" -msgstr "ruso" - -#: settings.py:43 -msgid "Spanish" -msgstr "español" - -#: settings.py:44 -msgid "Ukrainian" -msgstr "ucraniano" - -#: templates/404.html:6 -#: templates/404.html.py:15 +#: templates/404.html:6 templates/404.html.py:15 msgid "Page does not exist" msgstr "Página no existe" @@ -60,8 +28,7 @@ msgstr "Lo sentimos, esta página no existe. Comprueba si la dirección es corre msgid "main page" msgstr "página principal" -#: templates/500.html:6 -#: templates/500.html.py:54 +#: templates/500.html:6 templates/500.html.py:54 msgid "Server error" msgstr "Error del servidor" @@ -69,8 +36,7 @@ msgstr "Error del servidor" msgid "

The Wolnelektury.pl site is currently unavailable. Meanwhile, visit our blog.

Inform our administrators about the error.

" msgstr "

La página Wolnelektury.pl actualmente no está disponible. Mientras tanto visita nuestro blog.

Informa a nuestros administradores sobre el error.

" -#: templates/503.html:6 -#: templates/503.html.py:54 +#: templates/503.html:6 templates/503.html.py:54 msgid "Service unavailable" msgstr "Servicio no está disponible" @@ -78,60 +44,48 @@ msgstr "Servicio no está disponible" msgid "The Wolnelektury.pl site is currently unavailable due to maintainance." msgstr "La página Wolnelektury.pl no está disponible debido al mantenimiento." -#: templates/base.html:20 +#: templates/base.html:19 msgid "Internet Explorer cannot display this site properly. Click here to read more..." msgstr "Internet Explorer no puede mostrar esta página correctamente. Haz clic aquí para saber más..." -#: templates/base.html:33 +#: templates/base.html:32 msgid "Welcome" msgstr "Bienvenido(a)" -#: templates/base.html:34 +#: templates/base.html:33 msgid "Your shelves" msgstr "Tus estantes" -#: templates/base.html:36 +#: templates/base.html:35 msgid "Administration" msgstr "Administración" +#: templates/base.html:37 templates/base.html.py:41 +msgid "Report a bug" +msgstr "" + #: templates/base.html:38 msgid "Logout" msgstr "Cerrar sesión" -#: templates/base.html:41 -#: templates/base.html.py:87 -#: templates/base.html:91 -#: templates/base.html.py:95 -#: templates/auth/login.html:4 -#: templates/auth/login.html.py:7 -#: templates/auth/login.html:12 +#: templates/base.html:42 templates/base.html.py:88 templates/base.html:92 +#: templates/base.html.py:96 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 "Iniciar sesión" -#: templates/base.html:41 -#: templates/base.html.py:87 -#: templates/base.html:95 -#: templates/base.html.py:99 -#: templates/auth/login.html:7 -#: templates/auth/login.html.py:21 -#: templates/auth/login.html:23 +#: templates/base.html:42 templates/base.html.py:88 templates/base.html:96 +#: templates/base.html.py:100 templates/auth/login.html:7 +#: templates/auth/login.html.py:21 templates/auth/login.html:23 msgid "Register" msgstr "Registrarse" -#: templates/base.html:51 -msgid "Choose your interface language: " -msgstr "Elige el idioma de la interfaz:" - -#: templates/base.html:56 -msgid "Choose language" -msgstr "Elige el idioma" - -#: templates/base.html:68 +#: templates/base.html:69 msgid "" "\n" "\t\t\t\tWolne Lektury is a project lead by Modern Poland Foundation.\n" -"\t\t\t\tDigital reproductions are made by The National Library, based on TNL resources. \n" +"\t\t\t\tDigital reproductions are made by The National Library, based on TNL resources.\n" "\t\t\t\tHosting EO Networks.\n" "\t\t\t\t" msgstr "" @@ -141,7 +95,7 @@ msgstr "" "\t\t\t\tHosting EO Networks.\n" "\t\t\t\t " -#: templates/base.html:75 +#: templates/base.html:76 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" @@ -153,31 +107,31 @@ msgstr "" " e-mail: fundacja@nowoczesnapolska.org.pl\n" "\t\t\t\t" -#: templates/base.html:84 -#: templates/base.html.py:105 -#: templates/catalogue/book_detail.html:129 +#: templates/base.html:85 templates/base.html.py:106 templates/base.html:112 +#: templates/catalogue/book_detail.html:146 #: templates/catalogue/book_fragments.html:33 #: templates/catalogue/book_stub_detail.html:31 -#: templates/catalogue/search_multiple_hits.html:23 +#: templates/catalogue/differentiate_tags.html:23 +#: templates/catalogue/search_multiple_hits.html:29 #: templates/catalogue/search_no_hits.html:22 #: templates/catalogue/search_too_short.html:19 -#: templates/catalogue/tagged_object_list.html:141 +#: templates/catalogue/tagged_object_list.html:155 msgid "Close" msgstr "Cerrar" -#: templates/base.html:107 -#: templates/catalogue/book_detail.html:131 +#: templates/base.html:108 templates/base.html.py:114 +#: templates/catalogue/book_detail.html:148 #: templates/catalogue/book_fragments.html:35 #: templates/catalogue/book_stub_detail.html:33 -#: templates/catalogue/search_multiple_hits.html:25 +#: templates/catalogue/differentiate_tags.html:25 +#: templates/catalogue/search_multiple_hits.html:31 #: templates/catalogue/search_no_hits.html:24 #: templates/catalogue/search_too_short.html:21 -#: templates/catalogue/tagged_object_list.html:143 +#: templates/catalogue/tagged_object_list.html:157 msgid "Loading" msgstr "Cargando" -#: templates/admin/base_site.html:4 -#: templates/admin/base_site.html.py:7 +#: templates/admin/base_site.html:4 templates/admin/base_site.html.py:7 msgid "Site administration" msgstr "Administración de la página" @@ -193,34 +147,29 @@ msgstr "Importar el libro" msgid "Register on" msgstr "Registrarse en" -#: templates/auth/login.html:9 -#: templates/catalogue/book_detail.html:12 +#: templates/auth/login.html:9 templates/catalogue/book_detail.html:12 #: templates/catalogue/book_fragments.html:12 #: templates/catalogue/book_list.html:12 #: templates/catalogue/book_stub_detail.html:12 -#: templates/catalogue/breadcrumbs.html:9 -#: templates/catalogue/main_page.html:13 -#: templates/info/base.html:10 +#: templates/catalogue/breadcrumbs.html:21 +#: templates/catalogue/main_page.html:13 templates/info/base.html:10 #: templates/lessons/document_detail.html:9 #: templates/lessons/document_list.html:51 msgid "Search" msgstr "Buscar" -#: templates/auth/login.html:9 -#: templates/catalogue/book_detail.html:12 +#: templates/auth/login.html:9 templates/catalogue/book_detail.html:12 #: templates/catalogue/book_fragments.html:12 #: templates/catalogue/book_list.html:12 #: templates/catalogue/book_stub_detail.html:12 #: templates/catalogue/main_page.html:13 -#: templates/catalogue/tagged_object_list.html:41 -#: templates/info/base.html:10 +#: templates/catalogue/tagged_object_list.html:43 templates/info/base.html:10 #: templates/lessons/document_detail.html:9 #: templates/lessons/document_list.html:51 msgid "or" msgstr "o" -#: templates/auth/login.html:9 -#: templates/catalogue/book_detail.html:12 +#: templates/auth/login.html:9 templates/catalogue/book_detail.html:12 #: templates/catalogue/book_list.html:12 #: templates/catalogue/book_stub_detail.html:12 #: templates/lessons/document_list.html:51 @@ -231,100 +180,99 @@ msgstr "volver a la página principal" msgid "on WolneLektury.pl" msgstr "en WolneLektury.pl" -#: templates/catalogue/book_detail.html:17 +#: templates/catalogue/book_detail.html:29 msgid "Work is licensed under " msgstr "Las obras se distribuyen bajo licencia" -#: templates/catalogue/book_detail.html:19 +#: templates/catalogue/book_detail.html:31 msgid "Based on" msgstr "Basado en" -#: templates/catalogue/book_detail.html:24 -#: templates/catalogue/tagged_object_list.html:27 -msgid "Hide description" -msgstr "Esconder la descripción" - -#: templates/catalogue/book_detail.html:27 +#: templates/catalogue/book_detail.html:40 msgid "Put a book" msgstr "¡Poner un libro" -#: templates/catalogue/book_detail.html:27 +#: templates/catalogue/book_detail.html:40 msgid "on the shelf!" msgstr "en el estante!" -#: templates/catalogue/book_detail.html:31 +#: templates/catalogue/book_detail.html:44 msgid "Read online" msgstr "Leer online" -#: templates/catalogue/book_detail.html:34 +#: templates/catalogue/book_detail.html:47 msgid "Download PDF" msgstr "Descargar PDF" -#: templates/catalogue/book_detail.html:37 +#: templates/catalogue/book_detail.html:50 +msgid "Download EPUB" +msgstr "Descargar EPUB" + +#: templates/catalogue/book_detail.html:53 msgid "Download ODT" msgstr "Descargar ODT" -#: templates/catalogue/book_detail.html:40 +#: templates/catalogue/book_detail.html:56 msgid "Download TXT" msgstr "Descargar TXT" -#: templates/catalogue/book_detail.html:45 +#: templates/catalogue/book_detail.html:61 msgid "Artist" msgstr "Artista" -#: templates/catalogue/book_detail.html:47 +#: templates/catalogue/book_detail.html:63 msgid "Director" msgstr "Director" -#: templates/catalogue/book_detail.html:51 +#: templates/catalogue/book_detail.html:67 msgid "Download MP3" msgstr "Descargar MP3" -#: templates/catalogue/book_detail.html:52 +#: templates/catalogue/book_detail.html:68 msgid "Download Ogg Vorbis" msgstr "Descargar Ogg Vorbis" -#: templates/catalogue/book_detail.html:79 +#: templates/catalogue/book_detail.html:95 msgid "Details" msgstr "Detalles" -#: templates/catalogue/book_detail.html:82 +#: templates/catalogue/book_detail.html:99 msgid "Author" msgstr "Autor" -#: templates/catalogue/book_detail.html:88 +#: templates/catalogue/book_detail.html:105 msgid "Epoch" msgstr "Época" -#: templates/catalogue/book_detail.html:94 +#: templates/catalogue/book_detail.html:111 msgid "Kind" msgstr "Género" -#: templates/catalogue/book_detail.html:100 +#: templates/catalogue/book_detail.html:117 msgid "Genre" msgstr "Subgénero" -#: templates/catalogue/book_detail.html:106 +#: templates/catalogue/book_detail.html:123 msgid "Other resources" msgstr "Otros recursos" -#: templates/catalogue/book_detail.html:108 +#: templates/catalogue/book_detail.html:125 msgid "Book on project's wiki" msgstr "Libro en wiki del proyecto" -#: templates/catalogue/book_detail.html:109 +#: templates/catalogue/book_detail.html:126 msgid "Source of the book" msgstr "Fuente del libro" -#: templates/catalogue/book_detail.html:111 +#: templates/catalogue/book_detail.html:128 msgid "Book description on Lektury.Gazeta.pl" msgstr "Descripción del libro en Lektury.Gazeta.pl" -#: templates/catalogue/book_detail.html:114 +#: templates/catalogue/book_detail.html:131 msgid "Book description on Wikipedia" msgstr "Descripción del libro en Wikipedia" -#: templates/catalogue/book_detail.html:119 +#: templates/catalogue/book_detail.html:136 msgid "Work's themes " msgstr "Temas de la obra" @@ -355,31 +303,30 @@ msgid "of the book " msgstr "del libro" #: templates/catalogue/book_list.html:7 -msgid "Alphabetical listing of works on WolneLektury.pl" -msgstr "Lista alfabética de las obras en WolneLektury.pl" +msgid "Listing of all works on WolneLektury.pl" +msgstr "Lista de las obras en WolneLektury.pl" #: templates/catalogue/book_list.html:10 -msgid "Alphabetical listing of works" -msgstr "Lista alfabética de las obras" +msgid "Listing of all works" +msgstr "Lista de las obras" #: templates/catalogue/book_sets.html:2 msgid "Put a book on the shelf!" msgstr "¡Poner un libro en el estante!" -#: templates/catalogue/book_sets.html:4 +#: templates/catalogue/book_sets.html:3 templates/catalogue/book_sets.html:6 +#: templates/catalogue/fragment_sets.html:16 +msgid "Create new shelf" +msgstr "Crear un estante nuevo" + +#: templates/catalogue/book_sets.html:10 msgid "You do not have any shelves. You can create one below, if you want to." msgstr "No tienes ningún estante. Puedes crear uno abajo si quieres." -#: templates/catalogue/book_sets.html:9 -#: templates/catalogue/book_short.html:4 +#: templates/catalogue/book_sets.html:15 templates/catalogue/book_short.html:4 msgid "Put on the shelf!" msgstr "¡Poner en el estante!" -#: templates/catalogue/book_sets.html:16 -#: templates/catalogue/fragment_sets.html:16 -msgid "Create new shelf" -msgstr "Crear un estante nuevo" - #: templates/catalogue/book_short.html:14 msgid "Jump to" msgstr "Saltar a" @@ -409,17 +356,20 @@ msgid "Table of contents" msgstr "Índice" #: templates/catalogue/book_text.html:18 -#: templates/catalogue/tagged_object_list.html:132 +#: templates/catalogue/tagged_object_list.html:146 msgid "Themes" msgstr "Temas" +#: templates/catalogue/differentiate_tags.html:13 +msgid "The criteria are ambiguous. Please select one of the following options:" +msgstr "" + #: templates/catalogue/folded_tag_list.html:4 msgid "Show full category" msgstr "Mostrar toda la categoría" #: templates/catalogue/folded_tag_list.html:13 -#: templates/catalogue/main_page.html:43 -#: templates/catalogue/main_page.html:48 +#: templates/catalogue/main_page.html:43 templates/catalogue/main_page.html:48 #: templates/catalogue/main_page.html:87 #: templates/catalogue/main_page.html:270 #: templates/catalogue/main_page.html:279 @@ -444,15 +394,15 @@ msgstr "No tienes ningún estante. Puedes crear uno abajo si quieres." msgid "Save all shelves" msgstr "Guardar todos los estantes" -#: templates/catalogue/fragment_short.html:6 +#: templates/catalogue/fragment_short.html:7 msgid "Expand fragment" msgstr "Ampliar este fragmento" -#: templates/catalogue/fragment_short.html:12 +#: templates/catalogue/fragment_short.html:13 msgid "Hide fragment" msgstr "Esconder este fragmento" -#: templates/catalogue/fragment_short.html:17 +#: templates/catalogue/fragment_short.html:18 msgid "See in a book" msgstr "Ver en el libro" @@ -512,22 +462,22 @@ msgid "are professional recordings of literary texts from our repository, availa msgstr "son grabaciones profesionales de textos literarios de nuestro depósito. Están disponibles gratis en formatos MP3, Ogg Vorbis y en el sistema DAISY. " #: templates/catalogue/main_page.html:54 -#: templates/catalogue/tagged_object_list.html:114 +#: templates/catalogue/tagged_object_list.html:128 msgid "Authors" msgstr "Autores" #: templates/catalogue/main_page.html:58 -#: templates/catalogue/tagged_object_list.html:118 +#: templates/catalogue/tagged_object_list.html:132 msgid "Kinds" msgstr "Géneros" #: templates/catalogue/main_page.html:62 -#: templates/catalogue/tagged_object_list.html:122 +#: templates/catalogue/tagged_object_list.html:136 msgid "Genres" msgstr "Subgéneros" #: templates/catalogue/main_page.html:66 -#: templates/catalogue/tagged_object_list.html:126 +#: templates/catalogue/tagged_object_list.html:140 msgid "Epochs" msgstr "Épocas" @@ -587,7 +537,7 @@ msgid "Search in WolneLektury.pl" msgstr "Buscar en WolneLektury.pl" #: templates/catalogue/search_no_hits.html:14 -#: templates/catalogue/tagged_object_list.html:102 +#: templates/catalogue/tagged_object_list.html:116 msgid "Sorry! Search cirteria did not match any resources." msgstr "Lo sentimos, no hay resultados que corresponden con los criterios de la búsqueda." @@ -615,112 +565,136 @@ msgstr "Tu estante está vacío" msgid "You can put a book on a shelf by entering page of the reading and clicking 'Put on the shelf'." msgstr "Puedes poner un libro en el estante entrando en la página de aquella lectura y haciendo clic en \"Poner en el estante\"." -#: templates/catalogue/tagged_object_list.html:31 +#: templates/catalogue/tagged_object_list.html:32 msgid "Download all books from this shelf" msgstr "Descargar todos los libros de este estante" -#: templates/catalogue/tagged_object_list.html:35 +#: templates/catalogue/tagged_object_list.html:36 msgid "Choose books' formats which you want to download:" msgstr "Elige formatos de los libros que quieres descargar:" -#: templates/catalogue/tagged_object_list.html:36 #: 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 "para leer" -#: templates/catalogue/tagged_object_list.html:36 +#: templates/catalogue/tagged_object_list.html:37 msgid "and printing using" msgstr "e imprimir" -#: templates/catalogue/tagged_object_list.html:37 +#: templates/catalogue/tagged_object_list.html:39 msgid "and editing using" msgstr "y editar" -#: templates/catalogue/tagged_object_list.html:38 +#: templates/catalogue/tagged_object_list.html:40 msgid "on small displays, for example mobile phones" msgstr "en pantallas pequeñas como las de teléfonos móviles" -#: templates/catalogue/tagged_object_list.html:39 -#: templates/catalogue/tagged_object_list.html:40 +#: templates/catalogue/tagged_object_list.html:41 +#: templates/catalogue/tagged_object_list.html:42 msgid "for listening" msgstr "para escuchar" -#: templates/catalogue/tagged_object_list.html:39 +#: templates/catalogue/tagged_object_list.html:41 msgid "on favourite MP3 player" msgstr "en tu reproductor de MP3 favorito." -#: templates/catalogue/tagged_object_list.html:40 +#: templates/catalogue/tagged_object_list.html:42 msgid "open format" msgstr "formato abierto" -#: templates/catalogue/tagged_object_list.html:40 +#: templates/catalogue/tagged_object_list.html:42 msgid "Xiph.org Foundation" msgstr "Fundación Xiph.org" -#: templates/catalogue/tagged_object_list.html:41 +#: templates/catalogue/tagged_object_list.html:43 #: templates/lessons/ajax_document_detail.html:3 #: templates/lessons/document_detail.html:13 msgid "Download" msgstr "Descargar" -#: templates/catalogue/tagged_object_list.html:41 +#: templates/catalogue/tagged_object_list.html:43 msgid "Updating list of books' formats on the shelf" msgstr "Actualizando la lista de formatos de los libros en el estante" -#: templates/catalogue/tagged_object_list.html:41 +#: templates/catalogue/tagged_object_list.html:43 msgid "cancel" msgstr "cancelar" -#: templates/catalogue/tagged_object_list.html:46 +#: templates/catalogue/tagged_object_list.html:48 msgid "Share this shelf" msgstr "Compartir este estante" -#: templates/catalogue/tagged_object_list.html:48 +#: templates/catalogue/tagged_object_list.html:50 msgid "Copy this link and share it with other people to let them see your shelf." msgstr "Copia este enlace y compártelo con otros para que puedan ver tu estante. " -#: templates/catalogue/tagged_object_list.html:57 +#: templates/catalogue/tagged_object_list.html:60 msgid "Read work's study of this author on Lektury.Gazeta.pl" msgstr "Leer el estudio sobre las obras de este autor en Lektury.Gazeta.pl" -#: templates/catalogue/tagged_object_list.html:60 -msgid "Read study of epoch" -msgstr "Leer el estudio sobre esta época" +#: templates/catalogue/tagged_object_list.html:62 +#, fuzzy, python-format +msgid "Read study of epoch %(last_tag)s on Lektury.Gazeta.pl" +msgstr "Leer el estudio sobre las obras de este autor en Lektury.Gazeta.pl" -#: templates/catalogue/tagged_object_list.html:60 -msgid "on Lektury.Gazeta.pl" -msgstr "en Lektury.Gazeta.pl" +#: templates/catalogue/tagged_object_list.html:64 +#, fuzzy, python-format +msgid "Read study of kind %(last_tag)s on Lektury.Gazeta.pl" +msgstr "Leer el estudio sobre las obras de este autor en Lektury.Gazeta.pl" -#: templates/catalogue/tagged_object_list.html:67 +#: templates/catalogue/tagged_object_list.html:66 +#, fuzzy, python-format +msgid "Read study of genre %(last_tag)s on Lektury.Gazeta.pl" +msgstr "Leer el estudio sobre las obras de este autor en Lektury.Gazeta.pl" + +#: templates/catalogue/tagged_object_list.html:68 +#, fuzzy +msgid "Read related study on Lektury.Gazeta.pl" +msgstr "Leer el estudio sobre las obras de este autor en Lektury.Gazeta.pl" + +#: templates/catalogue/tagged_object_list.html:76 msgid "Read article about this author on Wikipedia" msgstr "Leer el artículo sobre este autor en Wikipedia" -#: templates/catalogue/tagged_object_list.html:70 -msgid "Read article about epoch" -msgstr "Leer el artículo sobre esta época" - -#: templates/catalogue/tagged_object_list.html:70 -msgid "on Wikipedia" -msgstr "en Wikipedia" +#: templates/catalogue/tagged_object_list.html:78 +#, fuzzy, python-format +msgid "Read article about epoch %(last_tag)s on Wikipedia" +msgstr "Leer el artículo sobre este autor en Wikipedia" #: templates/catalogue/tagged_object_list.html:80 +#, fuzzy, python-format +msgid "Read article about kind %(last_tag)s on Wikipedia" +msgstr "Leer el artículo sobre este autor en Wikipedia" + +#: templates/catalogue/tagged_object_list.html:82 +#, fuzzy, python-format +msgid "Read article about genre %(last_tag)s on Wikipedia" +msgstr "Leer el artículo sobre este autor en Wikipedia" + +#: templates/catalogue/tagged_object_list.html:84 +#, fuzzy +msgid "Read related article on Wikipedia" +msgstr "Leer el artículo sobre este autor en Wikipedia" + +#: templates/catalogue/tagged_object_list.html:94 msgid "Delete" msgstr "Borrar" -#: templates/catalogue/tagged_object_list.html:88 +#: templates/catalogue/tagged_object_list.html:102 msgid "This author's works are copyrighted." msgstr "Las obras de este autor están protegidas por los derechos de autor." -#: templates/catalogue/tagged_object_list.html:91 +#: templates/catalogue/tagged_object_list.html:105 msgid "This author's works are in public domain and will be published on Internet school library of Wolne Lektury soon." msgstr "Las obras de este autor se encuentran en el dominio público y pronto serán publicadas en la biblioteca virtual de Wolne Lektury." -#: templates/catalogue/tagged_object_list.html:95 +#: templates/catalogue/tagged_object_list.html:109 msgid "This author's works will become part of public domain and will be allowed to be published without restrictions in" msgstr "Las obras de este autor entrarán en los recursos del dominio público y podrán ser publicadas sin restricciones en " -#: templates/catalogue/tagged_object_list.html:97 +#: templates/catalogue/tagged_object_list.html:111 msgid "Find out why Internet libraries can't publish this author's works." msgstr "Entérate por qué las bibliotecas virtuales no pueden publicar las obras de este autor." @@ -737,18 +711,16 @@ msgid "return to the main page" msgstr "volver a la página principal" #: templates/info/join_us.html:2 -#, python-format msgid "" "We have over 1000 works published in Wolne Lektury!\n" "Help us expand the library and set new readings free by\n" -"making a donation or transferring 1%% of your income tax." +"making a donation or transferring 1% of your income tax." msgstr "" "¡Hay más que 1000 obras publicadas en Wolne Lektury!\n" "Ayúdanos a desarrollar la biblioteca y publicar nuevas lecturas gratis\n" -"haciendo una donación o transfiriendo 1%% de tus impuestos." +"haciendo una donación o transfiriendo 1% de tus impuestos." -#: templates/info/join_us.html:5 -#: templates/info/join_us.html.py:10 +#: templates/info/join_us.html:5 templates/info/join_us.html.py:10 msgid "More..." msgstr "Más..." @@ -785,3 +757,47 @@ msgstr "anterior" msgid "next" msgstr "siguiente" +#~ msgid "Polish" +#~ msgstr "polaco" + +#~ msgid "German" +#~ msgstr "alemán" + +#~ msgid "English" +#~ msgstr "inglés" + +#~ msgid "Lithuanian" +#~ msgstr "lituano" + +#~ msgid "French" +#~ msgstr "francés" + +#~ msgid "Russian" +#~ msgstr "ruso" + +#~ msgid "Spanish" +#~ msgstr "español" + +#~ msgid "Ukrainian" +#~ msgstr "ucraniano" + +#~ msgid "Choose your interface language: " +#~ msgstr "Elige el idioma de la interfaz:" + +#~ msgid "Choose language" +#~ msgstr "Elige el idioma" + +#~ msgid "Hide description" +#~ msgstr "Esconder la descripción" + +#~ msgid "Read study of epoch" +#~ msgstr "Leer el estudio sobre esta época" + +#~ msgid "on Lektury.Gazeta.pl" +#~ msgstr "en Lektury.Gazeta.pl" + +#~ msgid "Read article about epoch" +#~ msgstr "Leer el artículo sobre esta época" + +#~ msgid "on Wikipedia" +#~ msgstr "en Wikipedia" diff --git a/wolnelektury/locale/fr/LC_MESSAGES/django.mo b/wolnelektury/locale/fr/LC_MESSAGES/django.mo index 26ee3f3bf..4eaf87c12 100644 Binary files a/wolnelektury/locale/fr/LC_MESSAGES/django.mo and b/wolnelektury/locale/fr/LC_MESSAGES/django.mo differ diff --git a/wolnelektury/locale/fr/LC_MESSAGES/django.po b/wolnelektury/locale/fr/LC_MESSAGES/django.po index ae409ba39..0b3ce8983 100644 --- a/wolnelektury/locale/fr/LC_MESSAGES/django.po +++ b/wolnelektury/locale/fr/LC_MESSAGES/django.po @@ -2,53 +2,21 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 14:29+0200\n" -"PO-Revision-Date: 2010-08-05 13:22+0100\n" -"Last-Translator: fg \n" +"POT-Creation-Date: 2010-08-25 10:23+0000\n" +"PO-Revision-Date: 2010-08-25 10:49\n" +"Last-Translator: \n" "Language-Team: 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.6\n" -#: settings.py:37 -msgid "Polish" -msgstr "polonais" - -#: settings.py:38 -msgid "German" -msgstr "allemand" - -#: settings.py:39 -msgid "English" -msgstr "anglais" - -#: settings.py:40 -msgid "Lithuanian" -msgstr "lituanien" - -#: settings.py:41 -msgid "French" -msgstr "français" - -#: settings.py:42 -msgid "Russian" -msgstr "russe" - -#: settings.py:43 -msgid "Spanish" -msgstr "espagnol" - -#: settings.py:44 -msgid "Ukrainian" -msgstr "ukrainien" - -#: templates/404.html:6 -#: templates/404.html.py:15 +#: templates/404.html:6 templates/404.html.py:15 msgid "Page does not exist" msgstr "La page n'existe pas" @@ -60,8 +28,7 @@ msgstr "Désolé, cette page n'existe pas. Verifiez si vous avez introduit l'adr msgid "main page" msgstr "accueil" -#: templates/500.html:6 -#: templates/500.html.py:54 +#: templates/500.html:6 templates/500.html.py:54 msgid "Server error" msgstr "Erreur du serveur" @@ -69,8 +36,7 @@ msgstr "Erreur du serveur" msgid "

The Wolnelektury.pl site is currently unavailable. Meanwhile, visit our blog.

Inform our administrators about the error.

" msgstr "

Le site Wolnelektury.pl est temporairement inaccessible. En attendant, visitez notre blog.

Informez nos administrateurs de l'erreur.

" -#: templates/503.html:6 -#: templates/503.html.py:54 +#: templates/503.html:6 templates/503.html.py:54 msgid "Service unavailable" msgstr "Service inaccessible" @@ -78,60 +44,48 @@ msgstr "Service inaccessible" msgid "The Wolnelektury.pl site is currently unavailable due to maintainance." msgstr "Le site Wolnelektury.pl est temporairement inaccessible en raison d'opérations de maintenance." -#: templates/base.html:20 +#: templates/base.html:19 msgid "Internet Explorer cannot display this site properly. Click here to read more..." msgstr "Internet Explorer ne peut pas afficher ce site correctement. Cliquer ici pour en savoir plus..." -#: templates/base.html:33 +#: templates/base.html:32 msgid "Welcome" msgstr "Bienvenue" -#: templates/base.html:34 +#: templates/base.html:33 msgid "Your shelves" msgstr "Vos étagères" -#: templates/base.html:36 +#: templates/base.html:35 msgid "Administration" msgstr "Administration" +#: templates/base.html:37 templates/base.html.py:41 +msgid "Report a bug" +msgstr "" + #: templates/base.html:38 msgid "Logout" msgstr "Déconnexion" -#: templates/base.html:41 -#: templates/base.html.py:87 -#: templates/base.html:91 -#: templates/base.html.py:95 -#: templates/auth/login.html:4 -#: templates/auth/login.html.py:7 -#: templates/auth/login.html:12 +#: templates/base.html:42 templates/base.html.py:88 templates/base.html:92 +#: templates/base.html.py:96 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 "Connexion" -#: templates/base.html:41 -#: templates/base.html.py:87 -#: templates/base.html:95 -#: templates/base.html.py:99 -#: templates/auth/login.html:7 -#: templates/auth/login.html.py:21 -#: templates/auth/login.html:23 +#: templates/base.html:42 templates/base.html.py:88 templates/base.html:96 +#: templates/base.html.py:100 templates/auth/login.html:7 +#: templates/auth/login.html.py:21 templates/auth/login.html:23 msgid "Register" msgstr "Créer un compte" -#: templates/base.html:51 -msgid "Choose your interface language: " -msgstr "Choisissez la langue de l'interface" - -#: templates/base.html:56 -msgid "Choose language" -msgstr "Choisissez la langue" - -#: templates/base.html:68 +#: templates/base.html:69 msgid "" "\n" "\t\t\t\tWolne Lektury is a project lead by Modern Poland Foundation.\n" -"\t\t\t\tDigital reproductions are made by The National Library, based on TNL resources. \n" +"\t\t\t\tDigital reproductions are made by The National Library, based on TNL resources.\n" "\t\t\t\tHosting EO Networks.\n" "\t\t\t\t" msgstr "" @@ -141,7 +95,7 @@ msgstr "" "\t\t\t\tHosting EO Networks.\n" "\t\t\t\t" -#: templates/base.html:75 +#: templates/base.html:76 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" @@ -153,31 +107,31 @@ msgstr "" " e-mail: fundacja@nowoczesnapolska.org.pl\n" "\t\t\t\t" -#: templates/base.html:84 -#: templates/base.html.py:105 -#: templates/catalogue/book_detail.html:129 +#: templates/base.html:85 templates/base.html.py:106 templates/base.html:112 +#: templates/catalogue/book_detail.html:146 #: templates/catalogue/book_fragments.html:33 #: templates/catalogue/book_stub_detail.html:31 -#: templates/catalogue/search_multiple_hits.html:23 +#: templates/catalogue/differentiate_tags.html:23 +#: templates/catalogue/search_multiple_hits.html:29 #: templates/catalogue/search_no_hits.html:22 #: templates/catalogue/search_too_short.html:19 -#: templates/catalogue/tagged_object_list.html:141 +#: templates/catalogue/tagged_object_list.html:155 msgid "Close" msgstr "Fermer" -#: templates/base.html:107 -#: templates/catalogue/book_detail.html:131 +#: templates/base.html:108 templates/base.html.py:114 +#: templates/catalogue/book_detail.html:148 #: templates/catalogue/book_fragments.html:35 #: templates/catalogue/book_stub_detail.html:33 -#: templates/catalogue/search_multiple_hits.html:25 +#: templates/catalogue/differentiate_tags.html:25 +#: templates/catalogue/search_multiple_hits.html:31 #: templates/catalogue/search_no_hits.html:24 #: templates/catalogue/search_too_short.html:21 -#: templates/catalogue/tagged_object_list.html:143 +#: templates/catalogue/tagged_object_list.html:157 msgid "Loading" msgstr "Chargement en cours" -#: templates/admin/base_site.html:4 -#: templates/admin/base_site.html.py:7 +#: templates/admin/base_site.html:4 templates/admin/base_site.html.py:7 msgid "Site administration" msgstr "Site de l'administrateur" @@ -193,34 +147,29 @@ msgstr "Importer le livre" msgid "Register on" msgstr "Régistrer sur" -#: templates/auth/login.html:9 -#: templates/catalogue/book_detail.html:12 +#: templates/auth/login.html:9 templates/catalogue/book_detail.html:12 #: templates/catalogue/book_fragments.html:12 #: templates/catalogue/book_list.html:12 #: templates/catalogue/book_stub_detail.html:12 -#: templates/catalogue/breadcrumbs.html:9 -#: templates/catalogue/main_page.html:13 -#: templates/info/base.html:10 +#: templates/catalogue/breadcrumbs.html:21 +#: templates/catalogue/main_page.html:13 templates/info/base.html:10 #: templates/lessons/document_detail.html:9 #: templates/lessons/document_list.html:51 msgid "Search" msgstr "Chercher" -#: templates/auth/login.html:9 -#: templates/catalogue/book_detail.html:12 +#: templates/auth/login.html:9 templates/catalogue/book_detail.html:12 #: templates/catalogue/book_fragments.html:12 #: templates/catalogue/book_list.html:12 #: templates/catalogue/book_stub_detail.html:12 #: templates/catalogue/main_page.html:13 -#: templates/catalogue/tagged_object_list.html:41 -#: templates/info/base.html:10 +#: templates/catalogue/tagged_object_list.html:43 templates/info/base.html:10 #: templates/lessons/document_detail.html:9 #: templates/lessons/document_list.html:51 msgid "or" msgstr "ou" -#: templates/auth/login.html:9 -#: templates/catalogue/book_detail.html:12 +#: templates/auth/login.html:9 templates/catalogue/book_detail.html:12 #: templates/catalogue/book_list.html:12 #: templates/catalogue/book_stub_detail.html:12 #: templates/lessons/document_list.html:51 @@ -231,100 +180,99 @@ msgstr "retourner à l'accueil" msgid "on WolneLektury.pl" msgstr "sur WolneLektury.pl" -#: templates/catalogue/book_detail.html:17 +#: templates/catalogue/book_detail.html:29 msgid "Work is licensed under " msgstr "Oeuvre sous licence " -#: templates/catalogue/book_detail.html:19 +#: templates/catalogue/book_detail.html:31 msgid "Based on" msgstr "Basé sur" -#: templates/catalogue/book_detail.html:24 -#: templates/catalogue/tagged_object_list.html:27 -msgid "Hide description" -msgstr "Cacher la description" - -#: templates/catalogue/book_detail.html:27 +#: templates/catalogue/book_detail.html:40 msgid "Put a book" msgstr "Mettre le livre" -#: templates/catalogue/book_detail.html:27 +#: templates/catalogue/book_detail.html:40 msgid "on the shelf!" msgstr "sur l'étagère" -#: templates/catalogue/book_detail.html:31 +#: templates/catalogue/book_detail.html:44 msgid "Read online" msgstr "Lire en ligne" -#: templates/catalogue/book_detail.html:34 +#: templates/catalogue/book_detail.html:47 msgid "Download PDF" msgstr "Télécharger un fichier PDF" -#: templates/catalogue/book_detail.html:37 +#: templates/catalogue/book_detail.html:50 +msgid "Download EPUB" +msgstr "Télécharger un fichier EPUB" + +#: templates/catalogue/book_detail.html:53 msgid "Download ODT" msgstr "Télécharger un fichier ODT" -#: templates/catalogue/book_detail.html:40 +#: templates/catalogue/book_detail.html:56 msgid "Download TXT" msgstr "Télécharger un fichier TXT" -#: templates/catalogue/book_detail.html:45 +#: templates/catalogue/book_detail.html:61 msgid "Artist" msgstr "Artiste" -#: templates/catalogue/book_detail.html:47 +#: templates/catalogue/book_detail.html:63 msgid "Director" msgstr "Metteur en scene" -#: templates/catalogue/book_detail.html:51 +#: templates/catalogue/book_detail.html:67 msgid "Download MP3" msgstr "Télécharger un fichier MP3" -#: templates/catalogue/book_detail.html:52 +#: templates/catalogue/book_detail.html:68 msgid "Download Ogg Vorbis" msgstr "Télécharger un fichier Ogg Vorbis" -#: templates/catalogue/book_detail.html:79 +#: templates/catalogue/book_detail.html:95 msgid "Details" msgstr "Détails" -#: templates/catalogue/book_detail.html:82 +#: templates/catalogue/book_detail.html:99 msgid "Author" msgstr "Auteur" -#: templates/catalogue/book_detail.html:88 +#: templates/catalogue/book_detail.html:105 msgid "Epoch" msgstr "Epoque" -#: templates/catalogue/book_detail.html:94 +#: templates/catalogue/book_detail.html:111 msgid "Kind" msgstr "Type" -#: templates/catalogue/book_detail.html:100 +#: templates/catalogue/book_detail.html:117 msgid "Genre" msgstr "Genre" -#: templates/catalogue/book_detail.html:106 +#: templates/catalogue/book_detail.html:123 msgid "Other resources" msgstr "Autres ressources" -#: templates/catalogue/book_detail.html:108 +#: templates/catalogue/book_detail.html:125 msgid "Book on project's wiki" msgstr "Le livre sur le wiki du projet" -#: templates/catalogue/book_detail.html:109 +#: templates/catalogue/book_detail.html:126 msgid "Source of the book" msgstr "Source du livre" -#: templates/catalogue/book_detail.html:111 +#: templates/catalogue/book_detail.html:128 msgid "Book description on Lektury.Gazeta.pl" msgstr "Description du livre sur Lektury.Gazeta.pl" -#: templates/catalogue/book_detail.html:114 +#: templates/catalogue/book_detail.html:131 msgid "Book description on Wikipedia" msgstr "Description du livre sur Wikipédia" -#: templates/catalogue/book_detail.html:119 +#: templates/catalogue/book_detail.html:136 msgid "Work's themes " msgstr "Les thèmes de l'oeuvre" @@ -355,31 +303,30 @@ msgid "of the book " msgstr "du livre" #: templates/catalogue/book_list.html:7 -msgid "Alphabetical listing of works on WolneLektury.pl" -msgstr "Liste alphabétique des oeuvres sur WolneLektury.pl" +msgid "Listing of all works on WolneLektury.pl" +msgstr "Liste des oeuvres sur WolneLektury.pl" #: templates/catalogue/book_list.html:10 -msgid "Alphabetical listing of works" -msgstr "Liste alphabétique des oeuvres" +msgid "Listing of all works" +msgstr "Liste des oeuvres" #: templates/catalogue/book_sets.html:2 msgid "Put a book on the shelf!" msgstr "Mettre le livre sur l'étagère!" -#: templates/catalogue/book_sets.html:4 +#: templates/catalogue/book_sets.html:3 templates/catalogue/book_sets.html:6 +#: templates/catalogue/fragment_sets.html:16 +msgid "Create new shelf" +msgstr "Créer une étagère nouvelle" + +#: templates/catalogue/book_sets.html:10 msgid "You do not have any shelves. You can create one below, if you want to." msgstr "Vous ne possédez aucune étagère. Vous pouvez en créer une au-dessous, si vous voulez." -#: templates/catalogue/book_sets.html:9 -#: templates/catalogue/book_short.html:4 +#: templates/catalogue/book_sets.html:15 templates/catalogue/book_short.html:4 msgid "Put on the shelf!" msgstr "Mettre sur l'étagère!" -#: templates/catalogue/book_sets.html:16 -#: templates/catalogue/fragment_sets.html:16 -msgid "Create new shelf" -msgstr "Créer une étagère nouvelle" - #: templates/catalogue/book_short.html:14 msgid "Jump to" msgstr "Aller à" @@ -409,17 +356,20 @@ msgid "Table of contents" msgstr "Tables des matières" #: templates/catalogue/book_text.html:18 -#: templates/catalogue/tagged_object_list.html:132 +#: templates/catalogue/tagged_object_list.html:146 msgid "Themes" msgstr "Thèmes" +#: templates/catalogue/differentiate_tags.html:13 +msgid "The criteria are ambiguous. Please select one of the following options:" +msgstr "" + #: templates/catalogue/folded_tag_list.html:4 msgid "Show full category" msgstr "Montrer la catégorie entière" #: templates/catalogue/folded_tag_list.html:13 -#: templates/catalogue/main_page.html:43 -#: templates/catalogue/main_page.html:48 +#: templates/catalogue/main_page.html:43 templates/catalogue/main_page.html:48 #: templates/catalogue/main_page.html:87 #: templates/catalogue/main_page.html:270 #: templates/catalogue/main_page.html:279 @@ -444,15 +394,15 @@ msgstr "Vous ne possédez aucune étagère. Vous pouvez en créer une au-dessous msgid "Save all shelves" msgstr "Enregistrer toutes les étagères" -#: templates/catalogue/fragment_short.html:6 +#: templates/catalogue/fragment_short.html:7 msgid "Expand fragment" msgstr "Montrer l'extrait" -#: templates/catalogue/fragment_short.html:12 +#: templates/catalogue/fragment_short.html:13 msgid "Hide fragment" msgstr "Cacher l'extrait" -#: templates/catalogue/fragment_short.html:17 +#: templates/catalogue/fragment_short.html:18 msgid "See in a book" msgstr "Voir dans le livre" @@ -512,22 +462,22 @@ msgid "are professional recordings of literary texts from our repository, availa msgstr "sont des textes littéraires de notre répertoire lus par les professionnels et accessibles gratuitment au format MP3 et Ogg Vorbis ainsi que dans le système DAISY." #: templates/catalogue/main_page.html:54 -#: templates/catalogue/tagged_object_list.html:114 +#: templates/catalogue/tagged_object_list.html:128 msgid "Authors" msgstr "Auteurs" #: templates/catalogue/main_page.html:58 -#: templates/catalogue/tagged_object_list.html:118 +#: templates/catalogue/tagged_object_list.html:132 msgid "Kinds" msgstr "Types" #: templates/catalogue/main_page.html:62 -#: templates/catalogue/tagged_object_list.html:122 +#: templates/catalogue/tagged_object_list.html:136 msgid "Genres" msgstr "Genres" #: templates/catalogue/main_page.html:66 -#: templates/catalogue/tagged_object_list.html:126 +#: templates/catalogue/tagged_object_list.html:140 msgid "Epochs" msgstr "Epoques" @@ -587,7 +537,7 @@ msgid "Search in WolneLektury.pl" msgstr "Recherche dans WolneLektury.pl" #: templates/catalogue/search_no_hits.html:14 -#: templates/catalogue/tagged_object_list.html:102 +#: templates/catalogue/tagged_object_list.html:116 msgid "Sorry! Search cirteria did not match any resources." msgstr "Nous sommes désolés! Aucun ressource ne répond au critères de recherche." @@ -615,112 +565,136 @@ msgstr "Votre étagère est vide" msgid "You can put a book on a shelf by entering page of the reading and clicking 'Put on the shelf'." msgstr "Vous pouvez mettre un livre sur l'étagère en entrant sur son page et cliquant \"Mettre sur l'étagère\"." -#: templates/catalogue/tagged_object_list.html:31 +#: templates/catalogue/tagged_object_list.html:32 msgid "Download all books from this shelf" msgstr "Télécharger tous les livres de cette étagère" -#: templates/catalogue/tagged_object_list.html:35 +#: templates/catalogue/tagged_object_list.html:36 msgid "Choose books' formats which you want to download:" msgstr "Choisir le format du livre à télécharger:" -#: templates/catalogue/tagged_object_list.html:36 #: 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 "pour lire" -#: templates/catalogue/tagged_object_list.html:36 +#: templates/catalogue/tagged_object_list.html:37 msgid "and printing using" msgstr "et imprimer avec" -#: templates/catalogue/tagged_object_list.html:37 +#: templates/catalogue/tagged_object_list.html:39 msgid "and editing using" msgstr "et rédiger avec" -#: templates/catalogue/tagged_object_list.html:38 +#: templates/catalogue/tagged_object_list.html:40 msgid "on small displays, for example mobile phones" msgstr "sur petits écrans, par exemple téléphones portables" -#: templates/catalogue/tagged_object_list.html:39 -#: templates/catalogue/tagged_object_list.html:40 +#: templates/catalogue/tagged_object_list.html:41 +#: templates/catalogue/tagged_object_list.html:42 msgid "for listening" msgstr "pour écouter" -#: templates/catalogue/tagged_object_list.html:39 +#: templates/catalogue/tagged_object_list.html:41 msgid "on favourite MP3 player" msgstr "sur baladeur MP3 préféré" -#: templates/catalogue/tagged_object_list.html:40 +#: templates/catalogue/tagged_object_list.html:42 msgid "open format" msgstr "format ouvert" -#: templates/catalogue/tagged_object_list.html:40 +#: templates/catalogue/tagged_object_list.html:42 msgid "Xiph.org Foundation" msgstr "Fondation Xiph.org " -#: templates/catalogue/tagged_object_list.html:41 +#: templates/catalogue/tagged_object_list.html:43 #: templates/lessons/ajax_document_detail.html:3 #: templates/lessons/document_detail.html:13 msgid "Download" msgstr "Télécharger" -#: templates/catalogue/tagged_object_list.html:41 +#: templates/catalogue/tagged_object_list.html:43 msgid "Updating list of books' formats on the shelf" msgstr "Mettre à jour la liste des formats des livres sur l'étagère" -#: templates/catalogue/tagged_object_list.html:41 +#: templates/catalogue/tagged_object_list.html:43 msgid "cancel" msgstr "annuler" -#: templates/catalogue/tagged_object_list.html:46 +#: templates/catalogue/tagged_object_list.html:48 msgid "Share this shelf" msgstr "Partager l'étagère" -#: templates/catalogue/tagged_object_list.html:48 +#: templates/catalogue/tagged_object_list.html:50 msgid "Copy this link and share it with other people to let them see your shelf." msgstr "Copier le lien et partager avec les autres pour qu'ils puissent voir votre étagère" -#: templates/catalogue/tagged_object_list.html:57 +#: templates/catalogue/tagged_object_list.html:60 msgid "Read work's study of this author on Lektury.Gazeta.pl" msgstr "Lire l'étude sur cet auteur sur Lektury.Gazeta.pl" -#: templates/catalogue/tagged_object_list.html:60 -msgid "Read study of epoch" -msgstr "Lire l'étude de l'époque" +#: templates/catalogue/tagged_object_list.html:62 +#, fuzzy, python-format +msgid "Read study of epoch %(last_tag)s on Lektury.Gazeta.pl" +msgstr "Lire l'étude sur cet auteur sur Lektury.Gazeta.pl" -#: templates/catalogue/tagged_object_list.html:60 -msgid "on Lektury.Gazeta.pl" -msgstr "sur Lektury.Gazeta.pl" +#: templates/catalogue/tagged_object_list.html:64 +#, fuzzy, python-format +msgid "Read study of kind %(last_tag)s on Lektury.Gazeta.pl" +msgstr "Lire l'étude sur cet auteur sur Lektury.Gazeta.pl" -#: templates/catalogue/tagged_object_list.html:67 +#: templates/catalogue/tagged_object_list.html:66 +#, fuzzy, python-format +msgid "Read study of genre %(last_tag)s on Lektury.Gazeta.pl" +msgstr "Lire l'étude sur cet auteur sur Lektury.Gazeta.pl" + +#: templates/catalogue/tagged_object_list.html:68 +#, fuzzy +msgid "Read related study on Lektury.Gazeta.pl" +msgstr "Lire l'étude sur cet auteur sur Lektury.Gazeta.pl" + +#: templates/catalogue/tagged_object_list.html:76 msgid "Read article about this author on Wikipedia" msgstr "Lire l'article sur cet auteur sur Wikipédia" -#: templates/catalogue/tagged_object_list.html:70 -msgid "Read article about epoch" -msgstr "Lire l'article sur cette époque" - -#: templates/catalogue/tagged_object_list.html:70 -msgid "on Wikipedia" -msgstr "sur Wikipédia" +#: templates/catalogue/tagged_object_list.html:78 +#, fuzzy, python-format +msgid "Read article about epoch %(last_tag)s on Wikipedia" +msgstr "Lire l'article sur cet auteur sur Wikipédia" #: templates/catalogue/tagged_object_list.html:80 +#, fuzzy, python-format +msgid "Read article about kind %(last_tag)s on Wikipedia" +msgstr "Lire l'article sur cet auteur sur Wikipédia" + +#: templates/catalogue/tagged_object_list.html:82 +#, fuzzy, python-format +msgid "Read article about genre %(last_tag)s on Wikipedia" +msgstr "Lire l'article sur cet auteur sur Wikipédia" + +#: templates/catalogue/tagged_object_list.html:84 +#, fuzzy +msgid "Read related article on Wikipedia" +msgstr "Lire l'article sur cet auteur sur Wikipédia" + +#: templates/catalogue/tagged_object_list.html:94 msgid "Delete" msgstr "Supprimer" -#: templates/catalogue/tagged_object_list.html:88 +#: templates/catalogue/tagged_object_list.html:102 msgid "This author's works are copyrighted." msgstr "Les oeuvres de cet auteurs sont protégées par le droit d'auteur" -#: templates/catalogue/tagged_object_list.html:91 +#: templates/catalogue/tagged_object_list.html:105 msgid "This author's works are in public domain and will be published on Internet school library of Wolne Lektury soon." msgstr "Les oeuvres de cet auteur sont dans le domaine public et vont être prochainement publiées dans la bibliothèque en ligne Wolne Lektury." -#: templates/catalogue/tagged_object_list.html:95 +#: templates/catalogue/tagged_object_list.html:109 msgid "This author's works will become part of public domain and will be allowed to be published without restrictions in" msgstr "Les oeuvres de cet auteur seront dans le domaine public et il sera possible de les publier sans restrictions dans " -#: templates/catalogue/tagged_object_list.html:97 +#: templates/catalogue/tagged_object_list.html:111 msgid "Find out why Internet libraries can't publish this author's works." msgstr "Lire pourquoi les bibliothèques en ligne ne peuvent pas publier les oeuvres de cet auteur." @@ -737,18 +711,16 @@ msgid "return to the main page" msgstr "retourner à l'accueil" #: templates/info/join_us.html:2 -#, python-format msgid "" "We have over 1000 works published in Wolne Lektury!\n" "Help us expand the library and set new readings free by\n" -"making a donation or transferring 1%% of your income tax." +"making a donation or transferring 1% of your income tax." msgstr "" "Il y a plus de 1000 oeuvres publiées sur Wolne Lektury!\n" "Aidez-nous à développer la bibliothèque et mettre de textes nouveaux à disposition gratuite en\n" -"faisant une donation ou en nous transmettant 1%% de votre impôt sur le revenu." +"faisant une donation ou en nous transmettant 1% de votre impôt sur le revenu." -#: templates/info/join_us.html:5 -#: templates/info/join_us.html.py:10 +#: templates/info/join_us.html:5 templates/info/join_us.html.py:10 msgid "More..." msgstr "Plus..." @@ -785,3 +757,47 @@ msgstr "précédent" msgid "next" msgstr "suivant" +#~ msgid "Polish" +#~ msgstr "polonais" + +#~ msgid "German" +#~ msgstr "allemand" + +#~ msgid "English" +#~ msgstr "anglais" + +#~ msgid "Lithuanian" +#~ msgstr "lituanien" + +#~ msgid "French" +#~ msgstr "français" + +#~ msgid "Russian" +#~ msgstr "russe" + +#~ msgid "Spanish" +#~ msgstr "espagnol" + +#~ msgid "Ukrainian" +#~ msgstr "ukrainien" + +#~ msgid "Choose your interface language: " +#~ msgstr "Choisissez la langue de l'interface" + +#~ msgid "Choose language" +#~ msgstr "Choisissez la langue" + +#~ msgid "Hide description" +#~ msgstr "Cacher la description" + +#~ msgid "Read study of epoch" +#~ msgstr "Lire l'étude de l'époque" + +#~ msgid "on Lektury.Gazeta.pl" +#~ msgstr "sur Lektury.Gazeta.pl" + +#~ msgid "Read article about epoch" +#~ msgstr "Lire l'article sur cette époque" + +#~ msgid "on Wikipedia" +#~ msgstr "sur Wikipédia" diff --git a/wolnelektury/locale/lt/LC_MESSAGES/django.mo b/wolnelektury/locale/lt/LC_MESSAGES/django.mo index 3544d7961..301573f01 100644 Binary files a/wolnelektury/locale/lt/LC_MESSAGES/django.mo and b/wolnelektury/locale/lt/LC_MESSAGES/django.mo differ diff --git a/wolnelektury/locale/lt/LC_MESSAGES/django.po b/wolnelektury/locale/lt/LC_MESSAGES/django.po index 0b4d68f4d..42e20f17a 100644 --- a/wolnelektury/locale/lt/LC_MESSAGES/django.po +++ b/wolnelektury/locale/lt/LC_MESSAGES/django.po @@ -2,54 +2,21 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 14:29+0200\n" -"PO-Revision-Date: 2010-08-09 19:29+0100\n" -"Last-Translator: Alicja Sinkiewicz \n" +"POT-Creation-Date: 2010-08-25 10:23+0000\n" +"PO-Revision-Date: 2010-08-25 10:54\n" +"Last-Translator: \n" "Language-Team: 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" +"X-Translated-Using: django-rosetta 0.5.6\n" -#: settings.py:37 -msgid "Polish" -msgstr "Lenkų" - -#: settings.py:38 -msgid "German" -msgstr "Vokiečių" - -#: settings.py:39 -msgid "English" -msgstr "Anglų " - -#: settings.py:40 -msgid "Lithuanian" -msgstr "Lietuvių" - -#: settings.py:41 -msgid "French" -msgstr "Prancūzų" - -#: settings.py:42 -msgid "Russian" -msgstr "Rusų" - -#: settings.py:43 -msgid "Spanish" -msgstr "Ispanų" - -#: settings.py:44 -msgid "Ukrainian" -msgstr "Ukrainiečių" - -#: templates/404.html:6 -#: templates/404.html.py:15 +#: templates/404.html:6 templates/404.html.py:15 msgid "Page does not exist" msgstr "Tinklapis neegzistuoja" @@ -61,8 +28,7 @@ msgstr "Atsiprašom, bet svetainė neveike" msgid "main page" msgstr "pagrindinis puslapis" -#: templates/500.html:6 -#: templates/500.html.py:54 +#: templates/500.html:6 templates/500.html.py:54 msgid "Server error" msgstr "serverio klaida" @@ -72,8 +38,7 @@ msgstr "" "

Servisas Laisvojiliteratura.lt yra laikinai neprieinamas. Aplankyk mūsų blogą

\n" "

Powiadom administratorów o błędzie.

" -#: templates/503.html:6 -#: templates/503.html.py:54 +#: templates/503.html:6 templates/503.html.py:54 msgid "Service unavailable" msgstr "Servisas neprieinamas" @@ -81,60 +46,48 @@ msgstr "Servisas neprieinamas" msgid "The Wolnelektury.pl site is currently unavailable due to maintainance." msgstr "Servisas Laisvojiliteratura.lt pastaruoju metu yra neprieinamas del konservavimo darbų" -#: templates/base.html:20 +#: templates/base.html:19 msgid "Internet Explorer cannot display this site properly. Click here to read more..." msgstr "Internet Explorer nie sugeba teisingai parodyti šio tinklapio. Paspausti čia, kad sužinoti daugiau..." -#: templates/base.html:33 +#: templates/base.html:32 msgid "Welcome" msgstr "Sveikiname" -#: templates/base.html:34 +#: templates/base.html:33 msgid "Your shelves" msgstr "Tavo lentynos" -#: templates/base.html:36 +#: templates/base.html:35 msgid "Administration" msgstr "Administracija " +#: templates/base.html:37 templates/base.html.py:41 +msgid "Report a bug" +msgstr "" + #: templates/base.html:38 msgid "Logout" msgstr "Atsijungti" -#: templates/base.html:41 -#: templates/base.html.py:87 -#: templates/base.html:91 -#: templates/base.html.py:95 -#: templates/auth/login.html:4 -#: templates/auth/login.html.py:7 -#: templates/auth/login.html:12 +#: templates/base.html:42 templates/base.html.py:88 templates/base.html:92 +#: templates/base.html.py:96 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 "Prisijungti " -#: templates/base.html:41 -#: templates/base.html.py:87 -#: templates/base.html:95 -#: templates/base.html.py:99 -#: templates/auth/login.html:7 -#: templates/auth/login.html.py:21 -#: templates/auth/login.html:23 +#: templates/base.html:42 templates/base.html.py:88 templates/base.html:96 +#: templates/base.html.py:100 templates/auth/login.html:7 +#: templates/auth/login.html.py:21 templates/auth/login.html:23 msgid "Register" msgstr "Registruotis " -#: templates/base.html:51 -msgid "Choose your interface language: " -msgstr "Pasirink sąsajos kalbą:" - -#: templates/base.html:56 -msgid "Choose language" -msgstr "Pasirink kalbą" - -#: templates/base.html:68 +#: templates/base.html:69 msgid "" "\n" "\t\t\t\tWolne Lektury is a project lead by Modern Poland Foundation.\n" -"\t\t\t\tDigital reproductions are made by The National Library, based on TNL resources. \n" +"\t\t\t\tDigital reproductions are made by The National Library, based on TNL resources.\n" "\t\t\t\tHosting EO Networks.\n" "\t\t\t\t" msgstr "" @@ -143,7 +96,7 @@ msgstr "" "Skaitmenines reprodukcijas paruoše Lenkijos Tautinė Biblioteka egzemplioriai paskolinti iš Lenkijos Tautinės Bibliotekos.\n" "Hosting EO Networks." -#: templates/base.html:75 +#: templates/base.html:76 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" @@ -153,31 +106,31 @@ msgstr "" "\n" "Šiuolaikines Lenkijos Fondas, 00-514 Varšuva, ul. Marszałkowska 84/92 butas 125, tel/fax: (22) 621-30-17, e-mail: fundacja@nowoczesnapolska.org.plFundacja Nowoczesna Polska, 00-514 Warszawa, ul. Marszałkowska 84/92 lok. 125, tel/fax: (22) 621-30-17, e-mail: fundacja@nowoczesnapolska.org.pl" -#: templates/base.html:84 -#: templates/base.html.py:105 -#: templates/catalogue/book_detail.html:129 +#: templates/base.html:85 templates/base.html.py:106 templates/base.html:112 +#: templates/catalogue/book_detail.html:146 #: templates/catalogue/book_fragments.html:33 #: templates/catalogue/book_stub_detail.html:31 -#: templates/catalogue/search_multiple_hits.html:23 +#: templates/catalogue/differentiate_tags.html:23 +#: templates/catalogue/search_multiple_hits.html:29 #: templates/catalogue/search_no_hits.html:22 #: templates/catalogue/search_too_short.html:19 -#: templates/catalogue/tagged_object_list.html:141 +#: templates/catalogue/tagged_object_list.html:155 msgid "Close" msgstr "Uždaryk " -#: templates/base.html:107 -#: templates/catalogue/book_detail.html:131 +#: templates/base.html:108 templates/base.html.py:114 +#: templates/catalogue/book_detail.html:148 #: templates/catalogue/book_fragments.html:35 #: templates/catalogue/book_stub_detail.html:33 -#: templates/catalogue/search_multiple_hits.html:25 +#: templates/catalogue/differentiate_tags.html:25 +#: templates/catalogue/search_multiple_hits.html:31 #: templates/catalogue/search_no_hits.html:24 #: templates/catalogue/search_too_short.html:21 -#: templates/catalogue/tagged_object_list.html:143 +#: templates/catalogue/tagged_object_list.html:157 msgid "Loading" msgstr "Krovimas" -#: templates/admin/base_site.html:4 -#: templates/admin/base_site.html.py:7 +#: templates/admin/base_site.html:4 templates/admin/base_site.html.py:7 msgid "Site administration" msgstr "Tinklapio administracija" @@ -193,34 +146,29 @@ msgstr "Importuok knygą" msgid "Register on" msgstr "Registruotis į" -#: templates/auth/login.html:9 -#: templates/catalogue/book_detail.html:12 +#: templates/auth/login.html:9 templates/catalogue/book_detail.html:12 #: templates/catalogue/book_fragments.html:12 #: templates/catalogue/book_list.html:12 #: templates/catalogue/book_stub_detail.html:12 -#: templates/catalogue/breadcrumbs.html:9 -#: templates/catalogue/main_page.html:13 -#: templates/info/base.html:10 +#: templates/catalogue/breadcrumbs.html:21 +#: templates/catalogue/main_page.html:13 templates/info/base.html:10 #: templates/lessons/document_detail.html:9 #: templates/lessons/document_list.html:51 msgid "Search" msgstr "ieškojimas" -#: templates/auth/login.html:9 -#: templates/catalogue/book_detail.html:12 +#: templates/auth/login.html:9 templates/catalogue/book_detail.html:12 #: templates/catalogue/book_fragments.html:12 #: templates/catalogue/book_list.html:12 #: templates/catalogue/book_stub_detail.html:12 #: templates/catalogue/main_page.html:13 -#: templates/catalogue/tagged_object_list.html:41 -#: templates/info/base.html:10 +#: templates/catalogue/tagged_object_list.html:43 templates/info/base.html:10 #: templates/lessons/document_detail.html:9 #: templates/lessons/document_list.html:51 msgid "or" msgstr "arba" -#: templates/auth/login.html:9 -#: templates/catalogue/book_detail.html:12 +#: templates/auth/login.html:9 templates/catalogue/book_detail.html:12 #: templates/catalogue/book_list.html:12 #: templates/catalogue/book_stub_detail.html:12 #: templates/lessons/document_list.html:51 @@ -231,100 +179,99 @@ msgstr "gryžk į pagrindinį puslapį" msgid "on WolneLektury.pl" msgstr "LaisvojiLiteratura.lt" -#: templates/catalogue/book_detail.html:17 +#: templates/catalogue/book_detail.html:29 msgid "Work is licensed under " msgstr "Kūrinys yra prieinamas su licencija " -#: templates/catalogue/book_detail.html:19 +#: templates/catalogue/book_detail.html:31 msgid "Based on" msgstr "Pagal motyvus" -#: templates/catalogue/book_detail.html:24 -#: templates/catalogue/tagged_object_list.html:27 -msgid "Hide description" -msgstr "Suvyniok aprašymą " - -#: templates/catalogue/book_detail.html:27 +#: templates/catalogue/book_detail.html:40 msgid "Put a book" msgstr "Prijung literatūrą" -#: templates/catalogue/book_detail.html:27 +#: templates/catalogue/book_detail.html:40 msgid "on the shelf!" msgstr "į lentyną!" -#: templates/catalogue/book_detail.html:31 +#: templates/catalogue/book_detail.html:44 msgid "Read online" msgstr "Skaityk online" -#: templates/catalogue/book_detail.html:34 +#: templates/catalogue/book_detail.html:47 msgid "Download PDF" msgstr "atsisiųsk PDF failą" -#: templates/catalogue/book_detail.html:37 +#: templates/catalogue/book_detail.html:50 +msgid "Download EPUB" +msgstr "atsisiųsk EPUB failą" + +#: templates/catalogue/book_detail.html:53 msgid "Download ODT" msgstr "atsisiųsk ODT failą" -#: templates/catalogue/book_detail.html:40 +#: templates/catalogue/book_detail.html:56 msgid "Download TXT" msgstr "atsisiųsk TXT failą" -#: templates/catalogue/book_detail.html:45 +#: templates/catalogue/book_detail.html:61 msgid "Artist" msgstr "artistas" -#: templates/catalogue/book_detail.html:47 +#: templates/catalogue/book_detail.html:63 msgid "Director" msgstr "vadovas" -#: templates/catalogue/book_detail.html:51 +#: templates/catalogue/book_detail.html:67 msgid "Download MP3" msgstr "atsisiųsk MP3 failą" -#: templates/catalogue/book_detail.html:52 +#: templates/catalogue/book_detail.html:68 msgid "Download Ogg Vorbis" msgstr "atsisiųsk Ogg Vorbis failą" -#: templates/catalogue/book_detail.html:79 +#: templates/catalogue/book_detail.html:95 msgid "Details" msgstr "detalės " -#: templates/catalogue/book_detail.html:82 +#: templates/catalogue/book_detail.html:99 msgid "Author" msgstr "Autorius" -#: templates/catalogue/book_detail.html:88 +#: templates/catalogue/book_detail.html:105 msgid "Epoch" msgstr "Gadynė" -#: templates/catalogue/book_detail.html:94 +#: templates/catalogue/book_detail.html:111 msgid "Kind" msgstr "Rūšis " -#: templates/catalogue/book_detail.html:100 +#: templates/catalogue/book_detail.html:117 msgid "Genre" msgstr "Padermė " -#: templates/catalogue/book_detail.html:106 +#: templates/catalogue/book_detail.html:123 msgid "Other resources" msgstr "Kitose vietose" -#: templates/catalogue/book_detail.html:108 +#: templates/catalogue/book_detail.html:125 msgid "Book on project's wiki" msgstr "Sukurk straipsnį apie knygą vikiprojekte" -#: templates/catalogue/book_detail.html:109 +#: templates/catalogue/book_detail.html:126 msgid "Source of the book" msgstr "Literaturos šaltinis" -#: templates/catalogue/book_detail.html:111 +#: templates/catalogue/book_detail.html:128 msgid "Book description on Lektury.Gazeta.pl" msgstr "Literaturos aprašymas Lektury.Gazeta.pl" -#: templates/catalogue/book_detail.html:114 +#: templates/catalogue/book_detail.html:131 msgid "Book description on Wikipedia" msgstr "Literaturos aprašymas Vikipedijoje" -#: templates/catalogue/book_detail.html:119 +#: templates/catalogue/book_detail.html:136 msgid "Work's themes " msgstr "Kūrinio motyvai" @@ -355,31 +302,30 @@ msgid "of the book " msgstr "kūrinio" #: templates/catalogue/book_list.html:7 -msgid "Alphabetical listing of works on WolneLektury.pl" -msgstr "Abėcėliškas kūriniu sąrašas LaisvojiLiteratura.lt" +msgid "Listing of all works on WolneLektury.pl" +msgstr "Kūriniu sąrašas WolneLektury.pl" #: templates/catalogue/book_list.html:10 -msgid "Alphabetical listing of works" -msgstr "Abėcėliškas kūriniu sąrašas" +msgid "Listing of all works" +msgstr "Kūriniu sąrašas" #: templates/catalogue/book_sets.html:2 msgid "Put a book on the shelf!" msgstr "Įmesk knyga į lentyną! " -#: templates/catalogue/book_sets.html:4 +#: templates/catalogue/book_sets.html:3 templates/catalogue/book_sets.html:6 +#: templates/catalogue/fragment_sets.html:16 +msgid "Create new shelf" +msgstr "Sukurk naują lentyną" + +#: templates/catalogue/book_sets.html:10 msgid "You do not have any shelves. You can create one below, if you want to." msgstr "Neturi nei vienos lentynos. Jeigu nori gali žemiau sukurti naują lentyną." -#: templates/catalogue/book_sets.html:9 -#: templates/catalogue/book_short.html:4 +#: templates/catalogue/book_sets.html:15 templates/catalogue/book_short.html:4 msgid "Put on the shelf!" msgstr "Įmesk į lentyną! " -#: templates/catalogue/book_sets.html:16 -#: templates/catalogue/fragment_sets.html:16 -msgid "Create new shelf" -msgstr "Sukurk naują lentyną" - #: templates/catalogue/book_short.html:14 msgid "Jump to" msgstr "Santrumpa" @@ -409,17 +355,20 @@ msgid "Table of contents" msgstr "Turinys" #: templates/catalogue/book_text.html:18 -#: templates/catalogue/tagged_object_list.html:132 +#: templates/catalogue/tagged_object_list.html:146 msgid "Themes" msgstr "Motyai" +#: templates/catalogue/differentiate_tags.html:13 +msgid "The criteria are ambiguous. Please select one of the following options:" +msgstr "" + #: templates/catalogue/folded_tag_list.html:4 msgid "Show full category" msgstr "Apžiūrek visą kategoriją" #: templates/catalogue/folded_tag_list.html:13 -#: templates/catalogue/main_page.html:43 -#: templates/catalogue/main_page.html:48 +#: templates/catalogue/main_page.html:43 templates/catalogue/main_page.html:48 #: templates/catalogue/main_page.html:87 #: templates/catalogue/main_page.html:270 #: templates/catalogue/main_page.html:279 @@ -444,15 +393,15 @@ msgstr "Neturi nei vienos lentynos. Jeigu nori gali žemiau sukurti naują lenty msgid "Save all shelves" msgstr "Užsirašyk lentyną " -#: templates/catalogue/fragment_short.html:6 +#: templates/catalogue/fragment_short.html:7 msgid "Expand fragment" msgstr "Išplėsk fragmentą" -#: templates/catalogue/fragment_short.html:12 +#: templates/catalogue/fragment_short.html:13 msgid "Hide fragment" msgstr "Suvyniok fragmentą" -#: templates/catalogue/fragment_short.html:17 +#: templates/catalogue/fragment_short.html:18 msgid "See in a book" msgstr "Surask knygoje" @@ -512,22 +461,22 @@ msgid "are professional recordings of literary texts from our repository, availa msgstr "Tai profesjonalus literaturinių tekstų garso įrašai, mūsų rinkinių laisvai prieinami šiuose įrašymo formatouse: MP3, Ogg Vorbis ir sistema DAISY." #: templates/catalogue/main_page.html:54 -#: templates/catalogue/tagged_object_list.html:114 +#: templates/catalogue/tagged_object_list.html:128 msgid "Authors" msgstr "Autoriai" #: templates/catalogue/main_page.html:58 -#: templates/catalogue/tagged_object_list.html:118 +#: templates/catalogue/tagged_object_list.html:132 msgid "Kinds" msgstr "Rušys" #: templates/catalogue/main_page.html:62 -#: templates/catalogue/tagged_object_list.html:122 +#: templates/catalogue/tagged_object_list.html:136 msgid "Genres" msgstr "Padermės " #: templates/catalogue/main_page.html:66 -#: templates/catalogue/tagged_object_list.html:126 +#: templates/catalogue/tagged_object_list.html:140 msgid "Epochs" msgstr "Gadynės" @@ -570,7 +519,7 @@ msgid "" "\t\t\t" msgstr "" "\n" -"\t\t\tInternetine biblioteka \"Laisvoji Literatura\" (www.laisvojiliteratura.lt) siūlanti mokyklinę literaturą - tai Šiuolaikines Lenkijos Fondasto projektas. Fondas veike nou 2007 metų ir savo rinkinuose turi mokyklinę literaturą, kuri yra rekomenduojama per Švietimo ir Mokslo Ministeriją ir kuri jau pateko į viešią Interneto svetainę.\n" +"\t\t\tInternetine biblioteka \"Laisvoji Literatura\" (www.laisvojiliteratura.lt) siūlanti mokyklinę literaturą - tai Šiuolaikines Lenkijos Fondasto projektas. Fondas veike nou 2007 metų ir savo rinkinuose turi mokyklinę literaturą, kuri yra rekomenduojama per Švietimo ir Mokslo Ministeriją ir kuri jau\tpateko į viešią Interneto svetainę.\n" "\t\t\t" #: templates/catalogue/search_multiple_hits.html:5 @@ -587,7 +536,7 @@ msgid "Search in WolneLektury.pl" msgstr "Ieškok šiame tinklapyje LasvojiLiteratura.lt " #: templates/catalogue/search_no_hits.html:14 -#: templates/catalogue/tagged_object_list.html:102 +#: templates/catalogue/tagged_object_list.html:116 msgid "Sorry! Search cirteria did not match any resources." msgstr "Atsiprašom! Trūksta rezultatų atitinkančių užklausimui. " @@ -613,112 +562,136 @@ msgstr "Tavo lentyna yra tušia" msgid "You can put a book on a shelf by entering page of the reading and clicking 'Put on the shelf'." msgstr "Gali įmesti knygą į lentyną, įeik į knygos tinklapį ir išrink \"Į lentyną\". " -#: templates/catalogue/tagged_object_list.html:31 +#: templates/catalogue/tagged_object_list.html:32 msgid "Download all books from this shelf" msgstr "Persisiųsk visas knygas iš šios lentynos" -#: templates/catalogue/tagged_object_list.html:35 +#: templates/catalogue/tagged_object_list.html:36 msgid "Choose books' formats which you want to download:" msgstr "Pasirink knygos persiuntimo formatą:" -#: templates/catalogue/tagged_object_list.html:36 #: 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 "į skaitimą" -#: templates/catalogue/tagged_object_list.html:36 +#: templates/catalogue/tagged_object_list.html:37 msgid "and printing using" msgstr "ir spausdinti su pagalbą" -#: templates/catalogue/tagged_object_list.html:37 +#: templates/catalogue/tagged_object_list.html:39 msgid "and editing using" msgstr "ir edituoti su pagalbą " -#: templates/catalogue/tagged_object_list.html:38 +#: templates/catalogue/tagged_object_list.html:40 msgid "on small displays, for example mobile phones" msgstr "ant displėjaus, pvz. mobilaus telefono " -#: templates/catalogue/tagged_object_list.html:39 -#: templates/catalogue/tagged_object_list.html:40 +#: templates/catalogue/tagged_object_list.html:41 +#: templates/catalogue/tagged_object_list.html:42 msgid "for listening" msgstr "klausyti" -#: templates/catalogue/tagged_object_list.html:39 +#: templates/catalogue/tagged_object_list.html:41 msgid "on favourite MP3 player" msgstr "numylėtam MP3 grotuve" -#: templates/catalogue/tagged_object_list.html:40 +#: templates/catalogue/tagged_object_list.html:42 msgid "open format" msgstr "atviras formatas" -#: templates/catalogue/tagged_object_list.html:40 +#: templates/catalogue/tagged_object_list.html:42 msgid "Xiph.org Foundation" msgstr "Fondo Xiph.Org" -#: templates/catalogue/tagged_object_list.html:41 +#: templates/catalogue/tagged_object_list.html:43 #: templates/lessons/ajax_document_detail.html:3 #: templates/lessons/document_detail.html:13 msgid "Download" msgstr "Atsisiųsti" -#: templates/catalogue/tagged_object_list.html:41 +#: templates/catalogue/tagged_object_list.html:43 msgid "Updating list of books' formats on the shelf" msgstr "Atnaujinti knygų formatų sąrašą lentynose. " -#: templates/catalogue/tagged_object_list.html:41 +#: templates/catalogue/tagged_object_list.html:43 msgid "cancel" msgstr "anuliuoti" -#: templates/catalogue/tagged_object_list.html:46 +#: templates/catalogue/tagged_object_list.html:48 msgid "Share this shelf" msgstr "Pasidalink šia lentyną." -#: templates/catalogue/tagged_object_list.html:48 +#: templates/catalogue/tagged_object_list.html:50 msgid "Copy this link and share it with other people to let them see your shelf." msgstr "Sukopijuok šią nuorodą ir persiusk ją tiems, su kuriais noru pasidalinti savo lentyną." -#: templates/catalogue/tagged_object_list.html:57 +#: templates/catalogue/tagged_object_list.html:60 msgid "Read work's study of this author on Lektury.Gazeta.pl" msgstr "Perskaityk šio autoriaus aprašymą tinklapį Lektury.Gazeta.pl" -#: templates/catalogue/tagged_object_list.html:60 -msgid "Read study of epoch" -msgstr "Perskaityk gadynės aprašymą" +#: templates/catalogue/tagged_object_list.html:62 +#, fuzzy, python-format +msgid "Read study of epoch %(last_tag)s on Lektury.Gazeta.pl" +msgstr "Perskaityk šio autoriaus aprašymą tinklapį Lektury.Gazeta.pl" -#: templates/catalogue/tagged_object_list.html:60 -msgid "on Lektury.Gazeta.pl" -msgstr "tinklapyje Lektury.Gazeta.pl" +#: templates/catalogue/tagged_object_list.html:64 +#, fuzzy, python-format +msgid "Read study of kind %(last_tag)s on Lektury.Gazeta.pl" +msgstr "Perskaityk šio autoriaus aprašymą tinklapį Lektury.Gazeta.pl" -#: templates/catalogue/tagged_object_list.html:67 +#: templates/catalogue/tagged_object_list.html:66 +#, fuzzy, python-format +msgid "Read study of genre %(last_tag)s on Lektury.Gazeta.pl" +msgstr "Perskaityk šio autoriaus aprašymą tinklapį Lektury.Gazeta.pl" + +#: templates/catalogue/tagged_object_list.html:68 +#, fuzzy +msgid "Read related study on Lektury.Gazeta.pl" +msgstr "Perskaityk šio autoriaus aprašymą tinklapį Lektury.Gazeta.pl" + +#: templates/catalogue/tagged_object_list.html:76 msgid "Read article about this author on Wikipedia" msgstr "Perskaityk straipsny apie autoriu Wikipedijoje" -#: templates/catalogue/tagged_object_list.html:70 -msgid "Read article about epoch" -msgstr "Perskaityk straipsnį apie gadynę " - -#: templates/catalogue/tagged_object_list.html:70 -msgid "on Wikipedia" -msgstr "Vikipedijoje" +#: templates/catalogue/tagged_object_list.html:78 +#, fuzzy, python-format +msgid "Read article about epoch %(last_tag)s on Wikipedia" +msgstr "Perskaityk straipsny apie autoriu Wikipedijoje" #: templates/catalogue/tagged_object_list.html:80 +#, fuzzy, python-format +msgid "Read article about kind %(last_tag)s on Wikipedia" +msgstr "Perskaityk straipsny apie autoriu Wikipedijoje" + +#: templates/catalogue/tagged_object_list.html:82 +#, fuzzy, python-format +msgid "Read article about genre %(last_tag)s on Wikipedia" +msgstr "Perskaityk straipsny apie autoriu Wikipedijoje" + +#: templates/catalogue/tagged_object_list.html:84 +#, fuzzy +msgid "Read related article on Wikipedia" +msgstr "Perskaityk straipsny apie autoriu Wikipedijoje" + +#: templates/catalogue/tagged_object_list.html:94 msgid "Delete" msgstr "pašalinti " -#: templates/catalogue/tagged_object_list.html:88 +#: templates/catalogue/tagged_object_list.html:102 msgid "This author's works are copyrighted." msgstr "Šio autoriaus kūriniai yra saugomi nepažeidžiant autorių teisės" -#: templates/catalogue/tagged_object_list.html:91 +#: templates/catalogue/tagged_object_list.html:105 msgid "This author's works are in public domain and will be published on Internet school library of Wolne Lektury soon." msgstr "Šio autoriaus kūrinys jau yra viešoje Interneto svetaineję ir neužilgo bus paplatintas internetine bibliotekoje Laisvoji Literatura" -#: templates/catalogue/tagged_object_list.html:95 +#: templates/catalogue/tagged_object_list.html:109 msgid "This author's works will become part of public domain and will be allowed to be published without restrictions in" msgstr "Šio autoriaus kūrinys neužilgo atsiras viešoje Interneto svetaineję ir gales but paplatinti be jokiu ribų" -#: templates/catalogue/tagged_object_list.html:97 +#: templates/catalogue/tagged_object_list.html:111 msgid "Find out why Internet libraries can't publish this author's works." msgstr "Sužinok kodel šio autoriaus kūriniai negali būti platinti internetineje bibliotekoje" @@ -735,15 +708,13 @@ msgid "return to the main page" msgstr "sugryžk į pagrindinį puslapį " #: templates/info/join_us.html:2 -#, python-format msgid "" "We have over 1000 works published in Wolne Lektury!\n" "Help us expand the library and set new readings free by\n" -"making a donation or transferring 1%% of your income tax." -msgstr "Tinklapyje Laisvoji Literatura rasi virš 1000 kūrinių! Padek mums vystytis ir plesti literatura paskirk 1%% pajamų mokesčio bibliotekai" +"making a donation or transferring 1% of your income tax." +msgstr "Tinklapyje Laisvoji Literatura rasi virš 1000 kūrinių! Padek mums vystytis ir plesti literatura paskirk 1% pajamų mokesčio bibliotekai" -#: templates/info/join_us.html:5 -#: templates/info/join_us.html.py:10 +#: templates/info/join_us.html:5 templates/info/join_us.html.py:10 msgid "More..." msgstr "Daugiau..." @@ -777,3 +748,47 @@ msgstr "ankstesnis" msgid "next" msgstr "sekantis " +#~ msgid "Polish" +#~ msgstr "Lenkų" + +#~ msgid "German" +#~ msgstr "Vokiečių" + +#~ msgid "English" +#~ msgstr "Anglų " + +#~ msgid "Lithuanian" +#~ msgstr "Lietuvių" + +#~ msgid "French" +#~ msgstr "Prancūzų" + +#~ msgid "Russian" +#~ msgstr "Rusų" + +#~ msgid "Spanish" +#~ msgstr "Ispanų" + +#~ msgid "Ukrainian" +#~ msgstr "Ukrainiečių" + +#~ msgid "Choose your interface language: " +#~ msgstr "Pasirink sąsajos kalbą:" + +#~ msgid "Choose language" +#~ msgstr "Pasirink kalbą" + +#~ msgid "Hide description" +#~ msgstr "Suvyniok aprašymą " + +#~ msgid "Read study of epoch" +#~ msgstr "Perskaityk gadynės aprašymą" + +#~ msgid "on Lektury.Gazeta.pl" +#~ msgstr "tinklapyje Lektury.Gazeta.pl" + +#~ msgid "Read article about epoch" +#~ msgstr "Perskaityk straipsnį apie gadynę " + +#~ msgid "on Wikipedia" +#~ msgstr "Vikipedijoje" diff --git a/wolnelektury/locale/pl/LC_MESSAGES/django.mo b/wolnelektury/locale/pl/LC_MESSAGES/django.mo index 5bb3108c8..85e1ae8ca 100644 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 affc90828..c052607a6 100644 --- a/wolnelektury/locale/pl/LC_MESSAGES/django.po +++ b/wolnelektury/locale/pl/LC_MESSAGES/django.po @@ -7,14 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-27 04:00-0500\n" -"PO-Revision-Date: 2010-08-16 09:53\n" -"Last-Translator: \n" +"POT-Creation-Date: 2010-08-25 10:23+0000\n" +"PO-Revision-Date: 2010-08-25 10:59\n" +"Last-Translator: \n" "Language-Team: 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" +"X-Translated-Using: django-rosetta 0.5.6\n" #: localsettings.py:37 msgid "Polish" @@ -118,20 +118,20 @@ msgstr "Zgłoś błąd" msgid "Logout" msgstr "Wyloguj" -#: templates/base.html:42 templates/base.html.py:89 templates/base.html:93 -#: templates/base.html.py:97 templates/auth/login.html:4 +#: templates/base.html:42 templates/base.html.py:88 templates/base.html:92 +#: templates/base.html.py:96 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:42 templates/base.html.py:89 templates/base.html:97 -#: templates/base.html.py:101 templates/auth/login.html:7 +#: templates/base.html:42 templates/base.html.py:88 templates/base.html:96 +#: templates/base.html.py:100 templates/auth/login.html:7 #: templates/auth/login.html.py:21 templates/auth/login.html:23 msgid "Register" msgstr "Załóż konto" -#: templates/base.html:70 +#: templates/base.html:69 msgid "" "\n" "\t\t\t\tWolne Lektury is a project lead by Bibliotekę Narodową z egzemplarzy pochodzących ze zbiorów BN.\n" "Hosting EO Networks. " -#: templates/base.html:77 +#: templates/base.html:76 msgid "" "\n" "\t\t\t\tModern Poland Foundation, 00-514 Warsaw, ul. Marszałkowska 84/92 " @@ -162,7 +162,7 @@ msgstr "" "125, tel/fax: (22) 621-30-17, e-mail: fundacja@nowoczesnapolska.org.pl" -#: templates/base.html:86 templates/base.html.py:107 templates/base.html:113 +#: templates/base.html:85 templates/base.html.py:106 templates/base.html:112 #: templates/catalogue/book_detail.html:146 #: templates/catalogue/book_fragments.html:33 #: templates/catalogue/book_stub_detail.html:31 @@ -174,7 +174,7 @@ msgstr "" msgid "Close" msgstr "Zamknij" -#: templates/base.html:109 templates/base.html.py:115 +#: templates/base.html:108 templates/base.html.py:114 #: templates/catalogue/book_detail.html:148 #: templates/catalogue/book_fragments.html:35 #: templates/catalogue/book_stub_detail.html:33 @@ -429,7 +429,7 @@ msgstr "Motywy" #: templates/catalogue/differentiate_tags.html:13 msgid "The criteria are ambiguous. Please select one of the following options:" -msgstr "" +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" diff --git a/wolnelektury/locale/ru/LC_MESSAGES/django.mo b/wolnelektury/locale/ru/LC_MESSAGES/django.mo index 783fe505f..d79768d9b 100644 Binary files a/wolnelektury/locale/ru/LC_MESSAGES/django.mo and b/wolnelektury/locale/ru/LC_MESSAGES/django.mo differ diff --git a/wolnelektury/locale/ru/LC_MESSAGES/django.po b/wolnelektury/locale/ru/LC_MESSAGES/django.po index 1a36b2708..c94d6385d 100644 --- a/wolnelektury/locale/ru/LC_MESSAGES/django.po +++ b/wolnelektury/locale/ru/LC_MESSAGES/django.po @@ -2,53 +2,21 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 14:29+0200\n" -"PO-Revision-Date: 2010-08-13 11:41+0100\n" -"Last-Translator: I \n" +"POT-Creation-Date: 2010-08-25 10:23+0000\n" +"PO-Revision-Date: 2010-08-25 11:05\n" +"Last-Translator: \n" "Language-Team: 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.6\n" -#: settings.py:37 -msgid "Polish" -msgstr "польский" - -#: settings.py:38 -msgid "German" -msgstr "немецкий" - -#: settings.py:39 -msgid "English" -msgstr "английский" - -#: settings.py:40 -msgid "Lithuanian" -msgstr "литовский" - -#: settings.py:41 -msgid "French" -msgstr "французский" - -#: settings.py:42 -msgid "Russian" -msgstr "русский" - -#: settings.py:43 -msgid "Spanish" -msgstr "испанский" - -#: settings.py:44 -msgid "Ukrainian" -msgstr "украинский" - -#: templates/404.html:6 -#: templates/404.html.py:15 +#: templates/404.html:6 templates/404.html.py:15 msgid "Page does not exist" msgstr "Сайт не существует" @@ -60,8 +28,7 @@ msgstr "Извините! Этот сайт не существует. Пров msgid "main page" msgstr "главную страницу" -#: templates/500.html:6 -#: templates/500.html.py:54 +#: templates/500.html:6 templates/500.html.py:54 msgid "Server error" msgstr "Ошибка сервера" @@ -69,8 +36,7 @@ msgstr "Ошибка сервера" msgid "

The Wolnelektury.pl site is currently unavailable. Meanwhile, visit our blog.

Inform our administrators about the error.

" msgstr "

The Wolnelektury.pl временно не работает. Тем времнем зайдите на blog.

Inform our administrators about the error.

" -#: templates/503.html:6 -#: templates/503.html.py:54 +#: templates/503.html:6 templates/503.html.py:54 msgid "Service unavailable" msgstr "Сервис недоступен" @@ -78,60 +44,48 @@ msgstr "Сервис недоступен" msgid "The Wolnelektury.pl site is currently unavailable due to maintainance." msgstr "По поводу технической поддрежки сайт The Wolnelektury.pl временно не работает." -#: templates/base.html:20 +#: templates/base.html:19 msgid "Internet Explorer cannot display this site properly. Click here to read more..." msgstr "Internet Explorer не может хорошо показать сайта. Щелкните здесь, чтобы прочитать больше..." -#: templates/base.html:33 +#: templates/base.html:32 msgid "Welcome" msgstr "Добро пожаловать" -#: templates/base.html:34 +#: templates/base.html:33 msgid "Your shelves" msgstr "Ваши полки" -#: templates/base.html:36 +#: templates/base.html:35 msgid "Administration" msgstr "Администрация" +#: templates/base.html:37 templates/base.html.py:41 +msgid "Report a bug" +msgstr "" + #: templates/base.html:38 msgid "Logout" msgstr "Выход" -#: templates/base.html:41 -#: templates/base.html.py:87 -#: templates/base.html:91 -#: templates/base.html.py:95 -#: templates/auth/login.html:4 -#: templates/auth/login.html.py:7 -#: templates/auth/login.html:12 +#: templates/base.html:42 templates/base.html.py:88 templates/base.html:92 +#: templates/base.html.py:96 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 "Вход" -#: templates/base.html:41 -#: templates/base.html.py:87 -#: templates/base.html:95 -#: templates/base.html.py:99 -#: templates/auth/login.html:7 -#: templates/auth/login.html.py:21 -#: templates/auth/login.html:23 +#: templates/base.html:42 templates/base.html.py:88 templates/base.html:96 +#: templates/base.html.py:100 templates/auth/login.html:7 +#: templates/auth/login.html.py:21 templates/auth/login.html:23 msgid "Register" msgstr "Зарегистроваться" -#: templates/base.html:51 -msgid "Choose your interface language: " -msgstr "Выберите язык интерфейса" - -#: templates/base.html:56 -msgid "Choose language" -msgstr "Выберите язык" - -#: templates/base.html:68 +#: templates/base.html:69 msgid "" "\n" "\t\t\t\tWolne Lektury is a project lead by Modern Poland Foundation.\n" -"\t\t\t\tDigital reproductions are made by The National Library, based on TNL resources. \n" +"\t\t\t\tDigital reproductions are made by The National Library, based on TNL resources.\n" "\t\t\t\tHosting EO Networks.\n" "\t\t\t\t" msgstr "" @@ -141,7 +95,7 @@ msgstr "" "\t\t\t\tHosting EO Networks.\n" "\t\t\t\t" -#: templates/base.html:75 +#: templates/base.html:76 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" @@ -153,31 +107,31 @@ msgstr "" " e-mail: fundacja@nowoczesnapolska.org.pl\n" "\t\t\t\t" -#: templates/base.html:84 -#: templates/base.html.py:105 -#: templates/catalogue/book_detail.html:129 +#: templates/base.html:85 templates/base.html.py:106 templates/base.html:112 +#: templates/catalogue/book_detail.html:146 #: templates/catalogue/book_fragments.html:33 #: templates/catalogue/book_stub_detail.html:31 -#: templates/catalogue/search_multiple_hits.html:23 +#: templates/catalogue/differentiate_tags.html:23 +#: templates/catalogue/search_multiple_hits.html:29 #: templates/catalogue/search_no_hits.html:22 #: templates/catalogue/search_too_short.html:19 -#: templates/catalogue/tagged_object_list.html:141 +#: templates/catalogue/tagged_object_list.html:155 msgid "Close" msgstr "Закройте" -#: templates/base.html:107 -#: templates/catalogue/book_detail.html:131 +#: templates/base.html:108 templates/base.html.py:114 +#: templates/catalogue/book_detail.html:148 #: templates/catalogue/book_fragments.html:35 #: templates/catalogue/book_stub_detail.html:33 -#: templates/catalogue/search_multiple_hits.html:25 +#: templates/catalogue/differentiate_tags.html:25 +#: templates/catalogue/search_multiple_hits.html:31 #: templates/catalogue/search_no_hits.html:24 #: templates/catalogue/search_too_short.html:21 -#: templates/catalogue/tagged_object_list.html:143 +#: templates/catalogue/tagged_object_list.html:157 msgid "Loading" msgstr "Погрузка" -#: templates/admin/base_site.html:4 -#: templates/admin/base_site.html.py:7 +#: templates/admin/base_site.html:4 templates/admin/base_site.html.py:7 msgid "Site administration" msgstr "Сайт администрации" @@ -193,34 +147,29 @@ msgstr "Импорт книги" msgid "Register on" msgstr "Регистрация на" -#: templates/auth/login.html:9 -#: templates/catalogue/book_detail.html:12 +#: templates/auth/login.html:9 templates/catalogue/book_detail.html:12 #: templates/catalogue/book_fragments.html:12 #: templates/catalogue/book_list.html:12 #: templates/catalogue/book_stub_detail.html:12 -#: templates/catalogue/breadcrumbs.html:9 -#: templates/catalogue/main_page.html:13 -#: templates/info/base.html:10 +#: templates/catalogue/breadcrumbs.html:21 +#: templates/catalogue/main_page.html:13 templates/info/base.html:10 #: templates/lessons/document_detail.html:9 #: templates/lessons/document_list.html:51 msgid "Search" msgstr "Поиск" -#: templates/auth/login.html:9 -#: templates/catalogue/book_detail.html:12 +#: templates/auth/login.html:9 templates/catalogue/book_detail.html:12 #: templates/catalogue/book_fragments.html:12 #: templates/catalogue/book_list.html:12 #: templates/catalogue/book_stub_detail.html:12 #: templates/catalogue/main_page.html:13 -#: templates/catalogue/tagged_object_list.html:41 -#: templates/info/base.html:10 +#: templates/catalogue/tagged_object_list.html:43 templates/info/base.html:10 #: templates/lessons/document_detail.html:9 #: templates/lessons/document_list.html:51 msgid "or" msgstr "или" -#: templates/auth/login.html:9 -#: templates/catalogue/book_detail.html:12 +#: templates/auth/login.html:9 templates/catalogue/book_detail.html:12 #: templates/catalogue/book_list.html:12 #: templates/catalogue/book_stub_detail.html:12 #: templates/lessons/document_list.html:51 @@ -231,100 +180,99 @@ msgstr "возврат на главную страницу" msgid "on WolneLektury.pl" msgstr "на WolneLektury.pl" -#: templates/catalogue/book_detail.html:17 +#: templates/catalogue/book_detail.html:29 msgid "Work is licensed under " msgstr "Разрешение на работу со стороны" -#: templates/catalogue/book_detail.html:19 +#: templates/catalogue/book_detail.html:31 msgid "Based on" msgstr "Основанный на" -#: templates/catalogue/book_detail.html:24 -#: templates/catalogue/tagged_object_list.html:27 -msgid "Hide description" -msgstr "Скрыть описание" - -#: templates/catalogue/book_detail.html:27 +#: templates/catalogue/book_detail.html:40 msgid "Put a book" msgstr "Поставьте книгу" -#: templates/catalogue/book_detail.html:27 +#: templates/catalogue/book_detail.html:40 msgid "on the shelf!" msgstr "на полку" -#: templates/catalogue/book_detail.html:31 +#: templates/catalogue/book_detail.html:44 msgid "Read online" msgstr "Читать онлайн" -#: templates/catalogue/book_detail.html:34 +#: templates/catalogue/book_detail.html:47 msgid "Download PDF" msgstr "Скачать PDF" -#: templates/catalogue/book_detail.html:37 +#: templates/catalogue/book_detail.html:50 +msgid "Download EPUB" +msgstr "Скачать EPUB" + +#: templates/catalogue/book_detail.html:53 msgid "Download ODT" msgstr "Скачать ODT" -#: templates/catalogue/book_detail.html:40 +#: templates/catalogue/book_detail.html:56 msgid "Download TXT" msgstr "Скачать TXT" -#: templates/catalogue/book_detail.html:45 +#: templates/catalogue/book_detail.html:61 msgid "Artist" msgstr "Артист" -#: templates/catalogue/book_detail.html:47 +#: templates/catalogue/book_detail.html:63 msgid "Director" msgstr "режиссер" -#: templates/catalogue/book_detail.html:51 +#: templates/catalogue/book_detail.html:67 msgid "Download MP3" msgstr "скачать MP3" -#: templates/catalogue/book_detail.html:52 +#: templates/catalogue/book_detail.html:68 msgid "Download Ogg Vorbis" msgstr "Скачать Ogg Vorbis" -#: templates/catalogue/book_detail.html:79 +#: templates/catalogue/book_detail.html:95 msgid "Details" msgstr "Подробнее" -#: templates/catalogue/book_detail.html:82 +#: templates/catalogue/book_detail.html:99 msgid "Author" msgstr "Автор" -#: templates/catalogue/book_detail.html:88 +#: templates/catalogue/book_detail.html:105 msgid "Epoch" msgstr "эпоха" -#: templates/catalogue/book_detail.html:94 +#: templates/catalogue/book_detail.html:111 msgid "Kind" msgstr "форма" -#: templates/catalogue/book_detail.html:100 +#: templates/catalogue/book_detail.html:117 msgid "Genre" msgstr "жанр" -#: templates/catalogue/book_detail.html:106 +#: templates/catalogue/book_detail.html:123 msgid "Other resources" msgstr "другие ресурсы" -#: templates/catalogue/book_detail.html:108 +#: templates/catalogue/book_detail.html:125 msgid "Book on project's wiki" msgstr "Книга по проекту вики" -#: templates/catalogue/book_detail.html:109 +#: templates/catalogue/book_detail.html:126 msgid "Source of the book" msgstr "Источник книги" -#: templates/catalogue/book_detail.html:111 +#: templates/catalogue/book_detail.html:128 msgid "Book description on Lektury.Gazeta.pl" msgstr "Описание книги на Lektury.Gazeta.pl" -#: templates/catalogue/book_detail.html:114 +#: templates/catalogue/book_detail.html:131 msgid "Book description on Wikipedia" msgstr "Описание книги на Wikipedia" -#: templates/catalogue/book_detail.html:119 +#: templates/catalogue/book_detail.html:136 msgid "Work's themes " msgstr "Темы труда" @@ -355,31 +303,30 @@ msgid "of the book " msgstr "данной книги" #: templates/catalogue/book_list.html:7 -msgid "Alphabetical listing of works on WolneLektury.pl" -msgstr "Алфавитный список работ на WolneLektury.pl" +msgid "Listing of all works on WolneLektury.pl" +msgstr "Список работ на WolneLektury.pl" #: templates/catalogue/book_list.html:10 -msgid "Alphabetical listing of works" -msgstr "Алфавитный список работ" +msgid "Listing of all works" +msgstr "Список работ" #: templates/catalogue/book_sets.html:2 msgid "Put a book on the shelf!" msgstr "Поставьте книгу на полку!" -#: templates/catalogue/book_sets.html:4 +#: templates/catalogue/book_sets.html:3 templates/catalogue/book_sets.html:6 +#: templates/catalogue/fragment_sets.html:16 +msgid "Create new shelf" +msgstr "Создать новую полку" + +#: templates/catalogue/book_sets.html:10 msgid "You do not have any shelves. You can create one below, if you want to." msgstr "У вас нет никаких полок. Если вы хотите, вы можете создать одну ниже." -#: templates/catalogue/book_sets.html:9 -#: templates/catalogue/book_short.html:4 +#: templates/catalogue/book_sets.html:15 templates/catalogue/book_short.html:4 msgid "Put on the shelf!" msgstr "Поставьте на полку!" -#: templates/catalogue/book_sets.html:16 -#: templates/catalogue/fragment_sets.html:16 -msgid "Create new shelf" -msgstr "Создать новую полку" - #: templates/catalogue/book_short.html:14 msgid "Jump to" msgstr "Перейдите на" @@ -409,17 +356,20 @@ msgid "Table of contents" msgstr "Оглавление" #: templates/catalogue/book_text.html:18 -#: templates/catalogue/tagged_object_list.html:132 +#: templates/catalogue/tagged_object_list.html:146 msgid "Themes" msgstr "Мотивы" +#: templates/catalogue/differentiate_tags.html:13 +msgid "The criteria are ambiguous. Please select one of the following options:" +msgstr "" + #: templates/catalogue/folded_tag_list.html:4 msgid "Show full category" msgstr "Показать всю категорию" #: templates/catalogue/folded_tag_list.html:13 -#: templates/catalogue/main_page.html:43 -#: templates/catalogue/main_page.html:48 +#: templates/catalogue/main_page.html:43 templates/catalogue/main_page.html:48 #: templates/catalogue/main_page.html:87 #: templates/catalogue/main_page.html:270 #: templates/catalogue/main_page.html:279 @@ -444,15 +394,15 @@ msgstr "У вас нет никакой полки. Если вы хотите, msgid "Save all shelves" msgstr "Сохранить все полки" -#: templates/catalogue/fragment_short.html:6 +#: templates/catalogue/fragment_short.html:7 msgid "Expand fragment" msgstr "Растянуть фрагмент" -#: templates/catalogue/fragment_short.html:12 +#: templates/catalogue/fragment_short.html:13 msgid "Hide fragment" msgstr "Скрыть фрагмент" -#: templates/catalogue/fragment_short.html:17 +#: templates/catalogue/fragment_short.html:18 msgid "See in a book" msgstr "Посмотрите в книге" @@ -512,22 +462,22 @@ msgid "are professional recordings of literary texts from our repository, availa msgstr "- это профессиональные записи литературных текстов из нашего хранилища. Они доступны по бесплатному разрешению ? в форматах MP3 и Ogg Vorbis, а также в системе DAISY." #: templates/catalogue/main_page.html:54 -#: templates/catalogue/tagged_object_list.html:114 +#: templates/catalogue/tagged_object_list.html:128 msgid "Authors" msgstr "Авторы" #: templates/catalogue/main_page.html:58 -#: templates/catalogue/tagged_object_list.html:118 +#: templates/catalogue/tagged_object_list.html:132 msgid "Kinds" msgstr "Формы" #: templates/catalogue/main_page.html:62 -#: templates/catalogue/tagged_object_list.html:122 +#: templates/catalogue/tagged_object_list.html:136 msgid "Genres" msgstr "Жанры" #: templates/catalogue/main_page.html:66 -#: templates/catalogue/tagged_object_list.html:126 +#: templates/catalogue/tagged_object_list.html:140 msgid "Epochs" msgstr "Эпохи" @@ -587,7 +537,7 @@ msgid "Search in WolneLektury.pl" msgstr "Искать в WolneLektury.pl" #: templates/catalogue/search_no_hits.html:14 -#: templates/catalogue/tagged_object_list.html:102 +#: templates/catalogue/tagged_object_list.html:116 msgid "Sorry! Search cirteria did not match any resources." msgstr "Извините! Критерий поиска не соответствует никаким ресурсам." @@ -615,112 +565,136 @@ msgstr "У тебя пустая полка" msgid "You can put a book on a shelf by entering page of the reading and clicking 'Put on the shelf'." msgstr "Вы можете поставить книгу на полку, заходя на сайт произведения или щелкнув 'Поставить на полку'." -#: templates/catalogue/tagged_object_list.html:31 +#: templates/catalogue/tagged_object_list.html:32 msgid "Download all books from this shelf" msgstr "Скачать все книги с этой полки" -#: templates/catalogue/tagged_object_list.html:35 +#: templates/catalogue/tagged_object_list.html:36 msgid "Choose books' formats which you want to download:" msgstr "Выбрать формат книг, которые вы хотите скачать:" -#: templates/catalogue/tagged_object_list.html:36 #: 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 "для чтения" -#: templates/catalogue/tagged_object_list.html:36 +#: templates/catalogue/tagged_object_list.html:37 msgid "and printing using" msgstr "и для печатки" -#: templates/catalogue/tagged_object_list.html:37 +#: templates/catalogue/tagged_object_list.html:39 msgid "and editing using" msgstr "и для редактирования" -#: templates/catalogue/tagged_object_list.html:38 +#: templates/catalogue/tagged_object_list.html:40 msgid "on small displays, for example mobile phones" msgstr "на маленьких дисплеях, напр. мобильных телефонов" -#: templates/catalogue/tagged_object_list.html:39 -#: templates/catalogue/tagged_object_list.html:40 +#: templates/catalogue/tagged_object_list.html:41 +#: templates/catalogue/tagged_object_list.html:42 msgid "for listening" msgstr "для слушания" -#: templates/catalogue/tagged_object_list.html:39 +#: templates/catalogue/tagged_object_list.html:41 msgid "on favourite MP3 player" msgstr "на любимом MP3-плейере" -#: templates/catalogue/tagged_object_list.html:40 +#: templates/catalogue/tagged_object_list.html:42 msgid "open format" msgstr "открытый формат" -#: templates/catalogue/tagged_object_list.html:40 +#: templates/catalogue/tagged_object_list.html:42 msgid "Xiph.org Foundation" msgstr "Фонд Xiph.org" -#: templates/catalogue/tagged_object_list.html:41 +#: templates/catalogue/tagged_object_list.html:43 #: templates/lessons/ajax_document_detail.html:3 #: templates/lessons/document_detail.html:13 msgid "Download" msgstr "Скачать" -#: templates/catalogue/tagged_object_list.html:41 +#: templates/catalogue/tagged_object_list.html:43 msgid "Updating list of books' formats on the shelf" msgstr "Обновить список форматов книг на полке" -#: templates/catalogue/tagged_object_list.html:41 +#: templates/catalogue/tagged_object_list.html:43 msgid "cancel" msgstr "Отменить" -#: templates/catalogue/tagged_object_list.html:46 +#: templates/catalogue/tagged_object_list.html:48 msgid "Share this shelf" msgstr "Делить эту полку" -#: templates/catalogue/tagged_object_list.html:48 +#: templates/catalogue/tagged_object_list.html:50 msgid "Copy this link and share it with other people to let them see your shelf." msgstr "Копировать эту ссылку и делить с другими пользователями, чтобы они могли увидеть вашу полку." -#: templates/catalogue/tagged_object_list.html:57 +#: templates/catalogue/tagged_object_list.html:60 msgid "Read work's study of this author on Lektury.Gazeta.pl" msgstr "Читать очерк произведения данного автора на Lektury.Gazeta.pl" -#: templates/catalogue/tagged_object_list.html:60 -msgid "Read study of epoch" -msgstr "Прочитайте очерк эпохи" +#: templates/catalogue/tagged_object_list.html:62 +#, fuzzy, python-format +msgid "Read study of epoch %(last_tag)s on Lektury.Gazeta.pl" +msgstr "Читать очерк произведения данного автора на Lektury.Gazeta.pl" -#: templates/catalogue/tagged_object_list.html:60 -msgid "on Lektury.Gazeta.pl" -msgstr "на Lektury.Gazeta.pl" +#: templates/catalogue/tagged_object_list.html:64 +#, fuzzy, python-format +msgid "Read study of kind %(last_tag)s on Lektury.Gazeta.pl" +msgstr "Читать очерк произведения данного автора на Lektury.Gazeta.pl" -#: templates/catalogue/tagged_object_list.html:67 +#: templates/catalogue/tagged_object_list.html:66 +#, fuzzy, python-format +msgid "Read study of genre %(last_tag)s on Lektury.Gazeta.pl" +msgstr "Читать очерк произведения данного автора на Lektury.Gazeta.pl" + +#: templates/catalogue/tagged_object_list.html:68 +#, fuzzy +msgid "Read related study on Lektury.Gazeta.pl" +msgstr "Читать очерк произведения данного автора на Lektury.Gazeta.pl" + +#: templates/catalogue/tagged_object_list.html:76 msgid "Read article about this author on Wikipedia" msgstr "Прочитайте статью об авторе в Википедии" -#: templates/catalogue/tagged_object_list.html:70 -msgid "Read article about epoch" -msgstr "Прочитайте статью об эпохе" - -#: templates/catalogue/tagged_object_list.html:70 -msgid "on Wikipedia" -msgstr "в Википедии" +#: templates/catalogue/tagged_object_list.html:78 +#, fuzzy, python-format +msgid "Read article about epoch %(last_tag)s on Wikipedia" +msgstr "Прочитайте статью об авторе в Википедии" #: templates/catalogue/tagged_object_list.html:80 +#, fuzzy, python-format +msgid "Read article about kind %(last_tag)s on Wikipedia" +msgstr "Прочитайте статью об авторе в Википедии" + +#: templates/catalogue/tagged_object_list.html:82 +#, fuzzy, python-format +msgid "Read article about genre %(last_tag)s on Wikipedia" +msgstr "Прочитайте статью об авторе в Википедии" + +#: templates/catalogue/tagged_object_list.html:84 +#, fuzzy +msgid "Read related article on Wikipedia" +msgstr "Прочитайте статью об авторе в Википедии" + +#: templates/catalogue/tagged_object_list.html:94 msgid "Delete" msgstr "Удалить" -#: templates/catalogue/tagged_object_list.html:88 +#: templates/catalogue/tagged_object_list.html:102 msgid "This author's works are copyrighted." msgstr "На работы этого автора распространяется авторское право." -#: templates/catalogue/tagged_object_list.html:91 +#: templates/catalogue/tagged_object_list.html:105 msgid "This author's works are in public domain and will be published on Internet school library of Wolne Lektury soon." msgstr "Работы данного автора находятся в публичной области и будут изданы в школьной библиотеке Интернета скоро." -#: templates/catalogue/tagged_object_list.html:95 +#: templates/catalogue/tagged_object_list.html:109 msgid "This author's works will become part of public domain and will be allowed to be published without restrictions in" msgstr "Труды данного автора будут частью публичной области и возможным будет их издание без ограничений на" -#: templates/catalogue/tagged_object_list.html:97 +#: templates/catalogue/tagged_object_list.html:111 msgid "Find out why Internet libraries can't publish this author's works." msgstr "Узнайте, почему интернет-библиотеки не могут издать работ этого автора." @@ -737,18 +711,16 @@ msgid "return to the main page" msgstr "возвратитесь на главную страницу" #: templates/info/join_us.html:2 -#, python-format msgid "" "We have over 1000 works published in Wolne Lektury!\n" "Help us expand the library and set new readings free by\n" -"making a donation or transferring 1%% of your income tax." +"making a donation or transferring 1% of your income tax." msgstr "" "У нас больше 1000 трудов в Wolne Lektury!\n" "Помогите нам распространить библиотеку и поместить новые бесплатные чтения\n" -"при помощи денежного пожертвования или перевода 1%% вашего подоходного налога." +"при помощи денежного пожертвования или перевода 1% вашего подоходного налога." -#: templates/info/join_us.html:5 -#: templates/info/join_us.html.py:10 +#: templates/info/join_us.html:5 templates/info/join_us.html.py:10 msgid "More..." msgstr "Подробнее..." @@ -785,3 +757,47 @@ msgstr "предыдущая" msgid "next" msgstr "следующая" +#~ msgid "Polish" +#~ msgstr "польский" + +#~ msgid "German" +#~ msgstr "немецкий" + +#~ msgid "English" +#~ msgstr "английский" + +#~ msgid "Lithuanian" +#~ msgstr "литовский" + +#~ msgid "French" +#~ msgstr "французский" + +#~ msgid "Russian" +#~ msgstr "русский" + +#~ msgid "Spanish" +#~ msgstr "испанский" + +#~ msgid "Ukrainian" +#~ msgstr "украинский" + +#~ msgid "Choose your interface language: " +#~ msgstr "Выберите язык интерфейса" + +#~ msgid "Choose language" +#~ msgstr "Выберите язык" + +#~ msgid "Hide description" +#~ msgstr "Скрыть описание" + +#~ msgid "Read study of epoch" +#~ msgstr "Прочитайте очерк эпохи" + +#~ msgid "on Lektury.Gazeta.pl" +#~ msgstr "на Lektury.Gazeta.pl" + +#~ msgid "Read article about epoch" +#~ msgstr "Прочитайте статью об эпохе" + +#~ msgid "on Wikipedia" +#~ msgstr "в Википедии" diff --git a/wolnelektury/locale/uk/LC_MESSAGES/django.mo b/wolnelektury/locale/uk/LC_MESSAGES/django.mo index d827756d2..f018a3ccb 100644 Binary files a/wolnelektury/locale/uk/LC_MESSAGES/django.mo and b/wolnelektury/locale/uk/LC_MESSAGES/django.mo differ diff --git a/wolnelektury/locale/uk/LC_MESSAGES/django.po b/wolnelektury/locale/uk/LC_MESSAGES/django.po index e8b84e24c..186a46a4f 100644 --- a/wolnelektury/locale/uk/LC_MESSAGES/django.po +++ b/wolnelektury/locale/uk/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 14:29+0200\n" +"POT-Creation-Date: 2010-08-25 10:23+0000\n" "PO-Revision-Date: 2010-08-26 14:09+0100\n" "Last-Translator: Natalia Kertyczak \n" "Language-Team: LANGUAGE \n" @@ -15,40 +15,9 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: settings.py:37 -msgid "Polish" -msgstr "польська" - -#: settings.py:38 -msgid "German" -msgstr "німецька" - -#: settings.py:39 -msgid "English" -msgstr "англійська" - -#: settings.py:40 -msgid "Lithuanian" -msgstr "литовська" - -#: settings.py:41 -msgid "French" -msgstr "французька" - -#: settings.py:42 -msgid "Russian" -msgstr "російська" - -#: settings.py:43 -msgid "Spanish" -msgstr "іспанська" - -#: settings.py:44 -msgid "Ukrainian" -msgstr "українська" - #: templates/404.html:6 #: templates/404.html.py:15 +#: templates/404.html:6 templates/404.html.py:15 msgid "Page does not exist" msgstr "Сторінка не існує" @@ -82,18 +51,22 @@ msgstr "В зв'язку з технічними роботами сервіс W msgid "Internet Explorer cannot display this site properly. Click here to read more..." msgstr "Інтернет Експолорер не може правильно відобразити цієї сторінки. Натисніть, щоб дізнатися більше..." -#: templates/base.html:33 +#: templates/base.html:32 msgid "Welcome" msgstr "Ласкаво просимо" -#: templates/base.html:34 +#: templates/base.html:33 msgid "Your shelves" msgstr "Ваші полиці" -#: templates/base.html:36 +#: templates/base.html:35 msgid "Administration" msgstr "Адміністрація" +#: templates/base.html:37 templates/base.html.py:41 +msgid "Report a bug" +msgstr "" + #: templates/base.html:38 msgid "Logout" msgstr "Вийти " @@ -109,13 +82,9 @@ msgstr "Вийти " msgid "Sign in" msgstr "Увійти" -#: templates/base.html:41 -#: templates/base.html.py:87 -#: templates/base.html:95 -#: templates/base.html.py:99 -#: templates/auth/login.html:7 -#: templates/auth/login.html.py:21 -#: templates/auth/login.html:23 +#: templates/base.html:42 templates/base.html.py:88 templates/base.html:96 +#: templates/base.html.py:100 templates/auth/login.html:7 +#: templates/auth/login.html.py:21 templates/auth/login.html:23 msgid "Register" msgstr "Зареєструватися" @@ -130,8 +99,10 @@ msgstr "Вибрати мову" #: templates/base.html:68 msgid "" "\n" -"\t\t\t\tWolne Lektury is a project lead by Modern Poland Foundation.\n" -"\t\t\t\tDigital reproductions are made by The National Library, based on TNL resources. \n" +"\t\t\t\tWolne Lektury is a project lead by Modern Poland Foundation.\n" +"\t\t\t\tDigital reproductions are made by The National Library, based on TNL resources.\n" "\t\t\t\tHosting EO Networks.\n" "\t\t\t\t" msgstr "" @@ -141,7 +112,7 @@ msgstr "" "\t\t\t\tГостинг EO Networks.\n" "\t\t\t\t" -#: templates/base.html:75 +#: templates/base.html:76 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" @@ -153,26 +124,27 @@ msgstr "" " eлектронна пошта: fundacja@nowoczesnapolska.org.pl\n" "\t\t\t\t" -#: templates/base.html:84 -#: templates/base.html.py:105 -#: templates/catalogue/book_detail.html:129 +#: templates/base.html:85 templates/base.html.py:106 templates/base.html:112 +#: templates/catalogue/book_detail.html:146 #: templates/catalogue/book_fragments.html:33 #: templates/catalogue/book_stub_detail.html:31 -#: templates/catalogue/search_multiple_hits.html:23 +#: templates/catalogue/differentiate_tags.html:23 +#: templates/catalogue/search_multiple_hits.html:29 #: templates/catalogue/search_no_hits.html:22 #: templates/catalogue/search_too_short.html:19 -#: templates/catalogue/tagged_object_list.html:141 +#: templates/catalogue/tagged_object_list.html:155 msgid "Close" msgstr "Зачинити" -#: templates/base.html:107 -#: templates/catalogue/book_detail.html:131 +#: templates/base.html:108 templates/base.html.py:114 +#: templates/catalogue/book_detail.html:148 #: templates/catalogue/book_fragments.html:35 #: templates/catalogue/book_stub_detail.html:33 -#: templates/catalogue/search_multiple_hits.html:25 +#: templates/catalogue/differentiate_tags.html:25 +#: templates/catalogue/search_multiple_hits.html:31 #: templates/catalogue/search_no_hits.html:24 #: templates/catalogue/search_too_short.html:21 -#: templates/catalogue/tagged_object_list.html:143 +#: templates/catalogue/tagged_object_list.html:157 msgid "Loading" msgstr "Завантажується" @@ -198,9 +170,9 @@ msgstr "Реєстрація на" #: templates/catalogue/book_fragments.html:12 #: templates/catalogue/book_list.html:12 #: templates/catalogue/book_stub_detail.html:12 -#: templates/catalogue/breadcrumbs.html:9 -#: templates/catalogue/main_page.html:13 -#: templates/info/base.html:10 + +#: templates/catalogue/breadcrumbs.html:21 +#: templates/catalogue/main_page.html:13 templates/info/base.html:10 #: templates/lessons/document_detail.html:9 #: templates/lessons/document_list.html:51 msgid "Search" @@ -212,8 +184,6 @@ msgstr "Пошук" #: templates/catalogue/book_list.html:12 #: templates/catalogue/book_stub_detail.html:12 #: templates/catalogue/main_page.html:13 -#: templates/catalogue/tagged_object_list.html:41 -#: templates/info/base.html:10 #: templates/lessons/document_detail.html:9 #: templates/lessons/document_list.html:51 msgid "or" @@ -231,11 +201,11 @@ msgstr "повернення на головну сторінку" msgid "on WolneLektury.pl" msgstr "на WolneLektury.pl" -#: templates/catalogue/book_detail.html:17 +#: templates/catalogue/book_detail.html:29 msgid "Work is licensed under " msgstr "Твір на ліцензії" -#: templates/catalogue/book_detail.html:19 +#: templates/catalogue/book_detail.html:31 msgid "Based on" msgstr "На основі" @@ -243,28 +213,33 @@ msgstr "На основі" #: templates/catalogue/tagged_object_list.html:27 msgid "Hide description" msgstr "Сховати опис" - -#: templates/catalogue/book_detail.html:27 +#: templates/catalogue/book_detail.html:40 msgid "Put a book" msgstr "Покласти книжку" -#: templates/catalogue/book_detail.html:27 +#: templates/catalogue/book_detail.html:40 msgid "on the shelf!" msgstr "на полицю!" -#: templates/catalogue/book_detail.html:31 +#: templates/catalogue/book_detail.html:44 msgid "Read online" msgstr "Читати онлайн" -#: templates/catalogue/book_detail.html:34 +#: templates/catalogue/book_detail.html:47 msgid "Download PDF" msgstr "Завантажити PDF" #: templates/catalogue/book_detail.html:37 +#: templates/catalogue/book_detail.html:50 +msgid "Download EPUB" +msgstr "" + +#: templates/catalogue/book_detail.html:53 msgid "Download ODT" msgstr "Завантажити ODT" #: templates/catalogue/book_detail.html:40 +#: templates/catalogue/book_detail.html:56 msgid "Download TXT" msgstr "Завантажити TXT" @@ -272,7 +247,7 @@ msgstr "Завантажити TXT" msgid "Artist" msgstr "Артист" -#: templates/catalogue/book_detail.html:47 +#: templates/catalogue/book_detail.html:63 msgid "Director" msgstr "Режисер" @@ -284,10 +259,11 @@ msgstr "Завантажити MP3" msgid "Download Ogg Vorbis" msgstr "Завантажити Ogg Vorbis" -#: templates/catalogue/book_detail.html:79 +#: templates/catalogue/book_detail.html:95 msgid "Details" msgstr "Подробиці" + #: templates/catalogue/book_detail.html:82 msgid "Author" msgstr "Автор" @@ -301,22 +277,27 @@ msgid "Kind" msgstr "Рід" #: templates/catalogue/book_detail.html:100 +#: templates/catalogue/book_detail.html:117 msgid "Genre" msgstr "Жанр" #: templates/catalogue/book_detail.html:106 + msgid "Other resources" msgstr "Інші засоби" -#: templates/catalogue/book_detail.html:108 +#: templates/catalogue/book_detail.html:125 msgid "Book on project's wiki" msgstr "Книжка на вікі проекту" + #: templates/catalogue/book_detail.html:109 + +#: templates/catalogue/book_detail.html:126 msgid "Source of the book" msgstr "Джерело книжки" -#: templates/catalogue/book_detail.html:111 +#: templates/catalogue/book_detail.html:128 msgid "Book description on Lektury.Gazeta.pl" msgstr "Опис книжки на Lektury.Gazeta.pl" @@ -361,6 +342,12 @@ msgstr "Алфавітний список творів на WolneLektury.pl" #: templates/catalogue/book_list.html:10 msgid "Alphabetical listing of works" msgstr "Алфавітний список творів" +msgid "Listing of all works on WolneLektury.pl" +msgstr "" + +#: templates/catalogue/book_list.html:10 +msgid "Listing of all works" +msgstr "" #: templates/catalogue/book_sets.html:2 msgid "Put a book on the shelf!" @@ -409,10 +396,14 @@ msgid "Table of contents" msgstr "Зміст" #: templates/catalogue/book_text.html:18 -#: templates/catalogue/tagged_object_list.html:132 +#: templates/catalogue/tagged_object_list.html:146 msgid "Themes" msgstr "Теми" +#: templates/catalogue/differentiate_tags.html:13 +msgid "The criteria are ambiguous. Please select one of the following options:" +msgstr "" + #: templates/catalogue/folded_tag_list.html:4 msgid "Show full category" msgstr "Показати всю категорію" @@ -444,15 +435,15 @@ msgstr "В вас немає жодних полиць. В можете ство msgid "Save all shelves" msgstr "Зберегти всі полиці" -#: templates/catalogue/fragment_short.html:6 +#: templates/catalogue/fragment_short.html:7 msgid "Expand fragment" msgstr "Показати фрагмент" -#: templates/catalogue/fragment_short.html:12 +#: templates/catalogue/fragment_short.html:13 msgid "Hide fragment" msgstr "Сховати фрагмент" -#: templates/catalogue/fragment_short.html:17 +#: templates/catalogue/fragment_short.html:18 msgid "See in a book" msgstr "Дивитись у книжці" @@ -512,22 +503,26 @@ msgid "are professional recordings of literary texts from our repository, availa msgstr "це професійні записи текстів літератури з нашої бази, доступні на вільній ліцензії у форматах MP3 та Ogg Vorbis, а також в системі DAISY." #: templates/catalogue/main_page.html:54 -#: templates/catalogue/tagged_object_list.html:114 + +#: templates/catalogue/tagged_object_list.html:128 + msgid "Authors" msgstr "Автори" #: templates/catalogue/main_page.html:58 -#: templates/catalogue/tagged_object_list.html:118 +#: templates/catalogue/tagged_object_list.html:132 + msgid "Kinds" msgstr "Роди" #: templates/catalogue/main_page.html:62 -#: templates/catalogue/tagged_object_list.html:122 +#: templates/catalogue/tagged_object_list.html:136 + msgid "Genres" msgstr "Жанри" #: templates/catalogue/main_page.html:66 -#: templates/catalogue/tagged_object_list.html:126 +#: templates/catalogue/tagged_object_list.html:140 msgid "Epochs" msgstr "Епохи" @@ -615,64 +610,64 @@ msgstr "Ваша полиця порожня" msgid "You can put a book on a shelf by entering page of the reading and clicking 'Put on the shelf'." msgstr "Щоб покласти книжку на полицю, увійдіть на сторінку книжки та натисніть \"Покласти на полицю\"." -#: templates/catalogue/tagged_object_list.html:31 +#: templates/catalogue/tagged_object_list.html:32 msgid "Download all books from this shelf" msgstr "Завантажити всі книжки з цієї полиці" -#: templates/catalogue/tagged_object_list.html:35 +#: templates/catalogue/tagged_object_list.html:36 msgid "Choose books' formats which you want to download:" msgstr "Вибрати формат, в якому хочете завантажити книжку:" -#: templates/catalogue/tagged_object_list.html:36 #: 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 "для читання" -#: templates/catalogue/tagged_object_list.html:36 +#: templates/catalogue/tagged_object_list.html:37 msgid "and printing using" msgstr "та друку з використанням" -#: templates/catalogue/tagged_object_list.html:37 +#: templates/catalogue/tagged_object_list.html:39 msgid "and editing using" msgstr "та едиції з використанням" -#: templates/catalogue/tagged_object_list.html:38 +#: templates/catalogue/tagged_object_list.html:40 msgid "on small displays, for example mobile phones" msgstr "на невеликих екранах, на приклад на мобільному телефоні" -#: templates/catalogue/tagged_object_list.html:39 -#: templates/catalogue/tagged_object_list.html:40 +#: templates/catalogue/tagged_object_list.html:41 +#: templates/catalogue/tagged_object_list.html:42 msgid "for listening" msgstr "для слухання" -#: templates/catalogue/tagged_object_list.html:39 +#: templates/catalogue/tagged_object_list.html:41 msgid "on favourite MP3 player" msgstr "на улюбленому плеєрі MP3" -#: templates/catalogue/tagged_object_list.html:40 +#: templates/catalogue/tagged_object_list.html:42 msgid "open format" msgstr "відкритий формат" -#: templates/catalogue/tagged_object_list.html:40 +#: templates/catalogue/tagged_object_list.html:42 msgid "Xiph.org Foundation" msgstr "Фонд Xiph.org" -#: templates/catalogue/tagged_object_list.html:41 +#: templates/catalogue/tagged_object_list.html:43 #: templates/lessons/ajax_document_detail.html:3 #: templates/lessons/document_detail.html:13 msgid "Download" msgstr "Завантажити" -#: templates/catalogue/tagged_object_list.html:41 +#: templates/catalogue/tagged_object_list.html:43 msgid "Updating list of books' formats on the shelf" msgstr "Оновити список форматів книжок, які на полиці" -#: templates/catalogue/tagged_object_list.html:41 +#: templates/catalogue/tagged_object_list.html:43 msgid "cancel" msgstr "відхилити" -#: templates/catalogue/tagged_object_list.html:46 +#: templates/catalogue/tagged_object_list.html:48 msgid "Share this shelf" msgstr "Поділитися цією полицею" @@ -705,10 +700,11 @@ msgid "on Wikipedia" msgstr "на Вікіпедії" #: templates/catalogue/tagged_object_list.html:80 + msgid "Delete" msgstr "Видалити" -#: templates/catalogue/tagged_object_list.html:88 +#: templates/catalogue/tagged_object_list.html:102 msgid "This author's works are copyrighted." msgstr "Твори цього автора охороняються авторським правом" @@ -720,7 +716,7 @@ msgstr "Твори цього автора є частиною суспільн msgid "This author's works will become part of public domain and will be allowed to be published without restrictions in" msgstr "Твори цього автора стануть частиною суспільного надбання і можна буде їх публікувати без обмежень в" -#: templates/catalogue/tagged_object_list.html:97 +#: templates/catalogue/tagged_object_list.html:111 msgid "Find out why Internet libraries can't publish this author's works." msgstr "Дізнатися чому інтернет-бібліотеки не можуть опубілкувати творів цього автора." diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py index 01cfcf4c8..359f08f48 100644 --- a/wolnelektury/settings.py +++ b/wolnelektury/settings.py @@ -42,7 +42,7 @@ LANGUAGES = tuple(sorted([ ('fr', u'français'), ('ru', u'русский'), ('es', u'español'), - ('uk', u'українська'), + #('uk', u'українська'), ], key=lambda x: x[0])) @@ -159,6 +159,7 @@ COMPRESS_JS = { 'js/jquery.countdown-de.js', 'js/jquery.countdown-uk.js', 'js/jquery.countdown-es.js', 'js/jquery.countdown-lt.js', 'js/jquery.countdown-ru.js', 'js/jquery.countdown-fr.js', + 'js/jquery.marquee.js', 'js/jquery.jqmodal.js', 'js/jquery.labelify.js', 'js/catalogue.js', ), 'output_filename': 'js/all?.min.js', diff --git a/wolnelektury/static/css/master.css b/wolnelektury/static/css/master.css index 7cc1e304a..cfa644f65 100644 --- a/wolnelektury/static/css/master.css +++ b/wolnelektury/static/css/master.css @@ -877,6 +877,14 @@ div.shown-tags p, div.all-tags p { display: block; } +#document-list ul { + padding-left: 30px; + list-style: disc; +} +#document-list li li a { + width: 340px; +} + #document-list li a:hover, #document-list li a.active { text-decoration: none; background-color: #EEE; diff --git a/wolnelektury/static/css/sponsors.css b/wolnelektury/static/css/sponsors.css index f780972e2..4b847dc76 100644 --- a/wolnelektury/static/css/sponsors.css +++ b/wolnelektury/static/css/sponsors.css @@ -1,8 +1,14 @@ +.sponsors-sponsor-logo { + margin-left: 1em; + vertical-align: middle; +} + .sponsors-sponsor-column { - float: left; - overflow: hidden; + line-height: 120px; + padding-right: 5em; } -.sponsors-sponsor-logo { - float: left; -} \ No newline at end of file +.sponsors-sponsor-column-name { + font-weight: bold; + font-size: 1.25em; +} diff --git a/wolnelektury/static/js/catalogue.js b/wolnelektury/static/js/catalogue.js index b495ee535..076ae4eeb 100644 --- a/wolnelektury/static/js/catalogue.js +++ b/wolnelektury/static/js/catalogue.js @@ -446,5 +446,7 @@ function serverTime() { $('#download-shelf-menu').slideUp('fast'); return false; }); + + $('marquee').marquee() }); })(jQuery) diff --git a/wolnelektury/static/js/jquery.marquee.js b/wolnelektury/static/js/jquery.marquee.js new file mode 100644 index 000000000..d0200ef2f --- /dev/null +++ b/wolnelektury/static/js/jquery.marquee.js @@ -0,0 +1,155 @@ +/** +* author Remy Sharp +* url http://remysharp.com/tag/marquee +*/ + +(function ($) { + $.fn.marquee = function (klass) { + var newMarquee = [], + last = this.length; + + // works out the left or right hand reset position, based on scroll + // behavior, current direction and new direction + function getReset(newDir, marqueeRedux, marqueeState) { + var behavior = marqueeState.behavior, width = marqueeState.width, dir = marqueeState.dir; + var r = 0; + if (behavior == 'alternate') { + r = newDir == 1 ? marqueeRedux[marqueeState.widthAxis] - (width*2) : width; + } else if (behavior == 'slide') { + if (newDir == -1) { + r = dir == -1 ? marqueeRedux[marqueeState.widthAxis] : width; + } else { + r = dir == -1 ? marqueeRedux[marqueeState.widthAxis] - (width*2) : 0; + } + } else { + r = newDir == -1 ? marqueeRedux[marqueeState.widthAxis] : 0; + } + return r; + } + + // single "thread" animation + function animateMarquee() { + var i = newMarquee.length, + marqueeRedux = null, + $marqueeRedux = null, + marqueeState = {}, + newMarqueeList = [], + hitedge = false; + + while (i--) { + marqueeRedux = newMarquee[i]; + $marqueeRedux = $(marqueeRedux); + marqueeState = $marqueeRedux.data('marqueeState'); + + if ($marqueeRedux.data('paused') !== true) { + // TODO read scrollamount, dir, behavior, loops and last from data + marqueeRedux[marqueeState.axis] += (marqueeState.scrollamount * marqueeState.dir); + + // only true if it's hit the end + hitedge = marqueeState.dir == -1 ? marqueeRedux[marqueeState.axis] <= getReset(marqueeState.dir * -1, marqueeRedux, marqueeState) : marqueeRedux[marqueeState.axis] >= getReset(marqueeState.dir * -1, marqueeRedux, marqueeState); + + if ((marqueeState.behavior == 'scroll' && marqueeState.last == marqueeRedux[marqueeState.axis]) || (marqueeState.behavior == 'alternate' && hitedge && marqueeState.last != -1) || (marqueeState.behavior == 'slide' && hitedge && marqueeState.last != -1)) { + if (marqueeState.behavior == 'alternate') { + marqueeState.dir *= -1; // flip + } + marqueeState.last = -1; + + $marqueeRedux.trigger('stop'); + + marqueeState.loops--; + if (marqueeState.loops === 0) { + if (marqueeState.behavior != 'slide') { + marqueeRedux[marqueeState.axis] = getReset(marqueeState.dir, marqueeRedux, marqueeState); + } else { + // corrects the position + marqueeRedux[marqueeState.axis] = getReset(marqueeState.dir * -1, marqueeRedux, marqueeState); + } + + $marqueeRedux.trigger('end'); + } else { + // keep this marquee going + newMarqueeList.push(marqueeRedux); + $marqueeRedux.trigger('start'); + marqueeRedux[marqueeState.axis] = getReset(marqueeState.dir, marqueeRedux, marqueeState); + } + } else { + newMarqueeList.push(marqueeRedux); + } + marqueeState.last = marqueeRedux[marqueeState.axis]; + + // store updated state only if we ran an animation + $marqueeRedux.data('marqueeState', marqueeState); + } else { + // even though it's paused, keep it in the list + newMarqueeList.push(marqueeRedux); + } + } + + newMarquee = newMarqueeList; + + if (newMarquee.length) { + setTimeout(animateMarquee, 25); + } + } + + // TODO consider whether using .html() in the wrapping process could lead to loosing predefined events... + this.each(function (i) { + var $marquee = $(this), + width = $marquee.attr('width') || $marquee.width(), + height = $marquee.attr('height') || $marquee.height(), + $marqueeRedux = $marquee.after('
' + $marquee.html() + '
').next(), + marqueeRedux = $marqueeRedux.get(0), + hitedge = 0, + direction = ($marquee.attr('direction') || 'left').toLowerCase(), + marqueeState = { + dir : /down|right/.test(direction) ? -1 : 1, + axis : /left|right/.test(direction) ? 'scrollLeft' : 'scrollTop', + widthAxis : /left|right/.test(direction) ? 'scrollWidth' : 'scrollHeight', + last : -1, + loops : $marquee.attr('loop') || -1, + scrollamount : $marquee.attr('scrollamount') || this.scrollAmount || 2, + behavior : ($marquee.attr('behavior') || 'scroll').toLowerCase(), + width : /left|right/.test(direction) ? width : height + }; + + // corrects a bug in Firefox - the default loops for slide is -1 + if ($marquee.attr('loop') == -1 && marqueeState.behavior == 'slide') { + marqueeState.loops = 1; + } + + $marquee.remove(); + + // add padding + if (/left|right/.test(direction)) { + $marqueeRedux.find('> div').css('padding', '0 ' + width + 'px'); + } else { + $marqueeRedux.find('> div').css('padding', height + 'px 0'); + } + + // events + $marqueeRedux.bind('stop', function () { + $marqueeRedux.data('paused', true); + }).bind('pause', function () { + $marqueeRedux.data('paused', true); + }).bind('start', function () { + $marqueeRedux.data('paused', false); + }).bind('unpause', function () { + $marqueeRedux.data('paused', false); + }).data('marqueeState', marqueeState); // finally: store the state + + // todo - rerender event allowing us to do an ajax hit and redraw the marquee + + newMarquee.push(marqueeRedux); + + marqueeRedux[marqueeState.axis] = getReset(marqueeState.dir, marqueeRedux, marqueeState); + $marqueeRedux.trigger('start'); + + // on the very last marquee, trigger the animation + if (i+1 == last) { + animateMarquee(); + } + }); + + return $(newMarquee); + }; +}(jQuery)); diff --git a/wolnelektury/static/sponsors/css/footer_admin.css b/wolnelektury/static/sponsors/css/footer_admin.css index 0e2a01efc..1277bd2d3 100644 --- a/wolnelektury/static/sponsors/css/footer_admin.css +++ b/wolnelektury/static/sponsors/css/footer_admin.css @@ -55,13 +55,13 @@ margin: 0; padding: 2px; list-style: none; - min-height: 320px; + min-height: 400px; } .sponsors-sponsor { margin: 0 40px 2px 0; width: 120px; - height: 60px; + height: 120px; border: 1px solid #CCC; background-color: #EEE; cursor: default; diff --git a/wolnelektury/templates/base.html b/wolnelektury/templates/base.html index 393eec52d..4d59dc8aa 100644 --- a/wolnelektury/templates/base.html +++ b/wolnelektury/templates/base.html @@ -44,8 +44,7 @@
diff --git a/wolnelektury/templates/catalogue/book_detail.html b/wolnelektury/templates/catalogue/book_detail.html index c03614cea..fed2d5b26 100644 --- a/wolnelektury/templates/catalogue/book_detail.html +++ b/wolnelektury/templates/catalogue/book_detail.html @@ -46,8 +46,8 @@ {% if book.pdf_file %} {% trans "Download PDF" %} {% endif %} - {% if book.epub_file %} - {% trans "Download EPUB" %} + {% if book.root_ancestor.epub_file %} + {% trans "Download EPUB" %} {% endif %} {% if book.odt_file %} {% trans "Download ODT" %} diff --git a/wolnelektury/templates/lessons/document_list.html b/wolnelektury/templates/lessons/document_list.html index d8564a590..2f1c848b2 100644 --- a/wolnelektury/templates/lessons/document_list.html +++ b/wolnelektury/templates/lessons/document_list.html @@ -9,9 +9,9 @@ {% block extrahead %}