18 files changed, 99 insertions, 29 deletions
diff --git a/kalzium/ConfigureChecks.cmake b/kalzium/ConfigureChecks.cmake
index bb1da003..88ba0ed6 100644
--- a/kalzium/ConfigureChecks.cmake
+++ b/kalzium/ConfigureChecks.cmake
@@ -72,4 +72,70 @@ if( WITH_OCAML_SOLVER )
     message( STATUS "Search for facile - found" )
   endif( )
 
+
+  if( NOT DEFINED HAVE_NUMS )
+    message( STATUS "Search for nums" )
+
+    if( NOT DEFINED NUMS_LIBRARIES )
+      find_library( NUMS_LIBRARY
+        NAMES nums.a
+        HINTS ${OCAML_BASEDIR}
+        PATH_SUFFIXES num ocaml/num
+      )
+      if( NUMS_LIBRARY )
+        set( NUMS_LIBRARIES ${NUMS_LIBRARY} )
+      endif()
+    endif( )
+
+    if( NOT DEFINED NUMS_INCLUDE_DIR )
+      find_path( NUMS_INCLUDE_DIR
+          NAMES num.cmi
+          HINTS ${OCAML_BASEDIR}
+          PATH_SUFFIXES nums lib/ocaml/nums
+      )
+    endif( )
+
+    if( NUMS_LIBRARIES AND NUMS_INCLUDE_DIR )
+      set( HAVE_NUMS 1 CACHE INTERNAL "Enable build with ocaml/nums" )
+      message( STATUS "Search for nums - found" )
+    else()
+      message( STATUS "Search for nums - not found" )
+    endif()
+  endif( )
+
+
+  if( NOT DEFINED HAVE_ZARITH )
+    message( STATUS "Search for zarith" )
+
+    if( NOT DEFINED ZARITH_LIBRARIES )
+      find_library( ZARITH_LIBRARY
+        NAMES zarith.a
+        HINTS ${OCAML_BASEDIR}
+        PATH_SUFFIXES zarith ocaml/zarith
+      )
+      if( ZARITH_LIBRARY )
+        set( ZARITH_LIBRARIES ${ZARITH_LIBRARY} )
+      endif()
+    endif( )
+
+    if( NOT DEFINED ZARITH_INCLUDE_DIR )
+      find_path( ZARITH_INCLUDE_DIR
+          NAMES z.cmi
+          HINTS ${OCAML_BASEDIR}
+          PATH_SUFFIXES zarith lib/ocaml/zarith
+      )
+    endif( )
+
+    if( ZARITH_LIBRARIES AND ZARITH_INCLUDE_DIR )
+      set( HAVE_ZARITH 1 CACHE INTERNAL "Enable build with ocaml/zarith" )
+      message( STATUS "Search for zarith - found" )
+    else()
+      message( STATUS "Search for zarith - not found" )
+    endif()
+  endif( )
+
+  if( (NOT HAVE_NUMS) AND (NOT HAVE_ZARITH) )
+    tde_message_fatal( "Facile requires nums or zarith, but neither is found on your system" )
+  endif()
+
 endif( WITH_OCAML_SOLVER )
diff --git a/kalzium/src/CMakeLists.txt b/kalzium/src/CMakeLists.txt
index 5a91842b..ee4f437b 100644
--- a/kalzium/src/CMakeLists.txt
+++ b/kalzium/src/CMakeLists.txt
@@ -20,7 +20,7 @@ link_directories(
 )
 
 if( WITH_OCAML_SOLVER )
-  set( OCAML_LIBRARIES asmrun nums m ${CMAKE_DL_LIBS} )
+  set( OCAML_LIBRARIES asmrun m ${NUMS_LIBRARIES} ${ZARITH_LIBRARIES} ${CMAKE_DL_LIBS} )
   set( OCAML_SOLVER
     ${CMAKE_CURRENT_BINARY_DIR}/solver/modwrap.o
     ${CMAKE_CURRENT_BINARY_DIR}/solver/solver.o
diff --git a/kanagram/images/appicon.png b/kanagram/images/appicon.png
index b8374378..ce2aa8d7 100644
--- a/kanagram/images/appicon.png
+++ b/kanagram/images/appicon.png
diff --git a/kanagram/images/appiconover.png b/kanagram/images/appiconover.png
index 0e67fa42..aad15c8c 100644
--- a/kanagram/images/appiconover.png
+++ b/kanagram/images/appiconover.png
diff --git a/kanagram/images/kicon.png b/kanagram/images/kicon.png
index c34c434e..996ca9e5 100644
--- a/kanagram/images/kicon.png
+++ b/kanagram/images/kicon.png
diff --git a/kanagram/images/kiconover.png b/kanagram/images/kiconover.png
index cc85b305..d25d8b5b 100644
--- a/kanagram/images/kiconover.png
+++ b/kanagram/images/kiconover.png
diff --git a/keduca/keducabuilder/kcontrolheader.cpp b/keduca/keducabuilder/kcontrolheader.cpp
index d64d7f87..5d74b399 100644
--- a/keduca/keducabuilder/kcontrolheader.cpp
+++ b/keduca/keducabuilder/kcontrolheader.cpp
@@ -20,7 +20,7 @@
 
 #include <tdelocale.h>
 #include <tdestandarddirs.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <klineedit.h>
 #include <kcombobox.h>
 
@@ -267,7 +267,7 @@ void KControlHeader::loadCountryList(KLanguageCombo *combo)
         index = tag.findRev('.');
         if (index != -1) tag.truncate(index);
 
-        KSimpleConfig entry(*it);
+        TDESimpleConfig entry(*it);
         entry.setGroup(TQString::fromLatin1("KCM Locale"));
         TQString name = entry.readEntry(TQString::fromLatin1("Name"));
 
@@ -281,7 +281,7 @@ void KControlHeader::loadCountryList(KLanguageCombo *combo)
     for ( TQStringList::ConstIterator it = countrylist.begin();
           it != countrylist.end(); ++it )
     {
-        KSimpleConfig entry(*it);
+        TDESimpleConfig entry(*it);
         entry.setGroup(TQString::fromLatin1("KCM Locale"));
         TQString name = entry.readEntry(TQString::fromLatin1("Name"));
         TQString submenu = '-' + entry.readEntry(TQString::fromLatin1("Region"));
diff --git a/khangman/khangman/pics/desert/animation10.png b/khangman/khangman/pics/desert/animation10.png
index d05f82ba..ffe9eae4 100644
--- a/khangman/khangman/pics/desert/animation10.png
+++ b/khangman/khangman/pics/desert/animation10.png
diff --git a/khangman/khangman/pics/desert/animation9.png b/khangman/khangman/pics/desert/animation9.png
index 42693ed8..f611aa67 100644
--- a/khangman/khangman/pics/desert/animation9.png
+++ b/khangman/khangman/pics/desert/animation9.png
diff --git a/khangman/khangman/pics/sea/animation10.png b/khangman/khangman/pics/sea/animation10.png
index 30a5d5e9..f21e5e5a 100644
--- a/khangman/khangman/pics/sea/animation10.png
+++ b/khangman/khangman/pics/sea/animation10.png
diff --git a/khangman/khangman/pics/sea/animation9.png b/khangman/khangman/pics/sea/animation9.png
index 7f2ff262..ae3dcce5 100644
--- a/khangman/khangman/pics/sea/animation9.png
+++ b/khangman/khangman/pics/sea/animation9.png
diff --git a/kig/CMakeLists.txt b/kig/CMakeLists.txt
index 40d738a2..23a5511d 100644
--- a/kig/CMakeLists.txt
+++ b/kig/CMakeLists.txt
@@ -9,9 +9,13 @@ add_subdirectory( tdefile   )
 add_subdirectory( data      )
 add_subdirectory( icons     )
 add_subdirectory( pykig     )
-add_subdirectory( scripting )
 add_subdirectory( examples  )
 
+if( WITH_KIG_PYTHON_SCRIPTING )
+  add_subdirectory( scripting )
+  set( KIGSCRIPTING_LIBRARIES kigscripting-static )
+endif( )
+
 include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
@@ -25,7 +29,6 @@ link_directories(
   ${TDE_LIB_DIR}
 )
 
-
 ##### libkigpart (kpart)
 
 configure_file( ${TDE_CMAKE_TEMPLATES}/tde_dummy_cpp.cmake dummy.cpp COPYONLY )
@@ -43,7 +46,7 @@ tde_add_kpart( libkigpart AUTOMOC
      kigobjects-static
      kigfilters-static
      kigmodes-static
-     kigscripting-static
+     ${KIGSCRIPTING_LIBRARIES}
 
   EMBED
      kigpart-static
diff --git a/kig/filters/kgeo-filter.cpp b/kig/filters/kgeo-filter.cpp
index 8849256b..1b0900cf 100644
--- a/kig/filters/kgeo-filter.cpp
+++ b/kig/filters/kgeo-filter.cpp
@@ -42,7 +42,7 @@
 #include "../objects/transform_types.h"
 #include "../objects/vector_type.h"
 
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 
 #include <algorithm>
 #include <functional>
@@ -54,14 +54,14 @@ bool KigFilterKGeo::supportMime( const TQString& mime )
 
 KigDocument* KigFilterKGeo::load( const TQString& sFrom )
 {
-  // kgeo uses a KSimpleConfig to save its contents...
-  KSimpleConfig config ( sFrom );
+  // kgeo uses a TDESimpleConfig to save its contents...
+  TDESimpleConfig config ( sFrom );
 
   loadMetrics ( &config );
   return loadObjects ( sFrom, &config );
 }
 
-void KigFilterKGeo::loadMetrics(KSimpleConfig* c )
+void KigFilterKGeo::loadMetrics(TDESimpleConfig* c )
 {
   c->setGroup("Main");
   xMax = c->readNumEntry("XMax", 16);
@@ -100,7 +100,7 @@ static std::vector<KGeoHierarchyElement> sortElems( const std::vector<KGeoHierar
   return ret;
 }
 
-KigDocument* KigFilterKGeo::loadObjects( const TQString& file, KSimpleConfig* c )
+KigDocument* KigFilterKGeo::loadObjects( const TQString& file, TDESimpleConfig* c )
 {
   KigDocument* ret = new KigDocument();
 
diff --git a/kig/filters/kgeo-filter.h b/kig/filters/kgeo-filter.h
index 9bac9085..62fae04c 100644
--- a/kig/filters/kgeo-filter.h
+++ b/kig/filters/kgeo-filter.h
@@ -21,7 +21,7 @@
 
 #include "filter.h"
 
-class KSimpleConfig;
+class TDESimpleConfig;
 
 /**
  * This is an import filter for files generated by the program KGeo,
@@ -43,8 +43,8 @@ protected:
   KigFilterKGeo();
   ~KigFilterKGeo();
 
-  void loadMetrics ( KSimpleConfig* );
-  KigDocument* loadObjects ( const TQString& file, KSimpleConfig* );
+  void loadMetrics ( TDESimpleConfig* );
+  KigDocument* loadObjects ( const TQString& file, TDESimpleConfig* );
 
   int xMax;
   int yMax;
diff --git a/kig/kig/kig_part.cpp b/kig/kig/kig_part.cpp
index 26f7e681..be58e391 100644
--- a/kig/kig/kig_part.cpp
+++ b/kig/kig/kig_part.cpp
@@ -49,7 +49,7 @@
 #include <tdefiledialog.h>
 #include <tdeglobal.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdelocale.h>
 #include <tdemainwindow.h>
 #include <tdemessagebox.h>
diff --git a/kmplot/kmplot/MainDlg.cpp b/kmplot/kmplot/MainDlg.cpp
index 31c62e7f..4b514926 100644
--- a/kmplot/kmplot/MainDlg.cpp
+++ b/kmplot/kmplot/MainDlg.cpp
@@ -35,7 +35,7 @@
 #include <kdebug.h>
 #include <kedittoolbar.h>
 #include <tdeio/netaccess.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <klineedit.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
@@ -611,7 +611,7 @@ void MainDlg::updateSettings()
 
 void MainDlg::loadConstants()
 {
-	KSimpleConfig conf ("kcalcrc");
+	TDESimpleConfig conf ("kcalcrc");
 	conf.setGroup("UserConstants");
 	TQString tmp;
 	TQString tmp_constant;
@@ -674,7 +674,7 @@ void MainDlg::loadConstants()
 
 void MainDlg::saveConstants()
 {
-	KSimpleConfig conf ("kcalcrc");
+	TDESimpleConfig conf ("kcalcrc");
 	conf.deleteGroup("Constants");
 	conf.setGroup("UserConstants");
 	TQString tmp;
diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
index 8ceabdf8..b04f1b9e 100644
--- a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
@@ -1032,7 +1032,7 @@ void LanguageOptions::loadCountryData()
     index = tag.findRev('.');
     if (index != -1) tag.truncate(index);
 
-    KSimpleConfig entry(*it);
+    TDESimpleConfig entry(*it);
     entry.setGroup(TQString::fromLatin1("KCM Locale"));
     TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name"));
 
@@ -1045,7 +1045,7 @@ void LanguageOptions::loadCountryData()
   int idx = 0;
   for (TQStringList::ConstIterator sit = countrylist.begin(); sit != countrylist.end(); ++sit)
   {
-    KSimpleConfig entry(*sit);
+    TDESimpleConfig entry(*sit);
     entry.setGroup(TQString::fromLatin1("KCM Locale"));
     TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name"));
     TQString submenu = entry.readEntry(TQString::fromLatin1("Region"));
diff --git a/translations/desktop_files/blinken.desktop/zh_CN.po b/translations/desktop_files/blinken.desktop/zh_CN.po
index ed3b0b62..e8c30e2d 100644
--- a/translations/desktop_files/blinken.desktop/zh_CN.po
+++ b/translations/desktop_files/blinken.desktop/zh_CN.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Toad114514 <xiaolan2332021@163.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-05-26 03:08+0200\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"
+"PO-Revision-Date: 2025-09-13 13:15+0000\n"
+"Last-Translator: Toad114514 <xiaolan2332021@163.com>\n"
+"Language-Team: Chinese (Simplified Han script) <https://mirror.git."
+"trinitydesktop.org/weblate/projects/tdeedu/blinken-blinkendesktop/zh_Hans/>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 4.18.2\n"
 
 #. Name
 #: blinken.desktop:2
 msgid "Blinken"
-msgstr ""
+msgstr "BlinKen"
 
 #. GenericName
 #: blinken.desktop:4
@@ -29,4 +30,4 @@ msgstr "我说你做游戏"
 #. Comment
 #: blinken.desktop:8
 msgid "A retro memory enhancement game"
-msgstr "一个记忆强化游戏"
+msgstr "锻炼记忆力这一块"