diff --git a/.gitignore b/.gitignore index 6b29343f..1af0fc79 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ docs/*/_build dashel/ enki/ +*.qm diff --git a/.travis.yml b/.travis.yml index d89e433c..93ed0385 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,6 +24,7 @@ matrix: - qtbase5-dev - qttools5-dev - qtbase5-dev-tools + - qttools5-dev-tools - libqt5help5 - libqt5svg5-dev - libqt5x11extras5-dev diff --git a/CMakeLists.txt b/CMakeLists.txt index 0b8a3c07..d1d42729 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,7 +34,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") find_package(Threads REQUIRED) # Qt and Qwt -find_package(Qt5 OPTIONAL_COMPONENTS Core Gui Widgets OpenGL Network Help Concurrent Xml Svg Test) +find_package(Qt5 OPTIONAL_COMPONENTS Core Gui Widgets OpenGL Network Help Concurrent Xml Svg Test LinguistTools) find_package(Qwt) diff --git a/aseba/clients/studio/CMakeLists.txt b/aseba/clients/studio/CMakeLists.txt index 5b607ea7..fdff78cc 100644 --- a/aseba/clients/studio/CMakeLists.txt +++ b/aseba/clients/studio/CMakeLists.txt @@ -92,6 +92,9 @@ codesign(asebaqtcommon) add_subdirectory(plugins) # resources +file(GLOB TRANSLATIONS_SOURCES "asebastudio*.ts" "compiler*.ts") +set_source_files_properties(${TRANSLATIONS_SOURCES} PROPERTIES OUTPUT_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}") +qt5_add_translation(TRANSLATIONS ${TRANSLATIONS_SOURCES} ) qt5_add_resources(resfiles asebastudio.qrc) include_directories (${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/aseba/clients/studio/asebastudio_de.qm b/aseba/clients/studio/asebastudio_de.qm deleted file mode 100644 index 0172038f..00000000 Binary files a/aseba/clients/studio/asebastudio_de.qm and /dev/null differ diff --git a/aseba/clients/studio/asebastudio_el.qm b/aseba/clients/studio/asebastudio_el.qm deleted file mode 100644 index 1c4d2821..00000000 Binary files a/aseba/clients/studio/asebastudio_el.qm and /dev/null differ diff --git a/aseba/clients/studio/asebastudio_es.qm b/aseba/clients/studio/asebastudio_es.qm deleted file mode 100644 index a6268a5a..00000000 Binary files a/aseba/clients/studio/asebastudio_es.qm and /dev/null differ diff --git a/aseba/clients/studio/asebastudio_fr.qm b/aseba/clients/studio/asebastudio_fr.qm deleted file mode 100644 index c5eee45f..00000000 Binary files a/aseba/clients/studio/asebastudio_fr.qm and /dev/null differ diff --git a/aseba/clients/studio/asebastudio_it.qm b/aseba/clients/studio/asebastudio_it.qm deleted file mode 100644 index 6c9b3e6a..00000000 Binary files a/aseba/clients/studio/asebastudio_it.qm and /dev/null differ diff --git a/aseba/clients/studio/asebastudio_ja.qm b/aseba/clients/studio/asebastudio_ja.qm deleted file mode 100644 index dec6d5f0..00000000 Binary files a/aseba/clients/studio/asebastudio_ja.qm and /dev/null differ diff --git a/aseba/clients/studio/asebastudio_ru.qm b/aseba/clients/studio/asebastudio_ru.qm deleted file mode 100644 index 7431612d..00000000 Binary files a/aseba/clients/studio/asebastudio_ru.qm and /dev/null differ diff --git a/aseba/clients/studio/asebastudio_tl.qm b/aseba/clients/studio/asebastudio_tl.qm deleted file mode 100644 index c02994ca..00000000 Binary files a/aseba/clients/studio/asebastudio_tl.qm and /dev/null differ diff --git a/aseba/clients/studio/asebastudio_tr.qm b/aseba/clients/studio/asebastudio_tr.qm deleted file mode 100644 index 867877bb..00000000 Binary files a/aseba/clients/studio/asebastudio_tr.qm and /dev/null differ diff --git a/aseba/clients/studio/asebastudio_zh.qm b/aseba/clients/studio/asebastudio_zh.qm deleted file mode 100644 index 8cf6bfd8..00000000 Binary files a/aseba/clients/studio/asebastudio_zh.qm and /dev/null differ diff --git a/aseba/clients/studio/compiler_de.qm b/aseba/clients/studio/compiler_de.qm deleted file mode 100644 index 1b62c024..00000000 Binary files a/aseba/clients/studio/compiler_de.qm and /dev/null differ diff --git a/aseba/clients/studio/compiler_el.qm b/aseba/clients/studio/compiler_el.qm deleted file mode 100644 index 0dec1e50..00000000 Binary files a/aseba/clients/studio/compiler_el.qm and /dev/null differ diff --git a/aseba/clients/studio/compiler_es.qm b/aseba/clients/studio/compiler_es.qm deleted file mode 100644 index 5c608734..00000000 Binary files a/aseba/clients/studio/compiler_es.qm and /dev/null differ diff --git a/aseba/clients/studio/compiler_fr.qm b/aseba/clients/studio/compiler_fr.qm deleted file mode 100644 index 9588e622..00000000 Binary files a/aseba/clients/studio/compiler_fr.qm and /dev/null differ diff --git a/aseba/clients/studio/compiler_it.qm b/aseba/clients/studio/compiler_it.qm deleted file mode 100644 index 98340e03..00000000 Binary files a/aseba/clients/studio/compiler_it.qm and /dev/null differ diff --git a/aseba/clients/studio/compiler_ja.qm b/aseba/clients/studio/compiler_ja.qm deleted file mode 100644 index f129d2f7..00000000 Binary files a/aseba/clients/studio/compiler_ja.qm and /dev/null differ diff --git a/aseba/clients/studio/compiler_ru.qm b/aseba/clients/studio/compiler_ru.qm deleted file mode 100644 index 7431612d..00000000 Binary files a/aseba/clients/studio/compiler_ru.qm and /dev/null differ diff --git a/aseba/clients/studio/compiler_tl.qm b/aseba/clients/studio/compiler_tl.qm deleted file mode 100644 index c02994ca..00000000 Binary files a/aseba/clients/studio/compiler_tl.qm and /dev/null differ diff --git a/aseba/clients/studio/compiler_tr.qm b/aseba/clients/studio/compiler_tr.qm deleted file mode 100644 index be651eed..00000000 --- a/aseba/clients/studio/compiler_tr.qm +++ /dev/null @@ -1 +0,0 @@ -<¸dÊÍ!¿`¡½Ý \ No newline at end of file diff --git a/aseba/clients/studio/compiler_zh.qm b/aseba/clients/studio/compiler_zh.qm deleted file mode 100644 index 1734a088..00000000 Binary files a/aseba/clients/studio/compiler_zh.qm and /dev/null differ diff --git a/aseba/clients/thymioupgrader/CMakeLists.txt b/aseba/clients/thymioupgrader/CMakeLists.txt index 97c4328c..4660df3b 100644 --- a/aseba/clients/thymioupgrader/CMakeLists.txt +++ b/aseba/clients/thymioupgrader/CMakeLists.txt @@ -11,6 +11,9 @@ if (Qt5Widgets_FOUND AND Qt5Concurrent_FOUND AND Qt5Network_FOUND AND Qt5Xml_FOU ThymioUpgrader.h ) + file(GLOB TRANSLATIONS_SOURCES "thymioupgrader*.ts") + set_source_files_properties(${TRANSLATIONS_SOURCES} PROPERTIES OUTPUT_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}") + qt5_add_translation(TRANSLATIONS ${TRANSLATIONS_SOURCES} ) qt5_add_resources(resfiles thymioupgrader.qrc) include_directories (${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/aseba/clients/thymioupgrader/thymioupgrader_de.qm b/aseba/clients/thymioupgrader/thymioupgrader_de.qm deleted file mode 100644 index 0a9f2172..00000000 Binary files a/aseba/clients/thymioupgrader/thymioupgrader_de.qm and /dev/null differ diff --git a/aseba/clients/thymioupgrader/thymioupgrader_el.qm b/aseba/clients/thymioupgrader/thymioupgrader_el.qm deleted file mode 100644 index a11d1564..00000000 Binary files a/aseba/clients/thymioupgrader/thymioupgrader_el.qm and /dev/null differ diff --git a/aseba/clients/thymioupgrader/thymioupgrader_es.qm b/aseba/clients/thymioupgrader/thymioupgrader_es.qm deleted file mode 100644 index fd6b324c..00000000 Binary files a/aseba/clients/thymioupgrader/thymioupgrader_es.qm and /dev/null differ diff --git a/aseba/clients/thymioupgrader/thymioupgrader_fr.qm b/aseba/clients/thymioupgrader/thymioupgrader_fr.qm deleted file mode 100644 index 2b586481..00000000 Binary files a/aseba/clients/thymioupgrader/thymioupgrader_fr.qm and /dev/null differ diff --git a/aseba/clients/thymioupgrader/thymioupgrader_it.qm b/aseba/clients/thymioupgrader/thymioupgrader_it.qm deleted file mode 100644 index eaadc3c0..00000000 Binary files a/aseba/clients/thymioupgrader/thymioupgrader_it.qm and /dev/null differ diff --git a/aseba/clients/thymioupgrader/thymioupgrader_ja.qm b/aseba/clients/thymioupgrader/thymioupgrader_ja.qm deleted file mode 100644 index 03a4ae53..00000000 Binary files a/aseba/clients/thymioupgrader/thymioupgrader_ja.qm and /dev/null differ diff --git a/aseba/clients/thymioupgrader/thymioupgrader_ru.qm b/aseba/clients/thymioupgrader/thymioupgrader_ru.qm deleted file mode 100644 index 7431612d..00000000 Binary files a/aseba/clients/thymioupgrader/thymioupgrader_ru.qm and /dev/null differ diff --git a/aseba/clients/thymioupgrader/thymioupgrader_tl.qm b/aseba/clients/thymioupgrader/thymioupgrader_tl.qm deleted file mode 100644 index c02994ca..00000000 Binary files a/aseba/clients/thymioupgrader/thymioupgrader_tl.qm and /dev/null differ diff --git a/aseba/clients/thymioupgrader/thymioupgrader_tr.qm b/aseba/clients/thymioupgrader/thymioupgrader_tr.qm deleted file mode 100644 index be651eed..00000000 --- a/aseba/clients/thymioupgrader/thymioupgrader_tr.qm +++ /dev/null @@ -1 +0,0 @@ -<¸dÊÍ!¿`¡½Ý \ No newline at end of file diff --git a/aseba/clients/thymioupgrader/thymioupgrader_zh.qm b/aseba/clients/thymioupgrader/thymioupgrader_zh.qm deleted file mode 100644 index c1fd3073..00000000 Binary files a/aseba/clients/thymioupgrader/thymioupgrader_zh.qm and /dev/null differ diff --git a/aseba/clients/thymiownetconfig/CMakeLists.txt b/aseba/clients/thymiownetconfig/CMakeLists.txt index d33881b0..70a8a717 100644 --- a/aseba/clients/thymiownetconfig/CMakeLists.txt +++ b/aseba/clients/thymiownetconfig/CMakeLists.txt @@ -6,6 +6,9 @@ if (Qt5Widgets_FOUND) ThymioWNetConfig.h ) + file(GLOB TRANSLATIONS_SOURCES "thymiownetconfig*.ts") + set_source_files_properties(${TRANSLATIONS_SOURCES} PROPERTIES OUTPUT_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}") + qt5_add_translation(TRANSLATIONS ${TRANSLATIONS_SOURCES} ) qt5_add_resources(resfiles thymiownetconfig.qrc) include_directories (${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/aseba/clients/thymiownetconfig/thymiownetconfig_de.qm b/aseba/clients/thymiownetconfig/thymiownetconfig_de.qm deleted file mode 100644 index 741cf9df..00000000 Binary files a/aseba/clients/thymiownetconfig/thymiownetconfig_de.qm and /dev/null differ diff --git a/aseba/clients/thymiownetconfig/thymiownetconfig_el.qm b/aseba/clients/thymiownetconfig/thymiownetconfig_el.qm deleted file mode 100644 index 98a71ff2..00000000 Binary files a/aseba/clients/thymiownetconfig/thymiownetconfig_el.qm and /dev/null differ diff --git a/aseba/clients/thymiownetconfig/thymiownetconfig_es.qm b/aseba/clients/thymiownetconfig/thymiownetconfig_es.qm deleted file mode 100644 index 4f8efd32..00000000 Binary files a/aseba/clients/thymiownetconfig/thymiownetconfig_es.qm and /dev/null differ diff --git a/aseba/clients/thymiownetconfig/thymiownetconfig_fr.qm b/aseba/clients/thymiownetconfig/thymiownetconfig_fr.qm deleted file mode 100644 index ab65f616..00000000 Binary files a/aseba/clients/thymiownetconfig/thymiownetconfig_fr.qm and /dev/null differ diff --git a/aseba/clients/thymiownetconfig/thymiownetconfig_it.qm b/aseba/clients/thymiownetconfig/thymiownetconfig_it.qm deleted file mode 100644 index 69e78fd8..00000000 Binary files a/aseba/clients/thymiownetconfig/thymiownetconfig_it.qm and /dev/null differ diff --git a/aseba/clients/thymiownetconfig/thymiownetconfig_ja.qm b/aseba/clients/thymiownetconfig/thymiownetconfig_ja.qm deleted file mode 100644 index 3f9a0a2d..00000000 Binary files a/aseba/clients/thymiownetconfig/thymiownetconfig_ja.qm and /dev/null differ diff --git a/aseba/clients/thymiownetconfig/thymiownetconfig_ru.qm b/aseba/clients/thymiownetconfig/thymiownetconfig_ru.qm deleted file mode 100644 index 7431612d..00000000 Binary files a/aseba/clients/thymiownetconfig/thymiownetconfig_ru.qm and /dev/null differ diff --git a/aseba/clients/thymiownetconfig/thymiownetconfig_tl.qm b/aseba/clients/thymiownetconfig/thymiownetconfig_tl.qm deleted file mode 100644 index c02994ca..00000000 Binary files a/aseba/clients/thymiownetconfig/thymiownetconfig_tl.qm and /dev/null differ diff --git a/aseba/clients/thymiownetconfig/thymiownetconfig_tr.qm b/aseba/clients/thymiownetconfig/thymiownetconfig_tr.qm deleted file mode 100644 index be651eed..00000000 --- a/aseba/clients/thymiownetconfig/thymiownetconfig_tr.qm +++ /dev/null @@ -1 +0,0 @@ -<¸dÊÍ!¿`¡½Ý \ No newline at end of file diff --git a/aseba/clients/thymiownetconfig/thymiownetconfig_zh.qm b/aseba/clients/thymiownetconfig/thymiownetconfig_zh.qm deleted file mode 100644 index 94e4af55..00000000 Binary files a/aseba/clients/thymiownetconfig/thymiownetconfig_zh.qm and /dev/null differ diff --git a/aseba/common/about/CMakeLists.txt b/aseba/common/about/CMakeLists.txt index 31d3392d..f650a4e4 100644 --- a/aseba/common/about/CMakeLists.txt +++ b/aseba/common/about/CMakeLists.txt @@ -9,8 +9,13 @@ if (Qt5Svg_FOUND) if (ENKI_FOUND) add_definitions(-DHAVE_ENKI) endif (ENKI_FOUND) - + qt5_add_resources(resfiles asebaqtabout.qrc) + + file(GLOB TRANSLATIONS_SOURCES "qtabout*.ts") + set_source_files_properties(${TRANSLATIONS_SOURCES} PROPERTIES OUTPUT_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}") + qt5_add_translation(TRANSLATIONS ${TRANSLATIONS_SOURCES} ) + qt5_wrap_cpp(qt_about_MOCS AboutDialog.h) add_library(asebaqtabout AboutDialog.cpp ${qt_about_MOCS} ${resfiles}) qt5_use_modules(asebaqtabout Core Widgets Svg) diff --git a/aseba/common/about/qtabout_de.qm b/aseba/common/about/qtabout_de.qm deleted file mode 100644 index 53bce7e5..00000000 Binary files a/aseba/common/about/qtabout_de.qm and /dev/null differ diff --git a/aseba/common/about/qtabout_el.qm b/aseba/common/about/qtabout_el.qm deleted file mode 100644 index 9dad8dff..00000000 Binary files a/aseba/common/about/qtabout_el.qm and /dev/null differ diff --git a/aseba/common/about/qtabout_es.qm b/aseba/common/about/qtabout_es.qm deleted file mode 100644 index 4db159ba..00000000 Binary files a/aseba/common/about/qtabout_es.qm and /dev/null differ diff --git a/aseba/common/about/qtabout_fr.qm b/aseba/common/about/qtabout_fr.qm deleted file mode 100644 index 4b2a8cbd..00000000 Binary files a/aseba/common/about/qtabout_fr.qm and /dev/null differ diff --git a/aseba/common/about/qtabout_it.qm b/aseba/common/about/qtabout_it.qm deleted file mode 100644 index e8c60fc0..00000000 Binary files a/aseba/common/about/qtabout_it.qm and /dev/null differ diff --git a/aseba/common/about/qtabout_ja.qm b/aseba/common/about/qtabout_ja.qm deleted file mode 100644 index be651eed..00000000 --- a/aseba/common/about/qtabout_ja.qm +++ /dev/null @@ -1 +0,0 @@ -<¸dÊÍ!¿`¡½Ý \ No newline at end of file diff --git a/aseba/common/about/qtabout_ru.qm b/aseba/common/about/qtabout_ru.qm deleted file mode 100644 index 7431612d..00000000 Binary files a/aseba/common/about/qtabout_ru.qm and /dev/null differ diff --git a/aseba/common/about/qtabout_tl.qm b/aseba/common/about/qtabout_tl.qm deleted file mode 100644 index c02994ca..00000000 Binary files a/aseba/common/about/qtabout_tl.qm and /dev/null differ diff --git a/aseba/common/about/qtabout_tr.qm b/aseba/common/about/qtabout_tr.qm deleted file mode 100644 index be651eed..00000000 --- a/aseba/common/about/qtabout_tr.qm +++ /dev/null @@ -1 +0,0 @@ -<¸dÊÍ!¿`¡½Ý \ No newline at end of file diff --git a/aseba/common/about/qtabout_zh.qm b/aseba/common/about/qtabout_zh.qm deleted file mode 100644 index edc0950d..00000000 Binary files a/aseba/common/about/qtabout_zh.qm and /dev/null differ diff --git a/aseba/targets/challenge/CMakeLists.txt b/aseba/targets/challenge/CMakeLists.txt index 0fa7a6f6..bef5256a 100644 --- a/aseba/targets/challenge/CMakeLists.txt +++ b/aseba/targets/challenge/CMakeLists.txt @@ -11,6 +11,10 @@ set(challenge_SRCS objects/food_ring.cpp ) +file(GLOB TRANSLATIONS_SOURCES "asebachallenge*.ts") +set_source_files_properties(${TRANSLATIONS_SOURCES} PROPERTIES OUTPUT_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}") +qt5_add_translation(TRANSLATIONS ${TRANSLATIONS_SOURCES} ) + qt5_add_resources(challenge_RCC_SRCS challenge-textures.qrc) add_executable(asebachallenge WIN32 ${challenge_SRCS} ${challenge_RCC_SRCS}) diff --git a/aseba/targets/challenge/asebachallenge_de.qm b/aseba/targets/challenge/asebachallenge_de.qm deleted file mode 100644 index 6af8f9ec..00000000 Binary files a/aseba/targets/challenge/asebachallenge_de.qm and /dev/null differ diff --git a/aseba/targets/challenge/asebachallenge_el.qm b/aseba/targets/challenge/asebachallenge_el.qm deleted file mode 100644 index 18ccd6e6..00000000 Binary files a/aseba/targets/challenge/asebachallenge_el.qm and /dev/null differ diff --git a/aseba/targets/challenge/asebachallenge_es.qm b/aseba/targets/challenge/asebachallenge_es.qm deleted file mode 100644 index c846b5e2..00000000 Binary files a/aseba/targets/challenge/asebachallenge_es.qm and /dev/null differ diff --git a/aseba/targets/challenge/asebachallenge_fr.qm b/aseba/targets/challenge/asebachallenge_fr.qm deleted file mode 100644 index ec323162..00000000 Binary files a/aseba/targets/challenge/asebachallenge_fr.qm and /dev/null differ diff --git a/aseba/targets/challenge/asebachallenge_it.qm b/aseba/targets/challenge/asebachallenge_it.qm deleted file mode 100644 index 403ed1ce..00000000 Binary files a/aseba/targets/challenge/asebachallenge_it.qm and /dev/null differ diff --git a/aseba/targets/challenge/asebachallenge_ja.qm b/aseba/targets/challenge/asebachallenge_ja.qm deleted file mode 100644 index 05830a79..00000000 Binary files a/aseba/targets/challenge/asebachallenge_ja.qm and /dev/null differ diff --git a/aseba/targets/challenge/asebachallenge_ru.qm b/aseba/targets/challenge/asebachallenge_ru.qm deleted file mode 100644 index 7431612d..00000000 Binary files a/aseba/targets/challenge/asebachallenge_ru.qm and /dev/null differ diff --git a/aseba/targets/challenge/asebachallenge_tl.qm b/aseba/targets/challenge/asebachallenge_tl.qm deleted file mode 100644 index c02994ca..00000000 Binary files a/aseba/targets/challenge/asebachallenge_tl.qm and /dev/null differ diff --git a/aseba/targets/challenge/asebachallenge_tr.qm b/aseba/targets/challenge/asebachallenge_tr.qm deleted file mode 100644 index be651eed..00000000 --- a/aseba/targets/challenge/asebachallenge_tr.qm +++ /dev/null @@ -1 +0,0 @@ -<¸dÊÍ!¿`¡½Ý \ No newline at end of file diff --git a/aseba/targets/challenge/asebachallenge_zh.qm b/aseba/targets/challenge/asebachallenge_zh.qm deleted file mode 100644 index 1de3cda5..00000000 Binary files a/aseba/targets/challenge/asebachallenge_zh.qm and /dev/null differ diff --git a/aseba/targets/playground/CMakeLists.txt b/aseba/targets/playground/CMakeLists.txt index 6e2f0408..9446a18f 100644 --- a/aseba/targets/playground/CMakeLists.txt +++ b/aseba/targets/playground/CMakeLists.txt @@ -32,6 +32,9 @@ if (Qt5Widgets_FOUND AND Qt5OpenGL_FOUND AND Qt5Xml_FOUND) endif () set(CMAKE_AUTOMOC ON) + file(GLOB TRANSLATIONS_SOURCES "asebaplayground*.ts") + set_source_files_properties(${TRANSLATIONS_SOURCES} PROPERTIES OUTPUT_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}") + qt5_add_translation(TRANSLATIONS ${TRANSLATIONS_SOURCES} ) qt5_add_resources(resfiles asebaplayground.qrc) set(playground_SRCS diff --git a/aseba/targets/playground/asebaplayground_de.qm b/aseba/targets/playground/asebaplayground_de.qm deleted file mode 100644 index c8e349d3..00000000 Binary files a/aseba/targets/playground/asebaplayground_de.qm and /dev/null differ diff --git a/aseba/targets/playground/asebaplayground_el.qm b/aseba/targets/playground/asebaplayground_el.qm deleted file mode 100644 index 9dad8dff..00000000 Binary files a/aseba/targets/playground/asebaplayground_el.qm and /dev/null differ diff --git a/aseba/targets/playground/asebaplayground_es.qm b/aseba/targets/playground/asebaplayground_es.qm deleted file mode 100644 index 3a4b465f..00000000 Binary files a/aseba/targets/playground/asebaplayground_es.qm and /dev/null differ diff --git a/aseba/targets/playground/asebaplayground_fr.qm b/aseba/targets/playground/asebaplayground_fr.qm deleted file mode 100644 index 1afd15b5..00000000 Binary files a/aseba/targets/playground/asebaplayground_fr.qm and /dev/null differ diff --git a/aseba/targets/playground/asebaplayground_it.qm b/aseba/targets/playground/asebaplayground_it.qm deleted file mode 100644 index cfad644c..00000000 Binary files a/aseba/targets/playground/asebaplayground_it.qm and /dev/null differ diff --git a/aseba/targets/playground/asebaplayground_ja.qm b/aseba/targets/playground/asebaplayground_ja.qm deleted file mode 100644 index be651eed..00000000 --- a/aseba/targets/playground/asebaplayground_ja.qm +++ /dev/null @@ -1 +0,0 @@ -<¸dÊÍ!¿`¡½Ý \ No newline at end of file diff --git a/aseba/targets/playground/asebaplayground_ru.qm b/aseba/targets/playground/asebaplayground_ru.qm deleted file mode 100644 index 7431612d..00000000 Binary files a/aseba/targets/playground/asebaplayground_ru.qm and /dev/null differ diff --git a/aseba/targets/playground/asebaplayground_tl.qm b/aseba/targets/playground/asebaplayground_tl.qm deleted file mode 100644 index c02994ca..00000000 Binary files a/aseba/targets/playground/asebaplayground_tl.qm and /dev/null differ diff --git a/aseba/targets/playground/asebaplayground_tr.qm b/aseba/targets/playground/asebaplayground_tr.qm deleted file mode 100644 index be651eed..00000000 --- a/aseba/targets/playground/asebaplayground_tr.qm +++ /dev/null @@ -1 +0,0 @@ -<¸dÊÍ!¿`¡½Ý \ No newline at end of file diff --git a/aseba/targets/playground/asebaplayground_zh.qm b/aseba/targets/playground/asebaplayground_zh.qm deleted file mode 100644 index 1f107a57..00000000 Binary files a/aseba/targets/playground/asebaplayground_zh.qm and /dev/null differ diff --git a/maintainer/translations/01_new_language.py b/maintainer/translations/01_new_language.py index 1f1a6701..1c3ab95d 100755 --- a/maintainer/translations/01_new_language.py +++ b/maintainer/translations/01_new_language.py @@ -90,31 +90,31 @@ def insert_before_tag(input_file, output_file, tag_re, inserted_text): print "Generating files...\n" os.chdir(studio_path) -# lupdate / lrelease asebastudio_x.{ts,qm} -translation_tools.do_lupdate_lrelease("asebastudio", code, " ".join([studio_path, plugin_path, vpl_path])) +# lupdate asebastudio_x.{ts,qm} +translation_tools.do_lupdate("asebastudio", code, " ".join([studio_path, plugin_path, vpl_path])) -# lupdate / lrelease compiler_x.{ts,qm} -translation_tools.do_lupdate_lrelease("compiler", code, compiler_ts_path) +# lupdate compiler_x.{ts,qm} +translation_tools.do_lupdate("compiler", code, compiler_ts_path) os.chdir(challenge_path) -# lupdate / lrelease asebachallenge_x.{ts,qm} -translation_tools.do_lupdate_lrelease("asebachallenge", code, challenge_cpp) +# lupdate asebachallenge_x.{ts,qm} +translation_tools.do_lupdate("asebachallenge", code, challenge_cpp) os.chdir(playground_path) -# lupdate / lrelease asebaplayground_x.{ts,qm} -translation_tools.do_lupdate_lrelease("asebaplayground", code, playground_path) +# lupdate asebaplayground_x.{ts,qm} +translation_tools.do_lupdate("asebaplayground", code, playground_path) os.chdir(thymioupgrader_path) -# lupdate / lrelease thymioupgrader_x.{ts,qm} -translation_tools.do_lupdate_lrelease("thymioupgrader", code, thymioupgrader_path) +# lupdate thymioupgrader_x.{ts,qm} +translation_tools.do_lupdate("thymioupgrader", code, thymioupgrader_path) os.chdir(thymiownetconfig_path) -# lupdate / lrelease thymiownetconfig_x.{ts,qm} -translation_tools.do_lupdate_lrelease("thymiownetconfig", code, thymiownetconfig_path) +# lupdate thymiownetconfig_x.{ts,qm} +translation_tools.do_lupdate("thymiownetconfig", code, thymiownetconfig_path) os.chdir(qtabout_path) -# lupdate / lrelease qtabout_x.{ts,qm} -translation_tools.do_lupdate_lrelease("qtabout", code, qtabout_path) +# lupdate qtabout_x.{ts,qm} +translation_tools.do_lupdate("qtabout", code, qtabout_path) print "Modifying source files...\n" @@ -213,8 +213,8 @@ def insert_before_tag(input_file, output_file, tag_re, inserted_text): print "Done\n" -print "We are done! Now edit the .ts files with Qt Linguist, then run lrelease on them to generate valid .qm." -print "Finally, do not forget to commit the .ts and .qm files." +print "We are done! Now edit the .ts files with Qt Linguist" +print "Finally, do not forget to commit the .ts files." print "Have fun :-)\n" print "*****\n" diff --git a/maintainer/translations/03_sync_all_translations.py b/maintainer/translations/03_sync_all_translations.py index 3953a9f3..6f374df2 100755 --- a/maintainer/translations/03_sync_all_translations.py +++ b/maintainer/translations/03_sync_all_translations.py @@ -29,25 +29,25 @@ translation_tools.init_commands() # qtabout -translation_tools.do_lupdate_lrelease_all(qtabout_path, "qtabout", qtabout_path) +translation_tools.do_lupdate_all(qtabout_path, "qtabout", qtabout_path) # asebastudio -translation_tools.do_lupdate_lrelease_all(studio_path, "asebastudio", " ".join([studio_path, plugin_path, vpl_path])) +translation_tools.do_lupdate_all(studio_path, "asebastudio", " ".join([studio_path, plugin_path, vpl_path])) # compiler -translation_tools.do_lupdate_lrelease_all(studio_path, "compiler", compiler_ts_path) +translation_tools.do_lupdate_all(studio_path, "compiler", compiler_ts_path) # playground -translation_tools.do_lupdate_lrelease_all(playground_path, "asebaplayground", playground_path) +translation_tools.do_lupdate_all(playground_path, "asebaplayground", playground_path) # challenge -translation_tools.do_lupdate_lrelease_all(challenge_path, "asebachallenge", challenge_cpp) +translation_tools.do_lupdate_all(challenge_path, "asebachallenge", challenge_cpp) # upgrader -translation_tools.do_lupdate_lrelease_all(thymioupgrader_path, "thymioupgrader", thymioupgrader_path) +translation_tools.do_lupdate_all(thymioupgrader_path, "thymioupgrader", thymioupgrader_path) # wnetconfig -translation_tools.do_lupdate_lrelease_all(thymiownetconfig_path, "thymiownetconfig", thymiownetconfig_path) +translation_tools.do_lupdate_all(thymiownetconfig_path, "thymiownetconfig", thymiownetconfig_path) diff --git a/maintainer/translations/README b/maintainer/translations/README index 9331955a..74b2d7cc 100644 --- a/maintainer/translations/README +++ b/maintainer/translations/README @@ -1,4 +1,3 @@ - In this directory, you will find a bunch of scripts to maintain the translation files. When you want to add a new language, it is necessary to generate several files, and update others as well. The script "01_new_language.py" will help @@ -13,7 +12,7 @@ For regular updates, use the following scripts: | corresponding C++ source file in Aseba Studio. | | - 03_sync_all_translations.py - | Takes all the existing .ts, then performs lupate / lrelease + | Takes all the existing .ts, then performs lupate | |-- - 04_translation_statistics.py Gives some statistics about the current translations diff --git a/maintainer/translations/translation_tools.py b/maintainer/translations/translation_tools.py index f71d6142..e8355b24 100644 --- a/maintainer/translations/translation_tools.py +++ b/maintainer/translations/translation_tools.py @@ -25,7 +25,6 @@ import re _lupdate = "" -_lrelease = "" _git = "" def _verbose_call(cmd): @@ -47,9 +46,8 @@ def _find_cmd(possible_cmds, args): print "No" return "" -def do_lupdate_lrelease(output_name, lang_code, input_files): +def do_lupdate(output_name, lang_code, input_files): filename = "{}_{}.ts".format(output_name, lang_code) - filename_qm = "{}_{}.qm".format(output_name, lang_code) # _lupdate retcode = _verbose_call("{} -no-recursive {} -target-language {} -locations relative -ts {}".format(_lupdate, input_files, lang_code, filename)) if retcode != 0: @@ -57,16 +55,9 @@ def do_lupdate_lrelease(output_name, lang_code, input_files): exit(3) if _git: _verbose_call("{} add {}".format(_git, filename)) - # _lrelease - retcode = _verbose_call("{} {} -qm {}".format(_lrelease, filename, filename_qm)) - if retcode != 0: - print sys.stderr, "Ooops... Something wrong happened with lrelease {}".format(filename) - exit(4) - if _git: - _verbose_call("{} add {}".format(_git, filename_qm)) -def do_lupdate_lrelease_all(directory, generic_name, input_files): +def do_lupdate_all(directory, generic_name, input_files): old_path = os.getcwd() os.chdir(directory) # search all the existing languages corresponding to this file @@ -78,7 +69,7 @@ def do_lupdate_lrelease_all(directory, generic_name, input_files): continue # get the language lang = match.group(1) - do_lupdate_lrelease(generic_name, lang, input_files) + do_lupdate(generic_name, lang, input_files) os.chdir(old_path) @@ -89,7 +80,6 @@ def do_git_add(filename): def init_commands(): global _lupdate - global _lrelease global _git print "First, we will test for a valid lupdate binary..." @@ -98,12 +88,6 @@ def init_commands(): print sys.stderr, "No valide lupdate found :-(" exit(1) - print "...and for a valid lrelease..." - _lrelease = _find_cmd(["lrelease"], "-version") - if _lrelease == "": - print sys.stderr, "No valide lrelease found :-(" - exit(1) - print "Trying to find a valid git binary (not mandatory)..." _git = _find_cmd(["git"], "--version") if _git == "":