From 8a44ce4aa183a0b2a11d3c22113a5d7f9f4abf40 Mon Sep 17 00:00:00 2001
From: Nikolay Pultsin <geometer@fbreader.org>
Date: Fri, 30 Sep 2011 11:27:01 +0100
Subject: [PATCH] resources cleanup (searchResults=>found) and synchronization

---
 assets/resources/application/cs.xml           |  4 ++--
 assets/resources/application/de.xml           |  4 ++--
 assets/resources/application/en.xml           |  4 ++--
 assets/resources/application/es.xml           | 22 ++++++++++---------
 assets/resources/application/fr.xml           | 20 ++++++++---------
 assets/resources/application/gl.xml           | 12 ++++------
 assets/resources/application/hu.xml           | 12 ++++------
 assets/resources/application/it.xml           | 12 ++++------
 assets/resources/application/nl.xml           |  6 ++---
 assets/resources/application/pl.xml           |  6 ++---
 assets/resources/application/ro.xml           | 22 ++++++++++++-------
 assets/resources/application/ru.xml           |  4 ++--
 assets/resources/application/th.xml           |  6 ++---
 assets/resources/application/uk.xml           | 20 ++++++++---------
 assets/resources/application/vi.xml           |  6 ++---
 assets/resources/application/zh.xml           | 22 ++++++++++---------
 assets/resources/application/zh_TW.xml        | 16 +++++---------
 .../android/fbreader/BookmarksActivity.java   |  4 ++--
 .../fbreader/library/LibraryActivity.java     |  2 +-
 .../fbreader/library/LibraryTreeAdapter.java  |  2 +-
 .../fbreader/library/Library.java             | 16 +++++++-------
 21 files changed, 108 insertions(+), 114 deletions(-)

diff --git a/assets/resources/application/cs.xml b/assets/resources/application/cs.xml
index e7426111c..ef634ea41 100644
--- a/assets/resources/application/cs.xml
+++ b/assets/resources/application/cs.xml
@@ -23,7 +23,7 @@
 		<node name="favorites" value="Oblíbené">
 			<node name="summary" value="Mé oblíbené knihy"/>
 		</node>
-		<node name="searchResults" value="Nalezené">
+		<node name="found" value="Nalezené">
 			<node name="summary" value="Hledat výsledky pro: %s"/>
 		</node>
 		<node name="fileTree" value="Strom souborů">
@@ -178,7 +178,7 @@
 	<node name="bookmarksView">
 		<node name="thisBook" value="Tato kniha"/>
 		<node name="allBooks" value="Všechny knihy"/>
-		<node name="searchResults" value="Nalezené"/>
+		<node name="found" value="Nalezené"/>
 		<node name="new" value="Nová záložka"/>
 		<node name="open" value="Otevřít"/>
 		<node name="edit" value="Upravit záložku"/>
diff --git a/assets/resources/application/de.xml b/assets/resources/application/de.xml
index 611bcecf1..10b90bbfe 100644
--- a/assets/resources/application/de.xml
+++ b/assets/resources/application/de.xml
@@ -26,7 +26,7 @@
 		<node name="favorites" value="Favoriten">
 			<node name="summary" value="Meine Lieblingsbücher"/>
 		</node>
-		<node name="searchResults" value="Gefunden">
+		<node name="found" value="Gefunden">
 			<node name="summary" value="Suchergebnisse für: %s"/>
 		</node>
 		<node name="fileTree" value="Dateibaum">
@@ -181,7 +181,7 @@
 	<node name="bookmarksView">
 		<node name="thisBook" value="Dieses Buch"/>
 		<node name="allBooks" value="Alle Bücher"/>
-		<node name="searchResults" value="Gefunden"/>
+		<node name="found" value="Gefunden"/>
 		<node name="new" value="Neues Lesezeichen"/>
 		<node name="open" value="Zum dem Lesezeichen gehen"/>
 		<node name="edit" value="Lesezeichen bearbeiten"/>
diff --git a/assets/resources/application/en.xml b/assets/resources/application/en.xml
index 4cf778d14..82e33a815 100644
--- a/assets/resources/application/en.xml
+++ b/assets/resources/application/en.xml
@@ -23,7 +23,7 @@
 		<node name="favorites" value="Favorites">
 			<node name="summary" value="My selected books"/>
 		</node>
-		<node name="searchResults" value="Found">
+		<node name="found" value="Found">
 			<node name="summary" value="Search results for: %s"/>
 		</node>
 		<node name="fileTree" value="File tree">
@@ -178,7 +178,7 @@
 	<node name="bookmarksView">
 		<node name="thisBook" value="This book"/>
 		<node name="allBooks" value="All books"/>
-		<node name="searchResults" value="Found"/>
+		<node name="found" value="Found"/>
 		<node name="new" value="New bookmark"/>
 		<node name="open" value="Open"/>
 		<node name="edit" value="Edit bookmark"/>
diff --git a/assets/resources/application/es.xml b/assets/resources/application/es.xml
index 23b72d588..b6a3e5937 100644
--- a/assets/resources/application/es.xml
+++ b/assets/resources/application/es.xml
@@ -28,7 +28,7 @@
 		<node name="favorites" value="Favoritos">
 			<node name="summary" value="Mis libros favoritos"/>
 		</node>
-		<node name="searchResults" value="Buscar">
+		<node name="found" value="Buscar">
 			<node name="summary" value="Buscar resultados para: %s"/>
 		</node>
 		<node name="fileTree" value="Árbol de archivos">
@@ -65,7 +65,16 @@
 		<node name="bySeries" value="Por serie">
 			<node name="summary" value="Libros ordenados por serie"/>
 		</node>
+		<node name="search" value="Buscar">
+			<node name="summary" value="Search books on %s" toBeTranslated="true"/>
+			<node name="summaryAllCatalogs" value="Buscar libros en los catálogos"/>
+			<node name="summaryInProgress" value="Search in progress" toBeTranslated="true"/>
+		</node>
+		<node name="found" value="Found" toBeTranslated="true">
+			<node name="summary" value="Buscar resultados para: %s"/>
+		</node>
 		<node name="openCatalog" value="Abrir el catalogo"/>
+		<node name="networkSearch" value="Buscar"/>
 		<node name="showResults" value="Mostrar resultados"/>
 		<node name="showBooks" value="Mostrar libros"/>
 		<node name="download" value="Descarga"/>
@@ -96,9 +105,6 @@
 		<node name="alreadyDownloadingDemo" value="La muestra se está descargando" />
 		<node name="stoppingCatalogLoading" value="Deteniendo la carga" />
 		<node name="stoppingNetworkSearch" value="Deteniendo la búsqueda" />
-		<node name="search" value="Buscar" />
-		<node name="searchSummary" value="Buscar libros en los catálogos" />
-		<node name="searchResults" value="Buscar resultados para: %s" />
 		<node name="editCustomCatalog" value="Editar el catálogo"/>
 		<node name="removeCustomCatalog" value="Retirar el catálogo"/>
 		<node name="addCustomCatalog" value="Añadir catálogo"/>
@@ -177,7 +183,7 @@
 	<node name="bookmarksView">
 		<node name="thisBook" value="Este libro"/>
 		<node name="allBooks" value="Todos los libros"/>
-		<node name="searchResults" value="Encontrados"/>
+		<node name="found" value="Encontrados"/>
 		<node name="new" value="Nuevo marcador"/>
 		<node name="open" value="Abrir"/>
 		<node name="edit" value="Editar marcador"/>
@@ -638,10 +644,6 @@
 			<node name="noRequiredInformation" value="La información solicitada no está indicada en el catálogo" />
 			<node name="cacheDirectoryError" value="No es posible crear el directorio de caché" />
 		</node>
-		<node name="emptySearchResults">
-			<node name="title" value="Resultados de la búsqueda" />
-			<node name="message" value="No se encuentra ningún libro coincidente" />
-		</node>
 		<node name="AuthenticationDialog">
 			<node name="title" value="Autenticación" />
 			<node name="unencryptedWarning" value="Su contraseña se enviara sin codificar"/>
@@ -693,7 +695,7 @@
 		<node name="noFavorites" value="Su lista de preferencias está vacía"/>
 		<node name="emptyCatalog" value="El catálogo está vacío"/>
 		<node name="emptyBasket" value="Su cesta está vacía"/>
-		<node name="emptyNetworkSearchResults" value="No books found, sorry" toBeTranslated="true"/>
+		<node name="emptyNetworkSearchResults" value="No se encuentra ningún libro coincidente"/>
 	</node>
 	<node name="external">
 		<node name="browser" value="Navegador"/>
diff --git a/assets/resources/application/fr.xml b/assets/resources/application/fr.xml
index 22da486ea..90b2fec9f 100644
--- a/assets/resources/application/fr.xml
+++ b/assets/resources/application/fr.xml
@@ -23,7 +23,7 @@
 		<node name="favorites" value="Favoris">
 			<node name="summary" value="Ma sélection de livres"/>
 		</node>
-		<node name="searchResults" value="Trouvé(s)">
+		<node name="found" value="Trouvé(s)">
 			<node name="summary" value="Résultats de la recherche : %s"/>
 		</node>
 		<node name="fileTree" value="Système de fichiers">
@@ -60,7 +60,14 @@
 		<node name="bySeries" value="Par série">
 			<node name="summary" value="Livres triés par série"/>
 		</node>
+		<node name="search" value="Rechercher">
+		</node>
+		<node name="found" value="Trouvé(s)">
+			<node name="summary" value="Résultats de la recherche : %s"/>
+		</node>
+		<node name="searchSummary" value="Chercher des livres dans les catalogues" />
 		<node name="openCatalog" value="Ouvrir le catalogue"/>
+		<node name="networkSearch" value="Rechercher" />
 		<node name="showResults" value="Afficher les résultats"/>
 		<node name="showBooks" value="Afficher les livres"/>
 		<node name="download" value="Télécharger"/>
@@ -91,9 +98,6 @@
 		<node name="alreadyDownloadingDemo" value="L'exemple est en cours de téléchargement" />
 		<node name="stoppingCatalogLoading" value="Arrêt du chargement" />
 		<node name="stoppingNetworkSearch" value="Arrêt de la recherche" />
-		<node name="search" value="Rechercher" />
-		<node name="searchSummary" value="Chercher des livres dans les catalogues" />
-		<node name="searchResults" value="Résultats de la recherche : %s"/>
 		<node name="editCustomCatalog" value="Editer le catalogue"/>
 		<node name="removeCustomCatalog" value="Supprimer le catalogue"/>
 		<node name="addCustomCatalog" value="Ajouter un catalogue"/>
@@ -172,7 +176,7 @@
 	<node name="bookmarksView">
 		<node name="thisBook" value="Ce livre"/>
 		<node name="allBooks" value="Tous les livres"/>
-		<node name="searchResults" value="Trouvé"/>
+		<node name="found" value="Trouvé"/>
 		<node name="new" value="Nouveau marque-page"/>
 		<node name="open" value="Ouvrir"/>
 		<node name="edit" value="Modifier le marque-page"/>
@@ -633,10 +637,6 @@
 			<node name="noRequiredInformation" value="Certaines informations requises sont absentes du catalogue" />
 			<node name="cacheDirectoryError" value="Impossible de créer le répertoire contenant le cache" />
 		</node>
-		<node name="emptySearchResults">
-			<node name="title" value="Résultats de la recherche" />
-			<node name="message" value="Aucun livre correspondant trouvé." />
-		</node>
 		<node name="AuthenticationDialog">
 			<node name="title" value="Authentification"/>
 			<node name="unencryptedWarning" value="Votre mot de passe va être envoyé en clair"/>
@@ -682,7 +682,7 @@
 		<node name="noFavorites" value="Votre liste de favoris est vide"/>
 		<node name="emptyCatalog" value="Le catalogue est vide"/>
 		<node name="emptyBasket" value="Votre panier est vide, désolé"/>
-		<node name="emptyNetworkSearchResults" value="No books found, sorry" toBeTranslated="true"/>
+		<node name="emptyNetworkSearchResults" value="Aucun livre correspondant trouvé" />
 	</node>
 	<node name="external">
 		<node name="browser" value="Navigateur"/>
diff --git a/assets/resources/application/gl.xml b/assets/resources/application/gl.xml
index bfaa8fa25..a4c2c07fd 100644
--- a/assets/resources/application/gl.xml
+++ b/assets/resources/application/gl.xml
@@ -23,7 +23,7 @@
 		<node name="favorites" value="Preferidos">
 			<node name="summary" value="Os meus libros seleccionados"/>
 		</node>
-		<node name="searchResults" value="Buscar">
+		<node name="found" value="Buscar">
 			<node name="summary" value="Buscar resultados para: %s"/>
 		</node>
 		<node name="fileTree" value="Árbore de ficheiros">
@@ -93,7 +93,7 @@
 		<node name="stoppingNetworkSearch" value="Detendo a busca" />
 		<node name="search" value="Buscar" />
 		<node name="searchSummary" value="Buscar libros nos catálogos" />
-		<node name="searchResults" value="Buscar resultados para: %s" />
+		<node name="found" value="Buscar resultados para: %s" />
 		<node name="editCustomCatalog" value="Editar o catálogo"/>
 		<node name="removeCustomCatalog" value="Retirar o catálogo"/>
 		<node name="addCustomCatalog" value="Engadir catálogo"/>
@@ -172,7 +172,7 @@
 	<node name="bookmarksView">
 		<node name="thisBook" value="Este libro"/>
 		<node name="allBooks" value="Todos os libros"/>
-		<node name="searchResults" value="Atopados"/>
+		<node name="found" value="Atopados"/>
 		<node name="new" value="Novo marcador"/>
 		<node name="open" value="Abrir"/>
 		<node name="edit" value="Editar marcador"/>
@@ -633,10 +633,6 @@
 			<node name="noRequiredInformation" value="A información requirida non está indicada no catálogo" />
 			<node name="cacheDirectoryError" value="Non é posíbel crear o cartafol da caché" />
 		</node>
-		<node name="emptySearchResults">
-			<node name="title" value="Resultados da busca" />
-			<node name="message" value="Non se atopa ningún libro coincidente" />
-		</node>
 		<node name="AuthenticationDialog">
 			<node name="title" value="Autenticación" />
 			<node name="unencryptedWarning" value="Your password will be sent unencrypted" toBeTranslated="true"/>
@@ -682,7 +678,7 @@
 		<node name="noFavorites" value="A súa lista de preferencias está baleira"/>
 		<node name="emptyCatalog" value="O catálogo está baleiro"/>
 		<node name="emptyBasket" value="Your basket is empty, sorry" toBeTranslated="true"/>
-		<node name="emptyNetworkSearchResults" value="No books found, sorry" toBeTranslated="true"/>
+		<node name="emptyNetworkSearchResults" value="Non se atopa ningún libro coincidente"/>
 	</node>
 	<node name="external">
 		<node name="browser" value="Navegador"/>
diff --git a/assets/resources/application/hu.xml b/assets/resources/application/hu.xml
index f265ca023..c25c45f8f 100644
--- a/assets/resources/application/hu.xml
+++ b/assets/resources/application/hu.xml
@@ -23,7 +23,7 @@
 		<node name="favorites" value="Kedvencek">
 			<node name="summary" value="Kedvencnek jelölt könyveim"/>
 		</node>
-		<node name="searchResults" value="Találatok">
+		<node name="found" value="Találatok">
 			<node name="summary" value="Keresés: %s" />
 		</node>
 		<node name="fileTree" value="Könytárfa">
@@ -93,7 +93,7 @@
 		<node name="stoppingNetworkSearch" value="Keresés leállítása" />
 		<node name="search" value="Keresés" />
 		<node name="searchSummary" value="Könyvek keresése a katalógusokban" />
-		<node name="searchResults" value="Keresés az eredmények között: %s" />
+		<node name="found" value="Keresés az eredmények között: %s" />
 		<node name="editCustomCatalog" value="Katalógus szerkesztése"/>
 		<node name="removeCustomCatalog" value="Katalógus törlése"/>
 		<node name="addCustomCatalog" value="Katalógus hozzáadása"/>
@@ -172,7 +172,7 @@
 	<node name="bookmarksView">
 		<node name="thisBook" value="Ez a könyv"/>
 		<node name="allBooks" value="Minden könyv"/>
-		<node name="searchResults" value="Találat"/>
+		<node name="found" value="Találat"/>
 		<node name="new" value="Új könyvjelző"/>
 		<node name="open" value="Megnyitás"/>
 		<node name="edit" value="Könyvjelző szerkesztése"/>
@@ -633,10 +633,6 @@
 			<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" />
 		</node>
-		<node name="emptySearchResults">
-			<node name="title" value="Eredmények" />
-			<node name="message" value="Nem található megfelelő könyv" />
-		</node>
 		<node name="AuthenticationDialog">
 			<node name="title" value="Bejelentkezés" />
 			<node name="unencryptedWarning" value="Your password will be sent unencrypted" toBeTranslated="true"/>
@@ -682,7 +678,7 @@
 		<node name="noFavorites" value="A Kedvencek listája üres"/>
 		<node name="emptyCatalog" value="A katalógus üres"/>
 		<node name="emptyBasket" value="Your basket is empty, sorry" toBeTranslated="true"/>
-		<node name="emptyNetworkSearchResults" value="No books found, sorry" toBeTranslated="true"/>
+		<node name="emptyNetworkSearchResults" value="Nem található megfelelő könyv"/>
 	</node>
 	<node name="external">
 		<node name="browser" value="Böngésző"/>
diff --git a/assets/resources/application/it.xml b/assets/resources/application/it.xml
index b5a4a1f3a..894aab8ed 100644
--- a/assets/resources/application/it.xml
+++ b/assets/resources/application/it.xml
@@ -24,7 +24,7 @@
 		<node name="favorites" value="Preferiti">
 			<node name="summary" value="I miei libri preferiti"/>
 		</node>
-		<node name="searchResults" value="Trovato">
+		<node name="found" value="Trovato">
 			<node name="summary" value="Cerca risultati per: %s" />
 		</node>
 		<node name="fileTree" value="Albero dei file">
@@ -94,7 +94,7 @@
 		<node name="stoppingNetworkSearch" value="Sto fermando la ricerca" />
 		<node name="search" value="Ricerca" />
 		<node name="searchSummary" value="Cerca libri nei cataloghi" />
-		<node name="searchResults" value="Cerca risultati per: %s" />
+		<node name="found" value="Cerca risultati per: %s" />
 		<node name="editCustomCatalog" value="Modifica catalogo"/>
 		<node name="removeCustomCatalog" value="Cancella catalogo"/>
 		<node name="addCustomCatalog" value="Aggiungi catalogo"/>
@@ -173,7 +173,7 @@
 	<node name="bookmarksView">
 		<node name="thisBook" value="Questo libro"/>
 		<node name="allBooks" value="Tutti i libri"/>
-		<node name="searchResults" value="Trovato"/>
+		<node name="found" value="Trovato"/>
 		<node name="new" value="Nuovo segnalibro"/>
 		<node name="open" value="Apri"/>
 		<node name="edit" value="Modifica segnalibro"/>
@@ -634,10 +634,6 @@
 			<node name="noRequiredInformation" value="Le informazioni richieste non sono specificate nel catalogo" />
 			<node name="cacheDirectoryError" value="Impossibile creare la cartella della cache" />
 		</node>
-		<node name="emptySearchResults">
-			<node name="title" value="Risultati ricerca" />
-			<node name="message" value="Non sono stati trovati libri adatti" />
-		</node>
 		<node name="AuthenticationDialog">
 			<node name="title" value="Autenticazione" />
 			<node name="unencryptedWarning" value="La tua password verrà inviata in chiaro"/>
@@ -683,7 +679,7 @@
 		<node name="noFavorites" value="Spiacente, l'elenco dei favoriti e' vuoto"/>
 		<node name="emptyCatalog" value="Il catalogo è vuoto"/>
 		<node name="emptyBasket" value="Spiacente, il carrello è vuoto"/>
-		<node name="emptyNetworkSearchResults" value="No books found, sorry" toBeTranslated="true"/>
+		<node name="emptyNetworkSearchResults" value="Non sono stati trovati libri adatti"/>
 	</node>
 	<node name="external">
 		<node name="browser" value="Browser"/>
diff --git a/assets/resources/application/nl.xml b/assets/resources/application/nl.xml
index 9482a06d8..1f5c21081 100644
--- a/assets/resources/application/nl.xml
+++ b/assets/resources/application/nl.xml
@@ -23,7 +23,7 @@
 		<node name="favorites" value="Favorieten">
 			<node name="summary" value="Mijn geselecteerde boeken"/>
 		</node>
-		<node name="searchResults" value="Gevonden">
+		<node name="found" value="Gevonden">
 			<node name="summary" value="Zoekresultaten voor: %s"/>
 		</node>
 		<node name="fileTree" value="Bestanden">
@@ -93,7 +93,7 @@
 		<node name="stoppingNetworkSearch" value="Stopping search" toBeTranslated="true" />
 		<node name="search" value="Zoeken" />
 		<node name="searchSummary" value="Zoeken naar boeken in catalogi" />
-		<node name="searchResults" value="Zoekresulten voor: %s" />
+		<node name="found" value="Zoekresulten voor: %s" />
 		<node name="editCustomCatalog" value="Catalogus bewerken"/>
 		<node name="removeCustomCatalog" value="Verwijder catalogus"/>
 		<node name="addCustomCatalog" value="Catalogus toevoegen"/>
@@ -172,7 +172,7 @@
 	<node name="bookmarksView">
 		<node name="thisBook" value="Dit boek"/>
 		<node name="allBooks" value="Alle boeken"/>
-		<node name="searchResults" value="Gevonden"/>
+		<node name="found" value="Gevonden"/>
 		<node name="new" value="Nieuwe bladwijzer"/>
 		<node name="open" value="Openen"/>
 		<node name="edit" value="Bladwijzer bewerken"/>
diff --git a/assets/resources/application/pl.xml b/assets/resources/application/pl.xml
index 1caeda5e9..0fd95f24f 100644
--- a/assets/resources/application/pl.xml
+++ b/assets/resources/application/pl.xml
@@ -23,7 +23,7 @@
 		<node name="favorites" value="Ulubione">
 			<node name="summary" value="Moje wybrane książki"/>
 		</node>
-		<node name="searchResults" value="Wyszukane">
+		<node name="found" value="Wyszukane">
 			<node name="summary" value="Wyniki dla: %s" />
 		</node>
 		<node name="fileTree" value="Drzewo katalogów">
@@ -93,7 +93,7 @@
 		<node name="stoppingNetworkSearch" value="Zatrzymywanie wyszukiwania" />
 		<node name="search" value="Wyszukaj" />
 		<node name="searchSummary" value="Wyszykaj książki w katalogach" />
-		<node name="searchResults" value="Wyniki wyszukiwania: %s" />
+		<node name="found" value="Wyniki wyszukiwania: %s" />
 		<node name="editCustomCatalog" value="Edytuj katalog"/>
 		<node name="removeCustomCatalog" value="Usuń katalog"/>
 		<node name="addCustomCatalog" value="Dodaj katalog"/>
@@ -172,7 +172,7 @@
 	<node name="bookmarksView">
 		<node name="thisBook" value="Ta książka"/>
 		<node name="allBooks" value="Wszystkie ksiązki"/>
-		<node name="searchResults" value="Wyszukane"/>
+		<node name="found" value="Wyszukane"/>
 		<node name="new" value="Nowa zakładka"/>
 		<node name="open" value="Otwórz"/>
 		<node name="edit" value="Edytuj zakładkę"/>
diff --git a/assets/resources/application/ro.xml b/assets/resources/application/ro.xml
index 0424f4320..11d531180 100644
--- a/assets/resources/application/ro.xml
+++ b/assets/resources/application/ro.xml
@@ -23,8 +23,8 @@
 		<node name="favorites" value="Favoritele mele">
 			<node name="summary" value="Cartile mele selectate"/>
 		</node>
-		<node name="searchResults" value="S-au gasit">
-			<node name="summary" value="Rezultatele cautarii pentru:%s"/>
+		<node name="found" value="S-au gasit">
+			<node name="summary" value="Rezultatele cautarii pentru: %s"/>
 		</node>
 		<node name="fileTree" value="Listare copac a fisierelor">
 			<node name="summary" value="Cauta in sistemul de fisiere"/>
@@ -60,7 +60,16 @@
 		<node name="bySeries" value="Dupa serie">
 			<node name="summary" value="Carti sortate de serie"/>
 		</node>
+		<node name="search" value="Cautare">
+			<node name="summary" value="Search books on %s" toBeTranslated="true"/>
+			<node name="summaryAllCatalogs" value="Cauta carti în cataloage"/>
+			<node name="summaryInProgress" value="Search in progress" toBeTranslated="true"/>
+		</node>
+		<node name="found" value="S-au gasit">
+			<node name="summary" value="Rezultatele cautarii pentru: %s"/>
+		</node>
 		<node name="openCatalog" value="Deschide catalogul"/>
+		<node name="networkSearch" value="Cautare"/>
 		<node name="showResults" value="Arata rezultatele"/>
 		<node name="showBooks" value="Afisati cartile"/>
 		<node name="download" value="Descarca"/>
@@ -79,10 +88,10 @@
 		<node name="stopSearching" value="Opri cautarea"/>
 		<node name="signIn" value="Conectati-va în"/>
 		<node name="signOut" value="Deconectare (%s)"/>
-		<node name="topup" value="Incarcati contul (în prezent:%s)"/>
+		<node name="topup" value="Incarcati contul (în prezent: %s)"/>
 		<node name="topupTitle" value="Incarcati contul"/>
 		<node name="topupViaBrowser" value="Pagina deschis în browser"/>
-		<node name="topupSummary" value="În prezent:%s"/>
+		<node name="topupSummary" value="În prezent: %s"/>
 		<node name="basket" value="Cos"/>
 		<node name="basketSummaryEmpty" value="No books" toBeTranslated="true"/>
 		<node name="basketSummaryCountOnly" value="%0 book(s)" toBeTranslated="true"/>
@@ -91,9 +100,6 @@
 		<node name="alreadyDownloadingDemo" value="Esantionul este în curs de descarcare"/>
 		<node name="stoppingCatalogLoading" value="Oprirea  încarcarii"/>
 		<node name="stoppingNetworkSearch" value="Oprirea cautarii"/>
-		<node name="search" value="Cautare"/>
-		<node name="searchSummary" value="Cauta carti în cataloage"/>
-		<node name="searchResults" value="Rezultatele cautarii pentru:%s"/>
 		<node name="editCustomCatalog" value="Editare catalog"/>
 		<node name="removeCustomCatalog" value="Eliminati catalog"/>
 		<node name="addCustomCatalog" value="Adauga catalog"/>
@@ -172,7 +178,7 @@
 	<node name="bookmarksView">
 		<node name="thisBook" value="Aceasta carte"/>
 		<node name="allBooks" value="Toate cartile"/>
-		<node name="searchResults" value="S-au gasit"/>
+		<node name="found" value="S-au gasit"/>
 		<node name="new" value="Marcaj nou"/>
 		<node name="open" value="Deschis"/>
 		<node name="edit" value="Editeaza marcaj"/>
diff --git a/assets/resources/application/ru.xml b/assets/resources/application/ru.xml
index d8cf0e239..13fa0801f 100644
--- a/assets/resources/application/ru.xml
+++ b/assets/resources/application/ru.xml
@@ -23,7 +23,7 @@
 		<node name="favorites" value="Избранное">
 			<node name="summary" value="Мои любимые книги"/>
 		</node>
-		<node name="searchResults" value="Найдено">
+		<node name="found" value="Найдено">
 			<node name="summary" value="Результаты поиска для: %s" />
 		</node>
 		<node name="fileTree" value="Файловая система">
@@ -178,7 +178,7 @@
 	<node name="bookmarksView">
 		<node name="thisBook" value="Эта книга"/>
 		<node name="allBooks" value="Все книги"/>
-		<node name="searchResults" value="Найдено"/>
+		<node name="found" value="Найдено"/>
 		<node name="new" value="Добавить закладку"/>
 		<node name="open" value="Открыть"/>
 		<node name="edit" value="Поправить закладку"/>
diff --git a/assets/resources/application/th.xml b/assets/resources/application/th.xml
index 9b53fec92..7d06d48e2 100644
--- a/assets/resources/application/th.xml
+++ b/assets/resources/application/th.xml
@@ -23,7 +23,7 @@
 		<node name="favorites" value="หนังสือเล่มโปรด">
 			<node name="summary" value="หนังสือที่เลือก"/>
 		</node>
-		<node name="searchResults" value="ค้นพบ">
+		<node name="found" value="ค้นพบ">
 			<node name="summary" value="ผลการค้นหาสำหรับ: %s"/>
 		</node>
 		<node name="fileTree" value="คลังไฟล์">
@@ -93,7 +93,7 @@
 		<node name="stoppingNetworkSearch" value="หยุดการค้นหา"/>
 		<node name="search" value="ค้นหา"/>
 		<node name="searchSummary" value="ค้นหาหนังสือในแคตตาล็อก"/>
-		<node name="searchResults" value="ผลการค้นหาสำหรับ: %s"/>
+		<node name="found" value="ผลการค้นหาสำหรับ: %s"/>
 		<node name="editCustomCatalog" value="แก้ไขแคตตาล็อก"/>
 		<node name="removeCustomCatalog" value="ลบแคตตาล็อก"/>
 		<node name="addCustomCatalog" value="เพิ่มแคตตาล็อก"/>
@@ -172,7 +172,7 @@
 	<node name="bookmarksView">
 		<node name="thisBook" value="หนังสือเล่มนี้"/>
 		<node name="allBooks" value="หนังสือทั้งหมด"/>
-		<node name="searchResults" value="ค้นพบ"/>
+		<node name="found" value="ค้นพบ"/>
 		<node name="new" value="สร้างบุ๊คมาร์คใหม่"/>
 		<node name="open" value="เปิดบุ๊คมาร์ค"/>
 		<node name="edit" value="แก้ไขบุ๊คมาร์ค"/>
diff --git a/assets/resources/application/uk.xml b/assets/resources/application/uk.xml
index 7c1a64fef..4328b3068 100644
--- a/assets/resources/application/uk.xml
+++ b/assets/resources/application/uk.xml
@@ -23,7 +23,7 @@
 		<node name="favorites" value="Favorites" toBeTranslated="true">
 			<node name="summary" value="My selected books" toBeTranslated="true"/>
 		</node>
-		<node name="searchResults" value="Знайдено">
+		<node name="found" value="Знайдено">
 			<node name="summary" value="Результати пошуку для: %s" />
 		</node>
 		<node name="fileTree" value="File tree" toBeTranslated="true">
@@ -60,7 +60,14 @@
 		<node name="bySeries" value="By series" toBeTranslated="true">
 			<node name="summary" value="Books sorted by series" toBeTranslated="true"/>
 		</node>
+		<node name="search" value="Пошук">
+		</node>
+		<node name="searchSummary" value="Пошук книжок у каталогах" />
+		<node name="found" value="Знайдено">
+			<node name="summary" value="Результати пошуку для: %s" />
+		</node>
 		<node name="openCatalog" value="Відкрити теку"/>
+		<node name="networkSearch" value="Пошук" />
 		<node name="showResults" value="Показати результати"/>
 		<node name="showBooks" value="Показати книжки"/>
 		<node name="download" value="Завантажити"/>
@@ -91,9 +98,6 @@
 		<node name="alreadyDownloadingDemo" value="Уривок завантажається" />
 		<node name="stoppingCatalogLoading" value="Зупинка завантаження" />
 		<node name="stoppingNetworkSearch" value="Завершення пошуку" />
-		<node name="search" value="Пошук" />
-		<node name="searchSummary" value="Пошук книжок у каталогах" />
-		<node name="searchResults" value="Результати пошуку для: %s" />
 		<node name="editCustomCatalog" value="Змінити теку"/>
 		<node name="removeCustomCatalog" value="Видалити теку"/>
 		<node name="addCustomCatalog" value="Додати теку"/>
@@ -172,7 +176,7 @@
 	<node name="bookmarksView">
 		<node name="thisBook" value="Ця книга"/>
 		<node name="allBooks" value="Усі книги"/>
-		<node name="searchResults" value="Знайдено"/>
+		<node name="found" value="Знайдено"/>
 		<node name="new" value="Додати закладку"/>
 		<node name="open" value="Відкрити"/>
 		<node name="edit" value="Поправити закладку"/>
@@ -633,10 +637,6 @@
 			<node name="noRequiredInformation" value="Необхідна інформація не знайдена в каталозі" />
 			<node name="cacheDirectoryError" value="Не вдається створити каталог для кеша" />
 		</node>
-		<node name="emptySearchResults">
-			<node name="title" value="Результати пошуку" />
-			<node name="message" value="Відповідних книг не знайдено" />
-		</node>
 		<node name="AuthenticationDialog">
 			<node name="title" value="Авторизація" />
 			<node name="unencryptedWarning" value="Your password will be sent unencrypted" toBeTranslated="true"/>
@@ -682,7 +682,7 @@
 		<node name="noFavorites" value="Your favorites list is empty, sorry" toBeTranslated="true"/>
 		<node name="emptyCatalog" value="Каталог порожній"/>
 		<node name="emptyBasket" value="Your basket is empty, sorry" toBeTranslated="true"/>
-		<node name="emptyNetworkSearchResults" value="No books found, sorry" toBeTranslated="true"/>
+		<node name="emptyNetworkSearchResults" value="Відповідних книг не знайдено"/>
 	</node>
 	<node name="external">
 		<node name="browser" value="браузері"/>
diff --git a/assets/resources/application/vi.xml b/assets/resources/application/vi.xml
index fcfe074db..a6b1ef3ab 100644
--- a/assets/resources/application/vi.xml
+++ b/assets/resources/application/vi.xml
@@ -23,7 +23,7 @@
 		<node name="favorites" value="Yêu thích">
 			<node name="summary" value="Sách của tôi"/>
 		</node>
-		<node name="searchResults" value="Tìm thấy">
+		<node name="found" value="Tìm thấy">
 			<node name="summary" value="Kết quả tìm kiếm khoảng: %s" />
 		</node>
 		<node name="fileTree" value="Cây Tập tin">
@@ -93,7 +93,7 @@
 		<node name="stoppingNetworkSearch" value="Dừng tìm" />
 		<node name="search" value="Tìm" />
 		<node name="searchSummary" value="Tìm sách trong danh mục" />
-		<node name="searchResults" value="Kết quả tìm kiếm khoảng: %s" />
+		<node name="found" value="Kết quả tìm kiếm khoảng: %s" />
 		<node name="editCustomCatalog" value="Sửa Catalo"/>
 		<node name="removeCustomCatalog" value="Xóa catalo"/>
 		<node name="addCustomCatalog" value="Thêm"/>
@@ -172,7 +172,7 @@
 	<node name="bookmarksView">
 		<node name="thisBook" value="Quyển này"/>
 		<node name="allBooks" value="Tất cả sách"/>
-		<node name="searchResults" value="Tìm thấy"/>
+		<node name="found" value="Tìm thấy"/>
 		<node name="new" value="Đánh dấu mới"/>
 		<node name="open" value="Mở"/>
 		<node name="edit" value="Sửa đánh dấu"/>
diff --git a/assets/resources/application/zh.xml b/assets/resources/application/zh.xml
index 7a98f7c17..5dd67a0e5 100644
--- a/assets/resources/application/zh.xml
+++ b/assets/resources/application/zh.xml
@@ -23,7 +23,7 @@
 		<node name="favorites" value="喜爱的">
 			<node name="summary" value="我选择的书文"/>
 		</node>
-		<node name="searchResults" value="搜索结果">
+		<node name="found" value="搜索结果">
 			<node name="summary" value="搜索结果: %s" />
 		</node>
 		<node name="fileTree" value="文件树">
@@ -60,7 +60,16 @@
 		<node name="bySeries" value="By series" toBeTranslated="true">
 			<node name="summary" value="Books sorted by series" toBeTranslated="true"/>
 		</node>
+		<node name="search" value="搜索">
+			<node name="summary" value="Search books on %s" toBeTranslated="true"/>
+			<node name="summaryAllCatalogs" value="搜索书库目录" />
+			<node name="summaryInProgress" value="Search in progress" toBeTranslated="true"/>
+		</node>
+		<node name="found" value="搜索结果">
+			<node name="summary" value="搜索结果: %s" />
+		</node>
 		<node name="openCatalog" value="打开书库目录" />
+		<node name="networkSearch" value="搜索"/>
 		<node name="showResults" value="显示结果"/>
 		<node name="showBooks" value="显示书籍"/>
 		<node name="download" value="下载" />
@@ -91,9 +100,6 @@
 		<node name="alreadyDownloadingDemo" value="正在下载试读本" />
 		<node name="stoppingCatalogLoading" value="停止加载" />
 		<node name="stoppingNetworkSearch" value="停止搜索" />
-		<node name="search" value="搜索" />
-		<node name="searchSummary" value="搜索书库目录" />
-		<node name="searchResults" value="搜索结果: %s" />
 		<node name="editCustomCatalog" value="编辑书库目录"/>
 		<node name="removeCustomCatalog" value="移除书库目录"/>
 		<node name="addCustomCatalog" value="增加书库目录"/>
@@ -172,7 +178,7 @@
 	<node name="bookmarksView">
 		<node name="thisBook" value="本书" />
 		<node name="allBooks" value="所有图书" />
-		<node name="searchResults" value="搜索结果" />
+		<node name="found" value="搜索结果" />
 		<node name="new" value="添加书签" />
 		<node name="open" value="打开书签" />
 		<node name="edit" value="编辑书签" />
@@ -633,10 +639,6 @@
 			<node name="noRequiredInformation" value="书库目录中必须的信息没有定义" />
 			<node name="cacheDirectoryError" value="无法创建缓存目录" />
 		</node>
-		<node name="emptySearchResults">
-			<node name="title" value="搜索结果" />
-			<node name="message" value="没有找到对应的书籍." />
-		</node>
 		<node name="AuthenticationDialog">
 			<node name="title" value="鉴定" />
 			<node name="unencryptedWarning" value="Your password will be sent unencrypted" toBeTranslated="true"/>
@@ -688,7 +690,7 @@
 		<node name="noFavorites" value="对不起，你的收藏列表为空"/>
 		<node name="emptyCatalog" value="空书库目录"/>
 		<node name="emptyBasket" value="Your basket is empty, sorry" toBeTranslated="true"/>
-		<node name="emptyNetworkSearchResults" value="No books found, sorry" toBeTranslated="true"/>
+		<node name="emptyNetworkSearchResults" value="没有找到对应的书籍"/>
 	</node>
 	<node name="external">
 		<node name="browser" value="浏览器" />
diff --git a/assets/resources/application/zh_TW.xml b/assets/resources/application/zh_TW.xml
index bcd54c80c..d03d59e9b 100644
--- a/assets/resources/application/zh_TW.xml
+++ b/assets/resources/application/zh_TW.xml
@@ -23,7 +23,7 @@
 		<node name="favorites" value="收藏">
 			<node name="summary" value="我的精選書目"/>
 		</node>
-		<node name="searchResults" value="搜尋結果">
+		<node name="found" value="搜尋結果">
 			<node name="summary" value="%s 的搜尋結果"/>
 		</node>
 		<node name="fileTree" value="檔案">
@@ -93,7 +93,7 @@
 		<node name="stoppingNetworkSearch" value="搜尋中止中" />
 		<node name="search" value="搜尋" />
 		<node name="searchSummary" value="搜尋目錄" />
-		<node name="searchResults" value="%s 的搜尋結果" />
+		<node name="found" value="%s 的搜尋結果" />
 		<node name="editCustomCatalog" value="編輯目錄"/>
 		<node name="removeCustomCatalog" value="刪除目錄"/>
 		<node name="addCustomCatalog" value="新增目錄"/>
@@ -172,7 +172,7 @@
 	<node name="bookmarksView">
 		<node name="thisBook" value="本書"/>
 		<node name="allBooks" value="所有書藉"/>
-		<node name="searchResults" value="搜尋結果"/>
+		<node name="found" value="搜尋結果"/>
 		<node name="new" value="新增書籤"/>
 		<node name="open" value="開啟書籤"/>
 		<node name="edit" value="編輯書籤"/>
@@ -490,8 +490,8 @@
 					<node name="0" value="必然"/>
 					<!-- Percent sign (%) could not be used in resource strings
 								because there is a bug in Cyanogen Mod firmware that
-								crashes the program with such resources -->
-					<!--<node name="25" value="當電量大於25%"/>
+								crashes the program with such resources
+					<node name="25" value="當電量大於25%"/>
 					<node name="50" value="當電量大於50%"/>-->
 					<node name="25" value="While battery level is greater than 25 percent"/>
 					<node name="50" value="While battery level is greater than 50 percent"/>
@@ -638,10 +638,6 @@
 			<node name="noRequiredInformation" value="目錄沒有提供必需的資料" />
 			<node name="cacheDirectoryError" value="未能創建暫存檔案目錄" />
 		</node>
-		<node name="emptySearchResults">
-			<node name="title" value="搜尋結果" />
-			<node name="message" value="沒有結果符合" />
-		</node>
 		<node name="AuthenticationDialog">
 			<node name="title" value="驗證" />
 			<node name="unencryptedWarning" value="Your password will be sent unencrypted" toBeTranslated="true"/>
@@ -693,7 +689,7 @@
 		<node name="noFavorites" value="你並未有收藏"/>
 		<node name="emptyCatalog" value="空目錄" />
 		<node name="emptyBasket" value="購物籃內沒有物品" />
-		<node name="emptyNetworkSearchResults" value="No books found, sorry" toBeTranslated="true"/>
+		<node name="emptyNetworkSearchResults" value="沒有結果符合" />
 	</node>
 	<node name="external">
 		<node name="browser" value="瀏覽"/>
diff --git a/src/org/geometerplus/android/fbreader/BookmarksActivity.java b/src/org/geometerplus/android/fbreader/BookmarksActivity.java
index 29e6f6dbf..ac25f6791 100644
--- a/src/org/geometerplus/android/fbreader/BookmarksActivity.java
+++ b/src/org/geometerplus/android/fbreader/BookmarksActivity.java
@@ -151,7 +151,7 @@ public class BookmarksActivity extends TabActivity implements MenuItem.OnMenuIte
 
 	void showSearchResultsTab(LinkedList<Bookmark> results) {
 		if (mySearchResultsView == null) {
-			mySearchResultsView = createTab("searchResults", R.id.search_results);
+			mySearchResultsView = createTab("found", R.id.search_results);
 			new BookmarksAdapter(mySearchResultsView, mySearchResults, false);
 		} else {
 			mySearchResults.clear();
@@ -159,7 +159,7 @@ public class BookmarksActivity extends TabActivity implements MenuItem.OnMenuIte
 		mySearchResults.addAll(results);
 		mySearchResultsView.invalidateViews();
 		mySearchResultsView.requestLayout();
-		getTabHost().setCurrentTabByTag("searchResults");
+		getTabHost().setCurrentTabByTag("found");
 	}
 
 	public boolean onMenuItemClick(MenuItem item) {
diff --git a/src/org/geometerplus/android/fbreader/library/LibraryActivity.java b/src/org/geometerplus/android/fbreader/library/LibraryActivity.java
index 3bcf55a60..614a0f273 100644
--- a/src/org/geometerplus/android/fbreader/library/LibraryActivity.java
+++ b/src/org/geometerplus/android/fbreader/library/LibraryActivity.java
@@ -140,7 +140,7 @@ public class LibraryActivity extends TreeActivity implements MenuItem.OnMenuItem
 		new ZLStringOption("BookSearch", "Pattern", "");
 
 	private void openSearchResults() {
-		final FBTree tree = myLibrary.getRootTree().getSubTree(Library.ROOT_SEARCH_RESULTS);
+		final FBTree tree = myLibrary.getRootTree().getSubTree(Library.ROOT_FOUND);
 		if (tree != null) {
 			openTree(tree);
 		}
diff --git a/src/org/geometerplus/android/fbreader/library/LibraryTreeAdapter.java b/src/org/geometerplus/android/fbreader/library/LibraryTreeAdapter.java
index 630e81513..0427b5d0d 100644
--- a/src/org/geometerplus/android/fbreader/library/LibraryTreeAdapter.java
+++ b/src/org/geometerplus/android/fbreader/library/LibraryTreeAdapter.java
@@ -130,7 +130,7 @@ class LibraryTreeAdapter extends TreeAdapter {
 				return R.drawable.ic_list_library_tags;
 			} else if (Library.ROOT_FILE_TREE.equals(id)) {
 				return R.drawable.ic_list_library_folder;
-			} else if (Library.ROOT_SEARCH_RESULTS.equals(id)) {
+			} else if (Library.ROOT_FOUND.equals(id)) {
 				return R.drawable.ic_list_library_search;
 			}
 		} else if (tree instanceof FileTree) {
diff --git a/src/org/geometerplus/fbreader/library/Library.java b/src/org/geometerplus/fbreader/library/Library.java
index 2c70b333d..506c2420f 100644
--- a/src/org/geometerplus/fbreader/library/Library.java
+++ b/src/org/geometerplus/fbreader/library/Library.java
@@ -45,7 +45,7 @@ public final class Library {
 		void onLibraryChanged(Code code);
 	}
 
-	public static final String ROOT_SEARCH_RESULTS = "searchResults";
+	public static final String ROOT_FOUND = "found";
 	public static final String ROOT_FAVORITES = "favorites";
 	public static final String ROOT_RECENT = "recent";
 	public static final String ROOT_BY_AUTHOR = "byAuthor";
@@ -255,10 +255,10 @@ public final class Library {
 			getTagTree(t).getBookSubTree(book, true);
 		}
 
-		final SearchResultsTree searchResults =
-			(SearchResultsTree)getFirstLevelTree(ROOT_SEARCH_RESULTS);
-		if (searchResults != null && book.matches(searchResults.getPattern())) {
-			searchResults.getBookSubTree(book, true);
+		final SearchResultsTree found =
+			(SearchResultsTree)getFirstLevelTree(ROOT_FOUND);
+		if (found != null && book.matches(found.getPattern())) {
+			found.getBookSubTree(book, true);
 		}
 
 		fireModelChangedEvent(ChangeListener.Code.BookAdded);
@@ -298,7 +298,7 @@ public final class Library {
 		myBooks.remove(book);
 		refreshInTree(ROOT_FAVORITES, book);
 		refreshInTree(ROOT_RECENT, book);
-		removeFromTree(ROOT_SEARCH_RESULTS, book);
+		removeFromTree(ROOT_FOUND, book);
 		removeFromTree(ROOT_BY_TITLE, book);
 		removeFromTree(ROOT_BY_SERIES, book);
 		removeFromTree(ROOT_BY_AUTHOR, book);
@@ -488,7 +488,7 @@ public final class Library {
 
 		pattern = pattern.toLowerCase();
 
-		final SearchResultsTree oldSearchResults = (SearchResultsTree)getFirstLevelTree(ROOT_SEARCH_RESULTS);
+		final SearchResultsTree oldSearchResults = (SearchResultsTree)getFirstLevelTree(ROOT_FOUND);
 		if (oldSearchResults != null && pattern.equals(oldSearchResults.getPattern())) {
 			fireModelChangedEvent(ChangeListener.Code.Found);
 			return;
@@ -502,7 +502,7 @@ public final class Library {
 						if (oldSearchResults != null) {
 							oldSearchResults.removeSelf();
 						}
-						newSearchResults = new SearchResultsTree(myRootTree, ROOT_SEARCH_RESULTS, pattern);
+						newSearchResults = new SearchResultsTree(myRootTree, ROOT_FOUND, pattern);
 						fireModelChangedEvent(ChangeListener.Code.Found);
 					}
 					newSearchResults.getBookSubTree(book, true);