Compare commits

..

No commits in common. "dev" and "master" have entirely different histories.
dev ... master

57 changed files with 60 additions and 60 deletions

View File

@ -22,6 +22,6 @@ set(DATA_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
add_subdirectory(help)
add_subdirectory(levels)
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/music/CMakeLists.txt)
if(EXISTS music)
add_subdirectory(music)
endif()

View File

@ -100,9 +100,9 @@ Below are the different categories available :
\c;\l;YellowFlag\u object\flag; \n;Yellow Flag
\c;\l;VioletFlag\u object\flag; \n;Violet Flag
\c;\l;WayPoint\u object\waypoint; \n;Checkpoint
\c;\l;EnergySpot\u object\enerspot; \n;Underground Energy Deposit
\c;\l;TitaniumSpot\u object\stonspot; \n;Underground Titanium Deposit
\c;\l;UraniumSpot\u object\uranspot; \n;Underground Uranium Deposit
\c;\l;EnergySite\u object\enerspot; \n;Underground Energy Deposit
\c;\l;TitaniumSite\u object\stonspot; \n;Underground Titanium Deposit
\c;\l;UraniumSite\u object\uranspot; \n;Underground Uranium Deposit
\t;See also
\l;CBOT Language\u cbot; and \l;Variables\u cbot\type;.

View File

@ -676,11 +676,11 @@ msgid ""
" <code><a object|flag>YellowFlag</a> </code>Yellow Flag\n"
" <code><a object|flag>VioletFlag</a> </code>Violet Flag\n"
" <code><a object|waypoint>WayPoint</a> </code>Checkpoint\n"
" <code><a object|enerspot>EnergySpot</a> </code>Underground "
" <code><a object|enerspot>EnergySite</a> </code>Underground "
"Energy Deposit\n"
" <code><a object|stonspot>TitaniumSpot</a> </code>Underground "
" <code><a object|stonspot>TitaniumSite</a> </code>Underground "
"Titanium Deposit\n"
" <code><a object|uranspot>UraniumSpot</a> </code>Underground "
" <code><a object|uranspot>UraniumSite</a> </code>Underground "
"Uranium Deposit"
msgstr ""

View File

@ -743,9 +743,9 @@ msgid ""
" <code><a object|flag>YellowFlag</a> </code>Yellow Flag\n"
" <code><a object|flag>VioletFlag</a> </code>Violet Flag\n"
" <code><a object|waypoint>WayPoint</a> </code>Checkpoint\n"
" <code><a object|enerspot>EnergySpot</a> </code>Underground Energy Deposit\n"
" <code><a object|stonspot>TitaniumSpot</a> </code>Underground Titanium Deposit\n"
" <code><a object|uranspot>UraniumSpot</a> </code>Underground Uranium Deposit"
" <code><a object|enerspot>EnergySite</a> </code>Underground Energy Deposit\n"
" <code><a object|stonspot>TitaniumSite</a> </code>Underground Titanium Deposit\n"
" <code><a object|uranspot>UraniumSite</a> </code>Underground Uranium Deposit"
msgstr ""
#. type: Plain text

View File

@ -859,9 +859,9 @@ msgid ""
" <code><a object|flag>YellowFlag</a> </code>Yellow Flag\n"
" <code><a object|flag>VioletFlag</a> </code>Violet Flag\n"
" <code><a object|waypoint>WayPoint</a> </code>Checkpoint\n"
" <code><a object|enerspot>EnergySpot</a> </code>Underground Energy Deposit\n"
" <code><a object|stonspot>TitaniumSpot</a> </code>Underground Titanium Deposit\n"
" <code><a object|uranspot>UraniumSpot</a> </code>Underground Uranium Deposit"
" <code><a object|enerspot>EnergySite</a> </code>Underground Energy Deposit\n"
" <code><a object|stonspot>TitaniumSite</a> </code>Underground Titanium Deposit\n"
" <code><a object|uranspot>UraniumSite</a> </code>Underground Uranium Deposit"
msgstr ""
" <code><a object|waypoint>WayPoint</a> </code>Indicateur de chemin\n"
" <code><a object|flag>BlueFlag</a> </code>Drapeau bleu\n"

View File

@ -868,9 +868,9 @@ msgid ""
" <code><a object|flag>YellowFlag</a> </code>Yellow Flag\n"
" <code><a object|flag>VioletFlag</a> </code>Violet Flag\n"
" <code><a object|waypoint>WayPoint</a> </code>Checkpoint\n"
" <code><a object|enerspot>EnergySpot</a> </code>Underground Energy Deposit\n"
" <code><a object|stonspot>TitaniumSpot</a> </code>Underground Titanium Deposit\n"
" <code><a object|uranspot>UraniumSpot</a> </code>Underground Uranium Deposit"
" <code><a object|enerspot>EnergySite</a> </code>Underground Energy Deposit\n"
" <code><a object|stonspot>TitaniumSite</a> </code>Underground Titanium Deposit\n"
" <code><a object|uranspot>UraniumSite</a> </code>Underground Uranium Deposit"
msgstr ""
" <code><a object|flag>BlueFlag</a> </code>Niebieska flaga\n"
" <code><a object|flag>RedFlag</a> </code>Czerwona flaga\n"
@ -878,9 +878,9 @@ msgstr ""
" <code><a object|flag>YellowFlag</a> </code>Żółta flaga\n"
" <code><a object|flag>VioletFlag</a> </code>Fioletowa flaga\n"
" <code><a object|waypoint>WayPoint</a> </code>Punkt kontrolny\n"
" <code><a object|enerspot>EnergySpot</a> </code>Podziemne źródło energii\n"
" <code><a object|stonspot>TitaniumSpot</a> </code>Podziemne złoże tytanu\n"
" <code><a object|uranspot>UraniumSpot</a> </code>Podziemne złoże uranu"
" <code><a object|enerspot>EnergySite</a> </code>Podziemne źródło energii\n"
" <code><a object|stonspot>TitaniumSite</a> </code>Podziemne złoże tytanu\n"
" <code><a object|uranspot>UraniumSite</a> </code>Podziemne złoże uranu"
#. type: Plain text
#: help/cbot/E/category.txt:108

View File

@ -867,9 +867,9 @@ msgid ""
" <code><a object|flag>YellowFlag</a> </code>Yellow Flag\n"
" <code><a object|flag>VioletFlag</a> </code>Violet Flag\n"
" <code><a object|waypoint>WayPoint</a> </code>Checkpoint\n"
" <code><a object|enerspot>EnergySpot</a> </code>Underground Energy Deposit\n"
" <code><a object|stonspot>TitaniumSpot</a> </code>Underground Titanium Deposit\n"
" <code><a object|uranspot>UraniumSpot</a> </code>Underground Uranium Deposit"
" <code><a object|enerspot>EnergySite</a> </code>Underground Energy Deposit\n"
" <code><a object|stonspot>TitaniumSite</a> </code>Underground Titanium Deposit\n"
" <code><a object|uranspot>UraniumSite</a> </code>Underground Uranium Deposit"
msgstr ""
" <code><a object|flag>BlueFlag</a> </code>Синий Флаг\n"
" <code><a object|flag>RedFlag</a> </code>Красный Флаг\n"
@ -877,9 +877,9 @@ msgstr ""
" <code><a object|flag>YellowFlag</a> </code>Желтый Флаг\n"
" <code><a object|flag>VioletFlag</a> </code>Фиолетовый Флаг\n"
" <code><a object|waypoint>WayPoint</a> </code>Отметка\n"
" <code><a object|enerspot>EnergySpot</a> </code>Подземный запас энергии\n"
" <code><a object|stonspot>TitaniumSpot</a> </code>Подземный запас титана\n"
" <code><a object|uranspot>UraniumSpot</a> </code>Подземный запас урана"
" <code><a object|enerspot>EnergySite</a> </code>Подземный запас энергии\n"
" <code><a object|stonspot>TitaniumSite</a> </code>Подземный запас титана\n"
" <code><a object|uranspot>UraniumSite</a> </code>Подземный запас урана"
#. type: Plain text
#: help/cbot/E/category.txt:108

View File

@ -11,7 +11,7 @@ In order to prospect the subsoil you need a \l;sniffer bot\u object\botsr;, whic
Impossible.
\t;Object \l;Category\u cbot\category;
\c;EnergySpot\n;
\c;EnergySite\n;
\t;See also
\l;CBOT Language\u cbot;, \l;Variables\u cbot\type; and \l;Categories\u cbot\category;.

View File

@ -8,7 +8,7 @@ A \l;sniffer\u object\botsr; will lay down a red cross each time it uncovers a d
Impossible.
\t;Object \l;Category\u cbot\category;
\c;TitaniumSpot\n;
\c;TitaniumSite\n;
\t;See also
\l;CBOT Language\u cbot;, \l;Variables\u cbot\type; and \l;Categories\u cbot\category;.

View File

@ -9,7 +9,7 @@ A \l;sniffer\u object\botsr; will lay down a yellow circle each time it uncovers
Impossible.
\t;Object \l;Category\u cbot\category;
\c;UraniumSpot\n;
\c;UraniumSite\n;
\t;See also
\l;CBOT Language\u cbot;, \l;Variables\u cbot\type; and \l;Categories\u cbot\category;.

View File

@ -773,7 +773,7 @@ msgstr ""
#. type: Plain text
#: help/object/E/enerspot.txt:15
#, no-wrap
msgid "<code>EnergySpot</code>"
msgid "<code>EnergySite</code>"
msgstr ""
#. type: \b; header
@ -1660,7 +1660,7 @@ msgstr ""
#. type: Plain text
#: help/object/E/stonspot.txt:12
#, no-wrap
msgid "<code>TitaniumSpot</code>"
msgid "<code>TitaniumSite</code>"
msgstr ""
#. type: \b; header
@ -1858,7 +1858,7 @@ msgstr ""
#. type: Plain text
#: help/object/E/uranspot.txt:13
#, no-wrap
msgid "<code>UraniumSpot</code>"
msgid "<code>UraniumSite</code>"
msgstr ""
#. type: \b; header

View File

@ -773,7 +773,7 @@ msgstr ""
#. type: Plain text
#: help/object/E/enerspot.txt:15
#, no-wrap
msgid "<code>EnergySpot</code>"
msgid "<code>EnergySite</code>"
msgstr ""
#. type: \b; header
@ -1660,7 +1660,7 @@ msgstr ""
#. type: Plain text
#: help/object/E/stonspot.txt:12
#, no-wrap
msgid "<code>TitaniumSpot</code>"
msgid "<code>TitaniumSite</code>"
msgstr ""
#. type: \b; header
@ -1858,7 +1858,7 @@ msgstr ""
#. type: Plain text
#: help/object/E/uranspot.txt:13
#, no-wrap
msgid "<code>UraniumSpot</code>"
msgid "<code>UraniumSite</code>"
msgstr ""
#. type: \b; header

View File

@ -619,7 +619,7 @@ msgstr ""
#. type: Plain text
#: help/object/E/enerspot.txt:15
#, no-wrap
msgid "<code>EnergySpot</code>"
msgid "<code>EnergySite</code>"
msgstr ""
#. type: \b; header
@ -1641,7 +1641,7 @@ msgstr ""
#. type: Plain text
#: help/object/E/stonspot.txt:12
#, no-wrap
msgid "<code>TitaniumSpot</code>"
msgid "<code>TitaniumSite</code>"
msgstr ""
#. type: \b; header
@ -1886,7 +1886,7 @@ msgstr ""
#. type: Plain text
#: help/object/E/uranspot.txt:13
#, no-wrap
msgid "<code>UraniumSpot</code>"
msgid "<code>UraniumSite</code>"
msgstr ""
#. type: \b; header

View File

@ -777,8 +777,8 @@ msgstr "Niemożliwy."
#. type: Plain text
#: help/object/E/enerspot.txt:15
#, no-wrap
msgid "<code>EnergySpot</code>"
msgstr "<code>EnergySpot</code>"
msgid "<code>EnergySite</code>"
msgstr "<code>EnergySite</code>"
#. type: \b; header
#: help/object/E/exchange.txt:1
@ -1678,8 +1678,8 @@ msgstr "Robot <a object|botsr>szperacz</a> zostawia czerwony plus w miejscu odkr
#. type: Plain text
#: help/object/E/stonspot.txt:12
#, no-wrap
msgid "<code>TitaniumSpot</code>"
msgstr "<code>TitaniumSpot</code>"
msgid "<code>TitaniumSite</code>"
msgstr "<code>TitaniumSite</code>"
#. type: \b; header
#: help/object/E/titan.txt:1
@ -1876,8 +1876,8 @@ msgstr "Robot <a object|botsr>szperacz</a> zostawia żółte kółko w miejscu o
#. type: Plain text
#: help/object/E/uranspot.txt:13
#, no-wrap
msgid "<code>UraniumSpot</code>"
msgstr "<code>UraniumSpot</code>"
msgid "<code>UraniumSite</code>"
msgstr "<code>UraniumSite</code>"
#. type: \b; header
#: help/object/E/wasp.txt:1

View File

@ -777,8 +777,8 @@ msgstr "Невозможно."
#. type: Plain text
#: help/object/E/enerspot.txt:15
#, no-wrap
msgid "<code>EnergySpot</code>"
msgstr "<code>EnergySpot</code>"
msgid "<code>EnergySite</code>"
msgstr "<code>EnergySite</code>"
#. type: \b; header
#: help/object/E/exchange.txt:1
@ -1671,8 +1671,8 @@ msgstr "<a object|botsr>Сниффер</a> будет показывать кр
#. type: Plain text
#: help/object/E/stonspot.txt:12
#, no-wrap
msgid "<code>TitaniumSpot</code>"
msgstr "<code>TitaniumSpot</code>"
msgid "<code>TitaniumSite</code>"
msgstr "<code>TitaniumSite</code>"
#. type: \b; header
#: help/object/E/titan.txt:1
@ -1869,8 +1869,8 @@ msgstr "<a object|botsr>Сниффер</a> будет показывать же
#. type: Plain text
#: help/object/E/uranspot.txt:13
#, no-wrap
msgid "<code>UraniumSpot</code>"
msgstr "<code>UraniumSpot</code>"
msgid "<code>UraniumSite</code>"
msgstr "<code>UraniumSite</code>"
#. type: \b; header
#: help/object/E/wasp.txt:1

View File

@ -28,7 +28,7 @@ if [ -n "$VERBOSE" ]; then
else
verbosity="-q"
fi
PERL5LIB="${SCRIPT_DIR}/perllib${PERL5LIB+:}$PERL5LIB" po4a -k0 $verbosity -f --msgmerge-opt=--no-wrap --master-charset=UTF-8 --localized-charset=UTF-8 "$PO4A_CONFIG_FILE"
PERL5LIB="${SCRIPT_DIR}/perllib${PERL5LIB+:}$PERL5LIB" po4a -k0 $verbosity -f "$PO4A_CONFIG_FILE" --msgmerge-opt=--no-wrap -M UTF-8 -L UTF-8
# if applicable, touch dummy signal file to indicate success
if [ -n "$PO4A_SIGNALFILE" ]; then

View File

@ -31,7 +31,7 @@ msgstr ""
#. type: Resume-text
#: levels/exercises/chapter001/level006/scene.txt:2
#, no-wrap
msgid "Use the radar to find and kill all spiders."
msgid "Use the radar to find and kill all ants."
msgstr ""
#. type: ScriptName-text

View File

@ -32,8 +32,8 @@ msgstr "Araignées 2"
#
#. type: Resume-text
#: levels/exercises/chapter001/level006/scene.txt:2
#, fuzzy, no-wrap
msgid "Use the radar to find and kill all spiders."
#, no-wrap
msgid "Use the radar to find and kill all ants."
msgstr "Tuer plusieurs araignées localisées avec le radar."
#

View File

@ -31,8 +31,8 @@ msgstr "Pająki 2"
#. type: Resume-text
#: levels/exercises/chapter001/level006/scene.txt:2
#, no-wrap
msgid "Use the radar to find and kill all spiders."
msgstr "Użyj radaru do znalezienia i zabicia wszystkich pająków."
msgid "Use the radar to find and kill all ants."
msgstr "Użyj radaru do znalezienia i zabicia wszystkich mrówek."
#. type: ScriptName-text
#: levels/exercises/chapter001/level006/scene.txt:3

View File

@ -30,8 +30,8 @@ msgstr "Пауки 2"
#. type: Resume-text
#: levels/exercises/chapter001/level006/scene.txt:2
#, fuzzy, no-wrap
msgid "Use the radar to find and kill all spiders."
#, no-wrap
msgid "Use the radar to find and kill all ants."
msgstr "С помощью радара найдите и убейте всех муравьев."
#. type: ScriptName-text

View File

@ -31,7 +31,7 @@ msgstr ""
#. type: Resume-text
#: levels/exercises/chapter001/level006/scene.txt:2
#, no-wrap
msgid "Use the radar to find and kill all spiders."
msgid "Use the radar to find and kill all ants."
msgstr ""
#. type: ScriptName-text

View File

@ -1,5 +1,5 @@
Title.E text="Spiders 2"
Resume.E text="Use the radar to find and kill all spiders."
Resume.E text="Use the radar to find and kill all ants."
ScriptName.E text="Spider2"
Instructions name="%lvl%/help/help.%lng%.txt"
HelpFile name="cbot.txt"

2
music

@ -1 +1 @@
Subproject commit c789a6f2783711b5f9d6437169d71b00a557fc3d
Subproject commit 68744dcdb7aa9e10f471fe1cca4910a4fd594a2f

View File

Before

Width:  |  Height:  |  Size: 57 KiB

After

Width:  |  Height:  |  Size: 57 KiB

View File

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 39 KiB

View File

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

View File

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

View File

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

BIN
textures/dirty05.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 114 KiB

BIN
textures/dirty07.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 123 KiB

BIN
textures/dirty09.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 117 KiB

BIN
textures/dirty11.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 44 KiB

View File

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

BIN
textures/effect03.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

View File

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 48 KiB

View File

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

View File

Before

Width:  |  Height:  |  Size: 68 KiB

After

Width:  |  Height:  |  Size: 68 KiB

View File

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 46 KiB

View File

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

View File

Before

Width:  |  Height:  |  Size: 72 KiB

After

Width:  |  Height:  |  Size: 72 KiB

View File

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

BIN
textures/mars101.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 92 KiB

BIN
textures/mars102.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 105 KiB

View File

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 48 KiB

View File

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 41 KiB

BIN
textures/relief00.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 285 B

BIN
textures/relief03-n.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

BIN
textures/relief07.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.5 KiB

BIN
textures/relief13-n.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
textures/relief21.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
textures/relief57.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

BIN
textures/relief58.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

BIN
textures/relief59.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

View File

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

View File

Before

Width:  |  Height:  |  Size: 60 KiB

After

Width:  |  Height:  |  Size: 60 KiB

View File

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

View File

Before

Width:  |  Height:  |  Size: 97 KiB

After

Width:  |  Height:  |  Size: 97 KiB