diff --git a/android/assets/text/application/application.properties b/android/assets/text/application/application_cs_CZ.properties
similarity index 100%
rename from android/assets/text/application/application.properties
rename to android/assets/text/application/application_cs_CZ.properties
diff --git a/android/assets/text/application/language_sk_SK.properties b/android/assets/text/application/preferences_cs_CZ.properties
similarity index 100%
rename from android/assets/text/application/language_sk_SK.properties
rename to android/assets/text/application/preferences_cs_CZ.properties
diff --git a/android/assets/text/application/preferences.properties b/android/assets/text/application/preferences_sk_SK.properties
similarity index 100%
rename from android/assets/text/application/preferences.properties
rename to android/assets/text/application/preferences_sk_SK.properties
diff --git a/android/assets/text/game/robbery/robbery.properties b/android/assets/text/game/robbery/robbery_cs_CZ.properties
similarity index 100%
rename from android/assets/text/game/robbery/robbery.properties
rename to android/assets/text/game/robbery/robbery_cs_CZ.properties
diff --git a/core/src/cz/nic/tablexia/TablexiaSettings.java b/core/src/cz/nic/tablexia/TablexiaSettings.java
index c8a52bbc41b56d811982a9a594d68733bbc80e0d..2efb9b14e0eae576ea0c652ec8017b1789bebc15 100644
--- a/core/src/cz/nic/tablexia/TablexiaSettings.java
+++ b/core/src/cz/nic/tablexia/TablexiaSettings.java
@@ -77,7 +77,7 @@ public class TablexiaSettings {
         @Override
         public String toString() {
             if (ApplicationTextManager.getInstance().update()) {
-                return ApplicationTextManager.getInstance().getResult().get(descriptionKey);
+                return ApplicationTextManager.getInstance().getText(descriptionKey);
             } else {
                 return name();
             }
diff --git a/core/src/cz/nic/tablexia/loader/application/ApplicationTextManager.java b/core/src/cz/nic/tablexia/loader/application/ApplicationTextManager.java
index a3702ce355bd31222d6a94d342ec6b7e529c4364..7a193049334059ba2ddc9dc6c85b4ab863df2233 100644
--- a/core/src/cz/nic/tablexia/loader/application/ApplicationTextManager.java
+++ b/core/src/cz/nic/tablexia/loader/application/ApplicationTextManager.java
@@ -56,6 +56,14 @@ public class ApplicationTextManager extends TablexiaDataManager<I18NBundle> impl
 	public void load() {
         setAsyncTask(new ApplicationTextLoader(APPLICATION_TEXT_RESOURCE_FILE, TablexiaSettings.getInstance().getLocale()));
 	}
+
+    public String getText(String textKey) {
+        return getResult().get(textKey);
+    }
+
+    public String getFormattedText(String textKey, Object... args) {
+        return getResult().format(textKey, args);
+    }
 	
 	@Override
 	public void dispose() {
diff --git a/core/src/cz/nic/tablexia/menu/MainMenuDefinition.java b/core/src/cz/nic/tablexia/menu/MainMenuDefinition.java
index d14a719be94a921b1d52a397e464624e2d3df4b0..0f13e9123559e860005ab5aa38dec157fa44270d 100644
--- a/core/src/cz/nic/tablexia/menu/MainMenuDefinition.java
+++ b/core/src/cz/nic/tablexia/menu/MainMenuDefinition.java
@@ -28,7 +28,7 @@ public enum MainMenuDefinition implements ApplicationEvent, IMenuItem {
 	
 	@Override
 	public String getTitle() {
-		return ApplicationTextManager.getInstance().getResult().get(menuTextKey);
+		return ApplicationTextManager.getInstance().getText(menuTextKey);
 	}	
 	
 	@Override