immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into dev-savegame

blender-script
tomangelo 2020-01-02 15:00:33 +01:00 committed by GitHub
parent 17d0d2abb1 b8c4232312
commit 51cde3c868
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
32 changed files with 156 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
INSTALL.md
View File

@ -71,7 +71,7 @@ You will need:
On Ubuntu (and probably any other Debian-based system), you can use the following command to install all required packages: On Ubuntu (and probably any other Debian-based system), you can use the following command to install all required packages:
``` ```
$ apt-get install build-essential cmake libsdl2-dev libsdl2-image-dev libsdl2-ttf-dev libsndfile1-dev libvorbis-dev libogg-dev libpng12-dev libglew-dev libopenal-dev libboost-dev libboost-system-dev libboost-filesystem-dev libboost-regex-dev libphysfs-dev gettext git po4a vorbis-tools $ apt-get install build-essential cmake libsdl2-dev libsdl2-image-dev libsdl2-ttf-dev libsndfile1-dev libvorbis-dev libogg-dev libpng-dev libglew-dev libopenal-dev libboost-dev libboost-system-dev libboost-filesystem-dev libboost-regex-dev libphysfs-dev gettext git po4a vorbis-tools
``` ```
Make sure you install the packages along with header files (often distributed in separate *-dev packages). If you miss any requirements, Make sure you install the packages along with header files (often distributed in separate *-dev packages). If you miss any requirements,

2
Jenkinsfile vendored
View File

@ -81,6 +81,8 @@ pipeline {
# Create AppImage # Create AppImage
NO_STRIP=1 ./squashfs-root/AppRun -e colobot --output appimage --appdir colobot.AppDir -d desktop/colobot.desktop -i ../../desktop/colobot.svg NO_STRIP=1 ./squashfs-root/AppRun -e colobot --output appimage --appdir colobot.AppDir -d desktop/colobot.desktop -i ../../desktop/colobot.svg
#rename AppImage file to avoid "No such file or directory" errors
find . -maxdepth 1 -type f -name '*AppImage' -name 'Colobot*' -exec sh -c 'x="{}"; mv "$x" "Colobot-x86_64.AppImage"' \\;
chmod +x Colobot-x86_64.AppImage chmod +x Colobot-x86_64.AppImage
# Prepare folder for zip # Prepare folder for zip

35
desktop/CMakeLists.txt
View File

@ -82,20 +82,6 @@ if(PLATFORM_GNU)
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps/ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps/
) )
# Translate translatable material
find_program(PO4A po4a)
if(NOT PO4A)
message(WARNING "po4a not found; desktop and manpage files will not be translated")
endif()
if(PO4A)
add_custom_target(desktop_po4a
COMMAND ${PO4A} po4a.cfg
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)
add_dependencies(desktopfile desktop_po4a)
endif()
# Create manpage from pod-formatted file # Create manpage from pod-formatted file
find_program(POD2MAN pod2man) find_program(POD2MAN pod2man)
if(NOT POD2MAN) if(NOT POD2MAN)
@ -133,11 +119,30 @@ if(PLATFORM_GNU)
# Create the english manpage # Create the english manpage
podman(PODFILE colobot.pod) podman(PODFILE colobot.pod)
# Translate translatable material
find_program(PO4A po4a)
if(NOT PO4A)
message(WARNING "po4a not found; desktop and manpage files will not be translated")
endif()
if(PO4A) if(PO4A)
# Translate the manpage to other languages # Translate the manpage to other languages
add_dependencies(man desktop_po4a)
file(GLOB LINGUAS_PO RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/po/ ${CMAKE_CURRENT_SOURCE_DIR}/po/*.po) file(GLOB LINGUAS_PO RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/po/ ${CMAKE_CURRENT_SOURCE_DIR}/po/*.po)
string(REGEX REPLACE ".po$" "" LINGUAS ${LINGUAS_PO}) string(REGEX REPLACE ".po$" "" LINGUAS ${LINGUAS_PO})
set(PO4A_OUTPUTS)
foreach(LOCALE ${LINGUAS})
list(APPEND PO4A_OUTPUTS ${CMAKE_CURRENT_SOURCE_DIR}/lang/${LOCALE}/colobot.pod)
endforeach()
add_custom_command(
OUTPUT ${PO4A_OUTPUTS}
COMMAND ${PO4A} po4a.cfg
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)
add_custom_target(desktop_po4a DEPENDS ${PO4A_OUTPUTS})
add_dependencies(man desktop_po4a)
add_dependencies(desktopfile desktop_po4a)
foreach(LOCALE ${LINGUAS}) foreach(LOCALE ${LINGUAS})
podman(PODFILE lang/${LOCALE}/colobot.pod LOCALE ${LOCALE}) podman(PODFILE lang/${LOCALE}/colobot.pod LOCALE ${LOCALE})
add_dependencies(man${PM_LOCALE} desktop_po4a) add_dependencies(man${PM_LOCALE} desktop_po4a)

42
desktop/po/fr.po
View File

@ -3,18 +3,20 @@
# This file is distributed under the same license as the Colobot package. # This file is distributed under the same license as the Colobot package.
# #
# Didier Raboud <odyx@debian.org>, 2012, 2016. # Didier Raboud <odyx@debian.org>, 2012, 2016.
# B-CE <.>, 2019.
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: colobot 0.1.7\n" "Project-Id-Version: colobot 0.1.12\n"
"POT-Creation-Date: 2016-03-30 13:45+0200\n" "POT-Creation-Date: 2016-03-30 13:45+0200\n"
"PO-Revision-Date: 2016-03-30 13:49+0100\n" "PO-Revision-Date: 2019-06-01 09:43+0200\n"
"Last-Translator: Didier Raboud <odyx@debian.org>\n" "Last-Translator: BCE <.>\n"
"Language-Team: French <kde-i18n-doc@kde.org>\n"
"Language: fr\n" "Language: fr\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Lokalize 2.0\n" "X-Generator: Lokalize 18.12.3\n"
#. type: Name= #. type: Name=
#: colobot.ini:1 #: colobot.ini:1
@ -32,13 +34,13 @@ msgstr "Apprentissage de la programmation par le jeu"
#: colobot.ini:3 #: colobot.ini:3
#, no-wrap #, no-wrap
msgid "Colonize with bots" msgid "Colonize with bots"
msgstr "Colonise avec des roBots" msgstr "COlonise avec des roBOTs"
#. type: Keywords= #. type: Keywords=
#: colobot.ini:4 #: colobot.ini:4
#, no-wrap #, no-wrap
msgid "robots;3d;space;astronaut;java;c++;" msgid "robots;3d;space;astronaut;java;c++;"
msgstr "robots;3d;espace;astronaute;cosmonaute;java;c++;" msgstr "robots;3d;espace;astronaute;cosmonaute;java;c++;programmation;jeux"
#. type: =head1 #. type: =head1
#: colobot.pod:3 #: colobot.pod:3
@ -74,12 +76,12 @@ msgid ""
"real-time graphics and a C++ and Java-like, object-oriented language, CBOT, " "real-time graphics and a C++ and Java-like, object-oriented language, CBOT, "
"which can be used to program the robots available in the game." "which can be used to program the robots available in the game."
msgstr "" msgstr ""
"Colobot (Colonise avec des roBots) est un jeu éducatif visant à " "Colobot (Colonise avec des roBots) est un jeu éducatif visant "
"l'enseignement de la programmation par le jeu. Vous jouez un astronaute en " "à l'enseignement de la programmation par le jeu. Vous jouez un astronaute en "
"voyage avec des robots à la recherche d'une planète à coloniser. Son " "voyage avec des robots à la recherche d'une planète à coloniser. Son "
"interface est en trois-dimensions et en temps réel; le language utilisé " "interface est en trois-dimensions et en temps réel. Le langage utilisé "
"(CBOT) ressemble au C++ et à Java et peut être utilisé pour programmer les " "(CBOT), orienté objet , ressemble au C++ et à Java. Il peut être utilisé "
"robots disponibles dans le jeu." "pour programmer les robots disponibles dans le jeu."
#. type: =head1 #. type: =head1
#: colobot.pod:19 #: colobot.pod:19
@ -208,9 +210,9 @@ msgid ""
"Enable debug mode (more info printed in logs). Possible values are as " "Enable debug mode (more info printed in logs). Possible values are as "
"follows, as well as any comma-separated combination" "follows, as well as any comma-separated combination"
msgstr "" msgstr ""
"Active le mode de I<debug> (plus d'informations dans les logs). Les valeurs" "Active le mode de I<debug> (plus d'informations dans les logs). "
" possibles sont les suivantes, ainsi que toute combinaison séparée par des" "Les valeurs possibles sont les suivantes, "
" virgules" "ainsi que toute combinaison séparée par des virgules"
#. type: =item #. type: =item
#: colobot.pod:81 #: colobot.pod:81
@ -260,7 +262,7 @@ msgstr "models"
#. type: textblock #. type: textblock
#: colobot.pod:99 #: colobot.pod:99
msgid "Models-related debugging" msgid "Models-related debugging"
msgstr "Debug pour les modèles" msgstr "Débug pour les modèles"
#. type: =item #. type: =item
#: colobot.pod:101 #: colobot.pod:101
@ -270,7 +272,7 @@ msgstr "all"
#. type: textblock #. type: textblock
#: colobot.pod:103 #: colobot.pod:103
msgid "All above debugging statements" msgid "All above debugging statements"
msgstr "Tout les messages de debug ci-dessus" msgstr "Tous les messages de debug ci-dessus"
#. type: =item #. type: =item
#: colobot.pod:107 #: colobot.pod:107
@ -280,9 +282,7 @@ msgstr "B<-headless>"
#. type: textblock #. type: textblock
#: colobot.pod:109 #: colobot.pod:109
msgid "Run in headless mode - disables graphics, sound and user interaction" msgid "Run in headless mode - disables graphics, sound and user interaction"
msgstr "" msgstr "Lance en mode I<headless> - désactive les graphiques, sons et interactions utilisateurs"
"Lance en mode I<headless> - désactive les graphiques, sons et interactions"
" utilisateurs"
#. type: =item #. type: =item
#: colobot.pod:111 #: colobot.pod:111
@ -292,7 +292,7 @@ msgstr "B<-runscene> I<scenecodename>"
#. type: textblock #. type: textblock
#: colobot.pod:113 #: colobot.pod:113
msgid "Run given scene on start (skip menus)" msgid "Run given scene on start (skip menus)"
msgstr "Lance une scène donnée au lancement (saute les menus)" msgstr "Démarre directement une scène (saute les menus)"
#. type: =item #. type: =item
#: colobot.pod:115 #: colobot.pod:115
@ -317,7 +317,7 @@ msgstr "LC_MESSAGES"
#. type: textblock #. type: textblock
#: colobot.pod:127 #: colobot.pod:127
msgid "Used to determine the runtime language." msgid "Used to determine the runtime language."
msgstr "Utilisé pour déterminer la langue au lancement" msgstr "Utilisé pour déterminer la langue au lancement."
#. type: =head1 #. type: =head1
#: colobot.pod:131 #: colobot.pod:131

136
po/fr.po
View File

@ -1,21 +1,21 @@
# Didier Raboud <odyx@debian.org>, 2012, 2015, 2016. # Didier Raboud <odyx@debian.org>, 2012, 2015, 2016.
# Martin Quinson <mquinson@debian.org>, 2016 # Martin Quinson <mquinson@debian.org>, 2016.
# B-CE, 2018 # B-CE <.>, 2018, 2019.
# Pascal Audoux <pascal.audoux@gmail.com>, 2018 # Pascal Audoux <pascal.audoux@gmail.com>, 2018.
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Colobot 0.1.11\n" "Project-Id-Version: Colobot 0.1.12\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: DATE\n" "POT-Creation-Date: DATE\n"
"PO-Revision-Date: 2019-01-09 23:07+0100\n" "PO-Revision-Date: 2019-06-13 01:31+0200\n"
"Last-Translator: B-CE\n" "Last-Translator: BCE <.>\n"
"Language-Team: \n" "Language-Team: French <>\n"
"Language: fr\n" "Language: fr\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Poedit 2.0.6\n" "X-Generator: Lokalize 18.12.3\n"
"X-Language: fr_FR\n" "X-Language: fr_FR\n"
"X-Source-Language: en_US\n" "X-Source-Language: en_US\n"
@ -39,7 +39,7 @@ msgid "..in front"
msgstr "..devant" msgstr "..devant"
msgid "..power cell" msgid "..power cell"
msgstr "..pile" msgstr "..batterie"
msgid "1) First click on the key you want to redefine." msgid "1) First click on the key you want to redefine."
msgstr "1) Cliquez d'abord sur la touche à redéfinir." msgstr "1) Cliquez d'abord sur la touche à redéfinir."
@ -141,10 +141,10 @@ msgid "Automatic indent\\When program editing"
msgstr "Indentation automatique\\Pendant l'édition d'un programme" msgstr "Indentation automatique\\Pendant l'édition d'un programme"
msgid "Autosave interval\\How often your game will autosave" msgid "Autosave interval\\How often your game will autosave"
msgstr "Interval d'auto-sauvegarde\\À quels intervals les parties vont-t-elles êtres sauvegardées automatiquement" msgstr "Interval auto-sauvegarde\\À quels intervals les parties vont-t-elles êtres sauvegardées automatiquement"
msgid "Autosave slots\\How many autosave slots you'll have" msgid "Autosave slots\\How many autosave slots you'll have"
msgstr "Nombre d'auto-sauvegardes\\Combien d'auto-sauvegarde seront conservées" msgstr "Nb auto-sauvegardes\\Combien d'auto-sauvegarde seront conservées"
msgid "Autosave\\Enables autosave" msgid "Autosave\\Enables autosave"
msgstr "Auto-sauvegarde\\Activer l'auto-sauvegarde" msgstr "Auto-sauvegarde\\Activer l'auto-sauvegarde"
@ -186,13 +186,13 @@ msgid "Bot destroyed"
msgstr "Robot détruit" msgstr "Robot détruit"
msgid "Bot factory" msgid "Bot factory"
msgstr "Fabrique de robots" msgstr "Usine de robots"
msgid "Build a bot factory" msgid "Build a bot factory"
msgstr "Construire une fabrique de robots" msgstr "Construire une usine de robots"
msgid "Build a converter" msgid "Build a converter"
msgstr "Construire un convertisseur" msgstr "Construire une raffinerie"
msgid "Build a defense tower" msgid "Build a defense tower"
msgstr "Construire une tour" msgstr "Construire une tour"
@ -204,10 +204,10 @@ msgid "Build a destroyer"
msgstr "Construire un destructeur" msgstr "Construire un destructeur"
msgid "Build a exchange post" msgid "Build a exchange post"
msgstr "Construire une borne d'information" msgstr "Construire une station relais"
msgid "Build a legged grabber" msgid "Build a legged grabber"
msgstr "Fabriquer un déménageur à pattes" msgstr "Fabriquer un préhenseur à pattes"
msgid "Build a legged orga shooter" msgid "Build a legged orga shooter"
msgstr "Fabriquer un tireur organique à pattes" msgstr "Fabriquer un tireur organique à pattes"
@ -225,10 +225,10 @@ msgid "Build a nuclear power plant"
msgstr "Construire une centrale nucléaire" msgstr "Construire une centrale nucléaire"
msgid "Build a phazer shooter" msgid "Build a phazer shooter"
msgstr "Fabriquer un robot canon à phases" msgstr "Fabriquer un robot canon hachoir"
msgid "Build a power cell factory" msgid "Build a power cell factory"
msgstr "Construire une fabrique de piles" msgstr "Construire une fabrique de batteries"
msgid "Build a power station" msgid "Build a power station"
msgstr "Construire une station de recharge" msgstr "Construire une station de recharge"
@ -255,7 +255,7 @@ msgid "Build a thumper"
msgstr "Fabriquer un robot secoueur" msgstr "Fabriquer un robot secoueur"
msgid "Build a tracked grabber" msgid "Build a tracked grabber"
msgstr "Fabriquer un déménageur à chenilles" msgstr "Fabriquer un préhenseur à chenilles"
msgid "Build a tracked orga shooter" msgid "Build a tracked orga shooter"
msgstr "Fabriquer un tireur organique à chenilles" msgstr "Fabriquer un tireur organique à chenilles"
@ -267,7 +267,7 @@ msgid "Build a tracked sniffer"
msgstr "Fabriquer un renifleur à chenilles" msgstr "Fabriquer un renifleur à chenilles"
msgid "Build a wheeled grabber" msgid "Build a wheeled grabber"
msgstr "Fabriquer un déménageur à roues" msgstr "Fabriquer un préhenseur à roues"
msgid "Build a wheeled orga shooter" msgid "Build a wheeled orga shooter"
msgstr "Fabriquer un tireur organique à roues" msgstr "Fabriquer un tireur organique à roues"
@ -279,7 +279,7 @@ msgid "Build a wheeled sniffer"
msgstr "Fabriquer un renifleur à roues" msgstr "Fabriquer un renifleur à roues"
msgid "Build a winged grabber" msgid "Build a winged grabber"
msgstr "Fabriquer un déménageur volant" msgstr "Fabriquer un préhenseur volant"
msgid "Build a winged orga shooter" msgid "Build a winged orga shooter"
msgstr "Fabriquer un tireur organique volant" msgstr "Fabriquer un tireur organique volant"
@ -315,19 +315,19 @@ msgid "Camera border scrolling\\Scrolling when the mouse touches right or left b
msgstr "Défilement dans les bords\\Défilement lorsque la souris touche les bords gauche ou droite" msgstr "Défilement dans les bords\\Défilement lorsque la souris touche les bords gauche ou droite"
msgid "Camera closer\\Moves the camera forward" msgid "Camera closer\\Moves the camera forward"
msgstr "Caméra plus proche\\Avance la caméra" msgstr "Plus proche\\Avance la caméra"
msgid "Camera down\\Turns the camera down" msgid "Camera down\\Turns the camera down"
msgstr "Baisser caméra\\Baisse la caméra" msgstr "Plus bas\\Tourne la caméra vers le bas"
msgid "Camera left\\Turns the camera left" msgid "Camera left\\Turns the camera left"
msgstr "Caméra à gauche\\Tourne la caméra vers la gauche" msgstr "À gauche\\Tourne la caméra vers la gauche"
msgid "Camera right\\Turns the camera right" msgid "Camera right\\Turns the camera right"
msgstr "Caméra à droite\\Tourne la caméra vers la droite" msgstr "À droite\\Tourne la caméra vers la droite"
msgid "Camera up\\Turns the camera up" msgid "Camera up\\Turns the camera up"
msgstr "Lever caméra\\Monte la caméra" msgstr "Plus haut\\Tourne la caméra vers le haut"
msgid "Can not produce not researched object" msgid "Can not produce not researched object"
msgstr "Impossible de créer un objet n'ayant pas été recherché" msgstr "Impossible de créer un objet n'ayant pas été recherché"
@ -366,7 +366,7 @@ msgid "Cheat console\\Show cheat console"
msgstr "Console de triche\\Montre la console de triche" msgstr "Console de triche\\Montre la console de triche"
msgid "Checkpoint" msgid "Checkpoint"
msgstr "Indicateur" msgstr "Point de passage"
msgid "Class name expected" msgid "Class name expected"
msgstr "Nom de classe attendu" msgstr "Nom de classe attendu"
@ -420,7 +420,7 @@ msgid "Controls\\Keyboard, joystick and mouse settings"
msgstr "Commandes\\Touches du clavier" msgstr "Commandes\\Touches du clavier"
msgid "Converts ore to titanium" msgid "Converts ore to titanium"
msgstr "Conversion de minerai en titane" msgstr "Raffinage de minerai en titane"
msgid "Copy" msgid "Copy"
msgstr "Copier" msgstr "Copier"
@ -520,7 +520,7 @@ msgid "End of block missing"
msgstr "Il manque la fin du bloc" msgstr "Il manque la fin du bloc"
msgid "Energy deposit (site for power station)" msgid "Energy deposit (site for power station)"
msgstr "Emplacement pour une station de recharge ou une fabrique de pile" msgstr "Sous sol énergétique (Emplacement pour une station de recharge ou une fabrique de batteries)"
msgid "Energy level" msgid "Energy level"
msgstr "Niveau d'énergie" msgstr "Niveau d'énergie"
@ -575,7 +575,7 @@ msgstr "But/Objectif"
# OBJECT_END : GoalArea # OBJECT_END : GoalArea
msgid "Fixed mine" msgid "Fixed mine"
msgstr "Mine fixe" msgstr "Mine anti-personnel"
msgid "Flat ground not large enough" msgid "Flat ground not large enough"
msgstr "Sol plat pas assez grand" msgstr "Sol plat pas assez grand"
@ -606,7 +606,7 @@ msgid "Found a site for a derrick"
msgstr "Emplacement pour un derrick trouvé" msgstr "Emplacement pour un derrick trouvé"
msgid "Found a site for power station" msgid "Found a site for power station"
msgstr "Emplacement pour station de recharge ou fabrique de pile trouvé" msgstr "Emplacement pour station de recharge ou fabrique de batteries trouvé"
msgid "Found key A (site for derrick)" msgid "Found key A (site for derrick)"
msgstr "Emplacement pour un derrick (clé A)" msgstr "Emplacement pour un derrick (clé A)"
@ -726,7 +726,7 @@ msgid "Inappropriate bot"
msgstr "Robot inadapté" msgstr "Robot inadapté"
msgid "Inappropriate cell type" msgid "Inappropriate cell type"
msgstr "Pas le bon type de pile" msgstr "Source d'énergie non adapté"
msgid "Inappropriate object" msgid "Inappropriate object"
msgstr "Pas le bon objet" msgstr "Pas le bon objet"
@ -738,7 +738,7 @@ msgid "Infected by a virus; temporarily out of order"
msgstr "Infecté par un virus; ne fonctionne plus temporairement" msgstr "Infecté par un virus; ne fonctionne plus temporairement"
msgid "Information exchange post" msgid "Information exchange post"
msgstr "Borne d'information" msgstr "Station relais"
msgid "Instruction \"break\" outside a loop" msgid "Instruction \"break\" outside a loop"
msgstr "Instruction \"break\" en dehors d'une boucle" msgstr "Instruction \"break\" en dehors d'une boucle"
@ -801,7 +801,7 @@ msgid "LOADING"
msgstr "CHARGEMENT" msgstr "CHARGEMENT"
msgid "Legged grabber" msgid "Legged grabber"
msgstr "Robot déménageur à pattes" msgstr "Robot préhenseur à pattes"
msgid "Legged orga shooter" msgid "Legged orga shooter"
msgstr "Robot tireur organique à pattes" msgstr "Robot tireur organique à pattes"
@ -872,7 +872,7 @@ msgid "Lunar Roving Vehicle"
msgstr "Véhicule d'exploration lunaire" msgstr "Véhicule d'exploration lunaire"
msgid "MSAA\\Multisample anti-aliasing" msgid "MSAA\\Multisample anti-aliasing"
msgstr "ACME\\Anticrénelage multiéchantillon" msgstr "ACME\\Anticrénelage multiéchantillon (MSAA: Multisample anti-aliasing)"
msgid "Maximize" msgid "Maximize"
msgstr "Taille maximale" msgstr "Taille maximale"
@ -959,7 +959,7 @@ msgid "No function with this name accepts this number of parameters"
msgstr "Aucune fonction de ce nom n'accepte ce nombre de paramètres" msgstr "Aucune fonction de ce nom n'accepte ce nombre de paramètres"
msgid "No information exchange post within range" msgid "No information exchange post within range"
msgstr "Pas de borne d'information accessible" msgstr "Pas de station relais accessible"
msgid "No more energy" msgid "No more energy"
msgstr "Plus d'énergie" msgstr "Plus d'énergie"
@ -968,7 +968,7 @@ msgid "No ore in the subsoil"
msgstr "Pas de minerai en sous-sol" msgstr "Pas de minerai en sous-sol"
msgid "No power cell" msgid "No power cell"
msgstr "Pas de pile" msgstr "Pas de source d'énergie"
msgid "No titanium" msgid "No titanium"
msgstr "Pas de titane" msgstr "Pas de titane"
@ -977,7 +977,7 @@ msgid "No titanium around"
msgstr "Pas de titane accessible" msgstr "Pas de titane accessible"
msgid "No titanium ore to convert" msgid "No titanium ore to convert"
msgstr "Pas de minerai de titane à convertir" msgstr "Pas de minerai de titane à raffiner"
msgid "No titanium to transform" msgid "No titanium to transform"
msgstr "Pas de titane à transformer" msgstr "Pas de titane à transformer"
@ -1022,10 +1022,10 @@ msgid "Nothing to recycle"
msgstr "Rien à recycler" msgstr "Rien à recycler"
msgid "Nuclear power cell" msgid "Nuclear power cell"
msgstr "Pile nucléaire" msgstr "Pile atomique"
msgid "Nuclear power cell available" msgid "Nuclear power cell available"
msgstr "Pile nucléaire disponible" msgstr "Pile atomique disponible"
msgid "Nuclear power station" msgid "Nuclear power station"
msgstr "Centrale nucléaire" msgstr "Centrale nucléaire"
@ -1046,7 +1046,7 @@ msgid "OK\\Choose the selected player"
msgstr "D'accord\\Choisir le joueur" msgstr "D'accord\\Choisir le joueur"
msgid "OK\\Close program editor and return to game" msgid "OK\\Close program editor and return to game"
msgstr "D'accord\\Compiler le programme" msgstr "D'accord\\Compiler le programme et fermer la fenêtre d'édition"
msgid "Object too close" msgid "Object too close"
msgstr "Objet trop proche" msgstr "Objet trop proche"
@ -1109,7 +1109,7 @@ msgid "Pause\\Pause the game without opening menu"
msgstr "Pause\\Mettre le jeu en pause sans ouvrir le menu" msgstr "Pause\\Mettre le jeu en pause sans ouvrir le menu"
msgid "Phazer shooter" msgid "Phazer shooter"
msgstr "Robot canon à phases" msgstr "Robot canon hachoir"
msgid "Photography" msgid "Photography"
msgstr "Vue de la mission" msgstr "Vue de la mission"
@ -1127,7 +1127,7 @@ msgid "Plans for nuclear power plant available"
msgstr "Construction d'une centrale nucléaire possible" msgstr "Construction d'une centrale nucléaire possible"
msgid "Plans for phazer shooter available" msgid "Plans for phazer shooter available"
msgstr "Fabrication des robots canon à phases possible" msgstr "Fabrication des robots canon hachoir possible"
msgid "Plans for shielder available" msgid "Plans for shielder available"
msgstr "Fabrication d'un robot bouclier possible" msgstr "Fabrication d'un robot bouclier possible"
@ -1157,13 +1157,13 @@ msgid "Player's name"
msgstr "Nom du joueur" msgstr "Nom du joueur"
msgid "Power cell" msgid "Power cell"
msgstr "Pile normale" msgstr "Batterie standard"
msgid "Power cell available" msgid "Power cell available"
msgstr "Pile disponible" msgstr "Batterie disponible"
msgid "Power cell factory" msgid "Power cell factory"
msgstr "Fabrique de piles" msgstr "Fabrique de batteries"
msgid "Power station" msgid "Power station"
msgstr "Station de recharge" msgstr "Station de recharge"
@ -1241,7 +1241,7 @@ msgid "Quit\\Quit Colobot: Gold Edition"
msgstr "Quitter\\Quitter Colobot : Édition Gold" msgstr "Quitter\\Quitter Colobot : Édition Gold"
msgid "Quit\\Quit the current mission or exercise" msgid "Quit\\Quit the current mission or exercise"
msgstr "Quitter la mission en cours\\Terminer un exercice ou une mssion" msgstr "Quitter la mission en cours\\Terminer un exercice ou une mission"
msgid "Radar station" msgid "Radar station"
msgstr "Radar" msgstr "Radar"
@ -1326,34 +1326,34 @@ msgid "Ruin"
msgstr "Bâtiment en ruine" msgstr "Bâtiment en ruine"
msgid "Run research program for defense tower" msgid "Run research program for defense tower"
msgstr "Recherche la tour de défense" msgstr "Lancer la recherche de la tour de défense"
msgid "Run research program for legged bots" msgid "Run research program for legged bots"
msgstr "Recherche du fonctionnement des pattes" msgstr "Lancer la recherche du fonctionnement des pattes"
msgid "Run research program for nuclear power" msgid "Run research program for nuclear power"
msgstr "Recherche du programme nucléaire" msgstr "Lancer la recherche du programme nucléaire"
msgid "Run research program for orga shooter" msgid "Run research program for orga shooter"
msgstr "Recherche le canon organique" msgstr "Lancer la recherche du canon organique"
msgid "Run research program for phazer shooter" msgid "Run research program for phazer shooter"
msgstr "Recherche le canon à phases" msgstr "Lancer la recherche du canon hachoir"
msgid "Run research program for shielder" msgid "Run research program for shielder"
msgstr "Recherche le bouclier" msgstr "Lancer la recherche du bouclier"
msgid "Run research program for shooter" msgid "Run research program for shooter"
msgstr "Recherche le canon de tir" msgstr "Lancer la recherche du canon de tir"
msgid "Run research program for thumper" msgid "Run research program for thumper"
msgstr "Recherche le secoueur" msgstr "Lancer la recherche du secoueur"
msgid "Run research program for tracked bots" msgid "Run research program for tracked bots"
msgstr "Recherche du fonctionnement des chenilles" msgstr "Lancer la recherche du fonctionnement des chenilles"
msgid "Run research program for winged bots" msgid "Run research program for winged bots"
msgstr "Recherche du fonctionnement du jet" msgstr "Lancer la recherche du fonctionnement du jet"
msgid "SatCom" msgid "SatCom"
msgstr "SatCom" msgstr "SatCom"
@ -1446,7 +1446,7 @@ msgid "Spaceship"
msgstr "Vaisseau spatial" msgstr "Vaisseau spatial"
msgid "Spaceship ruin" msgid "Spaceship ruin"
msgstr "Epave de vaisseau spatial" msgstr "Épave de vaisseau spatial"
msgid "Spider" msgid "Spider"
msgstr "Araignée" msgstr "Araignée"
@ -1503,7 +1503,7 @@ msgid "Switch bots <-> buildings"
msgstr "Permute robots <-> bâtiments" msgstr "Permute robots <-> bâtiments"
msgid "Take off to finish the mission" msgid "Take off to finish the mission"
msgstr "Décolle pour terminer la mission" msgstr "Décollage pour terminer la mission"
msgid "Target" msgid "Target"
msgstr "Cible" msgstr "Cible"
@ -1566,7 +1566,7 @@ msgid "This program is read-only, clone it to edit"
msgstr "Ce programme est en lecture-seule, le dupliquer pour pouvoir le modifier" msgstr "Ce programme est en lecture-seule, le dupliquer pour pouvoir le modifier"
msgid "Thump (\\key action;)" msgid "Thump (\\key action;)"
msgstr "Secoue (\\key action;)" msgstr "Secouer (\\key action;)"
msgid "Thumper" msgid "Thumper"
msgstr "Robot secoueur" msgstr "Robot secoueur"
@ -1609,7 +1609,7 @@ msgid "Too many parameters"
msgstr "Trop de paramètres" msgstr "Trop de paramètres"
msgid "Tracked grabber" msgid "Tracked grabber"
msgstr "Robot déménageur à chenilles" msgstr "Robot préhenseur à chenilles"
msgid "Tracked orga shooter" msgid "Tracked orga shooter"
msgstr "Robot tireur organique à chenilles" msgstr "Robot tireur organique à chenilles"
@ -1690,7 +1690,7 @@ msgid "Vault"
msgstr "Coffre-fort" msgstr "Coffre-fort"
msgid "Vertical Synchronization\\Limits the number of frames per second to display frequency" msgid "Vertical Synchronization\\Limits the number of frames per second to display frequency"
msgstr "" msgstr "Synchronisation verticale :\\Réduit la fréquence d'images par seconde à afficher."
msgid "Violet flag" msgid "Violet flag"
msgstr "Drapeau violet" msgstr "Drapeau violet"
@ -1708,7 +1708,7 @@ msgid "Waste"
msgstr "Déchet" msgstr "Déchet"
msgid "Wheeled grabber" msgid "Wheeled grabber"
msgstr "Robot déménageur à roues" msgstr "Robot préhenseur à roues"
msgid "Wheeled orga shooter" msgid "Wheeled orga shooter"
msgstr "Robot tireur organique à roues" msgstr "Robot tireur organique à roues"
@ -1720,7 +1720,7 @@ msgid "Wheeled sniffer"
msgstr "Robot renifleur à roues" msgstr "Robot renifleur à roues"
msgid "Winged grabber" msgid "Winged grabber"
msgstr "Robot déménageur volant" msgstr "Robot préhenseur volant"
msgid "Winged orga shooter" msgid "Winged orga shooter"
msgstr "Robot tireur organique volant" msgstr "Robot tireur organique volant"
@ -1741,7 +1741,7 @@ msgid "Worm fatally wounded"
msgstr "Ver mortellement touché" msgstr "Ver mortellement touché"
msgid "Wreckage" msgid "Wreckage"
msgstr "Epave de robot" msgstr "Épave de robot"
msgid "Write error" msgid "Write error"
msgstr "Erreur lors de l'écriture" msgstr "Erreur lors de l'écriture"
@ -1826,7 +1826,7 @@ msgid "\\New player name"
msgstr "\\Nom du joueur à créer" msgstr "\\Nom du joueur à créer"
msgid "\\No eyeglasses" msgid "\\No eyeglasses"
msgstr "\\Pas de lunettes" msgstr "\\Pas de lunette"
msgid "\\Raise the pencil" msgid "\\Raise the pencil"
msgstr "\\Relève le crayon" msgstr "\\Relève le crayon"
@ -1888,9 +1888,6 @@ msgstr "colobot.info"
msgid "epsitec.com" msgid "epsitec.com"
msgstr "epsitec.com" msgstr "epsitec.com"
#~ msgid " "
#~ msgstr " "
#~ msgid " Drivers:" #~ msgid " Drivers:"
#~ msgstr " Pilotes :" #~ msgstr " Pilotes :"
@ -2058,3 +2055,4 @@ msgstr "epsitec.com"
#~ msgid "\\c; (none)\\n;\n" #~ msgid "\\c; (none)\\n;\n"
#~ msgstr "\\c; (aucun)\\n;\n" #~ msgstr "\\c; (aucun)\\n;\n"

18
po/pl.po
View File

@ -365,7 +365,7 @@ msgid "Checkpoint"
msgstr "Punkt kontrolny" msgstr "Punkt kontrolny"
msgid "Class name expected" msgid "Class name expected"
msgstr "" msgstr "Oczekiwano nazwy klasy"
msgid "Climb\\Increases the power of the jet" msgid "Climb\\Increases the power of the jet"
msgstr "W górę\\Zwiększa moc silnika" msgstr "W górę\\Zwiększa moc silnika"
@ -634,7 +634,7 @@ msgid "Function name missing"
msgstr "Brakująca nazwa funkcji" msgstr "Brakująca nazwa funkcji"
msgid "Function needs return type \"void\"" msgid "Function needs return type \"void\""
msgstr "" msgstr "Funkcja potrzebuje typu zwracanego \"void\""
msgid "Game speed" msgid "Game speed"
msgstr "Prędkość gry" msgstr "Prędkość gry"
@ -685,7 +685,7 @@ msgid "Help balloons\\Explain the function of the buttons"
msgstr "Dymki pomocy\\Wyjaśnia funkcje przycisków" msgstr "Dymki pomocy\\Wyjaśnia funkcje przycisków"
msgid "Hex value out of range" msgid "Hex value out of range"
msgstr "" msgstr "Wartość heksadecymalna poza zakresem"
msgid "Higher speed\\Doubles speed" msgid "Higher speed\\Doubles speed"
msgstr "Zwiększ prędkość\\Podwaja prędkość" msgstr "Zwiększ prędkość\\Podwaja prędkość"
@ -865,10 +865,10 @@ msgid "Mipmap level\\Mipmap level"
msgstr "Poziom mipmap\\Poziom mipmap" msgstr "Poziom mipmap\\Poziom mipmap"
msgid "Missing end quote" msgid "Missing end quote"
msgstr "" msgstr "Brak cudzysłowu zamykającego"
msgid "Missing hex digits after escape sequence" msgid "Missing hex digits after escape sequence"
msgstr "" msgstr "Brak cyfr heksadecymalnych po znaku ucieczki"
msgid "Mission name" msgid "Mission name"
msgstr "Nazwa misji" msgstr "Nazwa misji"
@ -970,7 +970,7 @@ msgid "No userlevels installed!"
msgstr "Brak zainstalowanych poziomów użytkownika!" msgstr "Brak zainstalowanych poziomów użytkownika!"
msgid "Non-void function needs \"return;\"" msgid "Non-void function needs \"return;\""
msgstr "" msgstr "Funkcja zwracająca typ inny, niż \"void\", wymaga \"return;\""
msgid "Normal size" msgid "Normal size"
msgstr "Normalna wielkość" msgstr "Normalna wielkość"
@ -1033,7 +1033,7 @@ msgid "Object too close"
msgstr "Obiekt za blisko" msgstr "Obiekt za blisko"
msgid "Octal value out of range" msgid "Octal value out of range"
msgstr "" msgstr "Wartość ósemkowa poza zakresem"
msgid "One step" msgid "One step"
msgstr "Jeden krok" msgstr "Jeden krok"
@ -1078,7 +1078,7 @@ msgid "Paste (Ctrl+V)"
msgstr "Wklej (Ctrl+V)" msgstr "Wklej (Ctrl+V)"
msgid "Pause blur\\Blur the background on the pause screen" msgid "Pause blur\\Blur the background on the pause screen"
msgstr "" msgstr "Rozmyta pauza\\Rozmyj tło na ekranie pauzy"
msgid "Pause in background\\Pause the game when the window is unfocused" msgid "Pause in background\\Pause the game when the window is unfocused"
msgstr "Wstrzymaj w tle\\Wstrzymaj grę gdy okno stanie się nieaktywne" msgstr "Wstrzymaj w tle\\Wstrzymaj grę gdy okno stanie się nieaktywne"
@ -1540,7 +1540,7 @@ msgid "This object is not a member of a class"
msgstr "Ten obiekt nie jest członkiem klasy" msgstr "Ten obiekt nie jest członkiem klasy"
msgid "This parameter needs a default value" msgid "This parameter needs a default value"
msgstr "" msgstr "Ten parametr wymaga podania domyślnej wartości"
msgid "This program is read-only, clone it to edit" msgid "This program is read-only, clone it to edit"
msgstr "Ten program jest tylko do odczytu, skopiuj go, aby edytować" msgstr "Ten program jest tylko do odczytu, skopiuj go, aby edytować"

2
src/CBot/CBotInstr/CBotDefClass.cpp
View File

@ -140,7 +140,7 @@ CBotInstr* CBotDefClass::Compile(CBotToken* &p, CBotCStack* pStack, CBotClass* p
if (typ == CBotErrUndefCall) if (typ == CBotErrUndefCall)
{ {
// si le constructeur n'existe pas // if the ctor don't exist
if (inst->m_parameters != nullptr) // with parameters if (inst->m_parameters != nullptr) // with parameters
{ {
pStk->SetError(CBotErrNoConstruct, vartoken); pStk->SetError(CBotErrNoConstruct, vartoken);

2
src/CBot/CBotInstr/CBotDo.cpp
View File

@ -57,7 +57,7 @@ CBotInstr* CBotDo::Compile(CBotToken* &p, CBotCStack* pStack)
inst->SetToken(p); inst->SetToken(p);
if (!IsOfType(p, ID_DO)) return nullptr; // should never happen if (!IsOfType(p, ID_DO)) return nullptr; // should never happen
CBotCStack* pStk = pStack->TokenStack(pp); // un petit bout de pile svp CBotCStack* pStk = pStack->TokenStack(pp); // some space for a stack, plz
// looking for a statement block after the do // looking for a statement block after the do

2
src/CBot/CBotInstr/CBotFor.cpp
View File

@ -67,7 +67,7 @@ CBotInstr* CBotFor::Compile(CBotToken* &p, CBotCStack* pStack)
return nullptr; return nullptr;
} }
CBotCStack* pStk = pStack->TokenStack(pp, true); // un petit bout de pile svp CBotCStack* pStk = pStack->TokenStack(pp, true); // some size for a stack, plz
// compiles instructions for initialization // compiles instructions for initialization
inst->m_init = CBotListExpression::Compile(p, pStk ); inst->m_init = CBotListExpression::Compile(p, pStk );

6
src/CBot/CBotInstr/CBotFunction.cpp
View File

@ -169,7 +169,7 @@ CBotFunction* CBotFunction::Compile(CBotToken* &p, CBotCStack* pStack, CBotFunct
func->m_token = d; func->m_token = d;
} }
// un nom de fonction est-il là ? // is there a function name here ?
if (IsOfType(p, TokenTypVar)) if (IsOfType(p, TokenTypVar))
{ {
if ( IsOfType( p, ID_DBLDOTS ) ) // method for a class if ( IsOfType( p, ID_DBLDOTS ) ) // method for a class
@ -284,7 +284,7 @@ CBotFunction* CBotFunction::Compile1(CBotToken* &p, CBotCStack* pStack, CBotClas
func->m_token = d; func->m_token = d;
} }
// un nom de fonction est-il là ? // is there a function name here ?
if (IsOfType(p, TokenTypVar)) if (IsOfType(p, TokenTypVar))
{ {
if ( IsOfType( p, ID_DBLDOTS ) ) // method for a class if ( IsOfType( p, ID_DBLDOTS ) ) // method for a class
@ -584,7 +584,7 @@ CBotFunction* CBotFunction::FindLocalOrPublic(const std::list<CBotFunction*>& lo
{ {
int i = 0; int i = 0;
int alpha = 0; // signature of parameters int alpha = 0; // signature of parameters
// parameters sont-ils compatibles ? // are parameters compatible ?
CBotDefParam* pv = pt->m_param; // list of expected parameters CBotDefParam* pv = pt->m_param; // list of expected parameters
CBotVar* pw = ppVars[i++]; // list of provided parameters CBotVar* pw = ppVars[i++]; // list of provided parameters
while ( pv != nullptr && (pw != nullptr || pv->HasDefault()) ) while ( pv != nullptr && (pw != nullptr || pv->HasDefault()) )

2
src/CBot/CBotInstr/CBotParExpr.cpp
View File

@ -94,7 +94,7 @@ CBotInstr* CBotParExpr::Compile(CBotToken* &p, CBotCStack* pStack, bool bConstEx
CBotToken* pvar = p; CBotToken* pvar = p;
// no, it an "ordinaty" variable // no, it's an "ordinaty" variable
inst = CBotExprVar::Compile(p, pStk); inst = CBotExprVar::Compile(p, pStk);
CBotToken* pp = p; CBotToken* pp = p;

4
src/CBot/CBotInstr/CBotSwitch.cpp
View File

@ -51,7 +51,7 @@ CBotInstr* CBotSwitch::Compile(CBotToken* &p, CBotCStack* pStack)
inst->SetToken(p); inst->SetToken(p);
if (!IsOfType(p, ID_SWITCH)) return nullptr; // should never happen if (!IsOfType(p, ID_SWITCH)) return nullptr; // should never happen
CBotCStack* pStk = pStack->TokenStack(pp); // un petit bout de pile svp CBotCStack* pStk = pStack->TokenStack(pp); // some space for a stack, plz
if ( IsOfType(p, ID_OPENPAR ) ) if ( IsOfType(p, ID_OPENPAR ) )
{ {
@ -72,7 +72,7 @@ CBotInstr* CBotSwitch::Compile(CBotToken* &p, CBotCStack* pStack)
if ( p->GetType() == ID_CASE || p->GetType() == ID_DEFAULT) if ( p->GetType() == ID_CASE || p->GetType() == ID_DEFAULT)
{ {
delete pStk2; delete pStk2;
pStk2 = pStk->TokenStack(p, true); // un petit bout de pile svp pStk2 = pStk->TokenStack(p, true); // some space for a stack, plz
caseInst = static_cast<CBotCase*>(CBotCase::Compile(p, pStk2, inst->m_labels)); caseInst = static_cast<CBotCase*>(CBotCase::Compile(p, pStk2, inst->m_labels));
if (caseInst == nullptr) if (caseInst == nullptr)

12
src/CBot/CBotInstr/CBotTry.cpp
View File

@ -52,7 +52,7 @@ CBotInstr* CBotTry::Compile(CBotToken* &p, CBotCStack* pStack)
inst->SetToken(p); inst->SetToken(p);
if (!IsOfType(p, ID_TRY)) return nullptr; // should never happen if (!IsOfType(p, ID_TRY)) return nullptr; // should never happen
CBotCStack* pStk = pStack->TokenStack(pp); // un petit bout de pile svp CBotCStack* pStk = pStack->TokenStack(pp); // some space for a stack, plz
inst->m_block = CBotBlock::CompileBlkOrInst(p, pStk ); inst->m_block = CBotBlock::CompileBlkOrInst(p, pStk );
CBotCatch** pn = &inst->m_catchList; CBotCatch** pn = &inst->m_catchList;
@ -102,11 +102,11 @@ bool CBotTry::Execute(CBotStack* &pj)
val = pile1->GetError(); val = pile1->GetError();
if ( val == CBotNoErr && pile1->GetTimer() == 0 ) // mode step? if ( val == CBotNoErr && pile1->GetTimer() == 0 ) // mode step?
return false; // does not make the catch return false; // don't jump to the catch
pile1->IncState(); pile1->IncState();
pile2->SetState(val); // stores the error number pile2->SetState(val); // stores the error number
pile1->SetError(CBotNoErr); // for now there is are more errors! pile1->SetError(CBotNoErr); // for now there are more errors!
if ( val == CBotNoErr && pile1->GetTimer() < 0 ) // mode step? if ( val == CBotNoErr && pile1->GetTimer() < 0 ) // mode step?
return false; // does not make the catch return false; // does not make the catch
@ -124,8 +124,7 @@ bool CBotTry::Execute(CBotStack* &pj)
{ {
if ( --state <= 0 ) if ( --state <= 0 )
{ {
// request to the catch block if they feel concerned // ask to the catch block if it feels concerned
// demande au bloc catch s'il se sent concerné
if ( !pc->TestCatch(pile2, val) ) return false; // suspend ! if ( !pc->TestCatch(pile2, val) ) return false; // suspend !
pile1->IncState(); pile1->IncState();
} }
@ -200,8 +199,7 @@ void CBotTry::RestoreState(CBotStack* &pj, bool bMain)
{ {
if ( --state <= 0 ) if ( --state <= 0 )
{ {
// request to the catch block if they feel concerned // ask to the catch block if it feels concerned
// demande au bloc catch s'il se sent concerné
pc->RestoreCondState(pile2, bMain); // suspend ! pc->RestoreCondState(pile2, bMain); // suspend !
return; return;
} }

2
src/CBot/CBotInstr/CBotTwoOpExpr.cpp
View File

@ -358,7 +358,7 @@ bool CBotTwoOpExpr::Execute(CBotStack* &pStack)
CBotStack* pStk2 = pStk1->AddStack(); // adds an item to the stack CBotStack* pStk2 = pStk1->AddStack(); // adds an item to the stack
// or return in case of recovery // or return in case of recovery
// 2e état, évalue l'opérande de droite // 2nd state, evalute right operand
if ( pStk2->GetState() == 0 ) if ( pStk2->GetState() == 0 )
{ {
if ( !m_rightop->Execute(pStk2) ) return false; // interrupted here? if ( !m_rightop->Execute(pStk2) ) return false; // interrupted here?

3
src/CBot/CBotInstr/CBotWhile.cpp
View File

@ -56,8 +56,7 @@ CBotInstr* CBotWhile::Compile(CBotToken* &p, CBotCStack* pStack)
inst->SetToken(p); inst->SetToken(p);
if (!IsOfType(p, ID_WHILE)) return nullptr; // should never happen if (!IsOfType(p, ID_WHILE)) return nullptr; // should never happen
CBotCStack* pStk = pStack->TokenStack(pp); // un petit bout de pile svp CBotCStack* pStk = pStack->TokenStack(pp); // some space for a stack, plz
// a bit of battery please (??)
if ( nullptr != (inst->m_condition = CBotCondition::Compile(p, pStk )) ) if ( nullptr != (inst->m_condition = CBotCondition::Compile(p, pStk )) )
{ {

4
src/CBot/CBotVar/CBotVar.cpp
View File

@ -382,7 +382,7 @@ CBotVar::InitType CBotVar::GetInit() const
void CBotVar::SetInit(CBotVar::InitType initType) void CBotVar::SetInit(CBotVar::InitType initType)
{ {
m_binit = initType; m_binit = initType;
if (initType == CBotVar::InitType::IS_POINTER ) m_binit = CBotVar::InitType::DEF; // cas spécial if (initType == CBotVar::InitType::IS_POINTER ) m_binit = CBotVar::InitType::DEF; // special case
if ( m_type.Eq(CBotTypPointer) && initType == CBotVar::InitType::IS_POINTER ) if ( m_type.Eq(CBotTypPointer) && initType == CBotVar::InitType::IS_POINTER )
{ {
@ -535,7 +535,7 @@ void CBotVar::SetVal(CBotVar* var)
assert(0); assert(0);
} }
m_binit = var->m_binit; // copie l'état nan s'il y a m_binit = var->m_binit; // copy the nan status if it has
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////

2
src/CBot/CBotVar/CBotVarArray.cpp
View File

@ -93,7 +93,7 @@ void CBotVarArray::SetPointer(CBotVar* pVarClass)
!pVarClass->m_type.Eq(CBotTypArrayBody)) !pVarClass->m_type.Eq(CBotTypArrayBody))
assert(0); assert(0);
(static_cast<CBotVarClass*>(pVarClass))->IncrementUse(); // incement the reference (static_cast<CBotVarClass*>(pVarClass))->IncrementUse(); // increment the reference
} }
if ( m_pInstance != nullptr ) m_pInstance->DecrementUse(); if ( m_pInstance != nullptr ) m_pInstance->DecrementUse();

2
src/CBot/CBotVar/CBotVarClass.cpp
View File

@ -51,7 +51,7 @@ CBotVarClass::CBotVarClass(const CBotToken& name, const CBotTypResult& type) : C
m_type = type; m_type = type;
if ( type.Eq(CBotTypArrayPointer) ) m_type.SetType( CBotTypArrayBody ); if ( type.Eq(CBotTypArrayPointer) ) m_type.SetType( CBotTypArrayBody );
else if ( !type.Eq(CBotTypArrayBody) ) m_type.SetType( CBotTypClass ); else if ( !type.Eq(CBotTypArrayBody) ) m_type.SetType( CBotTypClass );
// officel type for this object // official type for this object
m_pClass = nullptr; m_pClass = nullptr;
m_pParent = nullptr; m_pParent = nullptr;

2
src/CBot/stdlib/FileFunctions.cpp
View File

@ -181,7 +181,7 @@ CBotTypResult cfopen (CBotVar* pThis, CBotVar* &pVar)
// process FILE :: close // process FILE :: close
// execeution // execution
bool rfclose (CBotVar* pThis, CBotVar* pVar, CBotVar* pResult, int& Exception, void* user) bool rfclose (CBotVar* pThis, CBotVar* pVar, CBotVar* pResult, int& Exception, void* user)
{ {
// it shouldn't be any parameters // it shouldn't be any parameters

2
src/CMakeLists.txt
View File

@ -63,7 +63,6 @@ elseif(PLATFORM_WINDOWS)
find_library(BZ2_LIBRARY NAMES bz2.lib) find_library(BZ2_LIBRARY NAMES bz2.lib)
find_library(JPEG_LIBRARY NAMES jpeg.lib) find_library(JPEG_LIBRARY NAMES jpeg.lib)
find_library(TIFF_LIBRARY NAMES tiff.lib) find_library(TIFF_LIBRARY NAMES tiff.lib)
find_library(WEBP_LIBRARY NAMES webp.lib)
find_library(LZMA_LIBRARY NAMES lzma.lib) find_library(LZMA_LIBRARY NAMES lzma.lib)
find_library(FREETYPE_LIBRARY NAMES freetype.lib) find_library(FREETYPE_LIBRARY NAMES freetype.lib)
set(MSVC_LIBS set(MSVC_LIBS
@ -72,7 +71,6 @@ elseif(PLATFORM_WINDOWS)
${JPEG_LIBRARY} ${JPEG_LIBRARY}
${TIFF_LIBRARY} ${TIFF_LIBRARY}
${BZ2_LIBRARY} ${BZ2_LIBRARY}
${WEBP_LIBRARY}
${LZMA_LIBRARY} ${LZMA_LIBRARY}
${FREETYPE_LIBRARY} ${FREETYPE_LIBRARY}
winmm.lib winmm.lib

2
src/app/main.cpp
View File

@ -61,7 +61,7 @@ object-oriented language, CBOT, which can be used to program the robots availabl
The original version of the game was developed by [Epsitec](http://www.epsitec.ch/) and released in 2001. The original version of the game was developed by [Epsitec](http://www.epsitec.ch/) and released in 2001.
Later, in 2005 another version named Ceebot was released. In March 2012, through attempts Later, in 2005 another version named Ceebot was released. In March 2012, through attempts
by Polish Colobot fans, Epsitec agreeed to release the source code of the game on GPLv3 license. by Polish Colobot fans, Epsitec agreeed to release the source code of the game on GPLv3 license.
The license was given specfifically to our community, <b>TerranovaTeam</b>, The license was given specifically to our community, <b>TerranovaTeam</b>,
part of <b>International Colobot Community (ICC)</b> (previously known as <i>Polish Portal of Colobot (PPC)</i>; part of <b>International Colobot Community (ICC)</b> (previously known as <i>Polish Portal of Colobot (PPC)</i>;
Polish: <i>Polski Portal Colobota</i>) with our website at http://colobot.info/. Polish: <i>Polski Portal Colobota</i>) with our website at http://colobot.info/.

6
src/graphics/engine/particle.cpp
View File

@ -877,7 +877,7 @@ void CParticle::FrameParticle(float rTime)
m_track[r].drawParticle = (progress < 1.0f); m_track[r].drawParticle = (progress < 1.0f);
} }
if (m_particle[i].type == PARTITRACK1) // explosion technique? if (m_particle[i].type == PARTITRACK1) // technical explosion?
{ {
m_particle[i].zoom = 1.0f-(m_particle[i].time-m_particle[i].duration); m_particle[i].zoom = 1.0f-(m_particle[i].time-m_particle[i].duration);
@ -2407,7 +2407,7 @@ void CParticle::FrameParticle(float rTime)
ti.y = ts.y+0.125f; ti.y = ts.y+0.125f;
} }
if (m_particle[i].type == PARTIRAY1) // rayon tour ? if (m_particle[i].type == PARTIRAY1) // tower ray ?
{ {
if (progress >= 1.0f) if (progress >= 1.0f)
{ {
@ -2517,7 +2517,7 @@ void CParticle::TrackDraw(int i, ParticleType type)
Math::Point texInf, texSup; Math::Point texInf, texSup;
if (type == PARTITRACK1) // explosion technique? if (type == PARTITRACK1) // technical explosion?
{ {
texInf.x = 64.5f/256.0f; texInf.x = 64.5f/256.0f;
texInf.y = 21.0f/256.0f; texInf.y = 21.0f/256.0f;

4
src/object/auto/autoportico.cpp
View File

@ -47,8 +47,8 @@ const float PORTICO_TIME_OPEN = 12.0f;
// Si progress=0, return a. // if progress=0, return a.
// Si progress=1, return b. // if progress=1, return b.
static float Progress(float a, float b, float progress) static float Progress(float a, float b, float progress)
{ {

4
src/object/auto/autopowerstation.cpp
View File

@ -302,9 +302,7 @@ Error CAutoPowerStation::GetError()
return ERR_OK; return ERR_OK;
} }
// Create the all interface when the object is selected.
// Crée toute l'interface lorsque l'objet est sélectionné .
bool CAutoPowerStation::CreateInterface(bool bSelect) bool CAutoPowerStation::CreateInterface(bool bSelect)
{ {
Ui::CWindow* pw; Ui::CWindow* pw;

2
src/object/auto/autoresearch.cpp
View File

@ -502,7 +502,7 @@ void CAutoResearch::FireStopUpdate(float progress, bool bLightOn)
4.7f, -8.2f, 4.7f, -8.2f,
}; };
if ( !bLightOn ) // <EFBFBD>teint ? if ( !bLightOn ) // light-off ?
{ {
for ( i=0 ; i<6 ; i++ ) for ( i=0 ; i<6 ; i++ )
{ {

2
src/object/task/taskgoto.h
View File

@ -147,7 +147,7 @@ protected:
int m_bmTotal = 0; // number of points in m_bmPoints int m_bmTotal = 0; // number of points in m_bmPoints
int m_bmIndex = 0; // index in m_bmPoints int m_bmIndex = 0; // index in m_bmPoints
Math::Vector m_bmPoints[MAXPOINTS+2]; Math::Vector m_bmPoints[MAXPOINTS+2];
char m_bmIter[MAXPOINTS+2] = {}; signed char m_bmIter[MAXPOINTS+2] = {};
int m_bmIterCounter = 0; int m_bmIterCounter = 0;
CObject* m_bmCargoObject = nullptr; CObject* m_bmCargoObject = nullptr;
float m_bmFinalMove = 0.0f; // final advance distance float m_bmFinalMove = 0.0f; // final advance distance

2
src/object/task/taskmanip.cpp
View File

@ -259,7 +259,7 @@ void CTaskManip::InitAngle()
float energy = GetObjectEnergy(m_object); float energy = GetObjectEnergy(m_object);
if ( energy == 0.0f ) if ( energy == 0.0f )
{ {
m_speed *= 0.7f; // slower if more energy! m_speed *= 0.7f; // slower if no more energy!
} }
} }

2
src/object/task/tasktake.cpp
View File

@ -419,7 +419,7 @@ bool CTaskTake::TransporterTakeObject()
//? cargo = SearchTakeObject(angle, 1.5f, Math::PI*0.04f); //? cargo = SearchTakeObject(angle, 1.5f, Math::PI*0.04f);
float angle = 0.0f; float angle = 0.0f;
CObject* cargo = SearchTakeObject(angle, 1.5f, Math::PI*0.15f); //OK 1.9 CObject* cargo = SearchTakeObject(angle, 1.5f, Math::PI*0.15f); //OK 1.9
if (cargo == nullptr) return false; // rien <20> prendre ? if (cargo == nullptr) return false; // nothing to take ?
assert(cargo->Implements(ObjectInterfaceType::Transportable)); assert(cargo->Implements(ObjectInterfaceType::Transportable));
m_cargoType = cargo->GetType(); m_cargoType = cargo->GetType();

2
src/physics/physics.cpp
View File

@ -1196,7 +1196,7 @@ void CPhysics::EffectUpdate(float aTime, float rTime)
type == OBJECT_MOBILEfc || type == OBJECT_MOBILEfc ||
type == OBJECT_MOBILEfi || type == OBJECT_MOBILEfi ||
type == OBJECT_MOBILEfs || type == OBJECT_MOBILEfs ||
type == OBJECT_MOBILEft ) // fliyng? type == OBJECT_MOBILEft ) // flying?
{ {
if ( m_bLand ) // on the ground? if ( m_bLand ) // on the ground?
{ {

4
src/ui/controls/color.cpp
View File

@ -121,9 +121,7 @@ bool CColor::EventProcess(const Event &event)
return true; return true;
} }
// Draw the button.
// Dessine le bouton.
void CColor::Draw() void CColor::Draw()
{ {
Gfx::CDevice* device; Gfx::CDevice* device;

3
src/ui/controls/interface.cpp
View File

@ -194,8 +194,7 @@ CEdit* CInterface::CreateEdit(Math::Point pos, Math::Point dim, int icon, EventT
return CreateControl<CEdit>(pos, dim, icon, eventMsg); return CreateControl<CEdit>(pos, dim, icon, eventMsg);
} }
// Creates a new pave editable. // Creates a new editable area.
CEditValue* CInterface::CreateEditValue(Math::Point pos, Math::Point dim, int icon, EventType eventMsg) CEditValue* CInterface::CreateEditValue(Math::Point pos, Math::Point dim, int icon, EventType eventMsg)
{ {
CEditValue* ev = CreateControl<CEditValue>(pos, dim, icon, eventMsg); CEditValue* ev = CreateControl<CEditValue>(pos, dim, icon, eventMsg);

2
src/ui/studio.cpp
View File

@ -133,7 +133,7 @@ bool CStudio::EventProcess(const Event &event)
m_event->AddEvent(Event(EVENT_STUDIO_OK)); m_event->AddEvent(Event(EVENT_STUDIO_OK));
} }
if ( event.type == EVENT_STUDIO_EDIT ) // text modifief? if ( event.type == EVENT_STUDIO_EDIT ) // text modified?
{ {
ColorizeScript(edit); ColorizeScript(edit);
} }