Improve appdata.xml quality

This reverts commit f2f50f23fa236598bc9e6c94016e0edfd72f7a89.

CMakeLists.txt

@@ -14,8 +14,8 @@ link_directories (${CMAKE_INSTALL_PREFIX}/lib)
 project (planetblupi)
 set (PB_VERSION_MAJOR 1)
 set (PB_VERSION_MINOR 15)
-set (PB_VERSION_PATCH 0)
-set (PB_VERSION_EXTRA "-rc1")
+set (PB_VERSION_PATCH 1)
+set (PB_VERSION_EXTRA "")
 set (PB_PRODUCT_NAME "Planet Blupi")
 set (PB_PACKAGE_NAME "planetblupi")
 set (PB_EXEC         "planetblupi")
@@ -43,13 +43,11 @@ if (APPIMAGE_APPRUN_PROGRAM AND APPIMAGE_ASSISTANT_PROGRAM)
   set (USE_APPIMAGE ON)
 endif ()
 
-if (NOT USE_APPIMAGE)
-  configure_file (
-    "${PROJECT_SOURCE_DIR}/resources/linux/application.desktop.in"
-    "${CMAKE_CURRENT_BINARY_DIR}/${PB_PACKAGE_NAME}.desktop"
-    @ONLY
-  )
-endif ()
+configure_file (
+  "${PROJECT_SOURCE_DIR}/resources/linux/application.desktop.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/${PB_PACKAGE_NAME}.desktop"
+  @ONLY
+)
 
 set (planetblupi_OUTPUT planetblupi)
 
@@ -99,7 +97,7 @@ endif ()
 file (COPY resources/sound DESTINATION share/planetblupi)
 file (COPY resources/music DESTINATION share/planetblupi)
 file (COPY LICENSE.all DESTINATION share/doc/planetblupi)
-file (COPY COPYING DESTINATION share/doc/planetblupi)
+file (COPY CREDITS DESTINATION share/doc/planetblupi)
 file (RENAME "${CMAKE_BINARY_DIR}/share/doc/planetblupi/LICENSE.all"
              "${CMAKE_BINARY_DIR}/share/doc/planetblupi/copyright")
 
@@ -109,6 +107,10 @@ if (BUILD_LINUX)
     COPY resources/linux/org.blupi.${PB_PACKAGE_NAME}.appdata.xml
     DESTINATION share/metainfo
   )
+  file (
+    COPY ${CMAKE_CURRENT_BINARY_DIR}/${PB_PACKAGE_NAME}.desktop
+    DESTINATION share/applications
+  )
 endif ()
 
 # Windows stuff
@@ -152,18 +154,34 @@ include_directories (${SDLKitchensink_INCLUDE_DIRS})
 
 find_package (PkgConfig REQUIRED)
 if (NOT BUILD_JS)
-  find_package (SDL2 REQUIRED)
-  #include_directories (${SDL2_INCLUDE_DIRS})
-  set (planetblupi_DEPS ${planetblupi_DEPS} SDL2::Main)
-  find_package (SDL2_image REQUIRED)
-  #include_directories (${SDL2_IMAGE_INCLUDE_DIRS})
-  set (planetblupi_DEPS ${planetblupi_DEPS} SDL2::Image)
-  find_package (SDL2_ttf REQUIRED)
-  #include_directories (${SDL2_TTF_INCLUDE_DIRS})
-  set (planetblupi_DEPS ${planetblupi_DEPS} SDL2::TTF)
-  find_package (SDL2_mixer REQUIRED)
-  #include_directories (${SDL2_MIXER_INCLUDE_DIRS})
-  set (planetblupi_DEPS ${planetblupi_DEPS} SDL2::Mixer)
+  set (SDL2_DIR       "${CMAKE_INSTALL_PREFIX}/lib/cmake/SDL2")
+  set (SDL2_image_DIR "${CMAKE_INSTALL_PREFIX}/lib/cmake/SDL2_image")
+  set (SDL2_ttf_DIR   "${CMAKE_INSTALL_PREFIX}/lib/cmake/SDL2_ttf")
+  set (SDL2_mixer_DIR "${CMAKE_INSTALL_PREFIX}/lib/cmake/SDL2_mixer")
+
+  if ("${STATIC_BUILD}")
+    find_package (SDL2 REQUIRED NO_DEFAULT_PATH)
+    include_directories (${SDL2_INCLUDE_DIRS})
+    set (planetblupi_DEPS ${planetblupi_DEPS} ${SDL2_STATIC_LIBRARIES})
+    find_package (SDL2_image REQUIRED NO_DEFAULT_PATH)
+    include_directories (${SDL2_IMAGE_INCLUDE_DIRS})
+    set (planetblupi_DEPS ${planetblupi_DEPS} SDL2_image::SDL2_image-static)
+    find_package (SDL2_ttf REQUIRED NO_DEFAULT_PATH)
+    include_directories (${SDL2_TTF_INCLUDE_DIRS})
+    set (planetblupi_DEPS ${planetblupi_DEPS} SDL2_ttf::SDL2_ttf-static)
+    find_package (SDL2_mixer REQUIRED NO_DEFAULT_PATH)
+    include_directories (${SDL2_MIXER_INCLUDE_DIRS})
+    set (planetblupi_DEPS ${planetblupi_DEPS} SDL2_mixer::SDL2_mixer-static)
+  else ()
+    find_package (SDL2 REQUIRED)
+    include_directories (${SDL2_INCLUDE_DIRS})
+    find_package (SDL2_image REQUIRED)
+    include_directories (${SDL2_IMAGE_INCLUDE_DIRS})
+    find_package (SDL2_ttf REQUIRED)
+    include_directories (${SDL2_TTF_INCLUDE_DIRS})
+    find_package (SDL2_mixer REQUIRED)
+    include_directories (${SDL2_MIXER_INCLUDE_DIRS})
+  endif ()
 endif ()
 
 if (${PB_HTTP_VERSION_CHECK})
@@ -199,7 +217,6 @@ if ("${STATIC_BUILD}")
 
     # For the static SDL2::TTF
     set (planetblupi_DEPS ${planetblupi_DEPS}
-      -Wl,--allow-multiple-definition
       -lz
       -lfreetype
       -lharfbuzz
@@ -336,7 +353,7 @@ if (NOT BUILD_JS)
   install (DIRECTORY resources/sound DESTINATION share/planetblupi)
   install (DIRECTORY resources/music DESTINATION share/planetblupi)
   install (FILES LICENSE.all DESTINATION share/doc/planetblupi RENAME copyright)
-  install (FILES COPYING DESTINATION share/doc/planetblupi)
+  install (FILES CREDITS DESTINATION share/doc/planetblupi)
 
   if (BUILD_LINUX)
     install (DIRECTORY resources/icon/hicolor DESTINATION share/icons)
@@ -346,12 +363,10 @@ if (NOT BUILD_JS)
     )
   endif ()
 
-  if (NOT USE_APPIMAGE)
-    install (
-      FILES ${CMAKE_CURRENT_BINARY_DIR}/${PB_PACKAGE_NAME}.desktop
-      DESTINATION share/applications
-    )
-  endif ()
+  install (
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/${PB_PACKAGE_NAME}.desktop
+    DESTINATION share/applications
+  )
 
   # Copy libwinpthread-1.dll which seems not be linkable statically
   if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows" AND MINGW)
@@ -425,6 +440,9 @@ if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release" AND "${STATIC_BUILD}")
     set (CPACK_BUNDLE_STARTUP_COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/resources/darwin/Planet Blupi")
     if (SIGN_APP)
       set (CPACK_BUNDLE_APPLE_CERT_APP "Developer ID Application: Mathieu Schroeter")
+      set (CPACK_BUNDLE_APPLE_CODESIGN_PARAMETER "--deep -f --options runtime --timestamp")
+      set (CPACK_BUNDLE_APPLE_CODESIGN_FILES "/Contents/Resources/bin/planetblupi")
+      set (CPACK_APPLE_BUNDLE_ID "planetblupi")
     endif ()
     set (CPACK_PACKAGE_FILE_NAME "planetblupi-${PB_VERSION_MAJOR}.${PB_VERSION_MINOR}.${PB_VERSION_PATCH}${PB_VERSION_EXTRA}")
 

CREDITS

@@ -3,21 +3,24 @@
 | Years     | People                                                           |
 | --------- | ---------------------------------------------------------------- |
 |           | **Developers**                                                   |
-| 1997      | Daniel Roux and Denis Dumoulin                                   |
-| 2017-2019 | Mathieu Schroeter                                                |
+| 1997      | Daniel Roux, Denis Dumoulin                                      |
+| 2017-2023 | Mathieu Schroeter                                                |
 |           |                                                                  |
 |           | **Voices**                                                       |
-| 1997      | Daniel Roux, David Besuchet, Michael Walz and Garry Goodman      |
+| 1997      | Daniel Roux, David Besuchet, Michael Walz, Garry Goodman         |
+| 2022      | elPatrixF _(@github)_                                            |
 |           |                                                                  |
 |           | **Translators**                                                  |
 | 1997      | Christian Alleyn, Michael Walz, David Besuchet, Cedric Freeman,  |
-|           | Adrienne Magnin and Wendy de Pauli                               |
-| 2005      | Rodolfo Andrade de Oliveira and Vanessa Alexandre Vieira         |
-| 2017      | Catia Guidi and Mateusz Lis                                      |
-| 2019      | punctdan _(@github)_ and TheShwarma _(@twitter)_                 |
+|           | Adrienne Magnin, Wendy de Pauli                                  |
+| 2005      | Rodolfo Andrade de Oliveira, Vanessa Alexandre Vieira            |
+| 2017      | Catia Guidi, Mateusz Lis                                         |
+| 2019      | punctdan _(@github)_, TheShwarma _(@twitter)_,                   |
+|           | BLooperZ _(@github)_                                             |
+| 2022      | elPatrixF _(@github)_, WindowsNinetyTen _(@github)_              |
 |           |                                                                  |
 |           | **Missions**                                                     |
-| 1997      | Daniel Roux, Adrien Roux and Denis Dumoulin                      |
+| 1997      | Daniel Roux, Adrien Roux, Denis Dumoulin                         |
 |           |                                                                  |
 |           | **Testers**                                                      |
 | 1997      | Denis Dumoulin, Adrien Roux, Michael Walz, René Beuchat,         |
@@ -26,4 +29,4 @@
 |           | Michael Bloch, Florian Stutzmann, Fabrice Bodmer,                |
 |           | Rachel Besuchet, Pauline Rochat, Antoine Richoy,                 |
 |           | Fabrice Marquis, Steve Guex, Simon Lopez, David Piot,            |
-|           | Yves Burgos and Jeremy Kull                                      |
+|           | Yves Burgos, Jeremy Kull                                         |

LICENSE

@@ -17,7 +17,7 @@ This game is linked on some static libraries:
   zlib (own license)
 
 
-Planet Blupi is licensed under GPLv3, see LICENSE.all/copyright for details.
+Planet Blupi is licensed under GPLv3+, see LICENSE.all/copyright for details.
 
 
                     GNU GENERAL PUBLIC LICENSE

LICENSE.all

@@ -14,12 +14,13 @@ List of all licenses, concerns Planet Blupi and dependencies
  * libvorbis -- https://xiph.org/downloads/
  * SDL_kitchensink -- https://github.com/katajakasa/SDL_kitchensink
  * SDL2 -- https://www.libsdl.org
- * SDL2_image -- https://www.libsdl.org/projects/SDL_image/
- * SDL2_mixer -- https://www.libsdl.org/projects/SDL_mixer/
+ * SDL2_image -- https://github.com/libsdl-org/SDL_image
+ * SDL2_mixer -- https://github.com/libsdl-org/SDL_mixer
+ * SDL2_ttf -- https://github.com/libsdl-org/SDL_ttf
  * zlib -- https://zlib.net/
 
 ######################################################################
-# Planet Blupi - LICENSE
+# Planet Blupi is licensed under GPLv3+
 ######################################################################
 
                     GNU GENERAL PUBLIC LICENSE
@@ -3635,6 +3636,28 @@ freely, subject to the following restrictions:
    misrepresented as being the original software.
 3. This notice may not be removed or altered from any source distribution.
 
+######################################################################
+# SDL2_ttf - LICENSE
+######################################################################
+
+Copyright (C) 1997-2023 Sam Lantinga <slouken@libsdl.org>
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
 ######################################################################
 # zlib - LICENSE
 ######################################################################

README.translators.md

@@ -14,11 +14,11 @@ yours for example) `share/locale/fr/LC_MESSAGES/` and put your `.mo` file in
 this directory. You can replace an other lang if you like.
 
 > Under Windows OS, you should find the french translations in
-> `C:\Program Files\Planet Blupi\share\locale\fr\LC_MESSAGES\`.  
+> `C:\Program Files\Planet Blupi\share\locale\fr\LC_MESSAGES\`.
 > With macOS it's possible to open the `Planet Blupi.app` and update the file
 > directly in the `.app`. But note that it breaks the application signature. To
 > start the game, maybe it's necessary to open via the context menu for by
-> passing the macOS security.  
+> passing the macOS security.
 > For Linux you must unpack the AppImage file somewhere for changing the files.
 
 Then start the game, the interface will use your new translation if you select
@@ -51,6 +51,10 @@ don't forget to provide this one.
       lang = "Português";
     else if (locale == "he")
       lang = "עברית";
+    else if (locale == "ar")
+      lang = "العربية";
+    else if (locale == "es")
+      lang = "Español";
 ```
 
 ## The missions

cmake/LinuxAppImageBuild.cmake

@@ -134,16 +134,16 @@ macro (APPIMAGE_PACKAGE TARGET APPIMAGE_TITLE APPIMAGE_DISPLAYNAME CONFIGDIR DAT
   )
 
   if (SIGN_APP)
-    set (APPIMGKITARGS "-s")
+    set (APPIMGKITARGS -s -n)
   else ()
-    set (APPIMGKITARGS "")
+    set (APPIMGKITARGS -n)
   endif ()
 
   # Do the actual packaging step with AppImageKit
   add_custom_command (
     TARGET ${TARGET}
     POST_BUILD
-    COMMAND "${APPIMAGE_ASSISTANT_PROGRAM}" "${APPIMGKITARGS}" "${APPIMAGE_INTERMEDIATE_DIR}" "${APPIMAGE_FINAL_NAME}"
+    COMMAND "${APPIMAGE_ASSISTANT_PROGRAM}" ${APPIMGKITARGS} "${APPIMAGE_INTERMEDIATE_DIR}" "${APPIMAGE_FINAL_NAME}"
   )
 
   install (

planetblupi.6.ronn

@@ -195,6 +195,8 @@ Only 10 musics are supported: `music000` to `music009`.
     **Set fire**: you can add invisible fire on every type of cells (when
     building a map).
 
+    **Duplicate bombs**: duplicate a bomb just before the explosion.
+
   * `-m`, `--restore-midi`:
     Restore playback based on MIDI music instead of OGG.
 
@@ -210,4 +212,4 @@ https://www.blupi.org <info@blupi.org>
 ## COPYRIGHT
 
 planetblupi is Copyright (C) 1997, Daniel Roux & EPSITEC SA and
-Copyright (C) 2017-2021, Mathieu Schroeter
+Copyright (C) 2017-2023, Mathieu Schroeter

resources/darwin/Info.plist.in

@@ -12,5 +12,7 @@
 	<string>@CPACK_BUNDLE_NAME@</string>
 	<key>CFBundleIconFile</key>
 	<string>@BUNDLE_ICON_REF@</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
 </dict>
 </plist>

resources/darwin/dmgsetup.scpt

@@ -35,10 +35,9 @@ on run argv
     open
       update without registering applications
       tell container window
-        set sidebar width to 0
-        set statusbar visible to false
-        set toolbar visible to false
-        set the bounds to { 400, 100, 900, 465 }
+        set its sidebar width to 0
+        set its toolbar visible to false
+        set the bounds to { 400, 100, 900, 480 }
         set position of item "Planet Blupi.app" to { 133, 200 }
         set position of item "Applications" to { 378, 200 }
       end tell

resources/data/en/stories.blp

@@ -903,7 +903,7 @@ clicking on each Blupi.
 1|
 1|  Platinium....
 1|
-1|The platinium, which is placed
+1|The Platinium, which is placed
 2|next to the robot's rocket,
 2|will give him access to enemy
 2|technology.
@@ -911,7 +911,7 @@ clicking on each Blupi.
 
 
 2|Goal:
-2|Bring a cube of platinum onto
+2|Bring a cube of Platinium onto
 2|the striped paving stones.
 
 @25
@@ -929,13 +929,13 @@ clicking on each Blupi.
 2|is far in the east. You will
 2|have to blow up a barrier to
 2|be able to get hold of the
-2|platinium.
+2|Platinium.
 2|
-2|Bring the platinium back to
+2|Bring the Platinium back to
 2|base camp.
 
 #26
-1|The cube of Platinum will give
+1|The cube of Platinium will give
 1|you access to enemy technology
 1|so use it correctly.
 
@@ -951,7 +951,7 @@ clicking on each Blupi.
 1|Clues:
 1|
 1|Make a helping robot with the
-1|cube of platinum in the factory
+1|cube of Platinium in the factory
 1|and make a time bomb.
 1|
 1|Take the robot and the bomb.

resources/data/es/stories.blp

@@ -906,14 +906,14 @@ haces clic en cada Blupi
 1|
 1|  Platinium....
 1|
-1|El platinium, que está colocado
+1|El Platinium, que está colocado
 2|al lado del Cohete, le dará
 2|acceso a tecnología enemiga.
 2|
 
 
 2|Objetivo :
-2|Traer un cubo de platinium a
+2|Traer un cubo de Platinium a
 2|las baldosas rayadas.
 
 @25
@@ -930,13 +930,13 @@ haces clic en cada Blupi
 2|enemiga con el cohete está al
 2|este, a lo lejos. Ahí tendrás
 2|que volar una barrera para
-2|poder hacerte con el platinium.
+2|poder hacerte con el Platinium.
 2|
-2|Lleva el platinium devuelta al
+2|Lleva el Platinium devuelta al
 2|campamento.
 
 #26
-1|El cubo de platinium te dará
+1|El cubo de Platinium te dará
 1|acceso a la tecnología enemiga.
 1|Así que úsalo correctamente.
 
@@ -953,7 +953,7 @@ haces clic en cada Blupi
 1|Pistas :
 1|
 1|Haz un robot ayudante con el cubo
-1|de platinium en el taller, y haz una
+1|de Platinium en el taller, y haz una
 1|bomba de tiempo.
 1|
 1|Ve con el robot y la bomba.

resources/linux/org.blupi.planetblupi.appdata.xml

@@ -1,21 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop-application">
-	<id>org.blupi.planetblupi</id>
-	<metadata_license>MIT</metadata_license>
-	<project_license>GPL-3.0+</project_license>
-	<name>Planet Blupi</name>
-	<summary>Planet Blupi - A delirious spell-binding game</summary>
-	<description>
-		<p>Planet Blupi is a strategy and adventure game. It subtly blends action with thought-provoking challenges. Behind the quiet and gentle facade, you'll enjoy a fascinating diversion full of surprises.</p>
-	</description>
-	<launchable type="desktop-id">planetblupi.desktop</launchable>
-	<url type="homepage">https://blupi.org/</url>
-	<screenshots>
-		<screenshot type="default">
-			<image>https://blupi.org/download/screen/planetblupi.png</image>
-		</screenshot>
-	</screenshots>
-	<provides>
-		<id>planetblupi.desktop</id>
-	</provides>
+  <id>org.blupi.planetblupi</id>
+
+  <name>Planet Blupi</name>
+  <summary>Planet Blupi - A delirious spell-binding game</summary>
+
+  <metadata_license>MIT</metadata_license>
+  <project_license>GPL-3.0-or-later</project_license>
+
+  <description>
+    <p>
+      Planet Blupi is a strategy and adventure game. It subtly blends action with thought-provoking challenges. Behind the quiet and gentle facade, you&apos;ll enjoy a fascinating diversion full of surprises.
+    </p>
+  </description>
+
+  <url type="homepage">https://blupi.org</url>
+  <launchable type="desktop-id">planetblupi.desktop</launchable>
+  <screenshots>
+    <screenshot type="default">
+      <image>https://blupi.org/download/screen/planetblupi.png</image>
+    </screenshot>
+  </screenshots>
+
+  <provides>
+    <id>planetblupi.desktop</id>
+    <binary>planetblupi</binary>
+  </provides>
 </component>

resources/po/ar.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 23:04+0200\n"
+"POT-Creation-Date: 2023-11-30 23:00+0100\n"
 "PO-Revision-Date: 2022-04-28 14:38-0400\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -25,8 +25,8 @@ msgstr " - FFmpeg (LGPLv2.1)"
 msgid " - GNU/gettext and GNU/libiconv (GPLv3)"
 msgstr " - GNU/gettext and GNU/libiconv (GPLv3)"
 
-msgid " - SDL2, SDL2_image and SDL2_mixer (zlib license)"
-msgstr " - SDL2, SDL2_image and SDL2_mixer (zlib license)"
+msgid " - SDL2, SDL2_image, SDL2_mixer and SDL2_ttf (zlib license)"
+msgstr " - SDL2, SDL2_image, SDL2_mixer and SDL2_ttf (zlib license)"
 
 msgid " - SDL_kitchensink (MIT)"
 msgstr " - SDL_kitchensink (MIT)"
@@ -142,6 +142,13 @@ msgstr ""
 "1: تخذ\n"
 "2: تحويل"
 
+msgid ""
+"1|Drop Platinium on striped \n"
+"1|paving stones."
+msgstr ""
+"1| أوقع بلاتين على\n"
+"1| حجار المخططة."
+
 msgid ""
 "1|Drop planks on striped \n"
 "1|paving stones."
@@ -149,13 +156,6 @@ msgstr ""
 "1| اخفض الألواح على\n"
 "1| حجار مخططة."
 
-msgid ""
-"1|Drop platinium on striped \n"
-"1|paving stones."
-msgstr ""
-"1| أوقع بلاتين على\n"
-"1| حجار المخططة."
-
 msgid ""
 "1|Drop tomatoes on striped \n"
 "1|paving stones."

resources/po/de.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 23:04+0200\n"
+"POT-Creation-Date: 2023-11-30 23:00+0100\n"
 "PO-Revision-Date: 2017-12-14 23:15+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -24,8 +24,8 @@ msgstr " - FFmpeg (LGPLv2.1)"
 msgid " - GNU/gettext and GNU/libiconv (GPLv3)"
 msgstr " - GNU/gettext und GNU/libiconv (GPLv3)"
 
-msgid " - SDL2, SDL2_image and SDL2_mixer (zlib license)"
-msgstr " - SDL2, SDL2_image und SDL2_mixer (zlib Lizenz)"
+msgid " - SDL2, SDL2_image, SDL2_mixer and SDL2_ttf (zlib license)"
+msgstr " - SDL2, SDL2_image, SDL2_mixer und SDL2_ttf (zlib Lizenz)"
 
 msgid " - SDL_kitchensink (MIT)"
 msgstr " - SDL_kitchensink (MIT)"
@@ -141,6 +141,13 @@ msgstr ""
 "1: Nehmen\n"
 "2: Verarbeiten"
 
+msgid ""
+"1|Drop Platinium on striped \n"
+"1|paving stones."
+msgstr ""
+"1|Platinium auf die\n"
+"1|gestreiften Quadrate legen."
+
 msgid ""
 "1|Drop planks on striped \n"
 "1|paving stones."
@@ -148,13 +155,6 @@ msgstr ""
 "1|Bretter auf die\n"
 "1|gestreiften Quadrate legen."
 
-msgid ""
-"1|Drop platinium on striped \n"
-"1|paving stones."
-msgstr ""
-"1|Platinium auf die\n"
-"1|gestreiften Quadrate legen."
-
 msgid ""
 "1|Drop tomatoes on striped \n"
 "1|paving stones."

resources/po/en_US.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 23:04+0200\n"
+"POT-Creation-Date: 2023-11-30 23:00+0100\n"
 "PO-Revision-Date: 2017-02-27 21:28+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -24,7 +24,7 @@ msgstr ""
 msgid " - GNU/gettext and GNU/libiconv (GPLv3)"
 msgstr ""
 
-msgid " - SDL2, SDL2_image and SDL2_mixer (zlib license)"
+msgid " - SDL2, SDL2_image, SDL2_mixer and SDL2_ttf (zlib license)"
 msgstr ""
 
 msgid " - SDL_kitchensink (MIT)"
@@ -118,12 +118,12 @@ msgid ""
 msgstr ""
 
 msgid ""
-"1|Drop planks on striped \n"
+"1|Drop Platinium on striped \n"
 "1|paving stones."
 msgstr ""
 
 msgid ""
-"1|Drop platinium on striped \n"
+"1|Drop planks on striped \n"
 "1|paving stones."
 msgstr ""
 

resources/po/es.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-30 20:55+0100\n"
+"POT-Creation-Date: 2023-11-30 23:00+0100\n"
 "PO-Revision-Date: 2022-06-14 14:57-0300\n"
 "Last-Translator: \n"
 "Language-Team: Español <elpatrixf@hotmail.com>\n"
@@ -23,8 +23,8 @@ msgstr " - FFmpeg (LGPLv2.1)"
 msgid " - GNU/gettext and GNU/libiconv (GPLv3)"
 msgstr " - GNU/gettext y GNU/libiconv (GPLv3)"
 
-msgid " - SDL2, SDL2_image and SDL2_mixer (zlib license)"
-msgstr " - SDL2, SDL2_image y SDL2_mixer (licencia zlib)"
+msgid " - SDL2, SDL2_image, SDL2_mixer and SDL2_ttf (zlib license)"
+msgstr " - SDL2, SDL2_image, SDL2_mixer y SDL2_ttf (licencia zlib)"
 
 msgid " - SDL_kitchensink (MIT)"
 msgstr " - SDL_kitchensink (MIT)"
@@ -140,6 +140,13 @@ msgstr ""
 "1: Tomar\n"
 "2: Transformar"
 
+msgid ""
+"1|Drop Platinium on striped \n"
+"1|paving stones."
+msgstr ""
+"1|Deposita Platinium en\n"
+"1|las baldosas rayadas."
+
 msgid ""
 "1|Drop planks on striped \n"
 "1|paving stones."
@@ -147,13 +154,6 @@ msgstr ""
 "1|Deposita maderos en\n"
 "1|las baldosas rayadas."
 
-msgid ""
-"1|Drop platinium on striped \n"
-"1|paving stones."
-msgstr ""
-"1|Deposita platinium en\n"
-"1|las baldosas rayadas."
-
 msgid ""
 "1|Drop tomatoes on striped \n"
 "1|paving stones."

resources/po/fr.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 23:04+0200\n"
+"POT-Creation-Date: 2023-11-30 23:00+0100\n"
 "PO-Revision-Date: 2019-02-17 23:21+0100\n"
 "Last-Translator: Mathieu Schroeter <mathieu@schroetersa.ch>\n"
 "Language-Team: French <kde-i18n-doc@kde.org>\n"
@@ -23,8 +23,8 @@ msgstr " - FFmpeg (LGPLv2.1)"
 msgid " - GNU/gettext and GNU/libiconv (GPLv3)"
 msgstr " - GNU/gettext et GNU/libiconv (GPLv3)"
 
-msgid " - SDL2, SDL2_image and SDL2_mixer (zlib license)"
-msgstr " - SDL2, SDL2_image et SDL2_mixer (licence zlib)"
+msgid " - SDL2, SDL2_image, SDL2_mixer and SDL2_ttf (zlib license)"
+msgstr " - SDL2, SDL2_image, SDL2_mixer et SDL2_ttf (licence zlib)"
 
 msgid " - SDL_kitchensink (MIT)"
 msgstr " - SDL_kitchensink (MIT)"
@@ -140,6 +140,13 @@ msgstr ""
 "1: Prend\n"
 "2: Transforme"
 
+msgid ""
+"1|Drop Platinium on striped \n"
+"1|paving stones."
+msgstr ""
+"1|Déposer du Platinium\n"
+"1|sur les dalles hachurées."
+
 msgid ""
 "1|Drop planks on striped \n"
 "1|paving stones."
@@ -147,13 +154,6 @@ msgstr ""
 "1|Déposer des planches\n"
 "1|sur les dalles hachurées."
 
-msgid ""
-"1|Drop platinium on striped \n"
-"1|paving stones."
-msgstr ""
-"1|Déposer du platinium\n"
-"1|sur les dalles hachurées."
-
 msgid ""
 "1|Drop tomatoes on striped \n"
 "1|paving stones."
@@ -311,7 +311,7 @@ msgid ""
 "Choose the\n"
 "music format"
 msgstr ""
-"Choisi le\n"
+"Choisis le\n"
 "format de\n"
 "la musique"
 

resources/po/he.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 23:04+0200\n"
+"POT-Creation-Date: 2023-11-30 23:00+0100\n"
 "PO-Revision-Date: 2019-02-17 14:11+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -25,8 +25,8 @@ msgstr " - FFmpeg (LGPLv2.1)"
 msgid " - GNU/gettext and GNU/libiconv (GPLv3)"
 msgstr " - GNU/gettext and GNU/libiconv (GPLv3)"
 
-msgid " - SDL2, SDL2_image and SDL2_mixer (zlib license)"
-msgstr " - SDL2, SDL2_image and SDL2_mixer (zlib license)"
+msgid " - SDL2, SDL2_image, SDL2_mixer and SDL2_ttf (zlib license)"
+msgstr " - SDL2, SDL2_image, SDL2_mixer and SDL2_ttf (zlib license)"
 
 msgid " - SDL_kitchensink (MIT)"
 msgstr " - SDL_kitchensink (MIT)"
@@ -142,6 +142,13 @@ msgstr ""
 "1: לקחת\n"
 "2: לשנות"
 
+msgid ""
+"1|Drop Platinium on striped \n"
+"1|paving stones."
+msgstr ""
+"1|הורידו את הפלטינה על\n"
+"1|המרצפות המפוספסות"
+
 msgid ""
 "1|Drop planks on striped \n"
 "1|paving stones."
@@ -149,13 +156,6 @@ msgstr ""
 "1|הורידו את הקרשים על\n"
 "1|המרצפות המפוספסות"
 
-msgid ""
-"1|Drop platinium on striped \n"
-"1|paving stones."
-msgstr ""
-"1|הורידו את הפלטינה על\n"
-"1|המרצפות המפוספסות"
-
 msgid ""
 "1|Drop tomatoes on striped \n"
 "1|paving stones."

resources/po/it.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 23:04+0200\n"
+"POT-Creation-Date: 2023-11-30 23:00+0100\n"
 "PO-Revision-Date: 2019-02-18 15:22+0100\n"
 "Last-Translator: Mathieu Schroeter <mathieu@schroetersa.ch>\n"
 "Language-Team: \n"
@@ -24,8 +24,8 @@ msgstr " - FFmpeg (LGPLv2.1)"
 msgid " - GNU/gettext and GNU/libiconv (GPLv3)"
 msgstr " - GNU/gettext e GNU/libiconv (GPLv3)"
 
-msgid " - SDL2, SDL2_image and SDL2_mixer (zlib license)"
-msgstr " - SDL2, SDL2_image e SDL2_mixer (zlib licensa)"
+msgid " - SDL2, SDL2_image, SDL2_mixer and SDL2_ttf (zlib license)"
+msgstr " - SDL2, SDL2_image, SDL2_mixer e SDL2_ttf (zlib licensa)"
 
 msgid " - SDL_kitchensink (MIT)"
 msgstr " - SDL_kitchensink (MIT)"
@@ -141,6 +141,13 @@ msgstr ""
 "1: Prendi\n"
 "2: Trasforma"
 
+msgid ""
+"1|Drop Platinium on striped \n"
+"1|paving stones."
+msgstr ""
+"1|Posa del Platinium sulle \n"
+"1|lastre tratteggiate."
+
 msgid ""
 "1|Drop planks on striped \n"
 "1|paving stones."
@@ -148,13 +155,6 @@ msgstr ""
 "1|Posa delle assi \n"
 "1|sulle lastre tratteggiate."
 
-msgid ""
-"1|Drop platinium on striped \n"
-"1|paving stones."
-msgstr ""
-"1|Posa del platinium sulle \n"
-"1|lastre tratteggiate."
-
 msgid ""
 "1|Drop tomatoes on striped \n"
 "1|paving stones."

resources/po/pl.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 23:04+0200\n"
+"POT-Creation-Date: 2023-11-30 23:00+0100\n"
 "PO-Revision-Date: 2019-02-17 23:22+0100\n"
 "Last-Translator: tomangelo <tomangelo@wp.pl>\n"
 "Language-Team: TerranovaTeam <contact@colobot.info>\n"
@@ -25,8 +25,8 @@ msgstr " - FFmpeg (LGPLv2.1)"
 msgid " - GNU/gettext and GNU/libiconv (GPLv3)"
 msgstr " - GNU/gettext and GNU/libiconv (GPLv3)"
 
-msgid " - SDL2, SDL2_image and SDL2_mixer (zlib license)"
-msgstr " - SDL2, SDL2_image and SDL2_mixer (licencja zlib)"
+msgid " - SDL2, SDL2_image, SDL2_mixer and SDL2_ttf (zlib license)"
+msgstr " - SDL2, SDL2_image, SDL2_mixer and SDL2_ttf (licencja zlib)"
 
 msgid " - SDL_kitchensink (MIT)"
 msgstr " - SDL_kitchensink (MIT)"
@@ -142,6 +142,13 @@ msgstr ""
 "1: Weź\n"
 "2: Przetwórz"
 
+msgid ""
+"1|Drop Platinium on striped \n"
+"1|paving stones."
+msgstr ""
+"1|Połóż platynę na\n"
+"1|nawierzchni docelowej."
+
 msgid ""
 "1|Drop planks on striped \n"
 "1|paving stones."
@@ -149,13 +156,6 @@ msgstr ""
 "1|Połóż deski na\n"
 "1|nawierzchni docelowej."
 
-msgid ""
-"1|Drop platinium on striped \n"
-"1|paving stones."
-msgstr ""
-"1|Połóż platynę na\n"
-"1|nawierzchni docelowej."
-
 msgid ""
 "1|Drop tomatoes on striped \n"
 "1|paving stones."

resources/po/planetblupi.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 23:04+0200\n"
+"POT-Creation-Date: 2023-11-30 23:00+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -798,7 +798,7 @@ msgstr ""
 msgid " - SDL_kitchensink (MIT)"
 msgstr ""
 
-msgid " - SDL2, SDL2_image and SDL2_mixer (zlib license)"
+msgid " - SDL2, SDL2_image, SDL2_mixer and SDL2_ttf (zlib license)"
 msgstr ""
 
 msgid " - zlib (own license)"
@@ -847,7 +847,7 @@ msgid ""
 msgstr ""
 
 msgid ""
-"1|Drop platinium on striped \n"
+"1|Drop Platinium on striped \n"
 "1|paving stones."
 msgstr ""
 

resources/po/pt.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 23:04+0200\n"
+"POT-Creation-Date: 2023-11-30 23:00+0100\n"
 "PO-Revision-Date: 2019-02-17 23:23+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -24,7 +24,7 @@ msgstr " - FFmpeg (LGPLv2.1)"
 msgid " - GNU/gettext and GNU/libiconv (GPLv3)"
 msgstr ""
 
-msgid " - SDL2, SDL2_image and SDL2_mixer (zlib license)"
+msgid " - SDL2, SDL2_image, SDL2_mixer and SDL2_ttf (zlib license)"
 msgstr ""
 
 msgid " - SDL_kitchensink (MIT)"
@@ -141,6 +141,13 @@ msgstr ""
 "1: Pegar\n"
 "2: Transformar"
 
+msgid ""
+"1|Drop Platinium on striped \n"
+"1|paving stones."
+msgstr ""
+"1|Largar a platina no \n"
+"1|pavimento de pedra."
+
 msgid ""
 "1|Drop planks on striped \n"
 "1|paving stones."
@@ -148,13 +155,6 @@ msgstr ""
 "1|Largar madeira no \n"
 "1|pavimento de pedra."
 
-msgid ""
-"1|Drop platinium on striped \n"
-"1|paving stones."
-msgstr ""
-"1|Largar a platina no \n"
-"1|pavimento de pedra."
-
 msgid ""
 "1|Drop tomatoes on striped \n"
 "1|paving stones."

resources/po/tr.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 23:04+0200\n"
+"POT-Creation-Date: 2023-11-30 23:00+0100\n"
 "PO-Revision-Date: 2019-02-17 23:26+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -24,8 +24,8 @@ msgstr " - FFmpeg (LGPLv2.1)"
 msgid " - GNU/gettext and GNU/libiconv (GPLv3)"
 msgstr " - GNU/gettext ve GNU/libiconv (GPLv3)"
 
-msgid " - SDL2, SDL2_image and SDL2_mixer (zlib license)"
-msgstr " - SDL2, SDL2_image ve  SDL2_mixer (zlib lisansı)"
+msgid " - SDL2, SDL2_image, SDL2_mixer and SDL2_ttf (zlib license)"
+msgstr " - SDL2, SDL2_image, SDL2_mixer ve  SDL2_ttf (zlib lisansı)"
 
 msgid " - SDL_kitchensink (MIT)"
 msgstr " - SDL_kitchensink (MIT)"
@@ -141,6 +141,13 @@ msgstr ""
 "1: Al\n"
 "2: Dönüştür"
 
+msgid ""
+"1|Drop Platinium on striped \n"
+"1|paving stones."
+msgstr ""
+"1|Platini çizgili parke \n"
+"1|taşına bırak."
+
 msgid ""
 "1|Drop planks on striped \n"
 "1|paving stones."
@@ -148,13 +155,6 @@ msgstr ""
 "1|Kalasları çizgili parke \n"
 "1|taşına bırak."
 
-msgid ""
-"1|Drop platinium on striped \n"
-"1|paving stones."
-msgstr ""
-"1|Platini çizgili parke \n"
-"1|taşına bırak."
-
 msgid ""
 "1|Drop tomatoes on striped \n"
 "1|paving stones."

src/blupi.cxx

@@ -778,14 +778,14 @@ DoInit (int argc, char * argv[], bool & exit)
     return EXIT_FAILURE;
   }
 
-#ifdef __LINUX__
+#ifdef __linux__
   if (!getenv ("ALSA_CONFIG_DIR"))
   {
     static char env[256];
     snprintf (env, sizeof (env), "ALSA_CONFIG_DIR=/usr/share/alsa");
     putenv (env);
   }
-#endif /* __LINUX__ */
+#endif /* __linux__ */
 
 #ifdef _WIN32
   /* Fix laggy sounds on Windows by not using winmm driver. */
@@ -821,11 +821,12 @@ DoInit (int argc, char * argv[], bool & exit)
     return EXIT_FAILURE;
   }
 
-#if 0
-  auto icon = IMG_Load ((GetShareDir () + "icons/hicolor/256x256/apps/blupi.png").c_str ());
+#ifdef __linux__
+  auto icon = IMG_Load (
+    (GetShareDir () + "icons/hicolor/256x256/apps/blupi.png").c_str ());
   SDL_SetWindowIcon (g_window, icon);
   SDL_FreeSurface (icon);
-#endif /* 0 */
+#endif /* __linux__ */
 
   g_renderer = SDL_CreateRenderer (
     g_window, -1, g_rendererType | SDL_RENDERER_TARGETTEXTURE);

src/event.cxx

@@ -2898,7 +2898,7 @@ CEvent::DrawButtons ()
       gettext (" - libpulse (LGPLv2.1)"),
       gettext (" - libsndfile (LGPLv3)"),
       gettext (" - SDL_kitchensink (MIT)"),
-      gettext (" - SDL2, SDL2_image and SDL2_mixer (zlib license)"),
+      gettext (" - SDL2, SDL2_image, SDL2_mixer and SDL2_ttf (zlib license)"),
       gettext (" - zlib (own license)"),
       gettext (
         "All licenses are available under share/doc/planetblupi/copyright")};
@@ -4952,7 +4952,7 @@ CEvent::PrivateLibelle ()
     else if (term.bHachMetal)
     {
       term.bHachMetal = false;
-      text = gettext ("1|Drop platinium on striped \n1|paving stones.");
+      text = gettext ("1|Drop Platinium on striped \n1|paving stones.");
     }
     else if (term.bHachRobot)
     {