[games/skladnik] /: Rename to Skladnik

Luigi Toscano null at kde.org
Sat Nov 11 11:10:16 GMT 2023


Git commit e24b6a536bff9b3ada902aec077cf1272af8cec4 by Luigi Toscano, on behalf of Friedrich W. H. Kossebau.
Committed on 11/11/2023 at 10:58.
Pushed by kossebau into branch 'master'.

Rename to Skladnik

M  +1    -1    CMakeLists.txt
M  +1    -1    doc/CMakeLists.txt
M  +14   -13   doc/index.docbook
R  +-    --    icons/128-apps-skladnik.png [from: icons/128-apps-ksokoban.png - 100% similarity]
R  +-    --    icons/16-apps-skladnik.png [from: icons/16-apps-ksokoban.png - 100% similarity]
R  +-    --    icons/22-apps-skladnik.png [from: icons/22-apps-ksokoban.png - 100% similarity]
R  +-    --    icons/32-apps-skladnik.png [from: icons/32-apps-ksokoban.png - 100% similarity]
R  +-    --    icons/48-apps-skladnik.png [from: icons/48-apps-ksokoban.png - 100% similarity]
R  +-    --    icons/64-apps-skladnik.png [from: icons/64-apps-ksokoban.png - 100% similarity]
M  +6    -6    icons/CMakeLists.txt
M  +10   -10   src/CMakeLists.txt
M  +1    -1    src/HtmlPrinter.cpp
M  +1    -1    src/InternalCollections.cpp
M  +1    -1    src/Messages.sh
M  +3    -3    src/PlayField.cpp
M  +1    -1    src/images/floor_common.inc
M  +1    -1    src/images/goal.pov
M  +1    -1    src/images/halfstone_1.pov
M  +1    -1    src/images/halfstone_2.pov
M  +1    -1    src/images/halfstone_3.pov
M  +1    -1    src/images/halfstone_4.pov
M  +1    -1    src/images/man.pov
M  +1    -1    src/images/man_common.inc
M  +1    -1    src/images/object.pov
M  +1    -1    src/images/saveman.pov
M  +1    -1    src/images/stone_1.pov
M  +1    -1    src/images/stone_2.pov
M  +1    -1    src/images/stone_3.pov
M  +1    -1    src/images/stone_4.pov
M  +1    -1    src/images/stone_5.pov
M  +1    -1    src/images/stone_6.pov
M  +1    -1    src/images/stone_common.inc
M  +1    -1    src/images/treasure.pov
M  +6    -6    src/main.cpp
R  +4    -39   src/org.kde.skladnik.desktop [from: src/org.kde.ksokoban.desktop - 061% similarity]
R  +12   -63   src/org.kde.skladnik.metainfo.xml [from: src/org.kde.ksokoban.metainfo.xml - 068% similarity]
R  +3    -3    src/skladnik.qrc [from: src/ksokoban.qrc - 054% similarity]
R  +1    -1    src/skladnikui.rc [from: src/ksokobanui.rc - 096% similarity]
M  +6    -6    themes/CMakeLists.txt
R  +2    -2    themes/skladnik_classic.desktop [from: themes/ksokoban_classic.desktop - 094% similarity]
R  +16   -16   themes/skladnik_classic.svg [from: themes/ksokoban_classic.svg - 069% similarity]

https://invent.kde.org/games/skladnik/-/commit/e24b6a536bff9b3ada902aec077cf1272af8cec4

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 27a0275..9fbfc27 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required (VERSION 3.16 FATAL_ERROR)
 
-project(ksokoban VERSION "0.5.0")
+project(skladnik VERSION "0.5.0")
 
 set(QT_MIN_VERSION "5.15.2")
 set(KF_MIN_VERSION "5.91.0")
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index e63f248..12155fc 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1 +1 @@
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR ksokoban)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR skladnik)
diff --git a/doc/index.docbook b/doc/index.docbook
index 0d4a8d8..29d7f58 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -2,11 +2,12 @@
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
   <!ENTITY % English "INCLUDE" > <!-- change language only here -->
   <!ENTITY % addindex "IGNORE">
+  <!ENTITY skladnik "<application>Skladnik</application>">
 ]>
 	
 <book lang="&language;">
 <bookinfo>
-<title>The &ksokoban; Handbook</title>
+<title>The &skladnik; Handbook</title>
 
 <authorgroup>
 <author>
@@ -31,7 +32,7 @@
 
 <abstract>
 <para>
-&ksokoban; is a implementation of the Japanese warehouse keeper game <quote>sokoban</quote>.
+&skladnik; is an implementation of the Japanese warehouse keeper game <quote>sokoban</quote>.
 </para>
 </abstract>
 
@@ -40,7 +41,7 @@
 <keyword>kdegames</keyword>
 <keyword>game</keyword>
 <keyword>sokoban</keyword>
-<keyword>ksokoban</keyword>
+<keyword>skladnik</keyword>
 </keywordset>
 </bookinfo>
 
@@ -69,7 +70,7 @@ and/or pushes you use to solve the level.
 
 <para>
 To make the game more fun for small kids (below 10 years or so), some
-collections with easier levels are also included in &ksokoban;. These
+collections with easier levels are also included in &skladnik;. These
 are marked <emphasis>(easy)</emphasis> in the level collection menu.
 Of course, these levels can be fun for adults too, for example if you
 don't want to expose yourself to too much mental strain.
@@ -134,11 +135,11 @@ can of course also restart the level from the very beginning.
 <title>Loading external levels</title>
 
 <para>
-&ksokoban; has the ability to load external sokoban levels from text
+&skladnik; has the ability to load external sokoban levels from text
 files.  You can load levels using the <menuchoice><guimenu>Game</guimenu>
 <guimenuitem>Load Levels...</guimenuitem></menuchoice> menu item, or by
 specifying the level file &URL; as a command line argument when starting
-&ksokoban; from a shell.
+&skladnik; from a shell.
 </para>
 
 <para>
@@ -188,7 +189,7 @@ As an example, below is a text representation of the first level in the
 <chapter id="menu-reference">
 <title>Menu Reference</title>
 
-<para>This is a complete guide to the menus of &ksokoban;.</para>
+<para>This is a complete guide to the menus of &skladnik;.</para>
 
 <sect1 id="game-menu">
 <title>The Game Menu</title>
@@ -245,7 +246,7 @@ more information.</para>
 <guisubmenu>Level Collection</guisubmenu>
 </menuchoice></term>
 <listitem>
-<para><action>A submenu to switch to a different set of levels.</action> &ksokoban;
+<para><action>A submenu to switch to a different set of levels.</action> &skladnik;
 comes with several level sets, and you can load more that you can find
 on the internet.</para>
 </listitem>
@@ -280,7 +281,7 @@ on the internet.</para>
 <guimenuitem>Quit</guimenuitem>
 </menuchoice></term>
 <listitem>
-<para><action>Exit</action> &ksokoban;.</para>
+<para><action>Exit</action> &skladnik;.</para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -348,7 +349,7 @@ This menu offers menu items with check boxes that allow you to specify the speed
 <guisubmenu>Set Bookmark</guisubmenu>
 </menuchoice></term>
 <listitem>
-<para>&ksokoban; allows you to <action>set bookmarks with a level at a
+<para>&skladnik; allows you to <action>set bookmarks with a level at a
 particular state.</action> You might use this to save yourself
 repeating the same initial steps in a level.</para>
 <para>You can have up to ten bookmarks at a time, and access them via the
@@ -374,7 +375,7 @@ shortcut, where <replaceable>X</replaceable> is any digit between 0 and 9.</para
 <title>The Help Menu</title>
 
 <para>
-&ksokoban; has the common &kde; <guimenu>Help</guimenu> menu item, for more information read the section about the <ulink url="help:/fundamentals/menus.html#menus-help">Help Menu</ulink> of the &kde; Fundamentals.
+&skladnik; has the common &kde; <guimenu>Help</guimenu> menu item, for more information read the section about the <ulink url="help:/fundamentals/menus.html#menus-help">Help Menu</ulink> of the &kde; Fundamentals.
 </para>
 
 </sect1>
@@ -384,9 +385,9 @@ shortcut, where <replaceable>X</replaceable> is any digit between 0 and 9.</para
 <title>Credits and License</title>
 
 <para>
-&ksokoban; is copyright © 1998-2000 by &Anders.Widell;
+&skladnik; is copyright © 1998-2000 by &Anders.Widell;
 &Anders.Widell.mail;.<!-- TODO: For
-the latest info on &ksokoban;, see the &ksokoban; home page at
+the latest info on &skladnik;, see the &skladnik; home page at
 <ulink url="http://hem.passagen.se/awl/ksokoban/">
 http://hem.passagen.se/awl/ksokoban/</ulink>-->
 </para>
diff --git a/icons/128-apps-ksokoban.png b/icons/128-apps-skladnik.png
similarity index 100%
rename from icons/128-apps-ksokoban.png
rename to icons/128-apps-skladnik.png
diff --git a/icons/16-apps-ksokoban.png b/icons/16-apps-skladnik.png
similarity index 100%
rename from icons/16-apps-ksokoban.png
rename to icons/16-apps-skladnik.png
diff --git a/icons/22-apps-ksokoban.png b/icons/22-apps-skladnik.png
similarity index 100%
rename from icons/22-apps-ksokoban.png
rename to icons/22-apps-skladnik.png
diff --git a/icons/32-apps-ksokoban.png b/icons/32-apps-skladnik.png
similarity index 100%
rename from icons/32-apps-ksokoban.png
rename to icons/32-apps-skladnik.png
diff --git a/icons/48-apps-ksokoban.png b/icons/48-apps-skladnik.png
similarity index 100%
rename from icons/48-apps-ksokoban.png
rename to icons/48-apps-skladnik.png
diff --git a/icons/64-apps-ksokoban.png b/icons/64-apps-skladnik.png
similarity index 100%
rename from icons/64-apps-ksokoban.png
rename to icons/64-apps-skladnik.png
diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index 7238b01..315a738 100644
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -1,11 +1,11 @@
 ecm_install_icons(
     ICONS
-        16-apps-ksokoban.png
-        22-apps-ksokoban.png
-        32-apps-ksokoban.png
-        48-apps-ksokoban.png
-        64-apps-ksokoban.png
-        128-apps-ksokoban.png
+        16-apps-skladnik.png
+        22-apps-skladnik.png
+        32-apps-skladnik.png
+        48-apps-skladnik.png
+        64-apps-skladnik.png
+        128-apps-skladnik.png
     DESTINATION
         ${KDE_INSTALL_ICONDIR}
     THEME
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 799b686..b99fbde 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,12 +4,12 @@
 
 add_subdirectory(images)
 
-ecm_setup_version(${ksokoban_VERSION}
-    VARIABLE_PREFIX KSOKOBAN
+ecm_setup_version(${skladnik_VERSION}
+    VARIABLE_PREFIX SKLADNIK
     VERSION_HEADER version.h
 )
 
-add_executable(ksokoban
+add_executable(skladnik
     Bookmark.cpp
     LevelMap.cpp
     Map.cpp
@@ -28,23 +28,23 @@ add_executable(ksokoban
     GroundItem.cpp
     SimpleTextItem.cpp
 
-    ksokoban.qrc
+    skladnik.qrc
 )
 
 if (QT_MAJOR_VERSION STREQUAL "6")
-    target_link_libraries(ksokoban KDEGames6)
+    target_link_libraries(skladnik KDEGames6)
 else()
-    target_link_libraries(ksokoban KF5KDEGames)
+    target_link_libraries(skladnik KF5KDEGames)
 endif()
 
-target_link_libraries(ksokoban
+target_link_libraries(skladnik
     KF${KF_MAJOR_VERSION}::I18n
     KF${KF_MAJOR_VERSION}::WidgetsAddons
     KF${KF_MAJOR_VERSION}::XmlGui
     KF${KF_MAJOR_VERSION}::KIOCore
 )
 
-install(TARGETS ksokoban ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS skladnik ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 
-install(FILES org.kde.ksokoban.desktop DESTINATION ${KDE_INSTALL_APPDIR})
-install(FILES org.kde.ksokoban.metainfo.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
+install(FILES org.kde.skladnik.desktop DESTINATION ${KDE_INSTALL_APPDIR})
+install(FILES org.kde.skladnik.metainfo.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
diff --git a/src/HtmlPrinter.cpp b/src/HtmlPrinter.cpp
index 0856879..ab0e811 100644
--- a/src/HtmlPrinter.cpp
+++ b/src/HtmlPrinter.cpp
@@ -76,7 +76,7 @@ void HtmlPrinter::printHtml(const Map *lm)
         "\
 <html>\n\
 <head>\n\
-<title>ksokoban level</title>\n\
+<title>Skladnik level</title>\n\
 </head>\n\
 <body background=background.gif>\n\
 ");
diff --git a/src/InternalCollections.cpp b/src/InternalCollections.cpp
index ce10ad7..95dad14 100644
--- a/src/InternalCollections.cpp
+++ b/src/InternalCollections.cpp
@@ -57,7 +57,7 @@ InternalCollections::InternalCollections()
 {
     int datasize, levelnum = 0;
 
-    QFile resourceData(QStringLiteral(":/ksokoban/level.data"));
+    QFile resourceData(QStringLiteral(":/skladnik/level.data"));
     if (!resourceData.open(QIODevice::ReadOnly)) {
         abort();
     }
diff --git a/src/Messages.sh b/src/Messages.sh
index 428a11f..ed96d92 100644
--- a/src/Messages.sh
+++ b/src/Messages.sh
@@ -1,3 +1,3 @@
 #! /bin/sh
 $EXTRACTRC *.rc >> rc.cpp
-$XGETTEXT *.cpp -o $podir/ksokoban.pot
+$XGETTEXT *.cpp -o $podir/skladnik.pot
diff --git a/src/PlayField.cpp b/src/PlayField.cpp
index 1ec9e8b..ef85ec4 100644
--- a/src/PlayField.cpp
+++ b/src/PlayField.cpp
@@ -49,13 +49,13 @@ static constexpr int MESSAGE_TIMEOUT_MS = 4000;
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 static KGameTheme* createClassicTheme()
 {
-    auto *theme = new KGameTheme("themes/ksokoban_classic.desktop");
+    auto *theme = new KGameTheme("themes/skladnik_classic.desktop");
 #else
 static KgTheme* createClassicTheme()
 {
-    auto *theme = new KgTheme("themes/ksokoban_classic.desktop");
+    auto *theme = new KgTheme("themes/skladnik_classic.desktop");
 #endif
-    theme->setGraphicsPath(QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("themes/ksokoban_classic.svg")));
+    theme->setGraphicsPath(QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("themes/skladnik_classic.svg")));
     return theme;
 }
 
diff --git a/src/images/floor_common.inc b/src/images/floor_common.inc
index 04f21e1..c2744a0 100644
--- a/src/images/floor_common.inc
+++ b/src/images/floor_common.inc
@@ -1,4 +1,4 @@
-// Pov-ray image source for ksokoban
+// Pov-ray image source for Skladnik
 // SPDX-FileCopyrightText: 1998-1999  Anders Widell <awl at hem.passagen.se>
 
 #declare FloorColour = <114/255, 114/255, 114/255>;
diff --git a/src/images/goal.pov b/src/images/goal.pov
index 059d0ef..9920f3a 100644
--- a/src/images/goal.pov
+++ b/src/images/goal.pov
@@ -1,4 +1,4 @@
-// Pov-ray image source for ksokoban
+// Pov-ray image source for Skladnik
 // SPDX-FileCopyrightText: 1998-1999  Anders Widell <awl at hem.passagen.se>
 
 #include "floor_common.inc"
diff --git a/src/images/halfstone_1.pov b/src/images/halfstone_1.pov
index 2fe4621..bc9f577 100644
--- a/src/images/halfstone_1.pov
+++ b/src/images/halfstone_1.pov
@@ -1,4 +1,4 @@
-// Pov-ray image source for ksokoban
+// Pov-ray image source for Skladnik
 // SPDX-FileCopyrightText: 1998-1999  Anders Widell <awl at hem.passagen.se>
 
 #include "stone_common.inc"
diff --git a/src/images/halfstone_2.pov b/src/images/halfstone_2.pov
index d197272..b9a7f3f 100644
--- a/src/images/halfstone_2.pov
+++ b/src/images/halfstone_2.pov
@@ -1,4 +1,4 @@
-// Pov-ray image source for ksokoban
+// Pov-ray image source for Skladnik
 // SPDX-FileCopyrightText: 1998-1999  Anders Widell <awl at hem.passagen.se>
 
 #include "stone_common.inc"
diff --git a/src/images/halfstone_3.pov b/src/images/halfstone_3.pov
index ea15a85..d100738 100644
--- a/src/images/halfstone_3.pov
+++ b/src/images/halfstone_3.pov
@@ -1,4 +1,4 @@
-// Pov-ray image source for ksokoban
+// Pov-ray image source for Skladnik
 // SPDX-FileCopyrightText: 1998-1999  Anders Widell <awl at hem.passagen.se>
 
 #include "stone_common.inc"
diff --git a/src/images/halfstone_4.pov b/src/images/halfstone_4.pov
index 4730058..c2b60b7 100644
--- a/src/images/halfstone_4.pov
+++ b/src/images/halfstone_4.pov
@@ -1,4 +1,4 @@
-// Pov-ray image source for ksokoban
+// Pov-ray image source for Skladnik
 // SPDX-FileCopyrightText: 1998-1999  Anders Widell <awl at hem.passagen.se>
 
 #include "stone_common.inc"
diff --git a/src/images/man.pov b/src/images/man.pov
index ff960f7..77e094c 100644
--- a/src/images/man.pov
+++ b/src/images/man.pov
@@ -1,4 +1,4 @@
-// Pov-ray image source for ksokoban
+// Pov-ray image source for Skladnik
 // SPDX-FileCopyrightText: 1998-1999  Anders Widell <awl at hem.passagen.se>
 
 #include "floor_common.inc"
diff --git a/src/images/man_common.inc b/src/images/man_common.inc
index e6c04f0..00c513f 100644
--- a/src/images/man_common.inc
+++ b/src/images/man_common.inc
@@ -1,4 +1,4 @@
-// Pov-ray image source for ksokoban
+// Pov-ray image source for Skladnik
 // SPDX-FileCopyrightText: 1998-1999  Anders Widell <awl at hem.passagen.se>
 
 #include "colors.inc"
diff --git a/src/images/object.pov b/src/images/object.pov
index d748179..01fef08 100644
--- a/src/images/object.pov
+++ b/src/images/object.pov
@@ -1,4 +1,4 @@
-// Pov-ray image source for ksokoban
+// Pov-ray image source for Skladnik
 // SPDX-FileCopyrightText: 1998-1999  Anders Widell <awl at hem.passagen.se>
 
 #include "floor_common.inc"
diff --git a/src/images/saveman.pov b/src/images/saveman.pov
index 1ff2fbf..c1f34cd 100644
--- a/src/images/saveman.pov
+++ b/src/images/saveman.pov
@@ -1,4 +1,4 @@
-// Pov-ray image source for ksokoban
+// Pov-ray image source for Skladnik
 // SPDX-FileCopyrightText: 1998-1999  Anders Widell <awl at hem.passagen.se>
 
 #include "goal.pov"
diff --git a/src/images/stone_1.pov b/src/images/stone_1.pov
index 76fe4cd..b11c763 100644
--- a/src/images/stone_1.pov
+++ b/src/images/stone_1.pov
@@ -1,4 +1,4 @@
-// Pov-ray image source for ksokoban
+// Pov-ray image source for Skladnik
 // SPDX-FileCopyrightText: 1998-1999  Anders Widell <awl at hem.passagen.se>
 
 #include "stone_common.inc"
diff --git a/src/images/stone_2.pov b/src/images/stone_2.pov
index 03f6541..06dc6e6 100644
--- a/src/images/stone_2.pov
+++ b/src/images/stone_2.pov
@@ -1,4 +1,4 @@
-// Pov-ray image source for ksokoban
+// Pov-ray image source for Skladnik
 // SPDX-FileCopyrightText: 1998-1999  Anders Widell <awl at hem.passagen.se>
 
 #include "stone_common.inc"
diff --git a/src/images/stone_3.pov b/src/images/stone_3.pov
index bcfbef4..78f3492 100644
--- a/src/images/stone_3.pov
+++ b/src/images/stone_3.pov
@@ -1,4 +1,4 @@
-// Pov-ray image source for ksokoban
+// Pov-ray image source for Skladnik
 // SPDX-FileCopyrightText: 1998-1999  Anders Widell <awl at hem.passagen.se>
 
 #include "stone_common.inc"
diff --git a/src/images/stone_4.pov b/src/images/stone_4.pov
index 03ced70..756e20b 100644
--- a/src/images/stone_4.pov
+++ b/src/images/stone_4.pov
@@ -1,4 +1,4 @@
-// Pov-ray image source for ksokoban
+// Pov-ray image source for Skladnik
 // SPDX-FileCopyrightText: 1998-1999  Anders Widell <awl at hem.passagen.se>
 
 #include "stone_common.inc"
diff --git a/src/images/stone_5.pov b/src/images/stone_5.pov
index dba2828..b9fadee 100644
--- a/src/images/stone_5.pov
+++ b/src/images/stone_5.pov
@@ -1,4 +1,4 @@
-// Pov-ray image source for ksokoban
+// Pov-ray image source for Skladnik
 // SPDX-FileCopyrightText: 1998-1999  Anders Widell <awl at hem.passagen.se>
 
 #include "stone_common.inc"
diff --git a/src/images/stone_6.pov b/src/images/stone_6.pov
index 4267649..700bffd 100644
--- a/src/images/stone_6.pov
+++ b/src/images/stone_6.pov
@@ -1,4 +1,4 @@
-// Pov-ray image source for ksokoban
+// Pov-ray image source for Skladnik
 // SPDX-FileCopyrightText: 1998-1999  Anders Widell <awl at hem.passagen.se>
 
 #include "stone_common.inc"
diff --git a/src/images/stone_common.inc b/src/images/stone_common.inc
index 8c6c150..39400b7 100644
--- a/src/images/stone_common.inc
+++ b/src/images/stone_common.inc
@@ -1,4 +1,4 @@
-// Pov-ray image source for ksokoban
+// Pov-ray image source for Skladnik
 // SPDX-FileCopyrightText: 1998-1999  Anders Widell <awl at hem.passagen.se>
 
 #include "colors.inc"
diff --git a/src/images/treasure.pov b/src/images/treasure.pov
index 5779206..988d541 100644
--- a/src/images/treasure.pov
+++ b/src/images/treasure.pov
@@ -1,4 +1,4 @@
-// Pov-ray image source for ksokoban
+// Pov-ray image source for Skladnik
 // SPDX-FileCopyrightText: 1998-1999  Anders Widell <awl at hem.passagen.se>
 
 #include "goal.pov"
diff --git a/src/main.cpp b/src/main.cpp
index 3b25b43..ad2e0ac 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -21,16 +21,16 @@ int main(int argc, char **argv)
     QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
 #endif
     QApplication app(argc, argv);
-    KLocalizedString::setApplicationDomain("ksokoban");
+    KLocalizedString::setApplicationDomain("skladnik");
 
-    KAboutData aboutData(QStringLiteral("ksokoban"),
-                         i18n("KSokoban"),
-                         QStringLiteral(KSOKOBAN_VERSION_STRING),
+    KAboutData aboutData(QStringLiteral("skladnik"),
+                         i18n("Skladnik"),
+                         QStringLiteral(SKLADNIK_VERSION_STRING),
                          i18n("The japanese warehouse keeper game"),
                          KAboutLicense::GPL,
                          i18n("(c) 1998 Anders Widell <awl at hem.passagen.se>\n(c) 2012 Lukasz Kalamlacki"),
                          QString(),
-                         QStringLiteral("https://apps.kde.org/ksokoban"));
+                         QStringLiteral("https://apps.kde.org/skladnik"));
     aboutData.addAuthor(i18n("Shlomi Fish"),
                         i18n("For porting to Qt5/KF5 and doing other cleanups"),
                         QStringLiteral("shlomif at cpan.org"),
@@ -50,7 +50,7 @@ int main(int argc, char **argv)
 
     KAboutData::setApplicationData(aboutData);
 
-    app.setWindowIcon(QIcon::fromTheme(QStringLiteral("ksokoban")));
+    app.setWindowIcon(QIcon::fromTheme(QStringLiteral("skladnik")));
 
     QCommandLineParser parser;
     parser.addPositionalArgument(QStringLiteral("URL"), i18n("Level collection file to load."), QStringLiteral("[URL}"));
diff --git a/src/org.kde.ksokoban.desktop b/src/org.kde.skladnik.desktop
similarity index 61%
rename from src/org.kde.ksokoban.desktop
rename to src/org.kde.skladnik.desktop
index a6c7453..8efb8f9 100644
--- a/src/org.kde.ksokoban.desktop
+++ b/src/org.kde.skladnik.desktop
@@ -1,39 +1,5 @@
 [Desktop Entry]
-Name=KSokoban
-Name[ar]=حارس المستودع
-Name[bs]=KSokoban
-Name[ca]=KSokoban
-Name[ca at valencia]=KSokoban
-Name[cs]=KSokoban
-Name[de]=KSokoban
-Name[en_GB]=KSokoban
-Name[eo]=KSokoban
-Name[es]=KSokoban
-Name[et]=KSokoban
-Name[eu]=KSokoban
-Name[fi]=KSokoban
-Name[fr]=KSokoban
-Name[ga]=KSokoban
-Name[gl]=KSokoban
-Name[hu]=KSokoban
-Name[it]=KSokoban
-Name[ka]=KSokoban
-Name[ko]=KSokoban
-Name[mr]=के-सोकोबान
-Name[nl]=KSokoban
-Name[nn]=KSokoban
-Name[pl]=KSokoban
-Name[pt]=KSokoban
-Name[pt_BR]=KSokoban
-Name[ro]=KSokoban
-Name[ru]=KSokoban
-Name[sk]=KSokoban
-Name[sl]=KSokoban
-Name[sv]=Ksokoban
-Name[tr]=K Sokoban
-Name[uk]=KSokoban
-Name[x-test]=xxKSokobanxx
-Name[zh_TW]=KSokoban
+Name=Skladnik
 GenericName=Sokoban Game
 GenericName[ar]=لعبة حارس المستودع
 GenericName[bs]=Sokoban igra
@@ -66,11 +32,10 @@ GenericName[sl]=Igra KSokoban
 GenericName[sv]=Sokoban-spel
 GenericName[tr]=Sokoban Oyunu
 GenericName[uk]=Гра, подібна до гри Сокобан
-GenericName[x-test]=xxSokoban Gamexx
 GenericName[zh_TW]=推箱子遊戲
-DocPath=ksokoban/index.html
-Exec=ksokoban -qwindowtitle %c
-Icon=ksokoban
+DocPath=skladnik/index.html
+Exec=skladnik -qwindowtitle %c
+Icon=skladnik
 Terminal=false
 Type=Application
 X-KDE-StartupNotify=true
diff --git a/src/org.kde.ksokoban.metainfo.xml b/src/org.kde.skladnik.metainfo.xml
similarity index 68%
rename from src/org.kde.ksokoban.metainfo.xml
rename to src/org.kde.skladnik.metainfo.xml
index 39fcd52..2037c9d 100644
--- a/src/org.kde.ksokoban.metainfo.xml
+++ b/src/org.kde.skladnik.metainfo.xml
@@ -1,35 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component type="desktop-application">
-  <id>org.kde.ksokoban</id>
+  <id>org.kde.skladnik</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-2.0+</project_license>
-  <name>KSokoban</name>
-  <name xml:lang="ar">أمين المستودع</name>
-  <name xml:lang="ca">KSokoban</name>
-  <name xml:lang="ca-valencia">KSokoban</name>
-  <name xml:lang="cs">KSokoban</name>
-  <name xml:lang="de">KSokoban</name>
-  <name xml:lang="en-GB">KSokoban</name>
-  <name xml:lang="eo">KSokoban</name>
-  <name xml:lang="es">KSokoban</name>
-  <name xml:lang="eu">KSokoban</name>
-  <name xml:lang="fi">KSokoban</name>
-  <name xml:lang="fr">KSokoban</name>
-  <name xml:lang="gl">KSokoban</name>
-  <name xml:lang="it">KSokoban</name>
-  <name xml:lang="ka">KSokoban</name>
-  <name xml:lang="ko">KSokoban</name>
-  <name xml:lang="nl">KSokoban</name>
-  <name xml:lang="nn">KSokoban</name>
-  <name xml:lang="pl">KSokoban</name>
-  <name xml:lang="pt">KSokoban</name>
-  <name xml:lang="pt-BR">KSokoban</name>
-  <name xml:lang="sk">KSokoban</name>
-  <name xml:lang="sl">KSokoban</name>
-  <name xml:lang="sv">Ksokoban</name>
-  <name xml:lang="tr">K Sokoban</name>
-  <name xml:lang="uk">KSokoban</name>
-  <name xml:lang="x-test">xxKSokobanxx</name>
+  <name>Skladnik</name>
   <summary>Sokoban Game</summary>
   <summary xml:lang="ar">لعبة أمين المستودع</summary>
   <summary xml:lang="ca">Joc del Sokoban</summary>
@@ -56,34 +30,10 @@
   <summary xml:lang="sv">Sokoban-spel</summary>
   <summary xml:lang="tr">Sokoban Oyunu</summary>
   <summary xml:lang="uk">Гра «Сокобан»</summary>
-  <summary xml:lang="x-test">xxSokoban Gamexx</summary>
   <description>
     <p>
-      KSokoban is a implementation of the Japanese warehouse keeper game “sokoban”.
+      Skladnik is an implementation of the Japanese warehouse keeper game “sokoban”.
     </p>
-    <p xml:lang="ar">لعبة أمين المستودع هي تنفيذ للعبة اليابانية أمين المستودع المسماة "سوكوبان"</p>
-    <p xml:lang="ca">El KSokoban és una implementació del joc japonès «Sokoban» de l'encarregat de magatzem.</p>
-    <p xml:lang="ca-valencia">KSokoban és una implementació del joc japonés «Sokoban» de l'encarregat de magatzem.</p>
-    <p xml:lang="en-GB">KSokoban is a implementation of the Japanese warehouse keeper game “sokoban”.</p>
-    <p xml:lang="eo">KSokoban estas realigo de la japana magazenistoludo “sokoban”.</p>
-    <p xml:lang="es">KSokoban es una implementación del juego japonés del encargado de almacén «sokoban».</p>
-    <p xml:lang="eu">KSokoban, "Sokoban" biltegizainaren joko japoniarraren inplementazio bat da.</p>
-    <p xml:lang="fi">KSokoban on toteutus japanilaisesta varastotyöntekijäpelistä ”sokoban”.</p>
-    <p xml:lang="fr">KSokoban est une implémentation du jeu japonais « sokoban » de gardien d'entrepôt.</p>
-    <p xml:lang="gl">KSokoban é unha implementación do xogo xaponés de garda de almacén «sokoban».</p>
-    <p xml:lang="it">KSokoban è un'implementazione del gioco giapponese  del magazziniere «sokoban».</p>
-    <p xml:lang="ka">KSokoban - იაპონური საწყობის უფროსის თამაშიზე, სოკობანზეა დაფუძნებული.</p>
-    <p xml:lang="ko">KSokoban은 창고지기 게임 소코반 구현입니다.</p>
-    <p xml:lang="nl">KSokoban is een implementatie van het Japanse magazijn-beheerder-spel “sokoban”.</p>
-    <p xml:lang="nn">KSokoban er ei utgåve av det japanske lagersjef­spelet «sokoban».</p>
-    <p xml:lang="pl">KSokoban jest implementacją japońskiej gry “sokoban”, w którą grali magazynierzy.</p>
-    <p xml:lang="pt">O KSokoban é uma implementação do jogo japonês de arrumação de armazéns “sokoban”.</p>
-    <p xml:lang="pt-BR">KSokoban é uma implementação do jogo de almoxarife japonês “sokoban”.</p>
-    <p xml:lang="sl">KSokoban je izvedba japonske igre skrbnika skladišča "sokoban".</p>
-    <p xml:lang="sv">Ksokoban är en implementering av det japanska lagerarbetarspelet "sokoban”.</p>
-    <p xml:lang="tr">K Sokoban, Japon depo bekçisi oyunu "Sokoban"ın bir uyarlamasıdır.</p>
-    <p xml:lang="uk">KSokoban — реалізація японської гри у комірника, «сокобан».</p>
-    <p xml:lang="x-test">xxKSokoban is a implementation of the Japanese warehouse keeper game “sokoban”.xx</p>
     <p>
       The idea is that you are a warehouse keeper trying to push crates to their proper locations in a warehouse. The problem is that you cannot pull the crates or step over them. If you are not careful, some of the crates can get stuck in wrong places and/or block your way. 
     </p>
@@ -109,25 +59,24 @@
     <p xml:lang="sv">Idén är att du är en lagerarbetare som försöker knuffa lådor till sina riktiga platser i en lagerbyggnad. Problemet är att du inte kan dra lådorna eller kliva över dem. Om du inte är försiktig kan några av lådorna fastna på fel platser och/eller blockera vägen för dig.</p>
     <p xml:lang="tr">Buradaki fikir, kasaları bir depodaki uygun yerlerine itmeye çalışan bir depo bekçisi olmanızdır. Sorun şu ki, kasaları çekemiyor veya üzerinden geçemezsiniz. Dikkatli olmazsanız bazı sandıklar yanlış yerlere takılabilir ve/veya yolunuzu kapatabilir.</p>
     <p xml:lang="uk">Ви граєте за комірника, якому треба перетягти скриньки на складі у відповідні їм місця. Проблема полягає у тому, що ви не можете тягнути скриньки або переступати через них. Якщо ви не будете обережними, деякі скриньки може бути заблоковано у невідповідних місцях і/або вони можуть заблокувати вам дорогу.</p>
-    <p xml:lang="x-test">xxThe idea is that you are a warehouse keeper trying to push crates to their proper locations in a warehouse. The problem is that you cannot pull the crates or step over them. If you are not careful, some of the crates can get stuck in wrong places and/or block your way.xx</p>
   </description>
   <content_rating type="oars-1.1"/>
-  <url type="homepage">https://apps.kde.org/ksokoban</url>
-  <url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?format=guided&product=ksokoban</url>
-  <url type="help">https://docs.kde.org/?application=ksokoban</url>
-  <url type="donation">https://www.kde.org/community/donations/?app=ksokoban&source=appdata</url>
-  <screenshots>
+  <!-- TODO: uncomment once up url type="homepage">https://apps.kde.org/skladnik</url -->
+  <!-- TODO: uncomment once moved url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?format=guided&product=skladnik</url-->
+  <!-- TODO: uncomment once moved url type="help">https://docs.kde.org/?application=skladnik</url-->
+  <url type="donation">https://www.kde.org/community/donations/?app=skladnik&source=appdata</url>
+  <!-- TODO: uncomment once moved screenshots>
     <screenshot type="default">
-      <image>https://cdn.kde.org/screenshots/ksokoban/ksokoban.png</image>
+      <image>https://cdn.kde.org/screenshots/skladnik/skladnik.png</image>
     </screenshot>
-  </screenshots>
+  </screenshots -->
   <categories>
     <category>Game</category>
     <category>StrategyGame</category>
   </categories>
   <project_group>KDE</project_group>
   <provides>
-    <binary>ksokoban</binary>
+    <binary>skladnik</binary>
   </provides>
-  <launchable type="desktop-id">org.kde.ksokoban.desktop</launchable>
+  <launchable type="desktop-id">org.kde.skladnik.desktop</launchable>
 </component>
diff --git a/src/ksokoban.qrc b/src/skladnik.qrc
similarity index 54%
rename from src/ksokoban.qrc
rename to src/skladnik.qrc
index ebddfcd..ea9bf58 100644
--- a/src/ksokoban.qrc
+++ b/src/skladnik.qrc
@@ -1,9 +1,9 @@
 <!DOCTYPE RCC>
 <RCC version="1.0">
-    <qresource prefix="/kxmlgui5/ksokoban">
-        <file>ksokobanui.rc</file>
+    <qresource prefix="/kxmlgui5/skladnik">
+        <file>skladnikui.rc</file>
     </qresource>
-    <qresource prefix="/ksokoban">
+    <qresource prefix="/skladnik">
         <file alias="level.data">levels/level.data</file>
     </qresource>
 </RCC>
diff --git a/src/ksokobanui.rc b/src/skladnikui.rc
similarity index 96%
rename from src/ksokobanui.rc
rename to src/skladnikui.rc
index 6f1e913..4951b7f 100644
--- a/src/ksokobanui.rc
+++ b/src/skladnikui.rc
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE gui SYSTEM "kpartgui.dtd">
-<gui version="4" name="ksokoban" translationDomain="ksokoban">
+<gui version="0" name="skladnik" translationDomain="skladnik">
 <MenuBar>
     <Menu name="game" >
         <text>&Game</text>
diff --git a/themes/CMakeLists.txt b/themes/CMakeLists.txt
index 4aa6532..165f66a 100644
--- a/themes/CMakeLists.txt
+++ b/themes/CMakeLists.txt
@@ -1,8 +1,8 @@
 install( FILES
-    ksokoban_classic.svg
-    ksokoban_classic.desktop
-    #ksokoban_classic_preview.png
-    DESTINATION  ${KDE_INSTALL_DATADIR}/ksokoban/themes
+    skladnik_classic.svg
+    skladnik_classic.desktop
+    #skladnik_classic_preview.png
+    DESTINATION  ${KDE_INSTALL_DATADIR}/skladnik/themes
 )
 
 function(install_classic_sprite_image)
@@ -11,13 +11,13 @@ function(install_classic_sprite_image)
     foreach(image ${ARGS_IMAGES})
         install(FILES "${ARGS_SOURCE_DIR}/${image}"
             RENAME "${ARGS_NAMESPACE}${image}"
-            DESTINATION  ${KDE_INSTALL_DATADIR}/ksokoban/themes
+            DESTINATION  ${KDE_INSTALL_DATADIR}/skladnik/themes
         )
     endforeach()
 endfunction()
 
 install_classic_sprite_image(
-    NAMESPACE "ksokoban_classic_"
+    NAMESPACE "skladnik_classic_"
     SOURCE_DIR "${CMAKE_SOURCE_DIR}/src/images"
     IMAGES
         goal.png
diff --git a/themes/ksokoban_classic.desktop b/themes/skladnik_classic.desktop
similarity index 94%
rename from themes/ksokoban_classic.desktop
rename to themes/skladnik_classic.desktop
index 87517e0..242939d 100644
--- a/themes/ksokoban_classic.desktop
+++ b/themes/skladnik_classic.desktop
@@ -45,5 +45,5 @@ VersionFormat=1
 Author=Anders Widell
 AuthorEmail=awl at hem.passagen.se
 Type=SVG
-FileName=ksokoban_classic.svg
-Preview=ksokoban_classic_preview.png
+FileName=skladnik_classic.svg
+Preview=skladnik_classic_preview.png
diff --git a/themes/ksokoban_classic.svg b/themes/skladnik_classic.svg
similarity index 69%
rename from themes/ksokoban_classic.svg
rename to themes/skladnik_classic.svg
index b120a56..683f0a7 100644
--- a/themes/ksokoban_classic.svg
+++ b/themes/skladnik_classic.svg
@@ -14,112 +14,112 @@
       y="0"
       width="192"
       height="192"
-      xlink:href="ksokoban_classic_goal.png"
+      xlink:href="skladnik_classic_goal.png"
       id="goal"/>
     <image
       x="0"
       y="192"
       width="192"
       height="192"
-      xlink:href="ksokoban_classic_man.png"
+      xlink:href="skladnik_classic_man.png"
       id="man"/>
     <image
       x="0"
       y="384"
       width="192"
       height="192"
-      xlink:href="ksokoban_classic_saveman.png"
+      xlink:href="skladnik_classic_saveman.png"
       id="saveman"/>
     <image
       x="0"
       y="576"
       width="192"
       height="192"
-      xlink:href="ksokoban_classic_object.png"
+      xlink:href="skladnik_classic_object.png"
       id="object"/>
     <image
       x="0"
       y="768"
       width="192"
       height="192"
-      xlink:href="ksokoban_classic_treasure.png"
+      xlink:href="skladnik_classic_treasure.png"
       id="treasure"/>
     <image
       x="200"
       y="0"
       width="192"
       height="96"
-      xlink:href="ksokoban_classic_stone_1.png"
+      xlink:href="skladnik_classic_stone_1.png"
       id="stone_0"/>
     <image
       x="200"
       y="96"
       width="192"
       height="96"
-      xlink:href="ksokoban_classic_stone_2.png"
+      xlink:href="skladnik_classic_stone_2.png"
       id="stone_1"/>
     <image
       x="200"
       y="192"
       width="192"
       height="96"
-      xlink:href="ksokoban_classic_stone_3.png"
+      xlink:href="skladnik_classic_stone_3.png"
       id="stone_2"/>
     <image
       x="200"
       y="288"
       width="192"
       height="96"
-      xlink:href="ksokoban_classic_stone_4.png"
+      xlink:href="skladnik_classic_stone_4.png"
       id="stone_3"/>
     <image
       x="200"
       y="384"
       width="192"
       height="96"
-      xlink:href="ksokoban_classic_stone_5.png"
+      xlink:href="skladnik_classic_stone_5.png"
       id="stone_4"/>
     <image
       x="200"
       y="480"
       width="192"
       height="96"
-      xlink:href="ksokoban_classic_stone_6.png"
+      xlink:href="skladnik_classic_stone_6.png"
       id="stone_5"/>
     <image
       x="200"
       y="576"
       width="96"
       height="96"
-      xlink:href="ksokoban_classic_halfstone_1.png"
+      xlink:href="skladnik_classic_halfstone_1.png"
       id="halfstone_0"/>
     <image
       x="200"
       y="672"
       width="96"
       height="96"
-      xlink:href="ksokoban_classic_halfstone_2.png"
+      xlink:href="skladnik_classic_halfstone_2.png"
       id="halfstone_1"/>
     <image
       x="200"
       y="768"
       width="96"
       height="96"
-      xlink:href="ksokoban_classic_halfstone_3.png"
+      xlink:href="skladnik_classic_halfstone_3.png"
       id="halfstone_2"/>
     <image
       x="200"
       y="864"
       width="96"
       height="96"
-      xlink:href="ksokoban_classic_halfstone_4.png"
+      xlink:href="skladnik_classic_halfstone_4.png"
       id="halfstone_3"/>
     <image
       x="400"
       y="0"
       width="128"
       height="128"
-      xlink:href="ksokoban_classic_starfield.png"
+      xlink:href="skladnik_classic_starfield.png"
       id="background"/>
   </g>
 </svg>


More information about the kde-doc-english mailing list