Merge branch 'dev' into dev-add-russian

* dev:
  Add translation files for all categories
  Move the generic helpfiles into categories: generic, object, bots and cbot
  Add translation files for all levels
  Move help files to level-specific directories
  Correct the Polish files capitalisation to be uniform across languages
  Move level scenes to level-specific directories
  Add the help/ and levels/ CMake machinery to enable the po-based translations
  Add CMake-Po4a-based infrastructure to allow po-based translation of Colobot help- and scene-description (level) files

Conflicts:
	levels/gen_levels_xml.sh
dev-ui
Didier 'OdyX' Raboud 2013-11-11 08:56:01 +01:00
commit 79000b523e
2130 changed files with 142174 additions and 5816 deletions

View File

@ -10,7 +10,6 @@ endif()
install(DIRECTORY ai DESTINATION ${COLOBOT_INSTALL_DATA_DIR}) install(DIRECTORY ai DESTINATION ${COLOBOT_INSTALL_DATA_DIR})
install(DIRECTORY fonts DESTINATION ${COLOBOT_INSTALL_DATA_DIR}) install(DIRECTORY fonts DESTINATION ${COLOBOT_INSTALL_DATA_DIR})
install(DIRECTORY help DESTINATION ${COLOBOT_INSTALL_DATA_DIR})
install(DIRECTORY icons DESTINATION ${COLOBOT_INSTALL_DATA_DIR}) install(DIRECTORY icons DESTINATION ${COLOBOT_INSTALL_DATA_DIR})
install(DIRECTORY models DESTINATION ${COLOBOT_INSTALL_DATA_DIR}) install(DIRECTORY models DESTINATION ${COLOBOT_INSTALL_DATA_DIR})
#install(DIRECTORY models-new DESTINATION ${COLOBOT_INSTALL_DATA_DIR}) #install(DIRECTORY models-new DESTINATION ${COLOBOT_INSTALL_DATA_DIR})
@ -18,4 +17,5 @@ install(DIRECTORY music DESTINATION ${COLOBOT_INSTALL_DATA_DIR})
install(DIRECTORY sounds DESTINATION ${COLOBOT_INSTALL_DATA_DIR}) install(DIRECTORY sounds DESTINATION ${COLOBOT_INSTALL_DATA_DIR})
install(DIRECTORY textures DESTINATION ${COLOBOT_INSTALL_DATA_DIR}) install(DIRECTORY textures DESTINATION ${COLOBOT_INSTALL_DATA_DIR})
add_subdirectory(help)
add_subdirectory(levels) add_subdirectory(levels)

33
help/CMakeLists.txt Normal file
View File

@ -0,0 +1,33 @@
cmake_minimum_required(VERSION 2.8)
set(LEVELS_I18N_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../levels-i18n/)
# 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(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)
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)

1121
help/bots/po/bots.pot Normal file

File diff suppressed because it is too large Load Diff

1121
help/bots/po/de.po Normal file

File diff suppressed because it is too large Load Diff

1121
help/bots/po/fr.po Normal file

File diff suppressed because it is too large Load Diff

1121
help/bots/po/pl.po Normal file

File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More