Rename to tde-ebook-reader

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
author: Michele Calgaro <michele.calgaro@yahoo.it> 2024-06-07 23:30:05 +0900
committer: Michele Calgaro <michele.calgaro@yahoo.it> 2024-06-07 23:30:05 +0900
commit: 17b259df9cb6b28779d4881b2b6c805ee2e48eea (patch)
tree: 5ed61937459cb7081089111b0242c01ec178f1f3
parent: 1cba8bce178eb2d6719c6f7f21e2c9352c5513a6 (diff)
download: tde-ebook-reader-17b259df9cb6b28779d4881b2b6c805ee2e48eea.tar.gz
tde-ebook-reader-17b259df9cb6b28779d4881b2b6c805ee2e48eea.zip
728 files changed, 807 insertions, 807 deletions
diff --git a/fbreader/data/formats/fb2/FBReaderVersion.ent b/fbreader/data/formats/fb2/FBReaderVersion.ent
deleted file mode 100644
index c4b13fc..0000000
--- a/fbreader/data/formats/fb2/FBReaderVersion.ent
+++ /dev/null
@@ -1 +0,0 @@
-<!ENTITY FBReaderVersion   "VERSION">
diff --git a/fbreader/LICENSE b/reader/LICENSE
index d60c31a..d60c31a 100644
--- a/fbreader/LICENSE
+++ b/reader/LICENSE
diff --git a/fbreader/data/default/config.desktop.xml b/reader/data/default/config.desktop.xml
index 670a4eb..670a4eb 100644
--- a/fbreader/data/default/config.desktop.xml
+++ b/reader/data/default/config.desktop.xml
diff --git a/fbreader/data/default/external.desktop.xml b/reader/data/default/external.desktop.xml
index 424e676..424e676 100644
--- a/fbreader/data/default/external.desktop.xml
+++ b/reader/data/default/external.desktop.xml
diff --git a/fbreader/data/default/fullscreen_toolbar.desktop.xml b/reader/data/default/fullscreen_toolbar.desktop.xml
index 72da2c2..72da2c2 100644
--- a/fbreader/data/default/fullscreen_toolbar.desktop.xml
+++ b/reader/data/default/fullscreen_toolbar.desktop.xml
diff --git a/fbreader/data/default/keymap.desktop.xml b/reader/data/default/keymap.desktop.xml
index b795bd8..b795bd8 100644
--- a/fbreader/data/default/keymap.desktop.xml
+++ b/reader/data/default/keymap.desktop.xml
diff --git a/fbreader/data/default/menubar.xml b/reader/data/default/menubar.xml
index bbe89f5..bbe89f5 100644
--- a/fbreader/data/default/menubar.xml
+++ b/reader/data/default/menubar.xml
diff --git a/fbreader/data/default/styles.desktop.xml b/reader/data/default/styles.desktop.xml
index b12fbeb..b12fbeb 100644
--- a/fbreader/data/default/styles.desktop.xml
+++ b/reader/data/default/styles.desktop.xml
diff --git a/fbreader/data/default/toolbar.desktop.xml b/reader/data/default/toolbar.desktop.xml
index 822d9ee..822d9ee 100644
--- a/fbreader/data/default/toolbar.desktop.xml
+++ b/reader/data/default/toolbar.desktop.xml
diff --git a/fbreader/data/default/toolbar.full.xml b/reader/data/default/toolbar.full.xml
index 99cb8a0..99cb8a0 100644
--- a/fbreader/data/default/toolbar.full.xml
+++ b/reader/data/default/toolbar.full.xml
diff --git a/fbreader/data/default/toolbar.short.xml b/reader/data/default/toolbar.short.xml
index 4950710..4950710 100644
--- a/fbreader/data/default/toolbar.short.xml
+++ b/reader/data/default/toolbar.short.xml
diff --git a/reader/data/formats/fb2/ReaderVersion.ent b/reader/data/formats/fb2/ReaderVersion.ent
new file mode 100644
index 0000000..5475a8e
--- /dev/null
+++ b/reader/data/formats/fb2/ReaderVersion.ent
@@ -0,0 +1 @@
+<!ENTITY ReaderVersion   "VERSION">
diff --git a/fbreader/data/formats/fb2/fb2genres.xml b/reader/data/formats/fb2/fb2genres.xml
index 1fa028a..1fa028a 100644
--- a/fbreader/data/formats/fb2/fb2genres.xml
+++ b/reader/data/formats/fb2/fb2genres.xml
diff --git a/fbreader/data/formats/html/html.ent b/reader/data/formats/html/html.ent
index e9f8655..e9f8655 100644
--- a/fbreader/data/formats/html/html.ent
+++ b/reader/data/formats/html/html.ent
diff --git a/fbreader/data/help/MiniHelp.desktop.bg.fb2 b/reader/data/help/MiniHelp.desktop.bg.fb2
index 52dcfa8..12d046c 100644
--- a/fbreader/data/help/MiniHelp.desktop.bg.fb2
+++ b/reader/data/help/MiniHelp.desktop.bg.fb2
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>FBReader</last-name></author> <book-title>Относно FBReader</book-title> <lang>bg</lang></title-info></description>
+<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>Reader</last-name></author> <book-title>Относно Reader</book-title> <lang>bg</lang></title-info></description>
 <body>
-<title><p>Относно FBReader &FBReaderVersion;</p></title>
-<p>FBReader е програма за четене на електронни книги на PDA/UMPC/PC и операционни системи Linux и Windows XP. FBReader поддържа няколко формата за електронни книги: <code>ePub</code>, <code>fb2</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, и други. Поддържа също и директно четене от следните архиви: <code>zip</code>, <code>tar</code>, <code>gzip</code> и <code>bzip2</code>.</p>
-<p>FBReader се разпространява свободно под лицензa <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>.</p>
+<title><p>Относно Reader &ReaderVersion;</p></title>
+<p>Reader е програма за четене на електронни книги на PDA/UMPC/PC и операционни системи Linux и Windows XP. Reader поддържа няколко формата за електронни книги: <code>ePub</code>, <code>fb2</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, и други. Поддържа също и директно четене от следните архиви: <code>zip</code>, <code>tar</code>, <code>gzip</code> и <code>bzip2</code>.</p>
+<p>Reader се разпространява свободно под лицензa <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>.</p>
 <p>Ако харесвате програмата и бихте желали да подкрепите нейното развитие, моля <a l:href="http://www.fbreader.org/donation/make.php">направете дарение</a>.</p>
 <empty-line />
 <subtitle><p>Как да започнете</p></subtitle>
-<p>FBReader следи за книги във формат <code>ePub</code>, <code>fb2</code> и <code>OpenReader</code> в папките, зададени в настойките на <code>Папка за съхранение на книгите</code>. Първо трябва да настроите тези папки. Отворете настройките (просто кликнете на <image l:href="#settings.png" voffset="-6" /> в лентата с инструменти) и променете пътя в настройката <code>Папка за съхранение на книгите</code> в раздела <code>Библиотека</code>. Тази настройка съдържа списъка с папки съдржащи <code>*.epub</code>, <code>*.fb2</code>, <code>*.orb</code> или файлове архиви. Папките в списъка са разделени с двоеточия.</p>
+<p>Reader следи за книги във формат <code>ePub</code>, <code>fb2</code> и <code>OpenReader</code> в папките, зададени в настойките на <code>Папка за съхранение на книгите</code>. Първо трябва да настроите тези папки. Отворете настройките (просто кликнете на <image l:href="#settings.png" voffset="-6" /> в лентата с инструменти) и променете пътя в настройката <code>Папка за съхранение на книгите</code> в раздела <code>Библиотека</code>. Тази настройка съдържа списъка с папки съдржащи <code>*.epub</code>, <code>*.fb2</code>, <code>*.orb</code> или файлове архиви. Папките в списъка са разделени с двоеточия.</p>
 <p>Отворете <code>Библиотека</code> (кликнете на <image l:href="#books.png" voffset="-6" />), изберете книга от списъка и започнете да четете.</p>
 <p>За да четете файл в друг формат, трябва го добавите в библиотеката. Кликнете на <code>Добавяне на файл в библиотеката</code> (<image l:href="#addbook.png" />), изберете файл и редактирайте информацията на файла. Следващия път може да отворите този файл използвайки <code>Библиотека</code> (<image l:href="#books.png" voffset="-6" />).</p>
 <empty-line />
 <subtitle><p>Свързани сайтове</p></subtitle>
-<p>Повече информация за тази програма може да намерите на <a l:href="http://www.fbreader.org">домашната страница на FBReader</a>.</p>
-<p>Ако желаете да бъдете уведомявани за нови версии, моля абонирайте се на <a l:href="http://freshmeat.net/projects/fbreader">проекта FBReader на freshmeat</a>.</p>
-<p>Ако имате някакви въпроси или предложения, моля използвайте <a l:href="http://groups.google.com/group/fbreader">групата на FBReader в googlegroups</a>.</p>
+<p>Повече информация за тази програма може да намерите на <a l:href="http://www.fbreader.org">домашната страница на Reader</a>.</p>
+<p>Ако желаете да бъдете уведомявани за нови версии, моля абонирайте се на <a l:href="http://freshmeat.net/projects/fbreader">проекта Reader на freshmeat</a>.</p>
+<p>Ако имате някакви въпроси или предложения, моля използвайте <a l:href="http://groups.google.com/group/fbreader">групата на Reader в googlegroups</a>.</p>
 </body>
 <binary id="settings.png" content-type="image/png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
@@ -193,4 +193,4 @@ jyy6melZ91e/Bz73zf9d3B4Ol/OiuvuWbt1fFMXyZDK5M8+L5cLWlA5KZyit
 QmCC
 ====
 </binary>
-</FictionBook>
-\ No newline at end of file
+</FictionBook>
diff --git a/fbreader/data/help/MiniHelp.desktop.cs.fb2 b/reader/data/help/MiniHelp.desktop.cs.fb2
index 78a3256..ab246e2 100644
--- a/fbreader/data/help/MiniHelp.desktop.cs.fb2
+++ b/reader/data/help/MiniHelp.desktop.cs.fb2
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>FBReader</last-name></author> <book-title>About programu FBReader</book-title> <lang>cs</lang></title-info></description>
+<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>Reader</last-name></author> <book-title>About programu Reader</book-title> <lang>cs</lang></title-info></description>
 <body>
-<title><p>O programu FBReader &FBReaderVersion;</p></title>
-<p>FBReader je program pro čtení elektronických knih, který pracuje pod Linuxem/Windows XP PDA/UMPC/PC. FBReader podporuje následující formáty: <code>ePub</code>, <code>fb2</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, atd. Zvládne též přímé čtení archivů <code>zip</code>, <code>tar</code>, <code>gzip</code> and <code>bzip2</code>.</p>
-<p>FBReader je šířen pod licencí <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>.</p>
+<title><p>O programu Reader &ReaderVersion;</p></title>
+<p>Reader je program pro čtení elektronických knih, který pracuje pod Linuxem/Windows XP PDA/UMPC/PC. Reader podporuje následující formáty: <code>ePub</code>, <code>fb2</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, atd. Zvládne též přímé čtení archivů <code>zip</code>, <code>tar</code>, <code>gzip</code> and <code>bzip2</code>.</p>
+<p>Reader je šířen pod licencí <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>.</p>
 <p>Máte-li zájem o tento program a chcete-li podpořit jeho vývoj, navštivte prosím <a l:href="http://www.fbreader.org/donation/make.php">stránku příspěvků</a>.</p>
 <empty-line/>
 <subtitle><p>Jak začít</p></subtitle>
-<p>FBReader hledá knihy ve formátech <code>ePub</code>, <code>fb2</code> a <code>OpenReader</code> v cestě zadaných v parametru <code>Složka s knihami</code>. Nejprve nastavte tento parametr. Otevřete dialog s nastavením (kliknutím na položku <image l:href="#settings.png" voffset="-6"/> v panelu nástrojů) a změňte hodnotu parametru <code>Složka s knihami</code> v záložce <code>Knihovna</code>. Uvedený parametr obsahuje seznam adresářů se soubory <code>*.epub</code>, <code>*.fb2</code>, <code>*.orb</code> nebo soubory archivů. Adresáře jsou v seznamu zařazeny do oddělených sloupců.</p>
+<p>Reader hledá knihy ve formátech <code>ePub</code>, <code>fb2</code> a <code>OpenReader</code> v cestě zadaných v parametru <code>Složka s knihami</code>. Nejprve nastavte tento parametr. Otevřete dialog s nastavením (kliknutím na položku <image l:href="#settings.png" voffset="-6"/> v panelu nástrojů) a změňte hodnotu parametru <code>Složka s knihami</code> v záložce <code>Knihovna</code>. Uvedený parametr obsahuje seznam adresářů se soubory <code>*.epub</code>, <code>*.fb2</code>, <code>*.orb</code> nebo soubory archivů. Adresáře jsou v seznamu zařazeny do oddělených sloupců.</p>
 <p>Otevřete <code>knihovnu</code> (kliknutím na <image l:href="#books.png" voffset="-6"/>), vyberte knihu, kterou chcete číst ze seznamu.</p>
 
 <p>Pro čtení souboru v jiném formátu je nezbytné jeho zařazení do knihovny. Začněte <code>vložením knihy do knihovny.</code> (<image l:href="#addbook.png"/>). Vyberte soubor s knihou a založte informace (metadata), které ji charakterizují. Po zařazení už soubor otevírejte výhradně pomocí <code>knihovny</code> (<image l:href="#books.png" voffset="-6"/>).</p>
 <empty-line/>
 <subtitle><p>Odkazy</p></subtitle>
-<p>Více informací o programu najdete na <a l:href="http://www.fbreader.org">Domovské stránce programu FBReader</a>.</p>
-<p>Pro upozornění na nové verze se prosím přihlaste <a l:href="http://freshmeat.net/projects/fbreader">FBReader projekt na freshmeatu</a>.</p>
-<p>Pro vaše otázky a návrhy použijte prosím <a l:href="http://groups.google.com/group/fbreader">skupinu věnovanou programu FBReader na googlegroups</a>.</p>
+<p>Více informací o programu najdete na <a l:href="http://www.fbreader.org">Domovské stránce programu Reader</a>.</p>
+<p>Pro upozornění na nové verze se prosím přihlaste <a l:href="http://freshmeat.net/projects/fbreader">Reader projekt na freshmeatu</a>.</p>
+<p>Pro vaše otázky a návrhy použijte prosím <a l:href="http://groups.google.com/group/fbreader">skupinu věnovanou programu Reader na googlegroups</a>.</p>
 </body>
 <binary content-type="image/png" id="settings.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
diff --git a/fbreader/data/help/MiniHelp.desktop.de.fb2 b/reader/data/help/MiniHelp.desktop.de.fb2
index e881c90..07852f1 100644
--- a/fbreader/data/help/MiniHelp.desktop.de.fb2
+++ b/reader/data/help/MiniHelp.desktop.de.fb2
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>FBReader</last-name></author> <book-title>&#220;ber FBReader</book-title> <lang>de</lang></title-info></description>
+<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>Reader</last-name></author> <book-title>&#220;ber Reader</book-title> <lang>de</lang></title-info></description>
 <body>
-<title><p>&#220;ber FBReader &FBReaderVersion;</p></title>
-<p>FBReader ist ein Leseprogramm f&#252;r E-Books f&#252;r Linux/Windows XP bzw PDA/UMPC/Desktop Computer. FBReader unterst&#252;tzt verschiedene Formate: <code>ePub</code>, <code>fb2</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, usw. Er kann diese auch direkt aus <code>zip</code>, <code>tar</code>, <code>gzip</code> und <code>bzip2</code> - Archiven lesen.</p>
-<p>FBReader wird unter den Bedingungen der <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a> vertrieben.</p>
+<title><p>&#220;ber Reader &ReaderVersion;</p></title>
+<p>Reader ist ein Leseprogramm f&#252;r E-Books f&#252;r Linux/Windows XP bzw PDA/UMPC/Desktop Computer. Reader unterst&#252;tzt verschiedene Formate: <code>ePub</code>, <code>fb2</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, usw. Er kann diese auch direkt aus <code>zip</code>, <code>tar</code>, <code>gzip</code> und <code>bzip2</code> - Archiven lesen.</p>
+<p>Reader wird unter den Bedingungen der <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a> vertrieben.</p>
 <p>Wenn Sie das Programm m&#246;gen und die Weiterentwicklung unterst&#252;tzen wollen, besuchen Sie bitte die <a l:href="http://www.fbreader.org/donation/make.php">Make Donation</a> - Seite.</p>
 <empty-line/>
 <subtitle><p>Die ersten Schritte</p></subtitle>
-<p>FBReader sucht im <code>E-Book Verzeichnis</code> nach <code>ePub</code>, <code>fb2</code> und <code>OpenReader</code> B&#252;chern. Zuerst m&#252;ssen Sie daher diesen Pfad setzen. &#214;ffnen Sie dazu die Einstellungen (einfach auf <image l:href="#settings.png" voffset="-6"/> in der Symbolleiste klicken) und &#228;ndern Sie den Inhalt der Option <code>E-Book Verzeichnis</code>, die sich im Reiter <code>Bibliothek</code> befindet. Es k&#246;nnen mehrere Verzeichnisse eingetragen werden, die <code>*.epub</code>, <code>*.fb2</code>, <code>*.orb</code> oder Archivdateien enthalten, getrennt durch Colons.</p>
+<p>Reader sucht im <code>E-Book Verzeichnis</code> nach <code>ePub</code>, <code>fb2</code> und <code>OpenReader</code> B&#252;chern. Zuerst m&#252;ssen Sie daher diesen Pfad setzen. &#214;ffnen Sie dazu die Einstellungen (einfach auf <image l:href="#settings.png" voffset="-6"/> in der Symbolleiste klicken) und &#228;ndern Sie den Inhalt der Option <code>E-Book Verzeichnis</code>, die sich im Reiter <code>Bibliothek</code> befindet. Es k&#246;nnen mehrere Verzeichnisse eingetragen werden, die <code>*.epub</code>, <code>*.fb2</code>, <code>*.orb</code> oder Archivdateien enthalten, getrennt durch Colons.</p>
 <p>&#214;ffnen Sie nun die <code>Bibliothek</code> (auf <image l:href="#books.png" voffset="-6"/> klicken), w&#228;hlen Sie ein Buch aus der Liste aus und schon k&#246;nnen Sie es lesen.</p>
 <p>Um eine Datei in einem anderen Format zu lesen, m&#252;ssen Sie diese der Bibliothek hinzuf&#252;gen. &#214;ffnen Sie <code>Datei zur Bibliothek hinzuf&#252;gen</code> (<image l:href="#addbook.png"/>), w&#228;hlen Sie eine Datei aus und editieren Sie die Datei-Informationen. Beim n&#228;chsten Mal k&#246;nnen Sie diese Datei einfach in der <code>Bibliothek</code> (<image l:href="#books.png" voffset="-6"/>) &#246;ffnen.</p>
 <empty-line/>
 <subtitle><p>Verwandte Internetseiten</p></subtitle>
-<p>Weitere Informationen &#252;ber dieses Programm finden Sie auf der <a l:href="http://www.fbreader.org">FBReader Homepage</a>.</p>
-<p>Wenn Sie &#252;ber neue Releases informiert werden wollen, tragen Sie sich bitte bei <a l:href="http://freshmeat.net/projects/fbreader">FBReader project at freshmeat</a> ein.</p>
-<p>Falls Sie Fragen oder Anregungen haben, benutzen Sie bitte die <a l:href="http://groups.google.com/group/fbreader">FBReader group at googlegroups</a>.</p>
+<p>Weitere Informationen &#252;ber dieses Programm finden Sie auf der <a l:href="http://www.fbreader.org">Reader Homepage</a>.</p>
+<p>Wenn Sie &#252;ber neue Releases informiert werden wollen, tragen Sie sich bitte bei <a l:href="http://freshmeat.net/projects/fbreader">Reader project at freshmeat</a> ein.</p>
+<p>Falls Sie Fragen oder Anregungen haben, benutzen Sie bitte die <a l:href="http://groups.google.com/group/fbreader">Reader group at googlegroups</a>.</p>
 </body>
 <binary content-type="image/png" id="settings.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
diff --git a/fbreader/data/help/MiniHelp.desktop.en.fb2 b/reader/data/help/MiniHelp.desktop.en.fb2
index 902a662..841ed12 100644
--- a/fbreader/data/help/MiniHelp.desktop.en.fb2
+++ b/reader/data/help/MiniHelp.desktop.en.fb2
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>FBReader</last-name></author> <book-title>About FBReader</book-title> <lang>en</lang></title-info></description>
+<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>Reader</last-name></author> <book-title>About Reader</book-title> <lang>en</lang></title-info></description>
 <body>
-<title><p>About FBReader &FBReaderVersion;</p></title>
-<p>FBReader is an e-book reader for Linux/Windows XP PDA/UMPC/desktop computer. FBReader supports several e-book formats: <code>ePub</code>, <code>fb2</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, etc. Direct reading from <code>zip</code>, <code>tar</code>, <code>gzip</code> and <code>bzip2</code> archives is also supported.</p>
-<p>FBReader is distributed under the terms of the <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>.</p>
+<title><p>About Reader &ReaderVersion;</p></title>
+<p>Reader is an e-book reader for Linux/Windows XP PDA/UMPC/desktop computer. Reader supports several e-book formats: <code>ePub</code>, <code>fb2</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, etc. Direct reading from <code>zip</code>, <code>tar</code>, <code>gzip</code> and <code>bzip2</code> archives is also supported.</p>
+<p>Reader is distributed under the terms of the <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>.</p>
 <p>If you like the program and would like to support its development, please visit <a l:href="http://www.fbreader.org/donation/make.php">make donation</a> page.</p>
 <empty-line/>
 <subtitle><p>How To Start</p></subtitle>
-<p>FBReader looks for <code>ePub</code>, <code>fb2</code> and <code>OpenReader</code> books in directories listed in the <code>Book Path</code> option. First of all you need to set this path. Open the options dialog (just click on <image l:href="#settings.png" voffset="-6"/> in the toolbar) and change the value of <code>Book Path</code> option in the <code>Library</code> tab. This option contains the list of directories containing <code>*.epub</code>, <code>*.fb2</code>, <code>*.orb</code> or archive files. Directories in the list are separated by colons.</p>
+<p>Reader looks for <code>ePub</code>, <code>fb2</code> and <code>OpenReader</code> books in directories listed in the <code>Book Path</code> option. First of all you need to set this path. Open the options dialog (just click on <image l:href="#settings.png" voffset="-6"/> in the toolbar) and change the value of <code>Book Path</code> option in the <code>Library</code> tab. This option contains the list of directories containing <code>*.epub</code>, <code>*.fb2</code>, <code>*.orb</code> or archive files. Directories in the list are separated by colons.</p>
 <p>Open <code>library</code> (click on <image l:href="#books.png" voffset="-6"/>), select a book from the list and read it.</p>
 <p>To read a file in another format, you need to add it to the library. Start <code>add to library dialog</code> (<image l:href="#addbook.png"/>), select a file and edit the file information. Next time you can open this file using <code>library</code> (<image l:href="#books.png" voffset="-6"/>).</p>
 <empty-line/>
 <subtitle><p>Related sites</p></subtitle>
-<p>More information about this program can be found at <a l:href="http://www.fbreader.org">FBReader homepage</a>.</p>
-<p>If you want to be notified about new releases, please subscribe to <a l:href="http://freshmeat.net/projects/fbreader">FBReader project at freshmeat</a>.</p>
-<p>If you have any questions or suggestions, please use <a l:href="http://groups.google.com/group/fbreader">FBReader group at googlegroups</a>.</p>
+<p>More information about this program can be found at <a l:href="http://www.fbreader.org">Reader homepage</a>.</p>
+<p>If you want to be notified about new releases, please subscribe to <a l:href="http://freshmeat.net/projects/fbreader">Reader project at freshmeat</a>.</p>
+<p>If you have any questions or suggestions, please use <a l:href="http://groups.google.com/group/fbreader">Reader group at googlegroups</a>.</p>
 </body>
 <binary content-type="image/png" id="settings.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
diff --git a/fbreader/data/help/MiniHelp.desktop.es.fb2 b/reader/data/help/MiniHelp.desktop.es.fb2
index e9129a1..b1f5046 100644
--- a/fbreader/data/help/MiniHelp.desktop.es.fb2
+++ b/reader/data/help/MiniHelp.desktop.es.fb2
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>FBReader</last-name></author> <book-title>Acerca de FBReader</book-title> <lang>es</lang></title-info></description>
+<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>Reader</last-name></author> <book-title>Acerca de Reader</book-title> <lang>es</lang></title-info></description>
 <body>
-<title><p>Acerca de FBReader &FBReaderVersion;</p></title>
-<p>FBReader es un lector de libros electrónicos para Linux/Windows PDA/UMPC/PC. FBReader soporta varios formatos: <code>ePub</code>, <code>fb2</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, etc. También puede leer directamente archivos comprimidos en formato <code>zip</code>, <code>tar</code>, <code>gzip</code> y <code>bzip2</code> .</p>
-<p>FBReader es distribuido bajo los términos de la <a l:href="http://www.gnu.org/licenses/gpl.html">Licencia Pública General de GNU</a>.</p>
+<title><p>Acerca de Reader &ReaderVersion;</p></title>
+<p>Reader es un lector de libros electrónicos para Linux/Windows PDA/UMPC/PC. Reader soporta varios formatos: <code>ePub</code>, <code>fb2</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, etc. También puede leer directamente archivos comprimidos en formato <code>zip</code>, <code>tar</code>, <code>gzip</code> y <code>bzip2</code> .</p>
+<p>Reader es distribuido bajo los términos de la <a l:href="http://www.gnu.org/licenses/gpl.html">Licencia Pública General de GNU</a>.</p>
 <p>Si le gusta el programa y desea apoyar su desarrollo, por favor visite nuestra <a l:href="http://www.fbreader.org/donation/make.php">página de donaciones</a>.</p>
 <empty-line/>
 <subtitle><p>Cómo empezar</p></subtitle>
-<p>FBReader reconoce automáticamente los archivos <code> ePub</code>, <code>fb2</code> y <code>OpenReader </code> que estén en los <code>Directorios de Libros.</code> La ubicación de estos <code>Directorios</code> se puede modificar en el diálogo de Preferencias. (Haciendo click en <image l:href="#settings.png" voffset="-6"/>, en la barra de herramientas). Allí hay que dirigirse a la solapa <code>Biblioteca</code> e indicar la ubicación de los <code>Directorios</code>. Esta opción debe tener la lista de <code>Directorios</code> (separados por punto y coma) que contienen los archivos <code>*.epub</code>, <code>*.fb2</code>, <code>*.orb</code> etc.</p>
+<p>Reader reconoce automáticamente los archivos <code> ePub</code>, <code>fb2</code> y <code>OpenReader </code> que estén en los <code>Directorios de Libros.</code> La ubicación de estos <code>Directorios</code> se puede modificar en el diálogo de Preferencias. (Haciendo click en <image l:href="#settings.png" voffset="-6"/>, en la barra de herramientas). Allí hay que dirigirse a la solapa <code>Biblioteca</code> e indicar la ubicación de los <code>Directorios</code>. Esta opción debe tener la lista de <code>Directorios</code> (separados por punto y coma) que contienen los archivos <code>*.epub</code>, <code>*.fb2</code>, <code>*.orb</code> etc.</p>
 <p>Luego puede abrir la <code>Biblioteca</code> (haciendo click en <image l:href="#books.png" voffset="-6"/>) y seleccionar el Libro de su preferencia.</p>
 <p>Para leer un archivo de otro formato, primero es necesario agregarlo a la Biblioteca. Hay que entrar en la opción <code>Añadir Libro a la Biblioteca</code> (<image l:href="#addbook.png"/>), seleccionar el archivo e ingresar la información del Libro. La próxima vez que inicie el programa puede leerlo directamente desde la <code>Biblioteca</code> (<image l:href="#books.png" voffset="-6"/>).</p>
 <empty-line/>
 <subtitle><p>Sitios relacionados</p></subtitle>
-<p>Para mayor información sobre este programa puede dirigirse a la <a l:href="http://www.fbreader.org">Página principal de FBReader</a>.</p>
-<p>Si desea ser notificado sobre los nuevos lanzamientos, puede suscribirse al <a l:href="http://freshmeat.net/projects/fbreader">Proyecto de FBReader en freshmeat</a>.</p>
-<p>Si quiere realizar cualquier pregunta o sugerencia, por favor use el <a l:href="http://groups.google.com/group/fbreader">Grupo de FBReader en Googlegroups</a>.</p>
+<p>Para mayor información sobre este programa puede dirigirse a la <a l:href="http://www.fbreader.org">Página principal de Reader</a>.</p>
+<p>Si desea ser notificado sobre los nuevos lanzamientos, puede suscribirse al <a l:href="http://freshmeat.net/projects/fbreader">Proyecto de Reader en freshmeat</a>.</p>
+<p>Si quiere realizar cualquier pregunta o sugerencia, por favor use el <a l:href="http://groups.google.com/group/fbreader">Grupo de Reader en Googlegroups</a>.</p>
 <empty-line/>
 </body>
 <binary content-type="image/png" id="settings.png">
diff --git a/fbreader/data/help/MiniHelp.desktop.fi.fb2 b/reader/data/help/MiniHelp.desktop.fi.fb2
index 83dd226..706f91f 100644
--- a/fbreader/data/help/MiniHelp.desktop.fi.fb2
+++ b/reader/data/help/MiniHelp.desktop.fi.fb2
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>FBReader</last-name></author> <book-title>Tietoja FBReaderista</book-title> <lang>fi</lang></title-info></description>
+<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>Reader</last-name></author> <book-title>Tietoja Readerista</book-title> <lang>fi</lang></title-info></description>
 <body>
-<title><p>Tietoja FBReaderista &FBReaderVersion;</p></title>
-<p>FBReader on sähköisten kirjojen (e-kirja) lukemiseen tarkoitettu ohjelmisto Linux, Windows XP, PDA ja UMPC -tietokoneille. FBReader tukee mm. seuraavia e-kirjojen tiedostomuotoja: <code>ePub</code>, <code>fb2</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>. Kirjojen lukeminen onnistuu suoraan myös <code>zip</code>, <code>tar</code>, <code>gzip</code> ja <code>bzip2</code>-muotoihin pakatuista tiedostoista.</p>
-<p>FBReader ohjelmistoa levitetään <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>-lisenssin mukaisilla ehdoilla.</p>
+<title><p>Tietoja Readerista &ReaderVersion;</p></title>
+<p>Reader on sähköisten kirjojen (e-kirja) lukemiseen tarkoitettu ohjelmisto Linux, Windows XP, PDA ja UMPC -tietokoneille. Reader tukee mm. seuraavia e-kirjojen tiedostomuotoja: <code>ePub</code>, <code>fb2</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>. Kirjojen lukeminen onnistuu suoraan myös <code>zip</code>, <code>tar</code>, <code>gzip</code> ja <code>bzip2</code>-muotoihin pakatuista tiedostoista.</p>
+<p>Reader ohjelmistoa levitetään <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>-lisenssin mukaisilla ehdoilla.</p>
 <empty-line/>
 <subtitle><p>Aloitusohje</p></subtitle>
-<p>FBReader etsii <code>ePub</code>, <code>fb2</code> ja <code>OpenReader</code>-muodossa olevia kirjoja asetusten <code>Kirjaston hakemisto</code>-kohdassa olevista kansioista. Avaa asetukset valintaikkuna (työkalupalkin <image l:href="#settings.png" voffset="-6"/>-kuvakkeesta) ja muuta <code>Kirjasto</code>-välilehdellä olevaa <code>Kirjaston hakemisto</code>-asetusta. Tämä asetus sisältää listauksen niistä kansioista, jotka sisältävät <code>*.epub</code>, <code>*.fb2</code>, <code>*.orb</code> tai kyseisiä tiedostomuotoja sisältäviä pakattuja tiedostoja. Määritettäessä useita kansioita, tulee ne erottaa toisistaan puolipilkulla.</p>
+<p>Reader etsii <code>ePub</code>, <code>fb2</code> ja <code>OpenReader</code>-muodossa olevia kirjoja asetusten <code>Kirjaston hakemisto</code>-kohdassa olevista kansioista. Avaa asetukset valintaikkuna (työkalupalkin <image l:href="#settings.png" voffset="-6"/>-kuvakkeesta) ja muuta <code>Kirjasto</code>-välilehdellä olevaa <code>Kirjaston hakemisto</code>-asetusta. Tämä asetus sisältää listauksen niistä kansioista, jotka sisältävät <code>*.epub</code>, <code>*.fb2</code>, <code>*.orb</code> tai kyseisiä tiedostomuotoja sisältäviä pakattuja tiedostoja. Määritettäessä useita kansioita, tulee ne erottaa toisistaan puolipilkulla.</p>
 <p>Avaa <code>kirjasto</code> (työkalupalkin <image l:href="#books.png" voffset="-6"/>-kuvakkeesta), valitse kirja listasta ja voit aloittaa sen lukemisen.</p>
 <p>Lukeaksesi jossakin muussa tiedostomuodossa olevan kirjan, sinuun täytyy ensin lisätä kyseinen kirja kirjastoosi. Avaa <code>lisää kirja kirjastoon</code>-valintaikkuna (työkalupalkin <image l:href="#addbook.png"/>-kuvakkeesta). Valitse kirjan tiedosto ja muuta kirjan tiedot haluamiksesi. Tämän jälkeen voit avata lisätyn kirjan työkalupalkin <code>kirjasto-kuvakkeen</code> (<image l:href="#books.png" voffset="-6"/>) listauksesta.</p>
 <empty-line/>
 <subtitle><p>Liittyvät sivustot</p></subtitle>
-<p>Tästä ohjelmasta löytyy englanniksi lisätietoja <a l:href="http://www.fbreader.org">FBReaderin kotisivulta</a>.</p>
-<p>Jos haluat tiedon uusien versioiden julkaisuista, tilaa <a l:href="http://freshmeat.net/projects/fbreader">FBReader-projekti freshmeat palvelussa</a>.</p>
-<p>Jos sinulla on kysymyksiä tai ehdotuksia, käytä <a l:href="http://groups.google.com/group/fbreader">FBReader-ryhmää googlegroups palvelussa</a>.</p>
+<p>Tästä ohjelmasta löytyy englanniksi lisätietoja <a l:href="http://www.fbreader.org">Readerin kotisivulta</a>.</p>
+<p>Jos haluat tiedon uusien versioiden julkaisuista, tilaa <a l:href="http://freshmeat.net/projects/fbreader">Reader-projekti freshmeat palvelussa</a>.</p>
+<p>Jos sinulla on kysymyksiä tai ehdotuksia, käytä <a l:href="http://groups.google.com/group/fbreader">Reader-ryhmää googlegroups palvelussa</a>.</p>
 </body>
 <binary content-type="image/png" id="settings.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
diff --git a/fbreader/data/help/MiniHelp.desktop.fr.fb2 b/reader/data/help/MiniHelp.desktop.fr.fb2
index 2f3e758..92d6395 100644
--- a/fbreader/data/help/MiniHelp.desktop.fr.fb2
+++ b/reader/data/help/MiniHelp.desktop.fr.fb2
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>FBReader</last-name></author> <book-title>À propos de FBReader</book-title> <lang>fr</lang></title-info></description>
+<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>Reader</last-name></author> <book-title>À propos de Reader</book-title> <lang>fr</lang></title-info></description>
 <body>
-<title><p>À propos de FBReader &FBReaderVersion;</p></title>
-<p>FBReader est un lecteur de livres électroniques (e-books) pour PDA, ordinateur de bureau et UMPC sous Linux ou Windows XP. FBReader supporte plusieurs formats de livres électroniques : <code>ePub</code>, <code>fb2</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, etc. La lecture directe à partir d'archives <code>zip</code>, <code>tar</code>, <code>gzip</code> et <code>bzip2</code> est également supportée.</p>
-<p>FBReader est distribué selon les termes de la licence <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>.</p>
+<title><p>À propos de Reader &ReaderVersion;</p></title>
+<p>Reader est un lecteur de livres électroniques (e-books) pour PDA, ordinateur de bureau et UMPC sous Linux ou Windows XP. Reader supporte plusieurs formats de livres électroniques : <code>ePub</code>, <code>fb2</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, etc. La lecture directe à partir d'archives <code>zip</code>, <code>tar</code>, <code>gzip</code> et <code>bzip2</code> est également supportée.</p>
+<p>Reader est distribué selon les termes de la licence <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>.</p>
 <empty-line/>
-<subtitle><p>Débuts avec FBReader</p></subtitle>
-<p>FBReader cherche des livres aux formats <code>ePub</code>, <code>fb2</code> et <code>OpenReader</code> dans les répertoires indiqués dans l'option <code>Chemin des livres</code>. La première chose à faire est de remplir ce chemin. Ouvrez la boîte de dialogue d'options (il suffit de cliquer sur <image l:href="#settings.png" voffset="-6"/> dans la barre d'outils) et changez la valeur de l'option <code>Chemin des livres</code> dans l'onglet <code>Bibliothèque</code>. Cette option contient la liste des répertoires contenant des fichiers <code>*.epub</code>, <code>*.fb2</code>, <code>*.orb</code> ou des fichiers archives. Les répertoires de cette liste sont séparés par des caractères deux-points.</p>
+<subtitle><p>Débuts avec Reader</p></subtitle>
+<p>Reader cherche des livres aux formats <code>ePub</code>, <code>fb2</code> et <code>OpenReader</code> dans les répertoires indiqués dans l'option <code>Chemin des livres</code>. La première chose à faire est de remplir ce chemin. Ouvrez la boîte de dialogue d'options (il suffit de cliquer sur <image l:href="#settings.png" voffset="-6"/> dans la barre d'outils) et changez la valeur de l'option <code>Chemin des livres</code> dans l'onglet <code>Bibliothèque</code>. Cette option contient la liste des répertoires contenant des fichiers <code>*.epub</code>, <code>*.fb2</code>, <code>*.orb</code> ou des fichiers archives. Les répertoires de cette liste sont séparés par des caractères deux-points.</p>
 <p>Ouvrez la <code>bibliothèque</code> (cliques sur <image l:href="#books.png" voffset="-6"/>) et sélectionnez un livre de la liste afin de le lire.</p>
 <p>Pour lire un fichier dans un autre format, vous devez l'ajouter à la bibliothèque. Ouvrez le dialogue <code>Ajouter un livre</code> (<image l:href="#addbook.png"/>), sélectionnez un fichier et éditez les informations correspondantes. Dans l'avenir, vous pourrez ouvrir ce livre directement depuis la <code>bibliothèque</code> (<image l:href="#books.png" voffset="-6"/>).</p>
 <empty-line/>
 <subtitle><p>Informations complémentaires</p></subtitle>
-<p>Davantage d'informations sur ce programme se trouvent sur la <a l:href="http://www.fbreader.org">page Web de FBReader</a>.</p>
-<p>Si vous souhaitez être prévenu des nouvelles versions, veuillez vous inscrire au <a l:href="http://freshmeat.net/projects/fbreader">projet FBReader de freshmeat</a>.</p>
-<p>Si vous avez des questions ou des suggestions, veuillez utiliser le <a l:href="http://groups.google.com/group/fbreader">groupe FBReader de googlegroups</a>.</p>
+<p>Davantage d'informations sur ce programme se trouvent sur la <a l:href="http://www.fbreader.org">page Web de Reader</a>.</p>
+<p>Si vous souhaitez être prévenu des nouvelles versions, veuillez vous inscrire au <a l:href="http://freshmeat.net/projects/fbreader">projet Reader de freshmeat</a>.</p>
+<p>Si vous avez des questions ou des suggestions, veuillez utiliser le <a l:href="http://groups.google.com/group/fbreader">groupe Reader de googlegroups</a>.</p>
 </body>
 <binary content-type="image/png" id="settings.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
diff --git a/fbreader/data/help/MiniHelp.desktop.he.fb2 b/reader/data/help/MiniHelp.desktop.he.fb2
index cb3be26..130bfc3 100644
--- a/fbreader/data/help/MiniHelp.desktop.he.fb2
+++ b/reader/data/help/MiniHelp.desktop.he.fb2
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Hebrew FBReader resources, by David Kachan -->
+<!-- Hebrew Reader resources, by David Kachan -->
 <FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink">
-<description><title-info><author><last-name>FBReader</last-name></author><book-title>אודות FBReader</book-title><lang>he</lang></title-info></description>
+<description><title-info><author><last-name>Reader</last-name></author><book-title>אודות Reader</book-title><lang>he</lang></title-info></description>
   <body>
-    <title><p>אודות FBReader &FBReaderVersion;</p></title>
-      <p>FBReader הינו תוכנה המאפשרת קריאת ספרים אלקטרוניים, ועובדת תחת מערכות הפעלה Linux, FreeBSD, Windows XP. </p>
-      <p>FBReader מאשפר קריאת ספרים בפורמטים רבים: <code>ePub</code> , <code>fb2</code> , <code>chm</code> , <code>rtf</code> , <code>plucker</code>  וכו' . ניתן לפתוח ספרים מתוך קבצי ארכיון כגון  <code>zip</code> , <code>tar</code> , <code>gzip</code> <code> ו-bzip2 </code>.</p>
+    <title><p>אודות Reader &ReaderVersion;</p></title>
+      <p>Reader הינו תוכנה המאפשרת קריאת ספרים אלקטרוניים, ועובדת תחת מערכות הפעלה Linux, FreeBSD, Windows XP. </p>
+      <p>Reader מאשפר קריאת ספרים בפורמטים רבים: <code>ePub</code> , <code>fb2</code> , <code>chm</code> , <code>rtf</code> , <code>plucker</code>  וכו' . ניתן לפתוח ספרים מתוך קבצי ארכיון כגון  <code>zip</code> , <code>tar</code> , <code>gzip</code> <code> ו-bzip2 </code>.</p>
       <p>אם אהבת את התוכנה ובא לך לתמוך בפיתוח שלה, בקר בדף  <a l:href="http://www.fbreader.org/donation/make.php"> תרומה </a> ע" מ לתרום.</p>
     <empty-line/>
     <subtitle><p>כיצד מתחילים</p></subtitle>
-       <p>FBReader אוטומטית מצרף לספריה ספרים בפורמטים <code>ePub</code> , <code>fb2</code> <code>ו-OpenReader</code> אשר נמצאים בתיקיה מוגדרת בתוך שדה <code>&#171;נתיב הספריה&#187;</code> בתוך הגדרות.</p>
+       <p>Reader אוטומטית מצרף לספריה ספרים בפורמטים <code>ePub</code> , <code>fb2</code> <code>ו-OpenReader</code> אשר נמצאים בתיקיה מוגדרת בתוך שדה <code>&#171;נתיב הספריה&#187;</code> בתוך הגדרות.</p>
       <p> לכן לפני שמתחילים צריך להגדיר שדה זה. פתח הגדרות ( ע"י לחיצת כפתור <image l:href="#settings.png" voffset="-6"/>) וערוך שדה  <code>&#171;נתיב הספריה&#187;</code> תחת  <code>&#171;ספריה&#187;</code>.</p>
       <p> תיקיות בשדה הנ"ל צריכות להיות מופרדות ע"י נקודה ופסיק ולכלול קבצים עם סיומות  <code>epub</code> ,<code>fb2</code> ,<code>orb</code> או קבצי ארכיון עם קבצים אלה.</p>
       <p>כעת ניתן לפתוח את  <code>הספריה</code> (ע"י לחיצה על <image l:href="#books.png" voffset="-6"/>), לבחור ספר ולהתחיל לקרוא.</p>
@@ -17,9 +17,9 @@
       <p>בפעם הבאה ניתן לפתוח את הספר ע"י <code> ספריה </code> (<image l:href="#books.png" voffset="-6"/>).</p>
     <empty-line/>
     <subtitle><p>קישורים</p></subtitle>
-      <p>פרטים נוספים על תוכנית זו ניתן למצוא בדף הבית של<a l:href="http://www.fbreader.org"> FBReader </a>.</p>
-      <p>לקבלת עדכונים על גרסאות חדשות הירשם לפרוייקט<a l:href="http://freshmeat.net/projects/fbreader"> FBReader on-freshmeat </a>.</p>
-      <p>ליצירת קשר עם יוצרי התוכנה אנא השתמש בקבוצת<a l:href="http://groups.google.com/group/fbreader"> FBReader on-googlegroups </a>.</p>
+      <p>פרטים נוספים על תוכנית זו ניתן למצוא בדף הבית של<a l:href="http://www.fbreader.org"> Reader </a>.</p>
+      <p>לקבלת עדכונים על גרסאות חדשות הירשם לפרוייקט<a l:href="http://freshmeat.net/projects/fbreader"> Reader on-freshmeat </a>.</p>
+      <p>ליצירת קשר עם יוצרי התוכנה אנא השתמש בקבוצת<a l:href="http://groups.google.com/group/fbreader"> Reader on-googlegroups </a>.</p>
   </body>
 <binary content-type="image/png" id="settings.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
diff --git a/fbreader/data/help/MiniHelp.desktop.hu.fb2 b/reader/data/help/MiniHelp.desktop.hu.fb2
index 84e7f49..d1517c2 100644
--- a/fbreader/data/help/MiniHelp.desktop.hu.fb2
+++ b/reader/data/help/MiniHelp.desktop.hu.fb2
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>FBReader</last-name></author> <book-title>About FBReader</book-title> <lang>hu</lang></title-info></description>
+<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>Reader</last-name></author> <book-title>About Reader</book-title> <lang>hu</lang></title-info></description>
 <body>
-<title><p>Az FBReader &FBReaderVersion;</p></title>
-<p>Az FBReader egy elektronikus könyv (e-book) olvasó program, Linux/Windows XP operációsrendszerekre, PDA/UMPC/PC számítógépekre. Az FBReader többféle e-book formátumot képes kezelni: <code>ePub</code>, <code>fb2</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, stb. Közvetlenül olvas a <code>zip</code>, <code>tar</code>, <code>gzip</code> and <code>bzip2</code> formátumú tömörített fájlokból.</p>
-<p>Az FBReader a <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a> hatálya alatt terjesztett program.</p>
+<title><p>Az Reader &ReaderVersion;</p></title>
+<p>Az Reader egy elektronikus könyv (e-book) olvasó program, Linux/Windows XP operációsrendszerekre, PDA/UMPC/PC számítógépekre. Az Reader többféle e-book formátumot képes kezelni: <code>ePub</code>, <code>fb2</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, stb. Közvetlenül olvas a <code>zip</code>, <code>tar</code>, <code>gzip</code> and <code>bzip2</code> formátumú tömörített fájlokból.</p>
+<p>Az Reader a <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a> hatálya alatt terjesztett program.</p>
 <p>Ha tetszik a program és támogatnád a fejlesztést, látogass el az <a l:href="http://www.fbreader.org/donation/make.php">adományozó</a> oldalra.</p>
 <empty-line/>
 <subtitle><p>Kezdő lépések</p></subtitle>
-<p>Az FBReader azokat az <code>ePub</code>, <code>fb2</code> és <code>OpenReader</code> köteteket kezeli, amelyek <code>„A könyvek helye”</code> beállításban felsorolt könyvtárakban találhatók. Először ezt az opciót kell beállítani. Nyisd meg a <code>„Beállítások módosítása”</code> menüt (egy kattintás a <image l:href="#settings.png" voffset="-6"/> ikonon, az eszkösávon) és töltsd ki az <code>„A könyvek helye”</code> sort a <code>„Könyvtár”</code> fülön. Ez tartalmazza azon könyvtárak listáját, amelyekben megtalálhatók a <code>*.epub</code>, <code>*.fb2</code>, <code>*.orb</code> fájlok, vagy az ezeket tartalmazó tömörített állományok. A könyvtárakat kettősponttal (:) kell elválasztani egymástól.</p>
+<p>Az Reader azokat az <code>ePub</code>, <code>fb2</code> és <code>OpenReader</code> köteteket kezeli, amelyek <code>„A könyvek helye”</code> beállításban felsorolt könyvtárakban találhatók. Először ezt az opciót kell beállítani. Nyisd meg a <code>„Beállítások módosítása”</code> menüt (egy kattintás a <image l:href="#settings.png" voffset="-6"/> ikonon, az eszkösávon) és töltsd ki az <code>„A könyvek helye”</code> sort a <code>„Könyvtár”</code> fülön. Ez tartalmazza azon könyvtárak listáját, amelyekben megtalálhatók a <code>*.epub</code>, <code>*.fb2</code>, <code>*.orb</code> fájlok, vagy az ezeket tartalmazó tömörített állományok. A könyvtárakat kettősponttal (:) kell elválasztani egymástól.</p>
 <p>Nyisd meg a <code>„Könyvtár”</code>-at (egy kattintás a <image l:href="#books.png" voffset="-6"/> ikonon), válaszd ki a kötetet és azonnal olvashatod.</p>
 <p>A felsoroltaktól eltérő formátumú köteteket először hozzá kell adni a könyvtárhoz. Indítsd el a <code>„Fájl hozzáadása a könyvtárhoz”</code> (<image l:href="#addbook.png"/>) menüt, válaszd ki a fájlt és add meg a szükséges információkat. A továbbiakban a könyv elérhető a <code>„Könyvtár”</code> (<image l:href="#books.png" voffset="-6"/>) megnyitásával.</p>
 <empty-line/>
 <subtitle><p>Fontos Internetoldalak</p></subtitle>
-<p>A programról további információk olvashatók az <a l:href="http://www.fbreader.org">FBReader oldalon</a>.</p>
-<p>Ha értesítést szeretnél a változásokról, iratkozz fel a <a l:href="http://freshmeat.net/projects/fbreader">FBReader projectre a freshmeat-en</a>.</p>
-<p>Ha kérdéseid vagy ötleteid vannak, használd az <a l:href="http://groups.google.com/group/fbreader">FBReader csoportot a googlegroups-on</a>.</p>
+<p>A programról további információk olvashatók az <a l:href="http://www.fbreader.org">Reader oldalon</a>.</p>
+<p>Ha értesítést szeretnél a változásokról, iratkozz fel a <a l:href="http://freshmeat.net/projects/fbreader">Reader projectre a freshmeat-en</a>.</p>
+<p>Ha kérdéseid vagy ötleteid vannak, használd az <a l:href="http://groups.google.com/group/fbreader">Reader csoportot a googlegroups-on</a>.</p>
 </body>
 <binary content-type="image/png" id="settings.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
diff --git a/fbreader/data/help/MiniHelp.desktop.id.fb2 b/reader/data/help/MiniHelp.desktop.id.fb2
index 51be6b1..527406d 100644
--- a/fbreader/data/help/MiniHelp.desktop.id.fb2
+++ b/reader/data/help/MiniHelp.desktop.id.fb2
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>FBReader</last-name></author> <book-title>Mengenai FBReader</book-title> <lang>id</lang></title-info></description>
+<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>Reader</last-name></author> <book-title>Mengenai Reader</book-title> <lang>id</lang></title-info></description>
 <body>
-<title><p>Mengenai FBReader &FBReaderVersion;</p></title>
-<p>FBReader adalah aplikasi pembaca buku elektronik (e-book) untuk komputer PDA/UMPC/desktop dengan sistem operasi Linux/Windows XP. FBReader mendukung beberapa format buku elektronik: <code>ePub</code>, <code>fb2</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, dan lain-lain. Juga mendukung pembacaan langsung dari berkas terkompresi dalam format <code>zip</code>, <code>tar</code>, <code>gzip</code> dan <code>bzip2</code>.</p>
-<p>FBReader didistribusikan di bawah lisensi <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>.</p>
+<title><p>Mengenai Reader &ReaderVersion;</p></title>
+<p>Reader adalah aplikasi pembaca buku elektronik (e-book) untuk komputer PDA/UMPC/desktop dengan sistem operasi Linux/Windows XP. Reader mendukung beberapa format buku elektronik: <code>ePub</code>, <code>fb2</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, dan lain-lain. Juga mendukung pembacaan langsung dari berkas terkompresi dalam format <code>zip</code>, <code>tar</code>, <code>gzip</code> dan <code>bzip2</code>.</p>
+<p>Reader didistribusikan di bawah lisensi <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>.</p>
 <p>Jika Anda menyukai program ini dan ingin mendukung pengembangannya, silakan ke halaman <a l:href="http://www.fbreader.org/donation/make.php">pemberian donasi</a>.</p>
 <empty-line/>
 <subtitle><p>Bagaimana Memulainya</p></subtitle>
-<p>FBReader mencari buku format <code>ePub</code>, <code>fb2</code> dan <code>OpenReader</code> dalam direktori yang tercantum dalam pengaturan <code>Lokasi Buku</code>. Anda perlu mengatur lokasi ini terlebih dahulu. Buka dialog pengaturan (klik pada ikon <image l:href="#settings.png" voffset="-6"/> di toolbar) dan ubah pengaturan <code>Lokasi Buku</code> pada halaman <code>Pustaka</code>. Pengaturan ini berisi daftar direktori yang terdapat berkas <code>*.epub</code>, <code>*.fb2</code>, <code>*.orb</code> atau berkas terkompresi. Daftar direktori ini dipisahkan oleh titik dua.</p>
+<p>Reader mencari buku format <code>ePub</code>, <code>fb2</code> dan <code>OpenReader</code> dalam direktori yang tercantum dalam pengaturan <code>Lokasi Buku</code>. Anda perlu mengatur lokasi ini terlebih dahulu. Buka dialog pengaturan (klik pada ikon <image l:href="#settings.png" voffset="-6"/> di toolbar) dan ubah pengaturan <code>Lokasi Buku</code> pada halaman <code>Pustaka</code>. Pengaturan ini berisi daftar direktori yang terdapat berkas <code>*.epub</code>, <code>*.fb2</code>, <code>*.orb</code> atau berkas terkompresi. Daftar direktori ini dipisahkan oleh titik dua.</p>
 <p>Buka <code>pustaka</code> (klik pada ikon <image l:href="#books.png" voffset="-6"/>), pilih sebuah buku dari daftar dan Anda bisa mulai membaca.</p>
 <p>Untuk membaca berkas dalam format lain, Anda perlu menambahkannya ke pustaka. Mulailah <code>dialog tambah ke pustaka</code> (<image l:href="#addbook.png"/>), pilih sebuah berkas dan ubah informasi berkasnya jika perlu. Di lain waktu Anda dapat membuka berkas ini menggunakan <code>pustaka</code> (<image l:href="#books.png" voffset="-6"/>).</p>
 <empty-line/>
 <subtitle><p>Alamat yang berkaitan</p></subtitle>
-<p>Informasi tambahan mengenai aplikasi ini dapat ditemukan di <a l:href="http://www.fbreader.org">situs FBReader</a>.</p>
-<p>Jika ingin menerima informasi mengenai rilis baru aplikasi ini, silakan daftarkan diri ke <a l:href="http://freshmeat.net/projects/fbreader">proyek FBReader di freshmeat</a>.</p>
-<p>Jika Anda memiliki pertanyaan atau masukan, silakan gunakan <a l:href="http://groups.google.com/group/fbreader">grup FBReader di googlegroups</a>.</p>
+<p>Informasi tambahan mengenai aplikasi ini dapat ditemukan di <a l:href="http://www.fbreader.org">situs Reader</a>.</p>
+<p>Jika ingin menerima informasi mengenai rilis baru aplikasi ini, silakan daftarkan diri ke <a l:href="http://freshmeat.net/projects/fbreader">proyek Reader di freshmeat</a>.</p>
+<p>Jika Anda memiliki pertanyaan atau masukan, silakan gunakan <a l:href="http://groups.google.com/group/fbreader">grup Reader di googlegroups</a>.</p>
 </body>
 <binary content-type="image/png" id="settings.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
diff --git a/fbreader/data/help/MiniHelp.desktop.it.fb2 b/reader/data/help/MiniHelp.desktop.it.fb2
index 2c9d418..f80a992 100644
--- a/fbreader/data/help/MiniHelp.desktop.it.fb2
+++ b/reader/data/help/MiniHelp.desktop.it.fb2
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>FBReader</last-name></author> <book-title>Informazioni su FBReader</book-title> <lang>it</lang></title-info></description>
+<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>Reader</last-name></author> <book-title>Informazioni su Reader</book-title> <lang>it</lang></title-info></description>
 <body>
-<title><p>Informazioni su FBReader &FBReaderVersion;</p></title>
-<p>FBReader è un lettore di e-book per PDA/UMPC/computer Linux/Windows. FBReader supporta diversi formati di e-book: <code>ePub</code>, <code>fb2</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, etc. E' anche supportata la lettura diretta da archivi <code>zip</code>, <code>tar</code>, <code>gzip</code> e <code>bzip2</code>.</p>
-<p>FBReader è distribuito nei termini is della licenza <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>.</p>
+<title><p>Informazioni su Reader &ReaderVersion;</p></title>
+<p>Reader è un lettore di e-book per PDA/UMPC/computer Linux/Windows. Reader supporta diversi formati di e-book: <code>ePub</code>, <code>fb2</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, etc. E' anche supportata la lettura diretta da archivi <code>zip</code>, <code>tar</code>, <code>gzip</code> e <code>bzip2</code>.</p>
+<p>Reader è distribuito nei termini is della licenza <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>.</p>
 <empty-line/>
 <subtitle><p>Come Iniziare</p></subtitle>
-<p>FBReader cerca i libri <code>ePub</code>, <code>fb2</code> e <code>OpenReader</code> nelle cartelle elencate nell'opzione <code>Percorso Libri</code>. Prima di tutto occorre impostare questo percorso. Apri la finestra Opzioni (basta fare clic su <image l:href="#settings.png" voffset="-6"/> nella barra degli strumenti) and cambiare il valore dell'opzione <code>Percorso Libri</code> nella scheda <code>Biblioteca</code>. Questa opzione contiene l'elenco delle cartelle contenenti file <code>*.epub</code>, <code>*.fb2</code>, <code>*.orb</code> o archivi. Le cartelle dell'elenco sono separate da due punti.</p>
+<p>Reader cerca i libri <code>ePub</code>, <code>fb2</code> e <code>OpenReader</code> nelle cartelle elencate nell'opzione <code>Percorso Libri</code>. Prima di tutto occorre impostare questo percorso. Apri la finestra Opzioni (basta fare clic su <image l:href="#settings.png" voffset="-6"/> nella barra degli strumenti) and cambiare il valore dell'opzione <code>Percorso Libri</code> nella scheda <code>Biblioteca</code>. Questa opzione contiene l'elenco delle cartelle contenenti file <code>*.epub</code>, <code>*.fb2</code>, <code>*.orb</code> o archivi. Le cartelle dell'elenco sono separate da due punti.</p>
 <p>Apri <code>biblioteca</code> (fare clic su <image l:href="#books.png" voffset="-6"/>), seleziona un libro dall'elenco e leggi.</p>
 <p>Per leggere un file in un altro formato, devi aggiungerlo alla biblioteca. Apri la <code>finestra aggiungi alla biblioteca</code> (<image l:href="#addbook.png"/>), seleziona un file e modifica le informazioni sul file. La prossima volta puoi aprire questo file usando la <code>biblioteca</code> (<image l:href="#books.png" voffset="-6"/>).</p>
 <empty-line/>
 <subtitle><p>Siti correlati</p></subtitle>
-<p>Ulteriori informazioni su questo programma possono essere trovate alla <a l:href="http://www.fbreader.org">homepage di FBReader</a>.</p>
-<p>Se vuoi essere informato sull'uscita di nuove versioni, per favore iscriviti al <a l:href="http://freshmeat.net/projects/fbreader">progetto FBReader su freshmeat</a>.</p>
-<p>Se hai domande o suggerimenti, per favore usa il <a l:href="http://groups.google.com/group/fbreader">gruppo di FBReader su google gruppi</a>.</p>
+<p>Ulteriori informazioni su questo programma possono essere trovate alla <a l:href="http://www.fbreader.org">homepage di Reader</a>.</p>
+<p>Se vuoi essere informato sull'uscita di nuove versioni, per favore iscriviti al <a l:href="http://freshmeat.net/projects/fbreader">progetto Reader su freshmeat</a>.</p>
+<p>Se hai domande o suggerimenti, per favore usa il <a l:href="http://groups.google.com/group/fbreader">gruppo di Reader su google gruppi</a>.</p>
 </body>
 <binary content-type="image/png" id="settings.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
diff --git a/fbreader/data/help/MiniHelp.desktop.lt.fb2 b/reader/data/help/MiniHelp.desktop.lt.fb2
index 7b02dda..77ec399 100644
--- a/fbreader/data/help/MiniHelp.desktop.lt.fb2
+++ b/reader/data/help/MiniHelp.desktop.lt.fb2
@@ -3,11 +3,11 @@
 <description>
 <title-info>
 <author>
-<first-name>FBReader</first-name>
+<first-name>Reader</first-name>
 <middle-name></middle-name>
 <last-name></last-name>
 </author>
-<book-title>Apie FBReader 0.12.0</book-title>
+<book-title>Apie Reader 0.12.0</book-title>
 <lang>lt</lang>
 <src-lang>en</src-lang>
 <translator>
@@ -21,22 +21,22 @@
 </title-info>
 </description>
 <body>
-<title><p>Apie programą FBReader &FBReaderVersion;</p></title>
-<p>Programa FBReader skirta elektroninių knygų skaitymui kompiuteriuose, kuriuose yra įdiegtos Linux arba Windows operacinės sistemos. FBReader palaiko daugumą elektroninių knygų formatų: <code>ePub</code>, <code>fb2</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, ir t.t. Programa taip pat sugeba atidaryti elektronines knygas tiesiogiai iš archyvų <code>zip</code>, <code>tar</code>, <code>gzip</code> ir <code>bzip2</code>.</p>
-<p>Programa FBReader yra platinama pagal GNU Bendros Viešosios Licenzijos (<a l:href="http://www.gnu.org/licenses/gpl.html">GNU BVL</a>) sąlygas.</p>
+<title><p>Apie programą Reader &ReaderVersion;</p></title>
+<p>Programa Reader skirta elektroninių knygų skaitymui kompiuteriuose, kuriuose yra įdiegtos Linux arba Windows operacinės sistemos. Reader palaiko daugumą elektroninių knygų formatų: <code>ePub</code>, <code>fb2</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, ir t.t. Programa taip pat sugeba atidaryti elektronines knygas tiesiogiai iš archyvų <code>zip</code>, <code>tar</code>, <code>gzip</code> ir <code>bzip2</code>.</p>
+<p>Programa Reader yra platinama pagal GNU Bendros Viešosios Licenzijos (<a l:href="http://www.gnu.org/licenses/gpl.html">GNU BVL</a>) sąlygas.</p>
 <p>Jeigu jums patinka programa ir jūs norite paremti jos vystymąsi – aplankykite <a l:href="http://www.fbreader.org/donation/make.php">paramos puslapį</a>.</p>
 <empty-line/>
 <subtitle><p>Kaip pradėti naudotis programa</p></subtitle>
-<p>Programa FBReader ieško <code>ePub</code>, <code>fb2</code> ir <code>OpenReader</code> knygų kataloguose (directory) išvardintuose kortelės Biblioteka nustatymuose. Jeigu norite, kad FBReader žinotų kur jūsų kompiuteryje yra laikomos knygos, turite nurodyti programai kelią iki knygų katalogo. Tam tikslui atidarykite nustatymų langą paspausdami <image l:href="#settings.png"/> programos įrankių juostoje ir kortelės  Biblioteka laukuose “Kelias prie knygos (knygų)” ir “Atsisiųstų knygų saugojimo vieta” įrašykite kelią prie knygų saugojimo vietos, pavyzdžiui:</p>
+<p>Programa Reader ieško <code>ePub</code>, <code>fb2</code> ir <code>OpenReader</code> knygų kataloguose (directory) išvardintuose kortelės Biblioteka nustatymuose. Jeigu norite, kad Reader žinotų kur jūsų kompiuteryje yra laikomos knygos, turite nurodyti programai kelią iki knygų katalogo. Tam tikslui atidarykite nustatymų langą paspausdami <image l:href="#settings.png"/> programos įrankių juostoje ir kortelės  Biblioteka laukuose “Kelias prie knygos (knygų)” ir “Atsisiųstų knygų saugojimo vieta” įrašykite kelią prie knygų saugojimo vietos, pavyzdžiui:</p>
 <p><code>~/Books:/media/disk1/Books</code></p>
 <p>Skirtingos knygų laikymo vietos atskiriamos dvitaškiu: “:”</p>
-<p>Tam, kad atidaryti FBReader biblioteką – paspauskite ženkliuką <image l:href="#books.png"/> – čia galėsite išsirinkti knygą skaitymui.</p>
-<p>Norint pridėti knygą prie FBReader bibliotekos, paspauskite <image l:href="#addbook.png"/> – atsidarys knygos paieškos langas. Langas rodo paskutinės į FBReader biblioteką įkeltos knygos buvimo vietą. Nurodykite knygos, kurią norite skaityti FBReader programoje, saugojimo vietą jūsų kompiuteryje, pažymėkite knygą ir paspauskite mygtuką "Patvirtinti". Knyga bus prijungta prie FBReader bibliotekos ir sekantį kartą galėsite ją pasiekti spausdami FBReader bibliotekos ženkliuką <image l:href="#books.png"/>.</p>
+<p>Tam, kad atidaryti Reader biblioteką – paspauskite ženkliuką <image l:href="#books.png"/> – čia galėsite išsirinkti knygą skaitymui.</p>
+<p>Norint pridėti knygą prie Reader bibliotekos, paspauskite <image l:href="#addbook.png"/> – atsidarys knygos paieškos langas. Langas rodo paskutinės į Reader biblioteką įkeltos knygos buvimo vietą. Nurodykite knygos, kurią norite skaityti Reader programoje, saugojimo vietą jūsų kompiuteryje, pažymėkite knygą ir paspauskite mygtuką "Patvirtinti". Knyga bus prijungta prie Reader bibliotekos ir sekantį kartą galėsite ją pasiekti spausdami Reader bibliotekos ženkliuką <image l:href="#books.png"/>.</p>
 <empty-line/>
 <subtitle><p>Susieti tinklalapiai</p></subtitle>
-<p>Atnaujintą informaciją apie programą rasite <a l:href="http://www.fbreader.org/">FBReader svetainėje</a>.</p>
-<p>Jeigu jūs norite gauti informaciją apie FBReader atnaujinimus elektroniniu paštu – užsiprenumeruokite programos naujienas svetainėje <a l:href="http://freshmeat.net/projects/fbreader">Freshmeat.</a></p>
-<p>Jeigu turite klausimų ar pasiūlymų – susisiekite su FBReader bendruomene <a l:href="http://groups.google.com/group/fbreader">googlegroups</a>.</p>
+<p>Atnaujintą informaciją apie programą rasite <a l:href="http://www.fbreader.org/">Reader svetainėje</a>.</p>
+<p>Jeigu jūs norite gauti informaciją apie Reader atnaujinimus elektroniniu paštu – užsiprenumeruokite programos naujienas svetainėje <a l:href="http://freshmeat.net/projects/fbreader">Freshmeat.</a></p>
+<p>Jeigu turite klausimų ar pasiūlymų – susisiekite su Reader bendruomene <a l:href="http://groups.google.com/group/fbreader">googlegroups</a>.</p>
 </body>
 <binary content-type="image/png" id="settings.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
diff --git a/fbreader/data/help/MiniHelp.desktop.nl.fb2 b/reader/data/help/MiniHelp.desktop.nl.fb2
index 78f10a4..b505843 100755
--- a/fbreader/data/help/MiniHelp.desktop.nl.fb2
+++ b/reader/data/help/MiniHelp.desktop.nl.fb2
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>FBReader</last-name></author> <book-title>Over FBReader</book-title> <lang>nl</lang></title-info></description>
+<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>Reader</last-name></author> <book-title>Over Reader</book-title> <lang>nl</lang></title-info></description>
 <body>
-<title><p>Over FBReader &FBReaderVersion;</p></title>
-<p>FBReader is een e-book reader voor Linux/Windows/FreeBSD en verschillende mobiele platformen. FBReader ondersteunt verschillende e-book bestanden: <code>ePub</code>, <code>fb2</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, etc. Het direct lezen van <code>zip</code>, <code>tar</code>, <code>gzip</code> en <code>bzip2</code> gecomprimeerde bestanden wordt ook ondersteund.</p>
-<p>FBReader wordt distribueerd onder de voorwaarden van de <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>.</p>
+<title><p>Over Reader &ReaderVersion;</p></title>
+<p>Reader is een e-book reader voor Linux/Windows/FreeBSD en verschillende mobiele platformen. Reader ondersteunt verschillende e-book bestanden: <code>ePub</code>, <code>fb2</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, etc. Het direct lezen van <code>zip</code>, <code>tar</code>, <code>gzip</code> en <code>bzip2</code> gecomprimeerde bestanden wordt ook ondersteund.</p>
+<p>Reader wordt distribueerd onder de voorwaarden van de <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>.</p>
 <p>Indien U dit programma op prijs stelt en U aan de ontwikkeling ervan wilt bijdragen, bezoek dan de <a l:href="http://www.fbreader.org/donation/make.php">donatie</a> pagina.</p>
 <empty-line/>
 <subtitle><p>Configuratie</p></subtitle>
-<p>FBReader zoekt naar <code>ePub</code>, <code>fb2</code> en <code>OpenReader</code> boeken in de mappen die als <code>Boek Locaties </code> zijn gespecificeerd. Om te beginnen kiest u deze mappen. Open het configuratiescherm (Selecteer <image l:href="#settings.png" voffset="-6"/> in de menubalk) en kies Uw <code>Boek Locaties</code> op de pagina met het <code>Bibliotheek</code> label. Deze pagina bevat een lijst van mappen met <code>*.epub</code>, <code>*.fb2</code>, <code>*.orb</code> of gecomprimeerde bestanden. Mappen in deze lijst worden van elkaar gescheiden door een dubbele punt (:).</p>
+<p>Reader zoekt naar <code>ePub</code>, <code>fb2</code> en <code>OpenReader</code> boeken in de mappen die als <code>Boek Locaties </code> zijn gespecificeerd. Om te beginnen kiest u deze mappen. Open het configuratiescherm (Selecteer <image l:href="#settings.png" voffset="-6"/> in de menubalk) en kies Uw <code>Boek Locaties</code> op de pagina met het <code>Bibliotheek</code> label. Deze pagina bevat een lijst van mappen met <code>*.epub</code>, <code>*.fb2</code>, <code>*.orb</code> of gecomprimeerde bestanden. Mappen in deze lijst worden van elkaar gescheiden door een dubbele punt (:).</p>
 <p>Open de <code>bibliotheek</code> (<image l:href="#books.png" voffset="-6"/>) en  selecteer een boek uit de lijst om het te lezen.</p>
 <p>Om andere e-book bestanden te lezen dient U deze aan de bibliotheek toe te voegen. Open het <code>aan bibliotheek toevoegen</code> (<image l:href="#addbook.png"/>) keuzescherm, selecteer een bestand en bewerk eventueel de informatie. U kunt dit bestand in het vervolg vanuit de <code>bibliotheek</code> (<image l:href="#books.png" voffset="-6"/>) openen.</p>
 <empty-line/>
 <subtitle><p>Gerelateerde sites</p></subtitle>
-<p>Meer informatie over dit programma kunt U op de <a l:href="http://www.fbreader.org">FBReader homepage</a> vinden.</p>
-<p>Om op de hoogte gehouden te worden van nieuwe versies kunt U zich abonneren op het <a l:href="http://freshmeat.net/projects/fbreader">FBReader project op Freshmeat</a>.</p>
-<p>Voor vragen of suggesties kunt U de <a l:href="http://groups.google.com/group/fbreader">FBReader group van googlegroups</a> bezoeken.</p>
+<p>Meer informatie over dit programma kunt U op de <a l:href="http://www.fbreader.org">Reader homepage</a> vinden.</p>
+<p>Om op de hoogte gehouden te worden van nieuwe versies kunt U zich abonneren op het <a l:href="http://freshmeat.net/projects/fbreader">Reader project op Freshmeat</a>.</p>
+<p>Voor vragen of suggesties kunt U de <a l:href="http://groups.google.com/group/fbreader">Reader group van googlegroups</a> bezoeken.</p>
 </body>
 <binary content-type="image/png" id="settings.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
diff --git a/fbreader/data/help/MiniHelp.desktop.ru.fb2 b/reader/data/help/MiniHelp.desktop.ru.fb2
index 4e96613..dec9df7 100644
--- a/fbreader/data/help/MiniHelp.desktop.ru.fb2
+++ b/reader/data/help/MiniHelp.desktop.ru.fb2
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>FBReader</last-name></author> <book-title>О программе FBReader</book-title> <lang>ru</lang></title-info></description>
+<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>Reader</last-name></author> <book-title>О программе Reader</book-title> <lang>ru</lang></title-info></description>
 <body>
-<title><p>О программе FBReader &FBReaderVersion;</p></title>
-<p>FBReader &#8211; программа для чтения электронных книг, работающая под операционными системами Linux, FreeBSD, Windows XP. FBReader позволяет читать книги во многих форматах: <code>ePub</code>, <code>fb2</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, и&#160;т.&#160;д. Файлы можно читать напрямую из архивов <code>zip</code>, <code>tar</code>, <code>gzip</code> и <code>bzip2</code>.</p>
-<p>FBReader распространяется свободно, включая исходные тексты, под лицензией <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>.</p>
+<title><p>О программе Reader &ReaderVersion;</p></title>
+<p>Reader &#8211; программа для чтения электронных книг, работающая под операционными системами Linux, FreeBSD, Windows XP. Reader позволяет читать книги во многих форматах: <code>ePub</code>, <code>fb2</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, и&#160;т.&#160;д. Файлы можно читать напрямую из архивов <code>zip</code>, <code>tar</code>, <code>gzip</code> и <code>bzip2</code>.</p>
+<p>Reader распространяется свободно, включая исходные тексты, под лицензией <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>.</p>
 <empty-line/>
 <subtitle><p>С чего начать</p></subtitle>
-<p>FBReader автоматически собирает в библиотеку файлы форматов <code>ePub</code>, <code>fb2</code> и <code>OpenReader</code>, лежащие в каталогах, заданных параметром <code>&#171;Каталоги с книгами&#187;</code>. Поэтому прежде всего нужно определить этот параметр. Откройте диалог настроек (нажмите на кнопку <image l:href="#settings.png" voffset="-6"/>) и отредактруйте <code>&#171;каталоги с книгами&#187;</code> в разделе <code>&#171;Библиотека&#187;</code>. Каталоги перечисляются через двоеточие, в этих каталогах должны лежать файлы с расширениями <code>epub</code>, <code>fb2</code> или <code>orb</code>, или содержащие их архивы.</p>
+<p>Reader автоматически собирает в библиотеку файлы форматов <code>ePub</code>, <code>fb2</code> и <code>OpenReader</code>, лежащие в каталогах, заданных параметром <code>&#171;Каталоги с книгами&#187;</code>. Поэтому прежде всего нужно определить этот параметр. Откройте диалог настроек (нажмите на кнопку <image l:href="#settings.png" voffset="-6"/>) и отредактруйте <code>&#171;каталоги с книгами&#187;</code> в разделе <code>&#171;Библиотека&#187;</code>. Каталоги перечисляются через двоеточие, в этих каталогах должны лежать файлы с расширениями <code>epub</code>, <code>fb2</code> или <code>orb</code>, или содержащие их архивы.</p>
 <p>Теперь откройте <code>библиотеку</code> (нажмите на <image l:href="#books.png" voffset="-6"/>), выберите книгу, и приступайте к чтению.</p>
 <p>Чтобы читать книгу в другом формате, ее нужно вручную добавить в библиотеку. Запустите <code>диалог добавления книги</code> (<image l:href="#addbook.png"/>), выберите файл и отредактируйте информацию о книге. В следующий раз вы сможете открыть эту книгу уже с помощью <code>библиотеки</code> (<image l:href="#books.png" voffset="-6"/>).</p>
 <empty-line/>
 <subtitle><p>Ссылки</p></subtitle>
-<p>Информацию об FBReader'е и свежую версию программы можно найти на <a l:href="http://www.fbreader.org">сайте FBReader'а</a>.</p>
-<p>Если вы хотите получать сообщения о новых версиях, подпишитесь на <a l:href="http://freshmeat.net/projects/fbreader">проект FBReader на freshmeat</a>.</p>
-<p>Чтобы связаться с авторами программы, воспользуйтесь <a l:href="http://groups.google.com/group/fbreader">группой FBReader на googlegroups</a>.</p>
+<p>Информацию об Reader'е и свежую версию программы можно найти на <a l:href="http://www.fbreader.org">сайте Reader'а</a>.</p>
+<p>Если вы хотите получать сообщения о новых версиях, подпишитесь на <a l:href="http://freshmeat.net/projects/fbreader">проект Reader на freshmeat</a>.</p>
+<p>Чтобы связаться с авторами программы, воспользуйтесь <a l:href="http://groups.google.com/group/fbreader">группой Reader на googlegroups</a>.</p>
 </body>
 <binary content-type="image/png" id="settings.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
diff --git a/fbreader/data/help/MiniHelp.desktop.sv.fb2 b/reader/data/help/MiniHelp.desktop.sv.fb2
index d6f0023..730a27a 100644
--- a/fbreader/data/help/MiniHelp.desktop.sv.fb2
+++ b/reader/data/help/MiniHelp.desktop.sv.fb2
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>FBReader</last-name></author> <book-title>Om FBReader</book-title> <lang>sv</lang></title-info></description>
+<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>Reader</last-name></author> <book-title>Om Reader</book-title> <lang>sv</lang></title-info></description>
 <body>
-<title><p>Om FBReader &FBReaderVersion;</p></title>
-<p>FBReader är en e-boksläsare för Linux/Windows XP PDA/UMPC/skrivbordsdator. FBReader har stöd för flera e-boksformat: <code>ePub</code>, <code>fb2</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, etc. Direktläsning från arkivformaten <code>zip</code>, <code>tar</code>, <code>gzip</code> och <code>bzip2</code> stöds också.</p>
-<p>FBReader distribueras under villkoren för <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>.</p>
+<title><p>Om Reader &ReaderVersion;</p></title>
+<p>Reader är en e-boksläsare för Linux/Windows XP PDA/UMPC/skrivbordsdator. Reader har stöd för flera e-boksformat: <code>ePub</code>, <code>fb2</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, etc. Direktläsning från arkivformaten <code>zip</code>, <code>tar</code>, <code>gzip</code> och <code>bzip2</code> stöds också.</p>
+<p>Reader distribueras under villkoren för <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>.</p>
 <empty-line/>
 <subtitle><p>Hur man kommer igång</p></subtitle>
-<p>FBReader letar efter böcker i formaten <code>ePub</code>, <code>fb2</code> och <code>OpenReader</code> i kataloger som listas i alternativet <code>Boksökväg</code>. Först måste du ange denna sökväg. Öppna alternativdialogrutan (klicka helt enkelt på <image l:href="#settings.png" voffset="-6"/> i verktygsraden) och ändra värdet för alternativet <code>Boksökväg</code> under fliken <code>Bibliotek</code>. Detta alternativ innehåller listan över kataloger som innehåller <code>*.epub</code>, <code>*.fb2</code>, <code>*.orb</code> eller arkivfiler. Kataloger i listan separeras med kolon.</p>
+<p>Reader letar efter böcker i formaten <code>ePub</code>, <code>fb2</code> och <code>OpenReader</code> i kataloger som listas i alternativet <code>Boksökväg</code>. Först måste du ange denna sökväg. Öppna alternativdialogrutan (klicka helt enkelt på <image l:href="#settings.png" voffset="-6"/> i verktygsraden) och ändra värdet för alternativet <code>Boksökväg</code> under fliken <code>Bibliotek</code>. Detta alternativ innehåller listan över kataloger som innehåller <code>*.epub</code>, <code>*.fb2</code>, <code>*.orb</code> eller arkivfiler. Kataloger i listan separeras med kolon.</p>
 <p>Öppna <code>biblioteket</code> (klicka på <image l:href="#books.png" voffset="-6"/>), välj en bok från listan och läs den.</p>
 <p>För att läsa en fil i ett annat format måste du lägga till den till biblioteket. Starta <code>Lägg till i biblioteket</code> (<image l:href="#addbook.png"/>), välj en fil och redigera filinformationen. Nästa gång så kan du öppna denna fil med <code>biblioteket</code> (<image l:href="#books.png" voffset="-6"/>).</p>
 <empty-line/>
 <subtitle><p>Relaterade webbplatser</p></subtitle>
-<p>Mer information om det här programmet kan hittas på <a l:href="http://www.fbreader.org">FBReaders webbplats</a>.</p>
-<p>Om du vill bli informerad om nya utgåvor kan du prenumerera på <a l:href="http://freshmeat.net/projects/fbreader">FBReaders projektsida på Freshmeat</a>.</p>
-<p>Om du har några frågor eller förslag kan du använda <a l:href="http://groups.google.com/group/fbreader">FBReaders grupp hos Google Groups</a>.</p>
+<p>Mer information om det här programmet kan hittas på <a l:href="http://www.fbreader.org">Readers webbplats</a>.</p>
+<p>Om du vill bli informerad om nya utgåvor kan du prenumerera på <a l:href="http://freshmeat.net/projects/fbreader">Readers projektsida på Freshmeat</a>.</p>
+<p>Om du har några frågor eller förslag kan du använda <a l:href="http://groups.google.com/group/fbreader">Readers grupp hos Google Groups</a>.</p>
 </body>
 <binary content-type="image/png" id="settings.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
diff --git a/fbreader/data/help/MiniHelp.desktop.uk.fb2 b/reader/data/help/MiniHelp.desktop.uk.fb2
index c4cd7c4..754a000 100644
--- a/fbreader/data/help/MiniHelp.desktop.uk.fb2
+++ b/reader/data/help/MiniHelp.desktop.uk.fb2
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>FBReader</last-name></author> <book-title>Про програму FBReader</book-title> <lang>uk</lang></title-info></description>
+<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>Reader</last-name></author> <book-title>Про програму Reader</book-title> <lang>uk</lang></title-info></description>
 <body>
-<title><p>Про програму FBReader &FBReaderVersion;</p></title>
-<p>FBReader &#8211; програма для читання електронних книг, яка працює під операційними системами Linux, FreeBSD, Windows XP. FBReader дозволяє читати книги у багатьох форматах: <code>ePub</code>, <code>fb2</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, і&#160;т.&#160;д. Файли можна читати напряму з архівів <code>zip</code>, <code>tar</code>, <code>gzip</code> та <code>bzip2</code>.</p>
-<p>FBReader поширюється вільно, разом з джерельними текстами, під лицензією <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>.</p>
+<title><p>Про програму Reader &ReaderVersion;</p></title>
+<p>Reader &#8211; програма для читання електронних книг, яка працює під операційними системами Linux, FreeBSD, Windows XP. Reader дозволяє читати книги у багатьох форматах: <code>ePub</code>, <code>fb2</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, і&#160;т.&#160;д. Файли можна читати напряму з архівів <code>zip</code>, <code>tar</code>, <code>gzip</code> та <code>bzip2</code>.</p>
+<p>Reader поширюється вільно, разом з джерельними текстами, під лицензією <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>.</p>
 <empty-line/>
 <subtitle><p>З чого почати</p></subtitle>
-<p>FBReader автоматично збирає у бібліотеку файли форматів <code>ePub</code>, <code>fb2</code> та <code>OpenReader</code>, що лежать у каталогах, які задані параметром <code>&#8220;Каталоги з книгами&#8221;</code>. Тому передусім треба визначити цей параметр. Відкрийте діалог налаштувань (натисніть на кнопку <image l:href="#settings.png" voffset="-6"/>) і відредагуйте <code>&#8220;каталоги з книгами&#8221;</code> у розділі <code>&#8220;Бібліотека&#8221;</code>. Каталоги перелічуються через двокрапку i повинні містити файли з розширеннями <code>epub</code>, <code>fb2</code> або <code>orb</code>, чи архіви, що їх містять.</p>
+<p>Reader автоматично збирає у бібліотеку файли форматів <code>ePub</code>, <code>fb2</code> та <code>OpenReader</code>, що лежать у каталогах, які задані параметром <code>&#8220;Каталоги з книгами&#8221;</code>. Тому передусім треба визначити цей параметр. Відкрийте діалог налаштувань (натисніть на кнопку <image l:href="#settings.png" voffset="-6"/>) і відредагуйте <code>&#8220;каталоги з книгами&#8221;</code> у розділі <code>&#8220;Бібліотека&#8221;</code>. Каталоги перелічуються через двокрапку i повинні містити файли з розширеннями <code>epub</code>, <code>fb2</code> або <code>orb</code>, чи архіви, що їх містять.</p>
 <p>Тепер відкрийте <code>бібліотеку</code> (натисніть на <image l:href="#books.png" voffset="-6"/>), виберіть книгу і починайте читати.</p>
 <p>Щоб читати книгу у іншому форматі, її потрібно вручну додати у бібліотеку. Запустіть <code>діалог додавання книги</code> (<image l:href="#addbook.png"/>), виберіть файл і відредагуйте інформацію про книгу. Наступного разу ви зможете відкрити цю книгу вже за допомогою <code>бібліотеки</code> (<image l:href="#books.png" voffset="-6"/>).</p>
 <empty-line/>
 <subtitle><p>Посилання</p></subtitle>
-<p>Інформацію про FBReader та нову версію програми можна знайти на <a l:href="http://www.fbreader.org">сайтi FBReader'у</a>.</p>
-<p>Якщо ви бажаєте отримувати повідомлення про нові версії, підпишіться на <a l:href="http://freshmeat.net/projects/fbreader">проект FBReader на freshmeat</a>.</p>
-<p>Для зв'язку з авторами програми скористуйтесь <a l:href="http://groups.google.com/group/fbreader">групою FBReader на googlegroups</a>.</p>
+<p>Інформацію про Reader та нову версію програми можна знайти на <a l:href="http://www.fbreader.org">сайтi Reader'у</a>.</p>
+<p>Якщо ви бажаєте отримувати повідомлення про нові версії, підпишіться на <a l:href="http://freshmeat.net/projects/fbreader">проект Reader на freshmeat</a>.</p>
+<p>Для зв'язку з авторами програми скористуйтесь <a l:href="http://groups.google.com/group/fbreader">групою Reader на googlegroups</a>.</p>
 </body>
 <binary content-type="image/png" id="settings.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
diff --git a/fbreader/data/help/MiniHelp.desktop.vi.fb2 b/reader/data/help/MiniHelp.desktop.vi.fb2
index 7206485..2d00abe 100644
--- a/fbreader/data/help/MiniHelp.desktop.vi.fb2
+++ b/reader/data/help/MiniHelp.desktop.vi.fb2
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>FBReader</last-name></author> <book-title>About FBReader</book-title> <lang>vi</lang></title-info></description>
+<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>Reader</last-name></author> <book-title>About Reader</book-title> <lang>vi</lang></title-info></description>
 <body>
-<title><p>Về FBreader &FBReaderVersion;</p></title><p><code>(Dịch sang Tiếng Việt bởi Phạm Văn Hùng_Firestork (Có thể không chính xác 
+<title><p>Về FBreader &ReaderVersion;</p></title><p><code>(Dịch sang Tiếng Việt bởi Phạm Văn Hùng_Firestork (Có thể không chính xác 
 100% do trình độ người dịch có hạn. Nếu muốn hiểu kĩ làm ơn đọc bản tiếng Nga 
 hoặc tiếng Anh))</code> </p><empty-line/>
 <empty-line/>
-<p>FBReader là một chương trình đọc sách điện tử dành cho máy tính để bàn 
-Linux/Windows XP PDA/UMPC. FBReader hỗ trợ nhiều định dạng sách điện tử: 
+<p>Reader là một chương trình đọc sách điện tử dành cho máy tính để bàn 
+Linux/Windows XP PDA/UMPC. Reader hỗ trợ nhiều định dạng sách điện tử: 
 <code>ePub</code>, <code>fb2</code>, <code>chm</code>, <code>rtf</code>, 
 <code>plucker</code>, v...v. Việc đọc trực tiếp từ các định dạng nén 
 <code>zip</code>, <code>tar</code>, <code>gzip</code> và <code>bzip2</code> cũng 
 được hỗ trợ.</p>
-<p>FBReader được phân phối dưới điều khoản của giấy phép <a 
+<p>Reader được phân phối dưới điều khoản của giấy phép <a 
 l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>. </p>
 <p>Nếu bạn thích chương trình này và mong muốn hỗ trợ sự phát triển của nó, làm 
 ơn ghé thăm trang <a l:href="http://www.fbreader.org/donation/make.php"> hỗ trợ 
 tài chính</a> .</p>
 <empty-line/>
 <subtitle><p>Bắt đầu như thế nào?</p></subtitle>
-<p>FBReader tìm kiếm các sách định dạng <code>ePub</code>, <code>fb2</code> và 
+<p>Reader tìm kiếm các sách định dạng <code>ePub</code>, <code>fb2</code> và 
 <code>OpenReader</code> trong các thư mục được lên danh sách tại tùy chọn 
 <code>Đường dẫn Sách</code>. Đầu tiên bạn cần đặt đường dẫn này. Mở hộp tùy 
 chỉnh (click vào <image l:href="#settings.png" voffset="-6"/> trên thanh công 
@@ -35,12 +35,12 @@ viện</code> (<image l:href="#books.png" voffset="-6"/>) để mở tập tin n
 <empty-line/>
 <subtitle><p>Những trang Web liên quan</p></subtitle>
 <p>Bạn có thể tìm thêm thông tin về chương trình này tại <a 
-l:href="http://www.fbreader.org"> trang chủ của FBReader </a>.</p>
+l:href="http://www.fbreader.org"> trang chủ của Reader </a>.</p>
 <p>Nếu bạn muốn được thông báo về những bản phát hành mới, vui lòng đăng kí tại 
-<a l:href="http://freshmeat.net/projects/fbreader">dự án FBReader tại 
+<a l:href="http://freshmeat.net/projects/fbreader">dự án Reader tại 
 freshmeat</a>.</p>
 <p>Nếu bạn có bất kỳ câu hỏi hay lời đề nghị nào, vui lòng sử dụng <a 
-l:href="http://groups.google.com/group/fbreader">FBReader group tại 
+l:href="http://groups.google.com/group/fbreader">Reader group tại 
 googlegroups</a>.</p>
 
 </body>
diff --git a/fbreader/data/help/MiniHelp.desktop.zh.fb2 b/reader/data/help/MiniHelp.desktop.zh.fb2
index 9ccfdab..6795b77 100644
--- a/fbreader/data/help/MiniHelp.desktop.zh.fb2
+++ b/reader/data/help/MiniHelp.desktop.zh.fb2
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>FBReader</last-name></author> <book-title>关于 FBReader</book-title> <lang>zh</lang></title-info></description>
+<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>Reader</last-name></author> <book-title>关于 Reader</book-title> <lang>zh</lang></title-info></description>
 <body>
-<title><p>关于 FBReader &FBReaderVersion;</p></title>
-<p>FBReader是一款基于Linux/Windows XP PDA/UMPC/台式电脑的电子书阅读软件，它支持多种电子书格式，如<code>ePub</code>，<code>fb2</code>，<code>chm</code>， <code>rtf</code>，<code>plucker</code>等，也支持直接阅读<code>zip</code>， <code>tar</code>， <code>gzip</code>，<code>bzip2</code>存档格式的文件。</p>
-<p>FBReader采用<a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>条款发布。</p>
-<p>如果你喜欢FBReader并愿意支持它的发展，请访问“<a l:href="http://www.fbreader.org/donation/make.php">捐赠页面</a>”。</p>
+<title><p>关于 Reader &ReaderVersion;</p></title>
+<p>Reader是一款基于Linux/Windows XP PDA/UMPC/台式电脑的电子书阅读软件，它支持多种电子书格式，如<code>ePub</code>，<code>fb2</code>，<code>chm</code>， <code>rtf</code>，<code>plucker</code>等，也支持直接阅读<code>zip</code>， <code>tar</code>， <code>gzip</code>，<code>bzip2</code>存档格式的文件。</p>
+<p>Reader采用<a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>条款发布。</p>
+<p>如果你喜欢Reader并愿意支持它的发展，请访问“<a l:href="http://www.fbreader.org/donation/make.php">捐赠页面</a>”。</p>
 <empty-line/>
 <subtitle><p>怎么使用</p></subtitle>
-<p>FBReader会自动在 图书路径 设置选项中的目录里面寻找 <code>ePub</code>、<code>fb2</code>和<code>OpenReader</code>格式的书。</p>
+<p>Reader会自动在 图书路径 设置选项中的目录里面寻找 <code>ePub</code>、<code>fb2</code>和<code>OpenReader</code>格式的书。</p>
 <p>因此，你要做的第一件事情是设置这个 图书路径。打开设置选项对话框（点击工具栏上<image l:href="#settings.png" voffset="-6"/>按钮），修改书库选项卡下的图书路径。它可以包含多个含有<code>*.epub</code>， <code>*.fb2</code>，<code>*.orb</code>等格式文件的目录，列表中的目录用分号隔开。</p>
 <p>打开书库（单击<image l:href="#books.png" voffset="-6"/>），从书目列表中选择一本书阅读。</p>
 <p>要阅读其他格式的电子书，你需要单独把它添加到书库中。打开添加到书库的对话框（<image l:href="#addbook.png" voffset="-6"/>），选择一个文件，编辑文件信息。下次你就可以使用书库来打开此文件了（<image l:href="#books.png" voffset="-6"/>）。</p>
 <empty-line/>
 <subtitle><p>相关网站</p></subtitle>
-<p>更多有关FBReader的信息可以在<a l:href="http://www.fbreader.org">FBReader网站</a>查阅到。</p>
-<p>如果您想知道FBReader的最新版本信息，请订阅<a l:href="http://freshmeat.net/projects/fbreader">FBReader project at freshmeat</a>。</p>
-<p>如果您有任何的问题或建议，请使用googlegroups中的“<a l:href="http://groups.google.com/group/fbreader">FBReader group</a>”。</p>
+<p>更多有关Reader的信息可以在<a l:href="http://www.fbreader.org">Reader网站</a>查阅到。</p>
+<p>如果您想知道Reader的最新版本信息，请订阅<a l:href="http://freshmeat.net/projects/fbreader">Reader project at freshmeat</a>。</p>
+<p>如果您有任何的问题或建议，请使用googlegroups中的“<a l:href="http://groups.google.com/group/fbreader">Reader group</a>”。</p>
 </body>
 <binary content-type="image/png" id="settings.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
diff --git a/fbreader/data/icons/application/16x16.png b/reader/data/icons/application/16x16.png
index 42baa62..42baa62 100644
--- a/fbreader/data/icons/application/16x16.png
+++ b/reader/data/icons/application/16x16.png
diff --git a/fbreader/data/icons/application/26x26.png b/reader/data/icons/application/26x26.png
index c0b254b..c0b254b 100644
--- a/fbreader/data/icons/application/26x26.png
+++ b/reader/data/icons/application/26x26.png
diff --git a/fbreader/data/icons/application/32x24.png b/reader/data/icons/application/32x24.png
index 9b353ee..9b353ee 100644
--- a/fbreader/data/icons/application/32x24.png
+++ b/reader/data/icons/application/32x24.png
diff --git a/fbreader/data/icons/application/32x32.png b/reader/data/icons/application/32x32.png
index 7c5ad30..7c5ad30 100644
--- a/fbreader/data/icons/application/32x32.png
+++ b/reader/data/icons/application/32x32.png
diff --git a/fbreader/data/icons/application/48x48.png b/reader/data/icons/application/48x48.png
index d1b42d0..d1b42d0 100644
--- a/fbreader/data/icons/application/48x48.png
+++ b/reader/data/icons/application/48x48.png
diff --git a/fbreader/data/icons/application/64x43.png b/reader/data/icons/application/64x43.png
index 1c117e7..1c117e7 100644
--- a/fbreader/data/icons/application/64x43.png
+++ b/reader/data/icons/application/64x43.png
diff --git a/fbreader/data/icons/application/64x64.png b/reader/data/icons/application/64x64.png
index 4fa52c4..4fa52c4 100644
--- a/fbreader/data/icons/application/64x64.png
+++ b/reader/data/icons/application/64x64.png
diff --git a/fbreader/data/icons/application/FBReader.icns b/reader/data/icons/application/Reader.icns
index 95de917..95de917 100644
--- a/fbreader/data/icons/application/FBReader.icns
+++ b/reader/data/icons/application/Reader.icns
diff --git a/fbreader/data/icons/application/desktop.png b/reader/data/icons/application/desktop.png
index b463b00..b463b00 120000
--- a/fbreader/data/icons/application/desktop.png
+++ b/reader/data/icons/application/desktop.png
diff --git a/fbreader/data/icons/back_button.png b/reader/data/icons/back_button.png
index aea6df8..aea6df8 100755
--- a/fbreader/data/icons/back_button.png
+++ b/reader/data/icons/back_button.png
diff --git a/fbreader/data/icons/back_button_disabled.png b/reader/data/icons/back_button_disabled.png
index babd3c4..babd3c4 100755
--- a/fbreader/data/icons/back_button_disabled.png
+++ b/reader/data/icons/back_button_disabled.png
diff --git a/fbreader/data/icons/booktree/22x22-transparent-png/tree-authorinfo.png b/reader/data/icons/booktree/22x22-transparent-png/tree-authorinfo.png
index 6dc0485..6dc0485 100644
--- a/fbreader/data/icons/booktree/22x22-transparent-png/tree-authorinfo.png
+++ b/reader/data/icons/booktree/22x22-transparent-png/tree-authorinfo.png
diff --git a/fbreader/data/icons/booktree/22x22-transparent-png/tree-bookinfo.png b/reader/data/icons/booktree/22x22-transparent-png/tree-bookinfo.png
index d9949ea..d9949ea 100644
--- a/fbreader/data/icons/booktree/22x22-transparent-png/tree-bookinfo.png
+++ b/reader/data/icons/booktree/22x22-transparent-png/tree-bookinfo.png
diff --git a/fbreader/data/icons/booktree/22x22-transparent-png/tree-download-demo.png b/reader/data/icons/booktree/22x22-transparent-png/tree-download-demo.png
index 91ed9f2..91ed9f2 100644
--- a/fbreader/data/icons/booktree/22x22-transparent-png/tree-download-demo.png
+++ b/reader/data/icons/booktree/22x22-transparent-png/tree-download-demo.png
diff --git a/fbreader/data/icons/booktree/22x22-transparent-png/tree-download-epub.png b/reader/data/icons/booktree/22x22-transparent-png/tree-download-epub.png
index a23e6aa..a23e6aa 100644
--- a/fbreader/data/icons/booktree/22x22-transparent-png/tree-download-epub.png
+++ b/reader/data/icons/booktree/22x22-transparent-png/tree-download-epub.png
diff --git a/fbreader/data/icons/booktree/22x22-transparent-png/tree-download-fb2.png b/reader/data/icons/booktree/22x22-transparent-png/tree-download-fb2.png
index 7c19f1e..7c19f1e 100644
--- a/fbreader/data/icons/booktree/22x22-transparent-png/tree-download-fb2.png
+++ b/reader/data/icons/booktree/22x22-transparent-png/tree-download-fb2.png
diff --git a/fbreader/data/icons/booktree/22x22-transparent-png/tree-download-mobi.png b/reader/data/icons/booktree/22x22-transparent-png/tree-download-mobi.png
index 9282d6d..9282d6d 100644
--- a/fbreader/data/icons/booktree/22x22-transparent-png/tree-download-mobi.png
+++ b/reader/data/icons/booktree/22x22-transparent-png/tree-download-mobi.png
diff --git a/fbreader/data/icons/booktree/22x22-transparent-png/tree-local-demo.png b/reader/data/icons/booktree/22x22-transparent-png/tree-local-demo.png
index 3cbdda9..3cbdda9 100644
--- a/fbreader/data/icons/booktree/22x22-transparent-png/tree-local-demo.png
+++ b/reader/data/icons/booktree/22x22-transparent-png/tree-local-demo.png
diff --git a/fbreader/data/icons/booktree/22x22-transparent-png/tree-local-epub.png b/reader/data/icons/booktree/22x22-transparent-png/tree-local-epub.png
index d36c7c9..d36c7c9 100644
--- a/fbreader/data/icons/booktree/22x22-transparent-png/tree-local-epub.png
+++ b/reader/data/icons/booktree/22x22-transparent-png/tree-local-epub.png
diff --git a/fbreader/data/icons/booktree/22x22-transparent-png/tree-local-fb2.png b/reader/data/icons/booktree/22x22-transparent-png/tree-local-fb2.png
index 212c446..212c446 100644
--- a/fbreader/data/icons/booktree/22x22-transparent-png/tree-local-fb2.png
+++ b/reader/data/icons/booktree/22x22-transparent-png/tree-local-fb2.png
diff --git a/fbreader/data/icons/booktree/22x22-transparent-png/tree-local-mobi.png b/reader/data/icons/booktree/22x22-transparent-png/tree-local-mobi.png
index 11bc581..11bc581 100644
--- a/fbreader/data/icons/booktree/22x22-transparent-png/tree-local-mobi.png
+++ b/reader/data/icons/booktree/22x22-transparent-png/tree-local-mobi.png
diff --git a/fbreader/data/icons/booktree/22x22-transparent-png/tree-open-in-browser.png b/reader/data/icons/booktree/22x22-transparent-png/tree-open-in-browser.png
index 83fc6a0..83fc6a0 100644
--- a/fbreader/data/icons/booktree/22x22-transparent-png/tree-open-in-browser.png
+++ b/reader/data/icons/booktree/22x22-transparent-png/tree-open-in-browser.png
diff --git a/fbreader/data/icons/booktree/22x22-transparent-png/tree-order-series.png b/reader/data/icons/booktree/22x22-transparent-png/tree-order-series.png
index bf9db9b..bf9db9b 100644
--- a/fbreader/data/icons/booktree/22x22-transparent-png/tree-order-series.png
+++ b/reader/data/icons/booktree/22x22-transparent-png/tree-order-series.png
diff --git a/fbreader/data/icons/booktree/22x22-transparent-png/tree-purchase.png b/reader/data/icons/booktree/22x22-transparent-png/tree-purchase.png
index 6d9af32..6d9af32 100644
--- a/fbreader/data/icons/booktree/22x22-transparent-png/tree-purchase.png
+++ b/reader/data/icons/booktree/22x22-transparent-png/tree-purchase.png
diff --git a/fbreader/data/icons/booktree/22x22-transparent-png/tree-removebook.png b/reader/data/icons/booktree/22x22-transparent-png/tree-removebook.png
index 9b73cb6..9b73cb6 100644
--- a/fbreader/data/icons/booktree/22x22-transparent-png/tree-removebook.png
+++ b/reader/data/icons/booktree/22x22-transparent-png/tree-removebook.png
diff --git a/fbreader/data/icons/booktree/22x22-transparent-png/tree-removetag.png b/reader/data/icons/booktree/22x22-transparent-png/tree-removetag.png
index 5154445..5154445 100644
--- a/fbreader/data/icons/booktree/22x22-transparent-png/tree-removetag.png
+++ b/reader/data/icons/booktree/22x22-transparent-png/tree-removetag.png
diff --git a/fbreader/data/icons/booktree/22x22-transparent-png/tree-strut.png b/reader/data/icons/booktree/22x22-transparent-png/tree-strut.png
index 54ac724..54ac724 100644
--- a/fbreader/data/icons/booktree/22x22-transparent-png/tree-strut.png
+++ b/reader/data/icons/booktree/22x22-transparent-png/tree-strut.png
diff --git a/fbreader/data/icons/booktree/22x22-transparent-png/tree-taginfo.png b/reader/data/icons/booktree/22x22-transparent-png/tree-taginfo.png
index 982f154..982f154 100644
--- a/fbreader/data/icons/booktree/22x22-transparent-png/tree-taginfo.png
+++ b/reader/data/icons/booktree/22x22-transparent-png/tree-taginfo.png
diff --git a/fbreader/data/icons/booktree/28x28-transparent-png/tree-authorinfo.png b/reader/data/icons/booktree/28x28-transparent-png/tree-authorinfo.png
index 1c56ba9..1c56ba9 100644
--- a/fbreader/data/icons/booktree/28x28-transparent-png/tree-authorinfo.png
+++ b/reader/data/icons/booktree/28x28-transparent-png/tree-authorinfo.png
diff --git a/fbreader/data/icons/booktree/28x28-transparent-png/tree-bookinfo.png b/reader/data/icons/booktree/28x28-transparent-png/tree-bookinfo.png
index fa6b0f2..fa6b0f2 100644
--- a/fbreader/data/icons/booktree/28x28-transparent-png/tree-bookinfo.png
+++ b/reader/data/icons/booktree/28x28-transparent-png/tree-bookinfo.png
diff --git a/fbreader/data/icons/booktree/28x28-transparent-png/tree-download-epub.png b/reader/data/icons/booktree/28x28-transparent-png/tree-download-epub.png
index cc83f5a..cc83f5a 100644
--- a/fbreader/data/icons/booktree/28x28-transparent-png/tree-download-epub.png
+++ b/reader/data/icons/booktree/28x28-transparent-png/tree-download-epub.png
diff --git a/fbreader/data/icons/booktree/28x28-transparent-png/tree-download-fb2.png b/reader/data/icons/booktree/28x28-transparent-png/tree-download-fb2.png
index 0b63cb3..0b63cb3 100644
--- a/fbreader/data/icons/booktree/28x28-transparent-png/tree-download-fb2.png
+++ b/reader/data/icons/booktree/28x28-transparent-png/tree-download-fb2.png
diff --git a/fbreader/data/icons/booktree/28x28-transparent-png/tree-download-mobi.png b/reader/data/icons/booktree/28x28-transparent-png/tree-download-mobi.png
index 7840bc7..7840bc7 100644
--- a/fbreader/data/icons/booktree/28x28-transparent-png/tree-download-mobi.png
+++ b/reader/data/icons/booktree/28x28-transparent-png/tree-download-mobi.png
diff --git a/fbreader/data/icons/booktree/28x28-transparent-png/tree-local-epub.png b/reader/data/icons/booktree/28x28-transparent-png/tree-local-epub.png
index e41c1e1..e41c1e1 100644
--- a/fbreader/data/icons/booktree/28x28-transparent-png/tree-local-epub.png
+++ b/reader/data/icons/booktree/28x28-transparent-png/tree-local-epub.png
diff --git a/fbreader/data/icons/booktree/28x28-transparent-png/tree-local-fb2.png b/reader/data/icons/booktree/28x28-transparent-png/tree-local-fb2.png
index 834f75a..834f75a 100644
--- a/fbreader/data/icons/booktree/28x28-transparent-png/tree-local-fb2.png
+++ b/reader/data/icons/booktree/28x28-transparent-png/tree-local-fb2.png
diff --git a/fbreader/data/icons/booktree/28x28-transparent-png/tree-local-mobi.png b/reader/data/icons/booktree/28x28-transparent-png/tree-local-mobi.png
index aa64a3b..aa64a3b 100644
--- a/fbreader/data/icons/booktree/28x28-transparent-png/tree-local-mobi.png
+++ b/reader/data/icons/booktree/28x28-transparent-png/tree-local-mobi.png
diff --git a/fbreader/data/icons/booktree/28x28-transparent-png/tree-open-in-browser.png b/reader/data/icons/booktree/28x28-transparent-png/tree-open-in-browser.png
index 87d8e7a..87d8e7a 100644
--- a/fbreader/data/icons/booktree/28x28-transparent-png/tree-open-in-browser.png
+++ b/reader/data/icons/booktree/28x28-transparent-png/tree-open-in-browser.png
diff --git a/fbreader/data/icons/booktree/28x28-transparent-png/tree-orderseries.png b/reader/data/icons/booktree/28x28-transparent-png/tree-orderseries.png
index 026d07a..026d07a 100644
--- a/fbreader/data/icons/booktree/28x28-transparent-png/tree-orderseries.png
+++ b/reader/data/icons/booktree/28x28-transparent-png/tree-orderseries.png
diff --git a/fbreader/data/icons/booktree/28x28-transparent-png/tree-removebook.png b/reader/data/icons/booktree/28x28-transparent-png/tree-removebook.png
index f1fcc5c..f1fcc5c 100644
--- a/fbreader/data/icons/booktree/28x28-transparent-png/tree-removebook.png
+++ b/reader/data/icons/booktree/28x28-transparent-png/tree-removebook.png
diff --git a/fbreader/data/icons/booktree/28x28-transparent-png/tree-removetag.png b/reader/data/icons/booktree/28x28-transparent-png/tree-removetag.png
index 2d0c29f..2d0c29f 100644
--- a/fbreader/data/icons/booktree/28x28-transparent-png/tree-removetag.png
+++ b/reader/data/icons/booktree/28x28-transparent-png/tree-removetag.png
diff --git a/fbreader/data/icons/booktree/28x28-transparent-png/tree-strut.png b/reader/data/icons/booktree/28x28-transparent-png/tree-strut.png
index 6e05713..6e05713 100644
--- a/fbreader/data/icons/booktree/28x28-transparent-png/tree-strut.png
+++ b/reader/data/icons/booktree/28x28-transparent-png/tree-strut.png
diff --git a/fbreader/data/icons/booktree/28x28-transparent-png/tree-taginfo.png b/reader/data/icons/booktree/28x28-transparent-png/tree-taginfo.png
index 9dab5ad..9dab5ad 100644
--- a/fbreader/data/icons/booktree/28x28-transparent-png/tree-taginfo.png
+++ b/reader/data/icons/booktree/28x28-transparent-png/tree-taginfo.png
diff --git a/fbreader/data/icons/booktree/desktop b/reader/data/icons/booktree/desktop
index 5524476..5524476 120000
--- a/fbreader/data/icons/booktree/desktop
+++ b/reader/data/icons/booktree/desktop
diff --git a/fbreader/data/icons/booktree/new/booktree-author.png b/reader/data/icons/booktree/new/booktree-author.png
index 2e403d7..2e403d7 100644
--- a/fbreader/data/icons/booktree/new/booktree-author.png
+++ b/reader/data/icons/booktree/new/booktree-author.png
diff --git a/fbreader/data/icons/booktree/new/booktree-book.png b/reader/data/icons/booktree/new/booktree-book.png
index 3082f5a..3082f5a 100644
--- a/fbreader/data/icons/booktree/new/booktree-book.png
+++ b/reader/data/icons/booktree/new/booktree-book.png
diff --git a/fbreader/data/icons/booktree/new/booktree-catalog.png b/reader/data/icons/booktree/new/booktree-catalog.png
index 0b246be..0b246be 100644
--- a/fbreader/data/icons/booktree/new/booktree-catalog.png
+++ b/reader/data/icons/booktree/new/booktree-catalog.png
diff --git a/fbreader/data/icons/booktree/new/booktree-tag.png b/reader/data/icons/booktree/new/booktree-tag.png
index 289b717..289b717 100644
--- a/fbreader/data/icons/booktree/new/booktree-tag.png
+++ b/reader/data/icons/booktree/new/booktree-tag.png
diff --git a/fbreader/data/icons/booktree/new/searchresult.png b/reader/data/icons/booktree/new/searchresult.png
index 92604a0..92604a0 100644
--- a/fbreader/data/icons/booktree/new/searchresult.png
+++ b/reader/data/icons/booktree/new/searchresult.png
diff --git a/fbreader/data/icons/filetree/12x12-png/fb2.png b/reader/data/icons/filetree/12x12-png/fb2.png
index 77d70d4..77d70d4 100644
--- a/fbreader/data/icons/filetree/12x12-png/fb2.png
+++ b/reader/data/icons/filetree/12x12-png/fb2.png
diff --git a/fbreader/data/icons/filetree/12x12-png/folder.png b/reader/data/icons/filetree/12x12-png/folder.png
index f0c1cf8..f0c1cf8 100644
--- a/fbreader/data/icons/filetree/12x12-png/folder.png
+++ b/reader/data/icons/filetree/12x12-png/folder.png
diff --git a/fbreader/data/icons/filetree/12x12-png/html.png b/reader/data/icons/filetree/12x12-png/html.png
index 686ac26..686ac26 100644
--- a/fbreader/data/icons/filetree/12x12-png/html.png
+++ b/reader/data/icons/filetree/12x12-png/html.png
diff --git a/fbreader/data/icons/filetree/12x12-png/mobipocket.png b/reader/data/icons/filetree/12x12-png/mobipocket.png
index 77d70d4..77d70d4 100644
--- a/fbreader/data/icons/filetree/12x12-png/mobipocket.png
+++ b/reader/data/icons/filetree/12x12-png/mobipocket.png
diff --git a/fbreader/data/icons/filetree/12x12-png/oeb.png b/reader/data/icons/filetree/12x12-png/oeb.png
index 77d70d4..77d70d4 100644
--- a/fbreader/data/icons/filetree/12x12-png/oeb.png
+++ b/reader/data/icons/filetree/12x12-png/oeb.png
diff --git a/fbreader/data/icons/filetree/12x12-png/openreader.png b/reader/data/icons/filetree/12x12-png/openreader.png
index 77d70d4..77d70d4 100644
--- a/fbreader/data/icons/filetree/12x12-png/openreader.png
+++ b/reader/data/icons/filetree/12x12-png/openreader.png
diff --git a/fbreader/data/icons/filetree/12x12-png/palm.png b/reader/data/icons/filetree/12x12-png/palm.png
index 77d70d4..77d70d4 100644
--- a/fbreader/data/icons/filetree/12x12-png/palm.png
+++ b/reader/data/icons/filetree/12x12-png/palm.png
diff --git a/fbreader/data/icons/filetree/12x12-png/plucker.png b/reader/data/icons/filetree/12x12-png/plucker.png
index 77d70d4..77d70d4 100644
--- a/fbreader/data/icons/filetree/12x12-png/plucker.png
+++ b/reader/data/icons/filetree/12x12-png/plucker.png
diff --git a/fbreader/data/icons/filetree/12x12-png/rtf.png b/reader/data/icons/filetree/12x12-png/rtf.png
index 77d70d4..77d70d4 100644
--- a/fbreader/data/icons/filetree/12x12-png/rtf.png
+++ b/reader/data/icons/filetree/12x12-png/rtf.png
diff --git a/fbreader/data/icons/filetree/12x12-png/tcr.png b/reader/data/icons/filetree/12x12-png/tcr.png
index 77d70d4..77d70d4 100644
--- a/fbreader/data/icons/filetree/12x12-png/tcr.png
+++ b/reader/data/icons/filetree/12x12-png/tcr.png
diff --git a/fbreader/data/icons/filetree/12x12-png/unknown.png b/reader/data/icons/filetree/12x12-png/unknown.png
index 77d70d4..77d70d4 100644
--- a/fbreader/data/icons/filetree/12x12-png/unknown.png
+++ b/reader/data/icons/filetree/12x12-png/unknown.png
diff --git a/fbreader/data/icons/filetree/12x12-png/upfolder.png b/reader/data/icons/filetree/12x12-png/upfolder.png
index f0c1cf8..f0c1cf8 100644
--- a/fbreader/data/icons/filetree/12x12-png/upfolder.png
+++ b/reader/data/icons/filetree/12x12-png/upfolder.png
diff --git a/fbreader/data/icons/filetree/12x12-png/weasel.png b/reader/data/icons/filetree/12x12-png/weasel.png
index 77d70d4..77d70d4 100644
--- a/fbreader/data/icons/filetree/12x12-png/weasel.png
+++ b/reader/data/icons/filetree/12x12-png/weasel.png
diff --git a/fbreader/data/icons/filetree/12x12-png/zipfolder.png b/reader/data/icons/filetree/12x12-png/zipfolder.png
index 985e826..985e826 100644
--- a/fbreader/data/icons/filetree/12x12-png/zipfolder.png
+++ b/reader/data/icons/filetree/12x12-png/zipfolder.png
diff --git a/fbreader/data/icons/filetree/22x22-transparent-ico/fb2.ico b/reader/data/icons/filetree/22x22-transparent-ico/fb2.ico
index 31d71c6..31d71c6 100644
--- a/fbreader/data/icons/filetree/22x22-transparent-ico/fb2.ico
+++ b/reader/data/icons/filetree/22x22-transparent-ico/fb2.ico
diff --git a/fbreader/data/icons/filetree/22x22-transparent-ico/folder.ico b/reader/data/icons/filetree/22x22-transparent-ico/folder.ico
index b7c3313..b7c3313 100644
--- a/fbreader/data/icons/filetree/22x22-transparent-ico/folder.ico
+++ b/reader/data/icons/filetree/22x22-transparent-ico/folder.ico
diff --git a/fbreader/data/icons/filetree/22x22-transparent-ico/html.ico b/reader/data/icons/filetree/22x22-transparent-ico/html.ico
index 4bda4b7..4bda4b7 100644
--- a/fbreader/data/icons/filetree/22x22-transparent-ico/html.ico
+++ b/reader/data/icons/filetree/22x22-transparent-ico/html.ico
diff --git a/fbreader/data/icons/filetree/22x22-transparent-ico/mobipocket.ico b/reader/data/icons/filetree/22x22-transparent-ico/mobipocket.ico
index 31d71c6..31d71c6 100644
--- a/fbreader/data/icons/filetree/22x22-transparent-ico/mobipocket.ico
+++ b/reader/data/icons/filetree/22x22-transparent-ico/mobipocket.ico
diff --git a/fbreader/data/icons/filetree/22x22-transparent-ico/oeb.ico b/reader/data/icons/filetree/22x22-transparent-ico/oeb.ico
index 31d71c6..31d71c6 100644
--- a/fbreader/data/icons/filetree/22x22-transparent-ico/oeb.ico
+++ b/reader/data/icons/filetree/22x22-transparent-ico/oeb.ico
diff --git a/fbreader/data/icons/filetree/22x22-transparent-ico/openreader.ico b/reader/data/icons/filetree/22x22-transparent-ico/openreader.ico
index 31d71c6..31d71c6 100644
--- a/fbreader/data/icons/filetree/22x22-transparent-ico/openreader.ico
+++ b/reader/data/icons/filetree/22x22-transparent-ico/openreader.ico
diff --git a/fbreader/data/icons/filetree/22x22-transparent-ico/palm.ico b/reader/data/icons/filetree/22x22-transparent-ico/palm.ico
index 31d71c6..31d71c6 100644
--- a/fbreader/data/icons/filetree/22x22-transparent-ico/palm.ico
+++ b/reader/data/icons/filetree/22x22-transparent-ico/palm.ico
diff --git a/fbreader/data/icons/filetree/22x22-transparent-ico/plucker.ico b/reader/data/icons/filetree/22x22-transparent-ico/plucker.ico
index 31d71c6..31d71c6 100644
--- a/fbreader/data/icons/filetree/22x22-transparent-ico/plucker.ico
+++ b/reader/data/icons/filetree/22x22-transparent-ico/plucker.ico
diff --git a/fbreader/data/icons/filetree/22x22-transparent-ico/rtf.ico b/reader/data/icons/filetree/22x22-transparent-ico/rtf.ico
index 31d71c6..31d71c6 100644
--- a/fbreader/data/icons/filetree/22x22-transparent-ico/rtf.ico
+++ b/reader/data/icons/filetree/22x22-transparent-ico/rtf.ico
diff --git a/fbreader/data/icons/filetree/22x22-transparent-ico/tcr.ico b/reader/data/icons/filetree/22x22-transparent-ico/tcr.ico
index 31d71c6..31d71c6 100644
--- a/fbreader/data/icons/filetree/22x22-transparent-ico/tcr.ico
+++ b/reader/data/icons/filetree/22x22-transparent-ico/tcr.ico
diff --git a/fbreader/data/icons/filetree/22x22-transparent-ico/unknown.ico b/reader/data/icons/filetree/22x22-transparent-ico/unknown.ico
index 31d71c6..31d71c6 100644
--- a/fbreader/data/icons/filetree/22x22-transparent-ico/unknown.ico
+++ b/reader/data/icons/filetree/22x22-transparent-ico/unknown.ico
diff --git a/fbreader/data/icons/filetree/22x22-transparent-ico/upfolder.ico b/reader/data/icons/filetree/22x22-transparent-ico/upfolder.ico
index 6f2caf7..6f2caf7 100644
--- a/fbreader/data/icons/filetree/22x22-transparent-ico/upfolder.ico
+++ b/reader/data/icons/filetree/22x22-transparent-ico/upfolder.ico
diff --git a/fbreader/data/icons/filetree/22x22-transparent-ico/weasel.ico b/reader/data/icons/filetree/22x22-transparent-ico/weasel.ico
index 31d71c6..31d71c6 100644
--- a/fbreader/data/icons/filetree/22x22-transparent-ico/weasel.ico
+++ b/reader/data/icons/filetree/22x22-transparent-ico/weasel.ico
diff --git a/fbreader/data/icons/filetree/22x22-transparent-ico/zipfolder.ico b/reader/data/icons/filetree/22x22-transparent-ico/zipfolder.ico
index b9cc03b..b9cc03b 100644
--- a/fbreader/data/icons/filetree/22x22-transparent-ico/zipfolder.ico
+++ b/reader/data/icons/filetree/22x22-transparent-ico/zipfolder.ico
diff --git a/fbreader/data/icons/filetree/22x22-transparent-png/fb2.png b/reader/data/icons/filetree/22x22-transparent-png/fb2.png
index d68a56c..d68a56c 100644
--- a/fbreader/data/icons/filetree/22x22-transparent-png/fb2.png
+++ b/reader/data/icons/filetree/22x22-transparent-png/fb2.png
diff --git a/fbreader/data/icons/filetree/22x22-transparent-png/folder.png b/reader/data/icons/filetree/22x22-transparent-png/folder.png
index 45f71b1..45f71b1 100644
--- a/fbreader/data/icons/filetree/22x22-transparent-png/folder.png
+++ b/reader/data/icons/filetree/22x22-transparent-png/folder.png
diff --git a/fbreader/data/icons/filetree/22x22-transparent-png/html.png b/reader/data/icons/filetree/22x22-transparent-png/html.png
index 51beaff..51beaff 100644
--- a/fbreader/data/icons/filetree/22x22-transparent-png/html.png
+++ b/reader/data/icons/filetree/22x22-transparent-png/html.png
diff --git a/fbreader/data/icons/filetree/22x22-transparent-png/mobipocket.png b/reader/data/icons/filetree/22x22-transparent-png/mobipocket.png
index d68a56c..d68a56c 100644
--- a/fbreader/data/icons/filetree/22x22-transparent-png/mobipocket.png
+++ b/reader/data/icons/filetree/22x22-transparent-png/mobipocket.png
diff --git a/fbreader/data/icons/filetree/22x22-transparent-png/oeb.png b/reader/data/icons/filetree/22x22-transparent-png/oeb.png
index d68a56c..d68a56c 100644
--- a/fbreader/data/icons/filetree/22x22-transparent-png/oeb.png
+++ b/reader/data/icons/filetree/22x22-transparent-png/oeb.png
diff --git a/fbreader/data/icons/filetree/22x22-transparent-png/openreader.png b/reader/data/icons/filetree/22x22-transparent-png/openreader.png
index d68a56c..d68a56c 100644
--- a/fbreader/data/icons/filetree/22x22-transparent-png/openreader.png
+++ b/reader/data/icons/filetree/22x22-transparent-png/openreader.png
diff --git a/fbreader/data/icons/filetree/22x22-transparent-png/palm.png b/reader/data/icons/filetree/22x22-transparent-png/palm.png
index d68a56c..d68a56c 100644
--- a/fbreader/data/icons/filetree/22x22-transparent-png/palm.png
+++ b/reader/data/icons/filetree/22x22-transparent-png/palm.png
diff --git a/fbreader/data/icons/filetree/22x22-transparent-png/plucker.png b/reader/data/icons/filetree/22x22-transparent-png/plucker.png
index d68a56c..d68a56c 100644
--- a/fbreader/data/icons/filetree/22x22-transparent-png/plucker.png
+++ b/reader/data/icons/filetree/22x22-transparent-png/plucker.png
diff --git a/fbreader/data/icons/filetree/22x22-transparent-png/rtf.png b/reader/data/icons/filetree/22x22-transparent-png/rtf.png
index c9baeda..c9baeda 100644
--- a/fbreader/data/icons/filetree/22x22-transparent-png/rtf.png
+++ b/reader/data/icons/filetree/22x22-transparent-png/rtf.png
diff --git a/fbreader/data/icons/filetree/22x22-transparent-png/tcr.png b/reader/data/icons/filetree/22x22-transparent-png/tcr.png
index d68a56c..d68a56c 100644
--- a/fbreader/data/icons/filetree/22x22-transparent-png/tcr.png
+++ b/reader/data/icons/filetree/22x22-transparent-png/tcr.png
diff --git a/fbreader/data/icons/filetree/22x22-transparent-png/unknown.png b/reader/data/icons/filetree/22x22-transparent-png/unknown.png
index d68a56c..d68a56c 100644
--- a/fbreader/data/icons/filetree/22x22-transparent-png/unknown.png
+++ b/reader/data/icons/filetree/22x22-transparent-png/unknown.png
diff --git a/fbreader/data/icons/filetree/22x22-transparent-png/upfolder.png b/reader/data/icons/filetree/22x22-transparent-png/upfolder.png
index 27d1214..27d1214 100644
--- a/fbreader/data/icons/filetree/22x22-transparent-png/upfolder.png
+++ b/reader/data/icons/filetree/22x22-transparent-png/upfolder.png
diff --git a/fbreader/data/icons/filetree/22x22-transparent-png/weasel.png b/reader/data/icons/filetree/22x22-transparent-png/weasel.png
index d68a56c..d68a56c 100644
--- a/fbreader/data/icons/filetree/22x22-transparent-png/weasel.png
+++ b/reader/data/icons/filetree/22x22-transparent-png/weasel.png
diff --git a/fbreader/data/icons/filetree/22x22-transparent-png/zipfolder.png b/reader/data/icons/filetree/22x22-transparent-png/zipfolder.png
index dc76287..dc76287 100644
--- a/fbreader/data/icons/filetree/22x22-transparent-png/zipfolder.png
+++ b/reader/data/icons/filetree/22x22-transparent-png/zipfolder.png
diff --git a/fbreader/data/icons/filetree/32x32-transparent-png/fb2.png b/reader/data/icons/filetree/32x32-transparent-png/fb2.png
index 928a679..928a679 100644
--- a/fbreader/data/icons/filetree/32x32-transparent-png/fb2.png
+++ b/reader/data/icons/filetree/32x32-transparent-png/fb2.png
diff --git a/fbreader/data/icons/filetree/32x32-transparent-png/folder.png b/reader/data/icons/filetree/32x32-transparent-png/folder.png
index 0171b09..0171b09 100644
--- a/fbreader/data/icons/filetree/32x32-transparent-png/folder.png
+++ b/reader/data/icons/filetree/32x32-transparent-png/folder.png
diff --git a/fbreader/data/icons/filetree/32x32-transparent-png/html.png b/reader/data/icons/filetree/32x32-transparent-png/html.png
index a896697..a896697 100644
--- a/fbreader/data/icons/filetree/32x32-transparent-png/html.png
+++ b/reader/data/icons/filetree/32x32-transparent-png/html.png
diff --git a/fbreader/data/icons/filetree/32x32-transparent-png/mobipocket.png b/reader/data/icons/filetree/32x32-transparent-png/mobipocket.png
index 928a679..928a679 100644
--- a/fbreader/data/icons/filetree/32x32-transparent-png/mobipocket.png
+++ b/reader/data/icons/filetree/32x32-transparent-png/mobipocket.png
diff --git a/fbreader/data/icons/filetree/32x32-transparent-png/oeb.png b/reader/data/icons/filetree/32x32-transparent-png/oeb.png
index 928a679..928a679 100644
--- a/fbreader/data/icons/filetree/32x32-transparent-png/oeb.png
+++ b/reader/data/icons/filetree/32x32-transparent-png/oeb.png
diff --git a/fbreader/data/icons/filetree/32x32-transparent-png/openreader.png b/reader/data/icons/filetree/32x32-transparent-png/openreader.png
index 928a679..928a679 100644
--- a/fbreader/data/icons/filetree/32x32-transparent-png/openreader.png
+++ b/reader/data/icons/filetree/32x32-transparent-png/openreader.png
diff --git a/fbreader/data/icons/filetree/32x32-transparent-png/palm.png b/reader/data/icons/filetree/32x32-transparent-png/palm.png
index 928a679..928a679 100644
--- a/fbreader/data/icons/filetree/32x32-transparent-png/palm.png
+++ b/reader/data/icons/filetree/32x32-transparent-png/palm.png
diff --git a/fbreader/data/icons/filetree/32x32-transparent-png/plucker.png b/reader/data/icons/filetree/32x32-transparent-png/plucker.png
index 928a679..928a679 100644
--- a/fbreader/data/icons/filetree/32x32-transparent-png/plucker.png
+++ b/reader/data/icons/filetree/32x32-transparent-png/plucker.png
diff --git a/fbreader/data/icons/filetree/32x32-transparent-png/rtf.png b/reader/data/icons/filetree/32x32-transparent-png/rtf.png
index 928a679..928a679 100644
--- a/fbreader/data/icons/filetree/32x32-transparent-png/rtf.png
+++ b/reader/data/icons/filetree/32x32-transparent-png/rtf.png
diff --git a/fbreader/data/icons/filetree/32x32-transparent-png/tcr.png b/reader/data/icons/filetree/32x32-transparent-png/tcr.png
index 928a679..928a679 100644
--- a/fbreader/data/icons/filetree/32x32-transparent-png/tcr.png
+++ b/reader/data/icons/filetree/32x32-transparent-png/tcr.png
diff --git a/fbreader/data/icons/filetree/32x32-transparent-png/unknown.png b/reader/data/icons/filetree/32x32-transparent-png/unknown.png
index 928a679..928a679 100644
--- a/fbreader/data/icons/filetree/32x32-transparent-png/unknown.png
+++ b/reader/data/icons/filetree/32x32-transparent-png/unknown.png
diff --git a/fbreader/data/icons/filetree/32x32-transparent-png/upfolder.png b/reader/data/icons/filetree/32x32-transparent-png/upfolder.png
index 2fa4b0d..2fa4b0d 100644
--- a/fbreader/data/icons/filetree/32x32-transparent-png/upfolder.png
+++ b/reader/data/icons/filetree/32x32-transparent-png/upfolder.png
diff --git a/fbreader/data/icons/filetree/32x32-transparent-png/weasel.png b/reader/data/icons/filetree/32x32-transparent-png/weasel.png
index 928a679..928a679 100644
--- a/fbreader/data/icons/filetree/32x32-transparent-png/weasel.png
+++ b/reader/data/icons/filetree/32x32-transparent-png/weasel.png
diff --git a/fbreader/data/icons/filetree/32x32-transparent-png/zipfolder.png b/reader/data/icons/filetree/32x32-transparent-png/zipfolder.png
index 4b55b50..4b55b50 100644
--- a/fbreader/data/icons/filetree/32x32-transparent-png/zipfolder.png
+++ b/reader/data/icons/filetree/32x32-transparent-png/zipfolder.png
diff --git a/fbreader/data/icons/filetree/desktop b/reader/data/icons/filetree/desktop
index 5524476..5524476 120000
--- a/fbreader/data/icons/filetree/desktop
+++ b/reader/data/icons/filetree/desktop
diff --git a/fbreader/data/icons/forward_button.png b/reader/data/icons/forward_button.png
index a92d416..a92d416 100644
--- a/fbreader/data/icons/forward_button.png
+++ b/reader/data/icons/forward_button.png
diff --git a/fbreader/data/icons/forward_button_disabled.png b/reader/data/icons/forward_button_disabled.png
index 105cc93..105cc93 100755
--- a/fbreader/data/icons/forward_button_disabled.png
+++ b/reader/data/icons/forward_button_disabled.png
diff --git a/fbreader/data/icons/refresh-icon-1.png b/reader/data/icons/refresh-icon-1.png
index 29659b9..29659b9 100644
--- a/fbreader/data/icons/refresh-icon-1.png
+++ b/reader/data/icons/refresh-icon-1.png
diff --git a/fbreader/data/icons/refresh-icon-2.png b/reader/data/icons/refresh-icon-2.png
index a6bf621..a6bf621 100755
--- a/fbreader/data/icons/refresh-icon-2.png
+++ b/reader/data/icons/refresh-icon-2.png
diff --git a/fbreader/data/icons/refresh-icon.svg b/reader/data/icons/refresh-icon.svg
index 74758be..74758be 100644
--- a/fbreader/data/icons/refresh-icon.svg
+++ b/reader/data/icons/refresh-icon.svg
diff --git a/fbreader/data/icons/search_icon.png b/reader/data/icons/search_icon.png
index 12c8dbd..12c8dbd 100644
--- a/fbreader/data/icons/search_icon.png
+++ b/reader/data/icons/search_icon.png
diff --git a/fbreader/data/icons/spinner.gif b/reader/data/icons/spinner.gif
index 1ed786f..1ed786f 100644
--- a/fbreader/data/icons/spinner.gif
+++ b/reader/data/icons/spinner.gif
diff --git a/fbreader/data/icons/toolbar/14x15-png/addBook.png b/reader/data/icons/toolbar/14x15-png/addBook.png
index 40364ca..40364ca 100644
--- a/fbreader/data/icons/toolbar/14x15-png/addBook.png
+++ b/reader/data/icons/toolbar/14x15-png/addBook.png
diff --git a/fbreader/data/icons/toolbar/14x15-png/bookInfo.png b/reader/data/icons/toolbar/14x15-png/bookInfo.png
index 3def30e..3def30e 100644
--- a/fbreader/data/icons/toolbar/14x15-png/bookInfo.png
+++ b/reader/data/icons/toolbar/14x15-png/bookInfo.png
diff --git a/fbreader/data/icons/toolbar/14x15-png/findNext.png b/reader/data/icons/toolbar/14x15-png/findNext.png
index 022c235..022c235 100644
--- a/fbreader/data/icons/toolbar/14x15-png/findNext.png
+++ b/reader/data/icons/toolbar/14x15-png/findNext.png
diff --git a/fbreader/data/icons/toolbar/14x15-png/findPrevious.png b/reader/data/icons/toolbar/14x15-png/findPrevious.png
index a56aa4b..a56aa4b 100644
--- a/fbreader/data/icons/toolbar/14x15-png/findPrevious.png
+++ b/reader/data/icons/toolbar/14x15-png/findPrevious.png
diff --git a/fbreader/data/icons/toolbar/14x15-png/gotoHome.png b/reader/data/icons/toolbar/14x15-png/gotoHome.png
index bbca77a..bbca77a 100644
--- a/fbreader/data/icons/toolbar/14x15-png/gotoHome.png
+++ b/reader/data/icons/toolbar/14x15-png/gotoHome.png
diff --git a/fbreader/data/icons/toolbar/14x15-png/preferences.png b/reader/data/icons/toolbar/14x15-png/preferences.png
index af981f3..af981f3 100644
--- a/fbreader/data/icons/toolbar/14x15-png/preferences.png
+++ b/reader/data/icons/toolbar/14x15-png/preferences.png
diff --git a/fbreader/data/icons/toolbar/14x15-png/redo.png b/reader/data/icons/toolbar/14x15-png/redo.png
index 1311212..1311212 100644
--- a/fbreader/data/icons/toolbar/14x15-png/redo.png
+++ b/reader/data/icons/toolbar/14x15-png/redo.png
diff --git a/fbreader/data/icons/toolbar/14x15-png/rotate.png b/reader/data/icons/toolbar/14x15-png/rotate.png
index 0a69733..0a69733 100644
--- a/fbreader/data/icons/toolbar/14x15-png/rotate.png
+++ b/reader/data/icons/toolbar/14x15-png/rotate.png
diff --git a/fbreader/data/icons/toolbar/14x15-png/search.png b/reader/data/icons/toolbar/14x15-png/search.png
index b9b735b..b9b735b 100644
--- a/fbreader/data/icons/toolbar/14x15-png/search.png
+++ b/reader/data/icons/toolbar/14x15-png/search.png
diff --git a/fbreader/data/icons/toolbar/14x15-png/showLibrary.png b/reader/data/icons/toolbar/14x15-png/showLibrary.png
index 9a30429..9a30429 100644
--- a/fbreader/data/icons/toolbar/14x15-png/showLibrary.png
+++ b/reader/data/icons/toolbar/14x15-png/showLibrary.png
diff --git a/fbreader/data/icons/toolbar/14x15-png/showReading.png b/reader/data/icons/toolbar/14x15-png/showReading.png
index 5e0f6c3..5e0f6c3 100644
--- a/fbreader/data/icons/toolbar/14x15-png/showReading.png
+++ b/reader/data/icons/toolbar/14x15-png/showReading.png
diff --git a/fbreader/data/icons/toolbar/14x15-png/showRecent.png b/reader/data/icons/toolbar/14x15-png/showRecent.png
index 9165f11..9165f11 100644
--- a/fbreader/data/icons/toolbar/14x15-png/showRecent.png
+++ b/reader/data/icons/toolbar/14x15-png/showRecent.png
diff --git a/fbreader/data/icons/toolbar/14x15-png/toc.png b/reader/data/icons/toolbar/14x15-png/toc.png
index 575f378..575f378 100644
--- a/fbreader/data/icons/toolbar/14x15-png/toc.png
+++ b/reader/data/icons/toolbar/14x15-png/toc.png
diff --git a/fbreader/data/icons/toolbar/14x15-png/undo.png b/reader/data/icons/toolbar/14x15-png/undo.png
index 5e0f6c3..5e0f6c3 100644
--- a/fbreader/data/icons/toolbar/14x15-png/undo.png
+++ b/reader/data/icons/toolbar/14x15-png/undo.png
diff --git a/fbreader/data/icons/toolbar/22x18-png/addBook.png b/reader/data/icons/toolbar/22x18-png/addBook.png
index 7f4f02e..7f4f02e 100644
--- a/fbreader/data/icons/toolbar/22x18-png/addBook.png
+++ b/reader/data/icons/toolbar/22x18-png/addBook.png
diff --git a/fbreader/data/icons/toolbar/22x18-png/bookInfo.png b/reader/data/icons/toolbar/22x18-png/bookInfo.png
index 25eb5cb..25eb5cb 100644
--- a/fbreader/data/icons/toolbar/22x18-png/bookInfo.png
+++ b/reader/data/icons/toolbar/22x18-png/bookInfo.png
diff --git a/fbreader/data/icons/toolbar/22x18-png/findNext.png b/reader/data/icons/toolbar/22x18-png/findNext.png
index 45294b1..45294b1 100644
--- a/fbreader/data/icons/toolbar/22x18-png/findNext.png
+++ b/reader/data/icons/toolbar/22x18-png/findNext.png
diff --git a/fbreader/data/icons/toolbar/22x18-png/findPrevious.png b/reader/data/icons/toolbar/22x18-png/findPrevious.png
index c336d2b..c336d2b 100644
--- a/fbreader/data/icons/toolbar/22x18-png/findPrevious.png
+++ b/reader/data/icons/toolbar/22x18-png/findPrevious.png
diff --git a/fbreader/data/icons/toolbar/22x18-png/gotoHome.png b/reader/data/icons/toolbar/22x18-png/gotoHome.png
index 4ff73d7..4ff73d7 100644
--- a/fbreader/data/icons/toolbar/22x18-png/gotoHome.png
+++ b/reader/data/icons/toolbar/22x18-png/gotoHome.png
diff --git a/fbreader/data/icons/toolbar/22x18-png/preferences.png b/reader/data/icons/toolbar/22x18-png/preferences.png
index 143fb28..143fb28 100644
--- a/fbreader/data/icons/toolbar/22x18-png/preferences.png
+++ b/reader/data/icons/toolbar/22x18-png/preferences.png
diff --git a/fbreader/data/icons/toolbar/22x18-png/redo.png b/reader/data/icons/toolbar/22x18-png/redo.png
index b2f128b..b2f128b 100644
--- a/fbreader/data/icons/toolbar/22x18-png/redo.png
+++ b/reader/data/icons/toolbar/22x18-png/redo.png
diff --git a/fbreader/data/icons/toolbar/22x18-png/rotate.png b/reader/data/icons/toolbar/22x18-png/rotate.png
index 9d4f128..9d4f128 100644
--- a/fbreader/data/icons/toolbar/22x18-png/rotate.png
+++ b/reader/data/icons/toolbar/22x18-png/rotate.png
diff --git a/fbreader/data/icons/toolbar/22x18-png/search.png b/reader/data/icons/toolbar/22x18-png/search.png
index dfd2127..dfd2127 100644
--- a/fbreader/data/icons/toolbar/22x18-png/search.png
+++ b/reader/data/icons/toolbar/22x18-png/search.png
diff --git a/fbreader/data/icons/toolbar/22x18-png/showLibrary.png b/reader/data/icons/toolbar/22x18-png/showLibrary.png
index aa56dcb..aa56dcb 100644
--- a/fbreader/data/icons/toolbar/22x18-png/showLibrary.png
+++ b/reader/data/icons/toolbar/22x18-png/showLibrary.png
diff --git a/fbreader/data/icons/toolbar/22x18-png/showReading.png b/reader/data/icons/toolbar/22x18-png/showReading.png
index fae13ca..fae13ca 100644
--- a/fbreader/data/icons/toolbar/22x18-png/showReading.png
+++ b/reader/data/icons/toolbar/22x18-png/showReading.png
diff --git a/fbreader/data/icons/toolbar/22x18-png/showRecent.png b/reader/data/icons/toolbar/22x18-png/showRecent.png
index 0ffe21f..0ffe21f 100644
--- a/fbreader/data/icons/toolbar/22x18-png/showRecent.png
+++ b/reader/data/icons/toolbar/22x18-png/showRecent.png
diff --git a/fbreader/data/icons/toolbar/22x18-png/toc.png b/reader/data/icons/toolbar/22x18-png/toc.png
index aa9e4c3..aa9e4c3 100644
--- a/fbreader/data/icons/toolbar/22x18-png/toc.png
+++ b/reader/data/icons/toolbar/22x18-png/toc.png
diff --git a/fbreader/data/icons/toolbar/22x18-png/undo.png b/reader/data/icons/toolbar/22x18-png/undo.png
index fae13ca..fae13ca 100644
--- a/fbreader/data/icons/toolbar/22x18-png/undo.png
+++ b/reader/data/icons/toolbar/22x18-png/undo.png
diff --git a/fbreader/data/icons/toolbar/32x32-transparent-ico/addBook.ico b/reader/data/icons/toolbar/32x32-transparent-ico/addBook.ico
index 4d4f007..4d4f007 100644
--- a/fbreader/data/icons/toolbar/32x32-transparent-ico/addBook.ico
+++ b/reader/data/icons/toolbar/32x32-transparent-ico/addBook.ico
diff --git a/fbreader/data/icons/toolbar/32x32-transparent-ico/advancedSearchOnNetwork.ico b/reader/data/icons/toolbar/32x32-transparent-ico/advancedSearchOnNetwork.ico
index 25e82d3..25e82d3 100644
--- a/fbreader/data/icons/toolbar/32x32-transparent-ico/advancedSearchOnNetwork.ico
+++ b/reader/data/icons/toolbar/32x32-transparent-ico/advancedSearchOnNetwork.ico
diff --git a/fbreader/data/icons/toolbar/32x32-transparent-ico/bookInfo.ico b/reader/data/icons/toolbar/32x32-transparent-ico/bookInfo.ico
index dd9f4db..dd9f4db 100644
--- a/fbreader/data/icons/toolbar/32x32-transparent-ico/bookInfo.ico
+++ b/reader/data/icons/toolbar/32x32-transparent-ico/bookInfo.ico
diff --git a/fbreader/data/icons/toolbar/32x32-transparent-ico/byAuthor.ico b/reader/data/icons/toolbar/32x32-transparent-ico/byAuthor.ico
index 5adf345..5adf345 100644
--- a/fbreader/data/icons/toolbar/32x32-transparent-ico/byAuthor.ico
+++ b/reader/data/icons/toolbar/32x32-transparent-ico/byAuthor.ico
diff --git a/fbreader/data/icons/toolbar/32x32-transparent-ico/byTag.ico b/reader/data/icons/toolbar/32x32-transparent-ico/byTag.ico
index e2467b4..e2467b4 100644
--- a/fbreader/data/icons/toolbar/32x32-transparent-ico/byTag.ico
+++ b/reader/data/icons/toolbar/32x32-transparent-ico/byTag.ico
diff --git a/fbreader/data/icons/toolbar/32x32-transparent-ico/findNext.ico b/reader/data/icons/toolbar/32x32-transparent-ico/findNext.ico
index 1556227..1556227 100644
--- a/fbreader/data/icons/toolbar/32x32-transparent-ico/findNext.ico
+++ b/reader/data/icons/toolbar/32x32-transparent-ico/findNext.ico
diff --git a/fbreader/data/icons/toolbar/32x32-transparent-ico/findPrevious.ico b/reader/data/icons/toolbar/32x32-transparent-ico/findPrevious.ico
index 7f933db..7f933db 100644
--- a/fbreader/data/icons/toolbar/32x32-transparent-ico/findPrevious.ico
+++ b/reader/data/icons/toolbar/32x32-transparent-ico/findPrevious.ico
diff --git a/fbreader/data/icons/toolbar/32x32-transparent-ico/gotoHome.ico b/reader/data/icons/toolbar/32x32-transparent-ico/gotoHome.ico
index 41a406a..41a406a 100644
--- a/fbreader/data/icons/toolbar/32x32-transparent-ico/gotoHome.ico
+++ b/reader/data/icons/toolbar/32x32-transparent-ico/gotoHome.ico
diff --git a/fbreader/data/icons/toolbar/32x32-transparent-ico/preferences.ico b/reader/data/icons/toolbar/32x32-transparent-ico/preferences.ico
index 878df5c..878df5c 100644
--- a/fbreader/data/icons/toolbar/32x32-transparent-ico/preferences.ico
+++ b/reader/data/icons/toolbar/32x32-transparent-ico/preferences.ico
diff --git a/fbreader/data/icons/toolbar/32x32-transparent-ico/redo.ico b/reader/data/icons/toolbar/32x32-transparent-ico/redo.ico
index dfd3c93..dfd3c93 100644
--- a/fbreader/data/icons/toolbar/32x32-transparent-ico/redo.ico
+++ b/reader/data/icons/toolbar/32x32-transparent-ico/redo.ico
diff --git a/fbreader/data/icons/toolbar/32x32-transparent-ico/rotate.ico b/reader/data/icons/toolbar/32x32-transparent-ico/rotate.ico
index 0727596..0727596 100644
--- a/fbreader/data/icons/toolbar/32x32-transparent-ico/rotate.ico
+++ b/reader/data/icons/toolbar/32x32-transparent-ico/rotate.ico
diff --git a/fbreader/data/icons/toolbar/32x32-transparent-ico/search.ico b/reader/data/icons/toolbar/32x32-transparent-ico/search.ico
index 8fa3102..8fa3102 100644
--- a/fbreader/data/icons/toolbar/32x32-transparent-ico/search.ico
+++ b/reader/data/icons/toolbar/32x32-transparent-ico/search.ico
diff --git a/fbreader/data/icons/toolbar/32x32-transparent-ico/showHelp.ico b/reader/data/icons/toolbar/32x32-transparent-ico/showHelp.ico
index 6221e6e..6221e6e 100644
--- a/fbreader/data/icons/toolbar/32x32-transparent-ico/showHelp.ico
+++ b/reader/data/icons/toolbar/32x32-transparent-ico/showHelp.ico
diff --git a/fbreader/data/icons/toolbar/32x32-transparent-ico/showLibrary.ico b/reader/data/icons/toolbar/32x32-transparent-ico/showLibrary.ico
index ac83cf4..ac83cf4 100644
--- a/fbreader/data/icons/toolbar/32x32-transparent-ico/showLibrary.ico
+++ b/reader/data/icons/toolbar/32x32-transparent-ico/showLibrary.ico
diff --git a/fbreader/data/icons/toolbar/32x32-transparent-ico/showNetLibrary.ico b/reader/data/icons/toolbar/32x32-transparent-ico/showNetLibrary.ico
index a0d0614..a0d0614 100644
--- a/fbreader/data/icons/toolbar/32x32-transparent-ico/showNetLibrary.ico
+++ b/reader/data/icons/toolbar/32x32-transparent-ico/showNetLibrary.ico
diff --git a/fbreader/data/icons/toolbar/32x32-transparent-ico/showReading.ico b/reader/data/icons/toolbar/32x32-transparent-ico/showReading.ico
index f3f58bb..f3f58bb 100644
--- a/fbreader/data/icons/toolbar/32x32-transparent-ico/showReading.ico
+++ b/reader/data/icons/toolbar/32x32-transparent-ico/showReading.ico
diff --git a/fbreader/data/icons/toolbar/32x32-transparent-ico/showRecent.ico b/reader/data/icons/toolbar/32x32-transparent-ico/showRecent.ico
index 273774c..273774c 100644
--- a/fbreader/data/icons/toolbar/32x32-transparent-ico/showRecent.ico
+++ b/reader/data/icons/toolbar/32x32-transparent-ico/showRecent.ico
diff --git a/fbreader/data/icons/toolbar/32x32-transparent-ico/toc.ico b/reader/data/icons/toolbar/32x32-transparent-ico/toc.ico
index cc75cd9..cc75cd9 100644
--- a/fbreader/data/icons/toolbar/32x32-transparent-ico/toc.ico
+++ b/reader/data/icons/toolbar/32x32-transparent-ico/toc.ico
diff --git a/fbreader/data/icons/toolbar/32x32-transparent-ico/undo.ico b/reader/data/icons/toolbar/32x32-transparent-ico/undo.ico
index 3910a73..3910a73 100644
--- a/fbreader/data/icons/toolbar/32x32-transparent-ico/undo.ico
+++ b/reader/data/icons/toolbar/32x32-transparent-ico/undo.ico
diff --git a/fbreader/data/icons/toolbar/32x32-transparent-png/addBook.png b/reader/data/icons/toolbar/32x32-transparent-png/addBook.png
index e7046fd..e7046fd 100644
--- a/fbreader/data/icons/toolbar/32x32-transparent-png/addBook.png
+++ b/reader/data/icons/toolbar/32x32-transparent-png/addBook.png
diff --git a/fbreader/data/icons/toolbar/32x32-transparent-png/advancedSearchOnNetwork.png b/reader/data/icons/toolbar/32x32-transparent-png/advancedSearchOnNetwork.png
index f2e8fd0..f2e8fd0 100644
--- a/fbreader/data/icons/toolbar/32x32-transparent-png/advancedSearchOnNetwork.png
+++ b/reader/data/icons/toolbar/32x32-transparent-png/advancedSearchOnNetwork.png
diff --git a/fbreader/data/icons/toolbar/32x32-transparent-png/bookInfo.png b/reader/data/icons/toolbar/32x32-transparent-png/bookInfo.png
index 929a71d..929a71d 100644
--- a/fbreader/data/icons/toolbar/32x32-transparent-png/bookInfo.png
+++ b/reader/data/icons/toolbar/32x32-transparent-png/bookInfo.png
diff --git a/fbreader/data/icons/toolbar/32x32-transparent-png/byAuthor.png b/reader/data/icons/toolbar/32x32-transparent-png/byAuthor.png
index 4b5ef82..4b5ef82 100644
--- a/fbreader/data/icons/toolbar/32x32-transparent-png/byAuthor.png
+++ b/reader/data/icons/toolbar/32x32-transparent-png/byAuthor.png
diff --git a/fbreader/data/icons/toolbar/32x32-transparent-png/byTag.png b/reader/data/icons/toolbar/32x32-transparent-png/byTag.png
index 9df9113..9df9113 100644
--- a/fbreader/data/icons/toolbar/32x32-transparent-png/byTag.png
+++ b/reader/data/icons/toolbar/32x32-transparent-png/byTag.png
diff --git a/fbreader/data/icons/toolbar/32x32-transparent-png/findNext.png b/reader/data/icons/toolbar/32x32-transparent-png/findNext.png
index a784e80..a784e80 100644
--- a/fbreader/data/icons/toolbar/32x32-transparent-png/findNext.png
+++ b/reader/data/icons/toolbar/32x32-transparent-png/findNext.png
diff --git a/fbreader/data/icons/toolbar/32x32-transparent-png/findPrevious.png b/reader/data/icons/toolbar/32x32-transparent-png/findPrevious.png
index 4734693..4734693 100644
--- a/fbreader/data/icons/toolbar/32x32-transparent-png/findPrevious.png
+++ b/reader/data/icons/toolbar/32x32-transparent-png/findPrevious.png
diff --git a/fbreader/data/icons/toolbar/32x32-transparent-png/gotoHome.png b/reader/data/icons/toolbar/32x32-transparent-png/gotoHome.png
index e3fb36b..e3fb36b 100644
--- a/fbreader/data/icons/toolbar/32x32-transparent-png/gotoHome.png
+++ b/reader/data/icons/toolbar/32x32-transparent-png/gotoHome.png
diff --git a/fbreader/data/icons/toolbar/32x32-transparent-png/preferences.png b/reader/data/icons/toolbar/32x32-transparent-png/preferences.png
index 5fd04b9..5fd04b9 100644
--- a/fbreader/data/icons/toolbar/32x32-transparent-png/preferences.png
+++ b/reader/data/icons/toolbar/32x32-transparent-png/preferences.png
diff --git a/fbreader/data/icons/toolbar/32x32-transparent-png/redo.png b/reader/data/icons/toolbar/32x32-transparent-png/redo.png
index f822240..f822240 100644
--- a/fbreader/data/icons/toolbar/32x32-transparent-png/redo.png
+++ b/reader/data/icons/toolbar/32x32-transparent-png/redo.png
diff --git a/fbreader/data/icons/toolbar/32x32-transparent-png/rotate.png b/reader/data/icons/toolbar/32x32-transparent-png/rotate.png
index 4492032..4492032 100644
--- a/fbreader/data/icons/toolbar/32x32-transparent-png/rotate.png
+++ b/reader/data/icons/toolbar/32x32-transparent-png/rotate.png
diff --git a/fbreader/data/icons/toolbar/32x32-transparent-png/search.png b/reader/data/icons/toolbar/32x32-transparent-png/search.png
index 4fe48ab..4fe48ab 100644
--- a/fbreader/data/icons/toolbar/32x32-transparent-png/search.png
+++ b/reader/data/icons/toolbar/32x32-transparent-png/search.png
diff --git a/fbreader/data/icons/toolbar/32x32-transparent-png/showHelp.png b/reader/data/icons/toolbar/32x32-transparent-png/showHelp.png
index a65ca1b..a65ca1b 100644
--- a/fbreader/data/icons/toolbar/32x32-transparent-png/showHelp.png
+++ b/reader/data/icons/toolbar/32x32-transparent-png/showHelp.png
diff --git a/fbreader/data/icons/toolbar/32x32-transparent-png/showLibrary.png b/reader/data/icons/toolbar/32x32-transparent-png/showLibrary.png
index e244cd2..e244cd2 100644
--- a/fbreader/data/icons/toolbar/32x32-transparent-png/showLibrary.png
+++ b/reader/data/icons/toolbar/32x32-transparent-png/showLibrary.png
diff --git a/fbreader/data/icons/toolbar/32x32-transparent-png/showNetLibrary.png b/reader/data/icons/toolbar/32x32-transparent-png/showNetLibrary.png
index 54e3d0a..54e3d0a 100644
--- a/fbreader/data/icons/toolbar/32x32-transparent-png/showNetLibrary.png
+++ b/reader/data/icons/toolbar/32x32-transparent-png/showNetLibrary.png
diff --git a/fbreader/data/icons/toolbar/32x32-transparent-png/showNetworkLibrary.png b/reader/data/icons/toolbar/32x32-transparent-png/showNetworkLibrary.png
index 9e64d17..9e64d17 120000
--- a/fbreader/data/icons/toolbar/32x32-transparent-png/showNetworkLibrary.png
+++ b/reader/data/icons/toolbar/32x32-transparent-png/showNetworkLibrary.png
diff --git a/fbreader/data/icons/toolbar/32x32-transparent-png/showReading.png b/reader/data/icons/toolbar/32x32-transparent-png/showReading.png
index cbafa6b..cbafa6b 100644
--- a/fbreader/data/icons/toolbar/32x32-transparent-png/showReading.png
+++ b/reader/data/icons/toolbar/32x32-transparent-png/showReading.png
diff --git a/fbreader/data/icons/toolbar/32x32-transparent-png/showRecent.png b/reader/data/icons/toolbar/32x32-transparent-png/showRecent.png
index f4ad292..f4ad292 100644
--- a/fbreader/data/icons/toolbar/32x32-transparent-png/showRecent.png
+++ b/reader/data/icons/toolbar/32x32-transparent-png/showRecent.png
diff --git a/fbreader/data/icons/toolbar/32x32-transparent-png/toc.png b/reader/data/icons/toolbar/32x32-transparent-png/toc.png
index d7c9227..d7c9227 100644
--- a/fbreader/data/icons/toolbar/32x32-transparent-png/toc.png
+++ b/reader/data/icons/toolbar/32x32-transparent-png/toc.png
diff --git a/fbreader/data/icons/toolbar/32x32-transparent-png/undo.png b/reader/data/icons/toolbar/32x32-transparent-png/undo.png
index cbbf8b0..cbbf8b0 100644
--- a/fbreader/data/icons/toolbar/32x32-transparent-png/undo.png
+++ b/reader/data/icons/toolbar/32x32-transparent-png/undo.png
diff --git a/fbreader/data/icons/toolbar/desktop b/reader/data/icons/toolbar/desktop
index a98d612..a98d612 120000
--- a/fbreader/data/icons/toolbar/desktop
+++ b/reader/data/icons/toolbar/desktop
diff --git a/fbreader/data/resources/RIGHTS b/reader/data/resources/RIGHTS
index a8ee614..a8ee614 100644
--- a/fbreader/data/resources/RIGHTS
+++ b/reader/data/resources/RIGHTS
diff --git a/fbreader/data/resources/ar.xml b/reader/data/resources/ar.xml
index 362a580..273341a 100644
--- a/fbreader/data/resources/ar.xml
+++ b/reader/data/resources/ar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Arabic FBReader resources, by Khaled Hosny -->
+<!-- Arabic TDE-Ebook-Reader resources, by Khaled Hosny -->
 <resources>
 	<node name="libraryView">
 		<node name="authorNode">
@@ -250,7 +250,7 @@
 			<node name="buyAndDownload" value="اصشتر و &amp;نزّل"/>
 		</node>
 		<node name="LibraryOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Library Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Library Options"/>
 			<node name="tab">
 				<node name="Library" value="المكتبة">
 					<node name="bookPath" value="مسار الكتب"/>
@@ -261,7 +261,7 @@
 			</node>
 		</node>
 		<node name="NetworkOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Network Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Network Options"/>
 			<node name="tab">
 				<node name="NetworkLibrary" value="بحث الشبكة">
 				</node>
@@ -280,7 +280,7 @@
 			</node>
 		</node>
 		<node name="SystemOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - System Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - System Options"/>
 			<node name="tab">
 				<node name="Language" value="اللغة">
 					<node name="autoDetect" value="تعرّف على اللغة والترميز آليا"/>
@@ -307,7 +307,7 @@
 			</node>
 		</node>
 		<node name="ReadingOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Reading Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Reading Options"/>
 			<node name="tab">
 				<node name="Scrolling" value="التقليب">
 					<node name="keyScrollDelay" value="التأخير بين التقليب بالفاتيح، بالملي ثانية"/>
@@ -392,7 +392,7 @@
 			</node>
 		</node>
 		<node name="LookAndFeelOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Look &amp; Feel Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Look &amp; Feel Options"/>
 			<node name="tab">
 				<node name="CSS" value="الطرز المتراصة">
 					<node name="overrideSpecifiedFonts" value="استخدم دائما خطوطي الخاصة"/>
diff --git a/fbreader/data/resources/bg.xml b/reader/data/resources/bg.xml
index 9ccafc5..5bed7fb 100644
--- a/fbreader/data/resources/bg.xml
+++ b/reader/data/resources/bg.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Bulgarian FBReader resources, by Alexander Ivanov -->
+<!-- Bulgarian TDE-Ebook-Reader resources, by Alexander Ivanov -->
 <resources>
 	<node name="libraryView">
 		<node name="authorNode">
@@ -91,7 +91,7 @@
 			<node name="previousBook" value="Предишна книга"/>
 			<node name="showRecent" value="Последна"/>
 			<node name="addBook" value="Добавяне на книга..."/>
-			<node name="showHelp" value="За програмата FBReader"/>
+			<node name="showHelp" value="За програмата TDE-Ebook-Reader"/>
 		</node>
 		<node name="gotoHome" value="Отиване в началото на документа"/>
 		<node name="gotoPageNumber" value="Отиване на страница..."/>
@@ -250,7 +250,7 @@
 			<node name="buyAndDownload" value="Купуване и &amp;сваляне"/>
 		</node>
 		<node name="LibraryOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Library Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Library Options"/>
 			<node name="tab">
 				<node name="Library" value="Библиотека">
 					<node name="bookPath" value="Папка за съхранение на книгите"/>
@@ -261,7 +261,7 @@
 			</node>
 		</node>
 		<node name="NetworkOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Network Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Network Options"/>
 			<node name="tab">
 				<node name="NetworkLibrary" toBeTranslated="true" value="Network Library">
 				</node>
@@ -280,7 +280,7 @@
 			</node>
 		</node>
 		<node name="SystemOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - System Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - System Options"/>
 			<node name="tab">
 				<node name="Language" value="Език">
 					<node name="autoDetect" value="Автоматично определяне на езика и кодирането"/>
@@ -307,7 +307,7 @@
 			</node>
 		</node>
 		<node name="ReadingOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Reading Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Reading Options"/>
 			<node name="tab">
 				<node name="Scrolling" value="Прелистване">
 					<node name="keyScrollDelay" value="Забавяне между клавишни превъртания в милисекунди"/>
@@ -392,7 +392,7 @@
 			</node>
 		</node>
 		<node name="LookAndFeelOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Look &amp; Feel Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Look &amp; Feel Options"/>
 			<node name="tab">
 				<node name="CSS" value="CSS">
 					<node name="overrideSpecifiedFonts" value="Винаги да се използват собствени шрифтове"/>
@@ -449,7 +449,7 @@
 			</node>
 		</node>
 		<node name="InfoDialog">
-			<node name="title" value="FBReader - Информация за книгата"/>
+			<node name="title" value="TDE-Ebook-Reader - Информация за книгата"/>
 			<node name="tab">
 				<node name="Common" value="Основна">
 					<node name="file" value="Файл"/>
@@ -483,12 +483,12 @@
 			</node>
 		</node>
 		<node name="AuthorInfoDialog">
-			<node name="title" value="FBReader - Информация за автора"/>
+			<node name="title" value="TDE-Ebook-Reader - Информация за автора"/>
 			<node name="name" value="Име на автора"/>
 			<node name="sortKey" value="Сортиране на авторите по"/>
 		</node>
 		<node name="addFileDialog">
-			<node name="title" value="FBReader - Добавяне на книга в библиотеката"/>
+			<node name="title" value="TDE-Ebook-Reader - Добавяне на книга в библиотеката"/>
 		</node>
 		<node name="textSearchDialog">
 			<node name="title" value="Търсене на текст"/>
diff --git a/fbreader/data/resources/cs.xml b/reader/data/resources/cs.xml
index 134d6df..807d137 100644
--- a/fbreader/data/resources/cs.xml
+++ b/reader/data/resources/cs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Czech FBReader resources, by Lubomír Čevela -->
+<!-- Czech TDE-Ebook-Reader resources, by Lubomír Čevela -->
 <resources>
 	<node name="libraryView">
 		<node name="authorNode">
@@ -91,7 +91,7 @@
 			<node name="previousBook" value="Předchozí kniha"/>
 			<node name="showRecent" value="Nedávné"/>
 			<node name="addBook" value="Přidat knihu..."/>
-			<node name="showHelp" value="O programu FBReader"/>
+			<node name="showHelp" value="O programu TDE-Ebook-Reader"/>
 		</node>
 		<node name="gotoHome" value="Na začátek dokumentu"/>
 		<node name="gotoPageNumber" value="Na stránku..."/>
@@ -203,7 +203,7 @@
 		</node>
 		<node name="showHelp">
 			<node name="label" toBeTranslated="true" value="About"/>
-			<node name="tooltip" value="O programu FBReader"/>
+			<node name="tooltip" value="O programu TDE-Ebook-Reader"/>
 		</node>
 		<node name="filterLibrary">
 			<node name="label" toBeTranslated="true" value="Filter"/>
@@ -250,7 +250,7 @@
 			<node name="buyAndDownload" value="Zaplatit a &amp;stáhnout"/>
 		</node>
 		<node name="LibraryOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Library Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Library Options"/>
 			<node name="tab">
 				<node name="Library" value="Knihovna">
 					<node name="bookPath" value="Složka s knihami"/>
@@ -261,7 +261,7 @@
 			</node>
 		</node>
 		<node name="NetworkOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Network Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Network Options"/>
 			<node name="tab">
 				<node name="NetworkLibrary" value="Hledání knih na síti">
 				</node>
@@ -280,7 +280,7 @@
 			</node>
 		</node>
 		<node name="SystemOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - System Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - System Options"/>
 			<node name="tab">
 				<node name="Language" value="Jazyk">
 					<node name="autoDetect" value="Automatická detekce jazyka o kódování znaků"/>
@@ -307,7 +307,7 @@
 			</node>
 		</node>
 		<node name="ReadingOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Reading Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Reading Options"/>
 			<node name="tab">
 				<node name="Scrolling" value="Posuv textu">
 					<node name="keyScrollDelay" value="Zpoždění mezi stiskem kláves posuvu v msec"/>
@@ -392,7 +392,7 @@
 			</node>
 		</node>
 		<node name="LookAndFeelOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Look &amp; Feel Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Look &amp; Feel Options"/>
 			<node name="tab">
 				<node name="CSS" value="CSS">
 					<node name="overrideSpecifiedFonts" value="Vždy použít uživatelské fonty"/>
@@ -449,7 +449,7 @@
 			</node>
 		</node>
 		<node name="InfoDialog">
-			<node name="title" value="FBReader - Informace o knize"/>
+			<node name="title" value="TDE-Ebook-Reader - Informace o knize"/>
 			<node name="tab">
 				<node name="Common" value="Základní informace">
 					<node name="file" value="Soubor"/>
@@ -483,12 +483,12 @@
 			</node>
 		</node>
 		<node name="AuthorInfoDialog">
-			<node name="title" value="FBReader - Informace o autorovi"/>
+			<node name="title" value="TDE-Ebook-Reader - Informace o autorovi"/>
 			<node name="name" value="Jméno autora"/>
 			<node name="sortKey" value="Třídicí klíč autora"/>
 		</node>
 		<node name="addFileDialog">
-			<node name="title" value="FBReader - Přidat knihu do knihovny"/>
+			<node name="title" value="TDE-Ebook-Reader - Přidat knihu do knihovny"/>
 		</node>
 		<node name="textSearchDialog">
 			<node name="title" value="Hledat text"/>
diff --git a/fbreader/data/resources/de.xml b/reader/data/resources/de.xml
index f050576..7245ccd 100644
--- a/fbreader/data/resources/de.xml
+++ b/reader/data/resources/de.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- German FBReader resources, by Rainer Paul -->
+<!-- German TDE-Ebook-Reader resources, by Rainer Paul -->
 <resources>
 	<node name="libraryView">
 		<node name="authorNode">
@@ -91,7 +91,7 @@
 			<node name="previousBook" value="Vorheriges E-Book"/>
 			<node name="showRecent" value="Aktuell"/>
 			<node name="addBook" value="E-Book hinzufügen..."/>
-			<node name="showHelp" value="Über FBReader"/>
+			<node name="showHelp" value="Über TDE-Ebook-Reader"/>
 		</node>
 		<node name="gotoHome" value="Gehe zur ersten Seite des Dokuments"/>
 		<node name="gotoPageNumber" value="Gehe zur Seite..."/>
@@ -203,7 +203,7 @@
 		</node>
 		<node name="showHelp">
 			<node name="label" toBeTranslated="true" value="About"/>
-			<node name="tooltip" value="Über FBReader"/>
+			<node name="tooltip" value="Über TDE-Ebook-Reader"/>
 		</node>
 		<node name="filterLibrary">
 			<node name="label" toBeTranslated="true" value="Filter"/>
@@ -250,7 +250,7 @@
 			<node name="buyAndDownload" value="Kaufen und &amp;Download"/>
 		</node>
 		<node name="LibraryOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Library Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Library Options"/>
 			<node name="tab">
 				<node name="Library" value="Bibliothek">
 					<node name="bookPath" value="E-Book Verzeichnis"/>
@@ -261,7 +261,7 @@
 			</node>
 		</node>
 		<node name="NetworkOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Network Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Network Options"/>
 			<node name="tab">
 				<node name="NetworkLibrary" value="Suche im Netzwerk">
 				</node>
@@ -280,7 +280,7 @@
 			</node>
 		</node>
 		<node name="SystemOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - System Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - System Options"/>
 			<node name="tab">
 				<node name="Language" value="Sprache">
 					<node name="autoDetect" value="Automatisch Sprache und Codierung erkennen"/>
@@ -307,7 +307,7 @@
 			</node>
 		</node>
 		<node name="ReadingOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Reading Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Reading Options"/>
 			<node name="tab">
 				<node name="Scrolling" value="Bildlauf">
 					<node name="keyScrollDelay" value="Verzögerung beim Tasten-Bildlauf, ms"/>
@@ -392,7 +392,7 @@
 			</node>
 		</node>
 		<node name="LookAndFeelOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Look &amp; Feel Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Look &amp; Feel Options"/>
 			<node name="tab">
 				<node name="CSS" value="CSS">
 					<node name="overrideSpecifiedFonts" value="Immer eigene Schriftarten benützen"/>
@@ -449,7 +449,7 @@
 			</node>
 		</node>
 		<node name="InfoDialog">
-			<node name="title" value="FBReader - E-Book Info"/>
+			<node name="title" value="TDE-Ebook-Reader - E-Book Info"/>
 			<node name="tab">
 				<node name="Common" value="Allgemein">
 					<node name="file" value="Datei"/>
@@ -483,12 +483,12 @@
 			</node>
 		</node>
 		<node name="AuthorInfoDialog">
-			<node name="title" value="FBReader – Infos über Autor"/>
+			<node name="title" value="TDE-Ebook-Reader – Infos über Autor"/>
 			<node name="name" value="Name des Autors"/>
 			<node name="sortKey" value="Sortierungsindex des Autors"/>
 		</node>
 		<node name="addFileDialog">
-			<node name="title" value="FBReader - E-Book zur Bibliothek hinzufügen"/>
+			<node name="title" value="TDE-Ebook-Reader - E-Book zur Bibliothek hinzufügen"/>
 		</node>
 		<node name="textSearchDialog">
 			<node name="title" value="Text-Suche"/>
diff --git a/fbreader/data/resources/en.xml b/reader/data/resources/en.xml
index 9652cb3..4ea1887 100644
--- a/fbreader/data/resources/en.xml
+++ b/reader/data/resources/en.xml
@@ -124,7 +124,7 @@
 			<node name="previousBook" value="Previous Book"/>
 			<node name="showRecent" value="Recent"/>
 			<node name="addBook" value="Add Book..."/>
-			<node name="showHelp" value="About FBReader"/>
+			<node name="showHelp" value="About TDE-Ebook-Reader"/>
 		</node>
 		<node name="gotoHome" value="Go to Start of Document"/>
 		<node name="gotoPageNumber" value="Go to Page..."/>
@@ -236,7 +236,7 @@
 		</node>
 		<node name="showHelp">
 			<node name="label" value="About"/>
-			<node name="tooltip" value="About FBReader"/>
+			<node name="tooltip" value="About TDE-Ebook-Reader"/>
 		</node>
 		<node name="filterLibrary">
 			<node name="label" value="Filter"/>
@@ -283,7 +283,7 @@
 			<node name="buyAndDownload" value="Buy and &amp;download"/>
 		</node>
 		<node name="LibraryOptionsDialog">
-			<node name="title" value="FBReader - Library Options"/>
+			<node name="title" value="TDE-Ebook-Reader - Library Options"/>
 			<node name="tab">
 				<node name="Library" value="Library">
 					<node name="bookPath" value="Book Path"/>
@@ -294,7 +294,7 @@
 			</node>
 		</node>
 		<node name="NetworkOptionsDialog">
-			<node name="title" value="FBReader - Network Options"/>
+			<node name="title" value="TDE-Ebook-Reader - Network Options"/>
 			<node name="tab">
 				<node name="NetworkLibrary" value="Network Library">
 				</node>
@@ -313,7 +313,7 @@
 			</node>
 		</node>
 		<node name="SystemOptionsDialog">
-			<node name="title" value="FBReader - System Options"/>
+			<node name="title" value="TDE-Ebook-Reader - System Options"/>
 			<node name="tab">
 				<node name="Language" value="Language">
 					<node name="autoDetect" value="Automatically Detect Language and Encoding"/>
@@ -340,7 +340,7 @@
 			</node>
 		</node>
 		<node name="ReadingOptionsDialog">
-			<node name="title" value="FBReader - Reading Options"/>
+			<node name="title" value="TDE-Ebook-Reader - Reading Options"/>
 			<node name="tab">
 				<node name="Scrolling" value="Scrolling">
 					<node name="keyScrollDelay" value="Delay between Key Scrollings, msecs"/>
@@ -425,7 +425,7 @@
 			</node>
 		</node>
 		<node name="LookAndFeelOptionsDialog">
-			<node name="title" value="FBReader - Look &amp; Feel Options"/>
+			<node name="title" value="TDE-Ebook-Reader - Look &amp; Feel Options"/>
 			<node name="tab">
 				<node name="CSS" value="CSS">
 					<node name="overrideSpecifiedFonts" value="Always Use My Own Fonts"/>
@@ -482,7 +482,7 @@
 			</node>
 		</node>
 		<node name="InfoDialog">
-			<node name="title" value="FBReader - Book Info"/>
+			<node name="title" value="TDE-Ebook-Reader - Book Info"/>
 			<node name="tab">
 				<node name="Common" value="Common">
 					<node name="file" value="File"/>
@@ -516,12 +516,12 @@
 			</node>
 		</node>
 		<node name="AuthorInfoDialog">
-			<node name="title" value="FBReader - Author Info"/>
+			<node name="title" value="TDE-Ebook-Reader - Author Info"/>
 			<node name="name" value="Author Name"/>
 			<node name="sortKey" value="Author Sort Key"/>
 		</node>
 		<node name="addFileDialog">
-			<node name="title" value="FBReader - Add Book to the Library"/>
+			<node name="title" value="TDE-Ebook-Reader - Add Book to the Library"/>
 		</node>
 		<node name="textSearchDialog">
 			<node name="title" value="Text Search"/>
diff --git a/fbreader/data/resources/eo.xml b/reader/data/resources/eo.xml
index 4a1d77d..380826a 100644
--- a/fbreader/data/resources/eo.xml
+++ b/reader/data/resources/eo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Esperanto FBReader resources, by Katarína Nosková -->
+<!-- Esperanto TDE-Ebook-Reader resources, by Katarína Nosková -->
 <resources>
 	<node name="libraryView">
 		<node name="authorNode">
@@ -91,7 +91,7 @@
 			<node name="previousBook" value="Antaŭa libro"/>
 			<node name="showRecent" value="Lastatempe malfermitaj"/>
 			<node name="addBook" value="Aldoni libron..."/>
-			<node name="showHelp" value="Pri la programo FBReader"/>
+			<node name="showHelp" value="Pri la programo TDE-Ebook-Reader"/>
 		</node>
 		<node name="gotoHome" value="Al komenco de dokumento"/>
 		<node name="gotoPageNumber" value="Al la paĝo..."/>
@@ -203,7 +203,7 @@
 		</node>
 		<node name="showHelp">
 			<node name="label" toBeTranslated="true" value="About"/>
-			<node name="tooltip" value="Pri la programo FBReader"/>
+			<node name="tooltip" value="Pri la programo TDE-Ebook-Reader"/>
 		</node>
 		<node name="filterLibrary">
 			<node name="label" toBeTranslated="true" value="Filter"/>
@@ -250,7 +250,7 @@
 			<node name="buyAndDownload" value="Pagi kaj &amp;elŝuti"/>
 		</node>
 		<node name="LibraryOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Library Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Library Options"/>
 			<node name="tab">
 				<node name="Library" value="Librejo">
 					<node name="bookPath" value="Dosierujo kun libroj"/>
@@ -261,7 +261,7 @@
 			</node>
 		</node>
 		<node name="NetworkOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Network Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Network Options"/>
 			<node name="tab">
 				<node name="NetworkLibrary" value="Reta serĉado">
 				</node>
@@ -280,7 +280,7 @@
 			</node>
 		</node>
 		<node name="SystemOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - System Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - System Options"/>
 			<node name="tab">
 				<node name="Language" value="Lingvo">
 					<node name="autoDetect" value="Aŭtomata detekto de lingvo kaj kodado"/>
@@ -307,7 +307,7 @@
 			</node>
 		</node>
 		<node name="ReadingOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Reading Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Reading Options"/>
 			<node name="tab">
 				<node name="Scrolling" value="Rulumado de teksto">
 					<node name="keyScrollDelay" value="Malfruiĝo de rulumado en milisekundoj"/>
@@ -392,7 +392,7 @@
 			</node>
 		</node>
 		<node name="LookAndFeelOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Look &amp; Feel Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Look &amp; Feel Options"/>
 			<node name="tab">
 				<node name="CSS" value="CSS">
 					<node name="overrideSpecifiedFonts" value="Ĉiam uzi tiparojn de uzanto"/>
@@ -449,7 +449,7 @@
 			</node>
 		</node>
 		<node name="InfoDialog">
-			<node name="title" value="FBReader - Informoj pri libro"/>
+			<node name="title" value="TDE-Ebook-Reader - Informoj pri libro"/>
 			<node name="tab">
 				<node name="Common" value="Bazaj informoj">
 					<node name="file" value="Dosiero"/>
@@ -483,12 +483,12 @@
 			</node>
 		</node>
 		<node name="AuthorInfoDialog">
-			<node name="title" value="FBReader - Informoj pri aŭtoro"/>
+			<node name="title" value="TDE-Ebook-Reader - Informoj pri aŭtoro"/>
 			<node name="name" value="Nomo de aŭtoro"/>
 			<node name="sortKey" value="Ordiga ŝlosilo de aŭtoro"/>
 		</node>
 		<node name="addFileDialog">
-			<node name="title" value="FBReader - Aldoni libron en librejon"/>
+			<node name="title" value="TDE-Ebook-Reader - Aldoni libron en librejon"/>
 		</node>
 		<node name="textSearchDialog">
 			<node name="title" value="Serĉi tekston"/>
diff --git a/fbreader/data/resources/es.xml b/reader/data/resources/es.xml
index fe62d42..1d02f77 100644
--- a/fbreader/data/resources/es.xml
+++ b/reader/data/resources/es.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Spanish FBReader resources, by Leproso -->
+<!-- Spanish TDE-Ebook-Reader resources, by Leproso -->
 <resources>
 	<node name="libraryView">
 		<node name="authorNode">
@@ -91,7 +91,7 @@
 			<node name="previousBook" value="Libro anterior"/>
 			<node name="showRecent" value="Reciente"/>
 			<node name="addBook" value="Añadir libro..."/>
-			<node name="showHelp" value="Ayuda sobre FBReader"/>
+			<node name="showHelp" value="Ayuda sobre TDE-Ebook-Reader"/>
 		</node>
 		<node name="gotoHome" value="Ir al inicio del libro"/>
 		<node name="gotoPageNumber" value="Ir a la página..."/>
@@ -203,7 +203,7 @@
 		</node>
 		<node name="showHelp">
 			<node name="label" value="Ayuda"/>
-			<node name="tooltip" value="Información sobre FBReader"/>
+			<node name="tooltip" value="Información sobre TDE-Ebook-Reader"/>
 		</node>
 		<node name="filterLibrary">
 			<node name="label" value="Filtro"/>
@@ -250,7 +250,7 @@
 			<node name="buyAndDownload" value="Comprar y &amp;descargar"/>
 		</node>
 		<node name="LibraryOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Library Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Library Options"/>
 			<node name="tab">
 				<node name="Library" value="Biblioteca">
 					<node name="bookPath" value="Directorios de Libros"/>
@@ -261,7 +261,7 @@
 			</node>
 		</node>
 		<node name="NetworkOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Network Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Network Options"/>
 			<node name="tab">
 				<node name="NetworkLibrary" value="Búsqueda en la Web">
 				</node>
@@ -280,7 +280,7 @@
 			</node>
 		</node>
 		<node name="SystemOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - System Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - System Options"/>
 			<node name="tab">
 				<node name="Language" value="Idioma">
 					<node name="autoDetect" value="Detectar automáticamente el idioma y la codificación"/>
@@ -307,7 +307,7 @@
 			</node>
 		</node>
 		<node name="ReadingOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Reading Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Reading Options"/>
 			<node name="tab">
 				<node name="Scrolling" value="Desplazamiento Vertical">
 					<node name="keyScrollDelay" value="Retardo en desplazamiento vertical, milisegundos"/>
@@ -392,7 +392,7 @@
 			</node>
 		</node>
 		<node name="LookAndFeelOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Look &amp; Feel Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Look &amp; Feel Options"/>
 			<node name="tab">
 				<node name="CSS" value="CSS">
 					<node name="overrideSpecifiedFonts" value="Utilizar siempre Fuentes personalizadas"/>
@@ -449,7 +449,7 @@
 			</node>
 		</node>
 		<node name="InfoDialog">
-			<node name="title" value="FBReader - Información sobre el libro"/>
+			<node name="title" value="TDE-Ebook-Reader - Información sobre el libro"/>
 			<node name="tab">
 				<node name="Common" value="Datos">
 					<node name="file" value="Ubicación"/>
@@ -483,12 +483,12 @@
 			</node>
 		</node>
 		<node name="AuthorInfoDialog">
-			<node name="title" value="FBReader - Información del Autor"/>
+			<node name="title" value="TDE-Ebook-Reader - Información del Autor"/>
 			<node name="name" value="Nombre del Autor"/>
 			<node name="sortKey" value="Ordenar por Autor"/>
 		</node>
 		<node name="addFileDialog">
-			<node name="title" value="FBReader - Añadir libro a la Biblioteca"/>
+			<node name="title" value="TDE-Ebook-Reader - Añadir libro a la Biblioteca"/>
 		</node>
 		<node name="textSearchDialog">
 			<node name="title" value="Buscar texto"/>
diff --git a/fbreader/data/resources/fi.xml b/reader/data/resources/fi.xml
index addb51c..afe9b49 100644
--- a/fbreader/data/resources/fi.xml
+++ b/reader/data/resources/fi.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Finnish FBReader resources, by Marko Vertainen -->
+<!-- Finnish TDE-Ebook-Reader resources, by Marko Vertainen -->
 <resources>
 	<node name="libraryView">
 		<node name="authorNode">
@@ -91,7 +91,7 @@
 			<node name="previousBook" value="Edellinen kirja"/>
 			<node name="showRecent" value="Viimeisimmät kirjat"/>
 			<node name="addBook" value="Lisää kirja..."/>
-			<node name="showHelp" value="Tietoja FBReaderista"/>
+			<node name="showHelp" value="Tietoja TDE-Ebook-Readerista"/>
 		</node>
 		<node name="gotoHome" value="Siirry dokumentin alkuun"/>
 		<node name="gotoPageNumber" value="Siirry sivulle..."/>
@@ -203,7 +203,7 @@
 		</node>
 		<node name="showHelp">
 			<node name="label" value="Tietoja"/>
-			<node name="tooltip" value="Tietoja FBReaderista"/>
+			<node name="tooltip" value="Tietoja TDE-Ebook-Readerista"/>
 		</node>
 		<node name="filterLibrary">
 			<node name="label" value="Suodatin"/>
@@ -250,7 +250,7 @@
 			<node name="buyAndDownload" value="Osta ja &amp;lataa"/>
 		</node>
 		<node name="LibraryOptionsDialog">
-			<node name="title" value="FBReader - Kirjaston asetukset"/>
+			<node name="title" value="TDE-Ebook-Reader - Kirjaston asetukset"/>
 			<node name="tab">
 				<node name="Library" value="Kirjasto">
 					<node name="bookPath" value="Kirjaston hakemisto"/>
@@ -261,7 +261,7 @@
 			</node>
 		</node>
 		<node name="NetworkOptionsDialog">
-			<node name="title" value="FBReader - Verkkoasetukset"/>
+			<node name="title" value="TDE-Ebook-Reader - Verkkoasetukset"/>
 			<node name="tab">
 				<node name="NetworkLibrary" value="Verkkohaku">
 				</node>
@@ -280,7 +280,7 @@
 			</node>
 		</node>
 		<node name="SystemOptionsDialog">
-			<node name="title" value="FBReader - Järjestelmäasetukset"/>
+			<node name="title" value="TDE-Ebook-Reader - Järjestelmäasetukset"/>
 			<node name="tab">
 				<node name="Language" value="Kieli">
 					<node name="autoDetect" value="Tunnista kieli ja merkistö automaattisesti"/>
@@ -307,7 +307,7 @@
 			</node>
 		</node>
 		<node name="ReadingOptionsDialog">
-			<node name="title" value="FBReader - Lukuasetukset"/>
+			<node name="title" value="TDE-Ebook-Reader - Lukuasetukset"/>
 			<node name="tab">
 				<node name="Scrolling" value="Vieritys">
 					<node name="keyScrollDelay" value="Näppäinvierityksen painnallusten viive, msecs"/>
@@ -392,7 +392,7 @@
 			</node>
 		</node>
 		<node name="LookAndFeelOptionsDialog">
-			<node name="title" value="FBReader - Ulkoasun asetukset"/>
+			<node name="title" value="TDE-Ebook-Reader - Ulkoasun asetukset"/>
 			<node name="tab">
 				<node name="CSS" value="CSS">
 					<node name="overrideSpecifiedFonts" value="Käytä aina omaa kirjasinta"/>
@@ -449,7 +449,7 @@
 			</node>
 		</node>
 		<node name="InfoDialog">
-			<node name="title" value="FBReader - Kirjan tiedot"/>
+			<node name="title" value="TDE-Ebook-Reader - Kirjan tiedot"/>
 			<node name="tab">
 				<node name="Common" value="Yleiset">
 					<node name="file" value="Tiedosto"/>
@@ -483,12 +483,12 @@
 			</node>
 		</node>
 		<node name="AuthorInfoDialog">
-			<node name="title" value="FBReader - Tekijän tiedot"/>
+			<node name="title" value="TDE-Ebook-Reader - Tekijän tiedot"/>
 			<node name="name" value="Tekijän nimi"/>
 			<node name="sortKey" value="Tekijän lajitteluavain"/>
 		</node>
 		<node name="addFileDialog">
-			<node name="title" value="FBReader - Lisää kirja kirjastoon"/>
+			<node name="title" value="TDE-Ebook-Reader - Lisää kirja kirjastoon"/>
 		</node>
 		<node name="textSearchDialog">
 			<node name="title" value="Etsi teksti"/>
diff --git a/fbreader/data/resources/fr.xml b/reader/data/resources/fr.xml
index ae45970..922580d 100644
--- a/fbreader/data/resources/fr.xml
+++ b/reader/data/resources/fr.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- French FBReader resources, by Pierre Senellart -->
+<!-- French TDE-Ebook-Reader resources, by Pierre Senellart -->
 <resources>
 	<node name="libraryView">
 		<node name="authorNode">
@@ -91,7 +91,7 @@
 			<node name="previousBook" value="Livre précédent"/>
 			<node name="showRecent" value="Récents"/>
 			<node name="addBook" value="Ajouter un livre..."/>
-			<node name="showHelp" value="À propos de FBReader"/>
+			<node name="showHelp" value="À propos de TDE-Ebook-Reader"/>
 		</node>
 		<node name="gotoHome" value="Aller au début du document"/>
 		<node name="gotoPageNumber" value="Aller page..."/>
@@ -203,7 +203,7 @@
 		</node>
 		<node name="showHelp">
 			<node name="label" toBeTranslated="true" value="About"/>
-			<node name="tooltip" value="À propos de FBReader"/>
+			<node name="tooltip" value="À propos de TDE-Ebook-Reader"/>
 		</node>
 		<node name="filterLibrary">
 			<node name="label" toBeTranslated="true" value="Filter"/>
@@ -250,7 +250,7 @@
 			<node name="buyAndDownload" value="Acheter et &amp;télécharger"/>
 		</node>
 		<node name="LibraryOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Library Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Library Options"/>
 			<node name="tab">
 				<node name="Library" value="Bibliothèque">
 					<node name="bookPath" value="Chemin des livres"/>
@@ -261,7 +261,7 @@
 			</node>
 		</node>
 		<node name="NetworkOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Network Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Network Options"/>
 			<node name="tab">
 				<node name="NetworkLibrary" value="Recherche réseau">
 				</node>
@@ -280,7 +280,7 @@
 			</node>
 		</node>
 		<node name="SystemOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - System Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - System Options"/>
 			<node name="tab">
 				<node name="Language" value="Langue">
 					<node name="autoDetect" value="Detecter la langue et l'encodage automatiquement"/>
@@ -307,7 +307,7 @@
 			</node>
 		</node>
 		<node name="ReadingOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Reading Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Reading Options"/>
 			<node name="tab">
 				<node name="Scrolling" value="Défilement">
 					<node name="keyScrollDelay" value="Délai entre défilement par touche, msec"/>
@@ -392,7 +392,7 @@
 			</node>
 		</node>
 		<node name="LookAndFeelOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Look &amp; Feel Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Look &amp; Feel Options"/>
 			<node name="tab">
 				<node name="CSS" value="CSS">
 					<node name="overrideSpecifiedFonts" value="Toujours utiliser mes propres polices"/>
@@ -449,7 +449,7 @@
 			</node>
 		</node>
 		<node name="InfoDialog">
-			<node name="title" value="FBReader - Informations sur le livre"/>
+			<node name="title" value="TDE-Ebook-Reader - Informations sur le livre"/>
 			<node name="tab">
 				<node name="Common" value="Général">
 					<node name="file" value="Fichier"/>
@@ -483,12 +483,12 @@
 			</node>
 		</node>
 		<node name="AuthorInfoDialog">
-			<node name="title" value="FBReader - Information sur l'auteur"/>
+			<node name="title" value="TDE-Ebook-Reader - Information sur l'auteur"/>
 			<node name="name" value="Nom de l'auteur"/>
 			<node name="sortKey" value="Clef de tri de l'auteur"/>
 		</node>
 		<node name="addFileDialog">
-			<node name="title" value="FBReader - Ajouter un livre à la bibliothèque"/>
+			<node name="title" value="TDE-Ebook-Reader - Ajouter un livre à la bibliothèque"/>
 		</node>
 		<node name="textSearchDialog">
 			<node name="title" value="Rechercher"/>
diff --git a/fbreader/data/resources/he.xml b/reader/data/resources/he.xml
index 00bf8bb..17f9f9c 100644
--- a/fbreader/data/resources/he.xml
+++ b/reader/data/resources/he.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Hebrew FBReader resources, by David Kachan -->
+<!-- Hebrew TDE-Ebook-Reader resources, by David Kachan -->
 <resources>
 	<node name="libraryView">
 		<node name="authorNode">
@@ -91,7 +91,7 @@
 			<node name="previousBook" value="ספר קודם"/>
 			<node name="showRecent" value="ספרים שנקראו"/>
 			<node name="addBook" value="הוספת ספר"/>
-			<node name="showHelp" value="אודות FBReader"/>
+			<node name="showHelp" value="אודות TDE-Ebook-Reader"/>
 		</node>
 		<node name="gotoHome" value="לתחילת הספר"/>
 		<node name="gotoPageNumber" value="עבור לעמוד מס' "/>
@@ -250,7 +250,7 @@
 			<node name="buyAndDownload" value="קניה &amp;והורדה"/>
 		</node>
 		<node name="LibraryOptionsDialog">
-			<node name="title" value="FBReader - Library Options" toBeTranslated="true"/>
+			<node name="title" value="TDE-Ebook-Reader - Library Options" toBeTranslated="true"/>
 			<node name="tab">
 				<node name="Library" value="ספריה">
 					<node name="bookPath" value="נתיב הספריה"/>
@@ -261,7 +261,7 @@
 			</node>
 		</node>
 		<node name="NetworkOptionsDialog">
-			<node name="title" value="FBReader - Network Options" toBeTranslated="true"/>
+			<node name="title" value="TDE-Ebook-Reader - Network Options" toBeTranslated="true"/>
 			<node name="tab">
 				<node name="NetworkLibrary" value="חיפוש ברשת">
 				</node>
@@ -280,7 +280,7 @@
 			</node>
 		</node>
 		<node name="SystemOptionsDialog">
-			<node name="title" value="FBReader - System Options" toBeTranslated="true"/>
+			<node name="title" value="TDE-Ebook-Reader - System Options" toBeTranslated="true"/>
 			<node name="tab">
 				<node name="Language" value="שפה">
 					<node name="autoDetect" value="זיהוי שפה וקידוד אוטומתי"/>
@@ -307,7 +307,7 @@
 			</node>
 		</node>
 		<node name="ReadingOptionsDialog">
-			<node name="title" value="FBReader - Reading Options" toBeTranslated="true"/>
+			<node name="title" value="TDE-Ebook-Reader - Reading Options" toBeTranslated="true"/>
 			<node name="tab">
 				<node name="Scrolling" value="דפדוף">
 					<node name="keyScrollDelay" value="עיכוב בדפדוף על ידי לחצנים"/>
@@ -392,7 +392,7 @@
 			</node>
 		</node>
 		<node name="LookAndFeelOptionsDialog">
-			<node name="title" value="FBReader - Look &amp; Feel Options" toBeTranslated="true"/>
+			<node name="title" value="TDE-Ebook-Reader - Look &amp; Feel Options" toBeTranslated="true"/>
 			<node name="tab">
 				<node name="CSS" value="CSS">
 					<node name="overrideSpecifiedFonts" value="לא להשתמש בגופני ברירת מחדל"/>
@@ -449,7 +449,7 @@
 			</node>
 		</node>
 		<node name="InfoDialog">
-			<node name="title" value="FBReader - אודות הספר"/>
+			<node name="title" value="TDE-Ebook-Reader - אודות הספר"/>
 			<node name="tab">
 				<node name="Common" value="מידע בסיסי">
 					<node name="file" value="קובץ"/>
@@ -483,12 +483,12 @@
 			</node>
 		</node>
 		<node name="AuthorInfoDialog">
-			<node name="title" value="FBReader - אודות מחבר"/>
+			<node name="title" value="TDE-Ebook-Reader - אודות מחבר"/>
 			<node name="name" value="שם"/>
 			<node name="sortKey" value="מיין לפי"/>
 		</node>
 		<node name="addFileDialog">
-			<node name="title" value="FBReader - הוספת ספר לספריה"/>
+			<node name="title" value="TDE-Ebook-Reader - הוספת ספר לספריה"/>
 		</node>
 		<node name="textSearchDialog">
 			<node name="title" value="חיפוש בטקסט"/>
diff --git a/fbreader/data/resources/hu.xml b/reader/data/resources/hu.xml
index ff2367f..90d7fe4 100644
--- a/fbreader/data/resources/hu.xml
+++ b/reader/data/resources/hu.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Hungarian FBReader resources, by Sándor Gábor -->
+<!-- Hungarian TDE-Ebook-Reader resources, by Sándor Gábor -->
 <resources>
 	<node name="libraryView">
 		<node name="authorNode">
@@ -91,7 +91,7 @@
 			<node name="previousBook" value="Előző kötet"/>
 			<node name="showRecent" value="Legutóbbi"/>
 			<node name="addBook" value="Könyv hozzáadása..."/>
-			<node name="showHelp" value="FBReader névjegye"/>
+			<node name="showHelp" value="TDE-Ebook-Reader névjegye"/>
 		</node>
 		<node name="gotoHome" value="A kötet elejére"/>
 		<node name="gotoPageNumber" value="Ugrás egy oldalra..."/>
@@ -203,7 +203,7 @@
 		</node>
 		<node name="showHelp">
 			<node name="label" value="Névjegy"/>
-			<node name="tooltip" value="FBReader névjegye"/>
+			<node name="tooltip" value="TDE-Ebook-Reader névjegye"/>
 		</node>
 		<node name="filterLibrary">
 			<node name="label" value="Szűrés"/>
@@ -250,7 +250,7 @@
 			<node name="buyAndDownload" value="Vásárlás &amp;és letöltés"/>
 		</node>
 		<node name="LibraryOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Library Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Library Options"/>
 			<node name="tab">
 				<node name="Library" value="Könyvtár">
 					<node name="bookPath" value="A könyvek helye"/>
@@ -261,7 +261,7 @@
 			</node>
 		</node>
 		<node name="NetworkOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Network Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Network Options"/>
 			<node name="tab">
 				<node name="NetworkLibrary" value="Keresés az Interneten">
 				</node>
@@ -280,7 +280,7 @@
 			</node>
 		</node>
 		<node name="SystemOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - System Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - System Options"/>
 			<node name="tab">
 				<node name="Language" value="Nyelv">
 					<node name="autoDetect" value="Nyelv és kódlap automatikus kiválasztása"/>
@@ -307,7 +307,7 @@
 			</node>
 		</node>
 		<node name="ReadingOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Reading Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Reading Options"/>
 			<node name="tab">
 				<node name="Scrolling" value="Görgetés">
 					<node name="keyScrollDelay" value="Várakozás a billentyűlenyomás után, ezredmásodperc"/>
@@ -392,7 +392,7 @@
 			</node>
 		</node>
 		<node name="LookAndFeelOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Look &amp; Feel Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Look &amp; Feel Options"/>
 			<node name="tab">
 				<node name="CSS" value="CSS">
 					<node name="overrideSpecifiedFonts" value="Kizárólag saját fontok használata"/>
@@ -449,7 +449,7 @@
 			</node>
 		</node>
 		<node name="InfoDialog">
-			<node name="title" value="FBReader - Kötet adatai"/>
+			<node name="title" value="TDE-Ebook-Reader - Kötet adatai"/>
 			<node name="tab">
 				<node name="Common" value="Alapadatok">
 					<node name="file" value="File"/>
@@ -483,12 +483,12 @@
 			</node>
 		</node>
 		<node name="AuthorInfoDialog">
-			<node name="title" value="FBReader - Szerző adatai"/>
+			<node name="title" value="TDE-Ebook-Reader - Szerző adatai"/>
 			<node name="name" value="Szerző neve"/>
 			<node name="sortKey" value="Szerző rendezési kulcs"/>
 		</node>
 		<node name="addFileDialog">
-			<node name="title" value="FBReader - Kötet hozzáadása a könyvtárhoz"/>
+			<node name="title" value="TDE-Ebook-Reader - Kötet hozzáadása a könyvtárhoz"/>
 		</node>
 		<node name="textSearchDialog">
 			<node name="title" value="Szöveg keresése"/>
diff --git a/fbreader/data/resources/id.xml b/reader/data/resources/id.xml
index 86b975b..036f583 100644
--- a/fbreader/data/resources/id.xml
+++ b/reader/data/resources/id.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Indonesian FBReader resources, by Ketut Putu Kumajaya -->
+<!-- Indonesian TDE-Ebook-Reader resources, by Ketut Putu Kumajaya -->
 <resources>
 	<node name="libraryView">
 		<node name="authorNode">
@@ -91,7 +91,7 @@
 			<node name="previousBook" value="Buku Sebelumnya"/>
 			<node name="showRecent" value="Buku-buku Sebelumnya"/>
 			<node name="addBook" value="Tambah Buku..."/>
-			<node name="showHelp" value="Mengenai FBReader"/>
+			<node name="showHelp" value="Mengenai TDE-Ebook-Reader"/>
 		</node>
 		<node name="gotoHome" value="Ke Awal Dokumen"/>
 		<node name="gotoPageNumber" value="Ke Halaman..."/>
@@ -203,7 +203,7 @@
 		</node>
 		<node name="showHelp">
 			<node name="label" toBeTranslated="true" value="About"/>
-			<node name="tooltip" value="Mengenai FBReader"/>
+			<node name="tooltip" value="Mengenai TDE-Ebook-Reader"/>
 		</node>
 		<node name="filterLibrary">
 			<node name="label" toBeTranslated="true" value="Filter"/>
@@ -250,7 +250,7 @@
 			<node name="buyAndDownload" toBeTranslated="true" value="Buy and &amp;download"/>
 		</node>
 		<node name="LibraryOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Library Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Library Options"/>
 			<node name="tab">
 				<node name="Library" value="Pustaka">
 					<node name="bookPath" value="Lokasi Buku"/>
@@ -261,7 +261,7 @@
 			</node>
 		</node>
 		<node name="NetworkOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Network Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Network Options"/>
 			<node name="tab">
 				<node name="NetworkLibrary" value="Pencarian Jaringan">
 				</node>
@@ -280,7 +280,7 @@
 			</node>
 		</node>
 		<node name="SystemOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - System Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - System Options"/>
 			<node name="tab">
 				<node name="Language" value="Bahasa">
 					<node name="autoDetect" value="Deteksi Bahasa dan Enkode secara Otomatis"/>
@@ -307,7 +307,7 @@
 			</node>
 		</node>
 		<node name="ReadingOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Reading Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Reading Options"/>
 			<node name="tab">
 				<node name="Scrolling" value="Geser Layar">
 					<node name="keyScrollDelay" toBeTranslated="true" value="Delay between Key Scrollings, msecs"/>
@@ -392,7 +392,7 @@
 			</node>
 		</node>
 		<node name="LookAndFeelOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Look &amp; Feel Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Look &amp; Feel Options"/>
 			<node name="tab">
 				<node name="CSS" value="CSS">
 					<node name="overrideSpecifiedFonts" value="Gunakan Selalu Bentuk Huruf Milik Saya"/>
@@ -449,7 +449,7 @@
 			</node>
 		</node>
 		<node name="InfoDialog">
-			<node name="title" value="FBReader - Informasi Buku"/>
+			<node name="title" value="TDE-Ebook-Reader - Informasi Buku"/>
 			<node name="tab">
 				<node name="Common" value="Umum">
 					<node name="file" value="Berkas"/>
@@ -483,12 +483,12 @@
 			</node>
 		</node>
 		<node name="AuthorInfoDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Author Info"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Author Info"/>
 			<node name="name" toBeTranslated="true" value="Author Name"/>
 			<node name="sortKey" toBeTranslated="true" value="Author Sort Key"/>
 		</node>
 		<node name="addFileDialog">
-			<node name="title" value="FBReader - Tambahkan Buku ke Pustaka"/>
+			<node name="title" value="TDE-Ebook-Reader - Tambahkan Buku ke Pustaka"/>
 		</node>
 		<node name="textSearchDialog">
 			<node name="title" value="Pencarian Text"/>
diff --git a/fbreader/data/resources/it.xml b/reader/data/resources/it.xml
index 7f9f3f9..df2d10c 100644
--- a/fbreader/data/resources/it.xml
+++ b/reader/data/resources/it.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Italian FBReader resources, by Floriano Scioscia -->
+<!-- Italian TDE-Ebook-Reader resources, by Floriano Scioscia -->
 <resources>
 	<node name="libraryView">
 		<node name="authorNode">
@@ -91,7 +91,7 @@
 			<node name="previousBook" value="Libro Precedente"/>
 			<node name="showRecent" value="Recenti"/>
 			<node name="addBook" value="Aggiungi Libro..."/>
-			<node name="showHelp" value="Informazioni su FBReader"/>
+			<node name="showHelp" value="Informazioni su TDE-Ebook-Reader"/>
 		</node>
 		<node name="gotoHome" value="Vai all'Inizio del Documento"/>
 		<node name="gotoPageNumber" value="Vai a Pagina..."/>
@@ -203,7 +203,7 @@
 		</node>
 		<node name="showHelp">
 			<node name="label" toBeTranslated="true" value="About"/>
-			<node name="tooltip" value="Informazioni su FBReader"/>
+			<node name="tooltip" value="Informazioni su TDE-Ebook-Reader"/>
 		</node>
 		<node name="filterLibrary">
 			<node name="label" toBeTranslated="true" value="Filter"/>
@@ -250,7 +250,7 @@
 			<node name="buyAndDownload" value="Compra e &amp;scarica"/>
 		</node>
 		<node name="LibraryOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Library Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Library Options"/>
 			<node name="tab">
 				<node name="Library" value="Biblioteca">
 					<node name="bookPath" value="Percorso Libri"/>
@@ -261,7 +261,7 @@
 			</node>
 		</node>
 		<node name="NetworkOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Network Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Network Options"/>
 			<node name="tab">
 				<node name="NetworkLibrary" value="Ricerca Rete">
 				</node>
@@ -280,7 +280,7 @@
 			</node>
 		</node>
 		<node name="SystemOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - System Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - System Options"/>
 			<node name="tab">
 				<node name="Language" value="Lingua">
 					<node name="autoDetect" value="Riconosci Lingua e Codifica Automaticamente"/>
@@ -307,7 +307,7 @@
 			</node>
 		</node>
 		<node name="ReadingOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Reading Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Reading Options"/>
 			<node name="tab">
 				<node name="Scrolling" value="Scorrimento">
 					<node name="keyScrollDelay" value="Rtiardo tra Scorrimento Tasti, msec"/>
@@ -392,7 +392,7 @@
 			</node>
 		</node>
 		<node name="LookAndFeelOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Look &amp; Feel Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Look &amp; Feel Options"/>
 			<node name="tab">
 				<node name="CSS" value="CSS">
 					<node name="overrideSpecifiedFonts" value="Usa Sempre i Miei Font"/>
@@ -449,7 +449,7 @@
 			</node>
 		</node>
 		<node name="InfoDialog">
-			<node name="title" value="FBReader - Informazioni Libro"/>
+			<node name="title" value="TDE-Ebook-Reader - Informazioni Libro"/>
 			<node name="tab">
 				<node name="Common" value="Comuni">
 					<node name="file" value="File"/>
@@ -483,12 +483,12 @@
 			</node>
 		</node>
 		<node name="AuthorInfoDialog">
-			<node name="title" value="FBReader - Informazioni sull'Autore"/>
+			<node name="title" value="TDE-Ebook-Reader - Informazioni sull'Autore"/>
 			<node name="name" value="Nome dell'Autore"/>
 			<node name="sortKey" value="Tasto Ordinamento Autori"/>
 		</node>
 		<node name="addFileDialog">
-			<node name="title" value="FBReader - Aggiungi Libro alla Biblioteca"/>
+			<node name="title" value="TDE-Ebook-Reader - Aggiungi Libro alla Biblioteca"/>
 		</node>
 		<node name="textSearchDialog">
 			<node name="title" value="Trova Testo"/>
diff --git a/fbreader/data/resources/lt.xml b/reader/data/resources/lt.xml
index 255064e..6c5fbda 100644
--- a/fbreader/data/resources/lt.xml
+++ b/reader/data/resources/lt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Lithuanian FBReader resources, by Stanislovas Zacharovas -->
+<!-- Lithuanian TDE-Ebook-Reader resources, by Stanislovas Zacharovas -->
 <resources>
 	<node name="libraryView">
 		<node name="authorNode">
@@ -91,7 +91,7 @@
 			<node name="previousBook" value="Ankstesnė knyga"/>
 			<node name="showRecent" value="Paskutinės žiūrėtos"/>
 			<node name="addBook" value="Pridėti knygą..."/>
-			<node name="showHelp" value="Apie FBReader"/>
+			<node name="showHelp" value="Apie TDE-Ebook-Reader"/>
 		</node>
 		<node name="gotoHome" value="Eiti į pradžią"/>
 		<node name="gotoPageNumber" value="Atversti puslapį Nr..."/>
@@ -203,7 +203,7 @@
 		</node>
 		<node name="showHelp">
 			<node name="label" value="Apie"/>
-			<node name="tooltip" value="Apie FBReader"/>
+			<node name="tooltip" value="Apie TDE-Ebook-Reader"/>
 		</node>
 		<node name="filterLibrary">
 			<node name="label" value="Filtras"/>
@@ -250,7 +250,7 @@
 			<node name="buyAndDownload" value="Pirkti ir &amp;nusikrauti"/>
 		</node>
 		<node name="LibraryOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Library Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Library Options"/>
 			<node name="tab">
 				<node name="Library" value="Biblioteka">
 					<node name="bookPath" value="Kelias prie knygos (knygų)"/>
@@ -261,7 +261,7 @@
 			</node>
 		</node>
 		<node name="NetworkOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Network Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Network Options"/>
 			<node name="tab">
 				<node name="NetworkLibrary" value="Interneto bibliotekos">
 				</node>
@@ -280,7 +280,7 @@
 			</node>
 		</node>
 		<node name="SystemOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - System Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - System Options"/>
 			<node name="tab">
 				<node name="Language" value="Kalba">
 					<node name="autoDetect" value="Automatinis kalbos ir koduotės atpažinimas"/>
@@ -307,7 +307,7 @@
 			</node>
 		</node>
 		<node name="ReadingOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Reading Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Reading Options"/>
 			<node name="tab">
 				<node name="Scrolling" value="Puslapio keitimas">
 					<node name="keyScrollDelay" value="Puslapio keitimo užlaikymas, msec."/>
@@ -392,7 +392,7 @@
 			</node>
 		</node>
 		<node name="LookAndFeelOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Look &amp; Feel Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Look &amp; Feel Options"/>
 			<node name="tab">
 				<node name="CSS" value="CSS">
 					<node name="overrideSpecifiedFonts" value="Visada naudoti mano šriftą"/>
@@ -449,7 +449,7 @@
 			</node>
 		</node>
 		<node name="InfoDialog">
-			<node name="title" value="FBReader - Informacija apie knygą"/>
+			<node name="title" value="TDE-Ebook-Reader - Informacija apie knygą"/>
 			<node name="tab">
 				<node name="Common" value="Bendrai">
 					<node name="file" value="Failas"/>
@@ -483,12 +483,12 @@
 			</node>
 		</node>
 		<node name="AuthorInfoDialog">
-			<node name="title" value="FBReader - Informacija apie autorių"/>
+			<node name="title" value="TDE-Ebook-Reader - Informacija apie autorių"/>
 			<node name="name" value="Autoriaus vardas"/>
 			<node name="sortKey" value="Rūšiuoti autorius"/>
 		</node>
 		<node name="addFileDialog">
-			<node name="title" value="FBReader - Pridėti knygą į biblioteką"/>
+			<node name="title" value="TDE-Ebook-Reader - Pridėti knygą į biblioteką"/>
 		</node>
 		<node name="textSearchDialog">
 			<node name="title" value="Paieška tekste"/>
diff --git a/fbreader/data/resources/nl.xml b/reader/data/resources/nl.xml
index 1acc211..65f7c53 100644
--- a/fbreader/data/resources/nl.xml
+++ b/reader/data/resources/nl.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Dutch FBReader resources, by Bosel -->
+<!-- Dutch TDE-Ebook-Reader resources, by Bosel -->
 <resources>
 	<node name="libraryView">
 		<node name="authorNode">
@@ -91,7 +91,7 @@
 			<node name="previousBook" value="Vorig boek"/>
 			<node name="showRecent" value="Recent"/>
 			<node name="addBook" value="Boek toevoegen..."/>
-			<node name="showHelp" value="Over FBReader"/>
+			<node name="showHelp" value="Over TDE-Ebook-Reader"/>
 		</node>
 		<node name="gotoHome" value="Ga naar het begin van het document"/>
 		<node name="gotoPageNumber" value="Ga naar pagina..."/>
@@ -203,7 +203,7 @@
 		</node>
 		<node name="showHelp">
 			<node name="label" value="Over"/>
-			<node name="tooltip" value="Over FBReader"/>
+			<node name="tooltip" value="Over TDE-Ebook-Reader"/>
 		</node>
 		<node name="filterLibrary">
 			<node name="label" toBeTranslated="true" value="Filter"/>
@@ -250,7 +250,7 @@
 			<node name="buyAndDownload" value="Koop en &amp;download"/>
 		</node>
 		<node name="LibraryOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Library Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Library Options"/>
 			<node name="tab">
 				<node name="Library" value="Bibliotheek">
 					<node name="bookPath" value="Boek Locaties"/>
@@ -261,7 +261,7 @@
 			</node>
 		</node>
 		<node name="NetworkOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Network Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Network Options"/>
 			<node name="tab">
 				<node name="NetworkLibrary" value="online bibliotheken">
 				</node>
@@ -280,7 +280,7 @@
 			</node>
 		</node>
 		<node name="SystemOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - System Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - System Options"/>
 			<node name="tab">
 				<node name="Language" value="Taal">
 					<node name="autoDetect" value="Taal en Codering automatisch detecteren"/>
@@ -307,7 +307,7 @@
 			</node>
 		</node>
 		<node name="ReadingOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Reading Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Reading Options"/>
 			<node name="tab">
 				<node name="Scrolling" value="Scrolling">
 					<node name="keyScrollDelay" value="Vertraging tussen Toets Scrollings, msecs"/>
@@ -392,7 +392,7 @@
 			</node>
 		</node>
 		<node name="LookAndFeelOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Look &amp; Feel Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Look &amp; Feel Options"/>
 			<node name="tab">
 				<node name="CSS" value="CSS">
 					<node name="overrideSpecifiedFonts" value="Altijd mijn eigen Fonts gebruiken"/>
@@ -449,7 +449,7 @@
 			</node>
 		</node>
 		<node name="InfoDialog">
-			<node name="title" value="FBReader - Boek Info"/>
+			<node name="title" value="TDE-Ebook-Reader - Boek Info"/>
 			<node name="tab">
 				<node name="Common" value="Standaard">
 					<node name="file" value="Bestand"/>
@@ -483,12 +483,12 @@
 			</node>
 		</node>
 		<node name="AuthorInfoDialog">
-			<node name="title" value="FBReader - Auteur Info"/>
+			<node name="title" value="TDE-Ebook-Reader - Auteur Info"/>
 			<node name="name" value="Naam Auteur"/>
 			<node name="sortKey" value="Sorteer Sleutel Auteur"/>
 		</node>
 		<node name="addFileDialog">
-			<node name="title" value="FBReader - Boek aan de Bibliotheek Toevoegen"/>
+			<node name="title" value="TDE-Ebook-Reader - Boek aan de Bibliotheek Toevoegen"/>
 		</node>
 		<node name="textSearchDialog">
 			<node name="title" value="Tekst Zoeken"/>
diff --git a/fbreader/data/resources/pl.xml b/reader/data/resources/pl.xml
index 1a25a3c..c47405f 100644
--- a/fbreader/data/resources/pl.xml
+++ b/reader/data/resources/pl.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Polish FBReader resources, by Rafał Bakuła -->
+<!-- Polish TDE-Ebook-Reader resources, by Rafał Bakuła -->
 <resources>
 	<node name="libraryView">
 		<node name="authorNode">
@@ -91,7 +91,7 @@
 			<node name="previousBook" value="Poprzednia książka"/>
 			<node name="showRecent" value="Poprzednia"/>
 			<node name="addBook" value="Dodaj książkę..."/>
-			<node name="showHelp" value="O FBReader"/>
+			<node name="showHelp" value="O TDE-Ebook-Reader"/>
 		</node>
 		<node name="gotoHome" value="Idź na początek dokumentu"/>
 		<node name="gotoPageNumber" value="Idź na stronę..."/>
@@ -203,7 +203,7 @@
 		</node>
 		<node name="showHelp">
 			<node name="label" value="Informacje"/>
-			<node name="tooltip" value="O FBReader"/>
+			<node name="tooltip" value="O TDE-Ebook-Reader"/>
 		</node>
 		<node name="filterLibrary">
 			<node name="label" value="Filtr"/>
@@ -250,7 +250,7 @@
 			<node name="buyAndDownload" value="Kup i &amp;pobierz"/>
 		</node>
 		<node name="LibraryOptionsDialog">
-			<node name="title" value="FBReader - Opcje biblioteki"/>
+			<node name="title" value="TDE-Ebook-Reader - Opcje biblioteki"/>
 			<node name="tab">
 				<node name="Library" value="Biblioteka">
 					<node name="bookPath" value="Katalog z książkami"/>
@@ -261,7 +261,7 @@
 			</node>
 		</node>
 		<node name="NetworkOptionsDialog">
-			<node name="title" value="FBReader - Opcje sieci"/>
+			<node name="title" value="TDE-Ebook-Reader - Opcje sieci"/>
 			<node name="tab">
 				<node name="NetworkLibrary" value="Szukanie w sieci">
 				</node>
@@ -280,7 +280,7 @@
 			</node>
 		</node>
 		<node name="SystemOptionsDialog">
-			<node name="title" value="FBReader - Opcje systemu"/>
+			<node name="title" value="TDE-Ebook-Reader - Opcje systemu"/>
 			<node name="tab">
 				<node name="Language" value="Język">
 					<node name="autoDetect" value="Automatycznie wykryj język i kodowanie"/>
@@ -307,7 +307,7 @@
 			</node>
 		</node>
 		<node name="ReadingOptionsDialog">
-			<node name="title" value="FBReader - Opcje działania"/>
+			<node name="title" value="TDE-Ebook-Reader - Opcje działania"/>
 			<node name="tab">
 				<node name="Scrolling" value="Przewijanie">
 					<node name="keyScrollDelay" value="Opóźnienie powtarzania klawisza, ms"/>
@@ -392,7 +392,7 @@
 			</node>
 		</node>
 		<node name="LookAndFeelOptionsDialog">
-			<node name="title" value="FBReader - Opcje wyglądu i działania"/>
+			<node name="title" value="TDE-Ebook-Reader - Opcje wyglądu i działania"/>
 			<node name="tab">
 				<node name="CSS" value="Personalizacja wyświetlania (CSS)">
 					<node name="overrideSpecifiedFonts" value="Zawsze używaj moje czcionki"/>
@@ -449,7 +449,7 @@
 			</node>
 		</node>
 		<node name="InfoDialog">
-			<node name="title" value="FBReader - Informacje o książce"/>
+			<node name="title" value="TDE-Ebook-Reader - Informacje o książce"/>
 			<node name="tab">
 				<node name="Common" value="Podstawowe">
 					<node name="file" value="Plik"/>
@@ -483,12 +483,12 @@
 			</node>
 		</node>
 		<node name="AuthorInfoDialog">
-			<node name="title" value="FBReader - Informacje o autorze"/>
+			<node name="title" value="TDE-Ebook-Reader - Informacje o autorze"/>
 			<node name="name" value="Autor"/>
 			<node name="sortKey" value="Sortuj według"/>
 		</node>
 		<node name="addFileDialog">
-			<node name="title" value="FBReader - Dodaj książkę do biblioteki"/>
+			<node name="title" value="TDE-Ebook-Reader - Dodaj książkę do biblioteki"/>
 		</node>
 		<node name="textSearchDialog">
 			<node name="title" value="Szukaj tekstu"/>
diff --git a/fbreader/data/resources/ru.xml b/reader/data/resources/ru.xml
index 61c813e..113bfca 100644
--- a/fbreader/data/resources/ru.xml
+++ b/reader/data/resources/ru.xml
@@ -127,7 +127,7 @@
 			<node name="previousBook" value="Предыдущая книга"/>
 			<node name="showRecent" value="Прочитанные книги"/>
 			<node name="addBook" value="Добавить файл..."/>
-			<node name="showHelp" value="О программе FBReader"/>
+			<node name="showHelp" value="О программе TDE-Ebook-Reader"/>
 		</node>
 		<node name="gotoHome" value="В начало книги"/>
 		<node name="gotoPageNumber" value="На страницу..."/>
@@ -286,7 +286,7 @@
 			<node name="buyAndDownload" value="Купить и &amp;скачать"/>
 		</node>
 		<node name="LibraryOptionsDialog">
-			<node name="title" value="FBReader - Настройки библиотеки"/>
+			<node name="title" value="TDE-Ebook-Reader - Настройки библиотеки"/>
 			<node name="tab">
 				<node name="Library" value="Библиотека">
 					<node name="bookPath" value="Каталоги с книгами"/>
@@ -297,7 +297,7 @@
 			</node>
 		</node>
 		<node name="NetworkOptionsDialog">
-			<node name="title" value="FBReader - Сетевые настройки"/>
+			<node name="title" value="TDE-Ebook-Reader - Сетевые настройки"/>
 			<node name="tab">
 				<node name="NetworkLibrary" value="Поиск в сети">
 				</node>
@@ -316,7 +316,7 @@
 			</node>
 		</node>
 		<node name="SystemOptionsDialog">
-			<node name="title" value="FBReader - Системные настройки"/>
+			<node name="title" value="TDE-Ebook-Reader - Системные настройки"/>
 			<node name="tab">
 				<node name="Language" value="Язык">
 					<node name="autoDetect" value="Автоматически определять язык и кодировку"/>
@@ -343,7 +343,7 @@
 			</node>
 		</node>
 		<node name="ReadingOptionsDialog">
-			<node name="title" value="FBReader - Настройки чтения"/>
+			<node name="title" value="TDE-Ebook-Reader - Настройки чтения"/>
 			<node name="tab">
 				<node name="Scrolling" value="Перелистывание">
 					<node name="keyScrollDelay" value="Задержка между листаниями клавишами"/>
@@ -428,7 +428,7 @@
 			</node>
 		</node>
 		<node name="LookAndFeelOptionsDialog">
-			<node name="title" value="FBReader - Настройки внешнего вида"/>
+			<node name="title" value="TDE-Ebook-Reader - Настройки внешнего вида"/>
 			<node name="tab">
 				<node name="CSS" value="CSS">
 					<node name="overrideSpecifiedFonts" value="Всегда использовать собственные шрифты"/>
@@ -485,7 +485,7 @@
 			</node>
 		</node>
 		<node name="InfoDialog">
-			<node name="title" value="FBReader - Информация о книге"/>
+			<node name="title" value="TDE-Ebook-Reader - Информация о книге"/>
 			<node name="tab">
 				<node name="Common" value="Основная информация">
 					<node name="file" value="Файл"/>
@@ -519,12 +519,12 @@
 			</node>
 		</node>
 		<node name="AuthorInfoDialog">
-			<node name="title" value="FBReader - Информация об авторе"/>
+			<node name="title" value="TDE-Ebook-Reader - Информация об авторе"/>
 			<node name="name" value="Имя"/>
 			<node name="sortKey" value="Сортировать по"/>
 		</node>
 		<node name="addFileDialog">
-			<node name="title" value="FBReader - Добавление книги в библиотеку"/>
+			<node name="title" value="TDE-Ebook-Reader - Добавление книги в библиотеку"/>
 		</node>
 		<node name="textSearchDialog">
 			<node name="title" value="Поиск по тексту"/>
diff --git a/fbreader/data/resources/sv.xml b/reader/data/resources/sv.xml
index f588efd..59ad7bf 100644
--- a/fbreader/data/resources/sv.xml
+++ b/reader/data/resources/sv.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Swedish FBReader resources, by Daniel Nylander -->
+<!-- Swedish TDE-Ebook-Reader resources, by Daniel Nylander -->
 <resources>
 	<node name="libraryView">
 		<node name="authorNode">
@@ -91,7 +91,7 @@
 			<node name="previousBook" value="Föregående bok"/>
 			<node name="showRecent" value="Tidigare"/>
 			<node name="addBook" value="Lägg till bok..."/>
-			<node name="showHelp" value="Om FBReader"/>
+			<node name="showHelp" value="Om TDE-Ebook-Reader"/>
 		</node>
 		<node name="gotoHome" value="Gå till början av dokumentet"/>
 		<node name="gotoPageNumber" toBeTranslated="true" value="Go to Page..."/>
@@ -203,7 +203,7 @@
 		</node>
 		<node name="showHelp">
 			<node name="label" toBeTranslated="true" value="About"/>
-			<node name="tooltip" value="Om FBReader"/>
+			<node name="tooltip" value="Om TDE-Ebook-Reader"/>
 		</node>
 		<node name="filterLibrary">
 			<node name="label" toBeTranslated="true" value="Filter"/>
@@ -250,7 +250,7 @@
 			<node name="buyAndDownload" toBeTranslated="true" value="Buy and &amp;download"/>
 		</node>
 		<node name="LibraryOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Library Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Library Options"/>
 			<node name="tab">
 				<node name="Library" value="Bibliotek">
 					<node name="bookPath" value="Boksökväg"/>
@@ -261,7 +261,7 @@
 			</node>
 		</node>
 		<node name="NetworkOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Network Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Network Options"/>
 			<node name="tab">
 				<node name="NetworkLibrary" toBeTranslated="true" value="Network Search">
 				</node>
@@ -280,7 +280,7 @@
 			</node>
 		</node>
 		<node name="SystemOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - System Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - System Options"/>
 			<node name="tab">
 				<node name="Language" value="Språk">
 					<node name="autoDetect" value="Upptäck automatiskt språk och kodning"/>
@@ -307,7 +307,7 @@
 			</node>
 		</node>
 		<node name="ReadingOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Reading Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Reading Options"/>
 			<node name="tab">
 				<node name="Scrolling" value="Rullning">
 					<node name="keyScrollDelay" toBeTranslated="true" value="Delay between Key Scrollings, msecs"/>
@@ -392,7 +392,7 @@
 			</node>
 		</node>
 		<node name="LookAndFeelOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Look &amp; Feel Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Look &amp; Feel Options"/>
 			<node name="tab">
 				<node name="CSS" toBeTranslated="true" value="CSS">
 					<node name="overrideSpecifiedFonts" toBeTranslated="true" value="Always Use My Own Fonts"/>
@@ -449,7 +449,7 @@
 			</node>
 		</node>
 		<node name="InfoDialog">
-			<node name="title" value="FBReader - Bokinformation"/>
+			<node name="title" value="TDE-Ebook-Reader - Bokinformation"/>
 			<node name="tab">
 				<node name="Common" value="Allmänt">
 					<node name="file" value="Fil"/>
@@ -483,12 +483,12 @@
 			</node>
 		</node>
 		<node name="AuthorInfoDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Author Info"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Author Info"/>
 			<node name="name" toBeTranslated="true" value="Author Name"/>
 			<node name="sortKey" toBeTranslated="true" value="Author Sort Key"/>
 		</node>
 		<node name="addFileDialog">
-			<node name="title" value="FBReader - Lägg till bok till biblioteket"/>
+			<node name="title" value="TDE-Ebook-Reader - Lägg till bok till biblioteket"/>
 		</node>
 		<node name="textSearchDialog">
 			<node name="title" value="Textsökning"/>
diff --git a/fbreader/data/resources/uk.xml b/reader/data/resources/uk.xml
index 9fae704..019ca78 100644
--- a/fbreader/data/resources/uk.xml
+++ b/reader/data/resources/uk.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Ukrainian FBReader resources, by Valentina Kanevska -->
+<!-- Ukrainian TDE-Ebook-Reader resources, by Valentina Kanevska -->
 <resources>
 	<node name="libraryView">
 		<node name="authorNode">
@@ -91,7 +91,7 @@
 			<node name="previousBook" value="Попередня книга"/>
 			<node name="showRecent" value="Прочитані книги"/>
 			<node name="addBook" value="Додати файл..."/>
-			<node name="showHelp" value="Про програму FBReader"/>
+			<node name="showHelp" value="Про програму TDE-Ebook-Reader"/>
 		</node>
 		<node name="gotoHome" value="На початок книги"/>
 		<node name="gotoPageNumber" value="До сторінки..."/>
@@ -250,7 +250,7 @@
 			<node name="buyAndDownload" value="Купити та &amp;завантажити"/>
 		</node>
 		<node name="LibraryOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Library Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Library Options"/>
 			<node name="tab">
 				<node name="Library" value="Бібліотека">
 					<node name="bookPath" value="Каталоги з книгами"/>
@@ -261,7 +261,7 @@
 			</node>
 		</node>
 		<node name="NetworkOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Network Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Network Options"/>
 			<node name="tab">
 				<node name="NetworkLibrary" value="Пошук у мережі">
 				</node>
@@ -280,7 +280,7 @@
 			</node>
 		</node>
 		<node name="SystemOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - System Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - System Options"/>
 			<node name="tab">
 				<node name="Language" value="Мова">
 					<node name="autoDetect" value="Визначити мову та кодувати автоматично"/>
@@ -307,7 +307,7 @@
 			</node>
 		</node>
 		<node name="ReadingOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Reading Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Reading Options"/>
 			<node name="tab">
 				<node name="Scrolling" value="Перегортання">
 					<node name="keyScrollDelay" value="Затримка між перегортання клавішами, мілісекунди"/>
@@ -392,7 +392,7 @@
 			</node>
 		</node>
 		<node name="LookAndFeelOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Look &amp; Feel Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Look &amp; Feel Options"/>
 			<node name="tab">
 				<node name="CSS" value="CSS">
 					<node name="overrideSpecifiedFonts" value="Завжди використовувати власні шрифти"/>
@@ -449,7 +449,7 @@
 			</node>
 		</node>
 		<node name="InfoDialog">
-			<node name="title" value="FBReader - Інформація про книгу"/>
+			<node name="title" value="TDE-Ebook-Reader - Інформація про книгу"/>
 			<node name="tab">
 				<node name="Common" value="Основна інформація">
 					<node name="file" value="Файл"/>
@@ -483,12 +483,12 @@
 			</node>
 		</node>
 		<node name="AuthorInfoDialog">
-			<node name="title" value="FBReader - Інформація про автора"/>
+			<node name="title" value="TDE-Ebook-Reader - Інформація про автора"/>
 			<node name="name" value="Ім'я автора"/>
 			<node name="sortKey" value="Сортувати за авторами"/>
 		</node>
 		<node name="addFileDialog">
-			<node name="title" value="FBReader - Додавання книги до бібліотеки"/>
+			<node name="title" value="TDE-Ebook-Reader - Додавання книги до бібліотеки"/>
 		</node>
 		<node name="textSearchDialog">
 			<node name="title" value="Пошук по тексту"/>
diff --git a/fbreader/data/resources/vi.xml b/reader/data/resources/vi.xml
index 8b20a18..dc92878 100644
--- a/fbreader/data/resources/vi.xml
+++ b/reader/data/resources/vi.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Vietnamese FBReader resources, by Phạm Văn Hùng_Firestork -->
+<!-- Vietnamese TDE-Ebook-Reader resources, by Phạm Văn Hùng_Firestork -->
 <resources>
 	<node name="libraryView">
 		<node name="authorNode">
@@ -91,7 +91,7 @@
 			<node name="previousBook" value="Quyển trước"/>
 			<node name="showRecent" value="Vừa xem"/>
 			<node name="addBook" value="Thêm sách..."/>
-			<node name="showHelp" value="Nói về FBreader"/>
+			<node name="showHelp" value="Nói về tde-ebook-reader"/>
 		</node>
 		<node name="gotoHome" value="Đến vị trí đầu của Tài liệu"/>
 		<node name="gotoPageNumber" value="Đến trang..."/>
@@ -203,7 +203,7 @@
 		</node>
 		<node name="showHelp">
 			<node name="label" value="Nói về"/>
-			<node name="tooltip" value="Về FBreader"/>
+			<node name="tooltip" value="Về tde-ebook-reader"/>
 		</node>
 		<node name="filterLibrary">
 			<node name="label" value="Bộ lọc"/>
@@ -250,7 +250,7 @@
 			<node name="buyAndDownload" value="Mua và &amp;tải về"/>
 		</node>
 		<node name="LibraryOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Library Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Library Options"/>
 			<node name="tab">
 				<node name="Library" value="Thư viện">
 					<node name="bookPath" value="Đường dẫn tới Sách"/>
@@ -261,7 +261,7 @@
 			</node>
 		</node>
 		<node name="NetworkOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Network Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Network Options"/>
 			<node name="tab">
 				<node name="NetworkLibrary" value="Tìm kiếm trên Mạng">
 				</node>
@@ -280,7 +280,7 @@
 			</node>
 		</node>
 		<node name="SystemOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - System Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - System Options"/>
 			<node name="tab">
 				<node name="Language" value="Ngôn ngữ">
 					<node name="autoDetect" value="Tự động Lựa chọn Ngôn ngữ và cách Giải mã"/>
@@ -307,7 +307,7 @@
 			</node>
 		</node>
 		<node name="ReadingOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Reading Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Reading Options"/>
 			<node name="tab">
 				<node name="Scrolling" value="Cuộn">
 					<node name="keyScrollDelay" value="Thời gian giữa 2 lần ấn Phím Cuộn, mili giây"/>
@@ -392,7 +392,7 @@
 			</node>
 		</node>
 		<node name="LookAndFeelOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Look &amp; Feel Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Look &amp; Feel Options"/>
 			<node name="tab">
 				<node name="CSS" value="CSS">
 					<node name="overrideSpecifiedFonts" value="Luôn luôn Sử dụng Phông của Tôi"/>
@@ -449,7 +449,7 @@
 			</node>
 		</node>
 		<node name="InfoDialog">
-			<node name="title" value="FBReader - Thông tin sách"/>
+			<node name="title" value="TDE-Ebook-Reader - Thông tin sách"/>
 			<node name="tab">
 				<node name="Common" value="Tổng quát">
 					<node name="file" value="Tập tin"/>
@@ -483,12 +483,12 @@
 			</node>
 		</node>
 		<node name="AuthorInfoDialog">
-			<node name="title" value="FBReader - Thông tin Tác giả"/>
+			<node name="title" value="TDE-Ebook-Reader - Thông tin Tác giả"/>
 			<node name="name" value="Tên Tác giả"/>
 			<node name="sortKey" value="Khóa Xếp Tác giả"/>
 		</node>
 		<node name="addFileDialog">
-			<node name="title" value="FBReader - Thêm Sách vào Thư viện"/>
+			<node name="title" value="TDE-Ebook-Reader - Thêm Sách vào Thư viện"/>
 		</node>
 		<node name="textSearchDialog">
 			<node name="title" value="Tìm Chữ"/>
diff --git a/fbreader/data/resources/zh.xml b/reader/data/resources/zh.xml
index 0aca79d..4ba293d 100644
--- a/fbreader/data/resources/zh.xml
+++ b/reader/data/resources/zh.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Chinese FBReader resources, by http://shucang.com/ -->
+<!-- Chinese TDE-Ebook-Reader resources, by http://shucang.com/ -->
 <resources>
 	<node name="libraryView">
 		<node name="authorNode">
@@ -91,7 +91,7 @@
 			<node name="previousBook" value="上一本书"/>
 			<node name="showRecent" value="最近阅读"/>
 			<node name="addBook" value="添加书籍..."/>
-			<node name="showHelp" value="关于 FBReader"/>
+			<node name="showHelp" value="关于 TDE-Ebook-Reader"/>
 		</node>
 		<node name="gotoHome" value="跳转到文档开始"/>
 		<node name="gotoPageNumber" value="跳转到某页..."/>
@@ -202,8 +202,8 @@
 			<node name="tooltip" value="旋转"/>
 		</node>
 		<node name="showHelp">
-			<node name="label" value="关于 FBReader"/>
-			<node name="tooltip" value="关于 FBReader"/>
+			<node name="label" value="关于 TDE-Ebook-Reader"/>
+			<node name="tooltip" value="关于 TDE-Ebook-Reader"/>
 		</node>
 		<node name="filterLibrary">
 			<node name="label" value="筛选"/>
@@ -250,7 +250,7 @@
 			<node name="buyAndDownload" value="购买 &amp;下载"/>
 		</node>
 		<node name="LibraryOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Library Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Library Options"/>
 			<node name="tab">
 				<node name="Library" value="书库">
 					<node name="bookPath" value="书籍路径"/>
@@ -261,7 +261,7 @@
 			</node>
 		</node>
 		<node name="NetworkOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Network Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Network Options"/>
 			<node name="tab">
 				<node name="NetworkLibrary" value="网络搜索">
 				</node>
@@ -280,7 +280,7 @@
 			</node>
 		</node>
 		<node name="SystemOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - System Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - System Options"/>
 			<node name="tab">
 				<node name="Language" value="语言">
 					<node name="autoDetect" value="自动检测语言和编码"/>
@@ -307,7 +307,7 @@
 			</node>
 		</node>
 		<node name="ReadingOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Reading Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Reading Options"/>
 			<node name="tab">
 				<node name="Scrolling" value="滚动方式">
 					<node name="keyScrollDelay" value="按键滚动间的延迟, 兆秒"/>
@@ -392,7 +392,7 @@
 			</node>
 		</node>
 		<node name="LookAndFeelOptionsDialog">
-			<node name="title" toBeTranslated="true" value="FBReader - Look &amp; Feel Options"/>
+			<node name="title" toBeTranslated="true" value="TDE-Ebook-Reader - Look &amp; Feel Options"/>
 			<node name="tab">
 				<node name="CSS" value="CSS">
 					<node name="overrideSpecifiedFonts" value="始终用自己的字体"/>
@@ -449,7 +449,7 @@
 			</node>
 		</node>
 		<node name="InfoDialog">
-			<node name="title" value="FBReader - 书籍信息"/>
+			<node name="title" value="TDE-Ebook-Reader - 书籍信息"/>
 			<node name="tab">
 				<node name="Common" value="通用">
 					<node name="file" value="文件"/>
@@ -483,12 +483,12 @@
 			</node>
 		</node>
 		<node name="AuthorInfoDialog">
-			<node name="title" value="FBReader - 作者信息"/>
+			<node name="title" value="TDE-Ebook-Reader - 作者信息"/>
 			<node name="name" value="作家名字"/>
 			<node name="sortKey" value="作家分类键"/>
 		</node>
 		<node name="addFileDialog">
-			<node name="title" value="FBReader - 添加书籍到书库"/>
+			<node name="title" value="TDE-Ebook-Reader - 添加书籍到书库"/>
 		</node>
 		<node name="textSearchDialog">
 			<node name="title" value="全文搜索"/>
diff --git a/fbreader/desktop/desktop b/reader/desktop/desktop
index 5d45cfd..8bdf367 100644
--- a/fbreader/desktop/desktop
+++ b/reader/desktop/desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=FBReader
+Name=TDE Ebook Reader
 GenericName=E-book reader
 GenericName[ar]=قارئ الكتب الإلكترونية
 GenericName[es]=Lector de Libros
@@ -7,18 +7,18 @@ GenericName[hu]=E-könyv olvasó
 GenericName[pl]=Czytnik e-książek
 GenericName[ru]=Чтение электронных книг
 GenericName[zh_CN]=电子书阅读
-Comment=FBReader E-book reader
+Comment=TDE Ebook Reader
 Comment[ar]=قارئ الكتب الإلكترونية
-Comment[es]=FBReader Lector de Libros Elecrónicos
-Comment[hu]=FBReader, E-könyv olvasó program
-Comment[pl]=FBReader, czytnik książek elektronicznych
-Comment[ru]=FBReader, программа для чтения электронных книг
-Comment[zh_CN]=FBReader 电子书阅读器
-TryExec=FBReader
-Exec=FBReader %F
+Comment[es]=TDE Ebook Reader Lector de Libros Elecrónicos
+Comment[hu]=TDE Ebook Reader, E-könyv olvasó program
+Comment[pl]=TDE Ebook Reader, czytnik książek elektronicznych
+Comment[ru]=TDE Ebook Reader, программа для чтения электронных книг
+Comment[zh_CN]=TDE Ebook Reader 电子书阅读器
+TryExec=tde-ebook-reader
+Exec=tde-ebook-reader %F
 StartupNotify=true
 Terminal=false
 Type=Application
-Icon=FBReader
+Icon=TDEEbookReader
 Categories=Office;Viewer;Literature;
 MimeType=application/epub+zip;
diff --git a/fbreader/desktop/FBReader.1 b/reader/desktop/tde-ebook-reader.1
index d500bca..e6c7fe8 100644
--- a/fbreader/desktop/FBReader.1
+++ b/reader/desktop/tde-ebook-reader.1
@@ -1,18 +1,18 @@
-.TH FBREADER 1
+.TH TDE EBOOK READER 1
 .SH NAME
-FBReader \- e-book reader
+TDE e-book reader
 .SH SYNOPSIS
-.B FBReader [\fB\-lang \fIlanguage\fP] [\fIe-book\fP]
+.B tde-ebook-reader [\fB\-lang \fIlanguage\fP] [\fIe-book\fP]
 .SH DESCRIPTION
-FBReader is an e-book reader. It supports most open e-book formats, and can
+tde-ebook-reader is an e-book reader. It supports most open e-book formats, and can
 read compressed e-book archives.
 .PP
-For more information on using the program, see the "About FBReader" button
+For more information on using the program, see the "About TDE Ebook Reader" button
 on its toolbar.
 .SH OPTIONS
 .TP
 \fB-lang \fIlanguage\fP
-Language for user interface. Current version (0.12.0) of fbreader supports
+Language for user interface. Current version (0.12.0) of tde-ebook-reader supports
 Arabic (specify \fB\-lang ar\fP option),
 Chinese (\fB\-lang zh\fP),
 Czech (\fB\-lang cs\fP),
@@ -31,9 +31,9 @@ Swedish (\fB\-lang sv\fP) and
 Ukrainian (\fB\-lang uk\fP).
 .TP
 \fIe-book\fP
-Name of file to open. If this parameter is missing or if FBReader cannot open
-the specified file, the last opened file will be reopened. If you start FBReader
-for the first time or the last opened file is missing, "About FBReader" text
+Name of file to open. If this parameter is missing or if tde-ebook-reader cannot open
+the specified file, the last opened file will be reopened. If you start tde-ebook-reader
+for the first time or the last opened file is missing, "About TDE Ebook Reader" text
 will be opened.
 .SH AUTHOR
 This man page was written by Joey Hess <joeyh@debian.org> and Nikolay Pultsin
diff --git a/fbreader/src/blockTree/FBReaderNode.cpp b/reader/src/blockTree/ReaderNode.cpp
index dc72d1e..cdca140 100644
--- a/fbreader/src/blockTree/FBReaderNode.cpp
+++ b/reader/src/blockTree/ReaderNode.cpp
@@ -21,45 +21,45 @@
 #include <ZLibrary.h>
 #include <ZLFileImage.h>
 
-#include "FBReaderNode.h"
+#include "ReaderNode.h"
 
-#include "../fbreader/FBReader.h"
+#include "../reader/Reader.h"
 #include "../options/FBOptions.h"
 #include "../options/FBTextStyle.h"
 
-const ZLTypeId FBReaderNode::TYPE_ID(ZLBlockTreeNode::TYPE_ID);
+const ZLTypeId ReaderNode::TYPE_ID(ZLBlockTreeNode::TYPE_ID);
 
-class FBReaderNode::ExpandTreeAction : public ZLRunnableWithKey {
+class ReaderNode::ExpandTreeAction : public ZLRunnableWithKey {
 
 public:
-	ExpandTreeAction(FBReaderNode &node);
+	ExpandTreeAction(ReaderNode &node);
 	void run();
 	ZLResourceKey key() const;
 
 private:
-	FBReaderNode &myNode;
+	ReaderNode &myNode;
 };
 
-std::map<std::string,shared_ptr<const ZLImage> > FBReaderNode::ourDefaultCovers;
+std::map<std::string,shared_ptr<const ZLImage> > ReaderNode::ourDefaultCovers;
 
-FBReaderNode::FBReaderNode(ZLBlockTreeNode *parent, std::size_t atPosition) : ZLBlockTreeNode(parent, atPosition), myCoverImageIsStored(false), myIsInitialized(false) {
+ReaderNode::ReaderNode(ZLBlockTreeNode *parent, std::size_t atPosition) : ZLBlockTreeNode(parent, atPosition), myCoverImageIsStored(false), myIsInitialized(false) {
 }
 
-void FBReaderNode::init() {
+void ReaderNode::init() {
 }
 
-bool FBReaderNode::highlighted() const {
+bool ReaderNode::highlighted() const {
 	return false;
 }
 
-FBReaderNode::~FBReaderNode() {
+ReaderNode::~ReaderNode() {
 }
 
-const ZLTypeId &FBReaderNode::typeId() const {
+const ZLTypeId &ReaderNode::typeId() const {
 	return TYPE_ID;
 }
 
-shared_ptr<const ZLImage> FBReaderNode::coverImage() const {
+shared_ptr<const ZLImage> ReaderNode::coverImage() const {
 	if (!myCoverImageIsStored) {
 		myCoverImageIsStored = true;
 		myStoredCoverImage = extractCoverImage();
@@ -67,11 +67,11 @@ shared_ptr<const ZLImage> FBReaderNode::coverImage() const {
 	return myStoredCoverImage;
 }
 
-void FBReaderNode::drawCover(ZLPaintContext &context, int vOffset) {
+void ReaderNode::drawCover(ZLPaintContext &context, int vOffset) {
 	drawCoverReal(context, vOffset);
 }
 
-void FBReaderNode::drawCoverReal(ZLPaintContext &context, int vOffset) {
+void ReaderNode::drawCoverReal(ZLPaintContext &context, int vOffset) {
 	shared_ptr<const ZLImage> cover = coverImage();
 	if (cover.isNull()) {
 		return;
@@ -107,7 +107,7 @@ void FBReaderNode::drawCoverReal(ZLPaintContext &context, int vOffset) {
 	context.drawImage(hOffset + (w - width) / 2, vOffset + (h + height) / 2, *coverData, width, height, ZLPaintContext::SCALE_FIT_TO_SIZE);
 }
 
-void FBReaderNode::drawTitle(ZLPaintContext &context, int vOffset) {
+void ReaderNode::drawTitle(ZLPaintContext &context, int vOffset) {
 	const FBTextStyle &style = FBTextStyle::Instance();
 	const int unit = unitSize(context, style);
 	const int hOffset = level() * unit * 3 + unit * 2;
@@ -121,7 +121,7 @@ void FBReaderNode::drawTitle(ZLPaintContext &context, int vOffset) {
 	context.drawString(hOffset, vOffset + 2 * unit, text.data(), text.size(), false);
 }
 
-void FBReaderNode::drawSummary(ZLPaintContext &context, int vOffset) {
+void ReaderNode::drawSummary(ZLPaintContext &context, int vOffset) {
 	const std::string text = summary();
 	if (text.empty()) {
 		return;
@@ -139,7 +139,7 @@ void FBReaderNode::drawSummary(ZLPaintContext &context, int vOffset) {
 	context.drawString(hOffset, vOffset + 13 * unit / 4, text.data(), text.size(), false);
 }
 
-void FBReaderNode::drawHyperlink(ZLPaintContext &context, int &hOffset, int &vOffset, shared_ptr<ZLRunnableWithKey> action, bool auxiliary) {
+void ReaderNode::drawHyperlink(ZLPaintContext &context, int &hOffset, int &vOffset, shared_ptr<ZLRunnableWithKey> action, bool auxiliary) {
 	// auxiliary makes font size and hSkip to be 70% of their normal sizes
 	if (action.isNull() || !action->makesSense()) {
 		return;
@@ -166,19 +166,19 @@ void FBReaderNode::drawHyperlink(ZLPaintContext &context, int &hOffset, int &vOf
 	hOffset += stringW + 4 * context.spaceWidth();
 }
 
-FBReaderNode::ExpandTreeAction::ExpandTreeAction(FBReaderNode &node) : myNode(node) {
+ReaderNode::ExpandTreeAction::ExpandTreeAction(ReaderNode &node) : myNode(node) {
 }
 
-void FBReaderNode::ExpandTreeAction::run() {
+void ReaderNode::ExpandTreeAction::run() {
 	myNode.expandOrCollapseSubtree();
-	FBReader::Instance().refreshWindow();
+	Reader::Instance().refreshWindow();
 }
 
-ZLResourceKey FBReaderNode::ExpandTreeAction::key() const {
+ZLResourceKey ReaderNode::ExpandTreeAction::key() const {
 	return ZLResourceKey(myNode.isOpen() ? "collapseTree" : "expandTree");
 }
 
-void FBReaderNode::expandOrCollapseSubtree() {
+void ReaderNode::expandOrCollapseSubtree() {
 	if (isOpen()) {
 		open(false);
 	} else if (!children().empty()) {
@@ -193,17 +193,17 @@ void FBReaderNode::expandOrCollapseSubtree() {
 	}
 }
 
-void FBReaderNode::registerAction(shared_ptr<ZLRunnableWithKey> action, bool auxiliary) {
+void ReaderNode::registerAction(shared_ptr<ZLRunnableWithKey> action, bool auxiliary) {
 	if (!action.isNull()) {
 		myActions.push_back(std::make_pair(action, auxiliary));
 	}
 }
 
-void FBReaderNode::registerExpandTreeAction() {
+void ReaderNode::registerExpandTreeAction() {
 	registerAction(new ExpandTreeAction(*this));
 }
 
-shared_ptr<const ZLImage> FBReaderNode::defaultCoverImage(const std::string &id) {
+shared_ptr<const ZLImage> ReaderNode::defaultCoverImage(const std::string &id) {
 	shared_ptr<const ZLImage> cover = ourDefaultCovers[id];
 	if (cover.isNull()) {
 		cover = new ZLFileImage(
@@ -214,7 +214,7 @@ shared_ptr<const ZLImage> FBReaderNode::defaultCoverImage(const std::string &id)
 	return cover;
 }
 
-int FBReaderNode::height(ZLPaintContext &context) const {
+int ReaderNode::height(ZLPaintContext &context) const {
 	bool hasAuxHyperlink = false;
 	for (std::vector<std::pair<shared_ptr<ZLRunnableWithKey>,bool> >::const_iterator it = myActions.begin(); it != myActions.end(); ++it) {
 		if (it->second && it->first->makesSense()) {
@@ -227,12 +227,12 @@ int FBReaderNode::height(ZLPaintContext &context) const {
 			(hasAuxHyperlink ? 13 : 11) / 2;
 }
 
-int FBReaderNode::unitSize(ZLPaintContext &context, const FBTextStyle &style) const {
+int ReaderNode::unitSize(ZLPaintContext &context, const FBTextStyle &style) const {
 	context.setFont(style.fontFamily(), style.fontSize(), style.bold(), style.italic());
 	return (context.stringHeight() * 2 + 2) / 3;
 }
 
-std::string FBReaderNode::summary() const {
+std::string ReaderNode::summary() const {
 	std::string result;
 	int count = 0;
 	const ZLBlockTreeNode::List &subNodes = children();
@@ -241,7 +241,7 @@ std::string FBReaderNode::summary() const {
 		if (count > 0) {
 			result += ", ";
 		}
-		result += ((const FBReaderNode*)*it)->title();
+		result += ((const ReaderNode*)*it)->title();
 	}
 	if (it != subNodes.end()) {
 		result += ", ...";
@@ -249,7 +249,7 @@ std::string FBReaderNode::summary() const {
 	return result;
 }
 
-void FBReaderNode::paint(ZLPaintContext &context, int vOffset) {
+void ReaderNode::paint(ZLPaintContext &context, int vOffset) {
 	if (!myIsInitialized) {
 		init();
 		myIsInitialized = true;
diff --git a/fbreader/src/blockTree/FBReaderNode.h b/reader/src/blockTree/ReaderNode.h
index b38126f..8abb7a1 100644
--- a/fbreader/src/blockTree/FBReaderNode.h
+++ b/reader/src/blockTree/ReaderNode.h
@@ -17,8 +17,8 @@
  * 02110-1301, USA.
  */
 
-#ifndef __FBREADERNODE_H__
-#define __FBREADERNODE_H__
+#ifndef __READERNODE_H__
+#define __READERNODE_H__
 
 #include <map>
 #include <vector>
@@ -29,7 +29,7 @@ class ZLImage;
 class ZLResource;
 class FBTextStyle;
 
-class FBReaderNode : public ZLBlockTreeNode {
+class ReaderNode : public ZLBlockTreeNode {
 
 protected:
 	static shared_ptr<const ZLImage> defaultCoverImage(const std::string &id);
@@ -44,13 +44,13 @@ public:
 	static const ZLTypeId TYPE_ID;
 
 protected:
-	FBReaderNode(ZLBlockTreeNode *parent, std::size_t atPosition = (std::size_t)-1);
+	ReaderNode(ZLBlockTreeNode *parent, std::size_t atPosition = (std::size_t)-1);
 	virtual void init();
 	virtual const ZLResource &resource() const = 0;
 	virtual bool highlighted() const;
 
 public:
-	~FBReaderNode();
+	~ReaderNode();
 
 	void drawCoverReal(ZLPaintContext &context, int vOffset);
 
@@ -89,4 +89,4 @@ private:
 	bool myIsInitialized;
 };
 
-#endif /* __FBREADERNODE_H__ */
+#endif /* __READERNODE_H__ */
diff --git a/fbreader/src/bookmodel/BookModel.cpp b/reader/src/bookmodel/BookModel.cpp
index 2123282..2123282 100644
--- a/fbreader/src/bookmodel/BookModel.cpp
+++ b/reader/src/bookmodel/BookModel.cpp
diff --git a/fbreader/src/bookmodel/BookModel.h b/reader/src/bookmodel/BookModel.h
index 6f83728..6f83728 100644
--- a/fbreader/src/bookmodel/BookModel.h
+++ b/reader/src/bookmodel/BookModel.h
diff --git a/fbreader/src/bookmodel/BookReader.cpp b/reader/src/bookmodel/BookReader.cpp
index 2982c43..2982c43 100644
--- a/fbreader/src/bookmodel/BookReader.cpp
+++ b/reader/src/bookmodel/BookReader.cpp
diff --git a/fbreader/src/bookmodel/BookReader.h b/reader/src/bookmodel/BookReader.h
index 3a27262..3a27262 100644
--- a/fbreader/src/bookmodel/BookReader.h
+++ b/reader/src/bookmodel/BookReader.h
diff --git a/fbreader/src/bookmodel/FBHyperlinkType.h b/reader/src/bookmodel/FBHyperlinkType.h
index fac7d80..fac7d80 100644
--- a/fbreader/src/bookmodel/FBHyperlinkType.h
+++ b/reader/src/bookmodel/FBHyperlinkType.h
diff --git a/fbreader/src/bookmodel/FBTextKind.h b/reader/src/bookmodel/FBTextKind.h
index 746db2b..746db2b 100644
--- a/fbreader/src/bookmodel/FBTextKind.h
+++ b/reader/src/bookmodel/FBTextKind.h
diff --git a/fbreader/src/database/booksdb/BooksDB.cpp b/reader/src/database/booksdb/BooksDB.cpp
index bf6d2b3..bf6d2b3 100644
--- a/fbreader/src/database/booksdb/BooksDB.cpp
+++ b/reader/src/database/booksdb/BooksDB.cpp
diff --git a/fbreader/src/database/booksdb/BooksDB.h b/reader/src/database/booksdb/BooksDB.h
index 634b31b..282a0aa 100644
--- a/fbreader/src/database/booksdb/BooksDB.h
+++ b/reader/src/database/booksdb/BooksDB.h
@@ -27,7 +27,7 @@
 #include "../sqldb/implsqlite/SQLiteDataBase.h"
 #include "DBRunnables.h"
 
-#include "../../fbreader/ReadingState.h"
+#include "../../reader/ReadingState.h"
 
 class Book;
 
diff --git a/fbreader/src/database/booksdb/BooksDBQuery.cpp b/reader/src/database/booksdb/BooksDBQuery.cpp
index 134e43b..134e43b 100644
--- a/fbreader/src/database/booksdb/BooksDBQuery.cpp
+++ b/reader/src/database/booksdb/BooksDBQuery.cpp
diff --git a/fbreader/src/database/booksdb/BooksDBQuery.h b/reader/src/database/booksdb/BooksDBQuery.h
index c202dea..c202dea 100644
--- a/fbreader/src/database/booksdb/BooksDBQuery.h
+++ b/reader/src/database/booksdb/BooksDBQuery.h
diff --git a/fbreader/src/database/booksdb/BooksDBUtil.cpp b/reader/src/database/booksdb/BooksDBUtil.cpp
index 3a7de96..3a7de96 100644
--- a/fbreader/src/database/booksdb/BooksDBUtil.cpp
+++ b/reader/src/database/booksdb/BooksDBUtil.cpp
diff --git a/fbreader/src/database/booksdb/BooksDBUtil.h b/reader/src/database/booksdb/BooksDBUtil.h
index 8d55e1c..8d55e1c 100644
--- a/fbreader/src/database/booksdb/BooksDBUtil.h
+++ b/reader/src/database/booksdb/BooksDBUtil.h
diff --git a/fbreader/src/database/booksdb/BooksDB_BookAuthor.cpp b/reader/src/database/booksdb/BooksDB_BookAuthor.cpp
index 8cdc2a4..8cdc2a4 100644
--- a/fbreader/src/database/booksdb/BooksDB_BookAuthor.cpp
+++ b/reader/src/database/booksdb/BooksDB_BookAuthor.cpp
diff --git a/fbreader/src/database/booksdb/BooksDB_BookSeries.cpp b/reader/src/database/booksdb/BooksDB_BookSeries.cpp
index a9b860b..a9b860b 100644
--- a/fbreader/src/database/booksdb/BooksDB_BookSeries.cpp
+++ b/reader/src/database/booksdb/BooksDB_BookSeries.cpp
diff --git a/fbreader/src/database/booksdb/BooksDB_BookTag.cpp b/reader/src/database/booksdb/BooksDB_BookTag.cpp
index a3d36fe..a3d36fe 100644
--- a/fbreader/src/database/booksdb/BooksDB_BookTag.cpp
+++ b/reader/src/database/booksdb/BooksDB_BookTag.cpp
diff --git a/fbreader/src/database/booksdb/DBRunnables.h b/reader/src/database/booksdb/DBRunnables.h
index 4baee65..dcbe438 100644
--- a/fbreader/src/database/booksdb/DBRunnables.h
+++ b/reader/src/database/booksdb/DBRunnables.h
@@ -23,7 +23,7 @@
 #include <deque>
 #include <vector>
 
-#include "../../fbreader/ReadingState.h"
+#include "../../reader/ReadingState.h"
 
 #include "../sqldb/DBConnection.h"
 #include "../sqldb/DBCommand.h"
diff --git a/fbreader/src/database/booksdb/runnables/ClearBooksDBRunnable.cpp b/reader/src/database/booksdb/runnables/ClearBooksDBRunnable.cpp
index c0c9063..c0c9063 100644
--- a/fbreader/src/database/booksdb/runnables/ClearBooksDBRunnable.cpp
+++ b/reader/src/database/booksdb/runnables/ClearBooksDBRunnable.cpp
diff --git a/fbreader/src/database/booksdb/runnables/DeleteBookRunnable.cpp b/reader/src/database/booksdb/runnables/DeleteBookRunnable.cpp
index e9e2c14..e9e2c14 100644
--- a/fbreader/src/database/booksdb/runnables/DeleteBookRunnable.cpp
+++ b/reader/src/database/booksdb/runnables/DeleteBookRunnable.cpp
diff --git a/fbreader/src/database/booksdb/runnables/DeleteFileEntriesRunnable.cpp b/reader/src/database/booksdb/runnables/DeleteFileEntriesRunnable.cpp
index 065a4c2..065a4c2 100644
--- a/fbreader/src/database/booksdb/runnables/DeleteFileEntriesRunnable.cpp
+++ b/reader/src/database/booksdb/runnables/DeleteFileEntriesRunnable.cpp
diff --git a/fbreader/src/database/booksdb/runnables/FindFileIdRunnable.cpp b/reader/src/database/booksdb/runnables/FindFileIdRunnable.cpp
index 4461c4f..4461c4f 100644
--- a/fbreader/src/database/booksdb/runnables/FindFileIdRunnable.cpp
+++ b/reader/src/database/booksdb/runnables/FindFileIdRunnable.cpp
diff --git a/fbreader/src/database/booksdb/runnables/InitBooksDBRunnable.cpp b/reader/src/database/booksdb/runnables/InitBooksDBRunnable.cpp
index b8a4b01..b8a4b01 100644
--- a/fbreader/src/database/booksdb/runnables/InitBooksDBRunnable.cpp
+++ b/reader/src/database/booksdb/runnables/InitBooksDBRunnable.cpp
diff --git a/fbreader/src/database/booksdb/runnables/LoadFileEntriesRunnable.cpp b/reader/src/database/booksdb/runnables/LoadFileEntriesRunnable.cpp
index 3668b83..3668b83 100644
--- a/fbreader/src/database/booksdb/runnables/LoadFileEntriesRunnable.cpp
+++ b/reader/src/database/booksdb/runnables/LoadFileEntriesRunnable.cpp
diff --git a/fbreader/src/database/booksdb/runnables/LoadRecentBooksRunnable.cpp b/reader/src/database/booksdb/runnables/LoadRecentBooksRunnable.cpp
index 06e6f79..06e6f79 100644
--- a/fbreader/src/database/booksdb/runnables/LoadRecentBooksRunnable.cpp
+++ b/reader/src/database/booksdb/runnables/LoadRecentBooksRunnable.cpp
diff --git a/fbreader/src/database/booksdb/runnables/SaveAuthorsRunnable.cpp b/reader/src/database/booksdb/runnables/SaveAuthorsRunnable.cpp
index 7336a74..7336a74 100644
--- a/fbreader/src/database/booksdb/runnables/SaveAuthorsRunnable.cpp
+++ b/reader/src/database/booksdb/runnables/SaveAuthorsRunnable.cpp
diff --git a/fbreader/src/database/booksdb/runnables/SaveBookRunnable.cpp b/reader/src/database/booksdb/runnables/SaveBookRunnable.cpp
index 7cf8dff..7cf8dff 100644
--- a/fbreader/src/database/booksdb/runnables/SaveBookRunnable.cpp
+++ b/reader/src/database/booksdb/runnables/SaveBookRunnable.cpp
diff --git a/fbreader/src/database/booksdb/runnables/SaveBookStateStackRunnable.cpp b/reader/src/database/booksdb/runnables/SaveBookStateStackRunnable.cpp
index 85d4a89..85d4a89 100644
--- a/fbreader/src/database/booksdb/runnables/SaveBookStateStackRunnable.cpp
+++ b/reader/src/database/booksdb/runnables/SaveBookStateStackRunnable.cpp
diff --git a/fbreader/src/database/booksdb/runnables/SaveRecentBooksRunnable.cpp b/reader/src/database/booksdb/runnables/SaveRecentBooksRunnable.cpp
index 1c355ed..1c355ed 100644
--- a/fbreader/src/database/booksdb/runnables/SaveRecentBooksRunnable.cpp
+++ b/reader/src/database/booksdb/runnables/SaveRecentBooksRunnable.cpp
diff --git a/fbreader/src/database/booksdb/runnables/SaveSeriesRunnable.cpp b/reader/src/database/booksdb/runnables/SaveSeriesRunnable.cpp
index e56777b..e56777b 100644
--- a/fbreader/src/database/booksdb/runnables/SaveSeriesRunnable.cpp
+++ b/reader/src/database/booksdb/runnables/SaveSeriesRunnable.cpp
diff --git a/fbreader/src/database/booksdb/runnables/SaveTableBookRunnable.cpp b/reader/src/database/booksdb/runnables/SaveTableBookRunnable.cpp
index 770963e..770963e 100644
--- a/fbreader/src/database/booksdb/runnables/SaveTableBookRunnable.cpp
+++ b/reader/src/database/booksdb/runnables/SaveTableBookRunnable.cpp
diff --git a/fbreader/src/database/networkdb/DBRunnables.h b/reader/src/database/networkdb/DBRunnables.h
index e9633f6..e9633f6 100644
--- a/fbreader/src/database/networkdb/DBRunnables.h
+++ b/reader/src/database/networkdb/DBRunnables.h
diff --git a/fbreader/src/database/networkdb/NetworkDB.cpp b/reader/src/database/networkdb/NetworkDB.cpp
index f422643..f422643 100644
--- a/fbreader/src/database/networkdb/NetworkDB.cpp
+++ b/reader/src/database/networkdb/NetworkDB.cpp
diff --git a/fbreader/src/database/networkdb/NetworkDB.h b/reader/src/database/networkdb/NetworkDB.h
index d4761a6..d4761a6 100644
--- a/fbreader/src/database/networkdb/NetworkDB.h
+++ b/reader/src/database/networkdb/NetworkDB.h
diff --git a/fbreader/src/database/networkdb/NetworkDBQuery.cpp b/reader/src/database/networkdb/NetworkDBQuery.cpp
index a8771cb..a8771cb 100644
--- a/fbreader/src/database/networkdb/NetworkDBQuery.cpp
+++ b/reader/src/database/networkdb/NetworkDBQuery.cpp
diff --git a/fbreader/src/database/networkdb/NetworkDBQuery.h b/reader/src/database/networkdb/NetworkDBQuery.h
index 931705e..931705e 100644
--- a/fbreader/src/database/networkdb/NetworkDBQuery.h
+++ b/reader/src/database/networkdb/NetworkDBQuery.h
diff --git a/fbreader/src/database/networkdb/runnables/ClearNetworkDBRunnable.cpp b/reader/src/database/networkdb/runnables/ClearNetworkDBRunnable.cpp
index fe79ed3..fe79ed3 100644
--- a/fbreader/src/database/networkdb/runnables/ClearNetworkDBRunnable.cpp
+++ b/reader/src/database/networkdb/runnables/ClearNetworkDBRunnable.cpp
diff --git a/fbreader/src/database/networkdb/runnables/InitNetworkDBRunnable.cpp b/reader/src/database/networkdb/runnables/InitNetworkDBRunnable.cpp
index d0730b7..d0730b7 100644
--- a/fbreader/src/database/networkdb/runnables/InitNetworkDBRunnable.cpp
+++ b/reader/src/database/networkdb/runnables/InitNetworkDBRunnable.cpp
diff --git a/fbreader/src/database/networkdb/runnables/SaveNetworkLinkRunnable.cpp b/reader/src/database/networkdb/runnables/SaveNetworkLinkRunnable.cpp
index 4c80499..4c80499 100644
--- a/fbreader/src/database/networkdb/runnables/SaveNetworkLinkRunnable.cpp
+++ b/reader/src/database/networkdb/runnables/SaveNetworkLinkRunnable.cpp
diff --git a/fbreader/src/database/sqldb/DBCommand.cpp b/reader/src/database/sqldb/DBCommand.cpp
index 8986401..8986401 100644
--- a/fbreader/src/database/sqldb/DBCommand.cpp
+++ b/reader/src/database/sqldb/DBCommand.cpp
diff --git a/fbreader/src/database/sqldb/DBCommand.h b/reader/src/database/sqldb/DBCommand.h
index 2ac9ade..2ac9ade 100644
--- a/fbreader/src/database/sqldb/DBCommand.h
+++ b/reader/src/database/sqldb/DBCommand.h
diff --git a/fbreader/src/database/sqldb/DBCommandParameter.cpp b/reader/src/database/sqldb/DBCommandParameter.cpp
index d8ec08a..d8ec08a 100644
--- a/fbreader/src/database/sqldb/DBCommandParameter.cpp
+++ b/reader/src/database/sqldb/DBCommandParameter.cpp
diff --git a/fbreader/src/database/sqldb/DBCommandParameter.h b/reader/src/database/sqldb/DBCommandParameter.h
index 2e3c8ae..2e3c8ae 100644
--- a/fbreader/src/database/sqldb/DBCommandParameter.h
+++ b/reader/src/database/sqldb/DBCommandParameter.h
diff --git a/fbreader/src/database/sqldb/DBConnection.cpp b/reader/src/database/sqldb/DBConnection.cpp
index 20f4402..20f4402 100644
--- a/fbreader/src/database/sqldb/DBConnection.cpp
+++ b/reader/src/database/sqldb/DBConnection.cpp
diff --git a/fbreader/src/database/sqldb/DBConnection.h b/reader/src/database/sqldb/DBConnection.h
index 2345ddf..2345ddf 100644
--- a/fbreader/src/database/sqldb/DBConnection.h
+++ b/reader/src/database/sqldb/DBConnection.h
diff --git a/fbreader/src/database/sqldb/DBDataReader.cpp b/reader/src/database/sqldb/DBDataReader.cpp
index 7c40b03..7c40b03 100644
--- a/fbreader/src/database/sqldb/DBDataReader.cpp
+++ b/reader/src/database/sqldb/DBDataReader.cpp
diff --git a/fbreader/src/database/sqldb/DBDataReader.h b/reader/src/database/sqldb/DBDataReader.h
index f07b323..f07b323 100644
--- a/fbreader/src/database/sqldb/DBDataReader.h
+++ b/reader/src/database/sqldb/DBDataReader.h
diff --git a/fbreader/src/database/sqldb/DBIntValue.cpp b/reader/src/database/sqldb/DBIntValue.cpp
index cd3e900..cd3e900 100644
--- a/fbreader/src/database/sqldb/DBIntValue.cpp
+++ b/reader/src/database/sqldb/DBIntValue.cpp
diff --git a/fbreader/src/database/sqldb/DBNullValue.cpp b/reader/src/database/sqldb/DBNullValue.cpp
index cd6ab1c..cd6ab1c 100644
--- a/fbreader/src/database/sqldb/DBNullValue.cpp
+++ b/reader/src/database/sqldb/DBNullValue.cpp
diff --git a/fbreader/src/database/sqldb/DBRealValue.cpp b/reader/src/database/sqldb/DBRealValue.cpp
index eb849e5..eb849e5 100644
--- a/fbreader/src/database/sqldb/DBRealValue.cpp
+++ b/reader/src/database/sqldb/DBRealValue.cpp
diff --git a/fbreader/src/database/sqldb/DBRunnable.h b/reader/src/database/sqldb/DBRunnable.h
index 8e44a67..8e44a67 100644
--- a/fbreader/src/database/sqldb/DBRunnable.h
+++ b/reader/src/database/sqldb/DBRunnable.h
diff --git a/fbreader/src/database/sqldb/DBTextValue.cpp b/reader/src/database/sqldb/DBTextValue.cpp
index 27b4d96..27b4d96 100644
--- a/fbreader/src/database/sqldb/DBTextValue.cpp
+++ b/reader/src/database/sqldb/DBTextValue.cpp
diff --git a/fbreader/src/database/sqldb/DBValue.cpp b/reader/src/database/sqldb/DBValue.cpp
index 75c4376..75c4376 100644
--- a/fbreader/src/database/sqldb/DBValue.cpp
+++ b/reader/src/database/sqldb/DBValue.cpp
diff --git a/fbreader/src/database/sqldb/DBValues.h b/reader/src/database/sqldb/DBValues.h
index eb64d56..eb64d56 100644
--- a/fbreader/src/database/sqldb/DBValues.h
+++ b/reader/src/database/sqldb/DBValues.h
diff --git a/fbreader/src/database/sqldb/DataBase.cpp b/reader/src/database/sqldb/DataBase.cpp
index e1d0b3f..e1d0b3f 100644
--- a/fbreader/src/database/sqldb/DataBase.cpp
+++ b/reader/src/database/sqldb/DataBase.cpp
diff --git a/fbreader/src/database/sqldb/DataBase.h b/reader/src/database/sqldb/DataBase.h
index 33430aa..33430aa 100644
--- a/fbreader/src/database/sqldb/DataBase.h
+++ b/reader/src/database/sqldb/DataBase.h
diff --git a/fbreader/src/database/sqldb/implsqlite/SQLiteCommand.cpp b/reader/src/database/sqldb/implsqlite/SQLiteCommand.cpp
index 58d90f6..58d90f6 100644
--- a/fbreader/src/database/sqldb/implsqlite/SQLiteCommand.cpp
+++ b/reader/src/database/sqldb/implsqlite/SQLiteCommand.cpp
diff --git a/fbreader/src/database/sqldb/implsqlite/SQLiteCommand.h b/reader/src/database/sqldb/implsqlite/SQLiteCommand.h
index 395fd30..395fd30 100644
--- a/fbreader/src/database/sqldb/implsqlite/SQLiteCommand.h
+++ b/reader/src/database/sqldb/implsqlite/SQLiteCommand.h
diff --git a/fbreader/src/database/sqldb/implsqlite/SQLiteConnection.cpp b/reader/src/database/sqldb/implsqlite/SQLiteConnection.cpp
index f1a0f30..f1a0f30 100644
--- a/fbreader/src/database/sqldb/implsqlite/SQLiteConnection.cpp
+++ b/reader/src/database/sqldb/implsqlite/SQLiteConnection.cpp
diff --git a/fbreader/src/database/sqldb/implsqlite/SQLiteConnection.h b/reader/src/database/sqldb/implsqlite/SQLiteConnection.h
index 6854800..6854800 100644
--- a/fbreader/src/database/sqldb/implsqlite/SQLiteConnection.h
+++ b/reader/src/database/sqldb/implsqlite/SQLiteConnection.h
diff --git a/fbreader/src/database/sqldb/implsqlite/SQLiteDataBase.cpp b/reader/src/database/sqldb/implsqlite/SQLiteDataBase.cpp
index 1cccc0a..1cccc0a 100644
--- a/fbreader/src/database/sqldb/implsqlite/SQLiteDataBase.cpp
+++ b/reader/src/database/sqldb/implsqlite/SQLiteDataBase.cpp
diff --git a/fbreader/src/database/sqldb/implsqlite/SQLiteDataBase.h b/reader/src/database/sqldb/implsqlite/SQLiteDataBase.h
index dce8e5b..dce8e5b 100644
--- a/fbreader/src/database/sqldb/implsqlite/SQLiteDataBase.h
+++ b/reader/src/database/sqldb/implsqlite/SQLiteDataBase.h
diff --git a/fbreader/src/database/sqldb/implsqlite/SQLiteDataReader.cpp b/reader/src/database/sqldb/implsqlite/SQLiteDataReader.cpp
index 3ea4091..3ea4091 100644
--- a/fbreader/src/database/sqldb/implsqlite/SQLiteDataReader.cpp
+++ b/reader/src/database/sqldb/implsqlite/SQLiteDataReader.cpp
diff --git a/fbreader/src/database/sqldb/implsqlite/SQLiteDataReader.h b/reader/src/database/sqldb/implsqlite/SQLiteDataReader.h
index b220b39..b220b39 100644
--- a/fbreader/src/database/sqldb/implsqlite/SQLiteDataReader.h
+++ b/reader/src/database/sqldb/implsqlite/SQLiteDataReader.h
diff --git a/fbreader/src/database/sqldb/implsqlite/SQLiteFactory.cpp b/reader/src/database/sqldb/implsqlite/SQLiteFactory.cpp
index 5054cc9..5054cc9 100644
--- a/fbreader/src/database/sqldb/implsqlite/SQLiteFactory.cpp
+++ b/reader/src/database/sqldb/implsqlite/SQLiteFactory.cpp
diff --git a/fbreader/src/database/sqldb/implsqlite/SQLiteFactory.h b/reader/src/database/sqldb/implsqlite/SQLiteFactory.h
index b58b785..b58b785 100644
--- a/fbreader/src/database/sqldb/implsqlite/SQLiteFactory.h
+++ b/reader/src/database/sqldb/implsqlite/SQLiteFactory.h
diff --git a/fbreader/src/encodingOption/EncodingOptionEntry.cpp b/reader/src/encodingOption/EncodingOptionEntry.cpp
index 04d25d0..04d25d0 100644
--- a/fbreader/src/encodingOption/EncodingOptionEntry.cpp
+++ b/reader/src/encodingOption/EncodingOptionEntry.cpp
diff --git a/fbreader/src/encodingOption/EncodingOptionEntry.h b/reader/src/encodingOption/EncodingOptionEntry.h
index 7b43c60..7b43c60 100644
--- a/fbreader/src/encodingOption/EncodingOptionEntry.h
+++ b/reader/src/encodingOption/EncodingOptionEntry.h
diff --git a/fbreader/src/external/ProgramCollection.cpp b/reader/src/external/ProgramCollection.cpp
index 9599d90..9599d90 100644
--- a/fbreader/src/external/ProgramCollection.cpp
+++ b/reader/src/external/ProgramCollection.cpp
diff --git a/fbreader/src/external/ProgramCollection.h b/reader/src/external/ProgramCollection.h
index a8aa3ec..a8aa3ec 100644
--- a/fbreader/src/external/ProgramCollection.h
+++ b/reader/src/external/ProgramCollection.h
diff --git a/fbreader/src/formats/EncodedTextReader.cpp b/reader/src/formats/EncodedTextReader.cpp
index 12102c1..12102c1 100644
--- a/fbreader/src/formats/EncodedTextReader.cpp
+++ b/reader/src/formats/EncodedTextReader.cpp
diff --git a/fbreader/src/formats/EncodedTextReader.h b/reader/src/formats/EncodedTextReader.h
index 8035508..8035508 100644
--- a/fbreader/src/formats/EncodedTextReader.h
+++ b/reader/src/formats/EncodedTextReader.h
diff --git a/fbreader/src/formats/FormatPlugin.cpp b/reader/src/formats/FormatPlugin.cpp
index 059a53b..059a53b 100644
--- a/fbreader/src/formats/FormatPlugin.cpp
+++ b/reader/src/formats/FormatPlugin.cpp
diff --git a/fbreader/src/formats/FormatPlugin.h b/reader/src/formats/FormatPlugin.h
index 5e1075e..5e1075e 100644
--- a/fbreader/src/formats/FormatPlugin.h
+++ b/reader/src/formats/FormatPlugin.h
diff --git a/fbreader/src/formats/PluginCollection.cpp b/reader/src/formats/PluginCollection.cpp
index d120de1..d120de1 100644
--- a/fbreader/src/formats/PluginCollection.cpp
+++ b/reader/src/formats/PluginCollection.cpp
diff --git a/fbreader/src/formats/chm/BitStream.cpp b/reader/src/formats/chm/BitStream.cpp
index bf6c642..bf6c642 100644
--- a/fbreader/src/formats/chm/BitStream.cpp
+++ b/reader/src/formats/chm/BitStream.cpp
diff --git a/fbreader/src/formats/chm/BitStream.h b/reader/src/formats/chm/BitStream.h
index 80c1e25..80c1e25 100644
--- a/fbreader/src/formats/chm/BitStream.h
+++ b/reader/src/formats/chm/BitStream.h
diff --git a/fbreader/src/formats/chm/CHMFile.cpp b/reader/src/formats/chm/CHMFile.cpp
index 8c62bca..8c62bca 100644
--- a/fbreader/src/formats/chm/CHMFile.cpp
+++ b/reader/src/formats/chm/CHMFile.cpp
diff --git a/fbreader/src/formats/chm/CHMFile.h b/reader/src/formats/chm/CHMFile.h
index d98bd84..d98bd84 100644
--- a/fbreader/src/formats/chm/CHMFile.h
+++ b/reader/src/formats/chm/CHMFile.h
diff --git a/fbreader/src/formats/chm/CHMFileImage.cpp b/reader/src/formats/chm/CHMFileImage.cpp
index a2b58f0..a2b58f0 100644
--- a/fbreader/src/formats/chm/CHMFileImage.cpp
+++ b/reader/src/formats/chm/CHMFileImage.cpp
diff --git a/fbreader/src/formats/chm/CHMFileImage.h b/reader/src/formats/chm/CHMFileImage.h
index bacb6aa..bacb6aa 100644
--- a/fbreader/src/formats/chm/CHMFileImage.h
+++ b/reader/src/formats/chm/CHMFileImage.h
diff --git a/fbreader/src/formats/chm/CHMPlugin.cpp b/reader/src/formats/chm/CHMPlugin.cpp
index 9ea88e4..9ea88e4 100644
--- a/fbreader/src/formats/chm/CHMPlugin.cpp
+++ b/reader/src/formats/chm/CHMPlugin.cpp
diff --git a/fbreader/src/formats/chm/CHMPlugin.h b/reader/src/formats/chm/CHMPlugin.h
index 0d38e62..0d38e62 100644
--- a/fbreader/src/formats/chm/CHMPlugin.h
+++ b/reader/src/formats/chm/CHMPlugin.h
diff --git a/fbreader/src/formats/chm/CHMReferenceCollection.cpp b/reader/src/formats/chm/CHMReferenceCollection.cpp
index f29dd28..f29dd28 100644
--- a/fbreader/src/formats/chm/CHMReferenceCollection.cpp
+++ b/reader/src/formats/chm/CHMReferenceCollection.cpp
diff --git a/fbreader/src/formats/chm/CHMReferenceCollection.h b/reader/src/formats/chm/CHMReferenceCollection.h
index 6a53c45..6a53c45 100644
--- a/fbreader/src/formats/chm/CHMReferenceCollection.h
+++ b/reader/src/formats/chm/CHMReferenceCollection.h
diff --git a/fbreader/src/formats/chm/E8Decoder.cpp b/reader/src/formats/chm/E8Decoder.cpp
index 53b9335..53b9335 100644
--- a/fbreader/src/formats/chm/E8Decoder.cpp
+++ b/reader/src/formats/chm/E8Decoder.cpp
diff --git a/fbreader/src/formats/chm/HHCReader.cpp b/reader/src/formats/chm/HHCReader.cpp
index 4fd3105..4fd3105 100644
--- a/fbreader/src/formats/chm/HHCReader.cpp
+++ b/reader/src/formats/chm/HHCReader.cpp
diff --git a/fbreader/src/formats/chm/HHCReader.h b/reader/src/formats/chm/HHCReader.h
index c0e4cef..c0e4cef 100644
--- a/fbreader/src/formats/chm/HHCReader.h
+++ b/reader/src/formats/chm/HHCReader.h
diff --git a/fbreader/src/formats/chm/HHCReferenceCollector.cpp b/reader/src/formats/chm/HHCReferenceCollector.cpp
index 6abcef2..6abcef2 100644
--- a/fbreader/src/formats/chm/HHCReferenceCollector.cpp
+++ b/reader/src/formats/chm/HHCReferenceCollector.cpp
diff --git a/fbreader/src/formats/chm/HHCReferenceCollector.h b/reader/src/formats/chm/HHCReferenceCollector.h
index 20e58d1..20e58d1 100644
--- a/fbreader/src/formats/chm/HHCReferenceCollector.h
+++ b/reader/src/formats/chm/HHCReferenceCollector.h
diff --git a/fbreader/src/formats/chm/HtmlSectionReader.cpp b/reader/src/formats/chm/HtmlSectionReader.cpp
index 9973e14..9973e14 100644
--- a/fbreader/src/formats/chm/HtmlSectionReader.cpp
+++ b/reader/src/formats/chm/HtmlSectionReader.cpp
diff --git a/fbreader/src/formats/chm/HtmlSectionReader.h b/reader/src/formats/chm/HtmlSectionReader.h
index 424c178..424c178 100644
--- a/fbreader/src/formats/chm/HtmlSectionReader.h
+++ b/reader/src/formats/chm/HtmlSectionReader.h
diff --git a/fbreader/src/formats/chm/HuffmanDecoder.cpp b/reader/src/formats/chm/HuffmanDecoder.cpp
index db8718f..db8718f 100644
--- a/fbreader/src/formats/chm/HuffmanDecoder.cpp
+++ b/reader/src/formats/chm/HuffmanDecoder.cpp
diff --git a/fbreader/src/formats/chm/HuffmanDecoder.h b/reader/src/formats/chm/HuffmanDecoder.h
index bd9f700..bd9f700 100644
--- a/fbreader/src/formats/chm/HuffmanDecoder.h
+++ b/reader/src/formats/chm/HuffmanDecoder.h
diff --git a/fbreader/src/formats/chm/LZXDecompressor.cpp b/reader/src/formats/chm/LZXDecompressor.cpp
index 38b4311..38b4311 100644
--- a/fbreader/src/formats/chm/LZXDecompressor.cpp
+++ b/reader/src/formats/chm/LZXDecompressor.cpp
diff --git a/fbreader/src/formats/chm/LZXDecompressor.h b/reader/src/formats/chm/LZXDecompressor.h
index dac9e1f..dac9e1f 100644
--- a/fbreader/src/formats/chm/LZXDecompressor.h
+++ b/reader/src/formats/chm/LZXDecompressor.h
diff --git a/fbreader/src/formats/css/StyleSheetParser.cpp b/reader/src/formats/css/StyleSheetParser.cpp
index 33dc900..33dc900 100644
--- a/fbreader/src/formats/css/StyleSheetParser.cpp
+++ b/reader/src/formats/css/StyleSheetParser.cpp
diff --git a/fbreader/src/formats/css/StyleSheetParser.h b/reader/src/formats/css/StyleSheetParser.h
index 8949823..8949823 100644
--- a/fbreader/src/formats/css/StyleSheetParser.h
+++ b/reader/src/formats/css/StyleSheetParser.h
diff --git a/fbreader/src/formats/css/StyleSheetTable.cpp b/reader/src/formats/css/StyleSheetTable.cpp
index fe45a85..fe45a85 100644
--- a/fbreader/src/formats/css/StyleSheetTable.cpp
+++ b/reader/src/formats/css/StyleSheetTable.cpp
diff --git a/fbreader/src/formats/css/StyleSheetTable.h b/reader/src/formats/css/StyleSheetTable.h
index 54236fb..54236fb 100644
--- a/fbreader/src/formats/css/StyleSheetTable.h
+++ b/reader/src/formats/css/StyleSheetTable.h
diff --git a/fbreader/src/formats/doc/DocBookReader.cpp b/reader/src/formats/doc/DocBookReader.cpp
index 99f471a..99f471a 100644
--- a/fbreader/src/formats/doc/DocBookReader.cpp
+++ b/reader/src/formats/doc/DocBookReader.cpp
diff --git a/fbreader/src/formats/doc/DocBookReader.h b/reader/src/formats/doc/DocBookReader.h
index d80fb8e..d80fb8e 100644
--- a/fbreader/src/formats/doc/DocBookReader.h
+++ b/reader/src/formats/doc/DocBookReader.h
diff --git a/fbreader/src/formats/doc/DocFloatImageReader.cpp b/reader/src/formats/doc/DocFloatImageReader.cpp
index 8c308e4..8c308e4 100644
--- a/fbreader/src/formats/doc/DocFloatImageReader.cpp
+++ b/reader/src/formats/doc/DocFloatImageReader.cpp
diff --git a/fbreader/src/formats/doc/DocFloatImageReader.h b/reader/src/formats/doc/DocFloatImageReader.h
index d2d6c2e..d2d6c2e 100644
--- a/fbreader/src/formats/doc/DocFloatImageReader.h
+++ b/reader/src/formats/doc/DocFloatImageReader.h
diff --git a/fbreader/src/formats/doc/DocInlineImageReader.cpp b/reader/src/formats/doc/DocInlineImageReader.cpp
index 69ce74f..69ce74f 100644
--- a/fbreader/src/formats/doc/DocInlineImageReader.cpp
+++ b/reader/src/formats/doc/DocInlineImageReader.cpp
diff --git a/fbreader/src/formats/doc/DocInlineImageReader.h b/reader/src/formats/doc/DocInlineImageReader.h
index 9dab9ae..9dab9ae 100644
--- a/fbreader/src/formats/doc/DocInlineImageReader.h
+++ b/reader/src/formats/doc/DocInlineImageReader.h
diff --git a/fbreader/src/formats/doc/DocMetaInfoReader.cpp b/reader/src/formats/doc/DocMetaInfoReader.cpp
index 37b39c2..37b39c2 100644
--- a/fbreader/src/formats/doc/DocMetaInfoReader.cpp
+++ b/reader/src/formats/doc/DocMetaInfoReader.cpp
diff --git a/fbreader/src/formats/doc/DocMetaInfoReader.h b/reader/src/formats/doc/DocMetaInfoReader.h
index db26d29..db26d29 100644
--- a/fbreader/src/formats/doc/DocMetaInfoReader.h
+++ b/reader/src/formats/doc/DocMetaInfoReader.h
diff --git a/fbreader/src/formats/doc/DocPlugin.cpp b/reader/src/formats/doc/DocPlugin.cpp
index ef6f511..ef6f511 100644
--- a/fbreader/src/formats/doc/DocPlugin.cpp
+++ b/reader/src/formats/doc/DocPlugin.cpp
diff --git a/fbreader/src/formats/doc/DocPlugin.h b/reader/src/formats/doc/DocPlugin.h
index 93b1803..93b1803 100644
--- a/fbreader/src/formats/doc/DocPlugin.h
+++ b/reader/src/formats/doc/DocPlugin.h
diff --git a/fbreader/src/formats/doc/DocStreams.cpp b/reader/src/formats/doc/DocStreams.cpp
index b21e15a..b21e15a 100644
--- a/fbreader/src/formats/doc/DocStreams.cpp
+++ b/reader/src/formats/doc/DocStreams.cpp
diff --git a/fbreader/src/formats/doc/DocStreams.h b/reader/src/formats/doc/DocStreams.h
index 4b1538a..4b1538a 100644
--- a/fbreader/src/formats/doc/DocStreams.h
+++ b/reader/src/formats/doc/DocStreams.h
diff --git a/fbreader/src/formats/doc/OleMainStream.cpp b/reader/src/formats/doc/OleMainStream.cpp
index fe829e6..fe829e6 100644
--- a/fbreader/src/formats/doc/OleMainStream.cpp
+++ b/reader/src/formats/doc/OleMainStream.cpp
diff --git a/fbreader/src/formats/doc/OleMainStream.h b/reader/src/formats/doc/OleMainStream.h
index 378f037..378f037 100644
--- a/fbreader/src/formats/doc/OleMainStream.h
+++ b/reader/src/formats/doc/OleMainStream.h
diff --git a/fbreader/src/formats/doc/OleStorage.cpp b/reader/src/formats/doc/OleStorage.cpp
index a7ab81a..a7ab81a 100644
--- a/fbreader/src/formats/doc/OleStorage.cpp
+++ b/reader/src/formats/doc/OleStorage.cpp
diff --git a/fbreader/src/formats/doc/OleStorage.h b/reader/src/formats/doc/OleStorage.h
index 584ee94..584ee94 100644
--- a/fbreader/src/formats/doc/OleStorage.h
+++ b/reader/src/formats/doc/OleStorage.h
diff --git a/fbreader/src/formats/doc/OleStream.cpp b/reader/src/formats/doc/OleStream.cpp
index 8de1cc4..8de1cc4 100644
--- a/fbreader/src/formats/doc/OleStream.cpp
+++ b/reader/src/formats/doc/OleStream.cpp
diff --git a/fbreader/src/formats/doc/OleStream.h b/reader/src/formats/doc/OleStream.h
index 861c7cb..861c7cb 100644
--- a/fbreader/src/formats/doc/OleStream.h
+++ b/reader/src/formats/doc/OleStream.h
diff --git a/fbreader/src/formats/doc/OleStreamParser.cpp b/reader/src/formats/doc/OleStreamParser.cpp
index 0a9c62d..0a9c62d 100644
--- a/fbreader/src/formats/doc/OleStreamParser.cpp
+++ b/reader/src/formats/doc/OleStreamParser.cpp
diff --git a/fbreader/src/formats/doc/OleStreamParser.h b/reader/src/formats/doc/OleStreamParser.h
index 1adec2f..1adec2f 100644
--- a/fbreader/src/formats/doc/OleStreamParser.h
+++ b/reader/src/formats/doc/OleStreamParser.h
diff --git a/fbreader/src/formats/doc/OleStreamReader.cpp b/reader/src/formats/doc/OleStreamReader.cpp
index 224489a..224489a 100644
--- a/fbreader/src/formats/doc/OleStreamReader.cpp
+++ b/reader/src/formats/doc/OleStreamReader.cpp
diff --git a/fbreader/src/formats/doc/OleStreamReader.h b/reader/src/formats/doc/OleStreamReader.h
index 2d2a0ae..2d2a0ae 100644
--- a/fbreader/src/formats/doc/OleStreamReader.h
+++ b/reader/src/formats/doc/OleStreamReader.h
diff --git a/fbreader/src/formats/doc/OleUtil.cpp b/reader/src/formats/doc/OleUtil.cpp
index 2e8f685..2e8f685 100644
--- a/fbreader/src/formats/doc/OleUtil.cpp
+++ b/reader/src/formats/doc/OleUtil.cpp
diff --git a/fbreader/src/formats/doc/OleUtil.h b/reader/src/formats/doc/OleUtil.h
index 531c769..531c769 100644
--- a/fbreader/src/formats/doc/OleUtil.h
+++ b/reader/src/formats/doc/OleUtil.h
diff --git a/fbreader/src/formats/docbook/DocBookBookReader.cpp b/reader/src/formats/docbook/DocBookBookReader.cpp
index eada90c..eada90c 100644
--- a/fbreader/src/formats/docbook/DocBookBookReader.cpp
+++ b/reader/src/formats/docbook/DocBookBookReader.cpp
diff --git a/fbreader/src/formats/docbook/DocBookBookReader.h b/reader/src/formats/docbook/DocBookBookReader.h
index c226184..c226184 100644
--- a/fbreader/src/formats/docbook/DocBookBookReader.h
+++ b/reader/src/formats/docbook/DocBookBookReader.h
diff --git a/fbreader/src/formats/docbook/DocBookDescriptionReader.cpp b/reader/src/formats/docbook/DocBookDescriptionReader.cpp
index bcd4ae4..bcd4ae4 100644
--- a/fbreader/src/formats/docbook/DocBookDescriptionReader.cpp
+++ b/reader/src/formats/docbook/DocBookDescriptionReader.cpp
diff --git a/fbreader/src/formats/docbook/DocBookDescriptionReader.h b/reader/src/formats/docbook/DocBookDescriptionReader.h
index d9f4aa3..d9f4aa3 100644
--- a/fbreader/src/formats/docbook/DocBookDescriptionReader.h
+++ b/reader/src/formats/docbook/DocBookDescriptionReader.h
diff --git a/fbreader/src/formats/docbook/DocBookPlugin.cpp b/reader/src/formats/docbook/DocBookPlugin.cpp
index 1b890a6..1b890a6 100644
--- a/fbreader/src/formats/docbook/DocBookPlugin.cpp
+++ b/reader/src/formats/docbook/DocBookPlugin.cpp
diff --git a/fbreader/src/formats/docbook/DocBookPlugin.h b/reader/src/formats/docbook/DocBookPlugin.h
index 324b2be..324b2be 100644
--- a/fbreader/src/formats/docbook/DocBookPlugin.h
+++ b/reader/src/formats/docbook/DocBookPlugin.h
diff --git a/fbreader/src/formats/docbook/DocBookReader.cpp b/reader/src/formats/docbook/DocBookReader.cpp
index 73c17d1..73c17d1 100644
--- a/fbreader/src/formats/docbook/DocBookReader.cpp
+++ b/reader/src/formats/docbook/DocBookReader.cpp
diff --git a/fbreader/src/formats/docbook/DocBookReader.h b/reader/src/formats/docbook/DocBookReader.h
index a18f358..a18f358 100644
--- a/fbreader/src/formats/docbook/DocBookReader.h
+++ b/reader/src/formats/docbook/DocBookReader.h
diff --git a/fbreader/src/formats/dummy/DummyBookReader.cpp b/reader/src/formats/dummy/DummyBookReader.cpp
index 2684ebf..2684ebf 100644
--- a/fbreader/src/formats/dummy/DummyBookReader.cpp
+++ b/reader/src/formats/dummy/DummyBookReader.cpp
diff --git a/fbreader/src/formats/dummy/DummyBookReader.h b/reader/src/formats/dummy/DummyBookReader.h
index ba6bcf8..ba6bcf8 100644
--- a/fbreader/src/formats/dummy/DummyBookReader.h
+++ b/reader/src/formats/dummy/DummyBookReader.h
diff --git a/fbreader/src/formats/dummy/DummyMetaInfoReader.cpp b/reader/src/formats/dummy/DummyMetaInfoReader.cpp
index 5dd13c5..5dd13c5 100644
--- a/fbreader/src/formats/dummy/DummyMetaInfoReader.cpp
+++ b/reader/src/formats/dummy/DummyMetaInfoReader.cpp
diff --git a/fbreader/src/formats/dummy/DummyMetaInfoReader.h b/reader/src/formats/dummy/DummyMetaInfoReader.h
index 818d996..818d996 100644
--- a/fbreader/src/formats/dummy/DummyMetaInfoReader.h
+++ b/reader/src/formats/dummy/DummyMetaInfoReader.h
diff --git a/fbreader/src/formats/dummy/DummyPlugin.cpp b/reader/src/formats/dummy/DummyPlugin.cpp
index bfe0662..bfe0662 100644
--- a/fbreader/src/formats/dummy/DummyPlugin.cpp
+++ b/reader/src/formats/dummy/DummyPlugin.cpp
diff --git a/fbreader/src/formats/dummy/DummyPlugin.h b/reader/src/formats/dummy/DummyPlugin.h
index 073449c..073449c 100644
--- a/fbreader/src/formats/dummy/DummyPlugin.h
+++ b/reader/src/formats/dummy/DummyPlugin.h
diff --git a/fbreader/src/formats/dummy/createPlugin.sh b/reader/src/formats/dummy/createPlugin.sh
index aacc3d4..aacc3d4 100755
--- a/fbreader/src/formats/dummy/createPlugin.sh
+++ b/reader/src/formats/dummy/createPlugin.sh
diff --git a/fbreader/src/formats/fb2/FB2BookReader.cpp b/reader/src/formats/fb2/FB2BookReader.cpp
index f689343..f689343 100644
--- a/fbreader/src/formats/fb2/FB2BookReader.cpp
+++ b/reader/src/formats/fb2/FB2BookReader.cpp
diff --git a/fbreader/src/formats/fb2/FB2BookReader.h b/reader/src/formats/fb2/FB2BookReader.h
index b9d22d1..b9d22d1 100644
--- a/fbreader/src/formats/fb2/FB2BookReader.h
+++ b/reader/src/formats/fb2/FB2BookReader.h
diff --git a/fbreader/src/formats/fb2/FB2CoverReader.cpp b/reader/src/formats/fb2/FB2CoverReader.cpp
index cc84ac2..cc84ac2 100644
--- a/fbreader/src/formats/fb2/FB2CoverReader.cpp
+++ b/reader/src/formats/fb2/FB2CoverReader.cpp
diff --git a/fbreader/src/formats/fb2/FB2CoverReader.h b/reader/src/formats/fb2/FB2CoverReader.h
index 6807aa9..6807aa9 100644
--- a/fbreader/src/formats/fb2/FB2CoverReader.h
+++ b/reader/src/formats/fb2/FB2CoverReader.h
diff --git a/fbreader/src/formats/fb2/FB2MetaInfoReader.cpp b/reader/src/formats/fb2/FB2MetaInfoReader.cpp
index 3d596ac..3d596ac 100644
--- a/fbreader/src/formats/fb2/FB2MetaInfoReader.cpp
+++ b/reader/src/formats/fb2/FB2MetaInfoReader.cpp
diff --git a/fbreader/src/formats/fb2/FB2MetaInfoReader.h b/reader/src/formats/fb2/FB2MetaInfoReader.h
index cc09909..cc09909 100644
--- a/fbreader/src/formats/fb2/FB2MetaInfoReader.h
+++ b/reader/src/formats/fb2/FB2MetaInfoReader.h
diff --git a/fbreader/src/formats/fb2/FB2Plugin.cpp b/reader/src/formats/fb2/FB2Plugin.cpp
index f65ddcb..f65ddcb 100644
--- a/fbreader/src/formats/fb2/FB2Plugin.cpp
+++ b/reader/src/formats/fb2/FB2Plugin.cpp
diff --git a/fbreader/src/formats/fb2/FB2Plugin.h b/reader/src/formats/fb2/FB2Plugin.h
index d96558d..d96558d 100644
--- a/fbreader/src/formats/fb2/FB2Plugin.h
+++ b/reader/src/formats/fb2/FB2Plugin.h
diff --git a/fbreader/src/formats/fb2/FB2Reader.cpp b/reader/src/formats/fb2/FB2Reader.cpp
index c8e279c..c8e279c 100644
--- a/fbreader/src/formats/fb2/FB2Reader.cpp
+++ b/reader/src/formats/fb2/FB2Reader.cpp
diff --git a/fbreader/src/formats/fb2/FB2Reader.h b/reader/src/formats/fb2/FB2Reader.h
index 8fa8654..8fa8654 100644
--- a/fbreader/src/formats/fb2/FB2Reader.h
+++ b/reader/src/formats/fb2/FB2Reader.h
diff --git a/fbreader/src/formats/fb2/FB2TagManager.cpp b/reader/src/formats/fb2/FB2TagManager.cpp
index f698ace..f698ace 100644
--- a/fbreader/src/formats/fb2/FB2TagManager.cpp
+++ b/reader/src/formats/fb2/FB2TagManager.cpp
diff --git a/fbreader/src/formats/fb2/FB2TagManager.h b/reader/src/formats/fb2/FB2TagManager.h
index cfbf076..cfbf076 100644
--- a/fbreader/src/formats/fb2/FB2TagManager.h
+++ b/reader/src/formats/fb2/FB2TagManager.h
diff --git a/fbreader/src/formats/html/HtmlBookReader.cpp b/reader/src/formats/html/HtmlBookReader.cpp
index 321913d..321913d 100644
--- a/fbreader/src/formats/html/HtmlBookReader.cpp
+++ b/reader/src/formats/html/HtmlBookReader.cpp
diff --git a/fbreader/src/formats/html/HtmlBookReader.h b/reader/src/formats/html/HtmlBookReader.h
index c8d4e32..c8d4e32 100644
--- a/fbreader/src/formats/html/HtmlBookReader.h
+++ b/reader/src/formats/html/HtmlBookReader.h
diff --git a/fbreader/src/formats/html/HtmlDescriptionReader.cpp b/reader/src/formats/html/HtmlDescriptionReader.cpp
index 6ebcb8b..6ebcb8b 100644
--- a/fbreader/src/formats/html/HtmlDescriptionReader.cpp
+++ b/reader/src/formats/html/HtmlDescriptionReader.cpp
diff --git a/fbreader/src/formats/html/HtmlDescriptionReader.h b/reader/src/formats/html/HtmlDescriptionReader.h
index 159d4b0..159d4b0 100644
--- a/fbreader/src/formats/html/HtmlDescriptionReader.h
+++ b/reader/src/formats/html/HtmlDescriptionReader.h
diff --git a/fbreader/src/formats/html/HtmlEntityCollection.cpp b/reader/src/formats/html/HtmlEntityCollection.cpp
index bd1bb4e..bd1bb4e 100644
--- a/fbreader/src/formats/html/HtmlEntityCollection.cpp
+++ b/reader/src/formats/html/HtmlEntityCollection.cpp
diff --git a/fbreader/src/formats/html/HtmlEntityCollection.h b/reader/src/formats/html/HtmlEntityCollection.h
index 6f70491..6f70491 100644
--- a/fbreader/src/formats/html/HtmlEntityCollection.h
+++ b/reader/src/formats/html/HtmlEntityCollection.h
diff --git a/fbreader/src/formats/html/HtmlPlugin.cpp b/reader/src/formats/html/HtmlPlugin.cpp
index 279e096..279e096 100644
--- a/fbreader/src/formats/html/HtmlPlugin.cpp
+++ b/reader/src/formats/html/HtmlPlugin.cpp
diff --git a/fbreader/src/formats/html/HtmlPlugin.h b/reader/src/formats/html/HtmlPlugin.h
index c66a108..c66a108 100644
--- a/fbreader/src/formats/html/HtmlPlugin.h
+++ b/reader/src/formats/html/HtmlPlugin.h
diff --git a/fbreader/src/formats/html/HtmlReader.cpp b/reader/src/formats/html/HtmlReader.cpp
index a5ce7fa..a5ce7fa 100644
--- a/fbreader/src/formats/html/HtmlReader.cpp
+++ b/reader/src/formats/html/HtmlReader.cpp
diff --git a/fbreader/src/formats/html/HtmlReader.h b/reader/src/formats/html/HtmlReader.h
index 876fad8..876fad8 100644
--- a/fbreader/src/formats/html/HtmlReader.h
+++ b/reader/src/formats/html/HtmlReader.h
diff --git a/fbreader/src/formats/html/HtmlReaderStream.cpp b/reader/src/formats/html/HtmlReaderStream.cpp
index 08c43ae..08c43ae 100644
--- a/fbreader/src/formats/html/HtmlReaderStream.cpp
+++ b/reader/src/formats/html/HtmlReaderStream.cpp
diff --git a/fbreader/src/formats/html/HtmlReaderStream.h b/reader/src/formats/html/HtmlReaderStream.h
index c5c15b8..c5c15b8 100644
--- a/fbreader/src/formats/html/HtmlReaderStream.h
+++ b/reader/src/formats/html/HtmlReaderStream.h
diff --git a/fbreader/src/formats/html/HtmlTagActions.h b/reader/src/formats/html/HtmlTagActions.h
index 7da3f20..7da3f20 100644
--- a/fbreader/src/formats/html/HtmlTagActions.h
+++ b/reader/src/formats/html/HtmlTagActions.h
diff --git a/fbreader/src/formats/oeb/NCXReader.cpp b/reader/src/formats/oeb/NCXReader.cpp
index e824e16..e824e16 100644
--- a/fbreader/src/formats/oeb/NCXReader.cpp
+++ b/reader/src/formats/oeb/NCXReader.cpp
diff --git a/fbreader/src/formats/oeb/NCXReader.h b/reader/src/formats/oeb/NCXReader.h
index c10d2ab..c10d2ab 100644
--- a/fbreader/src/formats/oeb/NCXReader.h
+++ b/reader/src/formats/oeb/NCXReader.h
diff --git a/fbreader/src/formats/oeb/OEBBookReader.cpp b/reader/src/formats/oeb/OEBBookReader.cpp
index c4234a7..c4234a7 100644
--- a/fbreader/src/formats/oeb/OEBBookReader.cpp
+++ b/reader/src/formats/oeb/OEBBookReader.cpp
diff --git a/fbreader/src/formats/oeb/OEBBookReader.h b/reader/src/formats/oeb/OEBBookReader.h
index 092f269..092f269 100644
--- a/fbreader/src/formats/oeb/OEBBookReader.h
+++ b/reader/src/formats/oeb/OEBBookReader.h
diff --git a/fbreader/src/formats/oeb/OEBCoverReader.cpp b/reader/src/formats/oeb/OEBCoverReader.cpp
index 842de30..842de30 100644
--- a/fbreader/src/formats/oeb/OEBCoverReader.cpp
+++ b/reader/src/formats/oeb/OEBCoverReader.cpp
diff --git a/fbreader/src/formats/oeb/OEBCoverReader.h b/reader/src/formats/oeb/OEBCoverReader.h
index e1f96b5..e1f96b5 100644
--- a/fbreader/src/formats/oeb/OEBCoverReader.h
+++ b/reader/src/formats/oeb/OEBCoverReader.h
diff --git a/fbreader/src/formats/oeb/OEBMetaInfoReader.cpp b/reader/src/formats/oeb/OEBMetaInfoReader.cpp
index f9eb82d..f9eb82d 100644
--- a/fbreader/src/formats/oeb/OEBMetaInfoReader.cpp
+++ b/reader/src/formats/oeb/OEBMetaInfoReader.cpp
diff --git a/fbreader/src/formats/oeb/OEBMetaInfoReader.h b/reader/src/formats/oeb/OEBMetaInfoReader.h
index 2337c50..2337c50 100644
--- a/fbreader/src/formats/oeb/OEBMetaInfoReader.h
+++ b/reader/src/formats/oeb/OEBMetaInfoReader.h
diff --git a/fbreader/src/formats/oeb/OEBPlugin.cpp b/reader/src/formats/oeb/OEBPlugin.cpp
index 96970c1..96970c1 100644
--- a/fbreader/src/formats/oeb/OEBPlugin.cpp
+++ b/reader/src/formats/oeb/OEBPlugin.cpp
diff --git a/fbreader/src/formats/oeb/OEBPlugin.h b/reader/src/formats/oeb/OEBPlugin.h
index a515208..a515208 100644
--- a/fbreader/src/formats/oeb/OEBPlugin.h
+++ b/reader/src/formats/oeb/OEBPlugin.h
diff --git a/fbreader/src/formats/oeb/OEBTextStream.cpp b/reader/src/formats/oeb/OEBTextStream.cpp
index 4dbfa47..4dbfa47 100644
--- a/fbreader/src/formats/oeb/OEBTextStream.cpp
+++ b/reader/src/formats/oeb/OEBTextStream.cpp
diff --git a/fbreader/src/formats/oeb/OEBTextStream.h b/reader/src/formats/oeb/OEBTextStream.h
index 6ddd2c9..6ddd2c9 100644
--- a/fbreader/src/formats/oeb/OEBTextStream.h
+++ b/reader/src/formats/oeb/OEBTextStream.h
diff --git a/fbreader/src/formats/oeb/XHTMLImageFinder.cpp b/reader/src/formats/oeb/XHTMLImageFinder.cpp
index 6a449c9..6a449c9 100644
--- a/fbreader/src/formats/oeb/XHTMLImageFinder.cpp
+++ b/reader/src/formats/oeb/XHTMLImageFinder.cpp
diff --git a/fbreader/src/formats/oeb/XHTMLImageFinder.h b/reader/src/formats/oeb/XHTMLImageFinder.h
index 28e53f2..28e53f2 100644
--- a/fbreader/src/formats/oeb/XHTMLImageFinder.h
+++ b/reader/src/formats/oeb/XHTMLImageFinder.h
diff --git a/fbreader/src/formats/openreader/ORBookReader.cpp b/reader/src/formats/openreader/ORBookReader.cpp
index d494b7f..d494b7f 100644
--- a/fbreader/src/formats/openreader/ORBookReader.cpp
+++ b/reader/src/formats/openreader/ORBookReader.cpp
diff --git a/fbreader/src/formats/openreader/ORBookReader.h b/reader/src/formats/openreader/ORBookReader.h
index 160c9f1..160c9f1 100644
--- a/fbreader/src/formats/openreader/ORBookReader.h
+++ b/reader/src/formats/openreader/ORBookReader.h
diff --git a/fbreader/src/formats/openreader/ORDescriptionReader.cpp b/reader/src/formats/openreader/ORDescriptionReader.cpp
index 8c80dfa..8c80dfa 100644
--- a/fbreader/src/formats/openreader/ORDescriptionReader.cpp
+++ b/reader/src/formats/openreader/ORDescriptionReader.cpp
diff --git a/fbreader/src/formats/openreader/ORDescriptionReader.h b/reader/src/formats/openreader/ORDescriptionReader.h
index a4f6b2a..a4f6b2a 100644
--- a/fbreader/src/formats/openreader/ORDescriptionReader.h
+++ b/reader/src/formats/openreader/ORDescriptionReader.h
diff --git a/fbreader/src/formats/openreader/OpenReaderPlugin.cpp b/reader/src/formats/openreader/OpenReaderPlugin.cpp
index 545f83b..545f83b 100644
--- a/fbreader/src/formats/openreader/OpenReaderPlugin.cpp
+++ b/reader/src/formats/openreader/OpenReaderPlugin.cpp
diff --git a/fbreader/src/formats/openreader/OpenReaderPlugin.h b/reader/src/formats/openreader/OpenReaderPlugin.h
index fcfaa11..fcfaa11 100644
--- a/fbreader/src/formats/openreader/OpenReaderPlugin.h
+++ b/reader/src/formats/openreader/OpenReaderPlugin.h
diff --git a/fbreader/src/formats/pdb/BitReader.cpp b/reader/src/formats/pdb/BitReader.cpp
index 551aaf3..551aaf3 100644
--- a/fbreader/src/formats/pdb/BitReader.cpp
+++ b/reader/src/formats/pdb/BitReader.cpp
diff --git a/fbreader/src/formats/pdb/BitReader.h b/reader/src/formats/pdb/BitReader.h
index a8a3d2d..a8a3d2d 100644
--- a/fbreader/src/formats/pdb/BitReader.h
+++ b/reader/src/formats/pdb/BitReader.h
diff --git a/fbreader/src/formats/pdb/DocDecompressor.cpp b/reader/src/formats/pdb/DocDecompressor.cpp
index 9175bc9..9175bc9 100644
--- a/fbreader/src/formats/pdb/DocDecompressor.cpp
+++ b/reader/src/formats/pdb/DocDecompressor.cpp
diff --git a/fbreader/src/formats/pdb/DocDecompressor.h b/reader/src/formats/pdb/DocDecompressor.h
index 820bb0a..820bb0a 100644
--- a/fbreader/src/formats/pdb/DocDecompressor.h
+++ b/reader/src/formats/pdb/DocDecompressor.h
diff --git a/fbreader/src/formats/pdb/EReaderPlugin.cpp b/reader/src/formats/pdb/EReaderPlugin.cpp
index 8420c7f..8420c7f 100644
--- a/fbreader/src/formats/pdb/EReaderPlugin.cpp
+++ b/reader/src/formats/pdb/EReaderPlugin.cpp
diff --git a/fbreader/src/formats/pdb/EReaderStream.cpp b/reader/src/formats/pdb/EReaderStream.cpp
index 9775773..9775773 100644
--- a/fbreader/src/formats/pdb/EReaderStream.cpp
+++ b/reader/src/formats/pdb/EReaderStream.cpp
diff --git a/fbreader/src/formats/pdb/EReaderStream.h b/reader/src/formats/pdb/EReaderStream.h
index 990c6ba..990c6ba 100644
--- a/fbreader/src/formats/pdb/EReaderStream.h
+++ b/reader/src/formats/pdb/EReaderStream.h
diff --git a/fbreader/src/formats/pdb/HtmlMetainfoReader.cpp b/reader/src/formats/pdb/HtmlMetainfoReader.cpp
index 8829591..8829591 100644
--- a/fbreader/src/formats/pdb/HtmlMetainfoReader.cpp
+++ b/reader/src/formats/pdb/HtmlMetainfoReader.cpp
diff --git a/fbreader/src/formats/pdb/HtmlMetainfoReader.h b/reader/src/formats/pdb/HtmlMetainfoReader.h
index 119c72e..119c72e 100644
--- a/fbreader/src/formats/pdb/HtmlMetainfoReader.h
+++ b/reader/src/formats/pdb/HtmlMetainfoReader.h
diff --git a/fbreader/src/formats/pdb/HuffDecompressor.cpp b/reader/src/formats/pdb/HuffDecompressor.cpp
index 9b6f285..9b6f285 100644
--- a/fbreader/src/formats/pdb/HuffDecompressor.cpp
+++ b/reader/src/formats/pdb/HuffDecompressor.cpp
diff --git a/fbreader/src/formats/pdb/HuffDecompressor.h b/reader/src/formats/pdb/HuffDecompressor.h
index 76539e9..76539e9 100644
--- a/fbreader/src/formats/pdb/HuffDecompressor.h
+++ b/reader/src/formats/pdb/HuffDecompressor.h
diff --git a/fbreader/src/formats/pdb/MobipocketHtmlBookReader.cpp b/reader/src/formats/pdb/MobipocketHtmlBookReader.cpp
index cecbfbc..cecbfbc 100644
--- a/fbreader/src/formats/pdb/MobipocketHtmlBookReader.cpp
+++ b/reader/src/formats/pdb/MobipocketHtmlBookReader.cpp
diff --git a/fbreader/src/formats/pdb/MobipocketHtmlBookReader.h b/reader/src/formats/pdb/MobipocketHtmlBookReader.h
index 7a35523..7a35523 100644
--- a/fbreader/src/formats/pdb/MobipocketHtmlBookReader.h
+++ b/reader/src/formats/pdb/MobipocketHtmlBookReader.h
diff --git a/fbreader/src/formats/pdb/MobipocketPlugin.cpp b/reader/src/formats/pdb/MobipocketPlugin.cpp
index 4832b43..4832b43 100644
--- a/fbreader/src/formats/pdb/MobipocketPlugin.cpp
+++ b/reader/src/formats/pdb/MobipocketPlugin.cpp
diff --git a/fbreader/src/formats/pdb/PalmDocLikePlugin.cpp b/reader/src/formats/pdb/PalmDocLikePlugin.cpp
index 27c03a1..27c03a1 100644
--- a/fbreader/src/formats/pdb/PalmDocLikePlugin.cpp
+++ b/reader/src/formats/pdb/PalmDocLikePlugin.cpp
diff --git a/fbreader/src/formats/pdb/PalmDocLikeStream.cpp b/reader/src/formats/pdb/PalmDocLikeStream.cpp
index 8b99d4d..8b99d4d 100644
--- a/fbreader/src/formats/pdb/PalmDocLikeStream.cpp
+++ b/reader/src/formats/pdb/PalmDocLikeStream.cpp
diff --git a/fbreader/src/formats/pdb/PalmDocLikeStream.h b/reader/src/formats/pdb/PalmDocLikeStream.h
index 623a493..623a493 100644
--- a/fbreader/src/formats/pdb/PalmDocLikeStream.h
+++ b/reader/src/formats/pdb/PalmDocLikeStream.h
diff --git a/fbreader/src/formats/pdb/PalmDocPlugin.cpp b/reader/src/formats/pdb/PalmDocPlugin.cpp
index c23f11c..c23f11c 100644
--- a/fbreader/src/formats/pdb/PalmDocPlugin.cpp
+++ b/reader/src/formats/pdb/PalmDocPlugin.cpp
diff --git a/fbreader/src/formats/pdb/PalmDocStream.cpp b/reader/src/formats/pdb/PalmDocStream.cpp
index e699d47..e699d47 100644
--- a/fbreader/src/formats/pdb/PalmDocStream.cpp
+++ b/reader/src/formats/pdb/PalmDocStream.cpp
diff --git a/fbreader/src/formats/pdb/PalmDocStream.h b/reader/src/formats/pdb/PalmDocStream.h
index 4782a7b..4782a7b 100644
--- a/fbreader/src/formats/pdb/PalmDocStream.h
+++ b/reader/src/formats/pdb/PalmDocStream.h
diff --git a/fbreader/src/formats/pdb/PdbPlugin.cpp b/reader/src/formats/pdb/PdbPlugin.cpp
index 69ef233..69ef233 100644
--- a/fbreader/src/formats/pdb/PdbPlugin.cpp
+++ b/reader/src/formats/pdb/PdbPlugin.cpp
diff --git a/fbreader/src/formats/pdb/PdbPlugin.h b/reader/src/formats/pdb/PdbPlugin.h
index 9f8600b..9f8600b 100644
--- a/fbreader/src/formats/pdb/PdbPlugin.h
+++ b/reader/src/formats/pdb/PdbPlugin.h
diff --git a/fbreader/src/formats/pdb/PdbReader.cpp b/reader/src/formats/pdb/PdbReader.cpp
index 54dc654..54dc654 100644
--- a/fbreader/src/formats/pdb/PdbReader.cpp
+++ b/reader/src/formats/pdb/PdbReader.cpp
diff --git a/fbreader/src/formats/pdb/PdbReader.h b/reader/src/formats/pdb/PdbReader.h
index f32ebf5..f32ebf5 100644
--- a/fbreader/src/formats/pdb/PdbReader.h
+++ b/reader/src/formats/pdb/PdbReader.h
diff --git a/fbreader/src/formats/pdb/PdbStream.cpp b/reader/src/formats/pdb/PdbStream.cpp
index 219a0de..219a0de 100644
--- a/fbreader/src/formats/pdb/PdbStream.cpp
+++ b/reader/src/formats/pdb/PdbStream.cpp
diff --git a/fbreader/src/formats/pdb/PdbStream.h b/reader/src/formats/pdb/PdbStream.h
index f2c58f1..f2c58f1 100644
--- a/fbreader/src/formats/pdb/PdbStream.h
+++ b/reader/src/formats/pdb/PdbStream.h
diff --git a/fbreader/src/formats/pdb/PluckerBookReader.cpp b/reader/src/formats/pdb/PluckerBookReader.cpp
index 61bc311..61bc311 100644
--- a/fbreader/src/formats/pdb/PluckerBookReader.cpp
+++ b/reader/src/formats/pdb/PluckerBookReader.cpp
diff --git a/fbreader/src/formats/pdb/PluckerBookReader.h b/reader/src/formats/pdb/PluckerBookReader.h
index 1078f37..1078f37 100644
--- a/fbreader/src/formats/pdb/PluckerBookReader.h
+++ b/reader/src/formats/pdb/PluckerBookReader.h
diff --git a/fbreader/src/formats/pdb/PluckerImages.cpp b/reader/src/formats/pdb/PluckerImages.cpp
index db291ab..db291ab 100644
--- a/fbreader/src/formats/pdb/PluckerImages.cpp
+++ b/reader/src/formats/pdb/PluckerImages.cpp
diff --git a/fbreader/src/formats/pdb/PluckerImages.h b/reader/src/formats/pdb/PluckerImages.h
index 3269a29..3269a29 100644
--- a/fbreader/src/formats/pdb/PluckerImages.h
+++ b/reader/src/formats/pdb/PluckerImages.h
diff --git a/fbreader/src/formats/pdb/PluckerPlugin.cpp b/reader/src/formats/pdb/PluckerPlugin.cpp
index 1ec89ba..1ec89ba 100644
--- a/fbreader/src/formats/pdb/PluckerPlugin.cpp
+++ b/reader/src/formats/pdb/PluckerPlugin.cpp
diff --git a/fbreader/src/formats/pdb/PluckerTextStream.cpp b/reader/src/formats/pdb/PluckerTextStream.cpp
index 01291eb..01291eb 100644
--- a/fbreader/src/formats/pdb/PluckerTextStream.cpp
+++ b/reader/src/formats/pdb/PluckerTextStream.cpp
diff --git a/fbreader/src/formats/pdb/PluckerTextStream.h b/reader/src/formats/pdb/PluckerTextStream.h
index 70c1182..70c1182 100644
--- a/fbreader/src/formats/pdb/PluckerTextStream.h
+++ b/reader/src/formats/pdb/PluckerTextStream.h
diff --git a/fbreader/src/formats/pdb/PmlBookReader.cpp b/reader/src/formats/pdb/PmlBookReader.cpp
index e365983..e365983 100644
--- a/fbreader/src/formats/pdb/PmlBookReader.cpp
+++ b/reader/src/formats/pdb/PmlBookReader.cpp
diff --git a/fbreader/src/formats/pdb/PmlBookReader.h b/reader/src/formats/pdb/PmlBookReader.h
index 22944b4..22944b4 100644
--- a/fbreader/src/formats/pdb/PmlBookReader.h
+++ b/reader/src/formats/pdb/PmlBookReader.h
diff --git a/fbreader/src/formats/pdb/PmlReader.cpp b/reader/src/formats/pdb/PmlReader.cpp
index 712a6e0..712a6e0 100644
--- a/fbreader/src/formats/pdb/PmlReader.cpp
+++ b/reader/src/formats/pdb/PmlReader.cpp
diff --git a/fbreader/src/formats/pdb/PmlReader.h b/reader/src/formats/pdb/PmlReader.h
index 496c8d9..496c8d9 100644
--- a/fbreader/src/formats/pdb/PmlReader.h
+++ b/reader/src/formats/pdb/PmlReader.h
diff --git a/fbreader/src/formats/pdb/SimplePdbPlugin.cpp b/reader/src/formats/pdb/SimplePdbPlugin.cpp
index f4b5c30..f4b5c30 100644
--- a/fbreader/src/formats/pdb/SimplePdbPlugin.cpp
+++ b/reader/src/formats/pdb/SimplePdbPlugin.cpp
diff --git a/fbreader/src/formats/pdb/ZTXTPlugin.cpp b/reader/src/formats/pdb/ZTXTPlugin.cpp
index 1465856..1465856 100644
--- a/fbreader/src/formats/pdb/ZTXTPlugin.cpp
+++ b/reader/src/formats/pdb/ZTXTPlugin.cpp
diff --git a/fbreader/src/formats/pdb/ZTXTStream.cpp b/reader/src/formats/pdb/ZTXTStream.cpp
index 2dc549c..2dc549c 100644
--- a/fbreader/src/formats/pdb/ZTXTStream.cpp
+++ b/reader/src/formats/pdb/ZTXTStream.cpp
diff --git a/fbreader/src/formats/pdb/ZTXTStream.h b/reader/src/formats/pdb/ZTXTStream.h
index f89d3a0..f89d3a0 100644
--- a/fbreader/src/formats/pdb/ZTXTStream.h
+++ b/reader/src/formats/pdb/ZTXTStream.h
diff --git a/fbreader/src/formats/pdf/PdfBookReader.cpp b/reader/src/formats/pdf/PdfBookReader.cpp
index bd84452..bd84452 100644
--- a/fbreader/src/formats/pdf/PdfBookReader.cpp
+++ b/reader/src/formats/pdf/PdfBookReader.cpp
diff --git a/fbreader/src/formats/pdf/PdfBookReader.h b/reader/src/formats/pdf/PdfBookReader.h
index 9488dcf..9488dcf 100644
--- a/fbreader/src/formats/pdf/PdfBookReader.h
+++ b/reader/src/formats/pdf/PdfBookReader.h
diff --git a/fbreader/src/formats/pdf/PdfDescriptionReader.cpp b/reader/src/formats/pdf/PdfDescriptionReader.cpp
index 98937fa..98937fa 100644
--- a/fbreader/src/formats/pdf/PdfDescriptionReader.cpp
+++ b/reader/src/formats/pdf/PdfDescriptionReader.cpp
diff --git a/fbreader/src/formats/pdf/PdfDescriptionReader.h b/reader/src/formats/pdf/PdfDescriptionReader.h
index 004cdfa..004cdfa 100644
--- a/fbreader/src/formats/pdf/PdfDescriptionReader.h
+++ b/reader/src/formats/pdf/PdfDescriptionReader.h
diff --git a/fbreader/src/formats/pdf/PdfObject.cpp b/reader/src/formats/pdf/PdfObject.cpp
index 374a618..374a618 100644
--- a/fbreader/src/formats/pdf/PdfObject.cpp
+++ b/reader/src/formats/pdf/PdfObject.cpp
diff --git a/fbreader/src/formats/pdf/PdfObject.h b/reader/src/formats/pdf/PdfObject.h
index 76b8528..76b8528 100644
--- a/fbreader/src/formats/pdf/PdfObject.h
+++ b/reader/src/formats/pdf/PdfObject.h
diff --git a/fbreader/src/formats/pdf/PdfPlugin.cpp b/reader/src/formats/pdf/PdfPlugin.cpp
index 06325d4..06325d4 100644
--- a/fbreader/src/formats/pdf/PdfPlugin.cpp
+++ b/reader/src/formats/pdf/PdfPlugin.cpp
diff --git a/fbreader/src/formats/pdf/PdfPlugin.h b/reader/src/formats/pdf/PdfPlugin.h
index 9c330f6..9c330f6 100644
--- a/fbreader/src/formats/pdf/PdfPlugin.h
+++ b/reader/src/formats/pdf/PdfPlugin.h
diff --git a/fbreader/src/formats/pdf/StringStream.cpp b/reader/src/formats/pdf/StringStream.cpp
index b2369df..b2369df 100644
--- a/fbreader/src/formats/pdf/StringStream.cpp
+++ b/reader/src/formats/pdf/StringStream.cpp
diff --git a/fbreader/src/formats/pdf/StringStream.h b/reader/src/formats/pdf/StringStream.h
index f46c038..f46c038 100644
--- a/fbreader/src/formats/pdf/StringStream.h
+++ b/reader/src/formats/pdf/StringStream.h
diff --git a/fbreader/src/formats/rtf/RtfBookReader.cpp b/reader/src/formats/rtf/RtfBookReader.cpp
index cf16bc7..cf16bc7 100644
--- a/fbreader/src/formats/rtf/RtfBookReader.cpp
+++ b/reader/src/formats/rtf/RtfBookReader.cpp
diff --git a/fbreader/src/formats/rtf/RtfBookReader.h b/reader/src/formats/rtf/RtfBookReader.h
index a977cbd..a977cbd 100644
--- a/fbreader/src/formats/rtf/RtfBookReader.h
+++ b/reader/src/formats/rtf/RtfBookReader.h
diff --git a/fbreader/src/formats/rtf/RtfDescriptionReader.cpp b/reader/src/formats/rtf/RtfDescriptionReader.cpp
index 571e66b..571e66b 100644
--- a/fbreader/src/formats/rtf/RtfDescriptionReader.cpp
+++ b/reader/src/formats/rtf/RtfDescriptionReader.cpp
diff --git a/fbreader/src/formats/rtf/RtfDescriptionReader.h b/reader/src/formats/rtf/RtfDescriptionReader.h
index ff4ffa1..ff4ffa1 100644
--- a/fbreader/src/formats/rtf/RtfDescriptionReader.h
+++ b/reader/src/formats/rtf/RtfDescriptionReader.h
diff --git a/fbreader/src/formats/rtf/RtfPlugin.cpp b/reader/src/formats/rtf/RtfPlugin.cpp
index 42ce39b..42ce39b 100644
--- a/fbreader/src/formats/rtf/RtfPlugin.cpp
+++ b/reader/src/formats/rtf/RtfPlugin.cpp
diff --git a/fbreader/src/formats/rtf/RtfPlugin.h b/reader/src/formats/rtf/RtfPlugin.h
index cb3ef9d..cb3ef9d 100644
--- a/fbreader/src/formats/rtf/RtfPlugin.h
+++ b/reader/src/formats/rtf/RtfPlugin.h
diff --git a/fbreader/src/formats/rtf/RtfReader.cpp b/reader/src/formats/rtf/RtfReader.cpp
index 91fea0c..91fea0c 100644
--- a/fbreader/src/formats/rtf/RtfReader.cpp
+++ b/reader/src/formats/rtf/RtfReader.cpp
diff --git a/fbreader/src/formats/rtf/RtfReader.h b/reader/src/formats/rtf/RtfReader.h
index 10b037a..10b037a 100644
--- a/fbreader/src/formats/rtf/RtfReader.h
+++ b/reader/src/formats/rtf/RtfReader.h
diff --git a/fbreader/src/formats/rtf/RtfReaderStream.cpp b/reader/src/formats/rtf/RtfReaderStream.cpp
index f4537f7..f4537f7 100644
--- a/fbreader/src/formats/rtf/RtfReaderStream.cpp
+++ b/reader/src/formats/rtf/RtfReaderStream.cpp
diff --git a/fbreader/src/formats/rtf/RtfReaderStream.h b/reader/src/formats/rtf/RtfReaderStream.h
index 71555b4..71555b4 100644
--- a/fbreader/src/formats/rtf/RtfReaderStream.h
+++ b/reader/src/formats/rtf/RtfReaderStream.h
diff --git a/fbreader/src/formats/tcr/PPLBookReader.cpp b/reader/src/formats/tcr/PPLBookReader.cpp
index 9b7d271..9b7d271 100644
--- a/fbreader/src/formats/tcr/PPLBookReader.cpp
+++ b/reader/src/formats/tcr/PPLBookReader.cpp
diff --git a/fbreader/src/formats/tcr/PPLBookReader.h b/reader/src/formats/tcr/PPLBookReader.h
index 98c7f9d..98c7f9d 100644
--- a/fbreader/src/formats/tcr/PPLBookReader.h
+++ b/reader/src/formats/tcr/PPLBookReader.h
diff --git a/fbreader/src/formats/tcr/TcrPlugin.cpp b/reader/src/formats/tcr/TcrPlugin.cpp
index 8ee0f14..8ee0f14 100644
--- a/fbreader/src/formats/tcr/TcrPlugin.cpp
+++ b/reader/src/formats/tcr/TcrPlugin.cpp
diff --git a/fbreader/src/formats/tcr/TcrPlugin.h b/reader/src/formats/tcr/TcrPlugin.h
index 9655892..9655892 100644
--- a/fbreader/src/formats/tcr/TcrPlugin.h
+++ b/reader/src/formats/tcr/TcrPlugin.h
diff --git a/fbreader/src/formats/tcr/TcrStream.cpp b/reader/src/formats/tcr/TcrStream.cpp
index cf4e540..cf4e540 100644
--- a/fbreader/src/formats/tcr/TcrStream.cpp
+++ b/reader/src/formats/tcr/TcrStream.cpp
diff --git a/fbreader/src/formats/tcr/TcrStream.h b/reader/src/formats/tcr/TcrStream.h
index 0a9d212..0a9d212 100644
--- a/fbreader/src/formats/tcr/TcrStream.h
+++ b/reader/src/formats/tcr/TcrStream.h
diff --git a/fbreader/src/formats/txt/PlainTextFormat.cpp b/reader/src/formats/txt/PlainTextFormat.cpp
index 7c9360f..7c9360f 100644
--- a/fbreader/src/formats/txt/PlainTextFormat.cpp
+++ b/reader/src/formats/txt/PlainTextFormat.cpp
diff --git a/fbreader/src/formats/txt/PlainTextFormat.h b/reader/src/formats/txt/PlainTextFormat.h
index 32ca258..32ca258 100644
--- a/fbreader/src/formats/txt/PlainTextFormat.h
+++ b/reader/src/formats/txt/PlainTextFormat.h
diff --git a/fbreader/src/formats/txt/TxtBookReader.cpp b/reader/src/formats/txt/TxtBookReader.cpp
index c68ea2c..c68ea2c 100644
--- a/fbreader/src/formats/txt/TxtBookReader.cpp
+++ b/reader/src/formats/txt/TxtBookReader.cpp
diff --git a/fbreader/src/formats/txt/TxtBookReader.h b/reader/src/formats/txt/TxtBookReader.h
index e02ad2a..e02ad2a 100644
--- a/fbreader/src/formats/txt/TxtBookReader.h
+++ b/reader/src/formats/txt/TxtBookReader.h
diff --git a/fbreader/src/formats/txt/TxtPlugin.cpp b/reader/src/formats/txt/TxtPlugin.cpp
index b155c2f..b155c2f 100644
--- a/fbreader/src/formats/txt/TxtPlugin.cpp
+++ b/reader/src/formats/txt/TxtPlugin.cpp
diff --git a/fbreader/src/formats/txt/TxtPlugin.h b/reader/src/formats/txt/TxtPlugin.h
index e3e6e50..e3e6e50 100644
--- a/fbreader/src/formats/txt/TxtPlugin.h
+++ b/reader/src/formats/txt/TxtPlugin.h
diff --git a/fbreader/src/formats/txt/TxtReader.cpp b/reader/src/formats/txt/TxtReader.cpp
index d2f5659..d2f5659 100644
--- a/fbreader/src/formats/txt/TxtReader.cpp
+++ b/reader/src/formats/txt/TxtReader.cpp
diff --git a/fbreader/src/formats/txt/TxtReader.h b/reader/src/formats/txt/TxtReader.h
index 518ba8e..518ba8e 100644
--- a/fbreader/src/formats/txt/TxtReader.h
+++ b/reader/src/formats/txt/TxtReader.h
diff --git a/fbreader/src/formats/util/EntityFilesCollector.cpp b/reader/src/formats/util/EntityFilesCollector.cpp
index 075bd29..075bd29 100644
--- a/fbreader/src/formats/util/EntityFilesCollector.cpp
+++ b/reader/src/formats/util/EntityFilesCollector.cpp
diff --git a/fbreader/src/formats/util/EntityFilesCollector.h b/reader/src/formats/util/EntityFilesCollector.h
index 9967b3d..9967b3d 100644
--- a/fbreader/src/formats/util/EntityFilesCollector.h
+++ b/reader/src/formats/util/EntityFilesCollector.h
diff --git a/fbreader/src/formats/util/MergedStream.cpp b/reader/src/formats/util/MergedStream.cpp
index 1a26a33..1a26a33 100644
--- a/fbreader/src/formats/util/MergedStream.cpp
+++ b/reader/src/formats/util/MergedStream.cpp
diff --git a/fbreader/src/formats/util/MergedStream.h b/reader/src/formats/util/MergedStream.h
index 3f982ee..3f982ee 100644
--- a/fbreader/src/formats/util/MergedStream.h
+++ b/reader/src/formats/util/MergedStream.h
diff --git a/fbreader/src/formats/util/MiscUtil.cpp b/reader/src/formats/util/MiscUtil.cpp
index 1a91406..1a91406 100644
--- a/fbreader/src/formats/util/MiscUtil.cpp
+++ b/reader/src/formats/util/MiscUtil.cpp
diff --git a/fbreader/src/formats/util/MiscUtil.h b/reader/src/formats/util/MiscUtil.h
index c47d84a..c47d84a 100644
--- a/fbreader/src/formats/util/MiscUtil.h
+++ b/reader/src/formats/util/MiscUtil.h
diff --git a/fbreader/src/formats/util/TextFormatDetector.cpp b/reader/src/formats/util/TextFormatDetector.cpp
index 4a3ef67..4a3ef67 100644
--- a/fbreader/src/formats/util/TextFormatDetector.cpp
+++ b/reader/src/formats/util/TextFormatDetector.cpp
diff --git a/fbreader/src/formats/util/TextFormatDetector.h b/reader/src/formats/util/TextFormatDetector.h
index c86b90b..c86b90b 100644
--- a/fbreader/src/formats/util/TextFormatDetector.h
+++ b/reader/src/formats/util/TextFormatDetector.h
diff --git a/fbreader/src/formats/util/XMLTextStream.cpp b/reader/src/formats/util/XMLTextStream.cpp
index 19343a1..19343a1 100644
--- a/fbreader/src/formats/util/XMLTextStream.cpp
+++ b/reader/src/formats/util/XMLTextStream.cpp
diff --git a/fbreader/src/formats/util/XMLTextStream.h b/reader/src/formats/util/XMLTextStream.h
index f3151c6..f3151c6 100644
--- a/fbreader/src/formats/util/XMLTextStream.h
+++ b/reader/src/formats/util/XMLTextStream.h
diff --git a/fbreader/src/formats/xhtml/XHTMLReader.cpp b/reader/src/formats/xhtml/XHTMLReader.cpp
index 6e4ba59..6e4ba59 100644
--- a/fbreader/src/formats/xhtml/XHTMLReader.cpp
+++ b/reader/src/formats/xhtml/XHTMLReader.cpp
diff --git a/fbreader/src/formats/xhtml/XHTMLReader.h b/reader/src/formats/xhtml/XHTMLReader.h
index 08d4c02..08d4c02 100644
--- a/fbreader/src/formats/xhtml/XHTMLReader.h
+++ b/reader/src/formats/xhtml/XHTMLReader.h
diff --git a/fbreader/src/library/Author.cpp b/reader/src/library/Author.cpp
index 2478bdd..2478bdd 100644
--- a/fbreader/src/library/Author.cpp
+++ b/reader/src/library/Author.cpp
diff --git a/fbreader/src/library/Author.h b/reader/src/library/Author.h
index 04907f8..04907f8 100644
--- a/fbreader/src/library/Author.h
+++ b/reader/src/library/Author.h
diff --git a/fbreader/src/library/Book.cpp b/reader/src/library/Book.cpp
index ca3afd0..ca3afd0 100644
--- a/fbreader/src/library/Book.cpp
+++ b/reader/src/library/Book.cpp
diff --git a/fbreader/src/library/Book.h b/reader/src/library/Book.h
index daed2e0..daed2e0 100644
--- a/fbreader/src/library/Book.h
+++ b/reader/src/library/Book.h
diff --git a/fbreader/src/library/Comparators.cpp b/reader/src/library/Comparators.cpp
index 30b4059..30b4059 100644
--- a/fbreader/src/library/Comparators.cpp
+++ b/reader/src/library/Comparators.cpp
diff --git a/fbreader/src/library/Library.cpp b/reader/src/library/Library.cpp
index 8ee1f36..8ee1f36 100644
--- a/fbreader/src/library/Library.cpp
+++ b/reader/src/library/Library.cpp
diff --git a/fbreader/src/library/Library.h b/reader/src/library/Library.h
index 86eda4b..86eda4b 100644
--- a/fbreader/src/library/Library.h
+++ b/reader/src/library/Library.h
diff --git a/fbreader/src/library/Lists.h b/reader/src/library/Lists.h
index 9768841..9768841 100644
--- a/fbreader/src/library/Lists.h
+++ b/reader/src/library/Lists.h
diff --git a/fbreader/src/library/Number.cpp b/reader/src/library/Number.cpp
index 003104e..003104e 100644
--- a/fbreader/src/library/Number.cpp
+++ b/reader/src/library/Number.cpp
diff --git a/fbreader/src/library/Number.h b/reader/src/library/Number.h
index 858b4be..858b4be 100644
--- a/fbreader/src/library/Number.h
+++ b/reader/src/library/Number.h
diff --git a/fbreader/src/library/Tag.cpp b/reader/src/library/Tag.cpp
index c76db47..c76db47 100644
--- a/fbreader/src/library/Tag.cpp
+++ b/reader/src/library/Tag.cpp
diff --git a/fbreader/src/library/Tag.h b/reader/src/library/Tag.h
index 0bd1f79..0bd1f79 100644
--- a/fbreader/src/library/Tag.h
+++ b/reader/src/library/Tag.h
diff --git a/fbreader/src/libraryActions/AuthorInfoDialog.cpp b/reader/src/libraryActions/AuthorInfoDialog.cpp
index fdc2252..fdc2252 100644
--- a/fbreader/src/libraryActions/AuthorInfoDialog.cpp
+++ b/reader/src/libraryActions/AuthorInfoDialog.cpp
diff --git a/fbreader/src/libraryActions/AuthorInfoDialog.h b/reader/src/libraryActions/AuthorInfoDialog.h
index e4194aa..e4194aa 100644
--- a/fbreader/src/libraryActions/AuthorInfoDialog.h
+++ b/reader/src/libraryActions/AuthorInfoDialog.h
diff --git a/fbreader/src/libraryActions/BooksUtil.cpp b/reader/src/libraryActions/BooksUtil.cpp
index ee831bd..93f9f06 100644
--- a/fbreader/src/libraryActions/BooksUtil.cpp
+++ b/reader/src/libraryActions/BooksUtil.cpp
@@ -24,7 +24,7 @@
 
 #include "../library/Library.h"
 #include "../library/Tag.h"
-#include "../fbreader/FBReader.h"
+#include "../reader/Reader.h"
 
 void BooksUtil::removeTag(shared_ptr<Tag> tag) {
 	ZLResourceKey boxKey("removeTagBox");
@@ -62,7 +62,7 @@ void BooksUtil::removeTag(shared_ptr<Tag> tag) {
 	if (code != DONT_REMOVE) {
 		library.removeTag(tag, code == REMOVE_SUBTREE);
 		// TODO: select current node (?) again
-		FBReader::Instance().refreshWindow();
+		Reader::Instance().refreshWindow();
 	}
 }
 
diff --git a/fbreader/src/libraryActions/BooksUtil.h b/reader/src/libraryActions/BooksUtil.h
index b12c8e8..b12c8e8 100644
--- a/fbreader/src/libraryActions/BooksUtil.h
+++ b/reader/src/libraryActions/BooksUtil.h
diff --git a/fbreader/src/libraryActions/LibraryAuthorActions.cpp b/reader/src/libraryActions/LibraryAuthorActions.cpp
index d0c87b2..5f4363d 100644
--- a/fbreader/src/libraryActions/LibraryAuthorActions.cpp
+++ b/reader/src/libraryActions/LibraryAuthorActions.cpp
@@ -21,7 +21,7 @@
 #include "AuthorInfoDialog.h"
 
 #include "../library/Author.h"
-#include "../fbreader/FBReader.h"
+#include "../reader/Reader.h"
 
 AuthorEditInfoAction::AuthorEditInfoAction(shared_ptr<Author> author) : myAuthor(author) {
 }
@@ -32,7 +32,7 @@ AuthorEditInfoAction::~AuthorEditInfoAction() {
 void AuthorEditInfoAction::run() {
 	if (AuthorInfoDialog::run(myAuthor)) {
 		// TODO: select current node (?) again
-		FBReader::Instance().refreshWindow();
+		Reader::Instance().refreshWindow();
 	}
 }
 
diff --git a/fbreader/src/libraryActions/LibraryAuthorActions.h b/reader/src/libraryActions/LibraryAuthorActions.h
index 2fddb7a..2fddb7a 100644
--- a/fbreader/src/libraryActions/LibraryAuthorActions.h
+++ b/reader/src/libraryActions/LibraryAuthorActions.h
diff --git a/fbreader/src/libraryActions/LibraryBookActions.cpp b/reader/src/libraryActions/LibraryBookActions.cpp
index 6e72411..0c490c4 100644
--- a/fbreader/src/libraryActions/LibraryBookActions.cpp
+++ b/reader/src/libraryActions/LibraryBookActions.cpp
@@ -25,16 +25,16 @@
 
 #include "LibraryBookActions.h"
 #include "../library/Book.h"
-#include "../fbreader/FBReader.h"
+#include "../reader/Reader.h"
 #include "../optionsDialog/bookInfo/BookInfoDialog.h"
 
 BookReadAction::BookReadAction(shared_ptr<Book> book) : myBook(book) {
 }
 
 void BookReadAction::run() {
-	FBReader &fbreader = FBReader::Instance();
-	fbreader.openBook(myBook);
-	fbreader.showBookTextView();
+	Reader &reader = Reader::Instance();
+	reader.openBook(myBook);
+	reader.showBookTextView();
 }
 
 ZLResourceKey BookReadAction::key() const {
@@ -60,7 +60,7 @@ void BookRemoveAction::run() {
 		// yes, we go through this label
 		case Library::REMOVE_FROM_LIBRARY:
 			Library::Instance().removeBook(myBook);
-			FBReader::Instance().refreshWindow();
+			Reader::Instance().refreshWindow();
 		case Library::REMOVE_DONT_REMOVE:
 			break;
 	}
@@ -123,7 +123,7 @@ BookEditInfoAction::BookEditInfoAction(shared_ptr<Book> book) : myBook(book) {
 void BookEditInfoAction::run() {
 	if (BookInfoDialog(myBook).dialog().run()) {
 		// TODO: select current node (?) again
-		FBReader::Instance().refreshWindow();
+		Reader::Instance().refreshWindow();
 	}
 }
 
diff --git a/fbreader/src/libraryActions/LibraryBookActions.h b/reader/src/libraryActions/LibraryBookActions.h
index 873fbb7..873fbb7 100644
--- a/fbreader/src/libraryActions/LibraryBookActions.h
+++ b/reader/src/libraryActions/LibraryBookActions.h
diff --git a/fbreader/src/libraryActions/LibraryTagActions.cpp b/reader/src/libraryActions/LibraryTagActions.cpp
index 0fe945e..0fe945e 100644
--- a/fbreader/src/libraryActions/LibraryTagActions.cpp
+++ b/reader/src/libraryActions/LibraryTagActions.cpp
diff --git a/fbreader/src/libraryActions/LibraryTagActions.h b/reader/src/libraryActions/LibraryTagActions.h
index de9d6a9..de9d6a9 100644
--- a/fbreader/src/libraryActions/LibraryTagActions.h
+++ b/reader/src/libraryActions/LibraryTagActions.h
diff --git a/fbreader/src/libraryTree/AuthorNode.cpp b/reader/src/libraryTree/AuthorNode.cpp
index a250c1a..a22970f 100644
--- a/fbreader/src/libraryTree/AuthorNode.cpp
+++ b/reader/src/libraryTree/AuthorNode.cpp
@@ -26,7 +26,7 @@
 #include "../library/Author.h"
 #include "../libraryActions/LibraryAuthorActions.h"
 
-const ZLTypeId AuthorNode::TYPE_ID(FBReaderNode::TYPE_ID);
+const ZLTypeId AuthorNode::TYPE_ID(ReaderNode::TYPE_ID);
 
 const ZLResource &AuthorNode::resource() const {
 	return ZLResource::resource("libraryView")["authorNode"];
@@ -36,7 +36,7 @@ const ZLTypeId &AuthorNode::typeId() const {
 	return TYPE_ID;
 }
 
-AuthorNode::AuthorNode(ZLBlockTreeView::RootNode *parent, std::size_t atPosition, shared_ptr<Author> author) : FBReaderNode(parent, atPosition), myAuthor(author) {
+AuthorNode::AuthorNode(ZLBlockTreeView::RootNode *parent, std::size_t atPosition, shared_ptr<Author> author) : ReaderNode(parent, atPosition), myAuthor(author) {
 }
 
 void AuthorNode::init() {
diff --git a/fbreader/src/libraryTree/BookNode.cpp b/reader/src/libraryTree/BookNode.cpp
index 0df43e5..8ef323d 100644
--- a/fbreader/src/libraryTree/BookNode.cpp
+++ b/reader/src/libraryTree/BookNode.cpp
@@ -27,10 +27,10 @@
 #include "../library/Tag.h"
 #include "../libraryActions/LibraryBookActions.h"
 
-#include "../fbreader/FBReader.h"
+#include "../reader/Reader.h"
 #include "../formats/FormatPlugin.h"
 
-const ZLTypeId BookNode::TYPE_ID(FBReaderNode::TYPE_ID);
+const ZLTypeId BookNode::TYPE_ID(ReaderNode::TYPE_ID);
 
 const ZLTypeId &BookNode::typeId() const {
 	return TYPE_ID;
@@ -40,13 +40,13 @@ const ZLResource &BookNode::resource() const {
 	return ZLResource::resource("libraryView")["bookNode"];
 }
 
-BookNode::BookNode(AuthorNode *parent, shared_ptr<Book> book) : FBReaderNode(parent), myBook(book) {
+BookNode::BookNode(AuthorNode *parent, shared_ptr<Book> book) : ReaderNode(parent), myBook(book) {
 }
 
-BookNode::BookNode(SeriesNode *parent, shared_ptr<Book> book) : FBReaderNode(parent), myBook(book) {
+BookNode::BookNode(SeriesNode *parent, shared_ptr<Book> book) : ReaderNode(parent), myBook(book) {
 }
 
-BookNode::BookNode(TagNode *parent, std::size_t atPosition, shared_ptr<Book> book) : FBReaderNode(parent, atPosition), myBook(book) {
+BookNode::BookNode(TagNode *parent, std::size_t atPosition, shared_ptr<Book> book) : ReaderNode(parent, atPosition), myBook(book) {
 }
 
 void BookNode::init() {
@@ -64,10 +64,10 @@ std::string BookNode::title() const {
 }
 
 std::string BookNode::summary() const {
-	FBReaderNode *parent = (FBReaderNode*)this->parent();
+	ReaderNode *parent = (ReaderNode*)this->parent();
 	while (!parent->isInstanceOf(AuthorNode::TYPE_ID) &&
 				 !parent->isInstanceOf(TagNode::TYPE_ID)) {
-		parent = (FBReaderNode*)parent->parent();
+		parent = (ReaderNode*)parent->parent();
 	}
 	if (parent->isInstanceOf(AuthorNode::TYPE_ID)) {
 		const TagList &tags = myBook->tags();
@@ -101,7 +101,7 @@ std::string BookNode::summary() const {
 }
 
 bool BookNode::highlighted() const {
-	return myBook->file() == FBReader::Instance().currentBook()->file();
+	return myBook->file() == Reader::Instance().currentBook()->file();
 }
 
 shared_ptr<const ZLImage> BookNode::extractCoverImage() const {
diff --git a/fbreader/src/libraryTree/LibraryByAuthorView.cpp b/reader/src/libraryTree/LibraryByAuthorView.cpp
index 68a13f4..4b0bb56 100644
--- a/fbreader/src/libraryTree/LibraryByAuthorView.cpp
+++ b/reader/src/libraryTree/LibraryByAuthorView.cpp
@@ -66,7 +66,7 @@ bool LibraryByAuthorView::isSubtreeUpToDate(AuthorNode *authorNode) {
 
 	const ZLBlockTreeNode::List &nodes = authorNode->children();
 	for (ZLBlockTreeNode::List::const_iterator nIt = nodes.begin(); nIt != nodes.end(); ++nIt) {
-		FBReaderNode &node = *(FBReaderNode*)*nIt;
+		ReaderNode &node = *(ReaderNode*)*nIt;
 		if (node.isInstanceOf(BookNode::TYPE_ID)) {
 			shared_ptr<Book> book = ((BookNode&)node).book();
 			if (it == books.end() || *it != book || !book->seriesTitle().empty()) {
@@ -92,7 +92,7 @@ void LibraryByAuthorView::updateAuthorSubtree(AuthorNode *authorNode) {
 
 	const ZLBlockTreeNode::List &nodes = authorNode->children();
 	for (ZLBlockTreeNode::List::const_iterator nIt = nodes.begin(); nIt != nodes.end(); ++nIt) {
-		FBReaderNode &node = *(FBReaderNode*)*nIt;
+		ReaderNode &node = *(ReaderNode*)*nIt;
 		if (node.isInstanceOf(BookNode::TYPE_ID)) {
 			visibleBooks.insert(((BookNode&)node).book());
 		} else if (node.isOpen()) {
@@ -111,9 +111,9 @@ void LibraryByAuthorView::makeUpToDate() {
 	ZLBlockTreeNode *topNode = firstVisibleNode();
 	AuthorNode *topAuthorNode = 0;
 	if (topNode != &rootNode()) {
-		FBReaderNode *lNode = (FBReaderNode*)topNode;
+		ReaderNode *lNode = (ReaderNode*)topNode;
 		while (!lNode->isInstanceOf(AuthorNode::TYPE_ID)) {
-			lNode = (FBReaderNode*)lNode->parent();
+			lNode = (ReaderNode*)lNode->parent();
 		}
 		topAuthorNode = (AuthorNode*)lNode;
 	}
diff --git a/fbreader/src/libraryTree/LibraryByTagView.cpp b/reader/src/libraryTree/LibraryByTagView.cpp
index 76913f1..76913f1 100644
--- a/fbreader/src/libraryTree/LibraryByTagView.cpp
+++ b/reader/src/libraryTree/LibraryByTagView.cpp
diff --git a/fbreader/src/libraryTree/LibraryNodes.h b/reader/src/libraryTree/LibraryNodes.h
index 5f1eab9..fbd9fa3 100644
--- a/fbreader/src/libraryTree/LibraryNodes.h
+++ b/reader/src/libraryTree/LibraryNodes.h
@@ -20,7 +20,7 @@
 #ifndef __LIBRARYNODES_H__
 #define __LIBRARYNODES_H__
 
-#include "../blockTree/FBReaderNode.h"
+#include "../blockTree/ReaderNode.h"
 
 class ZLImage;
 
@@ -28,7 +28,7 @@ class Author;
 class Book;
 class Tag;
 
-class AuthorNode : public FBReaderNode {
+class AuthorNode : public ReaderNode {
 
 public:
 	static const ZLTypeId TYPE_ID;
@@ -49,7 +49,7 @@ private:
 	shared_ptr<Author> myAuthor;
 };
 
-class SeriesNode : public FBReaderNode {
+class SeriesNode : public ReaderNode {
 
 public:
 	static const ZLTypeId TYPE_ID;
@@ -67,7 +67,7 @@ private:
 	std::string title() const;
 };
 
-class TagNode : public FBReaderNode {
+class TagNode : public ReaderNode {
 
 public:
 	static const ZLTypeId TYPE_ID;
@@ -92,7 +92,7 @@ private:
 	const shared_ptr<Tag> myTag;
 };
 
-class BookNode : public FBReaderNode {
+class BookNode : public ReaderNode {
 
 public:
 	static const ZLTypeId TYPE_ID;
diff --git a/fbreader/src/libraryTree/LibraryView.cpp b/reader/src/libraryTree/LibraryView.cpp
index 067c865..067c865 100644
--- a/fbreader/src/libraryTree/LibraryView.cpp
+++ b/reader/src/libraryTree/LibraryView.cpp
diff --git a/fbreader/src/libraryTree/LibraryView.h b/reader/src/libraryTree/LibraryView.h
index 40715f6..40715f6 100644
--- a/fbreader/src/libraryTree/LibraryView.h
+++ b/reader/src/libraryTree/LibraryView.h
diff --git a/fbreader/src/libraryTree/SeriesNode.cpp b/reader/src/libraryTree/SeriesNode.cpp
index 6d4aafa..8646aac 100644
--- a/fbreader/src/libraryTree/SeriesNode.cpp
+++ b/reader/src/libraryTree/SeriesNode.cpp
@@ -24,7 +24,7 @@
 
 #include "../library/Book.h"
 
-const ZLTypeId SeriesNode::TYPE_ID(FBReaderNode::TYPE_ID);
+const ZLTypeId SeriesNode::TYPE_ID(ReaderNode::TYPE_ID);
 
 const ZLResource &SeriesNode::resource() const {
 	return ZLResource::resource("libraryView")["seriesNode"];
@@ -34,7 +34,7 @@ const ZLTypeId &SeriesNode::typeId() const {
 	return TYPE_ID;
 }
 
-SeriesNode::SeriesNode(AuthorNode *parent) : FBReaderNode(parent) {
+SeriesNode::SeriesNode(AuthorNode *parent) : ReaderNode(parent) {
 }
 
 void SeriesNode::init() {
@@ -52,7 +52,7 @@ std::string SeriesNode::title() const {
 shared_ptr<const ZLImage> SeriesNode::extractCoverImage() const {
 	const std::vector<ZLBlockTreeNode*> &books = children();
 	for (std::vector<ZLBlockTreeNode*>::const_iterator it = books.begin(); it != books.end(); ++it) {
-		shared_ptr<const ZLImage> bookCover = ((FBReaderNode*)*it)->coverImage();
+		shared_ptr<const ZLImage> bookCover = ((ReaderNode*)*it)->coverImage();
 		if (!bookCover.isNull()) {
 			return bookCover;
 		}
diff --git a/fbreader/src/libraryTree/TagNode.cpp b/reader/src/libraryTree/TagNode.cpp
index 7ccd3ac..a873ea5 100644
--- a/fbreader/src/libraryTree/TagNode.cpp
+++ b/reader/src/libraryTree/TagNode.cpp
@@ -25,7 +25,7 @@
 #include "../library/Tag.h"
 #include "../libraryActions/LibraryTagActions.h"
 
-const ZLTypeId TagNode::TYPE_ID(FBReaderNode::TYPE_ID);
+const ZLTypeId TagNode::TYPE_ID(ReaderNode::TYPE_ID);
 
 const ZLTypeId &TagNode::typeId() const {
 	return TYPE_ID;
@@ -47,10 +47,10 @@ std::size_t TagNode::positionToInsert(ZLBlockTreeNode *parent, shared_ptr<Tag> t
 	return children.rend() - it;
 }
 
-TagNode::TagNode(ZLBlockTreeView::RootNode *parent, shared_ptr<Tag> tag) : FBReaderNode(parent, positionToInsert(parent, tag)), myTag(tag) {
+TagNode::TagNode(ZLBlockTreeView::RootNode *parent, shared_ptr<Tag> tag) : ReaderNode(parent, positionToInsert(parent, tag)), myTag(tag) {
 }
 
-TagNode::TagNode(TagNode *parent, shared_ptr<Tag> tag) : FBReaderNode(parent, positionToInsert(parent, tag)), myTag(tag) {
+TagNode::TagNode(TagNode *parent, shared_ptr<Tag> tag) : ReaderNode(parent, positionToInsert(parent, tag)), myTag(tag) {
 }
 
 void TagNode::init() {
diff --git a/fbreader/src/migration/BookInfo.cpp b/reader/src/migration/BookInfo.cpp
index 5a13647..5a13647 100644
--- a/fbreader/src/migration/BookInfo.cpp
+++ b/reader/src/migration/BookInfo.cpp
diff --git a/fbreader/src/migration/BookInfo.h b/reader/src/migration/BookInfo.h
index 997e9ea..997e9ea 100644
--- a/fbreader/src/migration/BookInfo.h
+++ b/reader/src/migration/BookInfo.h
diff --git a/fbreader/src/migration/FB2MigrationReader.cpp b/reader/src/migration/FB2MigrationReader.cpp
index 875c0a5..875c0a5 100644
--- a/fbreader/src/migration/FB2MigrationReader.cpp
+++ b/reader/src/migration/FB2MigrationReader.cpp
diff --git a/fbreader/src/migration/FB2MigrationReader.h b/reader/src/migration/FB2MigrationReader.h
index d8e7dd2..d8e7dd2 100644
--- a/fbreader/src/migration/FB2MigrationReader.h
+++ b/reader/src/migration/FB2MigrationReader.h
diff --git a/fbreader/src/migration/HtmlDCTagsReader.cpp b/reader/src/migration/HtmlDCTagsReader.cpp
index 4929686..4929686 100644
--- a/fbreader/src/migration/HtmlDCTagsReader.cpp
+++ b/reader/src/migration/HtmlDCTagsReader.cpp
diff --git a/fbreader/src/migration/HtmlDCTagsReader.h b/reader/src/migration/HtmlDCTagsReader.h
index 5cd7f9a..5cd7f9a 100644
--- a/fbreader/src/migration/HtmlDCTagsReader.h
+++ b/reader/src/migration/HtmlDCTagsReader.h
diff --git a/fbreader/src/migration/Migration.cpp b/reader/src/migration/Migration.cpp
index 172209d..4226c62 100644
--- a/fbreader/src/migration/Migration.cpp
+++ b/reader/src/migration/Migration.cpp
@@ -69,7 +69,7 @@ int Migration::extractVersionInformation(const std::string &name) {
 }
 
 void Migration::doMigration() {
-	ZLStringOption versionOption(FBCategoryKey::SYSTEM, "Version", "FBReaderVersion", "0");
+	ZLStringOption versionOption(FBCategoryKey::SYSTEM, "Version", "ReaderVersion", "0");
 	if (extractVersionInformation(versionOption.value()) <
 			extractVersionInformation(myVersion)) {
 		doMigrationInternal();
diff --git a/fbreader/src/migration/Migration.h b/reader/src/migration/Migration.h
index 507da79..507da79 100644
--- a/fbreader/src/migration/Migration.h
+++ b/reader/src/migration/Migration.h
diff --git a/fbreader/src/migration/Migration_0_10_4.cpp b/reader/src/migration/Migration_0_10_4.cpp
index b4cedbf..b4cedbf 100644
--- a/fbreader/src/migration/Migration_0_10_4.cpp
+++ b/reader/src/migration/Migration_0_10_4.cpp
diff --git a/fbreader/src/migration/Migration_0_11_0.cpp b/reader/src/migration/Migration_0_11_0.cpp
index 144245e..0c2a509 100644
--- a/fbreader/src/migration/Migration_0_11_0.cpp
+++ b/reader/src/migration/Migration_0_11_0.cpp
@@ -511,7 +511,7 @@ bool Migration_0_11_0_Runnable::migrateBookLastState(const std::string &fileName
 
 bool Migration_0_11_0_Runnable::migrateNetwork() {
 	bool res = true;
-//	FBReader desktop 0.99.1 deprecates NetFiles table, so don't fill it
+//	TDE-Ebook-Reader desktop 0.99.1 deprecates NetFiles table, so don't fill it
 //	std::vector<std::string> urls;
 //	ZLOption::listOptionNames(NET_FILES_GROUP, urls);
 //	for (std::vector<std::string>::const_iterator it = urls.begin(); it != urls.end(); ++it) {
diff --git a/fbreader/src/migration/Migration_0_8_11.cpp b/reader/src/migration/Migration_0_8_11.cpp
index d4fd2f3..bf21004 100644
--- a/fbreader/src/migration/Migration_0_8_11.cpp
+++ b/reader/src/migration/Migration_0_8_11.cpp
@@ -22,7 +22,7 @@
 #include <ZLStringUtil.h>
 
 #include "Migration.h"
-#include "../fbreader/FBReaderActions.h"
+#include "../reader/ReaderActions.h"
 
 static void changeActionNames(const std::map<std::string,std::string> map, const std::string &group) {
 	const int length = ZLIntegerOption(ZLCategoryKey::CONFIG, group, "Number", 0).value();
diff --git a/fbreader/src/migration/Migration_0_8_13.cpp b/reader/src/migration/Migration_0_8_13.cpp
index ff86fed..ff86fed 100644
--- a/fbreader/src/migration/Migration_0_8_13.cpp
+++ b/reader/src/migration/Migration_0_8_13.cpp
diff --git a/fbreader/src/migration/Migration_0_8_16.cpp b/reader/src/migration/Migration_0_8_16.cpp
index d08fc49..d08fc49 100644
--- a/fbreader/src/migration/Migration_0_8_16.cpp
+++ b/reader/src/migration/Migration_0_8_16.cpp
diff --git a/fbreader/src/migration/Migration_0_99_0.cpp b/reader/src/migration/Migration_0_99_0.cpp
index 6a1d253..6a1d253 100644
--- a/fbreader/src/migration/Migration_0_99_0.cpp
+++ b/reader/src/migration/Migration_0_99_0.cpp
diff --git a/fbreader/src/migration/Migration_0_99_1.cpp b/reader/src/migration/Migration_0_99_1.cpp
index 970f4fc..985d743 100644
--- a/fbreader/src/migration/Migration_0_99_1.cpp
+++ b/reader/src/migration/Migration_0_99_1.cpp
@@ -22,7 +22,7 @@
 #include <ZLStringUtil.h>
 
 #include "Migration.h"
-#include "../fbreader/FBReaderActions.h"
+#include "../reader/ReaderActions.h"
 #include "../database/networkdb/NetworkDB.h"
 
 Migration_0_99_1::Migration_0_99_1() : Migration("0.99.1") {
diff --git a/fbreader/src/migration/OEBMigrationReader.cpp b/reader/src/migration/OEBMigrationReader.cpp
index 735e0df..735e0df 100644
--- a/fbreader/src/migration/OEBMigrationReader.cpp
+++ b/reader/src/migration/OEBMigrationReader.cpp
diff --git a/fbreader/src/migration/OEBMigrationReader.h b/reader/src/migration/OEBMigrationReader.h
index 2ce6690..2ce6690 100644
--- a/fbreader/src/migration/OEBMigrationReader.h
+++ b/reader/src/migration/OEBMigrationReader.h
diff --git a/fbreader/src/migration/migrate.cpp b/reader/src/migration/migrate.cpp
index 4fefbf7..af411f0 100644
--- a/fbreader/src/migration/migrate.cpp
+++ b/reader/src/migration/migrate.cpp
@@ -23,7 +23,7 @@
 #include "migrate.h"
 
 MigrationRunnable::MigrationRunnable() :
-	myVersionOption(FBCategoryKey::SYSTEM, "Version", "FBReaderVersion", "0") {
+	myVersionOption(FBCategoryKey::SYSTEM, "Version", "ReaderVersion", "0") {
 }
 
 bool MigrationRunnable::shouldMigrate() const {
diff --git a/fbreader/src/migration/migrate.h b/reader/src/migration/migrate.h
index e833d28..e833d28 100644
--- a/fbreader/src/migration/migrate.h
+++ b/reader/src/migration/migrate.h
diff --git a/fbreader/src/network/BookReference.cpp b/reader/src/network/BookReference.cpp
index 9740a65..9740a65 100644
--- a/fbreader/src/network/BookReference.cpp
+++ b/reader/src/network/BookReference.cpp
diff --git a/fbreader/src/network/BookReference.h b/reader/src/network/BookReference.h
index 7b7ef74..7b7ef74 100644
--- a/fbreader/src/network/BookReference.h
+++ b/reader/src/network/BookReference.h
diff --git a/fbreader/src/network/NetworkBookCollection.cpp b/reader/src/network/NetworkBookCollection.cpp
index 155d702..155d702 100644
--- a/fbreader/src/network/NetworkBookCollection.cpp
+++ b/reader/src/network/NetworkBookCollection.cpp
diff --git a/fbreader/src/network/NetworkBookCollection.h b/reader/src/network/NetworkBookCollection.h
index 730416e..730416e 100644
--- a/fbreader/src/network/NetworkBookCollection.h
+++ b/reader/src/network/NetworkBookCollection.h
diff --git a/fbreader/src/network/NetworkBookItem.cpp b/reader/src/network/NetworkBookItem.cpp
index 5eeb101..5eeb101 100644
--- a/fbreader/src/network/NetworkBookItem.cpp
+++ b/reader/src/network/NetworkBookItem.cpp
diff --git a/fbreader/src/network/NetworkCatalogItem.cpp b/reader/src/network/NetworkCatalogItem.cpp
index 58c739c..58c739c 100644
--- a/fbreader/src/network/NetworkCatalogItem.cpp
+++ b/reader/src/network/NetworkCatalogItem.cpp
diff --git a/fbreader/src/network/NetworkComparators.cpp b/reader/src/network/NetworkComparators.cpp
index 66a0de3..66a0de3 100644
--- a/fbreader/src/network/NetworkComparators.cpp
+++ b/reader/src/network/NetworkComparators.cpp
diff --git a/fbreader/src/network/NetworkComparators.h b/reader/src/network/NetworkComparators.h
index a872a3f..a872a3f 100644
--- a/fbreader/src/network/NetworkComparators.h
+++ b/reader/src/network/NetworkComparators.h
diff --git a/fbreader/src/network/NetworkErrors.cpp b/reader/src/network/NetworkErrors.cpp
index d20546f..d20546f 100644
--- a/fbreader/src/network/NetworkErrors.cpp
+++ b/reader/src/network/NetworkErrors.cpp
diff --git a/fbreader/src/network/NetworkErrors.h b/reader/src/network/NetworkErrors.h
index d18d2f0..d18d2f0 100644
--- a/fbreader/src/network/NetworkErrors.h
+++ b/reader/src/network/NetworkErrors.h
diff --git a/fbreader/src/network/NetworkItem.cpp b/reader/src/network/NetworkItem.cpp
index 33e22c4..33e22c4 100644
--- a/fbreader/src/network/NetworkItem.cpp
+++ b/reader/src/network/NetworkItem.cpp
diff --git a/fbreader/src/network/NetworkItems.h b/reader/src/network/NetworkItems.h
index 169e5b7..169e5b7 100644
--- a/fbreader/src/network/NetworkItems.h
+++ b/reader/src/network/NetworkItems.h
diff --git a/fbreader/src/network/NetworkLink.cpp b/reader/src/network/NetworkLink.cpp
index 218de23..218de23 100644
--- a/fbreader/src/network/NetworkLink.cpp
+++ b/reader/src/network/NetworkLink.cpp
diff --git a/fbreader/src/network/NetworkLink.h b/reader/src/network/NetworkLink.h
index e0260b0..e0260b0 100644
--- a/fbreader/src/network/NetworkLink.h
+++ b/reader/src/network/NetworkLink.h
diff --git a/fbreader/src/network/NetworkLinkCollection.cpp b/reader/src/network/NetworkLinkCollection.cpp
index 0b530b0..323605e 100644
--- a/fbreader/src/network/NetworkLinkCollection.cpp
+++ b/reader/src/network/NetworkLinkCollection.cpp
@@ -32,7 +32,7 @@
 #include <ZLDialogManager.h>
 #include <ZLInputStream.h>
 #include <ZLOutputStream.h>
-#include "../fbreader/FBReader.h"
+#include "../reader/Reader.h"
 #include "../networkActions/NetworkOperationRunnable.h"
 
 #include "NetworkLinkCollection.h"
@@ -105,12 +105,12 @@ bool NetworkLinkCollection::Comparator::operator() (
 //			break;
 //		}
 //	}
-//	FBReader::Instance().refreshWindow();
+//	Reader::Instance().refreshWindow();
 //}
 
 //void NetworkLinkCollection::saveLink(NetworkLink& link, bool isAuto) {
 //	saveLinkWithoutRefreshing(link, isAuto);
-//	FBReader::Instance().refreshWindow();
+//	Reader::Instance().refreshWindow();
 //}
 
 void NetworkLinkCollection::addOrUpdateLink(shared_ptr<NetworkLink> link) {
@@ -136,7 +136,7 @@ void NetworkLinkCollection::addOrUpdateLink(shared_ptr<NetworkLink> link) {
 	}
 	if (updated) {
 		NetworkDB::Instance().saveNetworkLink(link);
-		//FBReader::Instance().sendRefresh();
+		//Reader::Instance().sendRefresh();
 	}
 }
 
diff --git a/fbreader/src/network/NetworkLinkCollection.h b/reader/src/network/NetworkLinkCollection.h
index 080959d..080959d 100644
--- a/fbreader/src/network/NetworkLinkCollection.h
+++ b/reader/src/network/NetworkLinkCollection.h
diff --git a/fbreader/src/network/NetworkOperationData.cpp b/reader/src/network/NetworkOperationData.cpp
index 6988071..6988071 100644
--- a/fbreader/src/network/NetworkOperationData.cpp
+++ b/reader/src/network/NetworkOperationData.cpp
diff --git a/fbreader/src/network/NetworkOperationData.h b/reader/src/network/NetworkOperationData.h
index 4d4a46f..4d4a46f 100644
--- a/fbreader/src/network/NetworkOperationData.h
+++ b/reader/src/network/NetworkOperationData.h
diff --git a/fbreader/src/network/SearchResult.cpp b/reader/src/network/SearchResult.cpp
index 2b66326..2b66326 100644
--- a/fbreader/src/network/SearchResult.cpp
+++ b/reader/src/network/SearchResult.cpp
diff --git a/fbreader/src/network/SearchResult.h b/reader/src/network/SearchResult.h
index bd18b71..bd18b71 100644
--- a/fbreader/src/network/SearchResult.h
+++ b/reader/src/network/SearchResult.h
diff --git a/fbreader/src/network/UserList.cpp b/reader/src/network/UserList.cpp
index 1712788..1712788 100644
--- a/fbreader/src/network/UserList.cpp
+++ b/reader/src/network/UserList.cpp
diff --git a/fbreader/src/network/UserList.h b/reader/src/network/UserList.h
index d1f298f..d1f298f 100644
--- a/fbreader/src/network/UserList.h
+++ b/reader/src/network/UserList.h
diff --git a/fbreader/src/network/atom/ATOMConstructs.cpp b/reader/src/network/atom/ATOMConstructs.cpp
index 9684825..9684825 100644
--- a/fbreader/src/network/atom/ATOMConstructs.cpp
+++ b/reader/src/network/atom/ATOMConstructs.cpp
diff --git a/fbreader/src/network/atom/ATOMConstructs.h b/reader/src/network/atom/ATOMConstructs.h
index 2497bd4..2497bd4 100644
--- a/fbreader/src/network/atom/ATOMConstructs.h
+++ b/reader/src/network/atom/ATOMConstructs.h
diff --git a/fbreader/src/network/atom/ATOMContainers.cpp b/reader/src/network/atom/ATOMContainers.cpp
index fb05c10..fb05c10 100644
--- a/fbreader/src/network/atom/ATOMContainers.cpp
+++ b/reader/src/network/atom/ATOMContainers.cpp
diff --git a/fbreader/src/network/atom/ATOMContainers.h b/reader/src/network/atom/ATOMContainers.h
index 1fb3f92..1fb3f92 100644
--- a/fbreader/src/network/atom/ATOMContainers.h
+++ b/reader/src/network/atom/ATOMContainers.h
diff --git a/fbreader/src/network/atom/ATOMMetadata.cpp b/reader/src/network/atom/ATOMMetadata.cpp
index cb81e0e..cb81e0e 100644
--- a/fbreader/src/network/atom/ATOMMetadata.cpp
+++ b/reader/src/network/atom/ATOMMetadata.cpp
diff --git a/fbreader/src/network/atom/ATOMMetadata.h b/reader/src/network/atom/ATOMMetadata.h
index 3fb7619..3fb7619 100644
--- a/fbreader/src/network/atom/ATOMMetadata.h
+++ b/reader/src/network/atom/ATOMMetadata.h
diff --git a/fbreader/src/network/authentication/NetworkAuthenticationManager.cpp b/reader/src/network/authentication/NetworkAuthenticationManager.cpp
index 137388f..137388f 100644
--- a/fbreader/src/network/authentication/NetworkAuthenticationManager.cpp
+++ b/reader/src/network/authentication/NetworkAuthenticationManager.cpp
diff --git a/fbreader/src/network/authentication/NetworkAuthenticationManager.h b/reader/src/network/authentication/NetworkAuthenticationManager.h
index 75ae9dd..75ae9dd 100644
--- a/fbreader/src/network/authentication/NetworkAuthenticationManager.h
+++ b/reader/src/network/authentication/NetworkAuthenticationManager.h
diff --git a/fbreader/src/network/authentication/litres/LitResAuthenticationDataParser.cpp b/reader/src/network/authentication/litres/LitResAuthenticationDataParser.cpp
index b1b6c69..b1b6c69 100644
--- a/fbreader/src/network/authentication/litres/LitResAuthenticationDataParser.cpp
+++ b/reader/src/network/authentication/litres/LitResAuthenticationDataParser.cpp
diff --git a/fbreader/src/network/authentication/litres/LitResAuthenticationDataParser.h b/reader/src/network/authentication/litres/LitResAuthenticationDataParser.h
index 60baa02..60baa02 100644
--- a/fbreader/src/network/authentication/litres/LitResAuthenticationDataParser.h
+++ b/reader/src/network/authentication/litres/LitResAuthenticationDataParser.h
diff --git a/fbreader/src/network/authentication/litres/LitResAuthenticationManager.cpp b/reader/src/network/authentication/litres/LitResAuthenticationManager.cpp
index e552b5c..e552b5c 100644
--- a/fbreader/src/network/authentication/litres/LitResAuthenticationManager.cpp
+++ b/reader/src/network/authentication/litres/LitResAuthenticationManager.cpp
diff --git a/fbreader/src/network/authentication/litres/LitResAuthenticationManager.h b/reader/src/network/authentication/litres/LitResAuthenticationManager.h
index 6aefa6d..6aefa6d 100644
--- a/fbreader/src/network/authentication/litres/LitResAuthenticationManager.h
+++ b/reader/src/network/authentication/litres/LitResAuthenticationManager.h
diff --git a/fbreader/src/network/litres/LitResAuthorsItem.cpp b/reader/src/network/litres/LitResAuthorsItem.cpp
index ece7438..ece7438 100644
--- a/fbreader/src/network/litres/LitResAuthorsItem.cpp
+++ b/reader/src/network/litres/LitResAuthorsItem.cpp
diff --git a/fbreader/src/network/litres/LitResAuthorsItem.h b/reader/src/network/litres/LitResAuthorsItem.h
index 31847f4..31847f4 100644
--- a/fbreader/src/network/litres/LitResAuthorsItem.h
+++ b/reader/src/network/litres/LitResAuthorsItem.h
diff --git a/fbreader/src/network/litres/LitResAuthorsParser.cpp b/reader/src/network/litres/LitResAuthorsParser.cpp
index 453ffb5..453ffb5 100644
--- a/fbreader/src/network/litres/LitResAuthorsParser.cpp
+++ b/reader/src/network/litres/LitResAuthorsParser.cpp
diff --git a/fbreader/src/network/litres/LitResAuthorsParser.h b/reader/src/network/litres/LitResAuthorsParser.h
index ead137d..ead137d 100644
--- a/fbreader/src/network/litres/LitResAuthorsParser.h
+++ b/reader/src/network/litres/LitResAuthorsParser.h
diff --git a/fbreader/src/network/litres/LitResBookItem.cpp b/reader/src/network/litres/LitResBookItem.cpp
index cdc9306..cdc9306 100644
--- a/fbreader/src/network/litres/LitResBookItem.cpp
+++ b/reader/src/network/litres/LitResBookItem.cpp
diff --git a/fbreader/src/network/litres/LitResBookItem.h b/reader/src/network/litres/LitResBookItem.h
index 129b6a6..129b6a6 100644
--- a/fbreader/src/network/litres/LitResBookItem.h
+++ b/reader/src/network/litres/LitResBookItem.h
diff --git a/fbreader/src/network/litres/LitResBooksFeedItem.cpp b/reader/src/network/litres/LitResBooksFeedItem.cpp
index b597255..b597255 100644
--- a/fbreader/src/network/litres/LitResBooksFeedItem.cpp
+++ b/reader/src/network/litres/LitResBooksFeedItem.cpp
diff --git a/fbreader/src/network/litres/LitResBooksFeedItem.h b/reader/src/network/litres/LitResBooksFeedItem.h
index 8af7df2..8af7df2 100644
--- a/fbreader/src/network/litres/LitResBooksFeedItem.h
+++ b/reader/src/network/litres/LitResBooksFeedItem.h
diff --git a/fbreader/src/network/litres/LitResBooksFeedParser.cpp b/reader/src/network/litres/LitResBooksFeedParser.cpp
index 970a8eb..4d2fe93 100644
--- a/fbreader/src/network/litres/LitResBooksFeedParser.cpp
+++ b/reader/src/network/litres/LitResBooksFeedParser.cpp
@@ -97,7 +97,7 @@ void LitResBooksFeedParser::processState(const std::string &tag, bool closed, co
 
 			std::string url = stringAttributeValue(attributes, "url");
 			if (!url.empty()) {
-				myLink.rewriteUrl(url, true); // This code duplicates code in FBReader::openInBrowser and is not required
+				myLink.rewriteUrl(url, true); // This code duplicates code in Reader::openInBrowser and is not required
 				myURLByType[NetworkItem::URL_HTML_PAGE] = url;
 			}
 
diff --git a/fbreader/src/network/litres/LitResBooksFeedParser.h b/reader/src/network/litres/LitResBooksFeedParser.h
index 6f9a6dc..6f9a6dc 100644
--- a/fbreader/src/network/litres/LitResBooksFeedParser.h
+++ b/reader/src/network/litres/LitResBooksFeedParser.h
diff --git a/fbreader/src/network/litres/LitResBookshelfItem.cpp b/reader/src/network/litres/LitResBookshelfItem.cpp
index be931fe..be931fe 100644
--- a/fbreader/src/network/litres/LitResBookshelfItem.cpp
+++ b/reader/src/network/litres/LitResBookshelfItem.cpp
diff --git a/fbreader/src/network/litres/LitResBookshelfItem.h b/reader/src/network/litres/LitResBookshelfItem.h
index 22ea8d9..22ea8d9 100644
--- a/fbreader/src/network/litres/LitResBookshelfItem.h
+++ b/reader/src/network/litres/LitResBookshelfItem.h
diff --git a/fbreader/src/network/litres/LitResByGenresItem.cpp b/reader/src/network/litres/LitResByGenresItem.cpp
index a9b6367..a9b6367 100644
--- a/fbreader/src/network/litres/LitResByGenresItem.cpp
+++ b/reader/src/network/litres/LitResByGenresItem.cpp
diff --git a/fbreader/src/network/litres/LitResByGenresItem.h b/reader/src/network/litres/LitResByGenresItem.h
index 3af0e23..3af0e23 100644
--- a/fbreader/src/network/litres/LitResByGenresItem.h
+++ b/reader/src/network/litres/LitResByGenresItem.h
diff --git a/fbreader/src/network/litres/LitResGenre.cpp b/reader/src/network/litres/LitResGenre.cpp
index a541948..a541948 100644
--- a/fbreader/src/network/litres/LitResGenre.cpp
+++ b/reader/src/network/litres/LitResGenre.cpp
diff --git a/fbreader/src/network/litres/LitResGenre.h b/reader/src/network/litres/LitResGenre.h
index 4b2bd3b..4b2bd3b 100644
--- a/fbreader/src/network/litres/LitResGenre.h
+++ b/reader/src/network/litres/LitResGenre.h
diff --git a/fbreader/src/network/litres/LitResGenresParser.cpp b/reader/src/network/litres/LitResGenresParser.cpp
index 9ed3f2d..9ed3f2d 100644
--- a/fbreader/src/network/litres/LitResGenresParser.cpp
+++ b/reader/src/network/litres/LitResGenresParser.cpp
diff --git a/fbreader/src/network/litres/LitResGenresParser.h b/reader/src/network/litres/LitResGenresParser.h
index 424d37b..424d37b 100644
--- a/fbreader/src/network/litres/LitResGenresParser.h
+++ b/reader/src/network/litres/LitResGenresParser.h
diff --git a/fbreader/src/network/litres/LitResRecommendationsItem.cpp b/reader/src/network/litres/LitResRecommendationsItem.cpp
index 54d7cd7..54d7cd7 100644
--- a/fbreader/src/network/litres/LitResRecommendationsItem.cpp
+++ b/reader/src/network/litres/LitResRecommendationsItem.cpp
diff --git a/fbreader/src/network/litres/LitResRecommendationsItem.h b/reader/src/network/litres/LitResRecommendationsItem.h
index ba27623..ba27623 100644
--- a/fbreader/src/network/litres/LitResRecommendationsItem.h
+++ b/reader/src/network/litres/LitResRecommendationsItem.h
diff --git a/fbreader/src/network/litres/LitResUtil.cpp b/reader/src/network/litres/LitResUtil.cpp
index 992b7d9..992b7d9 100644
--- a/fbreader/src/network/litres/LitResUtil.cpp
+++ b/reader/src/network/litres/LitResUtil.cpp
diff --git a/fbreader/src/network/litres/LitResUtil.h b/reader/src/network/litres/LitResUtil.h
index fd23a08..fd23a08 100644
--- a/fbreader/src/network/litres/LitResUtil.h
+++ b/reader/src/network/litres/LitResUtil.h
diff --git a/fbreader/src/network/litres/SortedCatalogItem.cpp b/reader/src/network/litres/SortedCatalogItem.cpp
index 79d7f49..79d7f49 100644
--- a/fbreader/src/network/litres/SortedCatalogItem.cpp
+++ b/reader/src/network/litres/SortedCatalogItem.cpp
diff --git a/fbreader/src/network/litres/SortedCatalogItem.h b/reader/src/network/litres/SortedCatalogItem.h
index e4f2744..e4f2744 100644
--- a/fbreader/src/network/litres/SortedCatalogItem.h
+++ b/reader/src/network/litres/SortedCatalogItem.h
diff --git a/fbreader/src/network/opds/NetworkOPDSFeedReader.cpp b/reader/src/network/opds/NetworkOPDSFeedReader.cpp
index 3c1ad0a..3c1ad0a 100644
--- a/fbreader/src/network/opds/NetworkOPDSFeedReader.cpp
+++ b/reader/src/network/opds/NetworkOPDSFeedReader.cpp
diff --git a/fbreader/src/network/opds/NetworkOPDSFeedReader.h b/reader/src/network/opds/NetworkOPDSFeedReader.h
index f51b1bf..f51b1bf 100644
--- a/fbreader/src/network/opds/NetworkOPDSFeedReader.h
+++ b/reader/src/network/opds/NetworkOPDSFeedReader.h
diff --git a/fbreader/src/network/opds/OPDSBookItem.cpp b/reader/src/network/opds/OPDSBookItem.cpp
index 6899afa..6899afa 100644
--- a/fbreader/src/network/opds/OPDSBookItem.cpp
+++ b/reader/src/network/opds/OPDSBookItem.cpp
diff --git a/fbreader/src/network/opds/OPDSBookItem.h b/reader/src/network/opds/OPDSBookItem.h
index 8b3ddbd..8b3ddbd 100644
--- a/fbreader/src/network/opds/OPDSBookItem.h
+++ b/reader/src/network/opds/OPDSBookItem.h
diff --git a/fbreader/src/network/opds/OPDSCatalogItem.cpp b/reader/src/network/opds/OPDSCatalogItem.cpp
index 853bc4c..853bc4c 100644
--- a/fbreader/src/network/opds/OPDSCatalogItem.cpp
+++ b/reader/src/network/opds/OPDSCatalogItem.cpp
diff --git a/fbreader/src/network/opds/OPDSCatalogItem.h b/reader/src/network/opds/OPDSCatalogItem.h
index e2bc787..e2bc787 100644
--- a/fbreader/src/network/opds/OPDSCatalogItem.h
+++ b/reader/src/network/opds/OPDSCatalogItem.h
diff --git a/fbreader/src/network/opds/OPDSFeedReader.h b/reader/src/network/opds/OPDSFeedReader.h
index a842f41..a842f41 100644
--- a/fbreader/src/network/opds/OPDSFeedReader.h
+++ b/reader/src/network/opds/OPDSFeedReader.h
diff --git a/fbreader/src/network/opds/OPDSLink.cpp b/reader/src/network/opds/OPDSLink.cpp
index f682b7d..f682b7d 100644
--- a/fbreader/src/network/opds/OPDSLink.cpp
+++ b/reader/src/network/opds/OPDSLink.cpp
diff --git a/fbreader/src/network/opds/OPDSLink.h b/reader/src/network/opds/OPDSLink.h
index d6fd87e..d6fd87e 100644
--- a/fbreader/src/network/opds/OPDSLink.h
+++ b/reader/src/network/opds/OPDSLink.h
diff --git a/fbreader/src/network/opds/OPDSLink_AdvancedSearch.h b/reader/src/network/opds/OPDSLink_AdvancedSearch.h
index 76519c9..76519c9 100644
--- a/fbreader/src/network/opds/OPDSLink_AdvancedSearch.h
+++ b/reader/src/network/opds/OPDSLink_AdvancedSearch.h
diff --git a/fbreader/src/network/opds/OPDSLink_GenericFeedReader.cpp b/reader/src/network/opds/OPDSLink_GenericFeedReader.cpp
index 5389f2d..5389f2d 100644
--- a/fbreader/src/network/opds/OPDSLink_GenericFeedReader.cpp
+++ b/reader/src/network/opds/OPDSLink_GenericFeedReader.cpp
diff --git a/fbreader/src/network/opds/OPDSLink_GenericFeedReader.h b/reader/src/network/opds/OPDSLink_GenericFeedReader.h
index 15ffe38..15ffe38 100644
--- a/fbreader/src/network/opds/OPDSLink_GenericFeedReader.h
+++ b/reader/src/network/opds/OPDSLink_GenericFeedReader.h
diff --git a/fbreader/src/network/opds/OPDSLink_GenericXMLParser.cpp b/reader/src/network/opds/OPDSLink_GenericXMLParser.cpp
index ef67116..af5d866 100644
--- a/fbreader/src/network/opds/OPDSLink_GenericXMLParser.cpp
+++ b/reader/src/network/opds/OPDSLink_GenericXMLParser.cpp
@@ -24,11 +24,11 @@
 #include "OPDSLink_AdvancedSearch.h"
 
 static const std::string TAG_ENTRY = "entry";
-static const std::string FBREADER_ADVANCED_SEARCH = "advancedSearch";
-static const std::string FBREADER_AUTHENTICATION = "authentication";
-static const std::string FBREADER_REWRITING_RULE = "urlRewritingRule";
-static const std::string FBREADER_RELATION_ALIAS = "relationAlias";
-static const std::string FBREADER_EXTRA = "extra";
+static const std::string READER_ADVANCED_SEARCH = "advancedSearch";
+static const std::string READER_AUTHENTICATION = "authentication";
+static const std::string READER_REWRITING_RULE = "urlRewritingRule";
+static const std::string READER_RELATION_ALIAS = "relationAlias";
+static const std::string READER_EXTRA = "extra";
 
 OPDSLink::GenericXMLParser::GenericXMLParser(shared_ptr<OPDSFeedReader> feedReader) :
 	OPDSXMLParser(feedReader) {
@@ -46,7 +46,7 @@ void OPDSLink::GenericXMLParser::startElementHandler(const char *tag, const char
 			}
 			break;
 		case F_ENTRY:
-			if (testTag(ZLXMLNamespace::FBReaderCatalogMetadata, FBREADER_ADVANCED_SEARCH, tag)) {
+			if (testTag(ZLXMLNamespace::ReaderCatalogMetadata, READER_ADVANCED_SEARCH, tag)) {
 				const char *style = attributeValue(attributes, "style");
 				const char *author = attributeValue(attributes, "author");
 				const char *titleOrSeries = attributeValue(attributes, "titleOrSeries");
@@ -56,20 +56,20 @@ void OPDSLink::GenericXMLParser::startElementHandler(const char *tag, const char
 					getFeedReader().setAdvancedSearch(new OPDSLink::AdvancedSearch(style, titleOrSeries, author, tag, annotation));
 				}
 				return;
-			} else if (testTag(ZLXMLNamespace::FBReaderCatalogMetadata, FBREADER_AUTHENTICATION, tag)) {
+			} else if (testTag(ZLXMLNamespace::ReaderCatalogMetadata, READER_AUTHENTICATION, tag)) {
 				const char *type = attributeValue(attributes, "type");
 				if (type != 0) {
 					getFeedReader().setAuthenticationType(type);
 				}
 				return;
-			} else if (testTag(ZLXMLNamespace::FBReaderCatalogMetadata, FBREADER_RELATION_ALIAS, tag)) {
+			} else if (testTag(ZLXMLNamespace::ReaderCatalogMetadata, READER_RELATION_ALIAS, tag)) {
 				const char *name = attributeValue(attributes, "name");
 				const char *type = attributeValue(attributes, "type");
 				const char *alias = attributeValue(attributes, "alias");
 				if (name != 0 && alias != 0) {
 					getFeedReader().addRelationAlias(OPDSLink::RelationAlias(alias, (type != 0) ? type : std::string()), name);
 				}
-			} else if (testTag(ZLXMLNamespace::FBReaderCatalogMetadata, FBREADER_REWRITING_RULE, tag)) {
+			} else if (testTag(ZLXMLNamespace::ReaderCatalogMetadata, READER_REWRITING_RULE, tag)) {
 
 				getFeedReader().addUrlRewritingRule(new URLRewritingRule(getAttributesMap(attributes)));
 
diff --git a/fbreader/src/network/opds/OPDSLink_GenericXMLParser.h b/reader/src/network/opds/OPDSLink_GenericXMLParser.h
index 9bdf9d6..9bdf9d6 100644
--- a/fbreader/src/network/opds/OPDSLink_GenericXMLParser.h
+++ b/reader/src/network/opds/OPDSLink_GenericXMLParser.h
diff --git a/fbreader/src/network/opds/OPDSMetadata.cpp b/reader/src/network/opds/OPDSMetadata.cpp
index 6595e05..6595e05 100644
--- a/fbreader/src/network/opds/OPDSMetadata.cpp
+++ b/reader/src/network/opds/OPDSMetadata.cpp
diff --git a/fbreader/src/network/opds/OPDSMetadata.h b/reader/src/network/opds/OPDSMetadata.h
index 51554dd..51554dd 100644
--- a/fbreader/src/network/opds/OPDSMetadata.h
+++ b/reader/src/network/opds/OPDSMetadata.h
diff --git a/fbreader/src/network/opds/OPDSXMLParser.cpp b/reader/src/network/opds/OPDSXMLParser.cpp
index a1a1dd9..2b9fb4c 100644
--- a/fbreader/src/network/opds/OPDSXMLParser.cpp
+++ b/reader/src/network/opds/OPDSXMLParser.cpp
@@ -60,10 +60,10 @@ const std::string OPDSXMLParser::KEY_PRICE = "price";
 const std::string OPDSXMLParser::KEY_CURRENCY = "currency";
 const std::string OPDSXMLParser::KEY_FORMAT = "format";
 
-static const std::string TAG_SEARCH_DESCRIPTION = "fbreader:advancedSearch";
-static const std::string TAG_AUTHENTICATION = "fbreader:authentication";
-static const std::string TAG_URL_REWRITING_RULES = "fbreader:urlRewritingRule";
-static const std::string TAG_RELATION_ALIASES = "fbreader:relationAlias";
+static const std::string TAG_SEARCH_DESCRIPTION = "reader:advancedSearch";
+static const std::string TAG_AUTHENTICATION = "reader:authentication";
+static const std::string TAG_URL_REWRITING_RULES = "reader:urlRewritingRule";
+static const std::string TAG_RELATION_ALIASES = "reader:relationAlias";
 
 OPDSXMLParser::OPDSXMLParser(shared_ptr<OPDSFeedReader> feedReader, bool readEntryNotFeed) : myFeedReader(feedReader) {
 	myState = readEntryNotFeed ? FEED : START;
diff --git a/fbreader/src/network/opds/OPDSXMLParser.h b/reader/src/network/opds/OPDSXMLParser.h
index 82f0124..82f0124 100644
--- a/fbreader/src/network/opds/OPDSXMLParser.h
+++ b/reader/src/network/opds/OPDSXMLParser.h
diff --git a/fbreader/src/network/opds/OpenSearchXMLReader.cpp b/reader/src/network/opds/OpenSearchXMLReader.cpp
index 686d8c1..686d8c1 100644
--- a/fbreader/src/network/opds/OpenSearchXMLReader.cpp
+++ b/reader/src/network/opds/OpenSearchXMLReader.cpp
diff --git a/fbreader/src/network/opds/OpenSearchXMLReader.h b/reader/src/network/opds/OpenSearchXMLReader.h
index 2b53f19..2b53f19 100644
--- a/fbreader/src/network/opds/OpenSearchXMLReader.h
+++ b/reader/src/network/opds/OpenSearchXMLReader.h
diff --git a/fbreader/src/network/opds/URLRewritingRule.cpp b/reader/src/network/opds/URLRewritingRule.cpp
index 8cea851..8cea851 100644
--- a/fbreader/src/network/opds/URLRewritingRule.cpp
+++ b/reader/src/network/opds/URLRewritingRule.cpp
diff --git a/fbreader/src/network/opds/URLRewritingRule.h b/reader/src/network/opds/URLRewritingRule.h
index 1251139..1251139 100644
--- a/fbreader/src/network/opds/URLRewritingRule.h
+++ b/reader/src/network/opds/URLRewritingRule.h
diff --git a/fbreader/src/network/tree/NetworkAuthorTree.cpp b/reader/src/network/tree/NetworkAuthorTree.cpp
index 8106838..8106838 100644
--- a/fbreader/src/network/tree/NetworkAuthorTree.cpp
+++ b/reader/src/network/tree/NetworkAuthorTree.cpp
diff --git a/fbreader/src/network/tree/NetworkBookTree.cpp b/reader/src/network/tree/NetworkBookTree.cpp
index c59d247..c59d247 100644
--- a/fbreader/src/network/tree/NetworkBookTree.cpp
+++ b/reader/src/network/tree/NetworkBookTree.cpp
diff --git a/fbreader/src/network/tree/NetworkCatalogRootTree.cpp b/reader/src/network/tree/NetworkCatalogRootTree.cpp
index 50a78f5..27ac665 100644
--- a/fbreader/src/network/tree/NetworkCatalogRootTree.cpp
+++ b/reader/src/network/tree/NetworkCatalogRootTree.cpp
@@ -20,7 +20,7 @@
 #include <ZLStringUtil.h>
 #include <ZLExecutionUtil.h>
 
-#include "../../fbreader/FBReader.h"
+#include "../../reader/Reader.h"
 
 #include "../authentication/NetworkAuthenticationManager.h"
 #include "../../networkActions/NetworkOperationRunnable.h"
@@ -222,7 +222,7 @@ std::string NetworkCatalogRootTree::TopupAccountAction::text(const ZLResource &r
 }
 
 void NetworkCatalogRootTree::TopupAccountAction::run() {
-	FBReader::Instance().openLinkInBrowser(myManager.topupAccountLink());
+	Reader::Instance().openLinkInBrowser(myManager.topupAccountLink());
 	NetworkLibrary::Instance().refresh();
 }
 
@@ -243,7 +243,7 @@ void NetworkCatalogRootTree::PasswordRecoveryAction::run() {
 	}
 
 	PasswordRecoveryDialog::run(myManager);
-	FBReader::Instance().refreshWindow();
+	Reader::Instance().refreshWindow();
 	NetworkLibrary::Instance().refresh();
 }
 
@@ -260,6 +260,6 @@ void NetworkCatalogRootTree::RegisterUserAction::run() {
 	}
 
 	RegisterUserDialog::run(myManager);
-	FBReader::Instance().refreshWindow();
+	Reader::Instance().refreshWindow();
 	NetworkLibrary::Instance().refresh();
 }
diff --git a/fbreader/src/network/tree/NetworkCatalogTree.cpp b/reader/src/network/tree/NetworkCatalogTree.cpp
index 6b6bf6e..6b6bf6e 100644
--- a/fbreader/src/network/tree/NetworkCatalogTree.cpp
+++ b/reader/src/network/tree/NetworkCatalogTree.cpp
diff --git a/fbreader/src/network/tree/NetworkCatalogUtil.cpp b/reader/src/network/tree/NetworkCatalogUtil.cpp
index 953bf67..953bf67 100644
--- a/fbreader/src/network/tree/NetworkCatalogUtil.cpp
+++ b/reader/src/network/tree/NetworkCatalogUtil.cpp
diff --git a/fbreader/src/network/tree/NetworkCatalogUtil.h b/reader/src/network/tree/NetworkCatalogUtil.h
index 0196896..0196896 100644
--- a/fbreader/src/network/tree/NetworkCatalogUtil.h
+++ b/reader/src/network/tree/NetworkCatalogUtil.h
diff --git a/fbreader/src/network/tree/NetworkLibrary.cpp b/reader/src/network/tree/NetworkLibrary.cpp
index 118abd0..118abd0 100644
--- a/fbreader/src/network/tree/NetworkLibrary.cpp
+++ b/reader/src/network/tree/NetworkLibrary.cpp
diff --git a/fbreader/src/network/tree/NetworkLibrary.h b/reader/src/network/tree/NetworkLibrary.h
index 026cbbd..026cbbd 100644
--- a/fbreader/src/network/tree/NetworkLibrary.h
+++ b/reader/src/network/tree/NetworkLibrary.h
diff --git a/fbreader/src/network/tree/NetworkSearcher.cpp b/reader/src/network/tree/NetworkSearcher.cpp
index 10d318e..10d318e 100644
--- a/fbreader/src/network/tree/NetworkSearcher.cpp
+++ b/reader/src/network/tree/NetworkSearcher.cpp
diff --git a/fbreader/src/network/tree/NetworkSearcher.h b/reader/src/network/tree/NetworkSearcher.h
index 08ebc35..08ebc35 100644
--- a/fbreader/src/network/tree/NetworkSearcher.h
+++ b/reader/src/network/tree/NetworkSearcher.h
diff --git a/fbreader/src/network/tree/NetworkSeriesTree.cpp b/reader/src/network/tree/NetworkSeriesTree.cpp
index 4456ade..4456ade 100644
--- a/fbreader/src/network/tree/NetworkSeriesTree.cpp
+++ b/reader/src/network/tree/NetworkSeriesTree.cpp
diff --git a/fbreader/src/network/tree/NetworkTree.cpp b/reader/src/network/tree/NetworkTree.cpp
index ac7b39a..ac7b39a 100644
--- a/fbreader/src/network/tree/NetworkTree.cpp
+++ b/reader/src/network/tree/NetworkTree.cpp
diff --git a/fbreader/src/network/tree/NetworkTreeFactory.cpp b/reader/src/network/tree/NetworkTreeFactory.cpp
index 0868034..0868034 100644
--- a/fbreader/src/network/tree/NetworkTreeFactory.cpp
+++ b/reader/src/network/tree/NetworkTreeFactory.cpp
diff --git a/fbreader/src/network/tree/NetworkTreeFactory.h b/reader/src/network/tree/NetworkTreeFactory.h
index b53213e..b53213e 100644
--- a/fbreader/src/network/tree/NetworkTreeFactory.h
+++ b/reader/src/network/tree/NetworkTreeFactory.h
diff --git a/fbreader/src/network/tree/NetworkTreeNodes.h b/reader/src/network/tree/NetworkTreeNodes.h
index fcc76f6..fcc76f6 100644
--- a/fbreader/src/network/tree/NetworkTreeNodes.h
+++ b/reader/src/network/tree/NetworkTreeNodes.h
diff --git a/fbreader/src/network/tree/RootTree.cpp b/reader/src/network/tree/RootTree.cpp
index 8aad8a5..8aad8a5 100644
--- a/fbreader/src/network/tree/RootTree.cpp
+++ b/reader/src/network/tree/RootTree.cpp
diff --git a/fbreader/src/network/tree/SearchCatalogTree.cpp b/reader/src/network/tree/SearchCatalogTree.cpp
index 62ee967..62ee967 100644
--- a/fbreader/src/network/tree/SearchCatalogTree.cpp
+++ b/reader/src/network/tree/SearchCatalogTree.cpp
diff --git a/fbreader/src/networkActions/AuthenticationDialog.cpp b/reader/src/networkActions/AuthenticationDialog.cpp
index 4f4ed1a..4f4ed1a 100644
--- a/fbreader/src/networkActions/AuthenticationDialog.cpp
+++ b/reader/src/networkActions/AuthenticationDialog.cpp
diff --git a/fbreader/src/networkActions/AuthenticationDialog.h b/reader/src/networkActions/AuthenticationDialog.h
index ff5148c..ff5148c 100644
--- a/fbreader/src/networkActions/AuthenticationDialog.h
+++ b/reader/src/networkActions/AuthenticationDialog.h
diff --git a/fbreader/src/networkActions/AuthenticationDialogManager.cpp b/reader/src/networkActions/AuthenticationDialogManager.cpp
index 165ab01..165ab01 100644
--- a/fbreader/src/networkActions/AuthenticationDialogManager.cpp
+++ b/reader/src/networkActions/AuthenticationDialogManager.cpp
diff --git a/fbreader/src/networkActions/AuthenticationDialogManager.h b/reader/src/networkActions/AuthenticationDialogManager.h
index 3648d59..3648d59 100644
--- a/fbreader/src/networkActions/AuthenticationDialogManager.h
+++ b/reader/src/networkActions/AuthenticationDialogManager.h
diff --git a/fbreader/src/networkActions/NetworkActions.cpp b/reader/src/networkActions/NetworkActions.cpp
index 90a9725..4f2f2c6 100644
--- a/fbreader/src/networkActions/NetworkActions.cpp
+++ b/reader/src/networkActions/NetworkActions.cpp
@@ -35,7 +35,7 @@
 #include "../network/authentication/NetworkAuthenticationManager.h"
 
 #include "../library/Book.h"
-#include "../fbreader/FBReader.h"
+#include "../reader/Reader.h"
 
 NetworkBookReadAction::NetworkBookReadAction(const NetworkBookItem &book, bool demo) : myBook(book), myDemo(demo) {
 }
@@ -70,13 +70,13 @@ void NetworkBookReadAction::run() {
 		fileName = myBook.localCopyFileName();
 	}
 	if (!fileName.empty()) {
-		FBReader &fbreader = FBReader::Instance();
+		Reader &reader = Reader::Instance();
 		shared_ptr<Book> bookPtr;
-		fbreader.createBook(ZLFile(fileName), bookPtr);
+		reader.createBook(ZLFile(fileName), bookPtr);
 		if (!bookPtr.isNull()) {
-			fbreader.openBook(bookPtr);
-			fbreader.setMode(FBReader::BOOK_TEXT_MODE);
-			fbreader.refreshWindow();
+			reader.openBook(bookPtr);
+			reader.setMode(Reader::BOOK_TEXT_MODE);
+			reader.refreshWindow();
 			NetworkLibrary::Instance().refresh();
 		}
 	}
@@ -143,15 +143,15 @@ void NetworkBookDownloadAction::onBookDownloaded(const std::string &error) {
 	if (!error.empty()) {
 		NetworkErrors::showErrorMessage(error);
 	}
-	FBReader &fbreader = FBReader::Instance();
+	Reader &reader = Reader::Instance();
 	shared_ptr<Book> downloaderBook;
-	fbreader.createBook(ZLFile(myFileName), downloaderBook);
+	reader.createBook(ZLFile(myFileName), downloaderBook);
 	if (downloaderBook.isNull()) {
 		ZLFile(myFileName).remove();
 		ZLResourceKey boxKey("cantOpenDownloadedFile");
 		const std::string message = ZLStringUtil::printf(ZLDialogManager::dialogMessage(boxKey), myBook.Title);
 		ZLDialogManager::Instance().errorBox(boxKey, message);
-		fbreader.refreshWindow();
+		reader.refreshWindow();
 		NetworkLibrary::Instance().refresh();
 		return;
 	}
@@ -174,9 +174,9 @@ void NetworkBookDownloadAction::onBookDownloaded(const std::string &error) {
 	}
 	Library::Instance().addBook(downloaderBook);
 
-	fbreader.openBook(downloaderBook);
-	fbreader.setMode(FBReader::BOOK_TEXT_MODE);
-	fbreader.refreshWindow();
+	reader.openBook(downloaderBook);
+	reader.setMode(Reader::BOOK_TEXT_MODE);
+	reader.refreshWindow();
 	NetworkLibrary::Instance().refresh();
 }
 
@@ -328,7 +328,7 @@ std::string NetworkBookBuyInBrowserAction::text(const ZLResource &resource) cons
 void NetworkBookBuyInBrowserAction::run() {
 	shared_ptr<BookReference> reference = myBook.reference(BookReference::BUY_IN_BROWSER);
 	if (!reference.isNull()) {
-		FBReader::Instance().openLinkInBrowser(reference->URL);
+		Reader::Instance().openLinkInBrowser(reference->URL);
 	}
 	NetworkLibrary::Instance().refresh();
 }
@@ -352,6 +352,6 @@ void NetworkBookDeleteAction::run() {
 	}
 
 	myBook.removeLocalFiles();
-	FBReader::Instance().refreshWindow();
+	Reader::Instance().refreshWindow();
 	NetworkLibrary::Instance().refresh();
 }
diff --git a/fbreader/src/networkActions/NetworkActions.h b/reader/src/networkActions/NetworkActions.h
index f0cf513..f0cf513 100644
--- a/fbreader/src/networkActions/NetworkActions.h
+++ b/reader/src/networkActions/NetworkActions.h
diff --git a/fbreader/src/networkActions/NetworkOperationRunnable.cpp b/reader/src/networkActions/NetworkOperationRunnable.cpp
index 11a874c..11a874c 100644
--- a/fbreader/src/networkActions/NetworkOperationRunnable.cpp
+++ b/reader/src/networkActions/NetworkOperationRunnable.cpp
diff --git a/fbreader/src/networkActions/NetworkOperationRunnable.h b/reader/src/networkActions/NetworkOperationRunnable.h
index 4a7e8da..4a7e8da 100644
--- a/fbreader/src/networkActions/NetworkOperationRunnable.h
+++ b/reader/src/networkActions/NetworkOperationRunnable.h
diff --git a/fbreader/src/networkActions/PasswordRecoveryDialog.cpp b/reader/src/networkActions/PasswordRecoveryDialog.cpp
index c02fa15..70d6c61 100644
--- a/fbreader/src/networkActions/PasswordRecoveryDialog.cpp
+++ b/reader/src/networkActions/PasswordRecoveryDialog.cpp
@@ -32,7 +32,7 @@
 #include "../network/authentication/NetworkAuthenticationManager.h"
 #include "../network/NetworkErrors.h"
 
-#include "../fbreader/FBReader.h"
+#include "../reader/Reader.h"
 
 PasswordRecoveryDialog::PasswordRecoveryDialog(std::string &email, const std::string &errorMessage) {
 	myDialog = ZLDialogManager::Instance().createDialog(ZLResourceKey("PasswordRecoveryDialog"));
diff --git a/fbreader/src/networkActions/PasswordRecoveryDialog.h b/reader/src/networkActions/PasswordRecoveryDialog.h
index b2d9c86..b2d9c86 100644
--- a/fbreader/src/networkActions/PasswordRecoveryDialog.h
+++ b/reader/src/networkActions/PasswordRecoveryDialog.h
diff --git a/fbreader/src/networkActions/RegisterUserDialog.cpp b/reader/src/networkActions/RegisterUserDialog.cpp
index 4d93d8c..589aae6 100644
--- a/fbreader/src/networkActions/RegisterUserDialog.cpp
+++ b/reader/src/networkActions/RegisterUserDialog.cpp
@@ -32,7 +32,7 @@
 #include "../network/authentication/NetworkAuthenticationManager.h"
 #include "../network/NetworkErrors.h"
 
-#include "../fbreader/FBReader.h"
+#include "../reader/Reader.h"
 
 
 class HiddenValueEntry : public ZLPasswordOptionEntry {
diff --git a/fbreader/src/networkActions/RegisterUserDialog.h b/reader/src/networkActions/RegisterUserDialog.h
index 6dcb3d1..6dcb3d1 100644
--- a/fbreader/src/networkActions/RegisterUserDialog.h
+++ b/reader/src/networkActions/RegisterUserDialog.h
diff --git a/fbreader/src/options/FBCategoryKey.cpp b/reader/src/options/FBCategoryKey.cpp
index b1ab431..b1ab431 100644
--- a/fbreader/src/options/FBCategoryKey.cpp
+++ b/reader/src/options/FBCategoryKey.cpp
diff --git a/fbreader/src/options/FBCategoryKey.h b/reader/src/options/FBCategoryKey.h
index 8550340..8550340 100644
--- a/fbreader/src/options/FBCategoryKey.h
+++ b/reader/src/options/FBCategoryKey.h
diff --git a/fbreader/src/options/FBOptions.cpp b/reader/src/options/FBOptions.cpp
index c7d8f97..c7d8f97 100644
--- a/fbreader/src/options/FBOptions.cpp
+++ b/reader/src/options/FBOptions.cpp
diff --git a/fbreader/src/options/FBOptions.h b/reader/src/options/FBOptions.h
index be1e1fc..be1e1fc 100644
--- a/fbreader/src/options/FBOptions.h
+++ b/reader/src/options/FBOptions.h
diff --git a/fbreader/src/options/FBTextStyle.cpp b/reader/src/options/FBTextStyle.cpp
index c8ad9c5..c8ad9c5 100644
--- a/fbreader/src/options/FBTextStyle.cpp
+++ b/reader/src/options/FBTextStyle.cpp
diff --git a/fbreader/src/options/FBTextStyle.h b/reader/src/options/FBTextStyle.h
index 8bc0762..8bc0762 100644
--- a/fbreader/src/options/FBTextStyle.h
+++ b/reader/src/options/FBTextStyle.h
diff --git a/fbreader/src/optionsDialog/AbstractOptionsDialog.cpp b/reader/src/optionsDialog/AbstractOptionsDialog.cpp
index eb687b8..b49596d 100644
--- a/fbreader/src/optionsDialog/AbstractOptionsDialog.cpp
+++ b/reader/src/optionsDialog/AbstractOptionsDialog.cpp
@@ -22,7 +22,7 @@
 
 #include "AbstractOptionsDialog.h"
 
-#include "../fbreader/FBReader.h"
+#include "../reader/Reader.h"
 
 
 class OptionsApplyRunnable : public ZLRunnable {
@@ -32,10 +32,10 @@ public:
 };
 
 void OptionsApplyRunnable::run() {
-	FBReader &fbreader = FBReader::Instance();
-	fbreader.grabAllKeys(fbreader.KeyboardControlOption.value());
-	fbreader.clearTextCaches();
-	fbreader.refreshWindow();
+	Reader &reader = Reader::Instance();
+	reader.grabAllKeys(reader.KeyboardControlOption.value());
+	reader.clearTextCaches();
+	reader.refreshWindow();
 }
 
 
diff --git a/fbreader/src/optionsDialog/AbstractOptionsDialog.h b/reader/src/optionsDialog/AbstractOptionsDialog.h
index 31f4904..31f4904 100644
--- a/fbreader/src/optionsDialog/AbstractOptionsDialog.h
+++ b/reader/src/optionsDialog/AbstractOptionsDialog.h
diff --git a/fbreader/src/optionsDialog/IntegrationTab.cpp b/reader/src/optionsDialog/IntegrationTab.cpp
index ca3ebf0..ca3ebf0 100644
--- a/fbreader/src/optionsDialog/IntegrationTab.cpp
+++ b/reader/src/optionsDialog/IntegrationTab.cpp
diff --git a/fbreader/src/optionsDialog/bookInfo/BookInfoDialog.cpp b/reader/src/optionsDialog/bookInfo/BookInfoDialog.cpp
index 197bd98..197bd98 100644
--- a/fbreader/src/optionsDialog/bookInfo/BookInfoDialog.cpp
+++ b/reader/src/optionsDialog/bookInfo/BookInfoDialog.cpp
diff --git a/fbreader/src/optionsDialog/bookInfo/BookInfoDialog.h b/reader/src/optionsDialog/bookInfo/BookInfoDialog.h
index a5bb75d..a5bb75d 100644
--- a/fbreader/src/optionsDialog/bookInfo/BookInfoDialog.h
+++ b/reader/src/optionsDialog/bookInfo/BookInfoDialog.h
diff --git a/fbreader/src/optionsDialog/library/LibraryOptionsDialog.cpp b/reader/src/optionsDialog/library/LibraryOptionsDialog.cpp
index 1c4608a..b2168d3 100644
--- a/fbreader/src/optionsDialog/library/LibraryOptionsDialog.cpp
+++ b/reader/src/optionsDialog/library/LibraryOptionsDialog.cpp
@@ -22,7 +22,7 @@
 #include <ZLDialogManager.h>
 #include <ZLOptionsDialog.h>
 
-#include "../../fbreader/FBReader.h"
+#include "../../reader/Reader.h"
 
 #include "../../network/NetworkLinkCollection.h"
 
diff --git a/fbreader/src/optionsDialog/library/LibraryOptionsDialog.h b/reader/src/optionsDialog/library/LibraryOptionsDialog.h
index da217f6..da217f6 100644
--- a/fbreader/src/optionsDialog/library/LibraryOptionsDialog.h
+++ b/reader/src/optionsDialog/library/LibraryOptionsDialog.h
diff --git a/fbreader/src/optionsDialog/lookAndFeel/FormatOptionsPage.cpp b/reader/src/optionsDialog/lookAndFeel/FormatOptionsPage.cpp
index 0b77548..0b77548 100644
--- a/fbreader/src/optionsDialog/lookAndFeel/FormatOptionsPage.cpp
+++ b/reader/src/optionsDialog/lookAndFeel/FormatOptionsPage.cpp
diff --git a/fbreader/src/optionsDialog/lookAndFeel/FormatOptionsPage.h b/reader/src/optionsDialog/lookAndFeel/FormatOptionsPage.h
index 81aa33a..81aa33a 100644
--- a/fbreader/src/optionsDialog/lookAndFeel/FormatOptionsPage.h
+++ b/reader/src/optionsDialog/lookAndFeel/FormatOptionsPage.h
diff --git a/fbreader/src/optionsDialog/lookAndFeel/LookAndFeelOptionsDialog.cpp b/reader/src/optionsDialog/lookAndFeel/LookAndFeelOptionsDialog.cpp
index b3c20ce..ca740c6 100644
--- a/fbreader/src/optionsDialog/lookAndFeel/LookAndFeelOptionsDialog.cpp
+++ b/reader/src/optionsDialog/lookAndFeel/LookAndFeelOptionsDialog.cpp
@@ -31,13 +31,13 @@
 #include "FormatOptionsPage.h"
 #include "StyleOptionsPage.h"
 
-#include "../../fbreader/FBReader.h"
-#include "../../fbreader/FBView.h"
+#include "../../reader/Reader.h"
+#include "../../reader/FBView.h"
 #include "../../options/FBOptions.h"
 
 
 LookAndFeelOptionsDialog::LookAndFeelOptionsDialog() : AbstractOptionsDialog(ZLResourceKey("LookAndFeelOptionsDialog"), true) {
-	FBReader &fbreader = FBReader::Instance();
+	Reader &reader = Reader::Instance();
 	FBOptions &options = FBOptions::Instance();
 
 	ZLOptionsDialog &dialog = this->dialog();
@@ -56,7 +56,7 @@ LookAndFeelOptionsDialog::LookAndFeelOptionsDialog() : AbstractOptionsDialog(ZLR
 	);
 
 	myFormatPage = new FormatOptionsPage(dialog.createTab(ZLResourceKey("Format")));
-	myStylePage = new StyleOptionsPage(dialog.createTab(ZLResourceKey("Styles")), *fbreader.context());
+	myStylePage = new StyleOptionsPage(dialog.createTab(ZLResourceKey("Styles")), *reader.context());
 
 	ZLDialogContent &colorsTab = dialog.createTab(ZLResourceKey("Colors"));
 	ZLResourceKey colorKey("colorFor");
diff --git a/fbreader/src/optionsDialog/lookAndFeel/LookAndFeelOptionsDialog.h b/reader/src/optionsDialog/lookAndFeel/LookAndFeelOptionsDialog.h
index b908285..b908285 100644
--- a/fbreader/src/optionsDialog/lookAndFeel/LookAndFeelOptionsDialog.h
+++ b/reader/src/optionsDialog/lookAndFeel/LookAndFeelOptionsDialog.h
diff --git a/fbreader/src/optionsDialog/lookAndFeel/OptionsPage.cpp b/reader/src/optionsDialog/lookAndFeel/OptionsPage.cpp
index 55a6970..55a6970 100644
--- a/fbreader/src/optionsDialog/lookAndFeel/OptionsPage.cpp
+++ b/reader/src/optionsDialog/lookAndFeel/OptionsPage.cpp
diff --git a/fbreader/src/optionsDialog/lookAndFeel/OptionsPage.h b/reader/src/optionsDialog/lookAndFeel/OptionsPage.h
index a175c2b..a175c2b 100644
--- a/fbreader/src/optionsDialog/lookAndFeel/OptionsPage.h
+++ b/reader/src/optionsDialog/lookAndFeel/OptionsPage.h
diff --git a/fbreader/src/optionsDialog/lookAndFeel/StyleOptionsPage.cpp b/reader/src/optionsDialog/lookAndFeel/StyleOptionsPage.cpp
index c2086d1..c2086d1 100644
--- a/fbreader/src/optionsDialog/lookAndFeel/StyleOptionsPage.cpp
+++ b/reader/src/optionsDialog/lookAndFeel/StyleOptionsPage.cpp
diff --git a/fbreader/src/optionsDialog/lookAndFeel/StyleOptionsPage.h b/reader/src/optionsDialog/lookAndFeel/StyleOptionsPage.h
index c61709d..c61709d 100644
--- a/fbreader/src/optionsDialog/lookAndFeel/StyleOptionsPage.h
+++ b/reader/src/optionsDialog/lookAndFeel/StyleOptionsPage.h
diff --git a/fbreader/src/optionsDialog/network/NetworkOptionsDialog.cpp b/reader/src/optionsDialog/network/NetworkOptionsDialog.cpp
index c7c4b10..5c39131 100644
--- a/fbreader/src/optionsDialog/network/NetworkOptionsDialog.cpp
+++ b/reader/src/optionsDialog/network/NetworkOptionsDialog.cpp
@@ -29,7 +29,7 @@
 #include <ZLSimpleOptionEntry.h>
 #include <ZLToggleBooleanOptionEntry.h>
 
-#include "../../fbreader/FBReader.h"
+#include "../../reader/Reader.h"
 
 //#include "../../network/NetworkLinkCollection.h"
 //#include "../../network/NetworkLink.h"
@@ -58,14 +58,14 @@ void NetworkLinkBooleanOptionEntry::onAccept(bool state) {
 	bool oldState = myOption.value();
 	myOption.setValue(state);
 	if (state != oldState) {
-//		FBReader::Instance().invalidateNetworkView();
+//		Reader::Instance().invalidateNetworkView();
 	}
 }
 
 
 
 NetworkOptionsDialog::NetworkOptionsDialog() : AbstractOptionsDialog(ZLResourceKey("NetworkOptionsDialog"), true) {
-	FBReader &fbreader = FBReader::Instance();
+	Reader &reader = Reader::Instance();
 
 	ZLDialogContent &connectionTab = dialog().createTab(ZLResourceKey("Connection"));
 
@@ -100,5 +100,5 @@ NetworkOptionsDialog::NetworkOptionsDialog() : AbstractOptionsDialog(ZLResourceK
 //	}
 
 	std::vector<std::pair<ZLResourceKey,ZLOptionEntry*> > additional;
-	createIntegrationTab(fbreader.webBrowserCollection(), ZLResourceKey("Web"), additional);
+	createIntegrationTab(reader.webBrowserCollection(), ZLResourceKey("Web"), additional);
 }
diff --git a/fbreader/src/optionsDialog/network/NetworkOptionsDialog.h b/reader/src/optionsDialog/network/NetworkOptionsDialog.h
index 3c6ca32..3c6ca32 100644
--- a/fbreader/src/optionsDialog/network/NetworkOptionsDialog.h
+++ b/reader/src/optionsDialog/network/NetworkOptionsDialog.h
diff --git a/fbreader/src/optionsDialog/reading/IndicatorTab.cpp b/reader/src/optionsDialog/reading/IndicatorTab.cpp
index 2049b16..6d288c6 100644
--- a/fbreader/src/optionsDialog/reading/IndicatorTab.cpp
+++ b/reader/src/optionsDialog/reading/IndicatorTab.cpp
@@ -25,9 +25,9 @@
 
 #include "ReadingOptionsDialog.h"
 
-#include "../../fbreader/FBReader.h"
-#include "../../fbreader/FBView.h"
-#include "../../fbreader/BookTextView.h"
+#include "../../reader/Reader.h"
+#include "../../reader/FBView.h"
+#include "../../reader/BookTextView.h"
 
 class StateOptionEntry : public ZLToggleBooleanOptionEntry {
 
@@ -156,7 +156,7 @@ void ReadingOptionsDialog::createIndicatorTab() {
 	showTimeEntry->addDependentEntry(fontSizeEntry);
 
 	ZLOptionEntry *tocMarksEntry =
-		new ZLSimpleBooleanOptionEntry(FBReader::Instance().bookTextView().ShowTOCMarksOption);
+		new ZLSimpleBooleanOptionEntry(Reader::Instance().bookTextView().ShowTOCMarksOption);
 	indicatorTab.addOption(ZLResourceKey("tocMarks"), tocMarksEntry);
 	indicatorTypeEntry->addDependentEntry(tocMarksEntry);
 
diff --git a/fbreader/src/optionsDialog/reading/KeyBindingsTab.cpp b/reader/src/optionsDialog/reading/KeyBindingsTab.cpp
index b522578..f72023b 100644
--- a/fbreader/src/optionsDialog/reading/KeyBindingsTab.cpp
+++ b/reader/src/optionsDialog/reading/KeyBindingsTab.cpp
@@ -26,8 +26,8 @@
 
 #include "ReadingOptionsDialog.h"
 
-#include "../../fbreader/FBReader.h"
-#include "../../fbreader/FBReaderActions.h"
+#include "../../reader/Reader.h"
+#include "../../reader/ReaderActions.h"
 
 class KeyboardControlEntry : public ZLSimpleBooleanOptionEntry {
 
@@ -36,12 +36,12 @@ public:
 	void onStateChanged(bool state);
 };
 
-KeyboardControlEntry::KeyboardControlEntry() : ZLSimpleBooleanOptionEntry(FBReader::Instance().KeyboardControlOption) {
+KeyboardControlEntry::KeyboardControlEntry() : ZLSimpleBooleanOptionEntry(Reader::Instance().KeyboardControlOption) {
 }
 
 void KeyboardControlEntry::onStateChanged(bool state) {
 	ZLSimpleBooleanOptionEntry::onStateChanged(state);
-	FBReader::Instance().grabAllKeys(state);
+	Reader::Instance().grabAllKeys(state);
 }
 
 class SingleKeyOptionEntry : public ZLSimpleKeyOptionEntry {
@@ -96,10 +96,10 @@ void MultiKeyOptionEntry::addAction(const std::string &actionId) {
 MultiKeyOptionEntry::MultiKeyOptionEntry(const ZLResource &resource) :
 	ZLKeyOptionEntry(),
 	myResource(resource),
-	myEntry0(myBimap, *FBReader::Instance().keyBindings(ZLView::DEGREES0)),
-	myEntry90(myBimap, *FBReader::Instance().keyBindings(ZLView::DEGREES90)),
-	myEntry180(myBimap, *FBReader::Instance().keyBindings(ZLView::DEGREES180)),
-	myEntry270(myBimap, *FBReader::Instance().keyBindings(ZLView::DEGREES270)),
+	myEntry0(myBimap, *Reader::Instance().keyBindings(ZLView::DEGREES0)),
+	myEntry90(myBimap, *Reader::Instance().keyBindings(ZLView::DEGREES90)),
+	myEntry180(myBimap, *Reader::Instance().keyBindings(ZLView::DEGREES180)),
+	myEntry270(myBimap, *Reader::Instance().keyBindings(ZLView::DEGREES270)),
 	myCurrentEntry(&myEntry0),
 	myExitOnCancelEntry(0) {
 	addAction(ZLApplication::NoAction);
@@ -251,7 +251,7 @@ private:
 	OrientationEntry &myOrientationEntry;
 };
 
-UseSeparateOptionsEntry::UseSeparateOptionsEntry(ZLOptionEntry &keyEntry, OrientationEntry &orientationEntry) : ZLSimpleBooleanOptionEntry(FBReader::Instance().UseSeparateBindingsOption), myKeyEntry(keyEntry), myOrientationEntry(orientationEntry) {
+UseSeparateOptionsEntry::UseSeparateOptionsEntry(ZLOptionEntry &keyEntry, OrientationEntry &orientationEntry) : ZLSimpleBooleanOptionEntry(Reader::Instance().UseSeparateBindingsOption), myKeyEntry(keyEntry), myOrientationEntry(orientationEntry) {
 }
 
 void UseSeparateOptionsEntry::onStateChanged(bool state) {
@@ -263,7 +263,7 @@ void UseSeparateOptionsEntry::onStateChanged(bool state) {
 
 void ReadingOptionsDialog::createKeyBindingsTab() {
 	ZLDialogContent &dialogTab = dialog().createTab(ZLResourceKey("Keys"));
-	FBReader &fbreader = FBReader::Instance();
+	Reader &reader = Reader::Instance();
 	if (ZLBooleanOption(ZLCategoryKey::EMPTY, ZLOption::PLATFORM_GROUP, ZLOption::FULL_KEYBOARD_CONTROL, false).value()) {
 		dialogTab.addOption(ZLResourceKey("grabSystemKeys"), new KeyboardControlEntry());
 	}
@@ -276,10 +276,10 @@ void ReadingOptionsDialog::createKeyBindingsTab() {
 	dialogTab.addOption(separateKey, useSeparateBindingsEntry);
 	dialogTab.addOption(orientationKey, orientationEntry);
 	dialogTab.addOption("", "", keyEntry);
-	ZLOptionEntry *exitOnCancelEntry = new ZLSimpleBooleanOptionEntry(fbreader.QuitOnCancelOption);
+	ZLOptionEntry *exitOnCancelEntry = new ZLSimpleBooleanOptionEntry(reader.QuitOnCancelOption);
 	keyEntry->setExitOnCancelEntry(exitOnCancelEntry);
 	dialogTab.addOption(ZLResourceKey("quitOnCancel"), exitOnCancelEntry);
 	exitOnCancelEntry->setVisible(false);
 	useSeparateBindingsEntry->onStateChanged(useSeparateBindingsEntry->initialState());
-	dialogTab.addOption(ZLResourceKey("keyDelay"), new ZLSimpleSpinOptionEntry(fbreader.KeyDelayOption, 50));
+	dialogTab.addOption(ZLResourceKey("keyDelay"), new ZLSimpleSpinOptionEntry(reader.KeyDelayOption, 50));
 }
diff --git a/fbreader/src/optionsDialog/reading/ReadingOptionsDialog.cpp b/reader/src/optionsDialog/reading/ReadingOptionsDialog.cpp
index 98c079f..29528c6 100644
--- a/fbreader/src/optionsDialog/reading/ReadingOptionsDialog.cpp
+++ b/reader/src/optionsDialog/reading/ReadingOptionsDialog.cpp
@@ -25,8 +25,8 @@
 
 #include "ReadingOptionsDialog.h"
 
-#include "../../fbreader/FBReader.h"
-#include "../../fbreader/FBView.h"
+#include "../../reader/Reader.h"
+#include "../../reader/FBView.h"
 
 
 class RotationTypeEntry : public ZLComboOptionEntry {
@@ -87,25 +87,25 @@ void RotationTypeEntry::onAccept(const std::string &value) {
 
 
 ReadingOptionsDialog::ReadingOptionsDialog() : AbstractOptionsDialog(ZLResourceKey("ReadingOptionsDialog"), true) {
-	FBReader &fbreader = FBReader::Instance();
+	Reader &reader = Reader::Instance();
 
 	ZLOptionsDialog &dialog = this->dialog();
 
 	ZLDialogContent &scrollingTab = dialog.createTab(ZLResourceKey("Scrolling"));
-	scrollingTab.addOption(ZLResourceKey("keyLinesToScroll"), new ZLSimpleSpinOptionEntry(fbreader.LinesToScrollOption, 1));
-	scrollingTab.addOption(ZLResourceKey("keyLinesToKeep"), new ZLSimpleSpinOptionEntry(fbreader.LinesToKeepOption, 1));
-	scrollingTab.addOption(ZLResourceKey("keyScrollDelay"), new ZLSimpleSpinOptionEntry(fbreader.KeyScrollingDelayOption, 50));
+	scrollingTab.addOption(ZLResourceKey("keyLinesToScroll"), new ZLSimpleSpinOptionEntry(reader.LinesToScrollOption, 1));
+	scrollingTab.addOption(ZLResourceKey("keyLinesToKeep"), new ZLSimpleSpinOptionEntry(reader.LinesToKeepOption, 1));
+	scrollingTab.addOption(ZLResourceKey("keyScrollDelay"), new ZLSimpleSpinOptionEntry(reader.KeyScrollingDelayOption, 50));
 	const bool hasTouchScreen =
 		ZLBooleanOption(ZLCategoryKey::EMPTY, ZLOption::PLATFORM_GROUP, ZLOption::TOUCHSCREEN_PRESENTED, false).value();
 	if (hasTouchScreen) {
 		ZLToggleBooleanOptionEntry *enableTapScrollingEntry =
-			new ZLToggleBooleanOptionEntry(fbreader.EnableTapScrollingOption);
+			new ZLToggleBooleanOptionEntry(reader.EnableTapScrollingOption);
 		scrollingTab.addOption(ZLResourceKey("enableTapScrolling"), enableTapScrollingEntry);
 		const bool isFingerTapDetectionSupported =
 			ZLBooleanOption(ZLCategoryKey::EMPTY, ZLOption::PLATFORM_GROUP, ZLOption::FINGER_TAP_DETECTABLE, false).value();
 		if (isFingerTapDetectionSupported) {
 			ZLOptionEntry *fingerOnlyEntry =
-				new ZLSimpleBooleanOptionEntry(fbreader.TapScrollingOnFingerOnlyOption);
+				new ZLSimpleBooleanOptionEntry(reader.TapScrollingOnFingerOnlyOption);
 			scrollingTab.addOption(ZLResourceKey("fingerOnly"), fingerOnlyEntry);
 			enableTapScrollingEntry->addDependentEntry(fingerOnlyEntry);
 			enableTapScrollingEntry->onStateChanged(enableTapScrollingEntry->initialState());
@@ -119,7 +119,7 @@ ReadingOptionsDialog::ReadingOptionsDialog() : AbstractOptionsDialog(ZLResourceK
 
 	ZLDialogContent &rotationTab = dialog.createTab(ZLResourceKey("Rotation"));
 	ZLResourceKey directionKey("direction");
-	rotationTab.addOption(directionKey, new RotationTypeEntry(rotationTab.resource(directionKey), fbreader.RotationAngleOption));
+	rotationTab.addOption(directionKey, new RotationTypeEntry(rotationTab.resource(directionKey), reader.RotationAngleOption));
 
 	createKeyBindingsTab();
 }
diff --git a/fbreader/src/optionsDialog/reading/ReadingOptionsDialog.h b/reader/src/optionsDialog/reading/ReadingOptionsDialog.h
index 83a101a..83a101a 100644
--- a/fbreader/src/optionsDialog/reading/ReadingOptionsDialog.h
+++ b/reader/src/optionsDialog/reading/ReadingOptionsDialog.h
diff --git a/fbreader/src/optionsDialog/system/SystemOptionsDialog.cpp b/reader/src/optionsDialog/system/SystemOptionsDialog.cpp
index aadc669..1c649df 100644
--- a/fbreader/src/optionsDialog/system/SystemOptionsDialog.cpp
+++ b/reader/src/optionsDialog/system/SystemOptionsDialog.cpp
@@ -28,7 +28,7 @@
 
 #include "SystemOptionsDialog.h"
 
-#include "../../fbreader/FBReader.h"
+#include "../../reader/Reader.h"
 #include "../../formats/FormatPlugin.h"
 #include "../../encodingOption/EncodingOptionEntry.h"
 
@@ -62,25 +62,25 @@ SystemOptionsDialog::SystemOptionsDialog() : AbstractOptionsDialog(ZLResourceKey
 
 	if (ZLOption::isAutoSavingSupported()) {
 		ZLDialogContent &configTab = dialog.createTab(ZLResourceKey("Config"));
-		FBReader &fbreader = FBReader::Instance();
+		Reader &reader = Reader::Instance();
 		ZLToggleBooleanOptionEntry *enableEntry =
-			new ZLToggleBooleanOptionEntry(fbreader.ConfigAutoSavingOption);
+			new ZLToggleBooleanOptionEntry(reader.ConfigAutoSavingOption);
 		configTab.addOption(ZLResourceKey("autoSave"), enableEntry);
 
-		ZLOptionEntry *timeoutEntry = new TimeoutEntry(fbreader.ConfigAutoSaveTimeoutOption);
+		ZLOptionEntry *timeoutEntry = new TimeoutEntry(reader.ConfigAutoSaveTimeoutOption);
 		enableEntry->addDependentEntry(timeoutEntry);
 		configTab.addOption(ZLResourceKey("timeout"), timeoutEntry);
 
 		enableEntry->onStateChanged(enableEntry->initialState());
 	}
 
-	FBReader &fbreader = FBReader::Instance();
+	Reader &reader = Reader::Instance();
 
 	std::vector<std::pair<ZLResourceKey,ZLOptionEntry*> > additional;
 	ZLOptionEntry *entry =
-		new ZLSimpleBooleanOptionEntry(fbreader.EnableSingleClickDictionaryOption);
+		new ZLSimpleBooleanOptionEntry(reader.EnableSingleClickDictionaryOption);
 	additional.push_back(std::make_pair(ZLResourceKey("singleClickOpen"), entry));
-	createIntegrationTab(fbreader.dictionaryCollection(), ZLResourceKey("Dictionary"), additional);
+	createIntegrationTab(reader.dictionaryCollection(), ZLResourceKey("Dictionary"), additional);
 
 	dialog.createPlatformDependentTabs();
 }
diff --git a/fbreader/src/optionsDialog/system/SystemOptionsDialog.h b/reader/src/optionsDialog/system/SystemOptionsDialog.h
index 171b6ba..171b6ba 100644
--- a/fbreader/src/optionsDialog/system/SystemOptionsDialog.h
+++ b/reader/src/optionsDialog/system/SystemOptionsDialog.h
diff --git a/fbreader/src/fbreader/AddBookAction.cpp b/reader/src/reader/AddBookAction.cpp
index 5d339d3..a37af1e 100644
--- a/fbreader/src/fbreader/AddBookAction.cpp
+++ b/reader/src/reader/AddBookAction.cpp
@@ -21,8 +21,8 @@
 #include <ZLOptionsDialog.h>
 #include <ZLFile.h>
 
-#include "FBReaderActions.h"
-#include "FBReader.h"
+#include "ReaderActions.h"
+#include "Reader.h"
 #include "../library/Book.h"
 #include "../formats/FormatPlugin.h"
 
@@ -53,6 +53,6 @@ void AddBookAction::run() {
 	DirectoryOption.setValue(dialog->directoryPath());
 	FileOption.setValue(dialog->filePath());
 	if (code) {
-		FBReader::Instance().openFile(ZLFile(dialog->filePath()));
+		Reader::Instance().openFile(ZLFile(dialog->filePath()));
 	}
 }
diff --git a/fbreader/src/fbreader/BookTextView.cpp b/reader/src/reader/BookTextView.cpp
index 89cbea3..c506a85 100644
--- a/fbreader/src/fbreader/BookTextView.cpp
+++ b/reader/src/reader/BookTextView.cpp
@@ -28,7 +28,7 @@
 #include <ZLTextPositionIndicator.h>
 
 #include "BookTextView.h"
-#include "FBReader.h"
+#include "Reader.h"
 
 #include "../bookmodel/FBTextKind.h"
 #include "../bookmodel/BookModel.h"
@@ -245,7 +245,7 @@ void BookTextView::undoPageMove() {
 		gotoPosition(pos.Paragraph, pos.Word, pos.Character);
 		myLockUndoStackChanges = false;
 
-		FBReader::Instance().refreshWindow();
+		Reader::Instance().refreshWindow();
 	}
 }
 
@@ -268,7 +268,7 @@ void BookTextView::redoPageMove() {
 			myStackChanged = true;
 		}
 
-		FBReader::Instance().refreshWindow();
+		Reader::Instance().refreshWindow();
 	}
 }
 
@@ -304,21 +304,21 @@ bool BookTextView::_onStylusPress(int x, int y) {
 }
 
 bool BookTextView::onStylusClick(int x, int y, int count) {
-	FBReader &fbreader = FBReader::Instance();
+	Reader &reader = Reader::Instance();
 	const ZLTextElementRectangle *rectangle = textArea().elementByCoordinates(x, y);
 	if (rectangle != 0) {
 		std::string id;
 		ZLHyperlinkType type;
 		if (getHyperlinkInfo(*rectangle, id, type)) {
-			fbreader.tryShowFootnoteView(id, type);
+			reader.tryShowFootnoteView(id, type);
 			return true;
 		}
 
-		if (fbreader.isDictionarySupported() &&
-				fbreader.EnableSingleClickDictionaryOption.value()) {
+		if (reader.isDictionarySupported() &&
+				reader.EnableSingleClickDictionaryOption.value()) {
 			const std::string txt = word(*rectangle);
 			if (!txt.empty()) {
-				fbreader.openInDictionary(txt);
+				reader.openInDictionary(txt);
 				return true;
 			}
 		}
@@ -328,7 +328,7 @@ bool BookTextView::onStylusClick(int x, int y, int count) {
 }
 
 bool BookTextView::_onStylusRelease(int x, int y) {
-	FBReader &fbreader = FBReader::Instance();
+	Reader &reader = Reader::Instance();
 	if (!isReleasedWithoutMotion()) {
 		return false;
 	}
@@ -338,15 +338,15 @@ bool BookTextView::_onStylusRelease(int x, int y) {
 		std::string id;
 		ZLHyperlinkType type;
 		if (getHyperlinkInfo(*rectangle, id, type)) {
-			fbreader.tryShowFootnoteView(id, type);
+			reader.tryShowFootnoteView(id, type);
 			return true;
 		}
 
-		if (fbreader.isDictionarySupported() &&
-				fbreader.EnableSingleClickDictionaryOption.value()) {
+		if (reader.isDictionarySupported() &&
+				reader.EnableSingleClickDictionaryOption.value()) {
 			const std::string txt = word(*rectangle);
 			if (!txt.empty()) {
-				fbreader.openInDictionary(txt);
+				reader.openInDictionary(txt);
 				return true;
 			}
 		}
@@ -359,7 +359,7 @@ bool BookTextView::_onStylusMove(int x, int y) {
 	const ZLTextElementRectangle *rectangle = textArea().elementByCoordinates(x, y);
 	std::string id;
 	ZLHyperlinkType type;
-	FBReader::Instance().setHyperlinkCursor((rectangle != 0) && getHyperlinkInfo(*rectangle, id, type));
+	Reader::Instance().setHyperlinkCursor((rectangle != 0) && getHyperlinkInfo(*rectangle, id, type));
 	return true;
 }
 
@@ -408,12 +408,12 @@ void BookTextView::scrollToHome() {
 	}
 
 	gotoParagraph(0, false);
-	FBReader::Instance().refreshWindow();
+	Reader::Instance().refreshWindow();
 }
 
 void BookTextView::paint() {
 	FBView::paint();
 	std::string pn;
 	ZLStringUtil::appendNumber(pn, pageIndex());
-	FBReader::Instance().setVisualParameter(FBReader::PageIndexParameter, pn);
+	Reader::Instance().setVisualParameter(Reader::PageIndexParameter, pn);
 }
diff --git a/fbreader/src/fbreader/BookTextView.h b/reader/src/reader/BookTextView.h
index c98aa93..c98aa93 100644
--- a/fbreader/src/fbreader/BookTextView.h
+++ b/reader/src/reader/BookTextView.h
diff --git a/fbreader/src/fbreader/BooksOrderAction.cpp b/reader/src/reader/BooksOrderAction.cpp
index 91d5c76..45193ea 100644
--- a/fbreader/src/fbreader/BooksOrderAction.cpp
+++ b/reader/src/reader/BooksOrderAction.cpp
@@ -17,12 +17,12 @@
  * 02110-1301, USA.
  */
 
-#include "FBReader.h"
-#include "FBReaderActions.h"
+#include "Reader.h"
+#include "ReaderActions.h"
 
-BooksOrderAction::BooksOrderAction() : ModeDependentAction(FBReader::LIBRARY_MODE) {
+BooksOrderAction::BooksOrderAction() : ModeDependentAction(Reader::LIBRARY_MODE) {
 }
 
 void BooksOrderAction::run() {
-	FBReader::Instance().showLibraryView();
+	Reader::Instance().showLibraryView();
 }
diff --git a/fbreader/src/fbreader/ContentsView.cpp b/reader/src/reader/ContentsView.cpp
index e3d24ef..bb42aec 100644
--- a/fbreader/src/fbreader/ContentsView.cpp
+++ b/reader/src/reader/ContentsView.cpp
@@ -21,7 +21,7 @@
 
 #include "ContentsView.h"
 #include "BookTextView.h"
-#include "FBReader.h"
+#include "Reader.h"
 
 #include "../bookmodel/BookModel.h"
 
@@ -32,23 +32,23 @@ ContentsView::~ContentsView() {
 }
 
 bool ContentsView::_onStylusMove(int x, int y) {
-	FBReader &fbreader = FBReader::Instance();
+	Reader &reader = Reader::Instance();
 
 	int index = textArea().paragraphIndexByCoordinates(x, y);
 	if ((index < 0) || ((int)textArea().model()->paragraphsNumber() <= index)) {
-		fbreader.setHyperlinkCursor(false);
+		reader.setHyperlinkCursor(false);
 		return true;
 	}
 
 	const ContentsModel &contentsModel = (const ContentsModel&)*textArea().model();
 	const ZLTextTreeParagraph *paragraph = (const ZLTextTreeParagraph*)contentsModel[index];
 	
-	fbreader.setHyperlinkCursor(contentsModel.reference(paragraph) >= 0);
+	reader.setHyperlinkCursor(contentsModel.reference(paragraph) >= 0);
 	return true;
 }
 
 bool ContentsView::_onStylusPress(int x, int y) {
-	FBReader &fbreader = FBReader::Instance();
+	Reader &reader = Reader::Instance();
 
 	const ContentsModel &contentsModel = (const ContentsModel&)*textArea().model();
 	int index = textArea().paragraphIndexByCoordinates(x, y);
@@ -61,8 +61,8 @@ bool ContentsView::_onStylusPress(int x, int y) {
 	int reference = contentsModel.reference(paragraph);
 
 	if (reference >= 0) {
-		fbreader.bookTextView().gotoParagraph(reference);
-		fbreader.showBookTextView();
+		reader.bookTextView().gotoParagraph(reference);
+		reader.showBookTextView();
 	}
 
 	return true;
@@ -74,7 +74,7 @@ bool ContentsView::isEmpty() const {
 }
 
 std::size_t ContentsView::currentTextViewParagraph(bool includeStart) const {
-	const ZLTextWordCursor &cursor = FBReader::Instance().bookTextView().textArea().startCursor();
+	const ZLTextWordCursor &cursor = Reader::Instance().bookTextView().textArea().startCursor();
 	if (!cursor.isNull()) {
 		long reference = cursor.paragraphCursor().index();
 		bool startOfParagraph = cursor.elementIndex() == 0;
diff --git a/fbreader/src/fbreader/ContentsView.h b/reader/src/reader/ContentsView.h
index f6cec1a..f6cec1a 100644
--- a/fbreader/src/fbreader/ContentsView.h
+++ b/reader/src/reader/ContentsView.h
diff --git a/fbreader/src/fbreader/FootnoteView.h b/reader/src/reader/FootnoteView.h
index 76a6b77..76a6b77 100644
--- a/fbreader/src/fbreader/FootnoteView.h
+++ b/reader/src/reader/FootnoteView.h
diff --git a/fbreader/src/fbreader/PreferencesPopupData.cpp b/reader/src/reader/PreferencesPopupData.cpp
index 7b7cf92..ccc1edb 100644
--- a/fbreader/src/fbreader/PreferencesPopupData.cpp
+++ b/reader/src/reader/PreferencesPopupData.cpp
@@ -21,7 +21,7 @@
 
 #include <ZLResource.h>
 
-#include "FBReaderActions.h"
+#include "ReaderActions.h"
 
 PreferencesPopupData::PreferencesPopupData() {
 	myActionIds.push_back(ActionCode::SHOW_BOOK_INFO_DIALOG);
@@ -45,11 +45,11 @@ std::size_t PreferencesPopupData::count() const {
 	if (myInvalidated) {
 		myInvalidated = false;
 		myVisibleActionIds.clear();
-		const FBReader& fbreader = FBReader::Instance();
+		const Reader& reader = Reader::Instance();
 		const std::size_t size = myActionIds.size();
 		for (std::size_t i = 0; i < size; ++i) {
 			const std::string &actionId = myActionIds[i];
-			if (fbreader.action(actionId)->isVisible()) {
+			if (reader.action(actionId)->isVisible()) {
 				myVisibleActionIds.push_back(actionId);
 			}
 		}
@@ -69,5 +69,5 @@ void PreferencesPopupData::run(std::size_t index) {
 	if (index >= myVisibleActionIds.size()) {
 		return;
 	}
-	FBReader::Instance().doAction(myVisibleActionIds[index]);
+	Reader::Instance().doAction(myVisibleActionIds[index]);
 }
diff --git a/fbreader/src/fbreader/PreferencesPopupData.h b/reader/src/reader/PreferencesPopupData.h
index a3227d7..a3227d7 100644
--- a/fbreader/src/fbreader/PreferencesPopupData.h
+++ b/reader/src/reader/PreferencesPopupData.h
diff --git a/fbreader/src/fbreader/FBReader.cpp b/reader/src/reader/Reader.cpp
index f4825b0..7f42623 100644
--- a/fbreader/src/fbreader/FBReader.cpp
+++ b/reader/src/reader/Reader.cpp
@@ -34,8 +34,8 @@
 #include <ZLTextStyleCollection.h>
 #include <ZLTextHyphenator.h>
 
-#include "FBReader.h"
-#include "FBReaderActions.h"
+#include "Reader.h"
+#include "ReaderActions.h"
 #include "ScrollingAction.h"
 #include "BookTextView.h"
 #include "FootnoteView.h"
@@ -63,27 +63,27 @@
 
 static const std::string OPTIONS = "Options";
 
-const std::string FBReader::PageIndexParameter = "pageIndex";
+const std::string Reader::PageIndexParameter = "pageIndex";
 
 class OpenFileHandler : public ZLMessageHandler {
 
 public:
 	void onMessageReceived(const std::vector<std::string> &arguments) {
 		if (arguments.size() == 1) {
-			FBReader &fbreader = FBReader::Instance();
-			fbreader.myBookAlreadyOpen = true;
-			fbreader.presentWindow();
-			fbreader.openFile(ZLFile(arguments[0]));
+			Reader &reader = Reader::Instance();
+			reader.myBookAlreadyOpen = true;
+			reader.presentWindow();
+			reader.openFile(ZLFile(arguments[0]));
 		}
 	}
 };
 
-FBReader &FBReader::Instance() {
-	return (FBReader&)ZLApplication::Instance();
+Reader &Reader::Instance() {
+	return (Reader&)ZLApplication::Instance();
 }
 
-FBReader::FBReader(const std::string &bookToOpen) :
-	ZLApplication("FBReader"),
+Reader::Reader(const std::string &bookToOpen) :
+	ZLApplication("Reader"),
 	QuitOnCancelOption(ZLCategoryKey::CONFIG, OPTIONS, "QuitOnCancel", false),
 	KeyScrollingDelayOption(ZLCategoryKey::CONFIG, "Scrollings", "Delay", 0, 2000, 100),
 	LinesToScrollOption(ZLCategoryKey::CONFIG, "SmallScrolling", "LinesToScroll", 1, 20, 1),
@@ -113,8 +113,8 @@ FBReader::FBReader(const std::string &bookToOpen) :
 	myPreviousMode = BOOK_TEXT_MODE;
 	setMode(BOOK_TEXT_MODE);
 
-	addAction(ActionCode::SHOW_READING, new UndoAction(FBReader::ALL_MODES & ~FBReader::BOOK_TEXT_MODE));
-	addAction(ActionCode::SHOW_LIBRARY, new SetModeAction(FBReader::LIBRARY_MODE, FBReader::BOOK_TEXT_MODE | FBReader::CONTENTS_MODE));
+	addAction(ActionCode::SHOW_READING, new UndoAction(Reader::ALL_MODES & ~Reader::BOOK_TEXT_MODE));
+	addAction(ActionCode::SHOW_LIBRARY, new SetModeAction(Reader::LIBRARY_MODE, Reader::BOOK_TEXT_MODE | Reader::CONTENTS_MODE));
 	addAction(ActionCode::SHOW_NETWORK_LIBRARY, new ShowNetworkTreeLibraryAction());
 	registerPopupData(ActionCode::SHOW_LIBRARY, myRecentBooksPopupData);
 	addAction(ActionCode::SHOW_OPTIONS_DIALOG, new ShowOptionsDialogAction());
@@ -125,8 +125,8 @@ FBReader::FBReader(const std::string &bookToOpen) :
 	addAction(ActionCode::SHOW_SYSTEM_OPTIONS_DIALOG, new ShowSystemOptionsDialogAction());
 	addAction(ActionCode::SHOW_READING_OPTIONS_DIALOG, new ShowReadingOptionsDialogAction());
 	addAction(ActionCode::SHOW_LOOKANDFEEL_OPTIONS_DIALOG, new ShowLookAndFeelOptionsDialogAction());
-	addAction(ActionCode::ADD_BOOK, new AddBookAction(FBReader::BOOK_TEXT_MODE | FBReader::LIBRARY_MODE | FBReader::CONTENTS_MODE));
-	addAction(ActionCode::UNDO, new UndoAction(FBReader::BOOK_TEXT_MODE));
+	addAction(ActionCode::ADD_BOOK, new AddBookAction(Reader::BOOK_TEXT_MODE | Reader::LIBRARY_MODE | Reader::CONTENTS_MODE));
+	addAction(ActionCode::UNDO, new UndoAction(Reader::BOOK_TEXT_MODE));
 	addAction(ActionCode::REDO, new RedoAction());
 	addAction(ActionCode::SEARCH, new SearchPatternAction());
 	addAction(ActionCode::FIND_NEXT, new FindNextAction());
@@ -170,16 +170,16 @@ FBReader::FBReader(const std::string &bookToOpen) :
 	myOpenFileHandler = new OpenFileHandler();
 	ZLCommunicationManager::Instance().registerHandler("openFile", myOpenFileHandler);
 
-	ZLNetworkManager::Instance().setUserAgent(std::string("FBReader/") + VERSION);
+	ZLNetworkManager::Instance().setUserAgent(std::string("Reader/") + VERSION);
 }
 
-FBReader::~FBReader() {
+Reader::~Reader() {
 	ZLTextStyleCollection::deleteInstance();
 	PluginCollection::deleteInstance();
 	ZLTextHyphenator::deleteInstance();
 }
 
-void FBReader::initWindow() {
+void Reader::initWindow() {
 	ZLApplication::initWindow();
 	trackStylus(true);
 
@@ -212,13 +212,13 @@ void FBReader::initWindow() {
 	ZLTimeManager::Instance().addTask(new TimeUpdater(), 1000);
 }
 
-void FBReader::refreshWindow() {
+void Reader::refreshWindow() {
 	ZLApplication::refreshWindow();
 	((RecentBooksPopupData&)*myRecentBooksPopupData).updateId();
 	((PreferencesPopupData&)*myPreferencesPopupData).updateId();
 }
 
-bool FBReader::createBook(const ZLFile &bookFile, shared_ptr<Book> &book) {
+bool Reader::createBook(const ZLFile &bookFile, shared_ptr<Book> &book) {
 	shared_ptr<FormatPlugin> plugin =
 		PluginCollection::Instance().plugin(bookFile, false);
 	if (!plugin.isNull()) {
@@ -273,13 +273,13 @@ class OpenBookRunnable : public ZLRunnable {
 
 public:
 	OpenBookRunnable(shared_ptr<Book> book) : myBook(book) {}
-	void run() { FBReader::Instance().openBookInternal(myBook); }
+	void run() { Reader::Instance().openBookInternal(myBook); }
 
 private:
 	shared_ptr<Book> myBook;
 };
 
-void FBReader::openBook(shared_ptr<Book> book) {
+void Reader::openBook(shared_ptr<Book> book) {
 	OpenBookRunnable runnable(book);
 	ZLDialogManager::Instance().wait(ZLResourceKey("loadingBook"), runnable);
 	if (!book.isNull()) {
@@ -288,7 +288,7 @@ void FBReader::openBook(shared_ptr<Book> book) {
 	resetWindowCaption();
 }
 
-void FBReader::openBookInternal(shared_ptr<Book> book) {
+void Reader::openBookInternal(shared_ptr<Book> book) {
 	if (!book.isNull()) {
 		BookTextView &bookTextView = (BookTextView&)*myBookTextView;
 		ContentsView &contentsView = (ContentsView&)*myContentsView;
@@ -315,7 +315,7 @@ void FBReader::openBookInternal(shared_ptr<Book> book) {
 	}
 }
 
-void FBReader::openLinkInBrowser(const std::string &url) const {
+void Reader::openLinkInBrowser(const std::string &url) const {
 	if (url.empty()) {
 		return;
 	}
@@ -333,7 +333,7 @@ void FBReader::openLinkInBrowser(const std::string &url) const {
 	program->run("openLink", copy);
 }
 
-void FBReader::tryShowFootnoteView(const std::string &id, ZLHyperlinkType type) {
+void Reader::tryShowFootnoteView(const std::string &id, ZLHyperlinkType type) {
 	switch (type) {
 		case HYPERLINK_EXTERNAL:
 			openLinkInBrowser(id);
@@ -373,15 +373,15 @@ void FBReader::tryShowFootnoteView(const std::string &id, ZLHyperlinkType type)
 	}
 }
 
-FBReader::ViewMode FBReader::mode() const {
+Reader::ViewMode Reader::mode() const {
 	return myMode;
 }
 
-bool FBReader::isViewFinal() const {
+bool Reader::isViewFinal() const {
 	return myMode == BOOK_TEXT_MODE;
 }
 
-void FBReader::showLibraryView() {
+void Reader::showLibraryView() {
 	if (ZLStringOption(ZLCategoryKey::LOOK_AND_FEEL, "ToggleButtonGroup", "booksOrder", "").value() == ActionCode::ORGANIZE_BOOKS_BY_TAG) {
 		setView(myLibraryByTagView);
 	} else {
@@ -389,7 +389,7 @@ void FBReader::showLibraryView() {
 	}
 }
 
-void FBReader::setMode(ViewMode mode) {
+void Reader::setMode(ViewMode mode) {
 	//TODO remove code for old network library view
 	if (mode == myMode) {
 		return;
@@ -432,20 +432,20 @@ void FBReader::setMode(ViewMode mode) {
 	refreshWindow();
 }
 
-BookTextView &FBReader::bookTextView() const {
+BookTextView &Reader::bookTextView() const {
 	return (BookTextView&)*myBookTextView;
 }
 
-void FBReader::showBookTextView() {
+void Reader::showBookTextView() {
 	setMode(BOOK_TEXT_MODE);
 }
 
-void FBReader::restorePreviousMode() {
+void Reader::restorePreviousMode() {
 	setMode(myPreviousMode);
 	myPreviousMode = BOOK_TEXT_MODE;
 }
 
-bool FBReader::closeView() {
+bool Reader::closeView() {
 	if (myMode == BOOK_TEXT_MODE) {
 		quit();
 		return true;
@@ -455,11 +455,11 @@ bool FBReader::closeView() {
 	}
 }
 
-std::string FBReader::helpFileName(const std::string &language) const {
+std::string Reader::helpFileName(const std::string &language) const {
 	return ZLibrary::ApplicationDirectory() + ZLibrary::FileNameDelimiter + "help" + ZLibrary::FileNameDelimiter + "MiniHelp." + language + ".fb2";
 }
 
-void FBReader::openFile(const ZLFile &file) {
+void Reader::openFile(const ZLFile &file) {
 	shared_ptr<Book> book;
 	createBook(file, book);
 	if (!book.isNull()) {
@@ -468,7 +468,7 @@ void FBReader::openFile(const ZLFile &file) {
 	}
 }
 
-bool FBReader::canDragFiles(const std::vector<std::string> &filePaths) const {
+bool Reader::canDragFiles(const std::vector<std::string> &filePaths) const {
 	switch (myMode) {
 		case BOOK_TEXT_MODE:
 		case FOOTNOTE_MODE:
@@ -480,7 +480,7 @@ bool FBReader::canDragFiles(const std::vector<std::string> &filePaths) const {
 	}
 }
 
-void FBReader::dragFiles(const std::vector<std::string> &filePaths) {
+void Reader::dragFiles(const std::vector<std::string> &filePaths) {
 	switch (myMode) {
 		case BOOK_TEXT_MODE:
 		case FOOTNOTE_MODE:
@@ -499,18 +499,18 @@ void FBReader::dragFiles(const std::vector<std::string> &filePaths) {
 	}
 }
 
-void FBReader::clearTextCaches() {
+void Reader::clearTextCaches() {
 	((ZLTextView&)*myBookTextView).clearCaches();
 	((ZLTextView&)*myFootnoteView).clearCaches();
 	((ZLTextView&)*myContentsView).clearCaches();
 }
 
-shared_ptr<ZLKeyBindings> FBReader::keyBindings() {
+shared_ptr<ZLKeyBindings> Reader::keyBindings() {
 	return UseSeparateBindingsOption.value() ?
 		keyBindings(rotation()) : myBindings0;
 }
 
-shared_ptr<ZLKeyBindings> FBReader::keyBindings(ZLView::Angle angle) {
+shared_ptr<ZLKeyBindings> Reader::keyBindings(ZLView::Angle angle) {
 	switch (angle) {
 		case ZLView::DEGREES0:
 			return myBindings0;
@@ -524,35 +524,35 @@ shared_ptr<ZLKeyBindings> FBReader::keyBindings(ZLView::Angle angle) {
 	return 0;
 }
 
-shared_ptr<ProgramCollection> FBReader::dictionaryCollection() const {
+shared_ptr<ProgramCollection> Reader::dictionaryCollection() const {
 	return myProgramCollectionMap.collection("Dictionary");
 }
 
-bool FBReader::isDictionarySupported() const {
+bool Reader::isDictionarySupported() const {
 	shared_ptr<ProgramCollection> collection = dictionaryCollection();
 	return !collection.isNull() && !collection->currentProgram().isNull();
 }
 
-void FBReader::openInDictionary(const std::string &word) {
+void Reader::openInDictionary(const std::string &word) {
 	shared_ptr<Program> dictionary = dictionaryCollection()->currentProgram();
 	dictionary->run("present", ZLibrary::ApplicationName());
 	dictionary->run("showWord", word);
 }
 
-shared_ptr<ProgramCollection> FBReader::webBrowserCollection() const {
+shared_ptr<ProgramCollection> Reader::webBrowserCollection() const {
 	return myProgramCollectionMap.collection("Web Browser");
 }
 
-shared_ptr<Book> FBReader::currentBook() const {
+shared_ptr<Book> Reader::currentBook() const {
 	return myModel->book();
 }
 
-bool FBReader::showAuthDialog(const std::string &siteName, std::string &userName, std::string &password, const ZLResourceKey &errorKey) {
+bool Reader::showAuthDialog(const std::string &siteName, std::string &userName, std::string &password, const ZLResourceKey &errorKey) {
 	std::string message = errorKey.Name.empty() ? std::string() : NetworkErrors::errorMessage(errorKey.Name);
 	return AuthenticationDialog::run(siteName, userName, password, message);
 }
 
-void FBReader::saveUserName(const std::string &siteName, std::string &userName) {
+void Reader::saveUserName(const std::string &siteName, std::string &userName) {
 	UserList userList(siteName);
 	userList.saveUser(userName);
 }
diff --git a/fbreader/src/fbreader/FBReader.h b/reader/src/reader/Reader.h
index e42395a..7d9668b 100644
--- a/fbreader/src/fbreader/FBReader.h
+++ b/reader/src/reader/Reader.h
@@ -17,8 +17,8 @@
  * 02110-1301, USA.
  */
 
-#ifndef __FBREADER_H__
-#define __FBREADER_H__
+#ifndef __READER_H__
+#define __READER_H__
 
 #include <string>
 #include <map>
@@ -40,10 +40,10 @@ class Book;
 class BookModel;
 class BookTextView;
 
-class FBReader : public ZLApplication {
+class Reader : public ZLApplication {
 
 public:
-	static FBReader &Instance();
+	static Reader &Instance();
 
 public:
 	// returns true if description was found or error message was shown
@@ -78,8 +78,8 @@ public:
 	ZLStringOption LastOpenedPreferencesDialog;
 
 public:
-	FBReader(const std::string &bookToOpen);
-	~FBReader();
+	Reader(const std::string &bookToOpen);
+	~Reader();
 
 	void setMode(ViewMode mode);
 	ViewMode mode() const;
@@ -204,4 +204,4 @@ friend class BooksOrderAction;
 friend class LogOutAction;
 };
 
-#endif /* __FBREADER_H__ */
+#endif /* __READER_H__ */
diff --git a/fbreader/src/fbreader/FBReaderActionCode.cpp b/reader/src/reader/ReaderActionCode.cpp
index a5551e8..3e88e76 100644
--- a/fbreader/src/fbreader/FBReaderActionCode.cpp
+++ b/reader/src/reader/ReaderActionCode.cpp
@@ -17,7 +17,7 @@
  * 02110-1301, USA.
  */
 
-#include "FBReaderActions.h"
+#include "ReaderActions.h"
 
 const std::string ActionCode::SHOW_READING = "showReading";
 const std::string ActionCode::SHOW_LIBRARY = "showLibrary";
diff --git a/fbreader/src/fbreader/FBReaderActions.cpp b/reader/src/reader/ReaderActions.cpp
index 9ca36cf..d7cd843 100644
--- a/fbreader/src/fbreader/FBReaderActions.cpp
+++ b/reader/src/reader/ReaderActions.cpp
@@ -30,8 +30,8 @@
 #include <ZLTextView.h>
 #include <ZLTextSelectionModel.h>
 
-#include "FBReader.h"
-#include "FBReaderActions.h"
+#include "Reader.h"
+#include "ReaderActions.h"
 #include "BookTextView.h"
 #include "ContentsView.h"
 #include "../optionsDialog/bookInfo/BookInfoDialog.h"
@@ -54,126 +54,126 @@ ModeDependentAction::ModeDependentAction(int visibleInModes) : myVisibleInModes(
 }
 
 bool ModeDependentAction::isVisible() const {
-	return (FBReader::Instance().mode() & myVisibleInModes) != 0;
+	return (Reader::Instance().mode() & myVisibleInModes) != 0;
 }
 
-SetModeAction::SetModeAction(FBReader::ViewMode modeToSet, int visibleInModes) : ModeDependentAction(visibleInModes), myModeToSet(modeToSet) {
+SetModeAction::SetModeAction(Reader::ViewMode modeToSet, int visibleInModes) : ModeDependentAction(visibleInModes), myModeToSet(modeToSet) {
 }
 
 void SetModeAction::run() {
-	FBReader::Instance().setMode(myModeToSet);
+	Reader::Instance().setMode(myModeToSet);
 }
 
 void ShowHelpAction::run() {
-	FBReader &fbreader = FBReader::Instance();
-	shared_ptr<Book> book = BooksDBUtil::getBook(fbreader.helpFileName(ZLibrary::Language()));
+	Reader &reader = Reader::Instance();
+	shared_ptr<Book> book = BooksDBUtil::getBook(reader.helpFileName(ZLibrary::Language()));
 	if (book.isNull()) {
-		book = BooksDBUtil::getBook(fbreader.helpFileName("en"));
+		book = BooksDBUtil::getBook(reader.helpFileName("en"));
 	}
 	if (!book.isNull()) {
-		fbreader.openBook(book);
-		fbreader.setMode(FBReader::BOOK_TEXT_MODE);
-		fbreader.refreshWindow();
+		reader.openBook(book);
+		reader.setMode(Reader::BOOK_TEXT_MODE);
+		reader.refreshWindow();
 	} else {
 		ZLDialogManager::Instance().errorBox(ZLResourceKey("noHelpBox"));
 	}
 }
 
 void ShowOptionsDialogAction::run() {
-	std::string actionId = FBReader::Instance().LastOpenedPreferencesDialog.value();
+	std::string actionId = Reader::Instance().LastOpenedPreferencesDialog.value();
 	if (actionId.empty()) {
 		return;
 	}
-	FBReader::Instance().doAction(actionId);
+	Reader::Instance().doAction(actionId);
 }
 
 void ShowLibraryOptionsDialogAction::run() {
-	FBReader::Instance().LastOpenedPreferencesDialog.setValue(ActionCode::SHOW_LIBRARY_OPTIONS_DIALOG);
+	Reader::Instance().LastOpenedPreferencesDialog.setValue(ActionCode::SHOW_LIBRARY_OPTIONS_DIALOG);
 	LibraryOptionsDialog().dialog().run();
 }
 
 void ShowNetworkOptionsDialogAction::run() {
-	FBReader::Instance().LastOpenedPreferencesDialog.setValue(ActionCode::SHOW_NETWORK_OPTIONS_DIALOG);
+	Reader::Instance().LastOpenedPreferencesDialog.setValue(ActionCode::SHOW_NETWORK_OPTIONS_DIALOG);
 	NetworkOptionsDialog().dialog().run();
 }
 
 void ShowSystemOptionsDialogAction::run() {
-	FBReader::Instance().LastOpenedPreferencesDialog.setValue(ActionCode::SHOW_SYSTEM_OPTIONS_DIALOG);
+	Reader::Instance().LastOpenedPreferencesDialog.setValue(ActionCode::SHOW_SYSTEM_OPTIONS_DIALOG);
 	SystemOptionsDialog().dialog().run();
 }
 
 void ShowReadingOptionsDialogAction::run() {
-	FBReader::Instance().LastOpenedPreferencesDialog.setValue(ActionCode::SHOW_READING_OPTIONS_DIALOG);
+	Reader::Instance().LastOpenedPreferencesDialog.setValue(ActionCode::SHOW_READING_OPTIONS_DIALOG);
 	ReadingOptionsDialog().dialog().run();
 }
 
 void ShowLookAndFeelOptionsDialogAction::run() {
-	FBReader::Instance().LastOpenedPreferencesDialog.setValue(ActionCode::SHOW_LOOKANDFEEL_OPTIONS_DIALOG);
+	Reader::Instance().LastOpenedPreferencesDialog.setValue(ActionCode::SHOW_LOOKANDFEEL_OPTIONS_DIALOG);
 	LookAndFeelOptionsDialog().dialog().run();
 }
 
-ShowContentsAction::ShowContentsAction() : SetModeAction(FBReader::CONTENTS_MODE, FBReader::BOOK_TEXT_MODE) {
+ShowContentsAction::ShowContentsAction() : SetModeAction(Reader::CONTENTS_MODE, Reader::BOOK_TEXT_MODE) {
 }
 
 bool ShowContentsAction::isVisible() const {
-	return ModeDependentAction::isVisible() && !((ContentsView&)*FBReader::Instance().myContentsView).isEmpty();
+	return ModeDependentAction::isVisible() && !((ContentsView&)*Reader::Instance().myContentsView).isEmpty();
 }
 
-ScrollToHomeAction::ScrollToHomeAction() : ModeDependentAction(FBReader::BOOK_TEXT_MODE) {
+ScrollToHomeAction::ScrollToHomeAction() : ModeDependentAction(Reader::BOOK_TEXT_MODE) {
 }
 
 bool ScrollToHomeAction::isEnabled() const {
 	if (!isVisible()) {
 		return false;
 	}
-	ZLTextWordCursor cursor = FBReader::Instance().bookTextView().textArea().startCursor();
+	ZLTextWordCursor cursor = Reader::Instance().bookTextView().textArea().startCursor();
 	return cursor.isNull() || !cursor.isStartOfParagraph() || !cursor.paragraphCursor().isFirst();
 }
 
 void ScrollToHomeAction::run() {
-	FBReader::Instance().bookTextView().scrollToHome();
+	Reader::Instance().bookTextView().scrollToHome();
 }
 
-ScrollToStartOfTextAction::ScrollToStartOfTextAction() : ModeDependentAction(FBReader::BOOK_TEXT_MODE) {
+ScrollToStartOfTextAction::ScrollToStartOfTextAction() : ModeDependentAction(Reader::BOOK_TEXT_MODE) {
 }
 
 bool ScrollToStartOfTextAction::isEnabled() const {
 	if (!isVisible()) {
 		return false;
 	}
-	ZLTextWordCursor cursor = FBReader::Instance().bookTextView().textArea().startCursor();
+	ZLTextWordCursor cursor = Reader::Instance().bookTextView().textArea().startCursor();
 	return cursor.isNull() || !cursor.isStartOfParagraph() || !cursor.paragraphCursor().isFirst();
 }
 
 void ScrollToStartOfTextAction::run() {
-	FBReader::Instance().bookTextView().scrollToStartOfText();
+	Reader::Instance().bookTextView().scrollToStartOfText();
 }
 
-ScrollToEndOfTextAction::ScrollToEndOfTextAction() : ModeDependentAction(FBReader::BOOK_TEXT_MODE) {
+ScrollToEndOfTextAction::ScrollToEndOfTextAction() : ModeDependentAction(Reader::BOOK_TEXT_MODE) {
 }
 
 bool ScrollToEndOfTextAction::isEnabled() const {
 	if (!isVisible()) {
 		return false;
 	}
-	ZLTextWordCursor cursor = FBReader::Instance().bookTextView().textArea().endCursor();
+	ZLTextWordCursor cursor = Reader::Instance().bookTextView().textArea().endCursor();
 	return cursor.isNull() || !cursor.isEndOfParagraph() || !cursor.paragraphCursor().isLast();
 }
 
 void ScrollToEndOfTextAction::run() {
-	FBReader::Instance().bookTextView().scrollToEndOfText();
+	Reader::Instance().bookTextView().scrollToEndOfText();
 }
 
-ShowBookInfoAction::ShowBookInfoAction() : ModeDependentAction(FBReader::BOOK_TEXT_MODE | FBReader::CONTENTS_MODE | FBReader::FOOTNOTE_MODE) {
+ShowBookInfoAction::ShowBookInfoAction() : ModeDependentAction(Reader::BOOK_TEXT_MODE | Reader::CONTENTS_MODE | Reader::FOOTNOTE_MODE) {
 }
 
 void ShowBookInfoAction::run() {
-	FBReader &fbreader = FBReader::Instance();
-	fbreader.LastOpenedPreferencesDialog.setValue(ActionCode::SHOW_BOOK_INFO_DIALOG);
-	shared_ptr<Book> book = fbreader.myModel->book();
+	Reader &reader = Reader::Instance();
+	reader.LastOpenedPreferencesDialog.setValue(ActionCode::SHOW_BOOK_INFO_DIALOG);
+	shared_ptr<Book> book = reader.myModel->book();
 	if (BookInfoDialog(book).dialog().run()) {
-		fbreader.openBook(book);
-		fbreader.refreshWindow();
+		reader.openBook(book);
+		reader.refreshWindow();
 	}
 }
 
@@ -181,29 +181,29 @@ UndoAction::UndoAction(int visibleInModes) : ModeDependentAction(visibleInModes)
 }
 
 bool UndoAction::isEnabled() const {
-	FBReader &fbreader = FBReader::Instance();
-	return (fbreader.mode() != FBReader::BOOK_TEXT_MODE) ||
-					fbreader.bookTextView().canUndoPageMove();
+	Reader &reader = Reader::Instance();
+	return (reader.mode() != Reader::BOOK_TEXT_MODE) ||
+					reader.bookTextView().canUndoPageMove();
 }
 
 void UndoAction::run() {
-	FBReader &fbreader = FBReader::Instance();
-	if (fbreader.mode() == FBReader::BOOK_TEXT_MODE) {
-		fbreader.bookTextView().undoPageMove();
+	Reader &reader = Reader::Instance();
+	if (reader.mode() == Reader::BOOK_TEXT_MODE) {
+		reader.bookTextView().undoPageMove();
 	} else {
-		fbreader.restorePreviousMode();
+		reader.restorePreviousMode();
 	}
 }
 
-RedoAction::RedoAction() : ModeDependentAction(FBReader::BOOK_TEXT_MODE) {
+RedoAction::RedoAction() : ModeDependentAction(Reader::BOOK_TEXT_MODE) {
 }
 
 bool RedoAction::isEnabled() const {
-	return isVisible() && FBReader::Instance().bookTextView().canRedoPageMove();
+	return isVisible() && Reader::Instance().bookTextView().canRedoPageMove();
 }
 
 void RedoAction::run() {
-	FBReader::Instance().bookTextView().redoPageMove();
+	Reader::Instance().bookTextView().redoPageMove();
 }
 
 ChangeFontSizeAction::ChangeFontSizeAction(int delta) : myDelta(delta) {
@@ -219,54 +219,54 @@ bool ChangeFontSizeAction::isEnabled() const {
 }
 
 void ChangeFontSizeAction::run() {
-	FBReader &fbreader = FBReader::Instance();
+	Reader &reader = Reader::Instance();
 	ZLIntegerRangeOption &option = FBTextStyle::Instance().FontSizeOption;
 	option.setValue(option.value() + myDelta);
-	fbreader.clearTextCaches();
-	fbreader.refreshWindow();
+	reader.clearTextCaches();
+	reader.refreshWindow();
 }
 
 bool OpenPreviousBookAction::isVisible() const {
-	const FBReader &fbreader = FBReader::Instance();
-	if ((fbreader.mode() != FBReader::BOOK_TEXT_MODE) &&
-			(fbreader.mode() != FBReader::CONTENTS_MODE)) {
+	const Reader &reader = Reader::Instance();
+	if ((reader.mode() != Reader::BOOK_TEXT_MODE) &&
+			(reader.mode() != Reader::CONTENTS_MODE)) {
 		return false;
 	}
 	return Library::Instance().recentBooks().size() > 1;
 }
 
 void OpenPreviousBookAction::run() {
-	FBReader &fbreader = FBReader::Instance();
+	Reader &reader = Reader::Instance();
 	const BookList &books = Library::Instance().recentBooks();
-	fbreader.openBook(books[1]);
-	fbreader.refreshWindow();
-	fbreader.resetWindowCaption();
+	reader.openBook(books[1]);
+	reader.refreshWindow();
+	reader.resetWindowCaption();
 }
 
 void CancelAction::run() {
-	FBReader &fbreader = FBReader::Instance();
-	switch (fbreader.myActionOnCancel) {
-		case FBReader::UNFULLSCREEN:
-			if (fbreader.isFullscreen()) {
-				fbreader.setFullscreen(false);
+	Reader &reader = Reader::Instance();
+	switch (reader.myActionOnCancel) {
+		case Reader::UNFULLSCREEN:
+			if (reader.isFullscreen()) {
+				reader.setFullscreen(false);
 				return;
-			} else if (fbreader.mode() != FBReader::BOOK_TEXT_MODE) {
-				fbreader.restorePreviousMode();
+			} else if (reader.mode() != Reader::BOOK_TEXT_MODE) {
+				reader.restorePreviousMode();
 				return;
 			}
 			break;
-		case FBReader::RETURN_TO_TEXT_MODE:
-			if (fbreader.mode() != FBReader::BOOK_TEXT_MODE) {
-				fbreader.restorePreviousMode();
+		case Reader::RETURN_TO_TEXT_MODE:
+			if (reader.mode() != Reader::BOOK_TEXT_MODE) {
+				reader.restorePreviousMode();
 				return;
-			} else if (fbreader.isFullscreen()) {
-				fbreader.setFullscreen(false);
+			} else if (reader.isFullscreen()) {
+				reader.setFullscreen(false);
 				return;
 			}
 			break;
 	}
-	if (fbreader.QuitOnCancelOption.value()) {
-		fbreader.quit();
+	if (reader.QuitOnCancelOption.value()) {
+		reader.quit();
 	}
 }
 
@@ -287,65 +287,65 @@ void ToggleIndicatorAction::run() {
 			break;
 		case FBIndicatorStyle::FB_INDICATOR:
 			option.setValue(FBIndicatorStyle::NONE);
-			FBReader::Instance().refreshWindow();
+			Reader::Instance().refreshWindow();
 			break;
 		case FBIndicatorStyle::NONE:
 			option.setValue(FBIndicatorStyle::FB_INDICATOR);
-			FBReader::Instance().refreshWindow();
+			Reader::Instance().refreshWindow();
 			break;
 	}
 }
 
 void QuitAction::run() {
-	FBReader::Instance().closeView();
+	Reader::Instance().closeView();
 }
 
 void ForceQuitAction::run() {
-	FBReader::Instance().quit();
+	Reader::Instance().quit();
 }
 
 bool GotoNextTOCSectionAction::isVisible() const {
-	FBReader &fbreader = FBReader::Instance();
-	if (fbreader.mode() != FBReader::BOOK_TEXT_MODE) {
+	Reader &reader = Reader::Instance();
+	if (reader.mode() != Reader::BOOK_TEXT_MODE) {
 		return false;
 	}
-	const ContentsView &contentsView = (const ContentsView&)*fbreader.myContentsView;
+	const ContentsView &contentsView = (const ContentsView&)*reader.myContentsView;
 	shared_ptr<ZLTextModel> model = contentsView.textArea().model();
 	return !model.isNull() && (model->paragraphsNumber() > 1);
 }
 
 bool GotoNextTOCSectionAction::isEnabled() const {
-	FBReader &fbreader = FBReader::Instance();
-	const ContentsView &contentsView = (const ContentsView&)*fbreader.myContentsView;
+	Reader &reader = Reader::Instance();
+	const ContentsView &contentsView = (const ContentsView&)*reader.myContentsView;
 	shared_ptr<ZLTextModel> model = contentsView.textArea().model();
 	return !model.isNull() && ((int)contentsView.currentTextViewParagraph() < (int)model->paragraphsNumber() - 1);
 }
 
 void GotoNextTOCSectionAction::run() {
-	FBReader &fbreader = FBReader::Instance();
-	ContentsView &contentsView = (ContentsView&)*fbreader.myContentsView;
+	Reader &reader = Reader::Instance();
+	ContentsView &contentsView = (ContentsView&)*reader.myContentsView;
 	std::size_t current = contentsView.currentTextViewParagraph();
 	const ContentsModel &contentsModel = (const ContentsModel&)*contentsView.textArea().model();
 	int reference = contentsModel.reference(((const ZLTextTreeParagraph*)contentsModel[current + 1]));
 	if (reference != -1) {
-		((ZLTextView&)*fbreader.myBookTextView).gotoParagraph(reference);
-		fbreader.refreshWindow();
+		((ZLTextView&)*reader.myBookTextView).gotoParagraph(reference);
+		reader.refreshWindow();
 	}
 }
 
 bool GotoPreviousTOCSectionAction::isVisible() const {
-	const FBReader &fbreader = FBReader::Instance();
-	if (fbreader.mode() != FBReader::BOOK_TEXT_MODE) {
+	const Reader &reader = Reader::Instance();
+	if (reader.mode() != Reader::BOOK_TEXT_MODE) {
 		return false;
 	}
-	const ContentsView &contentsView = (const ContentsView&)*fbreader.myContentsView;
+	const ContentsView &contentsView = (const ContentsView&)*reader.myContentsView;
 	shared_ptr<ZLTextModel> model = contentsView.textArea().model();
 	return !model.isNull() && (model->paragraphsNumber() > 1);
 }
 
 bool GotoPreviousTOCSectionAction::isEnabled() const {
-	const FBReader &fbreader = FBReader::Instance();
-	const ContentsView &contentsView = (const ContentsView&)*fbreader.myContentsView;
+	const Reader &reader = Reader::Instance();
+	const ContentsView &contentsView = (const ContentsView&)*reader.myContentsView;
 	shared_ptr<ZLTextModel> model = contentsView.textArea().model();
 	if (model.isNull()) {
 		return false;
@@ -356,7 +356,7 @@ bool GotoPreviousTOCSectionAction::isEnabled() const {
 		return true;
 	}
 	if (tocIndex == 0) {
-		const ZLTextWordCursor &cursor = fbreader.bookTextView().textArea().startCursor();
+		const ZLTextWordCursor &cursor = reader.bookTextView().textArea().startCursor();
 		if (cursor.isNull()) {
 			return false;
 		}
@@ -371,20 +371,20 @@ bool GotoPreviousTOCSectionAction::isEnabled() const {
 }
 
 void GotoPreviousTOCSectionAction::run() {
-	FBReader &fbreader = FBReader::Instance();
-	ContentsView &contentsView = (ContentsView&)*fbreader.myContentsView;
+	Reader &reader = Reader::Instance();
+	ContentsView &contentsView = (ContentsView&)*reader.myContentsView;
 	std::size_t current = contentsView.currentTextViewParagraph(false);
 	const ContentsModel &contentsModel = (const ContentsModel&)*contentsView.textArea().model();
 
 	int reference = contentsModel.reference(((const ZLTextTreeParagraph*)contentsModel[current]));
-	const ZLTextWordCursor &cursor = fbreader.bookTextView().textArea().startCursor();
+	const ZLTextWordCursor &cursor = reader.bookTextView().textArea().startCursor();
 	if (!cursor.isNull() &&
 			(cursor.elementIndex() == 0)) {
 		int paragraphIndex = cursor.paragraphCursor().index();
 		if (reference == paragraphIndex) {
 			reference = contentsModel.reference(((const ZLTextTreeParagraph*)contentsModel[current - 1]));
 		} else if (reference == paragraphIndex - 1) {
-			const ZLTextModel &textModel = *fbreader.bookTextView().textArea().model();
+			const ZLTextModel &textModel = *reader.bookTextView().textArea().model();
 			const ZLTextParagraph *para = textModel[paragraphIndex];
 			if ((para != 0) && (para->kind() == ZLTextParagraph::END_OF_SECTION_PARAGRAPH)) {
 				reference = contentsModel.reference(((const ZLTextTreeParagraph*)contentsModel[current - 1]));
@@ -392,31 +392,31 @@ void GotoPreviousTOCSectionAction::run() {
 		}
 	}
 	if (reference != -1) {
-		((ZLTextView&)*fbreader.myBookTextView).gotoParagraph(reference);
-		fbreader.refreshWindow();
+		((ZLTextView&)*reader.myBookTextView).gotoParagraph(reference);
+		reader.refreshWindow();
 	}
 }
 
-GotoPageNumberAction::GotoPageNumberAction(const std::string &parameter) : ModeDependentAction(FBReader::BOOK_TEXT_MODE), myParameter(parameter) {
+GotoPageNumberAction::GotoPageNumberAction(const std::string &parameter) : ModeDependentAction(Reader::BOOK_TEXT_MODE), myParameter(parameter) {
 }
 
 bool GotoPageNumberAction::isVisible() const {
 	return
 		ModeDependentAction::isVisible() &&
-		!FBReader::Instance().bookTextView().hasMultiSectionModel();
+		!Reader::Instance().bookTextView().hasMultiSectionModel();
 }
 
 bool GotoPageNumberAction::isEnabled() const {
-	return ModeDependentAction::isEnabled() && (FBReader::Instance().bookTextView().pageNumber() > 1);
+	return ModeDependentAction::isEnabled() && (Reader::Instance().bookTextView().pageNumber() > 1);
 }
 
 void GotoPageNumberAction::run() {
-	FBReader &fbreader = FBReader::Instance();
+	Reader &reader = Reader::Instance();
 	int pageIndex = 0;
-	const int pageNumber = fbreader.bookTextView().pageNumber();
+	const int pageNumber = reader.bookTextView().pageNumber();
 
 	if (!myParameter.empty()) {
-		const std::string value = fbreader.visualParameter(myParameter);
+		const std::string value = reader.visualParameter(myParameter);
 		if (value.empty()) {
 			return;
 		}
@@ -436,12 +436,12 @@ void GotoPageNumberAction::run() {
 		}
 	}
 
-	fbreader.bookTextView().gotoPage(std::max(1, std::min(pageIndex, pageNumber)));
-	fbreader.refreshWindow();
+	reader.bookTextView().gotoPage(std::max(1, std::min(pageIndex, pageNumber)));
+	reader.refreshWindow();
 }
 
 bool SelectionAction::isVisible() const {
-	shared_ptr<ZLView> view = FBReader::Instance().currentView();
+	shared_ptr<ZLView> view = Reader::Instance().currentView();
 	return !view.isNull() && view->isInstanceOf(ZLTextView::TYPE_ID);
 }
 
@@ -454,7 +454,7 @@ bool SelectionAction::isEnabled() const {
 }
 
 ZLTextView &SelectionAction::textView() const {
-	return (ZLTextView&)*FBReader::Instance().currentView();
+	return (ZLTextView&)*Reader::Instance().currentView();
 }
 
 bool CopySelectedTextAction::isVisible() const {
@@ -466,27 +466,27 @@ void CopySelectedTextAction::run() {
 }
 
 bool OpenSelectedTextInDictionaryAction::isVisible() const {
-	return SelectionAction::isVisible() && FBReader::Instance().isDictionarySupported();
+	return SelectionAction::isVisible() && Reader::Instance().isDictionarySupported();
 }
 
 void OpenSelectedTextInDictionaryAction::run() {
-	FBReader::Instance().openInDictionary(textView().selectionModel().text());
+	Reader::Instance().openInDictionary(textView().selectionModel().text());
 }
 
 void ClearSelectionAction::run() {
 	textView().selectionModel().clear();
-	FBReader::Instance().refreshWindow();
+	Reader::Instance().refreshWindow();
 }
 
 void FBFullscreenAction::run() {
-	FBReader &fbreader = FBReader::Instance();
-	if (!fbreader.isFullscreen()) {
-		fbreader.myActionOnCancel = FBReader::UNFULLSCREEN;
+	Reader &reader = Reader::Instance();
+	if (!reader.isFullscreen()) {
+		reader.myActionOnCancel = Reader::UNFULLSCREEN;
 	}
 	FullscreenAction::run();
 }
 
-FilterLibraryAction::FilterLibraryAction() : ModeDependentAction(FBReader::LIBRARY_MODE) {
+FilterLibraryAction::FilterLibraryAction() : ModeDependentAction(Reader::LIBRARY_MODE) {
 }
 
 void FilterLibraryAction::run() {
diff --git a/fbreader/src/fbreader/FBReaderActions.h b/reader/src/reader/ReaderActions.h
index a91dda7..18407ac 100644
--- a/fbreader/src/fbreader/FBReaderActions.h
+++ b/reader/src/reader/ReaderActions.h
@@ -17,12 +17,12 @@
  * 02110-1301, USA.
  */
 
-#ifndef __FBREADERACTIONS_H__
-#define __FBREADERACTIONS_H__
+#ifndef __READERACTIONS_H__
+#define __READERACTIONS_H__
 
 #include <ZLApplication.h>
 
-#include "FBReader.h"
+#include "Reader.h"
 
 class ZLTextView;
 
@@ -98,11 +98,11 @@ private:
 class SetModeAction : public ModeDependentAction {
 
 public:
-	SetModeAction(FBReader::ViewMode modeToSet, int visibleInModes);
+	SetModeAction(Reader::ViewMode modeToSet, int visibleInModes);
 	void run();
 
 private:
-	FBReader::ViewMode myModeToSet;
+	Reader::ViewMode myModeToSet;
 };
 
 class ShowHelpAction : public ZLApplication::Action {
@@ -406,4 +406,4 @@ public:
 	void run();
 };
 
-#endif /* __FBREADERACTIONS_H__ */
+#endif /* __READERACTIONS_H__ */
diff --git a/fbreader/src/fbreader/ReadingState.h b/reader/src/reader/ReadingState.h
index 9724b92..9724b92 100644
--- a/fbreader/src/fbreader/ReadingState.h
+++ b/reader/src/reader/ReadingState.h
diff --git a/fbreader/src/fbreader/RecentBooksPopupData.cpp b/reader/src/reader/RecentBooksPopupData.cpp
index 3b17339..cc0dcc4 100644
--- a/fbreader/src/fbreader/RecentBooksPopupData.cpp
+++ b/reader/src/reader/RecentBooksPopupData.cpp
@@ -18,7 +18,7 @@
  */
 
 #include "RecentBooksPopupData.h"
-#include "FBReader.h"
+#include "Reader.h"
 
 #include "../library/Book.h"
 #include "../library/Author.h"
@@ -53,12 +53,12 @@ const std::string RecentBooksPopupData::text(std::size_t index) {
 }
 
 void RecentBooksPopupData::run(std::size_t index) {
-	FBReader &fbreader = FBReader::Instance();
+	Reader &reader = Reader::Instance();
 	const BookList &books = Library::Instance().recentBooks();
 	if (index >= books.size()) {
 		return;
 	}
-	fbreader.openBook(books[index]);
-	fbreader.showBookTextView();
-	fbreader.refreshWindow();
+	reader.openBook(books[index]);
+	reader.showBookTextView();
+	reader.refreshWindow();
 }
diff --git a/fbreader/src/fbreader/RecentBooksPopupData.h b/reader/src/reader/RecentBooksPopupData.h
index 2a6b132..2a6b132 100644
--- a/fbreader/src/fbreader/RecentBooksPopupData.h
+++ b/reader/src/reader/RecentBooksPopupData.h
diff --git a/fbreader/src/fbreader/ScrollingAction.cpp b/reader/src/reader/ScrollingAction.cpp
index fd3c1fa..29c92e0 100644
--- a/fbreader/src/fbreader/ScrollingAction.cpp
+++ b/reader/src/reader/ScrollingAction.cpp
@@ -20,7 +20,7 @@
 #include <ZLTextView.h>
 #include <ZLBlockTreeView.h>
 
-#include "FBReader.h"
+#include "Reader.h"
 #include "ScrollingAction.h"
 
 ScrollingAction::ScrollingAction(
@@ -43,9 +43,9 @@ bool ScrollingAction::useKeyDelay() const {
 }
 
 void ScrollingAction::run() {
-	FBReader &fbreader = FBReader::Instance();
-	shared_ptr<ZLView> view = fbreader.currentView();
-	int delay = fbreader.myLastScrollingTime.millisecondsTo(ZLTime());
+	Reader &reader = Reader::Instance();
+	shared_ptr<ZLView> view = reader.currentView();
+	int delay = reader.myLastScrollingTime.millisecondsTo(ZLTime());
 	if (view.isNull() ||
 			(delay >= 0 && delay < scrollingDelay())) {
 		return;
@@ -53,33 +53,33 @@ void ScrollingAction::run() {
 
 	if (view->isInstanceOf(ZLTextView::TYPE_ID)) {
 		((ZLTextView&)*view).scrollPage(myForward, myTextScrollingMode, textOptionValue());
-		FBReader::Instance().refreshWindow();
+		Reader::Instance().refreshWindow();
 	} else if (view->isInstanceOf(ZLBlockTreeView::TYPE_ID)) {
 		((ZLBlockTreeView&)*view).scroll(myBlockScrollingMode, !myForward);
 	}
-	fbreader.myLastScrollingTime = ZLTime();
+	reader.myLastScrollingTime = ZLTime();
 }
 
 LineScrollingAction::LineScrollingAction(bool forward) : ScrollingAction(ZLTextAreaController::SCROLL_LINES, ZLBlockTreeView::ITEM, forward) {
 }
 
 int LineScrollingAction::scrollingDelay() const {
-	return FBReader::Instance().KeyScrollingDelayOption.value();
+	return Reader::Instance().KeyScrollingDelayOption.value();
 }
 
 std::size_t LineScrollingAction::textOptionValue() const {
-	return FBReader::Instance().LinesToScrollOption.value();
+	return Reader::Instance().LinesToScrollOption.value();
 }
 
 PageScrollingAction::PageScrollingAction(bool forward) : ScrollingAction(ZLTextAreaController::KEEP_LINES, ZLBlockTreeView::PAGE, forward) {
 }
 
 int PageScrollingAction::scrollingDelay() const {
-	return FBReader::Instance().KeyScrollingDelayOption.value();
+	return Reader::Instance().KeyScrollingDelayOption.value();
 }
 
 std::size_t PageScrollingAction::textOptionValue() const {
-	return FBReader::Instance().LinesToKeepOption.value();
+	return Reader::Instance().LinesToKeepOption.value();
 }
 
 MouseWheelScrollingAction::MouseWheelScrollingAction(bool forward) : ScrollingAction(ZLTextAreaController::SCROLL_LINES, ZLBlockTreeView::ITEM, forward) {
@@ -93,9 +93,9 @@ TapScrollingAction::TapScrollingAction(bool forward) : ScrollingAction(ZLTextAre
 }
 
 std::size_t TapScrollingAction::textOptionValue() const {
-	return FBReader::Instance().LinesToKeepOption.value();
+	return Reader::Instance().LinesToKeepOption.value();
 }
 
 bool TapScrollingAction::isEnabled() const {
-	return FBReader::Instance().EnableTapScrollingOption.value();
+	return Reader::Instance().EnableTapScrollingOption.value();
 }
diff --git a/fbreader/src/fbreader/ScrollingAction.h b/reader/src/reader/ScrollingAction.h
index d93df64..d93df64 100644
--- a/fbreader/src/fbreader/ScrollingAction.h
+++ b/reader/src/reader/ScrollingAction.h
diff --git a/fbreader/src/fbreader/SearchActions.cpp b/reader/src/reader/SearchActions.cpp
index b06b8e7..ab80705 100644
--- a/fbreader/src/fbreader/SearchActions.cpp
+++ b/reader/src/reader/SearchActions.cpp
@@ -24,9 +24,9 @@
 
 #include <ZLTextView.h>
 
-#include "FBReader.h"
+#include "Reader.h"
 #include "FBView.h"
-#include "FBReaderActions.h"
+#include "ReaderActions.h"
 #include "../options/FBCategoryKey.h"
 
 #include <set>
@@ -87,7 +87,7 @@ void SearchPatternEntry::onAccept(const std::string &value) {
 }
 
 bool SearchAction::isVisible() const {
-	shared_ptr<ZLView> view = FBReader::Instance().currentView();
+	shared_ptr<ZLView> view = Reader::Instance().currentView();
 	return
 		!view.isNull() && 
 		view->isInstanceOf(ZLTextView::TYPE_ID) &&
@@ -103,7 +103,7 @@ SearchPatternAction::SearchPatternAction() :
 }
 
 void SearchPatternAction::run() {
-	ZLTextView &textView = (ZLTextView&)*FBReader::Instance().currentView();
+	ZLTextView &textView = (ZLTextView&)*Reader::Instance().currentView();
 
 	shared_ptr<ZLDialog> searchDialog = ZLDialogManager::Instance().createDialog(ZLResourceKey("textSearchDialog"));
 
@@ -130,7 +130,7 @@ void SearchPatternAction::run() {
 }
 
 bool FindNextAction::isEnabled() const {
-	shared_ptr<ZLView> view = FBReader::Instance().currentView();
+	shared_ptr<ZLView> view = Reader::Instance().currentView();
 	return
 		!view.isNull() && 
 		view->isInstanceOf(ZLTextView::TYPE_ID) &&
@@ -139,11 +139,11 @@ bool FindNextAction::isEnabled() const {
 }
 
 void FindNextAction::run() {
-	((ZLTextView&)*FBReader::Instance().currentView()).findNext();
+	((ZLTextView&)*Reader::Instance().currentView()).findNext();
 }
 
 bool FindPreviousAction::isEnabled() const {
-	shared_ptr<ZLView> view = FBReader::Instance().currentView();
+	shared_ptr<ZLView> view = Reader::Instance().currentView();
 	return
 		!view.isNull() && 
 		view->isInstanceOf(ZLTextView::TYPE_ID) &&
@@ -151,5 +151,5 @@ bool FindPreviousAction::isEnabled() const {
 }
 
 void FindPreviousAction::run() {
-	((ZLTextView&)*FBReader::Instance().currentView()).findPrevious();
+	((ZLTextView&)*Reader::Instance().currentView()).findPrevious();
 }
diff --git a/fbreader/src/fbreader/SearchOnNetworkAction.cpp b/reader/src/reader/SearchOnNetworkAction.cpp
index 1a1c238..2adda6f 100644
--- a/fbreader/src/fbreader/SearchOnNetworkAction.cpp
+++ b/reader/src/reader/SearchOnNetworkAction.cpp
@@ -25,7 +25,7 @@
 
 #include "../options/FBCategoryKey.h"
 
-#include "FBReaderActions.h"
+#include "ReaderActions.h"
 
 #include "../network/NetworkLink.h"
 #include "../network/NetworkLinkCollection.h"
@@ -71,8 +71,8 @@ void SearchOnNetworkAction::run() {
 
 
 void SimpleSearchOnNetworkAction::doSearch() {
-	FBReader &fbreader = FBReader::Instance();
-	const std::string pattern = fbreader.visualParameter(SEARCH_PARAMETER_ID);
+	Reader &reader = Reader::Instance();
+	const std::string pattern = reader.visualParameter(SEARCH_PARAMETER_ID);
 	if (pattern.empty()) {
 		return;
 	}
@@ -91,7 +91,7 @@ void SimpleSearchOnNetworkAction::doSearch() {
 		SearchResult::setLastSearchResult(summary, result);
 	}
 
-	fbreader.refreshWindow();
+	reader.refreshWindow();
 }
 
 void AdvancedSearchOnNetworkAction::doSearch() {
@@ -144,7 +144,7 @@ void AdvancedSearchOnNetworkAction::doSearch() {
 				SearchResult::setLastSearchResult(summary, result);
 			}
 
-			FBReader::Instance().refreshWindow();
+			Reader::Instance().refreshWindow();
 		}
 	}
 }
diff --git a/fbreader/src/fbreader/TimeUpdater.cpp b/reader/src/reader/TimeUpdater.cpp
index 14952a2..14952a2 100644
--- a/fbreader/src/fbreader/TimeUpdater.cpp
+++ b/reader/src/reader/TimeUpdater.cpp
diff --git a/fbreader/src/fbreader/TimeUpdater.h b/reader/src/reader/TimeUpdater.h
index 45166e7..45166e7 100644
--- a/fbreader/src/fbreader/TimeUpdater.h
+++ b/reader/src/reader/TimeUpdater.h
diff --git a/fbreader/src/fbreader/FBView.cpp b/reader/src/reader/View.cpp
index d85ef8e..8296a72 100644
--- a/fbreader/src/fbreader/FBView.cpp
+++ b/reader/src/reader/View.cpp
@@ -25,8 +25,8 @@
 #include <ZLTextSelectionModel.h>
 
 #include "FBView.h"
-#include "FBReader.h"
-#include "FBReaderActions.h"
+#include "Reader.h"
+#include "ReaderActions.h"
 #include "../options/FBOptions.h"
 #include "../options/FBTextStyle.h"
 
@@ -97,9 +97,9 @@ shared_ptr<ZLTextPositionIndicatorInfo> FBView::indicatorInfo() const {
 
 void FBView::doTapScrolling(int y) {
 	if (2 * y < context().height()) {
-		FBReader::Instance().doAction(ActionCode::TAP_SCROLL_BACKWARD);
+		Reader::Instance().doAction(ActionCode::TAP_SCROLL_BACKWARD);
 	} else {
-		FBReader::Instance().doAction(ActionCode::TAP_SCROLL_FORWARD);
+		Reader::Instance().doAction(ActionCode::TAP_SCROLL_FORWARD);
 	}
 }
 
@@ -182,13 +182,13 @@ bool FBView::onStylusRelease(int x, int y) {
 		return true;
 	}
 
-	FBReader &fbreader = FBReader::Instance();
+	Reader &reader = Reader::Instance();
 	myIsReleasedWithoutMotion =
 		myIsReleasedWithoutMotion && std::abs(x - pressedX()) <= 5 && std::abs(y - pressedY()) <= 5;
 	if (!hadSelection && isReleasedWithoutMotion() &&
-			fbreader.EnableTapScrollingOption.value() &&
+			reader.EnableTapScrollingOption.value() &&
 			(!ZLBooleanOption(ZLCategoryKey::EMPTY, ZLOption::PLATFORM_GROUP, ZLOption::FINGER_TAP_DETECTABLE, false).value() ||
-			 !fbreader.TapScrollingOnFingerOnlyOption.value())) {
+			 !reader.TapScrollingOnFingerOnlyOption.value())) {
 		myTapScroller = new TapScroller(*this, y);
 		ZLTimeManager::Instance().addAutoRemovableTask(myTapScroller, doubleClickDelay());
 		return true;
diff --git a/fbreader/src/fbreader/FBView.h b/reader/src/reader/View.h
index 368b6b8..368b6b8 100644
--- a/fbreader/src/fbreader/FBView.h
+++ b/reader/src/reader/View.h
diff --git a/fbreader/src/fbreader/main.cpp b/reader/src/reader/main.cpp
index 3ead3f0..967c068 100644
--- a/fbreader/src/fbreader/main.cpp
+++ b/reader/src/reader/main.cpp
@@ -19,13 +19,13 @@
 
 #include <ZLibrary.h>
 
-#include "FBReader.h"
+#include "Reader.h"
 
 int main(int argc, char **argv) {
 	if (!ZLibrary::init(argc, argv)) {
 		return 1;
 	}
-	ZLibrary::run(new FBReader(argc == 1 ? std::string() : argv[1]));
+	ZLibrary::run(new Reader(argc == 1 ? std::string() : argv[1]));
 	ZLibrary::shutdown();
 	return 0;
 }
diff --git a/fbreader/src/tree/FBTree.cpp b/reader/src/tree/FBTree.cpp
index 25e0bb3..25e0bb3 100644
--- a/fbreader/src/tree/FBTree.cpp
+++ b/reader/src/tree/FBTree.cpp
diff --git a/fbreader/src/tree/FBTree.h b/reader/src/tree/FBTree.h
index e0efb38..e0efb38 100644
--- a/fbreader/src/tree/FBTree.h
+++ b/reader/src/tree/FBTree.h
diff --git a/zlibrary/core/data/resources/ar.xml b/zlibrary/core/data/resources/ar.xml
index 55b6106..dc71156 100644
--- a/zlibrary/core/data/resources/ar.xml
+++ b/zlibrary/core/data/resources/ar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Arabic FBReader resources, by Khaled Hosny -->
+<!-- Arabic TDE-Ebook-Reader resources, by Khaled Hosny -->
 <resources>
 	<node name="dialog">
 		<node name="button">
diff --git a/zlibrary/core/data/resources/he.xml b/zlibrary/core/data/resources/he.xml
index fd8299d..12a7494 100644
--- a/zlibrary/core/data/resources/he.xml
+++ b/zlibrary/core/data/resources/he.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Hebrew FBReader resources, by David Kachan -->
+<!-- Hebrew TDE-Ebook-Reader resources, by David Kachan -->
 <resources>
 	<node name="dialog">
 		<node name="button">
diff --git a/zlibrary/core/data/resources/zh.xml b/zlibrary/core/data/resources/zh.xml
index 85b8a7a..e9e71c6 100644
--- a/zlibrary/core/data/resources/zh.xml
+++ b/zlibrary/core/data/resources/zh.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Chinese FBReader resources, by http://shucang.com/ -->
+<!-- Chinese TDE-Ebook-Reader resources, by http://shucang.com/ -->
 <resources>
 	<node name="dialog">
 		<node name="button">
diff --git a/zlibrary/core/include/ZLXMLNamespace.h b/zlibrary/core/include/ZLXMLNamespace.h
index e4c57d2..b9b39b0 100644
--- a/zlibrary/core/include/ZLXMLNamespace.h
+++ b/zlibrary/core/include/ZLXMLNamespace.h
@@ -40,7 +40,7 @@ public:
 	static const std::string CalibreMetadata;
 	static const std::string Opds;
 	static const std::string DaisyNCX;
-	static const std::string FBReaderCatalogMetadata;
+	static const std::string ReaderCatalogMetadata;
 };
 
 #endif /* __ZLXMLNAMESPACE_H__ */
diff --git a/zlibrary/core/src/constants/ZLXMLNamespace.cpp b/zlibrary/core/src/constants/ZLXMLNamespace.cpp
index 5a7ce1d..826a858 100644
--- a/zlibrary/core/src/constants/ZLXMLNamespace.cpp
+++ b/zlibrary/core/src/constants/ZLXMLNamespace.cpp
@@ -29,4 +29,4 @@ const std::string ZLXMLNamespace::OpenSearch = "http://a9.com/-/spec/opensearch/
 const std::string ZLXMLNamespace::CalibreMetadata = "http://calibre.kovidgoyal.net/2009/metadata";
 const std::string ZLXMLNamespace::Opds = "http://opds-spec.org/2010/catalog";
 const std::string ZLXMLNamespace::DaisyNCX = "http://www.daisy.org/z3986/2005/ncx/";
-const std::string ZLXMLNamespace::FBReaderCatalogMetadata = "http://data.fbreader.org/catalog/metadata/";
+const std::string ZLXMLNamespace::ReaderCatalogMetadata = "http://data.fbreader.org/catalog/metadata/";
author	Michele Calgaro <michele.calgaro@yahoo.it>	2024-06-07 23:30:05 +0900
committer	Michele Calgaro <michele.calgaro@yahoo.it>	2024-06-07 23:30:05 +0900
commit	17b259df9cb6b28779d4881b2b6c805ee2e48eea (patch)
tree	5ed61937459cb7081089111b0242c01ec178f1f3
parent	1cba8bce178eb2d6719c6f7f21e2c9352c5513a6 (diff)
download	tde-ebook-reader-17b259df9cb6b28779d4881b2b6c805ee2e48eea.tar.gz tde-ebook-reader-17b259df9cb6b28779d4881b2b6c805ee2e48eea.zip