Merge branch 'dev'

Conflicts:
	CMakeLists.txt

Author: krzys-h

.gitignore

@@ -2,7 +2,5 @@
 CMakeFiles/
 Makefile
 cmake_install.cmake
-levels/CMakeFiles/
-levels/Makefile
-levels/cmake_install.cmake
-levels/levels_i18n/
+levels-po/
+help-po/

CMakeLists.txt

@@ -14,7 +14,14 @@ install(DIRECTORY icons      DESTINATION ${COLOBOT_INSTALL_DATA_DIR})
 install(DIRECTORY models     DESTINATION ${COLOBOT_INSTALL_DATA_DIR})
 install(DIRECTORY sounds     DESTINATION ${COLOBOT_INSTALL_DATA_DIR})
 install(DIRECTORY textures   DESTINATION ${COLOBOT_INSTALL_DATA_DIR})
+install(DIRECTORY            DESTINATION ${COLOBOT_INSTALL_DATA_DIR}/mods) # Empty directory
+
+set(DATA_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+set(DATA_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
 
 add_subdirectory(help)
 add_subdirectory(levels)
-add_subdirectory(music)
+
+if(EXISTS music)
+    add_subdirectory(music)
+endif()

LICENSE LICENSE.txt

@@ -21,11 +21,7 @@ Helpfiles are divided in two categories:
   programs, etc. These are stored in levels/$level/help/.
 
 Helpfiles have their source in english, always stored in the E/
-subdirectory. To ensure retro-compatibility, existing translations have
-not been integrated in the gettext-based translation mechanisms and are
-stored in their respective one-character directories. New translations
-snd updates to existing ones should really use the gettext-based
-translation.
+subdirectory. Every other language directory is dynamically generated in the build process from files in level's po/ directory.
 
 ## Colobot syntax
 

README.i18n.md

@@ -26,6 +26,6 @@ Some details of how data file translation is achieved can be found in
 
 The source code contained here was released by Epsitec -- the original
 creator of the game -- on open source (GPLv3) license. The code was
-given and the rights granted specifically to PPC community in
+given and the rights granted specifically to ICC community in
 March 2012. Since then, we have been modifying the code and working on
-our goals, which are briefly summed up below.
+our goals. For more info, see [README.md in the main repository](https://github.com/colobot/colobot/blob/master/README.md)

README.md

@@ -1,33 +1,32 @@
 cmake_minimum_required(VERSION 2.8)
 
-set(LEVELS_I18N_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../levels-i18n/)
+include(../i18n-tools/CommonI18N.cmake)
+include(../i18n-tools/HelpI18N.cmake)
 
-# Handle all help categories' translations
-foreach(LEVEL_CODENAME cbot;object)
-    set(SCENEFILE)
-    set(SCENEDEST)
-    set(PODIR     "${LEVEL_CODENAME}/po/")
-    set(HELPDIR   "${LEVEL_CODENAME}/")
-    set(HELPDEST  "${LEVEL_CODENAME}")
-    message(STATUS "Managing translations for '${LEVEL_CODENAME}' help category")
-    include(${LEVELS_I18N_PATH}/CMakeLists.txt)
-endforeach()
+set(HELP_INSTALL_DATA_DIR  ${COLOBOT_INSTALL_DATA_DIR}/help)
 
-set(LEVEL_CODENAME generic)
-set(SCENEFILE)
-set(SCENEDEST)
-set(PODIR     "${LEVEL_CODENAME}/po/")
-set(HELPDIR   "${LEVEL_CODENAME}/")
-set(HELPDEST  "")
-message(STATUS "Managing translations for '${LEVEL_CODENAME}' help category")
-include(${LEVELS_I18N_PATH}/CMakeLists.txt)
+##
+# Add help category directory
+##
+function(add_help_category help_category_dir install_dest_dir)
+    file(GLOB help_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${help_category_dir}/E/*.txt)
+    list(SORT help_files)
+    if(PO4A AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${help_category_dir}/po/)
+        generate_help_i18n(translated_help_dirs
+                           "${help_files}"
+                           ${help_category_dir}/po
+                           ${DATA_BINARY_DIR}/help-po/${help_category_dir})
+    else()
+        set(translated_help_dirs "")
+    endif()
+    install(DIRECTORY ${help_category_dir}/E/ DESTINATION ${HELP_INSTALL_DATA_DIR}/E/${install_dest_dir})
+    foreach(translated_help_dir ${translated_help_dirs})
+        install(DIRECTORY ${DATA_BINARY_DIR}/help-po/${help_category_dir}/${translated_help_dir}/ DESTINATION ${HELP_INSTALL_DATA_DIR}/${translated_help_dir}/${install_dest_dir})
+    endforeach()
+endfunction()
 
-set(LEVEL_CODENAME bots)
-set(SCENEFILE)
-set(SCENEDEST)
-set(PODIR     "${LEVEL_CODENAME}/po/")
-set(HELPDIR   "${LEVEL_CODENAME}/")
-set(HELPDEST  "object/")
-message(STATUS "Managing translations for '${LEVEL_CODENAME}' help category")
-include(${LEVELS_I18N_PATH}/CMakeLists.txt)
 
+add_help_category(bots "object")
+add_help_category(cbot "cbot")
+add_help_category(generic "")
+add_help_category(object "object")