Merge commit '184fc65d3d97e23dcb3752f997d1c5eb1d5b1a5f' into wind_fixes

Author: biggeryetbetter

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -1,4 +1,4 @@
-name: Feature Requests
+name: Feature Request
 description: File a request for a feature you want to see in SuperTux!
 title: "[Feature Request]: "
 labels: ["type:idea"]

.github/workflows/translations.yml

@@ -34,7 +34,7 @@ jobs:
       - name: Update translations
         env:
           TX_TOKEN: ${{ secrets.TRANSIFEX_TOKEN }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
         run: |
           # Installs transifex client:
           curl -o- https://raw.githubusercontent.com/transifex/cli/master/install.sh | bash
@@ -52,5 +52,6 @@ jobs:
           git status
           git config --global user.email "[email protected]"
           git config --global user.name "SuperTux Bot"
+          git add *.po || true
           git commit -am "Update translations" || true
-          git push https://git:$GITHUB_TOKEN@github.com/SuperTux/supertux.git master
+          git push https://git:$GH_TOKEN@github.com/SuperTux/supertux.git master

.gitignore

@@ -30,7 +30,10 @@ docs/doxygen/
 tools/scripting_docs_gen/build/
 
 # Qt Creator project file
-CMakeLists.txt.user
+CMakeLists.txt.user*
+
+# KDevelop project files
+.kdev4/
 
 # Clangd
 .cache/

.tx/config

@@ -10,33 +10,6 @@ minimum_perc           = 75
 replace_edited_strings = false
 keep_translations      = false
 
-[o:arctic-games:p:supertux:r:bonus-2]
-file_filter            = data/levels/bonus2/<lang>.po
-source_file            = data/levels/bonus2/messages.pot
-source_lang            = en
-type                   = PO
-minimum_perc           = 75
-replace_edited_strings = false
-keep_translations      = false
-
-[o:arctic-games:p:supertux:r:bonus-3]
-file_filter            = data/levels/bonus3/<lang>.po
-source_file            = data/levels/bonus3/messages.pot
-source_lang            = en
-type                   = PO
-minimum_perc           = 75
-replace_edited_strings = false
-keep_translations      = false
-
-[o:arctic-games:p:supertux:r:bonus-4]
-file_filter            = data/levels/bonus4/<lang>.po
-source_file            = data/levels/bonus4/messages.pot
-source_lang            = en
-type                   = PO
-minimum_perc           = 75
-replace_edited_strings = false
-keep_translations      = false
-
 [o:arctic-games:p:supertux:r:community-island-2016]
 file_filter            = data/levels/community2016/<lang>.po
 source_file            = data/levels/community2016/messages.pot

README.md

@@ -95,7 +95,7 @@ In case you need help, feel free to reach out using the following means:
   and might miss potential answers.
 * **Matrix:** [#supertux:matrix.org](https://matrix.to/#/#supertux:matrix.org)
   is bridged to our IRC room.
-* **[Forum](https://groups.f-hub.org/g/8AKEaTgZ):** The SuperTux
+* **[Forum](https://groups.f-hub.org/supertux):** The SuperTux
   community is also active on the forum, the discussions range from feature
   proposals to support questions. In particular, most community-contributed
   add-ons are published there, so this is worth checking.

data/credits.stxt

@@ -1277,7 +1277,7 @@
       )
       (text
         (type "reference")
-        (string "http://forum.freegamedev.net/viewforum.php?f=66")
+        (string "https://groups.f-hub.org/supertux")
       )
       (blank)
       (text

data/images/engine/editor/editor-comment.png

@@ -177,7 +177,7 @@
     (icon "images/engine/editor/stalactite_ice_yeti.png"))
   (object
     (class "dart")
-    (icon "images/creatures/darttrap/granito/root_dart_left.png"))
+    (icon "images/creatures/darttrap/granito/root_dart_left.png"))
   (object
     (class "bigsnowball")
     (icon "images/objects/big_snowball/big_snowball.png"))
@@ -339,6 +339,9 @@
   (object
     (class "text-area")
     (icon "images/engine/editor/textarray.png"))
+  (object
+    (class "editor-comment")
+    (icon "images/engine/editor/editor-comment.png"))
  )
 
  (layers

data/images/engine/editor/objects.stoi

@@ -0,0 +1,208 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the SuperTux package.
+# 
+# Translators:
+# Martin van Zijl <[email protected]>, 2019
+msgid ""
+msgstr ""
+"Project-Id-Version: SuperTux\n"
+"Report-Msgid-Bugs-To: https://github.com/SuperTux/supertux/issues\n"
+"POT-Creation-Date: 2024-11-11 21:50+0000\n"
+"PO-Revision-Date: 2013-08-10 23:04+0000\n"
+"Last-Translator: Martin van Zijl <[email protected]>, 2019\n"
+"Language-Team: Afrikaans (South Africa) (http://app.transifex.com/arctic-games/supertux/language/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: data/levels/bonus1/abednego-level1.stl:3
+msgid "Flight Test"
+msgstr "Vlugtoets"
+
+#: data/levels/bonus1/abednego-level2.stl:3
+msgid "Dungeons but no Dragons"
+msgstr "Kerkers maar geen Drake"
+
+#: data/levels/bonus1/abednego-level3.stl:3
+msgid "Lies!"
+msgstr "Leuns!"
+
+#: data/levels/bonus1/abednego-level4.stl:3
+msgid "Train Leaves in One Minute"
+msgstr "Trein Verlaat in Een Minuut"
+
+#: data/levels/bonus1/bonus-level1.stl:3
+msgid "Bonus Dias!"
+msgstr "Bonus Dias!"
+
+#: data/levels/bonus1/bonus-level2.stl:3
+msgid "Castle Gate"
+msgstr "Kasteel Hek"
+
+#: data/levels/bonus1/bonus-level3.stl:3
+msgid "A Long Way Home"
+msgstr "'n Lang Pad Huis Toe"
+
+#: data/levels/bonus1/bonus-level4.stl:3
+msgid "Bonus Island Castle"
+msgstr "Bonus Eiland Kasteel"
+
+#: data/levels/bonus1/bonus-level5.stl:3
+msgid "Area 42"
+msgstr "Area 42"
+
+#: data/levels/bonus1/extro.txt:3
+msgid ""
+"-Congratulations!\n"
+"\n"
+"#You have successfully finished\n"
+"#Bonus Island I\n"
+"\n"
+"\tfeaturing levels contributed by\n"
+"\tJason W. Thompson\n"
+"\tTorfi Gunnarsson\n"
+"\tAbednego\n"
+"\tMatr1x\n"
+"\n"
+"\n"
+"#If you didn't clear all levels yet,\n"
+"#find your way back home and take\n"
+"#another path. There is still more\n"
+"#challenge waiting for you!\n"
+"\n"
+"#And there is a secret level to be\n"
+"#found as well...\n"
+"\n"
+"#A big \"Thank you\" goes out to\n"
+"#everyone who contributed to this\n"
+"#release. We hope you enjoyed it!"
+msgstr "-Baie Geluk!\n\n#Jy het vir Bonus Eiland I suksesvol\n#voltooi\n\nmet levels bygedra deur\nJason W. Thompson\nTorfi Gunnarsson\nAbednego\nMatr1x\n\n\n#Indien jy ny al die levels voltooi het nie,\n#probeer om 'n ander pad terug huis toe\n#te vat. Daar is nog meer uitdagings\n#wat vir jou wag!\n\n#En daarso is is ook 'n geheime level\n#iewers...\n\n#A groot \"Dankie\" gaan uit na\n#almal wat bygedra het tot hierdie\n#vrystelling. Ons hoop jy het dit geniet!"
+
+#: data/levels/bonus1/matr1x-level1.stl:3
+msgid "Pipe Down Over There"
+msgstr "Pyp Daar Onder"
+
+#: data/levels/bonus1/matr1x-level2.stl:3
+msgid "Something Fishy"
+msgstr "Iets Vissireg"
+
+#: data/levels/bonus1/matr1x-level3.stl:3
+msgid "Fire In The Sky"
+msgstr "Vuur in Die Lug"
+
+#: data/levels/bonus1/thompson-level1.stl:3
+msgid "Have I been here before?"
+msgstr "Was ek al tevore hier?"
+
+#: data/levels/bonus1/thompson-level2.stl:3
+msgid "Bad Guys Stink!"
+msgstr "Vyande Stink!"
+
+#: data/levels/bonus1/thompson-level2.stl:96
+msgid ""
+"#These levels were made Swimming-Ready by Serano and revamped by "
+"AllyTheOcelot"
+msgstr ""
+
+#: data/levels/bonus1/torfi-level1.stl:3
+msgid "A good start"
+msgstr "'n Goeie begin"
+
+#: data/levels/bonus1/torfi-level2.stl:3
+msgid "Too easy"
+msgstr "Te maklik"
+
+#: data/levels/bonus1/torfi-level2.stl:56
+msgid "#All these levels were upgraded for milestone 2 by Hume."
+msgstr ""
+
+#: data/levels/bonus1/torfi-level3.stl:3
+msgid "Still too easy"
+msgstr "Nog steeds te maklik"
+
+#: data/levels/bonus1/wansti-level1.stl:3
+msgid "Semi-Frozen"
+msgstr "Amper-Gevries"
+
+#: data/levels/bonus1/wansti-level2.stl:3
+msgid "Cave Of Mirrors"
+msgstr "Grot Van Spieëls"
+
+#: data/levels/bonus1/wansti-level3.stl:3
+msgid "A Maze In The Sky"
+msgstr "'n Doolhof In Die Lug"
+
+#: data/levels/bonus1/wansti-level4.stl:3
+msgid "Collapse Imminent!"
+msgstr "Inval Dreigend!"
+
+#: data/levels/bonus1/wansti-level5.stl:3
+msgid "Tip Of The Iceberg"
+msgstr "Punt Van Die Ysberg"
+
+#: data/levels/bonus1/worldmap.stwm:3
+msgid "Bonus Island I"
+msgstr "Bonus Eiland I"
+
+#: data/levels/bonus1/worldmap.stwm:127
+msgid "You found a secret place!"
+msgstr "Jy het 'n geheime plek ontdek!"
+
+#: data/levels/bonus1/worldmap.stwm:135
+msgid "Hint: Use igloos to get back here."
+msgstr "Wenk: Gebruik igloos om terug hierna te kom."
+
+#: data/levels/bonus1/worldmap.stwm:144
+msgid "Warp to Matr1x' Sector"
+msgstr "Gaan na Matr1x se Sektor"
+
+#: data/levels/bonus1/worldmap.stwm:151 data/levels/bonus1/worldmap.stwm:228
+msgid "Warp to Thompson's Domain"
+msgstr "Gaan ne Thompson se Domein"
+
+#: data/levels/bonus1/worldmap.stwm:158 data/levels/bonus1/worldmap.stwm:221
+msgid "Leave the SuperTux Team Island"
+msgstr "Verlaat die SuperTux Team Eiland"
+
+#: data/levels/bonus1/worldmap.stwm:165
+msgid "Warp to Abednego's Area"
+msgstr "Gaan na Abednego se Gebied"
+
+#: data/levels/bonus1/worldmap.stwm:172 data/levels/bonus1/worldmap.stwm:262
+msgid "Leave Torfi's Territory"
+msgstr "Verlaat Torfi se Gebied"
+
+#: data/levels/bonus1/worldmap.stwm:179 data/levels/bonus1/worldmap.stwm:207
+msgid "Leave Abednego's Area"
+msgstr "Verlaat Abednego se Gebied"
+
+#: data/levels/bonus1/worldmap.stwm:186 data/levels/bonus1/worldmap.stwm:234
+msgid "Leave Thompson's Domain"
+msgstr "Verlaat Thompson se Domein"
+
+#: data/levels/bonus1/worldmap.stwm:193
+msgid "Back to Matr1x' Sector"
+msgstr "Terug na Matr1x se Sektor"
+
+#: data/levels/bonus1/worldmap.stwm:200
+msgid "Warp home"
+msgstr "Gaan huis toe"
+
+#: data/levels/bonus1/worldmap.stwm:214
+msgid "Warp to the SuperTux Team Island"
+msgstr "Gaan na die SuperTux Team Eiland"
+
+#: data/levels/bonus1/worldmap.stwm:241
+msgid "Leave Matr1x' Sector"
+msgstr "Verlaat Matr1x' se Sektor"
+
+#: data/levels/bonus1/worldmap.stwm:248
+msgid "Continue Matr1x' Sector"
+msgstr "Gaan aan met Matr1x' se Sektor"
+
+#: data/levels/bonus1/worldmap.stwm:255
+msgid "Warp to Torfi's Territory"
+msgstr ""