From: Lukasz Anwajler <lukasz@anwajler.com>
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?ds=sidebyside;hp=--cc

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
---

0ee9de179914aa395f4b7475b7b9b6229c42b760
diff --cc apps/catalogue/locale/uk/LC_MESSAGES/django.mo
index 68b36b0a7,c3a8a693b..3edab2dac
Binary files differ
diff --cc apps/catalogue/locale/uk/LC_MESSAGES/django.po
index c89e74b38,5aa416b5b..9ad16402b
--- a/apps/catalogue/locale/uk/LC_MESSAGES/django.po
+++ b/apps/catalogue/locale/uk/LC_MESSAGES/django.po
@@@ -7,9 -8,9 +7,9 @@@ 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: FULL NAME <EMAIL@ADDRESS>\n"
 +"Last-Translator: Natalia Kertyczak <natalczyk@o2.pl>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
@@@ -22,266 -23,245 +22,259 @@@ msgstr "Введіть правильн
  
  #: forms.py:28
  msgid "title, author, theme/topic, epoch, kind, genre"
 -msgstr ""
 +msgstr "заголовок, автор, тема, епоха, рід, жанр"
  
- #: forms.py:44
+ #: forms.py:45
  msgid "Shelves"
 -msgstr ""
 +msgstr "Полиці"
  
- #: forms.py:57
+ #: forms.py:58
  msgid "Name of the new shelf"
 -msgstr ""
 +msgstr "Назва нової полиці"
  
- #: models.py:24
- #: models.py:363
+ #: models.py:25 models.py:585
  msgid "author"
 -msgstr ""
 +msgstr "автор"
  
- #: models.py:25
+ #: models.py:26
  msgid "epoch"
 -msgstr ""
 +msgstr "епоха"
  
- #: models.py:26
+ #: models.py:27
  msgid "kind"
 -msgstr ""
 +msgstr "рід"
  
- #: models.py:27
+ #: models.py:28
  msgid "genre"
 -msgstr ""
 +msgstr "жанр"
  
- #: models.py:28
+ #: models.py:29
  msgid "theme"
 -msgstr ""
 +msgstr "тема"
  
- #: models.py:29
+ #: models.py:30
  msgid "set"
 -msgstr ""
 +msgstr "вибір"
  
- #: models.py:30
- #: models.py:322
+ #: models.py:31 models.py:204
  msgid "book"
 -msgstr ""
 +msgstr "книжка"
  
- #: models.py:44
- #: migrations/0001_initial.py:47
+ #: models.py:45
  msgid "name"
 -msgstr ""
 +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 ""
 +msgstr "слуґ"
  
- #: models.py:46
- #: migrations/0001_initial.py:49
+ #: models.py:47
  msgid "sort key"
 -msgstr ""
 +msgstr "ключ сортування"
  
- #: models.py:47
- #: migrations/0001_initial.py:50
+ #: models.py:48
  msgid "category"
 -msgstr ""
 +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 ""
 +msgstr "опис"
 +
- #: models.py:50
- #: migrations/0001_initial.py:52
+ 
+ #: models.py:51
  msgid "main page"
 -msgstr ""
 +msgstr "головна сторінка"
  
- #: models.py:50
- #: migrations/0001_initial.py:52
+ #: models.py:51
  msgid "Show tag on main page"
 -msgstr ""
 +msgstr "Показати теґ на головній сторінці"
  
- #: models.py:53
- #: migrations/0001_initial.py:54
+ #: models.py:54
  msgid "book count"
 -msgstr ""
 +msgstr "кількість книжок"
  
- #: models.py:54
+ #: models.py:55
  msgid "year of death"
 -msgstr ""
 +msgstr "дата смерті"
  
- #: models.py:80
- #: migrations/0001_initial.py:61
+ #: models.py:71
  msgid "tag"
 -msgstr ""
 +msgstr "теґ"
  
- #: models.py:81
+ #: models.py:72
  msgid "tags"
 -msgstr ""
 +msgstr "теґи"
  
- #: models.py:102
- #: models.py:362
- #: migrations/0001_initial.py:18
+ #: models.py:169 models.py:584
  msgid "title"
 -msgstr ""
 +msgstr "заголовок"
  
- #: models.py:105
- #: migrations/0001_initial.py:21
+ #: models.py:172
  msgid "creation date"
 -msgstr ""
 +msgstr "дата створення"
  
- #: models.py:106
- #: migrations/0001_initial.py:22
+ #: models.py:173
  msgid "short HTML"
 -msgstr ""
 +msgstr "короткий HTML"
  
- #: models.py:107
- #: migrations/0001_initial.py:23
+ #: models.py:174
  msgid "parent number"
 -msgstr ""
 +msgstr "номер батька"
  
- #: models.py:108
+ #: models.py:175
  msgid "extra information"
 -msgstr ""
 +msgstr "додаткова інформація"
  
- #: models.py:114
- #: migrations/0001_initial.py:24
+ #: models.py:181
  msgid "XML file"
 -msgstr ""
 +msgstr "файл XML"
  
- #: models.py:115
- #: migrations/0001_initial.py:25
+ #: models.py:182
  msgid "HTML file"
 -msgstr ""
 +msgstr "файл HTML"
  
- #: models.py:116
- #: migrations/0001_initial.py:26
+ #: models.py:183
  msgid "PDF file"
 -msgstr ""
 +msgstr "файл PDF"
  
- #: models.py:117
- #: migrations/0001_initial.py:27
+ #: models.py:184
+ msgid "EPUB file"
+ msgstr ""
+ 
+ #: models.py:185
  msgid "ODT file"
 -msgstr ""
 +msgstr "файл ODT"
  
- #: models.py:118
- #: migrations/0001_initial.py:28
+ #: models.py:186
  msgid "TXT file"
 -msgstr ""
 +msgstr "файл TXT"
  
- #: models.py:119
+ #: models.py:187
  msgid "MP3 file"
 -msgstr ""
 +msgstr "файл MP3"
  
- #: models.py:120
+ #: models.py:188
  msgid "OGG file"
 -msgstr ""
 +msgstr "файл OGG"
  
- #: models.py:141
 -#: models.py:205
 -msgid "books"
 -msgstr ""
+ 
+ #: models.py:263
  msgid "Read online"
 -msgstr ""
 +msgstr "Читати онлайн"
  
- #: models.py:221
+ #: models.py:403
  #, python-format
  msgid "Book %s already exists"
 -msgstr ""
 +msgstr "Книжка %s вже існує"
  
- #: models.py:264
+ #: models.py:444
  #, python-format
  msgid "Book with slug = \"%s\" does not exist."
 -msgstr ""
 +msgstr "Книжки зі слуґом = \"%s\" не існує."
 +
 +#: models.py:323
 +msgid "books"
 +msgstr "книжки"
  
- #: models.py:357
+ #: models.py:565
  msgid "fragment"
 -msgstr ""
 +msgstr "фрагмент"
  
- #: models.py:358
+ #: models.py:566
  msgid "fragments"
 -msgstr ""
 +msgstr "фрагменти"
  
- #: models.py:364
+ #: models.py:586
  msgid "goes to public domain"
 -msgstr ""
 +msgstr "входить у суспільне надбання"
  
- #: models.py:366
+ #: models.py:588
  msgid "translator"
 -msgstr ""
 +msgstr "перекладач"
  
- #: models.py:367
+ #: models.py:589
  msgid "year of translator's death"
 -msgstr ""
 +msgstr "рік смерті перекладача"
  
- #: models.py:385
+ #: models.py:593
  msgid "book stub"
 -msgstr ""
 +msgstr "заготовка книжки"
  
- #: models.py:386
+ #: models.py:594
  msgid "book stubs"
 -msgstr ""
 +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 "<p>To maintain your shelves you need to be logged in.</p>"
 -msgstr ""
 +msgstr "<p>Щоб управляти своїми полицями, увійдть в акаунт</p>"
  
- #: views.py:357
+ #: views.py:470
  msgid "<p>Shelves were sucessfully saved.</p>"
 -msgstr ""
 +msgstr "<p>Полиці успішно збережено.</p>"
  
- #: views.py:381
+ #: views.py:494
  msgid "Book was successfully removed from the shelf"
 -msgstr ""
 +msgstr "Книжку було успішно видалено з полиці"
  
- #: views.py:383
+ #: views.py:496
  msgid "This book is not on the shelf"
 -msgstr ""
 +msgstr "Цієї книжки немає на полиці"
  
- #: views.py:479
+ #: views.py:599
  #, python-format
  msgid "<p>Shelf <strong>%s</strong> was successfully created</p>"
 -msgstr ""
 +msgstr "<p>Полицю <strong>%s</strong> успішно створено</p>"
  
- #: views.py:494
+ #: views.py:614
  #, python-format
  msgid "<p>Shelf <strong>%s</strong> was successfully removed</p>"
 -msgstr ""
 +msgstr "<p>Полицю <strong>%s</strong> успішно видалено</p>"
 +
- #: 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"
  "\n"
  "%(tb)s"
  msgstr ""
 +"Система виявила помилку  %(exception)s\n"
 +"\n"
 +"%(tb)s"
  
- #: views.py:555
+ #: views.py:674
  msgid "Book imported successfully"
 -msgstr ""
 +msgstr "Книжку успіщно завантажено"
  
- #: views.py:557
+ #: views.py:676
  #, python-format
  msgid "Error importing file: %r"
 -msgstr ""
 +msgstr "Помилка в завантаженні файла: %r"
 +
 +#: migrations/0001_initial.py:62
 +msgid "content type"
 +msgstr "тип змісту"
 +
 +#: migrations/0001_initial.py:63
 +msgid "object id"
 +msgstr "ІД об'єкту"
- 
diff --cc wolnelektury/locale/pl/LC_MESSAGES/django.mo
index 5bb3108c8,bde4a61d4..85e1ae8ca
Binary files differ
diff --cc wolnelektury/locale/pl/LC_MESSAGES/django.po
index affc90828,2a60db5c9..c052607a6
--- a/wolnelektury/locale/pl/LC_MESSAGES/django.po
+++ b/wolnelektury/locale/pl/LC_MESSAGES/django.po
@@@ -14,40 -14,8 +14,40 @@@ msgstr "
  "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"
 +msgstr "polski"
 +
 +#: localsettings.py:38
 +msgid "German"
 +msgstr "niemiecki"
 +
 +#: localsettings.py:39
 +msgid "English"
 +msgstr "angielski"
 +
 +#: localsettings.py:40
 +msgid "Lithuanian"
 +msgstr "litewski"
 +
 +#: localsettings.py:41
 +msgid "French"
 +msgstr "francuski"
 +
 +#: localsettings.py:42
 +msgid "Russian"
 +msgstr "rosyjski"
 +
 +#: localsettings.py:43
 +msgid "Spanish"
 +msgstr "hiszpański"
 +
 +#: localsettings.py:44
 +msgid "Ukrainian"
 +msgstr "ukraiński"
 +
  #: templates/404.html:6 templates/404.html.py:15
  msgid "Page does not exist"
  msgstr "Podana strona nie istnieje"
@@@ -131,38 -83,30 +131,38 @@@ msgstr "Zaloguj się
  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 <a href=\"http://nowoczesnapolska.org.pl/\">Modern Poland Foundation</a>.\n"
 -"\t\t\t\tDigital reproductions are made by <a href=\"http://www.bn.org.pl/\">The National Library</a>, based on TNL resources.\n"
 +"\t\t\t\tWolne Lektury is a project lead by <a href=\"http://nowoczesnapolska."
 +"org.pl/\">Modern Poland Foundation</a>.\n"
 +"\t\t\t\tDigital reproductions are made by <a href=\"http://www.bn.org.pl/"
 +"\">The National Library</a>, based on TNL resources.\n"
  "\t\t\t\tHosting <a href=\"http://eo.pl/\">EO Networks</a>.\n"
  "\t\t\t\t"
  msgstr ""
  "\n"
 -"Wolne Lektury to projekt prowadzony przez <a href=\"http://nowoczesnapolska.org.pl/\">Fundację Nowoczesna Polska</a>. \n"
 -"Reprodukcje cyfrowe wykonane przez <a href=\"http://www.bn.org.pl/\">Bibliotekę Narodową</a> z egzemplarzy pochodzących ze zbiorów BN.\n"
 +"Wolne Lektury to projekt prowadzony przez <a href=\"http://nowoczesnapolska."
 +"org.pl/\">Fundację Nowoczesna Polska</a>. \n"
 +"Reprodukcje cyfrowe wykonane przez <a href=\"http://www.bn.org.pl/"
 +"\">Bibliotekę Narodową</a> z egzemplarzy pochodzących ze zbiorów BN.\n"
  "Hosting <a href=\"http://eo.pl/\">EO Networks</a>. "
  
- #: templates/base.html:77
+ #: 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"
 -"                e-mail: <a href=\"mailto:fundacja@nowoczesnapolska.org.pl\">fundacja@nowoczesnapolska.org.pl</a>\n"
 +"\t\t\t\tModern Poland Foundation, 00-514 Warsaw, ul. Marszałkowska 84/92 "
 +"lok. 125, tel/fax: (22) 621-30-17\n"
 +"                e-mail: <a href=\"mailto:fundacja@nowoczesnapolska.org.pl"
 +"\">fundacja@nowoczesnapolska.org.pl</a>\n"
  "\t\t\t\t"
  msgstr ""
  "\n"
 -"Fundacja Nowoczesna Polska, 00-514 Warszawa, ul. Marszałkowska 84/92 lok. 125, tel/fax: (22) 621-30-17, e-mail: <a href=\"mailto:fundacja@nowoczesnapolska.org.pl\">fundacja@nowoczesnapolska.org.pl</a>"
 +"Fundacja Nowoczesna Polska, 00-514 Warszawa, ul. Marszałkowska 84/92 lok. "
 +"125, tel/fax: (22) 621-30-17, e-mail: <a href=\"mailto:"
 +"fundacja@nowoczesnapolska.org.pl\">fundacja@nowoczesnapolska.org.pl</a>"
  
- #: templates/base.html: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
diff --cc wolnelektury/locale/uk/LC_MESSAGES/django.mo
index d827756d2,bc4aa7867..f018a3ccb
Binary files differ
diff --cc wolnelektury/locale/uk/LC_MESSAGES/django.po
index e8b84e24c,8f09e1fdf..186a46a4f
--- a/wolnelektury/locale/uk/LC_MESSAGES/django.po
+++ b/wolnelektury/locale/uk/LC_MESSAGES/django.po
@@@ -7,54 -8,23 +7,23 @@@ 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: YEAR-MO-DA HO:MI+ZONE\n"
 -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 +"PO-Revision-Date: 2010-08-26 14:09+0100\n"
 +"Last-Translator: Natalia Kertyczak <natalczyk@o2.pl>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  
- #: 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 ""
 +msgstr "Сторінка не існує"
  
  #: templates/404.html:17
 -msgid ""
 -"We are sorry, but this page does not exist. Please check if you entered "
 -"correct address or go to "
 -msgstr ""
 +msgid "We are sorry, but this page does not exist. Please check if you entered correct address or go to "
 +msgstr "На жаль, ця сторінка не існує. Будь ласка, перевірте, чи ви ввели правильну адресу або перейдіть на"
  
  #: templates/404.html:17
  msgid "main page"
@@@ -76,110 -48,95 +45,113 @@@ msgstr "Послуга недоступ
  
  #: templates/503.html:56
  msgid "The Wolnelektury.pl site is currently unavailable due to maintainance."
 -msgstr ""
 +msgstr "В зв'язку з технічними роботами сервіс Wolnelektury.pl тимчасово недоступний."
  
 -#: templates/base.html:19
 -msgid ""
 -"Internet Explorer cannot display this site properly. Click here to read "
 -"more..."
 -msgstr ""
 +#: templates/base.html:20
 +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 ""
 +msgstr "Ласкаво просимо"
  
- #: templates/base.html:34
+ #: templates/base.html:33
  msgid "Your shelves"
 -msgstr ""
 +msgstr "Ваші полиці"
  
- #: templates/base.html:36
+ #: templates/base.html:35
  msgid "Administration"
 -msgstr ""
 +msgstr "Адміністрація"
  
+ #: templates/base.html:37 templates/base.html.py:41
+ msgid "Report a bug"
+ msgstr ""
+ 
  #: templates/base.html:38
  msgid "Logout"
 -msgstr ""
 +msgstr "Вийти "
  
 -#: 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/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/auth/login.html.py:15
  msgid "Sign in"
 -msgstr ""
 +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 ""
 +msgstr "Зареєструватися"
 +
 +#: templates/base.html:51
 +msgid "Choose your interface language: "
 +msgstr "Вибрати мову інтерфейсу"
 +
 +#: templates/base.html:56
 +msgid "Choose language"
 +msgstr "Вибрати мову"
  
 -#: templates/base.html:69
 +#: templates/base.html:68
  msgid ""
  "\n"
- "\t\t\t\tWolne Lektury is a project lead by <a href=\"http://nowoczesnapolska.org.pl/\">Modern Poland Foundation</a>.\n"
- "\t\t\t\tDigital reproductions are made by <a href=\"http://www.bn.org.pl/\">The National Library</a>, based on TNL resources. \n"
+ "\t\t\t\tWolne Lektury is a project lead by <a href=\"http://nowoczesnapolska."
+ "org.pl/\">Modern Poland Foundation</a>.\n"
+ "\t\t\t\tDigital reproductions are made by <a href=\"http://www.bn.org.pl/"
+ "\">The National Library</a>, based on TNL resources.\n"
  "\t\t\t\tHosting <a href=\"http://eo.pl/\">EO Networks</a>.\n"
  "\t\t\t\t"
  msgstr ""
 +"\n"
 +"\t\t\t\tWolne Lektury це проект реалізований <a href=\"http://nowoczesnapolska.org.pl/\">Фондом Модерна Польща</a>.\n"
 +"\t\t\t\tЦифрові репродукції виконані <a href=\"http://www.bn.org.pl/\">Національною Бібліотекою</a>, на основі її засобів. \n"
 +"\t\t\t\tГостинг <a href=\"http://eo.pl/\">EO Networks</a>.\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"
 -"                e-mail: <a href=\"mailto:fundacja@nowoczesnapolska.org.pl"
 -"\">fundacja@nowoczesnapolska.org.pl</a>\n"
 +"\t\t\t\tModern Poland Foundation, 00-514 Warsaw, ul. Marszałkowska 84/92 lok. 125, tel/fax: (22) 621-30-17\n"
 +"                e-mail: <a href=\"mailto:fundacja@nowoczesnapolska.org.pl\">fundacja@nowoczesnapolska.org.pl</a>\n"
  "\t\t\t\t"
  msgstr ""
 +"\n"
 +"\t\t\t\tФонд Модерна Польща, 00-514 Warszawa, ul. Marszałkowska 84/92 lok. 125, тел/факс: (22) 621-30-17\n"
 +"                eлектронна пошта: <a href=\"mailto:fundacja@nowoczesnapolska.org.pl\">fundacja@nowoczesnapolska.org.pl</a>\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 ""
 +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 ""
 +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 ""
 +msgstr "Сайт адміністрації"
  
  #: templates/admin/base_site.html:8
  msgid "Translations"
@@@ -198,9 -154,8 +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 -166,7 +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/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"
@@@ -229,104 -181,103 +199,115 @@@ msgstr "повернення на гоÐ
  
  #: templates/catalogue/book_detail.html:5
  msgid "on WolneLektury.pl"
 -msgstr ""
 +msgstr "на WolneLektury.pl"
  
- #: templates/catalogue/book_detail.html:17
+ #: templates/catalogue/book_detail.html:29
  msgid "Work is licensed under "
 -msgstr ""
 +msgstr "Твір на ліцензії"
  
- #: templates/catalogue/book_detail.html:19
+ #: templates/catalogue/book_detail.html:31
  msgid "Based on"
 -msgstr ""
 +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 ""
 +msgstr "Покласти книжку"
  
- #: templates/catalogue/book_detail.html:27
+ #: templates/catalogue/book_detail.html:40
  msgid "on the shelf!"
 -msgstr ""
 +msgstr "на полицю!"
  
- #: templates/catalogue/book_detail.html:31
+ #: templates/catalogue/book_detail.html:44
  msgid "Read online"
 -msgstr ""
 +msgstr "Читати онлайн"
  
- #: templates/catalogue/book_detail.html:34
+ #: templates/catalogue/book_detail.html:47
  msgid "Download PDF"
 -msgstr ""
 +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 ""
 +msgstr "Завантажити ODT"
  
 +#: templates/catalogue/book_detail.html:40
+ #: templates/catalogue/book_detail.html:56
  msgid "Download TXT"
 -msgstr ""
 +msgstr "Завантажити TXT"
  
 -#: templates/catalogue/book_detail.html:61
 +#: templates/catalogue/book_detail.html:45
  msgid "Artist"
 -msgstr ""
 +msgstr "Артист"
  
- #: templates/catalogue/book_detail.html:47
+ #: templates/catalogue/book_detail.html:63
  msgid "Director"
 -msgstr ""
 +msgstr "Режисер"
  
 -#: templates/catalogue/book_detail.html:67
 +#: templates/catalogue/book_detail.html:51
  msgid "Download MP3"
 -msgstr ""
 +msgstr "Завантажити MP3"
  
 -#: templates/catalogue/book_detail.html:68
 +#: templates/catalogue/book_detail.html:52
  msgid "Download Ogg Vorbis"
 -msgstr ""
 +msgstr "Завантажити Ogg Vorbis"
  
- #: templates/catalogue/book_detail.html:79
+ #: templates/catalogue/book_detail.html:95
  msgid "Details"
 -msgstr ""
 +msgstr "Подробиці"
  
 -#: templates/catalogue/book_detail.html:99
++
 +#: templates/catalogue/book_detail.html:82
  msgid "Author"
 -msgstr ""
 +msgstr "Автор"
  
 -#: templates/catalogue/book_detail.html:105
 +#: templates/catalogue/book_detail.html:88
  msgid "Epoch"
 -msgstr ""
 +msgstr "Епоха"
  
 -#: templates/catalogue/book_detail.html:111
 +#: templates/catalogue/book_detail.html:94
  msgid "Kind"
 -msgstr ""
 +msgstr "Рід"
  
 +#: templates/catalogue/book_detail.html:100
+ #: templates/catalogue/book_detail.html:117
  msgid "Genre"
 -msgstr ""
 +msgstr "Жанр"
 +
 +#: templates/catalogue/book_detail.html:106
+ 
 -#: templates/catalogue/book_detail.html:123
  msgid "Other resources"
 -msgstr ""
 +msgstr "Інші засоби"
  
- #: templates/catalogue/book_detail.html:108
+ #: templates/catalogue/book_detail.html:125
  msgid "Book on project's wiki"
 -msgstr ""
 +msgstr "Книжка на вікі проекту"
 +
++
 +#: templates/catalogue/book_detail.html:109
+ 
+ #: templates/catalogue/book_detail.html:126
  msgid "Source of the book"
 -msgstr ""
 +msgstr "Джерело книжки"
  
- #: templates/catalogue/book_detail.html:111
+ #: templates/catalogue/book_detail.html:128
  msgid "Book description on Lektury.Gazeta.pl"
 -msgstr ""
 +msgstr "Опис книжки на Lektury.Gazeta.pl"
  
 -#: templates/catalogue/book_detail.html:131
 +#: templates/catalogue/book_detail.html:114
  msgid "Book description on Wikipedia"
 -msgstr ""
 +msgstr "Опис книжки на Вікіпедії"
  
 -#: templates/catalogue/book_detail.html:136
 +#: templates/catalogue/book_detail.html:119
  msgid "Work's themes "
 -msgstr ""
 +msgstr "Теми твору"
  
  #: templates/catalogue/book_fragments.html:5
  #: templates/catalogue/book_fragments.html:10
@@@ -352,15 -303,15 +333,21 @@@ msgstr "Дивитись опис
  
  #: templates/catalogue/book_fragments.html:26
  msgid "of the book "
 -msgstr ""
 +msgstr "книжки"
  
  #: templates/catalogue/book_list.html:7
 +msgid "Alphabetical listing of works on WolneLektury.pl"
 +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!"
@@@ -406,20 -360,23 +393,24 @@@ msgstr "Цей твір охороняÑ
  
  #: templates/catalogue/book_text.html:17
  msgid "Table of contents"
 -msgstr ""
 +msgstr "Зміст"
  
  #: templates/catalogue/book_text.html:18
- #: templates/catalogue/tagged_object_list.html:132
+ #: templates/catalogue/tagged_object_list.html:146
  msgid "Themes"
 -msgstr ""
 +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 ""
 +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
@@@ -442,19 -399,19 +433,19 @@@ msgstr "В вас немає жодни
  
  #: templates/catalogue/fragment_sets.html:9
  msgid "Save all shelves"
 -msgstr ""
 +msgstr "Зберегти всі полиці"
  
- #: templates/catalogue/fragment_short.html:6
+ #: templates/catalogue/fragment_short.html:7
  msgid "Expand fragment"
 -msgstr ""
 +msgstr "Показати фрагмент"
  
- #: templates/catalogue/fragment_short.html:12
+ #: templates/catalogue/fragment_short.html:13
  msgid "Hide fragment"
 -msgstr ""
 +msgstr "Сховати фрагмент"
  
- #: templates/catalogue/fragment_short.html:17
+ #: templates/catalogue/fragment_short.html:18
  msgid "See in a book"
 -msgstr ""
 +msgstr "Дивитись у книжці"
  
  #: templates/catalogue/main_page.html:13
  msgid "check list of books"
@@@ -501,35 -460,38 +492,39 @@@ msgstr "щоб управляти свÐ
  #: templates/catalogue/main_page.html:41
  #: templates/lessons/document_list.html:49
  msgid "Hand-outs for teachers"
 -msgstr ""
 +msgstr "Матеріали для вчителів"
  
  #: templates/catalogue/main_page.html:42
 -msgid ""
 -"Lessons' prospects and other ideas for using Wolnelektury.pl for teaching."
 -msgstr ""
 +msgid "Lessons' prospects and other ideas for using Wolnelektury.pl for teaching."
 +msgstr "Плани уроків та інші ідеї як користуватися Wolnelektury.pl в навчанні"
  
  #: templates/catalogue/main_page.html:47
 -msgid ""
 -"are professional recordings of literary texts from our repository, available "
 -"on free license in MP3 and Ogg Vorbis formats as well as in DAISY system."
 -msgstr ""
 +msgid "are professional recordings of literary texts from our repository, available on free license in MP3 and Ogg Vorbis formats as well as in DAISY system."
 +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 ""
 +msgstr "Автори"
  
  #: templates/catalogue/main_page.html:58
- #: templates/catalogue/tagged_object_list.html:118
+ #: templates/catalogue/tagged_object_list.html:132
++
  msgid "Kinds"
 -msgstr ""
 +msgstr "Роди"
  
  #: templates/catalogue/main_page.html:62
- #: templates/catalogue/tagged_object_list.html:122
+ #: templates/catalogue/tagged_object_list.html:136
++
  msgid "Genres"
 -msgstr ""
 +msgstr "Жанри"
  
  #: templates/catalogue/main_page.html:66
- #: templates/catalogue/tagged_object_list.html:126
+ #: templates/catalogue/tagged_object_list.html:140
  msgid "Epochs"
 -msgstr ""
 +msgstr "Епохи"
  
  #: templates/catalogue/main_page.html:72
  msgid "Themes and topics"
@@@ -609,120 -575,149 +604,121 @@@ msgstr "Дивитись всю катÐ
  
  #: templates/catalogue/tagged_object_list.html:15
  msgid "Your shelf is empty"
 -msgstr ""
 +msgstr "Ваша полиця порожня"
  
  #: templates/catalogue/tagged_object_list.html:16
 -msgid ""
 -"You can put a book on a shelf by entering page of the reading and clicking "
 -"'Put on the shelf'."
 -msgstr ""
 +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 ""
 +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 ""
 +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 ""
 +msgstr "для читання"
  
- #: templates/catalogue/tagged_object_list.html:36
+ #: templates/catalogue/tagged_object_list.html:37
  msgid "and printing using"
 -msgstr ""
 +msgstr "та друку з використанням"
  
- #: templates/catalogue/tagged_object_list.html:37
+ #: templates/catalogue/tagged_object_list.html:39
  msgid "and editing using"
 -msgstr ""
 +msgstr "та едиції з використанням"
  
- #: templates/catalogue/tagged_object_list.html:38
+ #: templates/catalogue/tagged_object_list.html:40
  msgid "on small displays, for example mobile phones"
 -msgstr ""
 +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 ""
 +msgstr "для слухання"
  
- #: templates/catalogue/tagged_object_list.html:39
+ #: templates/catalogue/tagged_object_list.html:41
  msgid "on favourite MP3 player"
 -msgstr ""
 +msgstr "на улюбленому плеєрі MP3"
  
- #: templates/catalogue/tagged_object_list.html:40
+ #: templates/catalogue/tagged_object_list.html:42
  msgid "open format"
 -msgstr ""
 +msgstr "відкритий формат"
  
- #: templates/catalogue/tagged_object_list.html:40
+ #: templates/catalogue/tagged_object_list.html:42
  msgid "Xiph.org Foundation"
 -msgstr ""
 +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 ""
 +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 ""
 +msgstr "Оновити список форматів книжок, які на полиці"
  
- #: templates/catalogue/tagged_object_list.html:41
+ #: templates/catalogue/tagged_object_list.html:43
  msgid "cancel"
 -msgstr ""
 +msgstr "відхилити"
  
- #: templates/catalogue/tagged_object_list.html:46
+ #: templates/catalogue/tagged_object_list.html:48
  msgid "Share this shelf"
 -msgstr ""
 +msgstr "Поділитися цією полицею"
  
 -#: 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:48
 +msgid "Copy this link and share it with other people to let them see your shelf."
 +msgstr "Копіювати це посилання, щоб вислати іншим, та поділитися полицею."
  
 -#: templates/catalogue/tagged_object_list.html:60
 +#: templates/catalogue/tagged_object_list.html:57
  msgid "Read work's study of this author on Lektury.Gazeta.pl"
 -msgstr ""
 -
 -#: 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:64
 -#, python-format
 -msgid "Read study of kind %(last_tag)s on Lektury.Gazeta.pl"
 -msgstr ""
 +msgstr "Прочитати обговорення цього автора на Lektury.Gazeta.pl"
  
 -#: 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:60
 +msgid "Read study of epoch"
 +msgstr "Прочитати обговорення епохи"
  
 -#: templates/catalogue/tagged_object_list.html:68
 -msgid "Read related study on Lektury.Gazeta.pl"
 -msgstr ""
 +#: templates/catalogue/tagged_object_list.html:60
 +msgid "on Lektury.Gazeta.pl"
 +msgstr "на Lektury.Gazeta.pl"
  
 -#: templates/catalogue/tagged_object_list.html:76
 +#: templates/catalogue/tagged_object_list.html:67
  msgid "Read article about this author on Wikipedia"
 -msgstr ""
 +msgstr "Прочитати статтю про цього автора на Вікіпедії"
  
 -#: 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:70
 +msgid "Read article about epoch"
 +msgstr "Прочитати статтю про цю епоху"
  
 -#: 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:70
 +msgid "on Wikipedia"
 +msgstr "на Вікіпедії"
  
 -#: 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:84
 -msgid "Read related article on Wikipedia"
 -msgstr ""
 +#: templates/catalogue/tagged_object_list.html:80
+ 
 -#: templates/catalogue/tagged_object_list.html:94
  msgid "Delete"
 -msgstr ""
 +msgstr "Видалити"
  
- #: templates/catalogue/tagged_object_list.html:88
+ #: templates/catalogue/tagged_object_list.html:102
  msgid "This author's works are copyrighted."
 -msgstr ""
 +msgstr "Твори цього автора охороняються авторським правом"
  
 -#: 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:91
 +msgid "This author's works are in public domain and will be published on Internet school library of Wolne Lektury soon."
 +msgstr "Твори цього автора є частиною суспільного надбання і скоро будуть опубліковані на  Wolne Lektury."
  
 -#: 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:95
 +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 ""
 +msgstr "Дізнатися чому інтернет-бібліотеки не можуть опубілкувати творів цього автора."
  
  #: templates/catalogue/user_shelves.html:6
  msgid "remove"