Merge branch 'V3.4' into feature-inthedarkness

.gitmodules

-[submodule "core/external"]
-	path = core/external
+[submodule "core/external/tablexia-shared"]
+	path = core/external/tablexia-shared
 	url = git@gitlab.labs.nic.cz:labs/tablexia-model.git
+[submodule "core/external/copyright-test"]
+	path = core/external/copyright-test
+	url = git@gitlab.labs.nic.cz:util/copyright-test.git

android/AndroidManifest.xml

 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2016 CZ.NIC, z.s.p.o. (http://www.nic.cz/)
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="cz.nic.tablexia.debug"
     android:versionCode="1"
@@ -10,7 +27,11 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.CAMERA"/>
 
+    <uses-feature android:name="android.hardware.camera" />
+    <uses-feature android:name="android.hardware.camera.autofocus" />
+    
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"

android/assets/text/application/application_cs.properties

-# Copyright (C) 2016 CZ.NIC, z.s.p.o. <info@tablexia.cz>
+#
+# Copyright (C) 2016 CZ.NIC, z.s.p.o. (http://www.nic.cz/)
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
 
 language_system=Systémový jazyk
 language_czech=Čeština
@@ -22,8 +26,10 @@ system_confirm=Potvrdit
 system_decline=Zrušit
 system_exit=Konec
 system_retry=Znovu
+system_proceed=Pokračovat
 system_back=Zpět
 system_understand=Rozumím
+system_close=Zavřít
 
 zipassetloader_error=Chyba: Nemohu stáhnout dodatečná data! Zkontrolujte prosím připojení k internetu.
 zipassetloader_download_request: Právě využíváte mobilní připojení k internetu. Tablexia potřebuje stáhnout ~150 MB herních dat. Přejete si je stáhnout nyní ?
@@ -54,6 +60,7 @@ usermenu_dialog_no = Ne
 user_logout_message=Opravdu chcete odhlásit stávajícího uživatele?
 
 preloader_title=Jak hrát?
+confirm_button=Rozumím
 
 gamedifficulty_name=Obtížnost:
 gamedifficulty_tutorial=Cvičení
@@ -239,3 +246,7 @@ sync_request_dialog_text=Zadej číslo průkazu:
 sync_request_button=Synchronizovat uživatele
 sync_request_wrong_id=Špatně zadaný kód.
 sync_request_error=Synchronizace se nezdařila, zkuste to prosím později.
+sync_qr_request_button=Synchronizovat uživatele (QR)
+sync_qr_request_info_dialog_text = Umístěte kameru tak, aby QR Code byl uprostřed obrazovky.
+sync_qr_request_on_decoded_dialog_text = Dekódovaná zpráva\: 
+

android/assets/text/application/application_de.properties

-# Copyright (C) 2016 CZ.NIC, z.s.p.o. <info@tablexia.cz>
+#
+# Copyright (C) 2016 CZ.NIC, z.s.p.o. (http://www.nic.cz/)
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
 
 language_system=Systemsprache
 language_czech=Tschechisch
@@ -24,6 +28,8 @@ system_exit=Verlassen
 system_retry=Wieder
 system_back=Zurück
 system_understand=Ich verstehe
+system_proceed=Fortsetzen
+system_close=Schließen
 
 zipassetloader_error=Fehler: Nicht, um zusätzliche Daten Download! Bitte überprüfen Sie Ihre Internetverbindung.
 zipassetloader_download_request=Sie verwenden im Moment das mobile Internet. Tablexia lädt ~ 150 MB an Spieldaten herunter. Möchten Sie die Daten wirklich jetzt runterladen?
@@ -54,6 +60,7 @@ usermenu_dialog_yes=Ja
 usermenu_dialog_no=Nein
 user_logout_message=Möchtest du abmelden?
 preloader_title=Wie spielt man?
+confirm_button=Ich verstehe
 
 gamedifficulty_name=Schwierigkeitsgrad:
 gamedifficulty_tutorial=Lernprogramm
@@ -238,4 +245,9 @@ user_rank_11=Oberrat
 sync_request_dialog_text=Trage deine Ausweisnummer ein:
 sync_request_button=Account synchronisieren
 sync_request_wrong_id=Falsch geschriebener Code.
-sync_request_error=Die synchronisierung ist fehlgeschlagen, bitte versuche es später noch einmal.
+sync_request_error=Die synchronisierung ist fehlgeschlagen, bitte versuche es später noch einmal.
\ No newline at end of file
+sync_qr_request_button=Account synchronisieren (QR)
+sync_qr_request_info_dialog_text=Positionieren Sie die Kamera so, dass der QR-Code innerhalb der Mitte des Bildschirms.
+sync_qr_request_on_decoded_dialog_text=Die decodierte Nachricht\:  
+
+

android/assets/text/application/application_sk.properties

-# Copyright (C) 2016 CZ.NIC, z.s.p.o. <info@tablexia.cz>
+#
+# Copyright (C) 2016 CZ.NIC, z.s.p.o. (http://www.nic.cz/)
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
 
 language_system=Systémový jazyk
 language_czech=Čeština
@@ -24,6 +28,8 @@ system_exit=Koniec
 system_retry=Znovu
 system_back=Späť
 system_understand=Rozumiem
+system_proceed=Pokračovať
+system_close=Zavrieť
 
 zipassetloader_error=Chyba: Nemôžem stiahnuť dodatočná dáta! Skontrolujte prosím pripojenie k internetu.
 zipassetloader_download_request:Práve využívate mobilné pripojenie k internetu. Tablexia potrebuje stiahnuť ~150 M herných dat. Prajete si ich stiahnuť teraz?
@@ -56,6 +62,7 @@ usermenu_dialog_no=Nie
 user_logout_message=Naozaj chceš odhlásiť súčasného užívateľa?
 
 preloader_title=Ako hrať?
+confirm_button=Rozumiem
 
 gamedifficulty_name=Obtiažnosť:
 gamedifficulty_tutorial=Cvičenie
@@ -241,4 +248,8 @@ user_rank_11=Šefmajster
 sync_request_dialog_text=Zadaj číslo preukazu:
 sync_request_button=Synchronizovať užívateľa
 sync_request_wrong_id=Zle zadaný kód.
-sync_request_error=Synchronizácia sa nepodarila, skúste to prosím neskôr.
+sync_request_error=Synchronizácia sa nepodarila, skúste to prosím neskôr.
\ No newline at end of file
+sync_qr_request_button=Synchronizovať užívateľa (QR)
+sync_qr_request_info_dialog_text=Umiestnite kameru tak, aby bol QR kód uprostred obrazovky.
+sync_qr_request_on_decoded_dialog_text=Dekódovaný obsah\: 
+

android/assets/text/game/crimescene/crimescene_cs.properties

-# Copyright (C) 2016 CZ.NIC, z.s.p.o. <info@tablexia.cz>
+#
+# Copyright (C) 2016 CZ.NIC, z.s.p.o. (http://www.nic.cz/)
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
 
 complete=Hotovo
 score_0=Raději si zapisuj i co jsi měl k obědu.

android/assets/text/game/crimescene/crimescene_de.properties

-# Copyright (C) 2016 CZ.NIC, z.s.p.o. <info@tablexia.cz>
+#
+# Copyright (C) 2016 CZ.NIC, z.s.p.o. (http://www.nic.cz/)
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
 
 complete=Fertig
 score_0=Kein schlechter Anfang! Übe aber noch weiter um dich zu verbessern!

android/assets/text/game/crimescene/crimescene_sk.properties

-# Copyright (C) 2016 CZ.NIC, z.s.p.o. <info@tablexia.cz>
+#
+# Copyright (C) 2016 CZ.NIC, z.s.p.o. (http://www.nic.cz/)
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
 
 complete=Hotovo
 score_0=Radšej si zapisuj aj čo si mal na obed.

android/assets/text/game/inthedarkness/inthedarkness_cs.properties

-# Copyright (C) 2016 CZ.NIC, z.s.p.o. <info@tablexia.cz>
+#
+# Copyright (C) 2016 CZ.NIC, z.s.p.o. (http://www.nic.cz/)
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
 
 floor=Patro
 complete=Hotovo

android/assets/text/game/inthedarkness/inthedarkness_de.properties

-# Copyright (C) 2016 CZ.NIC, z.s.p.o. <info@tablexia.cz>
+#
+# Copyright (C) 2016 CZ.NIC, z.s.p.o. (http://www.nic.cz/)
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
 
 floor=Stock
 complete=Fertig

android/assets/text/game/inthedarkness/inthedarkness_sk.properties

-# Copyright (C) 2016 CZ.NIC, z.s.p.o. <info@tablexia.cz>
+#
+# Copyright (C) 2016 CZ.NIC, z.s.p.o. (http://www.nic.cz/)
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
 
 floor=Poschodie
 complete=Hotovo

android/assets/text/game/kidnapping/kidnapping_cs.properties

-# Copyright (C) 2016 CZ.NIC, z.s.p.o. <info@tablexia.cz>
+#
+# Copyright (C) 2016 CZ.NIC, z.s.p.o. (http://www.nic.cz/)
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
 
 game_kidnapping_replay=Přehrát znovu
 game_kidnapping_rulemessage_understand=Rozumím

android/assets/text/game/kidnapping/kidnapping_de.properties

-# Copyright (C) 2016 CZ.NIC, z.s.p.o. <info@tablexia.cz>
+#
+# Copyright (C) 2016 CZ.NIC, z.s.p.o. (http://www.nic.cz/)
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
 
 game_kidnapping_replay=Nochmal spielen
 game_kidnapping_rulemessage_understand=Ich verstehe

android/assets/text/game/kidnapping/kidnapping_sk.properties

-# Copyright (C) 2016 CZ.NIC, z.s.p.o. <info@tablexia.cz>
+#
+# Copyright (C) 2016 CZ.NIC, z.s.p.o. (http://www.nic.cz/)
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
 
 game_kidnapping_replay=Prehrať znova
 game_kidnapping_rulemessage_understand=Rozumiem

android/assets/text/game/nightwatch/nightwatch_cs.properties

-# Copyright (C) 2016 CZ.NIC, z.s.p.o. <info@tablexia.cz>
+#
+# Copyright (C) 2016 CZ.NIC, z.s.p.o. (http://www.nic.cz/)
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
 
 game_nocnisledovani_btncontinue_text=Hotovo
 victory_text_rounds=Počet bodů: [BLACK]{0}[]

android/assets/text/game/nightwatch/nightwatch_de.properties

-# Copyright (C) 2016 CZ.NIC, z.s.p.o. <info@tablexia.cz>
+#
+# Copyright (C) 2016 CZ.NIC, z.s.p.o. (http://www.nic.cz/)
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
 
 game_nocnisledovani_btncontinue_text=Fertig
 victory_text_rounds=Punktezahl: [BLACK]{0}[]

android/assets/text/game/nightwatch/nightwatch_sk.properties

-# Copyright (C) 2016 CZ.NIC, z.s.p.o. <info@tablexia.cz>
+#
+# Copyright (C) 2016 CZ.NIC, z.s.p.o. (http://www.nic.cz/)
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
 
 game_nocnisledovani_btncontinue_text=Hotovo
 victory_text_rounds=Počet bodov: [BLACK]{0}[]

android/assets/text/game/pursuit/pursuit_cs.properties

-# Copyright (C) 2016 CZ.NIC, z.s.p.o. <info@tablexia.cz>
+#
+# Copyright (C) 2016 CZ.NIC, z.s.p.o. (http://www.nic.cz/)
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
 
 victory_text_hours= {0}h
 victory_text_minutes= {0}min

android/assets/text/game/pursuit/pursuit_de.properties

-# Copyright (C) 2016 CZ.NIC, z.s.p.o. <info@tablexia.cz>
+#
+# Copyright (C) 2016 CZ.NIC, z.s.p.o. (http://www.nic.cz/)
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
 
 victory_text_hours= {0}h
 victory_text_minutes= {0}min

android/assets/text/game/pursuit/pursuit_sk.properties

-# Copyright (C) 2016 CZ.NIC, z.s.p.o. <info@tablexia.cz>
+#
+# Copyright (C) 2016 CZ.NIC, z.s.p.o. (http://www.nic.cz/)
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
 
 victory_text_hours= {0}h
 victory_text_minutes= {0}min