Merge branch 'SuperTux:master' into calm-ocean-music

SuperTux · Oct 16, 2024 · 536815e · 536815e
2 parents 9614a08 + e7f6c6b
commit 536815e
Show file tree

Hide file tree

Showing 151 changed files with 3,805 additions and 3,493 deletions.
diff --git a/.github/workflows/bsd.yml b/.github/workflows/bsd.yml
@@ -38,7 +38,7 @@ jobs:
 
     runs-on: macos-10.15
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           # Fetch the whole tree so git describe works
           fetch-depth: 0
@@ -79,5 +79,4 @@ jobs:
                                             # TODO: Uncomment whenever possible
             make -j3 VERBOSE=1
             make install DESTDIR="/tmp/supertux" VERBOSE=1
-            ./test_supertux2
-actions/checkout@v4
+            ./test_supertux2
diff --git a/.github/workflows/gnulinux.yml b/.github/workflows/gnulinux.yml
@@ -212,7 +212,7 @@ jobs:
           doxygen docs/Doxyfile
 
       - name: Package
-        if: ${{ matrix.arch != '32' }}
+        if: matrix.arch != '32'
         env:
           OS_NAME: ${{ matrix.os }}
           ARCH: ${{ matrix.arch }} # TODO: Working Linux 32-bit packaging
@@ -224,6 +224,7 @@ jobs:
         run: ../.ci_scripts/package.sh
 
       - name: Upload AppImage
+        if: matrix.build_type != 'Debug' && matrix.glbinding == 'OFF'
         uses: actions/upload-artifact@v4
         with:
           name: "${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.compiler }}-${{ matrix.build_type }}${{ matrix.glbinding == 'ON' && '-glbinding' || '' }}-appimage"

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -116,6 +116,7 @@ jobs:
         run: ../.ci_scripts/package.sh
 
       - uses: actions/upload-artifact@v4
+        if: matrix.build_type != 'Debug' && matrix.glbinding == 'OFF'
         with:
           name: "${{ matrix.os }}-${{ matrix.build_type }}${{ matrix.glbinding == 'ON' && '-glbinding' || '' }}-dmg"
           path: build/upload/*.dmg

diff --git a/.github/workflows/translation_templates.yml b/.github/workflows/translation_templates.yml
@@ -0,0 +1,52 @@
+#  SuperTux
+#  Copyright (C) 2024 Tobias Markus
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 3
+#  of the License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+name: translation_templates
+on:
+  workflow_dispatch:
+
+jobs:
+  update-all-templates:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout SuperTux repository
+        uses: actions/checkout@v4
+        with:
+          repository: 'SuperTux/supertux'
+          fetch-depth: 1
+
+      - name: Update translation templates
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          # Update packages
+          sudo apt-get update
+          sudo apt-get install -y gettext
+
+          # Checkout master to make git describe work
+          git checkout master
+          
+          # Update translation templates:
+          chmod +x makepot.sh
+          sh ./makepot.sh
+
+          # Commit
+          git status
+          git config --global user.email "[email protected]"
+          git config --global user.name "SuperTux Bot"
+          git commit -am "Update translation templates" || true
+          git push https://git:[email protected]/SuperTux/supertux.git master
diff --git a/.github/workflows/ubuntu-touch.yml b/.github/workflows/ubuntu-touch.yml
@@ -88,6 +88,7 @@ jobs:
           ~/.local/bin/clickable build --verbose ${BUILD_TYPE} --arch ${ARCH}
 
       - uses: actions/upload-artifact@v4
+        if: matrix.build_type != 'Debug'
         with:
           name: "clickable-${{ matrix.arch }}-${{ matrix.build_type }}-${{ matrix.opengl }}-click"
           path: build.clickable/*.click

diff --git a/.github/workflows/wasm.yml b/.github/workflows/wasm.yml
@@ -85,6 +85,7 @@ jobs:
           mv supertux2* upload/
 
       - uses: actions/upload-artifact@v4
+        if: matrix.build_type != 'Debug'
         with:
           name: "wasm32-emscripten-${{ matrix.build_type }}-html"
           path: build/upload/*

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -32,14 +32,14 @@ jobs:
       fail-fast: false
       matrix:
         arch: [x64, x86]
-        build_type: [Debug, Release]
+        build_type: [Debug, RelWithDebInfo]
         glbinding: [OFF] # [ON, OFF] # FIXME: Fix Windows glbinding builds
         include:
-          - build_type: Release
+          - build_type: RelWithDebInfo
             arch: x64
             glbinding: OFF
             release: ON
-          - build_type: Release
+          - build_type: RelWithDebInfo
             arch: x86
             glbinding: OFF
             release: ON
@@ -105,6 +105,7 @@ jobs:
           "./$Env:BUILD_TYPE/run_tests.exe"
 
       - name: Package MSI Installer
+        if: matrix.build_type != 'Debug' && matrix.glbinding == 'OFF'
         shell: pwsh
         working-directory: build
         env:
@@ -148,6 +149,7 @@ jobs:
           #>
 
       - name: Upload Portable Package
+        if: matrix.build_type != 'Debug' && matrix.glbinding == 'OFF'
         uses: actions/upload-artifact@v4
         with:
           name: "windows-${{ matrix.arch }}-${{ matrix.build_type }}${{ matrix.glbinding == 'ON' && '-glbinding' || '' }}-portable"

diff --git a/data/levels/bonus1/messages.pot b/data/levels/bonus1/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: SuperTux v0.6.3-1080-g2e08c1b7f\n"
+"Project-Id-Version: SuperTux \n"
 "Report-Msgid-Bugs-To: https://github.com/SuperTux/supertux/issues\n"
-"POT-Creation-Date: 2024-03-03 03:26+0100\n"
+"POT-Creation-Date: 2024-10-15 23:31+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"

diff --git a/data/levels/bonus1/ml.po b/data/levels/bonus1/ml.po
@@ -37,7 +37,7 @@ msgstr "തീവണ്ടി ഒരു മിനിറ്റിനകം പോ
 
 #: data/levels/bonus1/bonus-level1.stl:3
 msgid "Bonus Dias!"
-msgstr "ബോണസ് വേദി!"
+msgstr "പൊന്നിൻദ്വീപാ!"
 
 #: data/levels/bonus1/bonus-level2.stl:3
 msgid "Castle Gate"
@@ -118,15 +118,15 @@ msgstr "വളരെ എളുപ്പം"
 
 #: data/levels/bonus1/torfi-level2.stl:56
 msgid "#All these levels were upgraded for milestone 2 by Hume."
-msgstr ""
+msgstr "# ഈ ലെവലുകളെല്ലാം 2ാം നാഴികക്കൽ ശൈലിയിലേക്ക് പുതുക്കിയത് Hume ആണ്."
 
 #: data/levels/bonus1/torfi-level3.stl:3
 msgid "Still too easy"
 msgstr "ഇപ്പോഴും വളരെ എളുപ്പം"
 
 #: data/levels/bonus1/wansti-level1.stl:3
 msgid "Semi-Frozen"
-msgstr "പകുതി മരവിച്ചത്"
+msgstr "പാതി മരവിച്ചത്"
 
 #: data/levels/bonus1/wansti-level2.stl:3
 msgid "Cave Of Mirrors"
@@ -158,19 +158,19 @@ msgstr "സൂചന: ഇവിടെ തിരിച്ചെത്താൻ
 
 #: data/levels/bonus1/worldmap.stwm:144
 msgid "Warp to Matr1x' Sector"
-msgstr "മാട്ര്1x മേഖലയിൽ പ്രവേശിക്കുക"
+msgstr "മാട്ര്1x മേഖലയിലേക്ക് ഊളിയിടുക"
 
 #: data/levels/bonus1/worldmap.stwm:151 data/levels/bonus1/worldmap.stwm:228
 msgid "Warp to Thompson's Domain"
-msgstr "തോം‌പ്സണിന്റെ ഡൊമെയ്‌നിലേക്ക് പോകുക"
+msgstr "തോം‌പ്സന്റെ സാമ്രാജ്യത്തേക്ക്  ഊളിയിടുക"
 
 #: data/levels/bonus1/worldmap.stwm:158 data/levels/bonus1/worldmap.stwm:221
 msgid "Leave the SuperTux Team Island"
 msgstr "സൂപ്പർ‌ടക്സ് ടീം ദ്വീപ് വിടുക"
 
 #: data/levels/bonus1/worldmap.stwm:165
 msgid "Warp to Abednego's Area"
-msgstr "അബെഡ്‌നെഗോയുടെ പ്രദേശത്തേക്ക് പോകുക"
+msgstr "അബെഡ്‌നെഗോയുടെ ഭൂമിയിലേക്ക് ഊളിയിടുക"
 
 #: data/levels/bonus1/worldmap.stwm:172 data/levels/bonus1/worldmap.stwm:262
 msgid "Leave Torfi's Territory"
@@ -190,11 +190,11 @@ msgstr "മാട്ര്1x സെക്ടറിലേക്ക് മടങ
 
 #: data/levels/bonus1/worldmap.stwm:200
 msgid "Warp home"
-msgstr "വീട്ടിലേക്ക് പോകുക"
+msgstr "വീട്ടിലേക്ക് ഊളിയിടുക"
 
 #: data/levels/bonus1/worldmap.stwm:214
 msgid "Warp to the SuperTux Team Island"
-msgstr "സൂപ്പർ‌ടക്സ് ടീം ദ്വീപിലേക്ക് പോകുക"
+msgstr "സൂപ്പർ‌ടക്സ് ടീം ദ്വീപിലേക്ക് ഊളിയിടുക"
 
 #: data/levels/bonus1/worldmap.stwm:241
 msgid "Leave Matr1x' Sector"
@@ -206,4 +206,4 @@ msgstr "Matr1x' സെക്റ്റർ തുടരുക"
 
 #: data/levels/bonus1/worldmap.stwm:255
 msgid "Warp to Torfi's Territory"
-msgstr ""
+msgstr "ടോർഫിയുടെ പ്രദേശത്തേക്ക് ഊളിയിടുക"
diff --git a/data/levels/bonus2/bg.po b/data/levels/bonus2/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SuperTux\n"
 "Report-Msgid-Bugs-To: https://github.com/SuperTux/supertux/issues\n"
-"POT-Creation-Date: 2024-03-03 03:26+0100\n"
+"POT-Creation-Date: 2024-10-15 23:31+0000\n"
 "PO-Revision-Date: 2013-08-10 23:07+0000\n"
 "Last-Translator: Любомир Василев, 2015-2016\n"
 "Language-Team: Bulgarian (http://app.transifex.com/arctic-games/supertux/language/bg/)\n"

diff --git a/data/levels/bonus2/eo.po b/data/levels/bonus2/eo.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # vpzomtrrfrt <[email protected]>, 2020
-# Jorge Maldonado Ventura <[email protected]>, 2021
+# Jorge <[email protected]>, 2021
 # Robin van der Vliet <[email protected]>, 2015
 # Rubén Leal Coba <[email protected]>, 2013
 # tellovishous <[email protected]>, 2023

diff --git a/data/levels/bonus2/messages.pot b/data/levels/bonus2/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: SuperTux v0.6.3-1080-g2e08c1b7f\n"
+"Project-Id-Version: SuperTux \n"
 "Report-Msgid-Bugs-To: https://github.com/SuperTux/supertux/issues\n"
-"POT-Creation-Date: 2024-03-03 03:26+0100\n"
+"POT-Creation-Date: 2024-10-15 23:31+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"

diff --git a/data/levels/bonus3/af_ZA.po b/data/levels/bonus3/af_ZA.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SuperTux\n"
 "Report-Msgid-Bugs-To: https://github.com/SuperTux/supertux/issues\n"
-"POT-Creation-Date: 2024-03-03 03:26+0100\n"
+"POT-Creation-Date: 2024-10-15 23:31+0000\n"
 "PO-Revision-Date: 2013-08-10 23:08+0000\n"
 "Last-Translator: Martin van Zijl <[email protected]>, 2019-2020\n"
 "Language-Team: Afrikaans (South Africa) (http://app.transifex.com/arctic-games/supertux/language/af_ZA/)\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Global Warming"
 msgstr "Wêreldwye Opwarming"
 
-#: ⁨data/levels/bonus3/One Night in the Sky.stl⁩:3
+#: data/levels/bonus3/One Night in the Sky.stl:3
 msgid "One Night in the Sky"
 msgstr "Een Nag in die Lug"
 
@@ -78,7 +78,7 @@ msgstr "#Goed gedoen! Jy het die rooi lantern behou! Dit was eintlik nie nodig n
 msgid "Coconut Fortress"
 msgstr "Kokosneut Fort"
 
-#: ⁨data/levels/bonus3/crystal sunset.stl⁩:3
+#: data/levels/bonus3/crystal sunset.stl:3
 msgid "Crystal Sunset"
 msgstr "Kristal Sonsondergang"
 
@@ -139,7 +139,7 @@ msgstr "Blombonus"
 msgid "After the Glaciers"
 msgstr "Na die Gletsers"
 
-#: ⁨data/levels/bonus3/hanging roof.stl⁩:3
+#: data/levels/bonus3/hanging roof.stl:3
 msgid "Hanging From the Roof"
 msgstr "Hang Van die Dak Af"
 
@@ -215,7 +215,7 @@ msgstr ""
 msgid "Three Frosty Icebergs"
 msgstr "Drie Koue Ysberge"
 
-#: ⁨data/levels/bonus3/under ice.stl⁩:3
+#: data/levels/bonus3/under ice.stl:3
 msgid "Under the Ice"
 msgstr "Onder die Ys"
 

diff --git a/data/levels/bonus3/ar.po b/data/levels/bonus3/ar.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SuperTux\n"
 "Report-Msgid-Bugs-To: https://github.com/SuperTux/supertux/issues\n"
-"POT-Creation-Date: 2024-03-03 03:26+0100\n"
+"POT-Creation-Date: 2024-10-15 23:31+0000\n"
 "PO-Revision-Date: 2013-08-10 23:08+0000\n"
 "Last-Translator: IAN RODRÍGUEZ Lorenzo, 2023\n"
 "Language-Team: Arabic (http://app.transifex.com/arctic-games/supertux/language/ar/)\n"
@@ -27,7 +27,7 @@ msgstr "المستوى المعروف رسميًا باسم \"-89.2 درجة\""
 msgid "Global Warming"
 msgstr "الاحتباس الحراري"
 
-#: ⁨data/levels/bonus3/One Night in the Sky.stl⁩:3
+#: data/levels/bonus3/One Night in the Sky.stl:3
 msgid "One Night in the Sky"
 msgstr "ليلة واحدة في السماء"
 
@@ -79,7 +79,7 @@ msgstr "#أحسنت! لقد احتفظت بالفانوس الأحمر! لم ت
 msgid "Coconut Fortress"
 msgstr "قلعة جوز الهند"
 
-#: ⁨data/levels/bonus3/crystal sunset.stl⁩:3
+#: data/levels/bonus3/crystal sunset.stl:3
 msgid "Crystal Sunset"
 msgstr "كريستال صن سيت"
 
@@ -140,7 +140,7 @@ msgstr "مكافأة الزهور"
 msgid "After the Glaciers"
 msgstr "بعد الأنهار الجليدية"
 
-#: ⁨data/levels/bonus3/hanging roof.stl⁩:3
+#: data/levels/bonus3/hanging roof.stl:3
 msgid "Hanging From the Roof"
 msgstr "يتدلى من السطح"
 
@@ -216,7 +216,7 @@ msgstr "تلة ثلجية"
 msgid "Three Frosty Icebergs"
 msgstr "ثلاثة جبال جليدية فاترة"
 
-#: ⁨data/levels/bonus3/under ice.stl⁩:3
+#: data/levels/bonus3/under ice.stl:3
 msgid "Under the Ice"
 msgstr "تحت الثلج"
 

diff --git a/data/levels/bonus3/az.po b/data/levels/bonus3/az.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SuperTux\n"
 "Report-Msgid-Bugs-To: https://github.com/SuperTux/supertux/issues\n"
-"POT-Creation-Date: 2024-03-03 03:26+0100\n"
+"POT-Creation-Date: 2024-10-15 23:31+0000\n"
 "PO-Revision-Date: 2013-08-10 23:08+0000\n"
 "Last-Translator: IAN RODRÍGUEZ Lorenzo, 2023\n"
 "Language-Team: Azerbaijani (http://app.transifex.com/arctic-games/supertux/language/az/)\n"
@@ -26,7 +26,7 @@ msgstr "Əvvəllər \"-89,2 dərəcə\" kimi tanınan səviyyə"
 msgid "Global Warming"
 msgstr "Qlobal istiləşmə"
 
-#: ⁨data/levels/bonus3/One Night in the Sky.stl⁩:3
+#: data/levels/bonus3/One Night in the Sky.stl:3
 msgid "One Night in the Sky"
 msgstr "Göydə Bir Gecə"
 
@@ -78,7 +78,7 @@ msgstr "#Yaxşı iş! Qırmızı fənəri saxladın! Ehtiyacınız yox idi, anca
 msgid "Coconut Fortress"
 msgstr "Hindistancevizi qalası"
 
-#: ⁨data/levels/bonus3/crystal sunset.stl⁩:3
+#: data/levels/bonus3/crystal sunset.stl:3
 msgid "Crystal Sunset"
 msgstr "Kristal Gün batımı"
 
@@ -139,7 +139,7 @@ msgstr "Çiçək Bonusu"
 msgid "After the Glaciers"
 msgstr "Buzlaqlardan sonra"
 
-#: ⁨data/levels/bonus3/hanging roof.stl⁩:3
+#: data/levels/bonus3/hanging roof.stl:3
 msgid "Hanging From the Roof"
 msgstr "Damdan Asılır"
 
@@ -215,7 +215,7 @@ msgstr "Qarlı bir təpə"
 msgid "Three Frosty Icebergs"
 msgstr "Üç Şaxtalı Aysberq"
 
-#: ⁨data/levels/bonus3/under ice.stl⁩:3
+#: data/levels/bonus3/under ice.stl:3
 msgid "Under the Ice"
 msgstr "Buz altında"