Merge pull request #19 from VictorDenisov/dev

Change order of arguments of po4a

CMakeLists.txt

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

help/cbot/E/category.txt

@@ -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;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
+       \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
 
 \t;See also
 \l;CBOT Language\u cbot; and \l;Variables\u cbot\type;.

help/cbot/po/cbot.pot

@@ -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>EnergySite</a>        </code>Underground "
+"       <code><a object|enerspot>EnergySpot</a>        </code>Underground "
 "Energy Deposit\n"
-"       <code><a object|stonspot>TitaniumSite</a>      </code>Underground "
+"       <code><a object|stonspot>TitaniumSpot</a>      </code>Underground "
 "Titanium Deposit\n"
-"       <code><a object|uranspot>UraniumSite</a>       </code>Underground "
+"       <code><a object|uranspot>UraniumSpot</a>       </code>Underground "
 "Uranium Deposit"
 msgstr ""
 

help/cbot/po/de.po

@@ -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>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"
+"       <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"
 msgstr ""
 
 #. type: Plain text

help/cbot/po/fr.po

@@ -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>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"
+"       <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"
 msgstr ""
 "       <code><a object|waypoint>WayPoint</a>       </code>Indicateur de chemin\n"
 "       <code><a object|flag>BlueFlag</a>       </code>Drapeau bleu\n"

help/cbot/po/pl.po

@@ -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>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"
+"       <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"
 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>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"
+"       <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"
 
 #. type: Plain text
 #: help/cbot/E/category.txt:108

help/cbot/po/ru.po

@@ -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>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"
+"       <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"
 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>EnergySite</a>        </code>Подземный запас энергии\n"
-"       <code><a object|stonspot>TitaniumSite</a>      </code>Подземный запас титана\n"
-"       <code><a object|uranspot>UraniumSite</a>       </code>Подземный запас урана"
+"       <code><a object|enerspot>EnergySpot</a>        </code>Подземный запас энергии\n"
+"       <code><a object|stonspot>TitaniumSpot</a>      </code>Подземный запас титана\n"
+"       <code><a object|uranspot>UraniumSpot</a>       </code>Подземный запас урана"
 
 #. type: Plain text
 #: help/cbot/E/category.txt:108

help/object/E/enerspot.txt

@@ -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;EnergySite\n;
+\c;EnergySpot\n;
 
 \t;See also
 \l;CBOT Language\u cbot;, \l;Variables\u cbot\type; and \l;Categories\u cbot\category;.

help/object/E/stonspot.txt

@@ -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;TitaniumSite\n;
+\c;TitaniumSpot\n;
 
 \t;See also
 \l;CBOT Language\u cbot;, \l;Variables\u cbot\type; and \l;Categories\u cbot\category;.

help/object/E/uranspot.txt

@@ -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;UraniumSite\n;
+\c;UraniumSpot\n;
 
 \t;See also
 \l;CBOT Language\u cbot;, \l;Variables\u cbot\type; and \l;Categories\u cbot\category;.

help/object/po/de.po

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

help/object/po/fr.po

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

help/object/po/object.pot

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

help/object/po/pl.po

@@ -777,8 +777,8 @@ msgstr "Niemożliwy."
 #. type: Plain text
 #: help/object/E/enerspot.txt:15
 #, no-wrap
-msgid "<code>EnergySite</code>"
-msgstr "<code>EnergySite</code>"
+msgid "<code>EnergySpot</code>"
+msgstr "<code>EnergySpot</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>TitaniumSite</code>"
-msgstr "<code>TitaniumSite</code>"
+msgid "<code>TitaniumSpot</code>"
+msgstr "<code>TitaniumSpot</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>UraniumSite</code>"
-msgstr "<code>UraniumSite</code>"
+msgid "<code>UraniumSpot</code>"
+msgstr "<code>UraniumSpot</code>"
 
 #. type: \b; header
 #: help/object/E/wasp.txt:1

help/object/po/ru.po

@@ -777,8 +777,8 @@ msgstr "Невозможно."
 #. type: Plain text
 #: help/object/E/enerspot.txt:15
 #, no-wrap
-msgid "<code>EnergySite</code>"
-msgstr "<code>EnergySite</code>"
+msgid "<code>EnergySpot</code>"
+msgstr "<code>EnergySpot</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>TitaniumSite</code>"
-msgstr "<code>TitaniumSite</code>"
+msgid "<code>TitaniumSpot</code>"
+msgstr "<code>TitaniumSpot</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>UraniumSite</code>"
-msgstr "<code>UraniumSite</code>"
+msgid "<code>UraniumSpot</code>"
+msgstr "<code>UraniumSpot</code>"
 
 #. type: \b; header
 #: help/object/E/wasp.txt:1

i18n-tools/scripts/run_po4a.sh

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

levels/exercises/chapter001/level006/po/de.po

@@ -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 ants."
+msgid "Use the radar to find and kill all spiders."
 msgstr ""
 
 #. type: ScriptName-text

levels/exercises/chapter001/level006/po/fr.po

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

levels/exercises/chapter001/level006/po/pl.po

@@ -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 ants."
-msgstr "Użyj radaru do znalezienia i zabicia wszystkich mrówek."
+msgid "Use the radar to find and kill all spiders."
+msgstr "Użyj radaru do znalezienia i zabicia wszystkich pająków."
 
 #. type: ScriptName-text
 #: levels/exercises/chapter001/level006/scene.txt:3

levels/exercises/chapter001/level006/po/ru.po

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

levels/exercises/chapter001/level006/po/train106.pot

@@ -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 ants."
+msgid "Use the radar to find and kill all spiders."
 msgstr ""
 
 #. type: ScriptName-text

levels/exercises/chapter001/level006/scene.txt

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

music

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