Merge branch 'devel' into feature-createuser

533972ab · Luboš Horáček · c972983f · d46d8d29 · 533972ab · 533972ab
Commit 533972ab authored 9 years ago by Luboš Horáček
--- a/android/assets/text/application/application_cs.properties
+++ b/android/assets/text/application/application_cs.properties
@@ -9,6 +9,7 @@ mainmenu_encyclopedia=Encyklopedie
 mainmenu_preferences=Nastavení
 mainmenu_about=O aplikaci
 mainmenu_logout=Odhlásit
+mainmenu_screendebug=Debug Screen

 gamedifficulty_easy=Lehká
 gamedifficulty_medium=Střední

--- a/android/assets/text/application/application_sk.properties
+++ b/android/assets/text/application/application_sk.properties
@@ -9,6 +9,7 @@ mainmenu_encyclopedia=Encyklopédia
 mainmenu_preferences=Nastavenie
 mainmenu_about=O aplikácií
 mainmenu_logout=Odhlásiť
+mainmenu_screendebug=Debug Screen

 gamedifficulty_easy=Ľahká
 gamedifficulty_medium=Stredná

--- a/core/assets/common/screen/gamemenu/overlay.png
+++ b/core/assets/common/screen/gamemenu/overlay.png
--- a/core/assets/common/screen/debug/blue.png
+++ b/core/assets/common/screen/debug/blue.png
--- a/core/assets/common/screen/debug/checker.png
+++ b/core/assets/common/screen/debug/checker.png
--- a/core/assets/common/screen/debug/pink.png
+++ b/core/assets/common/screen/debug/pink.png
--- a/core/assets/common/screen/debug/point.png
+++ b/core/assets/common/screen/debug/point.png
--- a/core/assets/common/screen/debug/red.png
+++ b/core/assets/common/screen/debug/red.png
--- a/core/assets/common/screen/debug/yellow.png
+++ b/core/assets/common/screen/debug/yellow.png
--- a/core/assets/common/screen/gamemenu/bankovniloupez_back.png
+++ b/core/assets/common/screen/gamemenu/bankovniloupez_back.png
--- a/core/assets/common/screen/gamemenu/bankovniloupez_fore.png
+++ b/core/assets/common/screen/gamemenu/bankovniloupez_fore.png
--- a/core/assets/common/screen/gamemenu/bankovniloupez_mid.png
+++ b/core/assets/common/screen/gamemenu/bankovniloupez_mid.png
--- a/core/assets/common/screen/gamemenu/clickablemap.png
+++ b/core/assets/common/screen/gamemenu/clickablemap.png
--- a/core/assets/common/screen/gamemenu/desk.png
+++ b/core/assets/common/screen/gamemenu/desk.png
--- a/core/assets/common/screen/gamemenu/difficultyseekbar_background.png
+++ b/core/assets/common/screen/gamemenu/difficultyseekbar_background.png
--- a/core/assets/common/screen/gamemenu/difficultyseekbar_thumb.png
+++ b/core/assets/common/screen/gamemenu/difficultyseekbar_thumb.png
--- a/core/assets/common/screen/gamemenu/difficultyseekbar_thumb_easy.png
+++ b/core/assets/common/screen/gamemenu/difficultyseekbar_thumb_easy.png
--- a/core/assets/common/screen/gamemenu/difficultyseekbar_thumb_hard.png
+++ b/core/assets/common/screen/gamemenu/difficultyseekbar_thumb_hard.png
--- a/core/assets/common/screen/gamemenu/difficultyseekbar_thumb_medium.png
+++ b/core/assets/common/screen/gamemenu/difficultyseekbar_thumb_medium.png
--- a/core/assets/common/screen/gamemenu/encyclopedia_pressed.png
+++ b/core/assets/common/screen/gamemenu/encyclopedia_pressed.png