diff --git a/data/resources/application/en.xml b/data/resources/application/en.xml
index 86418dc35..16113ef78 100644
--- a/data/resources/application/en.xml
+++ b/data/resources/application/en.xml
@@ -4,54 +4,54 @@
 	  <node name="bookInfo" value="Book Info..."/>
 	  <node name="toc" value="Table of Contents"/>
 		<node name="library" value="Library">
-			<node name="open" value="Open"/>
-			<node name="previous" value="Previous Book"/>
-			<node name="recent" value="Recent"/>
+			<node name="showLibrary" value="Open"/>
+			<node name="previousBook" value="Previous Book"/>
+			<node name="showRecent" value="Recent"/>
 			<node name="addBook" value="Add Book..."/>
-			<node name="about" value="About FBReader"/>
+			<node name="showHelp" value="About FBReader"/>
 		</node>
 		<node name="navigate" value="Navigate">
-			<node name="gotoStartOfDocument" value="Go to Start of Document"/>
-			<node name="gotoStartOfSection" value="Go to Start of Text Section"/>
-			<node name="gotoEndOfSection" value="Go to End of Text Section"/>
-			<node name="gotoNextTOCItem" value="Go to Next TOC Item"/>
-			<node name="gotoPreviousTOCItem" value="Go to Previous TOC Item"/>
-			<node name="goBack" value="Go Back"/>
-			<node name="goForward" value="Go Forward"/>
+			<node name="gotoHome" value="Go to Start of Document"/>
+			<node name="gotoSectionStart" value="Go to Start of Text Section"/>
+			<node name="gotoSectionEnd" value="Go to End of Text Section"/>
+			<node name="nextTOCSection" value="Go to Next TOC Item"/>
+			<node name="previousTOCSection" value="Go to Previous TOC Item"/>
+			<node name="undo" value="Go Back"/>
+			<node name="redo" value="Go Forward"/>
 		</node>
 		<node name="selection" value="Selection">
-			<node name="clipboard" value="Copy to Clipboard"/>
-			<node name="dictionary" value="Open in Dictionary"/>
-			<node name="clear" value="Clear"/>
+			<node name="copyToClipboard" value="Copy to Clipboard"/>
+			<node name="openInDictionary" value="Open in Dictionary"/>
+			<node name="clearSelection" value="Clear"/>
 		</node>
 		<node name="search" value="Find">
-			<node name="find" value="Find Text..."/>
-			<node name="next" value="Find Next"/>
-			<node name="previous" value="Find Previous"/>
+			<node name="search" value="Find Text..."/>
+			<node name="findNext" value="Find Next"/>
+			<node name="findPrevious" value="Find Previous"/>
 		</node>
 		<node name="view" value="View">
 			<node name="rotate" value="Rotate Screen"/>
-			<node name="fullScreen" value="Full Screen"/>
+			<node name="toggleFullscreen" value="Full Screen"/>
 			<node name="toggleIndicator" value="Toggle Indicator"/>
 		</node>
-		<node name="settings" value="Preferences..."/>
-		<node name="close" value="Close"/>
+		<node name="preferences" value="Preferences..."/>
+		<node name="quit" value="Close"/>
 	</node>
 	<node name="toolbar">
-		<node name="books" value="Show Library Tree"/>
-		<node name="history" value="Show Recent Books List"/>
-		<node name="addbook" value="Add File to Library"/>
-		<node name="home" value="Go to Start of Text"/>
-		<node name="leftarrow" value="Go Back"/>
-		<node name="rightarrow" value="Go Forward"/>
-		<node name="contents" value="Table of Contents"/>
-		<node name="find" value="Text Search"/>
-		<node name="findnext" value="Find Next"/>
-		<node name="findprev" value="Find Previous"/>
-		<node name="bookinfo" value="Show Book Info Dialog"/>
-		<node name="settings" value="Show Preferences Dialog"/>
-		<node name="rotatescreen" value="Rotate Text"/>
-		<node name="help" value="About FBReader"/>
+		<node name="showLibrary" value="Show Library Tree"/>
+		<node name="showRecent" value="Show Recent Books List"/>
+		<node name="addBook" value="Add File to Library"/>
+		<node name="gotoHome" value="Go to Start of Text"/>
+		<node name="undo" value="Go Back"/>
+		<node name="redo" value="Go Forward"/>
+		<node name="toc" value="Table of Contents"/>
+		<node name="search" value="Text Search"/>
+		<node name="findNext" value="Find Next"/>
+		<node name="findPrevious" value="Find Previous"/>
+		<node name="bookInfo" value="Show Book Info Dialog"/>
+		<node name="preferences" value="Show Preferences Dialog"/>
+		<node name="rotate" value="Rotate Text"/>
+		<node name="showHelp" value="About FBReader"/>
 	</node>
 	<node name="dialog">
 		<node name="button">
@@ -221,7 +221,7 @@
 					<node name="command" value="Command to Execute"/>
 				</node>
 				<node name="Maemo" value="Maemo">
-					<node name="keyActionOnRelease" value="Key Action on Release, Not on Press"/>
+					<node name="keyActionOnRelease" value="Action on Key Release, not on Key Press"/>
 					<node name="minStylusPressure" value="Minimal Stylus Pressure"/>
 					<node name="maxStylusPressure" value="Maximal Stylus Pressure"/>
 				</node>
diff --git a/data/resources/application/fi.xml b/data/resources/application/fi.xml
index 8244270e8..ade02d21a 100644
--- a/data/resources/application/fi.xml
+++ b/data/resources/application/fi.xml
@@ -4,54 +4,54 @@
 	  <node name="bookInfo" value="Kirjan tiedot..."/>
 	  <node name="toc" value="Sisällysluettolo"/>
 		<node name="library" value="Kirjasto">
-			<node name="open" value="Avaa"/>
-			<node name="previous" value="Edellinen kirja"/>
-			<node name="recent" value="Viimeisin"/>
+			<node name="showLibrary" value="Avaa"/>
+			<node name="previousBook" value="Edellinen kirja"/>
+			<node name="showRecent" value="Viimeisin"/>
 			<node name="addBook" value="Lisää kirja..."/>
-			<node name="about" value="Tietoja FBReaderista"/>
+			<node name="showHelp" value="Tietoja FBReaderista"/>
 		</node>
 		<node name="navigate" value="Navigoi">
-			<node name="gotoStartOfDocument" value="Siirry dokumentin alkuun"/>
-			<node name="gotoStartOfSection" value="Siirry tekstiosion alkuun"/>
-			<node name="gotoEndOfSection" value="Siirry tekstiosion loppuun"/>
-			<node name="gotoNextTOCItem" value="Sisällysluettelon seuraavaan kohtaan"/>
-			<node name="gotoPreviousTOCItem" value="Sisällysluettelon edelliseen kohtaan"/>
-			<node name="goBack" value="Siirry edelliseen kohtaan"/>
-			<node name="goForward" value="Siirry eteenpäin"/>
+			<node name="gotoHome" value="Siirry dokumentin alkuun"/>
+			<node name="gotoSectionStart" value="Siirry tekstiosion alkuun"/>
+			<node name="gotoSectionEnd" value="Siirry tekstiosion loppuun"/>
+			<node name="nextTOCSection" value="Sisällysluettelon seuraavaan kohtaan"/>
+			<node name="previousTOCSection" value="Sisällysluettelon edelliseen kohtaan"/>
+			<node name="undo" value="Siirry edelliseen kohtaan"/>
+			<node name="redo" value="Siirry eteenpäin"/>
 		</node>
 		<node name="selection" value="Valinta">
-			<node name="clipboard" value="Kopioi leikepöydälle"/>
-			<node name="dictionary" value="Avaa sanakirjassa"/>
-			<node name="clear" value="Tyhjennä"/>
+			<node name="copyToClipboard" value="Kopioi leikepöydälle"/>
+			<node name="openInDictionary" value="Avaa sanakirjassa"/>
+			<node name="clearSelection" value="Tyhjennä"/>
 		</node>
 		<node name="search" value="Etsi">
-			<node name="find" value="Etsi teksti..."/>
-			<node name="next" value="Etsi seuraava"/>
-			<node name="previous" value="Etsi edellinen"/>
+			<node name="search" value="Etsi teksti..."/>
+			<node name="findNext" value="Etsi seuraava"/>
+			<node name="findPrevious" value="Etsi edellinen"/>
 		</node>
 		<node name="view" value="Näytä">
 			<node name="rotate" value="Kierrä näyttö"/>
-			<node name="fullScreen" value="Koko näyttö"/>
+			<node name="toggleFullscreen" value="Koko näyttö"/>
 			<node name="toggleIndicator" value="Sijainninilmaisin päällä/pois"/>
 		</node>
-		<node name="settings" value="Asetukset..."/>
-		<node name="close" value="Sulje"/>
+		<node name="preferences" value="Asetukset..."/>
+		<node name="quit" value="Sulje"/>
 	</node>
 	<node name="toolbar">
-		<node name="books" value="Näytä kirjastopuu"/>
-		<node name="history" value="Näytä viimeisimmät kirjat"/>
-		<node name="addbook" value="Lisää tiedosto kirjastoon"/>
-		<node name="home" value="Siirry tekstin alkuun"/>
-		<node name="leftarrow" value="Siirry edelliseen kohtaan"/>
-		<node name="rightarrow" value="Siirry eteenpäin"/>
-		<node name="contents" value="Sisällysluettelo"/>
-		<node name="find" value="Etsi teksti"/>
-		<node name="findnext" value="Etsi seuraava"/>
-		<node name="findprev" value="Etsi edellinen"/>
-		<node name="bookinfo" value="Näytä kirjan tiedot valintaikkuna"/>
-		<node name="settings" value="Näytä asetukset valintaikkuna"/>
-		<node name="rotatescreen" value="Kierrä teksti"/>
-		<node name="help" value="Tietoja FBReaderista"/>
+		<node name="showLibrary" value="Näytä kirjastopuu"/>
+		<node name="showRecent" value="Näytä viimeisimmät kirjat"/>
+		<node name="addBook" value="Lisää tiedosto kirjastoon"/>
+		<node name="gotoHome" value="Siirry tekstin alkuun"/>
+		<node name="undo" value="Siirry edelliseen kohtaan"/>
+		<node name="redo" value="Siirry eteenpäin"/>
+		<node name="toc" value="Sisällysluettelo"/>
+		<node name="search" value="Etsi teksti"/>
+		<node name="findNext" value="Etsi seuraava"/>
+		<node name="findPrevious" value="Etsi edellinen"/>
+		<node name="bookInfo" value="Näytä kirjan tiedot valintaikkuna"/>
+		<node name="preferences" value="Näytä asetukset valintaikkuna"/>
+		<node name="rotate" value="Kierrä teksti"/>
+		<node name="showHelp" value="Tietoja FBReaderista"/>
 	</node>
 	<node name="dialog">
 		<node name="button">
@@ -61,7 +61,7 @@
 			<node name="title" value="FBReader - Asetukset"/>
 			<node name="tab">
 				<node name="General" value="Yleinen">
-					<node name="bookPath" value="Kirjan hakemistopolku"/>
+					<node name="bookPath" value="Kirjaston polku"/>
 					<node name="lookInSubdirectories" value="Hae kirjoja alihakemistoista"/>
 					<node name="recentListSize" value="Viimeisimmät kirjat listan koko"/>
 					<node name="keyDelay" value="Hyväksyttyjen näppäinpainallusten viive"/>
@@ -71,7 +71,7 @@
 					<node name="defaultLanguage" value="Oletuskieli"/>
 					<node name="defaultEncodingSet" value="Oletusmerkistöalue"/>
 					<node name="defaultEncoding" value="Oletusmerkistö"/>
-					<node name="useWindows1252Hack" value="Use windows-1252 instead of iso-8859-1" toBeTranslated="true"/>
+					<node name="useWindows1252Hack" value="Käytä windows-1252 merkistöä iso-8859-1 sijaan"/>
 					<node name="chineseBreakAtAnyPosition" value="Katkaise Kiinaksi oleva teksti mistä tahansa kohdasta"/>
 				</node>
 				<node name="Indicator" value="Ilmaisin">
@@ -104,7 +104,7 @@
 					<node name="percentToScroll" value="Vieritysprosentti"/>
 				</node>
 				<node name="Selection" value="Valinta">
-					<node name="enableSelection" value="Enable Text Selection" toBeTranslated="true"/>
+					<node name="enableSelection" value="Ota käyttöön tekstin valinta"/>
 				</node>
 				<node name="Margins" value="Reunus">
 					<node name="left" value="Vasenreunus"/>
@@ -221,9 +221,9 @@
 					<node name="command" value="Suorituskomento"/>
 				</node>
 				<node name="Maemo" value="Maemo">
-					<node name="keyActionOnRelease" value="Key Action on Release, Not on Press" toBeTranslated="true"/>
-					<node name="minStylusPressure" value="Minimal Stylus Pressure" toBeTranslated="true"/>
-					<node name="maxStylusPressure" value="Maximal Stylus Pressure" toBeTranslated="true"/>
+					<node name="keyActionOnRelease" value="Toiminta näppäimen vapautuksesta painalluksen sijaan"/>
+					<node name="minStylusPressure" value="Styluksen minimi paine"/>
+					<node name="maxStylusPressure" value="Styluksen maksimi paine"/>
 				</node>
 			</node>
 		</node>
@@ -292,8 +292,8 @@
 		<node name="Section Title" value="Valinnan otsikolle"/>
 		<node name="Poem Title" value="Runon otsikolle"/>
 		<node name="Subtitle" value="Alaotsikolle"/>
-		<node name="Annotation" value="Sivuhuomautukselle"/>
-		<node name="Epigraph" value="Johdannolle"/>
+		<node name="Annotation" value="Huomautukselle"/>
+		<node name="Epigraph" value="Epigraphille"/>
 		<node name="Stanza" value="Säkeistölle"/>
 		<node name="Verse" value="Jakeelle"/>
 		<node name="Preformatted text" value="Esimuotoillulle tekstille"/>
diff --git a/data/resources/application/fr.xml b/data/resources/application/fr.xml
index fae78eec6..7f8bd8ceb 100644
--- a/data/resources/application/fr.xml
+++ b/data/resources/application/fr.xml
@@ -5,54 +5,54 @@
 		<node name="bookInfo" value="Informations sur le livre..."/>
 		<node name="toc" value="Table des matières"/>
 		<node name="library" value="Bibliothèque">
-			<node name="open" value="Ouvrir"/>
-			<node name="previous" value="Livre précédent"/>
-			<node name="recent" value="Récents"/>
+			<node name="showLibrary" value="Ouvrir"/>
+			<node name="previousBook" value="Livre précédent"/>
+			<node name="showRecent" value="Récents"/>
 			<node name="addBook" value="Ajouter un livre..."/>
-			<node name="about" value="À propos de FBReader"/>
+			<node name="showHelp" value="À propos de FBReader"/>
 		</node>
 		<node name="navigate" value="Navigation">
-			<node name="gotoStartOfDocument" value="Aller au début du document"/>
-			<node name="gotoStartOfSection" value="Aller au début de la section"/>
-			<node name="gotoEndOfSection" value="Aller à la fin de la section"/>
-			<node name="gotoNextTOCItem" value="Aller à l'entrée suivante de la TDM"/>
-			<node name="gotoPreviousTOCItem" value="Aller à l'entrée précédente de la TDM"/>
-			<node name="goBack" value="Précédent"/>
-			<node name="goForward" value="Suivant"/>
+			<node name="gotoHome" value="Aller au début du document"/>
+			<node name="gotoSectionStart" value="Aller au début de la section"/>
+			<node name="gotoSectionEnd" value="Aller à la fin de la section"/>
+			<node name="nextTOCSection" value="Aller à l'entrée suivante de la TDM"/>
+			<node name="previousTOCSection" value="Aller à l'entrée précédente de la TDM"/>
+			<node name="undo" value="Précédent"/>
+			<node name="redo" value="Suivant"/>
 		</node>
 		<node name="selection" value="Sélection">
-			<node name="clipboard" value="Copier dans le presse-papier"/>
-			<node name="dictionary" value="Ouvrir dans le dictionnaire"/>
-			<node name="clear" value="Effacer"/>
+			<node name="copyToClipboard" value="Copier dans le presse-papier"/>
+			<node name="openInDictionary" value="Ouvrir dans le dictionnaire"/>
+			<node name="clearSelection" value="Effacer"/>
 		</node>
 		<node name="search" value="Recherche">
-			<node name="find" value="Rechercher le texte..."/>
-			<node name="next" value="Rechercher suivant"/>
-			<node name="previous" value="Rechercher précédent"/>
+			<node name="search" value="Rechercher le texte..."/>
+			<node name="findNext" value="Rechercher suivant"/>
+			<node name="findPrevious" value="Rechercher précédent"/>
 		</node>
 		<node name="view" value="Affichage">
 			<node name="rotate" value="Tourner l'écran"/>
-			<node name="fullScreen" value="Plein écran"/>
+			<node name="toggleFullscreen" value="Plein écran"/>
 												<node name="toggleIndicator" value="Afficher/Masquer l'indicateur"/>
 		</node>
-		<node name="settings" value="Préférences..."/>
-		<node name="close" value="Fermer"/>
+		<node name="preferences" value="Préférences..."/>
+		<node name="quit" value="Fermer"/>
 	</node>
 	<node name="toolbar">
-		<node name="books" value="Afficher l'arbre de la bibliothèque"/>
-		<node name="history" value="Afficher la liste des livres récents"/>
-		<node name="addbook" value="Ajouter un livre à la bibliothèque"/>
-		<node name="home" value="Aller au début du texte"/>
-		<node name="leftarrow" value="Précédent"/>
-		<node name="rightarrow" value="Suivant"/>
-		<node name="contents" value="Table des matières"/>
-		<node name="find" value="Rechercher"/>
-		<node name="findnext" value="Rechercher suivant"/>
-		<node name="findprev" value="Rechercher précédent"/>
-		<node name="bookinfo" value="Afficher les informations sur le livre"/>
-		<node name="settings" value="Afficher les préférences"/>
-		<node name="rotatescreen" value="Tourner l'écran"/>
-		<node name="help" value="À propos de FBReader"/>
+		<node name="showLibrary" value="Afficher l'arbre de la bibliothèque"/>
+		<node name="showRecent" value="Afficher la liste des livres récents"/>
+		<node name="addBook" value="Ajouter un livre à la bibliothèque"/>
+		<node name="gotoHome" value="Aller au début du texte"/>
+		<node name="undo" value="Précédent"/>
+		<node name="redo" value="Suivant"/>
+		<node name="toc" value="Table des matières"/>
+		<node name="search" value="Rechercher"/>
+		<node name="findNext" value="Rechercher suivant"/>
+		<node name="findPrevious" value="Rechercher précédent"/>
+		<node name="bookInfo" value="Afficher les informations sur le livre"/>
+		<node name="preferences" value="Afficher les préférences"/>
+		<node name="rotate" value="Tourner l'écran"/>
+		<node name="showHelp" value="À propos de FBReader"/>
 	</node>
 	<node name="dialog">
 		<node name="button">
@@ -222,7 +222,7 @@
 					<node name="command" value="Commande à exécuter"/>
 				</node>
 				<node name="Maemo" value="Maemo">
-					<node name="keyActionOnRelease" value="Key Action on Release, Not on Press" toBeTranslated="true"/>
+					<node name="keyActionOnRelease" value="Action on Key Release, not on Key Press" toBeTranslated="true"/>
 					<node name="minStylusPressure" value="Minimal Stylus Pressure" toBeTranslated="true"/>
 					<node name="maxStylusPressure" value="Maximal Stylus Pressure" toBeTranslated="true"/>
 				</node>
diff --git a/data/resources/application/it.xml b/data/resources/application/it.xml
index 53eb7adce..de91c2681 100644
--- a/data/resources/application/it.xml
+++ b/data/resources/application/it.xml
@@ -4,54 +4,54 @@
 	  <node name="bookInfo" value="Informazioni Libro..."/>
 	  <node name="toc" value="Indice"/>
 		<node name="library" value="Biblioteca">
-			<node name="open" value="Apri"/>
-			<node name="previous" value="Libro Precedente"/>
-			<node name="recent" value="Recenti"/>
+			<node name="showLibrary" value="Apri"/>
+			<node name="previousBook" value="Libro Precedente"/>
+			<node name="showRecent" value="Recenti"/>
 			<node name="addBook" value="Aggiungi Libro..."/>
-			<node name="about" value="Informazioni su FBReader"/>
+			<node name="showHelp" value="Informazioni su FBReader"/>
 		</node>
 		<node name="navigate" value="Navigazione">
-			<node name="gotoStartOfDocument" value="Vai all'Inizio del Documento"/>
-			<node name="gotoStartOfSection" value="Vai all'Inizio di Sezione"/>
-			<node name="gotoEndOfSection" value="Vai alla Fine di Sezione"/>
-			<node name="gotoNextTOCItem" value="Vai al Successivo Elemento dell'Indice"/>
-			<node name="gotoPreviousTOCItem" value="Vai al Precedente Elemento dell'Indice"/>
-			<node name="goBack" value="Vai Indietro"/>
-			<node name="goForward" value="Vai Avanti"/>
+			<node name="gotoHome" value="Vai all'Inizio del Documento"/>
+			<node name="gotoSectionStart" value="Vai all'Inizio di Sezione"/>
+			<node name="gotoSectionEnd" value="Vai alla Fine di Sezione"/>
+			<node name="nextTOCSection" value="Vai al Successivo Elemento dell'Indice"/>
+			<node name="previousTOCSection" value="Vai al Precedente Elemento dell'Indice"/>
+			<node name="undo" value="Vai Indietro"/>
+			<node name="redo" value="Vai Avanti"/>
 		</node>
 		<node name="selection" value="Selezione">
-			<node name="clipboard" value="Copia negli Appunti"/>
-			<node name="dictionary" value="Apri in Dizionario"/>
-			<node name="clear" value="Deseleziona"/>
+			<node name="copyToClipboard" value="Copia negli Appunti"/>
+			<node name="openInDictionary" value="Apri in Dizionario"/>
+			<node name="clearSelection" value="Deseleziona"/>
 		</node>
 		<node name="search" value="Trova">
-			<node name="find" value="Trova Testo..."/>
-			<node name="next" value="Trova Successivo"/>
-			<node name="previous" value="Trova Precedente"/>
+			<node name="search" value="Trova Testo..."/>
+			<node name="findNext" value="Trova Successivo"/>
+			<node name="findPrevious" value="Trova Precedente"/>
 		</node>
 		<node name="view" value="Visualizzazione">
 			<node name="rotate" value="Ruota Schermo"/>
-			<node name="fullScreen" value="A Tutto Schermo"/>
+			<node name="toggleFullscreen" value="A Tutto Schermo"/>
 			<node name="toggleIndicator" value="Alterna Indicatore"/>
 		</node>
-		<node name="settings" value="Preferenze..."/>
-		<node name="close" value="Chiudi"/>
+		<node name="preferences" value="Preferenze..."/>
+		<node name="quit" value="Chiudi"/>
 	</node>
 	<node name="toolbar">
-		<node name="books" value="Mostra Albero Biblioteca"/>
-		<node name="history" value="Mostra Elenco Libri Recenti"/>
-		<node name="addbook" value="Aggiungi File alla Biblioteca"/>
-		<node name="home" value="Vai all'Inizio del Testo"/>
-		<node name="leftarrow" value="Vai Indietro"/>
-		<node name="rightarrow" value="Vai Avanti"/>
-		<node name="contents" value="Indice"/>
-		<node name="find" value="Trova Testo"/>
-		<node name="findnext" value="Trova Successivo"/>
-		<node name="findprev" value="Trova Precedente"/>
-		<node name="bookinfo" value="Mostra Finestra Informazioni Libro"/>
-		<node name="settings" value="Mostra Finestra Preferenze"/>
-		<node name="rotatescreen" value="Ruota Testo"/>
-		<node name="help" value="Informazioni su FBReader"/>
+		<node name="showLibrary" value="Mostra Albero Biblioteca"/>
+		<node name="showRecent" value="Mostra Elenco Libri Recenti"/>
+		<node name="addBook" value="Aggiungi File alla Biblioteca"/>
+		<node name="gotoHome" value="Vai all'Inizio del Testo"/>
+		<node name="undo" value="Vai Indietro"/>
+		<node name="redo" value="Vai Avanti"/>
+		<node name="toc" value="Indice"/>
+		<node name="search" value="Trova Testo"/>
+		<node name="findNext" value="Trova Successivo"/>
+		<node name="findPrevious" value="Trova Precedente"/>
+		<node name="bookInfo" value="Mostra Finestra Informazioni Libro"/>
+		<node name="preferences" value="Mostra Finestra Preferenze"/>
+		<node name="rotate" value="Ruota Testo"/>
+		<node name="showHelp" value="Informazioni su FBReader"/>
 	</node>
 	<node name="dialog">
 		<node name="button">
@@ -221,7 +221,7 @@
 					<node name="command" value="Comando da Eseguire"/>
 				</node>
 				<node name="Maemo" value="Maemo">
-					<node name="keyActionOnRelease" value="Key Action on Release, Not on Press" toBeTranslated="true"/>
+					<node name="keyActionOnRelease" value="Action on Key Release, not on Key Press" toBeTranslated="true"/>
 					<node name="minStylusPressure" value="Minimal Stylus Pressure" toBeTranslated="true"/>
 					<node name="maxStylusPressure" value="Maximal Stylus Pressure" toBeTranslated="true"/>
 				</node>
diff --git a/data/resources/application/ru.xml b/data/resources/application/ru.xml
index bfcd629fd..61f959ec3 100644
--- a/data/resources/application/ru.xml
+++ b/data/resources/application/ru.xml
@@ -4,54 +4,54 @@
 	  <node name="bookInfo" value="Информация о книге..."/>
 	  <node name="toc" value="Содержание"/>
 		<node name="library" value="Библиотека">
-			<node name="open" value="Открыть библиотеку"/>
-			<node name="previous" value="Предыдущая книга"/>
-			<node name="recent" value="Прочитанные книги"/>
+			<node name="showLibrary" value="Открыть библиотеку"/>
+			<node name="previousBook" value="Предыдущая книга"/>
+			<node name="showRecent" value="Прочитанные книги"/>
 			<node name="addBook" value="Добавить файл..."/>
-			<node name="about" value="О программе FBReader"/>
+			<node name="showHelp" value="О программе FBReader"/>
 		</node>
 		<node name="navigate" value="Переход">
-			<node name="gotoStartOfDocument" value="В начало книги"/>
-			<node name="gotoStartOfSection" value="В начало раздела"/>
-			<node name="gotoEndOfSection" value="В конец раздела"/>
-			<node name="gotoNextTOCItem" value="К следующей главе"/>
-			<node name="gotoPreviousTOCItem" value="К предыдущей главе"/>
-			<node name="goBack" value="Назад"/>
-			<node name="goForward" value="Вперед"/>
+			<node name="gotoHome" value="В начало книги"/>
+			<node name="gotoSectionStart" value="В начало раздела"/>
+			<node name="gotoSectionEnd" value="В конец раздела"/>
+			<node name="nextTOCSection" value="К следующей главе"/>
+			<node name="previousTOCSection" value="К предыдущей главе"/>
+			<node name="undo" value="Назад"/>
+			<node name="redo" value="Вперед"/>
 		</node>
 		<node name="selection" value="Пометка">
-			<node name="clipboard" value="Скопировать в буфер"/>
-			<node name="dictionary" value="Посмотреть в словаре"/>
-			<node name="clear" value="Убрать пометку"/>
+			<node name="copyToClipboard" value="Скопировать в буфер"/>
+			<node name="openInDictionary" value="Посмотреть в словаре"/>
+			<node name="clearSelection" value="Убрать пометку"/>
 		</node>
 		<node name="search" value="Поиск">
-			<node name="find" value="Искать..."/>
-			<node name="next" value="Искать дальше"/>
-			<node name="previous" value="Искать раньше"/>
+			<node name="search" value="Искать..."/>
+			<node name="findNext" value="Искать дальше"/>
+			<node name="findPrevious" value="Искать раньше"/>
 		</node>
 		<node name="view" value="Изображение">
 			<node name="rotate" value="Повернуть"/>
-			<node name="fullScreen" value="На весь экран"/>
+			<node name="toggleFullscreen" value="На весь экран"/>
 			<node name="toggleIndicator" value="Индикатор позиции"/>
 		</node>
-		<node name="settings" value="Настройки..."/>
-		<node name="close" value="Закрыть"/>
+		<node name="preferences" value="Настройки..."/>
+		<node name="quit" value="Закрыть"/>
 	</node>
 	<node name="toolbar">
-		<node name="books" value="Библиотека"/>
-		<node name="history" value="Прочитанные книги"/>
-		<node name="addbook" value="Добавить файл в библиотеку"/>
-		<node name="home" value="В начало книги"/>
-		<node name="leftarrow" value="Назад"/>
-		<node name="rightarrow" value="Вперед"/>
-		<node name="contents" value="Оглавление"/>
-		<node name="find" value="Поиск"/>
-		<node name="findnext" value="Найти следующий"/>
-		<node name="findprev" value="Найти предыдущий"/>
-		<node name="bookinfo" value="Информация о книге"/>
-		<node name="settings" value="Настройки"/>
-		<node name="rotatescreen" value="Поворот текста"/>
-		<node name="help" value="О программе"/>
+		<node name="showLibrary" value="Библиотека"/>
+		<node name="showRecent" value="Прочитанные книги"/>
+		<node name="addBook" value="Добавить файл в библиотеку"/>
+		<node name="gotoHome" value="В начало книги"/>
+		<node name="undo" value="Назад"/>
+		<node name="redo" value="Вперед"/>
+		<node name="toc" value="Оглавление"/>
+		<node name="search" value="Поиск"/>
+		<node name="findNext" value="Найти следующий"/>
+		<node name="findPrevious" value="Найти предыдущий"/>
+		<node name="bookInfo" value="Информация о книге"/>
+		<node name="preferences" value="Настройки"/>
+		<node name="rotate" value="Поворот текста"/>
+		<node name="showHelp" value="О программе"/>
 	</node>
 	<node name="dialog">
 		<node name="button">
@@ -71,7 +71,7 @@
 					<node name="defaultLanguage" value="Язык по умолчанию"/>
 					<node name="defaultEncodingSet" value="Набор кодировок по умолчанию"/>
 					<node name="defaultEncoding" value="Кодировка по умолчанию"/>
-					<node name="useWindows1252Hack" value="Use windows-1252 instead of iso-8859-1" toBeTranslated="true"/>
+					<node name="useWindows1252Hack" value="Использовать windows-1252 вместо iso-8859-1"/>
 					<node name="chineseBreakAtAnyPosition" value="В китайском языке разрыв строки в любом месте"/>
 				</node>
 				<node name="Indicator" value="Индикатор">
@@ -221,7 +221,7 @@
 					<node name="command" value="Выполнять команду"/>
 				</node>
 				<node name="Maemo" value="Maemo">
-					<node name="keyActionOnRelease" value="Key Action on Release, Not on Press" toBeTranslated="true"/>
+					<node name="keyActionOnRelease" value="Реагировать на отпускание клавиши, а не на нажатие"/>
 					<node name="minStylusPressure" value="Минимальное давление стилуса"/>
 					<node name="maxStylusPressure" value="Максимальное давление стилуса"/>
 				</node>
diff --git a/data/resources/application/sv.xml b/data/resources/application/sv.xml
new file mode 100644
index 000000000..92e7ca4f8
--- /dev/null
+++ b/data/resources/application/sv.xml
@@ -0,0 +1,337 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+  <node name="menu">
+	  <node name="bookInfo" value="Bokinformation..."/>
+	  <node name="toc" value="Innehållsförteckning"/>
+		<node name="library" value="Bibliotek">
+			<node name="showLibrary" value="Öppna"/>
+			<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>
+		<node name="navigate" value="Navigation">
+			<node name="gotoHome" value="Gå till början av dokumentet"/>
+			<node name="gotoSectionStart" value="Gå till början av textavsnitt"/>
+			<node name="gotoSectionEnd" value="Gå till slutet av textavsnitt"/>
+			<node name="nextTOCSection" value="Gå till nästa post i innehållsförteckning"/>
+			<node name="previousTOCSection" value="Gå till föregående post i innehållsförteckning"/>
+			<node name="undo" value="Gå bakåt"/>
+			<node name="redo" value="Gå framåt"/>
+		</node>
+		<node name="selection" value="Markering">
+			<node name="copyToClipboard" value="Kopiera till urklipp"/>
+			<node name="openInDictionary" value="Öppna i ordbok"/>
+			<node name="clearSelection" value="Töm"/>
+		</node>
+		<node name="search" value="Sök">
+			<node name="search" value="Sök text..."/>
+			<node name="findNext" value="Sök nästa"/>
+			<node name="findPrevious" value="Sök föregående"/>
+		</node>
+		<node name="view" value="Visa">
+			<node name="rotate" value="Rotera skärm"/>
+			<node name="toggleFullscreen" value="Helskärm"/>
+			<node name="toggleIndicator" value="Växla indikator"/>
+		</node>
+		<node name="preferences" value="Inställningar..."/>
+		<node name="quit" value="Stäng"/>
+	</node>
+	<node name="toolbar">
+		<node name="showLibrary" value="Visa biblioteksträd"/>
+		<node name="showRecent" value="Visa tidigare bokhistorik"/>
+		<node name="addBook" value="Lägg till fil till bibliotek"/>
+		<node name="gotoHome" value="Gå till början av text"/>
+		<node name="undo" value="Gå bakåt"/>
+		<node name="redo" value="Gå framåt"/>
+		<node name="toc" value="Innehållsförteckning"/>
+		<node name="search" value="Textsökning"/>
+		<node name="findNext" value="Sök nästa"/>
+		<node name="findPrevious" value="Sök föregående"/>
+		<node name="bookInfo" value="Visa bokinformation"/>
+		<node name="preferences" value="Visa inställningar"/>
+		<node name="rotate" value="Rotera text"/>
+		<node name="showHelp" value="Om FBReader"/>
+	</node>
+	<node name="dialog">
+		<node name="button">
+			<node name="go" value="&amp;Gå!"/>
+		</node>
+		<node name="OptionsDialog">
+			<node name="title" value="FBReader - Alternativ"/>
+			<node name="tab">
+				<node name="General" value="Allmänt">
+					<node name="bookPath" value="Boksökväg"/>
+					<node name="lookInSubdirectories" value="Leta efter böcker i underkataloger"/>
+					<node name="recentListSize" value="Storlek på lista över tidigare böcker"/>
+					<node name="keyDelay" value="Delay Between Accepted Key Pressings"/>
+				</node>
+				<node name="Language" value="Språk">
+					<node name="autoDetect" value="Upptäck automatiskt språk och kodning"/>
+					<node name="defaultLanguage" value="Standardspråk"/>
+					<node name="defaultEncodingSet" value="Standardteckenuppsättning"/>
+					<node name="defaultEncoding" value="Standardkodning"/>
+					<node name="useWindows1252Hack" value="Använd windows-1252 istället för iso-8859-1"/>
+					<node name="chineseBreakAtAnyPosition" value="För kinesiska radbrytningar på valfri position"/>
+				</node>
+				<node name="Indicator" value="Indikator">
+					<node name="show" value="Visa positionsindikator"/>
+					<node name="height" value="Indikatorns höjd"/>
+					<node name="offset" value="Offset från text"/>
+					<node name="pageNumber" value="Visa position som siffror"/>
+					<node name="time" value="Visa tid"/>
+					<node name="fontSize" value="Typsnittsstorlek"/>
+					<node name="tocMarks" value="Visa förteckningsmarkeringar"/>
+					<node name="navigation" value="Aktivera navigering"/>
+				</node>
+				<node name="Scrolling" value="Rullning">
+					<node name="optionsFor" value="Alternativ för">
+						<node name="large" value="Large Scrollings"/>
+						<node name="small" value="Small Scrollings"/>
+						<node name="mouse" value="Mouse Scrollings"/>
+						<node name="finger" value="Finger Tap Scrollings"/>
+					</node>
+					<node name="delay" value="Fördröjning mellan rullningar, ms"/>
+					<node name="mode" value="Rullningsläge">
+						<node name="noOverlapping" value="Ingen överlappning"/>
+						<node name="keepLines" value="Behåll rader"/>
+						<node name="scrollLines" value="Rulla rader"/>
+						<node name="scrollPercentage" value="Rulla procentandel"/>
+						<node name="disable" value="Inaktivera"/>
+					</node>
+					<node name="linesToKeep" value="Rader att behålla"/>
+					<node name="linesToScroll" value="Rader att rulla"/>
+					<node name="percentToScroll" value="Procentandel att rulla"/>
+				</node>
+				<node name="Selection" value="Markering">
+					<node name="enableSelection" value="Aktivera textmarkering"/>
+				</node>
+				<node name="Margins" value="Marginaler">
+					<node name="left" value="Vänstermarginal"/>
+					<node name="right" value="Högermarginal"/>
+					<node name="top" value="Övermarginal"/>
+					<node name="bottom" value="Nedermarginal"/>
+				</node>
+				<node name="Format" value="Formatering">
+					<node name="optionsFor" value="Alternativ för"/>
+					<node name="lineSpacing" value="Radmellanrum">
+						<node name="unchanged" value="&lt;oförändrad&gt;"/>
+					</node>
+					<node name="firstLineIndent" value="Indentera första raden"/>
+					<node name="alignment" value="Justering">
+						<node name="left" value="Vänster"/>
+						<node name="right" value="Höger"/>
+						<node name="center" value="Centrera"/>
+						<node name="justify" value="Justera"/>
+						<node name="unchanged" value="&lt;oförändrad&gt;"/>
+					</node>
+					<node name="spaceBefore" value="Blanksteg före"/>
+					<node name="spaceAfter" value="Blanksteg efter"/>
+					<node name="leftIndent" value="Vänsterindentering"/>
+					<node name="rightIndent" value="Högerindentering"/>
+				</node>
+				<node name="Styles" value="Stilar">
+					<node name="optionsFor" value="Alternativ för"/>
+					<node name="fontFamily" value="Familj">
+						<node name="unchanged" value="&lt;oförändrad&gt;"/>
+					</node>
+					<node name="fontSize" value="Storlek"/>
+					<node name="fontSizeDifference" value="Storleksskillnad"/>
+					<node name="bold" value="Fet"/>
+					<node name="italic" value="Kursiv"/>
+					<node name="allowHyphenations" value="Tillåt avstavningar"/>
+					<node name="autoHyphenations" value="Automatiska avstavningar"/>
+				</node>
+				<node name="Rotation" value="Rotering">
+					<node name="direction" value="Roteringstyp">
+						<node name="disabled" value="Inaktiverad"/>
+						<node name="clockwise" value="90 grader medsols"/>
+						<node name="counterclockwise" value="90 grader motsols"/>
+						<node name="180" value="180 grader"/>
+						<node name="cycle" value="Växla genom alla fyra riktningar"/>
+					</node>
+				</node>
+				<node name="Colors" value="Färger">
+					<node name="colorFor" value="Färg för">
+						<node name="background" value="Bakgrund"/>
+						<node name="selectionBackground" value="Markeringsbakgrund"/>
+						<node name="text" value="Vanlig text"/>
+						<node name="internalLink" value="Text för intern hyperlänk"/>
+						<node name="externalLink" value="Text för extern hyperlänk"/>
+						<node name="highlighted" value="Färgmarkerad text"/>
+						<node name="treeLines" value="Trädrader"/>
+						<node name="indicator" value="Positionsindikator"/>
+					</node>
+				</node>
+				<node name="Keys" value="Tangenter">
+					<node name="grabSystemKeys" value="Fånga systemtangenter"/>
+					<node name="separate" value="Tangentbindningar beroende av orientering"/>
+					<node name="orientation" value="Orientering"/>
+					<node name="action">
+						<node name="none" value="Ingen"/>
+						<node name="showLibrary" value="Visa bibliotek"/>
+						<node name="showRecent" value="Visa tidigare böcker"/>
+						<node name="previousBook" value="Öppna föregående bok"/>
+						<node name="toc" value="Visa innehållsförteckning"/>
+						<node name="gotoHome" value="Gå hem"/>
+						<node name="gotoSectionStart" value="Gå till början av avsnitt"/>
+						<node name="gotoSectionEnd" value="Gå till slutet av avsnitt"/>
+						<node name="nextTOCSection" value="Gå till nästa avsnitt i förteckning"/>
+						<node name="previousTOCSection" value="Gå till föregående avsnitt i förteckning"/>
+						<node name="largeScrollForward" value="Stor rullning framåt"/>
+						<node name="largeScrollBackward" value="Stor rullning bakåt"/>
+						<node name="smallScrollForward" value="Liten rullning framåt"/>
+						<node name="smallScrollBackward" value="Liten rullning bakåt"/>
+						<node name="undo" value="Ångra"/>
+						<node name="redo" value="Gör om"/>
+						<node name="copyToClipboard" value="Kopiera markerad text till urklipp"/>
+						<node name="openInDictionary" value="Öppna markerad text i ordbok"/>
+						<node name="clearSelection" value="Töm markering"/>
+						<node name="search" value="Sök"/>
+						<node name="findPrevious" value="Sök föregående"/>
+						<node name="findNext" value="Sök nästa"/>
+						<node name="increaseFont" value="Öka typsnittsstorlek"/>
+						<node name="decreaseFont" value="Minska typsnittsstorlek"/>
+						<node name="toggleIndicator" value="Växla positionsindikator"/>
+						<node name="toggleFullscreen" value="Växla helskärmsläge"/>
+						<node name="onFullscreen" value="Växla till helskärmsläge"/>
+						<node name="rotate" value="Rotera skärm"/>
+						<node name="preferences" value="Visa alternativdialog"/>
+						<node name="bookInfo" value="Visa bokinformation"/>
+						<node name="addBook" value="Lägg till bok"/>
+						<node name="cancel" value="Avbryt"/>
+						<node name="quit" value="Avsluta"/>
+					</node>
+					<node name="quitOnCancel" value="Avsluta programmet vid avbryt"/>
+				</node>
+				<node name="Config" value="Konfiguration">
+					<node name="autoSave" value="Spara tillstånd automatiskt"/>
+					<node name="timeout" value="Tidsgräns mellan sparningar, sekunder"/>
+				</node>
+				<node name="Dictionary" value="Ordbok">
+					<node name="enableIntegration" value="Aktivera integration med %s"/>
+					<node name="defaultText" value="Aktivera integration med ordbok"/>
+					<node name="choice" value="Integrera med"/>
+					<node name="singleClickOpen" value="Öppna med ett klick"/>
+				</node>
+				<node name="Web" value="Webb">
+					<node name="enableIntegration" value="Öppna externa länkar med %s"/>
+					<node name="defaultText" value="Öppna externa länkar i webbläsare"/>
+					<node name="choice" value="Använd webbläsare"/>
+					<node name="command" value="Kommando att köra"/>
+				</node>
+				<node name="Maemo" value="Maemo">
+					<node name="keyActionOnRelease" value="Åtgärd vid tangentsläpp, inte tangenttryck"/>
+					<node name="minStylusPressure" value="Minimalt pentryck"/>
+					<node name="maxStylusPressure" value="Maximalt pentryck"/>
+				</node>
+			</node>
+		</node>
+		<node name="InfoDialog">
+			<node name="title" value="FBReader - Bokinformation"/>
+			<node name="tab">
+				<node name="Common" value="Allmänt">
+					<node name="file" value="Fil"/>
+					<node name="title" value="Titel"/>
+					<node name="authorDisplayName" value="Författare (Visningsnamn)"/>
+					<node name="authorSortKey" value="Författare (Sorteringsnyckel)"/>
+					<node name="language" value="Språk"/>
+					<node name="encodingSet" value="Teckenuppsättning"/>
+					<node name="encoding" value="Kodning"/>
+				</node>
+				<node name="Series" value="Serier">
+					<node name="seriesTitle" value="Serietitel"/>
+					<node name="bookNumber" value="Boknummer"/>
+				</node>
+				<node name="Text" value="Text">
+					<node name="breakType" value="Bryt stycke vid"/>
+					<node name="ignoreIndent" value="Ignorera indentering mindre än"/>
+					<node name="buildTOC" value="Bygg innehållsförteckning"/>
+					<node name="emptyLines" value="Tomma rader innan nytt avsnitt"/>
+				</node>
+				<node name="&lt;PRE&gt;" value="&lt;PRE&gt;">
+					<node name="breakType" value="Bryt stycke vid"/>
+					<node name="ignoreIndent" value="Ignorera indentering mindre än"/>
+					<node name="buildTOC" value="Bygg innehållsförteckning"/>
+					<node name="emptyLines" value="Tomma rader innan nytt avsnitt"/>
+				</node>
+			</node>
+		</node>
+		<node name="addFileDialog">
+			<node name="title" value="FBReader - Lägg till bok till biblioteket"/>
+		</node>
+		<node name="textSearchDialog">
+			<node name="title" value="Textsökning"/>
+			<node name="text" value=""/>
+			<node name="ignoreCase" value="&amp;Ignorera skiftläge"/>
+			<node name="wholeText" value="I h&amp;ela texten"/>
+			<node name="backward" value="&amp;Bakåt"/>
+			<node name="currentSection" value="Endast i &amp;detta avsnitt"/>
+		</node>
+		<node name="removeBookBox">
+			<node name="title" value="Ta bort bok"/>
+			<node name="message" value="Ta bort boken &#13;&quot;%s&quot;&#13; från biblioteket?"/>
+		</node>
+		<node name="openBookErrorBox">
+			<node name="title" value="Fel"/>
+			<node name="message" value="Kunde inte öppna:&#13;%s"/>
+		</node>
+		<node name="noHelpBox">
+			<node name="title" value="Fel"/>
+			<node name="message" value="Tyvärr, hjälpfilen hittades inte"/>
+		</node>
+		<node name="waitMessage">
+			<node name="loadingBook" value="Läser in bok. Var god vänta..."/>
+			<node name="loadingBookList" value="Läser in boklista. Var god vänta..."/>
+		</node>
+	</node>
+	<node name="style">
+		<node name="Base" value="Bas"/>
+		<node name="Regular Paragraph" value="Vanligt stycke"/>
+		<node name="Title" value="Titel"/>
+		<node name="Section Title" value="Avsnittstitel"/>
+		<node name="Poem Title" value="Poem Title"/>
+		<node name="Subtitle" value="Undertext"/>
+		<node name="Annotation" value="Notation"/>
+		<node name="Epigraph" value="Epigram"/>
+		<node name="Stanza" value="Strof"/>
+		<node name="Verse" value="Vers"/>
+		<node name="Preformatted text" value="Förformaterad text"/>
+		<node name="Image" value="Bild"/>
+		<node name="Cite" value="Citat"/>
+		<node name="Author" value="Författare"/>
+		<node name="Date" value="Datum"/>
+		<node name="Internal Hyperlink" value="Intern hyperlänk"/>
+		<node name="Footnote" value="Fotnot"/>
+		<node name="Emphasis" value="Betoning"/>
+		<node name="Strong" value="Stark"/>
+		<node name="Subscript" value="Nedsänkt"/>
+		<node name="Superscript" value="Upphöjt"/>
+		<node name="Code" value="Kod"/>
+		<node name="StrikeThrough" value="Genomstruket"/>
+		<node name="Contents Table" value="Innehållstabell"/>
+		<node name="Author in Library" value="Författare i bibliotek"/>
+		<node name="Book in Library" value="Bok i bibliotek"/>
+		<node name="Recent Book List" value="Lista över tidigare böcker"/>
+		<node name="Italic" value="Kursiv"/>
+		<node name="Bold" value="Fet"/>
+		<node name="Definition" value="Definition"/>
+		<node name="Definition Description" value="Definitionsbeskrivning"/>
+		<node name="Header 1" value="Rubrik 1"/>
+		<node name="Header 2" value="Rubrik 2"/>
+		<node name="Header 3" value="Rubrik 3"/>
+		<node name="Header 4" value="Rubrik 4"/>
+		<node name="Header 5" value="Rubrik 5"/>
+		<node name="Header 6" value="Rubrik 6"/>
+		<node name="External Hyperlink" value="Extern hyperlänk"/>
+	</node>
+	<node name="external">
+		<node name="browser" value="Webbläsare"/>
+		<node name="defaultBrowser" value="Standardwebbläsare"/>
+	</node>
+	<node name="mobipocketPlugin">
+		<node name="unknown" value="Okänt fel"/>
+		<node name="unsupportedCompressionMethod" value="Komprimeringsmetoden stöds inte"/>
+		<node name="encriptedFile" value="DRM-skyddad fil"/>
+	</node>
+</resources>
diff --git a/data/resources/application/uk.xml b/data/resources/application/uk.xml
index bb38857ca..56dc8554d 100644
--- a/data/resources/application/uk.xml
+++ b/data/resources/application/uk.xml
@@ -4,54 +4,54 @@
 	  <node name="bookInfo" value="Інформація про книгу..."/>
 	  <node name="toc" value="Зміст"/>
 		<node name="library" value="Бібліотека">
-			<node name="open" value="Відкрити бібліотеку"/>
-			<node name="previous" value="Попередня книга"/>
-			<node name="recent" value="Прочитані книги"/>
+			<node name="showLibrary" value="Відкрити бібліотеку"/>
+			<node name="previousBook" value="Попередня книга"/>
+			<node name="showRecent" value="Прочитані книги"/>
 			<node name="addBook" value="Додати файл..."/>
-			<node name="about" value="Про програму FBReader"/>
+			<node name="showHelp" value="Про програму FBReader"/>
 		</node>
 		<node name="navigate" value="Навігація">
-			<node name="gotoStartOfDocument" value="На початок книги"/>
-			<node name="gotoStartOfSection" value="На початок розділу"/>
-			<node name="gotoEndOfSection" value="В кінець розділу"/>
-			<node name="gotoNextTOCItem" value="До наступної глави"/>
-			<node name="gotoPreviousTOCItem" value="До попередньої глави"/>
-			<node name="goBack" value="Назад"/>
-			<node name="goForward" value="Вперед"/>
+			<node name="gotoHome" value="На початок книги"/>
+			<node name="gotoSectionStart" value="На початок розділу"/>
+			<node name="gotoSectionEnd" value="В кінець розділу"/>
+			<node name="nextTOCSection" value="До наступної глави"/>
+			<node name="previousTOCSection" value="До попередньої глави"/>
+			<node name="undo" value="Назад"/>
+			<node name="redo" value="Вперед"/>
 		</node>
 		<node name="selection" value="Помітка">
-			<node name="clipboard" value="Скопіювати до буфера"/>
-			<node name="dictionary" value="Дивитися у словнику"/>
-			<node name="clear" value="Зняти помітку"/>
+			<node name="copyToClipboard" value="Скопіювати до буфера"/>
+			<node name="openInDictionary" value="Дивитися у словнику"/>
+			<node name="clearSelection" value="Зняти помітку"/>
 		</node>
 		<node name="search" value="Пошук">
-			<node name="find" value="Шукати..."/>
-			<node name="next" value="Шукати далі"/>
-			<node name="previous" value="Шукати раніше"/>
+			<node name="search" value="Шукати..."/>
+			<node name="findNext" value="Шукати далі"/>
+			<node name="findPrevious" value="Шукати раніше"/>
 		</node>
 		<node name="view" value="Зображення">
 			<node name="rotate" value="Повернути"/>
-			<node name="fullScreen" value="На весь екран"/>
+			<node name="toggleFullscreen" value="На весь екран"/>
 			<node name="toggleIndicator" value="Індикатор позиції"/>
 		</node>
-		<node name="settings" value="Налаштування..."/>
-		<node name="close" value="Закрити"/>
+		<node name="preferences" value="Налаштування..."/>
+		<node name="quit" value="Закрити"/>
 	</node>
 	<node name="toolbar">
-		<node name="books" value="Бібліотека"/>
-		<node name="history" value="Прочитані книги"/>
-		<node name="addbook" value="Додати файл до бібліотеки"/>
-		<node name="home" value="На початок книги"/>
-		<node name="leftarrow" value="Назад"/>
-		<node name="rightarrow" value="Вперед"/>
-		<node name="contents" value="Зміст"/>
-		<node name="find" value="Пошук"/>
-		<node name="findnext" value="Знайти наступний"/>
-		<node name="findprev" value="Знайти попередній"/>
-		<node name="bookinfo" value="Інформацiя про книгу"/>
-		<node name="settings" value="Налаштування"/>
-		<node name="rotatescreen" value="Повернути текст"/>
-		<node name="help" value="Про програму"/>
+		<node name="showLibrary" value="Бібліотека"/>
+		<node name="showRecent" value="Прочитані книги"/>
+		<node name="addBook" value="Додати файл до бібліотеки"/>
+		<node name="gotoHome" value="На початок книги"/>
+		<node name="undo" value="Назад"/>
+		<node name="redo" value="Вперед"/>
+		<node name="toc" value="Зміст"/>
+		<node name="search" value="Пошук"/>
+		<node name="findNext" value="Знайти наступний"/>
+		<node name="findPrevious" value="Знайти попередній"/>
+		<node name="bookInfo" value="Інформацiя про книгу"/>
+		<node name="preferences" value="Налаштування"/>
+		<node name="rotate" value="Повернути текст"/>
+		<node name="showHelp" value="Про програму"/>
 	</node>
 	<node name="dialog">
 		<node name="button">
@@ -71,7 +71,7 @@
 					<node name="defaultLanguage" value="Типова мова"/>
 					<node name="defaultEncodingSet" value="Набiр символiв"/>
 					<node name="defaultEncoding" value="Типовий набiр символiв"/>
-					<node name="useWindows1252Hack" value="Use windows-1252 instead of iso-8859-1" toBeTranslated="true"/>
+					<node name="useWindows1252Hack" value="Використати windows-1252 замiсть iso-8859-1"/>
 					<node name="chineseBreakAtAnyPosition" value="В китайскому розбивати строку у будь якому мiсцi"/>
 				</node>
 				<node name="Indicator" value="Індикатор">
@@ -104,7 +104,7 @@
 					<node name="percentToScroll" value="Скільки відсотків зсувати"/>
 				</node>
 				<node name="Selection" value="Помітка">
-					<node name="enableSelection" value="Enable Text Selection" toBeTranslated="true"/>
+					<node name="enableSelection" value="Дозволити помiчати текст"/>
 				</node>
 				<node name="Margins" value="Відступи">
 					<node name="left" value="Відступ зліва"/>
@@ -221,9 +221,9 @@
 					<node name="command" value="Виконати команду"/>
 				</node>
 				<node name="Maemo" value="Maemo">
-					<node name="keyActionOnRelease" value="Key Action on Release, Not on Press" toBeTranslated="true"/>
-					<node name="minStylusPressure" value="Minimal Stylus Pressure" toBeTranslated="true"/>
-					<node name="maxStylusPressure" value="Maximal Stylus Pressure" toBeTranslated="true"/>
+					<node name="keyActionOnRelease" value="Виконувати при вiдпусканнi клавiши, нe при натисненнi"/>
+					<node name="minStylusPressure" value="Мiнiмальне натискування стiлусом"/>
+					<node name="maxStylusPressure" value="Максимальне натискування стiлусом"/>
 				</node>
 			</node>
 		</node>
diff --git a/data/resources/zlibrary/sv.xml b/data/resources/zlibrary/sv.xml
new file mode 100644
index 000000000..1d4d1a55e
--- /dev/null
+++ b/data/resources/zlibrary/sv.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+	<node name="dialog">
+		<node name="button">
+			<node name="ok" value="&amp;Ok"/>
+			<node name="cancel" value="&amp;Avbryt"/>
+			<node name="yes" value="&amp;Ja"/>
+			<node name="no" value="&amp;Nej"/>
+			<node name="apply" value="&amp;Verkställ"/>
+		</node>
+		<node name="waitMessage">
+			<node name="savingConfig" value="Sparar konfiguration..."/>
+		</node>
+	</node>
+	<node name="color">
+		<node name="red" value="Röd"/>
+		<node name="green" value="Grön"/>
+		<node name="blue" value="Blå"/>
+		<node name="black" value="Svart"/>
+		<node name="white" value="Vit"/>
+		<node name="maroon" value="Mörk brun"/>
+		<node name="olive" value="Oliv"/>
+		<node name="navy" value="Marin"/>
+		<node name="purple" value="Lila"/>
+		<node name="teal" value="Teal"/>
+		<node name="silver" value="Silver"/>
+		<node name="gray" value="Grå"/>
+		<node name="lime" value="Lime"/>
+		<node name="yellow" value="Gul"/>
+		<node name="magenta" value="Magenta"/>
+		<node name="cyan" value="Cyan"/>
+		<node name="custom..." value="Anpassad..."/>
+	</node>
+	<node name="language">
+		<node name="cs" value="Tjeckiska"/>
+		<node name="de" value="Tyska"/>
+		<node name="de-traditional" value="Tyska (traditionell ortografi)"/>
+		<node name="en" value="Engelska"/>
+		<node name="eo" value="Esperanto"/>
+		<node name="es" value="Spanska"/>
+		<node name="fi" value="Finska"/>
+		<node name="fr" value="Franska"/>
+		<node name="it" value="Italienska"/>
+		<node name="no" value="Norska"/>
+		<node name="pt" value="Portugisiska"/>
+		<node name="ru" value="Ryska"/>
+		<node name="sv" value="Svenska"/>
+		<node name="uk" value="Ukrainska"/>
+		<node name="zh" value="Kinesiska"/>
+		<node name="other" value="Annat"/>
+	</node>
+	<node name="boolean3">
+		<node name="on" value="på"/>
+		<node name="off" value="av"/>
+		<node name="unchanged" value="oförändrat"/>
+	</node>
+	<node name="keyOptionView">
+		<node name="actionFor" value="Åtgärd för tangent"/>
+	</node>
+</resources>
diff --git a/icons/toolbar/addbook.png b/icons/toolbar/addBook.png
similarity index 100%
rename from icons/toolbar/addbook.png
rename to icons/toolbar/addBook.png
diff --git a/icons/toolbar/bookinfo.png b/icons/toolbar/bookInfo.png
similarity index 100%
rename from icons/toolbar/bookinfo.png
rename to icons/toolbar/bookInfo.png
diff --git a/icons/toolbar/findprev.png b/icons/toolbar/findNext.png
similarity index 100%
rename from icons/toolbar/findprev.png
rename to icons/toolbar/findNext.png
diff --git a/icons/toolbar/findnext.png b/icons/toolbar/findPrevious.png
similarity index 100%
rename from icons/toolbar/findnext.png
rename to icons/toolbar/findPrevious.png
diff --git a/icons/toolbar/home.png b/icons/toolbar/gotoHome.png
similarity index 100%
rename from icons/toolbar/home.png
rename to icons/toolbar/gotoHome.png
diff --git a/icons/toolbar/settings.png b/icons/toolbar/preferences.png
similarity index 100%
rename from icons/toolbar/settings.png
rename to icons/toolbar/preferences.png
diff --git a/icons/toolbar/rightarrow.png b/icons/toolbar/redo.png
similarity index 100%
rename from icons/toolbar/rightarrow.png
rename to icons/toolbar/redo.png
diff --git a/icons/toolbar/rotatescreen.png b/icons/toolbar/rotate.png
similarity index 100%
rename from icons/toolbar/rotatescreen.png
rename to icons/toolbar/rotate.png
diff --git a/icons/toolbar/find.png b/icons/toolbar/search.png
similarity index 100%
rename from icons/toolbar/find.png
rename to icons/toolbar/search.png
diff --git a/icons/toolbar/help.png b/icons/toolbar/showHelp.png
similarity index 100%
rename from icons/toolbar/help.png
rename to icons/toolbar/showHelp.png
diff --git a/icons/toolbar/books.png b/icons/toolbar/showLibrary.png
similarity index 100%
rename from icons/toolbar/books.png
rename to icons/toolbar/showLibrary.png
diff --git a/icons/toolbar/history.png b/icons/toolbar/showRecent.png
similarity index 100%
rename from icons/toolbar/history.png
rename to icons/toolbar/showRecent.png
diff --git a/icons/toolbar/contents.png b/icons/toolbar/toc.png
similarity index 100%
rename from icons/toolbar/contents.png
rename to icons/toolbar/toc.png
diff --git a/icons/toolbar/leftarrow.png b/icons/toolbar/undo.png
similarity index 100%
rename from icons/toolbar/leftarrow.png
rename to icons/toolbar/undo.png
diff --git a/platform/android/data/default/keymap.xml b/platform/android/data/default/keymap.xml
index 5363e6467..34c9c9f80 100644
--- a/platform/android/data/default/keymap.xml
+++ b/platform/android/data/default/keymap.xml
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <keymap>
-	<binding key="&lt;L&gt;" action="1"/>
-	<binding key="&lt;O&gt;" action="2"/>
-	<binding key="&lt;PadLeft&gt;" action="12"/>
-	<binding key="&lt;PadRight&gt;" action="11"/>
-	<binding key="&lt;C&gt;" action="5"/>
-	<binding key="&lt;F&gt;" action="6"/>
-	<binding key="&lt;P&gt;" action="7"/>
-	<binding key="&lt;N&gt;" action="8"/>
-	<binding key="&lt;PadDown&gt;" action="9"/>
-	<binding key="&lt;PadUp&gt;" action="10"/>
-	<binding key="&lt;Ctrl&gt;+&lt;Home&gt;" action="15"/>
-	<binding key="&lt;Home&gt;" action="16"/>
-	<binding key="&lt;End&gt;" action="17"/>
-	<binding key="&lt;Esc&gt;" action="18"/>
-	<binding key="&lt;=&gt;" action="19"/>
-	<binding key="&lt;-&gt;" action="20"/>
-	<binding key="&lt;D&gt;" action="21"/>
-	<binding key="&lt;Return&gt;" action="22"/>
-	<binding key="&lt;A&gt;" action="24"/>
-	<binding key="&lt;I&gt;" action="25"/>
-	<binding key="&lt;R&gt;" action="27"/>
-	<binding key="&lt;Z&gt;" action="28"/>
-	<binding key="&lt;Ctrl&gt;+&lt;DownArrow&gt;" action="33"/>
-	<binding key="&lt;Ctrl&gt;+&lt;UpArrow&gt;" action="34"/>
-	<binding key="&lt;Ctrl&gt;+&lt;C&gt;" action="35"/>
+	<binding key="&lt;L&gt;" action="showLibrary"/>
+	<binding key="&lt;O&gt;" action="preferences"/>
+	<binding key="&lt;PadLeft&gt;" action="smallScrollBackward"/>
+	<binding key="&lt;PadRight&gt;" action="smallScrollForward"/>
+	<binding key="&lt;C&gt;" action="toc"/>
+	<binding key="&lt;F&gt;" action="search"/>
+	<binding key="&lt;P&gt;" action="findPrevious"/>
+	<binding key="&lt;N&gt;" action="findNext"/>
+	<binding key="&lt;PadDown&gt;" action="largeScrollForward"/>
+	<binding key="&lt;PadUp&gt;" action="largeScrollBackward"/>
+	<binding key="&lt;Ctrl&gt;+&lt;Home&gt;" action="gotoHome"/>
+	<binding key="&lt;Home&gt;" action="gotoSectionStart"/>
+	<binding key="&lt;End&gt;" action="gotoSectionEnd"/>
+	<binding key="&lt;Esc&gt;" action="cancel"/>
+	<binding key="&lt;=&gt;" action="increaseFont"/>
+	<binding key="&lt;-&gt;" action="decreaseFont"/>
+	<binding key="&lt;D&gt;" action="toggleIndicator"/>
+	<binding key="&lt;Return&gt;" action="toggleFullscreen"/>
+	<binding key="&lt;A&gt;" action="addBook"/>
+	<binding key="&lt;I&gt;" action="bookInfo"/>
+	<binding key="&lt;R&gt;" action="rotate"/>
+	<binding key="&lt;Z&gt;" action="showRecent"/>
+	<binding key="&lt;Ctrl&gt;+&lt;DownArrow&gt;" action="nextTOCSection"/>
+	<binding key="&lt;Ctrl&gt;+&lt;UpArrow&gt;" action="previousTOCSection"/>
+	<binding key="&lt;Ctrl&gt;+&lt;C&gt;" action="copyToClipboard"/>
 </keymap>
diff --git a/platform/android/data/default/menubar.xml b/platform/android/data/default/menubar.xml
index 9a7f3de76..09fdb2f0a 100644
--- a/platform/android/data/default/menubar.xml
+++ b/platform/android/data/default/menubar.xml
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <menubar>
-	<item action="25" key="bookInfo"/>
-	<item action="5" key="toc"/>
-	<submenu key="library">
-		<item action="1" key="open"/>
-		<item action="7" key="previous"/>
-		<item action="28" key="recent"/>
-		<item action="24" key="addBook"/>
-		<item action="26" key="about"/>
+	<item id="bookInfo"/>
+	<item id="toc"/>
+	<submenu id="library">
+		<item id="showLibrary"/>
+		<item id="previousBook"/>
+		<item id="showRecent"/>
+		<item id="addBook"/>
+		<item id="showHelp"/>
 	</submenu>
-	<submenu key="navigate">
-		<item action="15" key="gotoStartOfDocument"/>
-		<item action="16" key="gotoStartOfSection"/>
-		<item action="17" key="gotoEndOfSection"/>
-		<item action="33" key="gotoNextTOCItem"/>
-		<item action="34" key="gotoPreviousTOCItem"/>
-		<item action="3" key="goBack"/>
-		<item action="4" key="goForward"/>
+	<submenu id="navigate">
+		<item id="gotoHome"/>
+		<item id="gotoSectionStart"/>
+		<item id="gotoSectionEnd"/>
+		<item id="nextTOCSection"/>
+		<item id="previousTOCSection"/>
+		<item id="undo"/>
+		<item id="redo"/>
 	</submenu>
-	<submenu key="selection">
-		<item action="35" key="clipboard"/>
-		<item action="37" key="dictionary"/>
-		<item action="36" key="clear"/>
+	<submenu id="selection">
+		<item id="copyToClipboard"/>
+		<item id="openInDictionary"/>
+		<item id="clearSelection"/>
 	</submenu>
-	<submenu key="search">
-		<item action="6" key="find"/>
-		<item action="7" key="next"/>
-		<item action="8" key="previous"/>
+	<submenu id="search">
+		<item id="search"/>
+		<item id="findPrevious"/>
+		<item id="findNext"/>
 	</submenu>
-	<submenu key="view">
-		<item action="27" key="rotate"/>
-		<item action="22" key="fullScreen"/>
-		<item action="21" key="toggleIndicator"/>
+	<submenu id="view">
+		<item id="rotate"/>
+		<item id="toggleFullscreen"/>
+		<item id="toggleIndicator"/>
 	</submenu>
-	<item action="2" key="settings"/>
-	<item action="29" key="close"/>
+	<item id="preferences"/>
+	<item id="quit"/>
 </menubar>
diff --git a/platform/swing/data/default/keymap.xml b/platform/swing/data/default/keymap.xml
index aa5a5bf12..365e2b57e 100644
--- a/platform/swing/data/default/keymap.xml
+++ b/platform/swing/data/default/keymap.xml
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <keymap>
-	<binding key="&lt;L&gt;" action="1"/>
-	<binding key="&lt;O&gt;" action="2"/>
-	<binding key="&lt;LeftArrow&gt;" action="3"/>
-	<binding key="&lt;RightArrow&gt;" action="4"/>
-	<binding key="&lt;C&gt;" action="5"/>
-	<binding key="&lt;F&gt;" action="6"/>
-	<binding key="&lt;P&gt;" action="7"/>
-	<binding key="&lt;N&gt;" action="8"/>
-	<binding key="&lt;PageDown&gt;" action="9"/>
-	<binding key="&lt;PageUp&gt;" action="10"/>
-	<binding key="&lt;DownArrow&gt;" action="11"/>
-	<binding key="&lt;UpArrow&gt;" action="12"/>
-	<binding key="&lt;MouseScrollDown&gt;" action="13"/>
-	<binding key="&lt;MouseScrollUp&gt;" action="14"/>
-	<binding key="&lt;Ctrl&gt;+&lt;Home&gt;" action="15"/>
-	<binding key="&lt;Home&gt;" action="16"/>
-	<binding key="&lt;End&gt;" action="17"/>
-	<binding key="&lt;Esc&gt;" action="18"/>
-	<binding key="&lt;=&gt;" action="19"/>
-	<binding key="&lt;-&gt;" action="20"/>
-	<binding key="&lt;D&gt;" action="21"/>
-	<binding key="&lt;Return&gt;" action="22"/>
-	<binding key="&lt;A&gt;" action="24"/>
-	<binding key="&lt;I&gt;" action="25"/>
-	<binding key="&lt;R&gt;" action="27"/>
-	<binding key="&lt;Z&gt;" action="28"/>
-	<binding key="&lt;Ctrl&gt;+&lt;DownArrow&gt;" action="33"/>
-	<binding key="&lt;Ctrl&gt;+&lt;UpArrow&gt;" action="34"/>
-	<binding key="&lt;Ctrl&gt;+&lt;C&gt;" action="35"/>
+	<binding key="&lt;L&gt;" action="showLibrary"/>
+	<binding key="&lt;O&gt;" action="preferences"/>
+	<binding key="&lt;LeftArrow&gt;" action="undo"/>
+	<binding key="&lt;RightArrow&gt;" action="redo"/>
+	<binding key="&lt;C&gt;" action="toc"/>
+	<binding key="&lt;F&gt;" action="search"/>
+	<binding key="&lt;P&gt;" action="findPrevious"/>
+	<binding key="&lt;N&gt;" action="findNext"/>
+	<binding key="&lt;PageDown&gt;" action="largeScrollForward"/>
+	<binding key="&lt;PageUp&gt;" action="largeScrollBackward"/>
+	<binding key="&lt;DownArrow&gt;" action="smallScrollForward"/>
+	<binding key="&lt;UpArrow&gt;" action="smallScrollBackward"/>
+	<binding key="&lt;MouseScrollDown&gt;" action="mouseScrollForward"/>
+	<binding key="&lt;MouseScrollUp&gt;" action="mouseScrollBackward"/>
+	<binding key="&lt;Ctrl&gt;+&lt;Home&gt;" action="gotoHome"/>
+	<binding key="&lt;Home&gt;" action="gotoSectionStart"/>
+	<binding key="&lt;End&gt;" action="gotoSectionEnd"/>
+	<binding key="&lt;Esc&gt;" action="cancel"/>
+	<binding key="&lt;=&gt;" action="increaseFont"/>
+	<binding key="&lt;-&gt;" action="decreaseFont"/>
+	<binding key="&lt;D&gt;" action="toggleIndicator"/>
+	<binding key="&lt;Return&gt;" action="toggleFullscreen"/>
+	<binding key="&lt;A&gt;" action="addBook"/>
+	<binding key="&lt;I&gt;" action="bookInfo"/>
+	<binding key="&lt;R&gt;" action="rotate"/>
+	<binding key="&lt;Z&gt;" action="showRecent"/>
+	<binding key="&lt;Ctrl&gt;+&lt;DownArrow&gt;" action="nextTOCSection"/>
+	<binding key="&lt;Ctrl&gt;+&lt;UpArrow&gt;" action="previousTOCSection"/>
+	<binding key="&lt;Ctrl&gt;+&lt;C&gt;" action="copyToClipboard"/>
 </keymap>
diff --git a/platform/swing/data/default/toolbar.xml b/platform/swing/data/default/toolbar.xml
index 9a23af2e3..b586b89f9 100644
--- a/platform/swing/data/default/toolbar.xml
+++ b/platform/swing/data/default/toolbar.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <toolbar>
-	<button action="1" key="books"/>
-	<button action="28" key="history"/>
-	<button action="24" key="addbook"/>
+	<button id="showLibrary"/>
+	<button id="showRecent"/>
+	<button id="addBook"/>
 	<separator/>
-	<button action="15" key="home"/>
-	<button action="3" key="leftarrow"/>
-	<button action="4" key="rightarrow"/>
+	<button id="gotoHome"/>
+	<button id="undo"/>
+	<button id="redo"/>
 	<separator/>
-	<button action="5" key="contents"/>
+	<button id="toc"/>
 	<separator/>
-	<button action="6" key="find"/>
-	<button action="7" key="findnext"/>
-	<button action="8" key="findprev"/>
+	<button id="search"/>
+	<button id="findPrevious"/>
+	<button id="findNext"/>
 	<separator/>
-	<button action="25" key="bookinfo"/>
-	<button action="2" key="settings"/>
+	<button id="bookInfo"/>
+	<button id="preferences"/>
 	<separator/>
-	<button action="27" key="rotatescreen"/>
+	<button id="rotate"/>
 	<separator/>
-	<button action="26" key="help"/>
+	<button id="showHelp"/>
 </toolbar>
diff --git a/src/org/fbreader/fbreader/ActionCode.java b/src/org/fbreader/fbreader/ActionCode.java
index 08dde66f0..73e886ea1 100644
--- a/src/org/fbreader/fbreader/ActionCode.java
+++ b/src/org/fbreader/fbreader/ActionCode.java
@@ -1,44 +1,41 @@
 package org.fbreader.fbreader;
 
 public interface ActionCode {
-	// please, don't change these numbers
-	// add new action id's at the end of this list
-	int NONE = 0;
-	int SHOW_COLLECTION = 1;
-	int SHOW_OPTIONS = 2;
-	int UNDO = 3;
-	int REDO = 4;
-	int SHOW_CONTENTS = 5;
-	int SEARCH = 6;
-	int FIND_PREVIOUS = 7;
-	int FIND_NEXT = 8;
-	int LARGE_SCROLL_FORWARD = 9;
-	int LARGE_SCROLL_BACKWARD = 10;
-	int SMALL_SCROLL_FORWARD = 11;
-	int SMALL_SCROLL_BACKWARD = 12;
-	int MOUSE_SCROLL_FORWARD = 13;
-	int MOUSE_SCROLL_BACKWARD = 14;
-	int SCROLL_TO_HOME = 15;
-	int SCROLL_TO_START_OF_TEXT = 16;
-	int SCROLL_TO_END_OF_TEXT = 17;
-	int CANCEL = 18;
-	int INCREASE_FONT = 19;
-	int DECREASE_FONT = 20;
-	int SHOW_HIDE_POSITION_INDICATOR = 21;
-	int TOGGLE_FULLSCREEN = 22;
-	int FULLSCREEN_ON = 23;
-	int ADD_BOOK = 24;
-	int SHOW_BOOK_INFO = 25;
-	int SHOW_HELP = 26;
-	int ROTATE_SCREEN = 27;
-	int SHOW_LAST_BOOKS = 28;
-	int QUIT = 29;
-	int OPEN_PREVIOUS_BOOK = 30;
-	int FINGER_TAP_SCROLL_FORWARD = 31;
-	int FINGER_TAP_SCROLL_BACKWARD = 32;
-	int GOTO_NEXT_TOC_SECTION = 33;
-	int GOTO_PREVIOUS_TOC_SECTION = 34;
-	int COPY_SELECTED_TEXT_TO_CLIPBOARD = 35;
-	int CLEAR_SELECTION = 36;
-	int OPEN_SELECTED_TEXT_IN_DICTIONARY = 37;
+	String SHOW_COLLECTION = "showLibrary";
+	String SHOW_OPTIONS = "preferences";
+	String UNDO = "undo";
+	String REDO = "redo";
+	String SHOW_CONTENTS = "toc";
+	String SEARCH = "search";
+	String FIND_PREVIOUS = "findPrevious";
+	String FIND_NEXT = "findNext";
+	String LARGE_SCROLL_FORWARD = "largeScrollForward";
+	String LARGE_SCROLL_BACKWARD = "largeScrollBackward";
+	String SMALL_SCROLL_FORWARD = "smallScrollForward";
+	String SMALL_SCROLL_BACKWARD = "smallScrollBackward";
+	String MOUSE_SCROLL_FORWARD = "mouseScrollForward";
+	String MOUSE_SCROLL_BACKWARD = "mouseScrollBackward";
+	String SCROLL_TO_HOME = "gotoHome";
+	String SCROLL_TO_START_OF_TEXT = "gotoSectionStart";
+	String SCROLL_TO_END_OF_TEXT = "gotoSectionEnd";
+	String CANCEL = "cancel";
+	String INCREASE_FONT = "increaseFont";
+	String DECREASE_FONT = "decreaseFont";
+	String SHOW_HIDE_POSITION_INDICATOR = "toggleIndicator";
+	String TOGGLE_FULLSCREEN = "toggleFullscreen";
+	String FULLSCREEN_ON = "onFullscreen";
+	String ADD_BOOK = "addBook";
+	String SHOW_BOOK_INFO = "bookInfo";
+	String SHOW_HELP = "showHelp";
+	String ROTATE_SCREEN = "rotate";
+	String SHOW_LAST_BOOKS = "showRecent";
+	String QUIT = "quit";
+	String OPEN_PREVIOUS_BOOK = "previousBook";
+	String FINGER_TAP_SCROLL_FORWARD = "tapScrollForward";
+	String FINGER_TAP_SCROLL_BACKWARD = "tapScrollBackward";
+	String GOTO_NEXT_TOC_SECTION = "nextTOCSection";
+	String GOTO_PREVIOUS_TOC_SECTION = "previousTOCSection";
+	String COPY_SELECTED_TEXT_TO_CLIPBOARD = "copyToClipboard";
+	String CLEAR_SELECTION = "clearSelection";
+	String OPEN_SELECTED_TEXT_IN_DICTIONARY = "openInDictionary";
 };
diff --git a/src/org/zlibrary/core/application/ZLApplication.java b/src/org/zlibrary/core/application/ZLApplication.java
index cdaedd801..3f5286fa2 100644
--- a/src/org/zlibrary/core/application/ZLApplication.java
+++ b/src/org/zlibrary/core/application/ZLApplication.java
@@ -45,8 +45,7 @@ public abstract class ZLApplication {
 	private ZLApplicationWindow myWindow;
 	private ZLView myInitialView;
 
-	// TODO: 256!!!
-	private final ZLAction[] myActionMap = new ZLAction[256];
+	private final HashMap myIdToActionMap = new HashMap();
 	private Toolbar myToolbar;
 	private Menubar myMenubar;
 	//private ZLTime myLastKeyActionTime;
@@ -141,10 +140,8 @@ public abstract class ZLApplication {
 		return (myWindow != null) && myWindow.isFullscreen();
 	}
 	
-	protected final void addAction(int actionId, ZLAction action) {
-		if ((actionId >= 0) && (actionId < 256)) {
-			myActionMap[actionId] = action;
-		}
+	protected final void addAction(String actionId, ZLAction action) {
+		myIdToActionMap.put(actionId, action);
 	}
 
 	public final boolean isFullKeyboardControlSupported() {
@@ -181,24 +178,21 @@ public abstract class ZLApplication {
 		}
 	}
 
-	private final ZLAction getAction(int actionId) {
-		if ((actionId >= 0) && (actionId < 256)) {
-			return myActionMap[actionId];
-		}
-		return null;
+	private final ZLAction getAction(String actionId) {
+		return (ZLAction)myIdToActionMap.get(actionId);
 	}
 	
-	public final boolean isActionVisible(int actionId) {
+	public final boolean isActionVisible(String actionId) {
 		ZLAction action = getAction(actionId);
 		return (action != null) && action.isVisible();
 	}
 	
-	public final boolean isActionEnabled(int actionId) {
+	public final boolean isActionEnabled(String actionId) {
 		ZLAction action = getAction(actionId);
 		return (action != null) && action.isEnabled();
 	}
 	
-	public final void doAction(int actionId) {
+	public final void doAction(String actionId) {
 		ZLAction action = getAction(actionId);
 		if (action != null) {
 			action.checkAndRun();
@@ -321,8 +315,8 @@ public abstract class ZLApplication {
 		private final ArrayList myItems = new ArrayList();
 		private final ZLResource myResource = ZLResource.resource("toolbar");
 
-		private void addButton(int actionId, String key/*, ButtonGroup group*/) {
-			ButtonItem button = new ButtonItem(actionId, key, myResource.getResource(key));
+		private void addButton(String actionId/*, ButtonGroup group*/) {
+			ButtonItem button = new ButtonItem(actionId, myResource.getResource(actionId));
 			myItems.add(button);
 			//button.setButtonGroup(group);
 		}
@@ -355,23 +349,21 @@ public abstract class ZLApplication {
 		}
 		
 		public final class ButtonItem implements Item {
-			private final int myActionId;
-			private final String myIconName;
+			private final String myActionId;
 			private final ZLResource myTooltip;
 			//private ButtonGroup myButtonGroup;
 			
-			public ButtonItem(int actionId, String iconName, ZLResource tooltip) {
+			public ButtonItem(String actionId, ZLResource tooltip) {
 				myActionId = actionId;
-				myIconName = iconName;
 				myTooltip = tooltip;
 			}
 
-			public int getActionId() {
+			public String getActionId() {
 				return myActionId;
 			}
 			
 			public String getIconName() {
-				return myIconName;
+				return myActionId;
 			}
 			
 			public String getTooltip() {
@@ -460,8 +452,8 @@ public abstract class ZLApplication {
 			return myResource;
 		}
 
-		void addItem(int actionId, String key) {
-			myItems.add(new Menubar.PlainItem(myResource.getResource(key).getValue(), actionId));
+		void addItem(String actionId) {
+			myItems.add(new Menubar.PlainItem(myResource.getResource(actionId).getValue(), actionId));
 		}
 		
 		void addSeparator() {
@@ -487,9 +479,9 @@ public abstract class ZLApplication {
 	public static final class Menubar extends Menu {
 		public static final class PlainItem implements Item {
 			private final String myName;
-			private final int myActionId;
+			private final String myActionId;
 
-			public PlainItem(String name, int actionId) {
+			public PlainItem(String name, String actionId) {
 				myName = name;
 				myActionId = actionId;
 			}
@@ -498,7 +490,7 @@ public abstract class ZLApplication {
 				return myName;
 			}
 			
-			public int getActionId() {
+			public String getActionId() {
 				return myActionId;
 			}
 		};
@@ -571,14 +563,9 @@ public abstract class ZLApplication {
 				myToolbar = new Toolbar();
 			}
 			if (BUTTON == tag) {
-				String action = attributes.getValue("action");
-				String key = attributes.getValue("key");
-				if ((action != null) && (key != null)) {
-					try {
-						int actionId = Integer.parseInt(action);
-						myToolbar.addButton(actionId, key);
-					} catch (NumberFormatException exception) {
-					}
+				String id = attributes.getValue("id");
+				if (id != null) {
+					myToolbar.addButton(id);
 				}
 			} else if (SEPARATOR == tag) {
 				myToolbar.addSeparator();
@@ -599,19 +586,14 @@ public abstract class ZLApplication {
 			final ArrayList stack = mySubmenuStack;
 			Menu menu = stack.isEmpty() ? myMenubar : (Menu)stack.get(stack.size() - 1);
 			if (ITEM == tag) {
-				String action = attributes.getValue("action");
-				String key = attributes.getValue("key");
-				if ((action != null) && (key != null)) {
-					try {
-						int actionId = Integer.parseInt(action);
-						menu.addItem(actionId, key);
-					} catch (NumberFormatException exception) {
-					}
+				String id = attributes.getValue("id");
+				if (id != null) {
+					menu.addItem(id);
 				}
 			} else if (SUBMENU == tag) {
-				String key = attributes.getValue("key");
-				if (key != null) {
-					stack.add(menu.addSubmenu(key));
+				String id = attributes.getValue("id");
+				if (id != null) {
+					stack.add(menu.addSubmenu(id));
 				}
 			}
 		}
diff --git a/src/org/zlibrary/core/application/ZLApplicationWindow.java b/src/org/zlibrary/core/application/ZLApplicationWindow.java
index 77fc18a30..5aaf36bf9 100644
--- a/src/org/zlibrary/core/application/ZLApplicationWindow.java
+++ b/src/org/zlibrary/core/application/ZLApplicationWindow.java
@@ -97,10 +97,10 @@ abstract public class ZLApplicationWindow {
 				} else */
 				if (item instanceof ZLApplication.Toolbar.ButtonItem) {
 					ZLApplication.Toolbar.ButtonItem button = (ZLApplication.Toolbar.ButtonItem)item;
-					int id = button.getActionId();
+					final String id = button.getActionId();
 	
-					boolean visible = getApplication().isActionVisible(id);
-					boolean enabled = getApplication().isActionEnabled(id);
+					final boolean visible = getApplication().isActionVisible(id);
+					final boolean enabled = getApplication().isActionEnabled(id);
     
 					if (visible) {
 						if (lastSeparator != null) {
diff --git a/src/org/zlibrary/core/application/ZLKeyBindings.java b/src/org/zlibrary/core/application/ZLKeyBindings.java
index 8c3d7afbd..ea745f2bf 100644
--- a/src/org/zlibrary/core/application/ZLKeyBindings.java
+++ b/src/org/zlibrary/core/application/ZLKeyBindings.java
@@ -24,14 +24,13 @@ public final class ZLKeyBindings {
 		myIsChanged = false;
 	}
 	
-	public void bindKey(String key, int code) {
-		myBindingsMap.put(key, code);
+	public void bindKey(String key, String actionId) {
+		myBindingsMap.put(key, actionId);
 		myIsChanged = true;
 	}
 	
-	public int getBinding(String key) {
-		Integer num = (Integer)myBindingsMap.get(key);
-		return (num == null) ? 0 : num.intValue();
+	public String getBinding(String key) {
+		return (String)myBindingsMap.get(key);
 	}
 	
 	/*
@@ -45,15 +44,15 @@ public final class ZLKeyBindings {
 			new ZLIntegerRangeOption(ZLOption.CONFIG_CATEGORY, myName, BINDINGS_NUMBER, 0, 256, 0).getValue();
 		final ZLStringOption keyOption =
 			new ZLStringOption(ZLOption.CONFIG_CATEGORY, myName, "", "");
-		final ZLIntegerOption actionOption =
-			new ZLIntegerOption(ZLOption.CONFIG_CATEGORY, myName, "", -1);
+		final ZLStringOption actionOption =
+			new ZLStringOption(ZLOption.CONFIG_CATEGORY, myName, "", "");
 		for (int i = 0; i < size; ++i) {
 			keyOption.changeName(BINDED_KEY + i);
 			String keyValue = keyOption.getValue();
 			if (keyValue.length() != 0) {
-				keyOption.changeName(BINDED_ACTION + i);
-				int actionValue = actionOption.getValue();
-				if (actionValue != -1) {
+				actionOption.changeName(BINDED_ACTION + i);
+				String actionValue = actionOption.getValue();
+				if (actionValue.length() != 0) {
 					bindKey(keyValue, actionValue);
 				}
 			}
diff --git a/src/org/zlibrary/core/application/ZLKeyBindingsReader.java b/src/org/zlibrary/core/application/ZLKeyBindingsReader.java
index ef3828fca..1a3828469 100644
--- a/src/org/zlibrary/core/application/ZLKeyBindingsReader.java
+++ b/src/org/zlibrary/core/application/ZLKeyBindingsReader.java
@@ -15,13 +15,9 @@ class ZLKeyBindingsReader extends ZLXMLReaderAdapter {
 	public void startElementHandler(String tag, ZLStringMap attributes) {
 		if ("binding".equals(tag)) {
 			String key = attributes.getValue("key");
-			String action = attributes.getValue("action");
-			if ((key != null) && (action != null)) {
-				try {
-					int actionId = Integer.parseInt(action);
-					myKeymap.put(key, actionId);
-				} catch (NumberFormatException e) {
-				}
+			String actionId = attributes.getValue("action");
+			if ((key != null) && (actionId != null)) {
+				myKeymap.put(key, actionId);
 			}
 		}
 	}
diff --git a/src/org/zlibrary/ui/android/application/ZLAndroidApplicationWindow.java b/src/org/zlibrary/ui/android/application/ZLAndroidApplicationWindow.java
index 9589f4487..6db774682 100644
--- a/src/org/zlibrary/ui/android/application/ZLAndroidApplicationWindow.java
+++ b/src/org/zlibrary/ui/android/application/ZLAndroidApplicationWindow.java
@@ -62,7 +62,7 @@ public final class ZLAndroidApplicationWindow extends ZLApplicationWindow {
 	protected void refresh() {
 		super.refresh();
 		for (Map.Entry<Menu.Item,ZLApplication.Menubar.PlainItem> entry : myMenuItemMap.entrySet()) {
-			final int actionId = entry.getValue().getActionId();
+			final String actionId = entry.getValue().getActionId();
 			final ZLApplication application = getApplication();
 			entry.getKey().setShown(application.isActionVisible(actionId) && application.isActionEnabled(actionId));
 		}