diff --git a/TODO.library b/TODO.library
index a6d48017d..ae4c1809a 100644
--- a/TODO.library
+++ b/TODO.library
@@ -4,6 +4,7 @@ DONE Reload book info from file
 * prevent from sleep if battery is in charging mode
 * Open the help file if the current book is deleted from library
 DONE don't run several initialization threads in the same time
+* lib.ololo.cc
 
 After 0.99:
 * Partial loading from database
diff --git a/assets/resources/application/cs.xml b/assets/resources/application/cs.xml
index f83e3abdb..bd963caac 100644
--- a/assets/resources/application/cs.xml
+++ b/assets/resources/application/cs.xml
@@ -445,6 +445,10 @@
 					<node name="50" value="Pokud je úroveň baterie větší než 50 procent"/>
 					<node name="100" value="Nikdy"/>
 				</node>
+				<node name="dontTurnScreenOffDuringCharging" value="Prevent screen from sleeping during charging" toBeTranslated="true">
+					<node name="summaryOn" value="Prevent screen from sleeping if device is in charging mode" toBeTranslated="true"/>
+					<node name="summaryOff" value="Switch screen off even if device is in charging mode" toBeTranslated="true"/>
+				</node>
 			</node>
 			<node name="scrolling" value="Posouvání">
 				<node name="summary" value="Jak posouvat text"/>
diff --git a/assets/resources/application/de.xml b/assets/resources/application/de.xml
index ef78346c9..f8e1bab56 100644
--- a/assets/resources/application/de.xml
+++ b/assets/resources/application/de.xml
@@ -446,6 +446,10 @@
 					<node name="50" value="Wenn der Akkuladezustand größer 50 Prozent ist."/>
 					<node name="100" value="Nie"/>
 				</node>
+				<node name="dontTurnScreenOffDuringCharging" value="Prevent screen from sleeping during charging" toBeTranslated="true">
+					<node name="summaryOn" value="Prevent screen from sleeping if device is in charging mode" toBeTranslated="true"/>
+					<node name="summaryOff" value="Switch screen off even if device is in charging mode" toBeTranslated="true"/>
+				</node>
 			</node>
 			<node name="scrolling" value="Blättern">
 				<node name="summary" value="Die Art des Umblätterns festlegen."/>
diff --git a/assets/resources/application/en.xml b/assets/resources/application/en.xml
index cb9166d65..24723aa01 100644
--- a/assets/resources/application/en.xml
+++ b/assets/resources/application/en.xml
@@ -444,6 +444,10 @@
 					<node name="50" value="While battery level is greater than 50 percent"/>
 					<node name="100" value="Never"/>
 				</node>
+				<node name="dontTurnScreenOffDuringCharging" value="Prevent screen from sleeping during charging">
+					<node name="summaryOn" value="Prevent screen from sleeping if device is in charging mode"/>
+					<node name="summaryOff" value="Switch screen off even if device is in charging mode"/>
+				</node>
 			</node>
 			<node name="scrolling" value="Scrolling">
 				<node name="summary" value="How to scroll text"/>
diff --git a/assets/resources/application/fr.xml b/assets/resources/application/fr.xml
index 190d01fa4..3c12ea731 100644
--- a/assets/resources/application/fr.xml
+++ b/assets/resources/application/fr.xml
@@ -454,6 +454,10 @@
 					-->
 					<node name="100" value="Jamais"/>
 				</node>
+				<node name="dontTurnScreenOffDuringCharging" value="Prevent screen from sleeping during charging" toBeTranslated="true">
+					<node name="summaryOn" value="Prevent screen from sleeping if device is in charging mode" toBeTranslated="true"/>
+					<node name="summaryOff" value="Switch screen off even if device is in charging mode" toBeTranslated="true"/>
+				</node>
 			</node>
 			<node name="scrolling" value="Navigation">
 				<node name="summary" value="Modalités de défilement du texte"/>
diff --git a/assets/resources/application/hu.xml b/assets/resources/application/hu.xml
index 515030b6b..09eb4a092 100644
--- a/assets/resources/application/hu.xml
+++ b/assets/resources/application/hu.xml
@@ -32,7 +32,7 @@
 			<node name="summary" value="Az eszközbe illesztett memóriakártya"/>
 		</node>
 		<node name="fileTreeLibrary" value="FBReader Könyvtár">
-			<node name="summary" value="FBReader könyvek helye"/>
+			<node name="summary" value="Az FBReader-könyvek helye"/>
 		</node>
 		<node name="menu">
 			<node name="localSearch" value="Helyi keresés"/>
@@ -162,7 +162,7 @@
 		<node name="hyperlinksOnlyMode" value="Standard mód"/>
 		<node name="dictionaryMode" value="Szótár mód"/>
 		<node name="navigate" value="Navigáció">
-			<node name="toc" value="Tartalomegyzék"/>
+			<node name="toc" value="Tartalomjegyzék"/>
 			<node name="gotoHome" value="A dokumentum elejére"/>
 			<node name="gotoPageNumber" value="Ugrás oldalszámra..."/>
 			<node name="gotoSectionStart" value="Ugrás a szövegrész elejére"/>
@@ -274,13 +274,13 @@
 					<node name="unchanged" value="&lt;változatlan&gt;"/>
 				</node>
 				<node name="firstLineIndent" value="Első sor behúzása"/>
-				<node name="spaceBefore" value="Space Before"/>
-				<node name="spaceAfter" value="Space After"/>
-				<node name="leftIndent" value="Left Indent"/>
-				<node name="rightIndent" value="Right Indent"/>
+				<node name="spaceBefore" value="Térköz előtte"/>
+				<node name="spaceAfter" value="Térköz utána"/>
+				<node name="leftIndent" value="Bal oldali behúzás"/>
+				<node name="rightIndent" value="Jobb oldali behúzás"/>
 				<node name="more" value="További formázás">
 					<node name="summary" value="Különálló beállítások címekhez, mottókhoz stb."/>
-					<node name="Regular Paragraph" value="Bekezdés">
+					<node name="Regular Paragraph" value="Normál bekezdés">
 						<node name="summary" value=""/>
 					</node>
 					<node name="Title" value="Cím">
@@ -307,7 +307,7 @@
 					<node name="Verse" value="Verssor">
 						<node name="summary" value=""/>
 					</node>
-					<node name="Preformatted text" value="Formázott szöveg">
+					<node name="Preformatted text" value="Előformázott szöveg">
 						<node name="summary" value=""/>
 					</node>
 					<node name="Image" value="Kép">
@@ -331,7 +331,7 @@
 					<node name="Emphasis" value="Kiemelés">
 						<node name="summary" value=""/>
 					</node>
-					<node name="Strong" value="Hangsúlyos">
+					<node name="Strong" value="Hangsúly">
 						<node name="summary" value=""/>
 					</node>
 					<node name="Subscript" value="Alsó index">
@@ -392,10 +392,10 @@
 			</node>
 			<node name="margins" value="Margók">
 				<node name="summary" value="Szövegmargók"/>
-				<node name="left" value="Bal"/>
-				<node name="right" value="Jobb"/>
-				<node name="top" value="Felső"/>
-				<node name="bottom" value="Alsó"/>
+				<node name="left" value="Bal margó"/>
+				<node name="right" value="Jobb margó"/>
+				<node name="top" value="Felső margó"/>
+				<node name="bottom" value="Alsó margó"/>
 			</node>
 			<node name="scrollBar" value="Gördítősáv">
 				<node name="summary" value="A gördítősáv és a lábléc beállításai"/>
@@ -406,12 +406,12 @@
 					<node name="showAsFooter" value="Vízszintes lábléc"/>
 				</node>
 				<node name="footerHeight" value="Lábléc magassága"/>
-				<node name="footerColor" value="Lábléc szíbe"/>
+				<node name="footerColor" value="Lábléc színe"/>
 				<node name="tocMarks" value="Tartalomjegyzék jelzése">
 					<node name="summaryOn" value="Mutassa a tartalomjegyzék elemeit a láblécen"/>
 					<node name="summaryOff" value="Ne mutassa a tartalomjegyzék elemeit a láblécen"/>
 				</node>
-				<node name="footerLongTap" value="Lábléc hosszú érintés">
+				<node name="footerLongTap" value="Lábléc hosszú érintése">
 					<node name="longTapRevert" value="Pozíció visszaállítása"/>
 					<node name="longTapNavigate" value="Ugrás pozícióra"/>
 				</node>
@@ -440,37 +440,35 @@
 					<node name="summaryOff" value="Kikapcsolva"/>
 				</node>
 				<node name="dontTurnScreenOff" value="Kijelző kikapcsolása">
-					<node name="0" value="Mindig (automatikusan)"/>
-					<node name="25" value="While battery level is greater than 25 percent" toBeTranslated="true"/>
-					<node name="50" value="While battery level is greater than 50 percent" toBeTranslated="true"/>
-					<!--
-					Please, update this translation to avoid % sign. Resources with % sign
-					causes crash on cyanogenmod firmware (due a bug in cyanogenmod)
-					<node name="25" value="Ha az akku töltöttsége 25% alatti" />
-					<node name="50" value="Ha az akku töltöttsége 50% alatti" />
-					-->
-					<node name="100" value="Soha" />
+					<node name="0" value="Soha"/>
+					<node name="25" value="25 százalék akku töltöttség alatt" />
+					<node name="50" value="50 százalék akku töltöttség alatt" />
+					<node name="100" value="Mindig (automatikusan)" />
+				</node>
+				<node name="dontTurnScreenOffDuringCharging" value="Prevent screen from sleeping during charging" toBeTranslated="true">
+					<node name="summaryOn" value="Prevent screen from sleeping if device is in charging mode" toBeTranslated="true"/>
+					<node name="summaryOff" value="Switch screen off even if device is in charging mode" toBeTranslated="true"/>
 				</node>
 			</node>
-			<node name="scrolling" value="Görgetés">
+			<node name="scrolling" value="Lapozás">
 				<node name="summary" value="Szöveg görgetésének beállításai"/>
-				<node name="flick" value="Kinetikus görgetés">
+				<node name="flick" value="Kinetikus lapozás">
 					<node name="summaryOn" value="Lapozás ujjmozdulatra"/>
 					<node name="summaryOff" value="Lapozás érintésre"/>
 				</node>
-				<node name="volumeKeys" value="Görgetés a hangerő gombokkal">
-					<node name="summaryOn" value="Hangerő gombok használata görgetéshez"/>
+				<node name="volumeKeys" value="Lapozás a hangerő gombokkal">
+					<node name="summaryOn" value="Hangerő gombok használata lapozáshoz"/>
 					<node name="summaryOff" value="A hangerő gombok a hangerőt állítják"/>
 				</node>
-				<node name="invertVolumeKeys" value="Fordított görgetés a hangerő gombokal">
+				<node name="invertVolumeKeys" value="Fordított lapozás a hangerő gombokal">
 					<node name="summaryOn" value="Fel (le) gomb lefelé (felfelé) lapoz"/>
 					<node name="summaryOff" value="Fel (le) gomb felfelé (lefelé) lapoz"/>
 				</node>
-				<node name="animated" value="Animált görgetés">
+				<node name="animated" value="Animált lapozás">
 					<node name="summaryOn" value="Finomabb görgetés"/>
-					<node name="summaryOff" value="Gyorsabb görgetés"/>
+					<node name="summaryOff" value="Gyorsabb lapozás"/>
 				</node>
-				<node name="horizontal" value="Vízszintes görgetés">
+				<node name="horizontal" value="Vízszintes lapozás">
 					<node name="summaryOn" value="Oldalak görgetése vízszintesen"/>
 					<node name="summaryOff" value="Oldalak görgetése függőlegesen"/>
 				</node>
@@ -518,13 +516,13 @@
 		</node>
 		<node name="networkError">
 			<node name="internalError" value="Belső szerverhiba" />
-			<node name="purchaseNotEnoughMoney" value="Nincs elegendő pént" />
+			<node name="purchaseNotEnoughMoney" value="Nincs elegendő pénz a számláján" />
 			<node name="purchaseMissingBook" value="Nincs ilyen könyv" />
-			<node name="purchaseAlreadyPurchased" value="Már megvásárolva" />
+			<node name="purchaseAlreadyPurchased" value="Már megvásárolta a könyvet" />
 			<node name="bookNotPurchased" value="A könyv nincs megvásárolva" />
 			<node name="downloadLimitExceeded" value="Túllépte a letöltési korlátot" />
 			<node name="noUserEmail" value="Nincs regisztrált felhasználónk&#10;ezzel az e-mail címmel" />
-			<node name="unsupportedOperation" value="nem támogatott művelet" />
+			<node name="unsupportedOperation" value="Nem támogatott művelet" />
 			<node name="notAnOPDS" value="Ez nem OPSD formátumú katalógus" />
 			<node name="noRequiredInformation" value="Szükséges információ nincs megadva a katalógusban" />
 			<node name="cacheDirectoryError" value="Gyorsítótár létrehozása sikertelen" />
@@ -573,8 +571,8 @@
 	</node>
 	<node name="errorMessage">
 		<node name="cannotRunAndroidMarket" value="Android Market elérése sikertelen. Kérjük, telepítse manuálisan a következőt: %s "/>
-		<node name="textNotFound" value="A keresett szöveg sajnos nem található a könyvben"/>
-		<node name="bookNotFound" value="A keresett könyv sajnos nem található meg a könyvtárban"/>
+		<node name="textNotFound" value="A keresett szöveg nem található a könyvben"/>
+		<node name="bookNotFound" value="A keresett könyv nem található meg a könyvtárban"/>
 		<node name="bookmarkNotFound" value="Sajnos nem találhatóak könyvjelzők"/>
 		<node name="cannotOpenBook" value="A könyv sajnos jelenleg nem nyitható meg"/>
 		<node name="dictionaryIsNotInstalled" value="Sajnos nincs telepítve szótár"/>
diff --git a/assets/resources/application/it.xml b/assets/resources/application/it.xml
index eea396bda..37fdfda77 100644
--- a/assets/resources/application/it.xml
+++ b/assets/resources/application/it.xml
@@ -445,6 +445,10 @@
 					<node name="50" value="While battery level is greater than 50 percent" toBeTranslated="true"/>
 					<node name="100" value="Never" toBeTranslated="true"/>
 				</node>
+				<node name="dontTurnScreenOffDuringCharging" value="Prevent screen from sleeping during charging" toBeTranslated="true">
+					<node name="summaryOn" value="Prevent screen from sleeping if device is in charging mode" toBeTranslated="true"/>
+					<node name="summaryOff" value="Switch screen off even if device is in charging mode" toBeTranslated="true"/>
+				</node>
 			</node>
 			<node name="scrolling" value="Scorrimento">
 				<node name="summary" value="How to scroll text" toBeTranslated="true"/>
diff --git a/assets/resources/application/ru.xml b/assets/resources/application/ru.xml
index 8eda827ef..c16a5b1af 100644
--- a/assets/resources/application/ru.xml
+++ b/assets/resources/application/ru.xml
@@ -444,6 +444,10 @@
 					<node name="50" value="Пока батарея заряжена хотя бы на половину"/>
 					<node name="100" value="Всегда выключать"/>
 				</node>
+				<node name="dontTurnScreenOffDuringCharging" value="Не выключать экран, если батарея заряжается">
+					<node name="summaryOn" value="Никогда не выключать экран, если чтение происходит в режиме зарядки"/>
+					<node name="summaryOff" value="Выключать экран даже в режиме зарядки"/>
+				</node>
 			</node>
 			<node name="scrolling" value="Перелистывание страниц">
 				<node name="summary" value="Как листать стрницы"/>
@@ -471,8 +475,8 @@
 			<node name="dictionary" value="Словарь">
 				<node name="summary" value="Настройки словаря"/>
 				<node name="runDictionaryOnTap" value="Открывать по прикосновению пальцем">
-					<node name="summaryOn" value="Открывать словарь по прикосновению пальцем"/>
-					<node name="summaryOff" value="Выделять слово по прикосновению пальцем"/>
+					<node name="summaryOn" value="Прикосновение к экрану запускает словарь"/>
+					<node name="summaryOff" value="Прикосновение к экрану выделяет слово"/>
 				</node>
 			</node>
 		</node>
diff --git a/assets/resources/application/uk.xml b/assets/resources/application/uk.xml
index eed43ba82..8036024c5 100644
--- a/assets/resources/application/uk.xml
+++ b/assets/resources/application/uk.xml
@@ -445,6 +445,10 @@
 					<node name="50" value="While battery level is greater than 50 percent" toBeTranslated="true"/>
 					<node name="100" value="Never" toBeTranslated="true"/>
 				</node>
+				<node name="dontTurnScreenOffDuringCharging" value="Prevent screen from sleeping during charging" toBeTranslated="true">
+					<node name="summaryOn" value="Prevent screen from sleeping if device is in charging mode" toBeTranslated="true"/>
+					<node name="summaryOff" value="Switch screen off even if device is in charging mode" toBeTranslated="true"/>
+				</node>
 			</node>
 			<node name="scrolling" value="Перегортання сторінок">
 				<node name="summary" value="How to scroll text" toBeTranslated="true"/>
diff --git a/assets/resources/application/vi.xml b/assets/resources/application/vi.xml
index fe9c43b03..7a5f38dbf 100644
--- a/assets/resources/application/vi.xml
+++ b/assets/resources/application/vi.xml
@@ -445,6 +445,10 @@
 					<node name="50" value="While battery level is greater than 50 percent" toBeTranslated="true"/>
 					<node name="100" value="Never" toBeTranslated="true"/>
 				</node>
+				<node name="dontTurnScreenOffDuringCharging" value="Prevent screen from sleeping during charging" toBeTranslated="true">
+					<node name="summaryOn" value="Prevent screen from sleeping if device is in charging mode" toBeTranslated="true"/>
+					<node name="summaryOff" value="Switch screen off even if device is in charging mode" toBeTranslated="true"/>
+				</node>
 			</node>
 			<node name="scrolling" value="Cuộn">
 				<node name="summary" value="How to scroll text" toBeTranslated="true"/>
diff --git a/assets/resources/application/zh.xml b/assets/resources/application/zh.xml
index fcac1e587..068e828ae 100644
--- a/assets/resources/application/zh.xml
+++ b/assets/resources/application/zh.xml
@@ -451,6 +451,10 @@
 					-->
 					<node name="100" value="从不"/>
 				</node>
+				<node name="dontTurnScreenOffDuringCharging" value="Prevent screen from sleeping during charging" toBeTranslated="true">
+					<node name="summaryOn" value="Prevent screen from sleeping if device is in charging mode" toBeTranslated="true"/>
+					<node name="summaryOff" value="Switch screen off even if device is in charging mode" toBeTranslated="true"/>
+				</node>
 			</node>
 			<node name="scrolling" value="翻阅操作">
 				<node name="summary" value="如何滚动文字内容"/>
diff --git a/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java b/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java
index d6d4048e3..9d974e088 100644
--- a/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java
+++ b/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java
@@ -312,6 +312,14 @@ public class PreferenceActivity extends ZLPreferenceActivity {
 			displayScreen.Resource,
 			"dontTurnScreenOff"
 		));
+		/*
+		displayScreen.addPreference(new ZLBooleanPreference(
+			this,
+			androidApp.DontTurnScreenOffDuringChargingOption,
+			displayScreen.Resource,
+			"dontTurnScreenOffDuringCharging"
+		));
+		*/
 
 		/*
 		final Screen colorProfileScreen = createPreferenceScreen("colorProfile");
diff --git a/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidApplication.java b/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidApplication.java
index e8d80fd74..4f5e451c7 100644
--- a/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidApplication.java
+++ b/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidApplication.java
@@ -36,6 +36,7 @@ public class ZLAndroidApplication extends Application {
 	public final ZLBooleanOption AutoOrientationOption = new ZLBooleanOption("LookNFeel", "AutoOrientation", false);
 	public final ZLBooleanOption ShowStatusBarOption = new ZLBooleanOption("LookNFeel", "ShowStatusBar", false);
 	public final ZLIntegerRangeOption BatteryLevelToTurnScreenOffOption = new ZLIntegerRangeOption("LookNFeel", "BatteryLevelToTurnScreenOff", 0, 100, 50);
+	public final ZLBooleanOption DontTurnScreenOffDuringChargingOption = new ZLBooleanOption("LookNFeel", "DontTurnScreenOffDuringCharging", true);
 	public final ZLIntegerRangeOption ScreenBrightnessLevelOption = new ZLIntegerRangeOption("LookNFeel", "ScreenBrightnessLevel", 0, 100, 0);
 
 	public static ZLAndroidApplication Instance() {