yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-05 10:49:24 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into epub-native

Browse source 
Conflicts:
	TODO.1.4.6
This commit is contained in:
Nikolay Pultsin 2012-04-15 02:33:44 +01:00
commit 7f72a53c48
21 changed files with 126 additions and 230 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TODO.1.4.6
View file

@ -5,7 +5,7 @@ litres: top/hot lists (what's happen?)
litres: author photos
* epub: series (Adams!)
* epub: tags (Adams!)
* check new condition syntax
* test opensearch parser
* series index => Decimal
* update series data for ePubs

16
assets/resources/application/cs.xml
View file

@ -150,21 +150,11 @@
<node name="unsufficientFunds" value="Tento nákup stojí %0 a vy máte pouze %1"/>
<node name="zeroFunds" value="Tento nákup stojí %0"/>
</node>
<node name="networkBookView">
<node name="bookInfo" value="Informace o knize"/>
<node name="description" value="Popis"/>
<node name="noDescription" value="Není dostupný žádný popis."/>
<node name="title" value="Název:"/>
<node name="authors" value="Autoři:"/>
<node name="series" value="Série:"/>
<node name="indexInSeries" value="Díl v sérii:"/>
<node name="tags" value="Štítky:"/>
<node name="catalog" value="Katalog:"/>
<node name="extraLinks" value="Související odkazy"/>
</node>
<node name="bookInfo">
<node name="bookInfo" value="Informace o knize"/>
<node name="fileInfo" value="Informace o souboru"/>
<node name="description" value="Popis"/>
<node name="noDescription" value="Není dostupný žádný popis."/>
<node name="annotation" value="Anotace"/>
<node name="title" value="Název:"/>
<node name="authors" value="Autoři:"/>
@ -180,6 +170,8 @@
<node condition="value 1" value="%s bajt"/>
</node>
<node name="sizeInKiloBytes" value="%s kB"/>
<node name="catalog" value="Katalog:"/>
<node name="extraLinks" value="Související odkazy"/>
<node name="menu">
<node name="edit" value="Upravit"/>
</node>

16
assets/resources/application/de.xml
View file

@ -149,21 +149,11 @@
<node name="unsufficientFunds" value="This purchase costs %0 and you have only %1" toBeTranslated="true"/>
<node name="zeroFunds" value="This purchase costs %0" toBeTranslated="true"/>
</node>
<node name="networkBookView">
<node name="bookInfo" value="Buchinformation"/>
<node name="description" value="Beschreibung"/>
<node name="noDescription" value="Keine Beschreibung vorhanden."/>
<node name="title" value="Titel:"/>
<node name="authors" value="Autor(en):"/>
<node name="series" value="Serie:"/>
<node name="indexInSeries" value="Seriennummer:"/>
<node name="tags" value="Schlagwörter (Tags):"/>
<node name="catalog" value="Katalog:"/>
<node name="extraLinks" value="Verwandte Themen"/>
</node>
<node name="bookInfo">
<node name="bookInfo" value="Buchinformation"/>
<node name="fileInfo" value="Dateiinformation"/>
<node name="description" value="Beschreibung"/>
<node name="noDescription" value="Keine Beschreibung vorhanden."/>
<node name="annotation" value="Anmerkung"/>
<node name="title" value="Titel:"/>
<node name="authors" value="Autor(en):"/>
@ -177,6 +167,8 @@
<node name="time" value="Letzte Änderung:"/>
<node name="sizeInBytes" value="%s Byte(s)"/>
<node name="sizeInKiloBytes" value="%s kB"/>
<node name="catalog" value="Katalog:"/>
<node name="extraLinks" value="Verwandte Themen"/>
<node name="menu">
<node name="edit" value="Bearbeiten"/>
</node>

24
assets/resources/application/en.xml
View file

@ -150,27 +150,21 @@
<node name="unsufficientFunds" value="This purchase costs %0 and you have only %1"/>
<node name="zeroFunds" value="This purchase costs %0"/>
</node>
<node name="networkBookView">
<node name="bookInfo" value="Book Info"/>
<node name="description" value="Description"/>
<node name="noDescription" value="No description available."/>
<node name="title" value="Title:"/>
<node name="authors" value="Authors:"/>
<node name="series" value="Series:"/>
<node name="indexInSeries" value="Index in series:"/>
<node name="tags" value="Tags:"/>
<node name="catalog" value="Catalog:"/>
<node name="extraLinks" value="Related links"/>
</node>
<node name="bookInfo">
<node name="bookInfo" value="Book Info"/>
<node name="fileInfo" value="File Info"/>
<node name="description" value="Description"/>
<node name="noDescription" value="No description available."/>
<node name="annotation" value="Annotation"/>
<node name="title" value="Title:"/>
<node name="authors" value="Authors:"/>
<node name="authors" value="Authors:">
<node condition="value 1" value="Author:"/>
</node>
<node name="series" value="Series:"/>
<node name="indexInSeries" value="Index in series:"/>
<node name="tags" value="Tags:"/>
<node name="tags" value="Tags:">
<node condition="value 1" value="Tag:"/>
</node>
<node name="language" value="Language:"/>
<node name="name" value="Name:"/>
<node name="type" value="Type:"/>
@ -180,6 +174,8 @@
<node condition="value 1" value="%s byte"/>
</node>
<node name="sizeInKiloBytes" value="%s kB"/>
<node name="catalog" value="Catalog:"/>
<node name="extraLinks" value="Related links"/>
<node name="menu">
<node name="edit" value="Edit"/>
</node>

16
assets/resources/application/es.xml
View file

@ -151,21 +151,11 @@
<node name="unsufficientFunds" value="This purchase costs %0 and you have only %1" toBeTranslated="true"/>
<node name="zeroFunds" value="This purchase costs %0" toBeTranslated="true"/>
</node>
<node name="networkBookView">
<node name="bookInfo" value="Información del libro" />
<node name="description" value="Descripción" />
<node name="noDescription" value="No hay descripción disponible." />
<node name="title" value="Título:" />
<node name="authors" value="Autores:" />
<node name="series" value="Series:" />
<node name="indexInSeries" value="Índices de las series:" />
<node name="tags" value="Etiquetas:" />
<node name="catalog" value="Catálogo:"/>
<node name="extraLinks" value="Enlaces relacionados"/>
</node>
<node name="bookInfo">
<node name="bookInfo" value="Información del libro" />
<node name="fileInfo" value="Información del archivo"/>
<node name="description" value="Descripción" />
<node name="noDescription" value="No hay descripción disponible." />
<node name="annotation" value="Anotación" />
<node name="title" value="Título:" />
<node name="authors" value="Autores:" />
@ -179,6 +169,8 @@
<node name="time" value="Última modificación:" />
<node name="sizeInBytes" value="%s byte(s)" />
<node name="sizeInKiloBytes" value="%s kB" />
<node name="catalog" value="Catálogo:"/>
<node name="extraLinks" value="Enlaces relacionados"/>
<node name="menu">
<node name="edit" value="Editar" />
</node>

16
assets/resources/application/fr.xml
View file

@ -149,21 +149,11 @@
<node name="unsufficientFunds" value="Cet article vaut %0 et vous n'avez que %1"/>
<node name="zeroFunds" value="Cet article coûte %0"/>
</node>
<node name="networkBookView">
<node name="bookInfo" value="Informations sur le livre" />
<node name="description" value="Description" />
<node name="noDescription" value="Aucune description disponible." />
<node name="title" value="Titre:" />
<node name="authors" value="Auteurs:" />
<node name="series" value="Série:" />
<node name="indexInSeries" value="Index dans les séries:" />
<node name="tags" value="Tags:" />
<node name="catalog" value="Catalogue:"/>
<node name="extraLinks" value="Voir aussi"/>
</node>
<node name="bookInfo">
<node name="bookInfo" value="Informations sur le livre" />
<node name="fileInfo" value="Info fichier" />
<node name="description" value="Description" />
<node name="noDescription" value="Aucune description disponible." />
<node name="annotation" value="Annotation" />
<node name="title" value="Titre:" />
<node name="authors" value="Auteurs:" />
@ -177,6 +167,8 @@
<node name="time" value="Dernière modification:" />
<node name="sizeInBytes" value="%s octet(s)" />
<node name="sizeInKiloBytes" value="%s Ko" />
<node name="catalog" value="Catalogue:"/>
<node name="extraLinks" value="Voir aussi"/>
<node name="menu">
<node name="edit" value="Editer" />
</node>

16
assets/resources/application/gl.xml
View file

@ -146,21 +146,11 @@
<node name="unsufficientFunds" value="This purchase costs %0 and you have only %1" toBeTranslated="true"/>
<node name="zeroFunds" value="This purchase costs %0" toBeTranslated="true"/>
</node>
<node name="networkBookView">
<node name="bookInfo" value="Información do libro" />
<node name="description" value="Descrición" />
<node name="noDescription" value="Non hai unha descrición dispoñíbel." />
<node name="title" value="Título:" />
<node name="authors" value="Autores:" />
<node name="series" value="Series:" />
<node name="indexInSeries" value="Índices das series:" />
<node name="tags" value="Etiquetas:" />
<node name="catalog" value="Catalog:" toBeTranslated="true"/>
<node name="extraLinks" value="Related links" toBeTranslated="true"/>
</node>
<node name="bookInfo">
<node name="bookInfo" value="Información do libro" />
<node name="fileInfo" value="Información do ficheiro" />
<node name="description" value="Descrición" />
<node name="noDescription" value="Non hai unha descrición dispoñíbel." />
<node name="annotation" value="Anotación" />
<node name="title" value="Título:" />
<node name="authors" value="Autores:" />
@ -174,6 +164,8 @@
<node name="time" value="Última modificación:" />
<node name="sizeInBytes" value="%s byte(s)" />
<node name="sizeInKiloBytes" value="%s kB" />
<node name="catalog" value="Catalog:" toBeTranslated="true"/>
<node name="extraLinks" value="Related links" toBeTranslated="true"/>
<node name="menu">
<node name="edit" value="Editar" />
</node>

16
assets/resources/application/hu.xml
View file

@ -146,21 +146,11 @@
<node name="unsufficientFunds" value="A vásárlás végösszege %0, de az Ön számláján csak %1 van "/>
<node name="zeroFunds" value="A vásárlás végösszege %0"/>
</node>
<node name="networkBookView">
<node name="bookInfo" value="Könyv adatai" />
<node name="description" value="Leírás" />
<node name="noDescription" value="Nem érhető el leírás." />
<node name="title" value="Cím:" />
<node name="authors" value="Szerzők:" />
<node name="series" value="Sorozat:" />
<node name="indexInSeries" value="Sorszám:" />
<node name="tags" value="Címkék:" />
<node name="catalog" value="Katalógus:"/>
<node name="extraLinks" value="Kapcsolódó linkek" />
</node>
<node name="bookInfo">
<node name="bookInfo" value="Könyv adatai" />
<node name="fileInfo" value="Fájlinformáció" />
<node name="description" value="Leírás" />
<node name="noDescription" value="Nem érhető el leírás." />
<node name="annotation" value="Fülszöveg" />
<node name="title" value="Cím:" />
<node name="authors" value="Szerzők:" />
@ -174,6 +164,8 @@
<node name="time" value="Utolsó módosítás:" />
<node name="sizeInBytes" value="%s byte" />
<node name="sizeInKiloBytes" value="%s kB" />
<node name="catalog" value="Katalógus:"/>
<node name="extraLinks" value="Kapcsolódó linkek" />
<node name="menu">
<node name="edit" value="Szerkesztés" />
</node>

16
assets/resources/application/it.xml
View file

@ -147,21 +147,11 @@
<node name="unsufficientFunds" value="This purchase costs %0 and you have only %1" toBeTranslated="true"/>
<node name="zeroFunds" value="This purchase costs %0" toBeTranslated="true"/>
</node>
<node name="networkBookView">
<node name="bookInfo" value="Info Libro" />
<node name="description" value="Descrizione" />
<node name="noDescription" value="Nessuna descrizione presente." />
<node name="title" value="Titolo:" />
<node name="authors" value="Autori:" />
<node name="series" value="Serie:" />
<node name="indexInSeries" value="Indice in serie:" />
<node name="tags" value="Etichette:" />
<node name="catalog" value="Catalogo:"/>
<node name="extraLinks" value="Collegamenti correlati:"/>
</node>
<node name="bookInfo">
<node name="bookInfo" value="Info Libro" />
<node name="fileInfo" value="Info File" />
<node name="description" value="Descrizione" />
<node name="noDescription" value="Nessuna descrizione presente." />
<node name="annotation" value="Annotazione:" />
<node name="title" value="Titolo:" />
<node name="authors" value="Autori:" />
@ -175,6 +165,8 @@
<node name="time" value="Ultima modifica:" />
<node name="sizeInBytes" value="%s byte(s)" />
<node name="sizeInKiloBytes" value="%s kB" />
<node name="catalog" value="Catalogo:"/>
<node name="extraLinks" value="Collegamenti correlati:"/>
<node name="menu">
<node name="edit" value="Modifica" />
</node>

16
assets/resources/application/nl.xml
View file

@ -146,21 +146,11 @@
<node name="unsufficientFunds" value="This purchase costs %0 and you have only %1" toBeTranslated="true"/>
<node name="zeroFunds" value="This purchase costs %0" toBeTranslated="true"/>
</node>
<node name="networkBookView">
<node name="bookInfo" value="Boekinformatie" />
<node name="description" value="Beschrijving" />
<node name="noDescription" value="Geen beschrijving beschikbaar" />
<node name="title" value="Titel:" />
<node name="authors" value="Auteurs:" />
<node name="series" value="Serie:" />
<node name="indexInSeries" value="Nummer in serie:" />
<node name="tags" value="Trefwoorden:" />
<node name="catalog" value="Catalog:" toBeTranslated="true"/>
<node name="extraLinks" value="Related links" toBeTranslated="true"/>
</node>
<node name="bookInfo">
<node name="bookInfo" value="Boekinformatie" />
<node name="fileInfo" value="Bestandsinformatie" />
<node name="description" value="Beschrijving" />
<node name="noDescription" value="Geen beschrijving beschikbaar" />
<node name="annotation" value="Annotatie" />
<node name="title" value="Titel:" />
<node name="authors" value="Auteurs:" />
@ -174,6 +164,8 @@
<node name="time" value="Laatst gewijzigd:" />
<node name="sizeInBytes" value="%s byte(s)" />
<node name="sizeInKiloBytes" value="%s kB" />
<node name="catalog" value="Catalog:" toBeTranslated="true"/>
<node name="extraLinks" value="Related links" toBeTranslated="true"/>
<node name="menu">
<node name="edit" value="Bewerken" />
</node>

16
assets/resources/application/pl.xml
View file

@ -146,21 +146,11 @@
<node name="unsufficientFunds" value="To zamówienie jest warte %0, a masz tylko %1"/>
<node name="zeroFunds" value="To zamówienie jest warte %0"/>
</node>
<node name="networkBookView">
<node name="bookInfo" value="Informacje o książce" />
<node name="description" value="Opis" />
<node name="noDescription" value="Brak dostępnego opisu." />
<node name="title" value="Tytuł:" />
<node name="authors" value="Autorzy:" />
<node name="series" value="Seria:" />
<node name="indexInSeries" value="Numer w serii:" />
<node name="tags" value="Etykiety:" />
<node name="catalog" value="Katalog:"/>
<node name="extraLinks" value="Powiązane linki"/>
</node>
<node name="bookInfo">
<node name="bookInfo" value="Informacje o książce" />
<node name="fileInfo" value="Informacja o pliku" />
<node name="description" value="Opis" />
<node name="noDescription" value="Brak dostępnego opisu." />
<node name="annotation" value="adnotacje" />
<node name="title" value="Tytuł:" />
<node name="authors" value="Autorzy:" />
@ -174,6 +164,8 @@
<node name="time" value="Ostatnio modyfikowany:" />
<node name="sizeInBytes" value="%s bajtów" />
<node name="sizeInKiloBytes" value="%s kB" />
<node name="catalog" value="Katalog:"/>
<node name="extraLinks" value="Powiązane linki"/>
<node name="menu">
<node name="edit" value="Edytuj" />
</node>

16
assets/resources/application/ro.xml
View file

@ -146,21 +146,11 @@
<node name="unsufficientFunds" value="Costul este de %0 dar aveti disponibil doar %1"/>
<node name="zeroFunds" value="Costul este de %0"/>
</node>
<node name="networkBookView">
<node name="bookInfo" value="Informatii despre carte"/>
<node name="description" value="Descriere"/>
<node name="noDescription" value="Nu este disponibila nicio descriere."/>
<node name="title" value="Titlu:"/>
<node name="authors" value="Autori:"/>
<node name="series" value="Seria:"/>
<node name="indexInSeries" value="Indexul seriilor:"/>
<node name="tags" value="Tag-uri:"/>
<node name="catalog" value="Catalog:"/>
<node name="extraLinks" value="Link-uri utile"/>
</node>
<node name="bookInfo">
<node name="bookInfo" value="Cartea Info"/>
<node name="fileInfo" value="Informatii fisier"/>
<node name="description" value="Descriere"/>
<node name="noDescription" value="Nu este disponibila nicio descriere."/>
<node name="annotation" value="Adnotare"/>
<node name="title" value="Titlu:"/>
<node name="authors" value="Autori:"/>
@ -174,6 +164,8 @@
<node name="time" value="Ultima modificare:"/>
<node name="sizeInBytes" value=" %s octet (e)"/>
<node name="sizeInKiloBytes" value=" %s kB"/>
<node name="catalog" value="Catalog:"/>
<node name="extraLinks" value="Link-uri utile"/>
<node name="menu">
<node name="edit" value="Editeaza"/>
</node>

42
assets/resources/application/ru.xml
View file

@ -98,18 +98,14 @@
<node name="basket" value="Корзина"/>
<node name="basketSummaryEmpty" value="Пустая корзина"/>
<node name="basketSummaryCountOnly" value="%0 книг">
<node condition="range 11 19" value="%0 книг"/>
<node condition="modrange 11 19 100" value="%0 книг"/>
<node condition="mod 1 10" value="%0 книгa"/>
<node condition="mod 2 10" value="%0 книги"/>
<node condition="mod 3 10" value="%0 книги"/>
<node condition="mod 4 10" value="%0 книги"/>
<node condition="modrange 2 4 10" value="%0 книги"/>
</node>
<node name="basketSummary" value="%0 книг, на сумму %1">
<node condition="range 11 19" value="%0 книг, на сумму %1"/>
<node condition="modrange 11 19 100" value="%0 книг, на сумму %1"/>
<node condition="mod 1 10" value="%0 книгa, на сумму %1"/>
<node condition="mod 2 10" value="%0 книги, на сумму %1"/>
<node condition="mod 3 10" value="%0 книги, на сумму %1"/>
<node condition="mod 4 10" value="%0 книги, на сумму %1"/>
<node condition="modrange 2 4 10" value="%0 книги, на сумму %1"/>
</node>
<node name="alreadyDownloading" value="Книга загружается"/>
<node name="alreadyDownloadingDemo" value="Фрагмент загружается"/>
@ -158,39 +154,33 @@
<node name="unsufficientFunds" value="Для покупки требуется %0, а на счёте только %1"/>
<node name="zeroFunds" value="Для покупки требуется %0"/>
</node>
<node name="networkBookView">
<node name="bookInfo" value="Информация о книге"/>
<node name="description" value="Описание"/>
<node name="noDescription" value="Описание отсутствует."/>
<node name="title" value="Название:"/>
<node name="authors" value="Авторы:"/>
<node name="series" value="Серия:"/>
<node name="indexInSeries" value="Номер в серии:"/>
<node name="tags" value="Категории:"/>
<node name="catalog" value="Каталог:"/>
<node name="extraLinks" value="Ссылки"/>
</node>
<node name="bookInfo">
<node name="bookInfo" value="Информация о книге"/>
<node name="fileInfo" value="Информация о файле"/>
<node name="description" value="Описание"/>
<node name="noDescription" value="Описание отсутствует."/>
<node name="annotation" value="Аннотация"/>
<node name="title" value="Название:"/>
<node name="authors" value="Авторы:"/>
<node name="authors" value="Авторы:">
<node condition="value 1" value="Автор:"/>
</node>
<node name="series" value="Серия:"/>
<node name="indexInSeries" value="Номер в серии:"/>
<node name="tags" value="Категории:"/>
<node name="tags" value="Категории:">
<node condition="value 1" value="Категория:"/>
</node>
<node name="language" value="Язык:"/>
<node name="name" value="Название:"/>
<node name="type" value="Тип:"/>
<node name="size" value="Размер:"/>
<node name="time" value="Последнее изменение:"/>
<node name="sizeInBytes" value="%s байт">
<node condition="range 11 19" value="%0 байт"/>
<node condition="mod 2 10" value="%0 байта"/>
<node condition="mod 3 10" value="%0 байта"/>
<node condition="mod 4 10" value="%0 байта"/>
<node condition="modrange 11 19 100" value="%0 байт"/>
<node condition="modrange 2 4 10" value="%0 байта"/>
</node>
<node name="sizeInKiloBytes" value="%s кБ"/>
<node name="catalog" value="Каталог:"/>
<node name="extraLinks" value="Ссылки"/>
<node name="menu">
<node name="edit" value="Редактировать"/>
</node>

16
assets/resources/application/th.xml
View file

@ -146,21 +146,11 @@
<node name="unsufficientFunds" value="This purchase costs %0 and you have only %1" toBeTranslated="true"/>
<node name="zeroFunds" value="This purchase costs %0" toBeTranslated="true"/>
</node>
<node name="networkBookView">
<node name="bookInfo" value="ข้อมูลหนังสือ"/>
<node name="description" value="รายละเอียดหนังสือ"/>
<node name="noDescription" value="ไม่พบรายละเอียดหนังสือ"/>
<node name="title" value="ชื่อหนังสือ:"/>
<node name="authors" value="ชื่อผู้แต่ง:"/>
<node name="series" value="ชุดหนังสือ:"/>
<node name="indexInSeries" value="ดัชนีชุดหนังสือ:"/>
<node name="tags" value="แท็ก:"/>
<node name="catalog" value="Catalog:" toBeTranslated="true"/>
<node name="extraLinks" value="Related links" toBeTranslated="true"/>
</node>
<node name="bookInfo">
<node name="bookInfo" value="ข้อมูลหนังสือ"/>
<node name="fileInfo" value="ข้อมูลไฟล์"/>
<node name="description" value="รายละเอียดหนังสือ"/>
<node name="noDescription" value="ไม่พบรายละเอียดหนังสือ"/>
<node name="annotation" value="บันทึกย่อ"/>
<node name="title" value="ชื่อหนังสือ:"/>
<node name="authors" value="ชื่อผู้แต่ง:"/>
@ -174,6 +164,8 @@
<node name="time" value="แก้ไขล่าสุดเมื่อ:"/>
<node name="sizeInBytes" value="%s ไบต์"/>
<node name="sizeInKiloBytes" value="%s กิโลไบต์"/>
<node name="catalog" value="Catalog:" toBeTranslated="true"/>
<node name="extraLinks" value="Related links" toBeTranslated="true"/>
<node name="menu">
<node name="edit" value="แก้ไข"/>
</node>

16
assets/resources/application/uk.xml
View file

@ -146,21 +146,11 @@
<node name="unsufficientFunds" value="Дана покупка коштує %0 але у Вас лише %1"/>
<node name="zeroFunds" value="Дана покупка коштує %0"/>
</node>
<node name="networkBookView">
<node name="bookInfo" value="Інформація про книгу" />
<node name="description" value="Опис" />
<node name="noDescription" value="Опис відсутній." />
<node name="title" value="Назва:" />
<node name="authors" value="Автори:" />
<node name="series" value="Серія:" />
<node name="indexInSeries" value="Номер у серії:" />
<node name="tags" value="Категорії:" />
<node name="catalog" value="Каталог:"/>
<node name="extraLinks" value="Пов'язані посилання"/>
</node>
<node name="bookInfo">
<node name="bookInfo" value="Інформація про книгу" />
<node name="fileInfo" value="Інформація про файл" />
<node name="description" value="Опис" />
<node name="noDescription" value="Опис відсутній." />
<node name="annotation" value="Анотації" />
<node name="title" value="Назва:" />
<node name="authors" value="Автори:" />
@ -174,6 +164,8 @@
<node name="time" value="Востаннє змінено:" />
<node name="sizeInBytes" value="%s байт" />
<node name="sizeInKiloBytes" value="%s kB" />
<node name="catalog" value="Каталог:"/>
<node name="extraLinks" value="Пов'язані посилання"/>
<node name="menu">
<node name="edit" value="Редагувати" />
</node>

16
assets/resources/application/vi.xml
View file

@ -146,21 +146,11 @@
<node name="unsufficientFunds" value="This purchase costs %0 and you have only %1" toBeTranslated="true"/>
<node name="zeroFunds" value="This purchase costs %0" toBeTranslated="true"/>
</node>
<node name="networkBookView">
<node name="bookInfo" value="Thông tin sách" />
<node name="description" value="Miêu tả" />
<node name="noDescription" value="Không có miêu tả nào." />
<node name="title" value="Tiêu đề:" />
<node name="authors" value="Tác giả:" />
<node name="series" value="Bộ sách:" />
<node name="indexInSeries" value="Chỉ mục trong bộ:" />
<node name="tags" value="Từ khóa:" />
<node name="catalog" value="Catalog:" toBeTranslated="true"/>
<node name="extraLinks" value="Related links" toBeTranslated="true"/>
</node>
<node name="bookInfo">
<node name="bookInfo" value="Thông tin sách" />
<node name="fileInfo" value="Thông tin tập tin" />
<node name="description" value="Miêu tả" />
<node name="noDescription" value="Không có miêu tả nào." />
<node name="annotation" value="Chú giải" />
<node name="title" value="Tiêu đề:" />
<node name="authors" value="Tác giả:" />
@ -174,6 +164,8 @@
<node name="time" value="Lần sửa cuối:" />
<node name="sizeInBytes" value="%s byte(s)" />
<node name="sizeInKiloBytes" value="%s kB" />
<node name="catalog" value="Catalog:" toBeTranslated="true"/>
<node name="extraLinks" value="Related links" toBeTranslated="true"/>
<node name="menu">
<node name="edit" value="Sửa" />
</node>

16
assets/resources/application/zh.xml
View file

@ -146,21 +146,11 @@
<node name="unsufficientFunds" value="你这次买了 %0 ，但是你现在只有 %1" />
<node name="zeroFunds" value="你这次买了 %0" />
</node>
<node name="networkBookView">
<node name="bookInfo" value="书籍信息" />
<node name="description" value="描述" />
<node name="noDescription" value="没有有效描述." />
<node name="title" value="书名:" />
<node name="authors" value="作者:" />
<node name="series" value="丛书系列:" />
<node name="indexInSeries" value="系列序号:" />
<node name="tags" value="标签:" />
<node name="catalog" value="书库:" />
<node name="extraLinks" value="相关链接" />
</node>
<node name="bookInfo">
<node name="bookInfo" value="书籍信息" />
<node name="fileInfo" value="书文信息" />
<node name="description" value="描述" />
<node name="noDescription" value="没有有效描述." />
<node name="annotation" value="简介" />
<node name="title" value="书名:" />
<node name="authors" value="作者:" />
@ -174,6 +164,8 @@
<node name="time" value="最后更改时间:" />
<node name="sizeInBytes" value="%s 字节" />
<node name="sizeInKiloBytes" value="%s kB" />
<node name="catalog" value="书库:" />
<node name="extraLinks" value="相关链接" />
<node name="menu">
<node name="edit" value="编辑" />
</node>

16
assets/resources/application/zh_TW.xml
View file

@ -146,21 +146,11 @@
<node name="unsufficientFunds" value="This purchase costs %0 and you have only %1" toBeTranslated="true"/>
<node name="zeroFunds" value="This purchase costs %0" toBeTranslated="true"/>
</node>
<node name="networkBookView">
<node name="bookInfo" value="書藉資訊" />
<node name="description" value="描述" />
<node name="noDescription" value="沒有描述" />
<node name="title" value="書名:" />
<node name="authors" value="作者:" />
<node name="series" value="系列:" />
<node name="indexInSeries" value="系列編號:" />
<node name="tags" value="標籤:" />
<node name="catalog" value="目錄:" />
<node name="extraLinks" value="Related links" toBeTranslated="true" />
</node>
<node name="bookInfo">
<node name="bookInfo" value="書藉資訊" />
<node name="fileInfo" value="檔案資訊" />
<node name="description" value="描述" />
<node name="noDescription" value="沒有描述" />
<node name="annotation" value="註解" />
<node name="title" value="書名:" />
<node name="authors" value="作者:" />
@ -174,6 +164,8 @@
<node name="time" value="最後更新時間:" />
<node name="sizeInBytes" value="%s 字節" />
<node name="sizeInKiloBytes" value="%s kB" />
<node name="catalog" value="目錄:" />
<node name="extraLinks" value="Related links" toBeTranslated="true" />
<node name="menu">
<node name="edit" value="編輯" />
</node>

15
src/org/geometerplus/android/fbreader/library/BookInfoActivity.java
View file

@ -162,13 +162,17 @@ public class BookInfoActivity extends Activity {
}
private void setupInfoPair(int id, String key, CharSequence value) {
setupInfoPair(id, key, value, 0);
}
private void setupInfoPair(int id, String key, CharSequence value, int param) {
final LinearLayout layout = (LinearLayout)findViewById(id);
if (value == null || value.length() == 0) {
layout.setVisibility(View.GONE);
return;
}
layout.setVisibility(View.VISIBLE);
((TextView)layout.findViewById(R.id.book_info_key)).setText(myResource.getResource(key).getValue());
((TextView)layout.findViewById(R.id.book_info_key)).setText(myResource.getResource(key).getValue(param));
((TextView)layout.findViewById(R.id.book_info_value)).setText(value);
}
@ -219,13 +223,14 @@ public class BookInfoActivity extends Activity {
setupInfoPair(R.id.book_title, "title", book.getTitle());
final StringBuilder buffer = new StringBuilder();
for (Author author: book.authors()) {
final List<Author> authors = book.authors();
for (Author a : authors) {
if (buffer.length() > 0) {
buffer.append(", ");
}
buffer.append(author.DisplayName);
buffer.append(a.DisplayName);
}
setupInfoPair(R.id.book_authors, "authors", buffer);
setupInfoPair(R.id.book_authors, "authors", buffer, authors.size());
final SeriesInfo series = book.getSeriesInfo();
setupInfoPair(R.id.book_series, "series", series == null ? null : series.Name);
@ -250,7 +255,7 @@ public class BookInfoActivity extends Activity {
tagNames.add(tag.Name);
}
}
setupInfoPair(R.id.book_tags, "tags", buffer);
setupInfoPair(R.id.book_tags, "tags", buffer, tagNames.size());
String language = book.getLanguage();
if (!ZLLanguageUtil.languageCodes().contains(language)) {
language = ZLLanguageUtil.OTHER_LANGUAGE_CODE;

13
src/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java
View file

@ -59,7 +59,7 @@ public class NetworkBookInfoActivity extends Activity implements NetworkLibrary.
private NetworkBookItem myBook;
private View myMainView;
private final ZLResource myResource = ZLResource.resource("networkBookView");
private final ZLResource myResource = ZLResource.resource("bookInfo");
private BookDownloaderServiceConnection myConnection;
@Override
@ -225,11 +225,15 @@ public class NetworkBookInfoActivity extends Activity implements NetworkLibrary.
}
private void setPairLabelTextFromResource(int id, String resourceKey) {
final LinearLayout layout = (LinearLayout)findViewById(id);
((TextView)layout.findViewById(R.id.book_info_key))
((TextView)findViewById(id).findViewById(R.id.book_info_key))
.setText(myResource.getResource(resourceKey).getValue());
}
private void setPairLabelTextFromResource(int id, String resourceKey, int param) {
((TextView)findViewById(id).findViewById(R.id.book_info_key))
.setText(myResource.getResource(resourceKey).getValue(param));
}
private void setPairValueText(int id, CharSequence text) {
final LinearLayout layout = (LinearLayout)findViewById(id);
((TextView)layout.findViewById(R.id.book_info_value)).setText(text);
@ -242,7 +246,6 @@ public class NetworkBookInfoActivity extends Activity implements NetworkLibrary.
setPairLabelTextFromResource(R.id.network_book_authors, "authors");
setPairLabelTextFromResource(R.id.network_book_series_title, "series");
setPairLabelTextFromResource(R.id.network_book_series_index, "indexInSeries");
setPairLabelTextFromResource(R.id.network_book_tags, "tags");
setPairLabelTextFromResource(R.id.network_book_catalog, "catalog");
setPairValueText(R.id.network_book_title, myBook.Title);
@ -256,6 +259,7 @@ public class NetworkBookInfoActivity extends Activity implements NetworkLibrary.
}
authorsText.append(author.DisplayName);
}
setPairLabelTextFromResource(R.id.network_book_authors, "authors", myBook.Authors.size());
setPairValueText(R.id.network_book_authors, authorsText);
} else {
findViewById(R.id.network_book_authors).setVisibility(View.GONE);
@ -291,6 +295,7 @@ public class NetworkBookInfoActivity extends Activity implements NetworkLibrary.
}
tagsText.append(tag);
}
setPairLabelTextFromResource(R.id.network_book_tags, "tags", myBook.Tags.size());
setPairValueText(R.id.network_book_tags, tagsText);
} else {
findViewById(R.id.network_book_tags).setVisibility(View.GONE);

20
src/org/geometerplus/zlibrary/core/resources/ZLTreeResource.java
View file

@ -58,6 +58,24 @@ final class ZLTreeResource extends ZLResource {
}
}
private static class ModRangeCondition implements Condition {
private final int myMin;
private final int myMax;
private final int myBase;
ModRangeCondition(int min, int max, int base) {
myMin = min;
myMax = max;
myBase = base;
}
@Override
public boolean accepts(int number) {
number = number % myBase;
return myMin <= number && number <= myMax;
}
}
private static class ModCondition implements Condition {
private final int myMod;
private final int myBase;
@ -80,6 +98,8 @@ final class ZLTreeResource extends ZLResource {
return new RangeCondition(Integer.parseInt(parts[1]), Integer.parseInt(parts[2]));
} else if ("mod".equals(parts[0])) {
return new ModCondition(Integer.parseInt(parts[1]), Integer.parseInt(parts[2]));
} else if ("modrange".equals(parts[0])) {
return new ModRangeCondition(Integer.parseInt(parts[1]), Integer.parseInt(parts[2]), Integer.parseInt(parts[3]));
} else if ("value".equals(parts[0])) {
return new ValueCondition(Integer.parseInt(parts[1]));
}