diff --git a/CMakeLists.txt b/CMakeLists.txt index 7fea2bfc..66378c55 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,11 @@ cmake_minimum_required(VERSION 2.8) -find_package(PythonInterp 2.7) +option(TRANSLATIONS "Enable translations of help and level files" ON) -if(NOT PYTHONINTERP_FOUND) - message(WARNING "Python not found, help and level files will NOT be translated!") +if(TRANSLATIONS) + find_package(PythonInterp 2.7 REQUIRED) +else() + message(STATUS "Translations disabled; only English files will be installed") endif() if(NOT DEFINED COLOBOT_INSTALL_DATA_DIR) diff --git a/ai/tremot4b.txt b/ai/tremot4b.txt index 0296b812..4bb67d5c 100644 --- a/ai/tremot4b.txt +++ b/ai/tremot4b.txt @@ -29,7 +29,7 @@ public class exchange } // Delete an order. - synchronized void delete() + synchronized void remove() { m_order.m_type = nan; } @@ -63,6 +63,6 @@ extern void object::Slave4( ) { message("Unknown order"); } - list.delete(); + list.remove(); } } diff --git a/help/CMakeLists.txt b/help/CMakeLists.txt index 3ff52821..cdcf47c4 100644 --- a/help/CMakeLists.txt +++ b/help/CMakeLists.txt @@ -9,12 +9,14 @@ set(HELP_INSTALL_DATA_DIR ${COLOBOT_INSTALL_DATA_DIR}/help) ## function(add_help_category help_category_dir install_subdir) - message(STATUS "Adding translation targets for help/${help_category_dir}") - + # Always install English files file(GLOB english_help_files ${help_category_dir}/E/*) install(FILES ${english_help_files} DESTINATION ${HELP_INSTALL_DATA_DIR}/E/${install_subdir}) - if(PYTHONINTERP_FOUND) + # If translations are turned on, also generate translated files + if(TRANSLATIONS) + message(STATUS "Adding translation targets for help/${help_category_dir}") + set(work_dir ${DATA_BINARY_DIR}/help-po/${help_category_dir}) generate_translations(translated_help_files "help" diff --git a/help/bots/po/fr.po b/help/bots/po/fr.po index 7c6575e3..90dd0e27 100644 --- a/help/bots/po/fr.po +++ b/help/bots/po/fr.po @@ -1,182 +1,249 @@ -# SOME DESCRIPTIVE TITLE -# Copyright (C) YEAR Free Software Foundation, Inc. +# Copyright (C) 2016 Free Software Foundation, Inc. # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# Didier Raboud , 2016. msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: colobot-data 0.1.7\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: DATE\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" +"PO-Revision-Date: 2016-03-25 16:57+0100\n" +"Last-Translator: Didier Raboud \n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Translate Toolkit 1.11.0\n" +"X-Generator: Lokalize 2.0\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #. type: \b; header #: ../E/botfc.txt:1 #, no-wrap msgid "